From 765e59e02015e11463ec49b71ce91fa2af33ac26 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 9 Jan 2021 16:55:31 +0900 Subject: [PATCH] blah --- asm/boot.s | 4 +- asm/data/battle/battle.rodata.s | 21 + asm/data/code_1000_len_60.data.s | 30 +- asm/data/code_26840_len_20d0.data.s | 2 +- asm/data/code_31650.data.s | 2 +- asm/data/code_a5dd0_len_114e0.data.s | 2 +- .../4E29B0/func_802184CC_4E2C0C.s | 34 +- .../431660/func_80218CC0_431660.s | 46 +- .../43A7E0/func_80218D50_43A7E0.s | 46 +- .../area_kpa3/6BBC60/func_802180D0_6BBC60.s | 72 +- .../area_kpa4/6CC070/func_80218000_6CC070.s | 4 +- .../area_kzn/58C740/func_8021851C_58C80C.s | 14 +- .../area_kzn2/59E6E0/func_802188B0_59EF90.s | 4 +- .../area_kzn2/59E6E0/func_802188FC_59EFDC.s | 4 +- .../area_omo/512AB0/func_802185AC_512B7C.s | 14 +- .../area_omo/512AB0/func_80218A98_513068.s | 2 +- .../area_omo/513580/func_80218FB0_513580.s | 14 +- .../area_sam2/63D710/func_80218588_63D768.s | 32 +- .../area_tik/5ED010/func_80218B80_5ED010.s | 120 +- .../code_102610_len_2330/func_802E13B8.s | 4 +- .../code_102610_len_2330/func_802E246C.s | 4 +- .../entity_init_Hammer1Block_normal.s | 4 +- .../code_105700_len_2130/func_802E464C.s | 4 +- .../code_105700_len_2130/func_802E46BC.s | 4 +- .../code_105700_len_2130/func_802E4B60.s | 4 +- .../code_105700_len_2130/func_802E4E04.s | 4 +- .../code_105700_len_2130/func_802E5F50.s | 4 +- .../code_105700_len_2130/func_802E5F7C.s | 4 +- .../code_1060_len_310/func_80025CC0.s | 4 +- .../code_1060_len_310/func_80025CFC.s | 4 +- .../code_1060_len_310/func_80025D38.s | 4 +- .../code_107830_len_e70/func_802E6C24.s | 4 +- .../code_1086a0_len_fc0/entity_init_Chest.s | 4 +- .../code_1086a0_len_fc0/func_802E7D54.s | 4 +- .../code_109660_len_1270/func_802E7DE0.s | 4 +- .../code_11a50_len_7a0/step_intro.s | 100 +- .../begin_state_title_screen.s | 4 +- .../code_135EE0/pause_tabs_handle_input.s | 8 +- .../code_135EE0/pause_tabs_update.s | 40 +- .../clear_encounter_status.s | 4 +- .../code_13870_len_6980/func_8003E338.s | 4 +- asm/nonmatchings/code_165490/func_80245A40.s | 108 +- asm/nonmatchings/code_167570/func_802471EC.s | 56 +- asm/nonmatchings/code_168590/func_80248024.s | 16 +- asm/nonmatchings/code_168590/func_8024830C.s | 4 +- asm/nonmatchings/code_168590/func_80248BF4.s | 20 +- asm/nonmatchings/code_16F740/func_80246B2C.s | 6 + asm/nonmatchings/code_16F740/pause_cleanup.s | 2 +- .../code_16c8e0/initialize_battle.s | 12 +- asm/nonmatchings/code_17D6A0/func_8024EFE0.s | 12 +- asm/nonmatchings/code_17D6A0/func_8024F394.s | 2 +- asm/nonmatchings/code_17D6A0/func_8024FB3C.s | 2 +- .../code_17D6A0/show_battle_message.s | 4 +- .../code_17D6A0/show_message_popup.s | 20 +- .../show_variable_battle_message.s | 4 +- asm/nonmatchings/code_18C790/func_8025E190.s | 8 +- asm/nonmatchings/code_196AA0/func_80268E88.s | 8 +- .../code_20ec0_len_5040/DoBasicAI.s | 18 +- .../code_20ec0_len_5040/func_80045AC0.s | 4 +- .../code_20ec0_len_5040/func_80045D00.s | 8 +- .../code_20ec0_len_5040/func_80045ED0.s | 4 +- .../code_20ec0_len_5040/func_80045FB4.s | 8 +- .../code_25f00_len_940/func_8004AB00.s | 8 +- asm/nonmatchings/code_3278F0/func_E0002000.s | 12 +- asm/nonmatchings/code_3278F0/func_E00022BC.s | 4 +- asm/nonmatchings/code_328110/func_E000C160.s | 12 +- asm/nonmatchings/code_328110/func_E000C754.s | 4 +- asm/nonmatchings/code_32C110/func_E000E000.s | 12 +- asm/nonmatchings/code_32C110/func_E000E244.s | 4 +- asm/nonmatchings/code_32E490/func_E0014000.s | 12 +- asm/nonmatchings/code_32E490/func_E001449C.s | 4 +- asm/nonmatchings/code_32EE30/func_E0016000.s | 12 +- asm/nonmatchings/code_32EE30/func_E0016410.s | 4 +- asm/nonmatchings/code_32FE30/func_E001A000.s | 12 +- asm/nonmatchings/code_32FE30/func_E001A3FC.s | 4 +- asm/nonmatchings/code_330910/func_E001C000.s | 12 +- asm/nonmatchings/code_330910/func_E001C200.s | 4 +- asm/nonmatchings/code_331940/func_E001E000.s | 12 +- asm/nonmatchings/code_331940/func_E001E6E8.s | 4 +- asm/nonmatchings/code_333EC0/func_E00202CC.s | 12 +- asm/nonmatchings/code_333EC0/func_E002058C.s | 4 +- asm/nonmatchings/code_337240/func_E0022000.s | 12 +- asm/nonmatchings/code_337240/func_E0022960.s | 4 +- asm/nonmatchings/code_339250/func_E0024000.s | 12 +- asm/nonmatchings/code_339250/func_E00242E0.s | 4 +- asm/nonmatchings/code_33B180/func_E0026000.s | 12 +- asm/nonmatchings/code_33B180/func_E00264B0.s | 4 +- asm/nonmatchings/code_33CDF0/func_E0028000.s | 12 +- asm/nonmatchings/code_33CDF0/func_E00284E8.s | 4 +- asm/nonmatchings/code_33E8C0/func_E002A000.s | 12 +- asm/nonmatchings/code_33E8C0/func_E002A380.s | 4 +- asm/nonmatchings/code_33FE80/func_E002C000.s | 12 +- asm/nonmatchings/code_33FE80/func_E002C3D0.s | 4 +- asm/nonmatchings/code_3419E0/func_E002E000.s | 12 +- asm/nonmatchings/code_3419E0/func_E002E330.s | 4 +- asm/nonmatchings/code_342140/func_E0030000.s | 12 +- asm/nonmatchings/code_342140/func_E0030A24.s | 4 +- asm/nonmatchings/code_343680/func_E0032000.s | 12 +- asm/nonmatchings/code_343680/func_E0032420.s | 4 +- asm/nonmatchings/code_344A10/func_E0034000.s | 12 +- asm/nonmatchings/code_344A10/func_E00342C8.s | 4 +- asm/nonmatchings/code_3454E0/func_E0036000.s | 12 +- asm/nonmatchings/code_3454E0/func_E00361D8.s | 4 +- asm/nonmatchings/code_34DD20/func_E0038000.s | 12 +- asm/nonmatchings/code_34DD20/func_E0038704.s | 4 +- asm/nonmatchings/code_34EC80/func_E003A000.s | 12 +- asm/nonmatchings/code_34EC80/func_E003A310.s | 4 +- asm/nonmatchings/code_34F4C0/func_E003C000.s | 16 +- asm/nonmatchings/code_352440/func_E003E000.s | 12 +- asm/nonmatchings/code_352440/func_E003E5F4.s | 4 +- asm/nonmatchings/code_353300/func_E0040000.s | 12 +- asm/nonmatchings/code_353300/func_E0040210.s | 4 +- asm/nonmatchings/code_3547A0/func_E0042000.s | 12 +- asm/nonmatchings/code_3547A0/func_E0042374.s | 4 +- asm/nonmatchings/code_354F60/func_E0044000.s | 12 +- asm/nonmatchings/code_354F60/func_E00448E4.s | 4 +- asm/nonmatchings/code_355EE0/func_E0046000.s | 12 +- asm/nonmatchings/code_355EE0/func_E004627C.s | 4 +- asm/nonmatchings/code_356980/func_E0048000.s | 12 +- asm/nonmatchings/code_356980/func_E00481D4.s | 4 +- asm/nonmatchings/code_3584C0/func_E004A000.s | 12 +- asm/nonmatchings/code_3584C0/func_E004A748.s | 4 +- asm/nonmatchings/code_359F20/func_E004C000.s | 12 +- asm/nonmatchings/code_359F20/func_E004C364.s | 4 +- asm/nonmatchings/code_35B9D0/func_E004E000.s | 12 +- asm/nonmatchings/code_35B9D0/func_E004E1D0.s | 4 +- asm/nonmatchings/code_35BFD0/func_E0050000.s | 12 +- asm/nonmatchings/code_35BFD0/func_E00502C4.s | 4 +- asm/nonmatchings/code_35CA80/func_E0052000.s | 12 +- asm/nonmatchings/code_35CA80/func_E005241C.s | 4 +- asm/nonmatchings/code_35DA00/func_E0056000.s | 12 +- asm/nonmatchings/code_35DA00/func_E0056B8C.s | 4 +- asm/nonmatchings/code_35E920/func_E0058000.s | 12 +- asm/nonmatchings/code_35E920/func_E0058490.s | 4 +- asm/nonmatchings/code_3602C0/func_E005A000.s | 12 +- asm/nonmatchings/code_3602C0/func_E005A3B0.s | 4 +- asm/nonmatchings/code_360F40/func_E005C000.s | 12 +- asm/nonmatchings/code_360F40/func_E005C2B4.s | 4 +- asm/nonmatchings/code_3625C0/func_E005E000.s | 16 +- asm/nonmatchings/code_363160/func_E0060000.s | 12 +- asm/nonmatchings/code_363160/func_E006040C.s | 4 +- asm/nonmatchings/code_364300/func_E0062000.s | 12 +- asm/nonmatchings/code_364300/func_E00624A8.s | 4 +- asm/nonmatchings/code_364F10/func_E0064000.s | 12 +- asm/nonmatchings/code_364F10/func_E00643DC.s | 4 +- asm/nonmatchings/code_366030/func_E0066000.s | 12 +- asm/nonmatchings/code_366030/func_E006672C.s | 4 +- asm/nonmatchings/code_36A8D0/func_E0068000.s | 12 +- asm/nonmatchings/code_36A8D0/func_E00681D8.s | 4 +- asm/nonmatchings/code_36D020/func_E006A1E8.s | 12 +- asm/nonmatchings/code_36D020/func_E006A814.s | 4 +- asm/nonmatchings/code_36E1D0/func_E006C000.s | 12 +- asm/nonmatchings/code_36E1D0/func_E006C5A0.s | 4 +- asm/nonmatchings/code_372790/func_E006E000.s | 12 +- asm/nonmatchings/code_372790/func_E006E6E4.s | 4 +- asm/nonmatchings/code_3740B0/func_E0070000.s | 12 +- asm/nonmatchings/code_3740B0/func_E00706F0.s | 4 +- asm/nonmatchings/code_374E50/func_E0072000.s | 12 +- asm/nonmatchings/code_374E50/func_E007238C.s | 4 +- asm/nonmatchings/code_376460/func_E0074000.s | 12 +- asm/nonmatchings/code_376460/func_E0074598.s | 4 +- asm/nonmatchings/code_377070/func_E0076000.s | 12 +- asm/nonmatchings/code_377070/func_E0076808.s | 4 +- asm/nonmatchings/code_37A3F0/func_E0078000.s | 12 +- asm/nonmatchings/code_37A3F0/func_E0078210.s | 4 +- asm/nonmatchings/code_37C540/func_E007A000.s | 12 +- asm/nonmatchings/code_37C540/func_E007A840.s | 4 +- asm/nonmatchings/code_37D490/func_E007C000.s | 12 +- asm/nonmatchings/code_37D490/func_E007C1B0.s | 4 +- asm/nonmatchings/code_37F720/func_E007E000.s | 12 +- asm/nonmatchings/code_37F720/func_E007E508.s | 4 +- asm/nonmatchings/code_3812C0/func_E0080000.s | 16 +- asm/nonmatchings/code_385640/func_E0082000.s | 16 +- asm/nonmatchings/code_3889D0/func_E0084084.s | 12 +- asm/nonmatchings/code_3889D0/func_E00848E4.s | 4 +- asm/nonmatchings/code_389850/func_E0086000.s | 16 +- asm/nonmatchings/code_38ADF0/func_E008817C.s | 12 +- asm/nonmatchings/code_38ADF0/func_E00887A8.s | 4 +- asm/nonmatchings/code_38DE00/func_E008C000.s | 12 +- asm/nonmatchings/code_38DE00/func_E008C6B8.s | 4 +- asm/nonmatchings/code_38EE60/func_E008E000.s | 12 +- asm/nonmatchings/code_38EE60/func_E008E498.s | 4 +- asm/nonmatchings/code_38F900/func_E0090000.s | 16 +- asm/nonmatchings/code_391D30/func_E0092000.s | 12 +- asm/nonmatchings/code_391D30/func_E0092258.s | 4 +- asm/nonmatchings/code_3928D0/func_E0094000.s | 12 +- asm/nonmatchings/code_3928D0/func_E00942C0.s | 4 +- asm/nonmatchings/code_394280/func_E0096000.s | 12 +- asm/nonmatchings/code_394280/func_E0096178.s | 4 +- asm/nonmatchings/code_395BB0/func_E0098000.s | 12 +- asm/nonmatchings/code_395BB0/func_E009829C.s | 4 +- asm/nonmatchings/code_3965B0/func_E009A000.s | 12 +- asm/nonmatchings/code_3965B0/func_E009A398.s | 4 +- asm/nonmatchings/code_3981F0/func_E009C000.s | 12 +- asm/nonmatchings/code_3981F0/func_E009C1DC.s | 4 +- asm/nonmatchings/code_39FF20/func_E009E000.s | 12 +- asm/nonmatchings/code_39FF20/func_E009E3DC.s | 4 +- asm/nonmatchings/code_3A2990/func_E00A2000.s | 12 +- asm/nonmatchings/code_3A2990/func_E00A21EC.s | 4 +- asm/nonmatchings/code_3A37E0/func_E00A4000.s | 12 +- asm/nonmatchings/code_3A37E0/func_E00A45DC.s | 4 +- asm/nonmatchings/code_3A5550/func_E00A6000.s | 12 +- asm/nonmatchings/code_3A5550/func_E00A6358.s | 4 +- asm/nonmatchings/code_3A70F0/func_E00A8000.s | 12 +- asm/nonmatchings/code_3A70F0/func_E00A82D4.s | 4 +- asm/nonmatchings/code_3AA920/func_E00AA000.s | 12 +- asm/nonmatchings/code_3AA920/func_E00AA3C0.s | 4 +- asm/nonmatchings/code_3AEE20/func_E00AC000.s | 16 +- asm/nonmatchings/code_3B2350/func_E00AE000.s | 12 +- asm/nonmatchings/code_3B2350/func_E00AE4FC.s | 4 +- asm/nonmatchings/code_3B3EB0/func_E00B0000.s | 12 +- asm/nonmatchings/code_3B3EB0/func_E00B01F8.s | 4 +- asm/nonmatchings/code_3B4790/func_E00B2000.s | 12 +- asm/nonmatchings/code_3B4790/func_E00B2460.s | 4 +- asm/nonmatchings/code_3B5CF0/func_E00B4000.s | 12 +- asm/nonmatchings/code_3B5CF0/func_E00B452C.s | 4 +- asm/nonmatchings/code_3B7160/func_E00B6000.s | 12 +- asm/nonmatchings/code_3B7160/func_E00B629C.s | 4 +- asm/nonmatchings/code_3B7B80/func_E00B8000.s | 12 +- asm/nonmatchings/code_3B7B80/func_E00B81B8.s | 4 +- asm/nonmatchings/code_3B8BD0/func_E00BA000.s | 12 +- asm/nonmatchings/code_3B8BD0/func_E00BA5DC.s | 4 +- asm/nonmatchings/code_3BA030/func_E00BC000.s | 12 +- asm/nonmatchings/code_3BA030/func_E00BC2E8.s | 4 +- asm/nonmatchings/code_3BBF60/func_E00BE000.s | 12 +- asm/nonmatchings/code_3BBF60/func_E00BE578.s | 4 +- asm/nonmatchings/code_3BCD60/func_E00C0000.s | 12 +- asm/nonmatchings/code_3BCD60/func_E00C0710.s | 4 +- asm/nonmatchings/code_3C11D0/func_E00C2000.s | 12 +- asm/nonmatchings/code_3C11D0/func_E00C21CC.s | 4 +- asm/nonmatchings/code_3CADF0/func_E00C4000.s | 12 +- asm/nonmatchings/code_3CADF0/func_E00C42C4.s | 4 +- asm/nonmatchings/code_3CC9E0/func_E00C6000.s | 12 +- asm/nonmatchings/code_3CC9E0/func_E00C6768.s | 4 +- asm/nonmatchings/code_3CF3A0/func_E00C8000.s | 12 +- asm/nonmatchings/code_3CF3A0/func_E00C8404.s | 4 +- asm/nonmatchings/code_3D0500/func_E00CA000.s | 12 +- asm/nonmatchings/code_3D0500/func_E00CA484.s | 4 +- asm/nonmatchings/code_3D1690/func_E00CC000.s | 12 +- asm/nonmatchings/code_3D1690/func_E00CC980.s | 4 +- asm/nonmatchings/code_3D2AC0/func_E00CE000.s | 12 +- asm/nonmatchings/code_3D2AC0/func_E00CE428.s | 4 +- asm/nonmatchings/code_3D3E20/func_E00D0000.s | 12 +- asm/nonmatchings/code_3D3E20/func_E00D0448.s | 4 +- asm/nonmatchings/code_3D4970/func_E00D2000.s | 12 +- asm/nonmatchings/code_3D4970/func_E00D2234.s | 4 +- asm/nonmatchings/code_3D5020/func_E00D6000.s | 12 +- asm/nonmatchings/code_3D5020/func_E00D693C.s | 4 +- asm/nonmatchings/code_3D67C0/func_E00D8000.s | 16 +- asm/nonmatchings/code_3D67C0/func_E00D8630.s | 4 +- asm/nonmatchings/code_3D7240/func_E00DA000.s | 12 +- asm/nonmatchings/code_3D7240/func_E00DA1E0.s | 4 +- asm/nonmatchings/code_3D7A70/func_E00DC000.s | 12 +- asm/nonmatchings/code_3D7A70/func_E00DC2C0.s | 4 +- asm/nonmatchings/code_3D8720/func_E00DE000.s | 12 +- asm/nonmatchings/code_3D8720/func_E00DE260.s | 4 +- asm/nonmatchings/code_3DB460/func_E00E0000.s | 12 +- asm/nonmatchings/code_3DB460/func_E00E05B0.s | 4 +- asm/nonmatchings/code_3DC310/func_E00E2000.s | 12 +- asm/nonmatchings/code_3DC310/func_E00E21C8.s | 4 +- asm/nonmatchings/code_3DE000/func_E00E4000.s | 12 +- asm/nonmatchings/code_3DE000/func_E00E490C.s | 4 +- asm/nonmatchings/code_3E0930/func_E00E6000.s | 12 +- asm/nonmatchings/code_3E0930/func_E00E64D4.s | 4 +- asm/nonmatchings/code_3E1690/func_E00E8000.s | 12 +- asm/nonmatchings/code_3E1690/func_E00E8374.s | 4 +- asm/nonmatchings/code_3E1EE0/func_E00EA000.s | 12 +- asm/nonmatchings/code_3E1EE0/func_E00EA520.s | 4 +- asm/nonmatchings/code_3E43A0/func_E010A000.s | 12 +- asm/nonmatchings/code_3E43A0/func_E010A4A0.s | 4 +- asm/nonmatchings/code_3E54C0/func_E010C000.s | 12 +- asm/nonmatchings/code_3E54C0/func_E010C354.s | 4 +- asm/nonmatchings/code_3F83F0/func_E0110000.s | 12 +- asm/nonmatchings/code_3F83F0/func_E01103A4.s | 4 +- asm/nonmatchings/code_3F9E50/func_E0112000.s | 12 +- asm/nonmatchings/code_3F9E50/func_E01122E8.s | 4 +- asm/nonmatchings/code_3FEAE0/func_E0114000.s | 12 +- asm/nonmatchings/code_3FEAE0/func_E0114340.s | 4 +- asm/nonmatchings/code_402640/func_E0116000.s | 12 +- asm/nonmatchings/code_402640/func_E01166A0.s | 4 +- asm/nonmatchings/code_403400/func_E0118000.s | 12 +- asm/nonmatchings/code_403400/func_E0118454.s | 4 +- asm/nonmatchings/code_404220/func_E011A000.s | 16 +- asm/nonmatchings/code_409990/func_E011E000.s | 12 +- asm/nonmatchings/code_409990/func_E011E530.s | 4 +- asm/nonmatchings/code_40B3F0/func_E0120000.s | 12 +- asm/nonmatchings/code_40B3F0/func_E012039C.s | 4 +- asm/nonmatchings/code_40C5A0/func_E0122000.s | 12 +- asm/nonmatchings/code_40C5A0/func_E01226C4.s | 4 +- asm/nonmatchings/code_412730/func_E0124000.s | 12 +- asm/nonmatchings/code_412730/func_E012448C.s | 4 +- asm/nonmatchings/code_413360/func_E0126000.s | 12 +- asm/nonmatchings/code_413360/func_E01264A4.s | 4 +- asm/nonmatchings/code_414BA0/func_E0128000.s | 12 +- asm/nonmatchings/code_414BA0/func_E0128198.s | 4 +- asm/nonmatchings/code_415D90/func_802A2C84.s | 28 +- asm/nonmatchings/code_415D90/func_802A4A54.s | 16 +- .../code_7340_len_b00/crash_printf_string.s | 4 +- .../code_7340_len_b00/func_8002C94C.s | 4 +- .../code_7bb60_len_41b0/func_800E46C8.s | 4 +- .../code_838b0_len_5900/partner_reset_data.s | 4 +- .../code_8a860_len_3f30/func_800F1A10.s | 64 +- .../code_8a860_len_3f30/func_800F4E40.s | 4 +- .../code_8a860_len_3f30/func_800F4FC4.s | 4 +- .../code_8a860_len_3f30/func_800F513C.s | 4 +- .../code_B9D60/clear_item_entity_data.s | 4 +- asm/nonmatchings/code_B9D60/func_80127BA4.s | 4 +- asm/nonmatchings/code_B9D60/func_801363A0.s | 16 +- .../code_B9D60/load_message_to_printer.s | 2 +- .../code_E225B0/func_802B72C0_E22870.s | 4 +- asm/nonmatchings/code_F5750/func_802D4488.s | 12 +- .../code_a5dd0_len_114e0/func_8011F304.s | 4 +- .../code_a5dd0_len_114e0/func_8011F3E8.s | 4 +- .../code_a5dd0_len_114e0/render_entities.s | 8 +- .../code_a5dd0_len_114e0/render_models.s | 4 +- .../code_a5dd0_len_114e0/render_shadows.s | 4 +- .../code_b72b0_len_15ed0/func_80121CE8.s | 4 +- .../code_b72b0_len_15ed0/func_80121EB8.s | 4 +- .../code_b72b0_len_15ed0/func_80122088.s | 4 +- .../code_b72b0_len_15ed0/func_80122188.s | 4 +- .../code_ef070_len_3400/func_802CD4B4.s | 4 +- .../os/osCreateThread/osCreateThread.s | 4 +- .../arn_02/BDD1B0/func_80240000_BDD1B0.s | 4 +- .../arn_02/BDD1B0/func_802401D4_BDD384.s | 4 +- .../arn_02/BDD1B0/func_80240984_BDDB34.s | 4 +- .../arn_02/BDD1B0/func_80240C90_BDDE40.s | 6 +- .../arn_03/BDED90/func_80240B94_BDF924.s | 8 +- .../arn_03/BDED90/func_8024113C_BDFECC.s | 2 +- .../arn_03/BDED90/func_802415F4_BE0384.s | 8 +- .../arn_03/BDED90/func_80241648_BE03D8.s | 4 +- .../arn_04/BE37B0/func_80240B94_BE4344.s | 8 +- .../arn_04/BE37B0/func_80241040_BE47F0.s | 4 +- .../arn_04/BE37B0/func_8024219C_BE594C.s | 10 +- .../arn_04/BE37B0/func_80243018_BE67C8.s | 2 +- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 8 +- .../arn_05/BE7BE0/func_8024113C_BE8D1C.s | 2 +- .../arn_07/BED740/func_80241C5C_BEEA4C.s | 6 +- .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 6 +- .../dgb_01/BFD9A0/func_802422B0_BFFB30.s | 2 +- .../dgb_01/BFD9A0/func_802430C0_C00940.s | 30 +- .../dgb_02/C2EBA0/func_8024061C_C2F1BC.s | 38 +- .../dgb_02/C2EBA0/func_802410D4_C2FC74.s | 54 +- .../dgb_03/C31730/func_80240458_C31938.s | 4 +- .../dgb_03/C31730/func_8024086C_C31D4C.s | 38 +- .../dgb_03/C31730/func_802416B4_C32B94.s | 12 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 42 +- .../dgb_03/C31730/func_80242480_C33960.s | 44 +- .../dgb_04/C36530/func_8024130C_C3783C.s | 6 +- .../dgb_04/C36530/func_80242154_C38684.s | 2 +- .../dgb_05/C3AA10/func_80240C00_C3B610.s | 4 +- .../dgb_05/C3AA10/func_80240E80_C3B890.s | 44 +- .../dgb_05/C3AA10/func_802411D0_C3BBE0.s | 40 +- .../dgb_06/C3D080/func_80240000_C3D080.s | 8 +- .../dgb_07/C3DBF0/func_80240208_C3DDF8.s | 4 +- .../dgb_07/C3DBF0/func_80240BA0_C3E790.s | 4 +- .../dgb_07/C3DBF0/func_80240E20_C3EA10.s | 44 +- .../dgb_07/C3DBF0/func_80241170_C3ED60.s | 44 +- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 8 +- .../dgb_08/C3FDB0/func_802414AC_C4125C.s | 34 +- .../dgb_08/C3FDB0/func_80242A6C_C4281C.s | 10 +- .../dgb_08/C3FDB0/func_802438F0_C436A0.s | 20 +- .../dgb_09/C46BE0/func_8024061C_C471FC.s | 34 +- .../dgb_09/C46BE0/func_802410D4_C47CB4.s | 44 +- .../dgb_09/C46BE0/func_802415D4_C481B4.s | 4 +- .../dgb_09/C46BE0/func_80242730_C49310.s | 6 +- .../dgb_09/C46BE0/func_80242C1C_C497FC.s | 4 +- .../dgb_09/C46BE0/func_80243578_C4A158.s | 2 +- .../dgb_12/C4DEF0/func_80240000_C4DEF0.s | 8 +- .../dgb_15/C4F510/func_8024061C_C4FB2C.s | 38 +- .../dgb_15/C4F510/func_802408D0_C4FDE0.s | 4 +- .../dgb_15/C4F510/func_80241464_C50974.s | 8 +- .../dgb_16/C52540/func_80240E20_C53360.s | 44 +- .../dgb_16/C52540/func_80241170_C536B0.s | 40 +- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 12 +- .../dro_01/95B7E0/func_80241174_95C374.s | 8 +- .../dro_01/95B7E0/func_802417D0_95C9D0.s | 4 +- .../dro_01/95B7E0/func_802424D4_95D6D4.s | 4 +- .../dro_02/9694C0/func_80240660_969820.s | 4 +- .../dro_02/9694C0/func_80241364_96A524.s | 4 +- .../dro_02/9694C0/func_802416FC_96A8BC.s | 8 +- .../dro_02/9694C0/func_8024190C_96AACC.s | 8 +- .../dro_02/9694C0/func_8024240C_96B5CC.s | 4 +- .../end_00/DF6A20/func_80241B34_DF8534.s | 16 +- .../end_00/DF6A20/func_80242500_DF8F00.s | 4 +- .../end_01/E05390/func_80242368_E076C8.s | 4 +- .../end_01/E05390/func_80242510_E07870.s | 4 +- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 8 +- .../flo_08/CAED40/func_802401CC_CAEF0C.s | 4 +- .../flo_08/CAFAC0/func_8024150C_CB024C.s | 16 +- .../flo_08/CAFAC0/func_80241970_CB06B0.s | 8 +- .../flo_08/CAFAC0/func_802419C4_CB0704.s | 4 +- .../flo_09/CB5320/func_8024162C_CB662C.s | 6 +- .../flo_10/CB9280/func_80240080_CB9280.s | 8 +- .../flo_12/CC0E70/func_8024027C_CC10AC.s | 8 +- .../flo_12/CC0E70/func_802405C0_CC13F0.s | 8 +- .../flo_12/CC0E70/func_80240614_CC1444.s | 4 +- .../flo_13/CC3850/func_802414D0_CC4CE0.s | 6 +- .../flo_13/CC3850/func_80241DB8_CC55C8.s | 4 +- .../flo_13/CC3850/func_8024262C_CC5E3C.s | 32 +- .../flo_13/CC3850/func_80242A6C_CC627C.s | 58 +- .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 6 +- .../flo_16/CD1F10/func_802402AC_CD20DC.s | 4 +- .../flo_16/CD1F10/func_802406E0_CD2510.s | 12 +- .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 6 +- .../flo_16/CD2C80/func_80242754_CD4584.s | 4 +- .../flo_17/CD7350/func_8024137C_CD865C.s | 6 +- .../flo_17/CD7350/func_80241C64_CD8F44.s | 4 +- .../flo_17/CD7350/func_802424D8_CD97B8.s | 32 +- .../flo_17/CD7350/func_80242918_CD9BF8.s | 64 +- .../flo_23/CEE2A0/func_8024026C_CEE4CC.s | 8 +- .../flo_23/CEE2A0/func_802402C0_CEE520.s | 4 +- .../flo_23/CEE2A0/func_802402F8_CEE558.s | 12 +- .../flo_23/CEE2A0/func_80240410_CEE670.s | 4 +- .../flo_23/CEE2A0/func_80240728_CEE988.s | 36 +- .../flo_23/CEE2A0/func_80240C9C_CEEEFC.s | 4 +- .../flo_25/CF2C10/func_80240C94_CF3864.s | 4 +- .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 10 +- .../flo_25/CF2C10/func_80241944_CF4514.s | 4 +- .../hos_00/A0C4E0/func_802407F0_A0C4E0.s | 8 +- .../hos_02/A16220/func_8024030C_A1652C.s | 4 +- .../hos_02/A16220/func_80240BFC_A16E1C.s | 4 +- .../hos_02/A17210/func_802422FC_A1851C.s | 10 +- .../hos_02/A17210/func_802428F4_A18B14.s | 4 +- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 6 +- .../hos_03/A1BDB0/func_80242804_A1D904.s | 4 +- .../hos_03/A1BDB0/func_80243508_A1E608.s | 4 +- .../hos_04/A26ED0/func_80240000_A26ED0.s | 8 +- .../hos_04/A26ED0/func_80240154_A27024.s | 4 +- .../hos_04/A274B0/func_80240734_A27604.s | 4 +- .../hos_04/A274B0/func_802408F8_A277C8.s | 4 +- .../hos_04/A274B0/func_802409B0_A27880.s | 20 +- .../hos_04/A274B0/func_80240A84_A27954.s | 8 +- .../hos_04/A27AA0/func_80240BD0_A27AA0.s | 24 +- .../hos_04/A27AA0/func_80240E6C_A27D3C.s | 4 +- .../hos_05/A2AAC0/func_80242704_A2C944.s | 4 +- .../hos_05/A2AAC0/func_80243164_A2D3A4.s | 4 +- .../hos_05/A2AAC0/func_80243FC4_A2E204.s | 4 +- .../hos_06/A397F0/func_80240654_A39B34.s | 4 +- .../hos_06/A397F0/func_802406A8_A39B88.s | 4 +- .../isk_04/97B670/func_802403D4_97BA04.s | 32 +- .../isk_05/97DAD0/func_80240BF0_97E6C0.s | 4 +- .../isk_05/97DAD0/func_80240F3C_97EA0C.s | 8 +- .../isk_05/97DAD0/func_80241B28_97F5F8.s | 4 +- .../isk_08/984E30/func_80240394_9851C4.s | 36 +- .../isk_09/9864E0/func_80240000_9864E0.s | 8 +- .../isk_10/988B60/func_802401CC_988D2C.s | 4 +- .../isk_13/98F7E0/func_80240BF0_9903D0.s | 4 +- .../isk_13/98F7E0/func_80240F3C_99071C.s | 8 +- .../isk_13/98F7E0/func_80241BA8_991388.s | 4 +- .../isk_14/992730/func_80240230_992960.s | 4 +- .../isk_14/992730/func_80240BF0_993320.s | 4 +- .../isk_14/992730/func_80240F3C_99366C.s | 4 +- .../isk_14/992730/func_80241610_993D40.s | 4 +- .../isk_14/992730/func_80241AF0_994220.s | 8 +- .../isk_14/992730/func_80241BEC_99431C.s | 4 +- .../isk_14/992730/func_80241CA0_9943D0.s | 4 +- .../isk_18/997F70/func_8024007C_997FEC.s | 4 +- .../isk_18/997F70/func_80240394_998304.s | 32 +- .../iwa_01/90F6B0/func_80240000_90F6B0.s | 8 +- .../iwa_01/90FBD0/func_80241F6C_91161C.s | 36 +- .../iwa_01/90FBD0/func_80242F54_912604.s | 12 +- .../iwa_02/915D70/func_80240C90_916A00.s | 2 +- .../iwa_03/918BB0/func_80240000_918BB0.s | 8 +- .../iwa_03/918EF0/func_802409D4_919584.s | 4 +- .../iwa_03/918EF0/func_80240FD0_919B80.s | 2 +- .../iwa_04/91B8E0/func_80240080_91B960.s | 4 +- .../iwa_04/91B8E0/func_80240714_91BFF4.s | 4 +- .../iwa_04/91B8E0/func_80240D10_91C5F0.s | 2 +- .../iwa_11/926C70/func_80240280_926C70.s | 8 +- .../jan_00/B216E0/func_802411EC_B2172C.s | 8 +- .../jan_01/B28030/func_80240F30_B28F60.s | 4 +- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 8 +- .../jan_02/B2C8A0/func_80241614_B2DA84.s | 8 +- .../jan_02/B2C8A0/func_80241974_B2DDE4.s | 4 +- .../jan_02/B2C8A0/func_80242678_B2EAE8.s | 4 +- .../jan_03/B34BD0/func_802411B4_B35D84.s | 8 +- .../jan_03/B34BD0/func_80241EFC_B36ACC.s | 4 +- .../jan_03/B34BD0/func_80242C00_B377D0.s | 4 +- .../jan_04/B44AC0/func_80240350_B44AC0.s | 8 +- .../jan_04/B45150/func_802409E0_B45150.s | 4 +- .../jan_05/B4B260/func_80241494_B4BF04.s | 4 +- .../jan_05/B4B260/func_80241EE8_B4C958.s | 34 +- .../jan_05/B4B260/func_8024219C_B4CC0C.s | 34 +- .../jan_06/B52F70/func_80241330_B53B60.s | 4 +- .../jan_06/B52F70/func_80241A24_B54254.s | 4 +- .../jan_06/B52F70/func_80241E38_B54668.s | 34 +- .../jan_06/B52F70/func_802420EC_B5491C.s | 34 +- .../jan_07/B59870/func_80240830_B5A0A0.s | 34 +- .../jan_07/B59870/func_80240AE4_B5A354.s | 38 +- .../jan_08/B5F650/func_80241C84_B5FF34.s | 34 +- .../jan_08/B5F650/func_80241F38_B601E8.s | 36 +- .../jan_09/B663F0/func_80241170_B66C20.s | 34 +- .../jan_09/B663F0/func_80241424_B66ED4.s | 38 +- .../jan_10/B6C6A0/func_80240F00_B6D290.s | 4 +- .../jan_12/B73570/func_80240CF0_B73DA0.s | 34 +- .../jan_12/B73570/func_80240FA4_B74054.s | 38 +- .../jan_13/B767B0/func_80240000_B767B0.s | 12 +- .../jan_14/B7A050/func_80240170_B7A1C0.s | 4 +- .../jan_14/B7A510/func_802406F0_B7A740.s | 4 +- .../jan_14/B7A510/func_802410B0_B7B100.s | 4 +- .../jan_22/B84180/func_80240000_B84180.s | 4 +- .../jan_22/B84180/func_80240B94_B84D14.s | 8 +- .../jan_22/B84180/func_80240E90_B85010.s | 8 +- .../kgr_01/8A9B70/func_80240160_8A9B70.s | 4 +- .../kgr_01/8A9B70/func_80240354_8A9D64.s | 4 +- .../kgr_01/8A9B70/func_802403E0_8A9DF0.s | 8 +- .../kkj_00/ABB290/func_80240040_ABB2D0.s | 4 +- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 8 +- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 8 +- .../kkj_12/AD4100/func_80240070_AD4100.s | 4 +- .../kkj_13/AD6200/func_802404E0_AD63B0.s | 4 +- .../kkj_14/ADAEF0/func_802403CC_ADB26C.s | 4 +- .../kkj_18/AF2FE0/func_8024056C_AF320C.s | 8 +- .../kkj_18/AF2FE0/func_802405C0_AF3260.s | 4 +- .../kkj_19/AF7950/func_80240000_AF7950.s | 4 +- .../kkj_19/AF7950/func_80240068_AF79B8.s | 8 +- .../kkj_19/AF7950/func_802400E4_AF7A34.s | 4 +- .../kkj_19/AF7950/func_80240178_AF7AC8.s | 4 +- .../kkj_19/AF7950/func_802401FC_AF7B4C.s | 12 +- .../kkj_19/AF7C00/func_802404DC_AF7E2C.s | 12 +- .../kkj_19/AF7C00/func_80240530_AF7E80.s | 8 +- .../kkj_19/AF7C00/func_802406C4_AF8014.s | 4 +- .../kkj_20/AFDB40/func_80240000_AFDB40.s | 8 +- .../kkj_25/B06D10/func_802406EC_B070EC.s | 4 +- .../kkj_27/B14080/func_8024041C_B1418C.s | 4 +- .../kkj_27/B14080/func_80240448_B141B8.s | 4 +- .../kmr_00/8ABF90/func_80240000_8ABF90.s | 16 +- .../kmr_02/8B0070/func_802406F0_8B0760.s | 4 +- .../kmr_02/8B0070/func_802413F4_8B1464.s | 4 +- .../kmr_02/8B0070/func_80241C18_8B1C88.s | 8 +- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 6 +- .../kmr_06/8D1510/func_802401B0_8D16C0.s | 4 +- .../kmr_06/8D1510/func_8024130C_8D281C.s | 6 +- .../kmr_06/8D2A10/func_802417A8_8D2CB8.s | 4 +- .../kmr_06/8D2A10/func_802417E0_8D2CF0.s | 4 +- .../kmr_07/8D3DC0/func_80240000_8D3DC0.s | 4 +- .../kmr_07/8D3DC0/func_802407F4_8D45B4.s | 8 +- .../kmr_09/8D5E00/func_802401B0_8D5FB0.s | 4 +- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 6 +- .../kmr_10/8D84D0/func_80240000_8D84D0.s | 8 +- .../kmr_11/8DA3A0/func_80240B64_8DAC64.s | 8 +- .../kmr_20/8EBE50/func_802406C8_8EC4E8.s | 4 +- .../kmr_20/8EDFC0/func_80242A04_8EE824.s | 4 +- .../kmr_20/8EDFC0/func_80242B04_8EE924.s | 4 +- .../kmr_21/8FEE90/func_80240010_8FEE90.s | 4 +- .../kmr_21/8FEE90/func_80240210_8FF090.s | 12 +- .../kmr_21/8FEE90/func_802402B4_8FF134.s | 4 +- .../kmr_22/8FF8B0/func_8024056C_8FFBDC.s | 6 +- .../kmr_22/8FF8B0/func_80240B00_900170.s | 4 +- .../kmr_22/8FF8B0/func_80240B4C_9001BC.s | 4 +- .../kmr_23/907A40/func_80240040_907A70.s | 4 +- .../kmr_24/90B250/func_80240074_90B2B4.s | 4 +- .../kpa_01/A470C0/func_802404F4_A47454.s | 32 +- .../kpa_03/A48720/func_802401DC_A4879C.s | 4 +- .../kpa_03/A48720/func_802404F4_A48AB4.s | 32 +- .../kpa_03/A48720/func_80240A48_A49008.s | 4 +- .../kpa_03/A48720/func_8024119C_A4975C.s | 8 +- .../kpa_03/A48720/func_8024150C_A49ACC.s | 4 +- .../kpa_08/A4CAC0/func_80240270_A4CC90.s | 8 +- .../kpa_08/A4CAC0/func_802407F4_A4D214.s | 12 +- .../kpa_08/A4CAC0/func_80240B64_A4D584.s | 4 +- .../kpa_08/A4CAC0/func_8024110C_A4DB2C.s | 4 +- .../kpa_09/A4F0A0/func_802400A0_A4F0A0.s | 4 +- .../kpa_09/A4F0A0/func_80240B38_A4FB38.s | 4 +- .../kpa_09/A4F0A0/func_80240F94_A4FF94.s | 36 +- .../kpa_100/A93160/func_80240000_A93160.s | 4 +- .../kpa_101/A93440/func_80240000_A93440.s | 8 +- .../kpa_102/A93A50/func_80241204_A94944.s | 36 +- .../kpa_102/A93A50/func_802418F0_A95030.s | 32 +- .../kpa_11/A52BD0/func_8024038C_A52C4C.s | 4 +- .../kpa_11/A52BD0/func_802406A4_A52F64.s | 38 +- .../kpa_111/A99590/func_80241064_A9A5F4.s | 36 +- .../kpa_113/A9CC70/func_8024022C_A9CE5C.s | 4 +- .../kpa_113/A9CC70/func_80240544_A9D174.s | 32 +- .../kpa_114/A9E980/func_80240000_A9E980.s | 8 +- .../kpa_115/A9ED40/func_80240170_A9EEB0.s | 4 +- .../kpa_115/A9ED40/func_80240C08_A9F948.s | 4 +- .../kpa_115/A9ED40/func_80241064_A9FDA4.s | 36 +- .../kpa_15/A596A0/func_80240310_A596A0.s | 8 +- .../kpa_50/A609D0/func_80240EF4_A618C4.s | 36 +- .../kpa_50/A609D0/func_802415E0_A61FB0.s | 32 +- .../kpa_51/A640E0/func_80240050_A640E0.s | 8 +- .../kpa_51/A640E0/func_802407A4_A64834.s | 8 +- .../kpa_51/A640E0/func_80240B14_A64BA4.s | 4 +- .../kpa_51/A640E0/func_802417E0_A65870.s | 36 +- .../kpa_52/A671E0/func_80240FD4_A680D4.s | 36 +- .../kpa_53/A6ACA0/func_80240050_A6ACF0.s | 4 +- .../kpa_61/A6E6F0/func_802406A4_A6EA84.s | 32 +- .../kpa_61/A6E6F0/func_8024138C_A6F76C.s | 4 +- .../kpa_70/A74B80/func_802406A4_A74F14.s | 38 +- .../kpa_81/A78510/func_8024027C_A7873C.s | 8 +- .../kpa_81/A78510/func_802402D0_A78790.s | 4 +- .../kpa_81/A78510/func_80240308_A787C8.s | 12 +- .../kpa_82/A7A550/func_8024027C_A7A77C.s | 8 +- .../kpa_82/A7A550/func_802402D0_A7A7D0.s | 4 +- .../kpa_83/A83490/func_80240000_A83490.s | 4 +- .../kpa_91/A86A50/func_80240B94_A875E4.s | 12 +- .../kpa_91/A86A50/func_80241224_A87C74.s | 26 +- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 12 +- .../kpa_95/A8CB60/func_80241304_A8DD84.s | 26 +- .../kzn_02/C5AC20/func_802404E0_C5AC20.s | 4 +- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 6 +- .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 4 +- .../kzn_03/C61020/func_802406A4_C613B4.s | 32 +- .../kzn_03/C61020/func_80241214_C61F24.s | 34 +- .../kzn_04/C68440/func_802404DC_C6860C.s | 4 +- .../kzn_04/C69180/func_80241050_C69180.s | 4 +- .../kzn_04/C69180/func_80241644_C69774.s | 4 +- .../kzn_06/C6CC30/func_80240310_C6CC30.s | 4 +- .../kzn_06/C6CD10/func_802403F0_C6CD10.s | 8 +- .../kzn_07/C6EA50/func_80240720_C6EA50.s | 4 +- .../kzn_07/C6EA50/func_80240820_C6EB50.s | 4 +- .../kzn_07/C6EA50/func_80241474_C6F7A4.s | 4 +- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 10 +- .../kzn_07/C6EA50/func_80242124_C70454.s | 8 +- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 6 +- .../kzn_08/C71ED0/func_80242354_C737D4.s | 4 +- .../kzn_08/C71ED0/func_80242B58_C73FD8.s | 34 +- .../kzn_09/C77D00/func_8024163C_C7831C.s | 34 +- .../kzn_09/C77D00/func_80242D58_C79A38.s | 32 +- .../kzn_10/C7E4B0/func_802404EC_C7E66C.s | 4 +- .../kzn_11/C80600/func_8024176C_C8190C.s | 6 +- .../kzn_11/C80600/func_80241D64_C81F04.s | 4 +- .../kzn_17/C85DC0/func_8024092C_C863DC.s | 34 +- .../kzn_17/C85DC0/func_80242048_C87AF8.s | 32 +- .../kzn_19/C8DBB0/func_80240E2C_C8E9DC.s | 4 +- .../kzn_19/C8DBB0/func_802413C0_C8EF70.s | 4 +- .../kzn_19/C8DBB0/func_8024140C_C8EFBC.s | 4 +- .../kzn_20/C96240/func_80240310_C96240.s | 8 +- .../mac_00/7EB340/func_80240990_7EB6A0.s | 4 +- .../mac_00/7EB340/func_80241694_7EC3A4.s | 4 +- .../mac_00/7ED280/func_80243104_7EDE14.s | 8 +- .../mac_01/8017D0/func_80241C14_802494.s | 30 +- .../mac_01/8017D0/func_80242270_802AF0.s | 4 +- .../mac_01/8017D0/func_80242F74_8037F4.s | 4 +- .../mac_01/8017D0/func_80243380_803C00.s | 4 +- .../mac_01/805DD0/func_802460E4_806964.s | 8 +- .../mac_02/823BF0/func_802414C4_824784.s | 8 +- .../mac_02/823BF0/func_80241B20_824DE0.s | 4 +- .../mac_02/823BF0/func_80242824_825AE4.s | 4 +- .../mac_03/831B20/func_80240810_832010.s | 4 +- .../mac_03/831B20/func_80241514_832D14.s | 4 +- .../mac_04/843030/func_802407C0_843390.s | 4 +- .../mac_04/843030/func_802414C4_844094.s | 4 +- .../mac_04/844860/func_80241C90_844860.s | 4 +- .../mac_04/844860/func_80241D30_844900.s | 4 +- .../mac_05/852170/func_80241024_853194.s | 8 +- .../mac_05/852170/func_80241680_8537F0.s | 4 +- .../mac_05/852170/func_80242384_8544F4.s | 4 +- .../mac_06/8659C0/func_80241098_865BD8.s | 8 +- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 8 +- .../mgm_00/E0F980/func_802411E0_E0F980.s | 4 +- .../mgm_00/E0F980/func_802416C0_E0FE60.s | 4 +- .../mgm_00/E0F980/func_802416F8_E0FE98.s | 4 +- .../mgm_01/E12760/func_80240000_E12760.s | 48 +- .../mgm_01/E12930/func_802403C4_E12B24.s | 4 +- .../mgm_01/E12930/func_8024058C_E12CEC.s | 12 +- .../mgm_01/E12930/func_802408EC_E1304C.s | 4 +- .../mgm_01/E12930/func_80240DB8_E13518.s | 4 +- .../mgm_01/E12930/func_80240F90_E136F0.s | 12 +- .../mgm_01/E12930/func_80241234_E13994.s | 20 +- .../mgm_01/E12930/func_80241574_E13CD4.s | 4 +- .../mgm_01/E12930/func_802415EC_E13D4C.s | 4 +- .../mgm_02/E15D80/func_80240430_E161B0.s | 4 +- .../mgm_02/E15D80/func_80240468_E161E8.s | 4 +- .../mgm_02/E15D80/func_802405D0_E16350.s | 4 +- .../mgm_02/E15D80/func_80240790_E16510.s | 8 +- .../mim_01/B93940/func_80240B1C_B93F5C.s | 34 +- .../mim_02/B97C70/func_80240C60_B98860.s | 4 +- .../mim_02/B97C70/func_802410B0_B98CB0.s | 4 +- .../mim_02/B97C70/func_80241104_B98D04.s | 4 +- .../mim_02/B97C70/func_8024113C_B98D3C.s | 12 +- .../mim_04/B9D9D0/func_80240070_B9D9D0.s | 4 +- .../mim_04/B9D9D0/func_802401DC_B9DB3C.s | 4 +- .../mim_04/B9DB60/func_80240DF0_B9E750.s | 4 +- .../mim_05/BA07A0/func_8024068C_BA0DBC.s | 34 +- .../mim_05/BA07A0/func_80240AA8_BA11D8.s | 4 +- .../mim_06/BA4CF0/func_80240B8C_BA530C.s | 38 +- .../mim_06/BA4CF0/func_80240FA8_BA5728.s | 4 +- .../mim_06/BA4CF0/func_80242B04_BA7284.s | 4 +- .../mim_07/BAA1B0/func_802400D8_BAA218.s | 4 +- .../mim_07/BAA1B0/func_80240244_BAA384.s | 4 +- .../mim_07/BAA3B0/func_80240E60_BAAFA0.s | 8 +- .../mim_08/BAD940/func_802413AC_BAECEC.s | 6 +- .../mim_08/BAD940/func_80241BB4_BAF4F4.s | 34 +- .../mim_09/BB2E00/func_802402D0_BB30D0.s | 4 +- .../mim_09/BB2E00/func_80240C90_BB3A90.s | 4 +- .../nok_01/9C53E0/func_802407F4_9C5BD4.s | 8 +- .../nok_01/9C53E0/func_802410C8_9C64A8.s | 4 +- .../nok_01/9C53E0/func_80241DCC_9C71AC.s | 4 +- .../nok_02/9D7020/func_80240624_9D7644.s | 4 +- .../nok_02/9D7020/func_80240678_9D7698.s | 4 +- .../nok_02/9D7AA0/func_80241614_9D8634.s | 8 +- .../nok_02/9D7AA0/func_80241C70_9D8C90.s | 4 +- .../nok_02/9D7AA0/func_80242080_9D90A0.s | 8 +- .../nok_02/9D7AA0/func_80242298_9D92B8.s | 8 +- .../nok_02/9D7AA0/func_8024234C_9D936C.s | 4 +- .../nok_02/9D7AA0/func_80242380_9D93A0.s | 4 +- .../nok_02/9D7AA0/func_80242974_9D9994.s | 8 +- .../nok_03/9EB7F0/func_80240BF0_9EC3E0.s | 4 +- .../nok_04/9EDBF0/func_8024051C_9EE10C.s | 4 +- .../nok_04/9EDBF0/func_80240574_9EE164.s | 12 +- .../nok_04/9EDBF0/func_802406C4_9EE2B4.s | 4 +- .../nok_04/9EDBF0/func_80240814_9EE404.s | 4 +- .../nok_04/9EDBF0/func_80240E4C_9EEA3C.s | 8 +- .../nok_04/9EDBF0/func_80240E70_9EEA60.s | 4 +- .../nok_11/9F4A40/func_80240394_9F4DD4.s | 32 +- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 6 +- .../nok_12/9FAD60/func_80240904_9FB0F4.s | 32 +- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 8 +- .../nok_12/9FAD60/func_80241BD4_9FC3C4.s | 30 +- .../nok_13/A00600/func_80240230_A00830.s | 4 +- .../nok_13/A00600/func_80240BF0_A011F0.s | 4 +- .../nok_13/A01420/func_802413CC_A019CC.s | 8 +- .../nok_14/A02A00/func_80240554_A02D94.s | 32 +- .../nok_14/A02A00/func_80241CA0_A044E0.s | 6 +- .../nok_14/A02A00/func_802421CC_A04A0C.s | 6 +- .../nok_15/A06F00/func_80240674_A07574.s | 32 +- .../nok_15/A06F00/func_80240C64_A07B64.s | 4 +- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 10 +- .../nok_15/A06F00/func_802422EC_A091EC.s | 6 +- .../obk_07/BCF0F0/func_80240564_BCF154.s | 12 +- .../obk_07/BCF0F0/func_80241130_BCFD20.s | 4 +- .../obk_07/BCF0F0/func_80241168_BCFD58.s | 8 +- .../obk_08/BD3870/func_802403DC_BD3C4C.s | 4 +- .../obk_09/BDAB00/func_80240350_BDAB00.s | 8 +- .../omo_01/D9AEF0/func_80240000_D9AEF0.s | 4 +- .../omo_01/D9B150/func_802409EC_D9B8DC.s | 26 +- .../omo_02/D9D510/func_80240BA8_D9E078.s | 26 +- .../omo_02/D9D510/func_802416D0_D9EBA0.s | 8 +- .../omo_02/D9D510/func_8024283C_D9FD0C.s | 36 +- .../omo_04/DAD400/func_80240550_DAD950.s | 4 +- .../omo_04/DAD400/func_80240FF4_DAE3F4.s | 4 +- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 6 +- .../omo_04/DAD400/func_80241AD0_DAEED0.s | 26 +- .../omo_05/DB22C0/func_80240238_DB24F8.s | 26 +- .../omo_05/DB22C0/func_80240780_DB2A40.s | 2 +- .../omo_05/DB22C0/func_80241D60_DB4020.s | 6 +- .../omo_05/DB22C0/func_80242178_DB4438.s | 4 +- .../omo_05/DB22C0/func_802421CC_DB448C.s | 4 +- .../omo_07/DBD2B0/func_80240238_DBD4E8.s | 26 +- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 8 +- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 6 +- .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 10 +- .../omo_08/DC4C40/func_80240AA8_DC4E78.s | 28 +- .../omo_09/DCD6B0/func_80240C18_DCD8E8.s | 26 +- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 8 +- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 6 +- .../omo_09/DCD6B0/func_8024324C_DCFF1C.s | 36 +- .../omo_11/DDC830/func_80240000_DDC830.s | 8 +- .../omo_11/DDC830/func_802401A0_DDC9D0.s | 12 +- .../omo_11/DDCFC0/func_8024095C_DDD18C.s | 12 +- .../omo_11/DDCFC0/func_80240D90_DDD5C0.s | 12 +- .../omo_13/DE2490/func_80240000_DE2490.s | 4 +- .../omo_13/DE2710/func_80240280_DE2710.s | 4 +- .../omo_13/DE2710/func_802404B8_DE2948.s | 30 +- .../omo_13/DE2710/func_8024083C_DE2CCC.s | 4 +- .../omo_13/DE2710/func_80240A00_DE2E90.s | 6 +- .../omo_13/DE2710/func_80240F8C_DE341C.s | 12 +- .../omo_13/DE36C0/func_80241230_DE36C0.s | 8 +- .../omo_17/DEF400/func_80240798_DEF638.s | 26 +- .../omo_17/DEF400/func_80240CE0_DEFB80.s | 2 +- .../omo_17/DEF400/func_802422C0_DF1160.s | 6 +- .../omo_17/DEF400/func_802433A0_DF2240.s | 36 +- .../osr_01/AB0350/func_80240360_AB0350.s | 8 +- .../osr_01/AB0350/func_802406A4_AB0694.s | 8 +- .../osr_01/AB0350/func_802406F8_AB06E8.s | 4 +- .../pra_01/D4D060/func_802400EC_D4D12C.s | 4 +- .../pra_01/D4D060/func_80240128_D4D168.s | 6 +- .../pra_01/D4D060/func_802402F0_D4D330.s | 2 +- .../pra_01/D4D060/func_8024049C_D4D4DC.s | 4 +- .../pra_01/D4D060/func_80240500_D4D540.s | 8 +- .../pra_01/D4D060/func_80240D3C_D4DD7C.s | 12 +- .../pra_01/D4D060/func_802411AC_D4E1EC.s | 12 +- .../pra_01/D4D060/func_80241200_D4E240.s | 8 +- .../pra_02/D50010/func_802400EC_D500DC.s | 4 +- .../pra_02/D50010/func_80240128_D50118.s | 6 +- .../pra_02/D50010/func_8024049C_D5048C.s | 4 +- .../pra_02/D50010/func_80240500_D504F0.s | 8 +- .../pra_02/D50010/func_80240D3C_D50D2C.s | 12 +- .../pra_02/D50010/func_802411D8_D511C8.s | 12 +- .../pra_04/D54840/func_802401B0_D54840.s | 12 +- .../pra_05/D55BD0/func_802400EC_D55C9C.s | 4 +- .../pra_05/D55BD0/func_80240128_D55CD8.s | 6 +- .../pra_05/D55BD0/func_8024049C_D5604C.s | 4 +- .../pra_05/D55BD0/func_80240500_D560B0.s | 8 +- .../pra_05/D55BD0/func_80240D3C_D568EC.s | 12 +- .../pra_05/D55BD0/func_80240F20_D56AD0.s | 8 +- .../pra_06/D57430/func_80240000_D57430.s | 4 +- .../pra_06/D57430/func_8024011C_D5754C.s | 4 +- .../pra_06/D57430/func_80240158_D57588.s | 6 +- .../pra_06/D57430/func_802404CC_D578FC.s | 4 +- .../pra_06/D57430/func_80240530_D57960.s | 8 +- .../pra_06/D57430/func_80240D6C_D5819C.s | 12 +- .../pra_09/D588B0/func_802400EC_D5897C.s | 4 +- .../pra_09/D588B0/func_80240128_D589B8.s | 6 +- .../pra_09/D588B0/func_8024049C_D58D2C.s | 4 +- .../pra_09/D588B0/func_80240500_D58D90.s | 8 +- .../pra_09/D588B0/func_80240D3C_D595CC.s | 12 +- .../pra_10/D5F2D0/func_802400EC_D5F39C.s | 4 +- .../pra_10/D5F2D0/func_80240128_D5F3D8.s | 6 +- .../pra_10/D5F2D0/func_8024049C_D5F74C.s | 4 +- .../pra_10/D5F2D0/func_80240500_D5F7B0.s | 8 +- .../pra_10/D5F2D0/func_80240D3C_D5FFEC.s | 12 +- .../pra_10/D5F2D0/func_80240F20_D601D0.s | 12 +- .../pra_11/D61520/func_802400EC_D615EC.s | 4 +- .../pra_11/D61520/func_80240128_D61628.s | 6 +- .../pra_11/D61520/func_8024049C_D6199C.s | 4 +- .../pra_11/D61520/func_80240500_D61A00.s | 8 +- .../pra_11/D61520/func_80240D3C_D6223C.s | 12 +- .../pra_11/D61520/func_80240F20_D62420.s | 8 +- .../pra_12/D62D10/func_8024011C_D62E2C.s | 4 +- .../pra_12/D62D10/func_80240158_D62E68.s | 6 +- .../pra_12/D62D10/func_802404CC_D631DC.s | 4 +- .../pra_12/D62D10/func_80240530_D63240.s | 8 +- .../pra_12/D62D10/func_80240D6C_D63A7C.s | 12 +- .../pra_12/D62D10/func_80240F50_D63C60.s | 8 +- .../pra_13/D64600/func_802400EC_D646CC.s | 4 +- .../pra_13/D64600/func_80240128_D64708.s | 6 +- .../pra_13/D64600/func_8024049C_D64A7C.s | 4 +- .../pra_13/D64600/func_80240500_D64AE0.s | 8 +- .../pra_13/D64600/func_80240D3C_D6531C.s | 12 +- .../pra_13/D64600/func_802413D0_D659B0.s | 4 +- .../pra_13/D64600/func_8024140C_D659EC.s | 4 +- .../pra_14/D67D20/func_802400EC_D67DEC.s | 4 +- .../pra_14/D67D20/func_80240128_D67E28.s | 6 +- .../pra_14/D67D20/func_8024049C_D6819C.s | 4 +- .../pra_14/D67D20/func_80240500_D68200.s | 8 +- .../pra_14/D67D20/func_80240D3C_D68A3C.s | 12 +- .../pra_16/D69B40/func_802400EC_D69C0C.s | 4 +- .../pra_16/D69B40/func_80240128_D69C48.s | 6 +- .../pra_16/D69B40/func_8024049C_D69FBC.s | 4 +- .../pra_16/D69B40/func_80240500_D6A020.s | 8 +- .../pra_16/D69B40/func_80240D3C_D6A85C.s | 12 +- .../pra_18/D6B640/func_802400EC_D6B70C.s | 4 +- .../pra_18/D6B640/func_80240128_D6B748.s | 6 +- .../pra_18/D6B640/func_8024049C_D6BABC.s | 4 +- .../pra_18/D6B640/func_80240500_D6BB20.s | 8 +- .../pra_18/D6B640/func_80240D3C_D6C35C.s | 12 +- .../pra_19/D6E9D0/func_802400EC_D6EA9C.s | 4 +- .../pra_19/D6E9D0/func_80240128_D6EAD8.s | 6 +- .../pra_19/D6E9D0/func_8024049C_D6EE4C.s | 4 +- .../pra_19/D6E9D0/func_80240500_D6EEB0.s | 8 +- .../pra_19/D6E9D0/func_80240D3C_D6F6EC.s | 12 +- .../pra_19/D6E9D0/func_8024114C_D6FAFC.s | 12 +- .../pra_19/D6E9D0/func_802411A0_D6FB50.s | 8 +- .../pra_19/D6E9D0/func_802414F4_D6FEA4.s | 4 +- .../pra_19/D6E9D0/func_80241530_D6FEE0.s | 4 +- .../pra_20/D763C0/func_802400EC_D7648C.s | 4 +- .../pra_20/D763C0/func_80240128_D764C8.s | 6 +- .../pra_20/D763C0/func_8024049C_D7683C.s | 4 +- .../pra_20/D763C0/func_80240500_D768A0.s | 8 +- .../pra_20/D763C0/func_80240D3C_D770DC.s | 12 +- .../pra_27/D799F0/func_8024011C_D79B0C.s | 4 +- .../pra_27/D799F0/func_80240158_D79B48.s | 6 +- .../pra_27/D799F0/func_802404CC_D79EBC.s | 4 +- .../pra_27/D799F0/func_80240530_D79F20.s | 8 +- .../pra_27/D799F0/func_80240D6C_D7A75C.s | 12 +- .../pra_27/D799F0/func_80240F50_D7A940.s | 8 +- .../pra_28/D7B2A0/func_8024011C_D7B3BC.s | 4 +- .../pra_28/D7B2A0/func_80240158_D7B3F8.s | 6 +- .../pra_28/D7B2A0/func_802404CC_D7B76C.s | 4 +- .../pra_28/D7B2A0/func_80240530_D7B7D0.s | 8 +- .../pra_28/D7B2A0/func_80240D6C_D7C00C.s | 12 +- .../pra_28/D7B2A0/func_80240F50_D7C1F0.s | 8 +- .../pra_29/D7CB70/func_802400EC_D7CC3C.s | 4 +- .../pra_29/D7CB70/func_80240128_D7CC78.s | 6 +- .../pra_29/D7CB70/func_8024049C_D7CFEC.s | 4 +- .../pra_29/D7CB70/func_80240500_D7D050.s | 8 +- .../pra_29/D7CB70/func_80240D3C_D7D88C.s | 12 +- .../pra_31/D7ED80/func_8024024C_D7EFAC.s | 12 +- .../pra_31/D7ED80/func_802402A0_D7F000.s | 8 +- .../pra_31/D7F270/func_80240510_D7F270.s | 12 +- .../pra_33/D89700/func_802400EC_D897CC.s | 4 +- .../pra_33/D89700/func_80240128_D89808.s | 6 +- .../pra_33/D89700/func_8024049C_D89B7C.s | 4 +- .../pra_33/D89700/func_80240500_D89BE0.s | 8 +- .../pra_33/D89700/func_80240D3C_D8A41C.s | 12 +- .../pra_34/D8B3D0/func_802400EC_D8B49C.s | 4 +- .../pra_34/D8B3D0/func_80240128_D8B4D8.s | 6 +- .../pra_34/D8B3D0/func_8024049C_D8B84C.s | 4 +- .../pra_34/D8B3D0/func_80240500_D8B8B0.s | 8 +- .../pra_34/D8B3D0/func_80240D3C_D8C0EC.s | 12 +- .../pra_35/D8D270/func_802400EC_D8D33C.s | 4 +- .../pra_35/D8D270/func_80240128_D8D378.s | 6 +- .../pra_35/D8D270/func_8024049C_D8D6EC.s | 4 +- .../pra_35/D8D270/func_80240500_D8D750.s | 8 +- .../pra_35/D8D270/func_80240D3C_D8DF8C.s | 12 +- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 8 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 42 +- .../pra_35/D8D270/func_80242698_D8F8E8.s | 36 +- .../pra_36/D91700/func_8024011C_D9181C.s | 4 +- .../pra_36/D91700/func_80240158_D91858.s | 6 +- .../pra_36/D91700/func_802404CC_D91BCC.s | 4 +- .../pra_36/D91700/func_80240530_D91C30.s | 8 +- .../pra_36/D91700/func_80240D6C_D9246C.s | 12 +- .../pra_37/D92F40/func_80240000_D92F40.s | 4 +- .../pra_37/D92F40/func_8024011C_D9305C.s | 4 +- .../pra_37/D92F40/func_80240158_D93098.s | 6 +- .../pra_37/D92F40/func_802404CC_D9340C.s | 4 +- .../pra_37/D92F40/func_80240530_D93470.s | 8 +- .../pra_37/D92F40/func_80240D6C_D93CAC.s | 12 +- .../pra_37/D92F40/func_8024156C_D944AC.s | 34 +- .../pra_38/D955F0/func_80240000_D955F0.s | 4 +- .../pra_38/D955F0/func_8024011C_D9570C.s | 4 +- .../pra_38/D955F0/func_80240158_D95748.s | 6 +- .../pra_38/D955F0/func_802404CC_D95ABC.s | 4 +- .../pra_38/D955F0/func_80240530_D95B20.s | 8 +- .../pra_38/D955F0/func_80240D6C_D9635C.s | 12 +- .../pra_38/D955F0/func_80240F50_D96540.s | 8 +- .../pra_39/D97890/func_80240000_D97890.s | 4 +- .../pra_39/D97890/func_8024011C_D979AC.s | 4 +- .../pra_39/D97890/func_80240158_D979E8.s | 6 +- .../pra_39/D97890/func_802404CC_D97D5C.s | 4 +- .../pra_39/D97890/func_80240530_D97DC0.s | 8 +- .../pra_39/D97890/func_80240D6C_D985FC.s | 12 +- .../pra_39/D97890/func_80240F50_D987E0.s | 4 +- .../pra_40/D999D0/func_802400EC_D99A9C.s | 4 +- .../pra_40/D999D0/func_80240128_D99AD8.s | 6 +- .../pra_40/D999D0/func_8024049C_D99E4C.s | 4 +- .../pra_40/D999D0/func_80240500_D99EB0.s | 8 +- .../pra_40/D999D0/func_80240D3C_D9A6EC.s | 12 +- .../sam_01/CF7E80/func_80240700_CF8270.s | 8 +- .../sam_01/CF7E80/func_80240A60_CF85D0.s | 4 +- .../sam_01/CF7E80/func_80240DEC_CF895C.s | 4 +- .../sam_01/CF7E80/func_80241764_CF92D4.s | 4 +- .../sam_02/D05F60/func_80240E8C_D065BC.s | 4 +- .../sam_02/D05F60/func_80241B90_D072C0.s | 4 +- .../sam_03/D110C0/func_8024066C_D1172C.s | 34 +- .../sam_04/D138E0/func_8024053C_D13B0C.s | 4 +- .../sam_04/D138E0/func_80240590_D13B60.s | 4 +- .../sam_05/D187E0/func_8024061C_D18DFC.s | 34 +- .../sam_05/D187E0/func_802419A4_D1A184.s | 4 +- .../sam_06/D203E0/func_8024185C_D216EC.s | 6 +- .../sam_06/D203E0/func_80241A48_D218D8.s | 8 +- .../sam_07/D2BD30/func_80240000_D2BD30.s | 8 +- .../sam_07/D2BD30/func_80240C6C_D2C99C.s | 34 +- .../sam_08/D2FC80/func_802401CC_D2FE4C.s | 4 +- .../sam_08/D2FC80/func_80240600_D30280.s | 12 +- .../sam_08/D309C0/func_8024135C_D30FDC.s | 34 +- .../sam_10/D37800/func_80240000_D37800.s | 8 +- .../sam_10/D37BD0/func_802405D8_D37DD8.s | 4 +- .../sam_10/D37BD0/func_802409EC_D381EC.s | 34 +- .../sam_11/D3A930/func_80240360_D3A930.s | 4 +- .../sam_11/D3ADA0/func_80240B30_D3B100.s | 4 +- .../sam_11/D3ADA0/func_80240F40_D3B510.s | 4 +- .../sam_11/D3ADA0/func_80241158_D3B728.s | 4 +- .../sam_11/D3ADA0/func_80241834_D3BE04.s | 4 +- .../sbk_30/93F5B0/func_80240370_93F920.s | 4 +- .../sbk_30/93F5B0/func_80240B64_940114.s | 8 +- .../sbk_34/945F10/func_80240384_946254.s | 8 +- .../sbk_34/945F10/func_802403D8_9462A8.s | 4 +- .../sbk_56/953FC0/func_8024024C_95420C.s | 4 +- .../tik_03/86F0F0/func_802409E0_86F4E0.s | 4 +- .../tik_07/87AC00/func_802426FC_87C2DC.s | 6 +- .../tik_09/882BF0/func_80240DC4_882F84.s | 32 +- .../tik_12/88A530/func_80241CF4_88A8C4.s | 32 +- .../tik_17/892A50/func_802401FC_892C1C.s | 4 +- .../tik_19/897BD0/func_802407BC_897D9C.s | 4 +- .../tik_19/897BD0/func_80240BF0_8981D0.s | 12 +- .../tik_20/89ACB0/func_802409DC_89AD2C.s | 4 +- .../tik_20/89ACB0/func_80240CF4_89B044.s | 38 +- .../tik_23/8A2D30/func_80240CF4_8A30C4.s | 38 +- .../tik_24/8A5DE0/func_8024074C_8A61CC.s | 4 +- .../tik_24/8A5DE0/func_80240A64_8A64E4.s | 38 +- .../trd_00/999F80/func_80240310_999F80.s | 8 +- .../trd_01/99CD80/func_80240784_99D114.s | 32 +- .../trd_01/99CD80/func_802413B8_99DD48.s | 8 +- .../trd_02/9A10C0/func_80240474_9A1454.s | 36 +- .../trd_02/9A10C0/func_80241448_9A2428.s | 12 +- .../trd_02/9A10C0/func_80241744_9A2724.s | 30 +- .../trd_03/9A46F0/func_80240434_9A4A84.s | 38 +- .../trd_04/9A88A0/func_80240844_9A8C34.s | 32 +- .../trd_04/9A88A0/func_80241818_9A9C08.s | 8 +- .../trd_04/9A88A0/func_80241B14_9A9F04.s | 26 +- .../trd_04/9A88A0/func_80243124_9AB514.s | 10 +- .../trd_04/9A88A0/func_80243650_9ABA40.s | 10 +- .../trd_05/9AE700/func_80240020_9AE720.s | 4 +- .../trd_05/9AE700/func_80240404_9AEB04.s | 12 +- .../trd_05/9AE700/func_802404D0_9AEBD0.s | 4 +- .../trd_05/9AE700/func_80240508_9AEC08.s | 4 +- .../trd_05/9AE700/func_802405FC_9AECFC.s | 4 +- .../trd_06/9B1AA0/func_80240724_9B1EB4.s | 4 +- .../trd_07/9B6C90/func_802406A4_9B7024.s | 32 +- .../trd_07/9B6C90/func_80241738_9B80B8.s | 4 +- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 6 +- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 6 +- .../trd_08/9BB5B0/func_80240904_9BBBA4.s | 4 +- .../tst_04/B1B570/func_80240260_B1B7D0.s | 4 +- .../tst_04/B1B570/func_8024029C_B1B80C.s | 4 +- .../tst_04/B1B570/func_80240510_B1BA80.s | 4 +- .../tst_04/B1B570/func_802405B0_B1BB20.s | 4 +- .../tst_04/B1B570/func_802405D4_B1BB44.s | 4 +- .../tst_04/B1B570/func_80240628_B1BB98.s | 8 +- .../tst_11/B1CA50/func_80240000_B1CA50.s | 4 +- .../tst_11/B1CA50/func_8024003C_B1CA8C.s | 4 +- .../tst_11/B1CA50/func_802402B8_B1CD08.s | 4 +- .../tst_11/B1CA50/func_802402F4_B1CD44.s | 4 +- .../tst_11/B1CA50/func_802406D4_B1D124.s | 4 +- .../tst_13/B1D760/func_8024013C_B1D89C.s | 8 +- .../world/script_api/7E0E80/MakeShop.s | 8 +- .../world/script_api/7E0E80/draw_shop_items.s | 8 +- asm/nonmatchings/world/world/func_80059F94.s | 4 +- asm/nonmatchings/world/world/func_8005A2BC.s | 12 +- asm/os/code_45df0_len_970.s | 2 + bs.py | 25 + include/variables.h | 1 - out.txt | 1325 ++++++++++++ out2.txt | 831 ++++++++ src/battle/battle.c | 76 - src/code_759b0_len_61b0.c | 4 +- src/code_80850_len_3060.c | 2 +- tools/duplicate_renames.txt | 1 + tools/splat.yaml | 14 +- tools/symbol_addrs.txt | 119 +- undefined_funcs.txt | 1 - undefined_funcs_auto.txt | 3 + undefined_syms.txt | 364 +--- undefined_syms_auto.txt | 1779 +++++------------ 1019 files changed, 8034 insertions(+), 6888 deletions(-) create mode 100644 asm/data/battle/battle.rodata.s create mode 100644 asm/nonmatchings/code_16F740/func_80246B2C.s create mode 100644 bs.py create mode 100644 out.txt create mode 100644 out2.txt create mode 100644 tools/duplicate_renames.txt diff --git a/asm/boot.s b/asm/boot.s index f1df16c865..12bd18612c 100644 --- a/asm/boot.s +++ b/asm/boot.s @@ -294,10 +294,10 @@ glabel func_A4000040 /* 460 A4000460 3C0BFFF0 */ lui $t3, 0xfff0 /* 464 A4000464 3C090010 */ lui $t1, 0x10 /* 468 A4000468 014B5024 */ and $t2, $t2, $t3 -/* 46C A400046C 3C08A400 */ lui $t0, %hi(D_A40004C0) +/* 46C A400046C 3C08A400 */ lui $t0, %hi(func_A40004C0) /* 470 A4000470 2529FFFF */ addiu $t1, $t1, -1 /* 474 A4000474 3C0BA400 */ lui $t3, %hi(D_A4000768) -/* 478 A4000478 250804C0 */ addiu $t0, $t0, %lo(D_A40004C0) +/* 478 A4000478 250804C0 */ addiu $t0, $t0, %lo(func_A40004C0) /* 47C A400047C 256B0768 */ addiu $t3, $t3, %lo(D_A4000768) /* 480 A4000480 01094024 */ and $t0, $t0, $t1 /* 484 A4000484 01695824 */ and $t3, $t3, $t1 diff --git a/asm/data/battle/battle.rodata.s b/asm/data/battle/battle.rodata.s new file mode 100644 index 0000000000..c594bc9d64 --- /dev/null +++ b/asm/data/battle/battle.rodata.s @@ -0,0 +1,21 @@ +.include "macro.inc" + +.section .rodata + +glabel D_80099E40 +.ascii "\0" + +glabel D_80099F40 +.ascii "\0" + +glabel D_8009A040 +.ascii "\0" + +glabel D_8009A140 +.word 0x00010202, 0x03030303, 0x04040404, 0x04040404, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x06060606, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x07070707, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x08080808, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825500, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825400, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825300, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825200, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825100, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825181, 0x51825000, 0x8347838A, 0x83412082, 0x63826882, 0x66000000, 0x8347838A, 0x83412082, 0x6A826A82, 0x69000000, 0x8347838A, 0x83412082, 0x6A826F82, 0x60825300, 0x8347838A, 0x83412082, 0x6A826F82, 0x60825200, 0x8347838A, 0x83412082, 0x6A826F82, 0x60825100, 0x8347838A, 0x83412082, 0x6A826F82, 0x60000000, 0x8347838A, 0x83412082, 0x6F827182, 0x60825200, 0x8347838A, 0x83412082, 0x6F827182, 0x60825100, 0x8347838A, 0x83412082, 0x6F827182, 0x60000000, 0x8347838A, 0x83412082, 0x72826082, 0x6C825100, 0x8347838A, 0x83412082, 0x72826082, 0x6C000000, 0x8347838A, 0x83412082, 0x73826882, 0x6A825200, 0x8347838A, 0x83412082, 0x73826882, 0x6A825100, 0x8347838A, 0x83412082, 0x73826882, 0x6A000000, 0x8347838A, 0x83412082, 0x65826B82, 0x6E825100, 0x8347838A, 0x83412082, 0x65826B82, 0x6E000000, 0x8347838A, 0x83412082, 0x6A827982, 0x6D825100, 0x8347838A, 0x83412082, 0x6A827982, 0x6D000000, 0x8347838A, 0x83412082, 0x69826082, 0x6D825100, 0x8347838A, 0x83412082, 0x69826082, 0x6D000000, 0x8347838A, 0x83412082, 0x6A826682, 0x71000000, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825200, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E825100, 0x8347838A, 0x83412082, 0x6E826C82, 0x6E000000, 0x8347838A, 0x83412082, 0x63826682, 0x61000000, 0x8347838A, 0x83412082, 0x60827182, 0x6D000000, 0x8347838A, 0x83412082, 0x6C826882, 0x6C000000, 0x8347838A, 0x83412082, 0x68827282, 0x6A2082BB, 0x82CC8251, 0x00000000, 0x8347838A, 0x83412082, 0x68827282, 0x6A2082BB, 0x82CC8250, 0x00000000, 0x8347838A, 0x83412082, 0x72826182, 0x6A000000, 0x8347838A, 0x83412082, 0x68827682, 0x60000000, 0x8347838A, 0x83412082, 0x73827182, 0x632082BB, 0x82CC8252, 0x00000000, 0x8347838A, 0x83412082, 0x73827182, 0x632082BB, 0x82CC8251, 0x00000000, 0x8347838A, 0x83412082, 0x73827182, 0x632082BB, 0x82CC8250, 0x00000000, 0x8347838A, 0x83412082, 0x6D826E82, 0x6A000000, 0x8347838A, 0x83412082, 0x67826E82, 0x72000000, 0x8347838A, 0x83412082, 0x6C826082, 0x62000000, 0x8347838A, 0x83412082, 0x6A826C82, 0x712082BB, 0x82CC8252, 0x00000000, 0x8347838A, 0x83412082, 0x6A826C82, 0x712082BB, 0x82CC8251, 0x00000000, 0x8347838A, 0x83412082, 0x6A826C82, 0x712082BB, 0x82CC8250, 0x00000000 + +glabel D_8009A578 +.word 0x80072F38, 0x80072F4C, 0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000 + +glabel D_8009A590 +.word 0x8007301C, 0x80073070, 0x80073094, 0x800730CC, 0x800730F8, 0x00000000, 0x00000000, 0x00000000 \ No newline at end of file diff --git a/asm/data/code_1000_len_60.data.s b/asm/data/code_1000_len_60.data.s index a6f6dff56d..07a23dbcaa 100644 --- a/asm/data/code_1000_len_60.data.s +++ b/asm/data/code_1000_len_60.data.s @@ -12,34 +12,34 @@ glabel D_80073E04 .word 0x00000000 glabel D_80073E08 -.word 0x00000000 +.short 0x0000 glabel D_80073E0A -.word 0x00000000 +.short 0x0000, 0x0000, 0x0000 glabel D_80073E10 .word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0FFFFFFF, 0x00FFFFFF, 0x000FFFFF, 0x0000FFFF, 0x00000FFF, 0x000000FF, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel D_80074010 -.ascii "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" +.word 0x00080000, 0x00000000, 0x00000000, 0x00000000 glabel D_80074020 -.ascii "" +.byte 0x01 glabel D_80074021 -.ascii "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" +.byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 glabel gGameStatusPtr .word 0x80074024 glabel D_800741A0 -.word 0x00000000 +.short 0x0000 glabel D_800741A2 -.word 0x00000000 +.short 0x0000, 0x0000, 0x0000 glabel D_800741A8 -.ascii "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" +.word 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel D_800741F0 .word 0x00000000 @@ -63,10 +63,10 @@ glabel D_80074274 .word 0x00000000, 0x3C8EF77F, 0x3D0EF241, 0x3D565E46, 0x3D8EDC3C, 0x3DB27ED8, 0x3DD612C7, 0x3DF99674, 0x3E0E835E, 0x3E20303C, 0x3E31D0C8, 0x3E43636F, 0x3E54E6E2, 0x3E66598E, 0x3E77BA67, 0x3E8483ED, 0x3E8D204B, 0x3E95B1C8, 0x3E9E377A, 0x3EA6B0D9, 0x3EAF1D3F, 0x3EB77C03, 0x3EBFCC7D, 0x3EC80DE5, 0x3ED03FD5, 0x3ED86163, 0x3EE0722A, 0x3EE87161, 0x3EF05EA2, 0x3EF83904, 0x3F000000, 0x3F03D988, 0x3F07A8C6, 0x3F0B6D76, 0x3F0F2746, 0x3F12D5E0, 0x3F167914, 0x3F1A108C, 0x3F1D9BF6, 0x3F211B1E, 0x3F248DC1, 0x3F27F37C, 0x3F2B4C2B, 0x3F2E976C, 0x3F31D51B, 0x3F3504F7, 0x3F3826AB, 0x3F3B3A04, 0x3F3E3EC0, 0x3F4134AD, 0x3F441B76, 0x3F46F30A, 0x3F49BB17, 0x3F4C7369, 0x3F4F1BBD, 0x3F51B3F2, 0x3F543BD6, 0x3F56B325, 0x3F5919AC, 0x3F5B6F4C, 0x3F5DB3D0, 0x3F5FE719, 0x3F6208E1, 0x3F641909, 0x3F66175D, 0x3F6803CD, 0x3F69DE16, 0x3F6BA637, 0x3F6D5BEE, 0x3F6EFF19, 0x3F708FB8, 0x3F720D88, 0x3F737879, 0x3F74D068, 0x3F761544, 0x3F7746ED, 0x3F786552, 0x3F797050, 0x3F7A67E8, 0x3F7B4BE8, 0x3F7C1C61, 0x3F7CD91F, 0x3F7D8234, 0x3F7E177F, 0x3F7E98FE, 0x3F7F06A3, 0x3F7F605B, 0x3F7FA637, 0x3F7FD817, 0x3F7FF60A, 0x3F800000 glabel D_800743E0 -.ascii "0123456789abcdefghijklmnopqrstuvwxyz\0\0\0\0\0\0\0\0\0\0\0\0" +.word 0x30313233, 0x34353637, 0x38396162, 0x63646566, 0x6768696A, 0x6B6C6D6E, 0x6F707172, 0x73747576, 0x7778797A, 0x00000000, 0x00000000, 0x00000000 glabel gRandSeed -.ascii "\0\0\0" +.word 0x00000001 glabel D_80074414 .word 0x3F800000, 0x3FA2F7CB, 0x3FA2F2A6, 0x3FA2EA10, 0x3FA2DE12, 0x3FA2CEAB, 0x3FA2BBDC, 0x3FA2A5AD, 0x3FA28C26, 0x3FA26F48, 0x3FA24F12, 0x3FA22B9D, 0x3FA204E2, 0x3FA1DAF0, 0x3FA1ADC9, 0x3FA17D85, 0x3FA14A23, 0x3FA113AD, 0x3FA0DA34, 0x3FA09DC7, 0x3FA05E68, 0x3FA01C26, 0x3F9FD71B, 0x3F9F8F47, 0x3F9F44BB, 0x3F9EF788, 0x3F9EA7BD, 0x3F9E5565, 0x3F9E0097, 0x3F9DA95D, 0x3F9D4FC6, 0x3F9CF3DC, 0x3F9C95C0, 0x3F9C357A, 0x3F9BD313, 0x3F9B6EAD, 0x3F9B083E, 0x3F9A9FF1, 0x3F9A35C6, 0x3F99C9CD, 0x3F995C21, 0x3F98ECD0, 0x3F987BE5, 0x3F980968, 0x3F979581, 0x3F972029, 0x3F96A97A, 0x3F963183, 0x3F95B84E, 0x3F953DEA, 0x3F94C272, 0x3F9445ED, 0x3F93C865, 0x3F9349E9, 0x3F92CA8A, 0x3F924A51, 0x3F91C958, 0x3F91479D, 0x3F90C533, 0x3F904229, 0x3F8FBE88, 0x3F8F3A60, 0x3F8EB5B3, 0x3F8E3098, 0x3F8DAB11, 0x3F8D252D, 0x3F8C9EF5, 0x3F8C1872, 0x3F8B91B4, 0x3F8B0AC4, 0x3F8A83A1, 0x3F89FC5D, 0x3F897500, 0x3F88ED91, 0x3F88661B, 0x3F87DEA4, 0x3F87572E, 0x3F86CFC8, 0x3F86487C, 0x3F85C140, 0x3F853A2E, 0x3F84B346, 0x3F842C91, 0x3F83A605, 0x3F831FBC, 0x3F8299B7, 0x3F8213F5, 0x3F818E75, 0x3F810953, 0x3F80847B, 0x3F800000 @@ -102,7 +102,7 @@ glabel D_800773D8 .word 0x8009801C, 0x80098008, 0x80097FF4, 0x80097FE8, 0x80097FDC, 0x80097FC8 glabel D_800773F0 -.ascii "\0\0\0" +.word 0x00000001 glabel D_800773F4 .word 0x00000000 @@ -123,19 +123,19 @@ glabel D_80077850 .word 0x800776E8, 0x800776FC, 0x80077710, 0x80077724, 0x80077774, 0x80077738, 0x8007774C, 0x80077760, 0x80077788, 0x8007779C, 0x800777B0, 0x800777C4, 0x800777D8, 0x800777EC, 0x80077800, 0x80077814, 0x80077828, 0x8007783C, 0x00000000, 0x00000000 glabel D_800778A0 -.word 0x8038F800, 0x803B5000, D_803DA800, 0x00000000, 0xFFFFFF00, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00200000, 0xE3000C00, 0x00000000, 0xE3001001, 0x00000000, 0xFCFFFFFF, 0xFFFCF87C, 0xE200001C, 0x00000000, 0xE3001201, 0x00000000, 0xDF000000, 0x00000000 +.word 0x8038F800, 0x803B5000, 0x803DA800, 0x00000000, 0xFFFFFF00, 0xFFFFFF00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00200000, 0xE3000C00, 0x00000000, 0xE3001001, 0x00000000, 0xFCFFFFFF, 0xFFFCF87C, 0xE200001C, 0x00000000, 0xE3001201, 0x00000000, 0xDF000000, 0x00000000 glabel D_80077908 .word 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE3000C00, 0x00000000, 0xE3001001, 0x00000000, 0xFCFFFFFF, 0xFFFCF87C, 0xE200001C, 0x0F0A4000, 0xE3001201, 0x00000000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 glabel D_80077950 -.word 0x8038F800, 0x803B5000, D_803DA800 +.word 0x8038F800, 0x803B5000, 0x803DA800 glabel D_8007795C .word 0x00135EE0, 0x00163400, pause_set_cursor_opacity, pause_set_cursor_opacity, gPauseMenuIconScripts, gPauseMenuIconScripts, gPauseMenuHeldButtons, gPauseMenuHeldButtons, 0x80278640 glabel D_80077980 -.word 0x8038F800, 0x803B5000, D_803DA800 +.word 0x8038F800, 0x803B5000, 0x803DA800 glabel D_8007798C .word 0x00163400, 0x0016C8E0, pause_set_cursor_opacity, pause_set_cursor_opacity, 0x80249B80, 0x80249B80, 0x8024C080, 0x8024C080, 0x8024C120 @@ -255,4 +255,4 @@ glabel D_80078164 .word 0x0000FFFE glabel D_80078168 -.word 0x001D0074, 0x001D0075 +.word 0x001D0074, 0x001D0075 \ No newline at end of file diff --git a/asm/data/code_26840_len_20d0.data.s b/asm/data/code_26840_len_20d0.data.s index 6787bc9375..9efca3a701 100644 --- a/asm/data/code_26840_len_20d0.data.s +++ b/asm/data/code_26840_len_20d0.data.s @@ -66,4 +66,4 @@ glabel D_800785A0 .word 0x0393756C, 0x034736DE, 0x02FAE1DA, 0x02AEA34C, 0x02624E48, 0x0215F944, 0x01C9BAB6, 0x01A39034, 0x017D65B2, 0x015751A6, 0x01312724, 0x0121E2F0, 0x01129EBC, 0x01035A88, 0x00F41654, 0x00E4D220, 0x00D58DEC, 0x00C649B8, 0x00B70584, 0x00A7D7C6, 0x00989392, 0x00894F5E, 0x007A0B2A, 0x006AC6F6, 0x005B82C2, 0x004C3E8E, 0x00449C74, 0x003CFA5A, 0x00355840, 0x002DB626, 0x0029F054, 0x0026140C, 0x00224E3A, 0x001E71F2, 0x001CF41C, 0x001B7646, 0x0019E1FA, 0x00186424, 0x0016CFD8, 0x00155202, 0x0013D42C, 0x00123FE0, 0x0010C20A, 0x000F2DBE, 0x000E7A0E, 0x000DAFE8, 0x000CE5C2, 0x000C3212, 0x000B67EC, 0x000A9DC6, 0x0009EA16, 0x00091FF0, 0x000855CA, 0x00078BA4, 0x0006D7F4, 0x00060DCE, 0x0005B3F6, 0x000543A8, 0x0004E9D0, 0x00048FF8, 0x0004630C, 0x00043620, 0x00040934, 0x0003F2BE, 0x0003C5D2, 0x000398E6, 0x00038270, 0x00035584, 0x00032898, 0x0002FBAC, 0x0002E536, 0x0002B84A, 0x00028B5E, 0x00025E72, 0x000247FC, 0x00021B10, 0x0001EE24, 0x0001C138, 0x0001AAC2, 0x00017DD6, 0x00016760, 0x00013A74, 0x00010D88, 0x0000F712, 0x0000E09C, 0x0000CA26, 0x0000B3B0, 0x00009D3A, 0x000086C4, 0x0000704E, 0x000059D8, 0x00004362, 0x00002CEC, 0x00001676, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel D_80078730 -.word 0x3F800000, 0x3F8012EF, 0x3F8025E1, 0x3F8038D6, 0x3F804BCD, 0x3F805EC7, 0x3F8071C4, 0x3F8084C4, 0x3F8097C7, 0x3F80AACC, 0x3F80BDD4, 0x3F80D0DF, 0x3F80E3ED, 0x3F80F6FE, 0x3F810A12, 0x3F811D28, 0x3F813041, 0x3F81435D, 0x3F81567C, 0x3F81699E, 0x3F817CC2, 0x3F818FE9, 0x3F81A313, 0x3F81B640, 0x3F81C970, 0x3F81DCA3, 0x3F81EFD9, 0x3F820311, 0x3F82164C, 0x3F82298A, 0x3F823CCB, 0x3F82500F, 0x3F826356, 0x3F82769F, 0x3F8289EB, 0x3F829D3A, 0x3F82B08C, 0x3F82C3E1, 0x3F82D739, 0x3F82EA94, 0x3F82FDF1, 0x3F831151, 0x3F8324B4, 0x3F83381A, 0x3F834B83, 0x3F835EEF, 0x3F83725E, 0x3F8385D0, 0x3F839944, 0x3F83ACBB, 0x3F83C035, 0x3F83D3B2, 0x3F83E732, 0x3F83FAB5, 0x3F840E3B, 0x3F8421C4, 0x3F84354F, 0x3F8448DD, 0x3F845C6E, 0x3F847002, 0x3F848399, 0x3F849733, 0x3F84AAD0, 0x3F84BE70, 0x3F84D213, 0x3F84E5B9, 0x3F84F961, 0x3F850D0C, 0x3F8520BA, 0x3F85346B, 0x3F85481F, 0x3F855BD6, 0x3F856F90, 0x3F85834D, 0x3F85970D, 0x3F85AAD0, 0x3F85BE96, 0x3F85D25F, 0x3F85E62A, 0x3F85F9F8, 0x3F860DC9, 0x3F86219D, 0x3F863574, 0x3F86494E, 0x3F865D2B, 0x3F86710B, 0x3F8684EE, 0x3F8698D4, 0x3F86ACBD, 0x3F86C0A9, 0x3F86D498, 0x3F86E88A, 0x3F86FC7F, 0x3F871077, 0x3F872472, 0x3F87386F, 0x3F874C6F, 0x3F876072, 0x3F877478, 0x3F878881, 0x3F879C8D, 0x3F87B09C, 0x3F87C4AE, 0x3F87D8C3, 0x3F87ECDB, 0x3F8800F6, 0x3F881514, 0x3F882935, 0x3F883D59, 0x3F885180, 0x3F8865AA, 0x3F8879D7, 0x3F888E07, 0x3F88A23A, 0x3F88B670, 0x3F88CAA9, 0x3F88DEE5, 0x3F88F324, 0x3F890766, 0x3F891BAB, 0x3F892FF3, 0x3F89443E, 0x3F89588C, 0x3F896CDD, 0x3F898131, 0x3F899588, 0x3F89A9E2, 0x3F89BE3F, 0x3F800000, 0x3F89D29F, 0x3F946637, 0x3F9FC997, 0x3FAC0CB1, 0x3FB940B0, 0x3FC77811, 0x3FD6C6BB, 0x3FE7421D, 0x3FF9014B, 0x40060E8F, 0x4010582B, 0x401B6BE2, 0x40275936, 0x403430DA, 0x404204C9, 0x4050E860, 0x4060F077, 0x40723381, 0x408264D5, 0x408C667B, 0x40972CB6, 0x40A2C69C, 0x40AF446B, 0x40BCB7A0, 0x40CB3311, 0x40DACB04, 0x40EB954F, 0x40FDA974, 0x41089062, 0x41130B3F, 0x411E53FF, 0x3F800000, 0x3F7FDA28, 0x3F7FB456, 0x3F7F8E89, 0x3F7F68C2, 0x3F7F4300, 0x3F7F1D44, 0x3F7EF78E, 0x3F7ED1DD, 0x3F7EAC32, 0x3F7E868C, 0x3F7E60EC, 0x3F7E3B51, 0x3F7E15BC, 0x3F7DF02C, 0x3F7DCAA2, 0x3F7DA51E, 0x3F7D7F9F, 0x3F7D5A26, 0x3F7D34B2, 0x3F7D0F44, 0x3F7CE9DB, 0x3F7CC478, 0x3F7C9F1A, 0x3F7C79C2, 0x3F7C546F, 0x3F7C2F22, 0x3F7C09DA, 0x3F7BE498, 0x3F7BBF5B, 0x3F7B9A24, 0x3F7B74F2, 0x3F7B4FC6, 0x3F7B2A9F, 0x3F7B057E, 0x3F7AE062, 0x3F7ABB4C, 0x3F7A963B, 0x3F7A7130, 0x3F7A4C2A, 0x3F7A272A, 0x3F7A022F, 0x3F79DD3A, 0x3F79B84A, 0x3F799360, 0x3F796E7B, 0x3F79499C, 0x3F7924C2, 0x3F78FFED, 0x3F78DB1E, 0x3F78B654, 0x3F789190, 0x3F786CD1, 0x3F784818, 0x3F782364, 0x3F77FEB6, 0x3F77DA0D, 0x3F77B569, 0x3F7790CB, 0x3F776C32, 0x3F77479F, 0x3F772311, 0x3F76FE88, 0x3F76DA05, 0x3F76B587, 0x3F76910F, 0x3F766C9C, 0x3F76482E, 0x3F7623C6, 0x3F75FF63, 0x3F75DB06, 0x3F75B6AE, 0x3F75925B, 0x3F756E0E, 0x3F7549C6, 0x3F752583, 0x3F750146, 0x3F74DD0E, 0x3F74B8DB, 0x3F7494AE, 0x3F747086, 0x3F744C63, 0x3F742846, 0x3F74042E, 0x3F73E01C, 0x3F73BC0F, 0x3F739807, 0x3F737404, 0x3F735007, 0x3F732C0F, 0x3F73081C, 0x3F72E42F, 0x3F72C047, 0x3F729C64, 0x3F727887, 0x3F7254AF, 0x3F7230DC, 0x3F720D0F, 0x3F71E947, 0x3F71C584, 0x3F71A1C6, 0x3F717E0E, 0x3F715A5B, 0x3F7136AD, 0x3F711305, 0x3F70EF62, 0x3F70CBC4, 0x3F70A82B, 0x3F708498, 0x3F70610A, 0x3F703D81, 0x3F7019FD, 0x3F6FF67F, 0x3F6FD306, 0x3F6FAF92, 0x3F6F8C23, 0x3F6F68BA, 0x3F6F4556, 0x3F6F21F7, 0x3F6EFE9D, 0x3F6EDB49, 0x3F6EB7FA, 0x3F6E94B0, 0x3F6E716B, 0x3F6E4E2B, 0x3F6E2AF1, 0x3F6E07BC, 0x3F6DE48C, 0x3F800000, 0x3F6DC161, 0x3F5CCFA0, 0x3F4D1303, 0x3F3E7583, 0x3F30E2A9, 0x3F244774, 0x3F18923F, 0x3F0DB2A4, 0x3F03996B, 0x3EF470E1, 0x3EE30526, 0x3ED2D741, 0x3EC3D08B, 0x3EB5DBFB, 0x3EA8E607, 0x3E9CDC8A, 0x3E91AEA9, 0x3E874CBE, 0x3E7B5080, 0x3E69675D, 0x3E58C500, 0x3E495220, 0x3E3AF91B, 0x3E2DA5DB, 0x3E2145B8, 0x3E15C75E, 0x3E0B1AB6, 0x3E0130CE, 0x3DEFF78B, 0x3DDEDD71, 0x3DCEFB5A, 0x3DC03B0C, 0x3DB287E0, 0x3DA5CEA6, 0x3D99FD90, 0x3D8F0410, 0x3D84D2CB, 0x3D76B6F6, 0x3D6521C0, 0x3D54CD52, 0x3D45A2D5, 0x3D378D0A, 0x3D2A7839, 0x3D1E5213, 0x3D130992, 0x3D088EF0, 0x3CFDA6F5, 0x3CEB932C, 0x3CDAC934, 0x3CCB318C, 0x3CBCB65A, 0x3CAF435F, 0x3CA2C5C3, 0x3C972C06, 0x3C8C65F5, 0x3C826474, 0x3C7232F8, 0x3C60F025, 0x3C50E83A, 0x3C4204D2, 0x3C3430FF, 0x3C275980, 0x3C1B6C42, 0x3C10589D, 0x3C060F18, 0x3BF90275, 0x3BE7435B, 0x3BD6C80E, 0x3BC7797C, 0x3BB9422B, 0x3BAC0E26, 0x3B9FCB0C, 0x3B9467C1, 0x3B89D42A, 0x3B800183, 0x3B6DC413, 0x3B5CD229, 0x3B4D1572, 0x3B3E77CA, 0x3B30E4BA, 0x3B24494B, 0x3B18940B, 0x3B0DB45E, 0x3B039B00, 0x3AF473B0, 0x3AE307F8, 0x3AD2D9AC, 0x3AC3D2FE, 0x3AB5DE1E, 0x3AA8E7EB, 0x3A9CDE48, 0x3A91B06C, 0x3A874E3D, 0x3A7B5348, 0x3A696A67, 0x3A58C7AD, 0x3A495447, 0x3A3AFB69, 0x3A2DA799, 0x3A214763, 0x3A15C955, 0x3A0B1CA9, 0x3A01329B, 0x39EFFA23, 0x39DEDFF5, 0x39CEFD29, 0x39C03D9D, 0x39B28A81, 0x39A5D10A, 0x3999FFC6, 0x398F0541, 0x3984D410, 0x3976BADD, 0x39652533, 0x3954CEFA, 0x3945A566, 0x39379050, 0x392A7A3D, 0x391E5312, 0x39130AB4, 0x39089109, 0x38FDABE8, 0x38EB9814, 0x38DACBBE, 0x38CB316C, 0x38BCB903, 0x38AF47AC +.word 0x3F800000, 0x3F8012EF, 0x3F8025E1, 0x3F8038D6, 0x3F804BCD, 0x3F805EC7, 0x3F8071C4, 0x3F8084C4, 0x3F8097C7, 0x3F80AACC, 0x3F80BDD4, 0x3F80D0DF, 0x3F80E3ED, 0x3F80F6FE, 0x3F810A12, 0x3F811D28, 0x3F813041, 0x3F81435D, 0x3F81567C, 0x3F81699E, 0x3F817CC2, 0x3F818FE9, 0x3F81A313, 0x3F81B640, 0x3F81C970, 0x3F81DCA3, 0x3F81EFD9, 0x3F820311, 0x3F82164C, 0x3F82298A, 0x3F823CCB, 0x3F82500F, 0x3F826356, 0x3F82769F, 0x3F8289EB, 0x3F829D3A, 0x3F82B08C, 0x3F82C3E1, 0x3F82D739, 0x3F82EA94, 0x3F82FDF1, 0x3F831151, 0x3F8324B4, 0x3F83381A, 0x3F834B83, 0x3F835EEF, 0x3F83725E, 0x3F8385D0, 0x3F839944, 0x3F83ACBB, 0x3F83C035, 0x3F83D3B2, 0x3F83E732, 0x3F83FAB5, 0x3F840E3B, 0x3F8421C4, 0x3F84354F, 0x3F8448DD, 0x3F845C6E, 0x3F847002, 0x3F848399, 0x3F849733, 0x3F84AAD0, 0x3F84BE70, 0x3F84D213, 0x3F84E5B9, 0x3F84F961, 0x3F850D0C, 0x3F8520BA, 0x3F85346B, 0x3F85481F, 0x3F855BD6, 0x3F856F90, 0x3F85834D, 0x3F85970D, 0x3F85AAD0, 0x3F85BE96, 0x3F85D25F, 0x3F85E62A, 0x3F85F9F8, 0x3F860DC9, 0x3F86219D, 0x3F863574, 0x3F86494E, 0x3F865D2B, 0x3F86710B, 0x3F8684EE, 0x3F8698D4, 0x3F86ACBD, 0x3F86C0A9, 0x3F86D498, 0x3F86E88A, 0x3F86FC7F, 0x3F871077, 0x3F872472, 0x3F87386F, 0x3F874C6F, 0x3F876072, 0x3F877478, 0x3F878881, 0x3F879C8D, 0x3F87B09C, 0x3F87C4AE, 0x3F87D8C3, 0x3F87ECDB, 0x3F8800F6, 0x3F881514, 0x3F882935, 0x3F883D59, 0x3F885180, 0x3F8865AA, 0x3F8879D7, 0x3F888E07, 0x3F88A23A, 0x3F88B670, 0x3F88CAA9, 0x3F88DEE5, 0x3F88F324, 0x3F890766, 0x3F891BAB, 0x3F892FF3, 0x3F89443E, 0x3F89588C, 0x3F896CDD, 0x3F898131, 0x3F899588, 0x3F89A9E2, 0x3F89BE3F, 0x3F800000, 0x3F89D29F, 0x3F946637, 0x3F9FC997, 0x3FAC0CB1, 0x3FB940B0, 0x3FC77811, 0x3FD6C6BB, 0x3FE7421D, 0x3FF9014B, 0x40060E8F, 0x4010582B, 0x401B6BE2, 0x40275936, 0x403430DA, 0x404204C9, 0x4050E860, 0x4060F077, 0x40723381, 0x408264D5, 0x408C667B, 0x40972CB6, 0x40A2C69C, 0x40AF446B, 0x40BCB7A0, 0x40CB3311, 0x40DACB04, 0x40EB954F, 0x40FDA974, 0x41089062, 0x41130B3F, 0x411E53FF, 0x3F800000, 0x3F7FDA28, 0x3F7FB456, 0x3F7F8E89, 0x3F7F68C2, 0x3F7F4300, 0x3F7F1D44, 0x3F7EF78E, 0x3F7ED1DD, 0x3F7EAC32, 0x3F7E868C, 0x3F7E60EC, 0x3F7E3B51, 0x3F7E15BC, 0x3F7DF02C, 0x3F7DCAA2, 0x3F7DA51E, 0x3F7D7F9F, 0x3F7D5A26, 0x3F7D34B2, 0x3F7D0F44, 0x3F7CE9DB, 0x3F7CC478, 0x3F7C9F1A, 0x3F7C79C2, 0x3F7C546F, 0x3F7C2F22, 0x3F7C09DA, 0x3F7BE498, 0x3F7BBF5B, 0x3F7B9A24, 0x3F7B74F2, 0x3F7B4FC6, 0x3F7B2A9F, 0x3F7B057E, 0x3F7AE062, 0x3F7ABB4C, 0x3F7A963B, 0x3F7A7130, 0x3F7A4C2A, 0x3F7A272A, 0x3F7A022F, 0x3F79DD3A, 0x3F79B84A, 0x3F799360, 0x3F796E7B, 0x3F79499C, 0x3F7924C2, 0x3F78FFED, 0x3F78DB1E, 0x3F78B654, 0x3F789190, 0x3F786CD1, 0x3F784818, 0x3F782364, 0x3F77FEB6, 0x3F77DA0D, 0x3F77B569, 0x3F7790CB, 0x3F776C32, 0x3F77479F, 0x3F772311, 0x3F76FE88, 0x3F76DA05, 0x3F76B587, 0x3F76910F, 0x3F766C9C, 0x3F76482E, 0x3F7623C6, 0x3F75FF63, 0x3F75DB06, 0x3F75B6AE, 0x3F75925B, 0x3F756E0E, 0x3F7549C6, 0x3F752583, 0x3F750146, 0x3F74DD0E, 0x3F74B8DB, 0x3F7494AE, 0x3F747086, 0x3F744C63, 0x3F742846, 0x3F74042E, 0x3F73E01C, 0x3F73BC0F, 0x3F739807, 0x3F737404, 0x3F735007, 0x3F732C0F, 0x3F73081C, 0x3F72E42F, 0x3F72C047, 0x3F729C64, 0x3F727887, 0x3F7254AF, 0x3F7230DC, 0x3F720D0F, 0x3F71E947, 0x3F71C584, 0x3F71A1C6, 0x3F717E0E, 0x3F715A5B, 0x3F7136AD, 0x3F711305, 0x3F70EF62, 0x3F70CBC4, 0x3F70A82B, 0x3F708498, 0x3F70610A, 0x3F703D81, 0x3F7019FD, 0x3F6FF67F, 0x3F6FD306, 0x3F6FAF92, 0x3F6F8C23, 0x3F6F68BA, 0x3F6F4556, 0x3F6F21F7, 0x3F6EFE9D, 0x3F6EDB49, 0x3F6EB7FA, 0x3F6E94B0, 0x3F6E716B, 0x3F6E4E2B, 0x3F6E2AF1, 0x3F6E07BC, 0x3F6DE48C, 0x3F800000, 0x3F6DC161, 0x3F5CCFA0, 0x3F4D1303, 0x3F3E7583, 0x3F30E2A9, 0x3F244774, 0x3F18923F, 0x3F0DB2A4, 0x3F03996B, 0x3EF470E1, 0x3EE30526, 0x3ED2D741, 0x3EC3D08B, 0x3EB5DBFB, 0x3EA8E607, 0x3E9CDC8A, 0x3E91AEA9, 0x3E874CBE, 0x3E7B5080, 0x3E69675D, 0x3E58C500, 0x3E495220, 0x3E3AF91B, 0x3E2DA5DB, 0x3E2145B8, 0x3E15C75E, 0x3E0B1AB6, 0x3E0130CE, 0x3DEFF78B, 0x3DDEDD71, 0x3DCEFB5A, 0x3DC03B0C, 0x3DB287E0, 0x3DA5CEA6, 0x3D99FD90, 0x3D8F0410, 0x3D84D2CB, 0x3D76B6F6, 0x3D6521C0, 0x3D54CD52, 0x3D45A2D5, 0x3D378D0A, 0x3D2A7839, 0x3D1E5213, 0x3D130992, 0x3D088EF0, 0x3CFDA6F5, 0x3CEB932C, 0x3CDAC934, 0x3CCB318C, 0x3CBCB65A, 0x3CAF435F, 0x3CA2C5C3, 0x3C972C06, 0x3C8C65F5, 0x3C826474, 0x3C7232F8, 0x3C60F025, 0x3C50E83A, 0x3C4204D2, 0x3C3430FF, 0x3C275980, 0x3C1B6C42, 0x3C10589D, 0x3C060F18, 0x3BF90275, 0x3BE7435B, 0x3BD6C80E, 0x3BC7797C, 0x3BB9422B, 0x3BAC0E26, 0x3B9FCB0C, 0x3B9467C1, 0x3B89D42A, 0x3B800183, 0x3B6DC413, 0x3B5CD229, 0x3B4D1572, 0x3B3E77CA, 0x3B30E4BA, 0x3B24494B, 0x3B18940B, 0x3B0DB45E, 0x3B039B00, 0x3AF473B0, 0x3AE307F8, 0x3AD2D9AC, 0x3AC3D2FE, 0x3AB5DE1E, 0x3AA8E7EB, 0x3A9CDE48, 0x3A91B06C, 0x3A874E3D, 0x3A7B5348, 0x3A696A67, 0x3A58C7AD, 0x3A495447, 0x3A3AFB69, 0x3A2DA799, 0x3A214763, 0x3A15C955, 0x3A0B1CA9, 0x3A01329B, 0x39EFFA23, 0x39DEDFF5, 0x39CEFD29, 0x39C03D9D, 0x39B28A81, 0x39A5D10A, 0x3999FFC6, 0x398F0541, 0x3984D410, 0x3976BADD, 0x39652533, 0x3954CEFA, 0x3945A566, 0x39379050, 0x392A7A3D, 0x391E5312, 0x39130AB4, 0x39089109, 0x38FDABE8, 0x38EB9814, 0x38DACBBE, 0x38CB316C, 0x38BCB903, 0x38AF47AC \ No newline at end of file diff --git a/asm/data/code_31650.data.s b/asm/data/code_31650.data.s index fbee982a2c..16a7c2467a 100644 --- a/asm/data/code_31650.data.s +++ b/asm/data/code_31650.data.s @@ -450,4 +450,4 @@ glabel D_8008FF70 .word 0x00040006, 0x00050004, 0x00070006, 0x00000003, 0x00040003, 0x00070004, 0x00030002, 0x00070002, 0x00060007, 0x00020001, 0x00060001, 0x00050006, 0x00010000, 0x00050000, 0x00040005, 0x00000001, 0x00020000, 0x00020003 glabel D_8008FFB8 -.word 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0xBF800000, 0xBF800000, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0xBF800000, 0xBF800000, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x00000000 \ No newline at end of file diff --git a/asm/data/code_a5dd0_len_114e0.data.s b/asm/data/code_a5dd0_len_114e0.data.s index cfe8a12bac..aca64c9c4f 100644 --- a/asm/data/code_a5dd0_len_114e0.data.s +++ b/asm/data/code_a5dd0_len_114e0.data.s @@ -261,4 +261,4 @@ glabel D_8014ED98 .word 0x00800080, 0x01FF0000, 0x00800080, 0x01FF0000, 0xFFF0FFF0, 0x00000000, 0x00000000, 0x000000FF, 0x0010FFF0, 0x00000000, 0x10000000, 0x000000FF, 0x00100010, 0x00000000, 0x10001000, 0x000000FF, 0xFFF00010, 0x00000000, 0x00001000, 0x000000FF glabel D_8014EDE8 -.word 0x01004008, 0x8014EDA8, 0x06000204, 0x00000406, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x01004008, 0x8014EDA8, 0x06000204, 0x00000406, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 \ No newline at end of file diff --git a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s index b96421f8db..90c7cb4a02 100644 --- a/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s +++ b/asm/nonmatchings/battle/area_isk_part_1/4E29B0/func_802184CC_4E2C0C.s @@ -82,13 +82,13 @@ glabel func_802184CC_4E2C0C /* 4E2D28 802185E8 46000007 */ neg.s $f0, $f0 /* 4E2D2C 802185EC 46000000 */ add.s $f0, $f0, $f0 /* 4E2D30 802185F0 4600103C */ c.lt.s $f2, $f0 -/* 4E2D34 802185F4 00000000 */ nop +/* 4E2D34 802185F4 00000000 */ nop /* 4E2D38 802185F8 4500000D */ bc1f .L80218630 /* 4E2D3C 802185FC E6020014 */ swc1 $f2, 0x14($s0) /* 4E2D40 80218600 E6000014 */ swc1 $f0, 0x14($s0) /* 4E2D44 80218604 8E2200A8 */ lw $v0, 0xa8($s1) /* 4E2D48 80218608 10400009 */ beqz $v0, .L80218630 -/* 4E2D4C 8021860C 00000000 */ nop +/* 4E2D4C 8021860C 00000000 */ nop /* 4E2D50 80218610 16600007 */ bnez $s3, .L80218630 /* 4E2D54 80218614 24042063 */ addiu $a0, $zero, 0x2063 /* 4E2D58 80218618 C620014C */ lwc1 $f0, 0x14c($s1) @@ -108,9 +108,9 @@ glabel func_802184CC_4E2C0C /* 4E2D8C 8021864C 3C014004 */ lui $at, 0x4004 /* 4E2D90 80218650 44811800 */ mtc1 $at, $f3 /* 4E2D94 80218654 44801000 */ mtc1 $zero, $f2 -/* 4E2D98 80218658 00000000 */ nop +/* 4E2D98 80218658 00000000 */ nop /* 4E2D9C 8021865C 4622003C */ c.lt.d $f0, $f2 -/* 4E2DA0 80218660 00000000 */ nop +/* 4E2DA0 80218660 00000000 */ nop /* 4E2DA4 80218664 45000012 */ bc1f .L802186B0 /* 4E2DA8 80218668 4600A306 */ mov.s $f12, $f20 /* 4E2DAC 8021866C 3C014020 */ lui $at, 0x4020 @@ -121,9 +121,9 @@ glabel func_802184CC_4E2C0C /* 4E2DBC 8021867C 3C014014 */ lui $at, 0x4014 /* 4E2DC0 80218680 44811800 */ mtc1 $at, $f3 /* 4E2DC4 80218684 44801000 */ mtc1 $zero, $f2 -/* 4E2DC8 80218688 00000000 */ nop +/* 4E2DC8 80218688 00000000 */ nop /* 4E2DCC 8021868C 4622003C */ c.lt.d $f0, $f2 -/* 4E2DD0 80218690 00000000 */ nop +/* 4E2DD0 80218690 00000000 */ nop /* 4E2DD4 80218694 45000006 */ bc1f .L802186B0 /* 4E2DD8 80218698 4600A306 */ mov.s $f12, $f20 /* 4E2DDC 8021869C 3C0140A0 */ lui $at, 0x40a0 @@ -145,7 +145,7 @@ glabel func_802184CC_4E2C0C /* 4E2E14 802186D4 46000506 */ mov.s $f20, $f0 /* 4E2E18 802186D8 C6020028 */ lwc1 $f2, 0x28($s0) /* 4E2E1C 802186DC 4614103E */ c.le.s $f2, $f20 -/* 4E2E20 802186E0 00000000 */ nop +/* 4E2E20 802186E0 00000000 */ nop /* 4E2E24 802186E4 45000012 */ bc1f .L80218730 /* 4E2E28 802186E8 46000586 */ mov.s $f22, $f0 /* 4E2E2C 802186EC 4602A081 */ sub.s $f2, $f20, $f2 @@ -159,7 +159,7 @@ glabel func_802184CC_4E2C0C /* 4E2E4C 8021870C 44801000 */ mtc1 $zero, $f2 /* 4E2E50 80218710 46000021 */ cvt.d.s $f0, $f0 /* 4E2E54 80218714 46220002 */ mul.d $f0, $f0, $f2 -/* 4E2E58 80218718 00000000 */ nop +/* 4E2E58 80218718 00000000 */ nop /* 4E2E5C 8021871C C6020014 */ lwc1 $f2, 0x14($s0) /* 4E2E60 80218720 460010A1 */ cvt.d.s $f2, $f2 /* 4E2E64 80218724 46201080 */ add.d $f2, $f2, $f0 @@ -168,14 +168,14 @@ glabel func_802184CC_4E2C0C .L80218730: /* 4E2E70 80218730 C6000024 */ lwc1 $f0, 0x24($s0) /* 4E2E74 80218734 4614003E */ c.le.s $f0, $f20 -/* 4E2E78 80218738 00000000 */ nop +/* 4E2E78 80218738 00000000 */ nop /* 4E2E7C 8021873C 4500000F */ bc1f .L8021877C -/* 4E2E80 80218740 00000000 */ nop +/* 4E2E80 80218740 00000000 */ nop /* 4E2E84 80218744 C6000020 */ lwc1 $f0, 0x20($s0) /* 4E2E88 80218748 4614003E */ c.le.s $f0, $f20 -/* 4E2E8C 8021874C 00000000 */ nop +/* 4E2E8C 8021874C 00000000 */ nop /* 4E2E90 80218750 45000003 */ bc1f .L80218760 -/* 4E2E94 80218754 00000000 */ nop +/* 4E2E94 80218754 00000000 */ nop /* 4E2E98 80218758 080861DC */ j .L80218770 /* 4E2E9C 8021875C 4600A001 */ sub.s $f0, $f20, $f0 .L80218760: @@ -186,14 +186,14 @@ glabel func_802184CC_4E2C0C .L80218770: /* 4E2EB0 80218770 44050000 */ mfc1 $a1, $f0 /* 4E2EB4 80218774 080861F2 */ j .L802187C8 -/* 4E2EB8 80218778 00000000 */ nop +/* 4E2EB8 80218778 00000000 */ nop .L8021877C: /* 4E2EBC 8021877C C602001C */ lwc1 $f2, 0x1c($s0) /* 4E2EC0 80218780 3C018022 */ lui $at, %hi(D_80224920) /* 4E2EC4 80218784 D4204920 */ ldc1 $f0, %lo(D_80224920)($at) /* 4E2EC8 80218788 460010A1 */ cvt.d.s $f2, $f2 /* 4E2ECC 8021878C 46201082 */ mul.d $f2, $f2, $f0 -/* 4E2ED0 80218790 00000000 */ nop +/* 4E2ED0 80218790 00000000 */ nop /* 4E2ED4 80218794 C6000018 */ lwc1 $f0, 0x18($s0) /* 4E2ED8 80218798 46000021 */ cvt.d.s $f0, $f0 /* 4E2EDC 8021879C 46220001 */ sub.d $f0, $f0, $f2 @@ -202,7 +202,7 @@ glabel func_802184CC_4E2C0C /* 4E2EE8 802187A8 46200020 */ cvt.s.d $f0, $f0 /* 4E2EEC 802187AC 460000A1 */ cvt.d.s $f2, $f0 /* 4E2EF0 802187B0 4624103C */ c.lt.d $f2, $f4 -/* 4E2EF4 802187B4 00000000 */ nop +/* 4E2EF4 802187B4 00000000 */ nop /* 4E2EF8 802187B8 45000002 */ bc1f .L802187C4 /* 4E2EFC 802187BC E6000018 */ swc1 $f0, 0x18($s0) /* 4E2F00 802187C0 AE000018 */ sw $zero, 0x18($s0) @@ -218,12 +218,12 @@ glabel func_802184CC_4E2C0C /* 4E2F20 802187E0 44801000 */ mtc1 $zero, $f2 /* 4E2F24 802187E4 46000021 */ cvt.d.s $f0, $f0 /* 4E2F28 802187E8 4620103C */ c.lt.d $f2, $f0 -/* 4E2F2C 802187EC 00000000 */ nop +/* 4E2F2C 802187EC 00000000 */ nop /* 4E2F30 802187F0 45000005 */ bc1f .L80218808 /* 4E2F34 802187F4 0220202D */ daddu $a0, $s1, $zero /* 4E2F38 802187F8 3C014080 */ lui $at, 0x4080 /* 4E2F3C 802187FC 44810000 */ mtc1 $at, $f0 -/* 4E2F40 80218800 00000000 */ nop +/* 4E2F40 80218800 00000000 */ nop /* 4E2F44 80218804 E6000018 */ swc1 $f0, 0x18($s0) .L80218808: /* 4E2F48 80218808 0C099117 */ jal get_actor_part diff --git a/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s b/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s index 8e2f1b475b..17ff38800e 100644 --- a/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s +++ b/asm/nonmatchings/battle/area_kmr_part_1/431660/func_80218CC0_431660.s @@ -21,7 +21,7 @@ glabel func_80218CC0_431660 /* 4316A0 80218D00 0C0B1EAF */ jal get_variable /* 4316A4 80218D04 26100004 */ addiu $s0, $s0, 4 /* 4316A8 80218D08 44820000 */ mtc1 $v0, $f0 -/* 4316AC 80218D0C 00000000 */ nop +/* 4316AC 80218D0C 00000000 */ nop /* 4316B0 80218D10 46800021 */ cvt.d.w $f0, $f0 /* 4316B4 80218D14 8E110000 */ lw $s1, ($s0) /* 4316B8 80218D18 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218CC0_431660 /* 4316D8 80218D38 46220003 */ div.d $f0, $f0, $f2 /* 4316DC 80218D3C 462007A0 */ cvt.s.d $f30, $f0 /* 4316E0 80218D40 4614F502 */ mul.s $f20, $f30, $f20 -/* 4316E4 80218D44 00000000 */ nop +/* 4316E4 80218D44 00000000 */ nop /* 4316E8 80218D48 26100004 */ addiu $s0, $s0, 4 /* 4316EC 80218D4C 8E120000 */ lw $s2, ($s0) /* 4316F0 80218D50 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218CC0_431660 /* 431704 80218D64 4600A306 */ mov.s $f12, $f20 /* 431708 80218D68 3C014100 */ lui $at, 0x4100 /* 43170C 80218D6C 44816000 */ mtc1 $at, $f12 -/* 431710 80218D70 00000000 */ nop +/* 431710 80218D70 00000000 */ nop /* 431714 80218D74 460CA302 */ mul.s $f12, $f20, $f12 -/* 431718 80218D78 00000000 */ nop +/* 431718 80218D78 00000000 */ nop /* 43171C 80218D7C 3C014316 */ lui $at, 0x4316 /* 431720 80218D80 4481E000 */ mtc1 $at, $f28 -/* 431724 80218D84 00000000 */ nop +/* 431724 80218D84 00000000 */ nop /* 431728 80218D88 461C0582 */ mul.s $f22, $f0, $f28 -/* 43172C 80218D8C 00000000 */ nop +/* 43172C 80218D8C 00000000 */ nop /* 431730 80218D90 4480D000 */ mtc1 $zero, $f26 /* 431734 80218D94 0C00A85B */ jal sin_rad /* 431738 80218D98 461AB580 */ add.s $f22, $f22, $f26 /* 43173C 80218D9C 3C014120 */ lui $at, 0x4120 /* 431740 80218DA0 44811000 */ mtc1 $at, $f2 -/* 431744 80218DA4 00000000 */ nop +/* 431744 80218DA4 00000000 */ nop /* 431748 80218DA8 46020602 */ mul.s $f24, $f0, $f2 -/* 43174C 80218DAC 00000000 */ nop +/* 43174C 80218DAC 00000000 */ nop /* 431750 80218DB0 4600A306 */ mov.s $f12, $f20 /* 431754 80218DB4 0C00A874 */ jal cos_rad /* 431758 80218DB8 461AC600 */ add.s $f24, $f24, $f26 /* 43175C 80218DBC 0280202D */ daddu $a0, $s4, $zero /* 431760 80218DC0 461C0502 */ mul.s $f20, $f0, $f28 -/* 431764 80218DC4 00000000 */ nop +/* 431764 80218DC4 00000000 */ nop /* 431768 80218DC8 0220282D */ daddu $a1, $s1, $zero /* 43176C 80218DCC 4406B000 */ mfc1 $a2, $f22 /* 431770 80218DD0 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218CC0_431660 /* 4317A8 80218E08 0240282D */ daddu $a1, $s2, $zero /* 4317AC 80218E0C 3C0142B4 */ lui $at, 0x42b4 /* 4317B0 80218E10 44810000 */ mtc1 $at, $f0 -/* 4317B4 80218E14 00000000 */ nop +/* 4317B4 80218E14 00000000 */ nop /* 4317B8 80218E18 461E003C */ c.lt.s $f0, $f30 -/* 4317BC 80218E1C 00000000 */ nop +/* 4317BC 80218E1C 00000000 */ nop /* 4317C0 80218E20 4500000B */ bc1f .L80218E50 /* 4317C4 80218E24 0000302D */ daddu $a2, $zero, $zero /* 4317C8 80218E28 3C014387 */ lui $at, 0x4387 /* 4317CC 80218E2C 44810000 */ mtc1 $at, $f0 -/* 4317D0 80218E30 00000000 */ nop +/* 4317D0 80218E30 00000000 */ nop /* 4317D4 80218E34 4600F03C */ c.lt.s $f30, $f0 -/* 4317D8 80218E38 00000000 */ nop +/* 4317D8 80218E38 00000000 */ nop /* 4317DC 80218E3C 45030001 */ bc1tl .L80218E44 /* 4317E0 80218E40 240600B4 */ addiu $a2, $zero, 0xb4 .L80218E44: /* 4317E4 80218E44 3C0142B4 */ lui $at, 0x42b4 /* 4317E8 80218E48 44810000 */ mtc1 $at, $f0 -/* 4317EC 80218E4C 00000000 */ nop +/* 4317EC 80218E4C 00000000 */ nop .L80218E50: /* 4317F0 80218E50 461E0001 */ sub.s $f0, $f0, $f30 /* 4317F4 80218E54 46000005 */ abs.s $f0, $f0 /* 4317F8 80218E58 4600010D */ trunc.w.s $f4, $f0 /* 4317FC 80218E5C 44022000 */ mfc1 $v0, $f4 -/* 431800 80218E60 00000000 */ nop +/* 431800 80218E60 00000000 */ nop /* 431804 80218E64 2842002D */ slti $v0, $v0, 0x2d /* 431808 80218E68 10400008 */ beqz $v0, .L80218E8C -/* 43180C 80218E6C 00000000 */ nop +/* 43180C 80218E6C 00000000 */ nop /* 431810 80218E70 3C014234 */ lui $at, 0x4234 /* 431814 80218E74 44810000 */ mtc1 $at, $f0 -/* 431818 80218E78 00000000 */ nop +/* 431818 80218E78 00000000 */ nop /* 43181C 80218E7C 4600F001 */ sub.s $f0, $f30, $f0 /* 431820 80218E80 46000000 */ add.s $f0, $f0, $f0 /* 431824 80218E84 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218CC0_431660 .L80218E8C: /* 43182C 80218E8C 3C014387 */ lui $at, 0x4387 /* 431830 80218E90 44810000 */ mtc1 $at, $f0 -/* 431834 80218E94 00000000 */ nop +/* 431834 80218E94 00000000 */ nop /* 431838 80218E98 461E0001 */ sub.s $f0, $f0, $f30 /* 43183C 80218E9C 46000005 */ abs.s $f0, $f0 /* 431840 80218EA0 4600010D */ trunc.w.s $f4, $f0 /* 431844 80218EA4 44022000 */ mfc1 $v0, $f4 -/* 431848 80218EA8 00000000 */ nop +/* 431848 80218EA8 00000000 */ nop /* 43184C 80218EAC 2842002D */ slti $v0, $v0, 0x2d /* 431850 80218EB0 1040000C */ beqz $v0, .L80218EE4 /* 431854 80218EB4 0280202D */ daddu $a0, $s4, $zero /* 431858 80218EB8 3C014361 */ lui $at, 0x4361 /* 43185C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 431860 80218EC0 00000000 */ nop +/* 431860 80218EC0 00000000 */ nop /* 431864 80218EC4 4600F001 */ sub.s $f0, $f30, $f0 /* 431868 80218EC8 46000000 */ add.s $f0, $f0, $f0 /* 43186C 80218ECC 3C014334 */ lui $at, 0x4334 /* 431870 80218ED0 44811000 */ mtc1 $at, $f2 -/* 431874 80218ED4 00000000 */ nop +/* 431874 80218ED4 00000000 */ nop /* 431878 80218ED8 46020000 */ add.s $f0, $f0, $f2 /* 43187C 80218EDC 4600010D */ trunc.w.s $f4, $f0 /* 431880 80218EE0 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218CC0_431660 /* 4318BC 80218F1C 24020002 */ addiu $v0, $zero, 2 /* 4318C0 80218F20 03E00008 */ jr $ra /* 4318C4 80218F24 27BD0058 */ addiu $sp, $sp, 0x58 -/* 4318C8 80218F28 00000000 */ nop -/* 4318CC 80218F2C 00000000 */ nop +/* 4318C8 80218F28 00000000 */ nop +/* 4318CC 80218F2C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s b/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s index 4c652965dd..26cf5e4daf 100644 --- a/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s +++ b/asm/nonmatchings/battle/area_kmr_part_2/43A7E0/func_80218D50_43A7E0.s @@ -21,7 +21,7 @@ glabel func_80218D50_43A7E0 /* 43A820 80218D90 0C0B1EAF */ jal get_variable /* 43A824 80218D94 26100004 */ addiu $s0, $s0, 4 /* 43A828 80218D98 44820000 */ mtc1 $v0, $f0 -/* 43A82C 80218D9C 00000000 */ nop +/* 43A82C 80218D9C 00000000 */ nop /* 43A830 80218DA0 46800021 */ cvt.d.w $f0, $f0 /* 43A834 80218DA4 8E110000 */ lw $s1, ($s0) /* 43A838 80218DA8 26100004 */ addiu $s0, $s0, 4 @@ -35,7 +35,7 @@ glabel func_80218D50_43A7E0 /* 43A858 80218DC8 46220003 */ div.d $f0, $f0, $f2 /* 43A85C 80218DCC 462007A0 */ cvt.s.d $f30, $f0 /* 43A860 80218DD0 4614F502 */ mul.s $f20, $f30, $f20 -/* 43A864 80218DD4 00000000 */ nop +/* 43A864 80218DD4 00000000 */ nop /* 43A868 80218DD8 26100004 */ addiu $s0, $s0, 4 /* 43A86C 80218DDC 8E120000 */ lw $s2, ($s0) /* 43A870 80218DE0 3C0143B4 */ lui $at, 0x43b4 @@ -46,28 +46,28 @@ glabel func_80218D50_43A7E0 /* 43A884 80218DF4 4600A306 */ mov.s $f12, $f20 /* 43A888 80218DF8 3C014100 */ lui $at, 0x4100 /* 43A88C 80218DFC 44816000 */ mtc1 $at, $f12 -/* 43A890 80218E00 00000000 */ nop +/* 43A890 80218E00 00000000 */ nop /* 43A894 80218E04 460CA302 */ mul.s $f12, $f20, $f12 -/* 43A898 80218E08 00000000 */ nop +/* 43A898 80218E08 00000000 */ nop /* 43A89C 80218E0C 3C014316 */ lui $at, 0x4316 /* 43A8A0 80218E10 4481E000 */ mtc1 $at, $f28 -/* 43A8A4 80218E14 00000000 */ nop +/* 43A8A4 80218E14 00000000 */ nop /* 43A8A8 80218E18 461C0582 */ mul.s $f22, $f0, $f28 -/* 43A8AC 80218E1C 00000000 */ nop +/* 43A8AC 80218E1C 00000000 */ nop /* 43A8B0 80218E20 4480D000 */ mtc1 $zero, $f26 /* 43A8B4 80218E24 0C00A85B */ jal sin_rad /* 43A8B8 80218E28 461AB580 */ add.s $f22, $f22, $f26 /* 43A8BC 80218E2C 3C014120 */ lui $at, 0x4120 /* 43A8C0 80218E30 44811000 */ mtc1 $at, $f2 -/* 43A8C4 80218E34 00000000 */ nop +/* 43A8C4 80218E34 00000000 */ nop /* 43A8C8 80218E38 46020602 */ mul.s $f24, $f0, $f2 -/* 43A8CC 80218E3C 00000000 */ nop +/* 43A8CC 80218E3C 00000000 */ nop /* 43A8D0 80218E40 4600A306 */ mov.s $f12, $f20 /* 43A8D4 80218E44 0C00A874 */ jal cos_rad /* 43A8D8 80218E48 461AC600 */ add.s $f24, $f24, $f26 /* 43A8DC 80218E4C 0280202D */ daddu $a0, $s4, $zero /* 43A8E0 80218E50 461C0502 */ mul.s $f20, $f0, $f28 -/* 43A8E4 80218E54 00000000 */ nop +/* 43A8E4 80218E54 00000000 */ nop /* 43A8E8 80218E58 0220282D */ daddu $a1, $s1, $zero /* 43A8EC 80218E5C 4406B000 */ mfc1 $a2, $f22 /* 43A8F0 80218E60 3C0141A0 */ lui $at, 0x41a0 @@ -87,34 +87,34 @@ glabel func_80218D50_43A7E0 /* 43A928 80218E98 0240282D */ daddu $a1, $s2, $zero /* 43A92C 80218E9C 3C0142B4 */ lui $at, 0x42b4 /* 43A930 80218EA0 44810000 */ mtc1 $at, $f0 -/* 43A934 80218EA4 00000000 */ nop +/* 43A934 80218EA4 00000000 */ nop /* 43A938 80218EA8 461E003C */ c.lt.s $f0, $f30 -/* 43A93C 80218EAC 00000000 */ nop +/* 43A93C 80218EAC 00000000 */ nop /* 43A940 80218EB0 4500000B */ bc1f .L80218EE0 /* 43A944 80218EB4 0000302D */ daddu $a2, $zero, $zero /* 43A948 80218EB8 3C014387 */ lui $at, 0x4387 /* 43A94C 80218EBC 44810000 */ mtc1 $at, $f0 -/* 43A950 80218EC0 00000000 */ nop +/* 43A950 80218EC0 00000000 */ nop /* 43A954 80218EC4 4600F03C */ c.lt.s $f30, $f0 -/* 43A958 80218EC8 00000000 */ nop +/* 43A958 80218EC8 00000000 */ nop /* 43A95C 80218ECC 45030001 */ bc1tl .L80218ED4 /* 43A960 80218ED0 240600B4 */ addiu $a2, $zero, 0xb4 .L80218ED4: /* 43A964 80218ED4 3C0142B4 */ lui $at, 0x42b4 /* 43A968 80218ED8 44810000 */ mtc1 $at, $f0 -/* 43A96C 80218EDC 00000000 */ nop +/* 43A96C 80218EDC 00000000 */ nop .L80218EE0: /* 43A970 80218EE0 461E0001 */ sub.s $f0, $f0, $f30 /* 43A974 80218EE4 46000005 */ abs.s $f0, $f0 /* 43A978 80218EE8 4600010D */ trunc.w.s $f4, $f0 /* 43A97C 80218EEC 44022000 */ mfc1 $v0, $f4 -/* 43A980 80218EF0 00000000 */ nop +/* 43A980 80218EF0 00000000 */ nop /* 43A984 80218EF4 2842002D */ slti $v0, $v0, 0x2d /* 43A988 80218EF8 10400008 */ beqz $v0, .L80218F1C -/* 43A98C 80218EFC 00000000 */ nop +/* 43A98C 80218EFC 00000000 */ nop /* 43A990 80218F00 3C014234 */ lui $at, 0x4234 /* 43A994 80218F04 44810000 */ mtc1 $at, $f0 -/* 43A998 80218F08 00000000 */ nop +/* 43A998 80218F08 00000000 */ nop /* 43A99C 80218F0C 4600F001 */ sub.s $f0, $f30, $f0 /* 43A9A0 80218F10 46000000 */ add.s $f0, $f0, $f0 /* 43A9A4 80218F14 4600010D */ trunc.w.s $f4, $f0 @@ -122,23 +122,23 @@ glabel func_80218D50_43A7E0 .L80218F1C: /* 43A9AC 80218F1C 3C014387 */ lui $at, 0x4387 /* 43A9B0 80218F20 44810000 */ mtc1 $at, $f0 -/* 43A9B4 80218F24 00000000 */ nop +/* 43A9B4 80218F24 00000000 */ nop /* 43A9B8 80218F28 461E0001 */ sub.s $f0, $f0, $f30 /* 43A9BC 80218F2C 46000005 */ abs.s $f0, $f0 /* 43A9C0 80218F30 4600010D */ trunc.w.s $f4, $f0 /* 43A9C4 80218F34 44022000 */ mfc1 $v0, $f4 -/* 43A9C8 80218F38 00000000 */ nop +/* 43A9C8 80218F38 00000000 */ nop /* 43A9CC 80218F3C 2842002D */ slti $v0, $v0, 0x2d /* 43A9D0 80218F40 1040000C */ beqz $v0, .L80218F74 /* 43A9D4 80218F44 0280202D */ daddu $a0, $s4, $zero /* 43A9D8 80218F48 3C014361 */ lui $at, 0x4361 /* 43A9DC 80218F4C 44810000 */ mtc1 $at, $f0 -/* 43A9E0 80218F50 00000000 */ nop +/* 43A9E0 80218F50 00000000 */ nop /* 43A9E4 80218F54 4600F001 */ sub.s $f0, $f30, $f0 /* 43A9E8 80218F58 46000000 */ add.s $f0, $f0, $f0 /* 43A9EC 80218F5C 3C014334 */ lui $at, 0x4334 /* 43A9F0 80218F60 44811000 */ mtc1 $at, $f2 -/* 43A9F4 80218F64 00000000 */ nop +/* 43A9F4 80218F64 00000000 */ nop /* 43A9F8 80218F68 46020000 */ add.s $f0, $f0, $f2 /* 43A9FC 80218F6C 4600010D */ trunc.w.s $f4, $f0 /* 43AA00 80218F70 44062000 */ mfc1 $a2, $f4 @@ -160,5 +160,5 @@ glabel func_80218D50_43A7E0 /* 43AA3C 80218FAC 24020002 */ addiu $v0, $zero, 2 /* 43AA40 80218FB0 03E00008 */ jr $ra /* 43AA44 80218FB4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 43AA48 80218FB8 00000000 */ nop -/* 43AA4C 80218FBC 00000000 */ nop +/* 43AA48 80218FB8 00000000 */ nop +/* 43AA4C 80218FBC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s index b15693c97b..ecbdd07ac5 100644 --- a/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s +++ b/asm/nonmatchings/battle/area_kpa3/6BBC60/func_802180D0_6BBC60.s @@ -40,7 +40,7 @@ glabel func_802180D0_6BBC60 .L8021815C: /* 6BBCEC 8021815C 8E820070 */ lw $v0, 0x70($s4) /* 6BBCF0 80218160 144000F7 */ bnez $v0, .L80218540 -/* 6BBCF4 80218164 00000000 */ nop +/* 6BBCF4 80218164 00000000 */ nop /* 6BBCF8 80218168 C6600144 */ lwc1 $f0, 0x144($s3) /* 6BBCFC 8021816C C638000C */ lwc1 $f24, 0xc($s1) /* 6BBD00 80218170 C63A0014 */ lwc1 $f26, 0x14($s1) @@ -70,29 +70,29 @@ glabel func_802180D0_6BBC60 /* 6BBD60 802181D0 46002003 */ div.s $f0, $f4, $f0 /* 6BBD64 802181D4 4600028D */ trunc.w.s $f10, $f0 /* 6BBD68 802181D8 44035000 */ mfc1 $v1, $f10 -/* 6BBD6C 802181DC 00000000 */ nop +/* 6BBD6C 802181DC 00000000 */ nop /* 6BBD70 802181E0 00031400 */ sll $v0, $v1, 0x10 /* 6BBD74 802181E4 00021403 */ sra $v0, $v0, 0x10 /* 6BBD78 802181E8 44820000 */ mtc1 $v0, $f0 -/* 6BBD7C 802181EC 00000000 */ nop +/* 6BBD7C 802181EC 00000000 */ nop /* 6BBD80 802181F0 46800020 */ cvt.s.w $f0, $f0 /* 6BBD84 802181F4 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBD88 802181F8 00000000 */ nop +/* 6BBD88 802181F8 00000000 */ nop /* 6BBD8C 802181FC 46002086 */ mov.s $f2, $f4 /* 6BBD90 80218200 A6230064 */ sh $v1, 0x64($s1) /* 6BBD94 80218204 08086090 */ j .L80218240 /* 6BBD98 80218208 46001201 */ sub.s $f8, $f2, $f0 .L8021820C: /* 6BBD9C 8021820C 44821000 */ mtc1 $v0, $f2 -/* 6BBDA0 80218210 00000000 */ nop +/* 6BBDA0 80218210 00000000 */ nop /* 6BBDA4 80218214 468010A0 */ cvt.s.w $f2, $f2 /* 6BBDA8 80218218 86220064 */ lh $v0, 0x64($s1) /* 6BBDAC 8021821C 46022083 */ div.s $f2, $f4, $f2 /* 6BBDB0 80218220 44820000 */ mtc1 $v0, $f0 -/* 6BBDB4 80218224 00000000 */ nop +/* 6BBDB4 80218224 00000000 */ nop /* 6BBDB8 80218228 46800020 */ cvt.s.w $f0, $f0 /* 6BBDBC 8021822C 46020002 */ mul.s $f0, $f0, $f2 -/* 6BBDC0 80218230 00000000 */ nop +/* 6BBDC0 80218230 00000000 */ nop /* 6BBDC4 80218234 C624004C */ lwc1 $f4, 0x4c($s1) /* 6BBDC8 80218238 E6220040 */ swc1 $f2, 0x40($s1) /* 6BBDCC 8021823C 46002201 */ sub.s $f8, $f4, $f0 @@ -107,13 +107,13 @@ glabel func_802180D0_6BBC60 /* 6BBDEC 8021825C 44810000 */ mtc1 $at, $f0 /* 6BBDF0 80218260 C6240000 */ lwc1 $f4, ($s1) /* 6BBDF4 80218264 44823000 */ mtc1 $v0, $f6 -/* 6BBDF8 80218268 00000000 */ nop +/* 6BBDF8 80218268 00000000 */ nop /* 6BBDFC 8021826C 468031A0 */ cvt.s.w $f6, $f6 /* 6BBE00 80218270 46060003 */ div.s $f0, $f0, $f6 /* 6BBE04 80218274 46041081 */ sub.s $f2, $f2, $f4 /* 6BBE08 80218278 E620003C */ swc1 $f0, 0x3c($s1) /* 6BBE0C 8021827C 44830000 */ mtc1 $v1, $f0 -/* 6BBE10 80218280 00000000 */ nop +/* 6BBE10 80218280 00000000 */ nop /* 6BBE14 80218284 46800020 */ cvt.s.w $f0, $f0 /* 6BBE18 80218288 46001083 */ div.s $f2, $f2, $f0 /* 6BBE1C 8021828C C6200010 */ lwc1 $f0, 0x10($s1) @@ -147,7 +147,7 @@ glabel func_802180D0_6BBC60 /* 6BBE88 802182F8 14410004 */ bne $v0, $at, .L8021830C /* 6BBE8C 802182FC 3C018000 */ lui $at, 0x8000 /* 6BBE90 80218300 14610002 */ bne $v1, $at, .L8021830C -/* 6BBE94 80218304 00000000 */ nop +/* 6BBE94 80218304 00000000 */ nop /* 6BBE98 80218308 0006000D */ break 6 .L8021830C: /* 6BBE9C 8021830C 00001812 */ mflo $v1 @@ -172,7 +172,7 @@ glabel func_802180D0_6BBC60 /* 6BBEE8 80218358 44811000 */ mtc1 $at, $f2 /* 6BBEEC 8021835C 46200220 */ cvt.s.d $f8, $f0 /* 6BBEF0 80218360 44830000 */ mtc1 $v1, $f0 -/* 6BBEF4 80218364 00000000 */ nop +/* 6BBEF4 80218364 00000000 */ nop /* 6BBEF8 80218368 46800020 */ cvt.s.w $f0, $f0 /* 6BBEFC 8021836C 86230066 */ lh $v1, 0x66($s1) /* 6BBF00 80218370 24020002 */ addiu $v0, $zero, 2 @@ -184,7 +184,7 @@ glabel func_802180D0_6BBC60 /* 6BBF18 80218388 D4228408 */ ldc1 $f2, %lo(D_80228408)($at) /* 6BBF1C 8021838C 46004021 */ cvt.d.s $f0, $f8 /* 6BBF20 80218390 46220002 */ mul.d $f0, $f0, $f2 -/* 6BBF24 80218394 00000000 */ nop +/* 6BBF24 80218394 00000000 */ nop /* 6BBF28 80218398 46200020 */ cvt.s.d $f0, $f0 /* 6BBF2C 8021839C E6200050 */ swc1 $f0, 0x50($s1) .L802183A0: @@ -196,7 +196,7 @@ glabel func_802180D0_6BBC60 /* 6BBF44 802183B4 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BBF48 802183B8 AE200018 */ sw $zero, 0x18($s1) /* 6BBF4C 802183BC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BBF50 802183C0 00000000 */ nop +/* 6BBF50 802183C0 00000000 */ nop /* 6BBF54 802183C4 AE20001C */ sw $zero, 0x1c($s1) /* 6BBF58 802183C8 4600A521 */ cvt.d.s $f20, $f20 /* 6BBF5C 802183CC 3C0143B4 */ lui $at, 0x43b4 @@ -219,7 +219,7 @@ glabel func_802180D0_6BBC60 /* 6BBF98 80218408 14410004 */ bne $v0, $at, .L8021841C /* 6BBF9C 8021840C 3C018000 */ lui $at, 0x8000 /* 6BBFA0 80218410 14610002 */ bne $v1, $at, .L8021841C -/* 6BBFA4 80218414 00000000 */ nop +/* 6BBFA4 80218414 00000000 */ nop /* 6BBFA8 80218418 0006000D */ break 6 .L8021841C: /* 6BBFAC 8021841C 00001812 */ mflo $v1 @@ -244,7 +244,7 @@ glabel func_802180D0_6BBC60 /* 6BBFF8 80218468 44811000 */ mtc1 $at, $f2 /* 6BBFFC 8021846C 46200220 */ cvt.s.d $f8, $f0 /* 6BC000 80218470 44830000 */ mtc1 $v1, $f0 -/* 6BC004 80218474 00000000 */ nop +/* 6BC004 80218474 00000000 */ nop /* 6BC008 80218478 46800020 */ cvt.s.w $f0, $f0 /* 6BC00C 8021847C 86230066 */ lh $v1, 0x66($s1) /* 6BC010 80218480 24020004 */ addiu $v0, $zero, 4 @@ -257,7 +257,7 @@ glabel func_802180D0_6BBC60 /* 6BC02C 8021849C 44801000 */ mtc1 $zero, $f2 /* 6BC030 802184A0 46004021 */ cvt.d.s $f0, $f8 /* 6BC034 802184A4 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC038 802184A8 00000000 */ nop +/* 6BC038 802184A8 00000000 */ nop /* 6BC03C 802184AC 46200020 */ cvt.s.d $f0, $f0 /* 6BC040 802184B0 E6200050 */ swc1 $f0, 0x50($s1) .L802184B4: @@ -269,7 +269,7 @@ glabel func_802180D0_6BBC60 /* 6BC058 802184C8 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC05C 802184CC AE200018 */ sw $zero, 0x18($s1) /* 6BC060 802184D0 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC064 802184D4 00000000 */ nop +/* 6BC064 802184D4 00000000 */ nop /* 6BC068 802184D8 AE20001C */ sw $zero, 0x1c($s1) /* 6BC06C 802184DC 4600A521 */ cvt.d.s $f20, $f20 /* 6BC070 802184E0 3C0143B4 */ lui $at, 0x43b4 @@ -282,9 +282,9 @@ glabel func_802180D0_6BBC60 /* 6BC08C 802184FC 46000021 */ cvt.d.s $f0, $f0 .L80218500: /* 6BC090 80218500 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC094 80218504 00000000 */ nop +/* 6BC094 80218504 00000000 */ nop /* 6BC098 80218508 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC09C 8021850C 00000000 */ nop +/* 6BC09C 8021850C 00000000 */ nop /* 6BC0A0 80218510 46360000 */ add.d $f0, $f0, $f22 /* 6BC0A4 80218514 4620A500 */ add.d $f20, $f20, $f0 /* 6BC0A8 80218518 4620A520 */ cvt.s.d $f20, $f20 @@ -308,21 +308,21 @@ glabel func_802180D0_6BBC60 /* 6BC0EC 8021855C 10620008 */ beq $v1, $v0, .L80218580 /* 6BC0F0 80218560 0000102D */ daddu $v0, $zero, $zero /* 6BC0F4 80218564 0808624C */ j .L80218930 -/* 6BC0F8 80218568 00000000 */ nop +/* 6BC0F8 80218568 00000000 */ nop .L8021856C: /* 6BC0FC 8021856C 24020003 */ addiu $v0, $zero, 3 /* 6BC100 80218570 106200BA */ beq $v1, $v0, .L8021885C /* 6BC104 80218574 0000102D */ daddu $v0, $zero, $zero /* 6BC108 80218578 0808624C */ j .L80218930 -/* 6BC10C 8021857C 00000000 */ nop +/* 6BC10C 8021857C 00000000 */ nop .L80218580: /* 6BC110 80218580 C6220044 */ lwc1 $f2, 0x44($s1) /* 6BC114 80218584 3C013FC9 */ lui $at, 0x3fc9 /* 6BC118 80218588 34210FD0 */ ori $at, $at, 0xfd0 /* 6BC11C 8021858C 44810000 */ mtc1 $at, $f0 -/* 6BC120 80218590 00000000 */ nop +/* 6BC120 80218590 00000000 */ nop /* 6BC124 80218594 4602003C */ c.lt.s $f0, $f2 -/* 6BC128 80218598 00000000 */ nop +/* 6BC128 80218598 00000000 */ nop /* 6BC12C 8021859C 45000004 */ bc1f .L802185B0 /* 6BC130 802185A0 2404FF81 */ addiu $a0, $zero, -0x7f /* 6BC134 802185A4 8E26005C */ lw $a2, 0x5c($s1) @@ -351,7 +351,7 @@ glabel func_802180D0_6BBC60 /* 6BC18C 802185FC C62C0044 */ lwc1 $f12, 0x44($s1) /* 6BC190 80218600 C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC194 80218604 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC198 80218608 00000000 */ nop +/* 6BC198 80218608 00000000 */ nop /* 6BC19C 8021860C C6200004 */ lwc1 $f0, 4($s1) /* 6BC1A0 80218610 46020000 */ add.s $f0, $f0, $f2 /* 6BC1A4 80218614 E6600148 */ swc1 $f0, 0x148($s3) @@ -360,7 +360,7 @@ glabel func_802180D0_6BBC60 /* 6BC1B0 80218620 C6220010 */ lwc1 $f2, 0x10($s1) /* 6BC1B4 80218624 C6600148 */ lwc1 $f0, 0x148($s3) /* 6BC1B8 80218628 4602003C */ c.lt.s $f0, $f2 -/* 6BC1BC 8021862C 00000000 */ nop +/* 6BC1BC 8021862C 00000000 */ nop /* 6BC1C0 80218630 45000007 */ bc1f .L80218650 /* 6BC1C4 80218634 4600B306 */ mov.s $f12, $f22 /* 6BC1C8 80218638 86220064 */ lh $v0, 0x64($s1) @@ -389,7 +389,7 @@ glabel func_802180D0_6BBC60 /* 6BC21C 8021868C 44810000 */ mtc1 $at, $f0 /* 6BC220 80218690 C6340044 */ lwc1 $f20, 0x44($s1) /* 6BC224 80218694 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC228 80218698 00000000 */ nop +/* 6BC228 80218698 00000000 */ nop /* 6BC22C 8021869C C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC230 802186A0 4600A521 */ cvt.d.s $f20, $f20 /* 6BC234 802186A4 3C0143B4 */ lui $at, 0x43b4 @@ -408,7 +408,7 @@ glabel func_802180D0_6BBC60 /* 6BC264 802186D4 44810000 */ mtc1 $at, $f0 /* 6BC268 802186D8 C6340044 */ lwc1 $f20, 0x44($s1) /* 6BC26C 802186DC 46006302 */ mul.s $f12, $f12, $f0 -/* 6BC270 802186E0 00000000 */ nop +/* 6BC270 802186E0 00000000 */ nop /* 6BC274 802186E4 C636003C */ lwc1 $f22, 0x3c($s1) /* 6BC278 802186E8 4600A521 */ cvt.d.s $f20, $f20 /* 6BC27C 802186EC 3C0143B4 */ lui $at, 0x43b4 @@ -421,9 +421,9 @@ glabel func_802180D0_6BBC60 /* 6BC298 80218708 46000021 */ cvt.d.s $f0, $f0 .L8021870C: /* 6BC29C 8021870C 46220002 */ mul.d $f0, $f0, $f2 -/* 6BC2A0 80218710 00000000 */ nop +/* 6BC2A0 80218710 00000000 */ nop /* 6BC2A4 80218714 46360002 */ mul.d $f0, $f0, $f22 -/* 6BC2A8 80218718 00000000 */ nop +/* 6BC2A8 80218718 00000000 */ nop /* 6BC2AC 8021871C 46360000 */ add.d $f0, $f0, $f22 /* 6BC2B0 80218720 4620A500 */ add.d $f20, $f20, $f0 /* 6BC2B4 80218724 4620A520 */ cvt.s.d $f20, $f20 @@ -469,7 +469,7 @@ glabel func_802180D0_6BBC60 /* 6BC34C 802187BC 14410004 */ bne $v0, $at, .L802187D0 /* 6BC350 802187C0 3C018000 */ lui $at, 0x8000 /* 6BC354 802187C4 14610002 */ bne $v1, $at, .L802187D0 -/* 6BC358 802187C8 00000000 */ nop +/* 6BC358 802187C8 00000000 */ nop /* 6BC35C 802187CC 0006000D */ break 6 .L802187D0: /* 6BC360 802187D0 00001812 */ mflo $v1 @@ -496,7 +496,7 @@ glabel func_802180D0_6BBC60 /* 6BC3B4 80218824 46200020 */ cvt.s.d $f0, $f0 /* 6BC3B8 80218828 E6200050 */ swc1 $f0, 0x50($s1) /* 6BC3BC 8021882C 44830000 */ mtc1 $v1, $f0 -/* 6BC3C0 80218830 00000000 */ nop +/* 6BC3C0 80218830 00000000 */ nop /* 6BC3C4 80218834 46800020 */ cvt.s.w $f0, $f0 /* 6BC3C8 80218838 E6200028 */ swc1 $f0, 0x28($s1) /* 6BC3CC 8021883C C6600144 */ lwc1 $f0, 0x144($s3) @@ -512,9 +512,9 @@ glabel func_802180D0_6BBC60 /* 6BC3F0 80218860 3C0140C9 */ lui $at, 0x40c9 /* 6BC3F4 80218864 34210FD0 */ ori $at, $at, 0xfd0 /* 6BC3F8 80218868 4481B000 */ mtc1 $at, $f22 -/* 6BC3FC 8021886C 00000000 */ nop +/* 6BC3FC 8021886C 00000000 */ nop /* 6BC400 80218870 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC404 80218874 00000000 */ nop +/* 6BC404 80218874 00000000 */ nop /* 6BC408 80218878 C6340000 */ lwc1 $f20, ($s1) /* 6BC40C 8021887C 3C0143B4 */ lui $at, 0x43b4 /* 6BC410 80218880 4481C000 */ mtc1 $at, $f24 @@ -523,10 +523,10 @@ glabel func_802180D0_6BBC60 /* 6BC41C 8021888C 46186303 */ div.s $f12, $f12, $f24 /* 6BC420 80218890 C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC424 80218894 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC428 80218898 00000000 */ nop +/* 6BC428 80218898 00000000 */ nop /* 6BC42C 8021889C C62C0024 */ lwc1 $f12, 0x24($s1) /* 6BC430 802188A0 46166302 */ mul.s $f12, $f12, $f22 -/* 6BC434 802188A4 00000000 */ nop +/* 6BC434 802188A4 00000000 */ nop /* 6BC438 802188A8 3C018023 */ lui $at, %hi(D_80228440) /* 6BC43C 802188AC D4208440 */ ldc1 $f0, %lo(D_80228440)($at) /* 6BC440 802188B0 460010A1 */ cvt.d.s $f2, $f2 @@ -538,7 +538,7 @@ glabel func_802180D0_6BBC60 /* 6BC458 802188C8 E6340000 */ swc1 $f20, ($s1) /* 6BC45C 802188CC C6220050 */ lwc1 $f2, 0x50($s1) /* 6BC460 802188D0 46001082 */ mul.s $f2, $f2, $f0 -/* 6BC464 802188D4 00000000 */ nop +/* 6BC464 802188D4 00000000 */ nop /* 6BC468 802188D8 C62C0024 */ lwc1 $f12, 0x24($s1) /* 6BC46C 802188DC C6200028 */ lwc1 $f0, 0x28($s1) /* 6BC470 802188E0 46006300 */ add.s $f12, $f12, $f0 diff --git a/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218000_6CC070.s b/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218000_6CC070.s index b7a62f16d6..44689f5378 100644 --- a/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218000_6CC070.s +++ b/asm/nonmatchings/battle/area_kpa4/6CC070/func_80218000_6CC070.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80218000_6CC070 -/* 6CC070 80218000 3C028022 */ lui $v0, %hi(D_80218DF4) -/* 6CC074 80218004 24428DF4 */ addiu $v0, $v0, %lo(D_80218DF4) +/* 6CC070 80218000 3C028022 */ lui $v0, %hi(func_80218DF4_465284) +/* 6CC074 80218004 24428DF4 */ addiu $v0, $v0, %lo(func_80218DF4_465284) /* 6CC078 80218008 24030001 */ addiu $v1, $zero, 1 /* 6CC07C 8021800C AC43000C */ sw $v1, 0xc($v0) /* 6CC080 80218010 8C830148 */ lw $v1, 0x148($a0) diff --git a/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s b/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s index d8dd35d906..8c0b59bd97 100644 --- a/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s +++ b/asm/nonmatchings/battle/area_kzn/58C740/func_8021851C_58C80C.s @@ -35,26 +35,26 @@ glabel func_8021851C_58C80C /* 58C884 80218594 34210FD8 */ ori $at, $at, 0xfd8 /* 58C888 80218598 44814000 */ mtc1 $at, $f8 /* 58C88C 8021859C 44922000 */ mtc1 $s2, $f4 -/* 58C890 802185A0 00000000 */ nop +/* 58C890 802185A0 00000000 */ nop /* 58C894 802185A4 46802120 */ cvt.s.w $f4, $f4 /* 58C898 802185A8 46082202 */ mul.s $f8, $f4, $f8 -/* 58C89C 802185AC 00000000 */ nop +/* 58C89C 802185AC 00000000 */ nop /* 58C8A0 802185B0 44903000 */ mtc1 $s0, $f6 -/* 58C8A4 802185B4 00000000 */ nop +/* 58C8A4 802185B4 00000000 */ nop /* 58C8A8 802185B8 468031A0 */ cvt.s.w $f6, $f6 /* 58C8AC 802185BC 3C013F80 */ lui $at, 0x3f80 /* 58C8B0 802185C0 44811000 */ mtc1 $at, $f2 /* 58C8B4 802185C4 46062103 */ div.s $f4, $f4, $f6 /* 58C8B8 802185C8 46041081 */ sub.s $f2, $f2, $f4 /* 58C8BC 802185CC 46020502 */ mul.s $f20, $f0, $f2 -/* 58C8C0 802185D0 00000000 */ nop +/* 58C8C0 802185D0 00000000 */ nop /* 58C8C4 802185D4 44936000 */ mtc1 $s3, $f12 -/* 58C8C8 802185D8 00000000 */ nop +/* 58C8C8 802185D8 00000000 */ nop /* 58C8CC 802185DC 46806320 */ cvt.s.w $f12, $f12 /* 58C8D0 802185E0 0C00A874 */ jal cos_rad /* 58C8D4 802185E4 460C4303 */ div.s $f12, $f8, $f12 /* 58C8D8 802185E8 4600A502 */ mul.s $f20, $f20, $f0 -/* 58C8DC 802185EC 00000000 */ nop +/* 58C8DC 802185EC 00000000 */ nop /* 58C8E0 802185F0 0220202D */ daddu $a0, $s1, $zero /* 58C8E4 802185F4 4600A28D */ trunc.w.s $f10, $f20 /* 58C8E8 802185F8 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_8021851C_58C80C /* 58C910 80218620 24020002 */ addiu $v0, $zero, 2 /* 58C914 80218624 03E00008 */ jr $ra /* 58C918 80218628 27BD0030 */ addiu $sp, $sp, 0x30 -/* 58C91C 8021862C 00000000 */ nop +/* 58C91C 8021862C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188B0_59EF90.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188B0_59EF90.s index 01645d9344..5b7d092681 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188B0_59EF90.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188B0_59EF90.s @@ -3,8 +3,8 @@ glabel func_802188B0_59EF90 /* 59EF90 802188B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 59EF94 802188B4 3C028022 */ lui $v0, %hi(D_8021835C) -/* 59EF98 802188B8 2442835C */ addiu $v0, $v0, %lo(D_8021835C) +/* 59EF94 802188B4 3C028022 */ lui $v0, %hi(func_8021835C_59E18C) +/* 59EF98 802188B8 2442835C */ addiu $v0, $v0, %lo(func_8021835C_59E18C) /* 59EF9C 802188BC AFA2001C */ sw $v0, 0x1c($sp) /* 59EFA0 802188C0 2402000A */ addiu $v0, $zero, 0xa /* 59EFA4 802188C4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188FC_59EFDC.s b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188FC_59EFDC.s index 89b3624ad4..6036ecf290 100644 --- a/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188FC_59EFDC.s +++ b/asm/nonmatchings/battle/area_kzn2/59E6E0/func_802188FC_59EFDC.s @@ -4,8 +4,8 @@ glabel func_802188FC_59EFDC /* 59EFDC 802188FC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 59EFE0 80218900 2402FFFF */ addiu $v0, $zero, -1 -/* 59EFE4 80218904 3C058022 */ lui $a1, %hi(D_802188B0) -/* 59EFE8 80218908 24A588B0 */ addiu $a1, $a1, %lo(D_802188B0) +/* 59EFE4 80218904 3C058022 */ lui $a1, %hi(func_802188B0_59E694) +/* 59EFE8 80218908 24A588B0 */ addiu $a1, $a1, %lo(func_802188B0_59E694) /* 59EFEC 8021890C AFBF0010 */ sw $ra, 0x10($sp) /* 59EFF0 80218910 3C018023 */ lui $at, %hi(D_8022B550) /* 59EFF4 80218914 AC22B550 */ sw $v0, %lo(D_8022B550)($at) diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s b/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s index 1fb08b26bb..679bab8fcb 100644 --- a/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_802185AC_512B7C.s @@ -35,26 +35,26 @@ glabel func_802185AC_512B7C /* 512BF4 80218624 34210FD8 */ ori $at, $at, 0xfd8 /* 512BF8 80218628 44814000 */ mtc1 $at, $f8 /* 512BFC 8021862C 44922000 */ mtc1 $s2, $f4 -/* 512C00 80218630 00000000 */ nop +/* 512C00 80218630 00000000 */ nop /* 512C04 80218634 46802120 */ cvt.s.w $f4, $f4 /* 512C08 80218638 46082202 */ mul.s $f8, $f4, $f8 -/* 512C0C 8021863C 00000000 */ nop +/* 512C0C 8021863C 00000000 */ nop /* 512C10 80218640 44903000 */ mtc1 $s0, $f6 -/* 512C14 80218644 00000000 */ nop +/* 512C14 80218644 00000000 */ nop /* 512C18 80218648 468031A0 */ cvt.s.w $f6, $f6 /* 512C1C 8021864C 3C013F80 */ lui $at, 0x3f80 /* 512C20 80218650 44811000 */ mtc1 $at, $f2 /* 512C24 80218654 46062103 */ div.s $f4, $f4, $f6 /* 512C28 80218658 46041081 */ sub.s $f2, $f2, $f4 /* 512C2C 8021865C 46020502 */ mul.s $f20, $f0, $f2 -/* 512C30 80218660 00000000 */ nop +/* 512C30 80218660 00000000 */ nop /* 512C34 80218664 44936000 */ mtc1 $s3, $f12 -/* 512C38 80218668 00000000 */ nop +/* 512C38 80218668 00000000 */ nop /* 512C3C 8021866C 46806320 */ cvt.s.w $f12, $f12 /* 512C40 80218670 0C00A874 */ jal cos_rad /* 512C44 80218674 460C4303 */ div.s $f12, $f8, $f12 /* 512C48 80218678 4600A502 */ mul.s $f20, $f20, $f0 -/* 512C4C 8021867C 00000000 */ nop +/* 512C4C 8021867C 00000000 */ nop /* 512C50 80218680 0220202D */ daddu $a0, $s1, $zero /* 512C54 80218684 4600A28D */ trunc.w.s $f10, $f20 /* 512C58 80218688 44065000 */ mfc1 $a2, $f10 @@ -70,4 +70,4 @@ glabel func_802185AC_512B7C /* 512C80 802186B0 24020002 */ addiu $v0, $zero, 2 /* 512C84 802186B4 03E00008 */ jr $ra /* 512C88 802186B8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 512C8C 802186BC 00000000 */ nop +/* 512C8C 802186BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s b/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s index a38e728743..5218449362 100644 --- a/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s +++ b/asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel area_omo_GetEntityPosition +glabel func_80218A98_513068 /* 513068 80218A98 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 51306C 80218A9C AFB20018 */ sw $s2, 0x18($sp) /* 513070 80218AA0 0080902D */ daddu $s2, $a0, $zero diff --git a/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s b/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s index 72a8b230b8..6c9ec34db9 100644 --- a/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s +++ b/asm/nonmatchings/battle/area_omo/513580/func_80218FB0_513580.s @@ -61,9 +61,9 @@ glabel func_80218FB0_513580 /* 513654 80219084 3C014048 */ lui $at, 0x4048 /* 513658 80219088 3421F5C3 */ ori $at, $at, 0xf5c3 /* 51365C 8021908C 44816000 */ mtc1 $at, $f12 -/* 513660 80219090 00000000 */ nop +/* 513660 80219090 00000000 */ nop /* 513664 80219094 460C0302 */ mul.s $f12, $f0, $f12 -/* 513668 80219098 00000000 */ nop +/* 513668 80219098 00000000 */ nop /* 51366C 8021909C 3C014334 */ lui $at, 0x4334 /* 513670 802190A0 44811000 */ mtc1 $at, $f2 /* 513674 802190A4 E6200008 */ swc1 $f0, 8($s1) @@ -71,11 +71,11 @@ glabel func_80218FB0_513580 /* 51367C 802190AC 46026303 */ div.s $f12, $f12, $f2 /* 513680 802190B0 3C0141A0 */ lui $at, 0x41a0 /* 513684 802190B4 44811000 */ mtc1 $at, $f2 -/* 513688 802190B8 00000000 */ nop +/* 513688 802190B8 00000000 */ nop /* 51368C 802190BC 46020502 */ mul.s $f20, $f0, $f2 -/* 513690 802190C0 00000000 */ nop +/* 513690 802190C0 00000000 */ nop /* 513694 802190C4 4614A582 */ mul.s $f22, $f20, $f20 -/* 513698 802190C8 00000000 */ nop +/* 513698 802190C8 00000000 */ nop /* 51369C 802190CC 26940001 */ addiu $s4, $s4, 1 /* 5136A0 802190D0 3C0142B4 */ lui $at, 0x42b4 /* 5136A4 802190D4 44810000 */ mtc1 $at, $f0 @@ -135,5 +135,5 @@ glabel func_80218FB0_513580 /* 51377C 802191AC D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 513780 802191B0 03E00008 */ jr $ra /* 513784 802191B4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 513788 802191B8 00000000 */ nop -/* 51378C 802191BC 00000000 */ nop +/* 513788 802191B8 00000000 */ nop +/* 51378C 802191BC 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s b/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s index 5b252f75a2..698ab7b129 100644 --- a/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s +++ b/asm/nonmatchings/battle/area_sam2/63D710/func_80218588_63D768.s @@ -11,12 +11,12 @@ glabel func_80218588_63D768 /* 63D780 802185A0 46007506 */ mov.s $f20, $f14 /* 63D784 802185A4 4600A18D */ trunc.w.s $f6, $f20 /* 63D788 802185A8 44023000 */ mfc1 $v0, $f6 -/* 63D78C 802185AC 00000000 */ nop +/* 63D78C 802185AC 00000000 */ nop /* 63D790 802185B0 04420001 */ bltzl $v0, .L802185B8 /* 63D794 802185B4 00021023 */ negu $v0, $v0 .L802185B8: /* 63D798 802185B8 44821000 */ mtc1 $v0, $f2 -/* 63D79C 802185BC 00000000 */ nop +/* 63D79C 802185BC 00000000 */ nop /* 63D7A0 802185C0 468010A0 */ cvt.s.w $f2, $f2 /* 63D7A4 802185C4 46001103 */ div.s $f4, $f2, $f0 /* 63D7A8 802185C8 0000202D */ daddu $a0, $zero, $zero @@ -37,7 +37,7 @@ glabel func_80218588_63D768 /* 63D7E0 80218600 00471021 */ addu $v0, $v0, $a3 /* 63D7E4 80218604 C4400000 */ lwc1 $f0, ($v0) /* 63D7E8 80218608 4604003C */ c.lt.s $f0, $f4 -/* 63D7EC 8021860C 00000000 */ nop +/* 63D7EC 8021860C 00000000 */ nop /* 63D7F0 80218610 45020002 */ bc1fl .L8021861C /* 63D7F4 80218614 0060302D */ daddu $a2, $v1, $zero /* 63D7F8 80218618 0060202D */ daddu $a0, $v1, $zero @@ -62,43 +62,43 @@ glabel func_80218588_63D768 /* 63D840 80218660 46001085 */ abs.s $f2, $f2 /* 63D844 80218664 46000005 */ abs.s $f0, $f0 /* 63D848 80218668 4600103C */ c.lt.s $f2, $f0 -/* 63D84C 8021866C 00000000 */ nop +/* 63D84C 8021866C 00000000 */ nop /* 63D850 80218670 45000002 */ bc1f .L8021867C /* 63D854 80218674 00C0182D */ daddu $v1, $a2, $zero /* 63D858 80218678 0080182D */ daddu $v1, $a0, $zero .L8021867C: /* 63D85C 8021867C 44800000 */ mtc1 $zero, $f0 -/* 63D860 80218680 00000000 */ nop +/* 63D860 80218680 00000000 */ nop /* 63D864 80218684 4600B03C */ c.lt.s $f22, $f0 -/* 63D868 80218688 00000000 */ nop +/* 63D868 80218688 00000000 */ nop /* 63D86C 8021868C 4500000A */ bc1f .L802186B8 -/* 63D870 80218690 00000000 */ nop +/* 63D870 80218690 00000000 */ nop /* 63D874 80218694 4614003E */ c.le.s $f0, $f20 -/* 63D878 80218698 00000000 */ nop +/* 63D878 80218698 00000000 */ nop /* 63D87C 8021869C 45000004 */ bc1f .L802186B0 /* 63D880 802186A0 240200B4 */ addiu $v0, $zero, 0xb4 /* 63D884 802186A4 00431823 */ subu $v1, $v0, $v1 /* 63D888 802186A8 44800000 */ mtc1 $zero, $f0 -/* 63D88C 802186AC 00000000 */ nop +/* 63D88C 802186AC 00000000 */ nop .L802186B0: /* 63D890 802186B0 4600B03C */ c.lt.s $f22, $f0 -/* 63D894 802186B4 00000000 */ nop +/* 63D894 802186B4 00000000 */ nop .L802186B8: /* 63D898 802186B8 45000005 */ bc1f .L802186D0 -/* 63D89C 802186BC 00000000 */ nop +/* 63D89C 802186BC 00000000 */ nop /* 63D8A0 802186C0 4600A03C */ c.lt.s $f20, $f0 -/* 63D8A4 802186C4 00000000 */ nop +/* 63D8A4 802186C4 00000000 */ nop /* 63D8A8 802186C8 45030001 */ bc1tl .L802186D0 /* 63D8AC 802186CC 246300B4 */ addiu $v1, $v1, 0xb4 .L802186D0: /* 63D8B0 802186D0 44800000 */ mtc1 $zero, $f0 -/* 63D8B4 802186D4 00000000 */ nop +/* 63D8B4 802186D4 00000000 */ nop /* 63D8B8 802186D8 4616003E */ c.le.s $f0, $f22 -/* 63D8BC 802186DC 00000000 */ nop +/* 63D8BC 802186DC 00000000 */ nop /* 63D8C0 802186E0 45000006 */ bc1f .L802186FC -/* 63D8C4 802186E4 00000000 */ nop +/* 63D8C4 802186E4 00000000 */ nop /* 63D8C8 802186E8 4600A03C */ c.lt.s $f20, $f0 -/* 63D8CC 802186EC 00000000 */ nop +/* 63D8CC 802186EC 00000000 */ nop /* 63D8D0 802186F0 45000002 */ bc1f .L802186FC /* 63D8D4 802186F4 24020168 */ addiu $v0, $zero, 0x168 /* 63D8D8 802186F8 00431823 */ subu $v1, $v0, $v1 diff --git a/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s b/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s index d1a8c7d962..c7dc2fd3e3 100644 --- a/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s +++ b/asm/nonmatchings/battle/area_tik/5ED010/func_80218B80_5ED010.s @@ -32,58 +32,58 @@ glabel func_80218B80_5ED010 /* 5ED07C 80218BEC C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED080 80218BF0 46001081 */ sub.s $f2, $f2, $f0 /* 5ED084 80218BF4 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED088 80218BF8 00000000 */ nop +/* 5ED088 80218BF8 00000000 */ nop /* 5ED08C 80218BFC C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED090 80218C00 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED094 80218C04 46001081 */ sub.s $f2, $f2, $f0 /* 5ED098 80218C08 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED09C 80218C0C 00000000 */ nop +/* 5ED09C 80218C0C 00000000 */ nop /* 5ED0A0 80218C10 92020191 */ lbu $v0, 0x191($s0) /* 5ED0A4 80218C14 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED0A8 80218C18 44820000 */ mtc1 $v0, $f0 -/* 5ED0AC 80218C1C 00000000 */ nop +/* 5ED0AC 80218C1C 00000000 */ nop /* 5ED0B0 80218C20 46800020 */ cvt.s.w $f0, $f0 /* 5ED0B4 80218C24 46001080 */ add.s $f2, $f2, $f0 /* 5ED0B8 80218C28 3C013FC0 */ lui $at, 0x3fc0 /* 5ED0BC 80218C2C 44810000 */ mtc1 $at, $f0 -/* 5ED0C0 80218C30 00000000 */ nop +/* 5ED0C0 80218C30 00000000 */ nop /* 5ED0C4 80218C34 46001081 */ sub.s $f2, $f2, $f0 /* 5ED0C8 80218C38 46043300 */ add.s $f12, $f6, $f4 /* 5ED0CC 80218C3C C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED0D0 80218C40 46001501 */ sub.s $f20, $f2, $f0 /* 5ED0D4 80218C44 46006084 */ sqrt.s $f2, $f12 /* 5ED0D8 80218C48 46021032 */ c.eq.s $f2, $f2 -/* 5ED0DC 80218C4C 00000000 */ nop +/* 5ED0DC 80218C4C 00000000 */ nop /* 5ED0E0 80218C50 45010004 */ bc1t .L80218C64 -/* 5ED0E4 80218C54 00000000 */ nop +/* 5ED0E4 80218C54 00000000 */ nop /* 5ED0E8 80218C58 0C0187BC */ jal sqrtf -/* 5ED0EC 80218C5C 00000000 */ nop +/* 5ED0EC 80218C5C 00000000 */ nop /* 5ED0F0 80218C60 46000086 */ mov.s $f2, $f0 .L80218C64: /* 5ED0F4 80218C64 44800000 */ mtc1 $zero, $f0 -/* 5ED0F8 80218C68 00000000 */ nop +/* 5ED0F8 80218C68 00000000 */ nop /* 5ED0FC 80218C6C 4614003C */ c.lt.s $f0, $f20 -/* 5ED100 80218C70 00000000 */ nop +/* 5ED100 80218C70 00000000 */ nop /* 5ED104 80218C74 45000017 */ bc1f .L80218CD4 /* 5ED108 80218C78 46001106 */ mov.s $f4, $f2 /* 5ED10C 80218C7C 92020191 */ lbu $v0, 0x191($s0) /* 5ED110 80218C80 44820000 */ mtc1 $v0, $f0 -/* 5ED114 80218C84 00000000 */ nop +/* 5ED114 80218C84 00000000 */ nop /* 5ED118 80218C88 46800020 */ cvt.s.w $f0, $f0 /* 5ED11C 80218C8C 4600A03C */ c.lt.s $f20, $f0 -/* 5ED120 80218C90 00000000 */ nop +/* 5ED120 80218C90 00000000 */ nop /* 5ED124 80218C94 4500000F */ bc1f .L80218CD4 -/* 5ED128 80218C98 00000000 */ nop +/* 5ED128 80218C98 00000000 */ nop /* 5ED12C 80218C9C 92020190 */ lbu $v0, 0x190($s0) /* 5ED130 80218CA0 3C013F00 */ lui $at, 0x3f00 /* 5ED134 80218CA4 44811000 */ mtc1 $at, $f2 /* 5ED138 80218CA8 44820000 */ mtc1 $v0, $f0 -/* 5ED13C 80218CAC 00000000 */ nop +/* 5ED13C 80218CAC 00000000 */ nop /* 5ED140 80218CB0 46800020 */ cvt.s.w $f0, $f0 /* 5ED144 80218CB4 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED148 80218CB8 00000000 */ nop +/* 5ED148 80218CB8 00000000 */ nop /* 5ED14C 80218CBC 4600203C */ c.lt.s $f4, $f0 -/* 5ED150 80218CC0 00000000 */ nop +/* 5ED150 80218CC0 00000000 */ nop /* 5ED154 80218CC4 45000003 */ bc1f .L80218CD4 /* 5ED158 80218CC8 24020001 */ addiu $v0, $zero, 1 /* 5ED15C 80218CCC 080863F7 */ j .L80218FDC @@ -96,58 +96,58 @@ glabel func_80218B80_5ED010 /* 5ED174 80218CE4 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED178 80218CE8 46001081 */ sub.s $f2, $f2, $f0 /* 5ED17C 80218CEC 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED180 80218CF0 00000000 */ nop +/* 5ED180 80218CF0 00000000 */ nop /* 5ED184 80218CF4 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED188 80218CF8 C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED18C 80218CFC 46001081 */ sub.s $f2, $f2, $f0 /* 5ED190 80218D00 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED194 80218D04 00000000 */ nop +/* 5ED194 80218D04 00000000 */ nop /* 5ED198 80218D08 92020191 */ lbu $v0, 0x191($s0) /* 5ED19C 80218D0C C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED1A0 80218D10 44820000 */ mtc1 $v0, $f0 -/* 5ED1A4 80218D14 00000000 */ nop +/* 5ED1A4 80218D14 00000000 */ nop /* 5ED1A8 80218D18 46800020 */ cvt.s.w $f0, $f0 /* 5ED1AC 80218D1C 46001080 */ add.s $f2, $f2, $f0 /* 5ED1B0 80218D20 3C013FC0 */ lui $at, 0x3fc0 /* 5ED1B4 80218D24 44810000 */ mtc1 $at, $f0 -/* 5ED1B8 80218D28 00000000 */ nop +/* 5ED1B8 80218D28 00000000 */ nop /* 5ED1BC 80218D2C 46001081 */ sub.s $f2, $f2, $f0 /* 5ED1C0 80218D30 46043300 */ add.s $f12, $f6, $f4 /* 5ED1C4 80218D34 C620009C */ lwc1 $f0, 0x9c($s1) /* 5ED1C8 80218D38 46001501 */ sub.s $f20, $f2, $f0 /* 5ED1CC 80218D3C 46006084 */ sqrt.s $f2, $f12 /* 5ED1D0 80218D40 46021032 */ c.eq.s $f2, $f2 -/* 5ED1D4 80218D44 00000000 */ nop +/* 5ED1D4 80218D44 00000000 */ nop /* 5ED1D8 80218D48 45010004 */ bc1t .L80218D5C -/* 5ED1DC 80218D4C 00000000 */ nop +/* 5ED1DC 80218D4C 00000000 */ nop /* 5ED1E0 80218D50 0C0187BC */ jal sqrtf -/* 5ED1E4 80218D54 00000000 */ nop +/* 5ED1E4 80218D54 00000000 */ nop /* 5ED1E8 80218D58 46000086 */ mov.s $f2, $f0 .L80218D5C: /* 5ED1EC 80218D5C 44800000 */ mtc1 $zero, $f0 -/* 5ED1F0 80218D60 00000000 */ nop +/* 5ED1F0 80218D60 00000000 */ nop /* 5ED1F4 80218D64 4614003C */ c.lt.s $f0, $f20 -/* 5ED1F8 80218D68 00000000 */ nop +/* 5ED1F8 80218D68 00000000 */ nop /* 5ED1FC 80218D6C 4500001B */ bc1f .L80218DDC /* 5ED200 80218D70 46001106 */ mov.s $f4, $f2 /* 5ED204 80218D74 92020191 */ lbu $v0, 0x191($s0) /* 5ED208 80218D78 44820000 */ mtc1 $v0, $f0 -/* 5ED20C 80218D7C 00000000 */ nop +/* 5ED20C 80218D7C 00000000 */ nop /* 5ED210 80218D80 46800020 */ cvt.s.w $f0, $f0 /* 5ED214 80218D84 4600A03C */ c.lt.s $f20, $f0 -/* 5ED218 80218D88 00000000 */ nop +/* 5ED218 80218D88 00000000 */ nop /* 5ED21C 80218D8C 45000014 */ bc1f .L80218DE0 /* 5ED220 80218D90 0000982D */ daddu $s3, $zero, $zero /* 5ED224 80218D94 92020190 */ lbu $v0, 0x190($s0) /* 5ED228 80218D98 3C013F00 */ lui $at, 0x3f00 /* 5ED22C 80218D9C 44811000 */ mtc1 $at, $f2 /* 5ED230 80218DA0 44820000 */ mtc1 $v0, $f0 -/* 5ED234 80218DA4 00000000 */ nop +/* 5ED234 80218DA4 00000000 */ nop /* 5ED238 80218DA8 46800020 */ cvt.s.w $f0, $f0 /* 5ED23C 80218DAC 46020002 */ mul.s $f0, $f0, $f2 -/* 5ED240 80218DB0 00000000 */ nop +/* 5ED240 80218DB0 00000000 */ nop /* 5ED244 80218DB4 4600203C */ c.lt.s $f4, $f0 -/* 5ED248 80218DB8 00000000 */ nop +/* 5ED248 80218DB8 00000000 */ nop /* 5ED24C 80218DBC 45000008 */ bc1f .L80218DE0 /* 5ED250 80218DC0 24020001 */ addiu $v0, $zero, 1 /* 5ED254 80218DC4 080863F7 */ j .L80218FDC @@ -179,16 +179,16 @@ glabel func_80218B80_5ED010 /* 5ED2A8 80218E18 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED2AC 80218E1C 46001081 */ sub.s $f2, $f2, $f0 /* 5ED2B0 80218E20 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED2B4 80218E24 00000000 */ nop +/* 5ED2B4 80218E24 00000000 */ nop /* 5ED2B8 80218E28 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED2BC 80218E2C C602014C */ lwc1 $f2, 0x14c($s0) /* 5ED2C0 80218E30 46001081 */ sub.s $f2, $f2, $f0 /* 5ED2C4 80218E34 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED2C8 80218E38 00000000 */ nop +/* 5ED2C8 80218E38 00000000 */ nop /* 5ED2CC 80218E3C 92020191 */ lbu $v0, 0x191($s0) /* 5ED2D0 80218E40 C6020148 */ lwc1 $f2, 0x148($s0) /* 5ED2D4 80218E44 44820000 */ mtc1 $v0, $f0 -/* 5ED2D8 80218E48 00000000 */ nop +/* 5ED2D8 80218E48 00000000 */ nop /* 5ED2DC 80218E4C 46800020 */ cvt.s.w $f0, $f0 /* 5ED2E0 80218E50 46001080 */ add.s $f2, $f2, $f0 /* 5ED2E4 80218E54 461A1081 */ sub.s $f2, $f2, $f26 @@ -197,32 +197,32 @@ glabel func_80218B80_5ED010 /* 5ED2F0 80218E60 46001501 */ sub.s $f20, $f2, $f0 /* 5ED2F4 80218E64 46006004 */ sqrt.s $f0, $f12 /* 5ED2F8 80218E68 46000032 */ c.eq.s $f0, $f0 -/* 5ED2FC 80218E6C 00000000 */ nop +/* 5ED2FC 80218E6C 00000000 */ nop /* 5ED300 80218E70 45010003 */ bc1t .L80218E80 -/* 5ED304 80218E74 00000000 */ nop +/* 5ED304 80218E74 00000000 */ nop /* 5ED308 80218E78 0C0187BC */ jal sqrtf -/* 5ED30C 80218E7C 00000000 */ nop +/* 5ED30C 80218E7C 00000000 */ nop .L80218E80: /* 5ED310 80218E80 4614C03C */ c.lt.s $f24, $f20 -/* 5ED314 80218E84 00000000 */ nop +/* 5ED314 80218E84 00000000 */ nop /* 5ED318 80218E88 45000013 */ bc1f .L80218ED8 /* 5ED31C 80218E8C 46000106 */ mov.s $f4, $f0 /* 5ED320 80218E90 92020191 */ lbu $v0, 0x191($s0) /* 5ED324 80218E94 44820000 */ mtc1 $v0, $f0 -/* 5ED328 80218E98 00000000 */ nop +/* 5ED328 80218E98 00000000 */ nop /* 5ED32C 80218E9C 46800020 */ cvt.s.w $f0, $f0 /* 5ED330 80218EA0 4600A03C */ c.lt.s $f20, $f0 -/* 5ED334 80218EA4 00000000 */ nop +/* 5ED334 80218EA4 00000000 */ nop /* 5ED338 80218EA8 4500000B */ bc1f .L80218ED8 -/* 5ED33C 80218EAC 00000000 */ nop +/* 5ED33C 80218EAC 00000000 */ nop /* 5ED340 80218EB0 92020190 */ lbu $v0, 0x190($s0) /* 5ED344 80218EB4 44820000 */ mtc1 $v0, $f0 -/* 5ED348 80218EB8 00000000 */ nop +/* 5ED348 80218EB8 00000000 */ nop /* 5ED34C 80218EBC 46800020 */ cvt.s.w $f0, $f0 /* 5ED350 80218EC0 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED354 80218EC4 00000000 */ nop +/* 5ED354 80218EC4 00000000 */ nop /* 5ED358 80218EC8 4600203C */ c.lt.s $f4, $f0 -/* 5ED35C 80218ECC 00000000 */ nop +/* 5ED35C 80218ECC 00000000 */ nop /* 5ED360 80218ED0 4501FFBE */ bc1t .L80218DCC /* 5ED364 80218ED4 24020001 */ addiu $v0, $zero, 1 .L80218ED8: @@ -235,21 +235,21 @@ glabel func_80218B80_5ED010 /* 5ED37C 80218EEC 14400034 */ bnez $v0, .L80218FC0 /* 5ED380 80218EF0 00751024 */ and $v0, $v1, $s5 /* 5ED384 80218EF4 10400032 */ beqz $v0, .L80218FC0 -/* 5ED388 80218EF8 00000000 */ nop +/* 5ED388 80218EF8 00000000 */ nop /* 5ED38C 80218EFC C6020058 */ lwc1 $f2, 0x58($s0) /* 5ED390 80218F00 C6200098 */ lwc1 $f0, 0x98($s1) /* 5ED394 80218F04 46001081 */ sub.s $f2, $f2, $f0 /* 5ED398 80218F08 46021182 */ mul.s $f6, $f2, $f2 -/* 5ED39C 80218F0C 00000000 */ nop +/* 5ED39C 80218F0C 00000000 */ nop /* 5ED3A0 80218F10 C62000A0 */ lwc1 $f0, 0xa0($s1) /* 5ED3A4 80218F14 C6020060 */ lwc1 $f2, 0x60($s0) /* 5ED3A8 80218F18 46001081 */ sub.s $f2, $f2, $f0 /* 5ED3AC 80218F1C 46021102 */ mul.s $f4, $f2, $f2 -/* 5ED3B0 80218F20 00000000 */ nop +/* 5ED3B0 80218F20 00000000 */ nop /* 5ED3B4 80218F24 92020073 */ lbu $v0, 0x73($s0) /* 5ED3B8 80218F28 C600005C */ lwc1 $f0, 0x5c($s0) /* 5ED3BC 80218F2C 44821000 */ mtc1 $v0, $f2 -/* 5ED3C0 80218F30 00000000 */ nop +/* 5ED3C0 80218F30 00000000 */ nop /* 5ED3C4 80218F34 468010A0 */ cvt.s.w $f2, $f2 /* 5ED3C8 80218F38 46020000 */ add.s $f0, $f0, $f2 /* 5ED3CC 80218F3C 461A0001 */ sub.s $f0, $f0, $f26 @@ -258,38 +258,38 @@ glabel func_80218B80_5ED010 /* 5ED3D8 80218F48 46020501 */ sub.s $f20, $f0, $f2 /* 5ED3DC 80218F4C 46006004 */ sqrt.s $f0, $f12 /* 5ED3E0 80218F50 46000032 */ c.eq.s $f0, $f0 -/* 5ED3E4 80218F54 00000000 */ nop +/* 5ED3E4 80218F54 00000000 */ nop /* 5ED3E8 80218F58 45010003 */ bc1t .L80218F68 -/* 5ED3EC 80218F5C 00000000 */ nop +/* 5ED3EC 80218F5C 00000000 */ nop /* 5ED3F0 80218F60 0C0187BC */ jal sqrtf -/* 5ED3F4 80218F64 00000000 */ nop +/* 5ED3F4 80218F64 00000000 */ nop .L80218F68: /* 5ED3F8 80218F68 4614C03C */ c.lt.s $f24, $f20 -/* 5ED3FC 80218F6C 00000000 */ nop +/* 5ED3FC 80218F6C 00000000 */ nop /* 5ED400 80218F70 45000013 */ bc1f .L80218FC0 /* 5ED404 80218F74 46000106 */ mov.s $f4, $f0 /* 5ED408 80218F78 92020073 */ lbu $v0, 0x73($s0) /* 5ED40C 80218F7C 44820000 */ mtc1 $v0, $f0 -/* 5ED410 80218F80 00000000 */ nop +/* 5ED410 80218F80 00000000 */ nop /* 5ED414 80218F84 46800020 */ cvt.s.w $f0, $f0 /* 5ED418 80218F88 4600A03C */ c.lt.s $f20, $f0 -/* 5ED41C 80218F8C 00000000 */ nop +/* 5ED41C 80218F8C 00000000 */ nop /* 5ED420 80218F90 4500000B */ bc1f .L80218FC0 -/* 5ED424 80218F94 00000000 */ nop +/* 5ED424 80218F94 00000000 */ nop /* 5ED428 80218F98 92020072 */ lbu $v0, 0x72($s0) /* 5ED42C 80218F9C 44820000 */ mtc1 $v0, $f0 -/* 5ED430 80218FA0 00000000 */ nop +/* 5ED430 80218FA0 00000000 */ nop /* 5ED434 80218FA4 46800020 */ cvt.s.w $f0, $f0 /* 5ED438 80218FA8 46160002 */ mul.s $f0, $f0, $f22 -/* 5ED43C 80218FAC 00000000 */ nop +/* 5ED43C 80218FAC 00000000 */ nop /* 5ED440 80218FB0 4600203C */ c.lt.s $f4, $f0 -/* 5ED444 80218FB4 00000000 */ nop +/* 5ED444 80218FB4 00000000 */ nop /* 5ED448 80218FB8 4501FF86 */ bc1t .L80218DD4 /* 5ED44C 80218FBC 24020001 */ addiu $v0, $zero, 1 .L80218FC0: /* 5ED450 80218FC0 8E10000C */ lw $s0, 0xc($s0) /* 5ED454 80218FC4 1600FFC7 */ bnez $s0, .L80218EE4 -/* 5ED458 80218FC8 00000000 */ nop +/* 5ED458 80218FC8 00000000 */ nop /* 5ED45C 80218FCC 26730001 */ addiu $s3, $s3, 1 .L80218FD0: /* 5ED460 80218FD0 2A620018 */ slti $v0, $s3, 0x18 @@ -310,6 +310,6 @@ glabel func_80218B80_5ED010 /* 5ED498 80219008 D7B40030 */ ldc1 $f20, 0x30($sp) /* 5ED49C 8021900C 03E00008 */ jr $ra /* 5ED4A0 80219010 27BD0050 */ addiu $sp, $sp, 0x50 -/* 5ED4A4 80219014 00000000 */ nop -/* 5ED4A8 80219018 00000000 */ nop -/* 5ED4AC 8021901C 00000000 */ nop +/* 5ED4A4 80219014 00000000 */ nop +/* 5ED4A8 80219018 00000000 */ nop +/* 5ED4AC 8021901C 00000000 */ nop diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s b/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s index 4867a57b93..b2ae151b88 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E13B8.s @@ -9,8 +9,8 @@ glabel func_802E13B8 /* 102C48 802E13C8 AFB10014 */ sw $s1, 0x14($sp) /* 102C4C 802E13CC 0C0B8DB9 */ jal entity_init_Hammer23Block_normal /* 102C50 802E13D0 8E110040 */ lw $s1, 0x40($s0) -/* 102C54 802E13D4 3C02802E */ lui $v0, %hi(D_802E0DE0) -/* 102C58 802E13D8 24420DE0 */ addiu $v0, $v0, %lo(D_802E0DE0) +/* 102C54 802E13D4 3C02802E */ lui $v0, %hi(func_802E0DE0) +/* 102C58 802E13D8 24420DE0 */ addiu $v0, $v0, %lo(func_802E0DE0) /* 102C5C 802E13DC AE02003C */ sw $v0, 0x3c($s0) /* 102C60 802E13E0 24020008 */ addiu $v0, $zero, 8 /* 102C64 802E13E4 A6220004 */ sh $v0, 4($s1) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s b/asm/nonmatchings/code_102610_len_2330/func_802E246C.s index 272330aebe..d0247ed57a 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E246C.s @@ -21,8 +21,8 @@ glabel func_802E246C /* 103D2C 802E24AC 8EB00040 */ lw $s0, 0x40($s5) /* 103D30 802E24B0 00451021 */ addu $v0, $v0, $a1 /* 103D34 802E24B4 AE020034 */ sw $v0, 0x34($s0) -/* 103D38 802E24B8 3C02802E */ lui $v0, %hi(D_802E2BA4) -/* 103D3C 802E24BC 24422BA4 */ addiu $v0, $v0, %lo(D_802E2BA4) +/* 103D38 802E24B8 3C02802E */ lui $v0, %hi(func_802E2BA4) +/* 103D3C 802E24BC 24422BA4 */ addiu $v0, $v0, %lo(func_802E2BA4) /* 103D40 802E24C0 AEA2003C */ sw $v0, 0x3c($s5) /* 103D44 802E24C4 240200FF */ addiu $v0, $zero, 0xff /* 103D48 802E24C8 A2A2000B */ sb $v0, 0xb($s5) diff --git a/asm/nonmatchings/code_104940_len_dc0/entity_init_Hammer1Block_normal.s b/asm/nonmatchings/code_104940_len_dc0/entity_init_Hammer1Block_normal.s index 01bf647333..de9560ccdd 100644 --- a/asm/nonmatchings/code_104940_len_dc0/entity_init_Hammer1Block_normal.s +++ b/asm/nonmatchings/code_104940_len_dc0/entity_init_Hammer1Block_normal.s @@ -7,8 +7,8 @@ glabel entity_init_Hammer1Block_normal /* 105688 802E3E08 AFBF0014 */ sw $ra, 0x14($sp) /* 10568C 802E3E0C 0C0B8DB9 */ jal entity_init_Hammer23Block_normal /* 105690 802E3E10 0080802D */ daddu $s0, $a0, $zero -/* 105694 802E3E14 3C02802E */ lui $v0, %hi(D_802E30C0) -/* 105698 802E3E18 244230C0 */ addiu $v0, $v0, %lo(D_802E30C0) +/* 105694 802E3E14 3C02802E */ lui $v0, %hi(func_802E30C0) +/* 105698 802E3E18 244230C0 */ addiu $v0, $v0, %lo(func_802E30C0) /* 10569C 802E3E1C AE02003C */ sw $v0, 0x3c($s0) /* 1056A0 802E3E20 8FBF0014 */ lw $ra, 0x14($sp) /* 1056A4 802E3E24 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E464C.s b/asm/nonmatchings/code_105700_len_2130/func_802E464C.s index edb7b61330..ecd7ae8386 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E464C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E464C.s @@ -13,8 +13,8 @@ glabel func_802E464C /* 105EEC 802E466C A4620010 */ sh $v0, 0x10($v1) /* 105EF0 802E4670 3402FFFF */ ori $v0, $zero, 0xffff /* 105EF4 802E4674 A462000A */ sh $v0, 0xa($v1) -/* 105EF8 802E4678 3C02802E */ lui $v0, %hi(D_802E455C) -/* 105EFC 802E467C 2442455C */ addiu $v0, $v0, %lo(D_802E455C) +/* 105EF8 802E4678 3C02802E */ lui $v0, %hi(func_802E455C) +/* 105EFC 802E467C 2442455C */ addiu $v0, $v0, %lo(func_802E455C) /* 105F00 802E4680 AE02003C */ sw $v0, 0x3c($s0) /* 105F04 802E4684 8FBF0014 */ lw $ra, 0x14($sp) /* 105F08 802E4688 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s b/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s index 38e9ec253e..91ba6dfa63 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s @@ -8,8 +8,8 @@ glabel func_802E46BC /* 105F48 802E46C8 0C0B8DB9 */ jal entity_init_Hammer23Block_normal /* 105F4C 802E46CC 0080802D */ daddu $s0, $a0, $zero /* 105F50 802E46D0 86040014 */ lh $a0, 0x14($s0) -/* 105F54 802E46D4 3C02802E */ lui $v0, %hi(D_802E455C) -/* 105F58 802E46D8 2442455C */ addiu $v0, $v0, %lo(D_802E455C) +/* 105F54 802E46D4 3C02802E */ lui $v0, %hi(func_802E455C) +/* 105F58 802E46D8 2442455C */ addiu $v0, $v0, %lo(func_802E455C) /* 105F5C 802E46DC 0C047FF8 */ jal get_anim_mesh /* 105F60 802E46E0 AE02003C */ sw $v0, 0x3c($s0) /* 105F64 802E46E4 24030011 */ addiu $v1, $zero, 0x11 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s b/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s index 57616a6889..6793c597cf 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s @@ -5,8 +5,8 @@ glabel func_802E4B60 /* 1063E0 802E4B60 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 1063E4 802E4B64 AFB10014 */ sw $s1, 0x14($sp) /* 1063E8 802E4B68 0080882D */ daddu $s1, $a0, $zero -/* 1063EC 802E4B6C 3C02802E */ lui $v0, %hi(D_802E4AEC) -/* 1063F0 802E4B70 24424AEC */ addiu $v0, $v0, %lo(D_802E4AEC) +/* 1063EC 802E4B6C 3C02802E */ lui $v0, %hi(func_802E4AEC) +/* 1063F0 802E4B70 24424AEC */ addiu $v0, $v0, %lo(func_802E4AEC) /* 1063F4 802E4B74 AFBF0018 */ sw $ra, 0x18($sp) /* 1063F8 802E4B78 AFB00010 */ sw $s0, 0x10($sp) /* 1063FC 802E4B7C AE22003C */ sw $v0, 0x3c($s1) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s b/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s index 5eb7436e56..8979c81900 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s @@ -68,8 +68,8 @@ glabel func_802E4E04 /* 106780 802E4F00 AE220000 */ sw $v0, ($s1) /* 106784 802E4F04 0C0442F3 */ jal func_80110BCC /* 106788 802E4F08 E6000054 */ swc1 $f0, 0x54($s0) -/* 10678C 802E4F0C 3C02802E */ lui $v0, %hi(D_802E4AEC) -/* 106790 802E4F10 24424AEC */ addiu $v0, $v0, %lo(D_802E4AEC) +/* 10678C 802E4F0C 3C02802E */ lui $v0, %hi(func_802E4AEC) +/* 106790 802E4F10 24424AEC */ addiu $v0, $v0, %lo(func_802E4AEC) /* 106794 802E4F14 080B94BA */ j .L802E52E8 /* 106798 802E4F18 AE22003C */ sw $v0, 0x3c($s1) /* 10679C 802E4F1C C60C0020 */ lwc1 $f12, 0x20($s0) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5F50.s b/asm/nonmatchings/code_105700_len_2130/func_802E5F50.s index 0acb93698f..51a8a6dea5 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5F50.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5F50.s @@ -9,7 +9,7 @@ glabel func_802E5F50 /* 1077E0 802E5F60 3C020A00 */ lui $v0, 0xa00 /* 1077E4 802E5F64 24420380 */ addiu $v0, $v0, 0x380 /* 1077E8 802E5F68 AC62012C */ sw $v0, 0x12c($v1) -/* 1077EC 802E5F6C 3C02802E */ lui $v0, %hi(D_802E586C) -/* 1077F0 802E5F70 2442586C */ addiu $v0, $v0, %lo(D_802E586C) +/* 1077EC 802E5F6C 3C02802E */ lui $v0, %hi(func_802E586C) +/* 1077F0 802E5F70 2442586C */ addiu $v0, $v0, %lo(func_802E586C) /* 1077F4 802E5F74 03E00008 */ jr $ra /* 1077F8 802E5F78 AC82003C */ sw $v0, 0x3c($a0) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s b/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s index 7bb3970880..1398b65e75 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s @@ -9,8 +9,8 @@ glabel func_802E5F7C /* 10780C 802E5F8C 3C020A00 */ lui $v0, 0xa00 /* 107810 802E5F90 24420750 */ addiu $v0, $v0, 0x750 /* 107814 802E5F94 AC62012C */ sw $v0, 0x12c($v1) -/* 107818 802E5F98 3C02802E */ lui $v0, %hi(D_802E586C) -/* 10781C 802E5F9C 2442586C */ addiu $v0, $v0, %lo(D_802E586C) +/* 107818 802E5F98 3C02802E */ lui $v0, %hi(func_802E586C) +/* 10781C 802E5F9C 2442586C */ addiu $v0, $v0, %lo(func_802E586C) /* 107820 802E5FA0 03E00008 */ jr $ra /* 107824 802E5FA4 AC82003C */ sw $v0, 0x3c($a0) /* 107828 802E5FA8 00000000 */ nop diff --git a/asm/nonmatchings/code_1060_len_310/func_80025CC0.s b/asm/nonmatchings/code_1060_len_310/func_80025CC0.s index 7553b2b1f0..3936f75df9 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025CC0.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025CC0.s @@ -8,8 +8,8 @@ glabel func_80025CC0 /* 10CC 80025CCC AFA7000C */ sw $a3, 0xc($sp) /* 10D0 80025CD0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 10D4 80025CD4 0080302D */ daddu $a2, $a0, $zero -/* 10D8 80025CD8 3C048002 */ lui $a0, %hi(D_80025D74) -/* 10DC 80025CDC 24845D74 */ addiu $a0, $a0, %lo(D_80025D74) +/* 10D8 80025CD8 3C048002 */ lui $a0, %hi(func_80025D74) +/* 10DC 80025CDC 24845D74 */ addiu $a0, $a0, %lo(func_80025D74) /* 10E0 80025CE0 0000282D */ daddu $a1, $zero, $zero /* 10E4 80025CE4 AFBF0010 */ sw $ra, 0x10($sp) /* 10E8 80025CE8 0C0192A8 */ jal _Printf diff --git a/asm/nonmatchings/code_1060_len_310/func_80025CFC.s b/asm/nonmatchings/code_1060_len_310/func_80025CFC.s index 9efdeefcf4..a01264ce6d 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025CFC.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025CFC.s @@ -8,8 +8,8 @@ glabel func_80025CFC /* 1108 80025D08 AFA7000C */ sw $a3, 0xc($sp) /* 110C 80025D0C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1110 80025D10 0080302D */ daddu $a2, $a0, $zero -/* 1114 80025D14 3C048002 */ lui $a0, %hi(D_80025D74) -/* 1118 80025D18 24845D74 */ addiu $a0, $a0, %lo(D_80025D74) +/* 1114 80025D14 3C048002 */ lui $a0, %hi(func_80025D74) +/* 1118 80025D18 24845D74 */ addiu $a0, $a0, %lo(func_80025D74) /* 111C 80025D1C 0000282D */ daddu $a1, $zero, $zero /* 1120 80025D20 AFBF0010 */ sw $ra, 0x10($sp) /* 1124 80025D24 0C0192A8 */ jal _Printf diff --git a/asm/nonmatchings/code_1060_len_310/func_80025D38.s b/asm/nonmatchings/code_1060_len_310/func_80025D38.s index d7a13805fc..81be205538 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025D38.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025D38.s @@ -8,8 +8,8 @@ glabel func_80025D38 /* 1144 80025D44 AFA7000C */ sw $a3, 0xc($sp) /* 1148 80025D48 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 114C 80025D4C 0080302D */ daddu $a2, $a0, $zero -/* 1150 80025D50 3C048002 */ lui $a0, %hi(D_80025D74) -/* 1154 80025D54 24845D74 */ addiu $a0, $a0, %lo(D_80025D74) +/* 1150 80025D50 3C048002 */ lui $a0, %hi(func_80025D74) +/* 1154 80025D54 24845D74 */ addiu $a0, $a0, %lo(func_80025D74) /* 1158 80025D58 0000282D */ daddu $a1, $zero, $zero /* 115C 80025D5C AFBF0010 */ sw $ra, 0x10($sp) /* 1160 80025D60 0C0192A8 */ jal _Printf diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s b/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s index d5e58fe738..1ee54d3b80 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s @@ -18,8 +18,8 @@ glabel func_802E6C24 /* 1084D8 802E6C58 8E720040 */ lw $s2, 0x40($s3) /* 1084DC 802E6C5C 0C00A580 */ jal mem_clear /* 1084E0 802E6C60 24050010 */ addiu $a1, $zero, 0x10 -/* 1084E4 802E6C64 3C02802E */ lui $v0, %hi(D_802E61B0) -/* 1084E8 802E6C68 244261B0 */ addiu $v0, $v0, %lo(D_802E61B0) +/* 1084E4 802E6C64 3C02802E */ lui $v0, %hi(func_802E61B0) +/* 1084E8 802E6C68 244261B0 */ addiu $v0, $v0, %lo(func_802E61B0) /* 1084EC 802E6C6C AE62003C */ sw $v0, 0x3c($s3) /* 1084F0 802E6C70 3402FFFF */ ori $v0, $zero, 0xffff /* 1084F4 802E6C74 A6420006 */ sh $v0, 6($s2) diff --git a/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s b/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s index 881ed04755..4c61107c79 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s @@ -13,8 +13,8 @@ glabel entity_init_Chest /* 109624 802E7DA4 3C013F0F */ lui $at, 0x3f0f /* 109628 802E7DA8 34215C29 */ ori $at, $at, 0x5c29 /* 10962C 802E7DAC 44810000 */ mtc1 $at, $f0 -/* 109630 802E7DB0 3C02802E */ lui $v0, %hi(D_802E6ED8) -/* 109634 802E7DB4 24426ED8 */ addiu $v0, $v0, %lo(D_802E6ED8) +/* 109630 802E7DB0 3C02802E */ lui $v0, %hi(func_802E6ED8) +/* 109634 802E7DB4 24426ED8 */ addiu $v0, $v0, %lo(func_802E6ED8) /* 109638 802E7DB8 AE02003C */ sw $v0, 0x3c($s0) /* 10963C 802E7DBC E6000054 */ swc1 $f0, 0x54($s0) /* 109640 802E7DC0 E6000058 */ swc1 $f0, 0x58($s0) diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s index 4a721a79fa..2eed07bd78 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s @@ -7,8 +7,8 @@ glabel func_802E7D54 /* 1095DC 802E7D5C AFBF0014 */ sw $ra, 0x14($sp) /* 1095E0 802E7D60 0C0B9F4E */ jal func_802E7D38 /* 1095E4 802E7D64 0080802D */ daddu $s0, $a0, $zero -/* 1095E8 802E7D68 3C02802E */ lui $v0, %hi(D_802E6ED8) -/* 1095EC 802E7D6C 24426ED8 */ addiu $v0, $v0, %lo(D_802E6ED8) +/* 1095E8 802E7D68 3C02802E */ lui $v0, %hi(func_802E6ED8) +/* 1095EC 802E7D6C 24426ED8 */ addiu $v0, $v0, %lo(func_802E6ED8) /* 1095F0 802E7D70 AE02003C */ sw $v0, 0x3c($s0) /* 1095F4 802E7D74 8FBF0014 */ lw $ra, 0x14($sp) /* 1095F8 802E7D78 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s b/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s index 7a070ac315..f9e09e7897 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s @@ -26,8 +26,8 @@ glabel func_802E7DE0 /* 1096B4 802E7E34 4481A000 */ mtc1 $at, $f20 /* 1096B8 802E7E38 00451021 */ addu $v0, $v0, $a1 /* 1096BC 802E7E3C AE020008 */ sw $v0, 8($s0) -/* 1096C0 802E7E40 3C02802F */ lui $v0, %hi(D_802E854C) -/* 1096C4 802E7E44 2442854C */ addiu $v0, $v0, %lo(D_802E854C) +/* 1096C0 802E7E40 3C02802F */ lui $v0, %hi(func_802E854C) +/* 1096C4 802E7E44 2442854C */ addiu $v0, $v0, %lo(func_802E854C) /* 1096C8 802E7E48 AE62003C */ sw $v0, 0x3c($s3) /* 1096CC 802E7E4C 240200FF */ addiu $v0, $zero, 0xff /* 1096D0 802E7E50 A262000B */ sb $v0, 0xb($s3) diff --git a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s index 8a49d6a09a..dc7360f7b1 100644 --- a/asm/nonmatchings/code_11a50_len_7a0/step_intro.s +++ b/asm/nonmatchings/code_11a50_len_7a0/step_intro.s @@ -47,7 +47,7 @@ glabel step_intro /* 11CF4 800368F4 8C630964 */ lw $v1, %lo(D_800A0964)($v1) .L800368F8: /* 11CF8 800368F8 14620011 */ bne $v1, $v0, .L80036940 -/* 11CFC 800368FC 00000000 */ nop +/* 11CFC 800368FC 00000000 */ nop /* 11D00 80036900 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* 11D04 80036904 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) /* 11D08 80036908 908300AC */ lbu $v1, 0xac($a0) @@ -57,7 +57,7 @@ glabel step_intro /* 11D18 80036918 00021603 */ sra $v0, $v0, 0x18 /* 11D1C 8003691C 24030004 */ addiu $v1, $zero, 4 /* 11D20 80036920 14430007 */ bne $v0, $v1, .L80036940 -/* 11D24 80036924 00000000 */ nop +/* 11D24 80036924 00000000 */ nop .L80036928: /* 11D28 80036928 908200A8 */ lbu $v0, 0xa8($a0) /* 11D2C 8003692C 24420001 */ addiu $v0, $v0, 1 @@ -65,7 +65,7 @@ glabel step_intro /* 11D30 80036930 0C00D994 */ jal begin_state_intro /* 11D34 80036934 A08200A8 */ sb $v0, 0xa8($a0) /* 11D38 80036938 0800DB72 */ j .L80036DC8 -/* 11D3C 8003693C 00000000 */ nop +/* 11D3C 8003693C 00000000 */ nop .L80036940: /* 11D40 80036940 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 11D44 80036944 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -77,25 +77,25 @@ glabel step_intro /* 11D5C 8003695C 00220821 */ addu $at, $at, $v0 /* 11D60 80036960 8C228338 */ lw $v0, %lo(D_80098338)($at) /* 11D64 80036964 00400008 */ jr $v0 -/* 11D68 80036968 00000000 */ nop +/* 11D68 80036968 00000000 */ nop /* 11D6C 8003696C 0C016754 */ jal func_80059D50 -/* 11D70 80036970 00000000 */ nop +/* 11D70 80036970 00000000 */ nop /* 11D74 80036974 0C00B500 */ jal update_cameras -/* 11D78 80036978 00000000 */ nop +/* 11D78 80036978 00000000 */ nop /* 11D7C 8003697C 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 11D80 80036980 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 11D84 80036984 8E060000 */ lw $a2, ($s0) /* 11D88 80036988 80C300A8 */ lb $v1, 0xa8($a2) /* 11D8C 8003698C 2402FFFF */ addiu $v0, $zero, -1 /* 11D90 80036990 14620010 */ bne $v1, $v0, .L800369D4 -/* 11D94 80036994 00000000 */ nop +/* 11D94 80036994 00000000 */ nop /* 11D98 80036998 44806000 */ mtc1 $zero, $f12 /* 11D9C 8003699C 0C00AFC5 */ jal set_curtain_fade_goal -/* 11DA0 800369A0 00000000 */ nop +/* 11DA0 800369A0 00000000 */ nop /* 11DA4 800369A4 3C04800A */ lui $a0, %hi(D_800A0956) /* 11DA8 800369A8 84840956 */ lh $a0, %lo(D_800A0956)($a0) /* 11DAC 800369AC 0C00CE0C */ jal intro_logos_fade_out -/* 11DB0 800369B0 00000000 */ nop +/* 11DB0 800369B0 00000000 */ nop /* 11DB4 800369B4 104000F0 */ beqz $v0, .L80036D78 /* 11DB8 800369B8 24020001 */ addiu $v0, $zero, 1 /* 11DBC 800369BC 0000202D */ daddu $a0, $zero, $zero @@ -103,7 +103,7 @@ glabel step_intro /* 11DC4 800369C4 0C00AFC1 */ jal set_curtain_draw_callback /* 11DC8 800369C8 A06200AC */ sb $v0, 0xac($v1) /* 11DCC 800369CC 0800DB5E */ j .L80036D78 -/* 11DD0 800369D0 00000000 */ nop +/* 11DD0 800369D0 00000000 */ nop .L800369D4: /* 11DD4 800369D4 3C05800A */ lui $a1, %hi(D_800A0954) /* 11DD8 800369D8 24A50954 */ addiu $a1, $a1, %lo(D_800A0954) @@ -123,7 +123,7 @@ glabel step_intro /* 11E10 80036A10 0C00AFC1 */ jal set_curtain_draw_callback /* 11E14 80036A14 A0C200AC */ sb $v0, 0xac($a2) /* 11E18 80036A18 0800DB5E */ j .L80036D78 -/* 11E1C 80036A1C 00000000 */ nop +/* 11E1C 80036A1C 00000000 */ nop /* 11E20 80036A20 3C04800A */ lui $a0, %hi(D_8009A650) /* 11E24 80036A24 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* 11E28 80036A28 8C820000 */ lw $v0, ($a0) @@ -136,9 +136,9 @@ glabel step_intro /* 11E44 80036A44 8C630960 */ lw $v1, %lo(D_800A0960)($v1) /* 11E48 80036A48 2402000E */ addiu $v0, $zero, 0xe /* 11E4C 80036A4C 106200CA */ beq $v1, $v0, .L80036D78 -/* 11E50 80036A50 00000000 */ nop +/* 11E50 80036A50 00000000 */ nop /* 11E54 80036A54 0800DAA3 */ j .L80036A8C -/* 11E58 80036A58 00000000 */ nop +/* 11E58 80036A58 00000000 */ nop /* 11E5C 80036A5C 3C03800A */ lui $v1, %hi(D_800A0950) /* 11E60 80036A60 24630950 */ addiu $v1, $v1, %lo(D_800A0950) /* 11E64 80036A64 8C620000 */ lw $v0, ($v1) @@ -175,59 +175,59 @@ glabel step_intro /* 11EDC 80036ADC 14450037 */ bne $v0, $a1, .L80036BBC /* 11EE0 80036AE0 2404000B */ addiu $a0, $zero, 0xb /* 11EE4 80036AE4 0C00AB00 */ jal general_heap_create -/* 11EE8 80036AE8 00000000 */ nop +/* 11EE8 80036AE8 00000000 */ nop /* 11EEC 80036AEC 0C047624 */ jal func_8011D890 -/* 11EF0 80036AF0 00000000 */ nop +/* 11EF0 80036AF0 00000000 */ nop /* 11EF4 80036AF4 0C048C2E */ jal clear_dynamic_entity_list -/* 11EF8 80036AF8 00000000 */ nop +/* 11EF8 80036AF8 00000000 */ nop /* 11EFC 80036AFC 0C0B0C77 */ jal clear_script_list -/* 11F00 80036B00 00000000 */ nop +/* 11F00 80036B00 00000000 */ nop /* 11F04 80036B04 0C00B7BD */ jal create_cameras_a -/* 11F08 80036B08 00000000 */ nop +/* 11F08 80036B08 00000000 */ nop /* 11F0C 80036B0C 0C0B763E */ jal func_802DD8F8 /* 11F10 80036B10 0000202D */ daddu $a0, $zero, $zero /* 11F14 80036B14 0C0482EC */ jal clear_virtual_models -/* 11F18 80036B18 00000000 */ nop +/* 11F18 80036B18 00000000 */ nop /* 11F1C 80036B1C 0C047889 */ jal func_8011E224 -/* 11F20 80036B20 00000000 */ nop +/* 11F20 80036B20 00000000 */ nop /* 11F24 80036B24 0C045751 */ jal clear_model_data -/* 11F28 80036B28 00000000 */ nop +/* 11F28 80036B28 00000000 */ nop /* 11F2C 80036B2C 0C052010 */ jal func_80148040 -/* 11F30 80036B30 00000000 */ nop +/* 11F30 80036B30 00000000 */ nop /* 11F34 80036B34 0C05177E */ jal func_80145DF8 -/* 11F38 80036B38 00000000 */ nop +/* 11F38 80036B38 00000000 */ nop /* 11F3C 80036B3C 0C050440 */ jal func_80141100 -/* 11F40 80036B40 00000000 */ nop +/* 11F40 80036B40 00000000 */ nop /* 11F44 80036B44 0C0515A0 */ jal clear_trigger_data -/* 11F48 80036B48 00000000 */ nop +/* 11F48 80036B48 00000000 */ nop /* 11F4C 80036B4C 0C048D9D */ jal clear_printers -/* 11F50 80036B50 00000000 */ nop +/* 11F50 80036B50 00000000 */ nop /* 11F54 80036B54 0C04432E */ jal clear_entity_data /* 11F58 80036B58 0000202D */ daddu $a0, $zero, $zero /* 11F5C 80036B5C 0C04E042 */ jal func_80138108 -/* 11F60 80036B60 00000000 */ nop +/* 11F60 80036B60 00000000 */ nop /* 11F64 80036B64 0C037F14 */ jal clear_player_status -/* 11F68 80036B68 00000000 */ nop +/* 11F68 80036B68 00000000 */ nop /* 11F6C 80036B6C 0C00E12F */ jal clear_npcs -/* 11F70 80036B70 00000000 */ nop +/* 11F70 80036B70 00000000 */ nop /* 11F74 80036B74 0C039CE8 */ jal clear_player_data -/* 11F78 80036B78 00000000 */ nop +/* 11F78 80036B78 00000000 */ nop /* 11F7C 80036B7C 0C01CACC */ jal func_80072B30 -/* 11F80 80036B80 00000000 */ nop +/* 11F80 80036B80 00000000 */ nop /* 11F84 80036B84 0C00F8CE */ jal func_8003E338 -/* 11F88 80036B88 00000000 */ nop +/* 11F88 80036B88 00000000 */ nop /* 11F8C 80036B8C 0C016727 */ jal func_80059C9C -/* 11F90 80036B90 00000000 */ nop +/* 11F90 80036B90 00000000 */ nop /* 11F94 80036B94 0C04C3FC */ jal clear_item_entity_data -/* 11F98 80036B98 00000000 */ nop +/* 11F98 80036B98 00000000 */ nop /* 11F9C 80036B9C 0C0514C8 */ jal clear_saved_variables -/* 11FA0 80036BA0 00000000 */ nop +/* 11FA0 80036BA0 00000000 */ nop /* 11FA4 80036BA4 0C016BE5 */ jal initialize_collision -/* 11FA8 80036BA8 00000000 */ nop +/* 11FA8 80036BA8 00000000 */ nop /* 11FAC 80036BAC 0C00CD3C */ jal set_game_mode /* 11FB0 80036BB0 24040002 */ addiu $a0, $zero, 2 /* 11FB4 80036BB4 0800DB72 */ j .L80036DC8 -/* 11FB8 80036BB8 00000000 */ nop +/* 11FB8 80036BB8 00000000 */ nop .L80036BBC: /* 11FBC 80036BBC 26230058 */ addiu $v1, $s1, 0x58 /* 11FC0 80036BC0 2402000A */ addiu $v0, $zero, 0xa @@ -262,7 +262,7 @@ glabel step_intro /* 12030 80036C30 0C03805E */ jal disable_player_input /* 12034 80036C34 A06200AC */ sb $v0, 0xac($v1) /* 12038 80036C38 0800DB5E */ j .L80036D78 -/* 1203C 80036C3C 00000000 */ nop +/* 1203C 80036C3C 00000000 */ nop /* 12040 80036C40 3C04800A */ lui $a0, %hi(D_800A0960) /* 12044 80036C44 24840960 */ addiu $a0, $a0, %lo(D_800A0960) /* 12048 80036C48 8C830000 */ lw $v1, ($a0) @@ -294,13 +294,13 @@ glabel step_intro /* 120AC 80036CAC 0C037DD0 */ jal update_player /* 120B0 80036CB0 AC830000 */ sw $v1, ($a0) /* 120B4 80036CB4 0C00F949 */ jal func_8003E524 -/* 120B8 80036CB8 00000000 */ nop +/* 120B8 80036CB8 00000000 */ nop /* 120BC 80036CBC 0C00E64C */ jal update_npcs -/* 120C0 80036CC0 00000000 */ nop +/* 120C0 80036CC0 00000000 */ nop /* 120C4 80036CC4 0C016754 */ jal func_80059D50 -/* 120C8 80036CC8 00000000 */ nop +/* 120C8 80036CC8 00000000 */ nop /* 120CC 80036CCC 0C00B500 */ jal update_cameras -/* 120D0 80036CD0 00000000 */ nop +/* 120D0 80036CD0 00000000 */ nop /* 120D4 80036CD4 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 120D8 80036CD8 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 120DC 80036CDC 8E020000 */ lw $v0, ($s0) @@ -314,11 +314,11 @@ glabel step_intro /* 120FC 80036CFC 0800DB5E */ j .L80036D78 /* 12100 80036D00 A4440088 */ sh $a0, 0x88($v0) /* 12104 80036D04 0C016754 */ jal func_80059D50 -/* 12108 80036D08 00000000 */ nop +/* 12108 80036D08 00000000 */ nop /* 1210C 80036D0C 0C00B500 */ jal update_cameras -/* 12110 80036D10 00000000 */ nop +/* 12110 80036D10 00000000 */ nop /* 12114 80036D14 0C00E64C */ jal update_npcs -/* 12118 80036D18 00000000 */ nop +/* 12118 80036D18 00000000 */ nop /* 1211C 80036D1C 3C04800A */ lui $a0, %hi(D_800A0954) /* 12120 80036D20 24840954 */ addiu $a0, $a0, %lo(D_800A0954) /* 12124 80036D24 84820000 */ lh $v0, ($a0) @@ -326,7 +326,7 @@ glabel step_intro /* 1212C 80036D2C 94830000 */ lhu $v1, ($a0) /* 12130 80036D30 3C01BF80 */ lui $at, 0xbf80 /* 12134 80036D34 4481A000 */ mtc1 $at, $f20 -/* 12138 80036D38 00000000 */ nop +/* 12138 80036D38 00000000 */ nop /* 1213C 80036D3C 4405A000 */ mfc1 $a1, $f20 /* 12140 80036D40 0C04DF62 */ jal func_80137D88 /* 12144 80036D44 240400FF */ addiu $a0, $zero, 0xff @@ -334,7 +334,7 @@ glabel step_intro /* 1214C 80036D4C 0C04DF69 */ jal func_80137DA4 /* 12150 80036D50 240400FF */ addiu $a0, $zero, 0xff /* 12154 80036D54 0800DB5E */ j .L80036D78 -/* 12158 80036D58 00000000 */ nop +/* 12158 80036D58 00000000 */ nop .L80036D5C: /* 1215C 80036D5C 3C02800A */ lui $v0, %hi(D_800A0958) /* 12160 80036D60 94420958 */ lhu $v0, %lo(D_800A0958)($v0) @@ -349,11 +349,11 @@ glabel step_intro /* 12180 80036D80 3C04800A */ lui $a0, %hi(D_800A0963) /* 12184 80036D84 90840963 */ lbu $a0, %lo(D_800A0963)($a0) /* 12188 80036D88 44820000 */ mtc1 $v0, $f0 -/* 1218C 80036D8C 00000000 */ nop +/* 1218C 80036D8C 00000000 */ nop /* 12190 80036D90 46800020 */ cvt.s.w $f0, $f0 /* 12194 80036D94 44050000 */ mfc1 $a1, $f0 /* 12198 80036D98 0C04DF69 */ jal func_80137DA4 -/* 1219C 80036D9C 00000000 */ nop +/* 1219C 80036D9C 00000000 */ nop /* 121A0 80036DA0 3C05800A */ lui $a1, %hi(D_800A095B) /* 121A4 80036DA4 90A5095B */ lbu $a1, %lo(D_800A095B)($a1) /* 121A8 80036DA8 3C06800A */ lui $a2, %hi(D_800A095D) @@ -363,7 +363,7 @@ glabel step_intro /* 121B8 80036DB8 0C04DF84 */ jal func_80137E10 /* 121BC 80036DBC 24040001 */ addiu $a0, $zero, 1 /* 121C0 80036DC0 0C00CE1D */ jal intro_logos_update_fade -/* 121C4 80036DC4 00000000 */ nop +/* 121C4 80036DC4 00000000 */ nop .L80036DC8: /* 121C8 80036DC8 8FBF0018 */ lw $ra, 0x18($sp) /* 121CC 80036DCC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s b/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s index 16e6ec3732..52a55caac3 100644 --- a/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s +++ b/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s @@ -148,8 +148,8 @@ glabel begin_state_title_screen /* 1242C 8003702C 0C039CE8 */ jal clear_player_data /* 12430 80037030 AE420000 */ sw $v0, ($s2) /* 12434 80037034 0000202D */ daddu $a0, $zero, $zero -/* 12438 80037038 3C058003 */ lui $a1, %hi(D_80037638) -/* 1243C 8003703C 24A57638 */ addiu $a1, $a1, %lo(D_80037638) +/* 12438 80037038 3C058003 */ lui $a1, %hi(func_80037638) +/* 1243C 8003703C 24A57638 */ addiu $a1, $a1, %lo(func_80037638) /* 12440 80037040 8E420000 */ lw $v0, ($s2) /* 12444 80037044 2403FFF7 */ addiu $v1, $zero, -9 /* 12448 80037048 00431024 */ and $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s b/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s index f8b844150c..0614b30d66 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_handle_input.s @@ -91,16 +91,16 @@ glabel pause_tabs_handle_input /* 1387D4 80245494 3C048025 */ lui $a0, %hi(D_8024F1D8) /* 1387D8 80245498 00832021 */ addu $a0, $a0, $v1 /* 1387DC 8024549C 9084F1D8 */ lbu $a0, %lo(D_8024F1D8)($a0) -/* 1387E0 802454A0 3C068024 */ lui $a2, %hi(D_80243090) -/* 1387E4 802454A4 24C63090 */ addiu $a2, $a2, %lo(D_80243090) +/* 1387E0 802454A0 3C068024 */ lui $a2, %hi(func_80243090) +/* 1387E4 802454A4 24C63090 */ addiu $a2, $a2, %lo(func_80243090) /* 1387E8 802454A8 0C051F92 */ jal func_80147E48 /* 1387EC 802454AC 24050040 */ addiu $a1, $zero, 0x40 /* 1387F0 802454B0 8E220000 */ lw $v0, ($s1) /* 1387F4 802454B4 3C048025 */ lui $a0, %hi(D_8024F1D8) /* 1387F8 802454B8 00822021 */ addu $a0, $a0, $v0 /* 1387FC 802454BC 9084F1D8 */ lbu $a0, %lo(D_8024F1D8)($a0) -/* 138800 802454C0 3C068024 */ lui $a2, %hi(D_80242FF4) -/* 138804 802454C4 24C62FF4 */ addiu $a2, $a2, %lo(D_80242FF4) +/* 138800 802454C0 3C068024 */ lui $a2, %hi(func_80242FF4) +/* 138804 802454C4 24C62FF4 */ addiu $a2, $a2, %lo(func_80242FF4) /* 138808 802454C8 0C051F92 */ jal func_80147E48 /* 13880C 802454CC 24050040 */ addiu $a1, $zero, 0x40 /* 138810 802454D0 3C048016 */ lui $a0, %hi(D_8015A070) diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_update.s b/asm/nonmatchings/code_135EE0/pause_tabs_update.s index b0d69f959d..abf06f606c 100644 --- a/asm/nonmatchings/code_135EE0/pause_tabs_update.s +++ b/asm/nonmatchings/code_135EE0/pause_tabs_update.s @@ -93,20 +93,20 @@ glabel pause_tabs_update /* 138A4C 8024570C 14600009 */ bnez $v1, .L80245734 /* 138A50 80245710 00000000 */ nop .L80245714: -/* 138A54 80245714 3C148024 */ lui $s4, %hi(D_80243238) -/* 138A58 80245718 26943238 */ addiu $s4, $s4, %lo(D_80243238) -/* 138A5C 8024571C 3C128024 */ lui $s2, %hi(D_802432E8) -/* 138A60 80245720 265232E8 */ addiu $s2, $s2, %lo(D_802432E8) +/* 138A54 80245714 3C148024 */ lui $s4, %hi(func_80243238) +/* 138A58 80245718 26943238 */ addiu $s4, $s4, %lo(func_80243238) +/* 138A5C 8024571C 3C128024 */ lui $s2, %hi(func_802432E8) +/* 138A60 80245720 265232E8 */ addiu $s2, $s2, %lo(func_802432E8) /* 138A64 80245724 080915D2 */ j .L80245748 /* 138A68 80245728 0000202D */ daddu $a0, $zero, $zero .L8024572C: /* 138A6C 8024572C 080915EE */ j .L802457B8 /* 138A70 80245730 24040001 */ addiu $a0, $zero, 1 .L80245734: -/* 138A74 80245734 3C148024 */ lui $s4, %hi(D_80243188) -/* 138A78 80245738 26943188 */ addiu $s4, $s4, %lo(D_80243188) -/* 138A7C 8024573C 3C128024 */ lui $s2, %hi(D_80243388) -/* 138A80 80245740 26523388 */ addiu $s2, $s2, %lo(D_80243388) +/* 138A74 80245734 3C148024 */ lui $s4, %hi(func_80243188) +/* 138A78 80245738 26943188 */ addiu $s4, $s4, %lo(func_80243188) +/* 138A7C 8024573C 3C128024 */ lui $s2, %hi(func_80243388) +/* 138A80 80245740 26523388 */ addiu $s2, $s2, %lo(func_80243388) /* 138A84 80245744 0000202D */ daddu $a0, $zero, $zero .L80245748: /* 138A88 80245748 0080802D */ daddu $s0, $a0, $zero @@ -142,12 +142,12 @@ glabel pause_tabs_update .L802457B8: /* 138AF8 802457B8 14800051 */ bnez $a0, .L80245900 /* 138AFC 802457BC 0000802D */ daddu $s0, $zero, $zero -/* 138B00 802457C0 3C1E8024 */ lui $fp, %hi(D_80243238) -/* 138B04 802457C4 27DE3238 */ addiu $fp, $fp, %lo(D_80243238) -/* 138B08 802457C8 3C178024 */ lui $s7, %hi(D_80243188) -/* 138B0C 802457CC 26F73188 */ addiu $s7, $s7, %lo(D_80243188) -/* 138B10 802457D0 3C168014 */ lui $s6, %hi(D_80147474) -/* 138B14 802457D4 26D67474 */ addiu $s6, $s6, %lo(D_80147474) +/* 138B00 802457C0 3C1E8024 */ lui $fp, %hi(func_80243238) +/* 138B04 802457C4 27DE3238 */ addiu $fp, $fp, %lo(func_80243238) +/* 138B08 802457C8 3C178024 */ lui $s7, %hi(func_80243188) +/* 138B0C 802457CC 26F73188 */ addiu $s7, $s7, %lo(func_80243188) +/* 138B10 802457D0 3C168014 */ lui $s6, %hi(func_80147474) +/* 138B14 802457D4 26D67474 */ addiu $s6, $s6, %lo(func_80147474) /* 138B18 802457D8 24150001 */ addiu $s5, $zero, 1 /* 138B1C 802457DC 3C118025 */ lui $s1, %hi(D_8024F1E0) /* 138B20 802457E0 2631F1E0 */ addiu $s1, $s1, %lo(D_8024F1E0) @@ -201,12 +201,12 @@ glabel pause_tabs_update /* 138BD4 80245894 3C038016 */ lui $v1, %hi(D_80159D54) /* 138BD8 80245898 00621821 */ addu $v1, $v1, $v0 /* 138BDC 8024589C 8C639D54 */ lw $v1, %lo(D_80159D54)($v1) -/* 138BE0 802458A0 3C028024 */ lui $v0, %hi(D_802432E8) -/* 138BE4 802458A4 244232E8 */ addiu $v0, $v0, %lo(D_802432E8) +/* 138BE0 802458A0 3C028024 */ lui $v0, %hi(func_802432E8) +/* 138BE4 802458A4 244232E8 */ addiu $v0, $v0, %lo(func_802432E8) /* 138BE8 802458A8 10620007 */ beq $v1, $v0, .L802458C8 /* 138BEC 802458AC 00000000 */ nop -/* 138BF0 802458B0 3C028024 */ lui $v0, %hi(D_80243388) -/* 138BF4 802458B4 24423388 */ addiu $v0, $v0, %lo(D_80243388) +/* 138BF0 802458B0 3C028024 */ lui $v0, %hi(func_80243388) +/* 138BF4 802458B4 24423388 */ addiu $v0, $v0, %lo(func_80243388) /* 138BF8 802458B8 10620003 */ beq $v1, $v0, .L802458C8 /* 138BFC 802458BC 24020002 */ addiu $v0, $zero, 2 /* 138C00 802458C0 1462000F */ bne $v1, $v0, .L80245900 @@ -217,8 +217,8 @@ glabel pause_tabs_update /* 138C10 802458D0 8C620000 */ lw $v0, ($v1) /* 138C14 802458D4 10400004 */ beqz $v0, .L802458E8 /* 138C18 802458D8 00000000 */ nop -/* 138C1C 802458DC 3C148014 */ lui $s4, %hi(D_80147474) -/* 138C20 802458E0 26947474 */ addiu $s4, $s4, %lo(D_80147474) +/* 138C1C 802458DC 3C148014 */ lui $s4, %hi(func_80147474) +/* 138C20 802458E0 26947474 */ addiu $s4, $s4, %lo(func_80147474) /* 138C24 802458E4 AC600000 */ sw $zero, ($v1) .L802458E8: /* 138C28 802458E8 82620001 */ lb $v0, 1($s3) diff --git a/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s b/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s index 1f2f21657f..e9f34c567c 100644 --- a/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s +++ b/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s @@ -65,8 +65,8 @@ glabel clear_encounter_status /* 198DC 8003E4DC A0E00012 */ sb $zero, 0x12($a3) /* 198E0 8003E4E0 0C0116B0 */ jal func_80045AC0 /* 198E4 8003E4E4 A0E2001F */ sb $v0, 0x1f($a3) -/* 198E8 8003E4E8 3C058004 */ lui $a1, %hi(D_8003E670) -/* 198EC 8003E4EC 24A5E670 */ addiu $a1, $a1, %lo(D_8003E670) +/* 198E8 8003E4E8 3C058004 */ lui $a1, %hi(func_8003E670) +/* 198EC 8003E4EC 24A5E670 */ addiu $a1, $a1, %lo(func_8003E670) /* 198F0 8003E4F0 3C01800A */ lui $at, %hi(gGameState) /* 198F4 8003E4F4 AC20A600 */ sw $zero, %lo(gGameState)($at) /* 198F8 8003E4F8 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E338.s b/asm/nonmatchings/code_13870_len_6980/func_8003E338.s index 61a2247747..4ab015c052 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E338.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E338.s @@ -47,8 +47,8 @@ glabel func_8003E338 /* 197D0 8003E3D0 2442FFFE */ addiu $v0, $v0, -2 /* 197D4 8003E3D4 0C0116B0 */ jal func_80045AC0 /* 197D8 8003E3D8 00000000 */ nop -/* 197DC 8003E3DC 3C058004 */ lui $a1, %hi(D_8003E670) -/* 197E0 8003E3E0 24A5E670 */ addiu $a1, $a1, %lo(D_8003E670) +/* 197DC 8003E3DC 3C058004 */ lui $a1, %hi(func_8003E670) +/* 197E0 8003E3E0 24A5E670 */ addiu $a1, $a1, %lo(func_8003E670) /* 197E4 8003E3E4 3C01800A */ lui $at, %hi(gGameState) /* 197E8 8003E3E8 AC20A600 */ sw $zero, %lo(gGameState)($at) /* 197EC 8003E3EC 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/code_165490/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s index 20784a75e4..f81c071271 100644 --- a/asm/nonmatchings/code_165490/func_80245A40.s +++ b/asm/nonmatchings/code_165490/func_80245A40.s @@ -267,8 +267,8 @@ glabel func_80245A40 /* 166674 80245E14 0461FFFD */ bgez $v1, .L80245E0C /* 166678 80245E18 2442FFFF */ addiu $v0, $v0, -1 /* 16667C 80245E1C 24040030 */ addiu $a0, $zero, 0x30 -/* 166680 80245E20 3C108024 */ lui $s0, %hi(D_80243380) -/* 166684 80245E24 26103380 */ addiu $s0, $s0, %lo(D_80243380) +/* 166680 80245E20 3C108024 */ lui $s0, %hi(func_80243380) +/* 166684 80245E24 26103380 */ addiu $s0, $s0, %lo(func_80243380) /* 166688 80245E28 3C018025 */ lui $at, %hi(D_8024C090) /* 16668C 80245E2C A020C090 */ sb $zero, %lo(D_8024C090)($at) /* 166690 80245E30 0C051F9F */ jal func_80147E7C @@ -277,8 +277,8 @@ glabel func_80245A40 /* 16669C 80245E3C 0C051F9F */ jal func_80147E7C /* 1666A0 80245E40 0200282D */ daddu $a1, $s0, $zero /* 1666A4 80245E44 2404002D */ addiu $a0, $zero, 0x2d -/* 1666A8 80245E48 3C108024 */ lui $s0, %hi(D_80243898) -/* 1666AC 80245E4C 26103898 */ addiu $s0, $s0, %lo(D_80243898) +/* 1666A8 80245E48 3C108024 */ lui $s0, %hi(func_80243898) +/* 1666AC 80245E4C 26103898 */ addiu $s0, $s0, %lo(func_80243898) /* 1666B0 80245E50 0C051F9F */ jal func_80147E7C /* 1666B4 80245E54 0200282D */ daddu $a1, $s0, $zero /* 1666B8 80245E58 24040033 */ addiu $a0, $zero, 0x33 @@ -328,18 +328,18 @@ glabel func_80245A40 /* 166764 80245F04 1462002C */ bne $v1, $v0, .L80245FB8 /* 166768 80245F08 24020004 */ addiu $v0, $zero, 4 /* 16676C 80245F0C 24040033 */ addiu $a0, $zero, 0x33 -/* 166770 80245F10 3C128024 */ lui $s2, %hi(D_8024368C) -/* 166774 80245F14 2652368C */ addiu $s2, $s2, %lo(D_8024368C) +/* 166770 80245F10 3C128024 */ lui $s2, %hi(func_8024368C) +/* 166774 80245F14 2652368C */ addiu $s2, $s2, %lo(func_8024368C) /* 166778 80245F18 0C051F9F */ jal func_80147E7C /* 16677C 80245F1C 0240282D */ daddu $a1, $s2, $zero /* 166780 80245F20 24040034 */ addiu $a0, $zero, 0x34 -/* 166784 80245F24 3C118024 */ lui $s1, %hi(D_802436F0) -/* 166788 80245F28 263136F0 */ addiu $s1, $s1, %lo(D_802436F0) +/* 166784 80245F24 3C118024 */ lui $s1, %hi(func_802436F0) +/* 166788 80245F28 263136F0 */ addiu $s1, $s1, %lo(func_802436F0) /* 16678C 80245F2C 0C051F9F */ jal func_80147E7C /* 166790 80245F30 0220282D */ daddu $a1, $s1, $zero /* 166794 80245F34 24040035 */ addiu $a0, $zero, 0x35 -/* 166798 80245F38 3C108024 */ lui $s0, %hi(D_802437B8) -/* 16679C 80245F3C 261037B8 */ addiu $s0, $s0, %lo(D_802437B8) +/* 166798 80245F38 3C108024 */ lui $s0, %hi(func_802437B8) +/* 16679C 80245F3C 261037B8 */ addiu $s0, $s0, %lo(func_802437B8) /* 1667A0 80245F40 0C051F9F */ jal func_80147E7C /* 1667A4 80245F44 0200282D */ daddu $a1, $s0, $zero /* 1667A8 80245F48 24040036 */ addiu $a0, $zero, 0x36 @@ -360,8 +360,8 @@ glabel func_80245A40 /* 1667E4 80245F84 2404003B */ addiu $a0, $zero, 0x3b /* 1667E8 80245F88 0C051F9F */ jal func_80147E7C /* 1667EC 80245F8C 0220282D */ daddu $a1, $s1, $zero -/* 1667F0 80245F90 3C058024 */ lui $a1, %hi(D_80243754) -/* 1667F4 80245F94 24A53754 */ addiu $a1, $a1, %lo(D_80243754) +/* 1667F0 80245F90 3C058024 */ lui $a1, %hi(func_80243754) +/* 1667F4 80245F94 24A53754 */ addiu $a1, $a1, %lo(func_80243754) /* 1667F8 80245F98 0C051F9F */ jal func_80147E7C /* 1667FC 80245F9C 2404002D */ addiu $a0, $zero, 0x2d /* 166800 80245FA0 0C05272D */ jal play_sound @@ -389,17 +389,17 @@ glabel func_80245A40 /* 16684C 80245FEC 24050001 */ addiu $a1, $zero, 1 /* 166850 80245FF0 0C090B65 */ jal func_80242D94 /* 166854 80245FF4 24060002 */ addiu $a2, $zero, 2 -/* 166858 80245FF8 3C058024 */ lui $a1, %hi(D_8024368C) -/* 16685C 80245FFC 24A5368C */ addiu $a1, $a1, %lo(D_8024368C) +/* 166858 80245FF8 3C058024 */ lui $a1, %hi(func_8024368C) +/* 16685C 80245FFC 24A5368C */ addiu $a1, $a1, %lo(func_8024368C) /* 166860 80246000 0C051F9F */ jal func_80147E7C /* 166864 80246004 24040033 */ addiu $a0, $zero, 0x33 -/* 166868 80246008 3C058024 */ lui $a1, %hi(D_802436F0) -/* 16686C 8024600C 24A536F0 */ addiu $a1, $a1, %lo(D_802436F0) +/* 166868 80246008 3C058024 */ lui $a1, %hi(func_802436F0) +/* 16686C 8024600C 24A536F0 */ addiu $a1, $a1, %lo(func_802436F0) /* 166870 80246010 0C051F9F */ jal func_80147E7C /* 166874 80246014 24040034 */ addiu $a0, $zero, 0x34 /* 166878 80246018 24040035 */ addiu $a0, $zero, 0x35 -/* 16687C 8024601C 3C108024 */ lui $s0, %hi(D_802437B8) -/* 166880 80246020 261037B8 */ addiu $s0, $s0, %lo(D_802437B8) +/* 16687C 8024601C 3C108024 */ lui $s0, %hi(func_802437B8) +/* 166880 80246020 261037B8 */ addiu $s0, $s0, %lo(func_802437B8) /* 166884 80246024 0C051F9F */ jal func_80147E7C /* 166888 80246028 0200282D */ daddu $a1, $s0, $zero /* 16688C 8024602C 24040037 */ addiu $a0, $zero, 0x37 @@ -413,8 +413,8 @@ glabel func_80245A40 /* 1668A8 80246048 0C05272D */ jal play_sound /* 1668AC 8024604C 240400C9 */ addiu $a0, $zero, 0xc9 /* 1668B0 80246050 2404002D */ addiu $a0, $zero, 0x2d -/* 1668B4 80246054 3C108024 */ lui $s0, %hi(D_80243898) -/* 1668B8 80246058 26103898 */ addiu $s0, $s0, %lo(D_80243898) +/* 1668B4 80246054 3C108024 */ lui $s0, %hi(func_80243898) +/* 1668B8 80246058 26103898 */ addiu $s0, $s0, %lo(func_80243898) /* 1668BC 8024605C 0C051F9F */ jal func_80147E7C /* 1668C0 80246060 0200282D */ daddu $a1, $s0, $zero /* 1668C4 80246064 24040033 */ addiu $a0, $zero, 0x33 @@ -448,8 +448,8 @@ glabel func_80245A40 /* 166934 802460D4 0C051F9F */ jal func_80147E7C /* 166938 802460D8 0200282D */ daddu $a1, $s0, $zero /* 16693C 802460DC 92640003 */ lbu $a0, 3($s3) -/* 166940 802460E0 3C058024 */ lui $a1, %hi(D_80243908) -/* 166944 802460E4 24A53908 */ addiu $a1, $a1, %lo(D_80243908) +/* 166940 802460E0 3C058024 */ lui $a1, %hi(func_80243908) +/* 166944 802460E4 24A53908 */ addiu $a1, $a1, %lo(func_80243908) /* 166948 802460E8 0C051F9F */ jal func_80147E7C /* 16694C 802460EC 24840038 */ addiu $a0, $a0, 0x38 /* 166950 802460F0 0C05272D */ jal play_sound @@ -525,12 +525,12 @@ glabel func_80245A40 /* 166A58 802461F8 0C05272D */ jal play_sound /* 166A5C 802461FC 240400C9 */ addiu $a0, $zero, 0xc9 /* 166A60 80246200 A2600004 */ sb $zero, 4($s3) -/* 166A64 80246204 3C058024 */ lui $a1, %hi(D_802433F4) -/* 166A68 80246208 24A533F4 */ addiu $a1, $a1, %lo(D_802433F4) +/* 166A64 80246204 3C058024 */ lui $a1, %hi(func_802433F4) +/* 166A68 80246208 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) /* 166A6C 8024620C 0C051F9F */ jal func_80147E7C /* 166A70 80246210 24040033 */ addiu $a0, $zero, 0x33 -/* 166A74 80246214 3C058024 */ lui $a1, %hi(D_80243468) -/* 166A78 80246218 24A53468 */ addiu $a1, $a1, %lo(D_80243468) +/* 166A74 80246214 3C058024 */ lui $a1, %hi(func_80243468) +/* 166A78 80246218 24A53468 */ addiu $a1, $a1, %lo(func_80243468) /* 166A7C 8024621C 0C051F9F */ jal func_80147E7C /* 166A80 80246220 24040034 */ addiu $a0, $zero, 0x34 /* 166A84 80246224 24040035 */ addiu $a0, $zero, 0x35 @@ -556,8 +556,8 @@ glabel func_80245A40 /* 166AD0 80246270 00000000 */ nop /* 166AD4 80246274 0C05272D */ jal play_sound /* 166AD8 80246278 240400C9 */ addiu $a0, $zero, 0xc9 -/* 166ADC 8024627C 3C058024 */ lui $a1, %hi(D_80243CCC) -/* 166AE0 80246280 24A53CCC */ addiu $a1, $a1, %lo(D_80243CCC) +/* 166ADC 8024627C 3C058024 */ lui $a1, %hi(func_80243CCC) +/* 166AE0 80246280 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) /* 166AE4 80246284 0C051F9F */ jal func_80147E7C /* 166AE8 80246288 24040032 */ addiu $a0, $zero, 0x32 /* 166AEC 8024628C 3C048016 */ lui $a0, %hi(gUIPanels) @@ -628,12 +628,12 @@ glabel func_80245A40 /* 166BE0 80246380 0C05272D */ jal play_sound /* 166BE4 80246384 240400C9 */ addiu $a0, $zero, 0xc9 /* 166BE8 80246388 A2600004 */ sb $zero, 4($s3) -/* 166BEC 8024638C 3C058024 */ lui $a1, %hi(D_802433F4) -/* 166BF0 80246390 24A533F4 */ addiu $a1, $a1, %lo(D_802433F4) +/* 166BEC 8024638C 3C058024 */ lui $a1, %hi(func_802433F4) +/* 166BF0 80246390 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) /* 166BF4 80246394 0C051F9F */ jal func_80147E7C /* 166BF8 80246398 24040033 */ addiu $a0, $zero, 0x33 -/* 166BFC 8024639C 3C058024 */ lui $a1, %hi(D_80243468) -/* 166C00 802463A0 24A53468 */ addiu $a1, $a1, %lo(D_80243468) +/* 166BFC 8024639C 3C058024 */ lui $a1, %hi(func_80243468) +/* 166C00 802463A0 24A53468 */ addiu $a1, $a1, %lo(func_80243468) /* 166C04 802463A4 0C051F9F */ jal func_80147E7C /* 166C08 802463A8 24040034 */ addiu $a0, $zero, 0x34 /* 166C0C 802463AC 24040035 */ addiu $a0, $zero, 0x35 @@ -808,8 +808,8 @@ glabel func_80245A40 .L80246630: /* 166E90 80246630 0C05272D */ jal play_sound /* 166E94 80246634 240400C9 */ addiu $a0, $zero, 0xc9 -/* 166E98 80246638 3C058024 */ lui $a1, %hi(D_80243CCC) -/* 166E9C 8024663C 24A53CCC */ addiu $a1, $a1, %lo(D_80243CCC) +/* 166E98 80246638 3C058024 */ lui $a1, %hi(func_80243CCC) +/* 166E9C 8024663C 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) /* 166EA0 80246640 0C051F9F */ jal func_80147E7C /* 166EA4 80246644 24040032 */ addiu $a0, $zero, 0x32 /* 166EA8 80246648 3C048016 */ lui $a0, %hi(gUIPanels) @@ -897,8 +897,8 @@ glabel func_80245A40 /* 166FDC 8024677C 0C05272D */ jal play_sound /* 166FE0 80246780 240400C9 */ addiu $a0, $zero, 0xc9 /* 166FE4 80246784 2404002C */ addiu $a0, $zero, 0x2c -/* 166FE8 80246788 3C058014 */ lui $a1, %hi(D_80147650) -/* 166FEC 8024678C 24A57650 */ addiu $a1, $a1, %lo(D_80147650) +/* 166FE8 80246788 3C058014 */ lui $a1, %hi(func_80147650) +/* 166FEC 8024678C 24A57650 */ addiu $a1, $a1, %lo(func_80147650) /* 166FF0 80246790 24020002 */ addiu $v0, $zero, 2 /* 166FF4 80246794 3C018025 */ lui $at, %hi(D_8024C098) /* 166FF8 80246798 A022C098 */ sb $v0, %lo(D_8024C098)($at) @@ -923,8 +923,8 @@ glabel func_80245A40 .L802467E4: /* 167044 802467E4 0C05272D */ jal play_sound /* 167048 802467E8 240400C9 */ addiu $a0, $zero, 0xc9 -/* 16704C 802467EC 3C058024 */ lui $a1, %hi(D_80243CCC) -/* 167050 802467F0 24A53CCC */ addiu $a1, $a1, %lo(D_80243CCC) +/* 16704C 802467EC 3C058024 */ lui $a1, %hi(func_80243CCC) +/* 167050 802467F0 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) /* 167054 802467F4 0C051F9F */ jal func_80147E7C /* 167058 802467F8 24040032 */ addiu $a0, $zero, 0x32 /* 16705C 802467FC 3C048016 */ lui $a0, %hi(gUIPanels) @@ -1026,18 +1026,18 @@ glabel func_80245A40 /* 1671B8 80246958 00400008 */ jr $v0 /* 1671BC 8024695C 00000000 */ nop /* 1671C0 80246960 24040033 */ addiu $a0, $zero, 0x33 -/* 1671C4 80246964 3C128024 */ lui $s2, %hi(D_8024368C) -/* 1671C8 80246968 2652368C */ addiu $s2, $s2, %lo(D_8024368C) +/* 1671C4 80246964 3C128024 */ lui $s2, %hi(func_8024368C) +/* 1671C8 80246968 2652368C */ addiu $s2, $s2, %lo(func_8024368C) /* 1671CC 8024696C 0C051F9F */ jal func_80147E7C /* 1671D0 80246970 0240282D */ daddu $a1, $s2, $zero /* 1671D4 80246974 24040034 */ addiu $a0, $zero, 0x34 -/* 1671D8 80246978 3C118024 */ lui $s1, %hi(D_802436F0) -/* 1671DC 8024697C 263136F0 */ addiu $s1, $s1, %lo(D_802436F0) +/* 1671D8 80246978 3C118024 */ lui $s1, %hi(func_802436F0) +/* 1671DC 8024697C 263136F0 */ addiu $s1, $s1, %lo(func_802436F0) /* 1671E0 80246980 0C051F9F */ jal func_80147E7C /* 1671E4 80246984 0220282D */ daddu $a1, $s1, $zero /* 1671E8 80246988 24040035 */ addiu $a0, $zero, 0x35 -/* 1671EC 8024698C 3C108024 */ lui $s0, %hi(D_802437B8) -/* 1671F0 80246990 261037B8 */ addiu $s0, $s0, %lo(D_802437B8) +/* 1671EC 8024698C 3C108024 */ lui $s0, %hi(func_802437B8) +/* 1671F0 80246990 261037B8 */ addiu $s0, $s0, %lo(func_802437B8) /* 1671F4 80246994 0C051F9F */ jal func_80147E7C /* 1671F8 80246998 0200282D */ daddu $a1, $s0, $zero /* 1671FC 8024699C 24040036 */ addiu $a0, $zero, 0x36 @@ -1058,8 +1058,8 @@ glabel func_80245A40 /* 167238 802469D8 2404003B */ addiu $a0, $zero, 0x3b /* 16723C 802469DC 0C051F9F */ jal func_80147E7C /* 167240 802469E0 0220282D */ daddu $a1, $s1, $zero -/* 167244 802469E4 3C058024 */ lui $a1, %hi(D_80243754) -/* 167248 802469E8 24A53754 */ addiu $a1, $a1, %lo(D_80243754) +/* 167244 802469E4 3C058024 */ lui $a1, %hi(func_80243754) +/* 167248 802469E8 24A53754 */ addiu $a1, $a1, %lo(func_80243754) /* 16724C 802469EC 0C051F9F */ jal func_80147E7C /* 167250 802469F0 2404002D */ addiu $a0, $zero, 0x2d /* 167254 802469F4 0C05272D */ jal play_sound @@ -1071,12 +1071,12 @@ glabel func_80245A40 /* 16726C 80246A0C 0000282D */ daddu $a1, $zero, $zero /* 167270 80246A10 0C090B65 */ jal func_80242D94 /* 167274 80246A14 24060002 */ addiu $a2, $zero, 2 -/* 167278 80246A18 3C058024 */ lui $a1, %hi(D_802433F4) -/* 16727C 80246A1C 24A533F4 */ addiu $a1, $a1, %lo(D_802433F4) +/* 167278 80246A18 3C058024 */ lui $a1, %hi(func_802433F4) +/* 16727C 80246A1C 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) /* 167280 80246A20 0C051F9F */ jal func_80147E7C /* 167284 80246A24 24040033 */ addiu $a0, $zero, 0x33 -/* 167288 80246A28 3C058024 */ lui $a1, %hi(D_80243468) -/* 16728C 80246A2C 24A53468 */ addiu $a1, $a1, %lo(D_80243468) +/* 167288 80246A28 3C058024 */ lui $a1, %hi(func_80243468) +/* 16728C 80246A2C 24A53468 */ addiu $a1, $a1, %lo(func_80243468) /* 167290 80246A30 0C051F9F */ jal func_80147E7C /* 167294 80246A34 24040034 */ addiu $a0, $zero, 0x34 /* 167298 80246A38 24040035 */ addiu $a0, $zero, 0x35 @@ -1094,12 +1094,12 @@ glabel func_80245A40 /* 1672C8 80246A68 24050001 */ addiu $a1, $zero, 1 /* 1672CC 80246A6C 0C090B65 */ jal func_80242D94 /* 1672D0 80246A70 24060002 */ addiu $a2, $zero, 2 -/* 1672D4 80246A74 3C058024 */ lui $a1, %hi(D_802433F4) -/* 1672D8 80246A78 24A533F4 */ addiu $a1, $a1, %lo(D_802433F4) +/* 1672D4 80246A74 3C058024 */ lui $a1, %hi(func_802433F4) +/* 1672D8 80246A78 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) /* 1672DC 80246A7C 0C051F9F */ jal func_80147E7C /* 1672E0 80246A80 24040033 */ addiu $a0, $zero, 0x33 -/* 1672E4 80246A84 3C058024 */ lui $a1, %hi(D_80243468) -/* 1672E8 80246A88 24A53468 */ addiu $a1, $a1, %lo(D_80243468) +/* 1672E4 80246A84 3C058024 */ lui $a1, %hi(func_80243468) +/* 1672E8 80246A88 24A53468 */ addiu $a1, $a1, %lo(func_80243468) /* 1672EC 80246A8C 0C051F9F */ jal func_80147E7C /* 1672F0 80246A90 24040034 */ addiu $a0, $zero, 0x34 /* 1672F4 80246A94 24040035 */ addiu $a0, $zero, 0x35 diff --git a/asm/nonmatchings/code_167570/func_802471EC.s b/asm/nonmatchings/code_167570/func_802471EC.s index 1d538372ea..1ab3f7932f 100644 --- a/asm/nonmatchings/code_167570/func_802471EC.s +++ b/asm/nonmatchings/code_167570/func_802471EC.s @@ -164,8 +164,8 @@ glabel func_802471EC /* 167CA4 80247444 24050001 */ addiu $a1, $zero, 1 /* 167CA8 80247448 0C051F9F */ jal func_80147E7C /* 167CAC 8024744C A4C20000 */ sh $v0, ($a2) -/* 167CB0 80247450 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 167CB4 80247454 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 167CB0 80247450 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 167CB4 80247454 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 167CB8 80247458 0C051F9F */ jal func_80147E7C /* 167CBC 8024745C 24040032 */ addiu $a0, $zero, 0x32 /* 167CC0 80247460 0000202D */ daddu $a0, $zero, $zero @@ -263,8 +263,8 @@ glabel func_802471EC /* 167E1C 802475BC 24050001 */ addiu $a1, $zero, 1 /* 167E20 802475C0 0C051F9F */ jal func_80147E7C /* 167E24 802475C4 A4C20000 */ sh $v0, ($a2) -/* 167E28 802475C8 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 167E2C 802475CC 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 167E28 802475C8 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 167E2C 802475CC 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 167E30 802475D0 0C051F9F */ jal func_80147E7C /* 167E34 802475D4 24040032 */ addiu $a0, $zero, 0x32 /* 167E38 802475D8 3C118025 */ lui $s1, %hi(D_8024C094) @@ -363,8 +363,8 @@ glabel func_802471EC /* 167F9C 8024773C 24050001 */ addiu $a1, $zero, 1 /* 167FA0 80247740 0C051F9F */ jal func_80147E7C /* 167FA4 80247744 A4C20000 */ sh $v0, ($a2) -/* 167FA8 80247748 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 167FAC 8024774C 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 167FA8 80247748 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 167FAC 8024774C 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 167FB0 80247750 0C051F9F */ jal func_80147E7C /* 167FB4 80247754 24040032 */ addiu $a0, $zero, 0x32 /* 167FB8 80247758 3C108025 */ lui $s0, %hi(D_80249B84) @@ -447,8 +447,8 @@ glabel func_802471EC /* 1680E4 80247884 0C00ACDD */ jal fio_save_game /* 1680E8 80247888 0220202D */ daddu $a0, $s1, $zero /* 1680EC 8024788C 24040030 */ addiu $a0, $zero, 0x30 -/* 1680F0 80247890 3C108024 */ lui $s0, %hi(D_80243628) -/* 1680F4 80247894 26103628 */ addiu $s0, $s0, %lo(D_80243628) +/* 1680F0 80247890 3C108024 */ lui $s0, %hi(func_80243628) +/* 1680F4 80247894 26103628 */ addiu $s0, $s0, %lo(func_80243628) /* 1680F8 80247898 24020001 */ addiu $v0, $zero, 1 /* 1680FC 8024789C 3C018007 */ lui $at, %hi(D_80077A24) /* 168100 802478A0 00310821 */ addu $at, $at, $s1 @@ -459,8 +459,8 @@ glabel func_802471EC /* 168114 802478B4 0C051F9F */ jal func_80147E7C /* 168118 802478B8 0200282D */ daddu $a1, $s0, $zero /* 16811C 802478BC 2404002D */ addiu $a0, $zero, 0x2d -/* 168120 802478C0 3C108024 */ lui $s0, %hi(D_8024381C) -/* 168124 802478C4 2610381C */ addiu $s0, $s0, %lo(D_8024381C) +/* 168120 802478C0 3C108024 */ lui $s0, %hi(func_8024381C) +/* 168124 802478C4 2610381C */ addiu $s0, $s0, %lo(func_8024381C) /* 168128 802478C8 0C051F9F */ jal func_80147E7C /* 16812C 802478CC 0200282D */ daddu $a1, $s0, $zero /* 168130 802478D0 24040033 */ addiu $a0, $zero, 0x33 @@ -493,8 +493,8 @@ glabel func_802471EC /* 16819C 8024793C 2404003B */ addiu $a0, $zero, 0x3b /* 1681A0 80247940 0C051F9F */ jal func_80147E7C /* 1681A4 80247944 0200282D */ daddu $a1, $s0, $zero -/* 1681A8 80247948 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 1681AC 8024794C 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 1681A8 80247948 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 1681AC 8024794C 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 1681B0 80247950 0C051F9F */ jal func_80147E7C /* 1681B4 80247954 24040032 */ addiu $a0, $zero, 0x32 /* 1681B8 80247958 24020002 */ addiu $v0, $zero, 2 @@ -597,20 +597,20 @@ glabel func_802471EC /* 168320 80247AC0 00000000 */ nop /* 168324 80247AC4 3C018025 */ lui $at, %hi(D_8024C098) /* 168328 80247AC8 A020C098 */ sb $zero, %lo(D_8024C098)($at) -/* 16832C 80247ACC 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 168330 80247AD0 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 16832C 80247ACC 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 168330 80247AD0 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168334 80247AD4 08091EEC */ j .L80247BB0 /* 168338 80247AD8 24040032 */ addiu $a0, $zero, 0x32 /* 16833C 80247ADC 24020003 */ addiu $v0, $zero, 3 /* 168340 80247AE0 3C018025 */ lui $at, %hi(D_8024C098) /* 168344 80247AE4 A022C098 */ sb $v0, %lo(D_8024C098)($at) -/* 168348 80247AE8 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 16834C 80247AEC 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 168348 80247AE8 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 16834C 80247AEC 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168350 80247AF0 08091EEC */ j .L80247BB0 /* 168354 80247AF4 24040032 */ addiu $a0, $zero, 0x32 /* 168358 80247AF8 2404002D */ addiu $a0, $zero, 0x2d -/* 16835C 80247AFC 3C108024 */ lui $s0, %hi(D_8024381C) -/* 168360 80247B00 2610381C */ addiu $s0, $s0, %lo(D_8024381C) +/* 16835C 80247AFC 3C108024 */ lui $s0, %hi(func_8024381C) +/* 168360 80247B00 2610381C */ addiu $s0, $s0, %lo(func_8024381C) /* 168364 80247B04 3C028025 */ lui $v0, %hi(D_80249B84) /* 168368 80247B08 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) /* 16836C 80247B0C 3C018025 */ lui $at, %hi(D_8024C098) @@ -648,8 +648,8 @@ glabel func_802471EC /* 1683EC 80247B8C 2404003B */ addiu $a0, $zero, 0x3b /* 1683F0 80247B90 0C051F9F */ jal func_80147E7C /* 1683F4 80247B94 0200282D */ daddu $a1, $s0, $zero -/* 1683F8 80247B98 3C058024 */ lui $a1, %hi(D_80243B10) -/* 1683FC 80247B9C 24A53B10 */ addiu $a1, $a1, %lo(D_80243B10) +/* 1683F8 80247B98 3C058024 */ lui $a1, %hi(func_80243B10) +/* 1683FC 80247B9C 24A53B10 */ addiu $a1, $a1, %lo(func_80243B10) /* 168400 80247BA0 0C051F9F */ jal func_80147E7C /* 168404 80247BA4 26240038 */ addiu $a0, $s1, 0x38 /* 168408 80247BA8 24040032 */ addiu $a0, $zero, 0x32 @@ -680,20 +680,20 @@ glabel func_802471EC /* 168464 80247C04 00000000 */ nop /* 168468 80247C08 3C018025 */ lui $at, %hi(D_8024C098) /* 16846C 80247C0C A020C098 */ sb $zero, %lo(D_8024C098)($at) -/* 168470 80247C10 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 168474 80247C14 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 168470 80247C10 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 168474 80247C14 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168478 80247C18 08091F3D */ j .L80247CF4 /* 16847C 80247C1C 24040032 */ addiu $a0, $zero, 0x32 /* 168480 80247C20 24020003 */ addiu $v0, $zero, 3 /* 168484 80247C24 3C018025 */ lui $at, %hi(D_8024C098) /* 168488 80247C28 A022C098 */ sb $v0, %lo(D_8024C098)($at) -/* 16848C 80247C2C 3C058024 */ lui $a1, %hi(D_80243EEC) -/* 168490 80247C30 24A53EEC */ addiu $a1, $a1, %lo(D_80243EEC) +/* 16848C 80247C2C 3C058024 */ lui $a1, %hi(func_80243EEC) +/* 168490 80247C30 24A53EEC */ addiu $a1, $a1, %lo(func_80243EEC) /* 168494 80247C34 08091F3D */ j .L80247CF4 /* 168498 80247C38 24040032 */ addiu $a0, $zero, 0x32 /* 16849C 80247C3C 2404002D */ addiu $a0, $zero, 0x2d -/* 1684A0 80247C40 3C108024 */ lui $s0, %hi(D_8024381C) -/* 1684A4 80247C44 2610381C */ addiu $s0, $s0, %lo(D_8024381C) +/* 1684A0 80247C40 3C108024 */ lui $s0, %hi(func_8024381C) +/* 1684A4 80247C44 2610381C */ addiu $s0, $s0, %lo(func_8024381C) /* 1684A8 80247C48 3C028025 */ lui $v0, %hi(D_80249B84) /* 1684AC 80247C4C 8C429B84 */ lw $v0, %lo(D_80249B84)($v0) /* 1684B0 80247C50 3C018025 */ lui $at, %hi(D_8024C098) @@ -731,8 +731,8 @@ glabel func_802471EC /* 168530 80247CD0 2404003B */ addiu $a0, $zero, 0x3b /* 168534 80247CD4 0C051F9F */ jal func_80147E7C /* 168538 80247CD8 0200282D */ daddu $a1, $s0, $zero -/* 16853C 80247CDC 3C058024 */ lui $a1, %hi(D_80243B10) -/* 168540 80247CE0 24A53B10 */ addiu $a1, $a1, %lo(D_80243B10) +/* 16853C 80247CDC 3C058024 */ lui $a1, %hi(func_80243B10) +/* 168540 80247CE0 24A53B10 */ addiu $a1, $a1, %lo(func_80243B10) /* 168544 80247CE4 0C051F9F */ jal func_80147E7C /* 168548 80247CE8 26240038 */ addiu $a0, $s1, 0x38 /* 16854C 80247CEC 24040032 */ addiu $a0, $zero, 0x32 diff --git a/asm/nonmatchings/code_168590/func_80248024.s b/asm/nonmatchings/code_168590/func_80248024.s index d5f57e3b20..9924d10fc2 100644 --- a/asm/nonmatchings/code_168590/func_80248024.s +++ b/asm/nonmatchings/code_168590/func_80248024.s @@ -32,12 +32,12 @@ glabel func_80248024 /* 1688EC 8024808C 00000000 */ nop .L80248090: /* 1688F0 80248090 A2200004 */ sb $zero, 4($s1) -/* 1688F4 80248094 3C058024 */ lui $a1, %hi(D_802433F4) -/* 1688F8 80248098 24A533F4 */ addiu $a1, $a1, %lo(D_802433F4) +/* 1688F4 80248094 3C058024 */ lui $a1, %hi(func_802433F4) +/* 1688F8 80248098 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) /* 1688FC 8024809C 0C051F9F */ jal func_80147E7C /* 168900 802480A0 24040033 */ addiu $a0, $zero, 0x33 -/* 168904 802480A4 3C058024 */ lui $a1, %hi(D_80243468) -/* 168908 802480A8 24A53468 */ addiu $a1, $a1, %lo(D_80243468) +/* 168904 802480A4 3C058024 */ lui $a1, %hi(func_80243468) +/* 168908 802480A8 24A53468 */ addiu $a1, $a1, %lo(func_80243468) /* 16890C 802480AC 0C051F9F */ jal func_80147E7C /* 168910 802480B0 24040034 */ addiu $a0, $zero, 0x34 /* 168914 802480B4 24040035 */ addiu $a0, $zero, 0x35 @@ -53,12 +53,12 @@ glabel func_80248024 /* 16893C 802480DC 0000282D */ daddu $a1, $zero, $zero .L802480E0: /* 168940 802480E0 A2200004 */ sb $zero, 4($s1) -/* 168944 802480E4 3C058024 */ lui $a1, %hi(D_802433F4) -/* 168948 802480E8 24A533F4 */ addiu $a1, $a1, %lo(D_802433F4) +/* 168944 802480E4 3C058024 */ lui $a1, %hi(func_802433F4) +/* 168948 802480E8 24A533F4 */ addiu $a1, $a1, %lo(func_802433F4) /* 16894C 802480EC 0C051F9F */ jal func_80147E7C /* 168950 802480F0 24040033 */ addiu $a0, $zero, 0x33 -/* 168954 802480F4 3C058024 */ lui $a1, %hi(D_80243468) -/* 168958 802480F8 24A53468 */ addiu $a1, $a1, %lo(D_80243468) +/* 168954 802480F4 3C058024 */ lui $a1, %hi(func_80243468) +/* 168958 802480F8 24A53468 */ addiu $a1, $a1, %lo(func_80243468) /* 16895C 802480FC 0C051F9F */ jal func_80147E7C /* 168960 80248100 24040034 */ addiu $a0, $zero, 0x34 /* 168964 80248104 24040035 */ addiu $a0, $zero, 0x35 diff --git a/asm/nonmatchings/code_168590/func_8024830C.s b/asm/nonmatchings/code_168590/func_8024830C.s index cb69e2f07a..ae73bf3932 100644 --- a/asm/nonmatchings/code_168590/func_8024830C.s +++ b/asm/nonmatchings/code_168590/func_8024830C.s @@ -24,8 +24,8 @@ glabel func_8024830C /* 168BB8 80248358 10400130 */ beqz $v0, .L8024881C /* 168BBC 8024835C 00A0482D */ daddu $t1, $a1, $zero /* 168BC0 80248360 8C830004 */ lw $v1, 4($a0) -/* 168BC4 80248364 3C028025 */ lui $v0, %hi(D_80248170) -/* 168BC8 80248368 24428170 */ addiu $v0, $v0, %lo(D_80248170) +/* 168BC4 80248364 3C028025 */ lui $v0, %hi(func_80248170) +/* 168BC8 80248368 24428170 */ addiu $v0, $v0, %lo(func_80248170) /* 168BCC 8024836C 1462012B */ bne $v1, $v0, .L8024881C /* 168BD0 80248370 00000000 */ nop /* 168BD4 80248374 9082001C */ lbu $v0, 0x1c($a0) diff --git a/asm/nonmatchings/code_168590/func_80248BF4.s b/asm/nonmatchings/code_168590/func_80248BF4.s index 913367f1bf..c85cfebf58 100644 --- a/asm/nonmatchings/code_168590/func_80248BF4.s +++ b/asm/nonmatchings/code_168590/func_80248BF4.s @@ -193,8 +193,8 @@ glabel func_80248BF4 .L80248EB4: /* 169714 80248EB4 0C090B65 */ jal func_80242D94 /* 169718 80248EB8 00000000 */ nop -/* 16971C 80248EBC 3C058025 */ lui $a1, %hi(D_80248170) -/* 169720 80248EC0 24A58170 */ addiu $a1, $a1, %lo(D_80248170) +/* 16971C 80248EBC 3C058025 */ lui $a1, %hi(func_80248170) +/* 169720 80248EC0 24A58170 */ addiu $a1, $a1, %lo(func_80248170) /* 169724 80248EC4 0C051F9F */ jal func_80147E7C /* 169728 80248EC8 24040031 */ addiu $a0, $zero, 0x31 /* 16972C 80248ECC 0809240D */ j .L80249034 @@ -223,8 +223,8 @@ glabel func_80248BF4 .L80248F20: /* 169780 80248F20 0C05272D */ jal play_sound /* 169784 80248F24 240400C9 */ addiu $a0, $zero, 0xc9 -/* 169788 80248F28 3C058024 */ lui $a1, %hi(D_80243CCC) -/* 16978C 80248F2C 24A53CCC */ addiu $a1, $a1, %lo(D_80243CCC) +/* 169788 80248F28 3C058024 */ lui $a1, %hi(func_80243CCC) +/* 16978C 80248F2C 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) /* 169790 80248F30 0C051F9F */ jal func_80147E7C /* 169794 80248F34 24040032 */ addiu $a0, $zero, 0x32 /* 169798 80248F38 3C048016 */ lui $a0, %hi(gUIPanels) @@ -335,8 +335,8 @@ glabel func_80248BF4 /* 16991C 802490BC 04430031 */ bgezl $v0, .L80249184 /* 169920 802490C0 0040182D */ daddu $v1, $v0, $zero /* 169924 802490C4 24040030 */ addiu $a0, $zero, 0x30 -/* 169928 802490C8 3C108024 */ lui $s0, %hi(D_80243628) -/* 16992C 802490CC 26103628 */ addiu $s0, $s0, %lo(D_80243628) +/* 169928 802490C8 3C108024 */ lui $s0, %hi(func_80243628) +/* 16992C 802490CC 26103628 */ addiu $s0, $s0, %lo(func_80243628) /* 169930 802490D0 0200282D */ daddu $a1, $s0, $zero /* 169934 802490D4 0C051F9F */ jal func_80147E7C /* 169938 802490D8 A0600000 */ sb $zero, ($v1) @@ -344,8 +344,8 @@ glabel func_80248BF4 /* 169940 802490E0 0C051F9F */ jal func_80147E7C /* 169944 802490E4 0200282D */ daddu $a1, $s0, $zero /* 169948 802490E8 2404002D */ addiu $a0, $zero, 0x2d -/* 16994C 802490EC 3C108024 */ lui $s0, %hi(D_8024381C) -/* 169950 802490F0 2610381C */ addiu $s0, $s0, %lo(D_8024381C) +/* 16994C 802490EC 3C108024 */ lui $s0, %hi(func_8024381C) +/* 169950 802490F0 2610381C */ addiu $s0, $s0, %lo(func_8024381C) /* 169954 802490F4 0C051F9F */ jal func_80147E7C /* 169958 802490F8 0200282D */ daddu $a1, $s0, $zero /* 16995C 802490FC 24040033 */ addiu $a0, $zero, 0x33 @@ -425,8 +425,8 @@ glabel func_80248BF4 .L80249210: /* 169A70 80249210 0C05272D */ jal play_sound /* 169A74 80249214 240400C9 */ addiu $a0, $zero, 0xc9 -/* 169A78 80249218 3C058024 */ lui $a1, %hi(D_80243CCC) -/* 169A7C 8024921C 24A53CCC */ addiu $a1, $a1, %lo(D_80243CCC) +/* 169A78 80249218 3C058024 */ lui $a1, %hi(func_80243CCC) +/* 169A7C 8024921C 24A53CCC */ addiu $a1, $a1, %lo(func_80243CCC) /* 169A80 80249220 0C051F9F */ jal func_80147E7C /* 169A84 80249224 24040032 */ addiu $a0, $zero, 0x32 /* 169A88 80249228 3C048016 */ lui $a0, %hi(gUIPanels) diff --git a/asm/nonmatchings/code_16F740/func_80246B2C.s b/asm/nonmatchings/code_16F740/func_80246B2C.s new file mode 100644 index 0000000000..fca63b0631 --- /dev/null +++ b/asm/nonmatchings/code_16F740/func_80246B2C.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80246B2C +/* 17540C 80246B2C 03E00008 */ jr $ra +/* 175410 80246B30 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/pause_cleanup.s b/asm/nonmatchings/code_16F740/pause_cleanup.s index 0abc065352..ad1542f85c 100644 --- a/asm/nonmatchings/code_16F740/pause_cleanup.s +++ b/asm/nonmatchings/code_16F740/pause_cleanup.s @@ -3,4 +3,4 @@ glabel pause_cleanup /* 172FE8 80244708 03E00008 */ jr $ra -/* 172FEC 8024470C 00000000 */ nop +/* 172FEC 8024470C 00000000 */ nop diff --git a/asm/nonmatchings/code_16c8e0/initialize_battle.s b/asm/nonmatchings/code_16c8e0/initialize_battle.s index 81d4c3bed6..e730b4db30 100644 --- a/asm/nonmatchings/code_16c8e0/initialize_battle.s +++ b/asm/nonmatchings/code_16c8e0/initialize_battle.s @@ -87,8 +87,8 @@ glabel initialize_battle /* 16CB44 8023E264 00641824 */ and $v1, $v1, $a0 /* 16CB48 8023E268 AC430004 */ sw $v1, 4($v0) .L8023E26C: -/* 16CB4C 8023E26C 3C058024 */ lui $a1, %hi(D_8023ED5C) -/* 16CB50 8023E270 24A5ED5C */ addiu $a1, $a1, %lo(D_8023ED5C) +/* 16CB4C 8023E26C 3C058024 */ lui $a1, %hi(func_8023ED5C) +/* 16CB50 8023E270 24A5ED5C */ addiu $a1, $a1, %lo(func_8023ED5C) /* 16CB54 8023E274 0C048C56 */ jal bind_dynamic_entity_3 /* 16CB58 8023E278 0000202D */ daddu $a0, $zero, $zero /* 16CB5C 8023E27C 0C093B70 */ jal func_8024EDC0 @@ -162,12 +162,12 @@ glabel initialize_battle /* 16CC60 8023E380 2A22000A */ slti $v0, $s1, 0xa /* 16CC64 8023E384 1440FFF2 */ bnez $v0, .L8023E350 /* 16CC68 8023E388 26520004 */ addiu $s2, $s2, 4 -/* 16CC6C 8023E38C 3C028024 */ lui $v0, %hi(D_8023F088) -/* 16CC70 8023E390 2442F088 */ addiu $v0, $v0, %lo(D_8023F088) +/* 16CC6C 8023E38C 3C028024 */ lui $v0, %hi(func_8023F088) +/* 16CC70 8023E390 2442F088 */ addiu $v0, $v0, %lo(func_8023F088) /* 16CC74 8023E394 AE8201FC */ sw $v0, 0x1fc($s4) /* 16CC78 8023E398 966302A2 */ lhu $v1, 0x2a2($s3) -/* 16CC7C 8023E39C 3C028024 */ lui $v0, %hi(D_8023FF84) -/* 16CC80 8023E3A0 2442FF84 */ addiu $v0, $v0, %lo(D_8023FF84) +/* 16CC7C 8023E39C 3C028024 */ lui $v0, %hi(func_8023FF84) +/* 16CC80 8023E3A0 2442FF84 */ addiu $v0, $v0, %lo(func_8023FF84) /* 16CC84 8023E3A4 AE820200 */ sw $v0, 0x200($s4) /* 16CC88 8023E3A8 2C62270F */ sltiu $v0, $v1, 0x270f /* 16CC8C 8023E3AC 10400002 */ beqz $v0, .L8023E3B8 diff --git a/asm/nonmatchings/code_17D6A0/func_8024EFE0.s b/asm/nonmatchings/code_17D6A0/func_8024EFE0.s index 9011569225..c6ec09eb98 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024EFE0.s +++ b/asm/nonmatchings/code_17D6A0/func_8024EFE0.s @@ -67,12 +67,12 @@ glabel func_8024EFE0 /* 17D9A8 8024F0C8 00042080 */ sll $a0, $a0, 2 /* 17D9AC 8024F0CC 00952023 */ subu $a0, $a0, $s5 /* 17D9B0 8024F0D0 00042080 */ sll $a0, $a0, 2 -/* 17D9B4 8024F0D4 3C028025 */ lui $v0, %hi(D_8024F394) -/* 17D9B8 8024F0D8 2442F394 */ addiu $v0, $v0, %lo(D_8024F394) +/* 17D9B4 8024F0D4 3C028025 */ lui $v0, %hi(func_8024F394) +/* 17D9B8 8024F0D8 2442F394 */ addiu $v0, $v0, %lo(func_8024F394) /* 17D9BC 8024F0DC A6200090 */ sh $zero, 0x90($s1) /* 17D9C0 8024F0E0 AE020004 */ sw $v0, 4($s0) -/* 17D9C4 8024F0E4 3C028025 */ lui $v0, %hi(D_8024F5AC) -/* 17D9C8 8024F0E8 2442F5AC */ addiu $v0, $v0, %lo(D_8024F5AC) +/* 17D9C4 8024F0E4 3C028025 */ lui $v0, %hi(func_8024F5AC) +/* 17D9C8 8024F0E8 2442F5AC */ addiu $v0, $v0, %lo(func_8024F5AC) /* 17D9CC 8024F0EC AE020008 */ sw $v0, 8($s0) /* 17D9D0 8024F0F0 96020010 */ lhu $v0, 0x10($s0) /* 17D9D4 8024F0F4 24030001 */ addiu $v1, $zero, 1 @@ -116,8 +116,8 @@ glabel func_8024EFE0 /* 17DA60 8024F180 0C048BBA */ jal func_80122EE8 /* 17DA64 8024F184 AE04FFBC */ sw $a0, -0x44($s0) /* 17DA68 8024F188 8E04FFBC */ lw $a0, -0x44($s0) -/* 17DA6C 8024F18C 3C068025 */ lui $a2, %hi(D_8024F768) -/* 17DA70 8024F190 24C6F768 */ addiu $a2, $a2, %lo(D_8024F768) +/* 17DA6C 8024F18C 3C068025 */ lui $a2, %hi(func_8024F768) +/* 17DA70 8024F190 24C6F768 */ addiu $a2, $a2, %lo(func_8024F768) /* 17DA74 8024F194 0C048BD9 */ jal func_80122F64 /* 17DA78 8024F198 0260282D */ daddu $a1, $s3, $zero /* 17DA7C 8024F19C 0240102D */ daddu $v0, $s2, $zero diff --git a/asm/nonmatchings/code_17D6A0/func_8024F394.s b/asm/nonmatchings/code_17D6A0/func_8024F394.s index 1810bb2325..68ac8ed929 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F394.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F394.s @@ -132,7 +132,7 @@ glabel func_8024F394 /* 17DE50 8024F570 0C00AB4B */ jal heap_free /* 17DE54 8024F574 8E840018 */ lw $a0, 0x18($s4) /* 17DE58 8024F578 0280202D */ daddu $a0, $s4, $zero -/* 17DE5C 8024F57C 0C093BE9 */ jal func_8024EFA4 +/* 17DE5C 8024F57C 0C093BE9 */ jal gPauseMenuCursorOpacity /* 17DE60 8024F580 AC800018 */ sw $zero, 0x18($a0) .L8024F584: /* 17DE64 8024F584 8FBF0028 */ lw $ra, 0x28($sp) diff --git a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s index 95db82f408..367963b5e4 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s +++ b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s @@ -846,7 +846,7 @@ glabel func_8024FB3C /* 17F0CC 802507EC 24050002 */ addiu $a1, $zero, 2 /* 17F0D0 802507F0 3C018028 */ lui $at, %hi(D_802838F8) /* 17F0D4 802507F4 AC2038F8 */ sw $zero, %lo(D_802838F8)($at) -/* 17F0D8 802507F8 0C093BE9 */ jal func_8024EFA4 +/* 17F0D8 802507F8 0C093BE9 */ jal gPauseMenuCursorOpacity /* 17F0DC 802507FC 0220202D */ daddu $a0, $s1, $zero .L80250800: /* 17F0E0 80250800 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_17D6A0/show_battle_message.s b/asm/nonmatchings/code_17D6A0/show_battle_message.s index decaf02859..35a142248e 100644 --- a/asm/nonmatchings/code_17D6A0/show_battle_message.s +++ b/asm/nonmatchings/code_17D6A0/show_battle_message.s @@ -12,8 +12,8 @@ glabel show_battle_message /* 17E25C 8024F97C 0040182D */ daddu $v1, $v0, $zero /* 17E260 8024F980 1060001B */ beqz $v1, .L8024F9F0 /* 17E264 8024F984 00000000 */ nop -/* 17E268 8024F988 3C028025 */ lui $v0, %hi(D_8024FB3C) -/* 17E26C 8024F98C 2442FB3C */ addiu $v0, $v0, %lo(D_8024FB3C) +/* 17E268 8024F988 3C028025 */ lui $v0, %hi(func_8024FB3C) +/* 17E26C 8024F98C 2442FB3C */ addiu $v0, $v0, %lo(func_8024FB3C) /* 17E270 8024F990 AC620004 */ sw $v0, 4($v1) /* 17E274 8024F994 3C028025 */ lui $v0, %hi(show_message_popup) /* 17E278 8024F998 24420EA4 */ addiu $v0, $v0, %lo(show_message_popup) diff --git a/asm/nonmatchings/code_17D6A0/show_message_popup.s b/asm/nonmatchings/code_17D6A0/show_message_popup.s index e3540d691f..81e2d67445 100644 --- a/asm/nonmatchings/code_17D6A0/show_message_popup.s +++ b/asm/nonmatchings/code_17D6A0/show_message_popup.s @@ -49,8 +49,8 @@ glabel show_message_popup /* 17F834 80250F54 3C088028 */ lui $t0, %hi(D_802835D0) /* 17F838 80250F58 01024021 */ addu $t0, $t0, $v0 /* 17F83C 80250F5C 850835D0 */ lh $t0, %lo(D_802835D0)($t0) -/* 17F840 80250F60 3C028025 */ lui $v0, %hi(D_80250818) -/* 17F844 80250F64 24420818 */ addiu $v0, $v0, %lo(D_80250818) +/* 17F840 80250F60 3C028025 */ lui $v0, %hi(func_80250818) +/* 17F844 80250F64 24420818 */ addiu $v0, $v0, %lo(func_80250818) /* 17F848 80250F68 AFA20018 */ sw $v0, 0x18($sp) /* 17F84C 80250F6C 2402FFFF */ addiu $v0, $zero, -1 /* 17F850 80250F70 AFA00014 */ sw $zero, 0x14($sp) @@ -81,8 +81,8 @@ glabel show_message_popup /* 17F8B4 80250FD4 240200A0 */ addiu $v0, $zero, 0xa0 /* 17F8B8 80250FD8 00452823 */ subu $a1, $v0, $a1 /* 17F8BC 80250FDC 0280302D */ daddu $a2, $s4, $zero -/* 17F8C0 80250FE0 3C028025 */ lui $v0, %hi(D_80250818) -/* 17F8C4 80250FE4 24420818 */ addiu $v0, $v0, %lo(D_80250818) +/* 17F8C0 80250FE0 3C028025 */ lui $v0, %hi(func_80250818) +/* 17F8C4 80250FE4 24420818 */ addiu $v0, $v0, %lo(func_80250818) /* 17F8C8 80250FE8 AFA20018 */ sw $v0, 0x18($sp) /* 17F8CC 80250FEC 2402FFFF */ addiu $v0, $zero, -1 /* 17F8D0 80250FF0 AFA80010 */ sw $t0, 0x10($sp) @@ -127,8 +127,8 @@ glabel show_message_popup /* 17F96C 8025108C 3C088028 */ lui $t0, %hi(D_802835D0) /* 17F970 80251090 01024021 */ addu $t0, $t0, $v0 /* 17F974 80251094 850835D0 */ lh $t0, %lo(D_802835D0)($t0) -/* 17F978 80251098 3C028025 */ lui $v0, %hi(D_80250818) -/* 17F97C 8025109C 24420818 */ addiu $v0, $v0, %lo(D_80250818) +/* 17F978 80251098 3C028025 */ lui $v0, %hi(func_80250818) +/* 17F97C 8025109C 24420818 */ addiu $v0, $v0, %lo(func_80250818) /* 17F980 802510A0 AFA20018 */ sw $v0, 0x18($sp) /* 17F984 802510A4 2402FFFF */ addiu $v0, $zero, -1 /* 17F988 802510A8 AFA00014 */ sw $zero, 0x14($sp) @@ -177,8 +177,8 @@ glabel show_message_popup /* 17FA34 80251154 3C088028 */ lui $t0, %hi(D_802835D0) /* 17FA38 80251158 01024021 */ addu $t0, $t0, $v0 /* 17FA3C 8025115C 850835D0 */ lh $t0, %lo(D_802835D0)($t0) -/* 17FA40 80251160 3C028025 */ lui $v0, %hi(D_80250818) -/* 17FA44 80251164 24420818 */ addiu $v0, $v0, %lo(D_80250818) +/* 17FA40 80251160 3C028025 */ lui $v0, %hi(func_80250818) +/* 17FA44 80251164 24420818 */ addiu $v0, $v0, %lo(func_80250818) /* 17FA48 80251168 AFA20018 */ sw $v0, 0x18($sp) /* 17FA4C 8025116C 2402FFFF */ addiu $v0, $zero, -1 /* 17FA50 80251170 AFA00014 */ sw $zero, 0x14($sp) @@ -229,8 +229,8 @@ glabel show_message_popup /* 17FB00 80251220 3C018028 */ lui $at, %hi(D_802835D8) /* 17FB04 80251224 00230821 */ addu $at, $at, $v1 /* 17FB08 80251228 942335D8 */ lhu $v1, %lo(D_802835D8)($at) -/* 17FB0C 8025122C 3C028025 */ lui $v0, %hi(D_80250818) -/* 17FB10 80251230 24420818 */ addiu $v0, $v0, %lo(D_80250818) +/* 17FB0C 8025122C 3C028025 */ lui $v0, %hi(func_80250818) +/* 17FB10 80251230 24420818 */ addiu $v0, $v0, %lo(func_80250818) /* 17FB14 80251234 AFA20018 */ sw $v0, 0x18($sp) /* 17FB18 80251238 2402FFFF */ addiu $v0, $zero, -1 /* 17FB1C 8025123C AFA20020 */ sw $v0, 0x20($sp) diff --git a/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s index 17a8187905..5087e9a033 100644 --- a/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s +++ b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s @@ -14,8 +14,8 @@ glabel show_variable_battle_message /* 17E308 8024FA28 0040182D */ daddu $v1, $v0, $zero /* 17E30C 8024FA2C 1060001B */ beqz $v1, .L8024FA9C /* 17E310 8024FA30 00000000 */ nop -/* 17E314 8024FA34 3C028025 */ lui $v0, %hi(D_8024FB3C) -/* 17E318 8024FA38 2442FB3C */ addiu $v0, $v0, %lo(D_8024FB3C) +/* 17E314 8024FA34 3C028025 */ lui $v0, %hi(func_8024FB3C) +/* 17E318 8024FA38 2442FB3C */ addiu $v0, $v0, %lo(func_8024FB3C) /* 17E31C 8024FA3C AC620004 */ sw $v0, 4($v1) /* 17E320 8024FA40 3C028025 */ lui $v0, %hi(show_message_popup) /* 17E324 8024FA44 24420EA4 */ addiu $v0, $v0, %lo(show_message_popup) diff --git a/asm/nonmatchings/code_18C790/func_8025E190.s b/asm/nonmatchings/code_18C790/func_8025E190.s index 981aa4c399..c889dae6e7 100644 --- a/asm/nonmatchings/code_18C790/func_8025E190.s +++ b/asm/nonmatchings/code_18C790/func_8025E190.s @@ -1470,8 +1470,8 @@ glabel func_8025E190 /* 18E0C4 8025F7E4 24020020 */ addiu $v0, $zero, 0x20 /* 18E0C8 8025F7E8 AFA30028 */ sw $v1, 0x28($sp) /* 18E0CC 8025F7EC AFA20010 */ sw $v0, 0x10($sp) -/* 18E0D0 8025F7F0 3C028026 */ lui $v0, %hi(D_80260948) -/* 18E0D4 8025F7F4 24420948 */ addiu $v0, $v0, %lo(D_80260948) +/* 18E0D0 8025F7F0 3C028026 */ lui $v0, %hi(func_80260948) +/* 18E0D4 8025F7F4 24420948 */ addiu $v0, $v0, %lo(func_80260948) /* 18E0D8 8025F7F8 AFA20018 */ sw $v0, 0x18($sp) /* 18E0DC 8025F7FC 2402FFFF */ addiu $v0, $zero, -1 /* 18E0E0 8025F800 AFA30014 */ sw $v1, 0x14($sp) @@ -1823,8 +1823,8 @@ glabel func_8025E190 /* 18E5C4 8025FCE4 AFA20010 */ sw $v0, 0x10($sp) /* 18E5C8 8025FCE8 2402000A */ addiu $v0, $zero, 0xa /* 18E5CC 8025FCEC AFA20014 */ sw $v0, 0x14($sp) -/* 18E5D0 8025FCF0 3C028026 */ lui $v0, %hi(D_80260A20) -/* 18E5D4 8025FCF4 24420A20 */ addiu $v0, $v0, %lo(D_80260A20) +/* 18E5D0 8025FCF0 3C028026 */ lui $v0, %hi(func_80260A20) +/* 18E5D4 8025FCF4 24420A20 */ addiu $v0, $v0, %lo(func_80260A20) /* 18E5D8 8025FCF8 AFA20018 */ sw $v0, 0x18($sp) /* 18E5DC 8025FCFC 2402FFFF */ addiu $v0, $zero, -1 /* 18E5E0 8025FD00 AFA0001C */ sw $zero, 0x1c($sp) diff --git a/asm/nonmatchings/code_196AA0/func_80268E88.s b/asm/nonmatchings/code_196AA0/func_80268E88.s index 65f5977abd..1b6e0126f3 100644 --- a/asm/nonmatchings/code_196AA0/func_80268E88.s +++ b/asm/nonmatchings/code_196AA0/func_80268E88.s @@ -6,10 +6,10 @@ glabel func_80268E88 /* 19776C 80268E8C AFB00010 */ sw $s0, 0x10($sp) /* 197770 80268E90 3C10802A */ lui $s0, %hi(D_8029FBE0) /* 197774 80268E94 2610FBE0 */ addiu $s0, $s0, %lo(D_8029FBE0) -/* 197778 80268E98 3C048027 */ lui $a0, %hi(D_80268938) -/* 19777C 80268E9C 24848938 */ addiu $a0, $a0, %lo(D_80268938) -/* 197780 80268EA0 3C058027 */ lui $a1, %hi(D_80268AF8) -/* 197784 80268EA4 24A58AF8 */ addiu $a1, $a1, %lo(D_80268AF8) +/* 197778 80268E98 3C048027 */ lui $a0, %hi(func_80268938) +/* 19777C 80268E9C 24848938 */ addiu $a0, $a0, %lo(func_80268938) +/* 197780 80268EA0 3C058027 */ lui $a1, %hi(func_80268AF8) +/* 197784 80268EA4 24A58AF8 */ addiu $a1, $a1, %lo(func_80268AF8) /* 197788 80268EA8 AFBF0014 */ sw $ra, 0x14($sp) /* 19778C 80268EAC 0C048C8F */ jal bind_dynamic_entity_7 /* 197790 80268EB0 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s index 81ec216ec6..59fe2d4798 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s +++ b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s @@ -46,7 +46,7 @@ glabel DoBasicAI /* 25920 8004A520 8E2200B0 */ lw $v0, 0xb0($s1) /* 25924 8004A524 30420004 */ andi $v0, $v0, 4 /* 25928 8004A528 1040002B */ beqz $v0, .L8004A5D8 -/* 2592C 8004A52C 00000000 */ nop +/* 2592C 8004A52C 00000000 */ nop .L8004A530: /* 25930 8004A530 2404F7FF */ addiu $a0, $zero, -0x801 /* 25934 8004A534 AE400070 */ sw $zero, 0x70($s2) @@ -103,7 +103,7 @@ glabel DoBasicAI /* 259EC 8004A5EC 00220821 */ addu $at, $at, $v0 /* 259F0 8004A5F0 8C228728 */ lw $v0, %lo(D_80098728)($at) /* 259F4 8004A5F4 00400008 */ jr $v0 -/* 259F8 8004A5F8 00000000 */ nop +/* 259F8 8004A5F8 00000000 */ nop /* 259FC 8004A5FC 0240202D */ daddu $a0, $s2, $zero /* 25A00 8004A600 0260282D */ daddu $a1, $s3, $zero /* 25A04 8004A604 0C012568 */ jal func_800495A0 @@ -113,17 +113,17 @@ glabel DoBasicAI /* 25A14 8004A614 0C0125AE */ jal func_800496B8 /* 25A18 8004A618 0280302D */ daddu $a2, $s4, $zero /* 25A1C 8004A61C 080129B1 */ j .L8004A6C4 -/* 25A20 8004A620 00000000 */ nop +/* 25A20 8004A620 00000000 */ nop /* 25A24 8004A624 0240202D */ daddu $a0, $s2, $zero /* 25A28 8004A628 0260282D */ daddu $a1, $s3, $zero -/* 25A2C 8004A62C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 25A2C 8004A62C 0C0126D1 */ jal func_80049B44 /* 25A30 8004A630 0280302D */ daddu $a2, $s4, $zero /* 25A34 8004A634 0240202D */ daddu $a0, $s2, $zero /* 25A38 8004A638 0260282D */ daddu $a1, $s3, $zero /* 25A3C 8004A63C 0C012701 */ jal func_80049C04 /* 25A40 8004A640 0280302D */ daddu $a2, $s4, $zero /* 25A44 8004A644 080129B1 */ j .L8004A6C4 -/* 25A48 8004A648 00000000 */ nop +/* 25A48 8004A648 00000000 */ nop /* 25A4C 8004A64C 0240202D */ daddu $a0, $s2, $zero /* 25A50 8004A650 0260282D */ daddu $a1, $s3, $zero /* 25A54 8004A654 0C01278F */ jal func_80049E3C @@ -133,7 +133,7 @@ glabel DoBasicAI /* 25A64 8004A664 0C0127B3 */ jal func_80049ECC /* 25A68 8004A668 0280302D */ daddu $a2, $s4, $zero /* 25A6C 8004A66C 080129B1 */ j .L8004A6C4 -/* 25A70 8004A670 00000000 */ nop +/* 25A70 8004A670 00000000 */ nop /* 25A74 8004A674 0240202D */ daddu $a0, $s2, $zero /* 25A78 8004A678 0260282D */ daddu $a1, $s3, $zero /* 25A7C 8004A67C 0C0127DF */ jal func_80049F7C @@ -145,13 +145,13 @@ glabel DoBasicAI /* 25A94 8004A694 8E430070 */ lw $v1, 0x70($s2) /* 25A98 8004A698 2402000E */ addiu $v0, $zero, 0xe /* 25A9C 8004A69C 14620009 */ bne $v1, $v0, .L8004A6C4 -/* 25AA0 8004A6A0 00000000 */ nop +/* 25AA0 8004A6A0 00000000 */ nop /* 25AA4 8004A6A4 0240202D */ daddu $a0, $s2, $zero /* 25AA8 8004A6A8 0260282D */ daddu $a1, $s3, $zero /* 25AAC 8004A6AC 0C0128FA */ jal func_8004A3E8 /* 25AB0 8004A6B0 0280302D */ daddu $a2, $s4, $zero /* 25AB4 8004A6B4 080129B1 */ j .L8004A6C4 -/* 25AB8 8004A6B8 00000000 */ nop +/* 25AB8 8004A6B8 00000000 */ nop /* 25ABC 8004A6BC 0C0129CF */ jal func_8004A73C /* 25AC0 8004A6C0 0240202D */ daddu $a0, $s2, $zero .L8004A6C4: @@ -165,4 +165,4 @@ glabel DoBasicAI /* 25AE0 8004A6E0 0000102D */ daddu $v0, $zero, $zero /* 25AE4 8004A6E4 03E00008 */ jr $ra /* 25AE8 8004A6E8 27BD0050 */ addiu $sp, $sp, 0x50 -/* 25AEC 8004A6EC 00000000 */ nop +/* 25AEC 8004A6EC 00000000 */ nop diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s index 29c44562b5..647016daf9 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s @@ -14,8 +14,8 @@ glabel func_80045AC0 /* 20EE0 80045AE0 28820020 */ slti $v0, $a0, 0x20 /* 20EE4 80045AE4 1440FFFB */ bnez $v0, .L80045AD4 /* 20EE8 80045AE8 2463001C */ addiu $v1, $v1, 0x1c -/* 20EEC 80045AEC 3C058004 */ lui $a1, %hi(D_80045BC8) -/* 20EF0 80045AF0 24A55BC8 */ addiu $a1, $a1, %lo(D_80045BC8) +/* 20EEC 80045AEC 3C058004 */ lui $a1, %hi(func_80045BC8) +/* 20EF0 80045AF0 24A55BC8 */ addiu $a1, $a1, %lo(func_80045BC8) /* 20EF4 80045AF4 0C048C56 */ jal bind_dynamic_entity_3 /* 20EF8 80045AF8 0000202D */ daddu $a0, $zero, $zero /* 20EFC 80045AFC 0C0117ED */ jal func_80045FB4 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s index 3a26b5d47c..46ae2beaf0 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s @@ -12,11 +12,11 @@ glabel func_80045D00 /* 2111C 80045D1C 0040182D */ daddu $v1, $v0, $zero /* 21120 80045D20 10600011 */ beqz $v1, .L80045D68 /* 21124 80045D24 00000000 */ nop -/* 21128 80045D28 3C028004 */ lui $v0, %hi(D_80045D7C) -/* 2112C 80045D2C 24425D7C */ addiu $v0, $v0, %lo(D_80045D7C) +/* 21128 80045D28 3C028004 */ lui $v0, %hi(func_80045D7C) +/* 2112C 80045D2C 24425D7C */ addiu $v0, $v0, %lo(func_80045D7C) /* 21130 80045D30 AC620004 */ sw $v0, 4($v1) -/* 21134 80045D34 3C028004 */ lui $v0, %hi(D_80045ED0) -/* 21138 80045D38 24425ED0 */ addiu $v0, $v0, %lo(D_80045ED0) +/* 21134 80045D34 3C028004 */ lui $v0, %hi(func_80045ED0) +/* 21138 80045D38 24425ED0 */ addiu $v0, $v0, %lo(func_80045ED0) /* 2113C 80045D3C AC62000C */ sw $v0, 0xc($v1) /* 21140 80045D40 24020001 */ addiu $v0, $zero, 1 /* 21144 80045D44 A0620017 */ sb $v0, 0x17($v1) diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s index f6a3ef0bbe..a36e9feb0c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045ED0.s @@ -35,8 +35,8 @@ glabel func_80045ED0 /* 21348 80045F48 3C038008 */ lui $v1, %hi(D_80078160) /* 2134C 80045F4C 00621821 */ addu $v1, $v1, $v0 /* 21350 80045F50 84638160 */ lh $v1, %lo(D_80078160)($v1) -/* 21354 80045F54 3C028004 */ lui $v0, %hi(D_80045E4C) -/* 21358 80045F58 24425E4C */ addiu $v0, $v0, %lo(D_80045E4C) +/* 21354 80045F54 3C028004 */ lui $v0, %hi(func_80045E4C) +/* 21358 80045F58 24425E4C */ addiu $v0, $v0, %lo(func_80045E4C) /* 2135C 80045F5C AFA20018 */ sw $v0, 0x18($sp) /* 21360 80045F60 2402FFFF */ addiu $v0, $zero, -1 /* 21364 80045F64 24060050 */ addiu $a2, $zero, 0x50 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s index 4f16a50ae9..e8f9147679 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s @@ -9,11 +9,11 @@ glabel func_80045FB4 /* 213C4 80045FC4 0040802D */ daddu $s0, $v0, $zero /* 213C8 80045FC8 12000015 */ beqz $s0, .L80046020 /* 213CC 80045FCC 24042C00 */ addiu $a0, $zero, 0x2c00 -/* 213D0 80045FD0 3C028004 */ lui $v0, %hi(D_80046030) -/* 213D4 80045FD4 24426030 */ addiu $v0, $v0, %lo(D_80046030) +/* 213D0 80045FD0 3C028004 */ lui $v0, %hi(func_80046030) +/* 213D4 80045FD4 24426030 */ addiu $v0, $v0, %lo(func_80046030) /* 213D8 80045FD8 AE020004 */ sw $v0, 4($s0) -/* 213DC 80045FDC 3C028004 */ lui $v0, %hi(D_800465E0) -/* 213E0 80045FE0 244265E0 */ addiu $v0, $v0, %lo(D_800465E0) +/* 213DC 80045FDC 3C028004 */ lui $v0, %hi(func_800465E0) +/* 213E0 80045FE0 244265E0 */ addiu $v0, $v0, %lo(func_800465E0) /* 213E4 80045FE4 AE000000 */ sw $zero, ($s0) /* 213E8 80045FE8 AE000008 */ sw $zero, 8($s0) /* 213EC 80045FEC 0C00AB0A */ jal general_heap_malloc diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s index 5a3d1080cf..f925fcdc25 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s @@ -156,8 +156,8 @@ glabel func_8004AB00 /* 2614C 8004AD4C 24060032 */ addiu $a2, $zero, 0x32 /* 26150 8004AD50 3C04800C */ lui $a0, %hi(D_800B91A0) /* 26154 8004AD54 248491A0 */ addiu $a0, $a0, %lo(D_800B91A0) -/* 26158 8004AD58 3C028005 */ lui $v0, %hi(D_8004B328) -/* 2615C 8004AD5C 2442B328 */ addiu $v0, $v0, %lo(D_8004B328) +/* 26158 8004AD58 3C028005 */ lui $v0, %hi(func_8004B328) +/* 2615C 8004AD5C 2442B328 */ addiu $v0, $v0, %lo(func_8004B328) /* 26160 8004AD60 3C018008 */ lui $at, %hi(nuAuPreNMIFunc) /* 26164 8004AD64 AC228174 */ sw $v0, %lo(nuAuPreNMIFunc)($at) /* 26168 8004AD68 0C015894 */ jal func_80056250 @@ -169,8 +169,8 @@ glabel func_8004AB00 /* 26180 8004AD80 26100F58 */ addiu $s0, $s0, %lo(D_800A0F58) /* 26184 8004AD84 0200202D */ daddu $a0, $s0, $zero /* 26188 8004AD88 24050003 */ addiu $a1, $zero, 3 -/* 2618C 8004AD8C 3C068005 */ lui $a2, %hi(D_8004AE08) -/* 26190 8004AD90 24C6AE08 */ addiu $a2, $a2, %lo(D_8004AE08) +/* 2618C 8004AD8C 3C068005 */ lui $a2, %hi(func_8004AE08) +/* 26190 8004AD90 24C6AE08 */ addiu $a2, $a2, %lo(func_8004AE08) /* 26194 8004AD94 3C02800A */ lui $v0, %hi(D_800A3510) /* 26198 8004AD98 24423510 */ addiu $v0, $v0, %lo(D_800A3510) /* 2619C 8004AD9C AFA20010 */ sw $v0, 0x10($sp) diff --git a/asm/nonmatchings/code_3278F0/func_E0002000.s b/asm/nonmatchings/code_3278F0/func_E0002000.s index 0c4a154081..1412f66db3 100644 --- a/asm/nonmatchings/code_3278F0/func_E0002000.s +++ b/asm/nonmatchings/code_3278F0/func_E0002000.s @@ -10,14 +10,14 @@ glabel func_E0002000 /* 327904 E0002014 27A40010 */ addiu $a0, $sp, 0x10 /* 327908 E0002018 F7BE0070 */ sdc1 $f30, 0x70($sp) /* 32790C E000201C 4486F000 */ mtc1 $a2, $f30 -/* 327910 E0002020 3C02E000 */ lui $v0, %hi(D_E00021B4) -/* 327914 E0002024 244221B4 */ addiu $v0, $v0, %lo(D_E00021B4) +/* 327910 E0002020 3C02E000 */ lui $v0, %hi(func_E00021B4) +/* 327914 E0002024 244221B4 */ addiu $v0, $v0, %lo(func_E00021B4) /* 327918 E0002028 AFA20018 */ sw $v0, 0x18($sp) -/* 32791C E000202C 3C02E000 */ lui $v0, %hi(D_E00021BC) -/* 327920 E0002030 244221BC */ addiu $v0, $v0, %lo(D_E00021BC) +/* 32791C E000202C 3C02E000 */ lui $v0, %hi(func_E00021BC) +/* 327920 E0002030 244221BC */ addiu $v0, $v0, %lo(func_E00021BC) /* 327924 E0002034 AFA2001C */ sw $v0, 0x1c($sp) -/* 327928 E0002038 3C02E000 */ lui $v0, %hi(D_E00022BC) -/* 32792C E000203C 244222BC */ addiu $v0, $v0, %lo(D_E00022BC) +/* 327928 E0002038 3C02E000 */ lui $v0, %hi(func_E00022BC) +/* 32792C E000203C 244222BC */ addiu $v0, $v0, %lo(func_E00022BC) /* 327930 E0002040 AFA20020 */ sw $v0, 0x20($sp) /* 327934 E0002044 24020001 */ addiu $v0, $zero, 1 /* 327938 E0002048 AFBF0044 */ sw $ra, 0x44($sp) diff --git a/asm/nonmatchings/code_3278F0/func_E00022BC.s b/asm/nonmatchings/code_3278F0/func_E00022BC.s index 074f203c00..cfaadd4b5d 100644 --- a/asm/nonmatchings/code_3278F0/func_E00022BC.s +++ b/asm/nonmatchings/code_3278F0/func_E00022BC.s @@ -3,8 +3,8 @@ glabel func_E00022BC /* 327BAC E00022BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 327BB0 E00022C0 3C02E000 */ lui $v0, %hi(D_E0002300) -/* 327BB4 E00022C4 24422300 */ addiu $v0, $v0, %lo(D_E0002300) +/* 327BB0 E00022C0 3C02E000 */ lui $v0, %hi(func_E0002300) +/* 327BB4 E00022C4 24422300 */ addiu $v0, $v0, %lo(func_E0002300) /* 327BB8 E00022C8 AFA2001C */ sw $v0, 0x1c($sp) /* 327BBC E00022CC 2402002D */ addiu $v0, $zero, 0x2d /* 327BC0 E00022D0 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_328110/func_E000C160.s b/asm/nonmatchings/code_328110/func_E000C160.s index 0c75cee26b..446dffb9aa 100644 --- a/asm/nonmatchings/code_328110/func_E000C160.s +++ b/asm/nonmatchings/code_328110/func_E000C160.s @@ -44,14 +44,14 @@ glabel func_E000C160 .LE000C1F0: /* 328300 E000C1F0 24130009 */ addiu $s3, $zero, 9 .LE000C1F4: -/* 328304 E000C1F4 3C02E001 */ lui $v0, %hi(D_E000C64C) -/* 328308 E000C1F8 2442C64C */ addiu $v0, $v0, %lo(D_E000C64C) +/* 328304 E000C1F4 3C02E001 */ lui $v0, %hi(func_E000C64C) +/* 328308 E000C1F8 2442C64C */ addiu $v0, $v0, %lo(func_E000C64C) /* 32830C E000C1FC AC820008 */ sw $v0, 8($a0) -/* 328310 E000C200 3C02E001 */ lui $v0, %hi(D_E000C654) -/* 328314 E000C204 2442C654 */ addiu $v0, $v0, %lo(D_E000C654) +/* 328310 E000C200 3C02E001 */ lui $v0, %hi(func_E000C654) +/* 328314 E000C204 2442C654 */ addiu $v0, $v0, %lo(func_E000C654) /* 328318 E000C208 AC82000C */ sw $v0, 0xc($a0) -/* 32831C E000C20C 3C02E001 */ lui $v0, %hi(D_E000C754) -/* 328320 E000C210 2442C754 */ addiu $v0, $v0, %lo(D_E000C754) +/* 32831C E000C20C 3C02E001 */ lui $v0, %hi(func_E000C754) +/* 328320 E000C210 2442C754 */ addiu $v0, $v0, %lo(func_E000C754) /* 328324 E000C214 AC820010 */ sw $v0, 0x10($a0) /* 328328 E000C218 24020006 */ addiu $v0, $zero, 6 /* 32832C E000C21C AC800000 */ sw $zero, ($a0) diff --git a/asm/nonmatchings/code_328110/func_E000C754.s b/asm/nonmatchings/code_328110/func_E000C754.s index 5ee37c9822..ec4c840c00 100644 --- a/asm/nonmatchings/code_328110/func_E000C754.s +++ b/asm/nonmatchings/code_328110/func_E000C754.s @@ -3,8 +3,8 @@ glabel func_E000C754 /* 328864 E000C754 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 328868 E000C758 3C02E001 */ lui $v0, %hi(D_E000C798) -/* 32886C E000C75C 2442C798 */ addiu $v0, $v0, %lo(D_E000C798) +/* 328868 E000C758 3C02E001 */ lui $v0, %hi(func_E000C798) +/* 32886C E000C75C 2442C798 */ addiu $v0, $v0, %lo(func_E000C798) /* 328870 E000C760 AFA2001C */ sw $v0, 0x1c($sp) /* 328874 E000C764 24020028 */ addiu $v0, $zero, 0x28 /* 328878 E000C768 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_32C110/func_E000E000.s b/asm/nonmatchings/code_32C110/func_E000E000.s index 49bb531c72..ded17b7a11 100644 --- a/asm/nonmatchings/code_32C110/func_E000E000.s +++ b/asm/nonmatchings/code_32C110/func_E000E000.s @@ -16,14 +16,14 @@ glabel func_E000E000 /* 32C13C E000E02C 27A40010 */ addiu $a0, $sp, 0x10 /* 32C140 E000E030 F7B40040 */ sdc1 $f20, 0x40($sp) /* 32C144 E000E034 C7B4007C */ lwc1 $f20, 0x7c($sp) -/* 32C148 E000E038 3C02E001 */ lui $v0, %hi(D_E000E16C) -/* 32C14C E000E03C 2442E16C */ addiu $v0, $v0, %lo(D_E000E16C) +/* 32C148 E000E038 3C02E001 */ lui $v0, %hi(func_E000E16C) +/* 32C14C E000E03C 2442E16C */ addiu $v0, $v0, %lo(func_E000E16C) /* 32C150 E000E040 AFA20018 */ sw $v0, 0x18($sp) -/* 32C154 E000E044 3C02E001 */ lui $v0, %hi(D_E000E174) -/* 32C158 E000E048 2442E174 */ addiu $v0, $v0, %lo(D_E000E174) +/* 32C154 E000E044 3C02E001 */ lui $v0, %hi(func_E000E174) +/* 32C158 E000E048 2442E174 */ addiu $v0, $v0, %lo(func_E000E174) /* 32C15C E000E04C AFA2001C */ sw $v0, 0x1c($sp) -/* 32C160 E000E050 3C02E001 */ lui $v0, %hi(D_E000E244) -/* 32C164 E000E054 2442E244 */ addiu $v0, $v0, %lo(D_E000E244) +/* 32C160 E000E050 3C02E001 */ lui $v0, %hi(func_E000E244) +/* 32C164 E000E054 2442E244 */ addiu $v0, $v0, %lo(func_E000E244) /* 32C168 E000E058 AFA20020 */ sw $v0, 0x20($sp) /* 32C16C E000E05C 24020007 */ addiu $v0, $zero, 7 /* 32C170 E000E060 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_32C110/func_E000E244.s b/asm/nonmatchings/code_32C110/func_E000E244.s index 0329e7e8eb..418af353bf 100644 --- a/asm/nonmatchings/code_32C110/func_E000E244.s +++ b/asm/nonmatchings/code_32C110/func_E000E244.s @@ -3,8 +3,8 @@ glabel func_E000E244 /* 32C354 E000E244 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 32C358 E000E248 3C02E001 */ lui $v0, %hi(D_E000E288) -/* 32C35C E000E24C 2442E288 */ addiu $v0, $v0, %lo(D_E000E288) +/* 32C358 E000E248 3C02E001 */ lui $v0, %hi(func_E000E288) +/* 32C35C E000E24C 2442E288 */ addiu $v0, $v0, %lo(func_E000E288) /* 32C360 E000E250 AFA2001C */ sw $v0, 0x1c($sp) /* 32C364 E000E254 24020028 */ addiu $v0, $zero, 0x28 /* 32C368 E000E258 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_32E490/func_E0014000.s b/asm/nonmatchings/code_32E490/func_E0014000.s index bf508f1d12..2bde59cde3 100644 --- a/asm/nonmatchings/code_32E490/func_E0014000.s +++ b/asm/nonmatchings/code_32E490/func_E0014000.s @@ -10,14 +10,14 @@ glabel func_E0014000 /* 32E4A4 E0014014 27A40010 */ addiu $a0, $sp, 0x10 /* 32E4A8 E0014018 F7BE0068 */ sdc1 $f30, 0x68($sp) /* 32E4AC E001401C 4486F000 */ mtc1 $a2, $f30 -/* 32E4B0 E0014020 3C02E001 */ lui $v0, %hi(D_E0014258) -/* 32E4B4 E0014024 24424258 */ addiu $v0, $v0, %lo(D_E0014258) +/* 32E4B0 E0014020 3C02E001 */ lui $v0, %hi(func_E0014258) +/* 32E4B4 E0014024 24424258 */ addiu $v0, $v0, %lo(func_E0014258) /* 32E4B8 E0014028 AFA20018 */ sw $v0, 0x18($sp) -/* 32E4BC E001402C 3C02E001 */ lui $v0, %hi(D_E0014260) -/* 32E4C0 E0014030 24424260 */ addiu $v0, $v0, %lo(D_E0014260) +/* 32E4BC E001402C 3C02E001 */ lui $v0, %hi(func_E0014260) +/* 32E4C0 E0014030 24424260 */ addiu $v0, $v0, %lo(func_E0014260) /* 32E4C4 E0014034 AFA2001C */ sw $v0, 0x1c($sp) -/* 32E4C8 E0014038 3C02E001 */ lui $v0, %hi(D_E001449C) -/* 32E4CC E001403C 2442449C */ addiu $v0, $v0, %lo(D_E001449C) +/* 32E4C8 E0014038 3C02E001 */ lui $v0, %hi(func_E001449C) +/* 32E4CC E001403C 2442449C */ addiu $v0, $v0, %lo(func_E001449C) /* 32E4D0 E0014040 AFA20020 */ sw $v0, 0x20($sp) /* 32E4D4 E0014044 2402000A */ addiu $v0, $zero, 0xa /* 32E4D8 E0014048 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_32E490/func_E001449C.s b/asm/nonmatchings/code_32E490/func_E001449C.s index 13949c5177..f33e973fb6 100644 --- a/asm/nonmatchings/code_32E490/func_E001449C.s +++ b/asm/nonmatchings/code_32E490/func_E001449C.s @@ -3,8 +3,8 @@ glabel func_E001449C /* 32E92C E001449C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 32E930 E00144A0 3C02E001 */ lui $v0, %hi(D_E00144E0) -/* 32E934 E00144A4 244244E0 */ addiu $v0, $v0, %lo(D_E00144E0) +/* 32E930 E00144A0 3C02E001 */ lui $v0, %hi(func_E00144E0) +/* 32E934 E00144A4 244244E0 */ addiu $v0, $v0, %lo(func_E00144E0) /* 32E938 E00144A8 AFA2001C */ sw $v0, 0x1c($sp) /* 32E93C E00144AC 24020028 */ addiu $v0, $zero, 0x28 /* 32E940 E00144B0 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_32EE30/func_E0016000.s b/asm/nonmatchings/code_32EE30/func_E0016000.s index 7dd57f6985..9c18e0b5a6 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016000.s +++ b/asm/nonmatchings/code_32EE30/func_E0016000.s @@ -12,14 +12,14 @@ glabel func_E0016000 /* 32EE4C E001601C 27A40010 */ addiu $a0, $sp, 0x10 /* 32EE50 E0016020 F7BC0068 */ sdc1 $f28, 0x68($sp) /* 32EE54 E0016024 4487E000 */ mtc1 $a3, $f28 -/* 32EE58 E0016028 3C02E001 */ lui $v0, %hi(D_E0016220) -/* 32EE5C E001602C 24426220 */ addiu $v0, $v0, %lo(D_E0016220) +/* 32EE58 E0016028 3C02E001 */ lui $v0, %hi(func_E0016220) +/* 32EE5C E001602C 24426220 */ addiu $v0, $v0, %lo(func_E0016220) /* 32EE60 E0016030 AFA20018 */ sw $v0, 0x18($sp) -/* 32EE64 E0016034 3C02E001 */ lui $v0, %hi(D_E0016228) -/* 32EE68 E0016038 24426228 */ addiu $v0, $v0, %lo(D_E0016228) +/* 32EE64 E0016034 3C02E001 */ lui $v0, %hi(func_E0016228) +/* 32EE68 E0016038 24426228 */ addiu $v0, $v0, %lo(func_E0016228) /* 32EE6C E001603C AFA2001C */ sw $v0, 0x1c($sp) -/* 32EE70 E0016040 3C02E001 */ lui $v0, %hi(D_E0016410) -/* 32EE74 E0016044 24426410 */ addiu $v0, $v0, %lo(D_E0016410) +/* 32EE70 E0016040 3C02E001 */ lui $v0, %hi(func_E0016410) +/* 32EE74 E0016044 24426410 */ addiu $v0, $v0, %lo(func_E0016410) /* 32EE78 E0016048 AFA20020 */ sw $v0, 0x20($sp) /* 32EE7C E001604C 2402000B */ addiu $v0, $zero, 0xb /* 32EE80 E0016050 AFBF0044 */ sw $ra, 0x44($sp) diff --git a/asm/nonmatchings/code_32EE30/func_E0016410.s b/asm/nonmatchings/code_32EE30/func_E0016410.s index a3c84e7595..0aacc16613 100644 --- a/asm/nonmatchings/code_32EE30/func_E0016410.s +++ b/asm/nonmatchings/code_32EE30/func_E0016410.s @@ -3,8 +3,8 @@ glabel func_E0016410 /* 32F240 E0016410 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 32F244 E0016414 3C02E001 */ lui $v0, %hi(D_E0016454) -/* 32F248 E0016418 24426454 */ addiu $v0, $v0, %lo(D_E0016454) +/* 32F244 E0016414 3C02E001 */ lui $v0, %hi(func_E0016454) +/* 32F248 E0016418 24426454 */ addiu $v0, $v0, %lo(func_E0016454) /* 32F24C E001641C AFA2001C */ sw $v0, 0x1c($sp) /* 32F250 E0016420 24020028 */ addiu $v0, $zero, 0x28 /* 32F254 E0016424 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_32FE30/func_E001A000.s b/asm/nonmatchings/code_32FE30/func_E001A000.s index 5ec95affec..fb7d88dcd8 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A000.s +++ b/asm/nonmatchings/code_32FE30/func_E001A000.s @@ -14,14 +14,14 @@ glabel func_E001A000 /* 32FE54 E001A024 27A40010 */ addiu $a0, $sp, 0x10 /* 32FE58 E001A028 AFB20030 */ sw $s2, 0x30($sp) /* 32FE5C E001A02C 8FB20060 */ lw $s2, 0x60($sp) -/* 32FE60 E001A030 3C02E002 */ lui $v0, %hi(D_E001A21C) -/* 32FE64 E001A034 2442A21C */ addiu $v0, $v0, %lo(D_E001A21C) +/* 32FE60 E001A030 3C02E002 */ lui $v0, %hi(func_E001A21C) +/* 32FE64 E001A034 2442A21C */ addiu $v0, $v0, %lo(func_E001A21C) /* 32FE68 E001A038 AFA20018 */ sw $v0, 0x18($sp) -/* 32FE6C E001A03C 3C02E002 */ lui $v0, %hi(D_E001A224) -/* 32FE70 E001A040 2442A224 */ addiu $v0, $v0, %lo(D_E001A224) +/* 32FE6C E001A03C 3C02E002 */ lui $v0, %hi(func_E001A224) +/* 32FE70 E001A040 2442A224 */ addiu $v0, $v0, %lo(func_E001A224) /* 32FE74 E001A044 AFA2001C */ sw $v0, 0x1c($sp) -/* 32FE78 E001A048 3C02E002 */ lui $v0, %hi(D_E001A3FC) -/* 32FE7C E001A04C 2442A3FC */ addiu $v0, $v0, %lo(D_E001A3FC) +/* 32FE78 E001A048 3C02E002 */ lui $v0, %hi(func_E001A3FC) +/* 32FE7C E001A04C 2442A3FC */ addiu $v0, $v0, %lo(func_E001A3FC) /* 32FE80 E001A050 AFA20020 */ sw $v0, 0x20($sp) /* 32FE84 E001A054 2402000D */ addiu $v0, $zero, 0xd /* 32FE88 E001A058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_32FE30/func_E001A3FC.s b/asm/nonmatchings/code_32FE30/func_E001A3FC.s index b86426b54a..76256efb17 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A3FC.s +++ b/asm/nonmatchings/code_32FE30/func_E001A3FC.s @@ -3,8 +3,8 @@ glabel func_E001A3FC /* 33022C E001A3FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 330230 E001A400 3C02E002 */ lui $v0, %hi(D_E001A440) -/* 330234 E001A404 2442A440 */ addiu $v0, $v0, %lo(D_E001A440) +/* 330230 E001A400 3C02E002 */ lui $v0, %hi(func_E001A440) +/* 330234 E001A404 2442A440 */ addiu $v0, $v0, %lo(func_E001A440) /* 330238 E001A408 AFA2001C */ sw $v0, 0x1c($sp) /* 33023C E001A40C 2402002D */ addiu $v0, $zero, 0x2d /* 330240 E001A410 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_330910/func_E001C000.s b/asm/nonmatchings/code_330910/func_E001C000.s index 45b41ffc60..4681b834a2 100644 --- a/asm/nonmatchings/code_330910/func_E001C000.s +++ b/asm/nonmatchings/code_330910/func_E001C000.s @@ -12,14 +12,14 @@ glabel func_E001C000 /* 33092C E001C01C 27A40010 */ addiu $a0, $sp, 0x10 /* 330930 E001C020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 330934 E001C024 4486C000 */ mtc1 $a2, $f24 -/* 330938 E001C028 3C02E002 */ lui $v0, %hi(D_E001C120) -/* 33093C E001C02C 2442C120 */ addiu $v0, $v0, %lo(D_E001C120) +/* 330938 E001C028 3C02E002 */ lui $v0, %hi(func_E001C120) +/* 33093C E001C02C 2442C120 */ addiu $v0, $v0, %lo(func_E001C120) /* 330940 E001C030 AFA20018 */ sw $v0, 0x18($sp) -/* 330944 E001C034 3C02E002 */ lui $v0, %hi(D_E001C128) -/* 330948 E001C038 2442C128 */ addiu $v0, $v0, %lo(D_E001C128) +/* 330944 E001C034 3C02E002 */ lui $v0, %hi(func_E001C128) +/* 330948 E001C038 2442C128 */ addiu $v0, $v0, %lo(func_E001C128) /* 33094C E001C03C AFA2001C */ sw $v0, 0x1c($sp) -/* 330950 E001C040 3C02E002 */ lui $v0, %hi(D_E001C200) -/* 330954 E001C044 2442C200 */ addiu $v0, $v0, %lo(D_E001C200) +/* 330950 E001C040 3C02E002 */ lui $v0, %hi(func_E001C200) +/* 330954 E001C044 2442C200 */ addiu $v0, $v0, %lo(func_E001C200) /* 330958 E001C048 AFA20020 */ sw $v0, 0x20($sp) /* 33095C E001C04C 2402000E */ addiu $v0, $zero, 0xe /* 330960 E001C050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_330910/func_E001C200.s b/asm/nonmatchings/code_330910/func_E001C200.s index 307d44c1f6..03326eea3e 100644 --- a/asm/nonmatchings/code_330910/func_E001C200.s +++ b/asm/nonmatchings/code_330910/func_E001C200.s @@ -61,8 +61,8 @@ glabel func_E001C200 .LE001C2D0: /* 330BE0 E001C2D0 E4400008 */ swc1 $f0, 8($v0) .LE001C2D4: -/* 330BE4 E001C2D4 3C02E002 */ lui $v0, %hi(D_E001C30C) -/* 330BE8 E001C2D8 2442C30C */ addiu $v0, $v0, %lo(D_E001C30C) +/* 330BE4 E001C2D4 3C02E002 */ lui $v0, %hi(func_E001C30C) +/* 330BE8 E001C2D8 2442C30C */ addiu $v0, $v0, %lo(func_E001C30C) /* 330BEC E001C2DC AC82000C */ sw $v0, 0xc($a0) /* 330BF0 E001C2E0 2402002D */ addiu $v0, $zero, 0x2d /* 330BF4 E001C2E4 AC850008 */ sw $a1, 8($a0) diff --git a/asm/nonmatchings/code_331940/func_E001E000.s b/asm/nonmatchings/code_331940/func_E001E000.s index b8aa7efcb6..20ec56f044 100644 --- a/asm/nonmatchings/code_331940/func_E001E000.s +++ b/asm/nonmatchings/code_331940/func_E001E000.s @@ -14,14 +14,14 @@ glabel func_E001E000 /* 331964 E001E024 27A40010 */ addiu $a0, $sp, 0x10 /* 331968 E001E028 F7BE0060 */ sdc1 $f30, 0x60($sp) /* 33196C E001E02C C7BE0084 */ lwc1 $f30, 0x84($sp) -/* 331970 E001E030 3C02E002 */ lui $v0, %hi(D_E001E370) -/* 331974 E001E034 2442E370 */ addiu $v0, $v0, %lo(D_E001E370) +/* 331970 E001E030 3C02E002 */ lui $v0, %hi(func_E001E370) +/* 331974 E001E034 2442E370 */ addiu $v0, $v0, %lo(func_E001E370) /* 331978 E001E038 AFA20018 */ sw $v0, 0x18($sp) -/* 33197C E001E03C 3C02E002 */ lui $v0, %hi(D_E001E378) -/* 331980 E001E040 2442E378 */ addiu $v0, $v0, %lo(D_E001E378) +/* 33197C E001E03C 3C02E002 */ lui $v0, %hi(func_E001E378) +/* 331980 E001E040 2442E378 */ addiu $v0, $v0, %lo(func_E001E378) /* 331984 E001E044 AFA2001C */ sw $v0, 0x1c($sp) -/* 331988 E001E048 3C02E002 */ lui $v0, %hi(D_E001E6E8) -/* 33198C E001E04C 2442E6E8 */ addiu $v0, $v0, %lo(D_E001E6E8) +/* 331988 E001E048 3C02E002 */ lui $v0, %hi(func_E001E6E8) +/* 33198C E001E04C 2442E6E8 */ addiu $v0, $v0, %lo(func_E001E6E8) /* 331990 E001E050 AFA20020 */ sw $v0, 0x20($sp) /* 331994 E001E054 2402000F */ addiu $v0, $zero, 0xf /* 331998 E001E058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_331940/func_E001E6E8.s b/asm/nonmatchings/code_331940/func_E001E6E8.s index da34e2a667..eef5fc0302 100644 --- a/asm/nonmatchings/code_331940/func_E001E6E8.s +++ b/asm/nonmatchings/code_331940/func_E001E6E8.s @@ -6,8 +6,8 @@ glabel func_E001E6E8 /* 33202C E001E6EC 0000282D */ daddu $a1, $zero, $zero /* 332030 E001E6F0 AFBF0020 */ sw $ra, 0x20($sp) /* 332034 E001E6F4 8C83000C */ lw $v1, 0xc($a0) -/* 332038 E001E6F8 3C02E002 */ lui $v0, %hi(D_E001E730) -/* 33203C E001E6FC 2442E730 */ addiu $v0, $v0, %lo(D_E001E730) +/* 332038 E001E6F8 3C02E002 */ lui $v0, %hi(func_E001E730) +/* 33203C E001E6FC 2442E730 */ addiu $v0, $v0, %lo(func_E001E730) /* 332040 E001E700 AFA40018 */ sw $a0, 0x18($sp) /* 332044 E001E704 AFA2001C */ sw $v0, 0x1c($sp) /* 332048 E001E708 AFA00014 */ sw $zero, 0x14($sp) diff --git a/asm/nonmatchings/code_333EC0/func_E00202CC.s b/asm/nonmatchings/code_333EC0/func_E00202CC.s index 53b4748f47..56404a4647 100644 --- a/asm/nonmatchings/code_333EC0/func_E00202CC.s +++ b/asm/nonmatchings/code_333EC0/func_E00202CC.s @@ -28,14 +28,14 @@ glabel func_E00202CC /* 3341E8 E0020328 AFB1002C */ sw $s1, 0x2c($sp) /* 3341EC E002032C 24130003 */ addiu $s3, $zero, 3 .LE0020330: -/* 3341F0 E0020330 3C02E002 */ lui $v0, %hi(D_E0020460) -/* 3341F4 E0020334 24420460 */ addiu $v0, $v0, %lo(D_E0020460) +/* 3341F0 E0020330 3C02E002 */ lui $v0, %hi(func_E0020460) +/* 3341F4 E0020334 24420460 */ addiu $v0, $v0, %lo(func_E0020460) /* 3341F8 E0020338 AFA20018 */ sw $v0, 0x18($sp) -/* 3341FC E002033C 3C02E002 */ lui $v0, %hi(D_E0020468) -/* 334200 E0020340 24420468 */ addiu $v0, $v0, %lo(D_E0020468) +/* 3341FC E002033C 3C02E002 */ lui $v0, %hi(func_E0020468) +/* 334200 E0020340 24420468 */ addiu $v0, $v0, %lo(func_E0020468) /* 334204 E0020344 AFA2001C */ sw $v0, 0x1c($sp) -/* 334208 E0020348 3C02E002 */ lui $v0, %hi(D_E002058C) -/* 33420C E002034C 2442058C */ addiu $v0, $v0, %lo(D_E002058C) +/* 334208 E0020348 3C02E002 */ lui $v0, %hi(func_E002058C) +/* 33420C E002034C 2442058C */ addiu $v0, $v0, %lo(func_E002058C) /* 334210 E0020350 AFA20020 */ sw $v0, 0x20($sp) /* 334214 E0020354 24020010 */ addiu $v0, $zero, 0x10 /* 334218 E0020358 AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_333EC0/func_E002058C.s b/asm/nonmatchings/code_333EC0/func_E002058C.s index 1ecff2a9a2..f3a377ea83 100644 --- a/asm/nonmatchings/code_333EC0/func_E002058C.s +++ b/asm/nonmatchings/code_333EC0/func_E002058C.s @@ -3,8 +3,8 @@ glabel func_E002058C /* 33444C E002058C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 334450 E0020590 3C02E002 */ lui $v0, %hi(D_E00205D0) -/* 334454 E0020594 244205D0 */ addiu $v0, $v0, %lo(D_E00205D0) +/* 334450 E0020590 3C02E002 */ lui $v0, %hi(func_E00205D0) +/* 334454 E0020594 244205D0 */ addiu $v0, $v0, %lo(func_E00205D0) /* 334458 E0020598 AFA2001C */ sw $v0, 0x1c($sp) /* 33445C E002059C 2402002D */ addiu $v0, $zero, 0x2d /* 334460 E00205A0 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_337240/func_E0022000.s b/asm/nonmatchings/code_337240/func_E0022000.s index ecf18bf4fb..9f314c598d 100644 --- a/asm/nonmatchings/code_337240/func_E0022000.s +++ b/asm/nonmatchings/code_337240/func_E0022000.s @@ -58,14 +58,14 @@ glabel func_E0022000 /* 3372FC E00220BC 4481F000 */ mtc1 $at, $f30 .LE00220C0: /* 337300 E00220C0 26520001 */ addiu $s2, $s2, 1 -/* 337304 E00220C4 3C02E002 */ lui $v0, %hi(D_E0022544) -/* 337308 E00220C8 24422544 */ addiu $v0, $v0, %lo(D_E0022544) +/* 337304 E00220C4 3C02E002 */ lui $v0, %hi(func_E0022544) +/* 337308 E00220C8 24422544 */ addiu $v0, $v0, %lo(func_E0022544) /* 33730C E00220CC AC820008 */ sw $v0, 8($a0) -/* 337310 E00220D0 3C02E002 */ lui $v0, %hi(D_E002254C) -/* 337314 E00220D4 2442254C */ addiu $v0, $v0, %lo(D_E002254C) +/* 337310 E00220D0 3C02E002 */ lui $v0, %hi(func_E002254C) +/* 337314 E00220D4 2442254C */ addiu $v0, $v0, %lo(func_E002254C) /* 337318 E00220D8 AC82000C */ sw $v0, 0xc($a0) -/* 33731C E00220DC 3C02E002 */ lui $v0, %hi(D_E0022960) -/* 337320 E00220E0 24422960 */ addiu $v0, $v0, %lo(D_E0022960) +/* 33731C E00220DC 3C02E002 */ lui $v0, %hi(func_E0022960) +/* 337320 E00220E0 24422960 */ addiu $v0, $v0, %lo(func_E0022960) /* 337324 E00220E4 AC820010 */ sw $v0, 0x10($a0) /* 337328 E00220E8 24020011 */ addiu $v0, $zero, 0x11 /* 33732C E00220EC AC800000 */ sw $zero, ($a0) diff --git a/asm/nonmatchings/code_337240/func_E0022960.s b/asm/nonmatchings/code_337240/func_E0022960.s index f77f805719..da556bd2d8 100644 --- a/asm/nonmatchings/code_337240/func_E0022960.s +++ b/asm/nonmatchings/code_337240/func_E0022960.s @@ -3,8 +3,8 @@ glabel func_E0022960 /* 337BA0 E0022960 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 337BA4 E0022964 3C02E002 */ lui $v0, %hi(D_E0022998) -/* 337BA8 E0022968 24422998 */ addiu $v0, $v0, %lo(D_E0022998) +/* 337BA4 E0022964 3C02E002 */ lui $v0, %hi(func_E0022998) +/* 337BA8 E0022968 24422998 */ addiu $v0, $v0, %lo(func_E0022998) /* 337BAC E002296C AFA2001C */ sw $v0, 0x1c($sp) /* 337BB0 E0022970 2402002D */ addiu $v0, $zero, 0x2d /* 337BB4 E0022974 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_339250/func_E0024000.s b/asm/nonmatchings/code_339250/func_E0024000.s index 5f357c4d36..348951d8b8 100644 --- a/asm/nonmatchings/code_339250/func_E0024000.s +++ b/asm/nonmatchings/code_339250/func_E0024000.s @@ -14,14 +14,14 @@ glabel func_E0024000 /* 339274 E0024024 27A40010 */ addiu $a0, $sp, 0x10 /* 339278 E0024028 AFB20030 */ sw $s2, 0x30($sp) /* 33927C E002402C 8FB2006C */ lw $s2, 0x6c($sp) -/* 339280 E0024030 3C02E002 */ lui $v0, %hi(D_E0024180) -/* 339284 E0024034 24424180 */ addiu $v0, $v0, %lo(D_E0024180) +/* 339280 E0024030 3C02E002 */ lui $v0, %hi(func_E0024180) +/* 339284 E0024034 24424180 */ addiu $v0, $v0, %lo(func_E0024180) /* 339288 E0024038 AFA20018 */ sw $v0, 0x18($sp) -/* 33928C E002403C 3C02E002 */ lui $v0, %hi(D_E0024188) -/* 339290 E0024040 24424188 */ addiu $v0, $v0, %lo(D_E0024188) +/* 33928C E002403C 3C02E002 */ lui $v0, %hi(func_E0024188) +/* 339290 E0024040 24424188 */ addiu $v0, $v0, %lo(func_E0024188) /* 339294 E0024044 AFA2001C */ sw $v0, 0x1c($sp) -/* 339298 E0024048 3C02E002 */ lui $v0, %hi(D_E00242E0) -/* 33929C E002404C 244242E0 */ addiu $v0, $v0, %lo(D_E00242E0) +/* 339298 E0024048 3C02E002 */ lui $v0, %hi(func_E00242E0) +/* 33929C E002404C 244242E0 */ addiu $v0, $v0, %lo(func_E00242E0) /* 3392A0 E0024050 AFA20020 */ sw $v0, 0x20($sp) /* 3392A4 E0024054 24020012 */ addiu $v0, $zero, 0x12 /* 3392A8 E0024058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_339250/func_E00242E0.s b/asm/nonmatchings/code_339250/func_E00242E0.s index a3fca5d739..0306b1996a 100644 --- a/asm/nonmatchings/code_339250/func_E00242E0.s +++ b/asm/nonmatchings/code_339250/func_E00242E0.s @@ -3,8 +3,8 @@ glabel func_E00242E0 /* 339530 E00242E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 339534 E00242E4 3C02E002 */ lui $v0, %hi(D_E0024454) -/* 339538 E00242E8 24424454 */ addiu $v0, $v0, %lo(D_E0024454) +/* 339534 E00242E4 3C02E002 */ lui $v0, %hi(func_E0024454) +/* 339538 E00242E8 24424454 */ addiu $v0, $v0, %lo(func_E0024454) /* 33953C E00242EC AFA2001C */ sw $v0, 0x1c($sp) /* 339540 E00242F0 2402002D */ addiu $v0, $zero, 0x2d /* 339544 E00242F4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_33B180/func_E0026000.s b/asm/nonmatchings/code_33B180/func_E0026000.s index 02e6c6e850..39e24aceef 100644 --- a/asm/nonmatchings/code_33B180/func_E0026000.s +++ b/asm/nonmatchings/code_33B180/func_E0026000.s @@ -14,14 +14,14 @@ glabel func_E0026000 /* 33B1A4 E0026024 27A40010 */ addiu $a0, $sp, 0x10 /* 33B1A8 E0026028 F7BA0050 */ sdc1 $f26, 0x50($sp) /* 33B1AC E002602C C7BA0068 */ lwc1 $f26, 0x68($sp) -/* 33B1B0 E0026030 3C02E002 */ lui $v0, %hi(D_E0026184) -/* 33B1B4 E0026034 24426184 */ addiu $v0, $v0, %lo(D_E0026184) +/* 33B1B0 E0026030 3C02E002 */ lui $v0, %hi(func_E0026184) +/* 33B1B4 E0026034 24426184 */ addiu $v0, $v0, %lo(func_E0026184) /* 33B1B8 E0026038 AFA20018 */ sw $v0, 0x18($sp) -/* 33B1BC E002603C 3C02E002 */ lui $v0, %hi(D_E002618C) -/* 33B1C0 E0026040 2442618C */ addiu $v0, $v0, %lo(D_E002618C) +/* 33B1BC E002603C 3C02E002 */ lui $v0, %hi(func_E002618C) +/* 33B1C0 E0026040 2442618C */ addiu $v0, $v0, %lo(func_E002618C) /* 33B1C4 E0026044 AFA2001C */ sw $v0, 0x1c($sp) -/* 33B1C8 E0026048 3C02E002 */ lui $v0, %hi(D_E00264B0) -/* 33B1CC E002604C 244264B0 */ addiu $v0, $v0, %lo(D_E00264B0) +/* 33B1C8 E0026048 3C02E002 */ lui $v0, %hi(func_E00264B0) +/* 33B1CC E002604C 244264B0 */ addiu $v0, $v0, %lo(func_E00264B0) /* 33B1D0 E0026050 AFA20020 */ sw $v0, 0x20($sp) /* 33B1D4 E0026054 24020013 */ addiu $v0, $zero, 0x13 /* 33B1D8 E0026058 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_33B180/func_E00264B0.s b/asm/nonmatchings/code_33B180/func_E00264B0.s index dd402dfb28..845fec8eb6 100644 --- a/asm/nonmatchings/code_33B180/func_E00264B0.s +++ b/asm/nonmatchings/code_33B180/func_E00264B0.s @@ -3,8 +3,8 @@ glabel func_E00264B0 /* 33B630 E00264B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 33B634 E00264B4 3C02E002 */ lui $v0, %hi(D_E00264F4) -/* 33B638 E00264B8 244264F4 */ addiu $v0, $v0, %lo(D_E00264F4) +/* 33B634 E00264B4 3C02E002 */ lui $v0, %hi(func_E00264F4) +/* 33B638 E00264B8 244264F4 */ addiu $v0, $v0, %lo(func_E00264F4) /* 33B63C E00264BC AFA2001C */ sw $v0, 0x1c($sp) /* 33B640 E00264C0 2402002D */ addiu $v0, $zero, 0x2d /* 33B644 E00264C4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_33CDF0/func_E0028000.s b/asm/nonmatchings/code_33CDF0/func_E0028000.s index 46d7a0cb8e..affc82eb0c 100644 --- a/asm/nonmatchings/code_33CDF0/func_E0028000.s +++ b/asm/nonmatchings/code_33CDF0/func_E0028000.s @@ -12,14 +12,14 @@ glabel func_E0028000 /* 33CE0C E002801C 27A40010 */ addiu $a0, $sp, 0x10 /* 33CE10 E0028020 F7B80050 */ sdc1 $f24, 0x50($sp) /* 33CE14 E0028024 4487C000 */ mtc1 $a3, $f24 -/* 33CE18 E0028028 3C02E003 */ lui $v0, %hi(D_E0028240) -/* 33CE1C E002802C 24428240 */ addiu $v0, $v0, %lo(D_E0028240) +/* 33CE18 E0028028 3C02E003 */ lui $v0, %hi(func_E0028240) +/* 33CE1C E002802C 24428240 */ addiu $v0, $v0, %lo(func_E0028240) /* 33CE20 E0028030 AFA20018 */ sw $v0, 0x18($sp) -/* 33CE24 E0028034 3C02E003 */ lui $v0, %hi(D_E0028248) -/* 33CE28 E0028038 24428248 */ addiu $v0, $v0, %lo(D_E0028248) +/* 33CE24 E0028034 3C02E003 */ lui $v0, %hi(func_E0028248) +/* 33CE28 E0028038 24428248 */ addiu $v0, $v0, %lo(func_E0028248) /* 33CE2C E002803C AFA2001C */ sw $v0, 0x1c($sp) -/* 33CE30 E0028040 3C02E003 */ lui $v0, %hi(D_E00284E8) -/* 33CE34 E0028044 244284E8 */ addiu $v0, $v0, %lo(D_E00284E8) +/* 33CE30 E0028040 3C02E003 */ lui $v0, %hi(func_E00284E8) +/* 33CE34 E0028044 244284E8 */ addiu $v0, $v0, %lo(func_E00284E8) /* 33CE38 E0028048 AFA20020 */ sw $v0, 0x20($sp) /* 33CE3C E002804C 24020014 */ addiu $v0, $zero, 0x14 /* 33CE40 E0028050 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_33CDF0/func_E00284E8.s b/asm/nonmatchings/code_33CDF0/func_E00284E8.s index 5b5f9056fc..58db5824a9 100644 --- a/asm/nonmatchings/code_33CDF0/func_E00284E8.s +++ b/asm/nonmatchings/code_33CDF0/func_E00284E8.s @@ -3,8 +3,8 @@ glabel func_E00284E8 /* 33D2D8 E00284E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 33D2DC E00284EC 3C02E003 */ lui $v0, %hi(D_E002852C) -/* 33D2E0 E00284F0 2442852C */ addiu $v0, $v0, %lo(D_E002852C) +/* 33D2DC E00284EC 3C02E003 */ lui $v0, %hi(func_E002852C) +/* 33D2E0 E00284F0 2442852C */ addiu $v0, $v0, %lo(func_E002852C) /* 33D2E4 E00284F4 AFA2001C */ sw $v0, 0x1c($sp) /* 33D2E8 E00284F8 2402002D */ addiu $v0, $zero, 0x2d /* 33D2EC E00284FC AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_33E8C0/func_E002A000.s b/asm/nonmatchings/code_33E8C0/func_E002A000.s index be9d18fb7f..f2f2e7fb85 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A000.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A000.s @@ -22,14 +22,14 @@ glabel func_E002A000 /* 33E904 E002A044 AFB00028 */ sw $s0, 0x28($sp) /* 33E908 E002A048 24120005 */ addiu $s2, $zero, 5 .LE002A04C: -/* 33E90C E002A04C 3C02E003 */ lui $v0, %hi(D_E002A284) -/* 33E910 E002A050 2442A284 */ addiu $v0, $v0, %lo(D_E002A284) +/* 33E90C E002A04C 3C02E003 */ lui $v0, %hi(func_E002A284) +/* 33E910 E002A050 2442A284 */ addiu $v0, $v0, %lo(func_E002A284) /* 33E914 E002A054 AFA20018 */ sw $v0, 0x18($sp) -/* 33E918 E002A058 3C02E003 */ lui $v0, %hi(D_E002A28C) -/* 33E91C E002A05C 2442A28C */ addiu $v0, $v0, %lo(D_E002A28C) +/* 33E918 E002A058 3C02E003 */ lui $v0, %hi(func_E002A28C) +/* 33E91C E002A05C 2442A28C */ addiu $v0, $v0, %lo(func_E002A28C) /* 33E920 E002A060 AFA2001C */ sw $v0, 0x1c($sp) -/* 33E924 E002A064 3C02E003 */ lui $v0, %hi(D_E002A380) -/* 33E928 E002A068 2442A380 */ addiu $v0, $v0, %lo(D_E002A380) +/* 33E924 E002A064 3C02E003 */ lui $v0, %hi(func_E002A380) +/* 33E928 E002A068 2442A380 */ addiu $v0, $v0, %lo(func_E002A380) /* 33E92C E002A06C AFA20020 */ sw $v0, 0x20($sp) /* 33E930 E002A070 24020015 */ addiu $v0, $zero, 0x15 /* 33E934 E002A074 AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_33E8C0/func_E002A380.s b/asm/nonmatchings/code_33E8C0/func_E002A380.s index 105ad6c044..6ae32d83e1 100644 --- a/asm/nonmatchings/code_33E8C0/func_E002A380.s +++ b/asm/nonmatchings/code_33E8C0/func_E002A380.s @@ -3,8 +3,8 @@ glabel func_E002A380 /* 33EC40 E002A380 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 33EC44 E002A384 3C02E003 */ lui $v0, %hi(D_E002A3C4) -/* 33EC48 E002A388 2442A3C4 */ addiu $v0, $v0, %lo(D_E002A3C4) +/* 33EC44 E002A384 3C02E003 */ lui $v0, %hi(func_E002A3C4) +/* 33EC48 E002A388 2442A3C4 */ addiu $v0, $v0, %lo(func_E002A3C4) /* 33EC4C E002A38C AFA2001C */ sw $v0, 0x1c($sp) /* 33EC50 E002A390 24020011 */ addiu $v0, $zero, 0x11 /* 33EC54 E002A394 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_33FE80/func_E002C000.s b/asm/nonmatchings/code_33FE80/func_E002C000.s index d84ff6413b..4acf52ca16 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C000.s +++ b/asm/nonmatchings/code_33FE80/func_E002C000.s @@ -10,14 +10,14 @@ glabel func_E002C000 /* 33FE94 E002C014 27A40010 */ addiu $a0, $sp, 0x10 /* 33FE98 E002C018 F7B80060 */ sdc1 $f24, 0x60($sp) /* 33FE9C E002C01C 4487C000 */ mtc1 $a3, $f24 -/* 33FEA0 E002C020 3C02E003 */ lui $v0, %hi(D_E002C234) -/* 33FEA4 E002C024 2442C234 */ addiu $v0, $v0, %lo(D_E002C234) +/* 33FEA0 E002C020 3C02E003 */ lui $v0, %hi(func_E002C234) +/* 33FEA4 E002C024 2442C234 */ addiu $v0, $v0, %lo(func_E002C234) /* 33FEA8 E002C028 AFA20018 */ sw $v0, 0x18($sp) -/* 33FEAC E002C02C 3C02E003 */ lui $v0, %hi(D_E002C23C) -/* 33FEB0 E002C030 2442C23C */ addiu $v0, $v0, %lo(D_E002C23C) +/* 33FEAC E002C02C 3C02E003 */ lui $v0, %hi(func_E002C23C) +/* 33FEB0 E002C030 2442C23C */ addiu $v0, $v0, %lo(func_E002C23C) /* 33FEB4 E002C034 AFA2001C */ sw $v0, 0x1c($sp) -/* 33FEB8 E002C038 3C02E003 */ lui $v0, %hi(D_E002C3D0) -/* 33FEBC E002C03C 2442C3D0 */ addiu $v0, $v0, %lo(D_E002C3D0) +/* 33FEB8 E002C038 3C02E003 */ lui $v0, %hi(func_E002C3D0) +/* 33FEBC E002C03C 2442C3D0 */ addiu $v0, $v0, %lo(func_E002C3D0) /* 33FEC0 E002C040 AFA20020 */ sw $v0, 0x20($sp) /* 33FEC4 E002C044 24020016 */ addiu $v0, $zero, 0x16 /* 33FEC8 E002C048 AFBF0048 */ sw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_33FE80/func_E002C3D0.s b/asm/nonmatchings/code_33FE80/func_E002C3D0.s index ca68d85ad1..f1478090d6 100644 --- a/asm/nonmatchings/code_33FE80/func_E002C3D0.s +++ b/asm/nonmatchings/code_33FE80/func_E002C3D0.s @@ -3,8 +3,8 @@ glabel func_E002C3D0 /* 340250 E002C3D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 340254 E002C3D4 3C02E003 */ lui $v0, %hi(D_E002C414) -/* 340258 E002C3D8 2442C414 */ addiu $v0, $v0, %lo(D_E002C414) +/* 340254 E002C3D4 3C02E003 */ lui $v0, %hi(func_E002C414) +/* 340258 E002C3D8 2442C414 */ addiu $v0, $v0, %lo(func_E002C414) /* 34025C E002C3DC AFA2001C */ sw $v0, 0x1c($sp) /* 340260 E002C3E0 2402002D */ addiu $v0, $zero, 0x2d /* 340264 E002C3E4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3419E0/func_E002E000.s b/asm/nonmatchings/code_3419E0/func_E002E000.s index 883dd0c28d..f2bdfc27bb 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E000.s +++ b/asm/nonmatchings/code_3419E0/func_E002E000.s @@ -40,14 +40,14 @@ glabel func_E002E000 /* 341A60 E002E080 3C014228 */ lui $at, 0x4228 /* 341A64 E002E084 4481B000 */ mtc1 $at, $f22 .LE002E088: -/* 341A68 E002E088 3C02E003 */ lui $v0, %hi(D_E002E248) -/* 341A6C E002E08C 2442E248 */ addiu $v0, $v0, %lo(D_E002E248) +/* 341A68 E002E088 3C02E003 */ lui $v0, %hi(func_E002E248) +/* 341A6C E002E08C 2442E248 */ addiu $v0, $v0, %lo(func_E002E248) /* 341A70 E002E090 AC820008 */ sw $v0, 8($a0) -/* 341A74 E002E094 3C02E003 */ lui $v0, %hi(D_E002E250) -/* 341A78 E002E098 2442E250 */ addiu $v0, $v0, %lo(D_E002E250) +/* 341A74 E002E094 3C02E003 */ lui $v0, %hi(func_E002E250) +/* 341A78 E002E098 2442E250 */ addiu $v0, $v0, %lo(func_E002E250) /* 341A7C E002E09C AC82000C */ sw $v0, 0xc($a0) -/* 341A80 E002E0A0 3C02E003 */ lui $v0, %hi(D_E002E330) -/* 341A84 E002E0A4 2442E330 */ addiu $v0, $v0, %lo(D_E002E330) +/* 341A80 E002E0A0 3C02E003 */ lui $v0, %hi(func_E002E330) +/* 341A84 E002E0A4 2442E330 */ addiu $v0, $v0, %lo(func_E002E330) /* 341A88 E002E0A8 AC820010 */ sw $v0, 0x10($a0) /* 341A8C E002E0AC 24020017 */ addiu $v0, $zero, 0x17 /* 341A90 E002E0B0 AC800000 */ sw $zero, ($a0) diff --git a/asm/nonmatchings/code_3419E0/func_E002E330.s b/asm/nonmatchings/code_3419E0/func_E002E330.s index 29e16c4d63..50045489ca 100644 --- a/asm/nonmatchings/code_3419E0/func_E002E330.s +++ b/asm/nonmatchings/code_3419E0/func_E002E330.s @@ -3,8 +3,8 @@ glabel func_E002E330 /* 341D10 E002E330 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 341D14 E002E334 3C02E003 */ lui $v0, %hi(D_E002E368) -/* 341D18 E002E338 2442E368 */ addiu $v0, $v0, %lo(D_E002E368) +/* 341D14 E002E334 3C02E003 */ lui $v0, %hi(func_E002E368) +/* 341D18 E002E338 2442E368 */ addiu $v0, $v0, %lo(func_E002E368) /* 341D1C E002E33C AFA2001C */ sw $v0, 0x1c($sp) /* 341D20 E002E340 24020028 */ addiu $v0, $zero, 0x28 /* 341D24 E002E344 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_342140/func_E0030000.s b/asm/nonmatchings/code_342140/func_E0030000.s index f6e59b7cdb..276f4fcd10 100644 --- a/asm/nonmatchings/code_342140/func_E0030000.s +++ b/asm/nonmatchings/code_342140/func_E0030000.s @@ -123,16 +123,16 @@ glabel func_E0030000 /* 34230C E00301CC 4600F782 */ mul.s $f30, $f30, $f0 /* 342310 E00301D0 00000000 */ nop /* 342314 E00301D4 0200202D */ daddu $a0, $s0, $zero -/* 342318 E00301D8 3C02E003 */ lui $v0, %hi(D_E0030728) -/* 34231C E00301DC 24420728 */ addiu $v0, $v0, %lo(D_E0030728) +/* 342318 E00301D8 3C02E003 */ lui $v0, %hi(func_E0030728) +/* 34231C E00301DC 24420728 */ addiu $v0, $v0, %lo(func_E0030728) /* 342320 E00301E0 AC820008 */ sw $v0, 8($a0) /* 342324 E00301E4 46004202 */ mul.s $f8, $f8, $f0 /* 342328 E00301E8 00000000 */ nop -/* 34232C E00301EC 3C02E003 */ lui $v0, %hi(D_E0030730) -/* 342330 E00301F0 24420730 */ addiu $v0, $v0, %lo(D_E0030730) +/* 34232C E00301EC 3C02E003 */ lui $v0, %hi(func_E0030730) +/* 342330 E00301F0 24420730 */ addiu $v0, $v0, %lo(func_E0030730) /* 342334 E00301F4 AC82000C */ sw $v0, 0xc($a0) -/* 342338 E00301F8 3C02E003 */ lui $v0, %hi(D_E0030A24) -/* 34233C E00301FC 24420A24 */ addiu $v0, $v0, %lo(D_E0030A24) +/* 342338 E00301F8 3C02E003 */ lui $v0, %hi(func_E0030A24) +/* 34233C E00301FC 24420A24 */ addiu $v0, $v0, %lo(func_E0030A24) /* 342340 E0030200 AC800000 */ sw $zero, ($a0) /* 342344 E0030204 4600E702 */ mul.s $f28, $f28, $f0 /* 342348 E0030208 00000000 */ nop diff --git a/asm/nonmatchings/code_342140/func_E0030A24.s b/asm/nonmatchings/code_342140/func_E0030A24.s index 937ff58d48..75fef3f131 100644 --- a/asm/nonmatchings/code_342140/func_E0030A24.s +++ b/asm/nonmatchings/code_342140/func_E0030A24.s @@ -3,8 +3,8 @@ glabel func_E0030A24 /* 342B64 E0030A24 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 342B68 E0030A28 3C02E003 */ lui $v0, %hi(D_E0030A68) -/* 342B6C E0030A2C 24420A68 */ addiu $v0, $v0, %lo(D_E0030A68) +/* 342B68 E0030A28 3C02E003 */ lui $v0, %hi(func_E0030A68) +/* 342B6C E0030A2C 24420A68 */ addiu $v0, $v0, %lo(func_E0030A68) /* 342B70 E0030A30 AFA2001C */ sw $v0, 0x1c($sp) /* 342B74 E0030A34 2402002D */ addiu $v0, $zero, 0x2d /* 342B78 E0030A38 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_343680/func_E0032000.s b/asm/nonmatchings/code_343680/func_E0032000.s index f0712daa5d..c6db358853 100644 --- a/asm/nonmatchings/code_343680/func_E0032000.s +++ b/asm/nonmatchings/code_343680/func_E0032000.s @@ -12,17 +12,17 @@ glabel func_E0032000 /* 34369C E003201C 27A40010 */ addiu $a0, $sp, 0x10 /* 3436A0 E0032020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3436A4 E0032024 4487C000 */ mtc1 $a3, $f24 -/* 3436A8 E0032028 3C02E003 */ lui $v0, %hi(D_E00321D0) -/* 3436AC E003202C 244221D0 */ addiu $v0, $v0, %lo(D_E00321D0) +/* 3436A8 E0032028 3C02E003 */ lui $v0, %hi(func_E00321D0) +/* 3436AC E003202C 244221D0 */ addiu $v0, $v0, %lo(func_E00321D0) /* 3436B0 E0032030 AFBF0030 */ sw $ra, 0x30($sp) /* 3436B4 E0032034 AFB00028 */ sw $s0, 0x28($sp) /* 3436B8 E0032038 AFA00010 */ sw $zero, 0x10($sp) /* 3436BC E003203C AC820008 */ sw $v0, 8($a0) -/* 3436C0 E0032040 3C02E003 */ lui $v0, %hi(D_E00321D8) -/* 3436C4 E0032044 244221D8 */ addiu $v0, $v0, %lo(D_E00321D8) +/* 3436C0 E0032040 3C02E003 */ lui $v0, %hi(func_E00321D8) +/* 3436C4 E0032044 244221D8 */ addiu $v0, $v0, %lo(func_E00321D8) /* 3436C8 E0032048 AC82000C */ sw $v0, 0xc($a0) -/* 3436CC E003204C 3C02E003 */ lui $v0, %hi(D_E0032420) -/* 3436D0 E0032050 24422420 */ addiu $v0, $v0, %lo(D_E0032420) +/* 3436CC E003204C 3C02E003 */ lui $v0, %hi(func_E0032420) +/* 3436D0 E0032050 24422420 */ addiu $v0, $v0, %lo(func_E0032420) /* 3436D4 E0032054 AC820010 */ sw $v0, 0x10($a0) /* 3436D8 E0032058 24020019 */ addiu $v0, $zero, 0x19 /* 3436DC E003205C AC800014 */ sw $zero, 0x14($a0) diff --git a/asm/nonmatchings/code_343680/func_E0032420.s b/asm/nonmatchings/code_343680/func_E0032420.s index 98552a917e..5d1ae34df1 100644 --- a/asm/nonmatchings/code_343680/func_E0032420.s +++ b/asm/nonmatchings/code_343680/func_E0032420.s @@ -3,8 +3,8 @@ glabel func_E0032420 /* 343AA0 E0032420 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 343AA4 E0032424 3C02E003 */ lui $v0, %hi(D_E003245C) -/* 343AA8 E0032428 2442245C */ addiu $v0, $v0, %lo(D_E003245C) +/* 343AA4 E0032424 3C02E003 */ lui $v0, %hi(func_E003245C) +/* 343AA8 E0032428 2442245C */ addiu $v0, $v0, %lo(func_E003245C) /* 343AAC E003242C AFA2001C */ sw $v0, 0x1c($sp) /* 343AB0 E0032430 2402000A */ addiu $v0, $zero, 0xa /* 343AB4 E0032434 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_344A10/func_E0034000.s b/asm/nonmatchings/code_344A10/func_E0034000.s index 5c5d873b8b..f1f1345763 100644 --- a/asm/nonmatchings/code_344A10/func_E0034000.s +++ b/asm/nonmatchings/code_344A10/func_E0034000.s @@ -12,14 +12,14 @@ glabel func_E0034000 /* 344A2C E003401C 27A40010 */ addiu $a0, $sp, 0x10 /* 344A30 E0034020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 344A34 E0034024 4487C000 */ mtc1 $a3, $f24 -/* 344A38 E0034028 3C02E003 */ lui $v0, %hi(D_E0034108) -/* 344A3C E003402C 24424108 */ addiu $v0, $v0, %lo(D_E0034108) +/* 344A38 E0034028 3C02E003 */ lui $v0, %hi(func_E0034108) +/* 344A3C E003402C 24424108 */ addiu $v0, $v0, %lo(func_E0034108) /* 344A40 E0034030 AFA20018 */ sw $v0, 0x18($sp) -/* 344A44 E0034034 3C02E003 */ lui $v0, %hi(D_E0034110) -/* 344A48 E0034038 24424110 */ addiu $v0, $v0, %lo(D_E0034110) +/* 344A44 E0034034 3C02E003 */ lui $v0, %hi(func_E0034110) +/* 344A48 E0034038 24424110 */ addiu $v0, $v0, %lo(func_E0034110) /* 344A4C E003403C AFA2001C */ sw $v0, 0x1c($sp) -/* 344A50 E0034040 3C02E003 */ lui $v0, %hi(D_E00342C8) -/* 344A54 E0034044 244242C8 */ addiu $v0, $v0, %lo(D_E00342C8) +/* 344A50 E0034040 3C02E003 */ lui $v0, %hi(func_E00342C8) +/* 344A54 E0034044 244242C8 */ addiu $v0, $v0, %lo(func_E00342C8) /* 344A58 E0034048 AFA20020 */ sw $v0, 0x20($sp) /* 344A5C E003404C 2402001A */ addiu $v0, $zero, 0x1a /* 344A60 E0034050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_344A10/func_E00342C8.s b/asm/nonmatchings/code_344A10/func_E00342C8.s index 47657782df..b1ba67644c 100644 --- a/asm/nonmatchings/code_344A10/func_E00342C8.s +++ b/asm/nonmatchings/code_344A10/func_E00342C8.s @@ -3,8 +3,8 @@ glabel func_E00342C8 /* 344CD8 E00342C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 344CDC E00342CC 3C02E003 */ lui $v0, %hi(D_E0034310) -/* 344CE0 E00342D0 24424310 */ addiu $v0, $v0, %lo(D_E0034310) +/* 344CDC E00342CC 3C02E003 */ lui $v0, %hi(func_E0034310) +/* 344CE0 E00342D0 24424310 */ addiu $v0, $v0, %lo(func_E0034310) /* 344CE4 E00342D4 AFA2001C */ sw $v0, 0x1c($sp) /* 344CE8 E00342D8 24020014 */ addiu $v0, $zero, 0x14 /* 344CEC E00342DC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3454E0/func_E0036000.s b/asm/nonmatchings/code_3454E0/func_E0036000.s index 23437f0861..2b07d48f4c 100644 --- a/asm/nonmatchings/code_3454E0/func_E0036000.s +++ b/asm/nonmatchings/code_3454E0/func_E0036000.s @@ -12,14 +12,14 @@ glabel func_E0036000 /* 3454FC E003601C 27A40010 */ addiu $a0, $sp, 0x10 /* 345500 E0036020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 345504 E0036024 4487C000 */ mtc1 $a3, $f24 -/* 345508 E0036028 3C02E003 */ lui $v0, %hi(D_E00360DC) -/* 34550C E003602C 244260DC */ addiu $v0, $v0, %lo(D_E00360DC) +/* 345508 E0036028 3C02E003 */ lui $v0, %hi(func_E00360DC) +/* 34550C E003602C 244260DC */ addiu $v0, $v0, %lo(func_E00360DC) /* 345510 E0036030 AFA20018 */ sw $v0, 0x18($sp) -/* 345514 E0036034 3C02E003 */ lui $v0, %hi(D_E00360E4) -/* 345518 E0036038 244260E4 */ addiu $v0, $v0, %lo(D_E00360E4) +/* 345514 E0036034 3C02E003 */ lui $v0, %hi(func_E00360E4) +/* 345518 E0036038 244260E4 */ addiu $v0, $v0, %lo(func_E00360E4) /* 34551C E003603C AFA2001C */ sw $v0, 0x1c($sp) -/* 345520 E0036040 3C02E003 */ lui $v0, %hi(D_E00361D8) -/* 345524 E0036044 244261D8 */ addiu $v0, $v0, %lo(D_E00361D8) +/* 345520 E0036040 3C02E003 */ lui $v0, %hi(func_E00361D8) +/* 345524 E0036044 244261D8 */ addiu $v0, $v0, %lo(func_E00361D8) /* 345528 E0036048 AFA20020 */ sw $v0, 0x20($sp) /* 34552C E003604C 2402001B */ addiu $v0, $zero, 0x1b /* 345530 E0036050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3454E0/func_E00361D8.s b/asm/nonmatchings/code_3454E0/func_E00361D8.s index 9cbd2b562e..74b9b12dde 100644 --- a/asm/nonmatchings/code_3454E0/func_E00361D8.s +++ b/asm/nonmatchings/code_3454E0/func_E00361D8.s @@ -3,8 +3,8 @@ glabel func_E00361D8 /* 3456B8 E00361D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3456BC E00361DC 3C02E003 */ lui $v0, %hi(D_E0036224) -/* 3456C0 E00361E0 24426224 */ addiu $v0, $v0, %lo(D_E0036224) +/* 3456BC E00361DC 3C02E003 */ lui $v0, %hi(func_E0036224) +/* 3456C0 E00361E0 24426224 */ addiu $v0, $v0, %lo(func_E0036224) /* 3456C4 E00361E4 AFA2001C */ sw $v0, 0x1c($sp) /* 3456C8 E00361E8 2402002D */ addiu $v0, $zero, 0x2d /* 3456CC E00361EC AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_34DD20/func_E0038000.s b/asm/nonmatchings/code_34DD20/func_E0038000.s index 6657dfb559..0546e15ec7 100644 --- a/asm/nonmatchings/code_34DD20/func_E0038000.s +++ b/asm/nonmatchings/code_34DD20/func_E0038000.s @@ -78,16 +78,16 @@ glabel func_E0038000 /* 34DE38 E0038118 0200202D */ daddu $a0, $s0, $zero /* 34DE3C E003811C 3C014190 */ lui $at, 0x4190 /* 34DE40 E0038120 44810000 */ mtc1 $at, $f0 -/* 34DE44 E0038124 3C02E004 */ lui $v0, %hi(D_E003841C) -/* 34DE48 E0038128 2442841C */ addiu $v0, $v0, %lo(D_E003841C) +/* 34DE44 E0038124 3C02E004 */ lui $v0, %hi(func_E003841C) +/* 34DE48 E0038128 2442841C */ addiu $v0, $v0, %lo(func_E003841C) /* 34DE4C E003812C AC820008 */ sw $v0, 8($a0) /* 34DE50 E0038130 4600D682 */ mul.s $f26, $f26, $f0 /* 34DE54 E0038134 00000000 */ nop -/* 34DE58 E0038138 3C02E004 */ lui $v0, %hi(D_E0038424) -/* 34DE5C E003813C 24428424 */ addiu $v0, $v0, %lo(D_E0038424) +/* 34DE58 E0038138 3C02E004 */ lui $v0, %hi(func_E0038424) +/* 34DE5C E003813C 24428424 */ addiu $v0, $v0, %lo(func_E0038424) /* 34DE60 E0038140 AC82000C */ sw $v0, 0xc($a0) -/* 34DE64 E0038144 3C02E004 */ lui $v0, %hi(D_E0038704) -/* 34DE68 E0038148 24428704 */ addiu $v0, $v0, %lo(D_E0038704) +/* 34DE64 E0038144 3C02E004 */ lui $v0, %hi(func_E0038704) +/* 34DE68 E0038148 24428704 */ addiu $v0, $v0, %lo(func_E0038704) /* 34DE6C E003814C AC820010 */ sw $v0, 0x10($a0) /* 34DE70 E0038150 4600C602 */ mul.s $f24, $f24, $f0 /* 34DE74 E0038154 00000000 */ nop diff --git a/asm/nonmatchings/code_34DD20/func_E0038704.s b/asm/nonmatchings/code_34DD20/func_E0038704.s index 0d4d2ed830..1df2a8651f 100644 --- a/asm/nonmatchings/code_34DD20/func_E0038704.s +++ b/asm/nonmatchings/code_34DD20/func_E0038704.s @@ -3,8 +3,8 @@ glabel func_E0038704 /* 34E424 E0038704 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 34E428 E0038708 3C02E004 */ lui $v0, %hi(D_E0038748) -/* 34E42C E003870C 24428748 */ addiu $v0, $v0, %lo(D_E0038748) +/* 34E428 E0038708 3C02E004 */ lui $v0, %hi(func_E0038748) +/* 34E42C E003870C 24428748 */ addiu $v0, $v0, %lo(func_E0038748) /* 34E430 E0038710 AFA2001C */ sw $v0, 0x1c($sp) /* 34E434 E0038714 2402002D */ addiu $v0, $zero, 0x2d /* 34E438 E0038718 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_34EC80/func_E003A000.s b/asm/nonmatchings/code_34EC80/func_E003A000.s index 44bce464bc..335f9b473a 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A000.s +++ b/asm/nonmatchings/code_34EC80/func_E003A000.s @@ -18,14 +18,14 @@ glabel func_E003A000 /* 34ECB4 E003A034 27A40010 */ addiu $a0, $sp, 0x10 /* 34ECB8 E003A038 AFB40038 */ sw $s4, 0x38($sp) /* 34ECBC E003A03C 8FB40084 */ lw $s4, 0x84($sp) -/* 34ECC0 E003A040 3C02E004 */ lui $v0, %hi(D_E003A1D4) -/* 34ECC4 E003A044 2442A1D4 */ addiu $v0, $v0, %lo(D_E003A1D4) +/* 34ECC0 E003A040 3C02E004 */ lui $v0, %hi(func_E003A1D4) +/* 34ECC4 E003A044 2442A1D4 */ addiu $v0, $v0, %lo(func_E003A1D4) /* 34ECC8 E003A048 AFA20018 */ sw $v0, 0x18($sp) -/* 34ECCC E003A04C 3C02E004 */ lui $v0, %hi(D_E003A1DC) -/* 34ECD0 E003A050 2442A1DC */ addiu $v0, $v0, %lo(D_E003A1DC) +/* 34ECCC E003A04C 3C02E004 */ lui $v0, %hi(func_E003A1DC) +/* 34ECD0 E003A050 2442A1DC */ addiu $v0, $v0, %lo(func_E003A1DC) /* 34ECD4 E003A054 AFA2001C */ sw $v0, 0x1c($sp) -/* 34ECD8 E003A058 3C02E004 */ lui $v0, %hi(D_E003A310) -/* 34ECDC E003A05C 2442A310 */ addiu $v0, $v0, %lo(D_E003A310) +/* 34ECD8 E003A058 3C02E004 */ lui $v0, %hi(func_E003A310) +/* 34ECDC E003A05C 2442A310 */ addiu $v0, $v0, %lo(func_E003A310) /* 34ECE0 E003A060 AFA20020 */ sw $v0, 0x20($sp) /* 34ECE4 E003A064 2402001D */ addiu $v0, $zero, 0x1d /* 34ECE8 E003A068 AFBF0040 */ sw $ra, 0x40($sp) diff --git a/asm/nonmatchings/code_34EC80/func_E003A310.s b/asm/nonmatchings/code_34EC80/func_E003A310.s index 253d3e1e3c..353dc0d9a2 100644 --- a/asm/nonmatchings/code_34EC80/func_E003A310.s +++ b/asm/nonmatchings/code_34EC80/func_E003A310.s @@ -3,8 +3,8 @@ glabel func_E003A310 /* 34EF90 E003A310 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 34EF94 E003A314 3C02E004 */ lui $v0, %hi(D_E003A354) -/* 34EF98 E003A318 2442A354 */ addiu $v0, $v0, %lo(D_E003A354) +/* 34EF94 E003A314 3C02E004 */ lui $v0, %hi(func_E003A354) +/* 34EF98 E003A318 2442A354 */ addiu $v0, $v0, %lo(func_E003A354) /* 34EF9C E003A31C AFA2001C */ sw $v0, 0x1c($sp) /* 34EFA0 E003A320 24020028 */ addiu $v0, $zero, 0x28 /* 34EFA4 E003A324 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_34F4C0/func_E003C000.s b/asm/nonmatchings/code_34F4C0/func_E003C000.s index 66a8375461..c62fb5e921 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C000.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C000.s @@ -27,17 +27,17 @@ glabel func_E003C000 /* 34F518 E003C058 24120014 */ addiu $s2, $zero, 0x14 .LE003C05C: /* 34F51C E003C05C 26520001 */ addiu $s2, $s2, 1 -/* 34F520 E003C060 3C02E004 */ lui $v0, %hi(D_E003C23C) -/* 34F524 E003C064 2442C23C */ addiu $v0, $v0, %lo(D_E003C23C) +/* 34F520 E003C060 3C02E004 */ lui $v0, %hi(func_E003C23C) +/* 34F524 E003C064 2442C23C */ addiu $v0, $v0, %lo(func_E003C23C) /* 34F528 E003C068 AFA20018 */ sw $v0, 0x18($sp) -/* 34F52C E003C06C 3C02E004 */ lui $v0, %hi(D_E003C244) -/* 34F530 E003C070 2442C244 */ addiu $v0, $v0, %lo(D_E003C244) +/* 34F52C E003C06C 3C02E004 */ lui $v0, %hi(func_E003C244) +/* 34F530 E003C070 2442C244 */ addiu $v0, $v0, %lo(func_E003C244) /* 34F534 E003C074 AFA2001C */ sw $v0, 0x1c($sp) -/* 34F538 E003C078 3C02E004 */ lui $v0, %hi(D_E003C474) -/* 34F53C E003C07C 2442C474 */ addiu $v0, $v0, %lo(D_E003C474) +/* 34F538 E003C078 3C02E004 */ lui $v0, %hi(func_E003C474) +/* 34F53C E003C07C 2442C474 */ addiu $v0, $v0, %lo(func_E003C474) /* 34F540 E003C080 AFA20020 */ sw $v0, 0x20($sp) -/* 34F544 E003C084 3C02E004 */ lui $v0, %hi(D_E003C47C) -/* 34F548 E003C088 2442C47C */ addiu $v0, $v0, %lo(D_E003C47C) +/* 34F544 E003C084 3C02E004 */ lui $v0, %hi(func_E003C47C) +/* 34F548 E003C088 2442C47C */ addiu $v0, $v0, %lo(func_E003C47C) /* 34F54C E003C08C AFA20024 */ sw $v0, 0x24($sp) /* 34F550 E003C090 2402001E */ addiu $v0, $zero, 0x1e /* 34F554 E003C094 AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_352440/func_E003E000.s b/asm/nonmatchings/code_352440/func_E003E000.s index de8b655531..7574ec809a 100644 --- a/asm/nonmatchings/code_352440/func_E003E000.s +++ b/asm/nonmatchings/code_352440/func_E003E000.s @@ -152,16 +152,16 @@ glabel func_E003E000 /* 352678 E003E238 460C8402 */ mul.s $f16, $f16, $f12 /* 35267C E003E23C 00000000 */ nop /* 352680 E003E240 0200202D */ daddu $a0, $s0, $zero -/* 352684 E003E244 3C02E004 */ lui $v0, %hi(D_E003E3F8) -/* 352688 E003E248 2442E3F8 */ addiu $v0, $v0, %lo(D_E003E3F8) +/* 352684 E003E244 3C02E004 */ lui $v0, %hi(func_E003E3F8) +/* 352688 E003E248 2442E3F8 */ addiu $v0, $v0, %lo(func_E003E3F8) /* 35268C E003E24C E7B2006C */ swc1 $f18, 0x6c($sp) /* 352690 E003E250 E7B00070 */ swc1 $f16, 0x70($sp) /* 352694 E003E254 AC820008 */ sw $v0, 8($a0) -/* 352698 E003E258 3C02E004 */ lui $v0, %hi(D_E003E400) -/* 35269C E003E25C 2442E400 */ addiu $v0, $v0, %lo(D_E003E400) +/* 352698 E003E258 3C02E004 */ lui $v0, %hi(func_E003E400) +/* 35269C E003E25C 2442E400 */ addiu $v0, $v0, %lo(func_E003E400) /* 3526A0 E003E260 AC82000C */ sw $v0, 0xc($a0) -/* 3526A4 E003E264 3C02E004 */ lui $v0, %hi(D_E003E5F4) -/* 3526A8 E003E268 2442E5F4 */ addiu $v0, $v0, %lo(D_E003E5F4) +/* 3526A4 E003E264 3C02E004 */ lui $v0, %hi(func_E003E5F4) +/* 3526A8 E003E268 2442E5F4 */ addiu $v0, $v0, %lo(func_E003E5F4) /* 3526AC E003E26C AC820010 */ sw $v0, 0x10($a0) /* 3526B0 E003E270 2402001F */ addiu $v0, $zero, 0x1f /* 3526B4 E003E274 AC800000 */ sw $zero, ($a0) diff --git a/asm/nonmatchings/code_352440/func_E003E5F4.s b/asm/nonmatchings/code_352440/func_E003E5F4.s index c7fe001692..05c47671e5 100644 --- a/asm/nonmatchings/code_352440/func_E003E5F4.s +++ b/asm/nonmatchings/code_352440/func_E003E5F4.s @@ -3,8 +3,8 @@ glabel func_E003E5F4 /* 352A34 E003E5F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 352A38 E003E5F8 3C02E004 */ lui $v0, %hi(D_E003E638) -/* 352A3C E003E5FC 2442E638 */ addiu $v0, $v0, %lo(D_E003E638) +/* 352A38 E003E5F8 3C02E004 */ lui $v0, %hi(func_E003E638) +/* 352A3C E003E5FC 2442E638 */ addiu $v0, $v0, %lo(func_E003E638) /* 352A40 E003E600 AFA2001C */ sw $v0, 0x1c($sp) /* 352A44 E003E604 2402002D */ addiu $v0, $zero, 0x2d /* 352A48 E003E608 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_353300/func_E0040000.s b/asm/nonmatchings/code_353300/func_E0040000.s index a23938b175..d92a4baec8 100644 --- a/asm/nonmatchings/code_353300/func_E0040000.s +++ b/asm/nonmatchings/code_353300/func_E0040000.s @@ -20,14 +20,14 @@ glabel func_E0040000 /* 35333C E004003C AFB1002C */ sw $s1, 0x2c($sp) /* 353340 E0040040 24100003 */ addiu $s0, $zero, 3 .LE0040044: -/* 353344 E0040044 3C02E004 */ lui $v0, %hi(D_E0040148) -/* 353348 E0040048 24420148 */ addiu $v0, $v0, %lo(D_E0040148) +/* 353344 E0040044 3C02E004 */ lui $v0, %hi(func_E0040148) +/* 353348 E0040048 24420148 */ addiu $v0, $v0, %lo(func_E0040148) /* 35334C E004004C AFA20018 */ sw $v0, 0x18($sp) -/* 353350 E0040050 3C02E004 */ lui $v0, %hi(D_E0040150) -/* 353354 E0040054 24420150 */ addiu $v0, $v0, %lo(D_E0040150) +/* 353350 E0040050 3C02E004 */ lui $v0, %hi(func_E0040150) +/* 353354 E0040054 24420150 */ addiu $v0, $v0, %lo(func_E0040150) /* 353358 E0040058 AFA2001C */ sw $v0, 0x1c($sp) -/* 35335C E004005C 3C02E004 */ lui $v0, %hi(D_E0040210) -/* 353360 E0040060 24420210 */ addiu $v0, $v0, %lo(D_E0040210) +/* 35335C E004005C 3C02E004 */ lui $v0, %hi(func_E0040210) +/* 353360 E0040060 24420210 */ addiu $v0, $v0, %lo(func_E0040210) /* 353364 E0040064 AFA20020 */ sw $v0, 0x20($sp) /* 353368 E0040068 24020020 */ addiu $v0, $zero, 0x20 /* 35336C E004006C AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_353300/func_E0040210.s b/asm/nonmatchings/code_353300/func_E0040210.s index 4c3f253b2c..88edb6c948 100644 --- a/asm/nonmatchings/code_353300/func_E0040210.s +++ b/asm/nonmatchings/code_353300/func_E0040210.s @@ -69,8 +69,8 @@ glabel func_E0040210 /* 353608 E0040308 0000182D */ daddu $v1, $zero, $zero /* 35360C E004030C 0200202D */ daddu $a0, $s0, $zero .LE0040310: -/* 353610 E0040310 3C02E004 */ lui $v0, %hi(D_E0040348) -/* 353614 E0040314 24420348 */ addiu $v0, $v0, %lo(D_E0040348) +/* 353610 E0040310 3C02E004 */ lui $v0, %hi(func_E0040348) +/* 353614 E0040314 24420348 */ addiu $v0, $v0, %lo(func_E0040348) /* 353618 E0040318 AC82000C */ sw $v0, 0xc($a0) /* 35361C E004031C 00031023 */ negu $v0, $v1 /* 353620 E0040320 AC820004 */ sw $v0, 4($a0) diff --git a/asm/nonmatchings/code_3547A0/func_E0042000.s b/asm/nonmatchings/code_3547A0/func_E0042000.s index 9b143958df..6960ce9a7b 100644 --- a/asm/nonmatchings/code_3547A0/func_E0042000.s +++ b/asm/nonmatchings/code_3547A0/func_E0042000.s @@ -24,14 +24,14 @@ glabel func_E0042000 /* 3547EC E004204C 12600069 */ beqz $s3, .LE00421F4 /* 3547F0 E0042050 AFA700BC */ sw $a3, 0xbc($sp) /* 3547F4 E0042054 26730001 */ addiu $s3, $s3, 1 -/* 3547F8 E0042058 3C02E004 */ lui $v0, %hi(D_E004222C) -/* 3547FC E004205C 2442222C */ addiu $v0, $v0, %lo(D_E004222C) +/* 3547F8 E0042058 3C02E004 */ lui $v0, %hi(func_E004222C) +/* 3547FC E004205C 2442222C */ addiu $v0, $v0, %lo(func_E004222C) /* 354800 E0042060 AFA20018 */ sw $v0, 0x18($sp) -/* 354804 E0042064 3C02E004 */ lui $v0, %hi(D_E0042234) -/* 354808 E0042068 24422234 */ addiu $v0, $v0, %lo(D_E0042234) +/* 354804 E0042064 3C02E004 */ lui $v0, %hi(func_E0042234) +/* 354808 E0042068 24422234 */ addiu $v0, $v0, %lo(func_E0042234) /* 35480C E004206C AFA2001C */ sw $v0, 0x1c($sp) -/* 354810 E0042070 3C02E004 */ lui $v0, %hi(D_E0042374) -/* 354814 E0042074 24422374 */ addiu $v0, $v0, %lo(D_E0042374) +/* 354810 E0042070 3C02E004 */ lui $v0, %hi(func_E0042374) +/* 354814 E0042074 24422374 */ addiu $v0, $v0, %lo(func_E0042374) /* 354818 E0042078 AFA20020 */ sw $v0, 0x20($sp) /* 35481C E004207C 24020021 */ addiu $v0, $zero, 0x21 /* 354820 E0042080 AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_3547A0/func_E0042374.s b/asm/nonmatchings/code_3547A0/func_E0042374.s index 51e8b6eb29..75e1cdaa91 100644 --- a/asm/nonmatchings/code_3547A0/func_E0042374.s +++ b/asm/nonmatchings/code_3547A0/func_E0042374.s @@ -3,8 +3,8 @@ glabel func_E0042374 /* 354B14 E0042374 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 354B18 E0042378 3C02E004 */ lui $v0, %hi(D_E00423B8) -/* 354B1C E004237C 244223B8 */ addiu $v0, $v0, %lo(D_E00423B8) +/* 354B18 E0042378 3C02E004 */ lui $v0, %hi(func_E00423B8) +/* 354B1C E004237C 244223B8 */ addiu $v0, $v0, %lo(func_E00423B8) /* 354B20 E0042380 AFA2001C */ sw $v0, 0x1c($sp) /* 354B24 E0042384 2402002D */ addiu $v0, $zero, 0x2d /* 354B28 E0042388 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_354F60/func_E0044000.s b/asm/nonmatchings/code_354F60/func_E0044000.s index 40efd7f287..821840cfb1 100644 --- a/asm/nonmatchings/code_354F60/func_E0044000.s +++ b/asm/nonmatchings/code_354F60/func_E0044000.s @@ -14,14 +14,14 @@ glabel func_E0044000 /* 354F84 E0044024 27A40010 */ addiu $a0, $sp, 0x10 /* 354F88 E0044028 AFB20038 */ sw $s2, 0x38($sp) /* 354F8C E004402C 8FB20098 */ lw $s2, 0x98($sp) -/* 354F90 E0044030 3C02E004 */ lui $v0, %hi(D_E004441C) -/* 354F94 E0044034 2442441C */ addiu $v0, $v0, %lo(D_E004441C) +/* 354F90 E0044030 3C02E004 */ lui $v0, %hi(func_E004441C) +/* 354F94 E0044034 2442441C */ addiu $v0, $v0, %lo(func_E004441C) /* 354F98 E0044038 AFA20018 */ sw $v0, 0x18($sp) -/* 354F9C E004403C 3C02E004 */ lui $v0, %hi(D_E0044424) -/* 354FA0 E0044040 24424424 */ addiu $v0, $v0, %lo(D_E0044424) +/* 354F9C E004403C 3C02E004 */ lui $v0, %hi(func_E0044424) +/* 354FA0 E0044040 24424424 */ addiu $v0, $v0, %lo(func_E0044424) /* 354FA4 E0044044 AFA2001C */ sw $v0, 0x1c($sp) -/* 354FA8 E0044048 3C02E004 */ lui $v0, %hi(D_E00448E4) -/* 354FAC E004404C 244248E4 */ addiu $v0, $v0, %lo(D_E00448E4) +/* 354FA8 E0044048 3C02E004 */ lui $v0, %hi(func_E00448E4) +/* 354FAC E004404C 244248E4 */ addiu $v0, $v0, %lo(func_E00448E4) /* 354FB0 E0044050 AFA20020 */ sw $v0, 0x20($sp) /* 354FB4 E0044054 24020022 */ addiu $v0, $zero, 0x22 /* 354FB8 E0044058 AFBF0048 */ sw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_354F60/func_E00448E4.s b/asm/nonmatchings/code_354F60/func_E00448E4.s index c4150e068f..f18b5cd313 100644 --- a/asm/nonmatchings/code_354F60/func_E00448E4.s +++ b/asm/nonmatchings/code_354F60/func_E00448E4.s @@ -3,8 +3,8 @@ glabel func_E00448E4 /* 355844 E00448E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 355848 E00448E8 3C02E004 */ lui $v0, %hi(D_E004491C) -/* 35584C E00448EC 2442491C */ addiu $v0, $v0, %lo(D_E004491C) +/* 355848 E00448E8 3C02E004 */ lui $v0, %hi(func_E004491C) +/* 35584C E00448EC 2442491C */ addiu $v0, $v0, %lo(func_E004491C) /* 355850 E00448F0 AFA2001C */ sw $v0, 0x1c($sp) /* 355854 E00448F4 2402002D */ addiu $v0, $zero, 0x2d /* 355858 E00448F8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_355EE0/func_E0046000.s b/asm/nonmatchings/code_355EE0/func_E0046000.s index 8dac1854de..023ba51c69 100644 --- a/asm/nonmatchings/code_355EE0/func_E0046000.s +++ b/asm/nonmatchings/code_355EE0/func_E0046000.s @@ -14,14 +14,14 @@ glabel func_E0046000 /* 355F04 E0046024 27A40010 */ addiu $a0, $sp, 0x10 /* 355F08 E0046028 F7BA0050 */ sdc1 $f26, 0x50($sp) /* 355F0C E004602C C7BA0068 */ lwc1 $f26, 0x68($sp) -/* 355F10 E0046030 3C02E004 */ lui $v0, %hi(D_E0046158) -/* 355F14 E0046034 24426158 */ addiu $v0, $v0, %lo(D_E0046158) +/* 355F10 E0046030 3C02E004 */ lui $v0, %hi(func_E0046158) +/* 355F14 E0046034 24426158 */ addiu $v0, $v0, %lo(func_E0046158) /* 355F18 E0046038 AFA20018 */ sw $v0, 0x18($sp) -/* 355F1C E004603C 3C02E004 */ lui $v0, %hi(D_E0046160) -/* 355F20 E0046040 24426160 */ addiu $v0, $v0, %lo(D_E0046160) +/* 355F1C E004603C 3C02E004 */ lui $v0, %hi(func_E0046160) +/* 355F20 E0046040 24426160 */ addiu $v0, $v0, %lo(func_E0046160) /* 355F24 E0046044 AFA2001C */ sw $v0, 0x1c($sp) -/* 355F28 E0046048 3C02E004 */ lui $v0, %hi(D_E004627C) -/* 355F2C E004604C 2442627C */ addiu $v0, $v0, %lo(D_E004627C) +/* 355F28 E0046048 3C02E004 */ lui $v0, %hi(func_E004627C) +/* 355F2C E004604C 2442627C */ addiu $v0, $v0, %lo(func_E004627C) /* 355F30 E0046050 AFA20020 */ sw $v0, 0x20($sp) /* 355F34 E0046054 24020023 */ addiu $v0, $zero, 0x23 /* 355F38 E0046058 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_355EE0/func_E004627C.s b/asm/nonmatchings/code_355EE0/func_E004627C.s index 26031c8b85..26e569a38e 100644 --- a/asm/nonmatchings/code_355EE0/func_E004627C.s +++ b/asm/nonmatchings/code_355EE0/func_E004627C.s @@ -3,8 +3,8 @@ glabel func_E004627C /* 35615C E004627C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 356160 E0046280 3C02E004 */ lui $v0, %hi(D_E00462C0) -/* 356164 E0046284 244262C0 */ addiu $v0, $v0, %lo(D_E00462C0) +/* 356160 E0046280 3C02E004 */ lui $v0, %hi(func_E00462C0) +/* 356164 E0046284 244262C0 */ addiu $v0, $v0, %lo(func_E00462C0) /* 356168 E0046288 AFA2001C */ sw $v0, 0x1c($sp) /* 35616C E004628C 2402002D */ addiu $v0, $zero, 0x2d /* 356170 E0046290 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_356980/func_E0048000.s b/asm/nonmatchings/code_356980/func_E0048000.s index 498a5ef239..292d8cd460 100644 --- a/asm/nonmatchings/code_356980/func_E0048000.s +++ b/asm/nonmatchings/code_356980/func_E0048000.s @@ -14,14 +14,14 @@ glabel func_E0048000 /* 3569A4 E0048024 27A40010 */ addiu $a0, $sp, 0x10 /* 3569A8 E0048028 AFB20030 */ sw $s2, 0x30($sp) /* 3569AC E004802C 8FB2006C */ lw $s2, 0x6c($sp) -/* 3569B0 E0048030 3C02E005 */ lui $v0, %hi(D_E0048128) -/* 3569B4 E0048034 24428128 */ addiu $v0, $v0, %lo(D_E0048128) +/* 3569B0 E0048030 3C02E005 */ lui $v0, %hi(func_E0048128) +/* 3569B4 E0048034 24428128 */ addiu $v0, $v0, %lo(func_E0048128) /* 3569B8 E0048038 AFA20018 */ sw $v0, 0x18($sp) -/* 3569BC E004803C 3C02E005 */ lui $v0, %hi(D_E0048130) -/* 3569C0 E0048040 24428130 */ addiu $v0, $v0, %lo(D_E0048130) +/* 3569BC E004803C 3C02E005 */ lui $v0, %hi(func_E0048130) +/* 3569C0 E0048040 24428130 */ addiu $v0, $v0, %lo(func_E0048130) /* 3569C4 E0048044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3569C8 E0048048 3C02E005 */ lui $v0, %hi(D_E00481D4) -/* 3569CC E004804C 244281D4 */ addiu $v0, $v0, %lo(D_E00481D4) +/* 3569C8 E0048048 3C02E005 */ lui $v0, %hi(func_E00481D4) +/* 3569CC E004804C 244281D4 */ addiu $v0, $v0, %lo(func_E00481D4) /* 3569D0 E0048050 AFA20020 */ sw $v0, 0x20($sp) /* 3569D4 E0048054 24020024 */ addiu $v0, $zero, 0x24 /* 3569D8 E0048058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_356980/func_E00481D4.s b/asm/nonmatchings/code_356980/func_E00481D4.s index e407928e06..590cd04b7c 100644 --- a/asm/nonmatchings/code_356980/func_E00481D4.s +++ b/asm/nonmatchings/code_356980/func_E00481D4.s @@ -3,8 +3,8 @@ glabel func_E00481D4 /* 356B54 E00481D4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 356B58 E00481D8 3C02E005 */ lui $v0, %hi(D_E0048218) -/* 356B5C E00481DC 24428218 */ addiu $v0, $v0, %lo(D_E0048218) +/* 356B58 E00481D8 3C02E005 */ lui $v0, %hi(func_E0048218) +/* 356B5C E00481DC 24428218 */ addiu $v0, $v0, %lo(func_E0048218) /* 356B60 E00481E0 AFA2001C */ sw $v0, 0x1c($sp) /* 356B64 E00481E4 24020028 */ addiu $v0, $zero, 0x28 /* 356B68 E00481E8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3584C0/func_E004A000.s b/asm/nonmatchings/code_3584C0/func_E004A000.s index a51e186e85..40cbd2b1db 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A000.s +++ b/asm/nonmatchings/code_3584C0/func_E004A000.s @@ -66,14 +66,14 @@ glabel func_E004A000 .LE004A0D0: /* 358590 E004A0D0 26730001 */ addiu $s3, $s3, 1 .LE004A0D4: -/* 358594 E004A0D4 3C02E005 */ lui $v0, %hi(D_E004A328) -/* 358598 E004A0D8 2442A328 */ addiu $v0, $v0, %lo(D_E004A328) +/* 358594 E004A0D4 3C02E005 */ lui $v0, %hi(func_E004A328) +/* 358598 E004A0D8 2442A328 */ addiu $v0, $v0, %lo(func_E004A328) /* 35859C E004A0DC AC820008 */ sw $v0, 8($a0) -/* 3585A0 E004A0E0 3C02E005 */ lui $v0, %hi(D_E004A330) -/* 3585A4 E004A0E4 2442A330 */ addiu $v0, $v0, %lo(D_E004A330) +/* 3585A0 E004A0E0 3C02E005 */ lui $v0, %hi(func_E004A330) +/* 3585A4 E004A0E4 2442A330 */ addiu $v0, $v0, %lo(func_E004A330) /* 3585A8 E004A0E8 AC82000C */ sw $v0, 0xc($a0) -/* 3585AC E004A0EC 3C02E005 */ lui $v0, %hi(D_E004A748) -/* 3585B0 E004A0F0 2442A748 */ addiu $v0, $v0, %lo(D_E004A748) +/* 3585AC E004A0EC 3C02E005 */ lui $v0, %hi(func_E004A748) +/* 3585B0 E004A0F0 2442A748 */ addiu $v0, $v0, %lo(func_E004A748) /* 3585B4 E004A0F4 AC820010 */ sw $v0, 0x10($a0) /* 3585B8 E004A0F8 24020025 */ addiu $v0, $zero, 0x25 /* 3585BC E004A0FC AC800000 */ sw $zero, ($a0) diff --git a/asm/nonmatchings/code_3584C0/func_E004A748.s b/asm/nonmatchings/code_3584C0/func_E004A748.s index f96e01eccd..02e2ed951d 100644 --- a/asm/nonmatchings/code_3584C0/func_E004A748.s +++ b/asm/nonmatchings/code_3584C0/func_E004A748.s @@ -3,8 +3,8 @@ glabel func_E004A748 /* 358C08 E004A748 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 358C0C E004A74C 3C02E005 */ lui $v0, %hi(D_E004A78C) -/* 358C10 E004A750 2442A78C */ addiu $v0, $v0, %lo(D_E004A78C) +/* 358C0C E004A74C 3C02E005 */ lui $v0, %hi(func_E004A78C) +/* 358C10 E004A750 2442A78C */ addiu $v0, $v0, %lo(func_E004A78C) /* 358C14 E004A754 AFA2001C */ sw $v0, 0x1c($sp) /* 358C18 E004A758 24020028 */ addiu $v0, $zero, 0x28 /* 358C1C E004A75C AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_359F20/func_E004C000.s b/asm/nonmatchings/code_359F20/func_E004C000.s index df5eb58417..61cd0403c4 100644 --- a/asm/nonmatchings/code_359F20/func_E004C000.s +++ b/asm/nonmatchings/code_359F20/func_E004C000.s @@ -12,14 +12,14 @@ glabel func_E004C000 /* 359F3C E004C01C 27A40010 */ addiu $a0, $sp, 0x10 /* 359F40 E004C020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 359F44 E004C024 4487C000 */ mtc1 $a3, $f24 -/* 359F48 E004C028 3C02E005 */ lui $v0, %hi(D_E004C204) -/* 359F4C E004C02C 2442C204 */ addiu $v0, $v0, %lo(D_E004C204) +/* 359F48 E004C028 3C02E005 */ lui $v0, %hi(func_E004C204) +/* 359F4C E004C02C 2442C204 */ addiu $v0, $v0, %lo(func_E004C204) /* 359F50 E004C030 AFA20018 */ sw $v0, 0x18($sp) -/* 359F54 E004C034 3C02E005 */ lui $v0, %hi(D_E004C20C) -/* 359F58 E004C038 2442C20C */ addiu $v0, $v0, %lo(D_E004C20C) +/* 359F54 E004C034 3C02E005 */ lui $v0, %hi(func_E004C20C) +/* 359F58 E004C038 2442C20C */ addiu $v0, $v0, %lo(func_E004C20C) /* 359F5C E004C03C AFA2001C */ sw $v0, 0x1c($sp) -/* 359F60 E004C040 3C02E005 */ lui $v0, %hi(D_E004C364) -/* 359F64 E004C044 2442C364 */ addiu $v0, $v0, %lo(D_E004C364) +/* 359F60 E004C040 3C02E005 */ lui $v0, %hi(func_E004C364) +/* 359F64 E004C044 2442C364 */ addiu $v0, $v0, %lo(func_E004C364) /* 359F68 E004C048 AFA20020 */ sw $v0, 0x20($sp) /* 359F6C E004C04C 24020026 */ addiu $v0, $zero, 0x26 /* 359F70 E004C050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_359F20/func_E004C364.s b/asm/nonmatchings/code_359F20/func_E004C364.s index 039559b6a2..b73422a96f 100644 --- a/asm/nonmatchings/code_359F20/func_E004C364.s +++ b/asm/nonmatchings/code_359F20/func_E004C364.s @@ -3,8 +3,8 @@ glabel func_E004C364 /* 35A284 E004C364 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 35A288 E004C368 3C02E005 */ lui $v0, %hi(D_E004C3A8) -/* 35A28C E004C36C 2442C3A8 */ addiu $v0, $v0, %lo(D_E004C3A8) +/* 35A288 E004C368 3C02E005 */ lui $v0, %hi(func_E004C3A8) +/* 35A28C E004C36C 2442C3A8 */ addiu $v0, $v0, %lo(func_E004C3A8) /* 35A290 E004C370 AFA2001C */ sw $v0, 0x1c($sp) /* 35A294 E004C374 2402002D */ addiu $v0, $zero, 0x2d /* 35A298 E004C378 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_35B9D0/func_E004E000.s b/asm/nonmatchings/code_35B9D0/func_E004E000.s index f574151c2d..8c803b56af 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E000.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E000.s @@ -14,14 +14,14 @@ glabel func_E004E000 /* 35B9F4 E004E024 27A40010 */ addiu $a0, $sp, 0x10 /* 35B9F8 E004E028 AFB30034 */ sw $s3, 0x34($sp) /* 35B9FC E004E02C 8FB3006C */ lw $s3, 0x6c($sp) -/* 35BA00 E004E030 3C02E005 */ lui $v0, %hi(D_E004E15C) -/* 35BA04 E004E034 2442E15C */ addiu $v0, $v0, %lo(D_E004E15C) +/* 35BA00 E004E030 3C02E005 */ lui $v0, %hi(func_E004E15C) +/* 35BA04 E004E034 2442E15C */ addiu $v0, $v0, %lo(func_E004E15C) /* 35BA08 E004E038 AFA20018 */ sw $v0, 0x18($sp) -/* 35BA0C E004E03C 3C02E005 */ lui $v0, %hi(D_E004E164) -/* 35BA10 E004E040 2442E164 */ addiu $v0, $v0, %lo(D_E004E164) +/* 35BA0C E004E03C 3C02E005 */ lui $v0, %hi(func_E004E164) +/* 35BA10 E004E040 2442E164 */ addiu $v0, $v0, %lo(func_E004E164) /* 35BA14 E004E044 AFA2001C */ sw $v0, 0x1c($sp) -/* 35BA18 E004E048 3C02E005 */ lui $v0, %hi(D_E004E1D0) -/* 35BA1C E004E04C 2442E1D0 */ addiu $v0, $v0, %lo(D_E004E1D0) +/* 35BA18 E004E048 3C02E005 */ lui $v0, %hi(func_E004E1D0) +/* 35BA1C E004E04C 2442E1D0 */ addiu $v0, $v0, %lo(func_E004E1D0) /* 35BA20 E004E050 AFA20020 */ sw $v0, 0x20($sp) /* 35BA24 E004E054 24020027 */ addiu $v0, $zero, 0x27 /* 35BA28 E004E058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_35B9D0/func_E004E1D0.s b/asm/nonmatchings/code_35B9D0/func_E004E1D0.s index 7b54e14a22..1fbc72f5d1 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E1D0.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E1D0.s @@ -3,8 +3,8 @@ glabel func_E004E1D0 /* 35BBA0 E004E1D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 35BBA4 E004E1D4 3C02E005 */ lui $v0, %hi(D_E004E214) -/* 35BBA8 E004E1D8 2442E214 */ addiu $v0, $v0, %lo(D_E004E214) +/* 35BBA4 E004E1D4 3C02E005 */ lui $v0, %hi(func_E004E214) +/* 35BBA8 E004E1D8 2442E214 */ addiu $v0, $v0, %lo(func_E004E214) /* 35BBAC E004E1DC AFA2001C */ sw $v0, 0x1c($sp) /* 35BBB0 E004E1E0 24020028 */ addiu $v0, $zero, 0x28 /* 35BBB4 E004E1E4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_35BFD0/func_E0050000.s b/asm/nonmatchings/code_35BFD0/func_E0050000.s index ee923c7e4d..d7159ef47e 100644 --- a/asm/nonmatchings/code_35BFD0/func_E0050000.s +++ b/asm/nonmatchings/code_35BFD0/func_E0050000.s @@ -14,14 +14,14 @@ glabel func_E0050000 /* 35BFF4 E0050024 27A40018 */ addiu $a0, $sp, 0x18 /* 35BFF8 E0050028 F7B60088 */ sdc1 $f22, 0x88($sp) /* 35BFFC E005002C C7B600BC */ lwc1 $f22, 0xbc($sp) -/* 35C000 E0050030 3C02E005 */ lui $v0, %hi(D_E00501D0) -/* 35C004 E0050034 244201D0 */ addiu $v0, $v0, %lo(D_E00501D0) +/* 35C000 E0050030 3C02E005 */ lui $v0, %hi(func_E00501D0) +/* 35C004 E0050034 244201D0 */ addiu $v0, $v0, %lo(func_E00501D0) /* 35C008 E0050038 AFA20020 */ sw $v0, 0x20($sp) -/* 35C00C E005003C 3C02E005 */ lui $v0, %hi(D_E00501D8) -/* 35C010 E0050040 244201D8 */ addiu $v0, $v0, %lo(D_E00501D8) +/* 35C00C E005003C 3C02E005 */ lui $v0, %hi(func_E00501D8) +/* 35C010 E0050040 244201D8 */ addiu $v0, $v0, %lo(func_E00501D8) /* 35C014 E0050044 AFA20024 */ sw $v0, 0x24($sp) -/* 35C018 E0050048 3C02E005 */ lui $v0, %hi(D_E00502C4) -/* 35C01C E005004C 244202C4 */ addiu $v0, $v0, %lo(D_E00502C4) +/* 35C018 E0050048 3C02E005 */ lui $v0, %hi(func_E00502C4) +/* 35C01C E005004C 244202C4 */ addiu $v0, $v0, %lo(func_E00502C4) /* 35C020 E0050050 AFA20028 */ sw $v0, 0x28($sp) /* 35C024 E0050054 24020028 */ addiu $v0, $zero, 0x28 /* 35C028 E0050058 AFBF007C */ sw $ra, 0x7c($sp) diff --git a/asm/nonmatchings/code_35BFD0/func_E00502C4.s b/asm/nonmatchings/code_35BFD0/func_E00502C4.s index 1f06214509..0f40cc3d42 100644 --- a/asm/nonmatchings/code_35BFD0/func_E00502C4.s +++ b/asm/nonmatchings/code_35BFD0/func_E00502C4.s @@ -3,8 +3,8 @@ glabel func_E00502C4 /* 35C294 E00502C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 35C298 E00502C8 3C02E005 */ lui $v0, %hi(D_E0050308) -/* 35C29C E00502CC 24420308 */ addiu $v0, $v0, %lo(D_E0050308) +/* 35C298 E00502C8 3C02E005 */ lui $v0, %hi(func_E0050308) +/* 35C29C E00502CC 24420308 */ addiu $v0, $v0, %lo(func_E0050308) /* 35C2A0 E00502D0 AFA2001C */ sw $v0, 0x1c($sp) /* 35C2A4 E00502D4 2402002D */ addiu $v0, $zero, 0x2d /* 35C2A8 E00502D8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_35CA80/func_E0052000.s b/asm/nonmatchings/code_35CA80/func_E0052000.s index 9e958ce2cc..e298980f6d 100644 --- a/asm/nonmatchings/code_35CA80/func_E0052000.s +++ b/asm/nonmatchings/code_35CA80/func_E0052000.s @@ -12,14 +12,14 @@ glabel func_E0052000 /* 35CA9C E005201C 27A40010 */ addiu $a0, $sp, 0x10 /* 35CAA0 E0052020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 35CAA4 E0052024 4487C000 */ mtc1 $a3, $f24 -/* 35CAA8 E0052028 3C02E005 */ lui $v0, %hi(D_E00520E8) -/* 35CAAC E005202C 244220E8 */ addiu $v0, $v0, %lo(D_E00520E8) +/* 35CAA8 E0052028 3C02E005 */ lui $v0, %hi(func_E00520E8) +/* 35CAAC E005202C 244220E8 */ addiu $v0, $v0, %lo(func_E00520E8) /* 35CAB0 E0052030 AFA20018 */ sw $v0, 0x18($sp) -/* 35CAB4 E0052034 3C02E005 */ lui $v0, %hi(D_E00520F0) -/* 35CAB8 E0052038 244220F0 */ addiu $v0, $v0, %lo(D_E00520F0) +/* 35CAB4 E0052034 3C02E005 */ lui $v0, %hi(func_E00520F0) +/* 35CAB8 E0052038 244220F0 */ addiu $v0, $v0, %lo(func_E00520F0) /* 35CABC E005203C AFA2001C */ sw $v0, 0x1c($sp) -/* 35CAC0 E0052040 3C02E005 */ lui $v0, %hi(D_E005241C) -/* 35CAC4 E0052044 2442241C */ addiu $v0, $v0, %lo(D_E005241C) +/* 35CAC0 E0052040 3C02E005 */ lui $v0, %hi(func_E005241C) +/* 35CAC4 E0052044 2442241C */ addiu $v0, $v0, %lo(func_E005241C) /* 35CAC8 E0052048 AFA20020 */ sw $v0, 0x20($sp) /* 35CACC E005204C 24020029 */ addiu $v0, $zero, 0x29 /* 35CAD0 E0052050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_35CA80/func_E005241C.s b/asm/nonmatchings/code_35CA80/func_E005241C.s index 550fbee617..15e82ac5bd 100644 --- a/asm/nonmatchings/code_35CA80/func_E005241C.s +++ b/asm/nonmatchings/code_35CA80/func_E005241C.s @@ -3,8 +3,8 @@ glabel func_E005241C /* 35CE9C E005241C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 35CEA0 E0052420 3C02E005 */ lui $v0, %hi(D_E0052460) -/* 35CEA4 E0052424 24422460 */ addiu $v0, $v0, %lo(D_E0052460) +/* 35CEA0 E0052420 3C02E005 */ lui $v0, %hi(func_E0052460) +/* 35CEA4 E0052424 24422460 */ addiu $v0, $v0, %lo(func_E0052460) /* 35CEA8 E0052428 AFA2001C */ sw $v0, 0x1c($sp) /* 35CEAC E005242C 2402002D */ addiu $v0, $zero, 0x2d /* 35CEB0 E0052430 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_35DA00/func_E0056000.s b/asm/nonmatchings/code_35DA00/func_E0056000.s index 5830883546..058feb7709 100644 --- a/asm/nonmatchings/code_35DA00/func_E0056000.s +++ b/asm/nonmatchings/code_35DA00/func_E0056000.s @@ -12,14 +12,14 @@ glabel func_E0056000 /* 35DA1C E005601C 27A40010 */ addiu $a0, $sp, 0x10 /* 35DA20 E0056020 F7B80058 */ sdc1 $f24, 0x58($sp) /* 35DA24 E0056024 4487C000 */ mtc1 $a3, $f24 -/* 35DA28 E0056028 3C02E005 */ lui $v0, %hi(D_E0056304) -/* 35DA2C E005602C 24426304 */ addiu $v0, $v0, %lo(D_E0056304) +/* 35DA28 E0056028 3C02E005 */ lui $v0, %hi(func_E0056304) +/* 35DA2C E005602C 24426304 */ addiu $v0, $v0, %lo(func_E0056304) /* 35DA30 E0056030 AFA20018 */ sw $v0, 0x18($sp) -/* 35DA34 E0056034 3C02E005 */ lui $v0, %hi(D_E005630C) -/* 35DA38 E0056038 2442630C */ addiu $v0, $v0, %lo(D_E005630C) +/* 35DA34 E0056034 3C02E005 */ lui $v0, %hi(func_E005630C) +/* 35DA38 E0056038 2442630C */ addiu $v0, $v0, %lo(func_E005630C) /* 35DA3C E005603C AFA2001C */ sw $v0, 0x1c($sp) -/* 35DA40 E0056040 3C02E005 */ lui $v0, %hi(D_E0056B8C) -/* 35DA44 E0056044 24426B8C */ addiu $v0, $v0, %lo(D_E0056B8C) +/* 35DA40 E0056040 3C02E005 */ lui $v0, %hi(func_E0056B8C) +/* 35DA44 E0056044 24426B8C */ addiu $v0, $v0, %lo(func_E0056B8C) /* 35DA48 E0056048 AFA20020 */ sw $v0, 0x20($sp) /* 35DA4C E005604C 2402002B */ addiu $v0, $zero, 0x2b /* 35DA50 E0056050 AFBF0044 */ sw $ra, 0x44($sp) diff --git a/asm/nonmatchings/code_35DA00/func_E0056B8C.s b/asm/nonmatchings/code_35DA00/func_E0056B8C.s index 3da3c46eb2..2fb6cb8ced 100644 --- a/asm/nonmatchings/code_35DA00/func_E0056B8C.s +++ b/asm/nonmatchings/code_35DA00/func_E0056B8C.s @@ -3,8 +3,8 @@ glabel func_E0056B8C /* 35E58C E0056B8C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 35E590 E0056B90 3C02E005 */ lui $v0, %hi(D_E0056BD0) -/* 35E594 E0056B94 24426BD0 */ addiu $v0, $v0, %lo(D_E0056BD0) +/* 35E590 E0056B90 3C02E005 */ lui $v0, %hi(func_E0056BD0) +/* 35E594 E0056B94 24426BD0 */ addiu $v0, $v0, %lo(func_E0056BD0) /* 35E598 E0056B98 AFA2001C */ sw $v0, 0x1c($sp) /* 35E59C E0056B9C 2402002D */ addiu $v0, $zero, 0x2d /* 35E5A0 E0056BA0 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_35E920/func_E0058000.s b/asm/nonmatchings/code_35E920/func_E0058000.s index 926a84b599..e7041aec89 100644 --- a/asm/nonmatchings/code_35E920/func_E0058000.s +++ b/asm/nonmatchings/code_35E920/func_E0058000.s @@ -12,14 +12,14 @@ glabel func_E0058000 /* 35E93C E005801C 27A40010 */ addiu $a0, $sp, 0x10 /* 35E940 E0058020 F7B80050 */ sdc1 $f24, 0x50($sp) /* 35E944 E0058024 4487C000 */ mtc1 $a3, $f24 -/* 35E948 E0058028 3C02E006 */ lui $v0, %hi(D_E00581AC) -/* 35E94C E005802C 244281AC */ addiu $v0, $v0, %lo(D_E00581AC) +/* 35E948 E0058028 3C02E006 */ lui $v0, %hi(func_E00581AC) +/* 35E94C E005802C 244281AC */ addiu $v0, $v0, %lo(func_E00581AC) /* 35E950 E0058030 AFA20018 */ sw $v0, 0x18($sp) -/* 35E954 E0058034 3C02E006 */ lui $v0, %hi(D_E00581B4) -/* 35E958 E0058038 244281B4 */ addiu $v0, $v0, %lo(D_E00581B4) +/* 35E954 E0058034 3C02E006 */ lui $v0, %hi(func_E00581B4) +/* 35E958 E0058038 244281B4 */ addiu $v0, $v0, %lo(func_E00581B4) /* 35E95C E005803C AFA2001C */ sw $v0, 0x1c($sp) -/* 35E960 E0058040 3C02E006 */ lui $v0, %hi(D_E0058490) -/* 35E964 E0058044 24428490 */ addiu $v0, $v0, %lo(D_E0058490) +/* 35E960 E0058040 3C02E006 */ lui $v0, %hi(func_E0058490) +/* 35E964 E0058044 24428490 */ addiu $v0, $v0, %lo(func_E0058490) /* 35E968 E0058048 AFA20020 */ sw $v0, 0x20($sp) /* 35E96C E005804C 2402002C */ addiu $v0, $zero, 0x2c /* 35E970 E0058050 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_35E920/func_E0058490.s b/asm/nonmatchings/code_35E920/func_E0058490.s index 9b14ca2257..a72504f934 100644 --- a/asm/nonmatchings/code_35E920/func_E0058490.s +++ b/asm/nonmatchings/code_35E920/func_E0058490.s @@ -3,8 +3,8 @@ glabel func_E0058490 /* 35EDB0 E0058490 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 35EDB4 E0058494 3C02E006 */ lui $v0, %hi(D_E00584D4) -/* 35EDB8 E0058498 244284D4 */ addiu $v0, $v0, %lo(D_E00584D4) +/* 35EDB4 E0058494 3C02E006 */ lui $v0, %hi(func_E00584D4) +/* 35EDB8 E0058498 244284D4 */ addiu $v0, $v0, %lo(func_E00584D4) /* 35EDBC E005849C AFA2001C */ sw $v0, 0x1c($sp) /* 35EDC0 E00584A0 2402002D */ addiu $v0, $zero, 0x2d /* 35EDC4 E00584A4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3602C0/func_E005A000.s b/asm/nonmatchings/code_3602C0/func_E005A000.s index 18df34803c..4dab03ae18 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A000.s +++ b/asm/nonmatchings/code_3602C0/func_E005A000.s @@ -16,14 +16,14 @@ glabel func_E005A000 /* 3602EC E005A02C 27A40010 */ addiu $a0, $sp, 0x10 /* 3602F0 E005A030 AFB20030 */ sw $s2, 0x30($sp) /* 3602F4 E005A034 8FB20074 */ lw $s2, 0x74($sp) -/* 3602F8 E005A038 3C02E006 */ lui $v0, %hi(D_E005A1F4) -/* 3602FC E005A03C 2442A1F4 */ addiu $v0, $v0, %lo(D_E005A1F4) +/* 3602F8 E005A038 3C02E006 */ lui $v0, %hi(func_E005A1F4) +/* 3602FC E005A03C 2442A1F4 */ addiu $v0, $v0, %lo(func_E005A1F4) /* 360300 E005A040 AFA20018 */ sw $v0, 0x18($sp) -/* 360304 E005A044 3C02E006 */ lui $v0, %hi(D_E005A1FC) -/* 360308 E005A048 2442A1FC */ addiu $v0, $v0, %lo(D_E005A1FC) +/* 360304 E005A044 3C02E006 */ lui $v0, %hi(func_E005A1FC) +/* 360308 E005A048 2442A1FC */ addiu $v0, $v0, %lo(func_E005A1FC) /* 36030C E005A04C AFA2001C */ sw $v0, 0x1c($sp) -/* 360310 E005A050 3C02E006 */ lui $v0, %hi(D_E005A3B0) -/* 360314 E005A054 2442A3B0 */ addiu $v0, $v0, %lo(D_E005A3B0) +/* 360310 E005A050 3C02E006 */ lui $v0, %hi(func_E005A3B0) +/* 360314 E005A054 2442A3B0 */ addiu $v0, $v0, %lo(func_E005A3B0) /* 360318 E005A058 AFA20020 */ sw $v0, 0x20($sp) /* 36031C E005A05C 2402002D */ addiu $v0, $zero, 0x2d /* 360320 E005A060 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_3602C0/func_E005A3B0.s b/asm/nonmatchings/code_3602C0/func_E005A3B0.s index ead75c858b..a167f8fd6a 100644 --- a/asm/nonmatchings/code_3602C0/func_E005A3B0.s +++ b/asm/nonmatchings/code_3602C0/func_E005A3B0.s @@ -3,8 +3,8 @@ glabel func_E005A3B0 /* 360670 E005A3B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 360674 E005A3B4 3C02E006 */ lui $v0, %hi(D_E005A3F4) -/* 360678 E005A3B8 2442A3F4 */ addiu $v0, $v0, %lo(D_E005A3F4) +/* 360674 E005A3B4 3C02E006 */ lui $v0, %hi(func_E005A3F4) +/* 360678 E005A3B8 2442A3F4 */ addiu $v0, $v0, %lo(func_E005A3F4) /* 36067C E005A3BC AFA2001C */ sw $v0, 0x1c($sp) /* 360680 E005A3C0 24020028 */ addiu $v0, $zero, 0x28 /* 360684 E005A3C4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_360F40/func_E005C000.s b/asm/nonmatchings/code_360F40/func_E005C000.s index 75449cd8e2..7312b854eb 100644 --- a/asm/nonmatchings/code_360F40/func_E005C000.s +++ b/asm/nonmatchings/code_360F40/func_E005C000.s @@ -14,14 +14,14 @@ glabel func_E005C000 /* 360F64 E005C024 27A40010 */ addiu $a0, $sp, 0x10 /* 360F68 E005C028 AFB40038 */ sw $s4, 0x38($sp) /* 360F6C E005C02C 8FB40074 */ lw $s4, 0x74($sp) -/* 360F70 E005C030 3C02E006 */ lui $v0, %hi(D_E005C178) -/* 360F74 E005C034 2442C178 */ addiu $v0, $v0, %lo(D_E005C178) +/* 360F70 E005C030 3C02E006 */ lui $v0, %hi(func_E005C178) +/* 360F74 E005C034 2442C178 */ addiu $v0, $v0, %lo(func_E005C178) /* 360F78 E005C038 AFA20018 */ sw $v0, 0x18($sp) -/* 360F7C E005C03C 3C02E006 */ lui $v0, %hi(D_E005C180) -/* 360F80 E005C040 2442C180 */ addiu $v0, $v0, %lo(D_E005C180) +/* 360F7C E005C03C 3C02E006 */ lui $v0, %hi(func_E005C180) +/* 360F80 E005C040 2442C180 */ addiu $v0, $v0, %lo(func_E005C180) /* 360F84 E005C044 AFA2001C */ sw $v0, 0x1c($sp) -/* 360F88 E005C048 3C02E006 */ lui $v0, %hi(D_E005C2B4) -/* 360F8C E005C04C 2442C2B4 */ addiu $v0, $v0, %lo(D_E005C2B4) +/* 360F88 E005C048 3C02E006 */ lui $v0, %hi(func_E005C2B4) +/* 360F8C E005C04C 2442C2B4 */ addiu $v0, $v0, %lo(func_E005C2B4) /* 360F90 E005C050 AFA20020 */ sw $v0, 0x20($sp) /* 360F94 E005C054 2402002E */ addiu $v0, $zero, 0x2e /* 360F98 E005C058 AFBF0040 */ sw $ra, 0x40($sp) diff --git a/asm/nonmatchings/code_360F40/func_E005C2B4.s b/asm/nonmatchings/code_360F40/func_E005C2B4.s index 946f90b55e..f172fd7f67 100644 --- a/asm/nonmatchings/code_360F40/func_E005C2B4.s +++ b/asm/nonmatchings/code_360F40/func_E005C2B4.s @@ -3,8 +3,8 @@ glabel func_E005C2B4 /* 3611F4 E005C2B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3611F8 E005C2B8 3C02E006 */ lui $v0, %hi(D_E005C2F8) -/* 3611FC E005C2BC 2442C2F8 */ addiu $v0, $v0, %lo(D_E005C2F8) +/* 3611F8 E005C2B8 3C02E006 */ lui $v0, %hi(func_E005C2F8) +/* 3611FC E005C2BC 2442C2F8 */ addiu $v0, $v0, %lo(func_E005C2F8) /* 361200 E005C2C0 AFA2001C */ sw $v0, 0x1c($sp) /* 361204 E005C2C4 24020028 */ addiu $v0, $zero, 0x28 /* 361208 E005C2C8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3625C0/func_E005E000.s b/asm/nonmatchings/code_3625C0/func_E005E000.s index 5cf66507f5..cf88bf01cf 100644 --- a/asm/nonmatchings/code_3625C0/func_E005E000.s +++ b/asm/nonmatchings/code_3625C0/func_E005E000.s @@ -14,17 +14,17 @@ glabel func_E005E000 /* 3625E4 E005E024 27A40010 */ addiu $a0, $sp, 0x10 /* 3625E8 E005E028 AFB1002C */ sw $s1, 0x2c($sp) /* 3625EC E005E02C 8FB1006C */ lw $s1, 0x6c($sp) -/* 3625F0 E005E030 3C02E006 */ lui $v0, %hi(D_E005E1B0) -/* 3625F4 E005E034 2442E1B0 */ addiu $v0, $v0, %lo(D_E005E1B0) +/* 3625F0 E005E030 3C02E006 */ lui $v0, %hi(func_E005E1B0) +/* 3625F4 E005E034 2442E1B0 */ addiu $v0, $v0, %lo(func_E005E1B0) /* 3625F8 E005E038 AFA20018 */ sw $v0, 0x18($sp) -/* 3625FC E005E03C 3C02E006 */ lui $v0, %hi(D_E005E1B8) -/* 362600 E005E040 2442E1B8 */ addiu $v0, $v0, %lo(D_E005E1B8) +/* 3625FC E005E03C 3C02E006 */ lui $v0, %hi(func_E005E1B8) +/* 362600 E005E040 2442E1B8 */ addiu $v0, $v0, %lo(func_E005E1B8) /* 362604 E005E044 AFA2001C */ sw $v0, 0x1c($sp) -/* 362608 E005E048 3C02E006 */ lui $v0, %hi(D_E005E310) -/* 36260C E005E04C 2442E310 */ addiu $v0, $v0, %lo(D_E005E310) +/* 362608 E005E048 3C02E006 */ lui $v0, %hi(func_E005E310) +/* 36260C E005E04C 2442E310 */ addiu $v0, $v0, %lo(func_E005E310) /* 362610 E005E050 AFA20020 */ sw $v0, 0x20($sp) -/* 362614 E005E054 3C02E006 */ lui $v0, %hi(D_E005E318) -/* 362618 E005E058 2442E318 */ addiu $v0, $v0, %lo(D_E005E318) +/* 362614 E005E054 3C02E006 */ lui $v0, %hi(func_E005E318) +/* 362618 E005E058 2442E318 */ addiu $v0, $v0, %lo(func_E005E318) /* 36261C E005E05C AFA20024 */ sw $v0, 0x24($sp) /* 362620 E005E060 2402002F */ addiu $v0, $zero, 0x2f /* 362624 E005E064 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_363160/func_E0060000.s b/asm/nonmatchings/code_363160/func_E0060000.s index d2abb7e8f7..2cb939ef42 100644 --- a/asm/nonmatchings/code_363160/func_E0060000.s +++ b/asm/nonmatchings/code_363160/func_E0060000.s @@ -12,14 +12,14 @@ glabel func_E0060000 /* 36317C E006001C 27A40010 */ addiu $a0, $sp, 0x10 /* 363180 E0060020 F7B80050 */ sdc1 $f24, 0x50($sp) /* 363184 E0060024 4487C000 */ mtc1 $a3, $f24 -/* 363188 E0060028 3C02E006 */ lui $v0, %hi(D_E00601D8) -/* 36318C E006002C 244201D8 */ addiu $v0, $v0, %lo(D_E00601D8) +/* 363188 E0060028 3C02E006 */ lui $v0, %hi(func_E00601D8) +/* 36318C E006002C 244201D8 */ addiu $v0, $v0, %lo(func_E00601D8) /* 363190 E0060030 AFA20018 */ sw $v0, 0x18($sp) -/* 363194 E0060034 3C02E006 */ lui $v0, %hi(D_E00601E0) -/* 363198 E0060038 244201E0 */ addiu $v0, $v0, %lo(D_E00601E0) +/* 363194 E0060034 3C02E006 */ lui $v0, %hi(func_E00601E0) +/* 363198 E0060038 244201E0 */ addiu $v0, $v0, %lo(func_E00601E0) /* 36319C E006003C AFA2001C */ sw $v0, 0x1c($sp) -/* 3631A0 E0060040 3C02E006 */ lui $v0, %hi(D_E006040C) -/* 3631A4 E0060044 2442040C */ addiu $v0, $v0, %lo(D_E006040C) +/* 3631A0 E0060040 3C02E006 */ lui $v0, %hi(func_E006040C) +/* 3631A4 E0060044 2442040C */ addiu $v0, $v0, %lo(func_E006040C) /* 3631A8 E0060048 AFA20020 */ sw $v0, 0x20($sp) /* 3631AC E006004C 24020030 */ addiu $v0, $zero, 0x30 /* 3631B0 E0060050 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_363160/func_E006040C.s b/asm/nonmatchings/code_363160/func_E006040C.s index f52aeefae6..cd1dae7d05 100644 --- a/asm/nonmatchings/code_363160/func_E006040C.s +++ b/asm/nonmatchings/code_363160/func_E006040C.s @@ -3,8 +3,8 @@ glabel func_E006040C /* 36356C E006040C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 363570 E0060410 3C02E006 */ lui $v0, %hi(D_E0060450) -/* 363574 E0060414 24420450 */ addiu $v0, $v0, %lo(D_E0060450) +/* 363570 E0060410 3C02E006 */ lui $v0, %hi(func_E0060450) +/* 363574 E0060414 24420450 */ addiu $v0, $v0, %lo(func_E0060450) /* 363578 E0060418 AFA2001C */ sw $v0, 0x1c($sp) /* 36357C E006041C 2402002D */ addiu $v0, $zero, 0x2d /* 363580 E0060420 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_364300/func_E0062000.s b/asm/nonmatchings/code_364300/func_E0062000.s index 534d15997a..672b65c118 100644 --- a/asm/nonmatchings/code_364300/func_E0062000.s +++ b/asm/nonmatchings/code_364300/func_E0062000.s @@ -12,14 +12,14 @@ glabel func_E0062000 /* 36431C E006201C 27A40010 */ addiu $a0, $sp, 0x10 /* 364320 E0062020 F7B80058 */ sdc1 $f24, 0x58($sp) /* 364324 E0062024 4487C000 */ mtc1 $a3, $f24 -/* 364328 E0062028 3C02E006 */ lui $v0, %hi(D_E0062218) -/* 36432C E006202C 24422218 */ addiu $v0, $v0, %lo(D_E0062218) +/* 364328 E0062028 3C02E006 */ lui $v0, %hi(func_E0062218) +/* 36432C E006202C 24422218 */ addiu $v0, $v0, %lo(func_E0062218) /* 364330 E0062030 AFA20018 */ sw $v0, 0x18($sp) -/* 364334 E0062034 3C02E006 */ lui $v0, %hi(D_E0062220) -/* 364338 E0062038 24422220 */ addiu $v0, $v0, %lo(D_E0062220) +/* 364334 E0062034 3C02E006 */ lui $v0, %hi(func_E0062220) +/* 364338 E0062038 24422220 */ addiu $v0, $v0, %lo(func_E0062220) /* 36433C E006203C AFA2001C */ sw $v0, 0x1c($sp) -/* 364340 E0062040 3C02E006 */ lui $v0, %hi(D_E00624A8) -/* 364344 E0062044 244224A8 */ addiu $v0, $v0, %lo(D_E00624A8) +/* 364340 E0062040 3C02E006 */ lui $v0, %hi(func_E00624A8) +/* 364344 E0062044 244224A8 */ addiu $v0, $v0, %lo(func_E00624A8) /* 364348 E0062048 AFA20020 */ sw $v0, 0x20($sp) /* 36434C E006204C 24020031 */ addiu $v0, $zero, 0x31 /* 364350 E0062050 AFBF0040 */ sw $ra, 0x40($sp) diff --git a/asm/nonmatchings/code_364300/func_E00624A8.s b/asm/nonmatchings/code_364300/func_E00624A8.s index f80f07b1f5..46a812fba8 100644 --- a/asm/nonmatchings/code_364300/func_E00624A8.s +++ b/asm/nonmatchings/code_364300/func_E00624A8.s @@ -3,8 +3,8 @@ glabel func_E00624A8 /* 3647A8 E00624A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3647AC E00624AC 3C02E006 */ lui $v0, %hi(D_E00624EC) -/* 3647B0 E00624B0 244224EC */ addiu $v0, $v0, %lo(D_E00624EC) +/* 3647AC E00624AC 3C02E006 */ lui $v0, %hi(func_E00624EC) +/* 3647B0 E00624B0 244224EC */ addiu $v0, $v0, %lo(func_E00624EC) /* 3647B4 E00624B4 AFA2001C */ sw $v0, 0x1c($sp) /* 3647B8 E00624B8 24020028 */ addiu $v0, $zero, 0x28 /* 3647BC E00624BC AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_364F10/func_E0064000.s b/asm/nonmatchings/code_364F10/func_E0064000.s index 4fb62b43b3..679178a411 100644 --- a/asm/nonmatchings/code_364F10/func_E0064000.s +++ b/asm/nonmatchings/code_364F10/func_E0064000.s @@ -23,15 +23,15 @@ glabel func_E0064000 /* 364F58 E0064048 24110004 */ addiu $s1, $zero, 4 .LE006404C: /* 364F5C E006404C 26310001 */ addiu $s1, $s1, 1 -/* 364F60 E0064050 3C02E006 */ lui $v0, %hi(D_E006419C) -/* 364F64 E0064054 2442419C */ addiu $v0, $v0, %lo(D_E006419C) +/* 364F60 E0064050 3C02E006 */ lui $v0, %hi(func_E006419C) +/* 364F64 E0064054 2442419C */ addiu $v0, $v0, %lo(func_E006419C) /* 364F68 E0064058 AFA00010 */ sw $zero, 0x10($sp) /* 364F6C E006405C AC820008 */ sw $v0, 8($a0) -/* 364F70 E0064060 3C02E006 */ lui $v0, %hi(D_E00641A4) -/* 364F74 E0064064 244241A4 */ addiu $v0, $v0, %lo(D_E00641A4) +/* 364F70 E0064060 3C02E006 */ lui $v0, %hi(func_E00641A4) +/* 364F74 E0064064 244241A4 */ addiu $v0, $v0, %lo(func_E00641A4) /* 364F78 E0064068 AC82000C */ sw $v0, 0xc($a0) -/* 364F7C E006406C 3C02E006 */ lui $v0, %hi(D_E00643DC) -/* 364F80 E0064070 244243DC */ addiu $v0, $v0, %lo(D_E00643DC) +/* 364F7C E006406C 3C02E006 */ lui $v0, %hi(func_E00643DC) +/* 364F80 E0064070 244243DC */ addiu $v0, $v0, %lo(func_E00643DC) /* 364F84 E0064074 AC820010 */ sw $v0, 0x10($a0) /* 364F88 E0064078 24020032 */ addiu $v0, $zero, 0x32 /* 364F8C E006407C AC800014 */ sw $zero, 0x14($a0) diff --git a/asm/nonmatchings/code_364F10/func_E00643DC.s b/asm/nonmatchings/code_364F10/func_E00643DC.s index 535c042692..5bff87d863 100644 --- a/asm/nonmatchings/code_364F10/func_E00643DC.s +++ b/asm/nonmatchings/code_364F10/func_E00643DC.s @@ -3,8 +3,8 @@ glabel func_E00643DC /* 3652EC E00643DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3652F0 E00643E0 3C02E006 */ lui $v0, %hi(D_E0064414) -/* 3652F4 E00643E4 24424414 */ addiu $v0, $v0, %lo(D_E0064414) +/* 3652F0 E00643E0 3C02E006 */ lui $v0, %hi(func_E0064414) +/* 3652F4 E00643E4 24424414 */ addiu $v0, $v0, %lo(func_E0064414) /* 3652F8 E00643E8 AFA2001C */ sw $v0, 0x1c($sp) /* 3652FC E00643EC 24020028 */ addiu $v0, $zero, 0x28 /* 365300 E00643F0 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_366030/func_E0066000.s b/asm/nonmatchings/code_366030/func_E0066000.s index 9196210139..93899e6536 100644 --- a/asm/nonmatchings/code_366030/func_E0066000.s +++ b/asm/nonmatchings/code_366030/func_E0066000.s @@ -14,14 +14,14 @@ glabel func_E0066000 /* 366054 E0066024 27A40010 */ addiu $a0, $sp, 0x10 /* 366058 E0066028 AFB00028 */ sw $s0, 0x28($sp) /* 36605C E006602C 8FB00064 */ lw $s0, 0x64($sp) -/* 366060 E0066030 3C02E006 */ lui $v0, %hi(D_E0066490) -/* 366064 E0066034 24426490 */ addiu $v0, $v0, %lo(D_E0066490) +/* 366060 E0066030 3C02E006 */ lui $v0, %hi(func_E0066490) +/* 366064 E0066034 24426490 */ addiu $v0, $v0, %lo(func_E0066490) /* 366068 E0066038 AFA20018 */ sw $v0, 0x18($sp) -/* 36606C E006603C 3C02E006 */ lui $v0, %hi(D_E0066498) -/* 366070 E0066040 24426498 */ addiu $v0, $v0, %lo(D_E0066498) +/* 36606C E006603C 3C02E006 */ lui $v0, %hi(func_E0066498) +/* 366070 E0066040 24426498 */ addiu $v0, $v0, %lo(func_E0066498) /* 366074 E0066044 AFA2001C */ sw $v0, 0x1c($sp) -/* 366078 E0066048 3C02E006 */ lui $v0, %hi(D_E006672C) -/* 36607C E006604C 2442672C */ addiu $v0, $v0, %lo(D_E006672C) +/* 366078 E0066048 3C02E006 */ lui $v0, %hi(func_E006672C) +/* 36607C E006604C 2442672C */ addiu $v0, $v0, %lo(func_E006672C) /* 366080 E0066050 AFA20020 */ sw $v0, 0x20($sp) /* 366084 E0066054 24020033 */ addiu $v0, $zero, 0x33 /* 366088 E0066058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_366030/func_E006672C.s b/asm/nonmatchings/code_366030/func_E006672C.s index f46ce46e17..abd0b1f444 100644 --- a/asm/nonmatchings/code_366030/func_E006672C.s +++ b/asm/nonmatchings/code_366030/func_E006672C.s @@ -3,8 +3,8 @@ glabel func_E006672C /* 36675C E006672C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 366760 E0066730 3C02E006 */ lui $v0, %hi(D_E0066770) -/* 366764 E0066734 24426770 */ addiu $v0, $v0, %lo(D_E0066770) +/* 366760 E0066730 3C02E006 */ lui $v0, %hi(func_E0066770) +/* 366764 E0066734 24426770 */ addiu $v0, $v0, %lo(func_E0066770) /* 366768 E0066738 AFA2001C */ sw $v0, 0x1c($sp) /* 36676C E006673C 2402002D */ addiu $v0, $zero, 0x2d /* 366770 E0066740 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_36A8D0/func_E0068000.s b/asm/nonmatchings/code_36A8D0/func_E0068000.s index c2a5ceccf2..f10faa86f5 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068000.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068000.s @@ -14,14 +14,14 @@ glabel func_E0068000 /* 36A8F4 E0068024 27A40010 */ addiu $a0, $sp, 0x10 /* 36A8F8 E0068028 F7B40038 */ sdc1 $f20, 0x38($sp) /* 36A8FC E006802C C7B40068 */ lwc1 $f20, 0x68($sp) -/* 36A900 E0068030 3C02E007 */ lui $v0, %hi(D_E0068140) -/* 36A904 E0068034 24428140 */ addiu $v0, $v0, %lo(D_E0068140) +/* 36A900 E0068030 3C02E007 */ lui $v0, %hi(func_E0068140) +/* 36A904 E0068034 24428140 */ addiu $v0, $v0, %lo(func_E0068140) /* 36A908 E0068038 AFA20018 */ sw $v0, 0x18($sp) -/* 36A90C E006803C 3C02E007 */ lui $v0, %hi(D_E0068148) -/* 36A910 E0068040 24428148 */ addiu $v0, $v0, %lo(D_E0068148) +/* 36A90C E006803C 3C02E007 */ lui $v0, %hi(func_E0068148) +/* 36A910 E0068040 24428148 */ addiu $v0, $v0, %lo(func_E0068148) /* 36A914 E0068044 AFA2001C */ sw $v0, 0x1c($sp) -/* 36A918 E0068048 3C02E007 */ lui $v0, %hi(D_E00681D8) -/* 36A91C E006804C 244281D8 */ addiu $v0, $v0, %lo(D_E00681D8) +/* 36A918 E0068048 3C02E007 */ lui $v0, %hi(func_E00681D8) +/* 36A91C E006804C 244281D8 */ addiu $v0, $v0, %lo(func_E00681D8) /* 36A920 E0068050 AFA20020 */ sw $v0, 0x20($sp) /* 36A924 E0068054 24020034 */ addiu $v0, $zero, 0x34 /* 36A928 E0068058 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_36A8D0/func_E00681D8.s b/asm/nonmatchings/code_36A8D0/func_E00681D8.s index e5e0cb417a..d77b40637f 100644 --- a/asm/nonmatchings/code_36A8D0/func_E00681D8.s +++ b/asm/nonmatchings/code_36A8D0/func_E00681D8.s @@ -5,8 +5,8 @@ glabel func_E00681D8 /* 36AAA8 E00681D8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 36AAAC E00681DC AFBF0020 */ sw $ra, 0x20($sp) /* 36AAB0 E00681E0 8C83000C */ lw $v1, 0xc($a0) -/* 36AAB4 E00681E4 3C02E007 */ lui $v0, %hi(D_E0068234) -/* 36AAB8 E00681E8 24428234 */ addiu $v0, $v0, %lo(D_E0068234) +/* 36AAB4 E00681E4 3C02E007 */ lui $v0, %hi(func_E0068234) +/* 36AAB8 E00681E8 24428234 */ addiu $v0, $v0, %lo(func_E0068234) /* 36AABC E00681EC AFA2001C */ sw $v0, 0x1c($sp) /* 36AAC0 E00681F0 2402000A */ addiu $v0, $zero, 0xa /* 36AAC4 E00681F4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_36D020/func_E006A1E8.s b/asm/nonmatchings/code_36D020/func_E006A1E8.s index d431457982..6ae0fc3769 100644 --- a/asm/nonmatchings/code_36D020/func_E006A1E8.s +++ b/asm/nonmatchings/code_36D020/func_E006A1E8.s @@ -27,14 +27,14 @@ glabel func_E006A1E8 /* 36D260 E006A240 AFB1002C */ sw $s1, 0x2c($sp) /* 36D264 E006A244 24120009 */ addiu $s2, $zero, 9 .LE006A248: -/* 36D268 E006A248 3C02E007 */ lui $v0, %hi(D_E006A45C) -/* 36D26C E006A24C 2442A45C */ addiu $v0, $v0, %lo(D_E006A45C) +/* 36D268 E006A248 3C02E007 */ lui $v0, %hi(func_E006A45C) +/* 36D26C E006A24C 2442A45C */ addiu $v0, $v0, %lo(func_E006A45C) /* 36D270 E006A250 AFA20018 */ sw $v0, 0x18($sp) -/* 36D274 E006A254 3C02E007 */ lui $v0, %hi(D_E006A580) -/* 36D278 E006A258 2442A580 */ addiu $v0, $v0, %lo(D_E006A580) +/* 36D274 E006A254 3C02E007 */ lui $v0, %hi(func_E006A580) +/* 36D278 E006A258 2442A580 */ addiu $v0, $v0, %lo(func_E006A580) /* 36D27C E006A25C AFA2001C */ sw $v0, 0x1c($sp) -/* 36D280 E006A260 3C02E007 */ lui $v0, %hi(D_E006A814) -/* 36D284 E006A264 2442A814 */ addiu $v0, $v0, %lo(D_E006A814) +/* 36D280 E006A260 3C02E007 */ lui $v0, %hi(func_E006A814) +/* 36D284 E006A264 2442A814 */ addiu $v0, $v0, %lo(func_E006A814) /* 36D288 E006A268 AFA20020 */ sw $v0, 0x20($sp) /* 36D28C E006A26C 24020035 */ addiu $v0, $zero, 0x35 /* 36D290 E006A270 AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_36D020/func_E006A814.s b/asm/nonmatchings/code_36D020/func_E006A814.s index a9a4907541..fdeae18249 100644 --- a/asm/nonmatchings/code_36D020/func_E006A814.s +++ b/asm/nonmatchings/code_36D020/func_E006A814.s @@ -3,8 +3,8 @@ glabel func_E006A814 /* 36D834 E006A814 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 36D838 E006A818 3C02E007 */ lui $v0, %hi(D_E006A94C) -/* 36D83C E006A81C 2442A94C */ addiu $v0, $v0, %lo(D_E006A94C) +/* 36D838 E006A818 3C02E007 */ lui $v0, %hi(func_E006A94C) +/* 36D83C E006A81C 2442A94C */ addiu $v0, $v0, %lo(func_E006A94C) /* 36D840 E006A820 AFA2001C */ sw $v0, 0x1c($sp) /* 36D844 E006A824 2402000A */ addiu $v0, $zero, 0xa /* 36D848 E006A828 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_36E1D0/func_E006C000.s b/asm/nonmatchings/code_36E1D0/func_E006C000.s index 583e33a283..6dbd4f155a 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C000.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C000.s @@ -12,14 +12,14 @@ glabel func_E006C000 /* 36E1EC E006C01C 27A40018 */ addiu $a0, $sp, 0x18 /* 36E1F0 E006C020 F7BA0060 */ sdc1 $f26, 0x60($sp) /* 36E1F4 E006C024 4487D000 */ mtc1 $a3, $f26 -/* 36E1F8 E006C028 3C02E007 */ lui $v0, %hi(D_E006C298) -/* 36E1FC E006C02C 2442C298 */ addiu $v0, $v0, %lo(D_E006C298) +/* 36E1F8 E006C028 3C02E007 */ lui $v0, %hi(func_E006C298) +/* 36E1FC E006C02C 2442C298 */ addiu $v0, $v0, %lo(func_E006C298) /* 36E200 E006C030 AFA20020 */ sw $v0, 0x20($sp) -/* 36E204 E006C034 3C02E007 */ lui $v0, %hi(D_E006C2A0) -/* 36E208 E006C038 2442C2A0 */ addiu $v0, $v0, %lo(D_E006C2A0) +/* 36E204 E006C034 3C02E007 */ lui $v0, %hi(func_E006C2A0) +/* 36E208 E006C038 2442C2A0 */ addiu $v0, $v0, %lo(func_E006C2A0) /* 36E20C E006C03C AFA20024 */ sw $v0, 0x24($sp) -/* 36E210 E006C040 3C02E007 */ lui $v0, %hi(D_E006C5A0) -/* 36E214 E006C044 2442C5A0 */ addiu $v0, $v0, %lo(D_E006C5A0) +/* 36E210 E006C040 3C02E007 */ lui $v0, %hi(func_E006C5A0) +/* 36E214 E006C044 2442C5A0 */ addiu $v0, $v0, %lo(func_E006C5A0) /* 36E218 E006C048 AFA20028 */ sw $v0, 0x28($sp) /* 36E21C E006C04C 24020036 */ addiu $v0, $zero, 0x36 /* 36E220 E006C050 AFBF0044 */ sw $ra, 0x44($sp) diff --git a/asm/nonmatchings/code_36E1D0/func_E006C5A0.s b/asm/nonmatchings/code_36E1D0/func_E006C5A0.s index 6e3fb6f306..690124c727 100644 --- a/asm/nonmatchings/code_36E1D0/func_E006C5A0.s +++ b/asm/nonmatchings/code_36E1D0/func_E006C5A0.s @@ -3,8 +3,8 @@ glabel func_E006C5A0 /* 36E770 E006C5A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 36E774 E006C5A4 3C02E007 */ lui $v0, %hi(D_E006C5E8) -/* 36E778 E006C5A8 2442C5E8 */ addiu $v0, $v0, %lo(D_E006C5E8) +/* 36E774 E006C5A4 3C02E007 */ lui $v0, %hi(func_E006C5E8) +/* 36E778 E006C5A8 2442C5E8 */ addiu $v0, $v0, %lo(func_E006C5E8) /* 36E77C E006C5AC AFA2001C */ sw $v0, 0x1c($sp) /* 36E780 E006C5B0 2402000A */ addiu $v0, $zero, 0xa /* 36E784 E006C5B4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_372790/func_E006E000.s b/asm/nonmatchings/code_372790/func_E006E000.s index 04818eb13d..eab0982a61 100644 --- a/asm/nonmatchings/code_372790/func_E006E000.s +++ b/asm/nonmatchings/code_372790/func_E006E000.s @@ -22,14 +22,14 @@ glabel func_E006E000 /* 3727D4 E006E044 27A40010 */ addiu $a0, $sp, 0x10 /* 3727D8 E006E048 AFB40038 */ sw $s4, 0x38($sp) /* 3727DC E006E04C 8FB40094 */ lw $s4, 0x94($sp) -/* 3727E0 E006E050 3C02E007 */ lui $v0, %hi(D_E006E354) -/* 3727E4 E006E054 2442E354 */ addiu $v0, $v0, %lo(D_E006E354) +/* 3727E0 E006E050 3C02E007 */ lui $v0, %hi(func_E006E354) +/* 3727E4 E006E054 2442E354 */ addiu $v0, $v0, %lo(func_E006E354) /* 3727E8 E006E058 AFA20018 */ sw $v0, 0x18($sp) -/* 3727EC E006E05C 3C02E007 */ lui $v0, %hi(D_E006E35C) -/* 3727F0 E006E060 2442E35C */ addiu $v0, $v0, %lo(D_E006E35C) +/* 3727EC E006E05C 3C02E007 */ lui $v0, %hi(func_E006E35C) +/* 3727F0 E006E060 2442E35C */ addiu $v0, $v0, %lo(func_E006E35C) /* 3727F4 E006E064 AFA2001C */ sw $v0, 0x1c($sp) -/* 3727F8 E006E068 3C02E007 */ lui $v0, %hi(D_E006E6E4) -/* 3727FC E006E06C 2442E6E4 */ addiu $v0, $v0, %lo(D_E006E6E4) +/* 3727F8 E006E068 3C02E007 */ lui $v0, %hi(func_E006E6E4) +/* 3727FC E006E06C 2442E6E4 */ addiu $v0, $v0, %lo(func_E006E6E4) /* 372800 E006E070 AFA20020 */ sw $v0, 0x20($sp) /* 372804 E006E074 24020037 */ addiu $v0, $zero, 0x37 /* 372808 E006E078 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_372790/func_E006E6E4.s b/asm/nonmatchings/code_372790/func_E006E6E4.s index 95c4c14bf1..eb1ca35604 100644 --- a/asm/nonmatchings/code_372790/func_E006E6E4.s +++ b/asm/nonmatchings/code_372790/func_E006E6E4.s @@ -5,8 +5,8 @@ glabel func_E006E6E4 /* 372E74 E006E6E4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 372E78 E006E6E8 AFBF0020 */ sw $ra, 0x20($sp) /* 372E7C E006E6EC 8C85000C */ lw $a1, 0xc($a0) -/* 372E80 E006E6F0 3C02E007 */ lui $v0, %hi(D_E006E764) -/* 372E84 E006E6F4 2442E764 */ addiu $v0, $v0, %lo(D_E006E764) +/* 372E80 E006E6F0 3C02E007 */ lui $v0, %hi(func_E006E764) +/* 372E84 E006E6F4 2442E764 */ addiu $v0, $v0, %lo(func_E006E764) /* 372E88 E006E6F8 AFA2001C */ sw $v0, 0x1c($sp) /* 372E8C E006E6FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 372E90 E006E700 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/asm/nonmatchings/code_3740B0/func_E0070000.s b/asm/nonmatchings/code_3740B0/func_E0070000.s index 2cc1672f80..96b4d96e6b 100644 --- a/asm/nonmatchings/code_3740B0/func_E0070000.s +++ b/asm/nonmatchings/code_3740B0/func_E0070000.s @@ -14,14 +14,14 @@ glabel func_E0070000 /* 3740D4 E0070024 27A40010 */ addiu $a0, $sp, 0x10 /* 3740D8 E0070028 AFB20030 */ sw $s2, 0x30($sp) /* 3740DC E007002C 8FB2006C */ lw $s2, 0x6c($sp) -/* 3740E0 E0070030 3C02E007 */ lui $v0, %hi(D_E00701EC) -/* 3740E4 E0070034 244201EC */ addiu $v0, $v0, %lo(D_E00701EC) +/* 3740E0 E0070030 3C02E007 */ lui $v0, %hi(func_E00701EC) +/* 3740E4 E0070034 244201EC */ addiu $v0, $v0, %lo(func_E00701EC) /* 3740E8 E0070038 AFA20018 */ sw $v0, 0x18($sp) -/* 3740EC E007003C 3C02E007 */ lui $v0, %hi(D_E00701F4) -/* 3740F0 E0070040 244201F4 */ addiu $v0, $v0, %lo(D_E00701F4) +/* 3740EC E007003C 3C02E007 */ lui $v0, %hi(func_E00701F4) +/* 3740F0 E0070040 244201F4 */ addiu $v0, $v0, %lo(func_E00701F4) /* 3740F4 E0070044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3740F8 E0070048 3C02E007 */ lui $v0, %hi(D_E00706F0) -/* 3740FC E007004C 244206F0 */ addiu $v0, $v0, %lo(D_E00706F0) +/* 3740F8 E0070048 3C02E007 */ lui $v0, %hi(func_E00706F0) +/* 3740FC E007004C 244206F0 */ addiu $v0, $v0, %lo(func_E00706F0) /* 374100 E0070050 AFA20020 */ sw $v0, 0x20($sp) /* 374104 E0070054 24020038 */ addiu $v0, $zero, 0x38 /* 374108 E0070058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3740B0/func_E00706F0.s b/asm/nonmatchings/code_3740B0/func_E00706F0.s index f4c4d10dae..c2ec62b1cb 100644 --- a/asm/nonmatchings/code_3740B0/func_E00706F0.s +++ b/asm/nonmatchings/code_3740B0/func_E00706F0.s @@ -3,8 +3,8 @@ glabel func_E00706F0 /* 3747A0 E00706F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3747A4 E00706F4 3C02E007 */ lui $v0, %hi(D_E0070740) -/* 3747A8 E00706F8 24420740 */ addiu $v0, $v0, %lo(D_E0070740) +/* 3747A4 E00706F4 3C02E007 */ lui $v0, %hi(func_E0070740) +/* 3747A8 E00706F8 24420740 */ addiu $v0, $v0, %lo(func_E0070740) /* 3747AC E00706FC AFA2001C */ sw $v0, 0x1c($sp) /* 3747B0 E0070700 2402000A */ addiu $v0, $zero, 0xa /* 3747B4 E0070704 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_374E50/func_E0072000.s b/asm/nonmatchings/code_374E50/func_E0072000.s index f41f3ec09f..ec8c0e451c 100644 --- a/asm/nonmatchings/code_374E50/func_E0072000.s +++ b/asm/nonmatchings/code_374E50/func_E0072000.s @@ -12,14 +12,14 @@ glabel func_E0072000 /* 374E6C E007201C 27A40010 */ addiu $a0, $sp, 0x10 /* 374E70 E0072020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 374E74 E0072024 4487C000 */ mtc1 $a3, $f24 -/* 374E78 E0072028 3C02E007 */ lui $v0, %hi(D_E0072148) -/* 374E7C E007202C 24422148 */ addiu $v0, $v0, %lo(D_E0072148) +/* 374E78 E0072028 3C02E007 */ lui $v0, %hi(func_E0072148) +/* 374E7C E007202C 24422148 */ addiu $v0, $v0, %lo(func_E0072148) /* 374E80 E0072030 AFA20018 */ sw $v0, 0x18($sp) -/* 374E84 E0072034 3C02E007 */ lui $v0, %hi(D_E0072150) -/* 374E88 E0072038 24422150 */ addiu $v0, $v0, %lo(D_E0072150) +/* 374E84 E0072034 3C02E007 */ lui $v0, %hi(func_E0072150) +/* 374E88 E0072038 24422150 */ addiu $v0, $v0, %lo(func_E0072150) /* 374E8C E007203C AFA2001C */ sw $v0, 0x1c($sp) -/* 374E90 E0072040 3C02E007 */ lui $v0, %hi(D_E007238C) -/* 374E94 E0072044 2442238C */ addiu $v0, $v0, %lo(D_E007238C) +/* 374E90 E0072040 3C02E007 */ lui $v0, %hi(func_E007238C) +/* 374E94 E0072044 2442238C */ addiu $v0, $v0, %lo(func_E007238C) /* 374E98 E0072048 AFA20020 */ sw $v0, 0x20($sp) /* 374E9C E007204C 24020039 */ addiu $v0, $zero, 0x39 /* 374EA0 E0072050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_374E50/func_E007238C.s b/asm/nonmatchings/code_374E50/func_E007238C.s index 00a29de0af..859d62a299 100644 --- a/asm/nonmatchings/code_374E50/func_E007238C.s +++ b/asm/nonmatchings/code_374E50/func_E007238C.s @@ -3,8 +3,8 @@ glabel func_E007238C /* 3751DC E007238C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3751E0 E0072390 3C02E007 */ lui $v0, %hi(D_E00723D4) -/* 3751E4 E0072394 244223D4 */ addiu $v0, $v0, %lo(D_E00723D4) +/* 3751E0 E0072390 3C02E007 */ lui $v0, %hi(func_E00723D4) +/* 3751E4 E0072394 244223D4 */ addiu $v0, $v0, %lo(func_E00723D4) /* 3751E8 E0072398 AFA2001C */ sw $v0, 0x1c($sp) /* 3751EC E007239C 2402000A */ addiu $v0, $zero, 0xa /* 3751F0 E00723A0 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_376460/func_E0074000.s b/asm/nonmatchings/code_376460/func_E0074000.s index 26bc427440..2b8f8775a5 100644 --- a/asm/nonmatchings/code_376460/func_E0074000.s +++ b/asm/nonmatchings/code_376460/func_E0074000.s @@ -16,14 +16,14 @@ glabel func_E0074000 /* 37648C E007402C 27A40010 */ addiu $a0, $sp, 0x10 /* 376490 E0074030 AFB20030 */ sw $s2, 0x30($sp) /* 376494 E0074034 8FB20074 */ lw $s2, 0x74($sp) -/* 376498 E0074038 3C02E007 */ lui $v0, %hi(D_E00741E0) -/* 37649C E007403C 244241E0 */ addiu $v0, $v0, %lo(D_E00741E0) +/* 376498 E0074038 3C02E007 */ lui $v0, %hi(func_E00741E0) +/* 37649C E007403C 244241E0 */ addiu $v0, $v0, %lo(func_E00741E0) /* 3764A0 E0074040 AFA20018 */ sw $v0, 0x18($sp) -/* 3764A4 E0074044 3C02E007 */ lui $v0, %hi(D_E00741E8) -/* 3764A8 E0074048 244241E8 */ addiu $v0, $v0, %lo(D_E00741E8) +/* 3764A4 E0074044 3C02E007 */ lui $v0, %hi(func_E00741E8) +/* 3764A8 E0074048 244241E8 */ addiu $v0, $v0, %lo(func_E00741E8) /* 3764AC E007404C AFA2001C */ sw $v0, 0x1c($sp) -/* 3764B0 E0074050 3C02E007 */ lui $v0, %hi(D_E0074598) -/* 3764B4 E0074054 24424598 */ addiu $v0, $v0, %lo(D_E0074598) +/* 3764B0 E0074050 3C02E007 */ lui $v0, %hi(func_E0074598) +/* 3764B4 E0074054 24424598 */ addiu $v0, $v0, %lo(func_E0074598) /* 3764B8 E0074058 AFA20020 */ sw $v0, 0x20($sp) /* 3764BC E007405C 2402003A */ addiu $v0, $zero, 0x3a /* 3764C0 E0074060 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_376460/func_E0074598.s b/asm/nonmatchings/code_376460/func_E0074598.s index e00bef6d12..582bad4740 100644 --- a/asm/nonmatchings/code_376460/func_E0074598.s +++ b/asm/nonmatchings/code_376460/func_E0074598.s @@ -3,8 +3,8 @@ glabel func_E0074598 /* 3769F8 E0074598 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3769FC E007459C 3C02E007 */ lui $v0, %hi(D_E00745E0) -/* 376A00 E00745A0 244245E0 */ addiu $v0, $v0, %lo(D_E00745E0) +/* 3769FC E007459C 3C02E007 */ lui $v0, %hi(func_E00745E0) +/* 376A00 E00745A0 244245E0 */ addiu $v0, $v0, %lo(func_E00745E0) /* 376A04 E00745A4 AFA2001C */ sw $v0, 0x1c($sp) /* 376A08 E00745A8 2402000A */ addiu $v0, $zero, 0xa /* 376A0C E00745AC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_377070/func_E0076000.s b/asm/nonmatchings/code_377070/func_E0076000.s index d925082df4..148a0b1282 100644 --- a/asm/nonmatchings/code_377070/func_E0076000.s +++ b/asm/nonmatchings/code_377070/func_E0076000.s @@ -14,14 +14,14 @@ glabel func_E0076000 /* 377094 E0076024 27A40010 */ addiu $a0, $sp, 0x10 /* 377098 E0076028 F7B40038 */ sdc1 $f20, 0x38($sp) /* 37709C E007602C C7B40068 */ lwc1 $f20, 0x68($sp) -/* 3770A0 E0076030 3C02E007 */ lui $v0, %hi(D_E0076370) -/* 3770A4 E0076034 24426370 */ addiu $v0, $v0, %lo(D_E0076370) +/* 3770A0 E0076030 3C02E007 */ lui $v0, %hi(func_E0076370) +/* 3770A4 E0076034 24426370 */ addiu $v0, $v0, %lo(func_E0076370) /* 3770A8 E0076038 AFA20018 */ sw $v0, 0x18($sp) -/* 3770AC E007603C 3C02E007 */ lui $v0, %hi(D_E0076378) -/* 3770B0 E0076040 24426378 */ addiu $v0, $v0, %lo(D_E0076378) +/* 3770AC E007603C 3C02E007 */ lui $v0, %hi(func_E0076378) +/* 3770B0 E0076040 24426378 */ addiu $v0, $v0, %lo(func_E0076378) /* 3770B4 E0076044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3770B8 E0076048 3C02E007 */ lui $v0, %hi(D_E0076808) -/* 3770BC E007604C 24426808 */ addiu $v0, $v0, %lo(D_E0076808) +/* 3770B8 E0076048 3C02E007 */ lui $v0, %hi(func_E0076808) +/* 3770BC E007604C 24426808 */ addiu $v0, $v0, %lo(func_E0076808) /* 3770C0 E0076050 AFA20020 */ sw $v0, 0x20($sp) /* 3770C4 E0076054 2402003B */ addiu $v0, $zero, 0x3b /* 3770C8 E0076058 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_377070/func_E0076808.s b/asm/nonmatchings/code_377070/func_E0076808.s index fbbd6e6560..175e09902a 100644 --- a/asm/nonmatchings/code_377070/func_E0076808.s +++ b/asm/nonmatchings/code_377070/func_E0076808.s @@ -3,8 +3,8 @@ glabel func_E0076808 /* 377878 E0076808 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 37787C E007680C 3C02E007 */ lui $v0, %hi(D_E007685C) -/* 377880 E0076810 2442685C */ addiu $v0, $v0, %lo(D_E007685C) +/* 37787C E007680C 3C02E007 */ lui $v0, %hi(func_E007685C) +/* 377880 E0076810 2442685C */ addiu $v0, $v0, %lo(func_E007685C) /* 377884 E0076814 AFA2001C */ sw $v0, 0x1c($sp) /* 377888 E0076818 2402002D */ addiu $v0, $zero, 0x2d /* 37788C E007681C AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_37A3F0/func_E0078000.s b/asm/nonmatchings/code_37A3F0/func_E0078000.s index 3328af8c22..943eb11429 100644 --- a/asm/nonmatchings/code_37A3F0/func_E0078000.s +++ b/asm/nonmatchings/code_37A3F0/func_E0078000.s @@ -12,14 +12,14 @@ glabel func_E0078000 /* 37A40C E007801C 27A40010 */ addiu $a0, $sp, 0x10 /* 37A410 E0078020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 37A414 E0078024 4487C000 */ mtc1 $a3, $f24 -/* 37A418 E0078028 3C02E008 */ lui $v0, %hi(D_E0078124) -/* 37A41C E007802C 24428124 */ addiu $v0, $v0, %lo(D_E0078124) +/* 37A418 E0078028 3C02E008 */ lui $v0, %hi(func_E0078124) +/* 37A41C E007802C 24428124 */ addiu $v0, $v0, %lo(func_E0078124) /* 37A420 E0078030 AFA20018 */ sw $v0, 0x18($sp) -/* 37A424 E0078034 3C02E008 */ lui $v0, %hi(D_E007812C) -/* 37A428 E0078038 2442812C */ addiu $v0, $v0, %lo(D_E007812C) +/* 37A424 E0078034 3C02E008 */ lui $v0, %hi(func_E007812C) +/* 37A428 E0078038 2442812C */ addiu $v0, $v0, %lo(func_E007812C) /* 37A42C E007803C AFA2001C */ sw $v0, 0x1c($sp) -/* 37A430 E0078040 3C02E008 */ lui $v0, %hi(D_E0078210) -/* 37A434 E0078044 24428210 */ addiu $v0, $v0, %lo(D_E0078210) +/* 37A430 E0078040 3C02E008 */ lui $v0, %hi(func_E0078210) +/* 37A434 E0078044 24428210 */ addiu $v0, $v0, %lo(func_E0078210) /* 37A438 E0078048 AFA20020 */ sw $v0, 0x20($sp) /* 37A43C E007804C 2402003C */ addiu $v0, $zero, 0x3c /* 37A440 E0078050 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_37A3F0/func_E0078210.s b/asm/nonmatchings/code_37A3F0/func_E0078210.s index f9c84939b8..b6fb6d0a52 100644 --- a/asm/nonmatchings/code_37A3F0/func_E0078210.s +++ b/asm/nonmatchings/code_37A3F0/func_E0078210.s @@ -5,8 +5,8 @@ glabel func_E0078210 /* 37A600 E0078210 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 37A604 E0078214 AFBF0020 */ sw $ra, 0x20($sp) /* 37A608 E0078218 8C83000C */ lw $v1, 0xc($a0) -/* 37A60C E007821C 3C02E008 */ lui $v0, %hi(D_E007827C) -/* 37A610 E0078220 2442827C */ addiu $v0, $v0, %lo(D_E007827C) +/* 37A60C E007821C 3C02E008 */ lui $v0, %hi(func_E007827C) +/* 37A610 E0078220 2442827C */ addiu $v0, $v0, %lo(func_E007827C) /* 37A614 E0078224 AFA40018 */ sw $a0, 0x18($sp) /* 37A618 E0078228 AFA2001C */ sw $v0, 0x1c($sp) /* 37A61C E007822C 8C630000 */ lw $v1, ($v1) diff --git a/asm/nonmatchings/code_37C540/func_E007A000.s b/asm/nonmatchings/code_37C540/func_E007A000.s index 567f19d0c4..8ecd812fca 100644 --- a/asm/nonmatchings/code_37C540/func_E007A000.s +++ b/asm/nonmatchings/code_37C540/func_E007A000.s @@ -119,16 +119,16 @@ glabel func_E007A000 /* 37C6FC E007A1BC 4600F782 */ mul.s $f30, $f30, $f0 /* 37C700 E007A1C0 00000000 */ nop /* 37C704 E007A1C4 0200202D */ daddu $a0, $s0, $zero -/* 37C708 E007A1C8 3C02E008 */ lui $v0, %hi(D_E007A504) -/* 37C70C E007A1CC 2442A504 */ addiu $v0, $v0, %lo(D_E007A504) +/* 37C708 E007A1C8 3C02E008 */ lui $v0, %hi(func_E007A504) +/* 37C70C E007A1CC 2442A504 */ addiu $v0, $v0, %lo(func_E007A504) /* 37C710 E007A1D0 AC820008 */ sw $v0, 8($a0) /* 37C714 E007A1D4 46008402 */ mul.s $f16, $f16, $f0 /* 37C718 E007A1D8 00000000 */ nop -/* 37C71C E007A1DC 3C02E008 */ lui $v0, %hi(D_E007A50C) -/* 37C720 E007A1E0 2442A50C */ addiu $v0, $v0, %lo(D_E007A50C) +/* 37C71C E007A1DC 3C02E008 */ lui $v0, %hi(func_E007A50C) +/* 37C720 E007A1E0 2442A50C */ addiu $v0, $v0, %lo(func_E007A50C) /* 37C724 E007A1E4 AC82000C */ sw $v0, 0xc($a0) -/* 37C728 E007A1E8 3C02E008 */ lui $v0, %hi(D_E007A840) -/* 37C72C E007A1EC 2442A840 */ addiu $v0, $v0, %lo(D_E007A840) +/* 37C728 E007A1E8 3C02E008 */ lui $v0, %hi(func_E007A840) +/* 37C72C E007A1EC 2442A840 */ addiu $v0, $v0, %lo(func_E007A840) /* 37C730 E007A1F0 AC800000 */ sw $zero, ($a0) /* 37C734 E007A1F4 4600E702 */ mul.s $f28, $f28, $f0 /* 37C738 E007A1F8 00000000 */ nop diff --git a/asm/nonmatchings/code_37C540/func_E007A840.s b/asm/nonmatchings/code_37C540/func_E007A840.s index 52dba67b5d..55f340dd6a 100644 --- a/asm/nonmatchings/code_37C540/func_E007A840.s +++ b/asm/nonmatchings/code_37C540/func_E007A840.s @@ -3,8 +3,8 @@ glabel func_E007A840 /* 37CD80 E007A840 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 37CD84 E007A844 3C02E008 */ lui $v0, %hi(D_E007A88C) -/* 37CD88 E007A848 2442A88C */ addiu $v0, $v0, %lo(D_E007A88C) +/* 37CD84 E007A844 3C02E008 */ lui $v0, %hi(func_E007A88C) +/* 37CD88 E007A848 2442A88C */ addiu $v0, $v0, %lo(func_E007A88C) /* 37CD8C E007A84C AFA2001C */ sw $v0, 0x1c($sp) /* 37CD90 E007A850 2402002D */ addiu $v0, $zero, 0x2d /* 37CD94 E007A854 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_37D490/func_E007C000.s b/asm/nonmatchings/code_37D490/func_E007C000.s index b97410c445..89bca70f30 100644 --- a/asm/nonmatchings/code_37D490/func_E007C000.s +++ b/asm/nonmatchings/code_37D490/func_E007C000.s @@ -14,14 +14,14 @@ glabel func_E007C000 /* 37D4B4 E007C024 27A40010 */ addiu $a0, $sp, 0x10 /* 37D4B8 E007C028 AFB20030 */ sw $s2, 0x30($sp) /* 37D4BC E007C02C 8FB2006C */ lw $s2, 0x6c($sp) -/* 37D4C0 E007C030 3C02E008 */ lui $v0, %hi(D_E007C128) -/* 37D4C4 E007C034 2442C128 */ addiu $v0, $v0, %lo(D_E007C128) +/* 37D4C0 E007C030 3C02E008 */ lui $v0, %hi(func_E007C128) +/* 37D4C4 E007C034 2442C128 */ addiu $v0, $v0, %lo(func_E007C128) /* 37D4C8 E007C038 AFA20018 */ sw $v0, 0x18($sp) -/* 37D4CC E007C03C 3C02E008 */ lui $v0, %hi(D_E007C130) -/* 37D4D0 E007C040 2442C130 */ addiu $v0, $v0, %lo(D_E007C130) +/* 37D4CC E007C03C 3C02E008 */ lui $v0, %hi(func_E007C130) +/* 37D4D0 E007C040 2442C130 */ addiu $v0, $v0, %lo(func_E007C130) /* 37D4D4 E007C044 AFA2001C */ sw $v0, 0x1c($sp) -/* 37D4D8 E007C048 3C02E008 */ lui $v0, %hi(D_E007C1B0) -/* 37D4DC E007C04C 2442C1B0 */ addiu $v0, $v0, %lo(D_E007C1B0) +/* 37D4D8 E007C048 3C02E008 */ lui $v0, %hi(func_E007C1B0) +/* 37D4DC E007C04C 2442C1B0 */ addiu $v0, $v0, %lo(func_E007C1B0) /* 37D4E0 E007C050 AFA20020 */ sw $v0, 0x20($sp) /* 37D4E4 E007C054 2402003E */ addiu $v0, $zero, 0x3e /* 37D4E8 E007C058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_37D490/func_E007C1B0.s b/asm/nonmatchings/code_37D490/func_E007C1B0.s index 3e7abd5805..799239b647 100644 --- a/asm/nonmatchings/code_37D490/func_E007C1B0.s +++ b/asm/nonmatchings/code_37D490/func_E007C1B0.s @@ -3,8 +3,8 @@ glabel func_E007C1B0 /* 37D640 E007C1B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 37D644 E007C1B4 3C02E008 */ lui $v0, %hi(D_E007C1F4) -/* 37D648 E007C1B8 2442C1F4 */ addiu $v0, $v0, %lo(D_E007C1F4) +/* 37D644 E007C1B4 3C02E008 */ lui $v0, %hi(func_E007C1F4) +/* 37D648 E007C1B8 2442C1F4 */ addiu $v0, $v0, %lo(func_E007C1F4) /* 37D64C E007C1BC AFA2001C */ sw $v0, 0x1c($sp) /* 37D650 E007C1C0 24020028 */ addiu $v0, $zero, 0x28 /* 37D654 E007C1C4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_37F720/func_E007E000.s b/asm/nonmatchings/code_37F720/func_E007E000.s index c6b9428963..86390c2094 100644 --- a/asm/nonmatchings/code_37F720/func_E007E000.s +++ b/asm/nonmatchings/code_37F720/func_E007E000.s @@ -12,14 +12,14 @@ glabel func_E007E000 /* 37F73C E007E01C 27A40010 */ addiu $a0, $sp, 0x10 /* 37F740 E007E020 F7B80060 */ sdc1 $f24, 0x60($sp) /* 37F744 E007E024 4487C000 */ mtc1 $a3, $f24 -/* 37F748 E007E028 3C02E008 */ lui $v0, %hi(D_E007E1FC) -/* 37F74C E007E02C 2442E1FC */ addiu $v0, $v0, %lo(D_E007E1FC) +/* 37F748 E007E028 3C02E008 */ lui $v0, %hi(func_E007E1FC) +/* 37F74C E007E02C 2442E1FC */ addiu $v0, $v0, %lo(func_E007E1FC) /* 37F750 E007E030 AFA20018 */ sw $v0, 0x18($sp) -/* 37F754 E007E034 3C02E008 */ lui $v0, %hi(D_E007E204) -/* 37F758 E007E038 2442E204 */ addiu $v0, $v0, %lo(D_E007E204) +/* 37F754 E007E034 3C02E008 */ lui $v0, %hi(func_E007E204) +/* 37F758 E007E038 2442E204 */ addiu $v0, $v0, %lo(func_E007E204) /* 37F75C E007E03C AFA2001C */ sw $v0, 0x1c($sp) -/* 37F760 E007E040 3C02E008 */ lui $v0, %hi(D_E007E508) -/* 37F764 E007E044 2442E508 */ addiu $v0, $v0, %lo(D_E007E508) +/* 37F760 E007E040 3C02E008 */ lui $v0, %hi(func_E007E508) +/* 37F764 E007E044 2442E508 */ addiu $v0, $v0, %lo(func_E007E508) /* 37F768 E007E048 AFA20020 */ sw $v0, 0x20($sp) /* 37F76C E007E04C 2402003F */ addiu $v0, $zero, 0x3f /* 37F770 E007E050 AFBF0048 */ sw $ra, 0x48($sp) diff --git a/asm/nonmatchings/code_37F720/func_E007E508.s b/asm/nonmatchings/code_37F720/func_E007E508.s index 713d47b196..ea93085c92 100644 --- a/asm/nonmatchings/code_37F720/func_E007E508.s +++ b/asm/nonmatchings/code_37F720/func_E007E508.s @@ -3,8 +3,8 @@ glabel func_E007E508 /* 37FC28 E007E508 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 37FC2C E007E50C 3C02E008 */ lui $v0, %hi(D_E007E54C) -/* 37FC30 E007E510 2442E54C */ addiu $v0, $v0, %lo(D_E007E54C) +/* 37FC2C E007E50C 3C02E008 */ lui $v0, %hi(func_E007E54C) +/* 37FC30 E007E510 2442E54C */ addiu $v0, $v0, %lo(func_E007E54C) /* 37FC34 E007E514 AFA2001C */ sw $v0, 0x1c($sp) /* 37FC38 E007E518 2402002D */ addiu $v0, $zero, 0x2d /* 37FC3C E007E51C AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3812C0/func_E0080000.s b/asm/nonmatchings/code_3812C0/func_E0080000.s index fa1b99b83b..0f66c6a26a 100644 --- a/asm/nonmatchings/code_3812C0/func_E0080000.s +++ b/asm/nonmatchings/code_3812C0/func_E0080000.s @@ -14,17 +14,17 @@ glabel func_E0080000 /* 3812E4 E0080024 27A40010 */ addiu $a0, $sp, 0x10 /* 3812E8 E0080028 AFB00028 */ sw $s0, 0x28($sp) /* 3812EC E008002C 8FB00068 */ lw $s0, 0x68($sp) -/* 3812F0 E0080030 3C02E008 */ lui $v0, %hi(D_E00801C8) -/* 3812F4 E0080034 244201C8 */ addiu $v0, $v0, %lo(D_E00801C8) +/* 3812F0 E0080030 3C02E008 */ lui $v0, %hi(func_E00801C8) +/* 3812F4 E0080034 244201C8 */ addiu $v0, $v0, %lo(func_E00801C8) /* 3812F8 E0080038 AFA20018 */ sw $v0, 0x18($sp) -/* 3812FC E008003C 3C02E008 */ lui $v0, %hi(D_E00801D0) -/* 381300 E0080040 244201D0 */ addiu $v0, $v0, %lo(D_E00801D0) +/* 3812FC E008003C 3C02E008 */ lui $v0, %hi(func_E00801D0) +/* 381300 E0080040 244201D0 */ addiu $v0, $v0, %lo(func_E00801D0) /* 381304 E0080044 AFA2001C */ sw $v0, 0x1c($sp) -/* 381308 E0080048 3C02E008 */ lui $v0, %hi(D_E0080424) -/* 38130C E008004C 24420424 */ addiu $v0, $v0, %lo(D_E0080424) +/* 381308 E0080048 3C02E008 */ lui $v0, %hi(func_E0080424) +/* 38130C E008004C 24420424 */ addiu $v0, $v0, %lo(func_E0080424) /* 381310 E0080050 AFA20020 */ sw $v0, 0x20($sp) -/* 381314 E0080054 3C02E008 */ lui $v0, %hi(D_E008042C) -/* 381318 E0080058 2442042C */ addiu $v0, $v0, %lo(D_E008042C) +/* 381314 E0080054 3C02E008 */ lui $v0, %hi(func_E008042C) +/* 381318 E0080058 2442042C */ addiu $v0, $v0, %lo(func_E008042C) /* 38131C E008005C AFA20024 */ sw $v0, 0x24($sp) /* 381320 E0080060 24020040 */ addiu $v0, $zero, 0x40 /* 381324 E0080064 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_385640/func_E0082000.s b/asm/nonmatchings/code_385640/func_E0082000.s index 9e575aa929..222ed0a2f2 100644 --- a/asm/nonmatchings/code_385640/func_E0082000.s +++ b/asm/nonmatchings/code_385640/func_E0082000.s @@ -12,17 +12,17 @@ glabel func_E0082000 /* 38565C E008201C 27A40010 */ addiu $a0, $sp, 0x10 /* 385660 E0082020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 385664 E0082024 4487C000 */ mtc1 $a3, $f24 -/* 385668 E0082028 3C02E008 */ lui $v0, %hi(D_E00821B0) -/* 38566C E008202C 244221B0 */ addiu $v0, $v0, %lo(D_E00821B0) +/* 385668 E0082028 3C02E008 */ lui $v0, %hi(func_E00821B0) +/* 38566C E008202C 244221B0 */ addiu $v0, $v0, %lo(func_E00821B0) /* 385670 E0082030 AFA20018 */ sw $v0, 0x18($sp) -/* 385674 E0082034 3C02E008 */ lui $v0, %hi(D_E00821B8) -/* 385678 E0082038 244221B8 */ addiu $v0, $v0, %lo(D_E00821B8) +/* 385674 E0082034 3C02E008 */ lui $v0, %hi(func_E00821B8) +/* 385678 E0082038 244221B8 */ addiu $v0, $v0, %lo(func_E00821B8) /* 38567C E008203C AFA2001C */ sw $v0, 0x1c($sp) -/* 385680 E0082040 3C02E008 */ lui $v0, %hi(D_E0082520) -/* 385684 E0082044 24422520 */ addiu $v0, $v0, %lo(D_E0082520) +/* 385680 E0082040 3C02E008 */ lui $v0, %hi(func_E0082520) +/* 385684 E0082044 24422520 */ addiu $v0, $v0, %lo(func_E0082520) /* 385688 E0082048 AFA20020 */ sw $v0, 0x20($sp) -/* 38568C E008204C 3C02E008 */ lui $v0, %hi(D_E0082528) -/* 385690 E0082050 24422528 */ addiu $v0, $v0, %lo(D_E0082528) +/* 38568C E008204C 3C02E008 */ lui $v0, %hi(func_E0082528) +/* 385690 E0082050 24422528 */ addiu $v0, $v0, %lo(func_E0082528) /* 385694 E0082054 AFA20024 */ sw $v0, 0x24($sp) /* 385698 E0082058 24020041 */ addiu $v0, $zero, 0x41 /* 38569C E008205C AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3889D0/func_E0084084.s b/asm/nonmatchings/code_3889D0/func_E0084084.s index 16e92f5b6c..0c86476d10 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084084.s +++ b/asm/nonmatchings/code_3889D0/func_E0084084.s @@ -91,15 +91,15 @@ glabel func_E0084084 /* 388BA4 E00841D4 46201082 */ mul.d $f2, $f2, $f0 /* 388BA8 E00841D8 00000000 */ nop /* 388BAC E00841DC 0200202D */ daddu $a0, $s0, $zero -/* 388BB0 E00841E0 3C02E008 */ lui $v0, %hi(D_E0084658) -/* 388BB4 E00841E4 24424658 */ addiu $v0, $v0, %lo(D_E0084658) +/* 388BB0 E00841E0 3C02E008 */ lui $v0, %hi(func_E0084658) +/* 388BB4 E00841E4 24424658 */ addiu $v0, $v0, %lo(func_E0084658) /* 388BB8 E00841E8 AFA20028 */ sw $v0, 0x28($sp) /* 388BBC E00841EC 02530018 */ mult $s2, $s3 -/* 388BC0 E00841F0 3C02E008 */ lui $v0, %hi(D_E0084660) -/* 388BC4 E00841F4 24424660 */ addiu $v0, $v0, %lo(D_E0084660) +/* 388BC0 E00841F0 3C02E008 */ lui $v0, %hi(func_E0084660) +/* 388BC4 E00841F4 24424660 */ addiu $v0, $v0, %lo(func_E0084660) /* 388BC8 E00841F8 AFA2002C */ sw $v0, 0x2c($sp) -/* 388BCC E00841FC 3C02E008 */ lui $v0, %hi(D_E00848E4) -/* 388BD0 E0084200 244248E4 */ addiu $v0, $v0, %lo(D_E00848E4) +/* 388BCC E00841FC 3C02E008 */ lui $v0, %hi(func_E00848E4) +/* 388BD0 E0084200 244248E4 */ addiu $v0, $v0, %lo(func_E00848E4) /* 388BD4 E0084204 AFA20030 */ sw $v0, 0x30($sp) /* 388BD8 E0084208 00004012 */ mflo $t0 /* 388BDC E008420C 24020042 */ addiu $v0, $zero, 0x42 diff --git a/asm/nonmatchings/code_3889D0/func_E00848E4.s b/asm/nonmatchings/code_3889D0/func_E00848E4.s index a34a8be729..11b5cc5400 100644 --- a/asm/nonmatchings/code_3889D0/func_E00848E4.s +++ b/asm/nonmatchings/code_3889D0/func_E00848E4.s @@ -3,8 +3,8 @@ glabel func_E00848E4 /* 3892B4 E00848E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3892B8 E00848E8 3C02E008 */ lui $v0, %hi(D_E0084928) -/* 3892BC E00848EC 24424928 */ addiu $v0, $v0, %lo(D_E0084928) +/* 3892B8 E00848E8 3C02E008 */ lui $v0, %hi(func_E0084928) +/* 3892BC E00848EC 24424928 */ addiu $v0, $v0, %lo(func_E0084928) /* 3892C0 E00848F0 AFA2001C */ sw $v0, 0x1c($sp) /* 3892C4 E00848F4 24020028 */ addiu $v0, $zero, 0x28 /* 3892C8 E00848F8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_389850/func_E0086000.s b/asm/nonmatchings/code_389850/func_E0086000.s index dbd55b2d3c..13fe2640d3 100644 --- a/asm/nonmatchings/code_389850/func_E0086000.s +++ b/asm/nonmatchings/code_389850/func_E0086000.s @@ -15,14 +15,14 @@ glabel func_E0086000 /* 389878 E0086028 F7B80060 */ sdc1 $f24, 0x60($sp) /* 38987C E008602C 4487C000 */ mtc1 $a3, $f24 /* 389880 E0086030 8FA3007C */ lw $v1, 0x7c($sp) -/* 389884 E0086034 3C02E008 */ lui $v0, %hi(D_E0086270) -/* 389888 E0086038 24426270 */ addiu $v0, $v0, %lo(D_E0086270) +/* 389884 E0086034 3C02E008 */ lui $v0, %hi(func_E0086270) +/* 389888 E0086038 24426270 */ addiu $v0, $v0, %lo(func_E0086270) /* 38988C E008603C AFA20018 */ sw $v0, 0x18($sp) -/* 389890 E0086040 3C02E008 */ lui $v0, %hi(D_E0086278) -/* 389894 E0086044 24426278 */ addiu $v0, $v0, %lo(D_E0086278) +/* 389890 E0086040 3C02E008 */ lui $v0, %hi(func_E0086278) +/* 389894 E0086044 24426278 */ addiu $v0, $v0, %lo(func_E0086278) /* 389898 E0086048 AFA2001C */ sw $v0, 0x1c($sp) -/* 38989C E008604C 3C02E008 */ lui $v0, %hi(D_E0086390) -/* 3898A0 E0086050 24426390 */ addiu $v0, $v0, %lo(D_E0086390) +/* 38989C E008604C 3C02E008 */ lui $v0, %hi(func_E0086390) +/* 3898A0 E0086050 24426390 */ addiu $v0, $v0, %lo(func_E0086390) /* 3898A4 E0086054 AFBF0048 */ sw $ra, 0x48($sp) /* 3898A8 E0086058 AFB70044 */ sw $s7, 0x44($sp) /* 3898AC E008605C AFB60040 */ sw $s6, 0x40($sp) @@ -36,8 +36,8 @@ glabel func_E0086000 /* 3898CC E008607C 00031080 */ sll $v0, $v1, 2 /* 3898D0 E0086080 00431021 */ addu $v0, $v0, $v1 /* 3898D4 E0086084 24420014 */ addiu $v0, $v0, 0x14 -/* 3898D8 E0086088 3C03E008 */ lui $v1, %hi(D_E0086398) -/* 3898DC E008608C 24636398 */ addiu $v1, $v1, %lo(D_E0086398) +/* 3898D8 E0086088 3C03E008 */ lui $v1, %hi(func_E0086398) +/* 3898DC E008608C 24636398 */ addiu $v1, $v1, %lo(func_E0086398) /* 3898E0 E0086090 00450018 */ mult $v0, $a1 /* 3898E4 E0086094 AFA30024 */ sw $v1, 0x24($sp) /* 3898E8 E0086098 24030043 */ addiu $v1, $zero, 0x43 diff --git a/asm/nonmatchings/code_38ADF0/func_E008817C.s b/asm/nonmatchings/code_38ADF0/func_E008817C.s index e67948dc13..931537ea2e 100644 --- a/asm/nonmatchings/code_38ADF0/func_E008817C.s +++ b/asm/nonmatchings/code_38ADF0/func_E008817C.s @@ -63,14 +63,14 @@ glabel func_E008817C /* 38B048 E0088258 00000000 */ nop /* 38B04C E008825C E7B00028 */ swc1 $f16, 0x28($sp) .LE0088260: -/* 38B050 E0088260 3C02E009 */ lui $v0, %hi(D_E00885A0) -/* 38B054 E0088264 244285A0 */ addiu $v0, $v0, %lo(D_E00885A0) +/* 38B050 E0088260 3C02E009 */ lui $v0, %hi(func_E00885A0) +/* 38B054 E0088264 244285A0 */ addiu $v0, $v0, %lo(func_E00885A0) /* 38B058 E0088268 AC820008 */ sw $v0, 8($a0) -/* 38B05C E008826C 3C02E009 */ lui $v0, %hi(D_E00885A8) -/* 38B060 E0088270 244285A8 */ addiu $v0, $v0, %lo(D_E00885A8) +/* 38B05C E008826C 3C02E009 */ lui $v0, %hi(func_E00885A8) +/* 38B060 E0088270 244285A8 */ addiu $v0, $v0, %lo(func_E00885A8) /* 38B064 E0088274 AC82000C */ sw $v0, 0xc($a0) -/* 38B068 E0088278 3C02E009 */ lui $v0, %hi(D_E00887A8) -/* 38B06C E008827C 244287A8 */ addiu $v0, $v0, %lo(D_E00887A8) +/* 38B068 E0088278 3C02E009 */ lui $v0, %hi(func_E00887A8) +/* 38B06C E008827C 244287A8 */ addiu $v0, $v0, %lo(func_E00887A8) /* 38B070 E0088280 AC820010 */ sw $v0, 0x10($a0) /* 38B074 E0088284 24020044 */ addiu $v0, $zero, 0x44 /* 38B078 E0088288 AC800000 */ sw $zero, ($a0) diff --git a/asm/nonmatchings/code_38ADF0/func_E00887A8.s b/asm/nonmatchings/code_38ADF0/func_E00887A8.s index 555a624ad5..48b129dfc6 100644 --- a/asm/nonmatchings/code_38ADF0/func_E00887A8.s +++ b/asm/nonmatchings/code_38ADF0/func_E00887A8.s @@ -3,8 +3,8 @@ glabel func_E00887A8 /* 38B598 E00887A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 38B59C E00887AC 3C02E009 */ lui $v0, %hi(D_E00887E0) -/* 38B5A0 E00887B0 244287E0 */ addiu $v0, $v0, %lo(D_E00887E0) +/* 38B59C E00887AC 3C02E009 */ lui $v0, %hi(func_E00887E0) +/* 38B5A0 E00887B0 244287E0 */ addiu $v0, $v0, %lo(func_E00887E0) /* 38B5A4 E00887B4 AFA2001C */ sw $v0, 0x1c($sp) /* 38B5A8 E00887B8 2402002D */ addiu $v0, $zero, 0x2d /* 38B5AC E00887BC AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_38DE00/func_E008C000.s b/asm/nonmatchings/code_38DE00/func_E008C000.s index e16eb67801..39189993f1 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C000.s +++ b/asm/nonmatchings/code_38DE00/func_E008C000.s @@ -9,14 +9,14 @@ glabel func_E008C000 /* 38DE10 E008C010 27A40010 */ addiu $a0, $sp, 0x10 /* 38DE14 E008C014 F7B40060 */ sdc1 $f20, 0x60($sp) /* 38DE18 E008C018 4486A000 */ mtc1 $a2, $f20 -/* 38DE1C E008C01C 3C02E009 */ lui $v0, %hi(D_E008C3F4) -/* 38DE20 E008C020 2442C3F4 */ addiu $v0, $v0, %lo(D_E008C3F4) +/* 38DE1C E008C01C 3C02E009 */ lui $v0, %hi(func_E008C3F4) +/* 38DE20 E008C020 2442C3F4 */ addiu $v0, $v0, %lo(func_E008C3F4) /* 38DE24 E008C024 AFA20018 */ sw $v0, 0x18($sp) -/* 38DE28 E008C028 3C02E009 */ lui $v0, %hi(D_E008C3FC) -/* 38DE2C E008C02C 2442C3FC */ addiu $v0, $v0, %lo(D_E008C3FC) +/* 38DE28 E008C028 3C02E009 */ lui $v0, %hi(func_E008C3FC) +/* 38DE2C E008C02C 2442C3FC */ addiu $v0, $v0, %lo(func_E008C3FC) /* 38DE30 E008C030 AFA2001C */ sw $v0, 0x1c($sp) -/* 38DE34 E008C034 3C02E009 */ lui $v0, %hi(D_E008C6B8) -/* 38DE38 E008C038 2442C6B8 */ addiu $v0, $v0, %lo(D_E008C6B8) +/* 38DE34 E008C034 3C02E009 */ lui $v0, %hi(func_E008C6B8) +/* 38DE38 E008C038 2442C6B8 */ addiu $v0, $v0, %lo(func_E008C6B8) /* 38DE3C E008C03C AFA20020 */ sw $v0, 0x20($sp) /* 38DE40 E008C040 24020046 */ addiu $v0, $zero, 0x46 /* 38DE44 E008C044 AFBF005C */ sw $ra, 0x5c($sp) diff --git a/asm/nonmatchings/code_38DE00/func_E008C6B8.s b/asm/nonmatchings/code_38DE00/func_E008C6B8.s index fdbd02ffd8..60d49dbe48 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C6B8.s +++ b/asm/nonmatchings/code_38DE00/func_E008C6B8.s @@ -3,8 +3,8 @@ glabel func_E008C6B8 /* 38E4B8 E008C6B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 38E4BC E008C6BC 3C02E009 */ lui $v0, %hi(D_E008C6FC) -/* 38E4C0 E008C6C0 2442C6FC */ addiu $v0, $v0, %lo(D_E008C6FC) +/* 38E4BC E008C6BC 3C02E009 */ lui $v0, %hi(func_E008C6FC) +/* 38E4C0 E008C6C0 2442C6FC */ addiu $v0, $v0, %lo(func_E008C6FC) /* 38E4C4 E008C6C4 AFA2001C */ sw $v0, 0x1c($sp) /* 38E4C8 E008C6C8 2402002D */ addiu $v0, $zero, 0x2d /* 38E4CC E008C6CC AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_38EE60/func_E008E000.s b/asm/nonmatchings/code_38EE60/func_E008E000.s index f79afb55c9..267cfdc4bc 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E000.s +++ b/asm/nonmatchings/code_38EE60/func_E008E000.s @@ -14,14 +14,14 @@ glabel func_E008E000 /* 38EE84 E008E024 27A40010 */ addiu $a0, $sp, 0x10 /* 38EE88 E008E028 AFB20030 */ sw $s2, 0x30($sp) /* 38EE8C E008E02C 8FB2006C */ lw $s2, 0x6c($sp) -/* 38EE90 E008E030 3C02E009 */ lui $v0, %hi(D_E008E1FC) -/* 38EE94 E008E034 2442E1FC */ addiu $v0, $v0, %lo(D_E008E1FC) +/* 38EE90 E008E030 3C02E009 */ lui $v0, %hi(func_E008E1FC) +/* 38EE94 E008E034 2442E1FC */ addiu $v0, $v0, %lo(func_E008E1FC) /* 38EE98 E008E038 AFA20018 */ sw $v0, 0x18($sp) -/* 38EE9C E008E03C 3C02E009 */ lui $v0, %hi(D_E008E204) -/* 38EEA0 E008E040 2442E204 */ addiu $v0, $v0, %lo(D_E008E204) +/* 38EE9C E008E03C 3C02E009 */ lui $v0, %hi(func_E008E204) +/* 38EEA0 E008E040 2442E204 */ addiu $v0, $v0, %lo(func_E008E204) /* 38EEA4 E008E044 AFA2001C */ sw $v0, 0x1c($sp) -/* 38EEA8 E008E048 3C02E009 */ lui $v0, %hi(D_E008E498) -/* 38EEAC E008E04C 2442E498 */ addiu $v0, $v0, %lo(D_E008E498) +/* 38EEA8 E008E048 3C02E009 */ lui $v0, %hi(func_E008E498) +/* 38EEAC E008E04C 2442E498 */ addiu $v0, $v0, %lo(func_E008E498) /* 38EEB0 E008E050 AFA20020 */ sw $v0, 0x20($sp) /* 38EEB4 E008E054 24020047 */ addiu $v0, $zero, 0x47 /* 38EEB8 E008E058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_38EE60/func_E008E498.s b/asm/nonmatchings/code_38EE60/func_E008E498.s index f16d5a4b7c..9827b77c8d 100644 --- a/asm/nonmatchings/code_38EE60/func_E008E498.s +++ b/asm/nonmatchings/code_38EE60/func_E008E498.s @@ -3,8 +3,8 @@ glabel func_E008E498 /* 38F2F8 E008E498 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 38F2FC E008E49C 3C02E009 */ lui $v0, %hi(D_E008E4E0) -/* 38F300 E008E4A0 2442E4E0 */ addiu $v0, $v0, %lo(D_E008E4E0) +/* 38F2FC E008E49C 3C02E009 */ lui $v0, %hi(func_E008E4E0) +/* 38F300 E008E4A0 2442E4E0 */ addiu $v0, $v0, %lo(func_E008E4E0) /* 38F304 E008E4A4 AFA2001C */ sw $v0, 0x1c($sp) /* 38F308 E008E4A8 2402000A */ addiu $v0, $zero, 0xa /* 38F30C E008E4AC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_38F900/func_E0090000.s b/asm/nonmatchings/code_38F900/func_E0090000.s index 6fd327fbc2..09fda2d335 100644 --- a/asm/nonmatchings/code_38F900/func_E0090000.s +++ b/asm/nonmatchings/code_38F900/func_E0090000.s @@ -16,17 +16,17 @@ glabel func_E0090000 /* 38F92C E009002C 27A40010 */ addiu $a0, $sp, 0x10 /* 38F930 E0090030 AFB30034 */ sw $s3, 0x34($sp) /* 38F934 E0090034 8FB3007C */ lw $s3, 0x7c($sp) -/* 38F938 E0090038 3C02E009 */ lui $v0, %hi(D_E00901C0) -/* 38F93C E009003C 244201C0 */ addiu $v0, $v0, %lo(D_E00901C0) +/* 38F938 E0090038 3C02E009 */ lui $v0, %hi(func_E00901C0) +/* 38F93C E009003C 244201C0 */ addiu $v0, $v0, %lo(func_E00901C0) /* 38F940 E0090040 AFA20018 */ sw $v0, 0x18($sp) -/* 38F944 E0090044 3C02E009 */ lui $v0, %hi(D_E00901C8) -/* 38F948 E0090048 244201C8 */ addiu $v0, $v0, %lo(D_E00901C8) +/* 38F944 E0090044 3C02E009 */ lui $v0, %hi(func_E00901C8) +/* 38F948 E0090048 244201C8 */ addiu $v0, $v0, %lo(func_E00901C8) /* 38F94C E009004C AFA2001C */ sw $v0, 0x1c($sp) -/* 38F950 E0090050 3C02E009 */ lui $v0, %hi(D_E0090420) -/* 38F954 E0090054 24420420 */ addiu $v0, $v0, %lo(D_E0090420) +/* 38F950 E0090050 3C02E009 */ lui $v0, %hi(func_E0090420) +/* 38F954 E0090054 24420420 */ addiu $v0, $v0, %lo(func_E0090420) /* 38F958 E0090058 AFA20020 */ sw $v0, 0x20($sp) -/* 38F95C E009005C 3C02E009 */ lui $v0, %hi(D_E0090428) -/* 38F960 E0090060 24420428 */ addiu $v0, $v0, %lo(D_E0090428) +/* 38F95C E009005C 3C02E009 */ lui $v0, %hi(func_E0090428) +/* 38F960 E0090060 24420428 */ addiu $v0, $v0, %lo(func_E0090428) /* 38F964 E0090064 AFA20024 */ sw $v0, 0x24($sp) /* 38F968 E0090068 24020048 */ addiu $v0, $zero, 0x48 /* 38F96C E009006C AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_391D30/func_E0092000.s b/asm/nonmatchings/code_391D30/func_E0092000.s index 3e3a46f52e..42e4debe4e 100644 --- a/asm/nonmatchings/code_391D30/func_E0092000.s +++ b/asm/nonmatchings/code_391D30/func_E0092000.s @@ -14,14 +14,14 @@ glabel func_E0092000 /* 391D54 E0092024 27A40010 */ addiu $a0, $sp, 0x10 /* 391D58 E0092028 F7BA0050 */ sdc1 $f26, 0x50($sp) /* 391D5C E009202C C7BA0068 */ lwc1 $f26, 0x68($sp) -/* 391D60 E0092030 3C02E009 */ lui $v0, %hi(D_E00921AC) -/* 391D64 E0092034 244221AC */ addiu $v0, $v0, %lo(D_E00921AC) +/* 391D60 E0092030 3C02E009 */ lui $v0, %hi(func_E00921AC) +/* 391D64 E0092034 244221AC */ addiu $v0, $v0, %lo(func_E00921AC) /* 391D68 E0092038 AFA20018 */ sw $v0, 0x18($sp) -/* 391D6C E009203C 3C02E009 */ lui $v0, %hi(D_E00921B4) -/* 391D70 E0092040 244221B4 */ addiu $v0, $v0, %lo(D_E00921B4) +/* 391D6C E009203C 3C02E009 */ lui $v0, %hi(func_E00921B4) +/* 391D70 E0092040 244221B4 */ addiu $v0, $v0, %lo(func_E00921B4) /* 391D74 E0092044 AFA2001C */ sw $v0, 0x1c($sp) -/* 391D78 E0092048 3C02E009 */ lui $v0, %hi(D_E0092258) -/* 391D7C E009204C 24422258 */ addiu $v0, $v0, %lo(D_E0092258) +/* 391D78 E0092048 3C02E009 */ lui $v0, %hi(func_E0092258) +/* 391D7C E009204C 24422258 */ addiu $v0, $v0, %lo(func_E0092258) /* 391D80 E0092050 AFA20020 */ sw $v0, 0x20($sp) /* 391D84 E0092054 24020049 */ addiu $v0, $zero, 0x49 /* 391D88 E0092058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_391D30/func_E0092258.s b/asm/nonmatchings/code_391D30/func_E0092258.s index f7e3301643..eddbf7fe62 100644 --- a/asm/nonmatchings/code_391D30/func_E0092258.s +++ b/asm/nonmatchings/code_391D30/func_E0092258.s @@ -3,8 +3,8 @@ glabel func_E0092258 /* 391F88 E0092258 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 391F8C E009225C 3C02E009 */ lui $v0, %hi(D_E00922A0) -/* 391F90 E0092260 244222A0 */ addiu $v0, $v0, %lo(D_E00922A0) +/* 391F8C E009225C 3C02E009 */ lui $v0, %hi(func_E00922A0) +/* 391F90 E0092260 244222A0 */ addiu $v0, $v0, %lo(func_E00922A0) /* 391F94 E0092264 AFA2001C */ sw $v0, 0x1c($sp) /* 391F98 E0092268 2402000A */ addiu $v0, $zero, 0xa /* 391F9C E009226C AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3928D0/func_E0094000.s b/asm/nonmatchings/code_3928D0/func_E0094000.s index f6c675c145..b73d7ae0e8 100644 --- a/asm/nonmatchings/code_3928D0/func_E0094000.s +++ b/asm/nonmatchings/code_3928D0/func_E0094000.s @@ -12,14 +12,14 @@ glabel func_E0094000 /* 3928EC E009401C 27A40010 */ addiu $a0, $sp, 0x10 /* 3928F0 E0094020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3928F4 E0094024 4487C000 */ mtc1 $a3, $f24 -/* 3928F8 E0094028 3C02E009 */ lui $v0, %hi(D_E0094190) -/* 3928FC E009402C 24424190 */ addiu $v0, $v0, %lo(D_E0094190) +/* 3928F8 E0094028 3C02E009 */ lui $v0, %hi(func_E0094190) +/* 3928FC E009402C 24424190 */ addiu $v0, $v0, %lo(func_E0094190) /* 392900 E0094030 AFA20018 */ sw $v0, 0x18($sp) -/* 392904 E0094034 3C02E009 */ lui $v0, %hi(D_E0094198) -/* 392908 E0094038 24424198 */ addiu $v0, $v0, %lo(D_E0094198) +/* 392904 E0094034 3C02E009 */ lui $v0, %hi(func_E0094198) +/* 392908 E0094038 24424198 */ addiu $v0, $v0, %lo(func_E0094198) /* 39290C E009403C AFA2001C */ sw $v0, 0x1c($sp) -/* 392910 E0094040 3C02E009 */ lui $v0, %hi(D_E00942C0) -/* 392914 E0094044 244242C0 */ addiu $v0, $v0, %lo(D_E00942C0) +/* 392910 E0094040 3C02E009 */ lui $v0, %hi(func_E00942C0) +/* 392914 E0094044 244242C0 */ addiu $v0, $v0, %lo(func_E00942C0) /* 392918 E0094048 AFA20020 */ sw $v0, 0x20($sp) /* 39291C E009404C 2402004A */ addiu $v0, $zero, 0x4a /* 392920 E0094050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3928D0/func_E00942C0.s b/asm/nonmatchings/code_3928D0/func_E00942C0.s index 362475bc71..033ba6cf65 100644 --- a/asm/nonmatchings/code_3928D0/func_E00942C0.s +++ b/asm/nonmatchings/code_3928D0/func_E00942C0.s @@ -3,8 +3,8 @@ glabel func_E00942C0 /* 392B90 E00942C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 392B94 E00942C4 3C02E009 */ lui $v0, %hi(D_E00942FC) -/* 392B98 E00942C8 244242FC */ addiu $v0, $v0, %lo(D_E00942FC) +/* 392B94 E00942C4 3C02E009 */ lui $v0, %hi(func_E00942FC) +/* 392B98 E00942C8 244242FC */ addiu $v0, $v0, %lo(func_E00942FC) /* 392B9C E00942CC AFA2001C */ sw $v0, 0x1c($sp) /* 392BA0 E00942D0 2402000A */ addiu $v0, $zero, 0xa /* 392BA4 E00942D4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_394280/func_E0096000.s b/asm/nonmatchings/code_394280/func_E0096000.s index 95218835af..ccf05f2579 100644 --- a/asm/nonmatchings/code_394280/func_E0096000.s +++ b/asm/nonmatchings/code_394280/func_E0096000.s @@ -12,14 +12,14 @@ glabel func_E0096000 /* 39429C E009601C 27A40010 */ addiu $a0, $sp, 0x10 /* 3942A0 E0096020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3942A4 E0096024 4487C000 */ mtc1 $a3, $f24 -/* 3942A8 E0096028 3C02E009 */ lui $v0, %hi(D_E00960EC) -/* 3942AC E009602C 244260EC */ addiu $v0, $v0, %lo(D_E00960EC) +/* 3942A8 E0096028 3C02E009 */ lui $v0, %hi(func_E00960EC) +/* 3942AC E009602C 244260EC */ addiu $v0, $v0, %lo(func_E00960EC) /* 3942B0 E0096030 AFA20018 */ sw $v0, 0x18($sp) -/* 3942B4 E0096034 3C02E009 */ lui $v0, %hi(D_E00960F4) -/* 3942B8 E0096038 244260F4 */ addiu $v0, $v0, %lo(D_E00960F4) +/* 3942B4 E0096034 3C02E009 */ lui $v0, %hi(func_E00960F4) +/* 3942B8 E0096038 244260F4 */ addiu $v0, $v0, %lo(func_E00960F4) /* 3942BC E009603C AFA2001C */ sw $v0, 0x1c($sp) -/* 3942C0 E0096040 3C02E009 */ lui $v0, %hi(D_E0096178) -/* 3942C4 E0096044 24426178 */ addiu $v0, $v0, %lo(D_E0096178) +/* 3942C0 E0096040 3C02E009 */ lui $v0, %hi(func_E0096178) +/* 3942C4 E0096044 24426178 */ addiu $v0, $v0, %lo(func_E0096178) /* 3942C8 E0096048 AFA20020 */ sw $v0, 0x20($sp) /* 3942CC E009604C 2402004B */ addiu $v0, $zero, 0x4b /* 3942D0 E0096050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_394280/func_E0096178.s b/asm/nonmatchings/code_394280/func_E0096178.s index d258f2c49c..50453937d1 100644 --- a/asm/nonmatchings/code_394280/func_E0096178.s +++ b/asm/nonmatchings/code_394280/func_E0096178.s @@ -3,8 +3,8 @@ glabel func_E0096178 /* 3943F8 E0096178 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3943FC E009617C 3C02E009 */ lui $v0, %hi(D_E00961BC) -/* 394400 E0096180 244261BC */ addiu $v0, $v0, %lo(D_E00961BC) +/* 3943FC E009617C 3C02E009 */ lui $v0, %hi(func_E00961BC) +/* 394400 E0096180 244261BC */ addiu $v0, $v0, %lo(func_E00961BC) /* 394404 E0096184 AFA2001C */ sw $v0, 0x1c($sp) /* 394408 E0096188 24020001 */ addiu $v0, $zero, 1 /* 39440C E009618C AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_395BB0/func_E0098000.s b/asm/nonmatchings/code_395BB0/func_E0098000.s index 5b9fa47162..d0f1bff012 100644 --- a/asm/nonmatchings/code_395BB0/func_E0098000.s +++ b/asm/nonmatchings/code_395BB0/func_E0098000.s @@ -14,14 +14,14 @@ glabel func_E0098000 /* 395BD4 E0098024 27A40010 */ addiu $a0, $sp, 0x10 /* 395BD8 E0098028 F7BA0050 */ sdc1 $f26, 0x50($sp) /* 395BDC E009802C C7BA0074 */ lwc1 $f26, 0x74($sp) -/* 395BE0 E0098030 3C02E00A */ lui $v0, %hi(D_E0098168) -/* 395BE4 E0098034 24428168 */ addiu $v0, $v0, %lo(D_E0098168) +/* 395BE0 E0098030 3C02E00A */ lui $v0, %hi(func_E0098168) +/* 395BE4 E0098034 24428168 */ addiu $v0, $v0, %lo(func_E0098168) /* 395BE8 E0098038 AFA20018 */ sw $v0, 0x18($sp) -/* 395BEC E009803C 3C02E00A */ lui $v0, %hi(D_E0098170) -/* 395BF0 E0098040 24428170 */ addiu $v0, $v0, %lo(D_E0098170) +/* 395BEC E009803C 3C02E00A */ lui $v0, %hi(func_E0098170) +/* 395BF0 E0098040 24428170 */ addiu $v0, $v0, %lo(func_E0098170) /* 395BF4 E0098044 AFA2001C */ sw $v0, 0x1c($sp) -/* 395BF8 E0098048 3C02E00A */ lui $v0, %hi(D_E009829C) -/* 395BFC E009804C 2442829C */ addiu $v0, $v0, %lo(D_E009829C) +/* 395BF8 E0098048 3C02E00A */ lui $v0, %hi(func_E009829C) +/* 395BFC E009804C 2442829C */ addiu $v0, $v0, %lo(func_E009829C) /* 395C00 E0098050 AFA20020 */ sw $v0, 0x20($sp) /* 395C04 E0098054 2402004C */ addiu $v0, $zero, 0x4c /* 395C08 E0098058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_395BB0/func_E009829C.s b/asm/nonmatchings/code_395BB0/func_E009829C.s index 547afb570a..e1170f2fdf 100644 --- a/asm/nonmatchings/code_395BB0/func_E009829C.s +++ b/asm/nonmatchings/code_395BB0/func_E009829C.s @@ -5,8 +5,8 @@ glabel func_E009829C /* 395E4C E009829C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 395E50 E00982A0 AFBF0020 */ sw $ra, 0x20($sp) /* 395E54 E00982A4 8C83000C */ lw $v1, 0xc($a0) -/* 395E58 E00982A8 3C02E00A */ lui $v0, %hi(D_E00982EC) -/* 395E5C E00982AC 244282EC */ addiu $v0, $v0, %lo(D_E00982EC) +/* 395E58 E00982A8 3C02E00A */ lui $v0, %hi(func_E00982EC) +/* 395E5C E00982AC 244282EC */ addiu $v0, $v0, %lo(func_E00982EC) /* 395E60 E00982B0 AFA2001C */ sw $v0, 0x1c($sp) /* 395E64 E00982B4 2402002D */ addiu $v0, $zero, 0x2d /* 395E68 E00982B8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3965B0/func_E009A000.s b/asm/nonmatchings/code_3965B0/func_E009A000.s index 87821885cf..bdf0049518 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A000.s +++ b/asm/nonmatchings/code_3965B0/func_E009A000.s @@ -16,14 +16,14 @@ glabel func_E009A000 /* 3965DC E009A02C 27A40010 */ addiu $a0, $sp, 0x10 /* 3965E0 E009A030 AFB20030 */ sw $s2, 0x30($sp) /* 3965E4 E009A034 8FB20074 */ lw $s2, 0x74($sp) -/* 3965E8 E009A038 3C02E00A */ lui $v0, %hi(D_E009A138) -/* 3965EC E009A03C 2442A138 */ addiu $v0, $v0, %lo(D_E009A138) +/* 3965E8 E009A038 3C02E00A */ lui $v0, %hi(func_E009A138) +/* 3965EC E009A03C 2442A138 */ addiu $v0, $v0, %lo(func_E009A138) /* 3965F0 E009A040 AFA20018 */ sw $v0, 0x18($sp) -/* 3965F4 E009A044 3C02E00A */ lui $v0, %hi(D_E009A140) -/* 3965F8 E009A048 2442A140 */ addiu $v0, $v0, %lo(D_E009A140) +/* 3965F4 E009A044 3C02E00A */ lui $v0, %hi(func_E009A140) +/* 3965F8 E009A048 2442A140 */ addiu $v0, $v0, %lo(func_E009A140) /* 3965FC E009A04C AFA2001C */ sw $v0, 0x1c($sp) -/* 396600 E009A050 3C02E00A */ lui $v0, %hi(D_E009A398) -/* 396604 E009A054 2442A398 */ addiu $v0, $v0, %lo(D_E009A398) +/* 396600 E009A050 3C02E00A */ lui $v0, %hi(func_E009A398) +/* 396604 E009A054 2442A398 */ addiu $v0, $v0, %lo(func_E009A398) /* 396608 E009A058 AFA20020 */ sw $v0, 0x20($sp) /* 39660C E009A05C 2402004D */ addiu $v0, $zero, 0x4d /* 396610 E009A060 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3965B0/func_E009A398.s b/asm/nonmatchings/code_3965B0/func_E009A398.s index 7d3247880c..28d9d54121 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A398.s +++ b/asm/nonmatchings/code_3965B0/func_E009A398.s @@ -3,8 +3,8 @@ glabel func_E009A398 /* 396948 E009A398 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 39694C E009A39C 3C02E00A */ lui $v0, %hi(D_E009A3E0) -/* 396950 E009A3A0 2442A3E0 */ addiu $v0, $v0, %lo(D_E009A3E0) +/* 39694C E009A39C 3C02E00A */ lui $v0, %hi(func_E009A3E0) +/* 396950 E009A3A0 2442A3E0 */ addiu $v0, $v0, %lo(func_E009A3E0) /* 396954 E009A3A4 AFA2001C */ sw $v0, 0x1c($sp) /* 396958 E009A3A8 2402FFF6 */ addiu $v0, $zero, -0xa /* 39695C E009A3AC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3981F0/func_E009C000.s b/asm/nonmatchings/code_3981F0/func_E009C000.s index 5215da546a..c12b9486a7 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C000.s +++ b/asm/nonmatchings/code_3981F0/func_E009C000.s @@ -12,14 +12,14 @@ glabel func_E009C000 /* 39820C E009C01C 27A40010 */ addiu $a0, $sp, 0x10 /* 398210 E009C020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 398214 E009C024 4487C000 */ mtc1 $a3, $f24 -/* 398218 E009C028 3C02E00A */ lui $v0, %hi(D_E009C100) -/* 39821C E009C02C 2442C100 */ addiu $v0, $v0, %lo(D_E009C100) +/* 398218 E009C028 3C02E00A */ lui $v0, %hi(func_E009C100) +/* 39821C E009C02C 2442C100 */ addiu $v0, $v0, %lo(func_E009C100) /* 398220 E009C030 AFA20018 */ sw $v0, 0x18($sp) -/* 398224 E009C034 3C02E00A */ lui $v0, %hi(D_E009C108) -/* 398228 E009C038 2442C108 */ addiu $v0, $v0, %lo(D_E009C108) +/* 398224 E009C034 3C02E00A */ lui $v0, %hi(func_E009C108) +/* 398228 E009C038 2442C108 */ addiu $v0, $v0, %lo(func_E009C108) /* 39822C E009C03C AFA2001C */ sw $v0, 0x1c($sp) -/* 398230 E009C040 3C02E00A */ lui $v0, %hi(D_E009C1DC) -/* 398234 E009C044 2442C1DC */ addiu $v0, $v0, %lo(D_E009C1DC) +/* 398230 E009C040 3C02E00A */ lui $v0, %hi(func_E009C1DC) +/* 398234 E009C044 2442C1DC */ addiu $v0, $v0, %lo(func_E009C1DC) /* 398238 E009C048 AFA20020 */ sw $v0, 0x20($sp) /* 39823C E009C04C 2402004E */ addiu $v0, $zero, 0x4e /* 398240 E009C050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3981F0/func_E009C1DC.s b/asm/nonmatchings/code_3981F0/func_E009C1DC.s index ab52f7ec18..f074cc03e5 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C1DC.s +++ b/asm/nonmatchings/code_3981F0/func_E009C1DC.s @@ -3,8 +3,8 @@ glabel func_E009C1DC /* 3983CC E009C1DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3983D0 E009C1E0 3C02E00A */ lui $v0, %hi(D_E009C220) -/* 3983D4 E009C1E4 2442C220 */ addiu $v0, $v0, %lo(D_E009C220) +/* 3983D0 E009C1E0 3C02E00A */ lui $v0, %hi(func_E009C220) +/* 3983D4 E009C1E4 2442C220 */ addiu $v0, $v0, %lo(func_E009C220) /* 3983D8 E009C1E8 AFA2001C */ sw $v0, 0x1c($sp) /* 3983DC E009C1EC 24020001 */ addiu $v0, $zero, 1 /* 3983E0 E009C1F0 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_39FF20/func_E009E000.s b/asm/nonmatchings/code_39FF20/func_E009E000.s index 35726fbf94..8dfca5f25f 100644 --- a/asm/nonmatchings/code_39FF20/func_E009E000.s +++ b/asm/nonmatchings/code_39FF20/func_E009E000.s @@ -14,14 +14,14 @@ glabel func_E009E000 /* 39FF44 E009E024 27A40010 */ addiu $a0, $sp, 0x10 /* 39FF48 E009E028 AFB00028 */ sw $s0, 0x28($sp) /* 39FF4C E009E02C 8FB0006C */ lw $s0, 0x6c($sp) -/* 39FF50 E009E030 3C02E00A */ lui $v0, %hi(D_E009E1DC) -/* 39FF54 E009E034 2442E1DC */ addiu $v0, $v0, %lo(D_E009E1DC) +/* 39FF50 E009E030 3C02E00A */ lui $v0, %hi(func_E009E1DC) +/* 39FF54 E009E034 2442E1DC */ addiu $v0, $v0, %lo(func_E009E1DC) /* 39FF58 E009E038 AFA20018 */ sw $v0, 0x18($sp) -/* 39FF5C E009E03C 3C02E00A */ lui $v0, %hi(D_E009E1E4) -/* 39FF60 E009E040 2442E1E4 */ addiu $v0, $v0, %lo(D_E009E1E4) +/* 39FF5C E009E03C 3C02E00A */ lui $v0, %hi(func_E009E1E4) +/* 39FF60 E009E040 2442E1E4 */ addiu $v0, $v0, %lo(func_E009E1E4) /* 39FF64 E009E044 AFA2001C */ sw $v0, 0x1c($sp) -/* 39FF68 E009E048 3C02E00A */ lui $v0, %hi(D_E009E3DC) -/* 39FF6C E009E04C 2442E3DC */ addiu $v0, $v0, %lo(D_E009E3DC) +/* 39FF68 E009E048 3C02E00A */ lui $v0, %hi(func_E009E3DC) +/* 39FF6C E009E04C 2442E3DC */ addiu $v0, $v0, %lo(func_E009E3DC) /* 39FF70 E009E050 AFA20020 */ sw $v0, 0x20($sp) /* 39FF74 E009E054 2402004F */ addiu $v0, $zero, 0x4f /* 39FF78 E009E058 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_39FF20/func_E009E3DC.s b/asm/nonmatchings/code_39FF20/func_E009E3DC.s index 677c427596..bb4ebcceb0 100644 --- a/asm/nonmatchings/code_39FF20/func_E009E3DC.s +++ b/asm/nonmatchings/code_39FF20/func_E009E3DC.s @@ -3,8 +3,8 @@ glabel func_E009E3DC /* 3A02FC E009E3DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3A0300 E009E3E0 3C02E00A */ lui $v0, %hi(D_E009E424) -/* 3A0304 E009E3E4 2442E424 */ addiu $v0, $v0, %lo(D_E009E424) +/* 3A0300 E009E3E0 3C02E00A */ lui $v0, %hi(func_E009E424) +/* 3A0304 E009E3E4 2442E424 */ addiu $v0, $v0, %lo(func_E009E424) /* 3A0308 E009E3E8 AFA2001C */ sw $v0, 0x1c($sp) /* 3A030C E009E3EC 2402000A */ addiu $v0, $zero, 0xa /* 3A0310 E009E3F0 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3A2990/func_E00A2000.s b/asm/nonmatchings/code_3A2990/func_E00A2000.s index ddd23391a4..1d89d104c3 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A2000.s +++ b/asm/nonmatchings/code_3A2990/func_E00A2000.s @@ -14,14 +14,14 @@ glabel func_E00A2000 /* 3A29B4 E00A2024 27A40010 */ addiu $a0, $sp, 0x10 /* 3A29B8 E00A2028 AFB1002C */ sw $s1, 0x2c($sp) /* 3A29BC E00A202C 8FB10064 */ lw $s1, 0x64($sp) -/* 3A29C0 E00A2030 3C02E00A */ lui $v0, %hi(D_E00A2118) -/* 3A29C4 E00A2034 24422118 */ addiu $v0, $v0, %lo(D_E00A2118) +/* 3A29C0 E00A2030 3C02E00A */ lui $v0, %hi(func_E00A2118) +/* 3A29C4 E00A2034 24422118 */ addiu $v0, $v0, %lo(func_E00A2118) /* 3A29C8 E00A2038 AFA20018 */ sw $v0, 0x18($sp) -/* 3A29CC E00A203C 3C02E00A */ lui $v0, %hi(D_E00A2120) -/* 3A29D0 E00A2040 24422120 */ addiu $v0, $v0, %lo(D_E00A2120) +/* 3A29CC E00A203C 3C02E00A */ lui $v0, %hi(func_E00A2120) +/* 3A29D0 E00A2040 24422120 */ addiu $v0, $v0, %lo(func_E00A2120) /* 3A29D4 E00A2044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3A29D8 E00A2048 3C02E00A */ lui $v0, %hi(D_E00A21EC) -/* 3A29DC E00A204C 244221EC */ addiu $v0, $v0, %lo(D_E00A21EC) +/* 3A29D8 E00A2048 3C02E00A */ lui $v0, %hi(func_E00A21EC) +/* 3A29DC E00A204C 244221EC */ addiu $v0, $v0, %lo(func_E00A21EC) /* 3A29E0 E00A2050 AFA20020 */ sw $v0, 0x20($sp) /* 3A29E4 E00A2054 24020051 */ addiu $v0, $zero, 0x51 /* 3A29E8 E00A2058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3A2990/func_E00A21EC.s b/asm/nonmatchings/code_3A2990/func_E00A21EC.s index 49968ee665..bf62e213f3 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A21EC.s +++ b/asm/nonmatchings/code_3A2990/func_E00A21EC.s @@ -3,8 +3,8 @@ glabel func_E00A21EC /* 3A2B7C E00A21EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3A2B80 E00A21F0 3C02E00A */ lui $v0, %hi(D_E00A223C) -/* 3A2B84 E00A21F4 2442223C */ addiu $v0, $v0, %lo(D_E00A223C) +/* 3A2B80 E00A21F0 3C02E00A */ lui $v0, %hi(func_E00A223C) +/* 3A2B84 E00A21F4 2442223C */ addiu $v0, $v0, %lo(func_E00A223C) /* 3A2B88 E00A21F8 AFA2001C */ sw $v0, 0x1c($sp) /* 3A2B8C E00A21FC 24020064 */ addiu $v0, $zero, 0x64 /* 3A2B90 E00A2200 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4000.s b/asm/nonmatchings/code_3A37E0/func_E00A4000.s index 14257a5dce..2568b207fc 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4000.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4000.s @@ -16,14 +16,14 @@ glabel func_E00A4000 /* 3A380C E00A402C 27A40010 */ addiu $a0, $sp, 0x10 /* 3A3810 E00A4030 AFB20030 */ sw $s2, 0x30($sp) /* 3A3814 E00A4034 8FB2006C */ lw $s2, 0x6c($sp) -/* 3A3818 E00A4038 3C02E00A */ lui $v0, %hi(D_E00A41A4) -/* 3A381C E00A403C 244241A4 */ addiu $v0, $v0, %lo(D_E00A41A4) +/* 3A3818 E00A4038 3C02E00A */ lui $v0, %hi(func_E00A41A4) +/* 3A381C E00A403C 244241A4 */ addiu $v0, $v0, %lo(func_E00A41A4) /* 3A3820 E00A4040 AFA20018 */ sw $v0, 0x18($sp) -/* 3A3824 E00A4044 3C02E00A */ lui $v0, %hi(D_E00A41AC) -/* 3A3828 E00A4048 244241AC */ addiu $v0, $v0, %lo(D_E00A41AC) +/* 3A3824 E00A4044 3C02E00A */ lui $v0, %hi(func_E00A41AC) +/* 3A3828 E00A4048 244241AC */ addiu $v0, $v0, %lo(func_E00A41AC) /* 3A382C E00A404C AFA2001C */ sw $v0, 0x1c($sp) -/* 3A3830 E00A4050 3C02E00A */ lui $v0, %hi(D_E00A45DC) -/* 3A3834 E00A4054 244245DC */ addiu $v0, $v0, %lo(D_E00A45DC) +/* 3A3830 E00A4050 3C02E00A */ lui $v0, %hi(func_E00A45DC) +/* 3A3834 E00A4054 244245DC */ addiu $v0, $v0, %lo(func_E00A45DC) /* 3A3838 E00A4058 AFA20020 */ sw $v0, 0x20($sp) /* 3A383C E00A405C 24020052 */ addiu $v0, $zero, 0x52 /* 3A3840 E00A4060 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3A37E0/func_E00A45DC.s b/asm/nonmatchings/code_3A37E0/func_E00A45DC.s index 5387d3b5c0..89b19aa673 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A45DC.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A45DC.s @@ -5,8 +5,8 @@ glabel func_E00A45DC /* 3A3DBC E00A45DC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 3A3DC0 E00A45E0 AFBF0020 */ sw $ra, 0x20($sp) /* 3A3DC4 E00A45E4 8C83000C */ lw $v1, 0xc($a0) -/* 3A3DC8 E00A45E8 3C02E00A */ lui $v0, %hi(D_E00A4650) -/* 3A3DCC E00A45EC 24424650 */ addiu $v0, $v0, %lo(D_E00A4650) +/* 3A3DC8 E00A45E8 3C02E00A */ lui $v0, %hi(func_E00A4650) +/* 3A3DCC E00A45EC 24424650 */ addiu $v0, $v0, %lo(func_E00A4650) /* 3A3DD0 E00A45F0 AFA2001C */ sw $v0, 0x1c($sp) /* 3A3DD4 E00A45F4 2402000A */ addiu $v0, $zero, 0xa /* 3A3DD8 E00A45F8 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3A5550/func_E00A6000.s b/asm/nonmatchings/code_3A5550/func_E00A6000.s index 28ee36d1f0..c26133316d 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A6000.s +++ b/asm/nonmatchings/code_3A5550/func_E00A6000.s @@ -12,14 +12,14 @@ glabel func_E00A6000 /* 3A556C E00A601C 27A40010 */ addiu $a0, $sp, 0x10 /* 3A5570 E00A6020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3A5574 E00A6024 4487C000 */ mtc1 $a3, $f24 -/* 3A5578 E00A6028 3C02E00A */ lui $v0, %hi(D_E00A611C) -/* 3A557C E00A602C 2442611C */ addiu $v0, $v0, %lo(D_E00A611C) +/* 3A5578 E00A6028 3C02E00A */ lui $v0, %hi(func_E00A611C) +/* 3A557C E00A602C 2442611C */ addiu $v0, $v0, %lo(func_E00A611C) /* 3A5580 E00A6030 AFA20018 */ sw $v0, 0x18($sp) -/* 3A5584 E00A6034 3C02E00A */ lui $v0, %hi(D_E00A6124) -/* 3A5588 E00A6038 24426124 */ addiu $v0, $v0, %lo(D_E00A6124) +/* 3A5584 E00A6034 3C02E00A */ lui $v0, %hi(func_E00A6124) +/* 3A5588 E00A6038 24426124 */ addiu $v0, $v0, %lo(func_E00A6124) /* 3A558C E00A603C AFA2001C */ sw $v0, 0x1c($sp) -/* 3A5590 E00A6040 3C02E00A */ lui $v0, %hi(D_E00A6358) -/* 3A5594 E00A6044 24426358 */ addiu $v0, $v0, %lo(D_E00A6358) +/* 3A5590 E00A6040 3C02E00A */ lui $v0, %hi(func_E00A6358) +/* 3A5594 E00A6044 24426358 */ addiu $v0, $v0, %lo(func_E00A6358) /* 3A5598 E00A6048 AFA20020 */ sw $v0, 0x20($sp) /* 3A559C E00A604C 24020053 */ addiu $v0, $zero, 0x53 /* 3A55A0 E00A6050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3A5550/func_E00A6358.s b/asm/nonmatchings/code_3A5550/func_E00A6358.s index e04a26f672..9d47fcd6d7 100644 --- a/asm/nonmatchings/code_3A5550/func_E00A6358.s +++ b/asm/nonmatchings/code_3A5550/func_E00A6358.s @@ -3,8 +3,8 @@ glabel func_E00A6358 /* 3A58A8 E00A6358 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3A58AC E00A635C 3C02E00A */ lui $v0, %hi(D_E00A63A4) -/* 3A58B0 E00A6360 244263A4 */ addiu $v0, $v0, %lo(D_E00A63A4) +/* 3A58AC E00A635C 3C02E00A */ lui $v0, %hi(func_E00A63A4) +/* 3A58B0 E00A6360 244263A4 */ addiu $v0, $v0, %lo(func_E00A63A4) /* 3A58B4 E00A6364 AFA2001C */ sw $v0, 0x1c($sp) /* 3A58B8 E00A6368 2402002D */ addiu $v0, $zero, 0x2d /* 3A58BC E00A636C AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3A70F0/func_E00A8000.s b/asm/nonmatchings/code_3A70F0/func_E00A8000.s index dd87c98591..5baf0ea01f 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A8000.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A8000.s @@ -12,14 +12,14 @@ glabel func_E00A8000 /* 3A710C E00A801C 27A40010 */ addiu $a0, $sp, 0x10 /* 3A7110 E00A8020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3A7114 E00A8024 4487C000 */ mtc1 $a3, $f24 -/* 3A7118 E00A8028 3C02E00B */ lui $v0, %hi(D_E00A80FC) -/* 3A711C E00A802C 244280FC */ addiu $v0, $v0, %lo(D_E00A80FC) +/* 3A7118 E00A8028 3C02E00B */ lui $v0, %hi(func_E00A80FC) +/* 3A711C E00A802C 244280FC */ addiu $v0, $v0, %lo(func_E00A80FC) /* 3A7120 E00A8030 AFA20018 */ sw $v0, 0x18($sp) -/* 3A7124 E00A8034 3C02E00B */ lui $v0, %hi(D_E00A8104) -/* 3A7128 E00A8038 24428104 */ addiu $v0, $v0, %lo(D_E00A8104) +/* 3A7124 E00A8034 3C02E00B */ lui $v0, %hi(func_E00A8104) +/* 3A7128 E00A8038 24428104 */ addiu $v0, $v0, %lo(func_E00A8104) /* 3A712C E00A803C AFA2001C */ sw $v0, 0x1c($sp) -/* 3A7130 E00A8040 3C02E00B */ lui $v0, %hi(D_E00A82D4) -/* 3A7134 E00A8044 244282D4 */ addiu $v0, $v0, %lo(D_E00A82D4) +/* 3A7130 E00A8040 3C02E00B */ lui $v0, %hi(func_E00A82D4) +/* 3A7134 E00A8044 244282D4 */ addiu $v0, $v0, %lo(func_E00A82D4) /* 3A7138 E00A8048 AFA20020 */ sw $v0, 0x20($sp) /* 3A713C E00A804C 24020054 */ addiu $v0, $zero, 0x54 /* 3A7140 E00A8050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3A70F0/func_E00A82D4.s b/asm/nonmatchings/code_3A70F0/func_E00A82D4.s index 0786d40cce..70b1bd940e 100644 --- a/asm/nonmatchings/code_3A70F0/func_E00A82D4.s +++ b/asm/nonmatchings/code_3A70F0/func_E00A82D4.s @@ -3,8 +3,8 @@ glabel func_E00A82D4 /* 3A73C4 E00A82D4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3A73C8 E00A82D8 3C02E00B */ lui $v0, %hi(D_E00A8320) -/* 3A73CC E00A82DC 24428320 */ addiu $v0, $v0, %lo(D_E00A8320) +/* 3A73C8 E00A82D8 3C02E00B */ lui $v0, %hi(func_E00A8320) +/* 3A73CC E00A82DC 24428320 */ addiu $v0, $v0, %lo(func_E00A8320) /* 3A73D0 E00A82E0 AFA2001C */ sw $v0, 0x1c($sp) /* 3A73D4 E00A82E4 2402002D */ addiu $v0, $zero, 0x2d /* 3A73D8 E00A82E8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3AA920/func_E00AA000.s b/asm/nonmatchings/code_3AA920/func_E00AA000.s index 4a67c25fb5..26dec14384 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA000.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA000.s @@ -12,14 +12,14 @@ glabel func_E00AA000 /* 3AA93C E00AA01C 27A40010 */ addiu $a0, $sp, 0x10 /* 3AA940 E00AA020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3AA944 E00AA024 4487C000 */ mtc1 $a3, $f24 -/* 3AA948 E00AA028 3C02E00B */ lui $v0, %hi(D_E00AA104) -/* 3AA94C E00AA02C 2442A104 */ addiu $v0, $v0, %lo(D_E00AA104) +/* 3AA948 E00AA028 3C02E00B */ lui $v0, %hi(func_E00AA104) +/* 3AA94C E00AA02C 2442A104 */ addiu $v0, $v0, %lo(func_E00AA104) /* 3AA950 E00AA030 AFA20018 */ sw $v0, 0x18($sp) -/* 3AA954 E00AA034 3C02E00B */ lui $v0, %hi(D_E00AA10C) -/* 3AA958 E00AA038 2442A10C */ addiu $v0, $v0, %lo(D_E00AA10C) +/* 3AA954 E00AA034 3C02E00B */ lui $v0, %hi(func_E00AA10C) +/* 3AA958 E00AA038 2442A10C */ addiu $v0, $v0, %lo(func_E00AA10C) /* 3AA95C E00AA03C AFA2001C */ sw $v0, 0x1c($sp) -/* 3AA960 E00AA040 3C02E00B */ lui $v0, %hi(D_E00AA3C0) -/* 3AA964 E00AA044 2442A3C0 */ addiu $v0, $v0, %lo(D_E00AA3C0) +/* 3AA960 E00AA040 3C02E00B */ lui $v0, %hi(func_E00AA3C0) +/* 3AA964 E00AA044 2442A3C0 */ addiu $v0, $v0, %lo(func_E00AA3C0) /* 3AA968 E00AA048 AFA20020 */ sw $v0, 0x20($sp) /* 3AA96C E00AA04C 24020055 */ addiu $v0, $zero, 0x55 /* 3AA970 E00AA050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3AA920/func_E00AA3C0.s b/asm/nonmatchings/code_3AA920/func_E00AA3C0.s index fa0b29f631..83b67f68b2 100644 --- a/asm/nonmatchings/code_3AA920/func_E00AA3C0.s +++ b/asm/nonmatchings/code_3AA920/func_E00AA3C0.s @@ -3,8 +3,8 @@ glabel func_E00AA3C0 /* 3AACE0 E00AA3C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3AACE4 E00AA3C4 3C02E00B */ lui $v0, %hi(D_E00AA404) -/* 3AACE8 E00AA3C8 2442A404 */ addiu $v0, $v0, %lo(D_E00AA404) +/* 3AACE4 E00AA3C4 3C02E00B */ lui $v0, %hi(func_E00AA404) +/* 3AACE8 E00AA3C8 2442A404 */ addiu $v0, $v0, %lo(func_E00AA404) /* 3AACEC E00AA3CC AFA2001C */ sw $v0, 0x1c($sp) /* 3AACF0 E00AA3D0 2402002D */ addiu $v0, $zero, 0x2d /* 3AACF4 E00AA3D4 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC000.s b/asm/nonmatchings/code_3AEE20/func_E00AC000.s index 0a78515b32..bedcbf1f5b 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC000.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC000.s @@ -12,17 +12,17 @@ glabel func_E00AC000 /* 3AEE3C E00AC01C 27A40010 */ addiu $a0, $sp, 0x10 /* 3AEE40 E00AC020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3AEE44 E00AC024 4487C000 */ mtc1 $a3, $f24 -/* 3AEE48 E00AC028 3C02E00B */ lui $v0, %hi(D_E00AC11C) -/* 3AEE4C E00AC02C 2442C11C */ addiu $v0, $v0, %lo(D_E00AC11C) +/* 3AEE48 E00AC028 3C02E00B */ lui $v0, %hi(func_E00AC11C) +/* 3AEE4C E00AC02C 2442C11C */ addiu $v0, $v0, %lo(func_E00AC11C) /* 3AEE50 E00AC030 AFA20018 */ sw $v0, 0x18($sp) -/* 3AEE54 E00AC034 3C02E00B */ lui $v0, %hi(D_E00AC124) -/* 3AEE58 E00AC038 2442C124 */ addiu $v0, $v0, %lo(D_E00AC124) +/* 3AEE54 E00AC034 3C02E00B */ lui $v0, %hi(func_E00AC124) +/* 3AEE58 E00AC038 2442C124 */ addiu $v0, $v0, %lo(func_E00AC124) /* 3AEE5C E00AC03C AFA2001C */ sw $v0, 0x1c($sp) -/* 3AEE60 E00AC040 3C02E00B */ lui $v0, %hi(D_E00AC280) -/* 3AEE64 E00AC044 2442C280 */ addiu $v0, $v0, %lo(D_E00AC280) +/* 3AEE60 E00AC040 3C02E00B */ lui $v0, %hi(func_E00AC280) +/* 3AEE64 E00AC044 2442C280 */ addiu $v0, $v0, %lo(func_E00AC280) /* 3AEE68 E00AC048 AFA20020 */ sw $v0, 0x20($sp) -/* 3AEE6C E00AC04C 3C02E00B */ lui $v0, %hi(D_E00AC288) -/* 3AEE70 E00AC050 2442C288 */ addiu $v0, $v0, %lo(D_E00AC288) +/* 3AEE6C E00AC04C 3C02E00B */ lui $v0, %hi(func_E00AC288) +/* 3AEE70 E00AC050 2442C288 */ addiu $v0, $v0, %lo(func_E00AC288) /* 3AEE74 E00AC054 AFA20024 */ sw $v0, 0x24($sp) /* 3AEE78 E00AC058 24020056 */ addiu $v0, $zero, 0x56 /* 3AEE7C E00AC05C AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3B2350/func_E00AE000.s b/asm/nonmatchings/code_3B2350/func_E00AE000.s index 16f626702e..38a5e5e242 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE000.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE000.s @@ -14,14 +14,14 @@ glabel func_E00AE000 /* 3B2374 E00AE024 27A40010 */ addiu $a0, $sp, 0x10 /* 3B2378 E00AE028 AFB20030 */ sw $s2, 0x30($sp) /* 3B237C E00AE02C 8FB2006C */ lw $s2, 0x6c($sp) -/* 3B2380 E00AE030 3C02E00B */ lui $v0, %hi(D_E00AE1AC) -/* 3B2384 E00AE034 2442E1AC */ addiu $v0, $v0, %lo(D_E00AE1AC) +/* 3B2380 E00AE030 3C02E00B */ lui $v0, %hi(func_E00AE1AC) +/* 3B2384 E00AE034 2442E1AC */ addiu $v0, $v0, %lo(func_E00AE1AC) /* 3B2388 E00AE038 AFA20018 */ sw $v0, 0x18($sp) -/* 3B238C E00AE03C 3C02E00B */ lui $v0, %hi(D_E00AE1B4) -/* 3B2390 E00AE040 2442E1B4 */ addiu $v0, $v0, %lo(D_E00AE1B4) +/* 3B238C E00AE03C 3C02E00B */ lui $v0, %hi(func_E00AE1B4) +/* 3B2390 E00AE040 2442E1B4 */ addiu $v0, $v0, %lo(func_E00AE1B4) /* 3B2394 E00AE044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3B2398 E00AE048 3C02E00B */ lui $v0, %hi(D_E00AE4FC) -/* 3B239C E00AE04C 2442E4FC */ addiu $v0, $v0, %lo(D_E00AE4FC) +/* 3B2398 E00AE048 3C02E00B */ lui $v0, %hi(func_E00AE4FC) +/* 3B239C E00AE04C 2442E4FC */ addiu $v0, $v0, %lo(func_E00AE4FC) /* 3B23A0 E00AE050 AFA20020 */ sw $v0, 0x20($sp) /* 3B23A4 E00AE054 24020057 */ addiu $v0, $zero, 0x57 /* 3B23A8 E00AE058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3B2350/func_E00AE4FC.s b/asm/nonmatchings/code_3B2350/func_E00AE4FC.s index 85e5720c4c..36e91b2e66 100644 --- a/asm/nonmatchings/code_3B2350/func_E00AE4FC.s +++ b/asm/nonmatchings/code_3B2350/func_E00AE4FC.s @@ -3,8 +3,8 @@ glabel func_E00AE4FC /* 3B284C E00AE4FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3B2850 E00AE500 3C02E00B */ lui $v0, %hi(D_E00AE54C) -/* 3B2854 E00AE504 2442E54C */ addiu $v0, $v0, %lo(D_E00AE54C) +/* 3B2850 E00AE500 3C02E00B */ lui $v0, %hi(func_E00AE54C) +/* 3B2854 E00AE504 2442E54C */ addiu $v0, $v0, %lo(func_E00AE54C) /* 3B2858 E00AE508 AFA2001C */ sw $v0, 0x1c($sp) /* 3B285C E00AE50C 2402000A */ addiu $v0, $zero, 0xa /* 3B2860 E00AE510 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B0000.s b/asm/nonmatchings/code_3B3EB0/func_E00B0000.s index 8bb532ce30..5291ecdb3a 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B0000.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B0000.s @@ -14,14 +14,14 @@ glabel func_E00B0000 /* 3B3ED4 E00B0024 27A40010 */ addiu $a0, $sp, 0x10 /* 3B3ED8 E00B0028 AFB1002C */ sw $s1, 0x2c($sp) /* 3B3EDC E00B002C 8FB10064 */ lw $s1, 0x64($sp) -/* 3B3EE0 E00B0030 3C02E00B */ lui $v0, %hi(D_E00B011C) -/* 3B3EE4 E00B0034 2442011C */ addiu $v0, $v0, %lo(D_E00B011C) +/* 3B3EE0 E00B0030 3C02E00B */ lui $v0, %hi(func_E00B011C) +/* 3B3EE4 E00B0034 2442011C */ addiu $v0, $v0, %lo(func_E00B011C) /* 3B3EE8 E00B0038 AFA20018 */ sw $v0, 0x18($sp) -/* 3B3EEC E00B003C 3C02E00B */ lui $v0, %hi(D_E00B0124) -/* 3B3EF0 E00B0040 24420124 */ addiu $v0, $v0, %lo(D_E00B0124) +/* 3B3EEC E00B003C 3C02E00B */ lui $v0, %hi(func_E00B0124) +/* 3B3EF0 E00B0040 24420124 */ addiu $v0, $v0, %lo(func_E00B0124) /* 3B3EF4 E00B0044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3B3EF8 E00B0048 3C02E00B */ lui $v0, %hi(D_E00B01F8) -/* 3B3EFC E00B004C 244201F8 */ addiu $v0, $v0, %lo(D_E00B01F8) +/* 3B3EF8 E00B0048 3C02E00B */ lui $v0, %hi(func_E00B01F8) +/* 3B3EFC E00B004C 244201F8 */ addiu $v0, $v0, %lo(func_E00B01F8) /* 3B3F00 E00B0050 AFA20020 */ sw $v0, 0x20($sp) /* 3B3F04 E00B0054 24020058 */ addiu $v0, $zero, 0x58 /* 3B3F08 E00B0058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3B3EB0/func_E00B01F8.s b/asm/nonmatchings/code_3B3EB0/func_E00B01F8.s index c090f8a1ee..154da34368 100644 --- a/asm/nonmatchings/code_3B3EB0/func_E00B01F8.s +++ b/asm/nonmatchings/code_3B3EB0/func_E00B01F8.s @@ -3,8 +3,8 @@ glabel func_E00B01F8 /* 3B40A8 E00B01F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3B40AC E00B01FC 3C02E00B */ lui $v0, %hi(D_E00B0234) -/* 3B40B0 E00B0200 24420234 */ addiu $v0, $v0, %lo(D_E00B0234) +/* 3B40AC E00B01FC 3C02E00B */ lui $v0, %hi(func_E00B0234) +/* 3B40B0 E00B0200 24420234 */ addiu $v0, $v0, %lo(func_E00B0234) /* 3B40B4 E00B0204 AFA2001C */ sw $v0, 0x1c($sp) /* 3B40B8 E00B0208 2402000A */ addiu $v0, $zero, 0xa /* 3B40BC E00B020C AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3B4790/func_E00B2000.s b/asm/nonmatchings/code_3B4790/func_E00B2000.s index 8b1b81df36..a361304b6d 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B2000.s +++ b/asm/nonmatchings/code_3B4790/func_E00B2000.s @@ -14,14 +14,14 @@ glabel func_E00B2000 /* 3B47B4 E00B2024 27A40010 */ addiu $a0, $sp, 0x10 /* 3B47B8 E00B2028 AFB00028 */ sw $s0, 0x28($sp) /* 3B47BC E00B202C 8FB00070 */ lw $s0, 0x70($sp) -/* 3B47C0 E00B2030 3C02E00B */ lui $v0, %hi(D_E00B21DC) -/* 3B47C4 E00B2034 244221DC */ addiu $v0, $v0, %lo(D_E00B21DC) +/* 3B47C0 E00B2030 3C02E00B */ lui $v0, %hi(func_E00B21DC) +/* 3B47C4 E00B2034 244221DC */ addiu $v0, $v0, %lo(func_E00B21DC) /* 3B47C8 E00B2038 AFA20018 */ sw $v0, 0x18($sp) -/* 3B47CC E00B203C 3C02E00B */ lui $v0, %hi(D_E00B21E4) -/* 3B47D0 E00B2040 244221E4 */ addiu $v0, $v0, %lo(D_E00B21E4) +/* 3B47CC E00B203C 3C02E00B */ lui $v0, %hi(func_E00B21E4) +/* 3B47D0 E00B2040 244221E4 */ addiu $v0, $v0, %lo(func_E00B21E4) /* 3B47D4 E00B2044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3B47D8 E00B2048 3C02E00B */ lui $v0, %hi(D_E00B2460) -/* 3B47DC E00B204C 24422460 */ addiu $v0, $v0, %lo(D_E00B2460) +/* 3B47D8 E00B2048 3C02E00B */ lui $v0, %hi(func_E00B2460) +/* 3B47DC E00B204C 24422460 */ addiu $v0, $v0, %lo(func_E00B2460) /* 3B47E0 E00B2050 AFA20020 */ sw $v0, 0x20($sp) /* 3B47E4 E00B2054 24020059 */ addiu $v0, $zero, 0x59 /* 3B47E8 E00B2058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3B4790/func_E00B2460.s b/asm/nonmatchings/code_3B4790/func_E00B2460.s index 4be8e8647f..66ad924ab1 100644 --- a/asm/nonmatchings/code_3B4790/func_E00B2460.s +++ b/asm/nonmatchings/code_3B4790/func_E00B2460.s @@ -3,8 +3,8 @@ glabel func_E00B2460 /* 3B4BF0 E00B2460 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3B4BF4 E00B2464 3C02E00B */ lui $v0, %hi(D_E00B24B0) -/* 3B4BF8 E00B2468 244224B0 */ addiu $v0, $v0, %lo(D_E00B24B0) +/* 3B4BF4 E00B2464 3C02E00B */ lui $v0, %hi(func_E00B24B0) +/* 3B4BF8 E00B2468 244224B0 */ addiu $v0, $v0, %lo(func_E00B24B0) /* 3B4BFC E00B246C AFA2001C */ sw $v0, 0x1c($sp) /* 3B4C00 E00B2470 2402000A */ addiu $v0, $zero, 0xa /* 3B4C04 E00B2474 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B4000.s b/asm/nonmatchings/code_3B5CF0/func_E00B4000.s index 9a6c510df1..22c0084a35 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B4000.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B4000.s @@ -14,14 +14,14 @@ glabel func_E00B4000 /* 3B5D14 E00B4024 27A40010 */ addiu $a0, $sp, 0x10 /* 3B5D18 E00B4028 AFB1002C */ sw $s1, 0x2c($sp) /* 3B5D1C E00B402C 8FB10064 */ lw $s1, 0x64($sp) -/* 3B5D20 E00B4030 3C02E00B */ lui $v0, %hi(D_E00B4134) -/* 3B5D24 E00B4034 24424134 */ addiu $v0, $v0, %lo(D_E00B4134) +/* 3B5D20 E00B4030 3C02E00B */ lui $v0, %hi(func_E00B4134) +/* 3B5D24 E00B4034 24424134 */ addiu $v0, $v0, %lo(func_E00B4134) /* 3B5D28 E00B4038 AFA20018 */ sw $v0, 0x18($sp) -/* 3B5D2C E00B403C 3C02E00B */ lui $v0, %hi(D_E00B413C) -/* 3B5D30 E00B4040 2442413C */ addiu $v0, $v0, %lo(D_E00B413C) +/* 3B5D2C E00B403C 3C02E00B */ lui $v0, %hi(func_E00B413C) +/* 3B5D30 E00B4040 2442413C */ addiu $v0, $v0, %lo(func_E00B413C) /* 3B5D34 E00B4044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3B5D38 E00B4048 3C02E00B */ lui $v0, %hi(D_E00B452C) -/* 3B5D3C E00B404C 2442452C */ addiu $v0, $v0, %lo(D_E00B452C) +/* 3B5D38 E00B4048 3C02E00B */ lui $v0, %hi(func_E00B452C) +/* 3B5D3C E00B404C 2442452C */ addiu $v0, $v0, %lo(func_E00B452C) /* 3B5D40 E00B4050 AFA20020 */ sw $v0, 0x20($sp) /* 3B5D44 E00B4054 2402005A */ addiu $v0, $zero, 0x5a /* 3B5D48 E00B4058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3B5CF0/func_E00B452C.s b/asm/nonmatchings/code_3B5CF0/func_E00B452C.s index 18b68f526f..61caa15a19 100644 --- a/asm/nonmatchings/code_3B5CF0/func_E00B452C.s +++ b/asm/nonmatchings/code_3B5CF0/func_E00B452C.s @@ -3,8 +3,8 @@ glabel func_E00B452C /* 3B621C E00B452C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3B6220 E00B4530 3C02E00B */ lui $v0, %hi(D_E00B457C) -/* 3B6224 E00B4534 2442457C */ addiu $v0, $v0, %lo(D_E00B457C) +/* 3B6220 E00B4530 3C02E00B */ lui $v0, %hi(func_E00B457C) +/* 3B6224 E00B4534 2442457C */ addiu $v0, $v0, %lo(func_E00B457C) /* 3B6228 E00B4538 AFA2001C */ sw $v0, 0x1c($sp) /* 3B622C E00B453C 24020014 */ addiu $v0, $zero, 0x14 /* 3B6230 E00B4540 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3B7160/func_E00B6000.s b/asm/nonmatchings/code_3B7160/func_E00B6000.s index c3e5e276d0..8982e50439 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B6000.s +++ b/asm/nonmatchings/code_3B7160/func_E00B6000.s @@ -14,14 +14,14 @@ glabel func_E00B6000 /* 3B7184 E00B6024 27A40010 */ addiu $a0, $sp, 0x10 /* 3B7188 E00B6028 AFB00028 */ sw $s0, 0x28($sp) /* 3B718C E00B602C 8FB00074 */ lw $s0, 0x74($sp) -/* 3B7190 E00B6030 3C02E00B */ lui $v0, %hi(D_E00B6178) -/* 3B7194 E00B6034 24426178 */ addiu $v0, $v0, %lo(D_E00B6178) +/* 3B7190 E00B6030 3C02E00B */ lui $v0, %hi(func_E00B6178) +/* 3B7194 E00B6034 24426178 */ addiu $v0, $v0, %lo(func_E00B6178) /* 3B7198 E00B6038 AFA20018 */ sw $v0, 0x18($sp) -/* 3B719C E00B603C 3C02E00B */ lui $v0, %hi(D_E00B6180) -/* 3B71A0 E00B6040 24426180 */ addiu $v0, $v0, %lo(D_E00B6180) +/* 3B719C E00B603C 3C02E00B */ lui $v0, %hi(func_E00B6180) +/* 3B71A0 E00B6040 24426180 */ addiu $v0, $v0, %lo(func_E00B6180) /* 3B71A4 E00B6044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3B71A8 E00B6048 3C02E00B */ lui $v0, %hi(D_E00B629C) -/* 3B71AC E00B604C 2442629C */ addiu $v0, $v0, %lo(D_E00B629C) +/* 3B71A8 E00B6048 3C02E00B */ lui $v0, %hi(func_E00B629C) +/* 3B71AC E00B604C 2442629C */ addiu $v0, $v0, %lo(func_E00B629C) /* 3B71B0 E00B6050 AFA20020 */ sw $v0, 0x20($sp) /* 3B71B4 E00B6054 2402005B */ addiu $v0, $zero, 0x5b /* 3B71B8 E00B6058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3B7160/func_E00B629C.s b/asm/nonmatchings/code_3B7160/func_E00B629C.s index 453f93b21a..e8ea74a651 100644 --- a/asm/nonmatchings/code_3B7160/func_E00B629C.s +++ b/asm/nonmatchings/code_3B7160/func_E00B629C.s @@ -3,8 +3,8 @@ glabel func_E00B629C /* 3B73FC E00B629C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3B7400 E00B62A0 3C02E00B */ lui $v0, %hi(D_E00B62E0) -/* 3B7404 E00B62A4 244262E0 */ addiu $v0, $v0, %lo(D_E00B62E0) +/* 3B7400 E00B62A0 3C02E00B */ lui $v0, %hi(func_E00B62E0) +/* 3B7404 E00B62A4 244262E0 */ addiu $v0, $v0, %lo(func_E00B62E0) /* 3B7408 E00B62A8 AFA2001C */ sw $v0, 0x1c($sp) /* 3B740C E00B62AC 2402000A */ addiu $v0, $zero, 0xa /* 3B7410 E00B62B0 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3B7B80/func_E00B8000.s b/asm/nonmatchings/code_3B7B80/func_E00B8000.s index 897d87c4cb..7f6671ffa8 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B8000.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B8000.s @@ -14,14 +14,14 @@ glabel func_E00B8000 /* 3B7BA4 E00B8024 27A40010 */ addiu $a0, $sp, 0x10 /* 3B7BA8 E00B8028 AFB1002C */ sw $s1, 0x2c($sp) /* 3B7BAC E00B802C 8FB10064 */ lw $s1, 0x64($sp) -/* 3B7BB0 E00B8030 3C02E00C */ lui $v0, %hi(D_E00B812C) -/* 3B7BB4 E00B8034 2442812C */ addiu $v0, $v0, %lo(D_E00B812C) +/* 3B7BB0 E00B8030 3C02E00C */ lui $v0, %hi(func_E00B812C) +/* 3B7BB4 E00B8034 2442812C */ addiu $v0, $v0, %lo(func_E00B812C) /* 3B7BB8 E00B8038 AFA20018 */ sw $v0, 0x18($sp) -/* 3B7BBC E00B803C 3C02E00C */ lui $v0, %hi(D_E00B8134) -/* 3B7BC0 E00B8040 24428134 */ addiu $v0, $v0, %lo(D_E00B8134) +/* 3B7BBC E00B803C 3C02E00C */ lui $v0, %hi(func_E00B8134) +/* 3B7BC0 E00B8040 24428134 */ addiu $v0, $v0, %lo(func_E00B8134) /* 3B7BC4 E00B8044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3B7BC8 E00B8048 3C02E00C */ lui $v0, %hi(D_E00B81B8) -/* 3B7BCC E00B804C 244281B8 */ addiu $v0, $v0, %lo(D_E00B81B8) +/* 3B7BC8 E00B8048 3C02E00C */ lui $v0, %hi(func_E00B81B8) +/* 3B7BCC E00B804C 244281B8 */ addiu $v0, $v0, %lo(func_E00B81B8) /* 3B7BD0 E00B8050 AFA20020 */ sw $v0, 0x20($sp) /* 3B7BD4 E00B8054 2402005C */ addiu $v0, $zero, 0x5c /* 3B7BD8 E00B8058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3B7B80/func_E00B81B8.s b/asm/nonmatchings/code_3B7B80/func_E00B81B8.s index c7192231f9..ab0f77fcba 100644 --- a/asm/nonmatchings/code_3B7B80/func_E00B81B8.s +++ b/asm/nonmatchings/code_3B7B80/func_E00B81B8.s @@ -3,8 +3,8 @@ glabel func_E00B81B8 /* 3B7D38 E00B81B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3B7D3C E00B81BC 3C02E00C */ lui $v0, %hi(D_E00B8208) -/* 3B7D40 E00B81C0 24428208 */ addiu $v0, $v0, %lo(D_E00B8208) +/* 3B7D3C E00B81BC 3C02E00C */ lui $v0, %hi(func_E00B8208) +/* 3B7D40 E00B81C0 24428208 */ addiu $v0, $v0, %lo(func_E00B8208) /* 3B7D44 E00B81C4 AFA2001C */ sw $v0, 0x1c($sp) /* 3B7D48 E00B81C8 2402000A */ addiu $v0, $zero, 0xa /* 3B7D4C E00B81CC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA000.s b/asm/nonmatchings/code_3B8BD0/func_E00BA000.s index 89cd28a5f2..be54f44ecd 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA000.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA000.s @@ -14,14 +14,14 @@ glabel func_E00BA000 /* 3B8BF4 E00BA024 27A40010 */ addiu $a0, $sp, 0x10 /* 3B8BF8 E00BA028 AFB1002C */ sw $s1, 0x2c($sp) /* 3B8BFC E00BA02C 8FB10064 */ lw $s1, 0x64($sp) -/* 3B8C00 E00BA030 3C02E00C */ lui $v0, %hi(D_E00BA16C) -/* 3B8C04 E00BA034 2442A16C */ addiu $v0, $v0, %lo(D_E00BA16C) +/* 3B8C00 E00BA030 3C02E00C */ lui $v0, %hi(func_E00BA16C) +/* 3B8C04 E00BA034 2442A16C */ addiu $v0, $v0, %lo(func_E00BA16C) /* 3B8C08 E00BA038 AFA20018 */ sw $v0, 0x18($sp) -/* 3B8C0C E00BA03C 3C02E00C */ lui $v0, %hi(D_E00BA174) -/* 3B8C10 E00BA040 2442A174 */ addiu $v0, $v0, %lo(D_E00BA174) +/* 3B8C0C E00BA03C 3C02E00C */ lui $v0, %hi(func_E00BA174) +/* 3B8C10 E00BA040 2442A174 */ addiu $v0, $v0, %lo(func_E00BA174) /* 3B8C14 E00BA044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3B8C18 E00BA048 3C02E00C */ lui $v0, %hi(D_E00BA5DC) -/* 3B8C1C E00BA04C 2442A5DC */ addiu $v0, $v0, %lo(D_E00BA5DC) +/* 3B8C18 E00BA048 3C02E00C */ lui $v0, %hi(func_E00BA5DC) +/* 3B8C1C E00BA04C 2442A5DC */ addiu $v0, $v0, %lo(func_E00BA5DC) /* 3B8C20 E00BA050 AFA20020 */ sw $v0, 0x20($sp) /* 3B8C24 E00BA054 2402005D */ addiu $v0, $zero, 0x5d /* 3B8C28 E00BA058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA5DC.s b/asm/nonmatchings/code_3B8BD0/func_E00BA5DC.s index 1354bdb5ae..4ea483dea9 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA5DC.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA5DC.s @@ -3,8 +3,8 @@ glabel func_E00BA5DC /* 3B91AC E00BA5DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3B91B0 E00BA5E0 3C02E00C */ lui $v0, %hi(D_E00BA620) -/* 3B91B4 E00BA5E4 2442A620 */ addiu $v0, $v0, %lo(D_E00BA620) +/* 3B91B0 E00BA5E0 3C02E00C */ lui $v0, %hi(func_E00BA620) +/* 3B91B4 E00BA5E4 2442A620 */ addiu $v0, $v0, %lo(func_E00BA620) /* 3B91B8 E00BA5E8 AFA2001C */ sw $v0, 0x1c($sp) /* 3B91BC E00BA5EC 24020064 */ addiu $v0, $zero, 0x64 /* 3B91C0 E00BA5F0 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3BA030/func_E00BC000.s b/asm/nonmatchings/code_3BA030/func_E00BC000.s index c1f332a65e..811a026ca9 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC000.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC000.s @@ -20,14 +20,14 @@ glabel func_E00BC000 /* 3BA06C E00BC03C 27A40010 */ addiu $a0, $sp, 0x10 /* 3BA070 E00BC040 AFB1002C */ sw $s1, 0x2c($sp) /* 3BA074 E00BC044 8FB10090 */ lw $s1, 0x90($sp) -/* 3BA078 E00BC048 3C02E00C */ lui $v0, %hi(D_E00BC1D0) -/* 3BA07C E00BC04C 2442C1D0 */ addiu $v0, $v0, %lo(D_E00BC1D0) +/* 3BA078 E00BC048 3C02E00C */ lui $v0, %hi(func_E00BC1D0) +/* 3BA07C E00BC04C 2442C1D0 */ addiu $v0, $v0, %lo(func_E00BC1D0) /* 3BA080 E00BC050 AFA20018 */ sw $v0, 0x18($sp) -/* 3BA084 E00BC054 3C02E00C */ lui $v0, %hi(D_E00BC238) -/* 3BA088 E00BC058 2442C238 */ addiu $v0, $v0, %lo(D_E00BC238) +/* 3BA084 E00BC054 3C02E00C */ lui $v0, %hi(func_E00BC238) +/* 3BA088 E00BC058 2442C238 */ addiu $v0, $v0, %lo(func_E00BC238) /* 3BA08C E00BC05C AFA2001C */ sw $v0, 0x1c($sp) -/* 3BA090 E00BC060 3C02E00C */ lui $v0, %hi(D_E00BC2E8) -/* 3BA094 E00BC064 2442C2E8 */ addiu $v0, $v0, %lo(D_E00BC2E8) +/* 3BA090 E00BC060 3C02E00C */ lui $v0, %hi(func_E00BC2E8) +/* 3BA094 E00BC064 2442C2E8 */ addiu $v0, $v0, %lo(func_E00BC2E8) /* 3BA098 E00BC068 AFA20020 */ sw $v0, 0x20($sp) /* 3BA09C E00BC06C 2402005E */ addiu $v0, $zero, 0x5e /* 3BA0A0 E00BC070 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3BA030/func_E00BC2E8.s b/asm/nonmatchings/code_3BA030/func_E00BC2E8.s index a8b61f3e37..1457e444c0 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC2E8.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC2E8.s @@ -5,8 +5,8 @@ glabel func_E00BC2E8 /* 3BA318 E00BC2E8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 3BA31C E00BC2EC AFBF0020 */ sw $ra, 0x20($sp) /* 3BA320 E00BC2F0 8C85000C */ lw $a1, 0xc($a0) -/* 3BA324 E00BC2F4 3C02E00C */ lui $v0, %hi(D_E00BC374) -/* 3BA328 E00BC2F8 2442C374 */ addiu $v0, $v0, %lo(D_E00BC374) +/* 3BA324 E00BC2F4 3C02E00C */ lui $v0, %hi(func_E00BC374) +/* 3BA328 E00BC2F8 2442C374 */ addiu $v0, $v0, %lo(func_E00BC374) /* 3BA32C E00BC2FC AFA2001C */ sw $v0, 0x1c($sp) /* 3BA330 E00BC300 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 3BA334 E00BC304 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE000.s b/asm/nonmatchings/code_3BBF60/func_E00BE000.s index 7fbbe17f14..e03702a8af 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE000.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE000.s @@ -30,14 +30,14 @@ glabel func_E00BE000 .LE00BE064: /* 3BBFC4 E00BE064 2410000B */ addiu $s0, $zero, 0xb .LE00BE068: -/* 3BBFC8 E00BE068 3C02E00C */ lui $v0, %hi(D_E00BE39C) -/* 3BBFCC E00BE06C 2442E39C */ addiu $v0, $v0, %lo(D_E00BE39C) +/* 3BBFC8 E00BE068 3C02E00C */ lui $v0, %hi(func_E00BE39C) +/* 3BBFCC E00BE06C 2442E39C */ addiu $v0, $v0, %lo(func_E00BE39C) /* 3BBFD0 E00BE070 AC820008 */ sw $v0, 8($a0) -/* 3BBFD4 E00BE074 3C02E00C */ lui $v0, %hi(D_E00BE3A4) -/* 3BBFD8 E00BE078 2442E3A4 */ addiu $v0, $v0, %lo(D_E00BE3A4) +/* 3BBFD4 E00BE074 3C02E00C */ lui $v0, %hi(func_E00BE3A4) +/* 3BBFD8 E00BE078 2442E3A4 */ addiu $v0, $v0, %lo(func_E00BE3A4) /* 3BBFDC E00BE07C AC82000C */ sw $v0, 0xc($a0) -/* 3BBFE0 E00BE080 3C02E00C */ lui $v0, %hi(D_E00BE578) -/* 3BBFE4 E00BE084 2442E578 */ addiu $v0, $v0, %lo(D_E00BE578) +/* 3BBFE0 E00BE080 3C02E00C */ lui $v0, %hi(func_E00BE578) +/* 3BBFE4 E00BE084 2442E578 */ addiu $v0, $v0, %lo(func_E00BE578) /* 3BBFE8 E00BE088 AC820010 */ sw $v0, 0x10($a0) /* 3BBFEC E00BE08C 2402005F */ addiu $v0, $zero, 0x5f /* 3BBFF0 E00BE090 AC800000 */ sw $zero, ($a0) diff --git a/asm/nonmatchings/code_3BBF60/func_E00BE578.s b/asm/nonmatchings/code_3BBF60/func_E00BE578.s index 678c7620b2..7c74038dbf 100644 --- a/asm/nonmatchings/code_3BBF60/func_E00BE578.s +++ b/asm/nonmatchings/code_3BBF60/func_E00BE578.s @@ -3,8 +3,8 @@ glabel func_E00BE578 /* 3BC4D8 E00BE578 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3BC4DC E00BE57C 3C02E00C */ lui $v0, %hi(D_E00BE5BC) -/* 3BC4E0 E00BE580 2442E5BC */ addiu $v0, $v0, %lo(D_E00BE5BC) +/* 3BC4DC E00BE57C 3C02E00C */ lui $v0, %hi(func_E00BE5BC) +/* 3BC4E0 E00BE580 2442E5BC */ addiu $v0, $v0, %lo(func_E00BE5BC) /* 3BC4E4 E00BE584 AFA2001C */ sw $v0, 0x1c($sp) /* 3BC4E8 E00BE588 2402000A */ addiu $v0, $zero, 0xa /* 3BC4EC E00BE58C AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0000.s b/asm/nonmatchings/code_3BCD60/func_E00C0000.s index 317a770292..5cb3b24932 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0000.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0000.s @@ -14,14 +14,14 @@ glabel func_E00C0000 /* 3BCD84 E00C0024 27A40010 */ addiu $a0, $sp, 0x10 /* 3BCD88 E00C0028 AFB1002C */ sw $s1, 0x2c($sp) /* 3BCD8C E00C002C 8FB10064 */ lw $s1, 0x64($sp) -/* 3BCD90 E00C0030 3C02E00C */ lui $v0, %hi(D_E00C0158) -/* 3BCD94 E00C0034 24420158 */ addiu $v0, $v0, %lo(D_E00C0158) +/* 3BCD90 E00C0030 3C02E00C */ lui $v0, %hi(func_E00C0158) +/* 3BCD94 E00C0034 24420158 */ addiu $v0, $v0, %lo(func_E00C0158) /* 3BCD98 E00C0038 AFA20018 */ sw $v0, 0x18($sp) -/* 3BCD9C E00C003C 3C02E00C */ lui $v0, %hi(D_E00C0160) -/* 3BCDA0 E00C0040 24420160 */ addiu $v0, $v0, %lo(D_E00C0160) +/* 3BCD9C E00C003C 3C02E00C */ lui $v0, %hi(func_E00C0160) +/* 3BCDA0 E00C0040 24420160 */ addiu $v0, $v0, %lo(func_E00C0160) /* 3BCDA4 E00C0044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3BCDA8 E00C0048 3C02E00C */ lui $v0, %hi(D_E00C0710) -/* 3BCDAC E00C004C 24420710 */ addiu $v0, $v0, %lo(D_E00C0710) +/* 3BCDA8 E00C0048 3C02E00C */ lui $v0, %hi(func_E00C0710) +/* 3BCDAC E00C004C 24420710 */ addiu $v0, $v0, %lo(func_E00C0710) /* 3BCDB0 E00C0050 AFA20020 */ sw $v0, 0x20($sp) /* 3BCDB4 E00C0054 24020060 */ addiu $v0, $zero, 0x60 /* 3BCDB8 E00C0058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3BCD60/func_E00C0710.s b/asm/nonmatchings/code_3BCD60/func_E00C0710.s index 27391f7a8a..ef9278be57 100644 --- a/asm/nonmatchings/code_3BCD60/func_E00C0710.s +++ b/asm/nonmatchings/code_3BCD60/func_E00C0710.s @@ -3,8 +3,8 @@ glabel func_E00C0710 /* 3BD470 E00C0710 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3BD474 E00C0714 3C02E00C */ lui $v0, %hi(D_E00C0760) -/* 3BD478 E00C0718 24420760 */ addiu $v0, $v0, %lo(D_E00C0760) +/* 3BD474 E00C0714 3C02E00C */ lui $v0, %hi(func_E00C0760) +/* 3BD478 E00C0718 24420760 */ addiu $v0, $v0, %lo(func_E00C0760) /* 3BD47C E00C071C AFA2001C */ sw $v0, 0x1c($sp) /* 3BD480 E00C0720 2402FFF6 */ addiu $v0, $zero, -0xa /* 3BD484 E00C0724 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3C11D0/func_E00C2000.s b/asm/nonmatchings/code_3C11D0/func_E00C2000.s index d314774e36..1278a24524 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C2000.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C2000.s @@ -14,14 +14,14 @@ glabel func_E00C2000 /* 3C11F4 E00C2024 27A40010 */ addiu $a0, $sp, 0x10 /* 3C11F8 E00C2028 AFB1002C */ sw $s1, 0x2c($sp) /* 3C11FC E00C202C 8FB10064 */ lw $s1, 0x64($sp) -/* 3C1200 E00C2030 3C02E00C */ lui $v0, %hi(D_E00C2124) -/* 3C1204 E00C2034 24422124 */ addiu $v0, $v0, %lo(D_E00C2124) +/* 3C1200 E00C2030 3C02E00C */ lui $v0, %hi(func_E00C2124) +/* 3C1204 E00C2034 24422124 */ addiu $v0, $v0, %lo(func_E00C2124) /* 3C1208 E00C2038 AFA20018 */ sw $v0, 0x18($sp) -/* 3C120C E00C203C 3C02E00C */ lui $v0, %hi(D_E00C212C) -/* 3C1210 E00C2040 2442212C */ addiu $v0, $v0, %lo(D_E00C212C) +/* 3C120C E00C203C 3C02E00C */ lui $v0, %hi(func_E00C212C) +/* 3C1210 E00C2040 2442212C */ addiu $v0, $v0, %lo(func_E00C212C) /* 3C1214 E00C2044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3C1218 E00C2048 3C02E00C */ lui $v0, %hi(D_E00C21CC) -/* 3C121C E00C204C 244221CC */ addiu $v0, $v0, %lo(D_E00C21CC) +/* 3C1218 E00C2048 3C02E00C */ lui $v0, %hi(func_E00C21CC) +/* 3C121C E00C204C 244221CC */ addiu $v0, $v0, %lo(func_E00C21CC) /* 3C1220 E00C2050 AFA20020 */ sw $v0, 0x20($sp) /* 3C1224 E00C2054 24020061 */ addiu $v0, $zero, 0x61 /* 3C1228 E00C2058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3C11D0/func_E00C21CC.s b/asm/nonmatchings/code_3C11D0/func_E00C21CC.s index f5c186b09d..4a89337a41 100644 --- a/asm/nonmatchings/code_3C11D0/func_E00C21CC.s +++ b/asm/nonmatchings/code_3C11D0/func_E00C21CC.s @@ -3,8 +3,8 @@ glabel func_E00C21CC /* 3C139C E00C21CC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3C13A0 E00C21D0 3C02E00C */ lui $v0, %hi(D_E00C221C) -/* 3C13A4 E00C21D4 2442221C */ addiu $v0, $v0, %lo(D_E00C221C) +/* 3C13A0 E00C21D0 3C02E00C */ lui $v0, %hi(func_E00C221C) +/* 3C13A4 E00C21D4 2442221C */ addiu $v0, $v0, %lo(func_E00C221C) /* 3C13A8 E00C21D8 AFA2001C */ sw $v0, 0x1c($sp) /* 3C13AC E00C21DC 2402000A */ addiu $v0, $zero, 0xa /* 3C13B0 E00C21E0 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3CADF0/func_E00C4000.s b/asm/nonmatchings/code_3CADF0/func_E00C4000.s index 3c9208d224..fd260904ca 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C4000.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C4000.s @@ -14,14 +14,14 @@ glabel func_E00C4000 /* 3CAE14 E00C4024 27A40010 */ addiu $a0, $sp, 0x10 /* 3CAE18 E00C4028 AFB1002C */ sw $s1, 0x2c($sp) /* 3CAE1C E00C402C 8FB10064 */ lw $s1, 0x64($sp) -/* 3CAE20 E00C4030 3C02E00C */ lui $v0, %hi(D_E00C4170) -/* 3CAE24 E00C4034 24424170 */ addiu $v0, $v0, %lo(D_E00C4170) +/* 3CAE20 E00C4030 3C02E00C */ lui $v0, %hi(func_E00C4170) +/* 3CAE24 E00C4034 24424170 */ addiu $v0, $v0, %lo(func_E00C4170) /* 3CAE28 E00C4038 AFA20018 */ sw $v0, 0x18($sp) -/* 3CAE2C E00C403C 3C02E00C */ lui $v0, %hi(D_E00C4178) -/* 3CAE30 E00C4040 24424178 */ addiu $v0, $v0, %lo(D_E00C4178) +/* 3CAE2C E00C403C 3C02E00C */ lui $v0, %hi(func_E00C4178) +/* 3CAE30 E00C4040 24424178 */ addiu $v0, $v0, %lo(func_E00C4178) /* 3CAE34 E00C4044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3CAE38 E00C4048 3C02E00C */ lui $v0, %hi(D_E00C42C4) -/* 3CAE3C E00C404C 244242C4 */ addiu $v0, $v0, %lo(D_E00C42C4) +/* 3CAE38 E00C4048 3C02E00C */ lui $v0, %hi(func_E00C42C4) +/* 3CAE3C E00C404C 244242C4 */ addiu $v0, $v0, %lo(func_E00C42C4) /* 3CAE40 E00C4050 AFA20020 */ sw $v0, 0x20($sp) /* 3CAE44 E00C4054 24020062 */ addiu $v0, $zero, 0x62 /* 3CAE48 E00C4058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3CADF0/func_E00C42C4.s b/asm/nonmatchings/code_3CADF0/func_E00C42C4.s index 58b1de5426..6ecc77a7a3 100644 --- a/asm/nonmatchings/code_3CADF0/func_E00C42C4.s +++ b/asm/nonmatchings/code_3CADF0/func_E00C42C4.s @@ -3,8 +3,8 @@ glabel func_E00C42C4 /* 3CB0B4 E00C42C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3CB0B8 E00C42C8 3C02E00C */ lui $v0, %hi(D_E00C4308) -/* 3CB0BC E00C42CC 24424308 */ addiu $v0, $v0, %lo(D_E00C4308) +/* 3CB0B8 E00C42C8 3C02E00C */ lui $v0, %hi(func_E00C4308) +/* 3CB0BC E00C42CC 24424308 */ addiu $v0, $v0, %lo(func_E00C4308) /* 3CB0C0 E00C42D0 AFA2001C */ sw $v0, 0x1c($sp) /* 3CB0C4 E00C42D4 2402000A */ addiu $v0, $zero, 0xa /* 3CB0C8 E00C42D8 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C6000.s b/asm/nonmatchings/code_3CC9E0/func_E00C6000.s index 00be5b6c63..e4ab3f4884 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C6000.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C6000.s @@ -28,14 +28,14 @@ glabel func_E00C6000 /* 3CCA3C E00C605C AFA70084 */ sw $a3, 0x84($sp) /* 3CCA40 E00C6060 24130008 */ addiu $s3, $zero, 8 .LE00C6064: -/* 3CCA44 E00C6064 3C02E00C */ lui $v0, %hi(D_E00C6394) -/* 3CCA48 E00C6068 24426394 */ addiu $v0, $v0, %lo(D_E00C6394) +/* 3CCA44 E00C6064 3C02E00C */ lui $v0, %hi(func_E00C6394) +/* 3CCA48 E00C6068 24426394 */ addiu $v0, $v0, %lo(func_E00C6394) /* 3CCA4C E00C606C AFA20018 */ sw $v0, 0x18($sp) -/* 3CCA50 E00C6070 3C02E00C */ lui $v0, %hi(D_E00C639C) -/* 3CCA54 E00C6074 2442639C */ addiu $v0, $v0, %lo(D_E00C639C) +/* 3CCA50 E00C6070 3C02E00C */ lui $v0, %hi(func_E00C639C) +/* 3CCA54 E00C6074 2442639C */ addiu $v0, $v0, %lo(func_E00C639C) /* 3CCA58 E00C6078 AFA2001C */ sw $v0, 0x1c($sp) -/* 3CCA5C E00C607C 3C02E00C */ lui $v0, %hi(D_E00C6768) -/* 3CCA60 E00C6080 24426768 */ addiu $v0, $v0, %lo(D_E00C6768) +/* 3CCA5C E00C607C 3C02E00C */ lui $v0, %hi(func_E00C6768) +/* 3CCA60 E00C6080 24426768 */ addiu $v0, $v0, %lo(func_E00C6768) /* 3CCA64 E00C6084 AFA20020 */ sw $v0, 0x20($sp) /* 3CCA68 E00C6088 24020063 */ addiu $v0, $zero, 0x63 /* 3CCA6C E00C608C AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_3CC9E0/func_E00C6768.s b/asm/nonmatchings/code_3CC9E0/func_E00C6768.s index 67bfe2ab5b..1fa0e6f093 100644 --- a/asm/nonmatchings/code_3CC9E0/func_E00C6768.s +++ b/asm/nonmatchings/code_3CC9E0/func_E00C6768.s @@ -3,8 +3,8 @@ glabel func_E00C6768 /* 3CD148 E00C6768 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3CD14C E00C676C 3C02E00C */ lui $v0, %hi(D_E00C67B0) -/* 3CD150 E00C6770 244267B0 */ addiu $v0, $v0, %lo(D_E00C67B0) +/* 3CD14C E00C676C 3C02E00C */ lui $v0, %hi(func_E00C67B0) +/* 3CD150 E00C6770 244267B0 */ addiu $v0, $v0, %lo(func_E00C67B0) /* 3CD154 E00C6774 AFA2001C */ sw $v0, 0x1c($sp) /* 3CD158 E00C6778 2402000A */ addiu $v0, $zero, 0xa /* 3CD15C E00C677C AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C8000.s b/asm/nonmatchings/code_3CF3A0/func_E00C8000.s index 8932efa917..1e924eb57c 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8000.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8000.s @@ -20,14 +20,14 @@ glabel func_E00C8000 /* 3CF3DC E00C803C 27A40010 */ addiu $a0, $sp, 0x10 /* 3CF3E0 E00C8040 AFB1002C */ sw $s1, 0x2c($sp) /* 3CF3E4 E00C8044 8FB10090 */ lw $s1, 0x90($sp) -/* 3CF3E8 E00C8048 3C02E00D */ lui $v0, %hi(D_E00C8218) -/* 3CF3EC E00C804C 24428218 */ addiu $v0, $v0, %lo(D_E00C8218) +/* 3CF3E8 E00C8048 3C02E00D */ lui $v0, %hi(func_E00C8218) +/* 3CF3EC E00C804C 24428218 */ addiu $v0, $v0, %lo(func_E00C8218) /* 3CF3F0 E00C8050 AFA20018 */ sw $v0, 0x18($sp) -/* 3CF3F4 E00C8054 3C02E00D */ lui $v0, %hi(D_E00C8220) -/* 3CF3F8 E00C8058 24428220 */ addiu $v0, $v0, %lo(D_E00C8220) +/* 3CF3F4 E00C8054 3C02E00D */ lui $v0, %hi(func_E00C8220) +/* 3CF3F8 E00C8058 24428220 */ addiu $v0, $v0, %lo(func_E00C8220) /* 3CF3FC E00C805C AFA2001C */ sw $v0, 0x1c($sp) -/* 3CF400 E00C8060 3C02E00D */ lui $v0, %hi(D_E00C8404) -/* 3CF404 E00C8064 24428404 */ addiu $v0, $v0, %lo(D_E00C8404) +/* 3CF400 E00C8060 3C02E00D */ lui $v0, %hi(func_E00C8404) +/* 3CF404 E00C8064 24428404 */ addiu $v0, $v0, %lo(func_E00C8404) /* 3CF408 E00C8068 AFA20020 */ sw $v0, 0x20($sp) /* 3CF40C E00C806C 24020064 */ addiu $v0, $zero, 0x64 /* 3CF410 E00C8070 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3CF3A0/func_E00C8404.s b/asm/nonmatchings/code_3CF3A0/func_E00C8404.s index dde426e19a..f7f0f59c09 100644 --- a/asm/nonmatchings/code_3CF3A0/func_E00C8404.s +++ b/asm/nonmatchings/code_3CF3A0/func_E00C8404.s @@ -3,8 +3,8 @@ glabel func_E00C8404 /* 3CF7A4 E00C8404 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3CF7A8 E00C8408 3C02E00D */ lui $v0, %hi(D_E00C8454) -/* 3CF7AC E00C840C 24428454 */ addiu $v0, $v0, %lo(D_E00C8454) +/* 3CF7A8 E00C8408 3C02E00D */ lui $v0, %hi(func_E00C8454) +/* 3CF7AC E00C840C 24428454 */ addiu $v0, $v0, %lo(func_E00C8454) /* 3CF7B0 E00C8410 AFA2001C */ sw $v0, 0x1c($sp) /* 3CF7B4 E00C8414 2402000A */ addiu $v0, $zero, 0xa /* 3CF7B8 E00C8418 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D0500/func_E00CA000.s b/asm/nonmatchings/code_3D0500/func_E00CA000.s index 8e90846c65..d611ac25c2 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA000.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA000.s @@ -14,14 +14,14 @@ glabel func_E00CA000 /* 3D0524 E00CA024 27A40010 */ addiu $a0, $sp, 0x10 /* 3D0528 E00CA028 AFB30034 */ sw $s3, 0x34($sp) /* 3D052C E00CA02C 8FB3006C */ lw $s3, 0x6c($sp) -/* 3D0530 E00CA030 3C02E00D */ lui $v0, %hi(D_E00CA240) -/* 3D0534 E00CA034 2442A240 */ addiu $v0, $v0, %lo(D_E00CA240) +/* 3D0530 E00CA030 3C02E00D */ lui $v0, %hi(func_E00CA240) +/* 3D0534 E00CA034 2442A240 */ addiu $v0, $v0, %lo(func_E00CA240) /* 3D0538 E00CA038 AFA20018 */ sw $v0, 0x18($sp) -/* 3D053C E00CA03C 3C02E00D */ lui $v0, %hi(D_E00CA248) -/* 3D0540 E00CA040 2442A248 */ addiu $v0, $v0, %lo(D_E00CA248) +/* 3D053C E00CA03C 3C02E00D */ lui $v0, %hi(func_E00CA248) +/* 3D0540 E00CA040 2442A248 */ addiu $v0, $v0, %lo(func_E00CA248) /* 3D0544 E00CA044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D0548 E00CA048 3C02E00D */ lui $v0, %hi(D_E00CA484) -/* 3D054C E00CA04C 2442A484 */ addiu $v0, $v0, %lo(D_E00CA484) +/* 3D0548 E00CA048 3C02E00D */ lui $v0, %hi(func_E00CA484) +/* 3D054C E00CA04C 2442A484 */ addiu $v0, $v0, %lo(func_E00CA484) /* 3D0550 E00CA050 AFA20020 */ sw $v0, 0x20($sp) /* 3D0554 E00CA054 24020065 */ addiu $v0, $zero, 0x65 /* 3D0558 E00CA058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3D0500/func_E00CA484.s b/asm/nonmatchings/code_3D0500/func_E00CA484.s index bc30638606..7e35db30e3 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA484.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA484.s @@ -3,8 +3,8 @@ glabel func_E00CA484 /* 3D0984 E00CA484 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D0988 E00CA488 3C02E00D */ lui $v0, %hi(D_E00CA4CC) -/* 3D098C E00CA48C 2442A4CC */ addiu $v0, $v0, %lo(D_E00CA4CC) +/* 3D0988 E00CA488 3C02E00D */ lui $v0, %hi(func_E00CA4CC) +/* 3D098C E00CA48C 2442A4CC */ addiu $v0, $v0, %lo(func_E00CA4CC) /* 3D0990 E00CA490 AFA2001C */ sw $v0, 0x1c($sp) /* 3D0994 E00CA494 2402000A */ addiu $v0, $zero, 0xa /* 3D0998 E00CA498 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D1690/func_E00CC000.s b/asm/nonmatchings/code_3D1690/func_E00CC000.s index c25582b536..7c339b7e6a 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC000.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC000.s @@ -14,14 +14,14 @@ glabel func_E00CC000 /* 3D16B4 E00CC024 27A40010 */ addiu $a0, $sp, 0x10 /* 3D16B8 E00CC028 AFB00028 */ sw $s0, 0x28($sp) /* 3D16BC E00CC02C 8FB00084 */ lw $s0, 0x84($sp) -/* 3D16C0 E00CC030 3C02E00D */ lui $v0, %hi(D_E00CC250) -/* 3D16C4 E00CC034 2442C250 */ addiu $v0, $v0, %lo(D_E00CC250) +/* 3D16C0 E00CC030 3C02E00D */ lui $v0, %hi(func_E00CC250) +/* 3D16C4 E00CC034 2442C250 */ addiu $v0, $v0, %lo(func_E00CC250) /* 3D16C8 E00CC038 AFA20018 */ sw $v0, 0x18($sp) -/* 3D16CC E00CC03C 3C02E00D */ lui $v0, %hi(D_E00CC258) -/* 3D16D0 E00CC040 2442C258 */ addiu $v0, $v0, %lo(D_E00CC258) +/* 3D16CC E00CC03C 3C02E00D */ lui $v0, %hi(func_E00CC258) +/* 3D16D0 E00CC040 2442C258 */ addiu $v0, $v0, %lo(func_E00CC258) /* 3D16D4 E00CC044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D16D8 E00CC048 3C02E00D */ lui $v0, %hi(D_E00CC980) -/* 3D16DC E00CC04C 2442C980 */ addiu $v0, $v0, %lo(D_E00CC980) +/* 3D16D8 E00CC048 3C02E00D */ lui $v0, %hi(func_E00CC980) +/* 3D16DC E00CC04C 2442C980 */ addiu $v0, $v0, %lo(func_E00CC980) /* 3D16E0 E00CC050 AFA20020 */ sw $v0, 0x20($sp) /* 3D16E4 E00CC054 24020066 */ addiu $v0, $zero, 0x66 /* 3D16E8 E00CC058 AFBF0040 */ sw $ra, 0x40($sp) diff --git a/asm/nonmatchings/code_3D1690/func_E00CC980.s b/asm/nonmatchings/code_3D1690/func_E00CC980.s index 3565efe78d..b7b41d6d1e 100644 --- a/asm/nonmatchings/code_3D1690/func_E00CC980.s +++ b/asm/nonmatchings/code_3D1690/func_E00CC980.s @@ -3,8 +3,8 @@ glabel func_E00CC980 /* 3D2010 E00CC980 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D2014 E00CC984 3C02E00D */ lui $v0, %hi(D_E00CC9D0) -/* 3D2018 E00CC988 2442C9D0 */ addiu $v0, $v0, %lo(D_E00CC9D0) +/* 3D2014 E00CC984 3C02E00D */ lui $v0, %hi(func_E00CC9D0) +/* 3D2018 E00CC988 2442C9D0 */ addiu $v0, $v0, %lo(func_E00CC9D0) /* 3D201C E00CC98C AFA2001C */ sw $v0, 0x1c($sp) /* 3D2020 E00CC990 2402000A */ addiu $v0, $zero, 0xa /* 3D2024 E00CC994 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE000.s b/asm/nonmatchings/code_3D2AC0/func_E00CE000.s index bff376e564..bf8238b531 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE000.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE000.s @@ -12,14 +12,14 @@ glabel func_E00CE000 /* 3D2ADC E00CE01C 27A40010 */ addiu $a0, $sp, 0x10 /* 3D2AE0 E00CE020 AFB00028 */ sw $s0, 0x28($sp) /* 3D2AE4 E00CE024 8FB00084 */ lw $s0, 0x84($sp) -/* 3D2AE8 E00CE028 3C02E00D */ lui $v0, %hi(D_E00CE21C) -/* 3D2AEC E00CE02C 2442E21C */ addiu $v0, $v0, %lo(D_E00CE21C) +/* 3D2AE8 E00CE028 3C02E00D */ lui $v0, %hi(func_E00CE21C) +/* 3D2AEC E00CE02C 2442E21C */ addiu $v0, $v0, %lo(func_E00CE21C) /* 3D2AF0 E00CE030 AFA20018 */ sw $v0, 0x18($sp) -/* 3D2AF4 E00CE034 3C02E00D */ lui $v0, %hi(D_E00CE224) -/* 3D2AF8 E00CE038 2442E224 */ addiu $v0, $v0, %lo(D_E00CE224) +/* 3D2AF4 E00CE034 3C02E00D */ lui $v0, %hi(func_E00CE224) +/* 3D2AF8 E00CE038 2442E224 */ addiu $v0, $v0, %lo(func_E00CE224) /* 3D2AFC E00CE03C AFA2001C */ sw $v0, 0x1c($sp) -/* 3D2B00 E00CE040 3C02E00D */ lui $v0, %hi(D_E00CE428) -/* 3D2B04 E00CE044 2442E428 */ addiu $v0, $v0, %lo(D_E00CE428) +/* 3D2B00 E00CE040 3C02E00D */ lui $v0, %hi(func_E00CE428) +/* 3D2B04 E00CE044 2442E428 */ addiu $v0, $v0, %lo(func_E00CE428) /* 3D2B08 E00CE048 AFA20020 */ sw $v0, 0x20($sp) /* 3D2B0C E00CE04C 24020067 */ addiu $v0, $zero, 0x67 /* 3D2B10 E00CE050 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE428.s b/asm/nonmatchings/code_3D2AC0/func_E00CE428.s index 1c174d99d8..cebba0c8cd 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE428.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE428.s @@ -3,8 +3,8 @@ glabel func_E00CE428 /* 3D2EE8 E00CE428 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D2EEC E00CE42C 3C02E00D */ lui $v0, %hi(D_E00CE478) -/* 3D2EF0 E00CE430 2442E478 */ addiu $v0, $v0, %lo(D_E00CE478) +/* 3D2EEC E00CE42C 3C02E00D */ lui $v0, %hi(func_E00CE478) +/* 3D2EF0 E00CE430 2442E478 */ addiu $v0, $v0, %lo(func_E00CE478) /* 3D2EF4 E00CE434 AFA2001C */ sw $v0, 0x1c($sp) /* 3D2EF8 E00CE438 2402000A */ addiu $v0, $zero, 0xa /* 3D2EFC E00CE43C AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D3E20/func_E00D0000.s b/asm/nonmatchings/code_3D3E20/func_E00D0000.s index 58d1968c64..e381ab8a4b 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D0000.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D0000.s @@ -24,15 +24,15 @@ glabel func_E00D0000 /* 3D3E6C E00D004C 24100007 */ addiu $s0, $zero, 7 .LE00D0050: /* 3D3E70 E00D0050 26100001 */ addiu $s0, $s0, 1 -/* 3D3E74 E00D0054 3C02E00D */ lui $v0, %hi(D_E00D018C) -/* 3D3E78 E00D0058 2442018C */ addiu $v0, $v0, %lo(D_E00D018C) +/* 3D3E74 E00D0054 3C02E00D */ lui $v0, %hi(func_E00D018C) +/* 3D3E78 E00D0058 2442018C */ addiu $v0, $v0, %lo(func_E00D018C) /* 3D3E7C E00D005C AFA00010 */ sw $zero, 0x10($sp) /* 3D3E80 E00D0060 AC820008 */ sw $v0, 8($a0) -/* 3D3E84 E00D0064 3C02E00D */ lui $v0, %hi(D_E00D0194) -/* 3D3E88 E00D0068 24420194 */ addiu $v0, $v0, %lo(D_E00D0194) +/* 3D3E84 E00D0064 3C02E00D */ lui $v0, %hi(func_E00D0194) +/* 3D3E88 E00D0068 24420194 */ addiu $v0, $v0, %lo(func_E00D0194) /* 3D3E8C E00D006C AC82000C */ sw $v0, 0xc($a0) -/* 3D3E90 E00D0070 3C02E00D */ lui $v0, %hi(D_E00D0448) -/* 3D3E94 E00D0074 24420448 */ addiu $v0, $v0, %lo(D_E00D0448) +/* 3D3E90 E00D0070 3C02E00D */ lui $v0, %hi(func_E00D0448) +/* 3D3E94 E00D0074 24420448 */ addiu $v0, $v0, %lo(func_E00D0448) /* 3D3E98 E00D0078 AC820010 */ sw $v0, 0x10($a0) /* 3D3E9C E00D007C 24020068 */ addiu $v0, $zero, 0x68 /* 3D3EA0 E00D0080 AC800014 */ sw $zero, 0x14($a0) diff --git a/asm/nonmatchings/code_3D3E20/func_E00D0448.s b/asm/nonmatchings/code_3D3E20/func_E00D0448.s index 4be906ab4d..ba9e3681da 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D0448.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D0448.s @@ -3,8 +3,8 @@ glabel func_E00D0448 /* 3D4268 E00D0448 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D426C E00D044C 3C02E00D */ lui $v0, %hi(D_E00D048C) -/* 3D4270 E00D0450 2442048C */ addiu $v0, $v0, %lo(D_E00D048C) +/* 3D426C E00D044C 3C02E00D */ lui $v0, %hi(func_E00D048C) +/* 3D4270 E00D0450 2442048C */ addiu $v0, $v0, %lo(func_E00D048C) /* 3D4274 E00D0454 AFA2001C */ sw $v0, 0x1c($sp) /* 3D4278 E00D0458 24020028 */ addiu $v0, $zero, 0x28 /* 3D427C E00D045C AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_3D4970/func_E00D2000.s b/asm/nonmatchings/code_3D4970/func_E00D2000.s index e15f7ac834..28a14dce89 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2000.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2000.s @@ -14,14 +14,14 @@ glabel func_E00D2000 /* 3D4994 E00D2024 27A40010 */ addiu $a0, $sp, 0x10 /* 3D4998 E00D2028 AFB1002C */ sw $s1, 0x2c($sp) /* 3D499C E00D202C 8FB10064 */ lw $s1, 0x64($sp) -/* 3D49A0 E00D2030 3C02E00D */ lui $v0, %hi(D_E00D2118) -/* 3D49A4 E00D2034 24422118 */ addiu $v0, $v0, %lo(D_E00D2118) +/* 3D49A0 E00D2030 3C02E00D */ lui $v0, %hi(func_E00D2118) +/* 3D49A4 E00D2034 24422118 */ addiu $v0, $v0, %lo(func_E00D2118) /* 3D49A8 E00D2038 AFA20018 */ sw $v0, 0x18($sp) -/* 3D49AC E00D203C 3C02E00D */ lui $v0, %hi(D_E00D2120) -/* 3D49B0 E00D2040 24422120 */ addiu $v0, $v0, %lo(D_E00D2120) +/* 3D49AC E00D203C 3C02E00D */ lui $v0, %hi(func_E00D2120) +/* 3D49B0 E00D2040 24422120 */ addiu $v0, $v0, %lo(func_E00D2120) /* 3D49B4 E00D2044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D49B8 E00D2048 3C02E00D */ lui $v0, %hi(D_E00D2234) -/* 3D49BC E00D204C 24422234 */ addiu $v0, $v0, %lo(D_E00D2234) +/* 3D49B8 E00D2048 3C02E00D */ lui $v0, %hi(func_E00D2234) +/* 3D49BC E00D204C 24422234 */ addiu $v0, $v0, %lo(func_E00D2234) /* 3D49C0 E00D2050 AFA20020 */ sw $v0, 0x20($sp) /* 3D49C4 E00D2054 24020069 */ addiu $v0, $zero, 0x69 /* 3D49C8 E00D2058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3D4970/func_E00D2234.s b/asm/nonmatchings/code_3D4970/func_E00D2234.s index df04e23e9d..31122e444e 100644 --- a/asm/nonmatchings/code_3D4970/func_E00D2234.s +++ b/asm/nonmatchings/code_3D4970/func_E00D2234.s @@ -3,8 +3,8 @@ glabel func_E00D2234 /* 3D4BA4 E00D2234 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D4BA8 E00D2238 3C02E00D */ lui $v0, %hi(D_E00D2284) -/* 3D4BAC E00D223C 24422284 */ addiu $v0, $v0, %lo(D_E00D2284) +/* 3D4BA8 E00D2238 3C02E00D */ lui $v0, %hi(func_E00D2284) +/* 3D4BAC E00D223C 24422284 */ addiu $v0, $v0, %lo(func_E00D2284) /* 3D4BB0 E00D2240 AFA2001C */ sw $v0, 0x1c($sp) /* 3D4BB4 E00D2244 2402000A */ addiu $v0, $zero, 0xa /* 3D4BB8 E00D2248 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D5020/func_E00D6000.s b/asm/nonmatchings/code_3D5020/func_E00D6000.s index 8b9d2dfa20..ef114bc08d 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6000.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6000.s @@ -27,14 +27,14 @@ glabel func_E00D6000 /* 3D5078 E00D6058 3C08E00D */ lui $t0, %hi(D_E00D6E74) /* 3D507C E00D605C 01174021 */ addu $t0, $t0, $s7 /* 3D5080 E00D6060 91086E74 */ lbu $t0, %lo(D_E00D6E74)($t0) -/* 3D5084 E00D6064 3C02E00D */ lui $v0, %hi(D_E00D6718) -/* 3D5088 E00D6068 24426718 */ addiu $v0, $v0, %lo(D_E00D6718) +/* 3D5084 E00D6064 3C02E00D */ lui $v0, %hi(func_E00D6718) +/* 3D5088 E00D6068 24426718 */ addiu $v0, $v0, %lo(func_E00D6718) /* 3D508C E00D606C AFA20018 */ sw $v0, 0x18($sp) -/* 3D5090 E00D6070 3C02E00D */ lui $v0, %hi(D_E00D6720) -/* 3D5094 E00D6074 24426720 */ addiu $v0, $v0, %lo(D_E00D6720) +/* 3D5090 E00D6070 3C02E00D */ lui $v0, %hi(func_E00D6720) +/* 3D5094 E00D6074 24426720 */ addiu $v0, $v0, %lo(func_E00D6720) /* 3D5098 E00D6078 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D509C E00D607C 3C02E00D */ lui $v0, %hi(D_E00D693C) -/* 3D50A0 E00D6080 2442693C */ addiu $v0, $v0, %lo(D_E00D693C) +/* 3D509C E00D607C 3C02E00D */ lui $v0, %hi(func_E00D693C) +/* 3D50A0 E00D6080 2442693C */ addiu $v0, $v0, %lo(func_E00D693C) /* 3D50A4 E00D6084 AFA20020 */ sw $v0, 0x20($sp) /* 3D50A8 E00D6088 2402006B */ addiu $v0, $zero, 0x6b /* 3D50AC E00D608C AFA00010 */ sw $zero, 0x10($sp) diff --git a/asm/nonmatchings/code_3D5020/func_E00D693C.s b/asm/nonmatchings/code_3D5020/func_E00D693C.s index 3dd15e0c0d..f9f9c86a31 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D693C.s +++ b/asm/nonmatchings/code_3D5020/func_E00D693C.s @@ -3,8 +3,8 @@ glabel func_E00D693C /* 3D595C E00D693C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D5960 E00D6940 3C02E00D */ lui $v0, %hi(D_E00D6980) -/* 3D5964 E00D6944 24426980 */ addiu $v0, $v0, %lo(D_E00D6980) +/* 3D5960 E00D6940 3C02E00D */ lui $v0, %hi(func_E00D6980) +/* 3D5964 E00D6944 24426980 */ addiu $v0, $v0, %lo(func_E00D6980) /* 3D5968 E00D6948 AFA2001C */ sw $v0, 0x1c($sp) /* 3D596C E00D694C 2402000A */ addiu $v0, $zero, 0xa /* 3D5970 E00D6950 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8000.s b/asm/nonmatchings/code_3D67C0/func_E00D8000.s index 7e0483f549..c27bb4e1be 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8000.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8000.s @@ -14,17 +14,17 @@ glabel func_E00D8000 /* 3D67E4 E00D8024 27A40010 */ addiu $a0, $sp, 0x10 /* 3D67E8 E00D8028 AFB1002C */ sw $s1, 0x2c($sp) /* 3D67EC E00D802C 8FB10064 */ lw $s1, 0x64($sp) -/* 3D67F0 E00D8030 3C02E00E */ lui $v0, %hi(D_E00D8120) -/* 3D67F4 E00D8034 24428120 */ addiu $v0, $v0, %lo(D_E00D8120) +/* 3D67F0 E00D8030 3C02E00E */ lui $v0, %hi(func_E00D8120) +/* 3D67F4 E00D8034 24428120 */ addiu $v0, $v0, %lo(func_E00D8120) /* 3D67F8 E00D8038 AFA20018 */ sw $v0, 0x18($sp) -/* 3D67FC E00D803C 3C02E00E */ lui $v0, %hi(D_E00D8128) -/* 3D6800 E00D8040 24428128 */ addiu $v0, $v0, %lo(D_E00D8128) +/* 3D67FC E00D803C 3C02E00E */ lui $v0, %hi(func_E00D8128) +/* 3D6800 E00D8040 24428128 */ addiu $v0, $v0, %lo(func_E00D8128) /* 3D6804 E00D8044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D6808 E00D8048 3C02E00E */ lui $v0, %hi(D_E00D825C) -/* 3D680C E00D804C 2442825C */ addiu $v0, $v0, %lo(D_E00D825C) +/* 3D6808 E00D8048 3C02E00E */ lui $v0, %hi(func_E00D825C) +/* 3D680C E00D804C 2442825C */ addiu $v0, $v0, %lo(func_E00D825C) /* 3D6810 E00D8050 AFA20020 */ sw $v0, 0x20($sp) -/* 3D6814 E00D8054 3C02E00E */ lui $v0, %hi(D_E00D8264) -/* 3D6818 E00D8058 24428264 */ addiu $v0, $v0, %lo(D_E00D8264) +/* 3D6814 E00D8054 3C02E00E */ lui $v0, %hi(func_E00D8264) +/* 3D6818 E00D8058 24428264 */ addiu $v0, $v0, %lo(func_E00D8264) /* 3D681C E00D805C AFA20024 */ sw $v0, 0x24($sp) /* 3D6820 E00D8060 2402006C */ addiu $v0, $zero, 0x6c /* 3D6824 E00D8064 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3D67C0/func_E00D8630.s b/asm/nonmatchings/code_3D67C0/func_E00D8630.s index ec22e205e5..69c2480c5d 100644 --- a/asm/nonmatchings/code_3D67C0/func_E00D8630.s +++ b/asm/nonmatchings/code_3D67C0/func_E00D8630.s @@ -66,8 +66,8 @@ glabel func_E00D8630 /* 3D6EE0 E00D8720 C500001C */ lwc1 $f0, 0x1c($t0) /* 3D6EE4 E00D8724 E7A00024 */ swc1 $f0, 0x24($sp) /* 3D6EE8 E00D8728 C500001C */ lwc1 $f0, 0x1c($t0) -/* 3D6EEC E00D872C 3C02E00E */ lui $v0, %hi(D_E00D8334) -/* 3D6EF0 E00D8730 24428334 */ addiu $v0, $v0, %lo(D_E00D8334) +/* 3D6EEC E00D872C 3C02E00E */ lui $v0, %hi(func_E00D8334) +/* 3D6EF0 E00D8730 24428334 */ addiu $v0, $v0, %lo(func_E00D8334) /* 3D6EF4 E00D8734 E7A00028 */ swc1 $f0, 0x28($sp) /* 3D6EF8 E00D8738 C5000020 */ lwc1 $f0, 0x20($t0) /* 3D6EFC E00D873C 3C05E00E */ lui $a1, %hi(D_E00D87E0) diff --git a/asm/nonmatchings/code_3D7240/func_E00DA000.s b/asm/nonmatchings/code_3D7240/func_E00DA000.s index 69af733551..b94425b44a 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA000.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA000.s @@ -12,14 +12,14 @@ glabel func_E00DA000 /* 3D725C E00DA01C 27A40010 */ addiu $a0, $sp, 0x10 /* 3D7260 E00DA020 F7B80048 */ sdc1 $f24, 0x48($sp) /* 3D7264 E00DA024 4487C000 */ mtc1 $a3, $f24 -/* 3D7268 E00DA028 3C02E00E */ lui $v0, %hi(D_E00DA0FC) -/* 3D726C E00DA02C 2442A0FC */ addiu $v0, $v0, %lo(D_E00DA0FC) +/* 3D7268 E00DA028 3C02E00E */ lui $v0, %hi(func_E00DA0FC) +/* 3D726C E00DA02C 2442A0FC */ addiu $v0, $v0, %lo(func_E00DA0FC) /* 3D7270 E00DA030 AFA20018 */ sw $v0, 0x18($sp) -/* 3D7274 E00DA034 3C02E00E */ lui $v0, %hi(D_E00DA104) -/* 3D7278 E00DA038 2442A104 */ addiu $v0, $v0, %lo(D_E00DA104) +/* 3D7274 E00DA034 3C02E00E */ lui $v0, %hi(func_E00DA104) +/* 3D7278 E00DA038 2442A104 */ addiu $v0, $v0, %lo(func_E00DA104) /* 3D727C E00DA03C AFA2001C */ sw $v0, 0x1c($sp) -/* 3D7280 E00DA040 3C02E00E */ lui $v0, %hi(D_E00DA1E0) -/* 3D7284 E00DA044 2442A1E0 */ addiu $v0, $v0, %lo(D_E00DA1E0) +/* 3D7280 E00DA040 3C02E00E */ lui $v0, %hi(func_E00DA1E0) +/* 3D7284 E00DA044 2442A1E0 */ addiu $v0, $v0, %lo(func_E00DA1E0) /* 3D7288 E00DA048 AFA20020 */ sw $v0, 0x20($sp) /* 3D728C E00DA04C 2402006D */ addiu $v0, $zero, 0x6d /* 3D7290 E00DA050 AFBF0030 */ sw $ra, 0x30($sp) diff --git a/asm/nonmatchings/code_3D7240/func_E00DA1E0.s b/asm/nonmatchings/code_3D7240/func_E00DA1E0.s index ed1fcecf43..912e1a17d3 100644 --- a/asm/nonmatchings/code_3D7240/func_E00DA1E0.s +++ b/asm/nonmatchings/code_3D7240/func_E00DA1E0.s @@ -3,8 +3,8 @@ glabel func_E00DA1E0 /* 3D7420 E00DA1E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D7424 E00DA1E4 3C02E00E */ lui $v0, %hi(D_E00DA230) -/* 3D7428 E00DA1E8 2442A230 */ addiu $v0, $v0, %lo(D_E00DA230) +/* 3D7424 E00DA1E4 3C02E00E */ lui $v0, %hi(func_E00DA230) +/* 3D7428 E00DA1E8 2442A230 */ addiu $v0, $v0, %lo(func_E00DA230) /* 3D742C E00DA1EC AFA2001C */ sw $v0, 0x1c($sp) /* 3D7430 E00DA1F0 2402000A */ addiu $v0, $zero, 0xa /* 3D7434 E00DA1F4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC000.s b/asm/nonmatchings/code_3D7A70/func_E00DC000.s index ab2ed4ea2f..34b10ac89b 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC000.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC000.s @@ -14,14 +14,14 @@ glabel func_E00DC000 /* 3D7A94 E00DC024 27A40010 */ addiu $a0, $sp, 0x10 /* 3D7A98 E00DC028 AFB00028 */ sw $s0, 0x28($sp) /* 3D7A9C E00DC02C 8FB00074 */ lw $s0, 0x74($sp) -/* 3D7AA0 E00DC030 3C02E00E */ lui $v0, %hi(D_E00DC190) -/* 3D7AA4 E00DC034 2442C190 */ addiu $v0, $v0, %lo(D_E00DC190) +/* 3D7AA0 E00DC030 3C02E00E */ lui $v0, %hi(func_E00DC190) +/* 3D7AA4 E00DC034 2442C190 */ addiu $v0, $v0, %lo(func_E00DC190) /* 3D7AA8 E00DC038 AFA20018 */ sw $v0, 0x18($sp) -/* 3D7AAC E00DC03C 3C02E00E */ lui $v0, %hi(D_E00DC198) -/* 3D7AB0 E00DC040 2442C198 */ addiu $v0, $v0, %lo(D_E00DC198) +/* 3D7AAC E00DC03C 3C02E00E */ lui $v0, %hi(func_E00DC198) +/* 3D7AB0 E00DC040 2442C198 */ addiu $v0, $v0, %lo(func_E00DC198) /* 3D7AB4 E00DC044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D7AB8 E00DC048 3C02E00E */ lui $v0, %hi(D_E00DC2C0) -/* 3D7ABC E00DC04C 2442C2C0 */ addiu $v0, $v0, %lo(D_E00DC2C0) +/* 3D7AB8 E00DC048 3C02E00E */ lui $v0, %hi(func_E00DC2C0) +/* 3D7ABC E00DC04C 2442C2C0 */ addiu $v0, $v0, %lo(func_E00DC2C0) /* 3D7AC0 E00DC050 AFA20020 */ sw $v0, 0x20($sp) /* 3D7AC4 E00DC054 2402006E */ addiu $v0, $zero, 0x6e /* 3D7AC8 E00DC058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3D7A70/func_E00DC2C0.s b/asm/nonmatchings/code_3D7A70/func_E00DC2C0.s index 6ee6c87162..4bad18eb22 100644 --- a/asm/nonmatchings/code_3D7A70/func_E00DC2C0.s +++ b/asm/nonmatchings/code_3D7A70/func_E00DC2C0.s @@ -3,8 +3,8 @@ glabel func_E00DC2C0 /* 3D7D30 E00DC2C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D7D34 E00DC2C4 3C02E00E */ lui $v0, %hi(D_E00DC304) -/* 3D7D38 E00DC2C8 2442C304 */ addiu $v0, $v0, %lo(D_E00DC304) +/* 3D7D34 E00DC2C4 3C02E00E */ lui $v0, %hi(func_E00DC304) +/* 3D7D38 E00DC2C8 2442C304 */ addiu $v0, $v0, %lo(func_E00DC304) /* 3D7D3C E00DC2CC AFA2001C */ sw $v0, 0x1c($sp) /* 3D7D40 E00DC2D0 2402000A */ addiu $v0, $zero, 0xa /* 3D7D44 E00DC2D4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3D8720/func_E00DE000.s b/asm/nonmatchings/code_3D8720/func_E00DE000.s index 37d2358482..b9aeed23c7 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE000.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE000.s @@ -14,14 +14,14 @@ glabel func_E00DE000 /* 3D8744 E00DE024 27A40010 */ addiu $a0, $sp, 0x10 /* 3D8748 E00DE028 AFB1002C */ sw $s1, 0x2c($sp) /* 3D874C E00DE02C 8FB10064 */ lw $s1, 0x64($sp) -/* 3D8750 E00DE030 3C02E00E */ lui $v0, %hi(D_E00DE11C) -/* 3D8754 E00DE034 2442E11C */ addiu $v0, $v0, %lo(D_E00DE11C) +/* 3D8750 E00DE030 3C02E00E */ lui $v0, %hi(func_E00DE11C) +/* 3D8754 E00DE034 2442E11C */ addiu $v0, $v0, %lo(func_E00DE11C) /* 3D8758 E00DE038 AFA20018 */ sw $v0, 0x18($sp) -/* 3D875C E00DE03C 3C02E00E */ lui $v0, %hi(D_E00DE124) -/* 3D8760 E00DE040 2442E124 */ addiu $v0, $v0, %lo(D_E00DE124) +/* 3D875C E00DE03C 3C02E00E */ lui $v0, %hi(func_E00DE124) +/* 3D8760 E00DE040 2442E124 */ addiu $v0, $v0, %lo(func_E00DE124) /* 3D8764 E00DE044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3D8768 E00DE048 3C02E00E */ lui $v0, %hi(D_E00DE260) -/* 3D876C E00DE04C 2442E260 */ addiu $v0, $v0, %lo(D_E00DE260) +/* 3D8768 E00DE048 3C02E00E */ lui $v0, %hi(func_E00DE260) +/* 3D876C E00DE04C 2442E260 */ addiu $v0, $v0, %lo(func_E00DE260) /* 3D8770 E00DE050 AFA20020 */ sw $v0, 0x20($sp) /* 3D8774 E00DE054 2402006F */ addiu $v0, $zero, 0x6f /* 3D8778 E00DE058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3D8720/func_E00DE260.s b/asm/nonmatchings/code_3D8720/func_E00DE260.s index 29429bc726..68ab217ae5 100644 --- a/asm/nonmatchings/code_3D8720/func_E00DE260.s +++ b/asm/nonmatchings/code_3D8720/func_E00DE260.s @@ -3,8 +3,8 @@ glabel func_E00DE260 /* 3D8980 E00DE260 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3D8984 E00DE264 3C02E00E */ lui $v0, %hi(D_E00DE2A8) -/* 3D8988 E00DE268 2442E2A8 */ addiu $v0, $v0, %lo(D_E00DE2A8) +/* 3D8984 E00DE264 3C02E00E */ lui $v0, %hi(func_E00DE2A8) +/* 3D8988 E00DE268 2442E2A8 */ addiu $v0, $v0, %lo(func_E00DE2A8) /* 3D898C E00DE26C AFA2001C */ sw $v0, 0x1c($sp) /* 3D8990 E00DE270 24020006 */ addiu $v0, $zero, 6 /* 3D8994 E00DE274 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3DB460/func_E00E0000.s b/asm/nonmatchings/code_3DB460/func_E00E0000.s index fc1c395311..37bef84f74 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E0000.s +++ b/asm/nonmatchings/code_3DB460/func_E00E0000.s @@ -16,14 +16,14 @@ glabel func_E00E0000 /* 3DB48C E00E002C 27A40010 */ addiu $a0, $sp, 0x10 /* 3DB490 E00E0030 AFB20030 */ sw $s2, 0x30($sp) /* 3DB494 E00E0034 8FB20078 */ lw $s2, 0x78($sp) -/* 3DB498 E00E0038 3C02E00E */ lui $v0, %hi(D_E00E01D0) -/* 3DB49C E00E003C 244201D0 */ addiu $v0, $v0, %lo(D_E00E01D0) +/* 3DB498 E00E0038 3C02E00E */ lui $v0, %hi(func_E00E01D0) +/* 3DB49C E00E003C 244201D0 */ addiu $v0, $v0, %lo(func_E00E01D0) /* 3DB4A0 E00E0040 AFA20018 */ sw $v0, 0x18($sp) -/* 3DB4A4 E00E0044 3C02E00E */ lui $v0, %hi(D_E00E01D8) -/* 3DB4A8 E00E0048 244201D8 */ addiu $v0, $v0, %lo(D_E00E01D8) +/* 3DB4A4 E00E0044 3C02E00E */ lui $v0, %hi(func_E00E01D8) +/* 3DB4A8 E00E0048 244201D8 */ addiu $v0, $v0, %lo(func_E00E01D8) /* 3DB4AC E00E004C AFA2001C */ sw $v0, 0x1c($sp) -/* 3DB4B0 E00E0050 3C02E00E */ lui $v0, %hi(D_E00E05B0) -/* 3DB4B4 E00E0054 244205B0 */ addiu $v0, $v0, %lo(D_E00E05B0) +/* 3DB4B0 E00E0050 3C02E00E */ lui $v0, %hi(func_E00E05B0) +/* 3DB4B4 E00E0054 244205B0 */ addiu $v0, $v0, %lo(func_E00E05B0) /* 3DB4B8 E00E0058 AFA20020 */ sw $v0, 0x20($sp) /* 3DB4BC E00E005C 24020070 */ addiu $v0, $zero, 0x70 /* 3DB4C0 E00E0060 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3DB460/func_E00E05B0.s b/asm/nonmatchings/code_3DB460/func_E00E05B0.s index 1f070534a2..b1cff1ee2a 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E05B0.s +++ b/asm/nonmatchings/code_3DB460/func_E00E05B0.s @@ -3,8 +3,8 @@ glabel func_E00E05B0 /* 3DBA10 E00E05B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3DBA14 E00E05B4 3C02E00E */ lui $v0, %hi(D_E00E0600) -/* 3DBA18 E00E05B8 24420600 */ addiu $v0, $v0, %lo(D_E00E0600) +/* 3DBA14 E00E05B4 3C02E00E */ lui $v0, %hi(func_E00E0600) +/* 3DBA18 E00E05B8 24420600 */ addiu $v0, $v0, %lo(func_E00E0600) /* 3DBA1C E00E05BC AFA2001C */ sw $v0, 0x1c($sp) /* 3DBA20 E00E05C0 2402000A */ addiu $v0, $zero, 0xa /* 3DBA24 E00E05C4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3DC310/func_E00E2000.s b/asm/nonmatchings/code_3DC310/func_E00E2000.s index 027c189fb8..1d77699003 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E2000.s +++ b/asm/nonmatchings/code_3DC310/func_E00E2000.s @@ -14,14 +14,14 @@ glabel func_E00E2000 /* 3DC334 E00E2024 27A40010 */ addiu $a0, $sp, 0x10 /* 3DC338 E00E2028 AFB1002C */ sw $s1, 0x2c($sp) /* 3DC33C E00E202C 8FB10064 */ lw $s1, 0x64($sp) -/* 3DC340 E00E2030 3C02E00E */ lui $v0, %hi(D_E00E212C) -/* 3DC344 E00E2034 2442212C */ addiu $v0, $v0, %lo(D_E00E212C) +/* 3DC340 E00E2030 3C02E00E */ lui $v0, %hi(func_E00E212C) +/* 3DC344 E00E2034 2442212C */ addiu $v0, $v0, %lo(func_E00E212C) /* 3DC348 E00E2038 AFA20018 */ sw $v0, 0x18($sp) -/* 3DC34C E00E203C 3C02E00E */ lui $v0, %hi(D_E00E2134) -/* 3DC350 E00E2040 24422134 */ addiu $v0, $v0, %lo(D_E00E2134) +/* 3DC34C E00E203C 3C02E00E */ lui $v0, %hi(func_E00E2134) +/* 3DC350 E00E2040 24422134 */ addiu $v0, $v0, %lo(func_E00E2134) /* 3DC354 E00E2044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3DC358 E00E2048 3C02E00E */ lui $v0, %hi(D_E00E21C8) -/* 3DC35C E00E204C 244221C8 */ addiu $v0, $v0, %lo(D_E00E21C8) +/* 3DC358 E00E2048 3C02E00E */ lui $v0, %hi(func_E00E21C8) +/* 3DC35C E00E204C 244221C8 */ addiu $v0, $v0, %lo(func_E00E21C8) /* 3DC360 E00E2050 AFA20020 */ sw $v0, 0x20($sp) /* 3DC364 E00E2054 24020071 */ addiu $v0, $zero, 0x71 /* 3DC368 E00E2058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3DC310/func_E00E21C8.s b/asm/nonmatchings/code_3DC310/func_E00E21C8.s index 72721e3cab..394aa74f1c 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E21C8.s +++ b/asm/nonmatchings/code_3DC310/func_E00E21C8.s @@ -3,8 +3,8 @@ glabel func_E00E21C8 /* 3DC4D8 E00E21C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3DC4DC E00E21CC 3C02E00E */ lui $v0, %hi(D_E00E2218) -/* 3DC4E0 E00E21D0 24422218 */ addiu $v0, $v0, %lo(D_E00E2218) +/* 3DC4DC E00E21CC 3C02E00E */ lui $v0, %hi(func_E00E2218) +/* 3DC4E0 E00E21D0 24422218 */ addiu $v0, $v0, %lo(func_E00E2218) /* 3DC4E4 E00E21D4 AFA2001C */ sw $v0, 0x1c($sp) /* 3DC4E8 E00E21D8 2402000A */ addiu $v0, $zero, 0xa /* 3DC4EC E00E21DC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3DE000/func_E00E4000.s b/asm/nonmatchings/code_3DE000/func_E00E4000.s index 555ad094f7..de2dc26df9 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E4000.s +++ b/asm/nonmatchings/code_3DE000/func_E00E4000.s @@ -16,14 +16,14 @@ glabel func_E00E4000 /* 3DE02C E00E402C 27A40010 */ addiu $a0, $sp, 0x10 /* 3DE030 E00E4030 AFB40038 */ sw $s4, 0x38($sp) /* 3DE034 E00E4034 8FB40078 */ lw $s4, 0x78($sp) -/* 3DE038 E00E4038 3C02E00E */ lui $v0, %hi(D_E00E4288) -/* 3DE03C E00E403C 24424288 */ addiu $v0, $v0, %lo(D_E00E4288) +/* 3DE038 E00E4038 3C02E00E */ lui $v0, %hi(func_E00E4288) +/* 3DE03C E00E403C 24424288 */ addiu $v0, $v0, %lo(func_E00E4288) /* 3DE040 E00E4040 AFA20018 */ sw $v0, 0x18($sp) -/* 3DE044 E00E4044 3C02E00E */ lui $v0, %hi(D_E00E4290) -/* 3DE048 E00E4048 24424290 */ addiu $v0, $v0, %lo(D_E00E4290) +/* 3DE044 E00E4044 3C02E00E */ lui $v0, %hi(func_E00E4290) +/* 3DE048 E00E4048 24424290 */ addiu $v0, $v0, %lo(func_E00E4290) /* 3DE04C E00E404C AFA2001C */ sw $v0, 0x1c($sp) -/* 3DE050 E00E4050 3C02E00E */ lui $v0, %hi(D_E00E490C) -/* 3DE054 E00E4054 2442490C */ addiu $v0, $v0, %lo(D_E00E490C) +/* 3DE050 E00E4050 3C02E00E */ lui $v0, %hi(func_E00E490C) +/* 3DE054 E00E4054 2442490C */ addiu $v0, $v0, %lo(func_E00E490C) /* 3DE058 E00E4058 AFA20020 */ sw $v0, 0x20($sp) /* 3DE05C E00E405C 24020072 */ addiu $v0, $zero, 0x72 /* 3DE060 E00E4060 AFBF003C */ sw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_3DE000/func_E00E490C.s b/asm/nonmatchings/code_3DE000/func_E00E490C.s index 03ced74fd2..424d39e32c 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E490C.s +++ b/asm/nonmatchings/code_3DE000/func_E00E490C.s @@ -3,8 +3,8 @@ glabel func_E00E490C /* 3DE90C E00E490C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3DE910 E00E4910 3C02E00E */ lui $v0, %hi(D_E00E495C) -/* 3DE914 E00E4914 2442495C */ addiu $v0, $v0, %lo(D_E00E495C) +/* 3DE910 E00E4910 3C02E00E */ lui $v0, %hi(func_E00E495C) +/* 3DE914 E00E4914 2442495C */ addiu $v0, $v0, %lo(func_E00E495C) /* 3DE918 E00E4918 AFA2001C */ sw $v0, 0x1c($sp) /* 3DE91C E00E491C 24020007 */ addiu $v0, $zero, 7 /* 3DE920 E00E4920 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3E0930/func_E00E6000.s b/asm/nonmatchings/code_3E0930/func_E00E6000.s index 990a33de44..ba905b5f10 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E6000.s +++ b/asm/nonmatchings/code_3E0930/func_E00E6000.s @@ -16,14 +16,14 @@ glabel func_E00E6000 /* 3E095C E00E602C 27A40010 */ addiu $a0, $sp, 0x10 /* 3E0960 E00E6030 AFB20030 */ sw $s2, 0x30($sp) /* 3E0964 E00E6034 8FB20070 */ lw $s2, 0x70($sp) -/* 3E0968 E00E6038 3C02E00E */ lui $v0, %hi(D_E00E617C) -/* 3E096C E00E603C 2442617C */ addiu $v0, $v0, %lo(D_E00E617C) +/* 3E0968 E00E6038 3C02E00E */ lui $v0, %hi(func_E00E617C) +/* 3E096C E00E603C 2442617C */ addiu $v0, $v0, %lo(func_E00E617C) /* 3E0970 E00E6040 AFA20018 */ sw $v0, 0x18($sp) -/* 3E0974 E00E6044 3C02E00E */ lui $v0, %hi(D_E00E6184) -/* 3E0978 E00E6048 24426184 */ addiu $v0, $v0, %lo(D_E00E6184) +/* 3E0974 E00E6044 3C02E00E */ lui $v0, %hi(func_E00E6184) +/* 3E0978 E00E6048 24426184 */ addiu $v0, $v0, %lo(func_E00E6184) /* 3E097C E00E604C AFA2001C */ sw $v0, 0x1c($sp) -/* 3E0980 E00E6050 3C02E00E */ lui $v0, %hi(D_E00E64D4) -/* 3E0984 E00E6054 244264D4 */ addiu $v0, $v0, %lo(D_E00E64D4) +/* 3E0980 E00E6050 3C02E00E */ lui $v0, %hi(func_E00E64D4) +/* 3E0984 E00E6054 244264D4 */ addiu $v0, $v0, %lo(func_E00E64D4) /* 3E0988 E00E6058 AFA20020 */ sw $v0, 0x20($sp) /* 3E098C E00E605C 24020073 */ addiu $v0, $zero, 0x73 /* 3E0990 E00E6060 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3E0930/func_E00E64D4.s b/asm/nonmatchings/code_3E0930/func_E00E64D4.s index 5a4a7b93f8..7136036183 100644 --- a/asm/nonmatchings/code_3E0930/func_E00E64D4.s +++ b/asm/nonmatchings/code_3E0930/func_E00E64D4.s @@ -3,8 +3,8 @@ glabel func_E00E64D4 /* 3E0E04 E00E64D4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3E0E08 E00E64D8 3C02E00E */ lui $v0, %hi(D_E00E6524) -/* 3E0E0C E00E64DC 24426524 */ addiu $v0, $v0, %lo(D_E00E6524) +/* 3E0E08 E00E64D8 3C02E00E */ lui $v0, %hi(func_E00E6524) +/* 3E0E0C E00E64DC 24426524 */ addiu $v0, $v0, %lo(func_E00E6524) /* 3E0E10 E00E64E0 AFA2001C */ sw $v0, 0x1c($sp) /* 3E0E14 E00E64E4 2402000A */ addiu $v0, $zero, 0xa /* 3E0E18 E00E64E8 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3E1690/func_E00E8000.s b/asm/nonmatchings/code_3E1690/func_E00E8000.s index 2725b891d6..e5550d66f0 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E8000.s +++ b/asm/nonmatchings/code_3E1690/func_E00E8000.s @@ -10,14 +10,14 @@ glabel func_E00E8000 /* 3E16A4 E00E8014 27A40010 */ addiu $a0, $sp, 0x10 /* 3E16A8 E00E8018 F7BC0058 */ sdc1 $f28, 0x58($sp) /* 3E16AC E00E801C C7BC0084 */ lwc1 $f28, 0x84($sp) -/* 3E16B0 E00E8020 3C02E00F */ lui $v0, %hi(D_E00E825C) -/* 3E16B4 E00E8024 2442825C */ addiu $v0, $v0, %lo(D_E00E825C) +/* 3E16B0 E00E8020 3C02E00F */ lui $v0, %hi(func_E00E825C) +/* 3E16B4 E00E8024 2442825C */ addiu $v0, $v0, %lo(func_E00E825C) /* 3E16B8 E00E8028 AFA20018 */ sw $v0, 0x18($sp) -/* 3E16BC E00E802C 3C02E00F */ lui $v0, %hi(D_E00E8264) -/* 3E16C0 E00E8030 24428264 */ addiu $v0, $v0, %lo(D_E00E8264) +/* 3E16BC E00E802C 3C02E00F */ lui $v0, %hi(func_E00E8264) +/* 3E16C0 E00E8030 24428264 */ addiu $v0, $v0, %lo(func_E00E8264) /* 3E16C4 E00E8034 AFA2001C */ sw $v0, 0x1c($sp) -/* 3E16C8 E00E8038 3C02E00F */ lui $v0, %hi(D_E00E8374) -/* 3E16CC E00E803C 24428374 */ addiu $v0, $v0, %lo(D_E00E8374) +/* 3E16C8 E00E8038 3C02E00F */ lui $v0, %hi(func_E00E8374) +/* 3E16CC E00E803C 24428374 */ addiu $v0, $v0, %lo(func_E00E8374) /* 3E16D0 E00E8040 AFA20020 */ sw $v0, 0x20($sp) /* 3E16D4 E00E8044 24020074 */ addiu $v0, $zero, 0x74 /* 3E16D8 E00E8048 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3E1690/func_E00E8374.s b/asm/nonmatchings/code_3E1690/func_E00E8374.s index 5b8a15a129..9c12f19056 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E8374.s +++ b/asm/nonmatchings/code_3E1690/func_E00E8374.s @@ -3,8 +3,8 @@ glabel func_E00E8374 /* 3E1A04 E00E8374 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3E1A08 E00E8378 3C02E00F */ lui $v0, %hi(D_E00E83BC) -/* 3E1A0C E00E837C 244283BC */ addiu $v0, $v0, %lo(D_E00E83BC) +/* 3E1A08 E00E8378 3C02E00F */ lui $v0, %hi(func_E00E83BC) +/* 3E1A0C E00E837C 244283BC */ addiu $v0, $v0, %lo(func_E00E83BC) /* 3E1A10 E00E8380 AFA2001C */ sw $v0, 0x1c($sp) /* 3E1A14 E00E8384 2402000A */ addiu $v0, $zero, 0xa /* 3E1A18 E00E8388 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA000.s b/asm/nonmatchings/code_3E1EE0/func_E00EA000.s index 6a95bd7b60..e32a49e39d 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA000.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA000.s @@ -14,14 +14,14 @@ glabel func_E00EA000 /* 3E1F04 E00EA024 27A40010 */ addiu $a0, $sp, 0x10 /* 3E1F08 E00EA028 AFB1002C */ sw $s1, 0x2c($sp) /* 3E1F0C E00EA02C 8FB10064 */ lw $s1, 0x64($sp) -/* 3E1F10 E00EA030 3C02E00F */ lui $v0, %hi(D_E00EA190) -/* 3E1F14 E00EA034 2442A190 */ addiu $v0, $v0, %lo(D_E00EA190) +/* 3E1F10 E00EA030 3C02E00F */ lui $v0, %hi(func_E00EA190) +/* 3E1F14 E00EA034 2442A190 */ addiu $v0, $v0, %lo(func_E00EA190) /* 3E1F18 E00EA038 AFA20018 */ sw $v0, 0x18($sp) -/* 3E1F1C E00EA03C 3C02E00F */ lui $v0, %hi(D_E00EA198) -/* 3E1F20 E00EA040 2442A198 */ addiu $v0, $v0, %lo(D_E00EA198) +/* 3E1F1C E00EA03C 3C02E00F */ lui $v0, %hi(func_E00EA198) +/* 3E1F20 E00EA040 2442A198 */ addiu $v0, $v0, %lo(func_E00EA198) /* 3E1F24 E00EA044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3E1F28 E00EA048 3C02E00F */ lui $v0, %hi(D_E00EA520) -/* 3E1F2C E00EA04C 2442A520 */ addiu $v0, $v0, %lo(D_E00EA520) +/* 3E1F28 E00EA048 3C02E00F */ lui $v0, %hi(func_E00EA520) +/* 3E1F2C E00EA04C 2442A520 */ addiu $v0, $v0, %lo(func_E00EA520) /* 3E1F30 E00EA050 AFA20020 */ sw $v0, 0x20($sp) /* 3E1F34 E00EA054 24020075 */ addiu $v0, $zero, 0x75 /* 3E1F38 E00EA058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3E1EE0/func_E00EA520.s b/asm/nonmatchings/code_3E1EE0/func_E00EA520.s index 057a035779..ba6a66e17e 100644 --- a/asm/nonmatchings/code_3E1EE0/func_E00EA520.s +++ b/asm/nonmatchings/code_3E1EE0/func_E00EA520.s @@ -69,8 +69,8 @@ glabel func_E00EA520 /* 3E24F8 E00EA618 0000182D */ daddu $v1, $zero, $zero /* 3E24FC E00EA61C 0200202D */ daddu $a0, $s0, $zero .LE00EA620: -/* 3E2500 E00EA620 3C02E00F */ lui $v0, %hi(D_E00EA66C) -/* 3E2504 E00EA624 2442A66C */ addiu $v0, $v0, %lo(D_E00EA66C) +/* 3E2500 E00EA620 3C02E00F */ lui $v0, %hi(func_E00EA66C) +/* 3E2504 E00EA624 2442A66C */ addiu $v0, $v0, %lo(func_E00EA66C) /* 3E2508 E00EA628 AC82000C */ sw $v0, 0xc($a0) /* 3E250C E00EA62C 00031023 */ negu $v0, $v1 /* 3E2510 E00EA630 AC820004 */ sw $v0, 4($a0) diff --git a/asm/nonmatchings/code_3E43A0/func_E010A000.s b/asm/nonmatchings/code_3E43A0/func_E010A000.s index 89b39b4075..2cdb8840e9 100644 --- a/asm/nonmatchings/code_3E43A0/func_E010A000.s +++ b/asm/nonmatchings/code_3E43A0/func_E010A000.s @@ -14,14 +14,14 @@ glabel func_E010A000 /* 3E43C4 E010A024 27A40010 */ addiu $a0, $sp, 0x10 /* 3E43C8 E010A028 AFB1002C */ sw $s1, 0x2c($sp) /* 3E43CC E010A02C 8FB10070 */ lw $s1, 0x70($sp) -/* 3E43D0 E010A030 3C02E011 */ lui $v0, %hi(D_E010A184) -/* 3E43D4 E010A034 2442A184 */ addiu $v0, $v0, %lo(D_E010A184) +/* 3E43D0 E010A030 3C02E011 */ lui $v0, %hi(func_E010A184) +/* 3E43D4 E010A034 2442A184 */ addiu $v0, $v0, %lo(func_E010A184) /* 3E43D8 E010A038 AFA20018 */ sw $v0, 0x18($sp) -/* 3E43DC E010A03C 3C02E011 */ lui $v0, %hi(D_E010A18C) -/* 3E43E0 E010A040 2442A18C */ addiu $v0, $v0, %lo(D_E010A18C) +/* 3E43DC E010A03C 3C02E011 */ lui $v0, %hi(func_E010A18C) +/* 3E43E0 E010A040 2442A18C */ addiu $v0, $v0, %lo(func_E010A18C) /* 3E43E4 E010A044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3E43E8 E010A048 3C02E011 */ lui $v0, %hi(D_E010A4A0) -/* 3E43EC E010A04C 2442A4A0 */ addiu $v0, $v0, %lo(D_E010A4A0) +/* 3E43E8 E010A048 3C02E011 */ lui $v0, %hi(func_E010A4A0) +/* 3E43EC E010A04C 2442A4A0 */ addiu $v0, $v0, %lo(func_E010A4A0) /* 3E43F0 E010A050 AFA20020 */ sw $v0, 0x20($sp) /* 3E43F4 E010A054 24020077 */ addiu $v0, $zero, 0x77 /* 3E43F8 E010A058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3E43A0/func_E010A4A0.s b/asm/nonmatchings/code_3E43A0/func_E010A4A0.s index 64e7aaedaa..59ad11c6d5 100644 --- a/asm/nonmatchings/code_3E43A0/func_E010A4A0.s +++ b/asm/nonmatchings/code_3E43A0/func_E010A4A0.s @@ -3,8 +3,8 @@ glabel func_E010A4A0 /* 3E4840 E010A4A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3E4844 E010A4A4 3C02E011 */ lui $v0, %hi(D_E010A4E8) -/* 3E4848 E010A4A8 2442A4E8 */ addiu $v0, $v0, %lo(D_E010A4E8) +/* 3E4844 E010A4A4 3C02E011 */ lui $v0, %hi(func_E010A4E8) +/* 3E4848 E010A4A8 2442A4E8 */ addiu $v0, $v0, %lo(func_E010A4E8) /* 3E484C E010A4AC AFA2001C */ sw $v0, 0x1c($sp) /* 3E4850 E010A4B0 240202BC */ addiu $v0, $zero, 0x2bc /* 3E4854 E010A4B4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3E54C0/func_E010C000.s b/asm/nonmatchings/code_3E54C0/func_E010C000.s index 8b92f3cfb8..3bbe859a06 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C000.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C000.s @@ -14,14 +14,14 @@ glabel func_E010C000 /* 3E54E4 E010C024 27A40010 */ addiu $a0, $sp, 0x10 /* 3E54E8 E010C028 AFB1002C */ sw $s1, 0x2c($sp) /* 3E54EC E010C02C 8FB10064 */ lw $s1, 0x64($sp) -/* 3E54F0 E010C030 3C02E011 */ lui $v0, %hi(D_E010C190) -/* 3E54F4 E010C034 2442C190 */ addiu $v0, $v0, %lo(D_E010C190) +/* 3E54F0 E010C030 3C02E011 */ lui $v0, %hi(func_E010C190) +/* 3E54F4 E010C034 2442C190 */ addiu $v0, $v0, %lo(func_E010C190) /* 3E54F8 E010C038 AFA20018 */ sw $v0, 0x18($sp) -/* 3E54FC E010C03C 3C02E011 */ lui $v0, %hi(D_E010C198) -/* 3E5500 E010C040 2442C198 */ addiu $v0, $v0, %lo(D_E010C198) +/* 3E54FC E010C03C 3C02E011 */ lui $v0, %hi(func_E010C198) +/* 3E5500 E010C040 2442C198 */ addiu $v0, $v0, %lo(func_E010C198) /* 3E5504 E010C044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3E5508 E010C048 3C02E011 */ lui $v0, %hi(D_E010C354) -/* 3E550C E010C04C 2442C354 */ addiu $v0, $v0, %lo(D_E010C354) +/* 3E5508 E010C048 3C02E011 */ lui $v0, %hi(func_E010C354) +/* 3E550C E010C04C 2442C354 */ addiu $v0, $v0, %lo(func_E010C354) /* 3E5510 E010C050 AFA20020 */ sw $v0, 0x20($sp) /* 3E5514 E010C054 24020078 */ addiu $v0, $zero, 0x78 /* 3E5518 E010C058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_3E54C0/func_E010C354.s b/asm/nonmatchings/code_3E54C0/func_E010C354.s index 0f498f523c..d27c08601a 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C354.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C354.s @@ -3,8 +3,8 @@ glabel func_E010C354 /* 3E5814 E010C354 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3E5818 E010C358 3C02E011 */ lui $v0, %hi(D_E010C39C) -/* 3E581C E010C35C 2442C39C */ addiu $v0, $v0, %lo(D_E010C39C) +/* 3E5818 E010C358 3C02E011 */ lui $v0, %hi(func_E010C39C) +/* 3E581C E010C35C 2442C39C */ addiu $v0, $v0, %lo(func_E010C39C) /* 3E5820 E010C360 AFA2001C */ sw $v0, 0x1c($sp) /* 3E5824 E010C364 2402000A */ addiu $v0, $zero, 0xa /* 3E5828 E010C368 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3F83F0/func_E0110000.s b/asm/nonmatchings/code_3F83F0/func_E0110000.s index 0f1f7c2932..a7b1599cf5 100644 --- a/asm/nonmatchings/code_3F83F0/func_E0110000.s +++ b/asm/nonmatchings/code_3F83F0/func_E0110000.s @@ -14,14 +14,14 @@ glabel func_E0110000 /* 3F8414 E0110024 27A40010 */ addiu $a0, $sp, 0x10 /* 3F8418 E0110028 AFB00028 */ sw $s0, 0x28($sp) /* 3F841C E011002C 8FB0006C */ lw $s0, 0x6c($sp) -/* 3F8420 E0110030 3C02E011 */ lui $v0, %hi(D_E0110224) -/* 3F8424 E0110034 24420224 */ addiu $v0, $v0, %lo(D_E0110224) +/* 3F8420 E0110030 3C02E011 */ lui $v0, %hi(func_E0110224) +/* 3F8424 E0110034 24420224 */ addiu $v0, $v0, %lo(func_E0110224) /* 3F8428 E0110038 AFA20018 */ sw $v0, 0x18($sp) -/* 3F842C E011003C 3C02E011 */ lui $v0, %hi(D_E011022C) -/* 3F8430 E0110040 2442022C */ addiu $v0, $v0, %lo(D_E011022C) +/* 3F842C E011003C 3C02E011 */ lui $v0, %hi(func_E011022C) +/* 3F8430 E0110040 2442022C */ addiu $v0, $v0, %lo(func_E011022C) /* 3F8434 E0110044 AFA2001C */ sw $v0, 0x1c($sp) -/* 3F8438 E0110048 3C02E011 */ lui $v0, %hi(D_E01103A4) -/* 3F843C E011004C 244203A4 */ addiu $v0, $v0, %lo(D_E01103A4) +/* 3F8438 E0110048 3C02E011 */ lui $v0, %hi(func_E01103A4) +/* 3F843C E011004C 244203A4 */ addiu $v0, $v0, %lo(func_E01103A4) /* 3F8440 E0110050 AFA20020 */ sw $v0, 0x20($sp) /* 3F8444 E0110054 2402007A */ addiu $v0, $zero, 0x7a /* 3F8448 E0110058 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_3F83F0/func_E01103A4.s b/asm/nonmatchings/code_3F83F0/func_E01103A4.s index 0b7cf2f88e..b5bd2d630c 100644 --- a/asm/nonmatchings/code_3F83F0/func_E01103A4.s +++ b/asm/nonmatchings/code_3F83F0/func_E01103A4.s @@ -3,8 +3,8 @@ glabel func_E01103A4 /* 3F8794 E01103A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3F8798 E01103A8 3C02E011 */ lui $v0, %hi(D_E01103EC) -/* 3F879C E01103AC 244203EC */ addiu $v0, $v0, %lo(D_E01103EC) +/* 3F8798 E01103A8 3C02E011 */ lui $v0, %hi(func_E01103EC) +/* 3F879C E01103AC 244203EC */ addiu $v0, $v0, %lo(func_E01103EC) /* 3F87A0 E01103B0 AFA2001C */ sw $v0, 0x1c($sp) /* 3F87A4 E01103B4 2402000A */ addiu $v0, $zero, 0xa /* 3F87A8 E01103B8 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3F9E50/func_E0112000.s b/asm/nonmatchings/code_3F9E50/func_E0112000.s index fe13c7f1ae..f222778cec 100644 --- a/asm/nonmatchings/code_3F9E50/func_E0112000.s +++ b/asm/nonmatchings/code_3F9E50/func_E0112000.s @@ -16,14 +16,14 @@ glabel func_E0112000 /* 3F9E7C E011202C 27A40028 */ addiu $a0, $sp, 0x28 /* 3F9E80 E0112030 AFB3004C */ sw $s3, 0x4c($sp) /* 3F9E84 E0112034 8FB30094 */ lw $s3, 0x94($sp) -/* 3F9E88 E0112038 3C02E011 */ lui $v0, %hi(D_E01121B8) -/* 3F9E8C E011203C 244221B8 */ addiu $v0, $v0, %lo(D_E01121B8) +/* 3F9E88 E0112038 3C02E011 */ lui $v0, %hi(func_E01121B8) +/* 3F9E8C E011203C 244221B8 */ addiu $v0, $v0, %lo(func_E01121B8) /* 3F9E90 E0112040 AFA20030 */ sw $v0, 0x30($sp) -/* 3F9E94 E0112044 3C02E011 */ lui $v0, %hi(D_E01121C0) -/* 3F9E98 E0112048 244221C0 */ addiu $v0, $v0, %lo(D_E01121C0) +/* 3F9E94 E0112044 3C02E011 */ lui $v0, %hi(func_E01121C0) +/* 3F9E98 E0112048 244221C0 */ addiu $v0, $v0, %lo(func_E01121C0) /* 3F9E9C E011204C AFA20034 */ sw $v0, 0x34($sp) -/* 3F9EA0 E0112050 3C02E011 */ lui $v0, %hi(D_E01122E8) -/* 3F9EA4 E0112054 244222E8 */ addiu $v0, $v0, %lo(D_E01122E8) +/* 3F9EA0 E0112050 3C02E011 */ lui $v0, %hi(func_E01122E8) +/* 3F9EA4 E0112054 244222E8 */ addiu $v0, $v0, %lo(func_E01122E8) /* 3F9EA8 E0112058 AFA20038 */ sw $v0, 0x38($sp) /* 3F9EAC E011205C 2402007B */ addiu $v0, $zero, 0x7b /* 3F9EB0 E0112060 AFBF0050 */ sw $ra, 0x50($sp) diff --git a/asm/nonmatchings/code_3F9E50/func_E01122E8.s b/asm/nonmatchings/code_3F9E50/func_E01122E8.s index 29928d55ec..c46e7d0d37 100644 --- a/asm/nonmatchings/code_3F9E50/func_E01122E8.s +++ b/asm/nonmatchings/code_3F9E50/func_E01122E8.s @@ -3,8 +3,8 @@ glabel func_E01122E8 /* 3FA138 E01122E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3FA13C E01122EC 3C02E011 */ lui $v0, %hi(D_E01124CC) -/* 3FA140 E01122F0 244224CC */ addiu $v0, $v0, %lo(D_E01124CC) +/* 3FA13C E01122EC 3C02E011 */ lui $v0, %hi(func_E01124CC) +/* 3FA140 E01122F0 244224CC */ addiu $v0, $v0, %lo(func_E01124CC) /* 3FA144 E01122F4 AFA2001C */ sw $v0, 0x1c($sp) /* 3FA148 E01122F8 2402000A */ addiu $v0, $zero, 0xa /* 3FA14C E01122FC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_3FEAE0/func_E0114000.s b/asm/nonmatchings/code_3FEAE0/func_E0114000.s index 53239f38b3..3bf7376dee 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E0114000.s +++ b/asm/nonmatchings/code_3FEAE0/func_E0114000.s @@ -4,14 +4,14 @@ glabel func_E0114000 /* 3FEAE0 E0114000 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 3FEAE4 E0114004 27A40010 */ addiu $a0, $sp, 0x10 -/* 3FEAE8 E0114008 3C02E011 */ lui $v0, %hi(D_E01140D4) -/* 3FEAEC E011400C 244240D4 */ addiu $v0, $v0, %lo(D_E01140D4) +/* 3FEAE8 E0114008 3C02E011 */ lui $v0, %hi(func_E01140D4) +/* 3FEAEC E011400C 244240D4 */ addiu $v0, $v0, %lo(func_E01140D4) /* 3FEAF0 E0114010 AFA20018 */ sw $v0, 0x18($sp) -/* 3FEAF4 E0114014 3C02E011 */ lui $v0, %hi(D_E01140DC) -/* 3FEAF8 E0114018 244240DC */ addiu $v0, $v0, %lo(D_E01140DC) +/* 3FEAF4 E0114014 3C02E011 */ lui $v0, %hi(func_E01140DC) +/* 3FEAF8 E0114018 244240DC */ addiu $v0, $v0, %lo(func_E01140DC) /* 3FEAFC E011401C AFA2001C */ sw $v0, 0x1c($sp) -/* 3FEB00 E0114020 3C02E011 */ lui $v0, %hi(D_E0114340) -/* 3FEB04 E0114024 24424340 */ addiu $v0, $v0, %lo(D_E0114340) +/* 3FEB00 E0114020 3C02E011 */ lui $v0, %hi(func_E0114340) +/* 3FEB04 E0114024 24424340 */ addiu $v0, $v0, %lo(func_E0114340) /* 3FEB08 E0114028 AFA20020 */ sw $v0, 0x20($sp) /* 3FEB0C E011402C 2402007C */ addiu $v0, $zero, 0x7c /* 3FEB10 E0114030 AFBF002C */ sw $ra, 0x2c($sp) diff --git a/asm/nonmatchings/code_3FEAE0/func_E0114340.s b/asm/nonmatchings/code_3FEAE0/func_E0114340.s index ee7dc55308..827bdda87e 100644 --- a/asm/nonmatchings/code_3FEAE0/func_E0114340.s +++ b/asm/nonmatchings/code_3FEAE0/func_E0114340.s @@ -3,8 +3,8 @@ glabel func_E0114340 /* 3FEE20 E0114340 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3FEE24 E0114344 3C02E011 */ lui $v0, %hi(D_E0114388) -/* 3FEE28 E0114348 24424388 */ addiu $v0, $v0, %lo(D_E0114388) +/* 3FEE24 E0114344 3C02E011 */ lui $v0, %hi(func_E0114388) +/* 3FEE28 E0114348 24424388 */ addiu $v0, $v0, %lo(func_E0114388) /* 3FEE2C E011434C AFA2001C */ sw $v0, 0x1c($sp) /* 3FEE30 E0114350 2402000A */ addiu $v0, $zero, 0xa /* 3FEE34 E0114354 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_402640/func_E0116000.s b/asm/nonmatchings/code_402640/func_E0116000.s index f4d37fa0f4..52d4e9499d 100644 --- a/asm/nonmatchings/code_402640/func_E0116000.s +++ b/asm/nonmatchings/code_402640/func_E0116000.s @@ -16,14 +16,14 @@ glabel func_E0116000 /* 40266C E011602C 27A40010 */ addiu $a0, $sp, 0x10 /* 402670 E0116030 AFB20030 */ sw $s2, 0x30($sp) /* 402674 E0116034 8FB20074 */ lw $s2, 0x74($sp) -/* 402678 E0116038 3C02E011 */ lui $v0, %hi(D_E0116184) -/* 40267C E011603C 24426184 */ addiu $v0, $v0, %lo(D_E0116184) +/* 402678 E0116038 3C02E011 */ lui $v0, %hi(func_E0116184) +/* 40267C E011603C 24426184 */ addiu $v0, $v0, %lo(func_E0116184) /* 402680 E0116040 AFA20018 */ sw $v0, 0x18($sp) -/* 402684 E0116044 3C02E011 */ lui $v0, %hi(D_E011618C) -/* 402688 E0116048 2442618C */ addiu $v0, $v0, %lo(D_E011618C) +/* 402684 E0116044 3C02E011 */ lui $v0, %hi(func_E011618C) +/* 402688 E0116048 2442618C */ addiu $v0, $v0, %lo(func_E011618C) /* 40268C E011604C AFA2001C */ sw $v0, 0x1c($sp) -/* 402690 E0116050 3C02E011 */ lui $v0, %hi(D_E01166A0) -/* 402694 E0116054 244266A0 */ addiu $v0, $v0, %lo(D_E01166A0) +/* 402690 E0116050 3C02E011 */ lui $v0, %hi(func_E01166A0) +/* 402694 E0116054 244266A0 */ addiu $v0, $v0, %lo(func_E01166A0) /* 402698 E0116058 AFA20020 */ sw $v0, 0x20($sp) /* 40269C E011605C 2402007D */ addiu $v0, $zero, 0x7d /* 4026A0 E0116060 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_402640/func_E01166A0.s b/asm/nonmatchings/code_402640/func_E01166A0.s index a55644b84e..dbd7d0d9b0 100644 --- a/asm/nonmatchings/code_402640/func_E01166A0.s +++ b/asm/nonmatchings/code_402640/func_E01166A0.s @@ -3,8 +3,8 @@ glabel func_E01166A0 /* 402CE0 E01166A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 402CE4 E01166A4 3C02E011 */ lui $v0, %hi(D_E0116884) -/* 402CE8 E01166A8 24426884 */ addiu $v0, $v0, %lo(D_E0116884) +/* 402CE4 E01166A4 3C02E011 */ lui $v0, %hi(func_E0116884) +/* 402CE8 E01166A8 24426884 */ addiu $v0, $v0, %lo(func_E0116884) /* 402CEC E01166AC AFA2001C */ sw $v0, 0x1c($sp) /* 402CF0 E01166B0 2402000A */ addiu $v0, $zero, 0xa /* 402CF4 E01166B4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_403400/func_E0118000.s b/asm/nonmatchings/code_403400/func_E0118000.s index 14ef7ee0ed..b86fa7b9a6 100644 --- a/asm/nonmatchings/code_403400/func_E0118000.s +++ b/asm/nonmatchings/code_403400/func_E0118000.s @@ -16,14 +16,14 @@ glabel func_E0118000 /* 40342C E011802C 27A40010 */ addiu $a0, $sp, 0x10 /* 403430 E0118030 AFB00028 */ sw $s0, 0x28($sp) /* 403434 E0118034 8FB00084 */ lw $s0, 0x84($sp) -/* 403438 E0118038 3C02E012 */ lui $v0, %hi(D_E01182EC) -/* 40343C E011803C 244282EC */ addiu $v0, $v0, %lo(D_E01182EC) +/* 403438 E0118038 3C02E012 */ lui $v0, %hi(func_E01182EC) +/* 40343C E011803C 244282EC */ addiu $v0, $v0, %lo(func_E01182EC) /* 403440 E0118040 AFA20018 */ sw $v0, 0x18($sp) -/* 403444 E0118044 3C02E012 */ lui $v0, %hi(D_E01182F4) -/* 403448 E0118048 244282F4 */ addiu $v0, $v0, %lo(D_E01182F4) +/* 403444 E0118044 3C02E012 */ lui $v0, %hi(func_E01182F4) +/* 403448 E0118048 244282F4 */ addiu $v0, $v0, %lo(func_E01182F4) /* 40344C E011804C AFA2001C */ sw $v0, 0x1c($sp) -/* 403450 E0118050 3C02E012 */ lui $v0, %hi(D_E0118454) -/* 403454 E0118054 24428454 */ addiu $v0, $v0, %lo(D_E0118454) +/* 403450 E0118050 3C02E012 */ lui $v0, %hi(func_E0118454) +/* 403454 E0118054 24428454 */ addiu $v0, $v0, %lo(func_E0118454) /* 403458 E0118058 AFA20020 */ sw $v0, 0x20($sp) /* 40345C E011805C 2402007E */ addiu $v0, $zero, 0x7e /* 403460 E0118060 AFBF0038 */ sw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_403400/func_E0118454.s b/asm/nonmatchings/code_403400/func_E0118454.s index 184792c547..b4fd5df3af 100644 --- a/asm/nonmatchings/code_403400/func_E0118454.s +++ b/asm/nonmatchings/code_403400/func_E0118454.s @@ -3,8 +3,8 @@ glabel func_E0118454 /* 403854 E0118454 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 403858 E0118458 3C02E012 */ lui $v0, %hi(D_E011849C) -/* 40385C E011845C 2442849C */ addiu $v0, $v0, %lo(D_E011849C) +/* 403858 E0118458 3C02E012 */ lui $v0, %hi(func_E011849C) +/* 40385C E011845C 2442849C */ addiu $v0, $v0, %lo(func_E011849C) /* 403860 E0118460 AFA2001C */ sw $v0, 0x1c($sp) /* 403864 E0118464 2402000A */ addiu $v0, $zero, 0xa /* 403868 E0118468 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_404220/func_E011A000.s b/asm/nonmatchings/code_404220/func_E011A000.s index a1fc87ed1d..0370ae6b8c 100644 --- a/asm/nonmatchings/code_404220/func_E011A000.s +++ b/asm/nonmatchings/code_404220/func_E011A000.s @@ -8,17 +8,17 @@ glabel func_E011A000 /* 40422C E011A00C 27A40010 */ addiu $a0, $sp, 0x10 /* 404230 E011A010 AFB20030 */ sw $s2, 0x30($sp) /* 404234 E011A014 8FB2004C */ lw $s2, 0x4c($sp) -/* 404238 E011A018 3C02E012 */ lui $v0, %hi(D_E011A0FC) -/* 40423C E011A01C 2442A0FC */ addiu $v0, $v0, %lo(D_E011A0FC) +/* 404238 E011A018 3C02E012 */ lui $v0, %hi(func_E011A0FC) +/* 40423C E011A01C 2442A0FC */ addiu $v0, $v0, %lo(func_E011A0FC) /* 404240 E011A020 AFA20018 */ sw $v0, 0x18($sp) -/* 404244 E011A024 3C02E012 */ lui $v0, %hi(D_E011A104) -/* 404248 E011A028 2442A104 */ addiu $v0, $v0, %lo(D_E011A104) +/* 404244 E011A024 3C02E012 */ lui $v0, %hi(func_E011A104) +/* 404248 E011A028 2442A104 */ addiu $v0, $v0, %lo(func_E011A104) /* 40424C E011A02C AFA2001C */ sw $v0, 0x1c($sp) -/* 404250 E011A030 3C02E012 */ lui $v0, %hi(D_E011A398) -/* 404254 E011A034 2442A398 */ addiu $v0, $v0, %lo(D_E011A398) +/* 404250 E011A030 3C02E012 */ lui $v0, %hi(func_E011A398) +/* 404254 E011A034 2442A398 */ addiu $v0, $v0, %lo(func_E011A398) /* 404258 E011A038 AFA20020 */ sw $v0, 0x20($sp) -/* 40425C E011A03C 3C02E012 */ lui $v0, %hi(D_E011A3A0) -/* 404260 E011A040 2442A3A0 */ addiu $v0, $v0, %lo(D_E011A3A0) +/* 40425C E011A03C 3C02E012 */ lui $v0, %hi(func_E011A3A0) +/* 404260 E011A040 2442A3A0 */ addiu $v0, $v0, %lo(func_E011A3A0) /* 404264 E011A044 AFA20024 */ sw $v0, 0x24($sp) /* 404268 E011A048 2402007F */ addiu $v0, $zero, 0x7f /* 40426C E011A04C AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_409990/func_E011E000.s b/asm/nonmatchings/code_409990/func_E011E000.s index 87d85e5978..431783ce3e 100644 --- a/asm/nonmatchings/code_409990/func_E011E000.s +++ b/asm/nonmatchings/code_409990/func_E011E000.s @@ -16,14 +16,14 @@ glabel func_E011E000 /* 4099BC E011E02C 27A40028 */ addiu $a0, $sp, 0x28 /* 4099C0 E011E030 AFB20048 */ sw $s2, 0x48($sp) /* 4099C4 E011E034 8FB2008C */ lw $s2, 0x8c($sp) -/* 4099C8 E011E038 3C02E012 */ lui $v0, %hi(D_E011E18C) -/* 4099CC E011E03C 2442E18C */ addiu $v0, $v0, %lo(D_E011E18C) +/* 4099C8 E011E038 3C02E012 */ lui $v0, %hi(func_E011E18C) +/* 4099CC E011E03C 2442E18C */ addiu $v0, $v0, %lo(func_E011E18C) /* 4099D0 E011E040 AFA20030 */ sw $v0, 0x30($sp) -/* 4099D4 E011E044 3C02E012 */ lui $v0, %hi(D_E011E194) -/* 4099D8 E011E048 2442E194 */ addiu $v0, $v0, %lo(D_E011E194) +/* 4099D4 E011E044 3C02E012 */ lui $v0, %hi(func_E011E194) +/* 4099D8 E011E048 2442E194 */ addiu $v0, $v0, %lo(func_E011E194) /* 4099DC E011E04C AFA20034 */ sw $v0, 0x34($sp) -/* 4099E0 E011E050 3C02E012 */ lui $v0, %hi(D_E011E530) -/* 4099E4 E011E054 2442E530 */ addiu $v0, $v0, %lo(D_E011E530) +/* 4099E0 E011E050 3C02E012 */ lui $v0, %hi(func_E011E530) +/* 4099E4 E011E054 2442E530 */ addiu $v0, $v0, %lo(func_E011E530) /* 4099E8 E011E058 AFA20038 */ sw $v0, 0x38($sp) /* 4099EC E011E05C 24020081 */ addiu $v0, $zero, 0x81 /* 4099F0 E011E060 AFBF0050 */ sw $ra, 0x50($sp) diff --git a/asm/nonmatchings/code_409990/func_E011E530.s b/asm/nonmatchings/code_409990/func_E011E530.s index 452627c198..708b8a26a1 100644 --- a/asm/nonmatchings/code_409990/func_E011E530.s +++ b/asm/nonmatchings/code_409990/func_E011E530.s @@ -3,8 +3,8 @@ glabel func_E011E530 /* 409EC0 E011E530 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 409EC4 E011E534 3C02E012 */ lui $v0, %hi(D_E011E578) -/* 409EC8 E011E538 2442E578 */ addiu $v0, $v0, %lo(D_E011E578) +/* 409EC4 E011E534 3C02E012 */ lui $v0, %hi(func_E011E578) +/* 409EC8 E011E538 2442E578 */ addiu $v0, $v0, %lo(func_E011E578) /* 409ECC E011E53C AFA2001C */ sw $v0, 0x1c($sp) /* 409ED0 E011E540 24020005 */ addiu $v0, $zero, 5 /* 409ED4 E011E544 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_40B3F0/func_E0120000.s b/asm/nonmatchings/code_40B3F0/func_E0120000.s index df8ee3edaf..fdd5917ae4 100644 --- a/asm/nonmatchings/code_40B3F0/func_E0120000.s +++ b/asm/nonmatchings/code_40B3F0/func_E0120000.s @@ -14,14 +14,14 @@ glabel func_E0120000 /* 40B414 E0120024 27A40010 */ addiu $a0, $sp, 0x10 /* 40B418 E0120028 AFB1002C */ sw $s1, 0x2c($sp) /* 40B41C E012002C 8FB10064 */ lw $s1, 0x64($sp) -/* 40B420 E0120030 3C02E012 */ lui $v0, %hi(D_E0120134) -/* 40B424 E0120034 24420134 */ addiu $v0, $v0, %lo(D_E0120134) +/* 40B420 E0120030 3C02E012 */ lui $v0, %hi(func_E0120134) +/* 40B424 E0120034 24420134 */ addiu $v0, $v0, %lo(func_E0120134) /* 40B428 E0120038 AFA20018 */ sw $v0, 0x18($sp) -/* 40B42C E012003C 3C02E012 */ lui $v0, %hi(D_E012013C) -/* 40B430 E0120040 2442013C */ addiu $v0, $v0, %lo(D_E012013C) +/* 40B42C E012003C 3C02E012 */ lui $v0, %hi(func_E012013C) +/* 40B430 E0120040 2442013C */ addiu $v0, $v0, %lo(func_E012013C) /* 40B434 E0120044 AFA2001C */ sw $v0, 0x1c($sp) -/* 40B438 E0120048 3C02E012 */ lui $v0, %hi(D_E012039C) -/* 40B43C E012004C 2442039C */ addiu $v0, $v0, %lo(D_E012039C) +/* 40B438 E0120048 3C02E012 */ lui $v0, %hi(func_E012039C) +/* 40B43C E012004C 2442039C */ addiu $v0, $v0, %lo(func_E012039C) /* 40B440 E0120050 AFA20020 */ sw $v0, 0x20($sp) /* 40B444 E0120054 24020082 */ addiu $v0, $zero, 0x82 /* 40B448 E0120058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_40B3F0/func_E012039C.s b/asm/nonmatchings/code_40B3F0/func_E012039C.s index 57c7267867..00839927de 100644 --- a/asm/nonmatchings/code_40B3F0/func_E012039C.s +++ b/asm/nonmatchings/code_40B3F0/func_E012039C.s @@ -3,8 +3,8 @@ glabel func_E012039C /* 40B78C E012039C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 40B790 E01203A0 3C02E012 */ lui $v0, %hi(D_E01203E4) -/* 40B794 E01203A4 244203E4 */ addiu $v0, $v0, %lo(D_E01203E4) +/* 40B790 E01203A0 3C02E012 */ lui $v0, %hi(func_E01203E4) +/* 40B794 E01203A4 244203E4 */ addiu $v0, $v0, %lo(func_E01203E4) /* 40B798 E01203A8 AFA2001C */ sw $v0, 0x1c($sp) /* 40B79C E01203AC 2402000A */ addiu $v0, $zero, 0xa /* 40B7A0 E01203B0 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_40C5A0/func_E0122000.s b/asm/nonmatchings/code_40C5A0/func_E0122000.s index 7f83ad0ecd..4d8b4b8c10 100644 --- a/asm/nonmatchings/code_40C5A0/func_E0122000.s +++ b/asm/nonmatchings/code_40C5A0/func_E0122000.s @@ -14,14 +14,14 @@ glabel func_E0122000 /* 40C5C4 E0122024 27A40010 */ addiu $a0, $sp, 0x10 /* 40C5C8 E0122028 AFB20030 */ sw $s2, 0x30($sp) /* 40C5CC E012202C 8FB20064 */ lw $s2, 0x64($sp) -/* 40C5D0 E0122030 3C02E012 */ lui $v0, %hi(D_E0122174) -/* 40C5D4 E0122034 24422174 */ addiu $v0, $v0, %lo(D_E0122174) +/* 40C5D0 E0122030 3C02E012 */ lui $v0, %hi(func_E0122174) +/* 40C5D4 E0122034 24422174 */ addiu $v0, $v0, %lo(func_E0122174) /* 40C5D8 E0122038 AFA20018 */ sw $v0, 0x18($sp) -/* 40C5DC E012203C 3C02E012 */ lui $v0, %hi(D_E012217C) -/* 40C5E0 E0122040 2442217C */ addiu $v0, $v0, %lo(D_E012217C) +/* 40C5DC E012203C 3C02E012 */ lui $v0, %hi(func_E012217C) +/* 40C5E0 E0122040 2442217C */ addiu $v0, $v0, %lo(func_E012217C) /* 40C5E4 E0122044 AFA2001C */ sw $v0, 0x1c($sp) -/* 40C5E8 E0122048 3C02E012 */ lui $v0, %hi(D_E01226C4) -/* 40C5EC E012204C 244226C4 */ addiu $v0, $v0, %lo(D_E01226C4) +/* 40C5E8 E0122048 3C02E012 */ lui $v0, %hi(func_E01226C4) +/* 40C5EC E012204C 244226C4 */ addiu $v0, $v0, %lo(func_E01226C4) /* 40C5F0 E0122050 AFA20020 */ sw $v0, 0x20($sp) /* 40C5F4 E0122054 24020083 */ addiu $v0, $zero, 0x83 /* 40C5F8 E0122058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_40C5A0/func_E01226C4.s b/asm/nonmatchings/code_40C5A0/func_E01226C4.s index 64a7f9d1cd..d9674179bd 100644 --- a/asm/nonmatchings/code_40C5A0/func_E01226C4.s +++ b/asm/nonmatchings/code_40C5A0/func_E01226C4.s @@ -3,8 +3,8 @@ glabel func_E01226C4 /* 40CC64 E01226C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 40CC68 E01226C8 3C02E012 */ lui $v0, %hi(D_E012270C) -/* 40CC6C E01226CC 2442270C */ addiu $v0, $v0, %lo(D_E012270C) +/* 40CC68 E01226C8 3C02E012 */ lui $v0, %hi(func_E012270C) +/* 40CC6C E01226CC 2442270C */ addiu $v0, $v0, %lo(func_E012270C) /* 40CC70 E01226D0 AFA2001C */ sw $v0, 0x1c($sp) /* 40CC74 E01226D4 2402000A */ addiu $v0, $zero, 0xa /* 40CC78 E01226D8 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_412730/func_E0124000.s b/asm/nonmatchings/code_412730/func_E0124000.s index e8eb502c2b..d0521db2b7 100644 --- a/asm/nonmatchings/code_412730/func_E0124000.s +++ b/asm/nonmatchings/code_412730/func_E0124000.s @@ -11,14 +11,14 @@ glabel func_E0124000 /* 412748 E0124018 27A40010 */ addiu $a0, $sp, 0x10 /* 41274C E012401C F7B80060 */ sdc1 $f24, 0x60($sp) /* 412750 E0124020 4487C000 */ mtc1 $a3, $f24 -/* 412754 E0124024 3C02E012 */ lui $v0, %hi(D_E01242FC) -/* 412758 E0124028 244242FC */ addiu $v0, $v0, %lo(D_E01242FC) +/* 412754 E0124024 3C02E012 */ lui $v0, %hi(func_E01242FC) +/* 412758 E0124028 244242FC */ addiu $v0, $v0, %lo(func_E01242FC) /* 41275C E012402C AFA20018 */ sw $v0, 0x18($sp) -/* 412760 E0124030 3C02E012 */ lui $v0, %hi(D_E0124304) -/* 412764 E0124034 24424304 */ addiu $v0, $v0, %lo(D_E0124304) +/* 412760 E0124030 3C02E012 */ lui $v0, %hi(func_E0124304) +/* 412764 E0124034 24424304 */ addiu $v0, $v0, %lo(func_E0124304) /* 412768 E0124038 AFA2001C */ sw $v0, 0x1c($sp) -/* 41276C E012403C 3C02E012 */ lui $v0, %hi(D_E012448C) -/* 412770 E0124040 2442448C */ addiu $v0, $v0, %lo(D_E012448C) +/* 41276C E012403C 3C02E012 */ lui $v0, %hi(func_E012448C) +/* 412770 E0124040 2442448C */ addiu $v0, $v0, %lo(func_E012448C) /* 412774 E0124044 AFA20020 */ sw $v0, 0x20($sp) /* 412778 E0124048 24020084 */ addiu $v0, $zero, 0x84 /* 41277C E012404C AFBF004C */ sw $ra, 0x4c($sp) diff --git a/asm/nonmatchings/code_412730/func_E012448C.s b/asm/nonmatchings/code_412730/func_E012448C.s index 4b59b9444d..cadd4a1283 100644 --- a/asm/nonmatchings/code_412730/func_E012448C.s +++ b/asm/nonmatchings/code_412730/func_E012448C.s @@ -3,8 +3,8 @@ glabel func_E012448C /* 412BBC E012448C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 412BC0 E0124490 3C02E012 */ lui $v0, %hi(D_E01244C4) -/* 412BC4 E0124494 244244C4 */ addiu $v0, $v0, %lo(D_E01244C4) +/* 412BC0 E0124490 3C02E012 */ lui $v0, %hi(func_E01244C4) +/* 412BC4 E0124494 244244C4 */ addiu $v0, $v0, %lo(func_E01244C4) /* 412BC8 E0124498 AFA2001C */ sw $v0, 0x1c($sp) /* 412BCC E012449C 2402002D */ addiu $v0, $zero, 0x2d /* 412BD0 E01244A0 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/nonmatchings/code_413360/func_E0126000.s b/asm/nonmatchings/code_413360/func_E0126000.s index 1c392e906c..8d05041daf 100644 --- a/asm/nonmatchings/code_413360/func_E0126000.s +++ b/asm/nonmatchings/code_413360/func_E0126000.s @@ -14,14 +14,14 @@ glabel func_E0126000 /* 413384 E0126024 27A40010 */ addiu $a0, $sp, 0x10 /* 413388 E0126028 AFB1002C */ sw $s1, 0x2c($sp) /* 41338C E012602C 8FB10064 */ lw $s1, 0x64($sp) -/* 413390 E0126030 3C02E012 */ lui $v0, %hi(D_E012612C) -/* 413394 E0126034 2442612C */ addiu $v0, $v0, %lo(D_E012612C) +/* 413390 E0126030 3C02E012 */ lui $v0, %hi(func_E012612C) +/* 413394 E0126034 2442612C */ addiu $v0, $v0, %lo(func_E012612C) /* 413398 E0126038 AFA20018 */ sw $v0, 0x18($sp) -/* 41339C E012603C 3C02E012 */ lui $v0, %hi(D_E0126134) -/* 4133A0 E0126040 24426134 */ addiu $v0, $v0, %lo(D_E0126134) +/* 41339C E012603C 3C02E012 */ lui $v0, %hi(func_E0126134) +/* 4133A0 E0126040 24426134 */ addiu $v0, $v0, %lo(func_E0126134) /* 4133A4 E0126044 AFA2001C */ sw $v0, 0x1c($sp) -/* 4133A8 E0126048 3C02E012 */ lui $v0, %hi(D_E01264A4) -/* 4133AC E012604C 244264A4 */ addiu $v0, $v0, %lo(D_E01264A4) +/* 4133A8 E0126048 3C02E012 */ lui $v0, %hi(func_E01264A4) +/* 4133AC E012604C 244264A4 */ addiu $v0, $v0, %lo(func_E01264A4) /* 4133B0 E0126050 AFA20020 */ sw $v0, 0x20($sp) /* 4133B4 E0126054 24020085 */ addiu $v0, $zero, 0x85 /* 4133B8 E0126058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_413360/func_E01264A4.s b/asm/nonmatchings/code_413360/func_E01264A4.s index 63881439d0..af8447ee3b 100644 --- a/asm/nonmatchings/code_413360/func_E01264A4.s +++ b/asm/nonmatchings/code_413360/func_E01264A4.s @@ -3,8 +3,8 @@ glabel func_E01264A4 /* 413804 E01264A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 413808 E01264A8 3C02E012 */ lui $v0, %hi(D_E01264EC) -/* 41380C E01264AC 244264EC */ addiu $v0, $v0, %lo(D_E01264EC) +/* 413808 E01264A8 3C02E012 */ lui $v0, %hi(func_E01264EC) +/* 41380C E01264AC 244264EC */ addiu $v0, $v0, %lo(func_E01264EC) /* 413810 E01264B0 AFA2001C */ sw $v0, 0x1c($sp) /* 413814 E01264B4 2402000A */ addiu $v0, $zero, 0xa /* 413818 E01264B8 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_414BA0/func_E0128000.s b/asm/nonmatchings/code_414BA0/func_E0128000.s index ec892f8df4..a7afa5ffeb 100644 --- a/asm/nonmatchings/code_414BA0/func_E0128000.s +++ b/asm/nonmatchings/code_414BA0/func_E0128000.s @@ -14,14 +14,14 @@ glabel func_E0128000 /* 414BC4 E0128024 27A40010 */ addiu $a0, $sp, 0x10 /* 414BC8 E0128028 AFB1002C */ sw $s1, 0x2c($sp) /* 414BCC E012802C 8FB10064 */ lw $s1, 0x64($sp) -/* 414BD0 E0128030 3C02E013 */ lui $v0, %hi(D_E0128128) -/* 414BD4 E0128034 24428128 */ addiu $v0, $v0, %lo(D_E0128128) +/* 414BD0 E0128030 3C02E013 */ lui $v0, %hi(func_E0128128) +/* 414BD4 E0128034 24428128 */ addiu $v0, $v0, %lo(func_E0128128) /* 414BD8 E0128038 AFA20018 */ sw $v0, 0x18($sp) -/* 414BDC E012803C 3C02E013 */ lui $v0, %hi(D_E0128130) -/* 414BE0 E0128040 24428130 */ addiu $v0, $v0, %lo(D_E0128130) +/* 414BDC E012803C 3C02E013 */ lui $v0, %hi(func_E0128130) +/* 414BE0 E0128040 24428130 */ addiu $v0, $v0, %lo(func_E0128130) /* 414BE4 E0128044 AFA2001C */ sw $v0, 0x1c($sp) -/* 414BE8 E0128048 3C02E013 */ lui $v0, %hi(D_E0128198) -/* 414BEC E012804C 24428198 */ addiu $v0, $v0, %lo(D_E0128198) +/* 414BE8 E0128048 3C02E013 */ lui $v0, %hi(func_E0128198) +/* 414BEC E012804C 24428198 */ addiu $v0, $v0, %lo(func_E0128198) /* 414BF0 E0128050 AFA20020 */ sw $v0, 0x20($sp) /* 414BF4 E0128054 24020086 */ addiu $v0, $zero, 0x86 /* 414BF8 E0128058 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_414BA0/func_E0128198.s b/asm/nonmatchings/code_414BA0/func_E0128198.s index ff9a33983c..f81e139f8a 100644 --- a/asm/nonmatchings/code_414BA0/func_E0128198.s +++ b/asm/nonmatchings/code_414BA0/func_E0128198.s @@ -3,8 +3,8 @@ glabel func_E0128198 /* 414D38 E0128198 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 414D3C E012819C 3C02E013 */ lui $v0, %hi(D_E01281E0) -/* 414D40 E01281A0 244281E0 */ addiu $v0, $v0, %lo(D_E01281E0) +/* 414D3C E012819C 3C02E013 */ lui $v0, %hi(func_E01281E0) +/* 414D40 E01281A0 244281E0 */ addiu $v0, $v0, %lo(func_E01281E0) /* 414D44 E01281A4 AFA2001C */ sw $v0, 0x1c($sp) /* 414D48 E01281A8 2402000A */ addiu $v0, $zero, 0xa /* 414D4C E01281AC AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A2C84.s b/asm/nonmatchings/code_415D90/func_802A2C84.s index 77ea3a13ef..2e9ab43680 100644 --- a/asm/nonmatchings/code_415D90/func_802A2C84.s +++ b/asm/nonmatchings/code_415D90/func_802A2C84.s @@ -365,8 +365,8 @@ glabel func_802A2C84 /* 417F54 802A31C4 0260282D */ daddu $a1, $s3, $zero /* 417F58 802A31C8 0240302D */ daddu $a2, $s2, $zero /* 417F5C 802A31CC 24070096 */ addiu $a3, $zero, 0x96 -/* 417F60 802A31D0 3C02802A */ lui $v0, %hi(D_802A3C98) -/* 417F64 802A31D4 24423C98 */ addiu $v0, $v0, %lo(D_802A3C98) +/* 417F60 802A31D0 3C02802A */ lui $v0, %hi(func_802A3C98) +/* 417F64 802A31D4 24423C98 */ addiu $v0, $v0, %lo(func_802A3C98) /* 417F68 802A31D8 3C03802B */ lui $v1, %hi(D_802AD10E) /* 417F6C 802A31DC 8063D10E */ lb $v1, %lo(D_802AD10E)($v1) /* 417F70 802A31E0 2410FFFF */ addiu $s0, $zero, -1 @@ -388,8 +388,8 @@ glabel func_802A2C84 /* 417FB0 802A3220 24020010 */ addiu $v0, $zero, 0x10 /* 417FB4 802A3224 24110001 */ addiu $s1, $zero, 1 /* 417FB8 802A3228 AFA20010 */ sw $v0, 0x10($sp) -/* 417FBC 802A322C 3C02802A */ lui $v0, %hi(D_802A43DC) -/* 417FC0 802A3230 244243DC */ addiu $v0, $v0, %lo(D_802A43DC) +/* 417FBC 802A322C 3C02802A */ lui $v0, %hi(func_802A43DC) +/* 417FC0 802A3230 244243DC */ addiu $v0, $v0, %lo(func_802A43DC) /* 417FC4 802A3234 AFB10014 */ sw $s1, 0x14($sp) /* 417FC8 802A3238 AFA20018 */ sw $v0, 0x18($sp) /* 417FCC 802A323C AFA0001C */ sw $zero, 0x1c($sp) @@ -405,8 +405,8 @@ glabel func_802A2C84 /* 417FF0 802A3260 0260282D */ daddu $a1, $s3, $zero /* 417FF4 802A3264 0240302D */ daddu $a2, $s2, $zero /* 417FF8 802A3268 24070090 */ addiu $a3, $zero, 0x90 -/* 417FFC 802A326C 3C02802A */ lui $v0, %hi(D_802A3C98) -/* 418000 802A3270 24423C98 */ addiu $v0, $v0, %lo(D_802A3C98) +/* 417FFC 802A326C 3C02802A */ lui $v0, %hi(func_802A3C98) +/* 418000 802A3270 24423C98 */ addiu $v0, $v0, %lo(func_802A3C98) /* 418004 802A3274 3C03802B */ lui $v1, %hi(D_802AD10E) /* 418008 802A3278 8063D10E */ lb $v1, %lo(D_802AD10E)($v1) /* 41800C 802A327C 2410FFFF */ addiu $s0, $zero, -1 @@ -428,8 +428,8 @@ glabel func_802A2C84 /* 41804C 802A32BC 24020010 */ addiu $v0, $zero, 0x10 /* 418050 802A32C0 24110001 */ addiu $s1, $zero, 1 /* 418054 802A32C4 AFA20010 */ sw $v0, 0x10($sp) -/* 418058 802A32C8 3C02802A */ lui $v0, %hi(D_802A43DC) -/* 41805C 802A32CC 244243DC */ addiu $v0, $v0, %lo(D_802A43DC) +/* 418058 802A32C8 3C02802A */ lui $v0, %hi(func_802A43DC) +/* 41805C 802A32CC 244243DC */ addiu $v0, $v0, %lo(func_802A43DC) /* 418060 802A32D0 AFB10014 */ sw $s1, 0x14($sp) /* 418064 802A32D4 AFA20018 */ sw $v0, 0x18($sp) /* 418068 802A32D8 AFA0001C */ sw $zero, 0x1c($sp) @@ -442,8 +442,8 @@ glabel func_802A2C84 /* 418084 802A32F4 24020023 */ addiu $v0, $zero, 0x23 .L802A32F8: /* 418088 802A32F8 AFA20010 */ sw $v0, 0x10($sp) -/* 41808C 802A32FC 3C02802A */ lui $v0, %hi(D_802A4448) -/* 418090 802A3300 24424448 */ addiu $v0, $v0, %lo(D_802A4448) +/* 41808C 802A32FC 3C02802A */ lui $v0, %hi(func_802A4448) +/* 418090 802A3300 24424448 */ addiu $v0, $v0, %lo(func_802A4448) /* 418094 802A3304 AFB10014 */ sw $s1, 0x14($sp) /* 418098 802A3308 AFA20018 */ sw $v0, 0x18($sp) /* 41809C 802A330C AFA0001C */ sw $zero, 0x1c($sp) @@ -456,8 +456,8 @@ glabel func_802A2C84 /* 4180B8 802A3328 24070118 */ addiu $a3, $zero, 0x118 /* 4180BC 802A332C 24020020 */ addiu $v0, $zero, 0x20 /* 4180C0 802A3330 AFA20010 */ sw $v0, 0x10($sp) -/* 4180C4 802A3334 3C02802A */ lui $v0, %hi(D_802A4494) -/* 4180C8 802A3338 24424494 */ addiu $v0, $v0, %lo(D_802A4494) +/* 4180C4 802A3334 3C02802A */ lui $v0, %hi(func_802A4494) +/* 4180C8 802A3338 24424494 */ addiu $v0, $v0, %lo(func_802A4494) /* 4180CC 802A333C AFA20018 */ sw $v0, 0x18($sp) /* 4180D0 802A3340 2402FFFF */ addiu $v0, $zero, -1 /* 4180D4 802A3344 AFB30014 */ sw $s3, 0x14($sp) @@ -1021,8 +1021,8 @@ glabel func_802A2C84 /* 4188F8 802A3B68 8463B340 */ lh $v1, %lo(D_802AB340)($v1) /* 4188FC 802A3B6C 24020014 */ addiu $v0, $zero, 0x14 /* 418900 802A3B70 AFA20014 */ sw $v0, 0x14($sp) -/* 418904 802A3B74 3C02802A */ lui $v0, %hi(D_802A4534) -/* 418908 802A3B78 24424534 */ addiu $v0, $v0, %lo(D_802A4534) +/* 418904 802A3B74 3C02802A */ lui $v0, %hi(func_802A4534) +/* 418908 802A3B78 24424534 */ addiu $v0, $v0, %lo(func_802A4534) /* 41890C 802A3B7C AFA20018 */ sw $v0, 0x18($sp) /* 418910 802A3B80 2402FFFF */ addiu $v0, $zero, -1 /* 418914 802A3B84 AFA0001C */ sw $zero, 0x1c($sp) diff --git a/asm/nonmatchings/code_415D90/func_802A4A54.s b/asm/nonmatchings/code_415D90/func_802A4A54.s index 12beb2833d..000ad75547 100644 --- a/asm/nonmatchings/code_415D90/func_802A4A54.s +++ b/asm/nonmatchings/code_415D90/func_802A4A54.s @@ -134,8 +134,8 @@ glabel func_802A4A54 /* 4199E0 802A4C50 2402000A */ addiu $v0, $zero, 0xa /* 4199E4 802A4C54 3C01802B */ lui $at, %hi(D_802AD614) /* 4199E8 802A4C58 A022D614 */ sb $v0, %lo(D_802AD614)($at) -/* 4199EC 802A4C5C 3C02802A */ lui $v0, %hi(D_802A5290) -/* 4199F0 802A4C60 24425290 */ addiu $v0, $v0, %lo(D_802A5290) +/* 4199EC 802A4C5C 3C02802A */ lui $v0, %hi(func_802A5290) +/* 4199F0 802A4C60 24425290 */ addiu $v0, $v0, %lo(func_802A5290) /* 4199F4 802A4C64 2412FFFF */ addiu $s2, $zero, -1 /* 4199F8 802A4C68 AFA00014 */ sw $zero, 0x14($sp) /* 4199FC 802A4C6C AFA20018 */ sw $v0, 0x18($sp) @@ -160,8 +160,8 @@ glabel func_802A4A54 /* 419A48 802A4CB8 24020010 */ addiu $v0, $zero, 0x10 /* 419A4C 802A4CBC 24100001 */ addiu $s0, $zero, 1 /* 419A50 802A4CC0 AFA20010 */ sw $v0, 0x10($sp) -/* 419A54 802A4CC4 3C02802A */ lui $v0, %hi(D_802A56F8) -/* 419A58 802A4CC8 244256F8 */ addiu $v0, $v0, %lo(D_802A56F8) +/* 419A54 802A4CC4 3C02802A */ lui $v0, %hi(func_802A56F8) +/* 419A58 802A4CC8 244256F8 */ addiu $v0, $v0, %lo(func_802A56F8) /* 419A5C 802A4CCC AFB00014 */ sw $s0, 0x14($sp) /* 419A60 802A4CD0 AFA20018 */ sw $v0, 0x18($sp) /* 419A64 802A4CD4 AFA0001C */ sw $zero, 0x1c($sp) @@ -174,8 +174,8 @@ glabel func_802A4A54 /* 419A80 802A4CF0 24070118 */ addiu $a3, $zero, 0x118 /* 419A84 802A4CF4 24020020 */ addiu $v0, $zero, 0x20 /* 419A88 802A4CF8 AFA20010 */ sw $v0, 0x10($sp) -/* 419A8C 802A4CFC 3C02802A */ lui $v0, %hi(D_802A5738) -/* 419A90 802A4D00 24425738 */ addiu $v0, $v0, %lo(D_802A5738) +/* 419A8C 802A4CFC 3C02802A */ lui $v0, %hi(func_802A5738) +/* 419A90 802A4D00 24425738 */ addiu $v0, $v0, %lo(func_802A5738) /* 419A94 802A4D04 AFB30014 */ sw $s3, 0x14($sp) /* 419A98 802A4D08 AFA20018 */ sw $v0, 0x18($sp) /* 419A9C 802A4D0C AFA0001C */ sw $zero, 0x1c($sp) @@ -491,8 +491,8 @@ glabel func_802A4A54 /* 419F2C 802A519C AFA20010 */ sw $v0, 0x10($sp) /* 419F30 802A51A0 24020014 */ addiu $v0, $zero, 0x14 /* 419F34 802A51A4 AFA20014 */ sw $v0, 0x14($sp) -/* 419F38 802A51A8 3C02802A */ lui $v0, %hi(D_802A57C8) -/* 419F3C 802A51AC 244257C8 */ addiu $v0, $v0, %lo(D_802A57C8) +/* 419F38 802A51A8 3C02802A */ lui $v0, %hi(func_802A57C8) +/* 419F3C 802A51AC 244257C8 */ addiu $v0, $v0, %lo(func_802A57C8) /* 419F40 802A51B0 AFA20018 */ sw $v0, 0x18($sp) /* 419F44 802A51B4 2402FFFF */ addiu $v0, $zero, -1 /* 419F48 802A51B8 AFA0001C */ sw $zero, 0x1c($sp) diff --git a/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s b/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s index cdd0606e03..0d39b7b67f 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s @@ -9,8 +9,8 @@ glabel crash_printf_string /* 7618 8002C218 0080902D */ daddu $s2, $a0, $zero /* 761C 8002C21C AFB50124 */ sw $s5, 0x124($sp) /* 7620 8002C220 00A0A82D */ daddu $s5, $a1, $zero -/* 7624 8002C224 3C048003 */ lui $a0, %hi(D_8002C1D4) -/* 7628 8002C228 2484C1D4 */ addiu $a0, $a0, %lo(D_8002C1D4) +/* 7624 8002C224 3C048003 */ lui $a0, %hi(func_8002C1D4) +/* 7628 8002C228 2484C1D4 */ addiu $a0, $a0, %lo(func_8002C1D4) /* 762C 8002C22C 27A50010 */ addiu $a1, $sp, 0x10 /* 7630 8002C230 27A7013C */ addiu $a3, $sp, 0x13c /* 7634 8002C234 AFBF0128 */ sw $ra, 0x128($sp) diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s b/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s index c71111cb84..9deb730745 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s @@ -11,8 +11,8 @@ glabel func_8002C94C /* 7D64 8002C964 00A0802D */ daddu $s0, $a1, $zero /* 7D68 8002C968 AFB3011C */ sw $s3, 0x11c($sp) /* 7D6C 8002C96C 0240982D */ daddu $s3, $s2, $zero -/* 7D70 8002C970 3C048003 */ lui $a0, %hi(D_8002C1D4) -/* 7D74 8002C974 2484C1D4 */ addiu $a0, $a0, %lo(D_8002C1D4) +/* 7D70 8002C970 3C048003 */ lui $a0, %hi(func_8002C1D4) +/* 7D74 8002C974 2484C1D4 */ addiu $a0, $a0, %lo(func_8002C1D4) /* 7D78 8002C978 27A50010 */ addiu $a1, $sp, 0x10 /* 7D7C 8002C97C 27A7013C */ addiu $a3, $sp, 0x13c /* 7D80 8002C980 AFBF0128 */ sw $ra, 0x128($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s index fe0105d3a8..beb3c1ad91 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_800E46C8 -/* 7DB78 800E46C8 3C048011 */ lui $a0, %hi(D_8010F094) -/* 7DB7C 800E46CC 8C84F094 */ lw $a0, %lo(D_8010F094)($a0) +/* 7DB78 800E46C8 3C048011 */ lui $a0, %hi(gPlayerStatus+0xCC) +/* 7DB7C 800E46CC 8C84F094 */ lw $a0, %lo(gPlayerStatus+0xCC)($a0) /* 7DB80 800E46D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7DB84 800E46D4 AFBF0010 */ sw $ra, 0x10($sp) /* 7DB88 800E46D8 0C044181 */ jal get_shadow_by_index diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s index 4a7634db48..eef204eb14 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s @@ -13,8 +13,8 @@ glabel partner_reset_data /* 84944 800EB494 AFBF0018 */ sw $ra, 0x18($sp) /* 84948 800EB498 0C00A580 */ jal mem_clear /* 8494C 800EB49C 24050360 */ addiu $a1, $zero, 0x360 -/* 84950 800EB4A0 3C04800F */ lui $a0, %hi(D_800EA6CC) -/* 84954 800EB4A4 2484A6CC */ addiu $a0, $a0, %lo(D_800EA6CC) +/* 84950 800EB4A0 3C04800F */ lui $a0, %hi(func_800EA6CC) +/* 84954 800EB4A4 2484A6CC */ addiu $a0, $a0, %lo(func_800EA6CC) /* 84958 800EB4A8 0C048C8F */ jal bind_dynamic_entity_7 /* 8495C 800EB4AC 0000282D */ daddu $a1, $zero, $zero /* 84960 800EB4B0 0C048D8F */ jal get_dynamic_entity diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s index e5c0f8711d..0a10c50fe1 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s @@ -285,8 +285,8 @@ glabel func_800F1A10 /* 8B2F8 800F1E48 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B2FC 800F1E4C 24020014 */ addiu $v0, $zero, 0x14 /* 8B300 800F1E50 AFA20014 */ sw $v0, 0x14($sp) -/* 8B304 800F1E54 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B308 800F1E58 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B304 800F1E54 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B308 800F1E58 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B30C 800F1E5C AFA20018 */ sw $v0, 0x18($sp) /* 8B310 800F1E60 2402FFFF */ addiu $v0, $zero, -1 /* 8B314 800F1E64 AFA0001C */ sw $zero, 0x1c($sp) @@ -335,8 +335,8 @@ glabel func_800F1A10 /* 8B3B8 800F1F08 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B3BC 800F1F0C 24020014 */ addiu $v0, $zero, 0x14 /* 8B3C0 800F1F10 AFA20014 */ sw $v0, 0x14($sp) -/* 8B3C4 800F1F14 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B3C8 800F1F18 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B3C4 800F1F14 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B3C8 800F1F18 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B3CC 800F1F1C AFA20018 */ sw $v0, 0x18($sp) /* 8B3D0 800F1F20 2402FFFF */ addiu $v0, $zero, -1 /* 8B3D4 800F1F24 AFA0001C */ sw $zero, 0x1c($sp) @@ -357,8 +357,8 @@ glabel func_800F1A10 /* 8B410 800F1F60 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B414 800F1F64 24020014 */ addiu $v0, $zero, 0x14 /* 8B418 800F1F68 AFA20014 */ sw $v0, 0x14($sp) -/* 8B41C 800F1F6C 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B420 800F1F70 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B41C 800F1F6C 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B420 800F1F70 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B424 800F1F74 AFA20018 */ sw $v0, 0x18($sp) /* 8B428 800F1F78 2402FFFF */ addiu $v0, $zero, -1 /* 8B42C 800F1F7C AFA0001C */ sw $zero, 0x1c($sp) @@ -397,8 +397,8 @@ glabel func_800F1A10 /* 8B4B0 800F2000 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B4B4 800F2004 24020014 */ addiu $v0, $zero, 0x14 /* 8B4B8 800F2008 AFA20014 */ sw $v0, 0x14($sp) -/* 8B4BC 800F200C 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B4C0 800F2010 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B4BC 800F200C 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B4C0 800F2010 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B4C4 800F2014 AFA20018 */ sw $v0, 0x18($sp) /* 8B4C8 800F2018 2402FFFF */ addiu $v0, $zero, -1 /* 8B4CC 800F201C AFA0001C */ sw $zero, 0x1c($sp) @@ -419,8 +419,8 @@ glabel func_800F1A10 /* 8B508 800F2058 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B50C 800F205C 24020014 */ addiu $v0, $zero, 0x14 /* 8B510 800F2060 AFA20014 */ sw $v0, 0x14($sp) -/* 8B514 800F2064 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B518 800F2068 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B514 800F2064 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B518 800F2068 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B51C 800F206C AFA20018 */ sw $v0, 0x18($sp) /* 8B520 800F2070 2402FFFF */ addiu $v0, $zero, -1 /* 8B524 800F2074 AFA0001C */ sw $zero, 0x1c($sp) @@ -459,8 +459,8 @@ glabel func_800F1A10 /* 8B5A8 800F20F8 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B5AC 800F20FC 24020014 */ addiu $v0, $zero, 0x14 /* 8B5B0 800F2100 AFA20014 */ sw $v0, 0x14($sp) -/* 8B5B4 800F2104 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B5B8 800F2108 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B5B4 800F2104 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B5B8 800F2108 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B5BC 800F210C AFA20018 */ sw $v0, 0x18($sp) /* 8B5C0 800F2110 2402FFFF */ addiu $v0, $zero, -1 /* 8B5C4 800F2114 AFA0001C */ sw $zero, 0x1c($sp) @@ -499,8 +499,8 @@ glabel func_800F1A10 /* 8B648 800F2198 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B64C 800F219C 24020014 */ addiu $v0, $zero, 0x14 /* 8B650 800F21A0 AFA20014 */ sw $v0, 0x14($sp) -/* 8B654 800F21A4 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B658 800F21A8 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B654 800F21A4 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B658 800F21A8 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B65C 800F21AC AFA20018 */ sw $v0, 0x18($sp) /* 8B660 800F21B0 2402FFFF */ addiu $v0, $zero, -1 /* 8B664 800F21B4 AFA0001C */ sw $zero, 0x1c($sp) @@ -539,8 +539,8 @@ glabel func_800F1A10 /* 8B6E8 800F2238 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B6EC 800F223C 24020014 */ addiu $v0, $zero, 0x14 /* 8B6F0 800F2240 AFA20014 */ sw $v0, 0x14($sp) -/* 8B6F4 800F2244 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B6F8 800F2248 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B6F4 800F2244 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B6F8 800F2248 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B6FC 800F224C AFA20018 */ sw $v0, 0x18($sp) /* 8B700 800F2250 2402FFFF */ addiu $v0, $zero, -1 /* 8B704 800F2254 AFA0001C */ sw $zero, 0x1c($sp) @@ -579,8 +579,8 @@ glabel func_800F1A10 /* 8B788 800F22D8 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B78C 800F22DC 24020014 */ addiu $v0, $zero, 0x14 /* 8B790 800F22E0 AFA20014 */ sw $v0, 0x14($sp) -/* 8B794 800F22E4 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B798 800F22E8 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B794 800F22E4 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B798 800F22E8 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B79C 800F22EC AFA20018 */ sw $v0, 0x18($sp) /* 8B7A0 800F22F0 2402FFFF */ addiu $v0, $zero, -1 /* 8B7A4 800F22F4 AFA0001C */ sw $zero, 0x1c($sp) @@ -619,8 +619,8 @@ glabel func_800F1A10 /* 8B828 800F2378 8063D656 */ lb $v1, %lo(D_8010D656)($v1) /* 8B82C 800F237C 24020014 */ addiu $v0, $zero, 0x14 /* 8B830 800F2380 AFA20014 */ sw $v0, 0x14($sp) -/* 8B834 800F2384 3C02800F */ lui $v0, %hi(D_800F3680) -/* 8B838 800F2388 24423680 */ addiu $v0, $v0, %lo(D_800F3680) +/* 8B834 800F2384 3C02800F */ lui $v0, %hi(func_800F3680) +/* 8B838 800F2388 24423680 */ addiu $v0, $v0, %lo(func_800F3680) /* 8B83C 800F238C AFA20018 */ sw $v0, 0x18($sp) /* 8B840 800F2390 2402FFFF */ addiu $v0, $zero, -1 /* 8B844 800F2394 AFA0001C */ sw $zero, 0x1c($sp) @@ -680,8 +680,8 @@ glabel func_800F1A10 /* 8B904 800F2454 AFA20010 */ sw $v0, 0x10($sp) /* 8B908 800F2458 24020015 */ addiu $v0, $zero, 0x15 /* 8B90C 800F245C AFA20014 */ sw $v0, 0x14($sp) -/* 8B910 800F2460 3C02800F */ lui $v0, %hi(D_800F4C6C) -/* 8B914 800F2464 24424C6C */ addiu $v0, $v0, %lo(D_800F4C6C) +/* 8B910 800F2460 3C02800F */ lui $v0, %hi(func_800F4C6C) +/* 8B914 800F2464 24424C6C */ addiu $v0, $v0, %lo(func_800F4C6C) /* 8B918 800F2468 AFA20018 */ sw $v0, 0x18($sp) /* 8B91C 800F246C 2402000E */ addiu $v0, $zero, 0xe /* 8B920 800F2470 AFA0001C */ sw $zero, 0x1c($sp) @@ -704,8 +704,8 @@ glabel func_800F1A10 /* 8B960 800F24B0 AFA20010 */ sw $v0, 0x10($sp) /* 8B964 800F24B4 24020015 */ addiu $v0, $zero, 0x15 /* 8B968 800F24B8 AFA20014 */ sw $v0, 0x14($sp) -/* 8B96C 800F24BC 3C02800F */ lui $v0, %hi(D_800F4D28) -/* 8B970 800F24C0 24424D28 */ addiu $v0, $v0, %lo(D_800F4D28) +/* 8B96C 800F24BC 3C02800F */ lui $v0, %hi(func_800F4D28) +/* 8B970 800F24C0 24424D28 */ addiu $v0, $v0, %lo(func_800F4D28) /* 8B974 800F24C4 AFA20018 */ sw $v0, 0x18($sp) /* 8B978 800F24C8 2402FFFF */ addiu $v0, $zero, -1 /* 8B97C 800F24CC AFA0001C */ sw $zero, 0x1c($sp) @@ -786,8 +786,8 @@ glabel func_800F1A10 /* 8BA98 800F25E8 AFA20010 */ sw $v0, 0x10($sp) /* 8BA9C 800F25EC 24020014 */ addiu $v0, $zero, 0x14 /* 8BAA0 800F25F0 AFA20014 */ sw $v0, 0x14($sp) -/* 8BAA4 800F25F4 3C02800F */ lui $v0, %hi(D_800F48F4) -/* 8BAA8 800F25F8 244248F4 */ addiu $v0, $v0, %lo(D_800F48F4) +/* 8BAA4 800F25F4 3C02800F */ lui $v0, %hi(func_800F48F4) +/* 8BAA8 800F25F8 244248F4 */ addiu $v0, $v0, %lo(func_800F48F4) /* 8BAAC 800F25FC AFA20018 */ sw $v0, 0x18($sp) /* 8BAB0 800F2600 2402FFFF */ addiu $v0, $zero, -1 /* 8BAB4 800F2604 AFA0001C */ sw $zero, 0x1c($sp) @@ -836,8 +836,8 @@ glabel func_800F1A10 /* 8BB54 800F26A4 AFA20010 */ sw $v0, 0x10($sp) /* 8BB58 800F26A8 24020014 */ addiu $v0, $zero, 0x14 /* 8BB5C 800F26AC AFA20014 */ sw $v0, 0x14($sp) -/* 8BB60 800F26B0 3C02800F */ lui $v0, %hi(D_800F4944) -/* 8BB64 800F26B4 24424944 */ addiu $v0, $v0, %lo(D_800F4944) +/* 8BB60 800F26B0 3C02800F */ lui $v0, %hi(func_800F4944) +/* 8BB64 800F26B4 24424944 */ addiu $v0, $v0, %lo(func_800F4944) /* 8BB68 800F26B8 AFA20018 */ sw $v0, 0x18($sp) /* 8BB6C 800F26BC 2402FFFF */ addiu $v0, $zero, -1 /* 8BB70 800F26C0 AFA0001C */ sw $zero, 0x1c($sp) @@ -1518,8 +1518,8 @@ glabel func_800F1A10 /* 8C548 800F3098 AFA20010 */ sw $v0, 0x10($sp) /* 8C54C 800F309C 24020014 */ addiu $v0, $zero, 0x14 /* 8C550 800F30A0 AFA20014 */ sw $v0, 0x14($sp) -/* 8C554 800F30A4 3C02800F */ lui $v0, %hi(D_800F4CF0) -/* 8C558 800F30A8 24424CF0 */ addiu $v0, $v0, %lo(D_800F4CF0) +/* 8C554 800F30A4 3C02800F */ lui $v0, %hi(func_800F4CF0) +/* 8C558 800F30A8 24424CF0 */ addiu $v0, $v0, %lo(func_800F4CF0) /* 8C55C 800F30AC AFA20018 */ sw $v0, 0x18($sp) /* 8C560 800F30B0 2402FFFF */ addiu $v0, $zero, -1 /* 8C564 800F30B4 AFA0001C */ sw $zero, 0x1c($sp) @@ -1728,8 +1728,8 @@ glabel func_800F1A10 /* 8C864 800F33B4 AFA20010 */ sw $v0, 0x10($sp) /* 8C868 800F33B8 24020013 */ addiu $v0, $zero, 0x13 /* 8C86C 800F33BC AFA20014 */ sw $v0, 0x14($sp) -/* 8C870 800F33C0 3C02800F */ lui $v0, %hi(D_800F4C1C) -/* 8C874 800F33C4 24424C1C */ addiu $v0, $v0, %lo(D_800F4C1C) +/* 8C870 800F33C0 3C02800F */ lui $v0, %hi(func_800F4C1C) +/* 8C874 800F33C4 24424C1C */ addiu $v0, $v0, %lo(func_800F4C1C) /* 8C878 800F33C8 AFA20018 */ sw $v0, 0x18($sp) /* 8C87C 800F33CC 2402FFFF */ addiu $v0, $zero, -1 /* 8C880 800F33D0 AFA0001C */ sw $zero, 0x1c($sp) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s index dda8c39169..a67f7f9726 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s @@ -90,8 +90,8 @@ glabel func_800F4E40 /* 8E430 800F4F80 3C018011 */ lui $at, %hi(D_8010D650) /* 8E434 800F4F84 AC22D650 */ sw $v0, %lo(D_8010D650)($at) /* 8E438 800F4F88 24020004 */ addiu $v0, $zero, 4 -/* 8E43C 800F4F8C 3C04800F */ lui $a0, %hi(D_800F1A10) -/* 8E440 800F4F90 24841A10 */ addiu $a0, $a0, %lo(D_800F1A10) +/* 8E43C 800F4F8C 3C04800F */ lui $a0, %hi(func_800F1A10) +/* 8E440 800F4F90 24841A10 */ addiu $a0, $a0, %lo(func_800F1A10) /* 8E444 800F4F94 3C018011 */ lui $at, %hi(D_8010D691) /* 8E448 800F4F98 A022D691 */ sb $v0, %lo(D_8010D691)($at) /* 8E44C 800F4F9C 3C018011 */ lui $at, %hi(D_8010D692) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s index 4505a044c4..147c2c1334 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s @@ -87,8 +87,8 @@ glabel func_800F4FC4 /* 8E5A8 800F50F8 3C018011 */ lui $at, %hi(D_8010D650) /* 8E5AC 800F50FC AC22D650 */ sw $v0, %lo(D_8010D650)($at) /* 8E5B0 800F5100 24020004 */ addiu $v0, $zero, 4 -/* 8E5B4 800F5104 3C04800F */ lui $a0, %hi(D_800F1A10) -/* 8E5B8 800F5108 24841A10 */ addiu $a0, $a0, %lo(D_800F1A10) +/* 8E5B4 800F5104 3C04800F */ lui $a0, %hi(func_800F1A10) +/* 8E5B8 800F5108 24841A10 */ addiu $a0, $a0, %lo(func_800F1A10) /* 8E5BC 800F510C 3C018011 */ lui $at, %hi(D_8010D691) /* 8E5C0 800F5110 A022D691 */ sb $v0, %lo(D_8010D691)($at) /* 8E5C4 800F5114 3C018011 */ lui $at, %hi(D_8010D692) diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s index f7457e55b7..e62002e21a 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s @@ -91,8 +91,8 @@ glabel func_800F513C /* 8E730 800F5280 3C018011 */ lui $at, %hi(D_8010D691) /* 8E734 800F5284 A022D691 */ sb $v0, %lo(D_8010D691)($at) /* 8E738 800F5288 24020002 */ addiu $v0, $zero, 2 -/* 8E73C 800F528C 3C04800F */ lui $a0, %hi(D_800F1A10) -/* 8E740 800F5290 24841A10 */ addiu $a0, $a0, %lo(D_800F1A10) +/* 8E73C 800F528C 3C04800F */ lui $a0, %hi(func_800F1A10) +/* 8E740 800F5290 24841A10 */ addiu $a0, $a0, %lo(func_800F1A10) /* 8E744 800F5294 3C018011 */ lui $at, %hi(D_8010D692) /* 8E748 800F5298 A022D692 */ sb $v0, %lo(D_8010D692)($at) /* 8E74C 800F529C 0C048C8F */ jal bind_dynamic_entity_7 diff --git a/asm/nonmatchings/code_B9D60/clear_item_entity_data.s b/asm/nonmatchings/code_B9D60/clear_item_entity_data.s index 0c09f9c8fa..1aa1ef3974 100644 --- a/asm/nonmatchings/code_B9D60/clear_item_entity_data.s +++ b/asm/nonmatchings/code_B9D60/clear_item_entity_data.s @@ -50,8 +50,8 @@ glabel clear_item_entity_data /* C7794 80131094 24A52C80 */ addiu $a1, $a1, %lo(draw_item_entities) /* C7798 80131098 0C048C56 */ jal bind_dynamic_entity_3 /* C779C 8013109C 0000202D */ daddu $a0, $zero, $zero -/* C77A0 801310A0 3C058013 */ lui $a1, %hi(D_80132D94) -/* C77A4 801310A4 24A52D94 */ addiu $a1, $a1, %lo(D_80132D94) +/* C77A0 801310A0 3C058013 */ lui $a1, %hi(func_80132D94) +/* C77A4 801310A4 24A52D94 */ addiu $a1, $a1, %lo(func_80132D94) /* C77A8 801310A8 0C048C8F */ jal bind_dynamic_entity_7 /* C77AC 801310AC 0000202D */ daddu $a0, $zero, $zero /* C77B0 801310B0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_B9D60/func_80127BA4.s b/asm/nonmatchings/code_B9D60/func_80127BA4.s index 94d002f82a..69624c43ac 100644 --- a/asm/nonmatchings/code_B9D60/func_80127BA4.s +++ b/asm/nonmatchings/code_B9D60/func_80127BA4.s @@ -98,8 +98,8 @@ glabel func_80127BA4 /* BE408 80127D08 00000000 */ nop /* BE40C 80127D0C 46800020 */ cvt.s.w $f0, $f0 /* BE410 80127D10 AFA2001C */ sw $v0, 0x1c($sp) -/* BE414 80127D14 3C028012 */ lui $v0, %hi(D_80127B70) -/* BE418 80127D18 24427B70 */ addiu $v0, $v0, %lo(D_80127B70) +/* BE414 80127D14 3C028012 */ lui $v0, %hi(func_80127B70) +/* BE418 80127D18 24427B70 */ addiu $v0, $v0, %lo(func_80127B70) /* BE41C 80127D1C AFA20038 */ sw $v0, 0x38($sp) /* BE420 80127D20 24020140 */ addiu $v0, $zero, 0x140 /* BE424 80127D24 AFA20044 */ sw $v0, 0x44($sp) diff --git a/asm/nonmatchings/code_B9D60/func_801363A0.s b/asm/nonmatchings/code_B9D60/func_801363A0.s index b6644dd2c1..c17d231178 100644 --- a/asm/nonmatchings/code_B9D60/func_801363A0.s +++ b/asm/nonmatchings/code_B9D60/func_801363A0.s @@ -168,8 +168,8 @@ glabel func_801363A0 /* CCCE4 801365E4 24C6FFE8 */ addiu $a2, $a2, -0x18 /* CCCE8 801365E8 02663021 */ addu $a2, $s3, $a2 /* CCCEC 801365EC 0200382D */ daddu $a3, $s0, $zero -/* CCCF0 801365F0 3C028013 */ lui $v0, %hi(D_8013673C) -/* CCCF4 801365F4 2442673C */ addiu $v0, $v0, %lo(D_8013673C) +/* CCCF0 801365F0 3C028013 */ lui $v0, %hi(func_8013673C) +/* CCCF4 801365F4 2442673C */ addiu $v0, $v0, %lo(func_8013673C) /* CCCF8 801365F8 AFA20018 */ sw $v0, 0x18($sp) /* CCCFC 801365FC 2402FFFF */ addiu $v0, $zero, -1 /* CCD00 80136600 AFA80010 */ sw $t0, 0x10($sp) @@ -188,8 +188,8 @@ glabel func_801363A0 /* CCD34 80136634 24070118 */ addiu $a3, $zero, 0x118 /* CCD38 80136638 24020020 */ addiu $v0, $zero, 0x20 /* CCD3C 8013663C AFA20010 */ sw $v0, 0x10($sp) -/* CCD40 80136640 3C028013 */ lui $v0, %hi(D_80136A08) -/* CCD44 80136644 24426A08 */ addiu $v0, $v0, %lo(D_80136A08) +/* CCD40 80136640 3C028013 */ lui $v0, %hi(func_80136A08) +/* CCD44 80136644 24426A08 */ addiu $v0, $v0, %lo(func_80136A08) /* CCD48 80136648 AFA20018 */ sw $v0, 0x18($sp) /* CCD4C 8013664C 2402FFFF */ addiu $v0, $zero, -1 /* CCD50 80136650 AFA00014 */ sw $zero, 0x14($sp) @@ -214,8 +214,8 @@ glabel func_801363A0 /* CCD98 80136698 24060024 */ addiu $a2, $zero, 0x24 /* CCD9C 8013669C 24020028 */ addiu $v0, $zero, 0x28 /* CCDA0 801366A0 AFA20010 */ sw $v0, 0x10($sp) -/* CCDA4 801366A4 3C028013 */ lui $v0, %hi(D_801369D0) -/* CCDA8 801366A8 244269D0 */ addiu $v0, $v0, %lo(D_801369D0) +/* CCDA4 801366A4 3C028013 */ lui $v0, %hi(func_801369D0) +/* CCDA8 801366A8 244269D0 */ addiu $v0, $v0, %lo(func_801369D0) /* CCDAC 801366AC 0804D9C1 */ j .L80136704 /* CCDB0 801366B0 0200382D */ daddu $a3, $s0, $zero .L801366B4: @@ -237,8 +237,8 @@ glabel func_801363A0 /* CCDF0 801366F0 0200382D */ daddu $a3, $s0, $zero /* CCDF4 801366F4 24020028 */ addiu $v0, $zero, 0x28 /* CCDF8 801366F8 AFA20010 */ sw $v0, 0x10($sp) -/* CCDFC 801366FC 3C028013 */ lui $v0, %hi(D_8013673C) -/* CCE00 80136700 2442673C */ addiu $v0, $v0, %lo(D_8013673C) +/* CCDFC 801366FC 3C028013 */ lui $v0, %hi(func_8013673C) +/* CCE00 80136700 2442673C */ addiu $v0, $v0, %lo(func_8013673C) .L80136704: /* CCE04 80136704 AFA20018 */ sw $v0, 0x18($sp) /* CCE08 80136708 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_B9D60/load_message_to_printer.s b/asm/nonmatchings/code_B9D60/load_message_to_printer.s index e759310f10..cdf8e1f14e 100644 --- a/asm/nonmatchings/code_B9D60/load_message_to_printer.s +++ b/asm/nonmatchings/code_B9D60/load_message_to_printer.s @@ -9,7 +9,7 @@ glabel load_message_to_printer /* BC178 80125A78 04400003 */ bltz $v0, .L80125A88 /* BC17C 80125A7C AFBF0014 */ sw $ra, 0x14($sp) /* BC180 80125A80 0C049623 */ jal load_message_to_buffer -/* BC184 80125A84 00000000 */ nop +/* BC184 80125A84 00000000 */ nop .L80125A88: /* BC188 80125A88 0040202D */ daddu $a0, $v0, $zero /* BC18C 80125A8C 8E0304FC */ lw $v1, 0x4fc($s0) diff --git a/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s b/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s index 10f4a34258..b6a51c3718 100644 --- a/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s +++ b/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s @@ -35,8 +35,8 @@ glabel func_802B72C0_E22870 /* E228E8 802B7338 AC820004 */ sw $v0, 4($a0) /* E228EC 802B733C 8FBF0014 */ lw $ra, 0x14($sp) /* E228F0 802B7340 8FB00010 */ lw $s0, 0x10($sp) -/* E228F4 802B7344 3C03802B */ lui $v1, %hi(D_802B735C) -/* E228F8 802B7348 2463735C */ addiu $v1, $v1, %lo(D_802B735C) +/* E228F4 802B7344 3C03802B */ lui $v1, %hi(func_802B735C_E2264C) +/* E228F8 802B7348 2463735C */ addiu $v1, $v1, %lo(func_802B735C_E2264C) /* E228FC 802B734C 3C018011 */ lui $at, %hi(D_8010C93C) /* E22900 802B7350 AC23C93C */ sw $v1, %lo(D_8010C93C)($at) /* E22904 802B7354 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_F5750/func_802D4488.s b/asm/nonmatchings/code_F5750/func_802D4488.s index 85104800bb..6e0172e076 100644 --- a/asm/nonmatchings/code_F5750/func_802D4488.s +++ b/asm/nonmatchings/code_F5750/func_802D4488.s @@ -46,13 +46,13 @@ glabel func_802D4488 /* F8EC8 802D4518 2A220040 */ slti $v0, $s1, 0x40 /* F8ECC 802D451C 1440FFEF */ bnez $v0, .L802D44DC /* F8ED0 802D4520 26100004 */ addiu $s0, $s0, 4 -/* F8ED4 802D4524 3C04802D */ lui $a0, %hi(D_802D2FCC) -/* F8ED8 802D4528 24842FCC */ addiu $a0, $a0, %lo(D_802D2FCC) -/* F8EDC 802D452C 3C05802D */ lui $a1, %hi(D_802D3028) +/* F8ED4 802D4524 3C04802D */ lui $a0, %hi(func_802D2FCC) +/* F8ED8 802D4528 24842FCC */ addiu $a0, $a0, %lo(func_802D2FCC) +/* F8EDC 802D452C 3C05802D */ lui $a1, %hi(func_802D3028) /* F8EE0 802D4530 0C048C56 */ jal bind_dynamic_entity_3 -/* F8EE4 802D4534 24A53028 */ addiu $a1, $a1, %lo(D_802D3028) -/* F8EE8 802D4538 3C05802D */ lui $a1, %hi(D_802D31E0) -/* F8EEC 802D453C 24A531E0 */ addiu $a1, $a1, %lo(D_802D31E0) +/* F8EE4 802D4534 24A53028 */ addiu $a1, $a1, %lo(func_802D3028) +/* F8EE8 802D4538 3C05802D */ lui $a1, %hi(func_802D31E0) +/* F8EEC 802D453C 24A531E0 */ addiu $a1, $a1, %lo(func_802D31E0) /* F8EF0 802D4540 0C048CC8 */ jal bind_dynamic_entity_B /* F8EF4 802D4544 0000202D */ daddu $a0, $zero, $zero /* F8EF8 802D4548 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s index f3a51ff18f..41bafb53d3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s @@ -48,8 +48,8 @@ glabel func_8011F304 /* B5AA8 8011F3A8 24A50010 */ addiu $a1, $a1, 0x10 /* B5AAC 8011F3AC 14A3FFF6 */ bne $a1, $v1, .L8011F388 /* B5AB0 8011F3B0 24420010 */ addiu $v0, $v0, 0x10 -/* B5AB4 8011F3B4 3C028012 */ lui $v0, %hi(D_8011F4D4) -/* B5AB8 8011F3B8 2442F4D4 */ addiu $v0, $v0, %lo(D_8011F4D4) +/* B5AB4 8011F3B4 3C028012 */ lui $v0, %hi(func_8011F4D4) +/* B5AB8 8011F3B8 2442F4D4 */ addiu $v0, $v0, %lo(func_8011F4D4) /* B5ABC 8011F3BC ACE000D8 */ sw $zero, 0xd8($a3) /* B5AC0 8011F3C0 AD070008 */ sw $a3, 8($t0) /* B5AC4 8011F3C4 AD02000C */ sw $v0, 0xc($t0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s index c2dcff4ed7..7a1b0e3540 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s @@ -48,8 +48,8 @@ glabel func_8011F3E8 /* B5B8C 8011F48C 24A50010 */ addiu $a1, $a1, 0x10 /* B5B90 8011F490 14A3FFF6 */ bne $a1, $v1, .L8011F46C /* B5B94 8011F494 24420010 */ addiu $v0, $v0, 0x10 -/* B5B98 8011F498 3C028012 */ lui $v0, %hi(D_8011F4D4) -/* B5B9C 8011F49C 2442F4D4 */ addiu $v0, $v0, %lo(D_8011F4D4) +/* B5B98 8011F498 3C028012 */ lui $v0, %hi(func_8011F4D4) +/* B5B9C 8011F49C 2442F4D4 */ addiu $v0, $v0, %lo(func_8011F4D4) /* B5BA0 8011F4A0 3C018015 */ lui $at, %hi(D_80153A60) /* B5BA4 8011F4A4 AC263A60 */ sw $a2, %lo(D_80153A60)($at) /* B5BA8 8011F4A8 AD2700D8 */ sw $a3, 0xd8($t1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s index 5f86c4597b..6595435de4 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s @@ -80,8 +80,8 @@ glabel render_entities .L8010FFCC: /* A66CC 8010FFCC 86040014 */ lh $a0, 0x14($s0) /* A66D0 8010FFD0 92050004 */ lbu $a1, 4($s0) -/* A66D4 8010FFD4 3C068011 */ lui $a2, %hi(D_8010FE44) -/* A66D8 8010FFD8 24C6FE44 */ addiu $a2, $a2, %lo(D_8010FE44) +/* A66D4 8010FFD4 3C068011 */ lui $a2, %hi(func_8010FE44) +/* A66D8 8010FFD8 24C6FE44 */ addiu $a2, $a2, %lo(func_8010FE44) .L8010FFDC: /* A66DC 8010FFDC 0C048000 */ jal func_80120000 /* A66E0 8010FFE0 00000000 */ nop @@ -120,8 +120,8 @@ glabel render_entities .L80110054: /* A6754 80110054 86040014 */ lh $a0, 0x14($s0) /* A6758 80110058 92050004 */ lbu $a1, 4($s0) -/* A675C 8011005C 3C068011 */ lui $a2, %hi(D_8010FE44) -/* A6760 80110060 24C6FE44 */ addiu $a2, $a2, %lo(D_8010FE44) +/* A675C 8011005C 3C068011 */ lui $a2, %hi(func_8010FE44) +/* A6760 80110060 24C6FE44 */ addiu $a2, $a2, %lo(func_8010FE44) .L80110064: /* A6764 80110064 0C048BD9 */ jal func_80122F64 /* A6768 80110068 00000000 */ nop diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s index 952ed3a41e..93eccf552c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s @@ -1082,8 +1082,8 @@ glabel render_models /* AE318 80117C18 4404C000 */ mfc1 $a0, $f24 /* AE31C 80117C1C 5440000C */ bnel $v0, $zero, .L80117C50 /* AE320 80117C20 26730001 */ addiu $s3, $s3, 1 -/* AE324 80117C24 3C028012 */ lui $v0, %hi(D_8011800C) -/* AE328 80117C28 2442800C */ addiu $v0, $v0, %lo(D_8011800C) +/* AE324 80117C24 3C028012 */ lui $v0, %hi(func_8011800C) +/* AE328 80117C28 2442800C */ addiu $v0, $v0, %lo(func_8011800C) /* AE32C 80117C2C AE22000C */ sw $v0, 0xc($s1) /* AE330 80117C30 00041023 */ negu $v0, $a0 /* AE334 80117C34 AE300008 */ sw $s0, 8($s1) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s index 0df678dafa..e7367fa089 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s @@ -69,9 +69,9 @@ glabel render_shadows .L801101BC: /* A68BC 801101BC 86040008 */ lh $a0, 8($s0) /* A68C0 801101C0 92050005 */ lbu $a1, 5($s0) -/* A68C4 801101C4 3C068011 */ lui $a2, %hi(D_8010FE68) +/* A68C4 801101C4 3C068011 */ lui $a2, %hi(func_8010FE68) /* A68C8 801101C8 0C048BD9 */ jal func_80122F64 -/* A68CC 801101CC 24C6FE68 */ addiu $a2, $a2, %lo(D_8010FE68) +/* A68CC 801101CC 24C6FE68 */ addiu $a2, $a2, %lo(func_8010FE68) /* A68D0 801101D0 8E07000C */ lw $a3, 0xc($s0) /* A68D4 801101D4 14E00006 */ bnez $a3, .L801101F0 /* A68D8 801101D8 00000000 */ nop diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s index be54abc666..ae7f0ff73b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s @@ -89,8 +89,8 @@ glabel func_80121CE8 /* B8530 80121E30 0C00A588 */ jal transform_point /* B8534 80121E34 E7A00010 */ swc1 $f0, 0x10($sp) /* B8538 80121E38 82030004 */ lb $v1, 4($s0) -/* B853C 80121E3C 3C028012 */ lui $v0, %hi(D_80121184) -/* B8540 80121E40 24421184 */ addiu $v0, $v0, %lo(D_80121184) +/* B853C 80121E3C 3C028012 */ lui $v0, %hi(func_80121184) +/* B8540 80121E40 24421184 */ addiu $v0, $v0, %lo(func_80121184) /* B8544 80121E44 AE300008 */ sw $s0, 8($s1) /* B8548 80121E48 AE22000C */ sw $v0, 0xc($s1) /* B854C 80121E4C AE230000 */ sw $v1, ($s1) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s index 42c95ab8f5..957bb9d7a4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s @@ -89,8 +89,8 @@ glabel func_80121EB8 /* B8700 80122000 0C00A588 */ jal transform_point /* B8704 80122004 E7A00010 */ swc1 $f0, 0x10($sp) /* B8708 80122008 82030004 */ lb $v1, 4($s0) -/* B870C 8012200C 3C028012 */ lui $v0, %hi(D_80121184) -/* B8710 80122010 24421184 */ addiu $v0, $v0, %lo(D_80121184) +/* B870C 8012200C 3C028012 */ lui $v0, %hi(func_80121184) +/* B8710 80122010 24421184 */ addiu $v0, $v0, %lo(func_80121184) /* B8714 80122014 AE300008 */ sw $s0, 8($s1) /* B8718 80122018 AE22000C */ sw $v0, 0xc($s1) /* B871C 8012201C AE230000 */ sw $v1, ($s1) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s index 16a01fe1f2..937f1538aa 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122088.s @@ -53,8 +53,8 @@ glabel func_80122088 /* B8840 80122140 14A3FFF6 */ bne $a1, $v1, .L8012211C /* B8844 80122144 24420010 */ addiu $v0, $v0, 0x10 /* B8848 80122148 80E30004 */ lb $v1, 4($a3) -/* B884C 8012214C 3C028012 */ lui $v0, %hi(D_80121184) -/* B8850 80122150 24421184 */ addiu $v0, $v0, %lo(D_80121184) +/* B884C 8012214C 3C028012 */ lui $v0, %hi(func_80121184) +/* B8850 80122150 24421184 */ addiu $v0, $v0, %lo(func_80121184) /* B8854 80122154 ACE0005C */ sw $zero, 0x5c($a3) /* B8858 80122158 AD070008 */ sw $a3, 8($t0) /* B885C 8012215C AD02000C */ sw $v0, 0xc($t0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s index d4114007fc..54a95c2350 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122188.s @@ -53,8 +53,8 @@ glabel func_80122188 /* B8940 80122240 3C018015 */ lui $at, %hi(D_80154374) /* B8944 80122244 AC264374 */ sw $a2, %lo(D_80154374)($at) /* B8948 80122248 81230004 */ lb $v1, 4($t1) -/* B894C 8012224C 3C028012 */ lui $v0, %hi(D_80121184) -/* B8950 80122250 24421184 */ addiu $v0, $v0, %lo(D_80121184) +/* B894C 8012224C 3C028012 */ lui $v0, %hi(func_80121184) +/* B8950 80122250 24421184 */ addiu $v0, $v0, %lo(func_80121184) /* B8954 80122254 AD27005C */ sw $a3, 0x5c($t1) /* B8958 80122258 AD490008 */ sw $t1, 8($t2) /* B895C 8012225C AD42000C */ sw $v0, 0xc($t2) diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s index 14b64218c4..e614ade3f9 100644 --- a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s +++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s @@ -46,8 +46,8 @@ glabel func_802CD4B4 /* F1EF4 802CD544 2A220010 */ slti $v0, $s1, 0x10 /* F1EF8 802CD548 1440FFEF */ bnez $v0, .L802CD508 /* F1EFC 802CD54C 26100004 */ addiu $s0, $s0, 4 -/* F1F00 802CD550 3C04802D */ lui $a0, %hi(D_802CCAC0) -/* F1F04 802CD554 2484CAC0 */ addiu $a0, $a0, %lo(D_802CCAC0) +/* F1F00 802CD550 3C04802D */ lui $a0, %hi(func_802CCAC0) +/* F1F04 802CD554 2484CAC0 */ addiu $a0, $a0, %lo(func_802CCAC0) /* F1F08 802CD558 3C05802D */ lui $a1, %hi(draw_anim_models) /* F1F0C 802CD55C 0C048C56 */ jal bind_dynamic_entity_3 /* F1F10 802CD560 24A5CB18 */ addiu $a1, $a1, %lo(draw_anim_models) diff --git a/asm/nonmatchings/os/osCreateThread/osCreateThread.s b/asm/nonmatchings/os/osCreateThread/osCreateThread.s index 219bc5afca..16db2f49ed 100644 --- a/asm/nonmatchings/os/osCreateThread/osCreateThread.s +++ b/asm/nonmatchings/os/osCreateThread/osCreateThread.s @@ -7,8 +7,8 @@ glabel osCreateThread /* 41268 80065E68 00808021 */ addu $s0, $a0, $zero /* 4126C 80065E6C 00E04821 */ addu $t1, $a3, $zero /* 41270 80065E70 000747C3 */ sra $t0, $a3, 0x1f -/* 41274 80065E74 3C048007 */ lui $a0, %hi(D_8006B350) -/* 41278 80065E78 2484B350 */ addiu $a0, $a0, %lo(D_8006B350) +/* 41274 80065E74 3C048007 */ lui $a0, %hi(osCleanupThread) +/* 41278 80065E78 2484B350 */ addiu $a0, $a0, %lo(osCleanupThread) /* 4127C 80065E7C 00801821 */ addu $v1, $a0, $zero /* 41280 80065E80 000417C3 */ sra $v0, $a0, 0x1f /* 41284 80065E84 8FA70028 */ lw $a3, 0x28($sp) diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s index c55934cf14..960e6b92ef 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240000_BDD1B0.s @@ -38,8 +38,8 @@ glabel func_80240000_BDD1B0 /* BDD234 80240084 0002802B */ sltu $s0, $zero, $v0 /* BDD238 80240088 0C00A6C9 */ jal clamp_angle /* BDD23C 8024008C 46000306 */ mov.s $f12, $f0 -/* BDD240 80240090 3C018024 */ lui $at, %hi(D_80241AE0) -/* BDD244 80240094 D4221AE0 */ ldc1 $f2, %lo(D_80241AE0)($at) +/* BDD240 80240090 3C018024 */ lui $at, %hi(func_80241AE0_9F6520) +/* BDD244 80240094 D4221AE0 */ ldc1 $f2, %lo(func_80241AE0_9F6520)($at) /* BDD248 80240098 46000021 */ cvt.d.s $f0, $f0 /* BDD24C 8024009C 4622003C */ c.lt.d $f0, $f2 /* BDD250 802400A0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s index 40e3c54d9e..6436b9e349 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_802401D4_BDD384.s @@ -21,8 +21,8 @@ glabel func_802401D4_BDD384 /* BDD3C4 80240214 8E420014 */ lw $v0, 0x14($s2) /* BDD3C8 80240218 AE620074 */ sw $v0, 0x74($s3) /* BDD3CC 8024021C C640000C */ lwc1 $f0, 0xc($s2) -/* BDD3D0 80240220 3C018024 */ lui $at, %hi(D_80241AF0) -/* BDD3D4 80240224 D4221AF0 */ ldc1 $f2, %lo(D_80241AF0)($at) +/* BDD3D0 80240220 3C018024 */ lui $at, %hi(func_80241AF0_A6FED0) +/* BDD3D4 80240224 D4221AF0 */ ldc1 $f2, %lo(func_80241AF0_A6FED0)($at) /* BDD3D8 80240228 46000021 */ cvt.d.s $f0, $f0 /* BDD3DC 8024022C 46220002 */ mul.d $f0, $f0, $f2 /* BDD3E0 80240230 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s index d11f0f9479..f0e68e9f22 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240984_BDDB34.s @@ -30,8 +30,8 @@ glabel func_80240984_BDDB34 /* BDDB98 802409E8 08090284 */ j .L80240A10 /* BDDB9C 802409EC E4600018 */ swc1 $f0, 0x18($v1) .L802409F0: -/* BDDBA0 802409F0 3C018024 */ lui $at, %hi(D_80241B00) -/* BDDBA4 802409F4 D4221B00 */ ldc1 $f2, %lo(D_80241B00)($at) +/* BDDBA0 802409F0 3C018024 */ lui $at, %hi(func_80241B00_B366D0) +/* BDDBA4 802409F4 D4221B00 */ ldc1 $f2, %lo(func_80241B00_B366D0)($at) /* BDDBA8 802409F8 44820000 */ mtc1 $v0, $f0 /* BDDBAC 802409FC 00000000 */ nop /* BDDBB0 80240A00 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s index 5a4ab7edec..b484b8f0a7 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s @@ -95,9 +95,9 @@ glabel func_80240C90_BDDE40 /* BDDF94 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 /* BDDF98 80240DE8 10400073 */ beqz $v0, .L80240FB8 /* BDDF9C 80240DEC 00031080 */ sll $v0, $v1, 2 -/* BDDFA0 80240DF0 3C018024 */ lui $at, %hi(D_80241B08) +/* BDDFA0 80240DF0 3C018024 */ lui $at, %hi(func_80241B08_B94F48) /* BDDFA4 80240DF4 00220821 */ addu $at, $at, $v0 -/* BDDFA8 80240DF8 8C221B08 */ lw $v0, %lo(D_80241B08)($at) +/* BDDFA8 80240DF8 8C221B08 */ lw $v0, %lo(func_80241B08_B94F48)($at) /* BDDFAC 80240DFC 00400008 */ jr $v0 /* BDDFB0 80240E00 00000000 */ nop /* BDDFB4 80240E04 0260202D */ daddu $a0, $s3, $zero @@ -207,7 +207,7 @@ glabel func_80240C90_BDDE40 /* BDE154 80240FA4 0000102D */ daddu $v0, $zero, $zero /* BDE158 80240FA8 0260202D */ daddu $a0, $s3, $zero /* BDE15C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* BDE160 80240FB0 0C090313 */ jal arn_02_UnkDurationCheck +/* BDE160 80240FB0 0C090313 */ jal func_80240C4C_BDDDFC /* BDE164 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: /* BDE168 80240FB8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 0cb76d032b..9f6ade27a0 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -141,7 +141,7 @@ glabel func_80240B94_BDF924 /* BDFB2C 80240D9C 00000000 */ nop /* BDFB30 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BDFB34 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BDFB38 80240DA8 0C090100 */ jal arn_03_UnkNpcAIFunc1 +/* BDFB38 80240DA8 0C090100 */ jal func_80240400_BDF190 /* BDFB3C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BDFB40 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_BDF924 /* BDFB6C 80240DDC 00000000 */ nop /* BDFB70 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BDFB74 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BDFB78 80240DE8 0C0901CC */ jal arn_03_NpcJumpFunc2 +/* BDFB78 80240DE8 0C0901CC */ jal func_80240730_BDF4C0 /* BDFB7C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BDFB80 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BDFB88 80240DF8 0C0901E9 */ jal arn_03_NpcJumpFunc +/* BDFB88 80240DF8 0C0901E9 */ jal func_802407A4_BDF534 /* BDFB8C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BDFB90 80240E00 0809039A */ j .L80240E68 /* BDFB94 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_BDF924 /* BDFBBC 80240E2C 00000000 */ nop /* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BDFBC8 80240E38 0C09029B */ jal arn_03_UnkNpcDurationFlagFunc +/* BDFBC8 80240E38 0C09029B */ jal func_80240A6C_BDF7FC /* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BDFBD0 80240E40 0809039A */ j .L80240E68 /* BDFBD4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s index 12e7864310..0cab59b800 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s @@ -71,7 +71,7 @@ glabel func_8024113C_BDFECC /* BDFFD0 80241240 00000000 */ nop /* BDFFD4 80241244 0280202D */ daddu $a0, $s4, $zero /* BDFFD8 80241248 0200282D */ daddu $a1, $s0, $zero -/* BDFFDC 8024124C 0C090100 */ jal arn_03_UnkNpcAIFunc1 +/* BDFFDC 8024124C 0C090100 */ jal func_80240400_BDF190 /* BDFFE0 80241250 0240302D */ daddu $a2, $s2, $zero /* BDFFE4 80241254 0280202D */ daddu $a0, $s4, $zero /* BDFFE8 80241258 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s index ebd49d32b9..e543d7de0e 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_802415F4_BE0384.s @@ -6,11 +6,11 @@ glabel func_802415F4_BE0384 /* BE0388 802415F8 AFBF0010 */ sw $ra, 0x10($sp) /* BE038C 802415FC 10A00003 */ beqz $a1, .L8024160C /* BE0390 80241600 8C86000C */ lw $a2, 0xc($a0) -/* BE0394 80241604 3C018024 */ lui $at, %hi(D_80241CCC) -/* BE0398 80241608 AC201CCC */ sw $zero, %lo(D_80241CCC)($at) +/* BE0394 80241604 3C018024 */ lui $at, %hi(func_80241CCC_A3B1AC) +/* BE0398 80241608 AC201CCC */ sw $zero, %lo(func_80241CCC_A3B1AC)($at) .L8024160C: -/* BE039C 8024160C 3C038024 */ lui $v1, %hi(D_80241CCC) -/* BE03A0 80241610 24631CCC */ addiu $v1, $v1, %lo(D_80241CCC) +/* BE039C 8024160C 3C038024 */ lui $v1, %hi(func_80241CCC_A3B1AC) +/* BE03A0 80241610 24631CCC */ addiu $v1, $v1, %lo(func_80241CCC_A3B1AC) /* BE03A4 80241614 8C620000 */ lw $v0, ($v1) /* BE03A8 80241618 54400003 */ bnel $v0, $zero, .L80241628 /* BE03AC 8024161C AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s index c558da2041..e8a60c03a3 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s @@ -12,7 +12,7 @@ glabel func_80241648_BE03D8 /* BE03F4 80241664 24020002 */ addiu $v0, $zero, 2 /* BE03F8 80241668 8FBF0010 */ lw $ra, 0x10($sp) /* BE03FC 8024166C 24030001 */ addiu $v1, $zero, 1 -/* BE0400 80241670 3C018024 */ lui $at, %hi(D_80241CCC) -/* BE0404 80241674 AC231CCC */ sw $v1, %lo(D_80241CCC)($at) +/* BE0400 80241670 3C018024 */ lui $at, %hi(func_80241CCC_A3B1AC) +/* BE0404 80241674 AC231CCC */ sw $v1, %lo(func_80241CCC_A3B1AC)($at) /* BE0408 80241678 03E00008 */ jr $ra /* BE040C 8024167C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index bf1180133d..47618e294d 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -141,7 +141,7 @@ glabel func_80240B94_BE4344 /* BE454C 80240D9C 00000000 */ nop /* BE4550 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE4554 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE4558 80240DA8 0C090100 */ jal arn_04_UnkNpcAIFunc1 +/* BE4558 80240DA8 0C090100 */ jal func_80240400_BE3BB0 /* BE455C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE4560 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_BE4344 /* BE458C 80240DDC 00000000 */ nop /* BE4590 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE4594 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE4598 80240DE8 0C0901CC */ jal arn_04_NpcJumpFunc2 +/* BE4598 80240DE8 0C0901CC */ jal func_80240730_BE3EE0 /* BE459C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE45A0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE45A8 80240DF8 0C0901E9 */ jal arn_04_NpcJumpFunc +/* BE45A8 80240DF8 0C0901E9 */ jal func_802407A4_BE3F54 /* BE45AC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE45B0 80240E00 0809039A */ j .L80240E68 /* BE45B4 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_BE4344 /* BE45DC 80240E2C 00000000 */ nop /* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE45E8 80240E38 0C09029B */ jal arn_04_UnkNpcDurationFlagFunc +/* BE45E8 80240E38 0C09029B */ jal func_80240A6C_BE421C /* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE45F0 80240E40 0809039A */ j .L80240E68 /* BE45F4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s index 4257104756..d0dd340dc8 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241040_BE47F0.s @@ -131,8 +131,8 @@ glabel func_80241040_BE47F0 /* BE49DC 8024122C C7A4002C */ lwc1 $f4, 0x2c($sp) /* BE49E0 80241230 461A2100 */ add.s $f4, $f4, $f26 /* BE49E4 80241234 46142081 */ sub.s $f2, $f4, $f20 -/* BE49E8 80241238 3C018024 */ lui $at, %hi(D_802442E0) -/* BE49EC 8024123C D42042E0 */ ldc1 $f0, %lo(D_802442E0)($at) +/* BE49E8 80241238 3C018024 */ lui $at, %hi(func_802442E0_9DB300) +/* BE49EC 8024123C D42042E0 */ ldc1 $f0, %lo(func_802442E0_9DB300)($at) /* BE49F0 80241240 460010A1 */ cvt.d.s $f2, $f2 /* BE49F4 80241244 46201082 */ mul.d $f2, $f2, $f0 /* BE49F8 80241248 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index e2d98dcb77..defb9a55e5 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -54,7 +54,7 @@ glabel func_8024219C_BE594C /* BE5A0C 8024225C 8E4300B0 */ lw $v1, 0xb0($s2) /* BE5A10 80242260 30620004 */ andi $v0, $v1, 4 /* BE5A14 80242264 10400007 */ beqz $v0, .L80242284 -/* BE5A18 80242268 00000000 */ nop +/* BE5A18 80242268 00000000 */ nop /* BE5A1C 8024226C 824200B4 */ lb $v0, 0xb4($s2) /* BE5A20 80242270 1440003C */ bnez $v0, .L80242364 /* BE5A24 80242274 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_8024219C_BE594C /* BE5A48 80242298 00220821 */ addu $at, $at, $v0 /* BE5A4C 8024229C 8C2242E8 */ lw $v0, %lo(D_802442E8)($at) /* BE5A50 802422A0 00400008 */ jr $v0 -/* BE5A54 802422A4 00000000 */ nop +/* BE5A54 802422A4 00000000 */ nop /* BE5A58 802422A8 0280202D */ daddu $a0, $s4, $zero /* BE5A5C 802422AC 0200282D */ daddu $a1, $s0, $zero /* BE5A60 802422B0 0C0903A4 */ jal func_80240E90_BE4640 @@ -83,7 +83,7 @@ glabel func_8024219C_BE594C /* BE5A7C 802422CC 0000102D */ daddu $v0, $zero, $zero /* BE5A80 802422D0 0280202D */ daddu $a0, $s4, $zero /* BE5A84 802422D4 0200282D */ daddu $a1, $s0, $zero -/* BE5A88 802422D8 0C09059A */ jal dup_arn_04_UnkNpcAIFunc1 +/* BE5A88 802422D8 0C09059A */ jal func_80241668_BE4E18 /* BE5A8C 802422DC 0260302D */ daddu $a2, $s3, $zero /* BE5A90 802422E0 0280202D */ daddu $a0, $s4, $zero /* BE5A94 802422E4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024219C_BE594C /* BE5AA4 802422F4 0000102D */ daddu $v0, $zero, $zero /* BE5AA8 802422F8 0280202D */ daddu $a0, $s4, $zero /* BE5AAC 802422FC 0200282D */ daddu $a1, $s0, $zero -/* BE5AB0 80242300 0C09069B */ jal arn_04_UnkNpcAIFunc2 +/* BE5AB0 80242300 0C09069B */ jal func_80241A6C_BE521C /* BE5AB4 80242304 0260302D */ daddu $a2, $s3, $zero /* BE5AB8 80242308 0280202D */ daddu $a0, $s4, $zero /* BE5ABC 8024230C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024219C_BE594C /* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero /* BE5AE8 80242338 0280202D */ daddu $a0, $s4, $zero /* BE5AEC 8024233C 0200282D */ daddu $a1, $s0, $zero -/* BE5AF0 80242340 0C090721 */ jal arn_04_UnkNpcAIFunc3 +/* BE5AF0 80242340 0C090721 */ jal func_80241C84_BE5434 /* BE5AF4 80242344 0260302D */ daddu $a2, $s3, $zero /* BE5AF8 80242348 080908D9 */ j .L80242364 /* BE5AFC 8024234C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s index 8657549f3f..dd691bff96 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s @@ -207,7 +207,7 @@ glabel func_80243018_BE67C8 /* BE6ADC 8024332C 0000102D */ daddu $v0, $zero, $zero /* BE6AE0 80243330 0260202D */ daddu $a0, $s3, $zero /* BE6AE4 80243334 0280282D */ daddu $a1, $s4, $zero -/* BE6AE8 80243338 0C090BF5 */ jal arn_04_UnkDurationCheck +/* BE6AE8 80243338 0C090BF5 */ jal func_80242FD4_BE6784 /* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero .L80243340: /* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 02d3f37ca9..59b61a03be 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -141,7 +141,7 @@ glabel func_80240B94_BE8774 /* BE897C 80240D9C 00000000 */ nop /* BE8980 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE8984 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE8988 80240DA8 0C090100 */ jal arn_05_UnkNpcAIFunc1 +/* BE8988 80240DA8 0C090100 */ jal func_80240400_BE7FE0 /* BE898C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE8990 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_BE8774 /* BE89BC 80240DDC 00000000 */ nop /* BE89C0 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE89C4 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE89C8 80240DE8 0C0901CC */ jal arn_05_NpcJumpFunc2 +/* BE89C8 80240DE8 0C0901CC */ jal func_80240730_BE8310 /* BE89CC 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE89D0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE89D8 80240DF8 0C0901E9 */ jal arn_05_NpcJumpFunc +/* BE89D8 80240DF8 0C0901E9 */ jal func_802407A4_BE8384 /* BE89DC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE89E0 80240E00 0809039A */ j .L80240E68 /* BE89E4 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_BE8774 /* BE8A0C 80240E2C 00000000 */ nop /* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE8A18 80240E38 0C09029B */ jal arn_05_UnkNpcDurationFlagFunc +/* BE8A18 80240E38 0C09029B */ jal func_80240A6C_BE864C /* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE8A20 80240E40 0809039A */ j .L80240E68 /* BE8A24 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s index bbbf9da09b..30723045da 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s @@ -71,7 +71,7 @@ glabel func_8024113C_BE8D1C /* BE8E20 80241240 00000000 */ nop /* BE8E24 80241244 0280202D */ daddu $a0, $s4, $zero /* BE8E28 80241248 0200282D */ daddu $a1, $s0, $zero -/* BE8E2C 8024124C 0C090100 */ jal arn_05_UnkNpcAIFunc1 +/* BE8E2C 8024124C 0C090100 */ jal func_80240400_BE7FE0 /* BE8E30 80241250 0240302D */ daddu $a2, $s2, $zero /* BE8E34 80241254 0280202D */ daddu $a0, $s4, $zero /* BE8E38 80241258 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index cd8ff492a6..c670b849fd 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -83,7 +83,7 @@ glabel func_80241C5C_BEEA4C /* BEEB7C 80241D8C 0000102D */ daddu $v0, $zero, $zero /* BEEB80 80241D90 0280202D */ daddu $a0, $s4, $zero /* BEEB84 80241D94 0200282D */ daddu $a1, $s0, $zero -/* BEEB88 80241D98 0C09044A */ jal arn_07_UnkNpcAIFunc1 +/* BEEB88 80241D98 0C09044A */ jal func_80241128_BEDF18 /* BEEB8C 80241D9C 0260302D */ daddu $a2, $s3, $zero /* BEEB90 80241DA0 0280202D */ daddu $a0, $s4, $zero /* BEEB94 80241DA4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241C5C_BEEA4C /* BEEBA4 80241DB4 0000102D */ daddu $v0, $zero, $zero /* BEEBA8 80241DB8 0280202D */ daddu $a0, $s4, $zero /* BEEBAC 80241DBC 0200282D */ daddu $a1, $s0, $zero -/* BEEBB0 80241DC0 0C09054B */ jal arn_07_UnkNpcAIFunc2 +/* BEEBB0 80241DC0 0C09054B */ jal func_8024152C_BEE31C /* BEEBB4 80241DC4 0260302D */ daddu $a2, $s3, $zero /* BEEBB8 80241DC8 0280202D */ daddu $a0, $s4, $zero /* BEEBBC 80241DCC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241C5C_BEEA4C /* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero /* BEEBE8 80241DF8 0280202D */ daddu $a0, $s4, $zero /* BEEBEC 80241DFC 0200282D */ daddu $a1, $s0, $zero -/* BEEBF0 80241E00 0C0905D1 */ jal arn_07_UnkNpcAIFunc3 +/* BEEBF0 80241E00 0C0905D1 */ jal func_80241744_BEE534 /* BEEBF4 80241E04 0260302D */ daddu $a2, $s3, $zero /* BEEBF8 80241E08 08090789 */ j .L80241E24 /* BEEBFC 80241E0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s index fbc3d75d4d..e5d1521e57 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -83,7 +83,7 @@ glabel func_8024142C_BFECAC /* BFEDDC 8024155C 0000102D */ daddu $v0, $zero, $zero /* BFEDE0 80241560 0280202D */ daddu $a0, $s4, $zero /* BFEDE4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BFEDE8 80241568 0C09023E */ jal dgb_01_UnkNpcAIFunc1 +/* BFEDE8 80241568 0C09023E */ jal func_802408F8_BFE178 /* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero /* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero /* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024142C_BFECAC /* BFEE04 80241584 0000102D */ daddu $v0, $zero, $zero /* BFEE08 80241588 0280202D */ daddu $a0, $s4, $zero /* BFEE0C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* BFEE10 80241590 0C09033F */ jal dgb_01_UnkNpcAIFunc2 +/* BFEE10 80241590 0C09033F */ jal func_80240CFC_BFE57C /* BFEE14 80241594 0260302D */ daddu $a2, $s3, $zero /* BFEE18 80241598 0280202D */ daddu $a0, $s4, $zero /* BFEE1C 8024159C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024142C_BFECAC /* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero /* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero /* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero -/* BFEE50 802415D0 0C0903C5 */ jal dgb_01_UnkNpcAIFunc3 +/* BFEE50 802415D0 0C0903C5 */ jal func_80240F14_BFE794 /* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero /* BFEE58 802415D8 0809057D */ j .L802415F4 /* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s index 251bef0a21..0955d6fd69 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s @@ -79,7 +79,7 @@ glabel func_802422B0_BFFB30 /* BFFC54 802423D4 00000000 */ nop /* BFFC58 802423D8 0280202D */ daddu $a0, $s4, $zero /* BFFC5C 802423DC 0220282D */ daddu $a1, $s1, $zero -/* BFFC60 802423E0 0C09023E */ jal dgb_01_UnkNpcAIFunc1 +/* BFFC60 802423E0 0C09023E */ jal func_802408F8_BFE178 /* BFFC64 802423E4 0260302D */ daddu $a2, $s3, $zero /* BFFC68 802423E8 0280202D */ daddu $a0, $s4, $zero /* BFFC6C 802423EC 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index dd007c20e6..8055da3d71 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -46,7 +46,7 @@ glabel func_802430C0_C00940 /* C009E4 80243164 8E2200B0 */ lw $v0, 0xb0($s1) /* C009E8 80243168 30420004 */ andi $v0, $v0, 4 /* C009EC 8024316C 10400044 */ beqz $v0, .L80243280 -/* C009F0 80243170 00000000 */ nop +/* C009F0 80243170 00000000 */ nop .L80243174: /* C009F4 80243174 2404F7FF */ addiu $a0, $zero, -0x801 /* C009F8 80243178 AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_802430C0_C00940 /* C00AAC 8024322C 3C0142C8 */ lui $at, 0x42c8 /* C00AB0 80243230 44812000 */ mtc1 $at, $f4 /* C00AB4 80243234 44823000 */ mtc1 $v0, $f6 -/* C00AB8 80243238 00000000 */ nop +/* C00AB8 80243238 00000000 */ nop /* C00ABC 8024323C 468031A0 */ cvt.s.w $f6, $f6 /* C00AC0 80243240 27A20044 */ addiu $v0, $sp, 0x44 /* C00AC4 80243244 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_802430C0_C00940 /* C00AE8 80243268 0C0372DF */ jal func_800DCB7C /* C00AEC 8024326C 27A70040 */ addiu $a3, $sp, 0x40 /* C00AF0 80243270 10400003 */ beqz $v0, .L80243280 -/* C00AF4 80243274 00000000 */ nop +/* C00AF4 80243274 00000000 */ nop /* C00AF8 80243278 C7A0003C */ lwc1 $f0, 0x3c($sp) /* C00AFC 8024327C E640003C */ swc1 $f0, 0x3c($s2) .L80243280: @@ -128,7 +128,7 @@ glabel func_802430C0_C00940 /* C00B14 80243294 00220821 */ addu $at, $at, $v0 /* C00B18 80243298 8C223520 */ lw $v0, %lo(D_80263520)($at) /* C00B1C 8024329C 00400008 */ jr $v0 -/* C00B20 802432A0 00000000 */ nop +/* C00B20 802432A0 00000000 */ nop /* C00B24 802432A4 0280202D */ daddu $a0, $s4, $zero /* C00B28 802432A8 0260282D */ daddu $a1, $s3, $zero /* C00B2C 802432AC 0C09094B */ jal func_8024252C_BFFDAC @@ -138,33 +138,33 @@ glabel func_802430C0_C00940 /* C00B3C 802432BC 0C0909A1 */ jal func_80242684_BFFF04 /* C00B40 802432C0 02A0302D */ daddu $a2, $s5, $zero /* C00B44 802432C4 08090CE5 */ j .L80243394 -/* C00B48 802432C8 00000000 */ nop +/* C00B48 802432C8 00000000 */ nop /* C00B4C 802432CC 0280202D */ daddu $a0, $s4, $zero /* C00B50 802432D0 0260282D */ daddu $a1, $s3, $zero -/* C00B54 802432D4 0C090A4B */ jal dup_dgb_01_UnkNpcAIFunc1 +/* C00B54 802432D4 0C090A4B */ jal func_8024292C_C001AC /* C00B58 802432D8 02A0302D */ daddu $a2, $s5, $zero /* C00B5C 802432DC 0280202D */ daddu $a0, $s4, $zero /* C00B60 802432E0 0260282D */ daddu $a1, $s3, $zero /* C00B64 802432E4 0C090A7B */ jal func_802429EC_C0026C /* C00B68 802432E8 02A0302D */ daddu $a2, $s5, $zero /* C00B6C 802432EC 08090CE5 */ j .L80243394 -/* C00B70 802432F0 00000000 */ nop +/* C00B70 802432F0 00000000 */ nop /* C00B74 802432F4 0280202D */ daddu $a0, $s4, $zero /* C00B78 802432F8 0260282D */ daddu $a1, $s3, $zero /* C00B7C 802432FC 0C090AEA */ jal func_80242BA8_C00428 /* C00B80 80243300 02A0302D */ daddu $a2, $s5, $zero /* C00B84 80243304 08090CE5 */ j .L80243394 -/* C00B88 80243308 00000000 */ nop +/* C00B88 80243308 00000000 */ nop /* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero /* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero -/* C00B94 80243314 0C090B17 */ jal dgb_01_NpcJumpFunc2 +/* C00B94 80243314 0C090B17 */ jal func_80242C5C_C004DC /* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero /* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero /* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero -/* C00BA4 80243324 0C090B34 */ jal dgb_01_NpcJumpFunc +/* C00BA4 80243324 0C090B34 */ jal func_80242CD0_C00550 /* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero /* C00BAC 8024332C 08090CE5 */ j .L80243394 -/* C00BB0 80243330 00000000 */ nop +/* C00BB0 80243330 00000000 */ nop /* C00BB4 80243334 0280202D */ daddu $a0, $s4, $zero /* C00BB8 80243338 0260282D */ daddu $a1, $s3, $zero /* C00BBC 8024333C 0C090B52 */ jal func_80242D48_C005C8 @@ -174,19 +174,19 @@ glabel func_802430C0_C00940 /* C00BCC 8024334C 0C090B9E */ jal func_80242E78_C006F8 /* C00BD0 80243350 02A0302D */ daddu $a2, $s5, $zero /* C00BD4 80243354 08090CE5 */ j .L80243394 -/* C00BD8 80243358 00000000 */ nop +/* C00BD8 80243358 00000000 */ nop /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero -/* C00BE4 80243364 0C090BE6 */ jal dgb_01_UnkNpcDurationFlagFunc +/* C00BE4 80243364 0C090BE6 */ jal func_80242F98_C00818 /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero /* C00BEC 8024336C 08090CE5 */ j .L80243394 -/* C00BF0 80243370 00000000 */ nop +/* C00BF0 80243370 00000000 */ nop /* C00BF4 80243374 0280202D */ daddu $a0, $s4, $zero /* C00BF8 80243378 0260282D */ daddu $a1, $s3, $zero /* C00BFC 8024337C 0C090C00 */ jal func_80243000_C00880 /* C00C00 80243380 02A0302D */ daddu $a2, $s5, $zero /* C00C04 80243384 08090CE5 */ j .L80243394 -/* C00C08 80243388 00000000 */ nop +/* C00C08 80243388 00000000 */ nop /* C00C0C 8024338C 0C0129CF */ jal func_8004A73C /* C00C10 80243390 0280202D */ daddu $a0, $s4, $zero .L80243394: diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index 333e49742d..b38f283501 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -46,7 +46,7 @@ glabel func_8024061C_C2F1BC /* C2F260 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* C2F264 802406C4 30420004 */ andi $v0, $v0, 4 /* C2F268 802406C8 10400020 */ beqz $v0, .L8024074C -/* C2F26C 802406CC 00000000 */ nop +/* C2F26C 802406CC 00000000 */ nop .L802406D0: /* C2F270 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* C2F274 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_C2F1BC /* C2F2EC 8024074C 8E420070 */ lw $v0, 0x70($s2) /* C2F2F0 80240750 2842001E */ slti $v0, $v0, 0x1e /* C2F2F4 80240754 10400009 */ beqz $v0, .L8024077C -/* C2F2F8 80240758 00000000 */ nop +/* C2F2F8 80240758 00000000 */ nop /* C2F2FC 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C2F300 80240760 14400006 */ bnez $v0, .L8024077C -/* C2F304 80240764 00000000 */ nop +/* C2F304 80240764 00000000 */ nop /* C2F308 80240768 0C090082 */ jal func_80240208_C2EDA8 /* C2F30C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C2F310 80240770 10400002 */ beqz $v0, .L8024077C @@ -100,11 +100,11 @@ glabel func_8024061C_C2F1BC /* C2F320 80240780 2C620064 */ sltiu $v0, $v1, 0x64 /* C2F324 80240784 10400048 */ beqz $v0, .L802408A8 /* C2F328 80240788 00031080 */ sll $v0, $v1, 2 -/* C2F32C 8024078C 3C018024 */ lui $at, %hi(D_80242618) +/* C2F32C 8024078C 3C018024 */ lui $at, %hi(func_80242618_A18838) /* C2F330 80240790 00220821 */ addu $at, $at, $v0 -/* C2F334 80240794 8C222618 */ lw $v0, %lo(D_80242618)($at) +/* C2F334 80240794 8C222618 */ lw $v0, %lo(func_80242618_A18838)($at) /* C2F338 80240798 00400008 */ jr $v0 -/* C2F33C 8024079C 00000000 */ nop +/* C2F33C 8024079C 00000000 */ nop /* C2F340 802407A0 0240202D */ daddu $a0, $s2, $zero /* C2F344 802407A4 0260282D */ daddu $a1, $s3, $zero /* C2F348 802407A8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024061C_C2F1BC /* C2F358 802407B8 0C0125AE */ jal func_800496B8 /* C2F35C 802407BC 0280302D */ daddu $a2, $s4, $zero /* C2F360 802407C0 0809022A */ j .L802408A8 -/* C2F364 802407C4 00000000 */ nop +/* C2F364 802407C4 00000000 */ nop /* C2F368 802407C8 0240202D */ daddu $a0, $s2, $zero /* C2F36C 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C2F370 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C2F370 802407D0 0C0126D1 */ jal func_80049B44 /* C2F374 802407D4 0280302D */ daddu $a2, $s4, $zero /* C2F378 802407D8 0240202D */ daddu $a0, $s2, $zero /* C2F37C 802407DC 0260282D */ daddu $a1, $s3, $zero /* C2F380 802407E0 0C012701 */ jal func_80049C04 /* C2F384 802407E4 0280302D */ daddu $a2, $s4, $zero /* C2F388 802407E8 0809022A */ j .L802408A8 -/* C2F38C 802407EC 00000000 */ nop +/* C2F38C 802407EC 00000000 */ nop /* C2F390 802407F0 0240202D */ daddu $a0, $s2, $zero /* C2F394 802407F4 0260282D */ daddu $a1, $s3, $zero /* C2F398 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_C2F1BC /* C2F3A8 80240808 0C0127B3 */ jal func_80049ECC /* C2F3AC 8024080C 0280302D */ daddu $a2, $s4, $zero /* C2F3B0 80240810 0809022A */ j .L802408A8 -/* C2F3B4 80240814 00000000 */ nop +/* C2F3B4 80240814 00000000 */ nop /* C2F3B8 80240818 0240202D */ daddu $a0, $s2, $zero /* C2F3BC 8024081C 0260282D */ daddu $a1, $s3, $zero /* C2F3C0 80240820 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024061C_C2F1BC /* C2F3D0 80240830 0C012849 */ jal func_8004A124 /* C2F3D4 80240834 0280302D */ daddu $a2, $s4, $zero /* C2F3D8 80240838 0809022A */ j .L802408A8 -/* C2F3DC 8024083C 00000000 */ nop +/* C2F3DC 8024083C 00000000 */ nop /* C2F3E0 80240840 0240202D */ daddu $a0, $s2, $zero /* C2F3E4 80240844 0260282D */ daddu $a1, $s3, $zero /* C2F3E8 80240848 0C0128FA */ jal func_8004A3E8 /* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero /* C2F3F0 80240850 0809022A */ j .L802408A8 -/* C2F3F4 80240854 00000000 */ nop -/* C2F3F8 80240858 0C090000 */ jal dgb_02_UnkNpcAIFunc6 +/* C2F3F4 80240854 00000000 */ nop +/* C2F3F8 80240858 0C090000 */ jal func_80240000_C2EBA0 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C2F400 80240860 0C09001B */ jal dgb_02_UnkNpcAIFunc7 +/* C2F400 80240860 0C09001B */ jal func_8024006C_C2EC0C /* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero /* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C2F414 80240874 00000000 */ nop -/* C2F418 80240878 0C090037 */ jal dgb_02_UnkNpcAIFunc8 +/* C2F414 80240874 00000000 */ nop +/* C2F418 80240878 0C090037 */ jal func_802400DC_C2EC7C /* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C2F428 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C2F42C 8024088C 00000000 */ nop -/* C2F430 80240890 0C09006D */ jal dgb_02_UnkNpcAIFunc5 +/* C2F42C 8024088C 00000000 */ nop +/* C2F430 80240890 0C09006D */ jal func_802401B4_C2ED54 /* C2F434 80240894 0240202D */ daddu $a0, $s2, $zero /* C2F438 80240898 0809022A */ j .L802408A8 -/* C2F43C 8024089C 00000000 */ nop +/* C2F43C 8024089C 00000000 */ nop /* C2F440 802408A0 0C0129CF */ jal func_8004A73C /* C2F444 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index 8e15780574..818aa37557 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -46,7 +46,7 @@ glabel func_802410D4_C2FC74 /* C2FD18 80241178 8E2200B0 */ lw $v0, 0xb0($s1) /* C2FD1C 8024117C 30420004 */ andi $v0, $v0, 4 /* C2FD20 80241180 10400027 */ beqz $v0, .L80241220 -/* C2FD24 80241184 00000000 */ nop +/* C2FD24 80241184 00000000 */ nop .L80241188: /* C2FD28 80241188 2402001E */ addiu $v0, $zero, 0x1e /* C2FD2C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_802410D4_C2FC74 /* C2FDC4 80241224 2442FFF6 */ addiu $v0, $v0, -0xa /* C2FDC8 80241228 2C420014 */ sltiu $v0, $v0, 0x14 /* C2FDCC 8024122C 10400009 */ beqz $v0, .L80241254 -/* C2FDD0 80241230 00000000 */ nop +/* C2FDD0 80241230 00000000 */ nop /* C2FDD4 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C2FDD8 80241238 14400006 */ bnez $v0, .L80241254 -/* C2FDDC 8024123C 00000000 */ nop +/* C2FDDC 8024123C 00000000 */ nop /* C2FDE0 80241240 0C090082 */ jal func_80240208_C2EDA8 /* C2FDE4 80241244 0240202D */ daddu $a0, $s2, $zero /* C2FDE8 80241248 10400002 */ beqz $v0, .L80241254 @@ -108,41 +108,41 @@ glabel func_802410D4_C2FC74 /* C2FDF8 80241258 2C620064 */ sltiu $v0, $v1, 0x64 /* C2FDFC 8024125C 10400067 */ beqz $v0, .L802413FC /* C2FE00 80241260 00031080 */ sll $v0, $v1, 2 -/* C2FE04 80241264 3C018024 */ lui $at, %hi(D_802427B0) +/* C2FE04 80241264 3C018024 */ lui $at, %hi(func_802427B0_BE5F60) /* C2FE08 80241268 00220821 */ addu $at, $at, $v0 -/* C2FE0C 8024126C 8C2227B0 */ lw $v0, %lo(D_802427B0)($at) +/* C2FE0C 8024126C 8C2227B0 */ lw $v0, %lo(func_802427B0_BE5F60)($at) /* C2FE10 80241270 00400008 */ jr $v0 -/* C2FE14 80241274 00000000 */ nop +/* C2FE14 80241274 00000000 */ nop /* C2FE18 80241278 0240202D */ daddu $a0, $s2, $zero /* C2FE1C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C2FE20 80241280 0C090234 */ jal func_802408D0_C2F470 /* C2FE24 80241284 02A0302D */ daddu $a2, $s5, $zero /* C2FE28 80241288 080904FF */ j .L802413FC -/* C2FE2C 8024128C 00000000 */ nop +/* C2FE2C 8024128C 00000000 */ nop /* C2FE30 80241290 0240202D */ daddu $a0, $s2, $zero /* C2FE34 80241294 0260282D */ daddu $a1, $s3, $zero /* C2FE38 80241298 0C090256 */ jal func_80240958_C2F4F8 /* C2FE3C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C2FE40 802412A0 080904FF */ j .L802413FC -/* C2FE44 802412A4 00000000 */ nop +/* C2FE44 802412A4 00000000 */ nop /* C2FE48 802412A8 0240202D */ daddu $a0, $s2, $zero /* C2FE4C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C2FE50 802412B0 0C090304 */ jal func_80240C10_C2F7B0 /* C2FE54 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C2FE58 802412B8 080904FF */ j .L802413FC -/* C2FE5C 802412BC 00000000 */ nop +/* C2FE5C 802412BC 00000000 */ nop /* C2FE60 802412C0 0240202D */ daddu $a0, $s2, $zero /* C2FE64 802412C4 0260282D */ daddu $a1, $s3, $zero /* C2FE68 802412C8 0C09031D */ jal func_80240C74_C2F814 /* C2FE6C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C2FE70 802412D0 080904FF */ j .L802413FC -/* C2FE74 802412D4 00000000 */ nop +/* C2FE74 802412D4 00000000 */ nop /* C2FE78 802412D8 0240202D */ daddu $a0, $s2, $zero /* C2FE7C 802412DC 0260282D */ daddu $a1, $s3, $zero /* C2FE80 802412E0 0C090347 */ jal func_80240D1C_C2F8BC /* C2FE84 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C2FE88 802412E8 080904FF */ j .L802413FC -/* C2FE8C 802412EC 00000000 */ nop +/* C2FE8C 802412EC 00000000 */ nop /* C2FE90 802412F0 0240202D */ daddu $a0, $s2, $zero /* C2FE94 802412F4 0260282D */ daddu $a1, $s3, $zero /* C2FE98 802412F8 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_802410D4_C2FC74 /* C2FEA0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C2FEA4 80241304 2402000D */ addiu $v0, $zero, 0xd /* C2FEA8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C2FEAC 8024130C 00000000 */ nop +/* C2FEAC 8024130C 00000000 */ nop /* C2FEB0 80241310 0240202D */ daddu $a0, $s2, $zero /* C2FEB4 80241314 0260282D */ daddu $a1, $s3, $zero /* C2FEB8 80241318 0C012849 */ jal func_8004A124 /* C2FEBC 8024131C 02A0302D */ daddu $a2, $s5, $zero /* C2FEC0 80241320 080904FF */ j .L802413FC -/* C2FEC4 80241324 00000000 */ nop +/* C2FEC4 80241324 00000000 */ nop /* C2FEC8 80241328 0240202D */ daddu $a0, $s2, $zero /* C2FECC 8024132C 0260282D */ daddu $a1, $s3, $zero /* C2FED0 80241330 0C0128FA */ jal func_8004A3E8 @@ -168,26 +168,26 @@ glabel func_802410D4_C2FC74 /* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 /* C2FEEC 8024134C 080904FF */ j .L802413FC /* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C2FEF4 80241354 0C090000 */ jal dgb_02_UnkNpcAIFunc6 +/* C2FEF4 80241354 0C090000 */ jal func_80240000_C2EBA0 /* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero /* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C2FF04 80241364 14620025 */ bne $v1, $v0, .L802413FC -/* C2FF08 80241368 00000000 */ nop -/* C2FF0C 8024136C 0C09001B */ jal dgb_02_UnkNpcAIFunc7 +/* C2FF08 80241368 00000000 */ nop +/* C2FF0C 8024136C 0C09001B */ jal func_8024006C_C2EC0C /* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero /* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C2FF20 80241380 00000000 */ nop -/* C2FF24 80241384 0C090037 */ jal dgb_02_UnkNpcAIFunc8 +/* C2FF20 80241380 00000000 */ nop +/* C2FF24 80241384 0C090037 */ jal func_802400DC_C2EC7C /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC -/* C2FF30 80241390 00000000 */ nop -/* C2FF34 80241394 0C09006D */ jal dgb_02_UnkNpcAIFunc5 +/* C2FF30 80241390 00000000 */ nop +/* C2FF34 80241394 0C09006D */ jal func_802401B4_C2ED54 /* C2FF38 80241398 0240202D */ daddu $a0, $s2, $zero /* C2FF3C 8024139C 080904FF */ j .L802413FC -/* C2FF40 802413A0 00000000 */ nop +/* C2FF40 802413A0 00000000 */ nop /* C2FF44 802413A4 0240202D */ daddu $a0, $s2, $zero /* C2FF48 802413A8 0260282D */ daddu $a1, $s3, $zero /* C2FF4C 802413AC 0C090395 */ jal func_80240E54_C2F9F4 @@ -195,19 +195,19 @@ glabel func_802410D4_C2FC74 /* C2FF54 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C2FF58 802413B8 24020029 */ addiu $v0, $zero, 0x29 /* C2FF5C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C2FF60 802413C0 00000000 */ nop +/* C2FF60 802413C0 00000000 */ nop /* C2FF64 802413C4 0240202D */ daddu $a0, $s2, $zero /* C2FF68 802413C8 0260282D */ daddu $a1, $s3, $zero /* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00_C2FAA0 /* C2FF70 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C2FF74 802413D4 080904FF */ j .L802413FC -/* C2FF78 802413D8 00000000 */ nop +/* C2FF78 802413D8 00000000 */ nop /* C2FF7C 802413DC 0240202D */ daddu $a0, $s2, $zero /* C2FF80 802413E0 0260282D */ daddu $a1, $s3, $zero /* C2FF84 802413E4 0C09041E */ jal func_80241078_C2FC18 /* C2FF88 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C2FF8C 802413EC 080904FF */ j .L802413FC -/* C2FF90 802413F0 00000000 */ nop +/* C2FF90 802413F0 00000000 */ nop /* C2FF94 802413F4 0C0129CF */ jal func_8004A73C /* C2FF98 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: @@ -221,6 +221,6 @@ glabel func_802410D4_C2FC74 /* C2FFB8 80241418 0000102D */ daddu $v0, $zero, $zero /* C2FFBC 8024141C 03E00008 */ jr $ra /* C2FFC0 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C2FFC4 80241424 00000000 */ nop -/* C2FFC8 80241428 00000000 */ nop -/* C2FFCC 8024142C 00000000 */ nop +/* C2FFC4 80241424 00000000 */ nop +/* C2FFC8 80241428 00000000 */ nop +/* C2FFCC 8024142C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s index d9b2fc972a..84d10d843e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s @@ -54,8 +54,8 @@ glabel func_80240458_C31938 /* C319F8 80240518 00000000 */ nop /* C319FC 8024051C 0C00A6C9 */ jal clamp_angle /* C31A00 80240520 46000306 */ mov.s $f12, $f0 -/* C31A04 80240524 3C018024 */ lui $at, %hi(D_802449F0) -/* C31A08 80240528 D42249F0 */ ldc1 $f2, %lo(D_802449F0)($at) +/* C31A04 80240524 3C018024 */ lui $at, %hi(func_802449F0_A2EC30) +/* C31A08 80240528 D42249F0 */ ldc1 $f2, %lo(func_802449F0_A2EC30)($at) /* C31A0C 8024052C 46000021 */ cvt.d.s $f0, $f0 /* C31A10 80240530 4622003C */ c.lt.d $f0, $f2 /* C31A14 80240534 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index 6f026ae755..7a4e335cb4 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -46,7 +46,7 @@ glabel func_8024086C_C31D4C /* C31DF0 80240910 8E2200B0 */ lw $v0, 0xb0($s1) /* C31DF4 80240914 30420004 */ andi $v0, $v0, 4 /* C31DF8 80240918 10400020 */ beqz $v0, .L8024099C -/* C31DFC 8024091C 00000000 */ nop +/* C31DFC 8024091C 00000000 */ nop .L80240920: /* C31E00 80240920 2404F7FF */ addiu $a0, $zero, -0x801 /* C31E04 80240924 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024086C_C31D4C /* C31E7C 8024099C 8E420070 */ lw $v0, 0x70($s2) /* C31E80 802409A0 2842001E */ slti $v0, $v0, 0x1e /* C31E84 802409A4 10400009 */ beqz $v0, .L802409CC -/* C31E88 802409A8 00000000 */ nop +/* C31E88 802409A8 00000000 */ nop /* C31E8C 802409AC 8E22006C */ lw $v0, 0x6c($s1) /* C31E90 802409B0 14400006 */ bnez $v0, .L802409CC -/* C31E94 802409B4 00000000 */ nop +/* C31E94 802409B4 00000000 */ nop /* C31E98 802409B8 0C090116 */ jal func_80240458_C31938 /* C31E9C 802409BC 0240202D */ daddu $a0, $s2, $zero /* C31EA0 802409C0 10400002 */ beqz $v0, .L802409CC @@ -100,11 +100,11 @@ glabel func_8024086C_C31D4C /* C31EB0 802409D0 2C620064 */ sltiu $v0, $v1, 0x64 /* C31EB4 802409D4 10400048 */ beqz $v0, .L80240AF8 /* C31EB8 802409D8 00031080 */ sll $v0, $v1, 2 -/* C31EBC 802409DC 3C018024 */ lui $at, %hi(D_802449F8) +/* C31EBC 802409DC 3C018024 */ lui $at, %hi(func_802449F8_805278) /* C31EC0 802409E0 00220821 */ addu $at, $at, $v0 -/* C31EC4 802409E4 8C2249F8 */ lw $v0, %lo(D_802449F8)($at) +/* C31EC4 802409E4 8C2249F8 */ lw $v0, %lo(func_802449F8_805278)($at) /* C31EC8 802409E8 00400008 */ jr $v0 -/* C31ECC 802409EC 00000000 */ nop +/* C31ECC 802409EC 00000000 */ nop /* C31ED0 802409F0 0240202D */ daddu $a0, $s2, $zero /* C31ED4 802409F4 0260282D */ daddu $a1, $s3, $zero /* C31ED8 802409F8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024086C_C31D4C /* C31EE8 80240A08 0C0125AE */ jal func_800496B8 /* C31EEC 80240A0C 0280302D */ daddu $a2, $s4, $zero /* C31EF0 80240A10 080902BE */ j .L80240AF8 -/* C31EF4 80240A14 00000000 */ nop +/* C31EF4 80240A14 00000000 */ nop /* C31EF8 80240A18 0240202D */ daddu $a0, $s2, $zero /* C31EFC 80240A1C 0260282D */ daddu $a1, $s3, $zero -/* C31F00 80240A20 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C31F00 80240A20 0C0126D1 */ jal func_80049B44 /* C31F04 80240A24 0280302D */ daddu $a2, $s4, $zero /* C31F08 80240A28 0240202D */ daddu $a0, $s2, $zero /* C31F0C 80240A2C 0260282D */ daddu $a1, $s3, $zero /* C31F10 80240A30 0C012701 */ jal func_80049C04 /* C31F14 80240A34 0280302D */ daddu $a2, $s4, $zero /* C31F18 80240A38 080902BE */ j .L80240AF8 -/* C31F1C 80240A3C 00000000 */ nop +/* C31F1C 80240A3C 00000000 */ nop /* C31F20 80240A40 0240202D */ daddu $a0, $s2, $zero /* C31F24 80240A44 0260282D */ daddu $a1, $s3, $zero /* C31F28 80240A48 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024086C_C31D4C /* C31F38 80240A58 0C0127B3 */ jal func_80049ECC /* C31F3C 80240A5C 0280302D */ daddu $a2, $s4, $zero /* C31F40 80240A60 080902BE */ j .L80240AF8 -/* C31F44 80240A64 00000000 */ nop +/* C31F44 80240A64 00000000 */ nop /* C31F48 80240A68 0240202D */ daddu $a0, $s2, $zero /* C31F4C 80240A6C 0260282D */ daddu $a1, $s3, $zero /* C31F50 80240A70 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024086C_C31D4C /* C31F60 80240A80 0C012849 */ jal func_8004A124 /* C31F64 80240A84 0280302D */ daddu $a2, $s4, $zero /* C31F68 80240A88 080902BE */ j .L80240AF8 -/* C31F6C 80240A8C 00000000 */ nop +/* C31F6C 80240A8C 00000000 */ nop /* C31F70 80240A90 0240202D */ daddu $a0, $s2, $zero /* C31F74 80240A94 0260282D */ daddu $a1, $s3, $zero /* C31F78 80240A98 0C0128FA */ jal func_8004A3E8 /* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero /* C31F80 80240AA0 080902BE */ j .L80240AF8 -/* C31F84 80240AA4 00000000 */ nop -/* C31F88 80240AA8 0C090094 */ jal dgb_03_UnkNpcAIFunc6 +/* C31F84 80240AA4 00000000 */ nop +/* C31F88 80240AA8 0C090094 */ jal func_80240250_C31730 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero -/* C31F90 80240AB0 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 +/* C31F90 80240AB0 0C0900AF */ jal func_802402BC_C3179C /* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero /* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 /* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 -/* C31FA4 80240AC4 00000000 */ nop -/* C31FA8 80240AC8 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 +/* C31FA4 80240AC4 00000000 */ nop +/* C31FA8 80240AC8 0C0900CB */ jal func_8024032C_C3180C /* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero /* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 /* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 -/* C31FBC 80240ADC 00000000 */ nop -/* C31FC0 80240AE0 0C090101 */ jal dgb_03_UnkNpcAIFunc5 +/* C31FBC 80240ADC 00000000 */ nop +/* C31FC0 80240AE0 0C090101 */ jal func_80240404_C318E4 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero /* C31FC8 80240AE8 080902BE */ j .L80240AF8 -/* C31FCC 80240AEC 00000000 */ nop +/* C31FCC 80240AEC 00000000 */ nop /* C31FD0 80240AF0 0C0129CF */ jal func_8004A73C /* C31FD4 80240AF4 0240202D */ daddu $a0, $s2, $zero .L80240AF8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s index 98b5fcbc25..e65a0bfb36 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -124,9 +124,9 @@ glabel func_802416B4_C32B94 /* C32D58 80241878 2C620064 */ sltiu $v0, $v1, 0x64 /* C32D5C 8024187C 10400042 */ beqz $v0, .L80241988 /* C32D60 80241880 00031080 */ sll $v0, $v1, 2 -/* C32D64 80241884 3C018024 */ lui $at, %hi(pause_tabs_draw_stats) +/* C32D64 80241884 3C018024 */ lui $at, %hi(pause_tabs_draw_stats_805418) /* C32D68 80241888 00220821 */ addu $at, $at, $v0 -/* C32D6C 8024188C 8C224B98 */ lw $v0, %lo(pause_tabs_draw_stats)($at) +/* C32D6C 8024188C 8C224B98 */ lw $v0, %lo(pause_tabs_draw_stats_805418)($at) /* C32D70 80241890 00400008 */ jr $v0 /* C32D74 80241894 00000000 */ nop /* C32D78 80241898 0280202D */ daddu $a0, $s4, $zero @@ -141,7 +141,7 @@ glabel func_802416B4_C32B94 /* C32D9C 802418BC 00000000 */ nop /* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero /* C32DA4 802418C4 0260282D */ daddu $a1, $s3, $zero -/* C32DA8 802418C8 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 +/* C32DA8 802418C8 0C0903C8 */ jal func_80240F20_C32400 /* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero /* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero /* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802416B4_C32B94 /* C32DDC 802418FC 00000000 */ nop /* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero /* C32DE4 80241904 0260282D */ daddu $a1, $s3, $zero -/* C32DE8 80241908 0C090494 */ jal dgb_03_NpcJumpFunc2 +/* C32DE8 80241908 0C090494 */ jal func_80241250_C32730 /* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero /* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero /* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero -/* C32DF8 80241918 0C0904B1 */ jal dgb_03_NpcJumpFunc +/* C32DF8 80241918 0C0904B1 */ jal func_802412C4_C327A4 /* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero /* C32E00 80241920 08090662 */ j .L80241988 /* C32E04 80241924 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802416B4_C32B94 /* C32E2C 8024194C 00000000 */ nop /* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero /* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero -/* C32E38 80241958 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc +/* C32E38 80241958 0C090563 */ jal func_8024158C_C32A6C /* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero /* C32E40 80241960 08090662 */ j .L80241988 /* C32E44 80241964 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s index 8547577075..626a690a27 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -46,7 +46,7 @@ glabel func_802419B0_C32E90 /* C32F34 80241A54 8E2200B0 */ lw $v0, 0xb0($s1) /* C32F38 80241A58 30420004 */ andi $v0, $v0, 4 /* C32F3C 80241A5C 10400020 */ beqz $v0, .L80241AE0 -/* C32F40 80241A60 00000000 */ nop +/* C32F40 80241A60 00000000 */ nop .L80241A64: /* C32F44 80241A64 2404F7FF */ addiu $a0, $zero, -0x801 /* C32F48 80241A68 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802419B0_C32E90 /* C32FC0 80241AE0 8E420070 */ lw $v0, 0x70($s2) /* C32FC4 80241AE4 2842001E */ slti $v0, $v0, 0x1e /* C32FC8 80241AE8 10400009 */ beqz $v0, .L80241B10 -/* C32FCC 80241AEC 00000000 */ nop +/* C32FCC 80241AEC 00000000 */ nop /* C32FD0 80241AF0 8E22006C */ lw $v0, 0x6c($s1) /* C32FD4 80241AF4 14400006 */ bnez $v0, .L80241B10 -/* C32FD8 80241AF8 00000000 */ nop +/* C32FD8 80241AF8 00000000 */ nop /* C32FDC 80241AFC 0C090116 */ jal func_80240458_C31938 /* C32FE0 80241B00 0240202D */ daddu $a0, $s2, $zero /* C32FE4 80241B04 10400002 */ beqz $v0, .L80241B10 @@ -104,7 +104,7 @@ glabel func_802419B0_C32E90 /* C33004 80241B24 00220821 */ addu $at, $at, $v0 /* C33008 80241B28 8C224D28 */ lw $v0, %lo(D_80244D28)($at) /* C3300C 80241B2C 00400008 */ jr $v0 -/* C33010 80241B30 00000000 */ nop +/* C33010 80241B30 00000000 */ nop /* C33014 80241B34 0240202D */ daddu $a0, $s2, $zero /* C33018 80241B38 0260282D */ daddu $a1, $s3, $zero /* C3301C 80241B3C 0C0902C8 */ jal func_80240B20_C32000 @@ -114,33 +114,33 @@ glabel func_802419B0_C32E90 /* C3302C 80241B4C 0C09031E */ jal func_80240C78_C32158 /* C33030 80241B50 0280302D */ daddu $a2, $s4, $zero /* C33034 80241B54 08090715 */ j .L80241C54 -/* C33038 80241B58 00000000 */ nop +/* C33038 80241B58 00000000 */ nop /* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero /* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero -/* C33044 80241B64 0C0903C8 */ jal dgb_03_UnkNpcAIFunc1 +/* C33044 80241B64 0C0903C8 */ jal func_80240F20_C32400 /* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero /* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero /* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero /* C33054 80241B74 0C0903F8 */ jal func_80240FE0_C324C0 /* C33058 80241B78 0280302D */ daddu $a2, $s4, $zero /* C3305C 80241B7C 08090715 */ j .L80241C54 -/* C33060 80241B80 00000000 */ nop +/* C33060 80241B80 00000000 */ nop /* C33064 80241B84 0240202D */ daddu $a0, $s2, $zero /* C33068 80241B88 0260282D */ daddu $a1, $s3, $zero /* C3306C 80241B8C 0C090467 */ jal func_8024119C_C3267C /* C33070 80241B90 0280302D */ daddu $a2, $s4, $zero /* C33074 80241B94 08090715 */ j .L80241C54 -/* C33078 80241B98 00000000 */ nop +/* C33078 80241B98 00000000 */ nop /* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero /* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero -/* C33084 80241BA4 0C090494 */ jal dgb_03_NpcJumpFunc2 +/* C33084 80241BA4 0C090494 */ jal func_80241250_C32730 /* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero /* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero /* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero -/* C33094 80241BB4 0C0904B1 */ jal dgb_03_NpcJumpFunc +/* C33094 80241BB4 0C0904B1 */ jal func_802412C4_C327A4 /* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero /* C3309C 80241BBC 08090715 */ j .L80241C54 -/* C330A0 80241BC0 00000000 */ nop +/* C330A0 80241BC0 00000000 */ nop /* C330A4 80241BC4 0240202D */ daddu $a0, $s2, $zero /* C330A8 80241BC8 0260282D */ daddu $a1, $s3, $zero /* C330AC 80241BCC 0C0904CF */ jal func_8024133C_C3281C @@ -150,31 +150,31 @@ glabel func_802419B0_C32E90 /* C330BC 80241BDC 0C09051B */ jal func_8024146C_C3294C /* C330C0 80241BE0 0280302D */ daddu $a2, $s4, $zero /* C330C4 80241BE4 08090715 */ j .L80241C54 -/* C330C8 80241BE8 00000000 */ nop +/* C330C8 80241BE8 00000000 */ nop /* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero /* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero -/* C330D4 80241BF4 0C090563 */ jal dgb_03_UnkNpcDurationFlagFunc +/* C330D4 80241BF4 0C090563 */ jal func_8024158C_C32A6C /* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero /* C330DC 80241BFC 08090715 */ j .L80241C54 -/* C330E0 80241C00 00000000 */ nop -/* C330E4 80241C04 0C090094 */ jal dgb_03_UnkNpcAIFunc6 +/* C330E0 80241C00 00000000 */ nop +/* C330E4 80241C04 0C090094 */ jal func_80240250_C31730 /* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero -/* C330EC 80241C0C 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 +/* C330EC 80241C0C 0C0900AF */ jal func_802402BC_C3179C /* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero /* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) /* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 /* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 -/* C33100 80241C20 00000000 */ nop -/* C33104 80241C24 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 +/* C33100 80241C20 00000000 */ nop +/* C33104 80241C24 0C0900CB */ jal func_8024032C_C3180C /* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero /* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) /* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 /* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 -/* C33118 80241C38 00000000 */ nop -/* C3311C 80241C3C 0C090101 */ jal dgb_03_UnkNpcAIFunc5 +/* C33118 80241C38 00000000 */ nop +/* C3311C 80241C3C 0C090101 */ jal func_80240404_C318E4 /* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero /* C33124 80241C44 08090715 */ j .L80241C54 -/* C33128 80241C48 00000000 */ nop +/* C33128 80241C48 00000000 */ nop /* C3312C 80241C4C 0C0129CF */ jal func_8004A73C /* C33130 80241C50 0240202D */ daddu $a0, $s2, $zero .L80241C54: diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s index 2029c0fb16..7454aea6d1 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -46,7 +46,7 @@ glabel func_80242480_C33960 /* C33A04 80242524 8E2200B0 */ lw $v0, 0xb0($s1) /* C33A08 80242528 30420004 */ andi $v0, $v0, 4 /* C33A0C 8024252C 10400027 */ beqz $v0, .L802425CC -/* C33A10 80242530 00000000 */ nop +/* C33A10 80242530 00000000 */ nop .L80242534: /* C33A14 80242534 2402001E */ addiu $v0, $zero, 0x1e /* C33A18 80242538 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80242480_C33960 /* C33AB0 802425D0 2442FFF6 */ addiu $v0, $v0, -0xa /* C33AB4 802425D4 2C420014 */ sltiu $v0, $v0, 0x14 /* C33AB8 802425D8 10400009 */ beqz $v0, .L80242600 -/* C33ABC 802425DC 00000000 */ nop +/* C33ABC 802425DC 00000000 */ nop /* C33AC0 802425E0 8E22006C */ lw $v0, 0x6c($s1) /* C33AC4 802425E4 14400006 */ bnez $v0, .L80242600 -/* C33AC8 802425E8 00000000 */ nop +/* C33AC8 802425E8 00000000 */ nop /* C33ACC 802425EC 0C090116 */ jal func_80240458_C31938 /* C33AD0 802425F0 0240202D */ daddu $a0, $s2, $zero /* C33AD4 802425F4 10400002 */ beqz $v0, .L80242600 @@ -112,37 +112,37 @@ glabel func_80242480_C33960 /* C33AF4 80242614 00220821 */ addu $at, $at, $v0 /* C33AF8 80242618 8C224EC0 */ lw $v0, %lo(D_80244EC0)($at) /* C33AFC 8024261C 00400008 */ jr $v0 -/* C33B00 80242620 00000000 */ nop +/* C33B00 80242620 00000000 */ nop /* C33B04 80242624 0240202D */ daddu $a0, $s2, $zero /* C33B08 80242628 0260282D */ daddu $a1, $s3, $zero /* C33B0C 8024262C 0C09071F */ jal func_80241C7C_C3315C /* C33B10 80242630 02A0302D */ daddu $a2, $s5, $zero /* C33B14 80242634 080909EA */ j .L802427A8 -/* C33B18 80242638 00000000 */ nop +/* C33B18 80242638 00000000 */ nop /* C33B1C 8024263C 0240202D */ daddu $a0, $s2, $zero /* C33B20 80242640 0260282D */ daddu $a1, $s3, $zero /* C33B24 80242644 0C090741 */ jal func_80241D04_C331E4 /* C33B28 80242648 02A0302D */ daddu $a2, $s5, $zero /* C33B2C 8024264C 080909EA */ j .L802427A8 -/* C33B30 80242650 00000000 */ nop +/* C33B30 80242650 00000000 */ nop /* C33B34 80242654 0240202D */ daddu $a0, $s2, $zero /* C33B38 80242658 0260282D */ daddu $a1, $s3, $zero /* C33B3C 8024265C 0C0907EF */ jal func_80241FBC_C3349C /* C33B40 80242660 02A0302D */ daddu $a2, $s5, $zero /* C33B44 80242664 080909EA */ j .L802427A8 -/* C33B48 80242668 00000000 */ nop +/* C33B48 80242668 00000000 */ nop /* C33B4C 8024266C 0240202D */ daddu $a0, $s2, $zero /* C33B50 80242670 0260282D */ daddu $a1, $s3, $zero /* C33B54 80242674 0C090808 */ jal func_80242020_C33500 /* C33B58 80242678 02A0302D */ daddu $a2, $s5, $zero /* C33B5C 8024267C 080909EA */ j .L802427A8 -/* C33B60 80242680 00000000 */ nop +/* C33B60 80242680 00000000 */ nop /* C33B64 80242684 0240202D */ daddu $a0, $s2, $zero /* C33B68 80242688 0260282D */ daddu $a1, $s3, $zero /* C33B6C 8024268C 0C090832 */ jal func_802420C8_C335A8 /* C33B70 80242690 02A0302D */ daddu $a2, $s5, $zero /* C33B74 80242694 080909EA */ j .L802427A8 -/* C33B78 80242698 00000000 */ nop +/* C33B78 80242698 00000000 */ nop /* C33B7C 8024269C 0240202D */ daddu $a0, $s2, $zero /* C33B80 802426A0 0260282D */ daddu $a1, $s3, $zero /* C33B84 802426A4 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80242480_C33960 /* C33B8C 802426AC 8E430070 */ lw $v1, 0x70($s2) /* C33B90 802426B0 2402000D */ addiu $v0, $zero, 0xd /* C33B94 802426B4 1462003C */ bne $v1, $v0, .L802427A8 -/* C33B98 802426B8 00000000 */ nop +/* C33B98 802426B8 00000000 */ nop /* C33B9C 802426BC 0240202D */ daddu $a0, $s2, $zero /* C33BA0 802426C0 0260282D */ daddu $a1, $s3, $zero /* C33BA4 802426C4 0C012849 */ jal func_8004A124 /* C33BA8 802426C8 02A0302D */ daddu $a2, $s5, $zero /* C33BAC 802426CC 080909EA */ j .L802427A8 -/* C33BB0 802426D0 00000000 */ nop +/* C33BB0 802426D0 00000000 */ nop /* C33BB4 802426D4 0240202D */ daddu $a0, $s2, $zero /* C33BB8 802426D8 0260282D */ daddu $a1, $s3, $zero /* C33BBC 802426DC 0C0128FA */ jal func_8004A3E8 @@ -168,26 +168,26 @@ glabel func_80242480_C33960 /* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 /* C33BD8 802426F8 080909EA */ j .L802427A8 /* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) -/* C33BE0 80242700 0C090094 */ jal dgb_03_UnkNpcAIFunc6 +/* C33BE0 80242700 0C090094 */ jal func_80240250_C31730 /* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero /* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) /* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f /* C33BF0 80242710 14620025 */ bne $v1, $v0, .L802427A8 -/* C33BF4 80242714 00000000 */ nop -/* C33BF8 80242718 0C0900AF */ jal dgb_03_UnkNpcAIFunc7 +/* C33BF4 80242714 00000000 */ nop +/* C33BF8 80242718 0C0900AF */ jal func_802402BC_C3179C /* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero /* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) /* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 /* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 -/* C33C0C 8024272C 00000000 */ nop -/* C33C10 80242730 0C0900CB */ jal dgb_03_UnkNpcAIFunc8 +/* C33C0C 8024272C 00000000 */ nop +/* C33C10 80242730 0C0900CB */ jal func_8024032C_C3180C /* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero /* C33C18 80242738 080909EA */ j .L802427A8 -/* C33C1C 8024273C 00000000 */ nop -/* C33C20 80242740 0C090101 */ jal dgb_03_UnkNpcAIFunc5 +/* C33C1C 8024273C 00000000 */ nop +/* C33C20 80242740 0C090101 */ jal func_80240404_C318E4 /* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero /* C33C28 80242748 080909EA */ j .L802427A8 -/* C33C2C 8024274C 00000000 */ nop +/* C33C2C 8024274C 00000000 */ nop /* C33C30 80242750 0240202D */ daddu $a0, $s2, $zero /* C33C34 80242754 0260282D */ daddu $a1, $s3, $zero /* C33C38 80242758 0C090880 */ jal func_80242200_C336E0 @@ -195,19 +195,19 @@ glabel func_80242480_C33960 /* C33C40 80242760 8E430070 */ lw $v1, 0x70($s2) /* C33C44 80242764 24020029 */ addiu $v0, $zero, 0x29 /* C33C48 80242768 1462000F */ bne $v1, $v0, .L802427A8 -/* C33C4C 8024276C 00000000 */ nop +/* C33C4C 8024276C 00000000 */ nop /* C33C50 80242770 0240202D */ daddu $a0, $s2, $zero /* C33C54 80242774 0260282D */ daddu $a1, $s3, $zero /* C33C58 80242778 0C0908AB */ jal func_802422AC_C3378C /* C33C5C 8024277C 02A0302D */ daddu $a2, $s5, $zero /* C33C60 80242780 080909EA */ j .L802427A8 -/* C33C64 80242784 00000000 */ nop +/* C33C64 80242784 00000000 */ nop /* C33C68 80242788 0240202D */ daddu $a0, $s2, $zero /* C33C6C 8024278C 0260282D */ daddu $a1, $s3, $zero /* C33C70 80242790 0C090909 */ jal func_80242424_C33904 /* C33C74 80242794 02A0302D */ daddu $a2, $s5, $zero /* C33C78 80242798 080909EA */ j .L802427A8 -/* C33C7C 8024279C 00000000 */ nop +/* C33C7C 8024279C 00000000 */ nop /* C33C80 802427A0 0C0129CF */ jal func_8004A73C /* C33C84 802427A4 0240202D */ daddu $a0, $s2, $zero .L802427A8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index d60ba2100b..72f4bb37de 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -83,7 +83,7 @@ glabel func_8024130C_C3783C /* C3796C 8024143C 0000102D */ daddu $v0, $zero, $zero /* C37970 80241440 0280202D */ daddu $a0, $s4, $zero /* C37974 80241444 0200282D */ daddu $a1, $s0, $zero -/* C37978 80241448 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 +/* C37978 80241448 0C0901F6 */ jal func_802407D8_C36D08 /* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero /* C37980 80241450 0280202D */ daddu $a0, $s4, $zero /* C37984 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_C3783C /* C37994 80241464 0000102D */ daddu $v0, $zero, $zero /* C37998 80241468 0280202D */ daddu $a0, $s4, $zero /* C3799C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* C379A0 80241470 0C0902F7 */ jal dgb_04_UnkNpcAIFunc2 +/* C379A0 80241470 0C0902F7 */ jal func_80240BDC_C3710C /* C379A4 80241474 0260302D */ daddu $a2, $s3, $zero /* C379A8 80241478 0280202D */ daddu $a0, $s4, $zero /* C379AC 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_C3783C /* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero /* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero /* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* C379E0 802414B0 0C09037D */ jal dgb_04_UnkNpcAIFunc3 +/* C379E0 802414B0 0C09037D */ jal func_80240DF4_C37324 /* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero /* C379E8 802414B8 08090535 */ j .L802414D4 /* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s index 16ee101d8a..924a4dfa82 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s @@ -79,7 +79,7 @@ glabel func_80242154_C38684 /* C387A8 80242278 00000000 */ nop /* C387AC 8024227C 0280202D */ daddu $a0, $s4, $zero /* C387B0 80242280 0220282D */ daddu $a1, $s1, $zero -/* C387B4 80242284 0C0901F6 */ jal dgb_04_UnkNpcAIFunc1 +/* C387B4 80242284 0C0901F6 */ jal func_802407D8_C36D08 /* C387B8 80242288 0260302D */ daddu $a2, $s3, $zero /* C387BC 8024228C 0280202D */ daddu $a0, $s4, $zero /* C387C0 80242290 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s index 830c4e105f..9c40b36491 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s @@ -30,8 +30,8 @@ glabel func_80240C00_C3B610 /* C3B674 80240C64 08090323 */ j .L80240C8C /* C3B678 80240C68 E4600018 */ swc1 $f0, 0x18($v1) .L80240C6C: -/* C3B67C 80240C6C 3C018024 */ lui $at, %hi(D_80242348) -/* C3B680 80240C70 D4222348 */ ldc1 $f2, %lo(D_80242348)($at) +/* C3B67C 80240C6C 3C018024 */ lui $at, %hi(func_80242348_A1D448) +/* C3B680 80240C70 D4222348 */ ldc1 $f2, %lo(func_80242348_A1D448)($at) /* C3B684 80240C74 44820000 */ mtc1 $v0, $f0 /* C3B688 80240C78 00000000 */ nop /* C3B68C 80240C7C 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index d538940d59..c4fe82fdf6 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -46,7 +46,7 @@ glabel func_80240E80_C3B890 /* C3B934 80240F24 8E2200B0 */ lw $v0, 0xb0($s1) /* C3B938 80240F28 30420004 */ andi $v0, $v0, 4 /* C3B93C 80240F2C 10400027 */ beqz $v0, .L80240FCC -/* C3B940 80240F30 00000000 */ nop +/* C3B940 80240F30 00000000 */ nop .L80240F34: /* C3B944 80240F34 2402001E */ addiu $v0, $zero, 0x1e /* C3B948 80240F38 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E80_C3B890 /* C3B9E0 80240FD0 2442FFF6 */ addiu $v0, $v0, -0xa /* C3B9E4 80240FD4 2C420014 */ sltiu $v0, $v0, 0x14 /* C3B9E8 80240FD8 10400009 */ beqz $v0, .L80241000 -/* C3B9EC 80240FDC 00000000 */ nop +/* C3B9EC 80240FDC 00000000 */ nop /* C3B9F0 80240FE0 8E22006C */ lw $v0, 0x6c($s1) /* C3B9F4 80240FE4 14400006 */ bnez $v0, .L80241000 -/* C3B9F8 80240FE8 00000000 */ nop +/* C3B9F8 80240FE8 00000000 */ nop /* C3B9FC 80240FEC 0C09009A */ jal func_80240268_C3AC78 /* C3BA00 80240FF0 0240202D */ daddu $a0, $s2, $zero /* C3BA04 80240FF4 10400002 */ beqz $v0, .L80241000 @@ -112,37 +112,37 @@ glabel func_80240E80_C3B890 /* C3BA24 80241014 00220821 */ addu $at, $at, $v0 /* C3BA28 80241018 8C222350 */ lw $v0, %lo(D_80242350)($at) /* C3BA2C 8024101C 00400008 */ jr $v0 -/* C3BA30 80241020 00000000 */ nop +/* C3BA30 80241020 00000000 */ nop /* C3BA34 80241024 0240202D */ daddu $a0, $s2, $zero /* C3BA38 80241028 0260282D */ daddu $a1, $s3, $zero /* C3BA3C 8024102C 0C09019F */ jal func_8024067C_C3B08C /* C3BA40 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3BA44 80241034 0809046A */ j .L802411A8 -/* C3BA48 80241038 00000000 */ nop +/* C3BA48 80241038 00000000 */ nop /* C3BA4C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3BA50 80241040 0260282D */ daddu $a1, $s3, $zero /* C3BA54 80241044 0C0901C1 */ jal func_80240704_C3B114 /* C3BA58 80241048 02A0302D */ daddu $a2, $s5, $zero /* C3BA5C 8024104C 0809046A */ j .L802411A8 -/* C3BA60 80241050 00000000 */ nop +/* C3BA60 80241050 00000000 */ nop /* C3BA64 80241054 0240202D */ daddu $a0, $s2, $zero /* C3BA68 80241058 0260282D */ daddu $a1, $s3, $zero /* C3BA6C 8024105C 0C09026F */ jal func_802409BC_C3B3CC /* C3BA70 80241060 02A0302D */ daddu $a2, $s5, $zero /* C3BA74 80241064 0809046A */ j .L802411A8 -/* C3BA78 80241068 00000000 */ nop +/* C3BA78 80241068 00000000 */ nop /* C3BA7C 8024106C 0240202D */ daddu $a0, $s2, $zero /* C3BA80 80241070 0260282D */ daddu $a1, $s3, $zero /* C3BA84 80241074 0C090288 */ jal func_80240A20_C3B430 /* C3BA88 80241078 02A0302D */ daddu $a2, $s5, $zero /* C3BA8C 8024107C 0809046A */ j .L802411A8 -/* C3BA90 80241080 00000000 */ nop +/* C3BA90 80241080 00000000 */ nop /* C3BA94 80241084 0240202D */ daddu $a0, $s2, $zero /* C3BA98 80241088 0260282D */ daddu $a1, $s3, $zero /* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8_C3B4D8 /* C3BAA0 80241090 02A0302D */ daddu $a2, $s5, $zero /* C3BAA4 80241094 0809046A */ j .L802411A8 -/* C3BAA8 80241098 00000000 */ nop +/* C3BAA8 80241098 00000000 */ nop /* C3BAAC 8024109C 0240202D */ daddu $a0, $s2, $zero /* C3BAB0 802410A0 0260282D */ daddu $a1, $s3, $zero /* C3BAB4 802410A4 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80240E80_C3B890 /* C3BABC 802410AC 8E430070 */ lw $v1, 0x70($s2) /* C3BAC0 802410B0 2402000D */ addiu $v0, $zero, 0xd /* C3BAC4 802410B4 1462003C */ bne $v1, $v0, .L802411A8 -/* C3BAC8 802410B8 00000000 */ nop +/* C3BAC8 802410B8 00000000 */ nop /* C3BACC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3BAD0 802410C0 0260282D */ daddu $a1, $s3, $zero /* C3BAD4 802410C4 0C012849 */ jal func_8004A124 /* C3BAD8 802410C8 02A0302D */ daddu $a2, $s5, $zero /* C3BADC 802410CC 0809046A */ j .L802411A8 -/* C3BAE0 802410D0 00000000 */ nop +/* C3BAE0 802410D0 00000000 */ nop /* C3BAE4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3BAE8 802410D8 0260282D */ daddu $a1, $s3, $zero /* C3BAEC 802410DC 0C0128FA */ jal func_8004A3E8 @@ -168,26 +168,26 @@ glabel func_80240E80_C3B890 /* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 /* C3BB08 802410F8 0809046A */ j .L802411A8 /* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) -/* C3BB10 80241100 0C090018 */ jal dgb_05_UnkNpcAIFunc6 +/* C3BB10 80241100 0C090018 */ jal func_80240060_C3AA70 /* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero /* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) /* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f /* C3BB20 80241110 14620025 */ bne $v1, $v0, .L802411A8 -/* C3BB24 80241114 00000000 */ nop -/* C3BB28 80241118 0C090033 */ jal dgb_05_UnkNpcAIFunc7 +/* C3BB24 80241114 00000000 */ nop +/* C3BB28 80241118 0C090033 */ jal func_802400CC_C3AADC /* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero /* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 /* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 -/* C3BB3C 8024112C 00000000 */ nop -/* C3BB40 80241130 0C09004F */ jal dgb_05_UnkNpcAIFunc8 +/* C3BB3C 8024112C 00000000 */ nop +/* C3BB40 80241130 0C09004F */ jal func_8024013C_C3AB4C /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 -/* C3BB4C 8024113C 00000000 */ nop -/* C3BB50 80241140 0C090085 */ jal dgb_05_UnkNpcAIFunc5 +/* C3BB4C 8024113C 00000000 */ nop +/* C3BB50 80241140 0C090085 */ jal func_80240214_C3AC24 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero /* C3BB58 80241148 0809046A */ j .L802411A8 -/* C3BB5C 8024114C 00000000 */ nop +/* C3BB5C 8024114C 00000000 */ nop /* C3BB60 80241150 0240202D */ daddu $a0, $s2, $zero /* C3BB64 80241154 0260282D */ daddu $a1, $s3, $zero /* C3BB68 80241158 0C090300 */ jal func_80240C00_C3B610 @@ -195,19 +195,19 @@ glabel func_80240E80_C3B890 /* C3BB70 80241160 8E430070 */ lw $v1, 0x70($s2) /* C3BB74 80241164 24020029 */ addiu $v0, $zero, 0x29 /* C3BB78 80241168 1462000F */ bne $v1, $v0, .L802411A8 -/* C3BB7C 8024116C 00000000 */ nop +/* C3BB7C 8024116C 00000000 */ nop /* C3BB80 80241170 0240202D */ daddu $a0, $s2, $zero /* C3BB84 80241174 0260282D */ daddu $a1, $s3, $zero /* C3BB88 80241178 0C09032B */ jal func_80240CAC_C3B6BC /* C3BB8C 8024117C 02A0302D */ daddu $a2, $s5, $zero /* C3BB90 80241180 0809046A */ j .L802411A8 -/* C3BB94 80241184 00000000 */ nop +/* C3BB94 80241184 00000000 */ nop /* C3BB98 80241188 0240202D */ daddu $a0, $s2, $zero /* C3BB9C 8024118C 0260282D */ daddu $a1, $s3, $zero /* C3BBA0 80241190 0C090389 */ jal func_80240E24_C3B834 /* C3BBA4 80241194 02A0302D */ daddu $a2, $s5, $zero /* C3BBA8 80241198 0809046A */ j .L802411A8 -/* C3BBAC 8024119C 00000000 */ nop +/* C3BBAC 8024119C 00000000 */ nop /* C3BBB0 802411A0 0C0129CF */ jal func_8004A73C /* C3BBB4 802411A4 0240202D */ daddu $a0, $s2, $zero .L802411A8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s index 465ca3ba5c..0d5d063f98 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -46,7 +46,7 @@ glabel func_802411D0_C3BBE0 /* C3BC84 80241274 8E2200B0 */ lw $v0, 0xb0($s1) /* C3BC88 80241278 30420004 */ andi $v0, $v0, 4 /* C3BC8C 8024127C 10400020 */ beqz $v0, .L80241300 -/* C3BC90 80241280 00000000 */ nop +/* C3BC90 80241280 00000000 */ nop .L80241284: /* C3BC94 80241284 2404F7FF */ addiu $a0, $zero, -0x801 /* C3BC98 80241288 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802411D0_C3BBE0 /* C3BD10 80241300 8E420070 */ lw $v0, 0x70($s2) /* C3BD14 80241304 2842001E */ slti $v0, $v0, 0x1e /* C3BD18 80241308 10400009 */ beqz $v0, .L80241330 -/* C3BD1C 8024130C 00000000 */ nop +/* C3BD1C 8024130C 00000000 */ nop /* C3BD20 80241310 8E22006C */ lw $v0, 0x6c($s1) /* C3BD24 80241314 14400006 */ bnez $v0, .L80241330 -/* C3BD28 80241318 00000000 */ nop +/* C3BD28 80241318 00000000 */ nop /* C3BD2C 8024131C 0C09009A */ jal func_80240268_C3AC78 /* C3BD30 80241320 0240202D */ daddu $a0, $s2, $zero /* C3BD34 80241324 10400002 */ beqz $v0, .L80241330 @@ -104,7 +104,7 @@ glabel func_802411D0_C3BBE0 /* C3BD54 80241344 00220821 */ addu $at, $at, $v0 /* C3BD58 80241348 8C2224E0 */ lw $v0, %lo(D_802424E0)($at) /* C3BD5C 8024134C 00400008 */ jr $v0 -/* C3BD60 80241350 00000000 */ nop +/* C3BD60 80241350 00000000 */ nop /* C3BD64 80241354 0240202D */ daddu $a0, $s2, $zero /* C3BD68 80241358 0260282D */ daddu $a1, $s3, $zero /* C3BD6C 8024135C 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_802411D0_C3BBE0 /* C3BD7C 8024136C 0C0125AE */ jal func_800496B8 /* C3BD80 80241370 0280302D */ daddu $a2, $s4, $zero /* C3BD84 80241374 08090517 */ j .L8024145C -/* C3BD88 80241378 00000000 */ nop +/* C3BD88 80241378 00000000 */ nop /* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero /* C3BD90 80241380 0260282D */ daddu $a1, $s3, $zero -/* C3BD94 80241384 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C3BD94 80241384 0C0126D1 */ jal func_80049B44 /* C3BD98 80241388 0280302D */ daddu $a2, $s4, $zero /* C3BD9C 8024138C 0240202D */ daddu $a0, $s2, $zero /* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero /* C3BDA4 80241394 0C012701 */ jal func_80049C04 /* C3BDA8 80241398 0280302D */ daddu $a2, $s4, $zero /* C3BDAC 8024139C 08090517 */ j .L8024145C -/* C3BDB0 802413A0 00000000 */ nop +/* C3BDB0 802413A0 00000000 */ nop /* C3BDB4 802413A4 0240202D */ daddu $a0, $s2, $zero /* C3BDB8 802413A8 0260282D */ daddu $a1, $s3, $zero /* C3BDBC 802413AC 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802411D0_C3BBE0 /* C3BDCC 802413BC 0C0127B3 */ jal func_80049ECC /* C3BDD0 802413C0 0280302D */ daddu $a2, $s4, $zero /* C3BDD4 802413C4 08090517 */ j .L8024145C -/* C3BDD8 802413C8 00000000 */ nop +/* C3BDD8 802413C8 00000000 */ nop /* C3BDDC 802413CC 0240202D */ daddu $a0, $s2, $zero /* C3BDE0 802413D0 0260282D */ daddu $a1, $s3, $zero /* C3BDE4 802413D4 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_802411D0_C3BBE0 /* C3BDF4 802413E4 0C012849 */ jal func_8004A124 /* C3BDF8 802413E8 0280302D */ daddu $a2, $s4, $zero /* C3BDFC 802413EC 08090517 */ j .L8024145C -/* C3BE00 802413F0 00000000 */ nop +/* C3BE00 802413F0 00000000 */ nop /* C3BE04 802413F4 0240202D */ daddu $a0, $s2, $zero /* C3BE08 802413F8 0260282D */ daddu $a1, $s3, $zero /* C3BE0C 802413FC 0C0128FA */ jal func_8004A3E8 /* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero /* C3BE14 80241404 08090517 */ j .L8024145C -/* C3BE18 80241408 00000000 */ nop -/* C3BE1C 8024140C 0C090018 */ jal dgb_05_UnkNpcAIFunc6 +/* C3BE18 80241408 00000000 */ nop +/* C3BE1C 8024140C 0C090018 */ jal func_80240060_C3AA70 /* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero -/* C3BE24 80241414 0C090033 */ jal dgb_05_UnkNpcAIFunc7 +/* C3BE24 80241414 0C090033 */ jal func_802400CC_C3AADC /* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero /* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) /* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 /* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C -/* C3BE38 80241428 00000000 */ nop -/* C3BE3C 8024142C 0C09004F */ jal dgb_05_UnkNpcAIFunc8 +/* C3BE38 80241428 00000000 */ nop +/* C3BE3C 8024142C 0C09004F */ jal func_8024013C_C3AB4C /* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero /* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) /* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 /* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C -/* C3BE50 80241440 00000000 */ nop -/* C3BE54 80241444 0C090085 */ jal dgb_05_UnkNpcAIFunc5 +/* C3BE50 80241440 00000000 */ nop +/* C3BE54 80241444 0C090085 */ jal func_80240214_C3AC24 /* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero /* C3BE5C 8024144C 08090517 */ j .L8024145C -/* C3BE60 80241450 00000000 */ nop +/* C3BE60 80241450 00000000 */ nop /* C3BE64 80241454 0C0129CF */ jal func_8004A73C /* C3BE68 80241458 0240202D */ daddu $a0, $s2, $zero .L8024145C: @@ -182,6 +182,6 @@ glabel func_802411D0_C3BBE0 /* C3BE88 80241478 0000102D */ daddu $v0, $zero, $zero /* C3BE8C 8024147C 03E00008 */ jr $ra /* C3BE90 80241480 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3BE94 80241484 00000000 */ nop -/* C3BE98 80241488 00000000 */ nop -/* C3BE9C 8024148C 00000000 */ nop +/* C3BE94 80241484 00000000 */ nop +/* C3BE98 80241488 00000000 */ nop +/* C3BE9C 8024148C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s index 2f6e79b36c..367c6fd651 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s +++ b/asm/nonmatchings/world/area_dgb/dgb_06/C3D080/func_80240000_C3D080.s @@ -4,8 +4,8 @@ glabel func_80240000_C3D080 /* C3D080 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C3D084 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C3D088 80240008 3C108024 */ lui $s0, %hi(D_80240620) -/* C3D08C 8024000C 26100620 */ addiu $s0, $s0, %lo(D_80240620) +/* C3D088 80240008 3C108024 */ lui $s0, %hi(func_80240620_B351F0) +/* C3D08C 8024000C 26100620 */ addiu $s0, $s0, %lo(func_80240620_B351F0) /* C3D090 80240010 AFBF0018 */ sw $ra, 0x18($sp) /* C3D094 80240014 AFB10014 */ sw $s1, 0x14($sp) /* C3D098 80240018 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240000_C3D080 /* C3D0FC 8024007C 28620010 */ slti $v0, $v1, 0x10 /* C3D100 80240080 1440FFFA */ bnez $v0, .L8024006C /* C3D104 80240084 24840004 */ addiu $a0, $a0, 4 -/* C3D108 80240088 3C108024 */ lui $s0, %hi(D_80240620) -/* C3D10C 8024008C 26100620 */ addiu $s0, $s0, %lo(D_80240620) +/* C3D108 80240088 3C108024 */ lui $s0, %hi(func_80240620_B351F0) +/* C3D10C 8024008C 26100620 */ addiu $s0, $s0, %lo(func_80240620_B351F0) /* C3D110 80240090 0C00AB4B */ jal heap_free /* C3D114 80240094 8E040000 */ lw $a0, ($s0) /* C3D118 80240098 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s index f3ffac3957..a86215744e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240208_C3DDF8.s @@ -54,8 +54,8 @@ glabel func_80240208_C3DDF8 /* C3DEB8 802402C8 00000000 */ nop /* C3DEBC 802402CC 0C00A6C9 */ jal clamp_angle /* C3DEC0 802402D0 46000306 */ mov.s $f12, $f0 -/* C3DEC4 802402D4 3C018024 */ lui $at, %hi(D_80241E90) -/* C3DEC8 802402D8 D4221E90 */ ldc1 $f2, %lo(D_80241E90)($at) +/* C3DEC4 802402D4 3C018024 */ lui $at, %hi(func_80241E90_8B1F00) +/* C3DEC8 802402D8 D4221E90 */ ldc1 $f2, %lo(func_80241E90_8B1F00)($at) /* C3DECC 802402DC 46000021 */ cvt.d.s $f0, $f0 /* C3DED0 802402E0 4622003C */ c.lt.d $f0, $f2 /* C3DED4 802402E4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s index 5e34a66399..12d045992d 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240BA0_C3E790.s @@ -30,8 +30,8 @@ glabel func_80240BA0_C3E790 /* C3E7F4 80240C04 0809030B */ j .L80240C2C /* C3E7F8 80240C08 E4600018 */ swc1 $f0, 0x18($v1) .L80240C0C: -/* C3E7FC 80240C0C 3C018024 */ lui $at, %hi(D_80241E98) -/* C3E800 80240C10 D4221E98 */ ldc1 $f2, %lo(D_80241E98)($at) +/* C3E7FC 80240C0C 3C018024 */ lui $at, %hi(func_80241E98_A1CF98) +/* C3E800 80240C10 D4221E98 */ ldc1 $f2, %lo(func_80241E98_A1CF98)($at) /* C3E804 80240C14 44820000 */ mtc1 $v0, $f0 /* C3E808 80240C18 00000000 */ nop /* C3E80C 80240C1C 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index 1b2c682fa8..96aa86f306 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -46,7 +46,7 @@ glabel func_80240E20_C3EA10 /* C3EAB4 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) /* C3EAB8 80240EC8 30420004 */ andi $v0, $v0, 4 /* C3EABC 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C3EAC0 80240ED0 00000000 */ nop +/* C3EAC0 80240ED0 00000000 */ nop .L80240ED4: /* C3EAC4 80240ED4 2402001E */ addiu $v0, $zero, 0x1e /* C3EAC8 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E20_C3EA10 /* C3EB60 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa /* C3EB64 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 /* C3EB68 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C3EB6C 80240F7C 00000000 */ nop +/* C3EB6C 80240F7C 00000000 */ nop /* C3EB70 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C3EB74 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C3EB78 80240F88 00000000 */ nop +/* C3EB78 80240F88 00000000 */ nop /* C3EB7C 80240F8C 0C090082 */ jal func_80240208_C3DDF8 /* C3EB80 80240F90 0240202D */ daddu $a0, $s2, $zero /* C3EB84 80240F94 10400002 */ beqz $v0, .L80240FA0 @@ -112,37 +112,37 @@ glabel func_80240E20_C3EA10 /* C3EBA4 80240FB4 00220821 */ addu $at, $at, $v0 /* C3EBA8 80240FB8 8C221EA0 */ lw $v0, %lo(D_80241EA0)($at) /* C3EBAC 80240FBC 00400008 */ jr $v0 -/* C3EBB0 80240FC0 00000000 */ nop +/* C3EBB0 80240FC0 00000000 */ nop /* C3EBB4 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C3EBB8 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C3EBBC 80240FCC 0C090187 */ jal func_8024061C_C3E20C /* C3EBC0 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C3EBC4 80240FD4 08090452 */ j .L80241148 -/* C3EBC8 80240FD8 00000000 */ nop +/* C3EBC8 80240FD8 00000000 */ nop /* C3EBCC 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C3EBD0 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4_C3E294 /* C3EBD8 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C3EBDC 80240FEC 08090452 */ j .L80241148 -/* C3EBE0 80240FF0 00000000 */ nop +/* C3EBE0 80240FF0 00000000 */ nop /* C3EBE4 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C3EBE8 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C3EBEC 80240FFC 0C090257 */ jal func_8024095C_C3E54C /* C3EBF0 80241000 02A0302D */ daddu $a2, $s5, $zero /* C3EBF4 80241004 08090452 */ j .L80241148 -/* C3EBF8 80241008 00000000 */ nop +/* C3EBF8 80241008 00000000 */ nop /* C3EBFC 8024100C 0240202D */ daddu $a0, $s2, $zero /* C3EC00 80241010 0260282D */ daddu $a1, $s3, $zero /* C3EC04 80241014 0C090270 */ jal func_802409C0_C3E5B0 /* C3EC08 80241018 02A0302D */ daddu $a2, $s5, $zero /* C3EC0C 8024101C 08090452 */ j .L80241148 -/* C3EC10 80241020 00000000 */ nop +/* C3EC10 80241020 00000000 */ nop /* C3EC14 80241024 0240202D */ daddu $a0, $s2, $zero /* C3EC18 80241028 0260282D */ daddu $a1, $s3, $zero /* C3EC1C 8024102C 0C09029A */ jal func_80240A68_C3E658 /* C3EC20 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3EC24 80241034 08090452 */ j .L80241148 -/* C3EC28 80241038 00000000 */ nop +/* C3EC28 80241038 00000000 */ nop /* C3EC2C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3EC30 80241040 0260282D */ daddu $a1, $s3, $zero /* C3EC34 80241044 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80240E20_C3EA10 /* C3EC3C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C3EC40 80241050 2402000D */ addiu $v0, $zero, 0xd /* C3EC44 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C3EC48 80241058 00000000 */ nop +/* C3EC48 80241058 00000000 */ nop /* C3EC4C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C3EC50 80241060 0260282D */ daddu $a1, $s3, $zero /* C3EC54 80241064 0C012849 */ jal func_8004A124 /* C3EC58 80241068 02A0302D */ daddu $a2, $s5, $zero /* C3EC5C 8024106C 08090452 */ j .L80241148 -/* C3EC60 80241070 00000000 */ nop +/* C3EC60 80241070 00000000 */ nop /* C3EC64 80241074 0240202D */ daddu $a0, $s2, $zero /* C3EC68 80241078 0260282D */ daddu $a1, $s3, $zero /* C3EC6C 8024107C 0C0128FA */ jal func_8004A3E8 @@ -168,26 +168,26 @@ glabel func_80240E20_C3EA10 /* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 /* C3EC88 80241098 08090452 */ j .L80241148 /* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C3EC90 802410A0 0C090000 */ jal dgb_07_UnkNpcAIFunc6 +/* C3EC90 802410A0 0C090000 */ jal func_80240000_C3DBF0 /* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero /* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C3ECA0 802410B0 14620025 */ bne $v1, $v0, .L80241148 -/* C3ECA4 802410B4 00000000 */ nop -/* C3ECA8 802410B8 0C09001B */ jal dgb_07_UnkNpcAIFunc7 +/* C3ECA4 802410B4 00000000 */ nop +/* C3ECA8 802410B8 0C09001B */ jal func_8024006C_C3DC5C /* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C3ECBC 802410CC 00000000 */ nop -/* C3ECC0 802410D0 0C090037 */ jal dgb_07_UnkNpcAIFunc8 +/* C3ECBC 802410CC 00000000 */ nop +/* C3ECC0 802410D0 0C090037 */ jal func_802400DC_C3DCCC /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 -/* C3ECCC 802410DC 00000000 */ nop -/* C3ECD0 802410E0 0C09006D */ jal dgb_07_UnkNpcAIFunc5 +/* C3ECCC 802410DC 00000000 */ nop +/* C3ECD0 802410E0 0C09006D */ jal func_802401B4_C3DDA4 /* C3ECD4 802410E4 0240202D */ daddu $a0, $s2, $zero /* C3ECD8 802410E8 08090452 */ j .L80241148 -/* C3ECDC 802410EC 00000000 */ nop +/* C3ECDC 802410EC 00000000 */ nop /* C3ECE0 802410F0 0240202D */ daddu $a0, $s2, $zero /* C3ECE4 802410F4 0260282D */ daddu $a1, $s3, $zero /* C3ECE8 802410F8 0C0902E8 */ jal func_80240BA0_C3E790 @@ -195,19 +195,19 @@ glabel func_80240E20_C3EA10 /* C3ECF0 80241100 8E430070 */ lw $v1, 0x70($s2) /* C3ECF4 80241104 24020029 */ addiu $v0, $zero, 0x29 /* C3ECF8 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C3ECFC 8024110C 00000000 */ nop +/* C3ECFC 8024110C 00000000 */ nop /* C3ED00 80241110 0240202D */ daddu $a0, $s2, $zero /* C3ED04 80241114 0260282D */ daddu $a1, $s3, $zero /* C3ED08 80241118 0C090313 */ jal func_80240C4C_C3E83C /* C3ED0C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C3ED10 80241120 08090452 */ j .L80241148 -/* C3ED14 80241124 00000000 */ nop +/* C3ED14 80241124 00000000 */ nop /* C3ED18 80241128 0240202D */ daddu $a0, $s2, $zero /* C3ED1C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C3ED20 80241130 0C090371 */ jal func_80240DC4_C3E9B4 /* C3ED24 80241134 02A0302D */ daddu $a2, $s5, $zero /* C3ED28 80241138 08090452 */ j .L80241148 -/* C3ED2C 8024113C 00000000 */ nop +/* C3ED2C 8024113C 00000000 */ nop /* C3ED30 80241140 0C0129CF */ jal func_8004A73C /* C3ED34 80241144 0240202D */ daddu $a0, $s2, $zero .L80241148: diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index ca350e9be9..64dd433168 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -46,7 +46,7 @@ glabel func_80241170_C3ED60 /* C3EE04 80241214 8E2200B0 */ lw $v0, 0xb0($s1) /* C3EE08 80241218 30420004 */ andi $v0, $v0, 4 /* C3EE0C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C3EE10 80241220 00000000 */ nop +/* C3EE10 80241220 00000000 */ nop .L80241224: /* C3EE14 80241224 2404F7FF */ addiu $a0, $zero, -0x801 /* C3EE18 80241228 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241170_C3ED60 /* C3EE90 802412A0 8E420070 */ lw $v0, 0x70($s2) /* C3EE94 802412A4 2842001E */ slti $v0, $v0, 0x1e /* C3EE98 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C3EE9C 802412AC 00000000 */ nop +/* C3EE9C 802412AC 00000000 */ nop /* C3EEA0 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* C3EEA4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C3EEA8 802412B8 00000000 */ nop +/* C3EEA8 802412B8 00000000 */ nop /* C3EEAC 802412BC 0C090082 */ jal func_80240208_C3DDF8 /* C3EEB0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C3EEB4 802412C4 10400002 */ beqz $v0, .L802412D0 @@ -100,11 +100,11 @@ glabel func_80241170_C3ED60 /* C3EEC4 802412D4 2C620064 */ sltiu $v0, $v1, 0x64 /* C3EEC8 802412D8 10400048 */ beqz $v0, .L802413FC /* C3EECC 802412DC 00031080 */ sll $v0, $v1, 2 -/* C3EED0 802412E0 3C018024 */ lui $at, %hi(D_80242030) +/* C3EED0 802412E0 3C018024 */ lui $at, %hi(func_80242030_8EDE50) /* C3EED4 802412E4 00220821 */ addu $at, $at, $v0 -/* C3EED8 802412E8 8C222030 */ lw $v0, %lo(D_80242030)($at) +/* C3EED8 802412E8 8C222030 */ lw $v0, %lo(func_80242030_8EDE50)($at) /* C3EEDC 802412EC 00400008 */ jr $v0 -/* C3EEE0 802412F0 00000000 */ nop +/* C3EEE0 802412F0 00000000 */ nop /* C3EEE4 802412F4 0240202D */ daddu $a0, $s2, $zero /* C3EEE8 802412F8 0260282D */ daddu $a1, $s3, $zero /* C3EEEC 802412FC 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241170_C3ED60 /* C3EEFC 8024130C 0C0125AE */ jal func_800496B8 /* C3EF00 80241310 0280302D */ daddu $a2, $s4, $zero /* C3EF04 80241314 080904FF */ j .L802413FC -/* C3EF08 80241318 00000000 */ nop +/* C3EF08 80241318 00000000 */ nop /* C3EF0C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C3EF10 80241320 0260282D */ daddu $a1, $s3, $zero -/* C3EF14 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C3EF14 80241324 0C0126D1 */ jal func_80049B44 /* C3EF18 80241328 0280302D */ daddu $a2, $s4, $zero /* C3EF1C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C3EF20 80241330 0260282D */ daddu $a1, $s3, $zero /* C3EF24 80241334 0C012701 */ jal func_80049C04 /* C3EF28 80241338 0280302D */ daddu $a2, $s4, $zero /* C3EF2C 8024133C 080904FF */ j .L802413FC -/* C3EF30 80241340 00000000 */ nop +/* C3EF30 80241340 00000000 */ nop /* C3EF34 80241344 0240202D */ daddu $a0, $s2, $zero /* C3EF38 80241348 0260282D */ daddu $a1, $s3, $zero /* C3EF3C 8024134C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241170_C3ED60 /* C3EF4C 8024135C 0C0127B3 */ jal func_80049ECC /* C3EF50 80241360 0280302D */ daddu $a2, $s4, $zero /* C3EF54 80241364 080904FF */ j .L802413FC -/* C3EF58 80241368 00000000 */ nop +/* C3EF58 80241368 00000000 */ nop /* C3EF5C 8024136C 0240202D */ daddu $a0, $s2, $zero /* C3EF60 80241370 0260282D */ daddu $a1, $s3, $zero /* C3EF64 80241374 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241170_C3ED60 /* C3EF74 80241384 0C012849 */ jal func_8004A124 /* C3EF78 80241388 0280302D */ daddu $a2, $s4, $zero /* C3EF7C 8024138C 080904FF */ j .L802413FC -/* C3EF80 80241390 00000000 */ nop +/* C3EF80 80241390 00000000 */ nop /* C3EF84 80241394 0240202D */ daddu $a0, $s2, $zero /* C3EF88 80241398 0260282D */ daddu $a1, $s3, $zero /* C3EF8C 8024139C 0C0128FA */ jal func_8004A3E8 /* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero /* C3EF94 802413A4 080904FF */ j .L802413FC -/* C3EF98 802413A8 00000000 */ nop -/* C3EF9C 802413AC 0C090000 */ jal dgb_07_UnkNpcAIFunc6 +/* C3EF98 802413A8 00000000 */ nop +/* C3EF9C 802413AC 0C090000 */ jal func_80240000_C3DBF0 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C3EFA4 802413B4 0C09001B */ jal dgb_07_UnkNpcAIFunc7 +/* C3EFA4 802413B4 0C09001B */ jal func_8024006C_C3DC5C /* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* C3EFB8 802413C8 00000000 */ nop -/* C3EFBC 802413CC 0C090037 */ jal dgb_07_UnkNpcAIFunc8 +/* C3EFB8 802413C8 00000000 */ nop +/* C3EFBC 802413CC 0C090037 */ jal func_802400DC_C3DCCC /* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C3EFCC 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* C3EFD0 802413E0 00000000 */ nop -/* C3EFD4 802413E4 0C09006D */ jal dgb_07_UnkNpcAIFunc5 +/* C3EFD0 802413E0 00000000 */ nop +/* C3EFD4 802413E4 0C09006D */ jal func_802401B4_C3DDA4 /* C3EFD8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C3EFDC 802413EC 080904FF */ j .L802413FC -/* C3EFE0 802413F0 00000000 */ nop +/* C3EFE0 802413F0 00000000 */ nop /* C3EFE4 802413F4 0C0129CF */ jal func_8004A73C /* C3EFE8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: @@ -182,6 +182,6 @@ glabel func_80241170_C3ED60 /* C3F008 80241418 0000102D */ daddu $v0, $zero, $zero /* C3F00C 8024141C 03E00008 */ jr $ra /* C3F010 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3F014 80241424 00000000 */ nop -/* C3F018 80241428 00000000 */ nop -/* C3F01C 8024142C 00000000 */ nop +/* C3F014 80241424 00000000 */ nop +/* C3F018 80241428 00000000 */ nop +/* C3F01C 8024142C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index 171cee1c1a..078fa72f8a 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -141,7 +141,7 @@ glabel func_80240B94_C40944 /* C40B4C 80240D9C 00000000 */ nop /* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C40B54 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C40B58 80240DA8 0C090100 */ jal dgb_08_UnkNpcAIFunc1 +/* C40B58 80240DA8 0C090100 */ jal func_80240400_C401B0 /* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_C40944 /* C40B8C 80240DDC 00000000 */ nop /* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C40B94 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C40B98 80240DE8 0C0901CC */ jal dgb_08_NpcJumpFunc2 +/* C40B98 80240DE8 0C0901CC */ jal func_80240730_C404E0 /* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C40BA8 80240DF8 0C0901E9 */ jal dgb_08_NpcJumpFunc +/* C40BA8 80240DF8 0C0901E9 */ jal func_802407A4_C40554 /* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C40BB0 80240E00 0809039A */ j .L80240E68 /* C40BB4 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_C40944 /* C40BDC 80240E2C 00000000 */ nop /* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero /* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C40BE8 80240E38 0C09029B */ jal dgb_08_UnkNpcDurationFlagFunc +/* C40BE8 80240E38 0C09029B */ jal func_80240A6C_C4081C /* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C40BF0 80240E40 0809039A */ j .L80240E68 /* C40BF4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s index ee9b4c96f4..134dff48a9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -46,7 +46,7 @@ glabel func_802414AC_C4125C /* C41300 80241550 8E2200B0 */ lw $v0, 0xb0($s1) /* C41304 80241554 30420004 */ andi $v0, $v0, 4 /* C41308 80241558 10400020 */ beqz $v0, .L802415DC -/* C4130C 8024155C 00000000 */ nop +/* C4130C 8024155C 00000000 */ nop .L80241560: /* C41310 80241560 2404F7FF */ addiu $a0, $zero, -0x801 /* C41314 80241564 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802414AC_C4125C /* C4138C 802415DC 8E420070 */ lw $v0, 0x70($s2) /* C41390 802415E0 2842001E */ slti $v0, $v0, 0x1e /* C41394 802415E4 10400009 */ beqz $v0, .L8024160C -/* C41398 802415E8 00000000 */ nop +/* C41398 802415E8 00000000 */ nop /* C4139C 802415EC 8E22006C */ lw $v0, 0x6c($s1) /* C413A0 802415F0 14400006 */ bnez $v0, .L8024160C -/* C413A4 802415F4 00000000 */ nop +/* C413A4 802415F4 00000000 */ nop /* C413A8 802415F8 0C090426 */ jal func_80241098_C40E48 /* C413AC 802415FC 0240202D */ daddu $a0, $s2, $zero /* C413B0 80241600 10400002 */ beqz $v0, .L8024160C @@ -104,7 +104,7 @@ glabel func_802414AC_C4125C /* C413D0 80241620 00220821 */ addu $at, $at, $v0 /* C413D4 80241624 8C226BA8 */ lw $v0, %lo(D_80246BA8)($at) /* C413D8 80241628 00400008 */ jr $v0 -/* C413DC 8024162C 00000000 */ nop +/* C413DC 8024162C 00000000 */ nop /* C413E0 80241630 0240202D */ daddu $a0, $s2, $zero /* C413E4 80241634 0260282D */ daddu $a1, $s3, $zero /* C413E8 80241638 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_802414AC_C4125C /* C413F8 80241648 0C0125AE */ jal func_800496B8 /* C413FC 8024164C 0280302D */ daddu $a2, $s4, $zero /* C41400 80241650 080905CE */ j .L80241738 -/* C41404 80241654 00000000 */ nop +/* C41404 80241654 00000000 */ nop /* C41408 80241658 0240202D */ daddu $a0, $s2, $zero /* C4140C 8024165C 0260282D */ daddu $a1, $s3, $zero -/* C41410 80241660 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C41410 80241660 0C0126D1 */ jal func_80049B44 /* C41414 80241664 0280302D */ daddu $a2, $s4, $zero /* C41418 80241668 0240202D */ daddu $a0, $s2, $zero /* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero /* C41420 80241670 0C012701 */ jal func_80049C04 /* C41424 80241674 0280302D */ daddu $a2, $s4, $zero /* C41428 80241678 080905CE */ j .L80241738 -/* C4142C 8024167C 00000000 */ nop +/* C4142C 8024167C 00000000 */ nop /* C41430 80241680 0240202D */ daddu $a0, $s2, $zero /* C41434 80241684 0260282D */ daddu $a1, $s3, $zero /* C41438 80241688 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802414AC_C4125C /* C41448 80241698 0C0127B3 */ jal func_80049ECC /* C4144C 8024169C 0280302D */ daddu $a2, $s4, $zero /* C41450 802416A0 080905CE */ j .L80241738 -/* C41454 802416A4 00000000 */ nop +/* C41454 802416A4 00000000 */ nop /* C41458 802416A8 0240202D */ daddu $a0, $s2, $zero /* C4145C 802416AC 0260282D */ daddu $a1, $s3, $zero /* C41460 802416B0 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_802414AC_C4125C /* C41470 802416C0 0C012849 */ jal func_8004A124 /* C41474 802416C4 0280302D */ daddu $a2, $s4, $zero /* C41478 802416C8 080905CE */ j .L80241738 -/* C4147C 802416CC 00000000 */ nop +/* C4147C 802416CC 00000000 */ nop /* C41480 802416D0 0240202D */ daddu $a0, $s2, $zero /* C41484 802416D4 0260282D */ daddu $a1, $s3, $zero /* C41488 802416D8 0C0128FA */ jal func_8004A3E8 /* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero /* C41490 802416E0 080905CE */ j .L80241738 -/* C41494 802416E4 00000000 */ nop -/* C41498 802416E8 0C0903A4 */ jal dgb_08_UnkNpcAIFunc6 +/* C41494 802416E4 00000000 */ nop +/* C41498 802416E8 0C0903A4 */ jal func_80240E90_C40C40 /* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero -/* C414A0 802416F0 0C0903BF */ jal dgb_08_UnkNpcAIFunc7 +/* C414A0 802416F0 0C0903BF */ jal func_80240EFC_C40CAC /* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero /* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) /* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 /* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 -/* C414B4 80241704 00000000 */ nop -/* C414B8 80241708 0C0903DB */ jal dgb_08_UnkNpcAIFunc8 +/* C414B4 80241704 00000000 */ nop +/* C414B8 80241708 0C0903DB */ jal func_80240F6C_C40D1C /* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero /* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) /* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 /* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 -/* C414CC 8024171C 00000000 */ nop -/* C414D0 80241720 0C090411 */ jal dgb_08_UnkNpcAIFunc5 +/* C414CC 8024171C 00000000 */ nop +/* C414D0 80241720 0C090411 */ jal func_80241044_C40DF4 /* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero /* C414D8 80241728 080905CE */ j .L80241738 -/* C414DC 8024172C 00000000 */ nop +/* C414DC 8024172C 00000000 */ nop /* C414E0 80241730 0C0129CF */ jal func_8004A73C /* C414E4 80241734 0240202D */ daddu $a0, $s2, $zero .L80241738: diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index b72d64f51b..8bbf9eb322 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -54,7 +54,7 @@ glabel func_80242A6C_C4281C /* C428DC 80242B2C 8E4300B0 */ lw $v1, 0xb0($s2) /* C428E0 80242B30 30620004 */ andi $v0, $v1, 4 /* C428E4 80242B34 10400007 */ beqz $v0, .L80242B54 -/* C428E8 80242B38 00000000 */ nop +/* C428E8 80242B38 00000000 */ nop /* C428EC 80242B3C 824200B4 */ lb $v0, 0xb4($s2) /* C428F0 80242B40 1440003C */ bnez $v0, .L80242C34 /* C428F4 80242B44 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_80242A6C_C4281C /* C42918 80242B68 00220821 */ addu $at, $at, $v0 /* C4291C 80242B6C 8C226D50 */ lw $v0, %lo(D_80246D50)($at) /* C42920 80242B70 00400008 */ jr $v0 -/* C42924 80242B74 00000000 */ nop +/* C42924 80242B74 00000000 */ nop /* C42928 80242B78 0280202D */ daddu $a0, $s4, $zero /* C4292C 80242B7C 0200282D */ daddu $a1, $s0, $zero /* C42930 80242B80 0C0905D8 */ jal func_80241760_C41510 @@ -83,7 +83,7 @@ glabel func_80242A6C_C4281C /* C4294C 80242B9C 0000102D */ daddu $v0, $zero, $zero /* C42950 80242BA0 0280202D */ daddu $a0, $s4, $zero /* C42954 80242BA4 0200282D */ daddu $a1, $s0, $zero -/* C42958 80242BA8 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 +/* C42958 80242BA8 0C0907CE */ jal func_80241F38_C41CE8 /* C4295C 80242BAC 0260302D */ daddu $a2, $s3, $zero /* C42960 80242BB0 0280202D */ daddu $a0, $s4, $zero /* C42964 80242BB4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80242A6C_C4281C /* C42974 80242BC4 0000102D */ daddu $v0, $zero, $zero /* C42978 80242BC8 0280202D */ daddu $a0, $s4, $zero /* C4297C 80242BCC 0200282D */ daddu $a1, $s0, $zero -/* C42980 80242BD0 0C0908CF */ jal dgb_08_UnkNpcAIFunc2 +/* C42980 80242BD0 0C0908CF */ jal func_8024233C_C420EC /* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero /* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero /* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80242A6C_C4281C /* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero /* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero /* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero -/* C429C0 80242C10 0C090955 */ jal dgb_08_UnkNpcAIFunc3 +/* C429C0 80242C10 0C090955 */ jal func_80242554_C42304 /* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero /* C429C8 80242C18 08090B0D */ j .L80242C34 /* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s index aa82550ba3..0873c74d4e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s @@ -58,7 +58,7 @@ glabel func_802438F0_C436A0 /* C43770 802439C0 00220821 */ addu $at, $at, $v0 /* C43774 802439C4 8C226DA0 */ lw $v0, %lo(D_80246DA0)($at) /* C43778 802439C8 00400008 */ jr $v0 -/* C4377C 802439CC 00000000 */ nop +/* C4377C 802439CC 00000000 */ nop /* C43780 802439D0 0280202D */ daddu $a0, $s4, $zero /* C43784 802439D4 0220282D */ daddu $a1, $s1, $zero /* C43788 802439D8 0C0905D8 */ jal func_80241760_C41510 @@ -76,10 +76,10 @@ glabel func_802438F0_C436A0 /* C437B8 80243A08 0C090644 */ jal func_80241910_C416C0 /* C437BC 80243A0C 0260302D */ daddu $a2, $s3, $zero /* C437C0 80243A10 08090E8E */ j .L80243A38 -/* C437C4 80243A14 00000000 */ nop +/* C437C4 80243A14 00000000 */ nop /* C437C8 80243A18 0280202D */ daddu $a0, $s4, $zero /* C437CC 80243A1C 0220282D */ daddu $a1, $s1, $zero -/* C437D0 80243A20 0C0907CE */ jal dup_dgb_08_UnkNpcAIFunc1 +/* C437D0 80243A20 0C0907CE */ jal func_80241F38_C41CE8 /* C437D4 80243A24 0260302D */ daddu $a2, $s3, $zero /* C437D8 80243A28 0280202D */ daddu $a0, $s4, $zero /* C437DC 80243A2C 0220282D */ daddu $a1, $s1, $zero @@ -99,13 +99,13 @@ glabel func_802438F0_C436A0 /* C43810 80243A60 8E830070 */ lw $v1, 0x70($s4) /* C43814 80243A64 2402000D */ addiu $v0, $zero, 0xd /* C43818 80243A68 14620033 */ bne $v1, $v0, .L80243B38 -/* C4381C 80243A6C 00000000 */ nop +/* C4381C 80243A6C 00000000 */ nop /* C43820 80243A70 0280202D */ daddu $a0, $s4, $zero /* C43824 80243A74 0220282D */ daddu $a1, $s1, $zero /* C43828 80243A78 0C090B6C */ jal func_80242DB0_C42B60 /* C4382C 80243A7C 0260302D */ daddu $a2, $s3, $zero /* C43830 80243A80 08090ECE */ j .L80243B38 -/* C43834 80243A84 00000000 */ nop +/* C43834 80243A84 00000000 */ nop /* C43838 80243A88 0280202D */ daddu $a0, $s4, $zero /* C4383C 80243A8C 0220282D */ daddu $a1, $s1, $zero /* C43840 80243A90 0C090BAD */ jal func_80242EB4_C42C64 @@ -113,13 +113,13 @@ glabel func_802438F0_C436A0 /* C43848 80243A98 8E830070 */ lw $v1, 0x70($s4) /* C4384C 80243A9C 2402000F */ addiu $v0, $zero, 0xf /* C43850 80243AA0 14620025 */ bne $v1, $v0, .L80243B38 -/* C43854 80243AA4 00000000 */ nop +/* C43854 80243AA4 00000000 */ nop /* C43858 80243AA8 0280202D */ daddu $a0, $s4, $zero /* C4385C 80243AAC 0220282D */ daddu $a1, $s1, $zero /* C43860 80243AB0 0C090BE5 */ jal func_80242F94_C42D44 /* C43864 80243AB4 0260302D */ daddu $a2, $s3, $zero /* C43868 80243AB8 08090ECE */ j .L80243B38 -/* C4386C 80243ABC 00000000 */ nop +/* C4386C 80243ABC 00000000 */ nop /* C43870 80243AC0 0280202D */ daddu $a0, $s4, $zero /* C43874 80243AC4 0220282D */ daddu $a1, $s1, $zero /* C43878 80243AC8 0C090C8C */ jal func_80243230_C42FE0 @@ -129,19 +129,19 @@ glabel func_802438F0_C436A0 /* C43888 80243AD8 0C090CBA */ jal func_802432E8_C43098 /* C4388C 80243ADC 0260302D */ daddu $a2, $s3, $zero /* C43890 80243AE0 08090ECE */ j .L80243B38 -/* C43894 80243AE4 00000000 */ nop +/* C43894 80243AE4 00000000 */ nop /* C43898 80243AE8 0280202D */ daddu $a0, $s4, $zero /* C4389C 80243AEC 0220282D */ daddu $a1, $s1, $zero /* C438A0 80243AF0 0C090D1A */ jal func_80243468_C43218 /* C438A4 80243AF4 0260302D */ daddu $a2, $s3, $zero /* C438A8 80243AF8 08090ECE */ j .L80243B38 -/* C438AC 80243AFC 00000000 */ nop +/* C438AC 80243AFC 00000000 */ nop /* C438B0 80243B00 0280202D */ daddu $a0, $s4, $zero /* C438B4 80243B04 0220282D */ daddu $a1, $s1, $zero /* C438B8 80243B08 0C090D2C */ jal func_802434B0_C43260 /* C438BC 80243B0C 0260302D */ daddu $a2, $s3, $zero /* C438C0 80243B10 08090ECE */ j .L80243B38 -/* C438C4 80243B14 00000000 */ nop +/* C438C4 80243B14 00000000 */ nop /* C438C8 80243B18 0280202D */ daddu $a0, $s4, $zero /* C438CC 80243B1C 0220282D */ daddu $a1, $s1, $zero /* C438D0 80243B20 0C090D4C */ jal func_80243530_C432E0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index b091ed3403..d0ee83be81 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -46,7 +46,7 @@ glabel func_8024061C_C471FC /* C472A0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* C472A4 802406C4 30420004 */ andi $v0, $v0, 4 /* C472A8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C472AC 802406CC 00000000 */ nop +/* C472AC 802406CC 00000000 */ nop .L802406D0: /* C472B0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* C472B4 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_C471FC /* C4732C 8024074C 8E420070 */ lw $v0, 0x70($s2) /* C47330 80240750 2842001E */ slti $v0, $v0, 0x1e /* C47334 80240754 10400009 */ beqz $v0, .L8024077C -/* C47338 80240758 00000000 */ nop +/* C47338 80240758 00000000 */ nop /* C4733C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C47340 80240760 14400006 */ bnez $v0, .L8024077C -/* C47344 80240764 00000000 */ nop +/* C47344 80240764 00000000 */ nop /* C47348 80240768 0C090082 */ jal func_80240208_C46DE8 /* C4734C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C47350 80240770 10400002 */ beqz $v0, .L8024077C @@ -104,7 +104,7 @@ glabel func_8024061C_C471FC /* C47370 80240790 00220821 */ addu $at, $at, $v0 /* C47374 80240794 8C225398 */ lw $v0, %lo(D_80245398)($at) /* C47378 80240798 00400008 */ jr $v0 -/* C4737C 8024079C 00000000 */ nop +/* C4737C 8024079C 00000000 */ nop /* C47380 802407A0 0240202D */ daddu $a0, $s2, $zero /* C47384 802407A4 0260282D */ daddu $a1, $s3, $zero /* C47388 802407A8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024061C_C471FC /* C47398 802407B8 0C0125AE */ jal func_800496B8 /* C4739C 802407BC 0280302D */ daddu $a2, $s4, $zero /* C473A0 802407C0 0809022A */ j .L802408A8 -/* C473A4 802407C4 00000000 */ nop +/* C473A4 802407C4 00000000 */ nop /* C473A8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C473AC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C473B0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C473B0 802407D0 0C0126D1 */ jal func_80049B44 /* C473B4 802407D4 0280302D */ daddu $a2, $s4, $zero /* C473B8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C473BC 802407DC 0260282D */ daddu $a1, $s3, $zero /* C473C0 802407E0 0C012701 */ jal func_80049C04 /* C473C4 802407E4 0280302D */ daddu $a2, $s4, $zero /* C473C8 802407E8 0809022A */ j .L802408A8 -/* C473CC 802407EC 00000000 */ nop +/* C473CC 802407EC 00000000 */ nop /* C473D0 802407F0 0240202D */ daddu $a0, $s2, $zero /* C473D4 802407F4 0260282D */ daddu $a1, $s3, $zero /* C473D8 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_C471FC /* C473E8 80240808 0C0127B3 */ jal func_80049ECC /* C473EC 8024080C 0280302D */ daddu $a2, $s4, $zero /* C473F0 80240810 0809022A */ j .L802408A8 -/* C473F4 80240814 00000000 */ nop +/* C473F4 80240814 00000000 */ nop /* C473F8 80240818 0240202D */ daddu $a0, $s2, $zero /* C473FC 8024081C 0260282D */ daddu $a1, $s3, $zero /* C47400 80240820 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024061C_C471FC /* C47410 80240830 0C012849 */ jal func_8004A124 /* C47414 80240834 0280302D */ daddu $a2, $s4, $zero /* C47418 80240838 0809022A */ j .L802408A8 -/* C4741C 8024083C 00000000 */ nop +/* C4741C 8024083C 00000000 */ nop /* C47420 80240840 0240202D */ daddu $a0, $s2, $zero /* C47424 80240844 0260282D */ daddu $a1, $s3, $zero /* C47428 80240848 0C0128FA */ jal func_8004A3E8 /* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C47430 80240850 0809022A */ j .L802408A8 -/* C47434 80240854 00000000 */ nop -/* C47438 80240858 0C090000 */ jal dgb_09_UnkNpcAIFunc6 +/* C47434 80240854 00000000 */ nop +/* C47438 80240858 0C090000 */ jal func_80240000_C46BE0 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C47440 80240860 0C09001B */ jal dgb_09_UnkNpcAIFunc7 +/* C47440 80240860 0C09001B */ jal func_8024006C_C46C4C /* C47444 80240864 0240202D */ daddu $a0, $s2, $zero /* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C47454 80240874 00000000 */ nop -/* C47458 80240878 0C090037 */ jal dgb_09_UnkNpcAIFunc8 +/* C47454 80240874 00000000 */ nop +/* C47458 80240878 0C090037 */ jal func_802400DC_C46CBC /* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C47468 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C4746C 8024088C 00000000 */ nop -/* C47470 80240890 0C09006D */ jal dgb_09_UnkNpcAIFunc5 +/* C4746C 8024088C 00000000 */ nop +/* C47470 80240890 0C09006D */ jal func_802401B4_C46D94 /* C47474 80240894 0240202D */ daddu $a0, $s2, $zero /* C47478 80240898 0809022A */ j .L802408A8 -/* C4747C 8024089C 00000000 */ nop +/* C4747C 8024089C 00000000 */ nop /* C47480 802408A0 0C0129CF */ jal func_8004A73C /* C47484 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index b70915279d..c2e249b2dc 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -46,7 +46,7 @@ glabel func_802410D4_C47CB4 /* C47D58 80241178 8E2200B0 */ lw $v0, 0xb0($s1) /* C47D5C 8024117C 30420004 */ andi $v0, $v0, 4 /* C47D60 80241180 10400027 */ beqz $v0, .L80241220 -/* C47D64 80241184 00000000 */ nop +/* C47D64 80241184 00000000 */ nop .L80241188: /* C47D68 80241188 2402001E */ addiu $v0, $zero, 0x1e /* C47D6C 8024118C 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_802410D4_C47CB4 /* C47E04 80241224 2442FFF6 */ addiu $v0, $v0, -0xa /* C47E08 80241228 2C420014 */ sltiu $v0, $v0, 0x14 /* C47E0C 8024122C 10400009 */ beqz $v0, .L80241254 -/* C47E10 80241230 00000000 */ nop +/* C47E10 80241230 00000000 */ nop /* C47E14 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C47E18 80241238 14400006 */ bnez $v0, .L80241254 -/* C47E1C 8024123C 00000000 */ nop +/* C47E1C 8024123C 00000000 */ nop /* C47E20 80241240 0C090082 */ jal func_80240208_C46DE8 /* C47E24 80241244 0240202D */ daddu $a0, $s2, $zero /* C47E28 80241248 10400002 */ beqz $v0, .L80241254 @@ -112,37 +112,37 @@ glabel func_802410D4_C47CB4 /* C47E48 80241268 00220821 */ addu $at, $at, $v0 /* C47E4C 8024126C 8C225530 */ lw $v0, %lo(D_80245530)($at) /* C47E50 80241270 00400008 */ jr $v0 -/* C47E54 80241274 00000000 */ nop +/* C47E54 80241274 00000000 */ nop /* C47E58 80241278 0240202D */ daddu $a0, $s2, $zero /* C47E5C 8024127C 0260282D */ daddu $a1, $s3, $zero /* C47E60 80241280 0C090234 */ jal func_802408D0_C474B0 /* C47E64 80241284 02A0302D */ daddu $a2, $s5, $zero /* C47E68 80241288 080904FF */ j .L802413FC -/* C47E6C 8024128C 00000000 */ nop +/* C47E6C 8024128C 00000000 */ nop /* C47E70 80241290 0240202D */ daddu $a0, $s2, $zero /* C47E74 80241294 0260282D */ daddu $a1, $s3, $zero /* C47E78 80241298 0C090256 */ jal func_80240958_C47538 /* C47E7C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C47E80 802412A0 080904FF */ j .L802413FC -/* C47E84 802412A4 00000000 */ nop +/* C47E84 802412A4 00000000 */ nop /* C47E88 802412A8 0240202D */ daddu $a0, $s2, $zero /* C47E8C 802412AC 0260282D */ daddu $a1, $s3, $zero /* C47E90 802412B0 0C090304 */ jal func_80240C10_C477F0 /* C47E94 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C47E98 802412B8 080904FF */ j .L802413FC -/* C47E9C 802412BC 00000000 */ nop +/* C47E9C 802412BC 00000000 */ nop /* C47EA0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C47EA4 802412C4 0260282D */ daddu $a1, $s3, $zero /* C47EA8 802412C8 0C09031D */ jal func_80240C74_C47854 /* C47EAC 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C47EB0 802412D0 080904FF */ j .L802413FC -/* C47EB4 802412D4 00000000 */ nop +/* C47EB4 802412D4 00000000 */ nop /* C47EB8 802412D8 0240202D */ daddu $a0, $s2, $zero /* C47EBC 802412DC 0260282D */ daddu $a1, $s3, $zero /* C47EC0 802412E0 0C090347 */ jal func_80240D1C_C478FC /* C47EC4 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C47EC8 802412E8 080904FF */ j .L802413FC -/* C47ECC 802412EC 00000000 */ nop +/* C47ECC 802412EC 00000000 */ nop /* C47ED0 802412F0 0240202D */ daddu $a0, $s2, $zero /* C47ED4 802412F4 0260282D */ daddu $a1, $s3, $zero /* C47ED8 802412F8 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_802410D4_C47CB4 /* C47EE0 80241300 8E430070 */ lw $v1, 0x70($s2) /* C47EE4 80241304 2402000D */ addiu $v0, $zero, 0xd /* C47EE8 80241308 1462003C */ bne $v1, $v0, .L802413FC -/* C47EEC 8024130C 00000000 */ nop +/* C47EEC 8024130C 00000000 */ nop /* C47EF0 80241310 0240202D */ daddu $a0, $s2, $zero /* C47EF4 80241314 0260282D */ daddu $a1, $s3, $zero /* C47EF8 80241318 0C012849 */ jal func_8004A124 /* C47EFC 8024131C 02A0302D */ daddu $a2, $s5, $zero /* C47F00 80241320 080904FF */ j .L802413FC -/* C47F04 80241324 00000000 */ nop +/* C47F04 80241324 00000000 */ nop /* C47F08 80241328 0240202D */ daddu $a0, $s2, $zero /* C47F0C 8024132C 0260282D */ daddu $a1, $s3, $zero /* C47F10 80241330 0C0128FA */ jal func_8004A3E8 @@ -168,26 +168,26 @@ glabel func_802410D4_C47CB4 /* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 /* C47F2C 8024134C 080904FF */ j .L802413FC /* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C47F34 80241354 0C090000 */ jal dgb_09_UnkNpcAIFunc6 +/* C47F34 80241354 0C090000 */ jal func_80240000_C46BE0 /* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero /* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C47F44 80241364 14620025 */ bne $v1, $v0, .L802413FC -/* C47F48 80241368 00000000 */ nop -/* C47F4C 8024136C 0C09001B */ jal dgb_09_UnkNpcAIFunc7 +/* C47F48 80241368 00000000 */ nop +/* C47F4C 8024136C 0C09001B */ jal func_8024006C_C46C4C /* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero /* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC -/* C47F60 80241380 00000000 */ nop -/* C47F64 80241384 0C090037 */ jal dgb_09_UnkNpcAIFunc8 +/* C47F60 80241380 00000000 */ nop +/* C47F64 80241384 0C090037 */ jal func_802400DC_C46CBC /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC -/* C47F70 80241390 00000000 */ nop -/* C47F74 80241394 0C09006D */ jal dgb_09_UnkNpcAIFunc5 +/* C47F70 80241390 00000000 */ nop +/* C47F74 80241394 0C09006D */ jal func_802401B4_C46D94 /* C47F78 80241398 0240202D */ daddu $a0, $s2, $zero /* C47F7C 8024139C 080904FF */ j .L802413FC -/* C47F80 802413A0 00000000 */ nop +/* C47F80 802413A0 00000000 */ nop /* C47F84 802413A4 0240202D */ daddu $a0, $s2, $zero /* C47F88 802413A8 0260282D */ daddu $a1, $s3, $zero /* C47F8C 802413AC 0C090395 */ jal func_80240E54_C47A34 @@ -195,19 +195,19 @@ glabel func_802410D4_C47CB4 /* C47F94 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C47F98 802413B8 24020029 */ addiu $v0, $zero, 0x29 /* C47F9C 802413BC 1462000F */ bne $v1, $v0, .L802413FC -/* C47FA0 802413C0 00000000 */ nop +/* C47FA0 802413C0 00000000 */ nop /* C47FA4 802413C4 0240202D */ daddu $a0, $s2, $zero /* C47FA8 802413C8 0260282D */ daddu $a1, $s3, $zero /* C47FAC 802413CC 0C0903C0 */ jal func_80240F00_C47AE0 /* C47FB0 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C47FB4 802413D4 080904FF */ j .L802413FC -/* C47FB8 802413D8 00000000 */ nop +/* C47FB8 802413D8 00000000 */ nop /* C47FBC 802413DC 0240202D */ daddu $a0, $s2, $zero /* C47FC0 802413E0 0260282D */ daddu $a1, $s3, $zero /* C47FC4 802413E4 0C09041E */ jal func_80241078_C47C58 /* C47FC8 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C47FCC 802413EC 080904FF */ j .L802413FC -/* C47FD0 802413F0 00000000 */ nop +/* C47FD0 802413F0 00000000 */ nop /* C47FD4 802413F4 0C0129CF */ jal func_8004A73C /* C47FD8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s index 066bd84a16..d4bb587865 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s @@ -104,8 +104,8 @@ glabel func_802415D4_C481B4 /* C48338 80241758 1040000A */ beqz $v0, .L80241784 /* C4833C 8024175C 4600C106 */ mov.s $f4, $f24 /* C48340 80241760 4614C081 */ sub.s $f2, $f24, $f20 -/* C48344 80241764 3C018024 */ lui $at, %hi(D_802456C8) -/* C48348 80241768 D42056C8 */ ldc1 $f0, %lo(D_802456C8)($at) +/* C48344 80241764 3C018024 */ lui $at, %hi(func_802456C8_A2F908) +/* C48348 80241768 D42056C8 */ ldc1 $f0, %lo(func_802456C8_A2F908)($at) /* C4834C 8024176C 460010A1 */ cvt.d.s $f2, $f2 /* C48350 80241770 46201082 */ mul.d $f2, $f2, $f0 /* C48354 80241774 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 73d8826df5..e2f554ea49 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -83,7 +83,7 @@ glabel func_80242730_C49310 /* C49440 80242860 0000102D */ daddu $v0, $zero, $zero /* C49444 80242864 0280202D */ daddu $a0, $s4, $zero /* C49448 80242868 0200282D */ daddu $a1, $s0, $zero -/* C4944C 8024286C 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 +/* C4944C 8024286C 0C0906FF */ jal func_80241BFC_C487DC /* C49450 80242870 0260302D */ daddu $a2, $s3, $zero /* C49454 80242874 0280202D */ daddu $a0, $s4, $zero /* C49458 80242878 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80242730_C49310 /* C49468 80242888 0000102D */ daddu $v0, $zero, $zero /* C4946C 8024288C 0280202D */ daddu $a0, $s4, $zero /* C49470 80242890 0200282D */ daddu $a1, $s0, $zero -/* C49474 80242894 0C090800 */ jal dgb_09_UnkNpcAIFunc2 +/* C49474 80242894 0C090800 */ jal func_80242000_C48BE0 /* C49478 80242898 0260302D */ daddu $a2, $s3, $zero /* C4947C 8024289C 0280202D */ daddu $a0, $s4, $zero /* C49480 802428A0 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80242730_C49310 /* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero /* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero /* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* C494B4 802428D4 0C090886 */ jal dgb_09_UnkNpcAIFunc3 +/* C494B4 802428D4 0C090886 */ jal func_80242218_C48DF8 /* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero /* C494BC 802428DC 08090A3E */ j .L802428F8 /* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s index 58d9302881..6ccc9656f9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s @@ -57,8 +57,8 @@ glabel func_80242C1C_C497FC /* C498C8 80242CE8 E6420038 */ swc1 $f2, 0x38($s2) /* C498CC 80242CEC C4420030 */ lwc1 $f2, 0x30($v0) /* C498D0 80242CF0 46001080 */ add.s $f2, $f2, $f0 -/* C498D4 80242CF4 3C018024 */ lui $at, %hi(D_80245718) -/* C498D8 80242CF8 D4265718 */ ldc1 $f6, %lo(D_80245718)($at) +/* C498D4 80242CF4 3C018024 */ lui $at, %hi(func_80245718_A2F958) +/* C498D8 80242CF8 D4265718 */ ldc1 $f6, %lo(func_80245718_A2F958)($at) /* C498DC 80242CFC 46002021 */ cvt.d.s $f0, $f4 /* C498E0 80242D00 4620303C */ c.lt.d $f6, $f0 /* C498E4 80242D04 E6440048 */ swc1 $f4, 0x48($s2) diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s index 37e34b8974..fbc502fe42 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s @@ -79,7 +79,7 @@ glabel func_80243578_C4A158 /* C4A27C 8024369C 00000000 */ nop /* C4A280 802436A0 0280202D */ daddu $a0, $s4, $zero /* C4A284 802436A4 0220282D */ daddu $a1, $s1, $zero -/* C4A288 802436A8 0C0906FF */ jal dgb_09_UnkNpcAIFunc1 +/* C4A288 802436A8 0C0906FF */ jal func_80241BFC_C487DC /* C4A28C 802436AC 0260302D */ daddu $a2, $s3, $zero /* C4A290 802436B0 0280202D */ daddu $a0, $s4, $zero /* C4A294 802436B4 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s index 09d46455de..3f77f06418 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_12/C4DEF0/func_80240000_C4DEF0.s @@ -4,8 +4,8 @@ glabel func_80240000_C4DEF0 /* C4DEF0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C4DEF4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* C4DEF8 80240008 3C108024 */ lui $s0, %hi(D_80240870) -/* C4DEFC 8024000C 26100870 */ addiu $s0, $s0, %lo(D_80240870) +/* C4DEF8 80240008 3C108024 */ lui $s0, %hi(func_80240870_BED660) +/* C4DEFC 8024000C 26100870 */ addiu $s0, $s0, %lo(func_80240870_BED660) /* C4DF00 80240010 AFBF0018 */ sw $ra, 0x18($sp) /* C4DF04 80240014 AFB10014 */ sw $s1, 0x14($sp) /* C4DF08 80240018 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240000_C4DEF0 /* C4DF6C 8024007C 28620010 */ slti $v0, $v1, 0x10 /* C4DF70 80240080 1440FFFA */ bnez $v0, .L8024006C /* C4DF74 80240084 24840004 */ addiu $a0, $a0, 4 -/* C4DF78 80240088 3C108024 */ lui $s0, %hi(D_80240870) -/* C4DF7C 8024008C 26100870 */ addiu $s0, $s0, %lo(D_80240870) +/* C4DF78 80240088 3C108024 */ lui $s0, %hi(func_80240870_BED660) +/* C4DF7C 8024008C 26100870 */ addiu $s0, $s0, %lo(func_80240870_BED660) /* C4DF80 80240090 0C00AB4B */ jal heap_free /* C4DF84 80240094 8E040000 */ lw $a0, ($s0) /* C4DF88 80240098 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index a56ac7182e..3475c128d0 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -46,7 +46,7 @@ glabel func_8024061C_C4FB2C /* C4FBD0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* C4FBD4 802406C4 30420004 */ andi $v0, $v0, 4 /* C4FBD8 802406C8 10400020 */ beqz $v0, .L8024074C -/* C4FBDC 802406CC 00000000 */ nop +/* C4FBDC 802406CC 00000000 */ nop .L802406D0: /* C4FBE0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* C4FBE4 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_C4FB2C /* C4FC5C 8024074C 8E420070 */ lw $v0, 0x70($s2) /* C4FC60 80240750 2842001E */ slti $v0, $v0, 0x1e /* C4FC64 80240754 10400009 */ beqz $v0, .L8024077C -/* C4FC68 80240758 00000000 */ nop +/* C4FC68 80240758 00000000 */ nop /* C4FC6C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C4FC70 80240760 14400006 */ bnez $v0, .L8024077C -/* C4FC74 80240764 00000000 */ nop +/* C4FC74 80240764 00000000 */ nop /* C4FC78 80240768 0C090082 */ jal func_80240208_C4F718 /* C4FC7C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C4FC80 80240770 10400002 */ beqz $v0, .L8024077C @@ -100,11 +100,11 @@ glabel func_8024061C_C4FB2C /* C4FC90 80240780 2C620064 */ sltiu $v0, $v1, 0x64 /* C4FC94 80240784 10400048 */ beqz $v0, .L802408A8 /* C4FC98 80240788 00031080 */ sll $v0, $v1, 2 -/* C4FC9C 8024078C 3C018024 */ lui $at, %hi(D_80242CF8) +/* C4FC9C 8024078C 3C018024 */ lui $at, %hi(func_80242CF8_9D9D18) /* C4FCA0 80240790 00220821 */ addu $at, $at, $v0 -/* C4FCA4 80240794 8C222CF8 */ lw $v0, %lo(D_80242CF8)($at) +/* C4FCA4 80240794 8C222CF8 */ lw $v0, %lo(func_80242CF8_9D9D18)($at) /* C4FCA8 80240798 00400008 */ jr $v0 -/* C4FCAC 8024079C 00000000 */ nop +/* C4FCAC 8024079C 00000000 */ nop /* C4FCB0 802407A0 0240202D */ daddu $a0, $s2, $zero /* C4FCB4 802407A4 0260282D */ daddu $a1, $s3, $zero /* C4FCB8 802407A8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024061C_C4FB2C /* C4FCC8 802407B8 0C0125AE */ jal func_800496B8 /* C4FCCC 802407BC 0280302D */ daddu $a2, $s4, $zero /* C4FCD0 802407C0 0809022A */ j .L802408A8 -/* C4FCD4 802407C4 00000000 */ nop +/* C4FCD4 802407C4 00000000 */ nop /* C4FCD8 802407C8 0240202D */ daddu $a0, $s2, $zero /* C4FCDC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* C4FCE0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C4FCE0 802407D0 0C0126D1 */ jal func_80049B44 /* C4FCE4 802407D4 0280302D */ daddu $a2, $s4, $zero /* C4FCE8 802407D8 0240202D */ daddu $a0, $s2, $zero /* C4FCEC 802407DC 0260282D */ daddu $a1, $s3, $zero /* C4FCF0 802407E0 0C012701 */ jal func_80049C04 /* C4FCF4 802407E4 0280302D */ daddu $a2, $s4, $zero /* C4FCF8 802407E8 0809022A */ j .L802408A8 -/* C4FCFC 802407EC 00000000 */ nop +/* C4FCFC 802407EC 00000000 */ nop /* C4FD00 802407F0 0240202D */ daddu $a0, $s2, $zero /* C4FD04 802407F4 0260282D */ daddu $a1, $s3, $zero /* C4FD08 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_C4FB2C /* C4FD18 80240808 0C0127B3 */ jal func_80049ECC /* C4FD1C 8024080C 0280302D */ daddu $a2, $s4, $zero /* C4FD20 80240810 0809022A */ j .L802408A8 -/* C4FD24 80240814 00000000 */ nop +/* C4FD24 80240814 00000000 */ nop /* C4FD28 80240818 0240202D */ daddu $a0, $s2, $zero /* C4FD2C 8024081C 0260282D */ daddu $a1, $s3, $zero /* C4FD30 80240820 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024061C_C4FB2C /* C4FD40 80240830 0C012849 */ jal func_8004A124 /* C4FD44 80240834 0280302D */ daddu $a2, $s4, $zero /* C4FD48 80240838 0809022A */ j .L802408A8 -/* C4FD4C 8024083C 00000000 */ nop +/* C4FD4C 8024083C 00000000 */ nop /* C4FD50 80240840 0240202D */ daddu $a0, $s2, $zero /* C4FD54 80240844 0260282D */ daddu $a1, $s3, $zero /* C4FD58 80240848 0C0128FA */ jal func_8004A3E8 /* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C4FD60 80240850 0809022A */ j .L802408A8 -/* C4FD64 80240854 00000000 */ nop -/* C4FD68 80240858 0C090000 */ jal dgb_15_UnkNpcAIFunc6 +/* C4FD64 80240854 00000000 */ nop +/* C4FD68 80240858 0C090000 */ jal func_80240000_C4F510 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C4FD70 80240860 0C09001B */ jal dgb_15_UnkNpcAIFunc7 +/* C4FD70 80240860 0C09001B */ jal func_8024006C_C4F57C /* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero /* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* C4FD84 80240874 00000000 */ nop -/* C4FD88 80240878 0C090037 */ jal dgb_15_UnkNpcAIFunc8 +/* C4FD84 80240874 00000000 */ nop +/* C4FD88 80240878 0C090037 */ jal func_802400DC_C4F5EC /* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 /* C4FD98 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* C4FD9C 8024088C 00000000 */ nop -/* C4FDA0 80240890 0C09006D */ jal dgb_15_UnkNpcAIFunc5 +/* C4FD9C 8024088C 00000000 */ nop +/* C4FDA0 80240890 0C09006D */ jal func_802401B4_C4F6C4 /* C4FDA4 80240894 0240202D */ daddu $a0, $s2, $zero /* C4FDA8 80240898 0809022A */ j .L802408A8 -/* C4FDAC 8024089C 00000000 */ nop +/* C4FDAC 8024089C 00000000 */ nop /* C4FDB0 802408A0 0C0129CF */ jal func_8004A73C /* C4FDB4 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s index 0d6131e08e..44d4b43a5f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802408D0_C4FDE0.s @@ -69,8 +69,8 @@ glabel func_802408D0_C4FDE0 /* C4FED4 802409C4 0809027B */ j .L802409EC /* C4FED8 802409C8 E6800018 */ swc1 $f0, 0x18($s4) .L802409CC: -/* C4FEDC 802409CC 3C018024 */ lui $at, %hi(D_80242E88) -/* C4FEE0 802409D0 D4222E88 */ ldc1 $f2, %lo(D_80242E88)($at) +/* C4FEDC 802409CC 3C018024 */ lui $at, %hi(func_80242E88_95E088) +/* C4FEE0 802409D0 D4222E88 */ ldc1 $f2, %lo(func_80242E88_95E088)($at) /* C4FEE4 802409D4 44820000 */ mtc1 $v0, $f0 /* C4FEE8 802409D8 00000000 */ nop /* C4FEEC 802409DC 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s index ff6d5a1333..411b690e56 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -141,7 +141,7 @@ glabel func_80241464_C50974 /* C50B7C 8024166C 00000000 */ nop /* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero /* C50B84 80241674 0260282D */ daddu $a1, $s3, $zero -/* C50B88 80241678 0C090334 */ jal dgb_15_UnkNpcAIFunc1 +/* C50B88 80241678 0C090334 */ jal func_80240CD0_C501E0 /* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero /* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero /* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241464_C50974 /* C50BBC 802416AC 00000000 */ nop /* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero /* C50BC4 802416B4 0260282D */ daddu $a1, $s3, $zero -/* C50BC8 802416B8 0C090400 */ jal dgb_15_NpcJumpFunc2 +/* C50BC8 802416B8 0C090400 */ jal func_80241000_C50510 /* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero /* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero /* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero -/* C50BD8 802416C8 0C09041D */ jal dgb_15_NpcJumpFunc +/* C50BD8 802416C8 0C09041D */ jal func_80241074_C50584 /* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero /* C50BE0 802416D0 080905CE */ j .L80241738 /* C50BE4 802416D4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241464_C50974 /* C50C0C 802416FC 00000000 */ nop /* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero /* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero -/* C50C18 80241708 0C0904CF */ jal dgb_15_UnkNpcDurationFlagFunc +/* C50C18 80241708 0C0904CF */ jal func_8024133C_C5084C /* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero /* C50C20 80241710 080905CE */ j .L80241738 /* C50C24 80241714 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index 819dc2140d..d8e8dd9f30 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -46,7 +46,7 @@ glabel func_80240E20_C53360 /* C53404 80240EC4 8E2200B0 */ lw $v0, 0xb0($s1) /* C53408 80240EC8 30420004 */ andi $v0, $v0, 4 /* C5340C 80240ECC 10400027 */ beqz $v0, .L80240F6C -/* C53410 80240ED0 00000000 */ nop +/* C53410 80240ED0 00000000 */ nop .L80240ED4: /* C53414 80240ED4 2402001E */ addiu $v0, $zero, 0x1e /* C53418 80240ED8 2404F7FF */ addiu $a0, $zero, -0x801 @@ -94,10 +94,10 @@ glabel func_80240E20_C53360 /* C534B0 80240F70 2442FFF6 */ addiu $v0, $v0, -0xa /* C534B4 80240F74 2C420014 */ sltiu $v0, $v0, 0x14 /* C534B8 80240F78 10400009 */ beqz $v0, .L80240FA0 -/* C534BC 80240F7C 00000000 */ nop +/* C534BC 80240F7C 00000000 */ nop /* C534C0 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C534C4 80240F84 14400006 */ bnez $v0, .L80240FA0 -/* C534C8 80240F88 00000000 */ nop +/* C534C8 80240F88 00000000 */ nop /* C534CC 80240F8C 0C090082 */ jal func_80240208_C52748 /* C534D0 80240F90 0240202D */ daddu $a0, $s2, $zero /* C534D4 80240F94 10400002 */ beqz $v0, .L80240FA0 @@ -112,37 +112,37 @@ glabel func_80240E20_C53360 /* C534F4 80240FB4 00220821 */ addu $at, $at, $v0 /* C534F8 80240FB8 8C223200 */ lw $v0, %lo(D_80243200)($at) /* C534FC 80240FBC 00400008 */ jr $v0 -/* C53500 80240FC0 00000000 */ nop +/* C53500 80240FC0 00000000 */ nop /* C53504 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C53508 80240FC8 0260282D */ daddu $a1, $s3, $zero /* C5350C 80240FCC 0C090187 */ jal func_8024061C_C52B5C /* C53510 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C53514 80240FD4 08090452 */ j .L80241148 -/* C53518 80240FD8 00000000 */ nop +/* C53518 80240FD8 00000000 */ nop /* C5351C 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C53520 80240FE0 0260282D */ daddu $a1, $s3, $zero /* C53524 80240FE4 0C0901A9 */ jal func_802406A4_C52BE4 /* C53528 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C5352C 80240FEC 08090452 */ j .L80241148 -/* C53530 80240FF0 00000000 */ nop +/* C53530 80240FF0 00000000 */ nop /* C53534 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C53538 80240FF8 0260282D */ daddu $a1, $s3, $zero /* C5353C 80240FFC 0C090257 */ jal func_8024095C_C52E9C /* C53540 80241000 02A0302D */ daddu $a2, $s5, $zero /* C53544 80241004 08090452 */ j .L80241148 -/* C53548 80241008 00000000 */ nop +/* C53548 80241008 00000000 */ nop /* C5354C 8024100C 0240202D */ daddu $a0, $s2, $zero /* C53550 80241010 0260282D */ daddu $a1, $s3, $zero /* C53554 80241014 0C090270 */ jal func_802409C0_C52F00 /* C53558 80241018 02A0302D */ daddu $a2, $s5, $zero /* C5355C 8024101C 08090452 */ j .L80241148 -/* C53560 80241020 00000000 */ nop +/* C53560 80241020 00000000 */ nop /* C53564 80241024 0240202D */ daddu $a0, $s2, $zero /* C53568 80241028 0260282D */ daddu $a1, $s3, $zero /* C5356C 8024102C 0C09029A */ jal func_80240A68_C52FA8 /* C53570 80241030 02A0302D */ daddu $a2, $s5, $zero /* C53574 80241034 08090452 */ j .L80241148 -/* C53578 80241038 00000000 */ nop +/* C53578 80241038 00000000 */ nop /* C5357C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C53580 80241040 0260282D */ daddu $a1, $s3, $zero /* C53584 80241044 0C0127DF */ jal func_80049F7C @@ -150,13 +150,13 @@ glabel func_80240E20_C53360 /* C5358C 8024104C 8E430070 */ lw $v1, 0x70($s2) /* C53590 80241050 2402000D */ addiu $v0, $zero, 0xd /* C53594 80241054 1462003C */ bne $v1, $v0, .L80241148 -/* C53598 80241058 00000000 */ nop +/* C53598 80241058 00000000 */ nop /* C5359C 8024105C 0240202D */ daddu $a0, $s2, $zero /* C535A0 80241060 0260282D */ daddu $a1, $s3, $zero /* C535A4 80241064 0C012849 */ jal func_8004A124 /* C535A8 80241068 02A0302D */ daddu $a2, $s5, $zero /* C535AC 8024106C 08090452 */ j .L80241148 -/* C535B0 80241070 00000000 */ nop +/* C535B0 80241070 00000000 */ nop /* C535B4 80241074 0240202D */ daddu $a0, $s2, $zero /* C535B8 80241078 0260282D */ daddu $a1, $s3, $zero /* C535BC 8024107C 0C0128FA */ jal func_8004A3E8 @@ -168,26 +168,26 @@ glabel func_80240E20_C53360 /* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 /* C535D8 80241098 08090452 */ j .L80241148 /* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C535E0 802410A0 0C090000 */ jal dgb_16_UnkNpcAIFunc6 +/* C535E0 802410A0 0C090000 */ jal func_80240000_C52540 /* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero /* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C535F0 802410B0 14620025 */ bne $v1, $v0, .L80241148 -/* C535F4 802410B4 00000000 */ nop -/* C535F8 802410B8 0C09001B */ jal dgb_16_UnkNpcAIFunc7 +/* C535F4 802410B4 00000000 */ nop +/* C535F8 802410B8 0C09001B */ jal func_8024006C_C525AC /* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 -/* C5360C 802410CC 00000000 */ nop -/* C53610 802410D0 0C090037 */ jal dgb_16_UnkNpcAIFunc8 +/* C5360C 802410CC 00000000 */ nop +/* C53610 802410D0 0C090037 */ jal func_802400DC_C5261C /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 -/* C5361C 802410DC 00000000 */ nop -/* C53620 802410E0 0C09006D */ jal dgb_16_UnkNpcAIFunc5 +/* C5361C 802410DC 00000000 */ nop +/* C53620 802410E0 0C09006D */ jal func_802401B4_C526F4 /* C53624 802410E4 0240202D */ daddu $a0, $s2, $zero /* C53628 802410E8 08090452 */ j .L80241148 -/* C5362C 802410EC 00000000 */ nop +/* C5362C 802410EC 00000000 */ nop /* C53630 802410F0 0240202D */ daddu $a0, $s2, $zero /* C53634 802410F4 0260282D */ daddu $a1, $s3, $zero /* C53638 802410F8 0C0902E8 */ jal func_80240BA0_C530E0 @@ -195,19 +195,19 @@ glabel func_80240E20_C53360 /* C53640 80241100 8E430070 */ lw $v1, 0x70($s2) /* C53644 80241104 24020029 */ addiu $v0, $zero, 0x29 /* C53648 80241108 1462000F */ bne $v1, $v0, .L80241148 -/* C5364C 8024110C 00000000 */ nop +/* C5364C 8024110C 00000000 */ nop /* C53650 80241110 0240202D */ daddu $a0, $s2, $zero /* C53654 80241114 0260282D */ daddu $a1, $s3, $zero /* C53658 80241118 0C090313 */ jal func_80240C4C_C5318C /* C5365C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C53660 80241120 08090452 */ j .L80241148 -/* C53664 80241124 00000000 */ nop +/* C53664 80241124 00000000 */ nop /* C53668 80241128 0240202D */ daddu $a0, $s2, $zero /* C5366C 8024112C 0260282D */ daddu $a1, $s3, $zero /* C53670 80241130 0C090371 */ jal func_80240DC4_C53304 /* C53674 80241134 02A0302D */ daddu $a2, $s5, $zero /* C53678 80241138 08090452 */ j .L80241148 -/* C5367C 8024113C 00000000 */ nop +/* C5367C 8024113C 00000000 */ nop /* C53680 80241140 0C0129CF */ jal func_8004A73C /* C53684 80241144 0240202D */ daddu $a0, $s2, $zero .L80241148: diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 761ade26fb..d06f34bc23 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -46,7 +46,7 @@ glabel func_80241170_C536B0 /* C53754 80241214 8E2200B0 */ lw $v0, 0xb0($s1) /* C53758 80241218 30420004 */ andi $v0, $v0, 4 /* C5375C 8024121C 10400020 */ beqz $v0, .L802412A0 -/* C53760 80241220 00000000 */ nop +/* C53760 80241220 00000000 */ nop .L80241224: /* C53764 80241224 2404F7FF */ addiu $a0, $zero, -0x801 /* C53768 80241228 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241170_C536B0 /* C537E0 802412A0 8E420070 */ lw $v0, 0x70($s2) /* C537E4 802412A4 2842001E */ slti $v0, $v0, 0x1e /* C537E8 802412A8 10400009 */ beqz $v0, .L802412D0 -/* C537EC 802412AC 00000000 */ nop +/* C537EC 802412AC 00000000 */ nop /* C537F0 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* C537F4 802412B4 14400006 */ bnez $v0, .L802412D0 -/* C537F8 802412B8 00000000 */ nop +/* C537F8 802412B8 00000000 */ nop /* C537FC 802412BC 0C090082 */ jal func_80240208_C52748 /* C53800 802412C0 0240202D */ daddu $a0, $s2, $zero /* C53804 802412C4 10400002 */ beqz $v0, .L802412D0 @@ -104,7 +104,7 @@ glabel func_80241170_C536B0 /* C53824 802412E4 00220821 */ addu $at, $at, $v0 /* C53828 802412E8 8C223390 */ lw $v0, %lo(D_80243390)($at) /* C5382C 802412EC 00400008 */ jr $v0 -/* C53830 802412F0 00000000 */ nop +/* C53830 802412F0 00000000 */ nop /* C53834 802412F4 0240202D */ daddu $a0, $s2, $zero /* C53838 802412F8 0260282D */ daddu $a1, $s3, $zero /* C5383C 802412FC 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241170_C536B0 /* C5384C 8024130C 0C0125AE */ jal func_800496B8 /* C53850 80241310 0280302D */ daddu $a2, $s4, $zero /* C53854 80241314 080904FF */ j .L802413FC -/* C53858 80241318 00000000 */ nop +/* C53858 80241318 00000000 */ nop /* C5385C 8024131C 0240202D */ daddu $a0, $s2, $zero /* C53860 80241320 0260282D */ daddu $a1, $s3, $zero -/* C53864 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C53864 80241324 0C0126D1 */ jal func_80049B44 /* C53868 80241328 0280302D */ daddu $a2, $s4, $zero /* C5386C 8024132C 0240202D */ daddu $a0, $s2, $zero /* C53870 80241330 0260282D */ daddu $a1, $s3, $zero /* C53874 80241334 0C012701 */ jal func_80049C04 /* C53878 80241338 0280302D */ daddu $a2, $s4, $zero /* C5387C 8024133C 080904FF */ j .L802413FC -/* C53880 80241340 00000000 */ nop +/* C53880 80241340 00000000 */ nop /* C53884 80241344 0240202D */ daddu $a0, $s2, $zero /* C53888 80241348 0260282D */ daddu $a1, $s3, $zero /* C5388C 8024134C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241170_C536B0 /* C5389C 8024135C 0C0127B3 */ jal func_80049ECC /* C538A0 80241360 0280302D */ daddu $a2, $s4, $zero /* C538A4 80241364 080904FF */ j .L802413FC -/* C538A8 80241368 00000000 */ nop +/* C538A8 80241368 00000000 */ nop /* C538AC 8024136C 0240202D */ daddu $a0, $s2, $zero /* C538B0 80241370 0260282D */ daddu $a1, $s3, $zero /* C538B4 80241374 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241170_C536B0 /* C538C4 80241384 0C012849 */ jal func_8004A124 /* C538C8 80241388 0280302D */ daddu $a2, $s4, $zero /* C538CC 8024138C 080904FF */ j .L802413FC -/* C538D0 80241390 00000000 */ nop +/* C538D0 80241390 00000000 */ nop /* C538D4 80241394 0240202D */ daddu $a0, $s2, $zero /* C538D8 80241398 0260282D */ daddu $a1, $s3, $zero /* C538DC 8024139C 0C0128FA */ jal func_8004A3E8 /* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero /* C538E4 802413A4 080904FF */ j .L802413FC -/* C538E8 802413A8 00000000 */ nop -/* C538EC 802413AC 0C090000 */ jal dgb_16_UnkNpcAIFunc6 +/* C538E8 802413A8 00000000 */ nop +/* C538EC 802413AC 0C090000 */ jal func_80240000_C52540 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C538F4 802413B4 0C09001B */ jal dgb_16_UnkNpcAIFunc7 +/* C538F4 802413B4 0C09001B */ jal func_8024006C_C525AC /* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* C53908 802413C8 00000000 */ nop -/* C5390C 802413CC 0C090037 */ jal dgb_16_UnkNpcAIFunc8 +/* C53908 802413C8 00000000 */ nop +/* C5390C 802413CC 0C090037 */ jal func_802400DC_C5261C /* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero /* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* C5391C 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* C53920 802413E0 00000000 */ nop -/* C53924 802413E4 0C09006D */ jal dgb_16_UnkNpcAIFunc5 +/* C53920 802413E0 00000000 */ nop +/* C53924 802413E4 0C09006D */ jal func_802401B4_C526F4 /* C53928 802413E8 0240202D */ daddu $a0, $s2, $zero /* C5392C 802413EC 080904FF */ j .L802413FC -/* C53930 802413F0 00000000 */ nop +/* C53930 802413F0 00000000 */ nop /* C53934 802413F4 0C0129CF */ jal func_8004A73C /* C53938 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: @@ -182,6 +182,6 @@ glabel func_80241170_C536B0 /* C53958 80241418 0000102D */ daddu $v0, $zero, $zero /* C5395C 8024141C 03E00008 */ jr $ra /* C53960 80241420 27BD0050 */ addiu $sp, $sp, 0x50 -/* C53964 80241424 00000000 */ nop -/* C53968 80241428 00000000 */ nop -/* C5396C 8024142C 00000000 */ nop +/* C53964 80241424 00000000 */ nop +/* C53968 80241428 00000000 */ nop +/* C5396C 8024142C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index 0dc13964e7..1420963ab9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -124,9 +124,9 @@ glabel func_80240B94_C56AD4 /* C56C98 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* C56C9C 80240D5C 10400042 */ beqz $v0, .L80240E68 /* C56CA0 80240D60 00031080 */ sll $v0, $v1, 2 -/* C56CA4 80240D64 3C018024 */ lui $at, %hi(D_802438F0) +/* C56CA4 80240D64 3C018024 */ lui $at, %hi(func_802438F0_C436A0) /* C56CA8 80240D68 00220821 */ addu $at, $at, $v0 -/* C56CAC 80240D6C 8C2238F0 */ lw $v0, %lo(D_802438F0)($at) +/* C56CAC 80240D6C 8C2238F0 */ lw $v0, %lo(func_802438F0_C436A0)($at) /* C56CB0 80240D70 00400008 */ jr $v0 /* C56CB4 80240D74 00000000 */ nop /* C56CB8 80240D78 0280202D */ daddu $a0, $s4, $zero @@ -141,7 +141,7 @@ glabel func_80240B94_C56AD4 /* C56CDC 80240D9C 00000000 */ nop /* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C56CE4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C56CE8 80240DA8 0C090100 */ jal dgb_18_UnkNpcAIFunc1 +/* C56CE8 80240DA8 0C090100 */ jal func_80240400_C56340 /* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_C56AD4 /* C56D1C 80240DDC 00000000 */ nop /* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C56D24 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C56D28 80240DE8 0C0901CC */ jal dgb_18_NpcJumpFunc2 +/* C56D28 80240DE8 0C0901CC */ jal func_80240730_C56670 /* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C56D38 80240DF8 0C0901E9 */ jal dgb_18_NpcJumpFunc +/* C56D38 80240DF8 0C0901E9 */ jal func_802407A4_C566E4 /* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C56D40 80240E00 0809039A */ j .L80240E68 /* C56D44 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_C56AD4 /* C56D6C 80240E2C 00000000 */ nop /* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero /* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C56D78 80240E38 0C09029B */ jal dgb_18_UnkNpcDurationFlagFunc +/* C56D78 80240E38 0C09029B */ jal func_80240A6C_C569AC /* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C56D80 80240E40 0809039A */ j .L80240E68 /* C56D84 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index 011bbcf8ac..dc5c3f0a5b 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -141,7 +141,7 @@ glabel func_80241174_95C374 /* 95C57C 8024137C 00000000 */ nop /* 95C580 80241380 0280202D */ daddu $a0, $s4, $zero /* 95C584 80241384 0260282D */ daddu $a1, $s3, $zero -/* 95C588 80241388 0C090278 */ jal dro_01_UnkNpcAIFunc1 +/* 95C588 80241388 0C090278 */ jal func_802409E0_95BBE0 /* 95C58C 8024138C 02A0302D */ daddu $a2, $s5, $zero /* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241174_95C374 /* 95C5BC 802413BC 00000000 */ nop /* 95C5C0 802413C0 0280202D */ daddu $a0, $s4, $zero /* 95C5C4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* 95C5C8 802413C8 0C090344 */ jal dro_01_NpcJumpFunc2 +/* 95C5C8 802413C8 0C090344 */ jal func_80240D10_95BF10 /* 95C5CC 802413CC 02A0302D */ daddu $a2, $s5, $zero /* 95C5D0 802413D0 0280202D */ daddu $a0, $s4, $zero /* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* 95C5D8 802413D8 0C090361 */ jal dro_01_NpcJumpFunc +/* 95C5D8 802413D8 0C090361 */ jal func_80240D84_95BF84 /* 95C5DC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* 95C5E0 802413E0 08090512 */ j .L80241448 /* 95C5E4 802413E4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241174_95C374 /* 95C60C 8024140C 00000000 */ nop /* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero /* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero -/* 95C618 80241418 0C090413 */ jal dro_01_UnkNpcDurationFlagFunc +/* 95C618 80241418 0C090413 */ jal func_8024104C_95C24C /* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero /* 95C620 80241420 08090512 */ j .L80241448 /* 95C624 80241424 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s index 235fedfeee..c038c98b6b 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s @@ -9,8 +9,8 @@ glabel func_802417D0_95C9D0 /* 95C9E0 802417E0 8C84014C */ lw $a0, 0x14c($a0) /* 95C9E4 802417E4 24040008 */ addiu $a0, $zero, 8 /* 95C9E8 802417E8 0040802D */ daddu $s0, $v0, $zero -/* 95C9EC 802417EC 3C028024 */ lui $v0, %hi(D_8024183C) -/* 95C9F0 802417F0 2442183C */ addiu $v0, $v0, %lo(D_8024183C) +/* 95C9EC 802417EC 3C028024 */ lui $v0, %hi(func_8024183C_95B84C) +/* 95C9F0 802417F0 2442183C */ addiu $v0, $v0, %lo(func_8024183C_95B84C) /* 95C9F4 802417F4 0C00AB39 */ jal heap_malloc /* 95C9F8 802417F8 AE020008 */ sw $v0, 8($s0) /* 95C9FC 802417FC 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s index bed90ed655..167fe90bee 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s @@ -3,8 +3,8 @@ glabel func_802424D4_95D6D4 /* 95D6D4 802424D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D6D8 802424D8 3C058024 */ lui $a1, %hi(D_80242468) -/* 95D6DC 802424DC 24A52468 */ addiu $a1, $a1, %lo(D_80242468) +/* 95D6D8 802424D8 3C058024 */ lui $a1, %hi(func_80242468_95B774) +/* 95D6DC 802424DC 24A52468 */ addiu $a1, $a1, %lo(func_80242468_95B774) /* 95D6E0 802424E0 AFBF0010 */ sw $ra, 0x10($sp) /* 95D6E4 802424E4 0C048C8F */ jal bind_dynamic_entity_7 /* 95D6E8 802424E8 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s index ae8accf4cc..fd03157ace 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s @@ -9,8 +9,8 @@ glabel func_80240660_969820 /* 969830 80240670 8C84014C */ lw $a0, 0x14c($a0) /* 969834 80240674 24040008 */ addiu $a0, $zero, 8 /* 969838 80240678 0040802D */ daddu $s0, $v0, $zero -/* 96983C 8024067C 3C028024 */ lui $v0, %hi(D_802406CC) -/* 969840 80240680 244206CC */ addiu $v0, $v0, %lo(D_802406CC) +/* 96983C 8024067C 3C028024 */ lui $v0, %hi(func_802406CC_96952C) +/* 969840 80240680 244206CC */ addiu $v0, $v0, %lo(func_802406CC_96952C) /* 969844 80240684 0C00AB39 */ jal heap_malloc /* 969848 80240688 AE020008 */ sw $v0, 8($s0) /* 96984C 8024068C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s index b7511e5af5..a21a0dfc0b 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241364_96A524.s @@ -3,8 +3,8 @@ glabel func_80241364_96A524 /* 96A524 80241364 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96A528 80241368 3C058024 */ lui $a1, %hi(D_802412F8) -/* 96A52C 8024136C 24A512F8 */ addiu $a1, $a1, %lo(D_802412F8) +/* 96A528 80241368 3C058024 */ lui $a1, %hi(func_802412F8_969454) +/* 96A52C 8024136C 24A512F8 */ addiu $a1, $a1, %lo(func_802412F8_969454) /* 96A530 80241370 AFBF0010 */ sw $ra, 0x10($sp) /* 96A534 80241374 0C048C8F */ jal bind_dynamic_entity_7 /* 96A538 80241378 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s index a1385a7808..56e67bb2e9 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802416FC_96A8BC.s @@ -77,10 +77,10 @@ glabel func_802416FC_96A8BC /* 96A9DC 8024181C 34A5D483 */ ori $a1, $a1, 0xd483 /* 96A9E0 80241820 0C0B2026 */ jal set_variable /* 96A9E4 80241824 0260302D */ daddu $a2, $s3, $zero -/* 96A9E8 80241828 3C048024 */ lui $a0, %hi(D_8024240C) -/* 96A9EC 8024182C 2484240C */ addiu $a0, $a0, %lo(D_8024240C) -/* 96A9F0 80241830 3C058024 */ lui $a1, %hi(D_80242EAC) -/* 96A9F4 80241834 24A52EAC */ addiu $a1, $a1, %lo(D_80242EAC) +/* 96A9E8 80241828 3C048024 */ lui $a0, %hi(func_8024240C_96A1D0) +/* 96A9EC 8024182C 2484240C */ addiu $a0, $a0, %lo(func_8024240C_96A1D0) +/* 96A9F0 80241830 3C058024 */ lui $a1, %hi(func_80242EAC_96AC70) +/* 96A9F4 80241834 24A52EAC */ addiu $a1, $a1, %lo(func_80242EAC_96AC70) /* 96A9F8 80241838 0C048C56 */ jal bind_dynamic_entity_3 /* 96A9FC 8024183C 00000000 */ nop /* 96AA00 80241840 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s index c88a49e2ba..3a2239eea2 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s @@ -119,10 +119,10 @@ glabel func_8024190C_96AACC .L80241AD0: /* 96AC90 80241AD0 24A20008 */ addiu $v0, $a1, 8 /* 96AC94 80241AD4 ACC20000 */ sw $v0, ($a2) -/* 96AC98 80241AD8 3C02DE00 */ lui $v0, %hi(D_DE0079B8) +/* 96AC98 80241AD8 3C02DE00 */ lui $v0, 0xde00 /* 96AC9C 80241ADC ACA20000 */ sw $v0, ($a1) /* 96ACA0 80241AE0 3C028024 */ lui $v0, %hi(D_802479B8) -/* 96ACA4 80241AE4 244279B8 */ addiu $v0, $v0, %lo(D_DE0079B8) +/* 96ACA4 80241AE4 244279B8 */ addiu $v0, $v0, %lo(D_802479B8) /* 96ACA8 80241AE8 ACA20004 */ sw $v0, 4($a1) /* 96ACAC 80241AEC 8FAD0100 */ lw $t5, 0x100($sp) /* 96ACB0 80241AF0 8DA30000 */ lw $v1, ($t5) @@ -313,10 +313,10 @@ glabel func_8024190C_96AACC /* 96AF8C 80241DCC 24820008 */ addiu $v0, $a0, 8 /* 96AF90 80241DD0 ACA30004 */ sw $v1, 4($a1) /* 96AF94 80241DD4 AE020000 */ sw $v0, ($s0) -/* 96AF98 80241DD8 3C02DE00 */ lui $v0, %hi(D_DE007A38) +/* 96AF98 80241DD8 3C02DE00 */ lui $v0, 0xde00 /* 96AF9C 80241DDC AC820000 */ sw $v0, ($a0) /* 96AFA0 80241DE0 3C028024 */ lui $v0, %hi(D_80247A38) -/* 96AFA4 80241DE4 24427A38 */ addiu $v0, $v0, %lo(D_DE007A38) +/* 96AFA4 80241DE4 24427A38 */ addiu $v0, $v0, %lo(D_80247A38) /* 96AFA8 80241DE8 AC820004 */ sw $v0, 4($a0) /* 96AFAC 80241DEC 24820010 */ addiu $v0, $a0, 0x10 /* 96AFB0 80241DF0 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s index ad400eb7dd..40794c625b 100644 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s @@ -97,11 +97,11 @@ glabel func_8024240C_96B5CC /* 96B73C 8024257C 24020012 */ addiu $v0, $zero, 0x12 /* 96B740 80242580 14620006 */ bne $v1, $v0, .L8024259C /* 96B744 80242584 00000000 */ nop -/* 96B748 80242588 3C01C47A */ lui $at, %hi(D_C479EFF4) +/* 96B748 80242588 3C01C47A */ lui $at, 0xc47a /* 96B74C 8024258C 44810000 */ mtc1 $at, $f0 /* 96B750 80242590 00000000 */ nop /* 96B754 80242594 3C018011 */ lui $at, %hi(gPlayerStatus+0x2C) -/* 96B758 80242598 E420EFF4 */ swc1 $f0, %lo(D_C479EFF4)($at) +/* 96B758 80242598 E420EFF4 */ swc1 $f0, %lo(gPlayerStatus+0x2C)($at) .L8024259C: /* 96B75C 8024259C 8E030000 */ lw $v1, ($s0) /* 96B760 802425A0 24020014 */ addiu $v0, $zero, 0x14 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s index 8de53650a2..f287451a36 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s @@ -90,13 +90,13 @@ glabel func_80241B34_DF8534 /* DF867C 80241C7C 2C420002 */ sltiu $v0, $v0, 2 /* DF8680 80241C80 10400022 */ beqz $v0, .L80241D0C /* DF8684 80241C84 AFA30044 */ sw $v1, 0x44($sp) -/* DF8688 80241C88 3C058024 */ lui $a1, %hi(D_80242CD8) -/* DF868C 80241C8C 24A52CD8 */ addiu $a1, $a1, %lo(D_80242CD8) +/* DF8688 80241C88 3C058024 */ lui $a1, %hi(func_80242CD8_C799B8) +/* DF868C 80241C8C 24A52CD8 */ addiu $a1, $a1, %lo(func_80242CD8_C799B8) /* DF8690 80241C90 24090004 */ addiu $t1, $zero, 4 /* DF8694 80241C94 14890003 */ bne $a0, $t1, .L80241CA4 /* DF8698 80241C98 00000000 */ nop -/* DF869C 80241C9C 3C058024 */ lui $a1, %hi(D_80242C70) -/* DF86A0 80241CA0 24A52C70 */ addiu $a1, $a1, %lo(D_80242C70) +/* DF869C 80241C9C 3C058024 */ lui $a1, %hi(func_80242C70_9AB060) +/* DF86A0 80241CA0 24A52C70 */ addiu $a1, $a1, %lo(func_80242C70_9AB060) .L80241CA4: /* DF86A4 80241CA4 14890007 */ bne $a0, $t1, .L80241CC4 /* DF86A8 80241CA8 0000302D */ daddu $a2, $zero, $zero @@ -368,13 +368,13 @@ glabel func_80241B34_DF8534 /* DF8A64 80242064 2C420002 */ sltiu $v0, $v0, 2 /* DF8A68 80242068 10400020 */ beqz $v0, .L802420EC /* DF8A6C 8024206C 00000000 */ nop -/* DF8A70 80242070 3C058024 */ lui $a1, %hi(D_80242CD8) -/* DF8A74 80242074 24A52CD8 */ addiu $a1, $a1, %lo(D_80242CD8) +/* DF8A70 80242070 3C058024 */ lui $a1, %hi(func_80242CD8_C799B8) +/* DF8A74 80242074 24A52CD8 */ addiu $a1, $a1, %lo(func_80242CD8_C799B8) /* DF8A78 80242078 24090004 */ addiu $t1, $zero, 4 /* DF8A7C 8024207C 14890003 */ bne $a0, $t1, .L8024208C /* DF8A80 80242080 00000000 */ nop -/* DF8A84 80242084 3C058024 */ lui $a1, %hi(D_80242C70) -/* DF8A88 80242088 24A52C70 */ addiu $a1, $a1, %lo(D_80242C70) +/* DF8A84 80242084 3C058024 */ lui $a1, %hi(func_80242C70_9AB060) +/* DF8A88 80242088 24A52C70 */ addiu $a1, $a1, %lo(func_80242C70_9AB060) .L8024208C: /* DF8A8C 8024208C 14890007 */ bne $a0, $t1, .L802420AC /* DF8A90 80242090 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s index 2e5ee364e5..7a7ddf82f2 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s @@ -6,8 +6,8 @@ glabel func_80242500_DF8F00 /* DF8F04 80242504 AFB00010 */ sw $s0, 0x10($sp) /* DF8F08 80242508 3C108025 */ lui $s0, %hi(D_8024E960) /* DF8F0C 8024250C 2610E960 */ addiu $s0, $s0, %lo(D_8024E960) -/* DF8F10 80242510 3C058024 */ lui $a1, %hi(D_802421D8) -/* DF8F14 80242514 24A521D8 */ addiu $a1, $a1, %lo(D_802421D8) +/* DF8F10 80242510 3C058024 */ lui $a1, %hi(func_802421D8_DF66F8) +/* DF8F14 80242514 24A521D8 */ addiu $a1, $a1, %lo(func_802421D8_DF66F8) /* DF8F18 80242518 AFBF0014 */ sw $ra, 0x14($sp) /* DF8F1C 8024251C 3C018025 */ lui $at, %hi(D_8024F7E4) /* DF8F20 80242520 AC30F7E4 */ sw $s0, %lo(D_8024F7E4)($at) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s index ca99b844da..b2a4f38fe5 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242368_E076C8.s @@ -35,8 +35,8 @@ glabel func_80242368_E076C8 /* E07738 802423D8 00C28821 */ addu $s1, $a2, $v0 /* E0773C 802423DC 04820014 */ bltzl $a0, .L80242430 /* E07740 802423E0 AE240000 */ sw $a0, ($s1) -/* E07744 802423E4 3C138024 */ lui $s3, %hi(D_80243210) -/* E07748 802423E8 26733210 */ addiu $s3, $s3, %lo(D_80243210) +/* E07744 802423E4 3C138024 */ lui $s3, %hi(func_80243210_8B3280) +/* E07748 802423E8 26733210 */ addiu $s3, $s3, %lo(func_80243210_8B3280) /* E0774C 802423EC 8E650000 */ lw $a1, ($s3) /* E07750 802423F0 3C108025 */ lui $s0, %hi(D_8024A2D0) /* E07754 802423F4 2610A2D0 */ addiu $s0, $s0, %lo(D_8024A2D0) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s index 691e4f0cd0..11f1a87fa4 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s @@ -6,8 +6,8 @@ glabel func_80242510_E07870 /* E07874 80242514 AFB00010 */ sw $s0, 0x10($sp) /* E07878 80242518 3C108025 */ lui $s0, %hi(D_80249440) /* E0787C 8024251C 26109440 */ addiu $s0, $s0, %lo(D_80249440) -/* E07880 80242520 3C058024 */ lui $a1, %hi(D_802421E8) -/* E07884 80242524 24A521E8 */ addiu $a1, $a1, %lo(D_802421E8) +/* E07880 80242520 3C058024 */ lui $a1, %hi(func_802421E8_E05068) +/* E07884 80242524 24A521E8 */ addiu $a1, $a1, %lo(func_802421E8_E05068) /* E07888 80242528 AFBF0014 */ sw $ra, 0x14($sp) /* E0788C 8024252C 3C018025 */ lui $at, %hi(D_8024A2C4) /* E07890 80242530 AC30A2C4 */ sw $s0, %lo(D_8024A2C4)($at) diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 14732d382c..b18c1d69ba 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -141,7 +141,7 @@ glabel func_80240BD4_C9EAF4 /* C9ECFC 80240DDC 00000000 */ nop /* C9ED00 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C9ED04 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C9ED08 80240DE8 0C090110 */ jal flo_00_UnkNpcAIFunc1 +/* C9ED08 80240DE8 0C090110 */ jal func_80240440_C9E360 /* C9ED0C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240BD4_C9EAF4 /* C9ED3C 80240E1C 00000000 */ nop /* C9ED40 80240E20 0280202D */ daddu $a0, $s4, $zero /* C9ED44 80240E24 0260282D */ daddu $a1, $s3, $zero -/* C9ED48 80240E28 0C0901DC */ jal flo_00_NpcJumpFunc2 +/* C9ED48 80240E28 0C0901DC */ jal func_80240770_C9E690 /* C9ED4C 80240E2C 02A0302D */ daddu $a2, $s5, $zero /* C9ED50 80240E30 0280202D */ daddu $a0, $s4, $zero /* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C9ED58 80240E38 0C0901F9 */ jal flo_00_NpcJumpFunc +/* C9ED58 80240E38 0C0901F9 */ jal func_802407E4_C9E704 /* C9ED5C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C9ED60 80240E40 080903AA */ j .L80240EA8 /* C9ED64 80240E44 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240BD4_C9EAF4 /* C9ED8C 80240E6C 00000000 */ nop /* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero /* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero -/* C9ED98 80240E78 0C0902AB */ jal flo_00_UnkNpcDurationFlagFunc +/* C9ED98 80240E78 0C0902AB */ jal func_80240AAC_C9E9CC /* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero /* C9EDA0 80240E80 080903AA */ j .L80240EA8 /* C9EDA4 80240E84 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s index ae764ce68b..3de3f20cb0 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s @@ -61,8 +61,8 @@ glabel func_802401CC_CAEF0C /* CAEFE8 802402A8 24020001 */ addiu $v0, $zero, 1 /* CAEFEC 802402AC AE22018C */ sw $v0, 0x18c($s1) /* CAEFF0 802402B0 00041080 */ sll $v0, $a0, 2 -/* CAEFF4 802402B4 3C068024 */ lui $a2, %hi(D_80241FC8) -/* CAEFF8 802402B8 24C61FC8 */ addiu $a2, $a2, %lo(D_80241FC8) +/* CAEFF4 802402B4 3C068024 */ lui $a2, %hi(func_80241FC8_C87A78) +/* CAEFF8 802402B8 24C61FC8 */ addiu $a2, $a2, %lo(func_80241FC8_C87A78) /* CAEFFC 802402BC AE230000 */ sw $v1, ($s1) /* CAF000 802402C0 001218C0 */ sll $v1, $s2, 3 /* CAF004 802402C4 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s index a9f3de1f3f..f92537a01e 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s @@ -46,7 +46,7 @@ glabel func_8024150C_CB024C /* CB02F0 802415B0 8E2200B0 */ lw $v0, 0xb0($s1) /* CB02F4 802415B4 30420004 */ andi $v0, $v0, 4 /* CB02F8 802415B8 1040001F */ beqz $v0, .L80241638 -/* CB02FC 802415BC 00000000 */ nop +/* CB02FC 802415BC 00000000 */ nop .L802415C0: /* CB0300 802415C0 2404F7FF */ addiu $a0, $zero, -0x801 /* CB0304 802415C4 AE800070 */ sw $zero, 0x70($s4) @@ -89,7 +89,7 @@ glabel func_8024150C_CB024C /* CB038C 8024164C 00220821 */ addu $at, $at, $v0 /* CB0390 80241650 8C226130 */ lw $v0, %lo(D_80246130)($at) /* CB0394 80241654 00400008 */ jr $v0 -/* CB0398 80241658 00000000 */ nop +/* CB0398 80241658 00000000 */ nop /* CB039C 8024165C 0280202D */ daddu $a0, $s4, $zero /* CB03A0 80241660 0240282D */ daddu $a1, $s2, $zero /* CB03A4 80241664 0C012568 */ jal func_800495A0 @@ -99,17 +99,17 @@ glabel func_8024150C_CB024C /* CB03B4 80241674 0C0125AE */ jal func_800496B8 /* CB03B8 80241678 0260302D */ daddu $a2, $s3, $zero /* CB03BC 8024167C 080905C7 */ j .L8024171C -/* CB03C0 80241680 00000000 */ nop +/* CB03C0 80241680 00000000 */ nop /* CB03C4 80241684 0280202D */ daddu $a0, $s4, $zero /* CB03C8 80241688 0240282D */ daddu $a1, $s2, $zero -/* CB03CC 8024168C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* CB03CC 8024168C 0C0126D1 */ jal func_80049B44 /* CB03D0 80241690 0260302D */ daddu $a2, $s3, $zero /* CB03D4 80241694 0280202D */ daddu $a0, $s4, $zero /* CB03D8 80241698 0240282D */ daddu $a1, $s2, $zero /* CB03DC 8024169C 0C012701 */ jal func_80049C04 /* CB03E0 802416A0 0260302D */ daddu $a2, $s3, $zero /* CB03E4 802416A4 080905C7 */ j .L8024171C -/* CB03E8 802416A8 00000000 */ nop +/* CB03E8 802416A8 00000000 */ nop /* CB03EC 802416AC 0280202D */ daddu $a0, $s4, $zero /* CB03F0 802416B0 0240282D */ daddu $a1, $s2, $zero /* CB03F4 802416B4 0C01278F */ jal func_80049E3C @@ -119,7 +119,7 @@ glabel func_8024150C_CB024C /* CB0404 802416C4 0C0127B3 */ jal func_80049ECC /* CB0408 802416C8 0260302D */ daddu $a2, $s3, $zero /* CB040C 802416CC 080905C7 */ j .L8024171C -/* CB0410 802416D0 00000000 */ nop +/* CB0410 802416D0 00000000 */ nop /* CB0414 802416D4 0280202D */ daddu $a0, $s4, $zero /* CB0418 802416D8 0240282D */ daddu $a1, $s2, $zero /* CB041C 802416DC 0C090360 */ jal func_80240D80_CAFAC0 @@ -129,13 +129,13 @@ glabel func_8024150C_CB024C /* CB042C 802416EC 0C0904D9 */ jal func_80241364_CB00A4 /* CB0430 802416F0 0260302D */ daddu $a2, $s3, $zero /* CB0434 802416F4 080905C7 */ j .L8024171C -/* CB0438 802416F8 00000000 */ nop +/* CB0438 802416F8 00000000 */ nop /* CB043C 802416FC 0280202D */ daddu $a0, $s4, $zero /* CB0440 80241700 0240282D */ daddu $a1, $s2, $zero /* CB0444 80241704 0C090532 */ jal func_802414C8_CB0208 /* CB0448 80241708 0260302D */ daddu $a2, $s3, $zero /* CB044C 8024170C 080905C7 */ j .L8024171C -/* CB0450 80241710 00000000 */ nop +/* CB0450 80241710 00000000 */ nop /* CB0454 80241714 0C0129CF */ jal func_8004A73C /* CB0458 80241718 0280202D */ daddu $a0, $s4, $zero .L8024171C: diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s index 344bf34ef0..122e2e886b 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241970_CB06B0.s @@ -6,11 +6,11 @@ glabel func_80241970_CB06B0 /* CB06B4 80241974 AFBF0010 */ sw $ra, 0x10($sp) /* CB06B8 80241978 10A00003 */ beqz $a1, .L80241988 /* CB06BC 8024197C 8C86000C */ lw $a2, 0xc($a0) -/* CB06C0 80241980 3C018024 */ lui $at, %hi(D_80243088) -/* CB06C4 80241984 AC203088 */ sw $zero, %lo(D_80243088)($at) +/* CB06C0 80241980 3C018024 */ lui $at, %hi(func_80243088_8551F8) +/* CB06C4 80241984 AC203088 */ sw $zero, %lo(func_80243088_8551F8)($at) .L80241988: -/* CB06C8 80241988 3C038024 */ lui $v1, %hi(D_80243088) -/* CB06CC 8024198C 24633088 */ addiu $v1, $v1, %lo(D_80243088) +/* CB06C8 80241988 3C038024 */ lui $v1, %hi(func_80243088_8551F8) +/* CB06CC 8024198C 24633088 */ addiu $v1, $v1, %lo(func_80243088_8551F8) /* CB06D0 80241990 8C620000 */ lw $v0, ($v1) /* CB06D4 80241994 54400003 */ bnel $v0, $zero, .L802419A4 /* CB06D8 80241998 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s index 4acb4408d9..8c3351ade9 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419C4_CB0704.s @@ -12,7 +12,7 @@ glabel func_802419C4_CB0704 /* CB0720 802419E0 24020002 */ addiu $v0, $zero, 2 /* CB0724 802419E4 8FBF0010 */ lw $ra, 0x10($sp) /* CB0728 802419E8 24030001 */ addiu $v1, $zero, 1 -/* CB072C 802419EC 3C018024 */ lui $at, %hi(D_80243088) -/* CB0730 802419F0 AC233088 */ sw $v1, %lo(D_80243088)($at) +/* CB072C 802419EC 3C018024 */ lui $at, %hi(func_80243088_8551F8) +/* CB0730 802419F0 AC233088 */ sw $v1, %lo(func_80243088_8551F8)($at) /* CB0734 802419F4 03E00008 */ jr $ra /* CB0738 802419F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index e1d0b13e8b..017b0091a7 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -83,7 +83,7 @@ glabel func_8024162C_CB662C /* CB675C 8024175C 0000102D */ daddu $v0, $zero, $zero /* CB6760 80241760 0280202D */ daddu $a0, $s4, $zero /* CB6764 80241764 0200282D */ daddu $a1, $s0, $zero -/* CB6768 80241768 0C0902BE */ jal flo_09_UnkNpcAIFunc1 +/* CB6768 80241768 0C0902BE */ jal func_80240AF8_CB5AF8 /* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024162C_CB662C /* CB6784 80241784 0000102D */ daddu $v0, $zero, $zero /* CB6788 80241788 0280202D */ daddu $a0, $s4, $zero /* CB678C 8024178C 0200282D */ daddu $a1, $s0, $zero -/* CB6790 80241790 0C0903BF */ jal flo_09_UnkNpcAIFunc2 +/* CB6790 80241790 0C0903BF */ jal func_80240EFC_CB5EFC /* CB6794 80241794 0260302D */ daddu $a2, $s3, $zero /* CB6798 80241798 0280202D */ daddu $a0, $s4, $zero /* CB679C 8024179C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024162C_CB662C /* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero /* CB67C8 802417C8 0280202D */ daddu $a0, $s4, $zero /* CB67CC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* CB67D0 802417D0 0C090445 */ jal flo_09_UnkNpcAIFunc3 +/* CB67D0 802417D0 0C090445 */ jal func_80241114_CB6114 /* CB67D4 802417D4 0260302D */ daddu $a2, $s3, $zero /* CB67D8 802417D8 080905FD */ j .L802417F4 /* CB67DC 802417DC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s index 9a936b868e..988f395546 100644 --- a/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s +++ b/asm/nonmatchings/world/area_flo/flo_10/CB9280/func_80240080_CB9280.s @@ -4,8 +4,8 @@ glabel func_80240080_CB9280 /* CB9280 80240080 27BDFFE0 */ addiu $sp, $sp, -0x20 /* CB9284 80240084 AFB00010 */ sw $s0, 0x10($sp) -/* CB9288 80240088 3C108024 */ lui $s0, %hi(D_80241CB0) -/* CB928C 8024008C 26101CB0 */ addiu $s0, $s0, %lo(D_80241CB0) +/* CB9288 80240088 3C108024 */ lui $s0, %hi(func_80241CB0_A17ED0) +/* CB928C 8024008C 26101CB0 */ addiu $s0, $s0, %lo(func_80241CB0_A17ED0) /* CB9290 80240090 AFBF0018 */ sw $ra, 0x18($sp) /* CB9294 80240094 AFB10014 */ sw $s1, 0x14($sp) /* CB9298 80240098 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240080_CB9280 /* CB92FC 802400FC 28620010 */ slti $v0, $v1, 0x10 /* CB9300 80240100 1440FFFA */ bnez $v0, .L802400EC /* CB9304 80240104 24840004 */ addiu $a0, $a0, 4 -/* CB9308 80240108 3C108024 */ lui $s0, %hi(D_80241CB0) -/* CB930C 8024010C 26101CB0 */ addiu $s0, $s0, %lo(D_80241CB0) +/* CB9308 80240108 3C108024 */ lui $s0, %hi(func_80241CB0_A17ED0) +/* CB930C 8024010C 26101CB0 */ addiu $s0, $s0, %lo(func_80241CB0_A17ED0) /* CB9310 80240110 0C00AB4B */ jal heap_free /* CB9314 80240114 8E040000 */ lw $a0, ($s0) /* CB9318 80240118 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s index 611de98e82..7201487547 100644 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_8024027C_CC10AC.s @@ -4,8 +4,8 @@ glabel func_8024027C_CC10AC /* CC10AC 8024027C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* CC10B0 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* CC10B4 80240284 3C108024 */ lui $s0, %hi(D_802417EC) -/* CC10B8 80240288 261017EC */ addiu $s0, $s0, %lo(D_802417EC) +/* CC10B4 80240284 3C108024 */ lui $s0, %hi(func_802417EC_C5BF2C) +/* CC10B8 80240288 261017EC */ addiu $s0, $s0, %lo(func_802417EC_C5BF2C) /* CC10BC 8024028C AFBF0018 */ sw $ra, 0x18($sp) /* CC10C0 80240290 AFB10014 */ sw $s1, 0x14($sp) /* CC10C4 80240294 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_8024027C_CC10AC /* CC1128 802402F8 28620010 */ slti $v0, $v1, 0x10 /* CC112C 802402FC 1440FFFA */ bnez $v0, .L802402E8 /* CC1130 80240300 24840004 */ addiu $a0, $a0, 4 -/* CC1134 80240304 3C108024 */ lui $s0, %hi(D_802417EC) -/* CC1138 80240308 261017EC */ addiu $s0, $s0, %lo(D_802417EC) +/* CC1134 80240304 3C108024 */ lui $s0, %hi(func_802417EC_C5BF2C) +/* CC1138 80240308 261017EC */ addiu $s0, $s0, %lo(func_802417EC_C5BF2C) /* CC113C 8024030C 0C00AB4B */ jal heap_free /* CC1140 80240310 8E040000 */ lw $a0, ($s0) /* CC1144 80240314 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s index b7510a165a..1be01f96bb 100644 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802405C0_CC13F0.s @@ -6,11 +6,11 @@ glabel func_802405C0_CC13F0 /* CC13F4 802405C4 AFBF0010 */ sw $ra, 0x10($sp) /* CC13F8 802405C8 10A00003 */ beqz $a1, .L802405D8 /* CC13FC 802405CC 8C86000C */ lw $a2, 0xc($a0) -/* CC1400 802405D0 3C018024 */ lui $at, %hi(D_80241850) -/* CC1404 802405D4 AC201850 */ sw $zero, %lo(D_80241850)($at) +/* CC1400 802405D0 3C018024 */ lui $at, %hi(func_80241850_A2BA90) +/* CC1404 802405D4 AC201850 */ sw $zero, %lo(func_80241850_A2BA90)($at) .L802405D8: -/* CC1408 802405D8 3C038024 */ lui $v1, %hi(D_80241850) -/* CC140C 802405DC 24631850 */ addiu $v1, $v1, %lo(D_80241850) +/* CC1408 802405D8 3C038024 */ lui $v1, %hi(func_80241850_A2BA90) +/* CC140C 802405DC 24631850 */ addiu $v1, $v1, %lo(func_80241850_A2BA90) /* CC1410 802405E0 8C620000 */ lw $v0, ($v1) /* CC1414 802405E4 54400003 */ bnel $v0, $zero, .L802405F4 /* CC1418 802405E8 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s index 567a4caea6..cb1ed7a76a 100644 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s @@ -12,7 +12,7 @@ glabel func_80240614_CC1444 /* CC1460 80240630 24020002 */ addiu $v0, $zero, 2 /* CC1464 80240634 8FBF0010 */ lw $ra, 0x10($sp) /* CC1468 80240638 24030001 */ addiu $v1, $zero, 1 -/* CC146C 8024063C 3C018024 */ lui $at, %hi(D_80241850) -/* CC1470 80240640 AC231850 */ sw $v1, %lo(D_80241850)($at) +/* CC146C 8024063C 3C018024 */ lui $at, %hi(func_80241850_A2BA90) +/* CC1470 80240640 AC231850 */ sw $v1, %lo(func_80241850_A2BA90)($at) /* CC1474 80240644 03E00008 */ jr $ra /* CC1478 80240648 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 773f2c1348..935a5cb1dd 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -83,7 +83,7 @@ glabel func_802414D0_CC4CE0 /* CC4E10 80241600 0000102D */ daddu $v0, $zero, $zero /* CC4E14 80241604 0280202D */ daddu $a0, $s4, $zero /* CC4E18 80241608 0200282D */ daddu $a1, $s0, $zero -/* CC4E1C 8024160C 0C090267 */ jal flo_13_UnkNpcAIFunc1 +/* CC4E1C 8024160C 0C090267 */ jal func_8024099C_CC41AC /* CC4E20 80241610 0260302D */ daddu $a2, $s3, $zero /* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero /* CC4E28 80241618 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802414D0_CC4CE0 /* CC4E38 80241628 0000102D */ daddu $v0, $zero, $zero /* CC4E3C 8024162C 0280202D */ daddu $a0, $s4, $zero /* CC4E40 80241630 0200282D */ daddu $a1, $s0, $zero -/* CC4E44 80241634 0C090368 */ jal flo_13_UnkNpcAIFunc2 +/* CC4E44 80241634 0C090368 */ jal func_80240DA0_CC45B0 /* CC4E48 80241638 0260302D */ daddu $a2, $s3, $zero /* CC4E4C 8024163C 0280202D */ daddu $a0, $s4, $zero /* CC4E50 80241640 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802414D0_CC4CE0 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero /* CC4E7C 8024166C 0280202D */ daddu $a0, $s4, $zero /* CC4E80 80241670 0200282D */ daddu $a1, $s0, $zero -/* CC4E84 80241674 0C0903EE */ jal flo_13_UnkNpcAIFunc3 +/* CC4E84 80241674 0C0903EE */ jal func_80240FB8_CC47C8 /* CC4E88 80241678 0260302D */ daddu $a2, $s3, $zero /* CC4E8C 8024167C 080905A6 */ j .L80241698 /* CC4E90 80241680 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s index 1fbd568542..5f9d6b7b3b 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -97,7 +97,7 @@ glabel func_80241DB8_CC55C8 .L80241F14: /* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero /* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero -/* CC572C 80241F1C 0C090267 */ jal flo_13_UnkNpcAIFunc1 +/* CC572C 80241F1C 0C090267 */ jal func_8024099C_CC41AC /* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero /* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero .L80241F28: @@ -160,7 +160,7 @@ glabel func_80241DB8_CC55C8 .L80241FF4: /* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero /* CC5808 80241FF8 02C0282D */ daddu $a1, $s6, $zero -/* CC580C 80241FFC 0C0903EE */ jal flo_13_UnkNpcAIFunc3 +/* CC580C 80241FFC 0C0903EE */ jal func_80240FB8_CC47C8 /* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero /* CC5814 80242004 08090806 */ j .L80242018 /* CC5818 80242008 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s index 9743746fbc..cb8458387c 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s @@ -55,7 +55,7 @@ glabel func_8024262C_CC5E3C /* CC5F00 802426F0 8E2200B0 */ lw $v0, 0xb0($s1) /* CC5F04 802426F4 30420004 */ andi $v0, $v0, 4 /* CC5F08 802426F8 10400047 */ beqz $v0, .L80242818 -/* CC5F0C 802426FC 00000000 */ nop +/* CC5F0C 802426FC 00000000 */ nop .L80242700: /* CC5F10 80242700 AE600070 */ sw $zero, 0x70($s3) /* CC5F14 80242704 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_8024262C_CC5E3C /* CC5FB8 802427A8 24020028 */ addiu $v0, $zero, 0x28 /* CC5FBC 802427AC AFA2001C */ sw $v0, 0x1c($sp) /* CC5FC0 802427B0 44833000 */ mtc1 $v1, $f6 -/* CC5FC4 802427B4 00000000 */ nop +/* CC5FC4 802427B4 00000000 */ nop /* CC5FC8 802427B8 468031A0 */ cvt.s.w $f6, $f6 /* CC5FCC 802427BC 44073000 */ mfc1 $a3, $f6 /* CC5FD0 802427C0 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_8024262C_CC5E3C /* CC6088 80242878 10600015 */ beqz $v1, .L802428D0 /* CC608C 8024287C 0260202D */ daddu $a0, $s3, $zero /* CC6090 80242880 08090A76 */ j .L802429D8 -/* CC6094 80242884 00000000 */ nop +/* CC6094 80242884 00000000 */ nop .L80242888: /* CC6098 80242888 1062001C */ beq $v1, $v0, .L802428FC /* CC609C 8024288C 24020003 */ addiu $v0, $zero, 3 /* CC60A0 80242890 10620035 */ beq $v1, $v0, .L80242968 /* CC60A4 80242894 0260202D */ daddu $a0, $s3, $zero /* CC60A8 80242898 08090A76 */ j .L802429D8 -/* CC60AC 8024289C 00000000 */ nop +/* CC60AC 8024289C 00000000 */ nop .L802428A0: /* CC60B0 802428A0 2402000E */ addiu $v0, $zero, 0xe /* CC60B4 802428A4 1062003F */ beq $v1, $v0, .L802429A4 @@ -177,9 +177,9 @@ glabel func_8024262C_CC5E3C /* CC60C8 802428B8 10620040 */ beq $v1, $v0, .L802429BC /* CC60CC 802428BC 24020063 */ addiu $v0, $zero, 0x63 /* CC60D0 802428C0 10620043 */ beq $v1, $v0, .L802429D0 -/* CC60D4 802428C4 00000000 */ nop +/* CC60D4 802428C4 00000000 */ nop /* CC60D8 802428C8 08090A76 */ j .L802429D8 -/* CC60DC 802428CC 00000000 */ nop +/* CC60DC 802428CC 00000000 */ nop .L802428D0: /* CC60E0 802428D0 0280282D */ daddu $a1, $s4, $zero /* CC60E4 802428D4 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_8024262C_CC5E3C /* CC60FC 802428EC 0C0125AE */ jal func_800496B8 /* CC6100 802428F0 02A0302D */ daddu $a2, $s5, $zero /* CC6104 802428F4 08090A76 */ j .L802429D8 -/* CC6108 802428F8 00000000 */ nop +/* CC6108 802428F8 00000000 */ nop .L802428FC: /* CC610C 802428FC 0260202D */ daddu $a0, $s3, $zero /* CC6110 80242900 0280282D */ daddu $a1, $s4, $zero -/* CC6114 80242904 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* CC6114 80242904 0C0126D1 */ jal func_80049B44 /* CC6118 80242908 02A0302D */ daddu $a2, $s5, $zero /* CC611C 8024290C 8E230088 */ lw $v1, 0x88($s1) /* CC6120 80242910 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_8024262C_CC5E3C /* CC617C 8024296C 0C012701 */ jal func_80049C04 /* CC6180 80242970 02A0302D */ daddu $a2, $s5, $zero /* CC6184 80242974 08090A76 */ j .L802429D8 -/* CC6188 80242978 00000000 */ nop +/* CC6188 80242978 00000000 */ nop .L8024297C: /* CC618C 8024297C 0260202D */ daddu $a0, $s3, $zero /* CC6190 80242980 0280282D */ daddu $a1, $s4, $zero -/* CC6194 80242984 0C0908A6 */ jal flo_13_set_script_owner_npc_anim +/* CC6194 80242984 0C0908A6 */ jal func_80242298_CC5AA8 /* CC6198 80242988 02A0302D */ daddu $a2, $s5, $zero /* CC619C 8024298C 0260202D */ daddu $a0, $s3, $zero .L80242990: @@ -240,20 +240,20 @@ glabel func_8024262C_CC5E3C /* CC61A4 80242994 0C0908C5 */ jal func_80242314_CC5B24 /* CC61A8 80242998 02A0302D */ daddu $a2, $s5, $zero /* CC61AC 8024299C 08090A76 */ j .L802429D8 -/* CC61B0 802429A0 00000000 */ nop +/* CC61B0 802429A0 00000000 */ nop .L802429A4: /* CC61B4 802429A4 0260202D */ daddu $a0, $s3, $zero /* CC61B8 802429A8 0280282D */ daddu $a1, $s4, $zero -/* CC61BC 802429AC 0C090912 */ jal flo_13_UnkNpcAIFunc12 +/* CC61BC 802429AC 0C090912 */ jal func_80242448_CC5C58 /* CC61C0 802429B0 02A0302D */ daddu $a2, $s5, $zero /* CC61C4 802429B4 08090A76 */ j .L802429D8 -/* CC61C8 802429B8 00000000 */ nop +/* CC61C8 802429B8 00000000 */ nop .L802429BC: /* CC61CC 802429BC 0280282D */ daddu $a1, $s4, $zero -/* CC61D0 802429C0 0C09096B */ jal flo_13_set_script_owner_npc_col_height +/* CC61D0 802429C0 0C09096B */ jal func_802425AC_CC5DBC /* CC61D4 802429C4 02A0302D */ daddu $a2, $s5, $zero /* CC61D8 802429C8 08090A76 */ j .L802429D8 -/* CC61DC 802429CC 00000000 */ nop +/* CC61DC 802429CC 00000000 */ nop .L802429D0: /* CC61E0 802429D0 0C0129CF */ jal func_8004A73C /* CC61E4 802429D4 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_8024262C_CC5E3C /* CC6238 80242A28 00220821 */ addu $at, $at, $v0 /* CC623C 80242A2C 8C227A90 */ lw $v0, %lo(D_80247A90)($at) /* CC6240 80242A30 00400008 */ jr $v0 -/* CC6244 80242A34 00000000 */ nop +/* CC6244 80242A34 00000000 */ nop /* CC6248 80242A38 8E420028 */ lw $v0, 0x28($s2) /* CC624C 80242A3C 24420001 */ addiu $v0, $v0, 1 /* CC6250 80242A40 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s index 57f76f1ad1..6ea839f96c 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s @@ -55,7 +55,7 @@ glabel func_80242A6C_CC627C /* CC6340 80242B30 8E430094 */ lw $v1, 0x94($s2) /* CC6344 80242B34 24020064 */ addiu $v0, $zero, 0x64 /* CC6348 80242B38 1462001C */ bne $v1, $v0, .L80242BAC -/* CC634C 80242B3C 00000000 */ nop +/* CC634C 80242B3C 00000000 */ nop .L80242B40: /* CC6350 80242B40 24020064 */ addiu $v0, $zero, 0x64 /* CC6354 80242B44 2404F7FF */ addiu $a0, $zero, -0x801 @@ -122,7 +122,7 @@ glabel func_80242A6C_CC627C /* CC6440 80242C30 24020028 */ addiu $v0, $zero, 0x28 /* CC6444 80242C34 AFA2001C */ sw $v0, 0x1c($sp) /* CC6448 80242C38 44834000 */ mtc1 $v1, $f8 -/* CC644C 80242C3C 00000000 */ nop +/* CC644C 80242C3C 00000000 */ nop /* CC6450 80242C40 46804220 */ cvt.s.w $f8, $f8 /* CC6454 80242C44 44074000 */ mfc1 $a3, $f8 /* CC6458 80242C48 27A20048 */ addiu $v0, $sp, 0x48 @@ -153,7 +153,7 @@ glabel func_80242A6C_CC627C /* CC64B4 80242CA4 8EA20070 */ lw $v0, 0x70($s5) /* CC64B8 80242CA8 28420064 */ slti $v0, $v0, 0x64 /* CC64BC 80242CAC 10400007 */ beqz $v0, .L80242CCC -/* CC64C0 80242CB0 00000000 */ nop +/* CC64C0 80242CB0 00000000 */ nop /* CC64C4 80242CB4 8FA2004C */ lw $v0, 0x4c($sp) /* CC64C8 80242CB8 24420032 */ addiu $v0, $v0, 0x32 /* CC64CC 80242CBC 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -178,7 +178,7 @@ glabel func_80242A6C_CC627C /* CC6514 80242D04 50600027 */ beql $v1, $zero, .L80242DA4 /* CC6518 80242D08 02A0202D */ daddu $a0, $s5, $zero /* CC651C 80242D0C 08090CCE */ j .L80243338 -/* CC6520 80242D10 00000000 */ nop +/* CC6520 80242D10 00000000 */ nop .L80242D14: /* CC6524 80242D14 2402000D */ addiu $v0, $zero, 0xd /* CC6528 80242D18 1062004D */ beq $v1, $v0, .L80242E50 @@ -188,7 +188,7 @@ glabel func_80242A6C_CC627C /* CC6538 80242D28 10620046 */ beq $v1, $v0, .L80242E44 /* CC653C 80242D2C 02A0202D */ daddu $a0, $s5, $zero /* CC6540 80242D30 08090CCE */ j .L80243338 -/* CC6544 80242D34 00000000 */ nop +/* CC6544 80242D34 00000000 */ nop .L80242D38: /* CC6548 80242D38 24020067 */ addiu $v0, $zero, 0x67 /* CC654C 80242D3C 10620158 */ beq $v1, $v0, .L802432A0 @@ -202,7 +202,7 @@ glabel func_80242A6C_CC627C /* CC656C 80242D5C 1062004F */ beq $v1, $v0, .L80242E9C /* CC6570 80242D60 24020002 */ addiu $v0, $zero, 2 /* CC6574 80242D64 08090CCE */ j .L80243338 -/* CC6578 80242D68 00000000 */ nop +/* CC6578 80242D68 00000000 */ nop .L80242D6C: /* CC657C 80242D6C 2404006F */ addiu $a0, $zero, 0x6f /* CC6580 80242D70 10640166 */ beq $v1, $a0, .L8024330C @@ -212,13 +212,13 @@ glabel func_80242A6C_CC627C /* CC6590 80242D80 10620156 */ beq $v1, $v0, .L802432DC /* CC6594 80242D84 2402001E */ addiu $v0, $zero, 0x1e /* CC6598 80242D88 08090CCE */ j .L80243338 -/* CC659C 80242D8C 00000000 */ nop +/* CC659C 80242D8C 00000000 */ nop .L80242D90: /* CC65A0 80242D90 240200C8 */ addiu $v0, $zero, 0xc8 /* CC65A4 80242D94 10620166 */ beq $v1, $v0, .L80243330 -/* CC65A8 80242D98 00000000 */ nop +/* CC65A8 80242D98 00000000 */ nop /* CC65AC 80242D9C 08090CCE */ j .L80243338 -/* CC65B0 80242DA0 00000000 */ nop +/* CC65B0 80242DA0 00000000 */ nop .L80242DA4: /* CC65B4 80242DA4 0260282D */ daddu $a1, $s3, $zero /* CC65B8 80242DA8 0C012568 */ jal func_800495A0 @@ -233,7 +233,7 @@ glabel func_80242A6C_CC627C /* CC65DC 80242DCC 44801800 */ mtc1 $zero, $f3 /* CC65E0 80242DD0 46000021 */ cvt.d.s $f0, $f0 /* CC65E4 80242DD4 4622003E */ c.le.d $f0, $f2 -/* CC65E8 80242DD8 00000000 */ nop +/* CC65E8 80242DD8 00000000 */ nop /* CC65EC 80242DDC 45000005 */ bc1f .L80242DF4 /* CC65F0 80242DE0 2403FDFF */ addiu $v1, $zero, -0x201 /* CC65F4 80242DE4 8E220000 */ lw $v0, ($s1) @@ -254,10 +254,10 @@ glabel func_80242A6C_CC627C /* CC6620 80242E10 0C0125AE */ jal func_800496B8 /* CC6624 80242E14 0280302D */ daddu $a2, $s4, $zero /* CC6628 80242E18 08090CCE */ j .L80243338 -/* CC662C 80242E1C 00000000 */ nop +/* CC662C 80242E1C 00000000 */ nop .L80242E20: /* CC6630 80242E20 0260282D */ daddu $a1, $s3, $zero -/* CC6634 80242E24 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* CC6634 80242E24 0C0126D1 */ jal func_80049B44 /* CC6638 80242E28 0280302D */ daddu $a2, $s4, $zero .L80242E2C: /* CC663C 80242E2C 02A0202D */ daddu $a0, $s5, $zero @@ -265,10 +265,10 @@ glabel func_80242A6C_CC627C /* CC6644 80242E34 0C012701 */ jal func_80049C04 /* CC6648 80242E38 0280302D */ daddu $a2, $s4, $zero /* CC664C 80242E3C 08090CCE */ j .L80243338 -/* CC6650 80242E40 00000000 */ nop +/* CC6650 80242E40 00000000 */ nop .L80242E44: /* CC6654 80242E44 0260282D */ daddu $a1, $s3, $zero -/* CC6658 80242E48 0C0908A6 */ jal flo_13_set_script_owner_npc_anim +/* CC6658 80242E48 0C0908A6 */ jal func_80242298_CC5AA8 /* CC665C 80242E4C 0280302D */ daddu $a2, $s4, $zero .L80242E50: /* CC6660 80242E50 02A0202D */ daddu $a0, $s5, $zero @@ -281,21 +281,21 @@ glabel func_80242A6C_CC627C .L80242E6C: /* CC667C 80242E6C 02A0202D */ daddu $a0, $s5, $zero /* CC6680 80242E70 0260282D */ daddu $a1, $s3, $zero -/* CC6684 80242E74 0C090912 */ jal flo_13_UnkNpcAIFunc12 +/* CC6684 80242E74 0C090912 */ jal func_80242448_CC5C58 /* CC6688 80242E78 0280302D */ daddu $a2, $s4, $zero /* CC668C 80242E7C 08090CCE */ j .L80243338 -/* CC6690 80242E80 00000000 */ nop +/* CC6690 80242E80 00000000 */ nop .L80242E84: /* CC6694 80242E84 02A0202D */ daddu $a0, $s5, $zero /* CC6698 80242E88 0260282D */ daddu $a1, $s3, $zero -/* CC669C 80242E8C 0C09096B */ jal flo_13_set_script_owner_npc_col_height +/* CC669C 80242E8C 0C09096B */ jal func_802425AC_CC5DBC /* CC66A0 80242E90 0280302D */ daddu $a2, $s4, $zero /* CC66A4 80242E94 08090CCE */ j .L80243338 -/* CC66A8 80242E98 00000000 */ nop +/* CC66A8 80242E98 00000000 */ nop .L80242E9C: /* CC66AC 80242E9C 8E430094 */ lw $v1, 0x94($s2) /* CC66B0 80242EA0 14620125 */ bne $v1, $v0, .L80243338 -/* CC66B4 80242EA4 00000000 */ nop +/* CC66B4 80242EA4 00000000 */ nop /* CC66B8 80242EA8 0C00FB3A */ jal get_enemy /* CC66BC 80242EAC 8E440098 */ lw $a0, 0x98($s2) /* CC66C0 80242EB0 0C00EABB */ jal get_npc_unsafe @@ -305,9 +305,9 @@ glabel func_80242A6C_CC627C /* CC66D0 80242EC0 D4227AE8 */ ldc1 $f2, %lo(D_80247AE8)($at) /* CC66D4 80242EC4 46000021 */ cvt.d.s $f0, $f0 /* CC66D8 80242EC8 4622003C */ c.lt.d $f0, $f2 -/* CC66DC 80242ECC 00000000 */ nop +/* CC66DC 80242ECC 00000000 */ nop /* CC66E0 80242ED0 45000008 */ bc1f .L80242EF4 -/* CC66E4 80242ED4 00000000 */ nop +/* CC66E4 80242ED4 00000000 */ nop /* CC66E8 80242ED8 C4400038 */ lwc1 $f0, 0x38($v0) /* CC66EC 80242EDC 3C014028 */ lui $at, 0x4028 /* CC66F0 80242EE0 44811800 */ mtc1 $at, $f3 @@ -390,7 +390,7 @@ glabel func_80242A6C_CC627C /* CC6814 80243004 44801800 */ mtc1 $zero, $f3 /* CC6818 80243008 46000021 */ cvt.d.s $f0, $f0 /* CC681C 8024300C 4620103C */ c.lt.d $f2, $f0 -/* CC6820 80243010 00000000 */ nop +/* CC6820 80243010 00000000 */ nop /* CC6824 80243014 4500001F */ bc1f .L80243094 /* CC6828 80243018 27A50058 */ addiu $a1, $sp, 0x58 /* CC682C 8024301C C6200038 */ lwc1 $f0, 0x38($s1) @@ -405,13 +405,13 @@ glabel func_80242A6C_CC627C /* CC6850 80243040 E7A00014 */ swc1 $f0, 0x14($sp) /* CC6854 80243044 862200A8 */ lh $v0, 0xa8($s1) /* CC6858 80243048 44820000 */ mtc1 $v0, $f0 -/* CC685C 8024304C 00000000 */ nop +/* CC685C 8024304C 00000000 */ nop /* CC6860 80243050 46800020 */ cvt.s.w $f0, $f0 /* CC6864 80243054 E7A00018 */ swc1 $f0, 0x18($sp) /* CC6868 80243058 862200A6 */ lh $v0, 0xa6($s1) /* CC686C 8024305C 27A6005C */ addiu $a2, $sp, 0x5c /* CC6870 80243060 44820000 */ mtc1 $v0, $f0 -/* CC6874 80243064 00000000 */ nop +/* CC6874 80243064 00000000 */ nop /* CC6878 80243068 46800020 */ cvt.s.w $f0, $f0 /* CC687C 8024306C E7A0001C */ swc1 $f0, 0x1c($sp) /* CC6880 80243070 8E240080 */ lw $a0, 0x80($s1) @@ -429,7 +429,7 @@ glabel func_80242A6C_CC627C /* CC68AC 8024309C 4480B800 */ mtc1 $zero, $f23 /* CC68B0 802430A0 46000021 */ cvt.d.s $f0, $f0 /* CC68B4 802430A4 4636003C */ c.lt.d $f0, $f22 -/* CC68B8 802430A8 00000000 */ nop +/* CC68B8 802430A8 00000000 */ nop /* CC68BC 802430AC 45000074 */ bc1f .L80243280 /* CC68C0 802430B0 27A50058 */ addiu $a1, $sp, 0x58 /* CC68C4 802430B4 27A6005C */ addiu $a2, $sp, 0x5c @@ -460,7 +460,7 @@ glabel func_80242A6C_CC627C /* CC6928 80243118 0C0372DF */ jal func_800DCB7C /* CC692C 8024311C 27A70060 */ addiu $a3, $sp, 0x60 /* CC6930 80243120 10400057 */ beqz $v0, .L80243280 -/* CC6934 80243124 00000000 */ nop +/* CC6934 80243124 00000000 */ nop /* CC6938 80243128 C620001C */ lwc1 $f0, 0x1c($s1) /* CC693C 8024312C C7A20064 */ lwc1 $f2, 0x64($sp) /* CC6940 80243130 46000005 */ abs.s $f0, $f0 @@ -468,9 +468,9 @@ glabel func_80242A6C_CC627C /* CC6948 80243138 46340000 */ add.d $f0, $f0, $f20 /* CC694C 8024313C 460010A1 */ cvt.d.s $f2, $f2 /* CC6950 80243140 4620103E */ c.le.d $f2, $f0 -/* CC6954 80243144 00000000 */ nop +/* CC6954 80243144 00000000 */ nop /* CC6958 80243148 4500004D */ bc1f .L80243280 -/* CC695C 8024314C 00000000 */ nop +/* CC695C 8024314C 00000000 */ nop /* CC6960 80243150 C7A0005C */ lwc1 $f0, 0x5c($sp) /* CC6964 80243154 E620003C */ swc1 $f0, 0x3c($s1) /* CC6968 80243158 8E4200D0 */ lw $v0, 0xd0($s2) @@ -504,7 +504,7 @@ glabel func_80242A6C_CC627C /* CC69D8 802431C8 C620003C */ lwc1 $f0, 0x3c($s1) /* CC69DC 802431CC 46000021 */ cvt.d.s $f0, $f0 /* CC69E0 802431D0 4636003E */ c.le.d $f0, $f22 -/* CC69E4 802431D4 00000000 */ nop +/* CC69E4 802431D4 00000000 */ nop /* CC69E8 802431D8 4501000D */ bc1t .L80243210 /* CC69EC 802431DC 2403FFF7 */ addiu $v1, $zero, -9 /* CC69F0 802431E0 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s index 3f4d4ca4ae..7abd3387ab 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -83,7 +83,7 @@ glabel func_80241E1C_CCD12C /* CCD25C 80241F4C 0000102D */ daddu $v0, $zero, $zero /* CCD260 80241F50 0280202D */ daddu $a0, $s4, $zero /* CCD264 80241F54 0200282D */ daddu $a1, $s0, $zero -/* CCD268 80241F58 0C0904BA */ jal flo_14_UnkNpcAIFunc1 +/* CCD268 80241F58 0C0904BA */ jal func_802412E8_CCC5F8 /* CCD26C 80241F5C 0260302D */ daddu $a2, $s3, $zero /* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero /* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241E1C_CCD12C /* CCD284 80241F74 0000102D */ daddu $v0, $zero, $zero /* CCD288 80241F78 0280202D */ daddu $a0, $s4, $zero /* CCD28C 80241F7C 0200282D */ daddu $a1, $s0, $zero -/* CCD290 80241F80 0C0905BB */ jal flo_14_UnkNpcAIFunc2 +/* CCD290 80241F80 0C0905BB */ jal func_802416EC_CCC9FC /* CCD294 80241F84 0260302D */ daddu $a2, $s3, $zero /* CCD298 80241F88 0280202D */ daddu $a0, $s4, $zero /* CCD29C 80241F8C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241E1C_CCD12C /* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero /* CCD2C8 80241FB8 0280202D */ daddu $a0, $s4, $zero /* CCD2CC 80241FBC 0200282D */ daddu $a1, $s0, $zero -/* CCD2D0 80241FC0 0C090641 */ jal flo_14_UnkNpcAIFunc3 +/* CCD2D0 80241FC0 0C090641 */ jal func_80241904_CCCC14 /* CCD2D4 80241FC4 0260302D */ daddu $a2, $s3, $zero /* CCD2D8 80241FC8 080907F9 */ j .L80241FE4 /* CCD2DC 80241FCC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s index 22ded36531..a2debf1f55 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802402AC_CD20DC.s @@ -61,8 +61,8 @@ glabel func_802402AC_CD20DC /* CD21B8 80240388 24020001 */ addiu $v0, $zero, 1 /* CD21BC 8024038C AE22018C */ sw $v0, 0x18c($s1) /* CD21C0 80240390 00041080 */ sll $v0, $a0, 2 -/* CD21C4 80240394 3C068024 */ lui $a2, %hi(D_80243718) -/* CD21C8 80240398 24C63718 */ addiu $a2, $a2, %lo(D_80243718) +/* CD21C4 80240394 3C068024 */ lui $a2, %hi(func_80243718_C7A3F8) +/* CD21C8 80240398 24C63718 */ addiu $a2, $a2, %lo(func_80243718_C7A3F8) /* CD21CC 8024039C AE230000 */ sw $v1, ($s1) /* CD21D0 802403A0 001218C0 */ sll $v1, $s2, 3 /* CD21D4 802403A4 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s index a11c5abf48..d5991a28ee 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802406E0_CD2510.s @@ -79,8 +79,8 @@ glabel func_802406E0_CD2510 /* CD2634 80240804 26100004 */ addiu $s0, $s0, 4 /* CD2638 80240808 0000882D */ daddu $s1, $zero, $zero /* CD263C 8024080C 0240802D */ daddu $s0, $s2, $zero -/* CD2640 80240810 3C148024 */ lui $s4, %hi(D_80243758) -/* CD2644 80240814 26943758 */ addiu $s4, $s4, %lo(D_80243758) +/* CD2640 80240810 3C148024 */ lui $s4, %hi(func_80243758_A2D998) +/* CD2644 80240814 26943758 */ addiu $s4, $s4, %lo(func_80243758_A2D998) /* CD2648 80240818 3C014248 */ lui $at, 0x4248 /* CD264C 8024081C 4481A000 */ mtc1 $at, $f20 /* CD2650 80240820 24130044 */ addiu $s3, $zero, 0x44 @@ -150,8 +150,8 @@ glabel func_802406E0_CD2510 /* CD2744 80240914 00000000 */ nop .L80240918: /* CD2748 80240918 0000882D */ daddu $s1, $zero, $zero -/* CD274C 8024091C 3C148024 */ lui $s4, %hi(D_80243758) -/* CD2750 80240920 26943758 */ addiu $s4, $s4, %lo(D_80243758) +/* CD274C 8024091C 3C148024 */ lui $s4, %hi(func_80243758_A2D998) +/* CD2750 80240920 26943758 */ addiu $s4, $s4, %lo(func_80243758_A2D998) /* CD2754 80240924 24130020 */ addiu $s3, $zero, 0x20 /* CD2758 80240928 3C064248 */ lui $a2, 0x4248 /* CD275C 8024092C 44800000 */ mtc1 $zero, $f0 @@ -197,8 +197,8 @@ glabel func_802406E0_CD2510 /* CD27F8 802409C8 AE400060 */ sw $zero, 0x60($s2) .L802409CC: /* CD27FC 802409CC 0000882D */ daddu $s1, $zero, $zero -/* CD2800 802409D0 3C148024 */ lui $s4, %hi(D_80243758) -/* CD2804 802409D4 26943758 */ addiu $s4, $s4, %lo(D_80243758) +/* CD2800 802409D0 3C148024 */ lui $s4, %hi(func_80243758_A2D998) +/* CD2804 802409D4 26943758 */ addiu $s4, $s4, %lo(func_80243758_A2D998) /* CD2808 802409D8 24130020 */ addiu $s3, $zero, 0x20 /* CD280C 802409DC 0240802D */ daddu $s0, $s2, $zero /* CD2810 802409E0 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s index 67eec98450..3356dd2603 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -83,7 +83,7 @@ glabel func_8024215C_CD3F8C /* CD40BC 8024228C 0000102D */ daddu $v0, $zero, $zero /* CD40C0 80242290 0280202D */ daddu $a0, $s4, $zero /* CD40C4 80242294 0200282D */ daddu $a1, $s0, $zero -/* CD40C8 80242298 0C09058A */ jal flo_16_UnkNpcAIFunc1 +/* CD40C8 80242298 0C09058A */ jal func_80241628_CD3458 /* CD40CC 8024229C 0260302D */ daddu $a2, $s3, $zero /* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero /* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024215C_CD3F8C /* CD40E4 802422B4 0000102D */ daddu $v0, $zero, $zero /* CD40E8 802422B8 0280202D */ daddu $a0, $s4, $zero /* CD40EC 802422BC 0200282D */ daddu $a1, $s0, $zero -/* CD40F0 802422C0 0C09068B */ jal flo_16_UnkNpcAIFunc2 +/* CD40F0 802422C0 0C09068B */ jal func_80241A2C_CD385C /* CD40F4 802422C4 0260302D */ daddu $a2, $s3, $zero /* CD40F8 802422C8 0280202D */ daddu $a0, $s4, $zero /* CD40FC 802422CC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024215C_CD3F8C /* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero /* CD4128 802422F8 0280202D */ daddu $a0, $s4, $zero /* CD412C 802422FC 0200282D */ daddu $a1, $s0, $zero -/* CD4130 80242300 0C090711 */ jal flo_16_UnkNpcAIFunc3 +/* CD4130 80242300 0C090711 */ jal func_80241C44_CD3A74 /* CD4134 80242304 0260302D */ daddu $a2, $s3, $zero /* CD4138 80242308 080908C9 */ j .L80242324 /* CD413C 8024230C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s index 851421c8ff..ddfff758f9 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -84,7 +84,7 @@ glabel func_80242754_CD4584 /* CD46B8 80242888 0000102D */ daddu $v0, $zero, $zero /* CD46BC 8024288C 0280202D */ daddu $a0, $s4, $zero /* CD46C0 80242890 0200282D */ daddu $a1, $s0, $zero -/* CD46C4 80242894 0C09058A */ jal flo_16_UnkNpcAIFunc1 +/* CD46C4 80242894 0C09058A */ jal func_80241628_CD3458 /* CD46C8 80242898 0260302D */ daddu $a2, $s3, $zero /* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero /* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80242754_CD4584 /* CD46E0 802428B0 0000102D */ daddu $v0, $zero, $zero /* CD46E4 802428B4 0280202D */ daddu $a0, $s4, $zero /* CD46E8 802428B8 0200282D */ daddu $a1, $s0, $zero -/* CD46EC 802428BC 0C09068B */ jal flo_16_UnkNpcAIFunc2 +/* CD46EC 802428BC 0C09068B */ jal func_80241A2C_CD385C /* CD46F0 802428C0 0260302D */ daddu $a2, $s3, $zero /* CD46F4 802428C4 0280202D */ daddu $a0, $s4, $zero /* CD46F8 802428C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 12d2232757..56881241b5 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -83,7 +83,7 @@ glabel func_8024137C_CD865C /* CD878C 802414AC 0000102D */ daddu $v0, $zero, $zero /* CD8790 802414B0 0280202D */ daddu $a0, $s4, $zero /* CD8794 802414B4 0200282D */ daddu $a1, $s0, $zero -/* CD8798 802414B8 0C090212 */ jal flo_17_UnkNpcAIFunc1 +/* CD8798 802414B8 0C090212 */ jal func_80240848_CD7B28 /* CD879C 802414BC 0260302D */ daddu $a2, $s3, $zero /* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero /* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024137C_CD865C /* CD87B4 802414D4 0000102D */ daddu $v0, $zero, $zero /* CD87B8 802414D8 0280202D */ daddu $a0, $s4, $zero /* CD87BC 802414DC 0200282D */ daddu $a1, $s0, $zero -/* CD87C0 802414E0 0C090313 */ jal flo_17_UnkNpcAIFunc2 +/* CD87C0 802414E0 0C090313 */ jal func_80240C4C_CD7F2C /* CD87C4 802414E4 0260302D */ daddu $a2, $s3, $zero /* CD87C8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CD87CC 802414EC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024137C_CD865C /* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero /* CD87F8 80241518 0280202D */ daddu $a0, $s4, $zero /* CD87FC 8024151C 0200282D */ daddu $a1, $s0, $zero -/* CD8800 80241520 0C090399 */ jal flo_17_UnkNpcAIFunc3 +/* CD8800 80241520 0C090399 */ jal func_80240E64_CD8144 /* CD8804 80241524 0260302D */ daddu $a2, $s3, $zero /* CD8808 80241528 08090551 */ j .L80241544 /* CD880C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s index 5b3100ed02..4c2e22ec04 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -97,7 +97,7 @@ glabel func_80241C64_CD8F44 .L80241DC0: /* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero /* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero -/* CD90A8 80241DC8 0C090212 */ jal flo_17_UnkNpcAIFunc1 +/* CD90A8 80241DC8 0C090212 */ jal func_80240848_CD7B28 /* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero /* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero .L80241DD4: @@ -160,7 +160,7 @@ glabel func_80241C64_CD8F44 .L80241EA0: /* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero /* CD9184 80241EA4 02C0282D */ daddu $a1, $s6, $zero -/* CD9188 80241EA8 0C090399 */ jal flo_17_UnkNpcAIFunc3 +/* CD9188 80241EA8 0C090399 */ jal func_80240E64_CD8144 /* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero /* CD9190 80241EB0 080907B1 */ j .L80241EC4 /* CD9194 80241EB4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s index d4cf8c8a21..ce2b28ea9f 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s @@ -55,7 +55,7 @@ glabel func_802424D8_CD97B8 /* CD987C 8024259C 8E2200B0 */ lw $v0, 0xb0($s1) /* CD9880 802425A0 30420004 */ andi $v0, $v0, 4 /* CD9884 802425A4 10400047 */ beqz $v0, .L802426C4 -/* CD9888 802425A8 00000000 */ nop +/* CD9888 802425A8 00000000 */ nop .L802425AC: /* CD988C 802425AC AE600070 */ sw $zero, 0x70($s3) /* CD9890 802425B0 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802424D8_CD97B8 /* CD9934 80242654 24020028 */ addiu $v0, $zero, 0x28 /* CD9938 80242658 AFA2001C */ sw $v0, 0x1c($sp) /* CD993C 8024265C 44833000 */ mtc1 $v1, $f6 -/* CD9940 80242660 00000000 */ nop +/* CD9940 80242660 00000000 */ nop /* CD9944 80242664 468031A0 */ cvt.s.w $f6, $f6 /* CD9948 80242668 44073000 */ mfc1 $a3, $f6 /* CD994C 8024266C 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802424D8_CD97B8 /* CD9A04 80242724 10600015 */ beqz $v1, .L8024277C /* CD9A08 80242728 0260202D */ daddu $a0, $s3, $zero /* CD9A0C 8024272C 08090A21 */ j .L80242884 -/* CD9A10 80242730 00000000 */ nop +/* CD9A10 80242730 00000000 */ nop .L80242734: /* CD9A14 80242734 1062001C */ beq $v1, $v0, .L802427A8 /* CD9A18 80242738 24020003 */ addiu $v0, $zero, 3 /* CD9A1C 8024273C 10620035 */ beq $v1, $v0, .L80242814 /* CD9A20 80242740 0260202D */ daddu $a0, $s3, $zero /* CD9A24 80242744 08090A21 */ j .L80242884 -/* CD9A28 80242748 00000000 */ nop +/* CD9A28 80242748 00000000 */ nop .L8024274C: /* CD9A2C 8024274C 2402000E */ addiu $v0, $zero, 0xe /* CD9A30 80242750 1062003F */ beq $v1, $v0, .L80242850 @@ -177,9 +177,9 @@ glabel func_802424D8_CD97B8 /* CD9A44 80242764 10620040 */ beq $v1, $v0, .L80242868 /* CD9A48 80242768 24020063 */ addiu $v0, $zero, 0x63 /* CD9A4C 8024276C 10620043 */ beq $v1, $v0, .L8024287C -/* CD9A50 80242770 00000000 */ nop +/* CD9A50 80242770 00000000 */ nop /* CD9A54 80242774 08090A21 */ j .L80242884 -/* CD9A58 80242778 00000000 */ nop +/* CD9A58 80242778 00000000 */ nop .L8024277C: /* CD9A5C 8024277C 0280282D */ daddu $a1, $s4, $zero /* CD9A60 80242780 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802424D8_CD97B8 /* CD9A78 80242798 0C0125AE */ jal func_800496B8 /* CD9A7C 8024279C 02A0302D */ daddu $a2, $s5, $zero /* CD9A80 802427A0 08090A21 */ j .L80242884 -/* CD9A84 802427A4 00000000 */ nop +/* CD9A84 802427A4 00000000 */ nop .L802427A8: /* CD9A88 802427A8 0260202D */ daddu $a0, $s3, $zero /* CD9A8C 802427AC 0280282D */ daddu $a1, $s4, $zero -/* CD9A90 802427B0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* CD9A90 802427B0 0C0126D1 */ jal func_80049B44 /* CD9A94 802427B4 02A0302D */ daddu $a2, $s5, $zero /* CD9A98 802427B8 8E230088 */ lw $v1, 0x88($s1) /* CD9A9C 802427BC 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802424D8_CD97B8 /* CD9AF8 80242818 0C012701 */ jal func_80049C04 /* CD9AFC 8024281C 02A0302D */ daddu $a2, $s5, $zero /* CD9B00 80242820 08090A21 */ j .L80242884 -/* CD9B04 80242824 00000000 */ nop +/* CD9B04 80242824 00000000 */ nop .L80242828: /* CD9B08 80242828 0260202D */ daddu $a0, $s3, $zero /* CD9B0C 8024282C 0280282D */ daddu $a1, $s4, $zero -/* CD9B10 80242830 0C090851 */ jal flo_17_set_script_owner_npc_anim +/* CD9B10 80242830 0C090851 */ jal func_80242144_CD9424 /* CD9B14 80242834 02A0302D */ daddu $a2, $s5, $zero /* CD9B18 80242838 0260202D */ daddu $a0, $s3, $zero .L8024283C: @@ -240,20 +240,20 @@ glabel func_802424D8_CD97B8 /* CD9B20 80242840 0C090870 */ jal func_802421C0_CD94A0 /* CD9B24 80242844 02A0302D */ daddu $a2, $s5, $zero /* CD9B28 80242848 08090A21 */ j .L80242884 -/* CD9B2C 8024284C 00000000 */ nop +/* CD9B2C 8024284C 00000000 */ nop .L80242850: /* CD9B30 80242850 0260202D */ daddu $a0, $s3, $zero /* CD9B34 80242854 0280282D */ daddu $a1, $s4, $zero -/* CD9B38 80242858 0C0908BD */ jal flo_17_UnkNpcAIFunc12 +/* CD9B38 80242858 0C0908BD */ jal func_802422F4_CD95D4 /* CD9B3C 8024285C 02A0302D */ daddu $a2, $s5, $zero /* CD9B40 80242860 08090A21 */ j .L80242884 -/* CD9B44 80242864 00000000 */ nop +/* CD9B44 80242864 00000000 */ nop .L80242868: /* CD9B48 80242868 0280282D */ daddu $a1, $s4, $zero -/* CD9B4C 8024286C 0C090916 */ jal flo_17_set_script_owner_npc_col_height +/* CD9B4C 8024286C 0C090916 */ jal func_80242458_CD9738 /* CD9B50 80242870 02A0302D */ daddu $a2, $s5, $zero /* CD9B54 80242874 08090A21 */ j .L80242884 -/* CD9B58 80242878 00000000 */ nop +/* CD9B58 80242878 00000000 */ nop .L8024287C: /* CD9B5C 8024287C 0C0129CF */ jal func_8004A73C /* CD9B60 80242880 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802424D8_CD97B8 /* CD9BB4 802428D4 00220821 */ addu $at, $at, $v0 /* CD9BB8 802428D8 8C225360 */ lw $v0, %lo(D_80245360)($at) /* CD9BBC 802428DC 00400008 */ jr $v0 -/* CD9BC0 802428E0 00000000 */ nop +/* CD9BC0 802428E0 00000000 */ nop /* CD9BC4 802428E4 8E420028 */ lw $v0, 0x28($s2) /* CD9BC8 802428E8 24420001 */ addiu $v0, $v0, 1 /* CD9BCC 802428EC AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s index 8b7fb5db9e..c9259e4003 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s @@ -55,7 +55,7 @@ glabel func_80242918_CD9BF8 /* CD9CBC 802429DC 8E430094 */ lw $v1, 0x94($s2) /* CD9CC0 802429E0 24020064 */ addiu $v0, $zero, 0x64 /* CD9CC4 802429E4 1462001C */ bne $v1, $v0, .L80242A58 -/* CD9CC8 802429E8 00000000 */ nop +/* CD9CC8 802429E8 00000000 */ nop .L802429EC: /* CD9CCC 802429EC 24020064 */ addiu $v0, $zero, 0x64 /* CD9CD0 802429F0 2404F7FF */ addiu $a0, $zero, -0x801 @@ -122,7 +122,7 @@ glabel func_80242918_CD9BF8 /* CD9DBC 80242ADC 24020028 */ addiu $v0, $zero, 0x28 /* CD9DC0 80242AE0 AFA2001C */ sw $v0, 0x1c($sp) /* CD9DC4 80242AE4 44834000 */ mtc1 $v1, $f8 -/* CD9DC8 80242AE8 00000000 */ nop +/* CD9DC8 80242AE8 00000000 */ nop /* CD9DCC 80242AEC 46804220 */ cvt.s.w $f8, $f8 /* CD9DD0 80242AF0 44074000 */ mfc1 $a3, $f8 /* CD9DD4 80242AF4 27A20048 */ addiu $v0, $sp, 0x48 @@ -153,7 +153,7 @@ glabel func_80242918_CD9BF8 /* CD9E30 80242B50 8EA20070 */ lw $v0, 0x70($s5) /* CD9E34 80242B54 28420064 */ slti $v0, $v0, 0x64 /* CD9E38 80242B58 10400007 */ beqz $v0, .L80242B78 -/* CD9E3C 80242B5C 00000000 */ nop +/* CD9E3C 80242B5C 00000000 */ nop /* CD9E40 80242B60 8FA2004C */ lw $v0, 0x4c($sp) /* CD9E44 80242B64 24420032 */ addiu $v0, $v0, 0x32 /* CD9E48 80242B68 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -178,7 +178,7 @@ glabel func_80242918_CD9BF8 /* CD9E90 80242BB0 50600027 */ beql $v1, $zero, .L80242C50 /* CD9E94 80242BB4 02A0202D */ daddu $a0, $s5, $zero /* CD9E98 80242BB8 08090C79 */ j .L802431E4 -/* CD9E9C 80242BBC 00000000 */ nop +/* CD9E9C 80242BBC 00000000 */ nop .L80242BC0: /* CD9EA0 80242BC0 2402000D */ addiu $v0, $zero, 0xd /* CD9EA4 80242BC4 1062004D */ beq $v1, $v0, .L80242CFC @@ -188,7 +188,7 @@ glabel func_80242918_CD9BF8 /* CD9EB4 80242BD4 10620046 */ beq $v1, $v0, .L80242CF0 /* CD9EB8 80242BD8 02A0202D */ daddu $a0, $s5, $zero /* CD9EBC 80242BDC 08090C79 */ j .L802431E4 -/* CD9EC0 80242BE0 00000000 */ nop +/* CD9EC0 80242BE0 00000000 */ nop .L80242BE4: /* CD9EC4 80242BE4 24020067 */ addiu $v0, $zero, 0x67 /* CD9EC8 80242BE8 10620158 */ beq $v1, $v0, .L8024314C @@ -202,7 +202,7 @@ glabel func_80242918_CD9BF8 /* CD9EE8 80242C08 1062004F */ beq $v1, $v0, .L80242D48 /* CD9EEC 80242C0C 24020002 */ addiu $v0, $zero, 2 /* CD9EF0 80242C10 08090C79 */ j .L802431E4 -/* CD9EF4 80242C14 00000000 */ nop +/* CD9EF4 80242C14 00000000 */ nop .L80242C18: /* CD9EF8 80242C18 2404006F */ addiu $a0, $zero, 0x6f /* CD9EFC 80242C1C 10640166 */ beq $v1, $a0, .L802431B8 @@ -212,13 +212,13 @@ glabel func_80242918_CD9BF8 /* CD9F0C 80242C2C 10620156 */ beq $v1, $v0, .L80243188 /* CD9F10 80242C30 2402001E */ addiu $v0, $zero, 0x1e /* CD9F14 80242C34 08090C79 */ j .L802431E4 -/* CD9F18 80242C38 00000000 */ nop +/* CD9F18 80242C38 00000000 */ nop .L80242C3C: /* CD9F1C 80242C3C 240200C8 */ addiu $v0, $zero, 0xc8 /* CD9F20 80242C40 10620166 */ beq $v1, $v0, .L802431DC -/* CD9F24 80242C44 00000000 */ nop +/* CD9F24 80242C44 00000000 */ nop /* CD9F28 80242C48 08090C79 */ j .L802431E4 -/* CD9F2C 80242C4C 00000000 */ nop +/* CD9F2C 80242C4C 00000000 */ nop .L80242C50: /* CD9F30 80242C50 0260282D */ daddu $a1, $s3, $zero /* CD9F34 80242C54 0C012568 */ jal func_800495A0 @@ -233,7 +233,7 @@ glabel func_80242918_CD9BF8 /* CD9F58 80242C78 44801800 */ mtc1 $zero, $f3 /* CD9F5C 80242C7C 46000021 */ cvt.d.s $f0, $f0 /* CD9F60 80242C80 4622003E */ c.le.d $f0, $f2 -/* CD9F64 80242C84 00000000 */ nop +/* CD9F64 80242C84 00000000 */ nop /* CD9F68 80242C88 45000005 */ bc1f .L80242CA0 /* CD9F6C 80242C8C 2403FDFF */ addiu $v1, $zero, -0x201 /* CD9F70 80242C90 8E220000 */ lw $v0, ($s1) @@ -254,10 +254,10 @@ glabel func_80242918_CD9BF8 /* CD9F9C 80242CBC 0C0125AE */ jal func_800496B8 /* CD9FA0 80242CC0 0280302D */ daddu $a2, $s4, $zero /* CD9FA4 80242CC4 08090C79 */ j .L802431E4 -/* CD9FA8 80242CC8 00000000 */ nop +/* CD9FA8 80242CC8 00000000 */ nop .L80242CCC: /* CD9FAC 80242CCC 0260282D */ daddu $a1, $s3, $zero -/* CD9FB0 80242CD0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* CD9FB0 80242CD0 0C0126D1 */ jal func_80049B44 /* CD9FB4 80242CD4 0280302D */ daddu $a2, $s4, $zero .L80242CD8: /* CD9FB8 80242CD8 02A0202D */ daddu $a0, $s5, $zero @@ -265,10 +265,10 @@ glabel func_80242918_CD9BF8 /* CD9FC0 80242CE0 0C012701 */ jal func_80049C04 /* CD9FC4 80242CE4 0280302D */ daddu $a2, $s4, $zero /* CD9FC8 80242CE8 08090C79 */ j .L802431E4 -/* CD9FCC 80242CEC 00000000 */ nop +/* CD9FCC 80242CEC 00000000 */ nop .L80242CF0: /* CD9FD0 80242CF0 0260282D */ daddu $a1, $s3, $zero -/* CD9FD4 80242CF4 0C090851 */ jal flo_17_set_script_owner_npc_anim +/* CD9FD4 80242CF4 0C090851 */ jal func_80242144_CD9424 /* CD9FD8 80242CF8 0280302D */ daddu $a2, $s4, $zero .L80242CFC: /* CD9FDC 80242CFC 02A0202D */ daddu $a0, $s5, $zero @@ -281,21 +281,21 @@ glabel func_80242918_CD9BF8 .L80242D18: /* CD9FF8 80242D18 02A0202D */ daddu $a0, $s5, $zero /* CD9FFC 80242D1C 0260282D */ daddu $a1, $s3, $zero -/* CDA000 80242D20 0C0908BD */ jal flo_17_UnkNpcAIFunc12 +/* CDA000 80242D20 0C0908BD */ jal func_802422F4_CD95D4 /* CDA004 80242D24 0280302D */ daddu $a2, $s4, $zero /* CDA008 80242D28 08090C79 */ j .L802431E4 -/* CDA00C 80242D2C 00000000 */ nop +/* CDA00C 80242D2C 00000000 */ nop .L80242D30: /* CDA010 80242D30 02A0202D */ daddu $a0, $s5, $zero /* CDA014 80242D34 0260282D */ daddu $a1, $s3, $zero -/* CDA018 80242D38 0C090916 */ jal flo_17_set_script_owner_npc_col_height +/* CDA018 80242D38 0C090916 */ jal func_80242458_CD9738 /* CDA01C 80242D3C 0280302D */ daddu $a2, $s4, $zero /* CDA020 80242D40 08090C79 */ j .L802431E4 -/* CDA024 80242D44 00000000 */ nop +/* CDA024 80242D44 00000000 */ nop .L80242D48: /* CDA028 80242D48 8E430094 */ lw $v1, 0x94($s2) /* CDA02C 80242D4C 14620125 */ bne $v1, $v0, .L802431E4 -/* CDA030 80242D50 00000000 */ nop +/* CDA030 80242D50 00000000 */ nop /* CDA034 80242D54 0C00FB3A */ jal get_enemy /* CDA038 80242D58 8E440098 */ lw $a0, 0x98($s2) /* CDA03C 80242D5C 0C00EABB */ jal get_npc_unsafe @@ -305,9 +305,9 @@ glabel func_80242918_CD9BF8 /* CDA04C 80242D6C D42253B8 */ ldc1 $f2, %lo(D_802453B8)($at) /* CDA050 80242D70 46000021 */ cvt.d.s $f0, $f0 /* CDA054 80242D74 4622003C */ c.lt.d $f0, $f2 -/* CDA058 80242D78 00000000 */ nop +/* CDA058 80242D78 00000000 */ nop /* CDA05C 80242D7C 45000008 */ bc1f .L80242DA0 -/* CDA060 80242D80 00000000 */ nop +/* CDA060 80242D80 00000000 */ nop /* CDA064 80242D84 C4400038 */ lwc1 $f0, 0x38($v0) /* CDA068 80242D88 3C014028 */ lui $at, 0x4028 /* CDA06C 80242D8C 44811800 */ mtc1 $at, $f3 @@ -390,7 +390,7 @@ glabel func_80242918_CD9BF8 /* CDA190 80242EB0 44801800 */ mtc1 $zero, $f3 /* CDA194 80242EB4 46000021 */ cvt.d.s $f0, $f0 /* CDA198 80242EB8 4620103C */ c.lt.d $f2, $f0 -/* CDA19C 80242EBC 00000000 */ nop +/* CDA19C 80242EBC 00000000 */ nop /* CDA1A0 80242EC0 4500001F */ bc1f .L80242F40 /* CDA1A4 80242EC4 27A50058 */ addiu $a1, $sp, 0x58 /* CDA1A8 80242EC8 C6200038 */ lwc1 $f0, 0x38($s1) @@ -405,13 +405,13 @@ glabel func_80242918_CD9BF8 /* CDA1CC 80242EEC E7A00014 */ swc1 $f0, 0x14($sp) /* CDA1D0 80242EF0 862200A8 */ lh $v0, 0xa8($s1) /* CDA1D4 80242EF4 44820000 */ mtc1 $v0, $f0 -/* CDA1D8 80242EF8 00000000 */ nop +/* CDA1D8 80242EF8 00000000 */ nop /* CDA1DC 80242EFC 46800020 */ cvt.s.w $f0, $f0 /* CDA1E0 80242F00 E7A00018 */ swc1 $f0, 0x18($sp) /* CDA1E4 80242F04 862200A6 */ lh $v0, 0xa6($s1) /* CDA1E8 80242F08 27A6005C */ addiu $a2, $sp, 0x5c /* CDA1EC 80242F0C 44820000 */ mtc1 $v0, $f0 -/* CDA1F0 80242F10 00000000 */ nop +/* CDA1F0 80242F10 00000000 */ nop /* CDA1F4 80242F14 46800020 */ cvt.s.w $f0, $f0 /* CDA1F8 80242F18 E7A0001C */ swc1 $f0, 0x1c($sp) /* CDA1FC 80242F1C 8E240080 */ lw $a0, 0x80($s1) @@ -429,7 +429,7 @@ glabel func_80242918_CD9BF8 /* CDA228 80242F48 4480B800 */ mtc1 $zero, $f23 /* CDA22C 80242F4C 46000021 */ cvt.d.s $f0, $f0 /* CDA230 80242F50 4636003C */ c.lt.d $f0, $f22 -/* CDA234 80242F54 00000000 */ nop +/* CDA234 80242F54 00000000 */ nop /* CDA238 80242F58 45000074 */ bc1f .L8024312C /* CDA23C 80242F5C 27A50058 */ addiu $a1, $sp, 0x58 /* CDA240 80242F60 27A6005C */ addiu $a2, $sp, 0x5c @@ -460,7 +460,7 @@ glabel func_80242918_CD9BF8 /* CDA2A4 80242FC4 0C0372DF */ jal func_800DCB7C /* CDA2A8 80242FC8 27A70060 */ addiu $a3, $sp, 0x60 /* CDA2AC 80242FCC 10400057 */ beqz $v0, .L8024312C -/* CDA2B0 80242FD0 00000000 */ nop +/* CDA2B0 80242FD0 00000000 */ nop /* CDA2B4 80242FD4 C620001C */ lwc1 $f0, 0x1c($s1) /* CDA2B8 80242FD8 C7A20064 */ lwc1 $f2, 0x64($sp) /* CDA2BC 80242FDC 46000005 */ abs.s $f0, $f0 @@ -468,9 +468,9 @@ glabel func_80242918_CD9BF8 /* CDA2C4 80242FE4 46340000 */ add.d $f0, $f0, $f20 /* CDA2C8 80242FE8 460010A1 */ cvt.d.s $f2, $f2 /* CDA2CC 80242FEC 4620103E */ c.le.d $f2, $f0 -/* CDA2D0 80242FF0 00000000 */ nop +/* CDA2D0 80242FF0 00000000 */ nop /* CDA2D4 80242FF4 4500004D */ bc1f .L8024312C -/* CDA2D8 80242FF8 00000000 */ nop +/* CDA2D8 80242FF8 00000000 */ nop /* CDA2DC 80242FFC C7A0005C */ lwc1 $f0, 0x5c($sp) /* CDA2E0 80243000 E620003C */ swc1 $f0, 0x3c($s1) /* CDA2E4 80243004 8E4200D0 */ lw $v0, 0xd0($s2) @@ -504,7 +504,7 @@ glabel func_80242918_CD9BF8 /* CDA354 80243074 C620003C */ lwc1 $f0, 0x3c($s1) /* CDA358 80243078 46000021 */ cvt.d.s $f0, $f0 /* CDA35C 8024307C 4636003E */ c.le.d $f0, $f22 -/* CDA360 80243080 00000000 */ nop +/* CDA360 80243080 00000000 */ nop /* CDA364 80243084 4501000D */ bc1t .L802430BC /* CDA368 80243088 2403FFF7 */ addiu $v1, $zero, -9 /* CDA36C 8024308C 8E220000 */ lw $v0, ($s1) @@ -614,6 +614,6 @@ glabel func_80242918_CD9BF8 /* CDA4E8 80243208 0000102D */ daddu $v0, $zero, $zero /* CDA4EC 8024320C 03E00008 */ jr $ra /* CDA4F0 80243210 27BD0098 */ addiu $sp, $sp, 0x98 -/* CDA4F4 80243214 00000000 */ nop -/* CDA4F8 80243218 00000000 */ nop -/* CDA4FC 8024321C 00000000 */ nop +/* CDA4F4 80243214 00000000 */ nop +/* CDA4F8 80243218 00000000 */ nop +/* CDA4FC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s index 695730b9ef..f9e0998c25 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_8024026C_CEE4CC.s @@ -6,11 +6,11 @@ glabel func_8024026C_CEE4CC /* CEE4D0 80240270 AFBF0010 */ sw $ra, 0x10($sp) /* CEE4D4 80240274 10A00003 */ beqz $a1, .L80240284 /* CEE4D8 80240278 8C86000C */ lw $a2, 0xc($a0) -/* CEE4DC 8024027C 3C018024 */ lui $at, %hi(D_8024130C) -/* CEE4E0 80240280 AC20130C */ sw $zero, %lo(D_8024130C)($at) +/* CEE4DC 8024027C 3C018024 */ lui $at, %hi(func_8024130C_C3783C) +/* CEE4E0 80240280 AC20130C */ sw $zero, %lo(func_8024130C_C3783C)($at) .L80240284: -/* CEE4E4 80240284 3C038024 */ lui $v1, %hi(D_8024130C) -/* CEE4E8 80240288 2463130C */ addiu $v1, $v1, %lo(D_8024130C) +/* CEE4E4 80240284 3C038024 */ lui $v1, %hi(func_8024130C_C3783C) +/* CEE4E8 80240288 2463130C */ addiu $v1, $v1, %lo(func_8024130C_C3783C) /* CEE4EC 8024028C 8C620000 */ lw $v0, ($v1) /* CEE4F0 80240290 54400003 */ bnel $v0, $zero, .L802402A0 /* CEE4F4 80240294 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s index 72a9879d38..f808ddc11e 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402C0_CEE520.s @@ -12,7 +12,7 @@ glabel func_802402C0_CEE520 /* CEE53C 802402DC 24020002 */ addiu $v0, $zero, 2 /* CEE540 802402E0 8FBF0010 */ lw $ra, 0x10($sp) /* CEE544 802402E4 24030001 */ addiu $v1, $zero, 1 -/* CEE548 802402E8 3C018024 */ lui $at, %hi(D_8024130C) -/* CEE54C 802402EC AC23130C */ sw $v1, %lo(D_8024130C)($at) +/* CEE548 802402E8 3C018024 */ lui $at, %hi(func_8024130C_C3783C) +/* CEE54C 802402EC AC23130C */ sw $v1, %lo(func_8024130C_C3783C)($at) /* CEE550 802402F0 03E00008 */ jr $ra /* CEE554 802402F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s index d48277b404..8ed0cac4b3 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_802402F8_CEE558.s @@ -13,8 +13,8 @@ glabel func_802402F8_CEE558 /* CEE578 80240318 8C620000 */ lw $v0, ($v1) /* CEE57C 8024031C 5040000A */ beql $v0, $zero, .L80240348 /* CEE580 80240320 00041080 */ sll $v0, $a0, 2 -/* CEE584 80240324 3C058024 */ lui $a1, %hi(D_802426E0) -/* CEE588 80240328 24A526E0 */ addiu $a1, $a1, %lo(D_802426E0) +/* CEE584 80240324 3C058024 */ lui $a1, %hi(func_802426E0_BA6E60) +/* CEE588 80240328 24A526E0 */ addiu $a1, $a1, %lo(func_802426E0_BA6E60) .L8024032C: /* CEE58C 8024032C 24630004 */ addiu $v1, $v1, 4 /* CEE590 80240330 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_802402F8_CEE558 /* CEE5A0 80240340 24A50004 */ addiu $a1, $a1, 4 /* CEE5A4 80240344 00041080 */ sll $v0, $a0, 2 .L80240348: -/* CEE5A8 80240348 3C018024 */ lui $at, %hi(D_802426E0) +/* CEE5A8 80240348 3C018024 */ lui $at, %hi(func_802426E0_BA6E60) /* CEE5AC 8024034C 00220821 */ addu $at, $at, $v0 -/* CEE5B0 80240350 AC2026E0 */ sw $zero, %lo(D_802426E0)($at) +/* CEE5B0 80240350 AC2026E0 */ sw $zero, %lo(func_802426E0_BA6E60)($at) /* CEE5B4 80240354 080900E1 */ j .L80240384 /* CEE5B8 80240358 00000000 */ nop .L8024035C: -/* CEE5BC 8024035C 3C038024 */ lui $v1, %hi(D_802426E0) -/* CEE5C0 80240360 246326E0 */ addiu $v1, $v1, %lo(D_802426E0) +/* CEE5BC 8024035C 3C038024 */ lui $v1, %hi(func_802426E0_BA6E60) +/* CEE5C0 80240360 246326E0 */ addiu $v1, $v1, %lo(func_802426E0_BA6E60) /* CEE5C4 80240364 0060282D */ daddu $a1, $v1, $zero .L80240368: /* CEE5C8 80240368 24820080 */ addiu $v0, $a0, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s index ac8706b4d9..7f6205de97 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240410_CEE670.s @@ -55,8 +55,8 @@ glabel func_80240410_CEE670 /* CEE72C 802404CC 8C470030 */ lw $a3, 0x30($v0) /* CEE730 802404D0 C6020018 */ lwc1 $f2, 0x18($s0) /* CEE734 802404D4 46020003 */ div.s $f0, $f0, $f2 -/* CEE738 802404D8 3C018024 */ lui $at, %hi(D_80242680) -/* CEE73C 802404DC D4222680 */ ldc1 $f2, %lo(D_80242680)($at) +/* CEE738 802404D8 3C018024 */ lui $at, %hi(func_80242680_802F00) +/* CEE73C 802404DC D4222680 */ ldc1 $f2, %lo(func_80242680_802F00)($at) /* CEE740 802404E0 46000021 */ cvt.d.s $f0, $f0 /* CEE744 802404E4 46220000 */ add.d $f0, $f0, $f2 /* CEE748 802404E8 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s index b2c07feeb0..2ef72cf4d9 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s @@ -55,7 +55,7 @@ glabel func_80240728_CEE988 /* CEEA4C 802407EC 8E2200B0 */ lw $v0, 0xb0($s1) /* CEEA50 802407F0 30420004 */ andi $v0, $v0, 4 /* CEEA54 802407F4 10400047 */ beqz $v0, .L80240914 -/* CEEA58 802407F8 00000000 */ nop +/* CEEA58 802407F8 00000000 */ nop .L802407FC: /* CEEA5C 802407FC AE600070 */ sw $zero, 0x70($s3) /* CEEA60 80240800 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240728_CEE988 /* CEEB04 802408A4 24020028 */ addiu $v0, $zero, 0x28 /* CEEB08 802408A8 AFA2001C */ sw $v0, 0x1c($sp) /* CEEB0C 802408AC 44833000 */ mtc1 $v1, $f6 -/* CEEB10 802408B0 00000000 */ nop +/* CEEB10 802408B0 00000000 */ nop /* CEEB14 802408B4 468031A0 */ cvt.s.w $f6, $f6 /* CEEB18 802408B8 44073000 */ mfc1 $a3, $f6 /* CEEB1C 802408BC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240728_CEE988 /* CEEBD4 80240974 10600015 */ beqz $v1, .L802409CC /* CEEBD8 80240978 0260202D */ daddu $a0, $s3, $zero /* CEEBDC 8024097C 080902B5 */ j .L80240AD4 -/* CEEBE0 80240980 00000000 */ nop +/* CEEBE0 80240980 00000000 */ nop .L80240984: /* CEEBE4 80240984 1062001C */ beq $v1, $v0, .L802409F8 /* CEEBE8 80240988 24020003 */ addiu $v0, $zero, 3 /* CEEBEC 8024098C 10620035 */ beq $v1, $v0, .L80240A64 /* CEEBF0 80240990 0260202D */ daddu $a0, $s3, $zero /* CEEBF4 80240994 080902B5 */ j .L80240AD4 -/* CEEBF8 80240998 00000000 */ nop +/* CEEBF8 80240998 00000000 */ nop .L8024099C: /* CEEBFC 8024099C 2402000E */ addiu $v0, $zero, 0xe /* CEEC00 802409A0 1062003F */ beq $v1, $v0, .L80240AA0 @@ -177,9 +177,9 @@ glabel func_80240728_CEE988 /* CEEC14 802409B4 10620040 */ beq $v1, $v0, .L80240AB8 /* CEEC18 802409B8 24020063 */ addiu $v0, $zero, 0x63 /* CEEC1C 802409BC 10620043 */ beq $v1, $v0, .L80240ACC -/* CEEC20 802409C0 00000000 */ nop +/* CEEC20 802409C0 00000000 */ nop /* CEEC24 802409C4 080902B5 */ j .L80240AD4 -/* CEEC28 802409C8 00000000 */ nop +/* CEEC28 802409C8 00000000 */ nop .L802409CC: /* CEEC2C 802409CC 0280282D */ daddu $a1, $s4, $zero /* CEEC30 802409D0 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240728_CEE988 /* CEEC48 802409E8 0C0125AE */ jal func_800496B8 /* CEEC4C 802409EC 02A0302D */ daddu $a2, $s5, $zero /* CEEC50 802409F0 080902B5 */ j .L80240AD4 -/* CEEC54 802409F4 00000000 */ nop +/* CEEC54 802409F4 00000000 */ nop .L802409F8: /* CEEC58 802409F8 0260202D */ daddu $a0, $s3, $zero /* CEEC5C 802409FC 0280282D */ daddu $a1, $s4, $zero -/* CEEC60 80240A00 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* CEEC60 80240A00 0C0126D1 */ jal func_80049B44 /* CEEC64 80240A04 02A0302D */ daddu $a2, $s5, $zero /* CEEC68 80240A08 8E230088 */ lw $v1, 0x88($s1) /* CEEC6C 80240A0C 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240728_CEE988 /* CEECC8 80240A68 0C012701 */ jal func_80049C04 /* CEECCC 80240A6C 02A0302D */ daddu $a2, $s5, $zero /* CEECD0 80240A70 080902B5 */ j .L80240AD4 -/* CEECD4 80240A74 00000000 */ nop +/* CEECD4 80240A74 00000000 */ nop .L80240A78: /* CEECD8 80240A78 0260202D */ daddu $a0, $s3, $zero /* CEECDC 80240A7C 0280282D */ daddu $a1, $s4, $zero -/* CEECE0 80240A80 0C0900E5 */ jal flo_23_set_script_owner_npc_anim +/* CEECE0 80240A80 0C0900E5 */ jal func_80240394_CEE5F4 /* CEECE4 80240A84 02A0302D */ daddu $a2, $s5, $zero /* CEECE8 80240A88 0260202D */ daddu $a0, $s3, $zero .L80240A8C: @@ -240,20 +240,20 @@ glabel func_80240728_CEE988 /* CEECF0 80240A90 0C090104 */ jal func_80240410_CEE670 /* CEECF4 80240A94 02A0302D */ daddu $a2, $s5, $zero /* CEECF8 80240A98 080902B5 */ j .L80240AD4 -/* CEECFC 80240A9C 00000000 */ nop +/* CEECFC 80240A9C 00000000 */ nop .L80240AA0: /* CEED00 80240AA0 0260202D */ daddu $a0, $s3, $zero /* CEED04 80240AA4 0280282D */ daddu $a1, $s4, $zero -/* CEED08 80240AA8 0C090151 */ jal flo_23_UnkNpcAIFunc12 +/* CEED08 80240AA8 0C090151 */ jal func_80240544_CEE7A4 /* CEED0C 80240AAC 02A0302D */ daddu $a2, $s5, $zero /* CEED10 80240AB0 080902B5 */ j .L80240AD4 -/* CEED14 80240AB4 00000000 */ nop +/* CEED14 80240AB4 00000000 */ nop .L80240AB8: /* CEED18 80240AB8 0280282D */ daddu $a1, $s4, $zero -/* CEED1C 80240ABC 0C0901AA */ jal flo_23_set_script_owner_npc_col_height +/* CEED1C 80240ABC 0C0901AA */ jal func_802406A8_CEE908 /* CEED20 80240AC0 02A0302D */ daddu $a2, $s5, $zero /* CEED24 80240AC4 080902B5 */ j .L80240AD4 -/* CEED28 80240AC8 00000000 */ nop +/* CEED28 80240AC8 00000000 */ nop .L80240ACC: /* CEED2C 80240ACC 0C0129CF */ jal func_8004A73C /* CEED30 80240AD0 0260202D */ daddu $a0, $s3, $zero @@ -279,11 +279,11 @@ glabel func_80240728_CEE988 /* CEED74 80240B14 2C620015 */ sltiu $v0, $v1, 0x15 /* CEED78 80240B18 10400009 */ beqz $v0, .L80240B40 /* CEED7C 80240B1C 00031080 */ sll $v0, $v1, 2 -/* CEED80 80240B20 3C018024 */ lui $at, %hi(D_80242688) +/* CEED80 80240B20 3C018024 */ lui $at, %hi(func_80242688_C79368) /* CEED84 80240B24 00220821 */ addu $at, $at, $v0 -/* CEED88 80240B28 8C222688 */ lw $v0, %lo(D_80242688)($at) +/* CEED88 80240B28 8C222688 */ lw $v0, %lo(func_80242688_C79368)($at) /* CEED8C 80240B2C 00400008 */ jr $v0 -/* CEED90 80240B30 00000000 */ nop +/* CEED90 80240B30 00000000 */ nop /* CEED94 80240B34 8E420028 */ lw $v0, 0x28($s2) /* CEED98 80240B38 24420001 */ addiu $v0, $v0, 1 /* CEED9C 80240B3C AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s index 34dca1671e..0b8ef0b3a2 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240C9C_CEEEFC.s @@ -3,8 +3,8 @@ glabel func_80240C9C_CEEEFC /* CEEEFC 80240C9C 2404005A */ addiu $a0, $zero, 0x5a -/* CEEF00 80240CA0 3C038024 */ lui $v1, %hi(D_802429B8) -/* CEEF04 80240CA4 246329B8 */ addiu $v1, $v1, %lo(D_802429B8) +/* CEEF00 80240CA0 3C038024 */ lui $v1, %hi(func_802429B8_B37588) +/* CEEF04 80240CA4 246329B8 */ addiu $v1, $v1, %lo(func_802429B8_B37588) /* CEEF08 80240CA8 240200DA */ addiu $v0, $zero, 0xda .L80240CAC: /* CEEF0C 80240CAC AC620000 */ sw $v0, ($v1) diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s index 889048b0bc..51d500e87b 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240C94_CF3864.s @@ -15,9 +15,9 @@ glabel func_80240C94_CF3864 /* CF388C 80240CBC 00031C00 */ sll $v1, $v1, 0x10 /* CF3890 80240CC0 00031B83 */ sra $v1, $v1, 0xe /* CF3894 80240CC4 A444008E */ sh $a0, 0x8e($v0) -/* CF3898 80240CC8 3C018024 */ lui $at, %hi(D_8024291C) +/* CF3898 80240CC8 3C018024 */ lui $at, %hi(func_8024291C_C494FC) /* CF389C 80240CCC 00230821 */ addu $at, $at, $v1 -/* CF38A0 80240CD0 C422291C */ lwc1 $f2, %lo(D_8024291C)($at) +/* CF38A0 80240CD0 C422291C */ lwc1 $f2, %lo(func_8024291C_C494FC)($at) /* CF38A4 80240CD4 8443008E */ lh $v1, 0x8e($v0) /* CF38A8 80240CD8 46020000 */ add.s $f0, $f0, $f2 /* CF38AC 80240CDC 28630005 */ slti $v1, $v1, 5 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index bc9c687f0c..5766a232b0 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -66,9 +66,9 @@ glabel func_8024134C_CF3F1C /* CF4008 80241438 2C62000F */ sltiu $v0, $v1, 0xf /* CF400C 8024143C 10400034 */ beqz $v0, .L80241510 /* CF4010 80241440 00031080 */ sll $v0, $v1, 2 -/* CF4014 80241444 3C018024 */ lui $at, %hi(D_80244EF8) +/* CF4014 80241444 3C018024 */ lui $at, %hi(func_80244EF8) /* CF4018 80241448 00220821 */ addu $at, $at, $v0 -/* CF401C 8024144C 8C224EF8 */ lw $v0, %lo(D_80244EF8)($at) +/* CF401C 8024144C 8C224EF8 */ lw $v0, %lo(func_80244EF8)($at) /* CF4020 80241450 00400008 */ jr $v0 /* CF4024 80241454 00000000 */ nop /* CF4028 80241458 0280202D */ daddu $a0, $s4, $zero @@ -83,7 +83,7 @@ glabel func_8024134C_CF3F1C /* CF404C 8024147C 0000102D */ daddu $v0, $zero, $zero /* CF4050 80241480 0280202D */ daddu $a0, $s4, $zero /* CF4054 80241484 0200282D */ daddu $a1, $s0, $zero -/* CF4058 80241488 0C090206 */ jal flo_25_UnkNpcAIFunc1 +/* CF4058 80241488 0C090206 */ jal func_80240818_CF33E8 /* CF405C 8024148C 0260302D */ daddu $a2, $s3, $zero /* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero /* CF4064 80241494 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024134C_CF3F1C /* CF4074 802414A4 0000102D */ daddu $v0, $zero, $zero /* CF4078 802414A8 0280202D */ daddu $a0, $s4, $zero /* CF407C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* CF4080 802414B0 0C090307 */ jal flo_25_UnkNpcAIFunc2 +/* CF4080 802414B0 0C090307 */ jal func_80240C1C_CF37EC /* CF4084 802414B4 0260302D */ daddu $a2, $s3, $zero /* CF4088 802414B8 0280202D */ daddu $a0, $s4, $zero /* CF408C 802414BC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024134C_CF3F1C /* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero /* CF40B8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CF40BC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CF40C0 802414F0 0C09038D */ jal flo_25_UnkNpcAIFunc3 +/* CF40C0 802414F0 0C09038D */ jal func_80240E34_CF3A04 /* CF40C4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CF40C8 802414F8 08090545 */ j .L80241514 /* CF40CC 802414FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index d7c403492e..edb212da60 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -84,7 +84,7 @@ glabel func_80241944_CF4514 /* CF4648 80241A78 0000102D */ daddu $v0, $zero, $zero /* CF464C 80241A7C 0280202D */ daddu $a0, $s4, $zero /* CF4650 80241A80 0200282D */ daddu $a1, $s0, $zero -/* CF4654 80241A84 0C090206 */ jal flo_25_UnkNpcAIFunc1 +/* CF4654 80241A84 0C090206 */ jal func_80240818_CF33E8 /* CF4658 80241A88 0260302D */ daddu $a2, $s3, $zero /* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80241944_CF4514 /* CF4670 80241AA0 0000102D */ daddu $v0, $zero, $zero /* CF4674 80241AA4 0280202D */ daddu $a0, $s4, $zero /* CF4678 80241AA8 0200282D */ daddu $a1, $s0, $zero -/* CF467C 80241AAC 0C090307 */ jal flo_25_UnkNpcAIFunc2 +/* CF467C 80241AAC 0C090307 */ jal func_80240C1C_CF37EC /* CF4680 80241AB0 0260302D */ daddu $a2, $s3, $zero /* CF4684 80241AB4 0280202D */ daddu $a0, $s4, $zero /* CF4688 80241AB8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s index a7b2a9d545..09a1b4bf05 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_802407F0_A0C4E0.s @@ -4,8 +4,8 @@ glabel func_802407F0_A0C4E0 /* A0C4E0 802407F0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A0C4E4 802407F4 AFB00010 */ sw $s0, 0x10($sp) -/* A0C4E8 802407F8 3C108024 */ lui $s0, %hi(D_80242970) -/* A0C4EC 802407FC 26102970 */ addiu $s0, $s0, %lo(D_80242970) +/* A0C4E8 802407F8 3C108024 */ lui $s0, %hi(func_80242970_7ED680) +/* A0C4EC 802407FC 26102970 */ addiu $s0, $s0, %lo(func_80242970_7ED680) /* A0C4F0 80240800 AFBF0018 */ sw $ra, 0x18($sp) /* A0C4F4 80240804 AFB10014 */ sw $s1, 0x14($sp) /* A0C4F8 80240808 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_802407F0_A0C4E0 /* A0C55C 8024086C 28620010 */ slti $v0, $v1, 0x10 /* A0C560 80240870 1440FFFA */ bnez $v0, .L8024085C /* A0C564 80240874 24840004 */ addiu $a0, $a0, 4 -/* A0C568 80240878 3C108024 */ lui $s0, %hi(D_80242970) -/* A0C56C 8024087C 26102970 */ addiu $s0, $s0, %lo(D_80242970) +/* A0C568 80240878 3C108024 */ lui $s0, %hi(func_80242970_7ED680) +/* A0C56C 8024087C 26102970 */ addiu $s0, $s0, %lo(func_80242970_7ED680) /* A0C570 80240880 0C00AB4B */ jal heap_free /* A0C574 80240884 8E040000 */ lw $a0, ($s0) /* A0C578 80240888 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s index a49806efab..290922006a 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_8024030C_A1652C.s @@ -4,8 +4,8 @@ glabel func_8024030C_A1652C /* A1652C 8024030C 27BDFFD8 */ addiu $sp, $sp, -0x28 /* A16530 80240310 AFB10014 */ sw $s1, 0x14($sp) -/* A16534 80240314 3C118024 */ lui $s1, %hi(D_802433AC) -/* A16538 80240318 263133AC */ addiu $s1, $s1, %lo(D_802433AC) +/* A16534 80240314 3C118024 */ lui $s1, %hi(func_802433AC_8B341C) +/* A16538 80240318 263133AC */ addiu $s1, $s1, %lo(func_802433AC_8B341C) /* A1653C 8024031C AFBF0020 */ sw $ra, 0x20($sp) /* A16540 80240320 AFB3001C */ sw $s3, 0x1c($sp) /* A16544 80240324 AFB20018 */ sw $s2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s index 84edcd6724..c13a74d3f5 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s @@ -95,8 +95,8 @@ glabel func_80240BFC_A16E1C /* A16F74 80240D54 24427FFF */ addiu $v0, $v0, 0x7fff .L80240D58: /* A16F78 80240D58 000213C3 */ sra $v0, $v0, 0xf -/* A16F7C 80240D5C 3C018024 */ lui $at, %hi(D_80244E10) -/* A16F80 80240D60 D4224E10 */ ldc1 $f2, %lo(D_80244E10)($at) +/* A16F7C 80240D5C 3C018024 */ lui $at, %hi(func_80244E10_805690) +/* A16F80 80240D60 D4224E10 */ ldc1 $f2, %lo(func_80244E10_805690)($at) /* A16F84 80240D64 44820000 */ mtc1 $v0, $f0 /* A16F88 80240D68 00000000 */ nop /* A16F8C 80240D6C 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index e3d4fedf82..d4a28d757f 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -66,9 +66,9 @@ glabel func_802422FC_A1851C /* A18608 802423E8 2C62000F */ sltiu $v0, $v1, 0xf /* A1860C 802423EC 10400034 */ beqz $v0, .L802424C0 /* A18610 802423F0 00031080 */ sll $v0, $v1, 2 -/* A18614 802423F4 3C018024 */ lui $at, %hi(D_80244E38) +/* A18614 802423F4 3C018024 */ lui $at, %hi(func_80244E38) /* A18618 802423F8 00220821 */ addu $at, $at, $v0 -/* A1861C 802423FC 8C224E38 */ lw $v0, %lo(D_80244E38)($at) +/* A1861C 802423FC 8C224E38 */ lw $v0, %lo(func_80244E38)($at) /* A18620 80242400 00400008 */ jr $v0 /* A18624 80242404 00000000 */ nop /* A18628 80242408 0280202D */ daddu $a0, $s4, $zero @@ -83,7 +83,7 @@ glabel func_802422FC_A1851C /* A1864C 8024242C 0000102D */ daddu $v0, $zero, $zero /* A18650 80242430 0280202D */ daddu $a0, $s4, $zero /* A18654 80242434 0200282D */ daddu $a1, $s0, $zero -/* A18658 80242438 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 +/* A18658 80242438 0C0905F2 */ jal func_802417C8_A179E8 /* A1865C 8024243C 0260302D */ daddu $a2, $s3, $zero /* A18660 80242440 0280202D */ daddu $a0, $s4, $zero /* A18664 80242444 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802422FC_A1851C /* A18674 80242454 0000102D */ daddu $v0, $zero, $zero /* A18678 80242458 0280202D */ daddu $a0, $s4, $zero /* A1867C 8024245C 0200282D */ daddu $a1, $s0, $zero -/* A18680 80242460 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 +/* A18680 80242460 0C0906F3 */ jal func_80241BCC_A17DEC /* A18684 80242464 0260302D */ daddu $a2, $s3, $zero /* A18688 80242468 0280202D */ daddu $a0, $s4, $zero /* A1868C 8024246C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802422FC_A1851C /* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero /* A186B8 80242498 0280202D */ daddu $a0, $s4, $zero /* A186BC 8024249C 0200282D */ daddu $a1, $s0, $zero -/* A186C0 802424A0 0C090779 */ jal hos_02_UnkNpcAIFunc3 +/* A186C0 802424A0 0C090779 */ jal func_80241DE4_A18004 /* A186C4 802424A4 0260302D */ daddu $a2, $s3, $zero /* A186C8 802424A8 08090931 */ j .L802424C4 /* A186CC 802424AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index 5d94b79ebd..3fd1862d3c 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -84,7 +84,7 @@ glabel func_802428F4_A18B14 /* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero /* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero /* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero -/* A18C54 80242A34 0C0905F2 */ jal hos_02_UnkNpcAIFunc1 +/* A18C54 80242A34 0C0905F2 */ jal func_802417C8_A179E8 /* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero /* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero /* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_802428F4_A18B14 /* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero /* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero /* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero -/* A18C7C 80242A5C 0C0906F3 */ jal hos_02_UnkNpcAIFunc2 +/* A18C7C 80242A5C 0C0906F3 */ jal func_80241BCC_A17DEC /* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero /* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero /* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 8ebd79c537..5eaaf74dd6 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -83,7 +83,7 @@ glabel func_80241FBC_A1D0BC /* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero /* A1D1F0 802420F0 0280202D */ daddu $a0, $s4, $zero /* A1D1F4 802420F4 0200282D */ daddu $a1, $s0, $zero -/* A1D1F8 802420F8 0C090522 */ jal hos_03_UnkNpcAIFunc1 +/* A1D1F8 802420F8 0C090522 */ jal func_80241488_A1C588 /* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero /* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero /* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241FBC_A1D0BC /* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero /* A1D218 80242118 0280202D */ daddu $a0, $s4, $zero /* A1D21C 8024211C 0200282D */ daddu $a1, $s0, $zero -/* A1D220 80242120 0C090623 */ jal hos_03_UnkNpcAIFunc2 +/* A1D220 80242120 0C090623 */ jal func_8024188C_A1C98C /* A1D224 80242124 0260302D */ daddu $a2, $s3, $zero /* A1D228 80242128 0280202D */ daddu $a0, $s4, $zero /* A1D22C 8024212C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241FBC_A1D0BC /* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero /* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero /* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero -/* A1D260 80242160 0C0906A9 */ jal hos_03_UnkNpcAIFunc3 +/* A1D260 80242160 0C0906A9 */ jal func_80241AA4_A1CBA4 /* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero /* A1D268 80242168 08090861 */ j .L80242184 /* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s index 4909e9e6b3..37a08ef76d 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242804_A1D904.s @@ -9,8 +9,8 @@ glabel func_80242804_A1D904 /* A1D914 80242814 8C84014C */ lw $a0, 0x14c($a0) /* A1D918 80242818 24040008 */ addiu $a0, $zero, 8 /* A1D91C 8024281C 0040802D */ daddu $s0, $v0, $zero -/* A1D920 80242820 3C028024 */ lui $v0, %hi(D_80242870) -/* A1D924 80242824 24422870 */ addiu $v0, $v0, %lo(D_80242870) +/* A1D920 80242820 3C028024 */ lui $v0, %hi(func_80242870_A1BE1C) +/* A1D924 80242824 24422870 */ addiu $v0, $v0, %lo(func_80242870_A1BE1C) /* A1D928 80242828 0C00AB39 */ jal heap_malloc /* A1D92C 8024282C AE020008 */ sw $v0, 8($s0) /* A1D930 80242830 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s index 77d4e15edb..86920ea007 100644 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s @@ -3,8 +3,8 @@ glabel func_80243508_A1E608 /* A1E608 80243508 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1E60C 8024350C 3C058024 */ lui $a1, %hi(D_8024349C) -/* A1E610 80243510 24A5349C */ addiu $a1, $a1, %lo(D_8024349C) +/* A1E60C 8024350C 3C058024 */ lui $a1, %hi(func_8024349C_A1BD44) +/* A1E610 80243510 24A5349C */ addiu $a1, $a1, %lo(func_8024349C_A1BD44) /* A1E614 80243514 AFBF0010 */ sw $ra, 0x10($sp) /* A1E618 80243518 0C048C8F */ jal bind_dynamic_entity_7 /* A1E61C 8024351C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s index 222316914a..811daf356e 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240000_A26ED0.s @@ -4,8 +4,8 @@ glabel func_80240000_A26ED0 /* A26ED0 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 /* A26ED4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* A26ED8 80240008 3C118024 */ lui $s1, %hi(D_802416F0) -/* A26EDC 8024000C 263116F0 */ addiu $s1, $s1, %lo(D_802416F0) +/* A26ED8 80240008 3C118024 */ lui $s1, %hi(func_802416F0_9C6AD0) +/* A26EDC 8024000C 263116F0 */ addiu $s1, $s1, %lo(func_802416F0_9C6AD0) /* A26EE0 80240010 AFBF0020 */ sw $ra, 0x20($sp) /* A26EE4 80240014 AFB3001C */ sw $s3, 0x1c($sp) /* A26EE8 80240018 AFB20018 */ sw $s2, 0x18($sp) @@ -34,8 +34,8 @@ glabel func_80240000_A26ED0 /* A26F44 80240074 44801000 */ mtc1 $zero, $f2 /* A26F48 80240078 46000021 */ cvt.d.s $f0, $f0 /* A26F4C 8024007C 46220000 */ add.d $f0, $f0, $f2 -/* A26F50 80240080 3C018024 */ lui $at, %hi(D_80243300) -/* A26F54 80240084 D4243300 */ ldc1 $f4, %lo(D_80243300)($at) +/* A26F50 80240080 3C018024 */ lui $at, %hi(func_80243300_8B3370) +/* A26F54 80240084 D4243300 */ ldc1 $f4, %lo(func_80243300_8B3370)($at) /* A26F58 80240088 46200020 */ cvt.s.d $f0, $f0 /* A26F5C 8024008C 460000A1 */ cvt.d.s $f2, $f0 /* A26F60 80240090 46241082 */ mul.d $f2, $f2, $f4 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s index 85ad195a4f..29595191e8 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_80240154_A27024.s @@ -4,8 +4,8 @@ glabel func_80240154_A27024 /* A27024 80240154 27BDFFD8 */ addiu $sp, $sp, -0x28 /* A27028 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* A2702C 8024015C 3C108024 */ lui $s0, %hi(D_802416F0) -/* A27030 80240160 261016F0 */ addiu $s0, $s0, %lo(D_802416F0) +/* A2702C 8024015C 3C108024 */ lui $s0, %hi(func_802416F0_9C6AD0) +/* A27030 80240160 261016F0 */ addiu $s0, $s0, %lo(func_802416F0_9C6AD0) /* A27034 80240164 AFBF001C */ sw $ra, 0x1c($sp) /* A27038 80240168 AFB20018 */ sw $s2, 0x18($sp) /* A2703C 8024016C AFB10014 */ sw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s index dfccc8c510..97faa562d8 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240734_A27604.s @@ -19,9 +19,9 @@ glabel func_80240734_A27604 /* A27638 80240768 2C820005 */ sltiu $v0, $a0, 5 /* A2763C 8024076C 10400056 */ beqz $v0, .L802408C8 /* A27640 80240770 00041080 */ sll $v0, $a0, 2 -/* A27644 80240774 3C018024 */ lui $at, %hi(D_80243310) +/* A27644 80240774 3C018024 */ lui $at, %hi(func_80243310_9AB700) /* A27648 80240778 00220821 */ addu $at, $at, $v0 -/* A2764C 8024077C 8C223310 */ lw $v0, %lo(D_80243310)($at) +/* A2764C 8024077C 8C223310 */ lw $v0, %lo(func_80243310_9AB700)($at) /* A27650 80240780 00400008 */ jr $v0 /* A27654 80240784 00000000 */ nop /* A27658 80240788 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s index 9d294f5a72..80efa92875 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s @@ -24,8 +24,8 @@ glabel func_802408F8_A277C8 /* A27814 80240944 8D030000 */ lw $v1, ($t0) /* A27818 80240948 10A30013 */ beq $a1, $v1, .L80240998 /* A2781C 8024094C 00448821 */ addu $s1, $v0, $a0 -/* A27820 80240950 3C108024 */ lui $s0, %hi(D_80241B7C) -/* A27824 80240954 26101B7C */ addiu $s0, $s0, %lo(D_80241B7C) +/* A27820 80240950 3C108024 */ lui $s0, %hi(func_80241B7C_A043BC) +/* A27824 80240954 26101B7C */ addiu $s0, $s0, %lo(func_80241B7C_A043BC) /* A27828 80240958 3C01442F */ lui $at, 0x442f /* A2782C 8024095C 44816000 */ mtc1 $at, $f12 /* A27830 80240960 3C014396 */ lui $at, 0x4396 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s index 1216e037ea..d40e9959e0 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s @@ -20,20 +20,20 @@ glabel func_802409B0_A27880 /* A278BC 802409EC 000210C0 */ sll $v0, $v0, 3 /* A278C0 802409F0 10A00005 */ beqz $a1, .L80240A08 /* A278C4 802409F4 00449021 */ addu $s2, $v0, $a0 -/* A278C8 802409F8 3C018024 */ lui $at, %hi(D_80241B54) -/* A278CC 802409FC C4201B54 */ lwc1 $f0, %lo(D_80241B54)($at) -/* A278D0 80240A00 3C018024 */ lui $at, %hi(D_80243370) -/* A278D4 80240A04 E4203370 */ swc1 $f0, %lo(D_80243370)($at) +/* A278C8 802409F8 3C018024 */ lui $at, %hi(func_80241B54_8023D4) +/* A278CC 802409FC C4201B54 */ lwc1 $f0, %lo(func_80241B54_8023D4)($at) +/* A278D0 80240A00 3C018024 */ lui $at, %hi(func_80243370_8B33E0) +/* A278D4 80240A04 E4203370 */ swc1 $f0, %lo(func_80243370_8B33E0)($at) .L80240A08: -/* A278D8 80240A08 3C118024 */ lui $s1, %hi(D_80243370) -/* A278DC 80240A0C 26313370 */ addiu $s1, $s1, %lo(D_80243370) +/* A278D8 80240A08 3C118024 */ lui $s1, %hi(func_80243370_8B33E0) +/* A278DC 80240A0C 26313370 */ addiu $s1, $s1, %lo(func_80243370_8B33E0) /* A278E0 80240A10 3C01428C */ lui $at, 0x428c /* A278E4 80240A14 44810000 */ mtc1 $at, $f0 -/* A278E8 80240A18 3C058024 */ lui $a1, %hi(D_80241B54) -/* A278EC 80240A1C 8CA51B54 */ lw $a1, %lo(D_80241B54)($a1) +/* A278E8 80240A18 3C058024 */ lui $a1, %hi(func_80241B54_8023D4) +/* A278EC 80240A1C 8CA51B54 */ lw $a1, %lo(func_80241B54_8023D4)($a1) /* A278F0 80240A20 3C06442F */ lui $a2, 0x442f -/* A278F4 80240A24 3C108024 */ lui $s0, %hi(D_80241B84) -/* A278F8 80240A28 26101B84 */ addiu $s0, $s0, %lo(D_80241B84) +/* A278F4 80240A24 3C108024 */ lui $s0, %hi(func_80241B84_9C6F64) +/* A278F8 80240A28 26101B84 */ addiu $s0, $s0, %lo(func_80241B84_9C6F64) /* A278FC 80240A2C AFB10014 */ sw $s1, 0x14($sp) /* A27900 80240A30 E7A00010 */ swc1 $f0, 0x10($sp) /* A27904 80240A34 C6000000 */ lwc1 $f0, ($s0) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s index 1be527b486..be8f07fb42 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s @@ -20,8 +20,8 @@ glabel func_80240A84_A27954 /* A27990 80240AC0 000210C0 */ sll $v0, $v0, 3 /* A27994 80240AC4 10A00005 */ beqz $a1, .L80240ADC /* A27998 80240AC8 00449021 */ addu $s2, $v0, $a0 -/* A2799C 80240ACC 3C018024 */ lui $at, %hi(D_80241B74) -/* A279A0 80240AD0 C4201B74 */ lwc1 $f0, %lo(D_80241B74)($at) +/* A2799C 80240ACC 3C018024 */ lui $at, %hi(func_80241B74_911224) +/* A279A0 80240AD0 C4201B74 */ lwc1 $f0, %lo(func_80241B74_911224)($at) /* A279A4 80240AD4 3C018024 */ lui $at, %hi(D_80243374) /* A279A8 80240AD8 E4203374 */ swc1 $f0, %lo(D_80243374)($at) .L80240ADC: @@ -29,8 +29,8 @@ glabel func_80240A84_A27954 /* A279B0 80240AE0 26313374 */ addiu $s1, $s1, %lo(D_80243374) /* A279B4 80240AE4 3C014348 */ lui $at, 0x4348 /* A279B8 80240AE8 44810000 */ mtc1 $at, $f0 -/* A279BC 80240AEC 3C058024 */ lui $a1, %hi(D_80241B74) -/* A279C0 80240AF0 8CA51B74 */ lw $a1, %lo(D_80241B74)($a1) +/* A279BC 80240AEC 3C058024 */ lui $a1, %hi(func_80241B74_911224) +/* A279C0 80240AF0 8CA51B74 */ lw $a1, %lo(func_80241B74_911224)($a1) /* A279C4 80240AF4 3C06C2A0 */ lui $a2, 0xc2a0 /* A279C8 80240AF8 3C108024 */ lui $s0, %hi(D_80241B88) /* A279CC 80240AFC 26101B88 */ addiu $s0, $s0, %lo(D_80241B88) diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s index a4843dda21..bd9f4cbe85 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240BD0_A27AA0.s @@ -39,8 +39,8 @@ glabel func_80240BD0_A27AA0 /* A27B24 80240C54 08090323 */ j .L80240C8C /* A27B28 80240C58 00000000 */ nop .L80240C5C: -/* A27B2C 80240C5C 3C038024 */ lui $v1, %hi(D_80243254) -/* A27B30 80240C60 24633254 */ addiu $v1, $v1, %lo(D_80243254) +/* A27B2C 80240C5C 3C038024 */ lui $v1, %hi(func_80243254_8553C4) +/* A27B30 80240C60 24633254 */ addiu $v1, $v1, %lo(func_80243254_8553C4) /* A27B34 80240C64 8C620000 */ lw $v0, ($v1) /* A27B38 80240C68 2442000A */ addiu $v0, $v0, 0xa /* A27B3C 80240C6C AC620000 */ sw $v0, ($v1) @@ -54,12 +54,12 @@ glabel func_80240BD0_A27AA0 .L80240C8C: /* A27B5C 80240C8C 3C018024 */ lui $at, %hi(D_80243250) /* A27B60 80240C90 AC223250 */ sw $v0, %lo(D_80243250)($at) -/* A27B64 80240C94 3C018024 */ lui $at, %hi(D_80243380) -/* A27B68 80240C98 AC233380 */ sw $v1, %lo(D_80243380)($at) +/* A27B64 80240C94 3C018024 */ lui $at, %hi(func_80243380_8554F0) +/* A27B68 80240C98 AC233380 */ sw $v1, %lo(func_80243380_8554F0)($at) /* A27B6C 80240C9C 08090359 */ j .L80240D64 /* A27B70 80240CA0 24040001 */ addiu $a0, $zero, 1 -/* A27B74 80240CA4 3C038024 */ lui $v1, %hi(D_80243380) -/* A27B78 80240CA8 24633380 */ addiu $v1, $v1, %lo(D_80243380) +/* A27B74 80240CA4 3C038024 */ lui $v1, %hi(func_80243380_8554F0) +/* A27B78 80240CA8 24633380 */ addiu $v1, $v1, %lo(func_80243380_8554F0) /* A27B7C 80240CAC 8C620000 */ lw $v0, ($v1) /* A27B80 80240CB0 1440001B */ bnez $v0, .L80240D20 /* A27B84 80240CB4 2442FFFF */ addiu $v0, $v0, -1 @@ -68,8 +68,8 @@ glabel func_80240BD0_A27AA0 /* A27B90 80240CC0 AC223250 */ sw $v0, %lo(D_80243250)($at) /* A27B94 80240CC4 08090359 */ j .L80240D64 /* A27B98 80240CC8 24040001 */ addiu $a0, $zero, 1 -/* A27B9C 80240CCC 3C048024 */ lui $a0, %hi(D_80243254) -/* A27BA0 80240CD0 24843254 */ addiu $a0, $a0, %lo(D_80243254) +/* A27B9C 80240CCC 3C048024 */ lui $a0, %hi(func_80243254_8553C4) +/* A27BA0 80240CD0 24843254 */ addiu $a0, $a0, %lo(func_80243254_8553C4) /* A27BA4 80240CD4 8C820000 */ lw $v0, ($a0) /* A27BA8 80240CD8 2442FFF6 */ addiu $v0, $v0, -0xa /* A27BAC 80240CDC 04410020 */ bgez $v0, .L80240D60 @@ -84,8 +84,8 @@ glabel func_80240BD0_A27AA0 /* A27BD0 80240D00 AC430000 */ sw $v1, ($v0) /* A27BD4 80240D04 08090356 */ j .L80240D58 /* A27BD8 80240D08 00000000 */ nop -/* A27BDC 80240D0C 3C038024 */ lui $v1, %hi(D_80243380) -/* A27BE0 80240D10 24633380 */ addiu $v1, $v1, %lo(D_80243380) +/* A27BDC 80240D0C 3C038024 */ lui $v1, %hi(func_80243380_8554F0) +/* A27BE0 80240D10 24633380 */ addiu $v1, $v1, %lo(func_80243380_8554F0) /* A27BE4 80240D14 8C620000 */ lw $v0, ($v1) /* A27BE8 80240D18 10400003 */ beqz $v0, .L80240D28 /* A27BEC 80240D1C 2442FFFF */ addiu $v0, $v0, -1 @@ -125,8 +125,8 @@ glabel func_80240BD0_A27AA0 /* A27C5C 80240D8C 44812000 */ mtc1 $at, $f4 /* A27C60 80240D90 00000000 */ nop /* A27C64 80240D94 46022081 */ sub.s $f2, $f4, $f2 -/* A27C68 80240D98 3C018024 */ lui $at, %hi(D_80243254) -/* A27C6C 80240D9C C4203254 */ lwc1 $f0, %lo(D_80243254)($at) +/* A27C68 80240D98 3C018024 */ lui $at, %hi(func_80243254_8553C4) +/* A27C6C 80240D9C C4203254 */ lwc1 $f0, %lo(func_80243254_8553C4)($at) /* A27C70 80240DA0 46800020 */ cvt.s.w $f0, $f0 /* A27C74 80240DA4 46020002 */ mul.s $f0, $f0, $f2 /* A27C78 80240DA8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s index c57d182186..6895e892e3 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s @@ -3,8 +3,8 @@ glabel func_80240E6C_A27D3C /* A27D3C 80240E6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27D40 80240E70 3C048024 */ lui $a0, %hi(D_80243284) -/* A27D44 80240E74 24843284 */ addiu $a0, $a0, %lo(D_80243284) +/* A27D40 80240E70 3C048024 */ lui $a0, %hi(func_80243284_8B32F4) +/* A27D44 80240E74 24843284 */ addiu $a0, $a0, %lo(func_80243284_8B32F4) /* A27D48 80240E78 AFBF0010 */ sw $ra, 0x10($sp) /* A27D4C 80240E7C 0C0902F4 */ jal func_80240BD0_A27AA0 /* A27D50 80240E80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s index dd90bc494e..f93f360e25 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s @@ -5,8 +5,8 @@ glabel func_80242704_A2C944 /* A2C944 80242704 27BDFFB8 */ addiu $sp, $sp, -0x48 /* A2C948 80242708 24040003 */ addiu $a0, $zero, 3 /* A2C94C 8024270C AFB1001C */ sw $s1, 0x1c($sp) -/* A2C950 80242710 3C118025 */ lui $s1, %hi(D_80249AA4) -/* A2C954 80242714 26319AA4 */ addiu $s1, $s1, %lo(D_80249AA4) +/* A2C950 80242710 3C118025 */ lui $s1, %hi(func_80249AA4) +/* A2C954 80242714 26319AA4 */ addiu $s1, $s1, %lo(func_80249AA4) /* A2C958 80242718 AFBF0030 */ sw $ra, 0x30($sp) /* A2C95C 8024271C AFB5002C */ sw $s5, 0x2c($sp) /* A2C960 80242720 AFB40028 */ sw $s4, 0x28($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s index b12e022846..ceafe370f9 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s @@ -33,10 +33,10 @@ glabel func_80243164_A2D3A4 /* A2D414 802431D4 AC400004 */ sw $zero, 4($v0) /* A2D418 802431D8 24A20008 */ addiu $v0, $a1, 8 /* A2D41C 802431DC ACC20000 */ sw $v0, ($a2) -/* A2D420 802431E0 3C02DE00 */ lui $v0, %hi(D_DDFFAA28) +/* A2D420 802431E0 3C02DE00 */ lui $v0, 0xde00 /* A2D424 802431E4 ACA20000 */ sw $v0, ($a1) /* A2D428 802431E8 3C028025 */ lui $v0, %hi(D_8024AA28) -/* A2D42C 802431EC 2442AA28 */ addiu $v0, $v0, %lo(D_DDFFAA28) +/* A2D42C 802431EC 2442AA28 */ addiu $v0, $v0, %lo(D_8024AA28) /* A2D430 802431F0 12600023 */ beqz $s3, .L80243280 /* A2D434 802431F4 ACA20004 */ sw $v0, 4($a1) /* A2D438 802431F8 3C03F500 */ lui $v1, 0xf500 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s index adaa7ff780..3cdf7f46c2 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s @@ -4,8 +4,8 @@ glabel func_80243FC4_A2E204 /* A2E204 80243FC4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A2E208 80243FC8 0000202D */ daddu $a0, $zero, $zero -/* A2E20C 80243FCC 3C058024 */ lui $a1, %hi(D_80243CC0) -/* A2E210 80243FD0 24A53CC0 */ addiu $a1, $a1, %lo(D_80243CC0) +/* A2E20C 80243FCC 3C058024 */ lui $a1, %hi(func_80243CC0_A2A7BC) +/* A2E210 80243FD0 24A53CC0 */ addiu $a1, $a1, %lo(func_80243CC0_A2A7BC) /* A2E214 80243FD4 AFBF0014 */ sw $ra, 0x14($sp) /* A2E218 80243FD8 0C048C8F */ jal bind_dynamic_entity_7 /* A2E21C 80243FDC AFB00010 */ sw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s index 5b4dbe8ce9..0684e5f2d6 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240654_A39B34.s @@ -18,9 +18,9 @@ glabel func_80240654_A39B34 /* A39B64 80240684 0000102D */ daddu $v0, $zero, $zero .L80240688: /* A39B68 80240688 8CC50000 */ lw $a1, ($a2) -/* A39B6C 8024068C 3C068024 */ lui $a2, %hi(D_80242C70) +/* A39B6C 8024068C 3C068024 */ lui $a2, %hi(func_80242C70_9AB060) /* A39B70 80240690 0C0B2026 */ jal set_variable -/* A39B74 80240694 8CC62C70 */ lw $a2, %lo(D_80242C70)($a2) +/* A39B74 80240694 8CC62C70 */ lw $a2, %lo(func_80242C70_9AB060)($a2) /* A39B78 80240698 24020002 */ addiu $v0, $zero, 2 .L8024069C: /* A39B7C 8024069C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s index 78e84ebfc3..8b7dc94dcd 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s @@ -7,8 +7,8 @@ glabel func_802406A8_A39B88 /* A39B90 802406B0 8C82000C */ lw $v0, 0xc($a0) /* A39B94 802406B4 0C0B1EAF */ jal get_variable /* A39B98 802406B8 8C450000 */ lw $a1, ($v0) -/* A39B9C 802406BC 3C018024 */ lui $at, %hi(D_80242C70) -/* A39BA0 802406C0 AC222C70 */ sw $v0, %lo(D_80242C70)($at) +/* A39B9C 802406BC 3C018024 */ lui $at, %hi(func_80242C70_9AB060) +/* A39BA0 802406C0 AC222C70 */ sw $v0, %lo(func_80242C70_9AB060)($at) /* A39BA4 802406C4 24020002 */ addiu $v0, $zero, 2 /* A39BA8 802406C8 8FBF0010 */ lw $ra, 0x10($sp) /* A39BAC 802406CC 24030001 */ addiu $v1, $zero, 1 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index da10e611a4..c4c27806be 100644 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -55,7 +55,7 @@ glabel func_802403D4_97BA04 /* 97BAC8 80240498 8E2200B0 */ lw $v0, 0xb0($s1) /* 97BACC 8024049C 30420004 */ andi $v0, $v0, 4 /* 97BAD0 802404A0 10400047 */ beqz $v0, .L802405C0 -/* 97BAD4 802404A4 00000000 */ nop +/* 97BAD4 802404A4 00000000 */ nop .L802404A8: /* 97BAD8 802404A8 AE600070 */ sw $zero, 0x70($s3) /* 97BADC 802404AC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802403D4_97BA04 /* 97BB80 80240550 24020028 */ addiu $v0, $zero, 0x28 /* 97BB84 80240554 AFA2001C */ sw $v0, 0x1c($sp) /* 97BB88 80240558 44833000 */ mtc1 $v1, $f6 -/* 97BB8C 8024055C 00000000 */ nop +/* 97BB8C 8024055C 00000000 */ nop /* 97BB90 80240560 468031A0 */ cvt.s.w $f6, $f6 /* 97BB94 80240564 44073000 */ mfc1 $a3, $f6 /* 97BB98 80240568 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802403D4_97BA04 /* 97BC50 80240620 10600015 */ beqz $v1, .L80240678 /* 97BC54 80240624 0260202D */ daddu $a0, $s3, $zero /* 97BC58 80240628 080901E0 */ j .L80240780 -/* 97BC5C 8024062C 00000000 */ nop +/* 97BC5C 8024062C 00000000 */ nop .L80240630: /* 97BC60 80240630 1062001C */ beq $v1, $v0, .L802406A4 /* 97BC64 80240634 24020003 */ addiu $v0, $zero, 3 /* 97BC68 80240638 10620035 */ beq $v1, $v0, .L80240710 /* 97BC6C 8024063C 0260202D */ daddu $a0, $s3, $zero /* 97BC70 80240640 080901E0 */ j .L80240780 -/* 97BC74 80240644 00000000 */ nop +/* 97BC74 80240644 00000000 */ nop .L80240648: /* 97BC78 80240648 2402000E */ addiu $v0, $zero, 0xe /* 97BC7C 8024064C 1062003F */ beq $v1, $v0, .L8024074C @@ -177,9 +177,9 @@ glabel func_802403D4_97BA04 /* 97BC90 80240660 10620040 */ beq $v1, $v0, .L80240764 /* 97BC94 80240664 24020063 */ addiu $v0, $zero, 0x63 /* 97BC98 80240668 10620043 */ beq $v1, $v0, .L80240778 -/* 97BC9C 8024066C 00000000 */ nop +/* 97BC9C 8024066C 00000000 */ nop /* 97BCA0 80240670 080901E0 */ j .L80240780 -/* 97BCA4 80240674 00000000 */ nop +/* 97BCA4 80240674 00000000 */ nop .L80240678: /* 97BCA8 80240678 0280282D */ daddu $a1, $s4, $zero /* 97BCAC 8024067C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802403D4_97BA04 /* 97BCC4 80240694 0C0125AE */ jal func_800496B8 /* 97BCC8 80240698 02A0302D */ daddu $a2, $s5, $zero /* 97BCCC 8024069C 080901E0 */ j .L80240780 -/* 97BCD0 802406A0 00000000 */ nop +/* 97BCD0 802406A0 00000000 */ nop .L802406A4: /* 97BCD4 802406A4 0260202D */ daddu $a0, $s3, $zero /* 97BCD8 802406A8 0280282D */ daddu $a1, $s4, $zero -/* 97BCDC 802406AC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 97BCDC 802406AC 0C0126D1 */ jal func_80049B44 /* 97BCE0 802406B0 02A0302D */ daddu $a2, $s5, $zero /* 97BCE4 802406B4 8E230088 */ lw $v1, 0x88($s1) /* 97BCE8 802406B8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802403D4_97BA04 /* 97BD44 80240714 0C012701 */ jal func_80049C04 /* 97BD48 80240718 02A0302D */ daddu $a2, $s5, $zero /* 97BD4C 8024071C 080901E0 */ j .L80240780 -/* 97BD50 80240720 00000000 */ nop +/* 97BD50 80240720 00000000 */ nop .L80240724: /* 97BD54 80240724 0260202D */ daddu $a0, $s3, $zero /* 97BD58 80240728 0280282D */ daddu $a1, $s4, $zero -/* 97BD5C 8024072C 0C090010 */ jal isk_04_set_script_owner_npc_anim +/* 97BD5C 8024072C 0C090010 */ jal func_80240040_97B670 /* 97BD60 80240730 02A0302D */ daddu $a2, $s5, $zero /* 97BD64 80240734 0260202D */ daddu $a0, $s3, $zero .L80240738: @@ -240,20 +240,20 @@ glabel func_802403D4_97BA04 /* 97BD6C 8024073C 0C09002F */ jal func_802400BC_97B6EC /* 97BD70 80240740 02A0302D */ daddu $a2, $s5, $zero /* 97BD74 80240744 080901E0 */ j .L80240780 -/* 97BD78 80240748 00000000 */ nop +/* 97BD78 80240748 00000000 */ nop .L8024074C: /* 97BD7C 8024074C 0260202D */ daddu $a0, $s3, $zero /* 97BD80 80240750 0280282D */ daddu $a1, $s4, $zero -/* 97BD84 80240754 0C09007C */ jal isk_04_UnkNpcAIFunc12 +/* 97BD84 80240754 0C09007C */ jal func_802401F0_97B820 /* 97BD88 80240758 02A0302D */ daddu $a2, $s5, $zero /* 97BD8C 8024075C 080901E0 */ j .L80240780 -/* 97BD90 80240760 00000000 */ nop +/* 97BD90 80240760 00000000 */ nop .L80240764: /* 97BD94 80240764 0280282D */ daddu $a1, $s4, $zero -/* 97BD98 80240768 0C0900D5 */ jal isk_04_set_script_owner_npc_col_height +/* 97BD98 80240768 0C0900D5 */ jal func_80240354_97B984 /* 97BD9C 8024076C 02A0302D */ daddu $a2, $s5, $zero /* 97BDA0 80240770 080901E0 */ j .L80240780 -/* 97BDA4 80240774 00000000 */ nop +/* 97BDA4 80240774 00000000 */ nop .L80240778: /* 97BDA8 80240778 0C0129CF */ jal func_8004A73C /* 97BDAC 8024077C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802403D4_97BA04 /* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 /* 97BE04 802407D4 8C222438 */ lw $v0, %lo(D_80242438)($at) /* 97BE08 802407D8 00400008 */ jr $v0 -/* 97BE0C 802407DC 00000000 */ nop +/* 97BE0C 802407DC 00000000 */ nop /* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) /* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 /* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index d2d83c9f54..cfff413b63 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_97E6C0 /* 97E848 80240D78 0000102D */ daddu $v0, $zero, $zero /* 97E84C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 97E850 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 97E854 80240D84 0C09015A */ jal isk_05_UnkNpcAIFunc1 +/* 97E854 80240D84 0C09015A */ jal func_80240568_97E038 /* 97E858 80240D88 0200302D */ daddu $a2, $s0, $zero /* 97E85C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 97E860 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240BF0_97E6C0 /* 97E8A8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 97E8AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 97E8B0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 97E8B4 80240DE4 0C0902EB */ jal isk_05_UnkDurationCheck +/* 97E8B4 80240DE4 0C0902EB */ jal func_80240BAC_97E67C /* 97E8B8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 97E8BC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s index 9d6328bc2c..c6b87abc52 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s @@ -69,9 +69,9 @@ glabel func_80240F3C_97EA0C /* 97EB08 80241038 2C62000F */ sltiu $v0, $v1, 0xf /* 97EB0C 8024103C 10400028 */ beqz $v0, .L802410E0 /* 97EB10 80241040 00031080 */ sll $v0, $v1, 2 -/* 97EB14 80241044 3C018024 */ lui $at, %hi(D_80242EF8) +/* 97EB14 80241044 3C018024 */ lui $at, %hi(func_80242EF8) /* 97EB18 80241048 00220821 */ addu $at, $at, $v0 -/* 97EB1C 8024104C 8C222EF8 */ lw $v0, %lo(D_80242EF8)($at) +/* 97EB1C 8024104C 8C222EF8 */ lw $v0, %lo(func_80242EF8)($at) /* 97EB20 80241050 00400008 */ jr $v0 /* 97EB24 80241054 00000000 */ nop /* 97EB28 80241058 0280202D */ daddu $a0, $s4, $zero @@ -86,7 +86,7 @@ glabel func_80240F3C_97EA0C /* 97EB4C 8024107C 00000000 */ nop /* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero /* 97EB54 80241084 0200282D */ daddu $a1, $s0, $zero -/* 97EB58 80241088 0C09015A */ jal isk_05_UnkNpcAIFunc1 +/* 97EB58 80241088 0C09015A */ jal func_80240568_97E038 /* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero /* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero @@ -106,7 +106,7 @@ glabel func_80240F3C_97EA0C /* 97EB9C 802410CC 00000000 */ nop /* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 97EBA8 802410D8 0C0902EB */ jal isk_05_UnkDurationCheck +/* 97EBA8 802410D8 0C0902EB */ jal func_80240BAC_97E67C /* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s index cbcbf25a29..11c3310e7b 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s @@ -49,8 +49,8 @@ glabel func_80241B28_97F5F8 /* 97F6A8 80241BD8 3C013F36 */ lui $at, 0x3f36 /* 97F6AC 80241BDC 3421DB6E */ ori $at, $at, 0xdb6e /* 97F6B0 80241BE0 44810000 */ mtc1 $at, $f0 -/* 97F6B4 80241BE4 3C058024 */ lui $a1, %hi(D_80241610) -/* 97F6B8 80241BE8 24A51610 */ addiu $a1, $a1, %lo(D_80241610) +/* 97F6B4 80241BE4 3C058024 */ lui $a1, %hi(func_80241610_97D5B8) +/* 97F6B8 80241BE8 24A51610 */ addiu $a1, $a1, %lo(func_80241610_97D5B8) /* 97F6BC 80241BEC AE00001C */ sw $zero, 0x1c($s0) /* 97F6C0 80241BF0 AE000020 */ sw $zero, 0x20($s0) /* 97F6C4 80241BF4 AE000024 */ sw $zero, 0x24($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index f947453a56..9a6e61ac9c 100644 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -55,7 +55,7 @@ glabel func_80240394_9851C4 /* 985288 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 98528C 8024045C 30420004 */ andi $v0, $v0, 4 /* 985290 80240460 10400047 */ beqz $v0, .L80240580 -/* 985294 80240464 00000000 */ nop +/* 985294 80240464 00000000 */ nop .L80240468: /* 985298 80240468 AE600070 */ sw $zero, 0x70($s3) /* 98529C 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_9851C4 /* 985340 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 985344 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 985348 80240518 44833000 */ mtc1 $v1, $f6 -/* 98534C 8024051C 00000000 */ nop +/* 98534C 8024051C 00000000 */ nop /* 985350 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 985354 80240524 44073000 */ mfc1 $a3, $f6 /* 985358 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_9851C4 /* 985410 802405E0 10600015 */ beqz $v1, .L80240638 /* 985414 802405E4 0260202D */ daddu $a0, $s3, $zero /* 985418 802405E8 080901D0 */ j .L80240740 -/* 98541C 802405EC 00000000 */ nop +/* 98541C 802405EC 00000000 */ nop .L802405F0: /* 985420 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 985424 802405F4 24020003 */ addiu $v0, $zero, 3 /* 985428 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 98542C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 985430 80240600 080901D0 */ j .L80240740 -/* 985434 80240604 00000000 */ nop +/* 985434 80240604 00000000 */ nop .L80240608: /* 985438 80240608 2402000E */ addiu $v0, $zero, 0xe /* 98543C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_9851C4 /* 985450 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 985454 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 985458 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 98545C 8024062C 00000000 */ nop +/* 98545C 8024062C 00000000 */ nop /* 985460 80240630 080901D0 */ j .L80240740 -/* 985464 80240634 00000000 */ nop +/* 985464 80240634 00000000 */ nop .L80240638: /* 985468 80240638 0280282D */ daddu $a1, $s4, $zero /* 98546C 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_9851C4 /* 985484 80240654 0C0125AE */ jal func_800496B8 /* 985488 80240658 02A0302D */ daddu $a2, $s5, $zero /* 98548C 8024065C 080901D0 */ j .L80240740 -/* 985490 80240660 00000000 */ nop +/* 985490 80240660 00000000 */ nop .L80240664: /* 985494 80240664 0260202D */ daddu $a0, $s3, $zero /* 985498 80240668 0280282D */ daddu $a1, $s4, $zero -/* 98549C 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 98549C 8024066C 0C0126D1 */ jal func_80049B44 /* 9854A0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9854A4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9854A8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240394_9851C4 /* 985504 802406D4 0C012701 */ jal func_80049C04 /* 985508 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 98550C 802406DC 080901D0 */ j .L80240740 -/* 985510 802406E0 00000000 */ nop +/* 985510 802406E0 00000000 */ nop .L802406E4: /* 985514 802406E4 0260202D */ daddu $a0, $s3, $zero /* 985518 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 98551C 802406EC 0C090000 */ jal isk_08_set_script_owner_npc_anim +/* 98551C 802406EC 0C090000 */ jal func_80240000_984E30 /* 985520 802406F0 02A0302D */ daddu $a2, $s5, $zero /* 985524 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: @@ -240,20 +240,20 @@ glabel func_80240394_9851C4 /* 98552C 802406FC 0C09001F */ jal func_8024007C_984EAC /* 985530 80240700 02A0302D */ daddu $a2, $s5, $zero /* 985534 80240704 080901D0 */ j .L80240740 -/* 985538 80240708 00000000 */ nop +/* 985538 80240708 00000000 */ nop .L8024070C: /* 98553C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 985540 80240710 0280282D */ daddu $a1, $s4, $zero -/* 985544 80240714 0C09006C */ jal isk_08_UnkNpcAIFunc12 +/* 985544 80240714 0C09006C */ jal func_802401B0_984FE0 /* 985548 80240718 02A0302D */ daddu $a2, $s5, $zero /* 98554C 8024071C 080901D0 */ j .L80240740 -/* 985550 80240720 00000000 */ nop +/* 985550 80240720 00000000 */ nop .L80240724: /* 985554 80240724 0280282D */ daddu $a1, $s4, $zero -/* 985558 80240728 0C0900C5 */ jal isk_08_set_script_owner_npc_col_height +/* 985558 80240728 0C0900C5 */ jal func_80240314_985144 /* 98555C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 985560 80240730 080901D0 */ j .L80240740 -/* 985564 80240734 00000000 */ nop +/* 985564 80240734 00000000 */ nop .L80240738: /* 985568 80240738 0C0129CF */ jal func_8004A73C /* 98556C 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -279,11 +279,11 @@ glabel func_80240394_9851C4 /* 9855B0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 /* 9855B4 80240784 10400009 */ beqz $v0, .L802407AC /* 9855B8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9855BC 8024078C 3C018024 */ lui $at, %hi(D_80241658) +/* 9855BC 8024078C 3C018024 */ lui $at, %hi(func_80241658_8B16C8) /* 9855C0 80240790 00220821 */ addu $at, $at, $v0 -/* 9855C4 80240794 8C221658 */ lw $v0, %lo(D_80241658)($at) +/* 9855C4 80240794 8C221658 */ lw $v0, %lo(func_80241658_8B16C8)($at) /* 9855C8 80240798 00400008 */ jr $v0 -/* 9855CC 8024079C 00000000 */ nop +/* 9855CC 8024079C 00000000 */ nop /* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s index be0aeb6788..c3875599f6 100644 --- a/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s +++ b/asm/nonmatchings/world/area_isk/isk_09/9864E0/func_80240000_9864E0.s @@ -4,8 +4,8 @@ glabel func_80240000_9864E0 /* 9864E0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 9864E4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 9864E8 80240008 3C108024 */ lui $s0, %hi(D_802406F0) -/* 9864EC 8024000C 261006F0 */ addiu $s0, $s0, %lo(D_802406F0) +/* 9864E8 80240008 3C108024 */ lui $s0, %hi(func_802406F0_92A9A0) +/* 9864EC 8024000C 261006F0 */ addiu $s0, $s0, %lo(func_802406F0_92A9A0) /* 9864F0 80240010 AFBF0018 */ sw $ra, 0x18($sp) /* 9864F4 80240014 AFB10014 */ sw $s1, 0x14($sp) /* 9864F8 80240018 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240000_9864E0 /* 98655C 8024007C 28620010 */ slti $v0, $v1, 0x10 /* 986560 80240080 1440FFFA */ bnez $v0, .L8024006C /* 986564 80240084 24840004 */ addiu $a0, $a0, 4 -/* 986568 80240088 3C108024 */ lui $s0, %hi(D_802406F0) -/* 98656C 8024008C 261006F0 */ addiu $s0, $s0, %lo(D_802406F0) +/* 986568 80240088 3C108024 */ lui $s0, %hi(func_802406F0_92A9A0) +/* 98656C 8024008C 261006F0 */ addiu $s0, $s0, %lo(func_802406F0_92A9A0) /* 986570 80240090 0C00AB4B */ jal heap_free /* 986574 80240094 8E040000 */ lw $a0, ($s0) /* 986578 80240098 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s index 236b0876ca..f8ca845b90 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s @@ -22,8 +22,8 @@ glabel func_802401CC_988D2C /* 988D70 80240210 0040982D */ daddu $s3, $v0, $zero /* 988D74 80240214 0000B02D */ daddu $s6, $zero, $zero /* 988D78 80240218 02C0902D */ daddu $s2, $s6, $zero -/* 988D7C 8024021C 3C148024 */ lui $s4, %hi(D_80241108) -/* 988D80 80240220 26941108 */ addiu $s4, $s4, %lo(D_80241108) +/* 988D7C 8024021C 3C148024 */ lui $s4, %hi(func_80241108_97EBD8) +/* 988D80 80240220 26941108 */ addiu $s4, $s4, %lo(func_80241108_97EBD8) /* 988D84 80240224 0260882D */ daddu $s1, $s3, $zero /* 988D88 80240228 8EA200B4 */ lw $v0, 0xb4($s5) /* 988D8C 8024022C 3C038024 */ lui $v1, %hi(D_80241100) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index 5a42424c27..f871cf5b9a 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_9903D0 /* 990558 80240D78 0000102D */ daddu $v0, $zero, $zero /* 99055C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 990560 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 990564 80240D84 0C09015A */ jal isk_13_UnkNpcAIFunc1 +/* 990564 80240D84 0C09015A */ jal func_80240568_98FD48 /* 990568 80240D88 0200302D */ daddu $a2, $s0, $zero /* 99056C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 990570 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240BF0_9903D0 /* 9905B8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9905BC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9905C0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9905C4 80240DE4 0C0902EB */ jal isk_13_UnkDurationCheck +/* 9905C4 80240DE4 0C0902EB */ jal func_80240BAC_99038C /* 9905C8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9905CC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s index d745e653d4..54bf98312d 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s @@ -69,9 +69,9 @@ glabel func_80240F3C_99071C /* 990818 80241038 2C62000F */ sltiu $v0, $v1, 0xf /* 99081C 8024103C 10400028 */ beqz $v0, .L802410E0 /* 990820 80241040 00031080 */ sll $v0, $v1, 2 -/* 990824 80241044 3C018024 */ lui $at, %hi(D_80242EF8) +/* 990824 80241044 3C018024 */ lui $at, %hi(func_80242EF8) /* 990828 80241048 00220821 */ addu $at, $at, $v0 -/* 99082C 8024104C 8C222EF8 */ lw $v0, %lo(D_80242EF8)($at) +/* 99082C 8024104C 8C222EF8 */ lw $v0, %lo(func_80242EF8)($at) /* 990830 80241050 00400008 */ jr $v0 /* 990834 80241054 00000000 */ nop /* 990838 80241058 0280202D */ daddu $a0, $s4, $zero @@ -86,7 +86,7 @@ glabel func_80240F3C_99071C /* 99085C 8024107C 00000000 */ nop /* 990860 80241080 0280202D */ daddu $a0, $s4, $zero /* 990864 80241084 0200282D */ daddu $a1, $s0, $zero -/* 990868 80241088 0C09015A */ jal isk_13_UnkNpcAIFunc1 +/* 990868 80241088 0C09015A */ jal func_80240568_98FD48 /* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 990870 80241090 0280202D */ daddu $a0, $s4, $zero /* 990874 80241094 0200282D */ daddu $a1, $s0, $zero @@ -106,7 +106,7 @@ glabel func_80240F3C_99071C /* 9908AC 802410CC 00000000 */ nop /* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 9908B8 802410D8 0C0902EB */ jal isk_13_UnkDurationCheck +/* 9908B8 802410D8 0C0902EB */ jal func_80240BAC_99038C /* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s index b467f8a491..1772bd2f2f 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s @@ -61,8 +61,8 @@ glabel func_80241BA8_991388 /* 991468 80241C88 3C013F36 */ lui $at, 0x3f36 /* 99146C 80241C8C 3421DB6E */ ori $at, $at, 0xdb6e /* 991470 80241C90 44810000 */ mtc1 $at, $f0 -/* 991474 80241C94 3C058024 */ lui $a1, %hi(D_80241610) -/* 991478 80241C98 24A51610 */ addiu $a1, $a1, %lo(D_80241610) +/* 991474 80241C94 3C058024 */ lui $a1, %hi(func_80241610_98F248) +/* 991478 80241C98 24A51610 */ addiu $a1, $a1, %lo(func_80241610_98F248) /* 99147C 80241C9C AE000020 */ sw $zero, 0x20($s0) /* 991480 80241CA0 AE000024 */ sw $zero, 0x24($s0) /* 991484 80241CA4 E6020028 */ swc1 $f2, 0x28($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s index 46b9f25540..8da381eb07 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240230_992960.s @@ -83,8 +83,8 @@ glabel func_80240230_992960 /* 992A8C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c /* 992A90 80240360 C6000038 */ lwc1 $f0, 0x38($s0) /* 992A94 80240364 860200A6 */ lh $v0, 0xa6($s0) -/* 992A98 80240368 3C018024 */ lui $at, %hi(D_80242A30) -/* 992A9C 8024036C D4222A30 */ ldc1 $f2, %lo(D_80242A30)($at) +/* 992A98 80240368 3C018024 */ lui $at, %hi(func_80242A30_7ED740) +/* 992A9C 8024036C D4222A30 */ ldc1 $f2, %lo(func_80242A30_7ED740)($at) /* 992AA0 80240370 27A60030 */ addiu $a2, $sp, 0x30 /* 992AA4 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) /* 992AA8 80240378 44820000 */ mtc1 $v0, $f0 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index 39e6ea9bac..dfc74bba7c 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -105,7 +105,7 @@ glabel func_80240BF0_993320 /* 9934A8 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9934AC 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9934B0 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9934B4 80240D84 0C09015A */ jal isk_14_UnkNpcAIFunc1 +/* 9934B4 80240D84 0C09015A */ jal func_80240568_992C98 /* 9934B8 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9934BC 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9934C0 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240BF0_993320 /* 993508 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 99350C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 993510 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 993514 80240DE4 0C0902EB */ jal isk_14_UnkDurationCheck +/* 993514 80240DE4 0C0902EB */ jal func_80240BAC_9932DC /* 993518 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 99351C 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s index 82bf0ad38c..bc3e9487e6 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s @@ -86,7 +86,7 @@ glabel func_80240F3C_99366C /* 9937AC 8024107C 00000000 */ nop /* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero /* 9937B4 80241084 0200282D */ daddu $a1, $s0, $zero -/* 9937B8 80241088 0C09015A */ jal isk_14_UnkNpcAIFunc1 +/* 9937B8 80241088 0C09015A */ jal func_80240568_992C98 /* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero /* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero /* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero @@ -106,7 +106,7 @@ glabel func_80240F3C_99366C /* 9937FC 802410CC 00000000 */ nop /* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero /* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 993808 802410D8 0C0902EB */ jal isk_14_UnkDurationCheck +/* 993808 802410D8 0C0902EB */ jal func_80240BAC_9932DC /* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s index 96778cdf3b..3318107451 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241610_993D40.s @@ -40,8 +40,8 @@ glabel func_80241610_993D40 /* 993DCC 8024169C 24C200A0 */ addiu $v0, $a2, 0xa0 /* 993DD0 802416A0 AC820004 */ sw $v0, 4($a0) /* 993DD4 802416A4 94C20000 */ lhu $v0, ($a2) -/* 993DD8 802416A8 3C1E8024 */ lui $fp, %hi(D_80242AC0) -/* 993DDC 802416AC 27DE2AC0 */ addiu $fp, $fp, %lo(D_80242AC0) +/* 993DD8 802416A8 3C1E8024 */ lui $fp, %hi(func_80242AC0) +/* 993DDC 802416AC 27DE2AC0 */ addiu $fp, $fp, %lo(func_80242AC0) /* 993DE0 802416B0 30420010 */ andi $v0, $v0, 0x10 /* 993DE4 802416B4 14400007 */ bnez $v0, .L802416D4 /* 993DE8 802416B8 24C400D4 */ addiu $a0, $a2, 0xd4 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s index b22b5da554..206f7bcda6 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s @@ -11,8 +11,8 @@ glabel func_80241AF0_994220 /* 994238 80241B08 84440008 */ lh $a0, 8($v0) /* 99423C 80241B0C 27A40010 */ addiu $a0, $sp, 0x10 /* 994240 80241B10 24050035 */ addiu $a1, $zero, 0x35 -/* 994244 80241B14 3C108024 */ lui $s0, %hi(D_80242AC0) -/* 994248 80241B18 26102AC0 */ addiu $s0, $s0, %lo(D_80242AC0) +/* 994244 80241B14 3C108024 */ lui $s0, %hi(func_80242AC0) +/* 994248 80241B18 26102AC0 */ addiu $s0, $s0, %lo(func_80242AC0) /* 99424C 80241B1C 00A0182D */ daddu $v1, $a1, $zero /* 994250 80241B20 0040882D */ daddu $s1, $v0, $zero /* 994254 80241B24 0000302D */ daddu $a2, $zero, $zero @@ -36,8 +36,8 @@ glabel func_80241AF0_994220 /* 99429C 80241B6C 3C013F36 */ lui $at, 0x3f36 /* 9942A0 80241B70 3421DB6E */ ori $at, $at, 0xdb6e /* 9942A4 80241B74 44810000 */ mtc1 $at, $f0 -/* 9942A8 80241B78 3C058024 */ lui $a1, %hi(D_80241610) -/* 9942AC 80241B7C 24A51610 */ addiu $a1, $a1, %lo(D_80241610) +/* 9942A8 80241B78 3C058024 */ lui $a1, %hi(func_80241610_992250) +/* 9942AC 80241B7C 24A51610 */ addiu $a1, $a1, %lo(func_80241610_992250) /* 9942B0 80241B80 AE00001C */ sw $zero, 0x1c($s0) /* 9942B4 80241B84 AE000020 */ sw $zero, 0x20($s0) /* 9942B8 80241B88 AE000024 */ sw $zero, 0x24($s0) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s index dd4bb0fcaa..0fd7b616a0 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BEC_99431C.s @@ -23,8 +23,8 @@ glabel func_80241BEC_99431C /* 994364 80241C34 44102000 */ mfc1 $s0, $f4 /* 994368 80241C38 0C0B210B */ jal get_float_variable /* 99436C 80241C3C 0220202D */ daddu $a0, $s1, $zero -/* 994370 80241C40 3C038024 */ lui $v1, %hi(D_80242AC0) -/* 994374 80241C44 24632AC0 */ addiu $v1, $v1, %lo(D_80242AC0) +/* 994370 80241C40 3C038024 */ lui $v1, %hi(func_80242AC0) +/* 994374 80241C44 24632AC0 */ addiu $v1, $v1, %lo(func_80242AC0) /* 994378 80241C48 44921000 */ mtc1 $s2, $f2 /* 99437C 80241C4C 00000000 */ nop /* 994380 80241C50 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s index 561799b425..66e77aab7b 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s @@ -23,8 +23,8 @@ glabel func_80241CA0_9943D0 /* 994418 80241CE8 44102000 */ mfc1 $s0, $f4 /* 99441C 80241CEC 0C0B210B */ jal get_float_variable /* 994420 80241CF0 0220202D */ daddu $a0, $s1, $zero -/* 994424 80241CF4 3C038024 */ lui $v1, %hi(D_80242AC0) -/* 994428 80241CF8 24632AC0 */ addiu $v1, $v1, %lo(D_80242AC0) +/* 994424 80241CF4 3C038024 */ lui $v1, %hi(func_80242AC0) +/* 994428 80241CF8 24632AC0 */ addiu $v1, $v1, %lo(func_80242AC0) /* 99442C 80241CFC 44921000 */ mtc1 $s2, $f2 /* 994430 80241D00 00000000 */ nop /* 994434 80241D04 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s index 4ebac89bd6..cb507a85b9 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s @@ -55,8 +55,8 @@ glabel func_8024007C_997FEC /* 9980A8 80240138 8C470030 */ lw $a3, 0x30($v0) /* 9980AC 8024013C C6020018 */ lwc1 $f2, 0x18($s0) /* 9980B0 80240140 46020003 */ div.s $f0, $f0, $f2 -/* 9980B4 80240144 3C018024 */ lui $at, %hi(D_80241770) -/* 9980B8 80240148 D4221770 */ ldc1 $f2, %lo(D_80241770)($at) +/* 9980B4 80240144 3C018024 */ lui $at, %hi(func_80241770_832F70) +/* 9980B8 80240148 D4221770 */ ldc1 $f2, %lo(func_80241770_832F70)($at) /* 9980BC 8024014C 46000021 */ cvt.d.s $f0, $f0 /* 9980C0 80240150 46220000 */ add.d $f0, $f0, $f2 /* 9980C4 80240154 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index d7b07a228f..aa0a3364b3 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -55,7 +55,7 @@ glabel func_80240394_998304 /* 9983C8 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 9983CC 8024045C 30420004 */ andi $v0, $v0, 4 /* 9983D0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9983D4 80240464 00000000 */ nop +/* 9983D4 80240464 00000000 */ nop .L80240468: /* 9983D8 80240468 AE600070 */ sw $zero, 0x70($s3) /* 9983DC 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_998304 /* 998480 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 998484 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 998488 80240518 44833000 */ mtc1 $v1, $f6 -/* 99848C 8024051C 00000000 */ nop +/* 99848C 8024051C 00000000 */ nop /* 998490 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 998494 80240524 44073000 */ mfc1 $a3, $f6 /* 998498 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_998304 /* 998550 802405E0 10600015 */ beqz $v1, .L80240638 /* 998554 802405E4 0260202D */ daddu $a0, $s3, $zero /* 998558 802405E8 080901D0 */ j .L80240740 -/* 99855C 802405EC 00000000 */ nop +/* 99855C 802405EC 00000000 */ nop .L802405F0: /* 998560 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 998564 802405F4 24020003 */ addiu $v0, $zero, 3 /* 998568 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 99856C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 998570 80240600 080901D0 */ j .L80240740 -/* 998574 80240604 00000000 */ nop +/* 998574 80240604 00000000 */ nop .L80240608: /* 998578 80240608 2402000E */ addiu $v0, $zero, 0xe /* 99857C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_998304 /* 998590 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 998594 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 998598 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 99859C 8024062C 00000000 */ nop +/* 99859C 8024062C 00000000 */ nop /* 9985A0 80240630 080901D0 */ j .L80240740 -/* 9985A4 80240634 00000000 */ nop +/* 9985A4 80240634 00000000 */ nop .L80240638: /* 9985A8 80240638 0280282D */ daddu $a1, $s4, $zero /* 9985AC 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_998304 /* 9985C4 80240654 0C0125AE */ jal func_800496B8 /* 9985C8 80240658 02A0302D */ daddu $a2, $s5, $zero /* 9985CC 8024065C 080901D0 */ j .L80240740 -/* 9985D0 80240660 00000000 */ nop +/* 9985D0 80240660 00000000 */ nop .L80240664: /* 9985D4 80240664 0260202D */ daddu $a0, $s3, $zero /* 9985D8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9985DC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9985DC 8024066C 0C0126D1 */ jal func_80049B44 /* 9985E0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9985E4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9985E8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240394_998304 /* 998644 802406D4 0C012701 */ jal func_80049C04 /* 998648 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 99864C 802406DC 080901D0 */ j .L80240740 -/* 998650 802406E0 00000000 */ nop +/* 998650 802406E0 00000000 */ nop .L802406E4: /* 998654 802406E4 0260202D */ daddu $a0, $s3, $zero /* 998658 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 99865C 802406EC 0C090000 */ jal isk_18_set_script_owner_npc_anim +/* 99865C 802406EC 0C090000 */ jal func_80240000_997F70 /* 998660 802406F0 02A0302D */ daddu $a2, $s5, $zero /* 998664 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: @@ -240,20 +240,20 @@ glabel func_80240394_998304 /* 99866C 802406FC 0C09001F */ jal func_8024007C_997FEC /* 998670 80240700 02A0302D */ daddu $a2, $s5, $zero /* 998674 80240704 080901D0 */ j .L80240740 -/* 998678 80240708 00000000 */ nop +/* 998678 80240708 00000000 */ nop .L8024070C: /* 99867C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 998680 80240710 0280282D */ daddu $a1, $s4, $zero -/* 998684 80240714 0C09006C */ jal isk_18_UnkNpcAIFunc12 +/* 998684 80240714 0C09006C */ jal func_802401B0_998120 /* 998688 80240718 02A0302D */ daddu $a2, $s5, $zero /* 99868C 8024071C 080901D0 */ j .L80240740 -/* 998690 80240720 00000000 */ nop +/* 998690 80240720 00000000 */ nop .L80240724: /* 998694 80240724 0280282D */ daddu $a1, $s4, $zero -/* 998698 80240728 0C0900C5 */ jal isk_18_set_script_owner_npc_col_height +/* 998698 80240728 0C0900C5 */ jal func_80240314_998284 /* 99869C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9986A0 80240730 080901D0 */ j .L80240740 -/* 9986A4 80240734 00000000 */ nop +/* 9986A4 80240734 00000000 */ nop .L80240738: /* 9986A8 80240738 0C0129CF */ jal func_8004A73C /* 9986AC 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_998304 /* 998700 80240790 00220821 */ addu $at, $at, $v0 /* 998704 80240794 8C221778 */ lw $v0, %lo(D_80241778)($at) /* 998708 80240798 00400008 */ jr $v0 -/* 99870C 8024079C 00000000 */ nop +/* 99870C 8024079C 00000000 */ nop /* 998710 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 998714 802407A4 24420001 */ addiu $v0, $v0, 1 /* 998718 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s index b4e8341a1e..98b3a909fc 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240000_90F6B0.s @@ -29,12 +29,12 @@ glabel func_80240000_90F6B0 /* 90F710 80240060 3C140001 */ lui $s4, 1 /* 90F714 80240064 36941630 */ ori $s4, $s4, 0x1630 /* 90F718 80240068 26300018 */ addiu $s0, $s1, 0x18 -/* 90F71C 8024006C 3C01C1F0 */ lui $at, %hi(D_C1F06370) +/* 90F71C 8024006C 3C01C1F0 */ lui $at, 0xc1f0 /* 90F720 80240070 4481C000 */ mtc1 $at, $f24 /* 90F724 80240074 3C014120 */ lui $at, 0x4120 /* 90F728 80240078 4481B000 */ mtc1 $at, $f22 /* 90F72C 8024007C 3C018024 */ lui $at, %hi(D_80246370) -/* 90F730 80240080 D4346370 */ ldc1 $f20, %lo(D_C1F06370)($at) +/* 90F730 80240080 D4346370 */ ldc1 $f20, %lo(D_80246370)($at) .L80240084: /* 90F734 80240084 C600FFEC */ lwc1 $f0, -0x14($s0) /* 90F738 80240088 4618003C */ c.lt.s $f0, $f24 @@ -196,10 +196,10 @@ glabel func_80240000_90F6B0 /* 90F99C 802402EC 24820008 */ addiu $v0, $a0, 8 /* 90F9A0 802402F0 ACA30004 */ sw $v1, 4($a1) /* 90F9A4 802402F4 AE420000 */ sw $v0, ($s2) -/* 90F9A8 802402F8 3C02DE00 */ lui $v0, %hi(D_DE003E00) +/* 90F9A8 802402F8 3C02DE00 */ lui $v0, 0xde00 /* 90F9AC 802402FC AC820000 */ sw $v0, ($a0) /* 90F9B0 80240300 3C028024 */ lui $v0, %hi(D_80243E00) -/* 90F9B4 80240304 24423E00 */ addiu $v0, $v0, %lo(D_DE003E00) +/* 90F9B4 80240304 24423E00 */ addiu $v0, $v0, %lo(D_80243E00) /* 90F9B8 80240308 AC820004 */ sw $v0, 4($a0) /* 90F9BC 8024030C 24820010 */ addiu $v0, $a0, 0x10 /* 90F9C0 80240310 AE420000 */ sw $v0, ($s2) diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index 9f58dafa23..17015ab0ee 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -46,7 +46,7 @@ glabel func_80241F6C_91161C /* 9116C0 80242010 8E4200B0 */ lw $v0, 0xb0($s2) /* 9116C4 80242014 30420004 */ andi $v0, $v0, 4 /* 9116C8 80242018 1040002F */ beqz $v0, .L802420D8 -/* 9116CC 8024201C 00000000 */ nop +/* 9116CC 8024201C 00000000 */ nop .L80242020: /* 9116D0 80242020 2404F7FF */ addiu $a0, $zero, -0x801 /* 9116D4 80242024 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241F6C_91161C /* 91179C 802420EC 00220821 */ addu $at, $at, $v0 /* 9117A0 802420F0 8C226430 */ lw $v0, %lo(D_80246430)($at) /* 9117A4 802420F4 00400008 */ jr $v0 -/* 9117A8 802420F8 00000000 */ nop +/* 9117A8 802420F8 00000000 */ nop /* 9117AC 802420FC 0260202D */ daddu $a0, $s3, $zero /* 9117B0 80242100 0200282D */ daddu $a1, $s0, $zero /* 9117B4 80242104 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241F6C_91161C /* 9117C4 80242114 0C0125AE */ jal func_800496B8 /* 9117C8 80242118 02A0302D */ daddu $a2, $s5, $zero /* 9117CC 8024211C 08090899 */ j .L80242264 -/* 9117D0 80242120 00000000 */ nop +/* 9117D0 80242120 00000000 */ nop /* 9117D4 80242124 0260202D */ daddu $a0, $s3, $zero /* 9117D8 80242128 0200282D */ daddu $a1, $s0, $zero -/* 9117DC 8024212C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9117DC 8024212C 0C0126D1 */ jal func_80049B44 /* 9117E0 80242130 02A0302D */ daddu $a2, $s5, $zero /* 9117E4 80242134 0260202D */ daddu $a0, $s3, $zero /* 9117E8 80242138 0200282D */ daddu $a1, $s0, $zero /* 9117EC 8024213C 0C012701 */ jal func_80049C04 /* 9117F0 80242140 02A0302D */ daddu $a2, $s5, $zero /* 9117F4 80242144 08090899 */ j .L80242264 -/* 9117F8 80242148 00000000 */ nop +/* 9117F8 80242148 00000000 */ nop /* 9117FC 8024214C 0260202D */ daddu $a0, $s3, $zero /* 911800 80242150 0200282D */ daddu $a1, $s0, $zero /* 911804 80242154 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241F6C_91161C /* 911814 80242164 0C0127B3 */ jal func_80049ECC /* 911818 80242168 02A0302D */ daddu $a2, $s5, $zero /* 91181C 8024216C 08090899 */ j .L80242264 -/* 911820 80242170 00000000 */ nop +/* 911820 80242170 00000000 */ nop /* 911824 80242174 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* 911828 80242178 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* 91182C 8024217C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241F6C_91161C /* 911844 80242194 10400008 */ beqz $v0, .L802421B8 /* 911848 80242198 46000086 */ mov.s $f2, $f0 /* 91184C 8024219C 44820000 */ mtc1 $v0, $f0 -/* 911850 802421A0 00000000 */ nop +/* 911850 802421A0 00000000 */ nop /* 911854 802421A4 46800020 */ cvt.s.w $f0, $f0 /* 911858 802421A8 4602003C */ c.lt.s $f0, $f2 -/* 91185C 802421AC 00000000 */ nop +/* 91185C 802421AC 00000000 */ nop /* 911860 802421B0 4500000B */ bc1f .L802421E0 /* 911864 802421B4 0260202D */ daddu $a0, $s3, $zero .L802421B8: @@ -164,7 +164,7 @@ glabel func_80241F6C_91161C /* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) /* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc /* 911884 802421D4 14620023 */ bne $v1, $v0, .L80242264 -/* 911888 802421D8 00000000 */ nop +/* 911888 802421D8 00000000 */ nop /* 91188C 802421DC 0260202D */ daddu $a0, $s3, $zero .L802421E0: /* 911890 802421E0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241F6C_91161C /* 9118A4 802421F4 0C012849 */ jal func_8004A124 /* 9118A8 802421F8 02A0302D */ daddu $a2, $s5, $zero /* 9118AC 802421FC 08090899 */ j .L80242264 -/* 9118B0 80242200 00000000 */ nop +/* 9118B0 80242200 00000000 */ nop /* 9118B4 80242204 0260202D */ daddu $a0, $s3, $zero /* 9118B8 80242208 0200282D */ daddu $a1, $s0, $zero /* 9118BC 8024220C 0C0128FA */ jal func_8004A3E8 /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero /* 9118C4 80242214 08090899 */ j .L80242264 -/* 9118C8 80242218 00000000 */ nop +/* 9118C8 80242218 00000000 */ nop /* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 -/* 9118D8 80242228 00000000 */ nop -/* 9118DC 8024222C 0C090255 */ jal iwa_01_UnkSetDurationFunc +/* 9118D8 80242228 00000000 */ nop +/* 9118DC 8024222C 0C090255 */ jal func_80240954_910004 /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 -/* 9118E8 80242238 00000000 */ nop -/* 9118EC 8024223C 0C090266 */ jal iwa_01_UnkNpcAIFunc9 +/* 9118E8 80242238 00000000 */ nop +/* 9118EC 8024223C 0C090266 */ jal func_80240998_910048 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 -/* 9118F8 80242248 00000000 */ nop -/* 9118FC 8024224C 0C09028E */ jal iwa_01_UnkDurationCheck +/* 9118F8 80242248 00000000 */ nop +/* 9118FC 8024224C 0C09028E */ jal func_80240A38_9100E8 /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 -/* 911908 80242258 00000000 */ nop +/* 911908 80242258 00000000 */ nop /* 91190C 8024225C 0C0129CF */ jal func_8004A73C /* 911910 80242260 0260202D */ daddu $a0, $s3, $zero .L80242264: diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s index ea3e39c132..42135cffca 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s @@ -71,7 +71,7 @@ glabel func_80242F54_912604 /* 912700 80243050 8E4300B0 */ lw $v1, 0xb0($s2) /* 912704 80243054 30620004 */ andi $v0, $v1, 4 /* 912708 80243058 10400007 */ beqz $v0, .L80243078 -/* 91270C 8024305C 00000000 */ nop +/* 91270C 8024305C 00000000 */ nop /* 912710 80243060 824200B4 */ lb $v0, 0xb4($s2) /* 912714 80243064 14400086 */ bnez $v0, .L80243280 /* 912718 80243068 0000102D */ daddu $v0, $zero, $zero @@ -99,7 +99,7 @@ glabel func_80242F54_912604 /* 912768 802430B8 00220821 */ addu $at, $at, $v0 /* 91276C 802430BC 8C2265E8 */ lw $v0, %lo(D_802465E8)($at) /* 912770 802430C0 00400008 */ jr $v0 -/* 912774 802430C4 00000000 */ nop +/* 912774 802430C4 00000000 */ nop /* 912778 802430C8 0260202D */ daddu $a0, $s3, $zero /* 91277C 802430CC 0280282D */ daddu $a1, $s4, $zero /* 912780 802430D0 0C090909 */ jal func_80242424_911AD4 @@ -207,7 +207,7 @@ glabel func_80242F54_912604 /* 912918 80243268 0000102D */ daddu $v0, $zero, $zero /* 91291C 8024326C 0260202D */ daddu $a0, $s3, $zero /* 912920 80243270 0280282D */ daddu $a1, $s4, $zero -/* 912924 80243274 0C090BC4 */ jal dup_iwa_01_UnkDurationCheck +/* 912924 80243274 0C090BC4 */ jal func_80242F10_9125C0 /* 912928 80243278 0200302D */ daddu $a2, $s0, $zero .L8024327C: /* 91292C 8024327C 0000102D */ daddu $v0, $zero, $zero @@ -221,6 +221,6 @@ glabel func_80242F54_912604 /* 912948 80243298 8FB00030 */ lw $s0, 0x30($sp) /* 91294C 8024329C 03E00008 */ jr $ra /* 912950 802432A0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 912954 802432A4 00000000 */ nop -/* 912958 802432A8 00000000 */ nop -/* 91295C 802432AC 00000000 */ nop +/* 912954 802432A4 00000000 */ nop +/* 912958 802432A8 00000000 */ nop +/* 91295C 802432AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s index e1eb3ac9c4..16c7bc32f4 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s @@ -207,7 +207,7 @@ glabel func_80240C90_916A00 /* 916D14 80240FA4 0000102D */ daddu $v0, $zero, $zero /* 916D18 80240FA8 0260202D */ daddu $a0, $s3, $zero /* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 916D20 80240FB0 0C090313 */ jal iwa_02_UnkDurationCheck +/* 916D20 80240FB0 0C090313 */ jal func_80240C4C_9169BC /* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: /* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s index 394a7e943f..8ab6fa136d 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_80240000_918BB0.s @@ -4,8 +4,8 @@ glabel func_80240000_918BB0 /* 918BB0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 918BB4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 918BB8 80240008 3C108024 */ lui $s0, %hi(D_80241530) -/* 918BBC 8024000C 26101530 */ addiu $s0, $s0, %lo(D_80241530) +/* 918BB8 80240008 3C108024 */ lui $s0, %hi(func_80241530_8ED350) +/* 918BBC 8024000C 26101530 */ addiu $s0, $s0, %lo(func_80241530_8ED350) /* 918BC0 80240010 AFBF0018 */ sw $ra, 0x18($sp) /* 918BC4 80240014 AFB10014 */ sw $s1, 0x14($sp) /* 918BC8 80240018 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240000_918BB0 /* 918C2C 8024007C 28620010 */ slti $v0, $v1, 0x10 /* 918C30 80240080 1440FFFA */ bnez $v0, .L8024006C /* 918C34 80240084 24840004 */ addiu $a0, $a0, 4 -/* 918C38 80240088 3C108024 */ lui $s0, %hi(D_80241530) -/* 918C3C 8024008C 26101530 */ addiu $s0, $s0, %lo(D_80241530) +/* 918C38 80240088 3C108024 */ lui $s0, %hi(func_80241530_8ED350) +/* 918C3C 8024008C 26101530 */ addiu $s0, $s0, %lo(func_80241530_8ED350) /* 918C40 80240090 0C00AB4B */ jal heap_free /* 918C44 80240094 8E040000 */ lw $a0, ($s0) /* 918C48 80240098 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s index 07dc105c2a..b2a2afc77f 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s @@ -83,8 +83,8 @@ glabel func_802409D4_919584 /* 9196B8 80240B08 8C470030 */ lw $a3, 0x30($v0) /* 9196BC 80240B0C C6020018 */ lwc1 $f2, 0x18($s0) /* 9196C0 80240B10 46020003 */ div.s $f0, $f0, $f2 -/* 9196C4 80240B14 3C018024 */ lui $at, %hi(D_80242C48) -/* 9196C8 80240B18 D4222C48 */ ldc1 $f2, %lo(D_80242C48)($at) +/* 9196C4 80240B14 3C018024 */ lui $at, %hi(func_80242C48_9122F8) +/* 9196C8 80240B18 D4222C48 */ ldc1 $f2, %lo(func_80242C48_9122F8)($at) /* 9196CC 80240B1C 46000021 */ cvt.d.s $f0, $f0 /* 9196D0 80240B20 46220000 */ add.d $f0, $f0, $f2 /* 9196D4 80240B24 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s index 23f02db23a..eda4531d93 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s @@ -207,7 +207,7 @@ glabel func_80240FD0_919B80 /* 919E94 802412E4 0000102D */ daddu $v0, $zero, $zero /* 919E98 802412E8 0260202D */ daddu $a0, $s3, $zero /* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero -/* 919EA0 802412F0 0C0903E3 */ jal iwa_03_UnkDurationCheck +/* 919EA0 802412F0 0C0903E3 */ jal func_80240F8C_919B3C /* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero .L802412F8: /* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s index 57ee38493c..b5d9639280 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s @@ -38,8 +38,8 @@ glabel func_80240080_91B960 /* 91B9E4 80240104 0002802B */ sltu $s0, $zero, $v0 /* 91B9E8 80240108 0C00A6C9 */ jal clamp_angle /* 91B9EC 8024010C 46000306 */ mov.s $f12, $f0 -/* 91B9F0 80240110 3C018024 */ lui $at, %hi(D_80242B90) -/* 91B9F4 80240114 D4222B90 */ ldc1 $f2, %lo(D_80242B90)($at) +/* 91B9F0 80240110 3C018024 */ lui $at, %hi(func_80242B90_803410) +/* 91B9F4 80240114 D4222B90 */ ldc1 $f2, %lo(func_80242B90_803410)($at) /* 91B9F8 80240118 46000021 */ cvt.d.s $f0, $f0 /* 91B9FC 8024011C 4622003C */ c.lt.d $f0, $f2 /* 91BA00 80240120 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s index f811b517cc..54015bb640 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s @@ -83,8 +83,8 @@ glabel func_80240714_91BFF4 /* 91C128 80240848 8C470030 */ lw $a3, 0x30($v0) /* 91C12C 8024084C C6020018 */ lwc1 $f2, 0x18($s0) /* 91C130 80240850 46020003 */ div.s $f0, $f0, $f2 -/* 91C134 80240854 3C018024 */ lui $at, %hi(D_80242BA8) -/* 91C138 80240858 D4222BA8 */ ldc1 $f2, %lo(D_80242BA8)($at) +/* 91C134 80240854 3C018024 */ lui $at, %hi(func_80242BA8_8B2C18) +/* 91C138 80240858 D4222BA8 */ ldc1 $f2, %lo(func_80242BA8_8B2C18)($at) /* 91C13C 8024085C 46000021 */ cvt.d.s $f0, $f0 /* 91C140 80240860 46220000 */ add.d $f0, $f0, $f2 /* 91C144 80240864 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s index 3eb47f22e1..5fbb75fc54 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s @@ -207,7 +207,7 @@ glabel func_80240D10_91C5F0 /* 91C904 80241024 0000102D */ daddu $v0, $zero, $zero /* 91C908 80241028 0260202D */ daddu $a0, $s3, $zero /* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero -/* 91C910 80241030 0C090333 */ jal iwa_04_UnkDurationCheck +/* 91C910 80241030 0C090333 */ jal func_80240CCC_91C5AC /* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero .L80241038: /* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s index 7e9b3a6a87..a4f603dab1 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s +++ b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s @@ -4,8 +4,8 @@ glabel func_80240280_926C70 /* 926C70 80240280 8C860084 */ lw $a2, 0x84($a0) /* 926C74 80240284 0000282D */ daddu $a1, $zero, $zero -/* 926C78 80240288 3C038024 */ lui $v1, %hi(D_80242148) -/* 926C7C 8024028C 24632148 */ addiu $v1, $v1, %lo(D_80242148) +/* 926C78 80240288 3C038024 */ lui $v1, %hi(func_80242148_825408) +/* 926C7C 8024028C 24632148 */ addiu $v1, $v1, %lo(func_80242148_825408) .L80240290: /* 926C80 80240290 8C620000 */ lw $v0, ($v1) /* 926C84 80240294 00C2102A */ slt $v0, $a2, $v0 @@ -18,8 +18,8 @@ glabel func_80240280_926C70 /* 926CA0 802402B0 24A3FFFF */ addiu $v1, $a1, -1 .L802402B4: /* 926CA4 802402B4 0000282D */ daddu $a1, $zero, $zero -/* 926CA8 802402B8 3C078024 */ lui $a3, %hi(D_80242148) -/* 926CAC 802402BC 24E72148 */ addiu $a3, $a3, %lo(D_80242148) +/* 926CA8 802402B8 3C078024 */ lui $a3, %hi(func_80242148_825408) +/* 926CAC 802402BC 24E72148 */ addiu $a3, $a3, %lo(func_80242148_825408) /* 926CB0 802402C0 000310C0 */ sll $v0, $v1, 3 /* 926CB4 802402C4 00431023 */ subu $v0, $v0, $v1 /* 926CB8 802402C8 00023080 */ sll $a2, $v0, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s index db340f9bd0..536c6f7f73 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s @@ -25,8 +25,8 @@ glabel func_802411EC_B2172C /* B2177C 8024123C 0040802D */ daddu $s0, $v0, $zero /* B21780 80241240 12000034 */ beqz $s0, .L80241314 /* B21784 80241244 24020002 */ addiu $v0, $zero, 2 -/* B21788 80241248 3C038024 */ lui $v1, %hi(D_80245950) -/* B2178C 8024124C 24635950 */ addiu $v1, $v1, %lo(D_80245950) +/* B21788 80241248 3C038024 */ lui $v1, %hi(func_80245950_8061D0) +/* B2178C 8024124C 24635950 */ addiu $v1, $v1, %lo(func_80245950_8061D0) /* B21790 80241250 8C640000 */ lw $a0, ($v1) /* B21794 80241254 24820004 */ addiu $v0, $a0, 4 /* B21798 80241258 AC620000 */ sw $v0, ($v1) @@ -50,8 +50,8 @@ glabel func_802411EC_B2172C /* B217DC 8024129C 14620011 */ bne $v1, $v0, .L802412E4 /* B217E0 802412A0 0220202D */ daddu $a0, $s1, $zero .L802412A4: -/* B217E4 802412A4 3C028024 */ lui $v0, %hi(D_80245950) -/* B217E8 802412A8 8C425950 */ lw $v0, %lo(D_80245950)($v0) +/* B217E4 802412A4 3C028024 */ lui $v0, %hi(func_80245950_8061D0) +/* B217E8 802412A8 8C425950 */ lw $v0, %lo(func_80245950_8061D0)($v0) /* B217EC 802412AC 44826000 */ mtc1 $v0, $f12 /* B217F0 802412B0 00000000 */ nop /* B217F4 802412B4 04410006 */ bgez $v0, .L802412D0 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index 9b11943d8b..f305a1dbd7 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -105,7 +105,7 @@ glabel func_80240F30_B28F60 /* B290E8 802410B8 0000102D */ daddu $v0, $zero, $zero /* B290EC 802410BC 0260202D */ daddu $a0, $s3, $zero /* B290F0 802410C0 0280282D */ daddu $a1, $s4, $zero -/* B290F4 802410C4 0C09022A */ jal jan_01_UnkNpcAIFunc1 +/* B290F4 802410C4 0C09022A */ jal func_802408A8_B288D8 /* B290F8 802410C8 0200302D */ daddu $a2, $s0, $zero /* B290FC 802410CC 8E630070 */ lw $v1, 0x70($s3) /* B29100 802410D0 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240F30_B28F60 /* B29148 80241118 0000102D */ daddu $v0, $zero, $zero /* B2914C 8024111C 0260202D */ daddu $a0, $s3, $zero /* B29150 80241120 0280282D */ daddu $a1, $s4, $zero -/* B29154 80241124 0C0903BB */ jal jan_01_UnkDurationCheck +/* B29154 80241124 0C0903BB */ jal func_80240EEC_B28F1C /* B29158 80241128 0200302D */ daddu $a2, $s0, $zero .L8024112C: /* B2915C 8024112C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index 5e06ba14c4..485d411213 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -141,7 +141,7 @@ glabel func_80240FC4_B2D434 /* B2D63C 802411CC 00000000 */ nop /* B2D640 802411D0 0280202D */ daddu $a0, $s4, $zero /* B2D644 802411D4 0260282D */ daddu $a1, $s3, $zero -/* B2D648 802411D8 0C09020C */ jal jan_02_UnkNpcAIFunc1 +/* B2D648 802411D8 0C09020C */ jal func_80240830_B2CCA0 /* B2D64C 802411DC 02A0302D */ daddu $a2, $s5, $zero /* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero /* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240FC4_B2D434 /* B2D67C 8024120C 00000000 */ nop /* B2D680 80241210 0280202D */ daddu $a0, $s4, $zero /* B2D684 80241214 0260282D */ daddu $a1, $s3, $zero -/* B2D688 80241218 0C0902D8 */ jal jan_02_NpcJumpFunc2 +/* B2D688 80241218 0C0902D8 */ jal func_80240B60_B2CFD0 /* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero /* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero /* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero -/* B2D698 80241228 0C0902F5 */ jal jan_02_NpcJumpFunc +/* B2D698 80241228 0C0902F5 */ jal func_80240BD4_B2D044 /* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero /* B2D6A0 80241230 080904A6 */ j .L80241298 /* B2D6A4 80241234 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240FC4_B2D434 /* B2D6CC 8024125C 00000000 */ nop /* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero /* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero -/* B2D6D8 80241268 0C0903A7 */ jal jan_02_UnkNpcDurationFlagFunc +/* B2D6D8 80241268 0C0903A7 */ jal func_80240E9C_B2D30C /* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero /* B2D6E0 80241270 080904A6 */ j .L80241298 /* B2D6E4 80241274 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s index 1bc4e676bd..ca114974b2 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241614_B2DA84.s @@ -4,8 +4,8 @@ glabel func_80241614_B2DA84 /* B2DA84 80241614 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B2DA88 80241618 AFB00010 */ sw $s0, 0x10($sp) -/* B2DA8C 8024161C 3C108024 */ lui $s0, %hi(D_802431E4) -/* B2DA90 80241620 261031E4 */ addiu $s0, $s0, %lo(D_802431E4) +/* B2DA8C 8024161C 3C108024 */ lui $s0, %hi(func_802431E4_8B3254) +/* B2DA90 80241620 261031E4 */ addiu $s0, $s0, %lo(func_802431E4_8B3254) /* B2DA94 80241624 AFBF0018 */ sw $ra, 0x18($sp) /* B2DA98 80241628 AFB10014 */ sw $s1, 0x14($sp) /* B2DA9C 8024162C 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80241614_B2DA84 /* B2DB00 80241690 28620010 */ slti $v0, $v1, 0x10 /* B2DB04 80241694 1440FFFA */ bnez $v0, .L80241680 /* B2DB08 80241698 24840004 */ addiu $a0, $a0, 4 -/* B2DB0C 8024169C 3C108024 */ lui $s0, %hi(D_802431E4) -/* B2DB10 802416A0 261031E4 */ addiu $s0, $s0, %lo(D_802431E4) +/* B2DB0C 8024169C 3C108024 */ lui $s0, %hi(func_802431E4_8B3254) +/* B2DB10 802416A0 261031E4 */ addiu $s0, $s0, %lo(func_802431E4_8B3254) /* B2DB14 802416A4 0C00AB4B */ jal heap_free /* B2DB18 802416A8 8E040000 */ lw $a0, ($s0) /* B2DB1C 802416AC AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s index aac2c77f95..30dccd5cc8 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s @@ -9,8 +9,8 @@ glabel func_80241974_B2DDE4 /* B2DDF4 80241984 8C84014C */ lw $a0, 0x14c($a0) /* B2DDF8 80241988 24040008 */ addiu $a0, $zero, 8 /* B2DDFC 8024198C 0040802D */ daddu $s0, $v0, $zero -/* B2DE00 80241990 3C028024 */ lui $v0, %hi(D_802419E0) -/* B2DE04 80241994 244219E0 */ addiu $v0, $v0, %lo(D_802419E0) +/* B2DE00 80241990 3C028024 */ lui $v0, %hi(func_802419E0_B2C90C) +/* B2DE04 80241994 244219E0 */ addiu $v0, $v0, %lo(func_802419E0_B2C90C) /* B2DE08 80241998 0C00AB39 */ jal heap_malloc /* B2DE0C 8024199C AE020008 */ sw $v0, 8($s0) /* B2DE10 802419A0 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s index 99efd7f0bb..a014a4d199 100644 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s @@ -3,8 +3,8 @@ glabel func_80242678_B2EAE8 /* B2EAE8 80242678 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2EAEC 8024267C 3C058024 */ lui $a1, %hi(D_8024260C) -/* B2EAF0 80242680 24A5260C */ addiu $a1, $a1, %lo(D_8024260C) +/* B2EAEC 8024267C 3C058024 */ lui $a1, %hi(func_8024260C_B2C834) +/* B2EAF0 80242680 24A5260C */ addiu $a1, $a1, %lo(func_8024260C_B2C834) /* B2EAF4 80242684 AFBF0010 */ sw $ra, 0x10($sp) /* B2EAF8 80242688 0C048C8F */ jal bind_dynamic_entity_7 /* B2EAFC 8024268C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 8c565f69f9..51cda1d44d 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -141,7 +141,7 @@ glabel func_802411B4_B35D84 /* B35F8C 802413BC 00000000 */ nop /* B35F90 802413C0 0280202D */ daddu $a0, $s4, $zero /* B35F94 802413C4 0260282D */ daddu $a1, $s3, $zero -/* B35F98 802413C8 0C090288 */ jal jan_03_UnkNpcAIFunc1 +/* B35F98 802413C8 0C090288 */ jal func_80240A20_B355F0 /* B35F9C 802413CC 02A0302D */ daddu $a2, $s5, $zero /* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802411B4_B35D84 /* B35FCC 802413FC 00000000 */ nop /* B35FD0 80241400 0280202D */ daddu $a0, $s4, $zero /* B35FD4 80241404 0260282D */ daddu $a1, $s3, $zero -/* B35FD8 80241408 0C090354 */ jal jan_03_NpcJumpFunc2 +/* B35FD8 80241408 0C090354 */ jal func_80240D50_B35920 /* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero /* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero -/* B35FE8 80241418 0C090371 */ jal jan_03_NpcJumpFunc +/* B35FE8 80241418 0C090371 */ jal func_80240DC4_B35994 /* B35FEC 8024141C 02A0302D */ daddu $a2, $s5, $zero /* B35FF0 80241420 08090522 */ j .L80241488 /* B35FF4 80241424 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802411B4_B35D84 /* B3601C 8024144C 00000000 */ nop /* B36020 80241450 0280202D */ daddu $a0, $s4, $zero /* B36024 80241454 0260282D */ daddu $a1, $s3, $zero -/* B36028 80241458 0C090423 */ jal jan_03_UnkNpcDurationFlagFunc +/* B36028 80241458 0C090423 */ jal func_8024108C_B35C5C /* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero /* B36030 80241460 08090522 */ j .L80241488 /* B36034 80241464 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s index 7f46b11d23..5230a7b1a8 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s @@ -9,8 +9,8 @@ glabel func_80241EFC_B36ACC /* B36ADC 80241F0C 8C84014C */ lw $a0, 0x14c($a0) /* B36AE0 80241F10 24040008 */ addiu $a0, $zero, 8 /* B36AE4 80241F14 0040802D */ daddu $s0, $v0, $zero -/* B36AE8 80241F18 3C028024 */ lui $v0, %hi(D_80241F68) -/* B36AEC 80241F1C 24421F68 */ addiu $v0, $v0, %lo(D_80241F68) +/* B36AE8 80241F18 3C028024 */ lui $v0, %hi(func_80241F68_B34C3C) +/* B36AEC 80241F1C 24421F68 */ addiu $v0, $v0, %lo(func_80241F68_B34C3C) /* B36AF0 80241F20 0C00AB39 */ jal heap_malloc /* B36AF4 80241F24 AE020008 */ sw $v0, 8($s0) /* B36AF8 80241F28 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s index bc94bc4568..eab0415d7a 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s @@ -3,8 +3,8 @@ glabel func_80242C00_B377D0 /* B377D0 80242C00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B377D4 80242C04 3C058024 */ lui $a1, %hi(D_80242B94) -/* B377D8 80242C08 24A52B94 */ addiu $a1, $a1, %lo(D_80242B94) +/* B377D4 80242C04 3C058024 */ lui $a1, %hi(func_80242B94_B34B64) +/* B377D8 80242C08 24A52B94 */ addiu $a1, $a1, %lo(func_80242B94_B34B64) /* B377DC 80242C0C AFBF0010 */ sw $ra, 0x10($sp) /* B377E0 80242C10 0C048C8F */ jal bind_dynamic_entity_7 /* B377E4 80242C14 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s index f278e31759..260df94591 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240350_B44AC0.s @@ -4,8 +4,8 @@ glabel func_80240350_B44AC0 /* B44AC0 80240350 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B44AC4 80240354 AFB00010 */ sw $s0, 0x10($sp) -/* B44AC8 80240358 3C108024 */ lui $s0, %hi(D_80241800) -/* B44ACC 8024035C 26101800 */ addiu $s0, $s0, %lo(D_80241800) +/* B44AC8 80240358 3C108024 */ lui $s0, %hi(func_80241800_8B1870) +/* B44ACC 8024035C 26101800 */ addiu $s0, $s0, %lo(func_80241800_8B1870) /* B44AD0 80240360 AFBF0018 */ sw $ra, 0x18($sp) /* B44AD4 80240364 AFB10014 */ sw $s1, 0x14($sp) /* B44AD8 80240368 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240350_B44AC0 /* B44B3C 802403CC 28620010 */ slti $v0, $v1, 0x10 /* B44B40 802403D0 1440FFFA */ bnez $v0, .L802403BC /* B44B44 802403D4 24840004 */ addiu $a0, $a0, 4 -/* B44B48 802403D8 3C108024 */ lui $s0, %hi(D_80241800) -/* B44B4C 802403DC 26101800 */ addiu $s0, $s0, %lo(D_80241800) +/* B44B48 802403D8 3C108024 */ lui $s0, %hi(func_80241800_8B1870) +/* B44B4C 802403DC 26101800 */ addiu $s0, $s0, %lo(func_80241800_8B1870) /* B44B50 802403E0 0C00AB4B */ jal heap_free /* B44B54 802403E4 8E040000 */ lw $a0, ($s0) /* B44B58 802403E8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s b/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s index 122aa863dd..7daf74e48d 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B45150/func_802409E0_B45150.s @@ -20,8 +20,8 @@ glabel func_802409E0_B45150 /* B4518C 80240A1C 0200202D */ daddu $a0, $s0, $zero /* B45190 80240A20 3C048025 */ lui $a0, %hi(D_8024A2A0) /* B45194 80240A24 2484A2A0 */ addiu $a0, $a0, %lo(D_8024A2A0) -/* B45198 80240A28 3C028024 */ lui $v0, %hi(D_80246500) -/* B4519C 80240A2C 24426500 */ addiu $v0, $v0, %lo(D_80246500) +/* B45198 80240A28 3C028024 */ lui $v0, %hi(func_80246500_806D80) +/* B4519C 80240A2C 24426500 */ addiu $v0, $v0, %lo(func_80246500_806D80) /* B451A0 80240A30 AC820000 */ sw $v0, ($a0) /* B451A4 80240A34 24020096 */ addiu $v0, $zero, 0x96 /* B451A8 80240A38 A4820008 */ sh $v0, 8($a0) diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index 85e9798594..9075bb7e33 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -105,7 +105,7 @@ glabel func_80241494_B4BF04 /* B4C08C 8024161C 0000102D */ daddu $v0, $zero, $zero /* B4C090 80241620 0260202D */ daddu $a0, $s3, $zero /* B4C094 80241624 0280282D */ daddu $a1, $s4, $zero -/* B4C098 80241628 0C090383 */ jal jan_05_UnkNpcAIFunc1 +/* B4C098 80241628 0C090383 */ jal func_80240E0C_B4B87C /* B4C09C 8024162C 0200302D */ daddu $a2, $s0, $zero /* B4C0A0 80241630 8E630070 */ lw $v1, 0x70($s3) /* B4C0A4 80241634 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80241494_B4BF04 /* B4C0EC 8024167C 0000102D */ daddu $v0, $zero, $zero /* B4C0F0 80241680 0260202D */ daddu $a0, $s3, $zero /* B4C0F4 80241684 0280282D */ daddu $a1, $s4, $zero -/* B4C0F8 80241688 0C090514 */ jal jan_05_UnkDurationCheck +/* B4C0F8 80241688 0C090514 */ jal func_80241450_B4BEC0 /* B4C0FC 8024168C 0200302D */ daddu $a2, $s0, $zero .L80241690: /* B4C100 80241690 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s index 8e1e790c7b..d65d1b2c53 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -46,7 +46,7 @@ glabel func_80241EE8_B4C958 /* B4C9FC 80241F8C 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CA00 80241F90 30420004 */ andi $v0, $v0, 4 /* B4CA04 80241F94 10400020 */ beqz $v0, .L80242018 -/* B4CA08 80241F98 00000000 */ nop +/* B4CA08 80241F98 00000000 */ nop .L80241F9C: /* B4CA0C 80241F9C 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CA10 80241FA0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241EE8_B4C958 /* B4CA88 80242018 8E420070 */ lw $v0, 0x70($s2) /* B4CA8C 8024201C 2842001E */ slti $v0, $v0, 0x1e /* B4CA90 80242020 10400009 */ beqz $v0, .L80242048 -/* B4CA94 80242024 00000000 */ nop +/* B4CA94 80242024 00000000 */ nop /* B4CA98 80242028 8E22006C */ lw $v0, 0x6c($s1) /* B4CA9C 8024202C 14400006 */ bnez $v0, .L80242048 -/* B4CAA0 80242030 00000000 */ nop +/* B4CAA0 80242030 00000000 */ nop /* B4CAA4 80242034 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CAA8 80242038 0240202D */ daddu $a0, $s2, $zero /* B4CAAC 8024203C 10400002 */ beqz $v0, .L80242048 @@ -104,7 +104,7 @@ glabel func_80241EE8_B4C958 /* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 /* B4CAD0 80242060 8C227A98 */ lw $v0, %lo(D_80247A98)($at) /* B4CAD4 80242064 00400008 */ jr $v0 -/* B4CAD8 80242068 00000000 */ nop +/* B4CAD8 80242068 00000000 */ nop /* B4CADC 8024206C 0240202D */ daddu $a0, $s2, $zero /* B4CAE0 80242070 0260282D */ daddu $a1, $s3, $zero /* B4CAE4 80242074 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241EE8_B4C958 /* B4CAF4 80242084 0C0125AE */ jal func_800496B8 /* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero /* B4CAFC 8024208C 0809085D */ j .L80242174 -/* B4CB00 80242090 00000000 */ nop +/* B4CB00 80242090 00000000 */ nop /* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero /* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero -/* B4CB0C 8024209C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* B4CB0C 8024209C 0C0126D1 */ jal func_80049B44 /* B4CB10 802420A0 0280302D */ daddu $a2, $s4, $zero /* B4CB14 802420A4 0240202D */ daddu $a0, $s2, $zero /* B4CB18 802420A8 0260282D */ daddu $a1, $s3, $zero /* B4CB1C 802420AC 0C012701 */ jal func_80049C04 /* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero /* B4CB24 802420B4 0809085D */ j .L80242174 -/* B4CB28 802420B8 00000000 */ nop +/* B4CB28 802420B8 00000000 */ nop /* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B4CB30 802420C0 0260282D */ daddu $a1, $s3, $zero /* B4CB34 802420C4 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241EE8_B4C958 /* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC /* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero /* B4CB4C 802420DC 0809085D */ j .L80242174 -/* B4CB50 802420E0 00000000 */ nop +/* B4CB50 802420E0 00000000 */ nop /* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero /* B4CB58 802420E8 0260282D */ daddu $a1, $s3, $zero /* B4CB5C 802420EC 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241EE8_B4C958 /* B4CB6C 802420FC 0C012849 */ jal func_8004A124 /* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero /* B4CB74 80242104 0809085D */ j .L80242174 -/* B4CB78 80242108 00000000 */ nop +/* B4CB78 80242108 00000000 */ nop /* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero /* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero /* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 /* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero /* B4CB8C 8024211C 0809085D */ j .L80242174 -/* B4CB90 80242120 00000000 */ nop -/* B4CB94 80242124 0C090633 */ jal jan_05_UnkNpcAIFunc6 +/* B4CB90 80242120 00000000 */ nop +/* B4CB94 80242124 0C090633 */ jal func_802418CC_B4C33C /* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero -/* B4CB9C 8024212C 0C09064E */ jal jan_05_UnkNpcAIFunc7 +/* B4CB9C 8024212C 0C09064E */ jal func_80241938_B4C3A8 /* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero /* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) /* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 /* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 -/* B4CBB0 80242140 00000000 */ nop -/* B4CBB4 80242144 0C09066A */ jal jan_05_UnkNpcAIFunc8 +/* B4CBB0 80242140 00000000 */ nop +/* B4CBB4 80242144 0C09066A */ jal func_802419A8_B4C418 /* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero /* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) /* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 /* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 -/* B4CBC8 80242158 00000000 */ nop -/* B4CBCC 8024215C 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 +/* B4CBC8 80242158 00000000 */ nop +/* B4CBCC 8024215C 0C0906A0 */ jal func_80241A80_B4C4F0 /* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero /* B4CBD4 80242164 0809085D */ j .L80242174 -/* B4CBD8 80242168 00000000 */ nop +/* B4CBD8 80242168 00000000 */ nop /* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C /* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero .L80242174: diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s index 89d7c9fb0b..38c7e963e4 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -46,7 +46,7 @@ glabel func_8024219C_B4CC0C /* B4CCB0 80242240 8E2200B0 */ lw $v0, 0xb0($s1) /* B4CCB4 80242244 30420004 */ andi $v0, $v0, 4 /* B4CCB8 80242248 10400020 */ beqz $v0, .L802422CC -/* B4CCBC 8024224C 00000000 */ nop +/* B4CCBC 8024224C 00000000 */ nop .L80242250: /* B4CCC0 80242250 2404F7FF */ addiu $a0, $zero, -0x801 /* B4CCC4 80242254 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024219C_B4CC0C /* B4CD3C 802422CC 8E420070 */ lw $v0, 0x70($s2) /* B4CD40 802422D0 2842001E */ slti $v0, $v0, 0x1e /* B4CD44 802422D4 10400009 */ beqz $v0, .L802422FC -/* B4CD48 802422D8 00000000 */ nop +/* B4CD48 802422D8 00000000 */ nop /* B4CD4C 802422DC 8E22006C */ lw $v0, 0x6c($s1) /* B4CD50 802422E0 14400006 */ bnez $v0, .L802422FC -/* B4CD54 802422E4 00000000 */ nop +/* B4CD54 802422E4 00000000 */ nop /* B4CD58 802422E8 0C0906B5 */ jal func_80241AD4_B4C544 /* B4CD5C 802422EC 0240202D */ daddu $a0, $s2, $zero /* B4CD60 802422F0 10400002 */ beqz $v0, .L802422FC @@ -104,7 +104,7 @@ glabel func_8024219C_B4CC0C /* B4CD80 80242310 00220821 */ addu $at, $at, $v0 /* B4CD84 80242314 8C227C28 */ lw $v0, %lo(D_80247C28)($at) /* B4CD88 80242318 00400008 */ jr $v0 -/* B4CD8C 8024231C 00000000 */ nop +/* B4CD8C 8024231C 00000000 */ nop /* B4CD90 80242320 0240202D */ daddu $a0, $s2, $zero /* B4CD94 80242324 0260282D */ daddu $a1, $s3, $zero /* B4CD98 80242328 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024219C_B4CC0C /* B4CDA8 80242338 0C0125AE */ jal func_800496B8 /* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero /* B4CDB0 80242340 0809090A */ j .L80242428 -/* B4CDB4 80242344 00000000 */ nop +/* B4CDB4 80242344 00000000 */ nop /* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero /* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero -/* B4CDC0 80242350 0C0905AE */ jal jan_05_UnkNpcAIFunc4 +/* B4CDC0 80242350 0C0905AE */ jal func_802416B8_B4C128 /* B4CDC4 80242354 0280302D */ daddu $a2, $s4, $zero /* B4CDC8 80242358 0240202D */ daddu $a0, $s2, $zero /* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero /* B4CDD0 80242360 0C0905C2 */ jal func_80241708_B4C178 /* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero /* B4CDD8 80242368 0809090A */ j .L80242428 -/* B4CDDC 8024236C 00000000 */ nop +/* B4CDDC 8024236C 00000000 */ nop /* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero /* B4CDE4 80242374 0260282D */ daddu $a1, $s3, $zero /* B4CDE8 80242378 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024219C_B4CC0C /* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC /* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero /* B4CE00 80242390 0809090A */ j .L80242428 -/* B4CE04 80242394 00000000 */ nop +/* B4CE04 80242394 00000000 */ nop /* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero /* B4CE0C 8024239C 0260282D */ daddu $a1, $s3, $zero /* B4CE10 802423A0 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024219C_B4CC0C /* B4CE20 802423B0 0C012849 */ jal func_8004A124 /* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero /* B4CE28 802423B8 0809090A */ j .L80242428 -/* B4CE2C 802423BC 00000000 */ nop +/* B4CE2C 802423BC 00000000 */ nop /* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero /* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero /* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8 /* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero /* B4CE40 802423D0 0809090A */ j .L80242428 -/* B4CE44 802423D4 00000000 */ nop -/* B4CE48 802423D8 0C090633 */ jal jan_05_UnkNpcAIFunc6 +/* B4CE44 802423D4 00000000 */ nop +/* B4CE48 802423D8 0C090633 */ jal func_802418CC_B4C33C /* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero -/* B4CE50 802423E0 0C09064E */ jal jan_05_UnkNpcAIFunc7 +/* B4CE50 802423E0 0C09064E */ jal func_80241938_B4C3A8 /* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero /* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) /* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 /* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 -/* B4CE64 802423F4 00000000 */ nop -/* B4CE68 802423F8 0C09066A */ jal jan_05_UnkNpcAIFunc8 +/* B4CE64 802423F4 00000000 */ nop +/* B4CE68 802423F8 0C09066A */ jal func_802419A8_B4C418 /* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero /* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) /* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 /* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 -/* B4CE7C 8024240C 00000000 */ nop -/* B4CE80 80242410 0C0906A0 */ jal jan_05_UnkNpcAIFunc5 +/* B4CE7C 8024240C 00000000 */ nop +/* B4CE80 80242410 0C0906A0 */ jal func_80241A80_B4C4F0 /* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero /* B4CE88 80242418 0809090A */ j .L80242428 -/* B4CE8C 8024241C 00000000 */ nop +/* B4CE8C 8024241C 00000000 */ nop /* B4CE90 80242420 0C0129CF */ jal func_8004A73C /* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero .L80242428: diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index e1ee49cbee..a3c019f351 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -105,7 +105,7 @@ glabel func_80241330_B53B60 /* B53CE8 802414B8 0000102D */ daddu $v0, $zero, $zero /* B53CEC 802414BC 0260202D */ daddu $a0, $s3, $zero /* B53CF0 802414C0 0280282D */ daddu $a1, $s4, $zero -/* B53CF4 802414C4 0C09032A */ jal jan_06_UnkNpcAIFunc1 +/* B53CF4 802414C4 0C09032A */ jal func_80240CA8_B534D8 /* B53CF8 802414C8 0200302D */ daddu $a2, $s0, $zero /* B53CFC 802414CC 8E630070 */ lw $v1, 0x70($s3) /* B53D00 802414D0 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80241330_B53B60 /* B53D48 80241518 0000102D */ daddu $v0, $zero, $zero /* B53D4C 8024151C 0260202D */ daddu $a0, $s3, $zero /* B53D50 80241520 0280282D */ daddu $a1, $s4, $zero -/* B53D54 80241524 0C0904BB */ jal jan_06_UnkDurationCheck +/* B53D54 80241524 0C0904BB */ jal func_802412EC_B53B1C /* B53D58 80241528 0200302D */ daddu $a2, $s0, $zero .L8024152C: /* B53D5C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s index a9aa179af3..c185ebf952 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s @@ -54,8 +54,8 @@ glabel func_80241A24_B54254 /* B54314 80241AE4 00000000 */ nop /* B54318 80241AE8 0C00A6C9 */ jal clamp_angle /* B5431C 80241AEC 46000306 */ mov.s $f12, $f0 -/* B54320 80241AF0 3C018024 */ lui $at, %hi(D_80246D10) -/* B54324 80241AF4 D4226D10 */ ldc1 $f2, %lo(D_80246D10)($at) +/* B54320 80241AF0 3C018024 */ lui $at, %hi(func_80246D10) +/* B54324 80241AF4 D4226D10 */ ldc1 $f2, %lo(func_80246D10)($at) /* B54328 80241AF8 46000021 */ cvt.d.s $f0, $f0 /* B5432C 80241AFC 4622003C */ c.lt.d $f0, $f2 /* B54330 80241B00 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s index aba32b93d9..16bd8117fb 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -46,7 +46,7 @@ glabel func_80241E38_B54668 /* B5470C 80241EDC 8E2200B0 */ lw $v0, 0xb0($s1) /* B54710 80241EE0 30420004 */ andi $v0, $v0, 4 /* B54714 80241EE4 10400020 */ beqz $v0, .L80241F68 -/* B54718 80241EE8 00000000 */ nop +/* B54718 80241EE8 00000000 */ nop .L80241EEC: /* B5471C 80241EEC 2404F7FF */ addiu $a0, $zero, -0x801 /* B54720 80241EF0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241E38_B54668 /* B54798 80241F68 8E420070 */ lw $v0, 0x70($s2) /* B5479C 80241F6C 2842001E */ slti $v0, $v0, 0x1e /* B547A0 80241F70 10400009 */ beqz $v0, .L80241F98 -/* B547A4 80241F74 00000000 */ nop +/* B547A4 80241F74 00000000 */ nop /* B547A8 80241F78 8E22006C */ lw $v0, 0x6c($s1) /* B547AC 80241F7C 14400006 */ bnez $v0, .L80241F98 -/* B547B0 80241F80 00000000 */ nop +/* B547B0 80241F80 00000000 */ nop /* B547B4 80241F84 0C090689 */ jal func_80241A24_B54254 /* B547B8 80241F88 0240202D */ daddu $a0, $s2, $zero /* B547BC 80241F8C 10400002 */ beqz $v0, .L80241F98 @@ -104,7 +104,7 @@ glabel func_80241E38_B54668 /* B547DC 80241FAC 00220821 */ addu $at, $at, $v0 /* B547E0 80241FB0 8C226D18 */ lw $v0, %lo(D_80246D18)($at) /* B547E4 80241FB4 00400008 */ jr $v0 -/* B547E8 80241FB8 00000000 */ nop +/* B547E8 80241FB8 00000000 */ nop /* B547EC 80241FBC 0240202D */ daddu $a0, $s2, $zero /* B547F0 80241FC0 0260282D */ daddu $a1, $s3, $zero /* B547F4 80241FC4 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241E38_B54668 /* B54804 80241FD4 0C0125AE */ jal func_800496B8 /* B54808 80241FD8 0280302D */ daddu $a2, $s4, $zero /* B5480C 80241FDC 08090831 */ j .L802420C4 -/* B54810 80241FE0 00000000 */ nop +/* B54810 80241FE0 00000000 */ nop /* B54814 80241FE4 0240202D */ daddu $a0, $s2, $zero /* B54818 80241FE8 0260282D */ daddu $a1, $s3, $zero -/* B5481C 80241FEC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* B5481C 80241FEC 0C0126D1 */ jal func_80049B44 /* B54820 80241FF0 0280302D */ daddu $a2, $s4, $zero /* B54824 80241FF4 0240202D */ daddu $a0, $s2, $zero /* B54828 80241FF8 0260282D */ daddu $a1, $s3, $zero /* B5482C 80241FFC 0C012701 */ jal func_80049C04 /* B54830 80242000 0280302D */ daddu $a2, $s4, $zero /* B54834 80242004 08090831 */ j .L802420C4 -/* B54838 80242008 00000000 */ nop +/* B54838 80242008 00000000 */ nop /* B5483C 8024200C 0240202D */ daddu $a0, $s2, $zero /* B54840 80242010 0260282D */ daddu $a1, $s3, $zero /* B54844 80242014 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241E38_B54668 /* B54854 80242024 0C0127B3 */ jal func_80049ECC /* B54858 80242028 0280302D */ daddu $a2, $s4, $zero /* B5485C 8024202C 08090831 */ j .L802420C4 -/* B54860 80242030 00000000 */ nop +/* B54860 80242030 00000000 */ nop /* B54864 80242034 0240202D */ daddu $a0, $s2, $zero /* B54868 80242038 0260282D */ daddu $a1, $s3, $zero /* B5486C 8024203C 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241E38_B54668 /* B5487C 8024204C 0C012849 */ jal func_8004A124 /* B54880 80242050 0280302D */ daddu $a2, $s4, $zero /* B54884 80242054 08090831 */ j .L802420C4 -/* B54888 80242058 00000000 */ nop +/* B54888 80242058 00000000 */ nop /* B5488C 8024205C 0240202D */ daddu $a0, $s2, $zero /* B54890 80242060 0260282D */ daddu $a1, $s3, $zero /* B54894 80242064 0C0128FA */ jal func_8004A3E8 /* B54898 80242068 0280302D */ daddu $a2, $s4, $zero /* B5489C 8024206C 08090831 */ j .L802420C4 -/* B548A0 80242070 00000000 */ nop -/* B548A4 80242074 0C090607 */ jal jan_06_UnkNpcAIFunc6 +/* B548A0 80242070 00000000 */ nop +/* B548A4 80242074 0C090607 */ jal func_8024181C_B5404C /* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero -/* B548AC 8024207C 0C090622 */ jal jan_06_UnkNpcAIFunc7 +/* B548AC 8024207C 0C090622 */ jal func_80241888_B540B8 /* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero /* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) /* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 /* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 -/* B548C0 80242090 00000000 */ nop -/* B548C4 80242094 0C09063E */ jal jan_06_UnkNpcAIFunc8 +/* B548C0 80242090 00000000 */ nop +/* B548C4 80242094 0C09063E */ jal func_802418F8_B54128 /* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero /* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) /* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 /* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 -/* B548D8 802420A8 00000000 */ nop -/* B548DC 802420AC 0C090674 */ jal jan_06_UnkNpcAIFunc5 +/* B548D8 802420A8 00000000 */ nop +/* B548DC 802420AC 0C090674 */ jal func_802419D0_B54200 /* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero /* B548E4 802420B4 08090831 */ j .L802420C4 -/* B548E8 802420B8 00000000 */ nop +/* B548E8 802420B8 00000000 */ nop /* B548EC 802420BC 0C0129CF */ jal func_8004A73C /* B548F0 802420C0 0240202D */ daddu $a0, $s2, $zero .L802420C4: diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index 11d628a122..7a2b2cae85 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -46,7 +46,7 @@ glabel func_802420EC_B5491C /* B549C0 80242190 8E2200B0 */ lw $v0, 0xb0($s1) /* B549C4 80242194 30420004 */ andi $v0, $v0, 4 /* B549C8 80242198 10400020 */ beqz $v0, .L8024221C -/* B549CC 8024219C 00000000 */ nop +/* B549CC 8024219C 00000000 */ nop .L802421A0: /* B549D0 802421A0 2404F7FF */ addiu $a0, $zero, -0x801 /* B549D4 802421A4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802420EC_B5491C /* B54A4C 8024221C 8E420070 */ lw $v0, 0x70($s2) /* B54A50 80242220 2842001E */ slti $v0, $v0, 0x1e /* B54A54 80242224 10400009 */ beqz $v0, .L8024224C -/* B54A58 80242228 00000000 */ nop +/* B54A58 80242228 00000000 */ nop /* B54A5C 8024222C 8E22006C */ lw $v0, 0x6c($s1) /* B54A60 80242230 14400006 */ bnez $v0, .L8024224C -/* B54A64 80242234 00000000 */ nop +/* B54A64 80242234 00000000 */ nop /* B54A68 80242238 0C090689 */ jal func_80241A24_B54254 /* B54A6C 8024223C 0240202D */ daddu $a0, $s2, $zero /* B54A70 80242240 10400002 */ beqz $v0, .L8024224C @@ -104,7 +104,7 @@ glabel func_802420EC_B5491C /* B54A90 80242260 00220821 */ addu $at, $at, $v0 /* B54A94 80242264 8C226EA8 */ lw $v0, %lo(D_80246EA8)($at) /* B54A98 80242268 00400008 */ jr $v0 -/* B54A9C 8024226C 00000000 */ nop +/* B54A9C 8024226C 00000000 */ nop /* B54AA0 80242270 0240202D */ daddu $a0, $s2, $zero /* B54AA4 80242274 0260282D */ daddu $a1, $s3, $zero /* B54AA8 80242278 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_802420EC_B5491C /* B54AB8 80242288 0C0125AE */ jal func_800496B8 /* B54ABC 8024228C 0280302D */ daddu $a2, $s4, $zero /* B54AC0 80242290 080908DE */ j .L80242378 -/* B54AC4 80242294 00000000 */ nop +/* B54AC4 80242294 00000000 */ nop /* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero /* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero -/* B54AD0 802422A0 0C090582 */ jal jan_06_UnkNpcAIFunc4 +/* B54AD0 802422A0 0C090582 */ jal func_80241608_B53E38 /* B54AD4 802422A4 0280302D */ daddu $a2, $s4, $zero /* B54AD8 802422A8 0240202D */ daddu $a0, $s2, $zero /* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero /* B54AE0 802422B0 0C090596 */ jal func_80241658_B53E88 /* B54AE4 802422B4 0280302D */ daddu $a2, $s4, $zero /* B54AE8 802422B8 080908DE */ j .L80242378 -/* B54AEC 802422BC 00000000 */ nop +/* B54AEC 802422BC 00000000 */ nop /* B54AF0 802422C0 0240202D */ daddu $a0, $s2, $zero /* B54AF4 802422C4 0260282D */ daddu $a1, $s3, $zero /* B54AF8 802422C8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802420EC_B5491C /* B54B08 802422D8 0C0127B3 */ jal func_80049ECC /* B54B0C 802422DC 0280302D */ daddu $a2, $s4, $zero /* B54B10 802422E0 080908DE */ j .L80242378 -/* B54B14 802422E4 00000000 */ nop +/* B54B14 802422E4 00000000 */ nop /* B54B18 802422E8 0240202D */ daddu $a0, $s2, $zero /* B54B1C 802422EC 0260282D */ daddu $a1, $s3, $zero /* B54B20 802422F0 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_802420EC_B5491C /* B54B30 80242300 0C012849 */ jal func_8004A124 /* B54B34 80242304 0280302D */ daddu $a2, $s4, $zero /* B54B38 80242308 080908DE */ j .L80242378 -/* B54B3C 8024230C 00000000 */ nop +/* B54B3C 8024230C 00000000 */ nop /* B54B40 80242310 0240202D */ daddu $a0, $s2, $zero /* B54B44 80242314 0260282D */ daddu $a1, $s3, $zero /* B54B48 80242318 0C0128FA */ jal func_8004A3E8 /* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero /* B54B50 80242320 080908DE */ j .L80242378 -/* B54B54 80242324 00000000 */ nop -/* B54B58 80242328 0C090607 */ jal jan_06_UnkNpcAIFunc6 +/* B54B54 80242324 00000000 */ nop +/* B54B58 80242328 0C090607 */ jal func_8024181C_B5404C /* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero -/* B54B60 80242330 0C090622 */ jal jan_06_UnkNpcAIFunc7 +/* B54B60 80242330 0C090622 */ jal func_80241888_B540B8 /* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero /* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 /* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 -/* B54B74 80242344 00000000 */ nop -/* B54B78 80242348 0C09063E */ jal jan_06_UnkNpcAIFunc8 +/* B54B74 80242344 00000000 */ nop +/* B54B78 80242348 0C09063E */ jal func_802418F8_B54128 /* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero /* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 /* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 -/* B54B8C 8024235C 00000000 */ nop -/* B54B90 80242360 0C090674 */ jal jan_06_UnkNpcAIFunc5 +/* B54B8C 8024235C 00000000 */ nop +/* B54B90 80242360 0C090674 */ jal func_802419D0_B54200 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero /* B54B98 80242368 080908DE */ j .L80242378 -/* B54B9C 8024236C 00000000 */ nop +/* B54B9C 8024236C 00000000 */ nop /* B54BA0 80242370 0C0129CF */ jal func_8004A73C /* B54BA4 80242374 0240202D */ daddu $a0, $s2, $zero .L80242378: diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index 9b085c3755..85dac43dc3 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -46,7 +46,7 @@ glabel func_80240830_B5A0A0 /* B5A144 802408D4 8E2200B0 */ lw $v0, 0xb0($s1) /* B5A148 802408D8 30420004 */ andi $v0, $v0, 4 /* B5A14C 802408DC 10400020 */ beqz $v0, .L80240960 -/* B5A150 802408E0 00000000 */ nop +/* B5A150 802408E0 00000000 */ nop .L802408E4: /* B5A154 802408E4 2404F7FF */ addiu $a0, $zero, -0x801 /* B5A158 802408E8 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240830_B5A0A0 /* B5A1D0 80240960 8E420070 */ lw $v0, 0x70($s2) /* B5A1D4 80240964 2842001E */ slti $v0, $v0, 0x1e /* B5A1D8 80240968 10400009 */ beqz $v0, .L80240990 -/* B5A1DC 8024096C 00000000 */ nop +/* B5A1DC 8024096C 00000000 */ nop /* B5A1E0 80240970 8E22006C */ lw $v0, 0x6c($s1) /* B5A1E4 80240974 14400006 */ bnez $v0, .L80240990 -/* B5A1E8 80240978 00000000 */ nop +/* B5A1E8 80240978 00000000 */ nop /* B5A1EC 8024097C 0C090107 */ jal func_8024041C_B59C8C /* B5A1F0 80240980 0240202D */ daddu $a0, $s2, $zero /* B5A1F4 80240984 10400002 */ beqz $v0, .L80240990 @@ -104,7 +104,7 @@ glabel func_80240830_B5A0A0 /* B5A214 802409A4 00220821 */ addu $at, $at, $v0 /* B5A218 802409A8 8C224720 */ lw $v0, %lo(D_80244720)($at) /* B5A21C 802409AC 00400008 */ jr $v0 -/* B5A220 802409B0 00000000 */ nop +/* B5A220 802409B0 00000000 */ nop /* B5A224 802409B4 0240202D */ daddu $a0, $s2, $zero /* B5A228 802409B8 0260282D */ daddu $a1, $s3, $zero /* B5A22C 802409BC 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80240830_B5A0A0 /* B5A23C 802409CC 0C0125AE */ jal func_800496B8 /* B5A240 802409D0 0280302D */ daddu $a2, $s4, $zero /* B5A244 802409D4 080902AF */ j .L80240ABC -/* B5A248 802409D8 00000000 */ nop +/* B5A248 802409D8 00000000 */ nop /* B5A24C 802409DC 0240202D */ daddu $a0, $s2, $zero /* B5A250 802409E0 0260282D */ daddu $a1, $s3, $zero -/* B5A254 802409E4 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* B5A254 802409E4 0C0126D1 */ jal func_80049B44 /* B5A258 802409E8 0280302D */ daddu $a2, $s4, $zero /* B5A25C 802409EC 0240202D */ daddu $a0, $s2, $zero /* B5A260 802409F0 0260282D */ daddu $a1, $s3, $zero /* B5A264 802409F4 0C012701 */ jal func_80049C04 /* B5A268 802409F8 0280302D */ daddu $a2, $s4, $zero /* B5A26C 802409FC 080902AF */ j .L80240ABC -/* B5A270 80240A00 00000000 */ nop +/* B5A270 80240A00 00000000 */ nop /* B5A274 80240A04 0240202D */ daddu $a0, $s2, $zero /* B5A278 80240A08 0260282D */ daddu $a1, $s3, $zero /* B5A27C 80240A0C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240830_B5A0A0 /* B5A28C 80240A1C 0C0127B3 */ jal func_80049ECC /* B5A290 80240A20 0280302D */ daddu $a2, $s4, $zero /* B5A294 80240A24 080902AF */ j .L80240ABC -/* B5A298 80240A28 00000000 */ nop +/* B5A298 80240A28 00000000 */ nop /* B5A29C 80240A2C 0240202D */ daddu $a0, $s2, $zero /* B5A2A0 80240A30 0260282D */ daddu $a1, $s3, $zero /* B5A2A4 80240A34 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80240830_B5A0A0 /* B5A2B4 80240A44 0C012849 */ jal func_8004A124 /* B5A2B8 80240A48 0280302D */ daddu $a2, $s4, $zero /* B5A2BC 80240A4C 080902AF */ j .L80240ABC -/* B5A2C0 80240A50 00000000 */ nop +/* B5A2C0 80240A50 00000000 */ nop /* B5A2C4 80240A54 0240202D */ daddu $a0, $s2, $zero /* B5A2C8 80240A58 0260282D */ daddu $a1, $s3, $zero /* B5A2CC 80240A5C 0C0128FA */ jal func_8004A3E8 /* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero /* B5A2D4 80240A64 080902AF */ j .L80240ABC -/* B5A2D8 80240A68 00000000 */ nop -/* B5A2DC 80240A6C 0C090085 */ jal jan_07_UnkNpcAIFunc6 +/* B5A2D8 80240A68 00000000 */ nop +/* B5A2DC 80240A6C 0C090085 */ jal func_80240214_B59A84 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero -/* B5A2E4 80240A74 0C0900A0 */ jal jan_07_UnkNpcAIFunc7 +/* B5A2E4 80240A74 0C0900A0 */ jal func_80240280_B59AF0 /* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero /* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 /* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC -/* B5A2F8 80240A88 00000000 */ nop -/* B5A2FC 80240A8C 0C0900BC */ jal jan_07_UnkNpcAIFunc8 +/* B5A2F8 80240A88 00000000 */ nop +/* B5A2FC 80240A8C 0C0900BC */ jal func_802402F0_B59B60 /* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero /* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 /* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC -/* B5A310 80240AA0 00000000 */ nop -/* B5A314 80240AA4 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 +/* B5A310 80240AA0 00000000 */ nop +/* B5A314 80240AA4 0C0900F2 */ jal func_802403C8_B59C38 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero /* B5A31C 80240AAC 080902AF */ j .L80240ABC -/* B5A320 80240AB0 00000000 */ nop +/* B5A320 80240AB0 00000000 */ nop /* B5A324 80240AB4 0C0129CF */ jal func_8004A73C /* B5A328 80240AB8 0240202D */ daddu $a0, $s2, $zero .L80240ABC: diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index 9fec2cc7ef..73d600391f 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -46,7 +46,7 @@ glabel func_80240AE4_B5A354 /* B5A3F8 80240B88 8E2200B0 */ lw $v0, 0xb0($s1) /* B5A3FC 80240B8C 30420004 */ andi $v0, $v0, 4 /* B5A400 80240B90 10400020 */ beqz $v0, .L80240C14 -/* B5A404 80240B94 00000000 */ nop +/* B5A404 80240B94 00000000 */ nop .L80240B98: /* B5A408 80240B98 2404F7FF */ addiu $a0, $zero, -0x801 /* B5A40C 80240B9C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240AE4_B5A354 /* B5A484 80240C14 8E420070 */ lw $v0, 0x70($s2) /* B5A488 80240C18 2842001E */ slti $v0, $v0, 0x1e /* B5A48C 80240C1C 10400009 */ beqz $v0, .L80240C44 -/* B5A490 80240C20 00000000 */ nop +/* B5A490 80240C20 00000000 */ nop /* B5A494 80240C24 8E22006C */ lw $v0, 0x6c($s1) /* B5A498 80240C28 14400006 */ bnez $v0, .L80240C44 -/* B5A49C 80240C2C 00000000 */ nop +/* B5A49C 80240C2C 00000000 */ nop /* B5A4A0 80240C30 0C090107 */ jal func_8024041C_B59C8C /* B5A4A4 80240C34 0240202D */ daddu $a0, $s2, $zero /* B5A4A8 80240C38 10400002 */ beqz $v0, .L80240C44 @@ -104,7 +104,7 @@ glabel func_80240AE4_B5A354 /* B5A4C8 80240C58 00220821 */ addu $at, $at, $v0 /* B5A4CC 80240C5C 8C2248B0 */ lw $v0, %lo(D_802448B0)($at) /* B5A4D0 80240C60 00400008 */ jr $v0 -/* B5A4D4 80240C64 00000000 */ nop +/* B5A4D4 80240C64 00000000 */ nop /* B5A4D8 80240C68 0240202D */ daddu $a0, $s2, $zero /* B5A4DC 80240C6C 0260282D */ daddu $a1, $s3, $zero /* B5A4E0 80240C70 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80240AE4_B5A354 /* B5A4F0 80240C80 0C0125AE */ jal func_800496B8 /* B5A4F4 80240C84 0280302D */ daddu $a2, $s4, $zero /* B5A4F8 80240C88 0809035C */ j .L80240D70 -/* B5A4FC 80240C8C 00000000 */ nop +/* B5A4FC 80240C8C 00000000 */ nop /* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero /* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero -/* B5A508 80240C98 0C090000 */ jal jan_07_UnkNpcAIFunc4 +/* B5A508 80240C98 0C090000 */ jal func_80240000_B59870 /* B5A50C 80240C9C 0280302D */ daddu $a2, $s4, $zero /* B5A510 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero /* B5A518 80240CA8 0C090014 */ jal func_80240050_B598C0 /* B5A51C 80240CAC 0280302D */ daddu $a2, $s4, $zero /* B5A520 80240CB0 0809035C */ j .L80240D70 -/* B5A524 80240CB4 00000000 */ nop +/* B5A524 80240CB4 00000000 */ nop /* B5A528 80240CB8 0240202D */ daddu $a0, $s2, $zero /* B5A52C 80240CBC 0260282D */ daddu $a1, $s3, $zero /* B5A530 80240CC0 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240AE4_B5A354 /* B5A540 80240CD0 0C0127B3 */ jal func_80049ECC /* B5A544 80240CD4 0280302D */ daddu $a2, $s4, $zero /* B5A548 80240CD8 0809035C */ j .L80240D70 -/* B5A54C 80240CDC 00000000 */ nop +/* B5A54C 80240CDC 00000000 */ nop /* B5A550 80240CE0 0240202D */ daddu $a0, $s2, $zero /* B5A554 80240CE4 0260282D */ daddu $a1, $s3, $zero /* B5A558 80240CE8 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80240AE4_B5A354 /* B5A568 80240CF8 0C012849 */ jal func_8004A124 /* B5A56C 80240CFC 0280302D */ daddu $a2, $s4, $zero /* B5A570 80240D00 0809035C */ j .L80240D70 -/* B5A574 80240D04 00000000 */ nop +/* B5A574 80240D04 00000000 */ nop /* B5A578 80240D08 0240202D */ daddu $a0, $s2, $zero /* B5A57C 80240D0C 0260282D */ daddu $a1, $s3, $zero /* B5A580 80240D10 0C0128FA */ jal func_8004A3E8 /* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero /* B5A588 80240D18 0809035C */ j .L80240D70 -/* B5A58C 80240D1C 00000000 */ nop -/* B5A590 80240D20 0C090085 */ jal jan_07_UnkNpcAIFunc6 +/* B5A58C 80240D1C 00000000 */ nop +/* B5A590 80240D20 0C090085 */ jal func_80240214_B59A84 /* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero -/* B5A598 80240D28 0C0900A0 */ jal jan_07_UnkNpcAIFunc7 +/* B5A598 80240D28 0C0900A0 */ jal func_80240280_B59AF0 /* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero /* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 /* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 -/* B5A5AC 80240D3C 00000000 */ nop -/* B5A5B0 80240D40 0C0900BC */ jal jan_07_UnkNpcAIFunc8 +/* B5A5AC 80240D3C 00000000 */ nop +/* B5A5B0 80240D40 0C0900BC */ jal func_802402F0_B59B60 /* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero /* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 /* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 -/* B5A5C4 80240D54 00000000 */ nop -/* B5A5C8 80240D58 0C0900F2 */ jal jan_07_UnkNpcAIFunc5 +/* B5A5C4 80240D54 00000000 */ nop +/* B5A5C8 80240D58 0C0900F2 */ jal func_802403C8_B59C38 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B5A5D0 80240D60 0809035C */ j .L80240D70 -/* B5A5D4 80240D64 00000000 */ nop +/* B5A5D4 80240D64 00000000 */ nop /* B5A5D8 80240D68 0C0129CF */ jal func_8004A73C /* B5A5DC 80240D6C 0240202D */ daddu $a0, $s2, $zero .L80240D70: @@ -182,5 +182,5 @@ glabel func_80240AE4_B5A354 /* B5A5FC 80240D8C 0000102D */ daddu $v0, $zero, $zero /* B5A600 80240D90 03E00008 */ jr $ra /* B5A604 80240D94 27BD0050 */ addiu $sp, $sp, 0x50 -/* B5A608 80240D98 00000000 */ nop -/* B5A60C 80240D9C 00000000 */ nop +/* B5A608 80240D98 00000000 */ nop +/* B5A60C 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s index 486798a960..56eab5184e 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -46,7 +46,7 @@ glabel func_80241C84_B5FF34 /* B5FFD8 80241D28 8E2200B0 */ lw $v0, 0xb0($s1) /* B5FFDC 80241D2C 30420004 */ andi $v0, $v0, 4 /* B5FFE0 80241D30 10400020 */ beqz $v0, .L80241DB4 -/* B5FFE4 80241D34 00000000 */ nop +/* B5FFE4 80241D34 00000000 */ nop .L80241D38: /* B5FFE8 80241D38 2404F7FF */ addiu $a0, $zero, -0x801 /* B5FFEC 80241D3C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241C84_B5FF34 /* B60064 80241DB4 8E420070 */ lw $v0, 0x70($s2) /* B60068 80241DB8 2842001E */ slti $v0, $v0, 0x1e /* B6006C 80241DBC 10400009 */ beqz $v0, .L80241DE4 -/* B60070 80241DC0 00000000 */ nop +/* B60070 80241DC0 00000000 */ nop /* B60074 80241DC4 8E22006C */ lw $v0, 0x6c($s1) /* B60078 80241DC8 14400006 */ bnez $v0, .L80241DE4 -/* B6007C 80241DCC 00000000 */ nop +/* B6007C 80241DCC 00000000 */ nop /* B60080 80241DD0 0C09061C */ jal func_80241870_B5FB20 /* B60084 80241DD4 0240202D */ daddu $a0, $s2, $zero /* B60088 80241DD8 10400002 */ beqz $v0, .L80241DE4 @@ -104,7 +104,7 @@ glabel func_80241C84_B5FF34 /* B600A8 80241DF8 00220821 */ addu $at, $at, $v0 /* B600AC 80241DFC 8C2274E0 */ lw $v0, %lo(D_802474E0)($at) /* B600B0 80241E00 00400008 */ jr $v0 -/* B600B4 80241E04 00000000 */ nop +/* B600B4 80241E04 00000000 */ nop /* B600B8 80241E08 0240202D */ daddu $a0, $s2, $zero /* B600BC 80241E0C 0260282D */ daddu $a1, $s3, $zero /* B600C0 80241E10 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241C84_B5FF34 /* B600D0 80241E20 0C0125AE */ jal func_800496B8 /* B600D4 80241E24 0280302D */ daddu $a2, $s4, $zero /* B600D8 80241E28 080907C4 */ j .L80241F10 -/* B600DC 80241E2C 00000000 */ nop +/* B600DC 80241E2C 00000000 */ nop /* B600E0 80241E30 0240202D */ daddu $a0, $s2, $zero /* B600E4 80241E34 0260282D */ daddu $a1, $s3, $zero -/* B600E8 80241E38 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* B600E8 80241E38 0C0126D1 */ jal func_80049B44 /* B600EC 80241E3C 0280302D */ daddu $a2, $s4, $zero /* B600F0 80241E40 0240202D */ daddu $a0, $s2, $zero /* B600F4 80241E44 0260282D */ daddu $a1, $s3, $zero /* B600F8 80241E48 0C012701 */ jal func_80049C04 /* B600FC 80241E4C 0280302D */ daddu $a2, $s4, $zero /* B60100 80241E50 080907C4 */ j .L80241F10 -/* B60104 80241E54 00000000 */ nop +/* B60104 80241E54 00000000 */ nop /* B60108 80241E58 0240202D */ daddu $a0, $s2, $zero /* B6010C 80241E5C 0260282D */ daddu $a1, $s3, $zero /* B60110 80241E60 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241C84_B5FF34 /* B60120 80241E70 0C0127B3 */ jal func_80049ECC /* B60124 80241E74 0280302D */ daddu $a2, $s4, $zero /* B60128 80241E78 080907C4 */ j .L80241F10 -/* B6012C 80241E7C 00000000 */ nop +/* B6012C 80241E7C 00000000 */ nop /* B60130 80241E80 0240202D */ daddu $a0, $s2, $zero /* B60134 80241E84 0260282D */ daddu $a1, $s3, $zero /* B60138 80241E88 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241C84_B5FF34 /* B60148 80241E98 0C012849 */ jal func_8004A124 /* B6014C 80241E9C 0280302D */ daddu $a2, $s4, $zero /* B60150 80241EA0 080907C4 */ j .L80241F10 -/* B60154 80241EA4 00000000 */ nop +/* B60154 80241EA4 00000000 */ nop /* B60158 80241EA8 0240202D */ daddu $a0, $s2, $zero /* B6015C 80241EAC 0260282D */ daddu $a1, $s3, $zero /* B60160 80241EB0 0C0128FA */ jal func_8004A3E8 /* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero /* B60168 80241EB8 080907C4 */ j .L80241F10 -/* B6016C 80241EBC 00000000 */ nop -/* B60170 80241EC0 0C09059A */ jal jan_08_UnkNpcAIFunc6 +/* B6016C 80241EBC 00000000 */ nop +/* B60170 80241EC0 0C09059A */ jal func_80241668_B5F918 /* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* B60178 80241EC8 0C0905B5 */ jal jan_08_UnkNpcAIFunc7 +/* B60178 80241EC8 0C0905B5 */ jal func_802416D4_B5F984 /* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero /* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) /* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 /* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 -/* B6018C 80241EDC 00000000 */ nop -/* B60190 80241EE0 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 +/* B6018C 80241EDC 00000000 */ nop +/* B60190 80241EE0 0C0905D1 */ jal func_80241744_B5F9F4 /* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero /* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) /* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 /* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 -/* B601A4 80241EF4 00000000 */ nop -/* B601A8 80241EF8 0C090607 */ jal jan_08_UnkNpcAIFunc5 +/* B601A4 80241EF4 00000000 */ nop +/* B601A8 80241EF8 0C090607 */ jal func_8024181C_B5FACC /* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero /* B601B0 80241F00 080907C4 */ j .L80241F10 -/* B601B4 80241F04 00000000 */ nop +/* B601B4 80241F04 00000000 */ nop /* B601B8 80241F08 0C0129CF */ jal func_8004A73C /* B601BC 80241F0C 0240202D */ daddu $a0, $s2, $zero .L80241F10: diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s index 37d8a064a0..950279fc05 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -46,7 +46,7 @@ glabel func_80241F38_B601E8 /* B6028C 80241FDC 8E2200B0 */ lw $v0, 0xb0($s1) /* B60290 80241FE0 30420004 */ andi $v0, $v0, 4 /* B60294 80241FE4 10400020 */ beqz $v0, .L80242068 -/* B60298 80241FE8 00000000 */ nop +/* B60298 80241FE8 00000000 */ nop .L80241FEC: /* B6029C 80241FEC 2404F7FF */ addiu $a0, $zero, -0x801 /* B602A0 80241FF0 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241F38_B601E8 /* B60318 80242068 8E420070 */ lw $v0, 0x70($s2) /* B6031C 8024206C 2842001E */ slti $v0, $v0, 0x1e /* B60320 80242070 10400009 */ beqz $v0, .L80242098 -/* B60324 80242074 00000000 */ nop +/* B60324 80242074 00000000 */ nop /* B60328 80242078 8E22006C */ lw $v0, 0x6c($s1) /* B6032C 8024207C 14400006 */ bnez $v0, .L80242098 -/* B60330 80242080 00000000 */ nop +/* B60330 80242080 00000000 */ nop /* B60334 80242084 0C09061C */ jal func_80241870_B5FB20 /* B60338 80242088 0240202D */ daddu $a0, $s2, $zero /* B6033C 8024208C 10400002 */ beqz $v0, .L80242098 @@ -104,7 +104,7 @@ glabel func_80241F38_B601E8 /* B6035C 802420AC 00220821 */ addu $at, $at, $v0 /* B60360 802420B0 8C227670 */ lw $v0, %lo(D_80247670)($at) /* B60364 802420B4 00400008 */ jr $v0 -/* B60368 802420B8 00000000 */ nop +/* B60368 802420B8 00000000 */ nop /* B6036C 802420BC 0240202D */ daddu $a0, $s2, $zero /* B60370 802420C0 0260282D */ daddu $a1, $s3, $zero /* B60374 802420C4 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241F38_B601E8 /* B60384 802420D4 0C0125AE */ jal func_800496B8 /* B60388 802420D8 0280302D */ daddu $a2, $s4, $zero /* B6038C 802420DC 08090871 */ j .L802421C4 -/* B60390 802420E0 00000000 */ nop +/* B60390 802420E0 00000000 */ nop /* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero /* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero -/* B6039C 802420EC 0C090515 */ jal jan_08_UnkNpcAIFunc4 +/* B6039C 802420EC 0C090515 */ jal func_80241454_B5F704 /* B603A0 802420F0 0280302D */ daddu $a2, $s4, $zero /* B603A4 802420F4 0240202D */ daddu $a0, $s2, $zero /* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero /* B603AC 802420FC 0C090529 */ jal func_802414A4_B5F754 /* B603B0 80242100 0280302D */ daddu $a2, $s4, $zero /* B603B4 80242104 08090871 */ j .L802421C4 -/* B603B8 80242108 00000000 */ nop +/* B603B8 80242108 00000000 */ nop /* B603BC 8024210C 0240202D */ daddu $a0, $s2, $zero /* B603C0 80242110 0260282D */ daddu $a1, $s3, $zero /* B603C4 80242114 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241F38_B601E8 /* B603D4 80242124 0C0127B3 */ jal func_80049ECC /* B603D8 80242128 0280302D */ daddu $a2, $s4, $zero /* B603DC 8024212C 08090871 */ j .L802421C4 -/* B603E0 80242130 00000000 */ nop +/* B603E0 80242130 00000000 */ nop /* B603E4 80242134 0240202D */ daddu $a0, $s2, $zero /* B603E8 80242138 0260282D */ daddu $a1, $s3, $zero /* B603EC 8024213C 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241F38_B601E8 /* B603FC 8024214C 0C012849 */ jal func_8004A124 /* B60400 80242150 0280302D */ daddu $a2, $s4, $zero /* B60404 80242154 08090871 */ j .L802421C4 -/* B60408 80242158 00000000 */ nop +/* B60408 80242158 00000000 */ nop /* B6040C 8024215C 0240202D */ daddu $a0, $s2, $zero /* B60410 80242160 0260282D */ daddu $a1, $s3, $zero /* B60414 80242164 0C0128FA */ jal func_8004A3E8 /* B60418 80242168 0280302D */ daddu $a2, $s4, $zero /* B6041C 8024216C 08090871 */ j .L802421C4 -/* B60420 80242170 00000000 */ nop -/* B60424 80242174 0C09059A */ jal jan_08_UnkNpcAIFunc6 +/* B60420 80242170 00000000 */ nop +/* B60424 80242174 0C09059A */ jal func_80241668_B5F918 /* B60428 80242178 0240202D */ daddu $a0, $s2, $zero -/* B6042C 8024217C 0C0905B5 */ jal jan_08_UnkNpcAIFunc7 +/* B6042C 8024217C 0C0905B5 */ jal func_802416D4_B5F984 /* B60430 80242180 0240202D */ daddu $a0, $s2, $zero /* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) /* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 /* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 -/* B60440 80242190 00000000 */ nop -/* B60444 80242194 0C0905D1 */ jal jan_08_UnkNpcAIFunc8 +/* B60440 80242190 00000000 */ nop +/* B60444 80242194 0C0905D1 */ jal func_80241744_B5F9F4 /* B60448 80242198 0240202D */ daddu $a0, $s2, $zero /* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) /* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 /* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 -/* B60458 802421A8 00000000 */ nop -/* B6045C 802421AC 0C090607 */ jal jan_08_UnkNpcAIFunc5 +/* B60458 802421A8 00000000 */ nop +/* B6045C 802421AC 0C090607 */ jal func_8024181C_B5FACC /* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero /* B60464 802421B4 08090871 */ j .L802421C4 -/* B60468 802421B8 00000000 */ nop +/* B60468 802421B8 00000000 */ nop /* B6046C 802421BC 0C0129CF */ jal func_8004A73C /* B60470 802421C0 0240202D */ daddu $a0, $s2, $zero .L802421C4: @@ -182,4 +182,4 @@ glabel func_80241F38_B601E8 /* B60490 802421E0 0000102D */ daddu $v0, $zero, $zero /* B60494 802421E4 03E00008 */ jr $ra /* B60498 802421E8 27BD0050 */ addiu $sp, $sp, 0x50 -/* B6049C 802421EC 00000000 */ nop +/* B6049C 802421EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index 2293d3c68f..5c2bc31259 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -46,7 +46,7 @@ glabel func_80241170_B66C20 /* B66CC4 80241214 8E2200B0 */ lw $v0, 0xb0($s1) /* B66CC8 80241218 30420004 */ andi $v0, $v0, 4 /* B66CCC 8024121C 10400020 */ beqz $v0, .L802412A0 -/* B66CD0 80241220 00000000 */ nop +/* B66CD0 80241220 00000000 */ nop .L80241224: /* B66CD4 80241224 2404F7FF */ addiu $a0, $zero, -0x801 /* B66CD8 80241228 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241170_B66C20 /* B66D50 802412A0 8E420070 */ lw $v0, 0x70($s2) /* B66D54 802412A4 2842001E */ slti $v0, $v0, 0x1e /* B66D58 802412A8 10400009 */ beqz $v0, .L802412D0 -/* B66D5C 802412AC 00000000 */ nop +/* B66D5C 802412AC 00000000 */ nop /* B66D60 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* B66D64 802412B4 14400006 */ bnez $v0, .L802412D0 -/* B66D68 802412B8 00000000 */ nop +/* B66D68 802412B8 00000000 */ nop /* B66D6C 802412BC 0C090357 */ jal func_80240D5C_B6680C /* B66D70 802412C0 0240202D */ daddu $a0, $s2, $zero /* B66D74 802412C4 10400002 */ beqz $v0, .L802412D0 @@ -104,7 +104,7 @@ glabel func_80241170_B66C20 /* B66D94 802412E4 00220821 */ addu $at, $at, $v0 /* B66D98 802412E8 8C2265C0 */ lw $v0, %lo(D_802465C0)($at) /* B66D9C 802412EC 00400008 */ jr $v0 -/* B66DA0 802412F0 00000000 */ nop +/* B66DA0 802412F0 00000000 */ nop /* B66DA4 802412F4 0240202D */ daddu $a0, $s2, $zero /* B66DA8 802412F8 0260282D */ daddu $a1, $s3, $zero /* B66DAC 802412FC 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241170_B66C20 /* B66DBC 8024130C 0C0125AE */ jal func_800496B8 /* B66DC0 80241310 0280302D */ daddu $a2, $s4, $zero /* B66DC4 80241314 080904FF */ j .L802413FC -/* B66DC8 80241318 00000000 */ nop +/* B66DC8 80241318 00000000 */ nop /* B66DCC 8024131C 0240202D */ daddu $a0, $s2, $zero /* B66DD0 80241320 0260282D */ daddu $a1, $s3, $zero -/* B66DD4 80241324 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* B66DD4 80241324 0C0126D1 */ jal func_80049B44 /* B66DD8 80241328 0280302D */ daddu $a2, $s4, $zero /* B66DDC 8024132C 0240202D */ daddu $a0, $s2, $zero /* B66DE0 80241330 0260282D */ daddu $a1, $s3, $zero /* B66DE4 80241334 0C012701 */ jal func_80049C04 /* B66DE8 80241338 0280302D */ daddu $a2, $s4, $zero /* B66DEC 8024133C 080904FF */ j .L802413FC -/* B66DF0 80241340 00000000 */ nop +/* B66DF0 80241340 00000000 */ nop /* B66DF4 80241344 0240202D */ daddu $a0, $s2, $zero /* B66DF8 80241348 0260282D */ daddu $a1, $s3, $zero /* B66DFC 8024134C 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241170_B66C20 /* B66E0C 8024135C 0C0127B3 */ jal func_80049ECC /* B66E10 80241360 0280302D */ daddu $a2, $s4, $zero /* B66E14 80241364 080904FF */ j .L802413FC -/* B66E18 80241368 00000000 */ nop +/* B66E18 80241368 00000000 */ nop /* B66E1C 8024136C 0240202D */ daddu $a0, $s2, $zero /* B66E20 80241370 0260282D */ daddu $a1, $s3, $zero /* B66E24 80241374 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241170_B66C20 /* B66E34 80241384 0C012849 */ jal func_8004A124 /* B66E38 80241388 0280302D */ daddu $a2, $s4, $zero /* B66E3C 8024138C 080904FF */ j .L802413FC -/* B66E40 80241390 00000000 */ nop +/* B66E40 80241390 00000000 */ nop /* B66E44 80241394 0240202D */ daddu $a0, $s2, $zero /* B66E48 80241398 0260282D */ daddu $a1, $s3, $zero /* B66E4C 8024139C 0C0128FA */ jal func_8004A3E8 /* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero /* B66E54 802413A4 080904FF */ j .L802413FC -/* B66E58 802413A8 00000000 */ nop -/* B66E5C 802413AC 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 +/* B66E58 802413A8 00000000 */ nop +/* B66E5C 802413AC 0C0902D5 */ jal func_80240B54_B66604 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero -/* B66E64 802413B4 0C0902F0 */ jal jan_09_UnkNpcAIFunc7 +/* B66E64 802413B4 0C0902F0 */ jal func_80240BC0_B66670 /* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero /* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC -/* B66E78 802413C8 00000000 */ nop -/* B66E7C 802413CC 0C09030C */ jal jan_09_UnkNpcAIFunc8 +/* B66E78 802413C8 00000000 */ nop +/* B66E7C 802413CC 0C09030C */ jal func_80240C30_B666E0 /* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero /* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC -/* B66E90 802413E0 00000000 */ nop -/* B66E94 802413E4 0C090342 */ jal jan_09_UnkNpcAIFunc5 +/* B66E90 802413E0 00000000 */ nop +/* B66E94 802413E4 0C090342 */ jal func_80240D08_B667B8 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero /* B66E9C 802413EC 080904FF */ j .L802413FC -/* B66EA0 802413F0 00000000 */ nop +/* B66EA0 802413F0 00000000 */ nop /* B66EA4 802413F4 0C0129CF */ jal func_8004A73C /* B66EA8 802413F8 0240202D */ daddu $a0, $s2, $zero .L802413FC: diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index 2009a13779..52cd6802ec 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -46,7 +46,7 @@ glabel func_80241424_B66ED4 /* B66F78 802414C8 8E2200B0 */ lw $v0, 0xb0($s1) /* B66F7C 802414CC 30420004 */ andi $v0, $v0, 4 /* B66F80 802414D0 10400020 */ beqz $v0, .L80241554 -/* B66F84 802414D4 00000000 */ nop +/* B66F84 802414D4 00000000 */ nop .L802414D8: /* B66F88 802414D8 2404F7FF */ addiu $a0, $zero, -0x801 /* B66F8C 802414DC AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241424_B66ED4 /* B67004 80241554 8E420070 */ lw $v0, 0x70($s2) /* B67008 80241558 2842001E */ slti $v0, $v0, 0x1e /* B6700C 8024155C 10400009 */ beqz $v0, .L80241584 -/* B67010 80241560 00000000 */ nop +/* B67010 80241560 00000000 */ nop /* B67014 80241564 8E22006C */ lw $v0, 0x6c($s1) /* B67018 80241568 14400006 */ bnez $v0, .L80241584 -/* B6701C 8024156C 00000000 */ nop +/* B6701C 8024156C 00000000 */ nop /* B67020 80241570 0C090357 */ jal func_80240D5C_B6680C /* B67024 80241574 0240202D */ daddu $a0, $s2, $zero /* B67028 80241578 10400002 */ beqz $v0, .L80241584 @@ -104,7 +104,7 @@ glabel func_80241424_B66ED4 /* B67048 80241598 00220821 */ addu $at, $at, $v0 /* B6704C 8024159C 8C226750 */ lw $v0, %lo(D_80246750)($at) /* B67050 802415A0 00400008 */ jr $v0 -/* B67054 802415A4 00000000 */ nop +/* B67054 802415A4 00000000 */ nop /* B67058 802415A8 0240202D */ daddu $a0, $s2, $zero /* B6705C 802415AC 0260282D */ daddu $a1, $s3, $zero /* B67060 802415B0 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241424_B66ED4 /* B67070 802415C0 0C0125AE */ jal func_800496B8 /* B67074 802415C4 0280302D */ daddu $a2, $s4, $zero /* B67078 802415C8 080905AC */ j .L802416B0 -/* B6707C 802415CC 00000000 */ nop +/* B6707C 802415CC 00000000 */ nop /* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero /* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero -/* B67088 802415D8 0C090250 */ jal jan_09_UnkNpcAIFunc4 +/* B67088 802415D8 0C090250 */ jal func_80240940_B663F0 /* B6708C 802415DC 0280302D */ daddu $a2, $s4, $zero /* B67090 802415E0 0240202D */ daddu $a0, $s2, $zero /* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero /* B67098 802415E8 0C090264 */ jal func_80240990_B66440 /* B6709C 802415EC 0280302D */ daddu $a2, $s4, $zero /* B670A0 802415F0 080905AC */ j .L802416B0 -/* B670A4 802415F4 00000000 */ nop +/* B670A4 802415F4 00000000 */ nop /* B670A8 802415F8 0240202D */ daddu $a0, $s2, $zero /* B670AC 802415FC 0260282D */ daddu $a1, $s3, $zero /* B670B0 80241600 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241424_B66ED4 /* B670C0 80241610 0C0127B3 */ jal func_80049ECC /* B670C4 80241614 0280302D */ daddu $a2, $s4, $zero /* B670C8 80241618 080905AC */ j .L802416B0 -/* B670CC 8024161C 00000000 */ nop +/* B670CC 8024161C 00000000 */ nop /* B670D0 80241620 0240202D */ daddu $a0, $s2, $zero /* B670D4 80241624 0260282D */ daddu $a1, $s3, $zero /* B670D8 80241628 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241424_B66ED4 /* B670E8 80241638 0C012849 */ jal func_8004A124 /* B670EC 8024163C 0280302D */ daddu $a2, $s4, $zero /* B670F0 80241640 080905AC */ j .L802416B0 -/* B670F4 80241644 00000000 */ nop +/* B670F4 80241644 00000000 */ nop /* B670F8 80241648 0240202D */ daddu $a0, $s2, $zero /* B670FC 8024164C 0260282D */ daddu $a1, $s3, $zero /* B67100 80241650 0C0128FA */ jal func_8004A3E8 /* B67104 80241654 0280302D */ daddu $a2, $s4, $zero /* B67108 80241658 080905AC */ j .L802416B0 -/* B6710C 8024165C 00000000 */ nop -/* B67110 80241660 0C0902D5 */ jal jan_09_UnkNpcAIFunc6 +/* B6710C 8024165C 00000000 */ nop +/* B67110 80241660 0C0902D5 */ jal func_80240B54_B66604 /* B67114 80241664 0240202D */ daddu $a0, $s2, $zero -/* B67118 80241668 0C0902F0 */ jal jan_09_UnkNpcAIFunc7 +/* B67118 80241668 0C0902F0 */ jal func_80240BC0_B66670 /* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero /* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 /* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 -/* B6712C 8024167C 00000000 */ nop -/* B67130 80241680 0C09030C */ jal jan_09_UnkNpcAIFunc8 +/* B6712C 8024167C 00000000 */ nop +/* B67130 80241680 0C09030C */ jal func_80240C30_B666E0 /* B67134 80241684 0240202D */ daddu $a0, $s2, $zero /* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 /* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 -/* B67144 80241694 00000000 */ nop -/* B67148 80241698 0C090342 */ jal jan_09_UnkNpcAIFunc5 +/* B67144 80241694 00000000 */ nop +/* B67148 80241698 0C090342 */ jal func_80240D08_B667B8 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero /* B67150 802416A0 080905AC */ j .L802416B0 -/* B67154 802416A4 00000000 */ nop +/* B67154 802416A4 00000000 */ nop /* B67158 802416A8 0C0129CF */ jal func_8004A73C /* B6715C 802416AC 0240202D */ daddu $a0, $s2, $zero .L802416B0: @@ -182,5 +182,5 @@ glabel func_80241424_B66ED4 /* B6717C 802416CC 0000102D */ daddu $v0, $zero, $zero /* B67180 802416D0 03E00008 */ jr $ra /* B67184 802416D4 27BD0050 */ addiu $sp, $sp, 0x50 -/* B67188 802416D8 00000000 */ nop -/* B6718C 802416DC 00000000 */ nop +/* B67188 802416D8 00000000 */ nop +/* B6718C 802416DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s index 7c24495a29..1fb17f15b3 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -105,7 +105,7 @@ glabel func_80240F00_B6D290 /* B6D418 80241088 0000102D */ daddu $v0, $zero, $zero /* B6D41C 8024108C 0260202D */ daddu $a0, $s3, $zero /* B6D420 80241090 0280282D */ daddu $a1, $s4, $zero -/* B6D424 80241094 0C09021E */ jal jan_10_UnkNpcAIFunc1 +/* B6D424 80241094 0C09021E */ jal func_80240878_B6CC08 /* B6D428 80241098 0200302D */ daddu $a2, $s0, $zero /* B6D42C 8024109C 8E630070 */ lw $v1, 0x70($s3) /* B6D430 802410A0 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240F00_B6D290 /* B6D478 802410E8 0000102D */ daddu $v0, $zero, $zero /* B6D47C 802410EC 0260202D */ daddu $a0, $s3, $zero /* B6D480 802410F0 0280282D */ daddu $a1, $s4, $zero -/* B6D484 802410F4 0C0903AF */ jal jan_10_UnkDurationCheck +/* B6D484 802410F4 0C0903AF */ jal func_80240EBC_B6D24C /* B6D488 802410F8 0200302D */ daddu $a2, $s0, $zero .L802410FC: /* B6D48C 802410FC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index 15e49ffa14..c5df029956 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -46,7 +46,7 @@ glabel func_80240CF0_B73DA0 /* B73E44 80240D94 8E2200B0 */ lw $v0, 0xb0($s1) /* B73E48 80240D98 30420004 */ andi $v0, $v0, 4 /* B73E4C 80240D9C 10400020 */ beqz $v0, .L80240E20 -/* B73E50 80240DA0 00000000 */ nop +/* B73E50 80240DA0 00000000 */ nop .L80240DA4: /* B73E54 80240DA4 2404F7FF */ addiu $a0, $zero, -0x801 /* B73E58 80240DA8 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240CF0_B73DA0 /* B73ED0 80240E20 8E420070 */ lw $v0, 0x70($s2) /* B73ED4 80240E24 2842001E */ slti $v0, $v0, 0x1e /* B73ED8 80240E28 10400009 */ beqz $v0, .L80240E50 -/* B73EDC 80240E2C 00000000 */ nop +/* B73EDC 80240E2C 00000000 */ nop /* B73EE0 80240E30 8E22006C */ lw $v0, 0x6c($s1) /* B73EE4 80240E34 14400006 */ bnez $v0, .L80240E50 -/* B73EE8 80240E38 00000000 */ nop +/* B73EE8 80240E38 00000000 */ nop /* B73EEC 80240E3C 0C090237 */ jal func_802408DC_B7398C /* B73EF0 80240E40 0240202D */ daddu $a0, $s2, $zero /* B73EF4 80240E44 10400002 */ beqz $v0, .L80240E50 @@ -104,7 +104,7 @@ glabel func_80240CF0_B73DA0 /* B73F14 80240E64 00220821 */ addu $at, $at, $v0 /* B73F18 80240E68 8C2233E0 */ lw $v0, %lo(D_802433E0)($at) /* B73F1C 80240E6C 00400008 */ jr $v0 -/* B73F20 80240E70 00000000 */ nop +/* B73F20 80240E70 00000000 */ nop /* B73F24 80240E74 0240202D */ daddu $a0, $s2, $zero /* B73F28 80240E78 0260282D */ daddu $a1, $s3, $zero /* B73F2C 80240E7C 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80240CF0_B73DA0 /* B73F3C 80240E8C 0C0125AE */ jal func_800496B8 /* B73F40 80240E90 0280302D */ daddu $a2, $s4, $zero /* B73F44 80240E94 080903DF */ j .L80240F7C -/* B73F48 80240E98 00000000 */ nop +/* B73F48 80240E98 00000000 */ nop /* B73F4C 80240E9C 0240202D */ daddu $a0, $s2, $zero /* B73F50 80240EA0 0260282D */ daddu $a1, $s3, $zero -/* B73F54 80240EA4 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* B73F54 80240EA4 0C0126D1 */ jal func_80049B44 /* B73F58 80240EA8 0280302D */ daddu $a2, $s4, $zero /* B73F5C 80240EAC 0240202D */ daddu $a0, $s2, $zero /* B73F60 80240EB0 0260282D */ daddu $a1, $s3, $zero /* B73F64 80240EB4 0C012701 */ jal func_80049C04 /* B73F68 80240EB8 0280302D */ daddu $a2, $s4, $zero /* B73F6C 80240EBC 080903DF */ j .L80240F7C -/* B73F70 80240EC0 00000000 */ nop +/* B73F70 80240EC0 00000000 */ nop /* B73F74 80240EC4 0240202D */ daddu $a0, $s2, $zero /* B73F78 80240EC8 0260282D */ daddu $a1, $s3, $zero /* B73F7C 80240ECC 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240CF0_B73DA0 /* B73F8C 80240EDC 0C0127B3 */ jal func_80049ECC /* B73F90 80240EE0 0280302D */ daddu $a2, $s4, $zero /* B73F94 80240EE4 080903DF */ j .L80240F7C -/* B73F98 80240EE8 00000000 */ nop +/* B73F98 80240EE8 00000000 */ nop /* B73F9C 80240EEC 0240202D */ daddu $a0, $s2, $zero /* B73FA0 80240EF0 0260282D */ daddu $a1, $s3, $zero /* B73FA4 80240EF4 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80240CF0_B73DA0 /* B73FB4 80240F04 0C012849 */ jal func_8004A124 /* B73FB8 80240F08 0280302D */ daddu $a2, $s4, $zero /* B73FBC 80240F0C 080903DF */ j .L80240F7C -/* B73FC0 80240F10 00000000 */ nop +/* B73FC0 80240F10 00000000 */ nop /* B73FC4 80240F14 0240202D */ daddu $a0, $s2, $zero /* B73FC8 80240F18 0260282D */ daddu $a1, $s3, $zero /* B73FCC 80240F1C 0C0128FA */ jal func_8004A3E8 /* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero /* B73FD4 80240F24 080903DF */ j .L80240F7C -/* B73FD8 80240F28 00000000 */ nop -/* B73FDC 80240F2C 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 +/* B73FD8 80240F28 00000000 */ nop +/* B73FDC 80240F2C 0C0901B5 */ jal func_802406D4_B73784 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero -/* B73FE4 80240F34 0C0901D0 */ jal jan_12_UnkNpcAIFunc7 +/* B73FE4 80240F34 0C0901D0 */ jal func_80240740_B737F0 /* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero /* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 /* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C -/* B73FF8 80240F48 00000000 */ nop -/* B73FFC 80240F4C 0C0901EC */ jal jan_12_UnkNpcAIFunc8 +/* B73FF8 80240F48 00000000 */ nop +/* B73FFC 80240F4C 0C0901EC */ jal func_802407B0_B73860 /* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero /* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 /* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C -/* B74010 80240F60 00000000 */ nop -/* B74014 80240F64 0C090222 */ jal jan_12_UnkNpcAIFunc5 +/* B74010 80240F60 00000000 */ nop +/* B74014 80240F64 0C090222 */ jal func_80240888_B73938 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero /* B7401C 80240F6C 080903DF */ j .L80240F7C -/* B74020 80240F70 00000000 */ nop +/* B74020 80240F70 00000000 */ nop /* B74024 80240F74 0C0129CF */ jal func_8004A73C /* B74028 80240F78 0240202D */ daddu $a0, $s2, $zero .L80240F7C: diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s index 72e7b050d9..e5b4c42817 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -46,7 +46,7 @@ glabel func_80240FA4_B74054 /* B740F8 80241048 8E2200B0 */ lw $v0, 0xb0($s1) /* B740FC 8024104C 30420004 */ andi $v0, $v0, 4 /* B74100 80241050 10400020 */ beqz $v0, .L802410D4 -/* B74104 80241054 00000000 */ nop +/* B74104 80241054 00000000 */ nop .L80241058: /* B74108 80241058 2404F7FF */ addiu $a0, $zero, -0x801 /* B7410C 8024105C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240FA4_B74054 /* B74184 802410D4 8E420070 */ lw $v0, 0x70($s2) /* B74188 802410D8 2842001E */ slti $v0, $v0, 0x1e /* B7418C 802410DC 10400009 */ beqz $v0, .L80241104 -/* B74190 802410E0 00000000 */ nop +/* B74190 802410E0 00000000 */ nop /* B74194 802410E4 8E22006C */ lw $v0, 0x6c($s1) /* B74198 802410E8 14400006 */ bnez $v0, .L80241104 -/* B7419C 802410EC 00000000 */ nop +/* B7419C 802410EC 00000000 */ nop /* B741A0 802410F0 0C090237 */ jal func_802408DC_B7398C /* B741A4 802410F4 0240202D */ daddu $a0, $s2, $zero /* B741A8 802410F8 10400002 */ beqz $v0, .L80241104 @@ -104,7 +104,7 @@ glabel func_80240FA4_B74054 /* B741C8 80241118 00220821 */ addu $at, $at, $v0 /* B741CC 8024111C 8C223570 */ lw $v0, %lo(pause_textbox_draw_contents)($at) /* B741D0 80241120 00400008 */ jr $v0 -/* B741D4 80241124 00000000 */ nop +/* B741D4 80241124 00000000 */ nop /* B741D8 80241128 0240202D */ daddu $a0, $s2, $zero /* B741DC 8024112C 0260282D */ daddu $a1, $s3, $zero /* B741E0 80241130 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80240FA4_B74054 /* B741F0 80241140 0C0125AE */ jal func_800496B8 /* B741F4 80241144 0280302D */ daddu $a2, $s4, $zero /* B741F8 80241148 0809048C */ j .L80241230 -/* B741FC 8024114C 00000000 */ nop +/* B741FC 8024114C 00000000 */ nop /* B74200 80241150 0240202D */ daddu $a0, $s2, $zero /* B74204 80241154 0260282D */ daddu $a1, $s3, $zero -/* B74208 80241158 0C090130 */ jal jan_12_UnkNpcAIFunc4 +/* B74208 80241158 0C090130 */ jal func_802404C0_B73570 /* B7420C 8024115C 0280302D */ daddu $a2, $s4, $zero /* B74210 80241160 0240202D */ daddu $a0, $s2, $zero /* B74214 80241164 0260282D */ daddu $a1, $s3, $zero /* B74218 80241168 0C090144 */ jal func_80240510_B735C0 /* B7421C 8024116C 0280302D */ daddu $a2, $s4, $zero /* B74220 80241170 0809048C */ j .L80241230 -/* B74224 80241174 00000000 */ nop +/* B74224 80241174 00000000 */ nop /* B74228 80241178 0240202D */ daddu $a0, $s2, $zero /* B7422C 8024117C 0260282D */ daddu $a1, $s3, $zero /* B74230 80241180 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240FA4_B74054 /* B74240 80241190 0C0127B3 */ jal func_80049ECC /* B74244 80241194 0280302D */ daddu $a2, $s4, $zero /* B74248 80241198 0809048C */ j .L80241230 -/* B7424C 8024119C 00000000 */ nop +/* B7424C 8024119C 00000000 */ nop /* B74250 802411A0 0240202D */ daddu $a0, $s2, $zero /* B74254 802411A4 0260282D */ daddu $a1, $s3, $zero /* B74258 802411A8 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80240FA4_B74054 /* B74268 802411B8 0C012849 */ jal func_8004A124 /* B7426C 802411BC 0280302D */ daddu $a2, $s4, $zero /* B74270 802411C0 0809048C */ j .L80241230 -/* B74274 802411C4 00000000 */ nop +/* B74274 802411C4 00000000 */ nop /* B74278 802411C8 0240202D */ daddu $a0, $s2, $zero /* B7427C 802411CC 0260282D */ daddu $a1, $s3, $zero /* B74280 802411D0 0C0128FA */ jal func_8004A3E8 /* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero /* B74288 802411D8 0809048C */ j .L80241230 -/* B7428C 802411DC 00000000 */ nop -/* B74290 802411E0 0C0901B5 */ jal jan_12_UnkNpcAIFunc6 +/* B7428C 802411DC 00000000 */ nop +/* B74290 802411E0 0C0901B5 */ jal func_802406D4_B73784 /* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero -/* B74298 802411E8 0C0901D0 */ jal jan_12_UnkNpcAIFunc7 +/* B74298 802411E8 0C0901D0 */ jal func_80240740_B737F0 /* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero /* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) /* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 /* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 -/* B742AC 802411FC 00000000 */ nop -/* B742B0 80241200 0C0901EC */ jal jan_12_UnkNpcAIFunc8 +/* B742AC 802411FC 00000000 */ nop +/* B742B0 80241200 0C0901EC */ jal func_802407B0_B73860 /* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero /* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) /* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 /* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 -/* B742C4 80241214 00000000 */ nop -/* B742C8 80241218 0C090222 */ jal jan_12_UnkNpcAIFunc5 +/* B742C4 80241214 00000000 */ nop +/* B742C8 80241218 0C090222 */ jal func_80240888_B73938 /* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero /* B742D0 80241220 0809048C */ j .L80241230 -/* B742D4 80241224 00000000 */ nop +/* B742D4 80241224 00000000 */ nop /* B742D8 80241228 0C0129CF */ jal func_8004A73C /* B742DC 8024122C 0240202D */ daddu $a0, $s2, $zero .L80241230: @@ -182,5 +182,5 @@ glabel func_80240FA4_B74054 /* B742FC 8024124C 0000102D */ daddu $v0, $zero, $zero /* B74300 80241250 03E00008 */ jr $ra /* B74304 80241254 27BD0050 */ addiu $sp, $sp, 0x50 -/* B74308 80241258 00000000 */ nop -/* B7430C 8024125C 00000000 */ nop +/* B74308 80241258 00000000 */ nop +/* B7430C 8024125C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s index c4de0b6e05..61370fd113 100644 --- a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s +++ b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240000_B767B0.s @@ -4,8 +4,8 @@ glabel func_80240000_B767B0 /* B767B0 80240000 27BDFFB8 */ addiu $sp, $sp, -0x48 /* B767B4 80240004 AFB10014 */ sw $s1, 0x14($sp) -/* B767B8 80240008 3C118024 */ lui $s1, %hi(D_80240850) -/* B767BC 8024000C 26310850 */ addiu $s1, $s1, %lo(D_80240850) +/* B767B8 80240008 3C118024 */ lui $s1, %hi(func_80240850_AEDC60) +/* B767BC 8024000C 26310850 */ addiu $s1, $s1, %lo(func_80240850_AEDC60) /* B767C0 80240010 AFBF0020 */ sw $ra, 0x20($sp) /* B767C4 80240014 AFB3001C */ sw $s3, 0x1c($sp) /* B767C8 80240018 AFB20018 */ sw $s2, 0x18($sp) @@ -15,8 +15,8 @@ glabel func_80240000_B767B0 /* B767D8 80240028 F7B60030 */ sdc1 $f22, 0x30($sp) /* B767DC 8024002C F7B40028 */ sdc1 $f20, 0x28($sp) /* B767E0 80240030 96220000 */ lhu $v0, ($s1) -/* B767E4 80240034 3C018024 */ lui $at, %hi(D_80243880) -/* B767E8 80240038 D4203880 */ ldc1 $f0, %lo(D_80243880)($at) +/* B767E4 80240034 3C018024 */ lui $at, %hi(func_80243880_95EA80) +/* B767E8 80240038 D4203880 */ ldc1 $f0, %lo(func_80243880_95EA80)($at) /* B767EC 8024003C 44826000 */ mtc1 $v0, $f12 /* B767F0 80240040 00000000 */ nop /* B767F4 80240044 46806320 */ cvt.s.w $f12, $f12 @@ -43,8 +43,8 @@ glabel func_80240000_B767B0 /* B76848 80240098 4600A521 */ cvt.d.s $f20, $f20 /* B7684C 8024009C 4638A502 */ mul.d $f20, $f20, $f24 /* B76850 802400A0 00000000 */ nop -/* B76854 802400A4 3C018024 */ lui $at, %hi(D_80243898) -/* B76858 802400A8 D4203898 */ ldc1 $f0, %lo(D_80243898)($at) +/* B76854 802400A4 3C018024 */ lui $at, %hi(func_80243898) +/* B76858 802400A8 D4203898 */ ldc1 $f0, %lo(func_80243898)($at) /* B7685C 802400AC 4620A500 */ add.d $f20, $f20, $f0 /* B76860 802400B0 0C00A85B */ jal sin_rad /* B76864 802400B4 46206320 */ cvt.s.d $f12, $f12 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s index 3f117b8799..38086b071a 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_80240170_B7A1C0.s @@ -9,8 +9,8 @@ glabel func_80240170_B7A1C0 /* B7A1D0 80240180 AFBF0014 */ sw $ra, 0x14($sp) /* B7A1D4 80240184 0C019D28 */ jal guMtxIdentF /* B7A1D8 80240188 0080802D */ daddu $s0, $a0, $zero -/* B7A1DC 8024018C 3C018024 */ lui $at, %hi(D_80243870) -/* B7A1E0 80240190 D4203870 */ ldc1 $f0, %lo(D_80243870)($at) +/* B7A1DC 8024018C 3C018024 */ lui $at, %hi(func_80243870_96CA30) +/* B7A1E0 80240190 D4203870 */ ldc1 $f0, %lo(func_80243870_96CA30)($at) /* B7A1E4 80240194 4600A521 */ cvt.d.s $f20, $f20 /* B7A1E8 80240198 4620A502 */ mul.d $f20, $f20, $f0 /* B7A1EC 8024019C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s index 594d622f50..138d82791f 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802406F0_B7A740.s @@ -83,8 +83,8 @@ glabel func_802406F0_B7A740 /* B7A86C 8024081C 27A5002C */ addiu $a1, $sp, 0x2c /* B7A870 80240820 C6000038 */ lwc1 $f0, 0x38($s0) /* B7A874 80240824 860200A6 */ lh $v0, 0xa6($s0) -/* B7A878 80240828 3C018024 */ lui $at, %hi(D_80243880) -/* B7A87C 8024082C D4223880 */ ldc1 $f2, %lo(D_80243880)($at) +/* B7A878 80240828 3C018024 */ lui $at, %hi(func_80243880_95EA80) +/* B7A87C 8024082C D4223880 */ ldc1 $f2, %lo(func_80243880_95EA80)($at) /* B7A880 80240830 27A60030 */ addiu $a2, $sp, 0x30 /* B7A884 80240834 E7A0002C */ swc1 $f0, 0x2c($sp) /* B7A888 80240838 44820000 */ mtc1 $v0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s index b8894917fe..bd1f8f42c2 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -105,7 +105,7 @@ glabel func_802410B0_B7B100 /* B7B288 80241238 0000102D */ daddu $v0, $zero, $zero /* B7B28C 8024123C 0260202D */ daddu $a0, $s3, $zero /* B7B290 80241240 0280282D */ daddu $a1, $s4, $zero -/* B7B294 80241244 0C09028A */ jal jan_14_UnkNpcAIFunc1 +/* B7B294 80241244 0C09028A */ jal func_80240A28_B7AA78 /* B7B298 80241248 0200302D */ daddu $a2, $s0, $zero /* B7B29C 8024124C 8E630070 */ lw $v1, 0x70($s3) /* B7B2A0 80241250 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_802410B0_B7B100 /* B7B2E8 80241298 0000102D */ daddu $v0, $zero, $zero /* B7B2EC 8024129C 0260202D */ daddu $a0, $s3, $zero /* B7B2F0 802412A0 0280282D */ daddu $a1, $s4, $zero -/* B7B2F4 802412A4 0C09041B */ jal jan_14_UnkDurationCheck +/* B7B2F4 802412A4 0C09041B */ jal func_8024106C_B7B0BC /* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero .L802412AC: /* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s index 8f4d0591ec..13af9e332c 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s @@ -69,8 +69,8 @@ glabel func_80240000_B84180 /* B84274 802400F4 08090047 */ j .L8024011C /* B84278 802400F8 E6800018 */ swc1 $f0, 0x18($s4) .L802400FC: -/* B8427C 802400FC 3C018025 */ lui $at, %hi(D_8024B9A0) -/* B84280 80240100 D422B9A0 */ ldc1 $f2, %lo(D_8024B9A0)($at) +/* B8427C 802400FC 3C018025 */ lui $at, %hi(func_8024B9A0) +/* B84280 80240100 D422B9A0 */ ldc1 $f2, %lo(func_8024B9A0)($at) /* B84284 80240104 44820000 */ mtc1 $v0, $f0 /* B84288 80240108 00000000 */ nop /* B8428C 8024010C 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index 8e6436fa0b..25aff70de4 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -141,7 +141,7 @@ glabel func_80240B94_B84D14 /* B84F1C 80240D9C 00000000 */ nop /* B84F20 80240DA0 0280202D */ daddu $a0, $s4, $zero /* B84F24 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* B84F28 80240DA8 0C090100 */ jal jan_22_UnkNpcAIFunc1 +/* B84F28 80240DA8 0C090100 */ jal func_80240400_B84580 /* B84F2C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_B84D14 /* B84F5C 80240DDC 00000000 */ nop /* B84F60 80240DE0 0280202D */ daddu $a0, $s4, $zero /* B84F64 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* B84F68 80240DE8 0C0901CC */ jal jan_22_NpcJumpFunc2 +/* B84F68 80240DE8 0C0901CC */ jal func_80240730_B848B0 /* B84F6C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* B84F70 80240DF0 0280202D */ daddu $a0, $s4, $zero /* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* B84F78 80240DF8 0C0901E9 */ jal jan_22_NpcJumpFunc +/* B84F78 80240DF8 0C0901E9 */ jal func_802407A4_B84924 /* B84F7C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* B84F80 80240E00 0809039A */ j .L80240E68 /* B84F84 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_B84D14 /* B84FAC 80240E2C 00000000 */ nop /* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero /* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* B84FB8 80240E38 0C09029B */ jal jan_22_UnkNpcDurationFlagFunc +/* B84FB8 80240E38 0C09029B */ jal func_80240A6C_B84BEC /* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* B84FC0 80240E40 0809039A */ j .L80240E68 /* B84FC4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s index 01a2b52c50..3f03f53092 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240E90_B85010.s @@ -4,8 +4,8 @@ glabel func_80240E90_B85010 /* B85010 80240E90 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B85014 80240E94 AFB00010 */ sw $s0, 0x10($sp) -/* B85018 80240E98 3C108024 */ lui $s0, %hi(D_802425BC) -/* B8501C 80240E9C 261025BC */ addiu $s0, $s0, %lo(D_802425BC) +/* B85018 80240E98 3C108024 */ lui $s0, %hi(func_802425BC_A1D6BC) +/* B8501C 80240E9C 261025BC */ addiu $s0, $s0, %lo(func_802425BC_A1D6BC) /* B85020 80240EA0 AFBF0018 */ sw $ra, 0x18($sp) /* B85024 80240EA4 AFB10014 */ sw $s1, 0x14($sp) /* B85028 80240EA8 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240E90_B85010 /* B8508C 80240F0C 28620010 */ slti $v0, $v1, 0x10 /* B85090 80240F10 1440FFFA */ bnez $v0, .L80240EFC /* B85094 80240F14 24840004 */ addiu $a0, $a0, 4 -/* B85098 80240F18 3C108024 */ lui $s0, %hi(D_802425BC) -/* B8509C 80240F1C 261025BC */ addiu $s0, $s0, %lo(D_802425BC) +/* B85098 80240F18 3C108024 */ lui $s0, %hi(func_802425BC_A1D6BC) +/* B8509C 80240F1C 261025BC */ addiu $s0, $s0, %lo(func_802425BC_A1D6BC) /* B850A0 80240F20 0C00AB4B */ jal heap_free /* B850A4 80240F24 8E040000 */ lw $a0, ($s0) /* B850A8 80240F28 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s index 8e320cc92f..892706d4b1 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s @@ -56,8 +56,8 @@ glabel func_80240160_8A9B70 /* 8A9C38 80240228 50400001 */ beql $v0, $zero, .L80240230 /* 8A9C3C 8024022C 2410000A */ addiu $s0, $zero, 0xa .L80240230: -/* 8A9C40 80240230 3C018024 */ lui $at, %hi(D_80240A30) -/* 8A9C44 80240234 D4200A30 */ ldc1 $f0, %lo(D_80240A30)($at) +/* 8A9C40 80240230 3C018024 */ lui $at, %hi(func_80240A30_882BF0) +/* 8A9C44 80240234 D4200A30 */ ldc1 $f0, %lo(func_80240A30_882BF0)($at) /* 8A9C48 80240238 46006321 */ cvt.d.s $f12, $f12 /* 8A9C4C 8024023C 46206302 */ mul.d $f12, $f12, $f0 /* 8A9C50 80240240 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s index 8eff3cd710..a6841e372b 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s @@ -11,8 +11,8 @@ glabel func_80240354_8A9D64 /* 8A9D7C 8024036C AFB10024 */ sw $s1, 0x24($sp) /* 8A9D80 80240370 0C0470AC */ jal func_8011C2B0 /* 8A9D84 80240374 AFB00020 */ sw $s0, 0x20($sp) -/* 8A9D88 80240378 3C108024 */ lui $s0, %hi(D_802407C0) -/* 8A9D8C 8024037C 261007C0 */ addiu $s0, $s0, %lo(D_802407C0) +/* 8A9D88 80240378 3C108024 */ lui $s0, %hi(func_802407C0_843390) +/* 8A9D8C 8024037C 261007C0 */ addiu $s0, $s0, %lo(func_802407C0_843390) /* 8A9D90 80240380 8FA40010 */ lw $a0, 0x10($sp) /* 8A9D94 80240384 8FA50014 */ lw $a1, 0x14($sp) /* 8A9D98 80240388 8FA60018 */ lw $a2, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s index 3de139a898..4bc6e56c9f 100644 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s @@ -8,8 +8,8 @@ glabel func_802403E0_8A9DF0 /* 8A9DFC 802403EC AFBF0014 */ sw $ra, 0x14($sp) /* 8A9E00 802403F0 C60C0084 */ lwc1 $f12, 0x84($s0) /* 8A9E04 802403F4 46806320 */ cvt.s.w $f12, $f12 -/* 8A9E08 802403F8 3C018024 */ lui $at, %hi(D_80240A38) -/* 8A9E0C 802403FC D4200A38 */ ldc1 $f0, %lo(D_80240A38)($at) +/* 8A9E08 802403F8 3C018024 */ lui $at, %hi(func_80240A38_898018) +/* 8A9E0C 802403FC D4200A38 */ ldc1 $f0, %lo(func_80240A38_898018)($at) /* 8A9E10 80240400 46006321 */ cvt.d.s $f12, $f12 /* 8A9E14 80240404 46206302 */ mul.d $f12, $f12, $f0 /* 8A9E18 80240408 00000000 */ nop @@ -20,8 +20,8 @@ glabel func_802403E0_8A9DF0 /* 8A9E2C 8024041C 468010A0 */ cvt.s.w $f2, $f2 /* 8A9E30 80240420 46001082 */ mul.s $f2, $f2, $f0 /* 8A9E34 80240424 00000000 */ nop -/* 8A9E38 80240428 3C028024 */ lui $v0, %hi(D_802407C0) -/* 8A9E3C 8024042C 944207C0 */ lhu $v0, %lo(D_802407C0)($v0) +/* 8A9E38 80240428 3C028024 */ lui $v0, %hi(func_802407C0_843390) +/* 8A9E3C 8024042C 944207C0 */ lhu $v0, %lo(func_802407C0_843390)($v0) /* 8A9E40 80240430 3C013C23 */ lui $at, 0x3c23 /* 8A9E44 80240434 3421D70A */ ori $at, $at, 0xd70a /* 8A9E48 80240438 44812000 */ mtc1 $at, $f4 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s index 77e07c0e83..68c1648dc5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB290/func_80240040_ABB2D0.s @@ -18,8 +18,8 @@ glabel func_80240040_ABB2D0 /* ABB304 80240074 08090022 */ j .L80240088 /* ABB308 80240078 AE0200D0 */ sw $v0, 0xd0($s0) .L8024007C: -/* ABB30C 8024007C 3C028024 */ lui $v0, %hi(D_8024162C) -/* ABB310 80240080 2442162C */ addiu $v0, $v0, %lo(D_8024162C) +/* ABB30C 8024007C 3C028024 */ lui $v0, %hi(func_8024162C_9F606C) +/* ABB310 80240080 2442162C */ addiu $v0, $v0, %lo(func_8024162C_9F606C) /* ABB314 80240084 AE0200D0 */ sw $v0, 0xd0($s0) .L80240088: /* ABB318 80240088 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index fd356aad73..afa76dd2e0 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -141,7 +141,7 @@ glabel func_80240C44_ABBED4 /* ABC0DC 80240E4C 00000000 */ nop /* ABC0E0 80240E50 0280202D */ daddu $a0, $s4, $zero /* ABC0E4 80240E54 0260282D */ daddu $a1, $s3, $zero -/* ABC0E8 80240E58 0C09012C */ jal kkj_00_UnkNpcAIFunc1 +/* ABC0E8 80240E58 0C09012C */ jal func_802404B0_ABB740 /* ABC0EC 80240E5C 02A0302D */ daddu $a2, $s5, $zero /* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero /* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240C44_ABBED4 /* ABC11C 80240E8C 00000000 */ nop /* ABC120 80240E90 0280202D */ daddu $a0, $s4, $zero /* ABC124 80240E94 0260282D */ daddu $a1, $s3, $zero -/* ABC128 80240E98 0C0901F8 */ jal kkj_00_NpcJumpFunc2 +/* ABC128 80240E98 0C0901F8 */ jal func_802407E0_ABBA70 /* ABC12C 80240E9C 02A0302D */ daddu $a2, $s5, $zero /* ABC130 80240EA0 0280202D */ daddu $a0, $s4, $zero /* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero -/* ABC138 80240EA8 0C090215 */ jal kkj_00_NpcJumpFunc +/* ABC138 80240EA8 0C090215 */ jal func_80240854_ABBAE4 /* ABC13C 80240EAC 02A0302D */ daddu $a2, $s5, $zero /* ABC140 80240EB0 080903C6 */ j .L80240F18 /* ABC144 80240EB4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240C44_ABBED4 /* ABC16C 80240EDC 00000000 */ nop /* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero /* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero -/* ABC178 80240EE8 0C0902C7 */ jal kkj_00_UnkNpcDurationFlagFunc +/* ABC178 80240EE8 0C0902C7 */ jal func_80240B1C_ABBDAC /* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero /* ABC180 80240EF0 080903C6 */ j .L80240F18 /* ABC184 80240EF4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 35882169b0..c549229a0b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -141,7 +141,7 @@ glabel func_80240B94_AC5D04 /* AC5F0C 80240D9C 00000000 */ nop /* AC5F10 80240DA0 0280202D */ daddu $a0, $s4, $zero /* AC5F14 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* AC5F18 80240DA8 0C090100 */ jal kkj_01_UnkNpcAIFunc1 +/* AC5F18 80240DA8 0C090100 */ jal func_80240400_AC5570 /* AC5F1C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_AC5D04 /* AC5F4C 80240DDC 00000000 */ nop /* AC5F50 80240DE0 0280202D */ daddu $a0, $s4, $zero /* AC5F54 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* AC5F58 80240DE8 0C0901CC */ jal kkj_01_NpcJumpFunc2 +/* AC5F58 80240DE8 0C0901CC */ jal func_80240730_AC58A0 /* AC5F5C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* AC5F60 80240DF0 0280202D */ daddu $a0, $s4, $zero /* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* AC5F68 80240DF8 0C0901E9 */ jal kkj_01_NpcJumpFunc +/* AC5F68 80240DF8 0C0901E9 */ jal func_802407A4_AC5914 /* AC5F6C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* AC5F70 80240E00 0809039A */ j .L80240E68 /* AC5F74 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_AC5D04 /* AC5F9C 80240E2C 00000000 */ nop /* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero /* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* AC5FA8 80240E38 0C09029B */ jal kkj_01_UnkNpcDurationFlagFunc +/* AC5FA8 80240E38 0C09029B */ jal func_80240A6C_AC5BDC /* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* AC5FB0 80240E40 0809039A */ j .L80240E68 /* AC5FB4 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s index 0174885d2c..1562fe0ec8 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_80240070_AD4100.s @@ -58,8 +58,8 @@ glabel func_80240070_AD4100 /* AD41D4 80240144 00000000 */ nop /* AD41D8 80240148 45010007 */ bc1t .L80240168 /* AD41DC 8024014C 46000086 */ mov.s $f2, $f0 -/* AD41E0 80240150 3C018024 */ lui $at, %hi(D_80241E28) -/* AD41E4 80240154 D4201E28 */ ldc1 $f0, %lo(D_80241E28)($at) +/* AD41E0 80240150 3C018024 */ lui $at, %hi(func_80241E28_853F98) +/* AD41E4 80240154 D4201E28 */ ldc1 $f0, %lo(func_80241E28_853F98)($at) /* AD41E8 80240158 46202032 */ c.eq.d $f4, $f0 /* AD41EC 8024015C 00000000 */ nop /* AD41F0 80240160 45000008 */ bc1f .L80240184 diff --git a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s index be2734ac17..161aecb2af 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_13/AD6200/func_802404E0_AD63B0.s @@ -107,8 +107,8 @@ glabel func_802404E0_AD63B0 /* AD6544 80240674 2404000A */ addiu $a0, $zero, 0xa /* AD6548 80240678 0C00A67F */ jal rand_int /* AD654C 8024067C AC400044 */ sw $zero, 0x44($v0) -/* AD6550 80240680 3C018024 */ lui $at, %hi(D_80244FB8) -/* AD6554 80240684 D4224FB8 */ ldc1 $f2, %lo(D_80244FB8)($at) +/* AD6550 80240680 3C018024 */ lui $at, %hi(func_80244FB8_A2F1F8) +/* AD6554 80240684 D4224FB8 */ ldc1 $f2, %lo(func_80244FB8_A2F1F8)($at) /* AD6558 80240688 44820000 */ mtc1 $v0, $f0 /* AD655C 8024068C 00000000 */ nop /* AD6560 80240690 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s index f10d21f83c..f0e4d570a1 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403CC_ADB26C.s @@ -8,8 +8,8 @@ glabel func_802403CC_ADB26C /* ADB278 802403D8 0C0B1EAF */ jal get_variable /* ADB27C 802403DC 8C450000 */ lw $a1, ($v0) /* ADB280 802403E0 8FBF0010 */ lw $ra, 0x10($sp) -/* ADB284 802403E4 3C018024 */ lui $at, %hi(D_80241D38) -/* ADB288 802403E8 AC221D38 */ sw $v0, %lo(D_80241D38)($at) +/* ADB284 802403E4 3C018024 */ lui $at, %hi(func_80241D38_991518) +/* ADB288 802403E8 AC221D38 */ sw $v0, %lo(func_80241D38_991518)($at) /* ADB28C 802403EC 24020002 */ addiu $v0, $zero, 2 /* ADB290 802403F0 03E00008 */ jr $ra /* ADB294 802403F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s index d3a4eeb6c6..ff42207570 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_8024056C_AF320C.s @@ -6,11 +6,11 @@ glabel func_8024056C_AF320C /* AF3210 80240570 AFBF0010 */ sw $ra, 0x10($sp) /* AF3214 80240574 10A00003 */ beqz $a1, .L80240584 /* AF3218 80240578 8C86000C */ lw $a2, 0xc($a0) -/* AF321C 8024057C 3C018024 */ lui $at, %hi(D_80241F10) -/* AF3220 80240580 AC201F10 */ sw $zero, %lo(D_80241F10)($at) +/* AF321C 8024057C 3C018024 */ lui $at, %hi(func_80241F10_802790) +/* AF3220 80240580 AC201F10 */ sw $zero, %lo(func_80241F10_802790)($at) .L80240584: -/* AF3224 80240584 3C038024 */ lui $v1, %hi(D_80241F10) -/* AF3228 80240588 24631F10 */ addiu $v1, $v1, %lo(D_80241F10) +/* AF3224 80240584 3C038024 */ lui $v1, %hi(func_80241F10_802790) +/* AF3228 80240588 24631F10 */ addiu $v1, $v1, %lo(func_80241F10_802790) /* AF322C 8024058C 8C620000 */ lw $v0, ($v1) /* AF3230 80240590 54400003 */ bnel $v0, $zero, .L802405A0 /* AF3234 80240594 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s index ec9c3b57a6..8c5b478296 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_802405C0_AF3260.s @@ -12,7 +12,7 @@ glabel func_802405C0_AF3260 /* AF327C 802405DC 24020002 */ addiu $v0, $zero, 2 /* AF3280 802405E0 8FBF0010 */ lw $ra, 0x10($sp) /* AF3284 802405E4 24030001 */ addiu $v1, $zero, 1 -/* AF3288 802405E8 3C018024 */ lui $at, %hi(D_80241F10) -/* AF328C 802405EC AC231F10 */ sw $v1, %lo(D_80241F10)($at) +/* AF3288 802405E8 3C018024 */ lui $at, %hi(func_80241F10_802790) +/* AF328C 802405EC AC231F10 */ sw $v1, %lo(func_80241F10_802790)($at) /* AF3290 802405F0 03E00008 */ jr $ra /* AF3294 802405F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s index dca3b0052c..e811818ee1 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240000_AF7950.s @@ -9,8 +9,8 @@ glabel func_80240000_AF7950 /* AF7960 80240010 8C450000 */ lw $a1, ($v0) /* AF7964 80240014 0000202D */ daddu $a0, $zero, $zero /* AF7968 80240018 3C05F971 */ lui $a1, 0xf971 -/* AF796C 8024001C 3C018024 */ lui $at, %hi(D_80240E90) -/* AF7970 80240020 AC220E90 */ sw $v0, %lo(D_80240E90)($at) +/* AF796C 8024001C 3C018024 */ lui $at, %hi(func_80240E90_A878E0) +/* AF7970 80240020 AC220E90 */ sw $v0, %lo(func_80240E90_A878E0)($at) /* AF7974 80240024 0C0B1EAF */ jal get_variable /* AF7978 80240028 34A58892 */ ori $a1, $a1, 0x8892 /* AF797C 8024002C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s index d6ab662ada..d6a3137d42 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240068_AF79B8.s @@ -8,14 +8,14 @@ glabel func_80240068_AF79B8 /* AF79C4 80240074 AFBF0014 */ sw $ra, 0x14($sp) /* AF79C8 80240078 10400005 */ beqz $v0, .L80240090 /* AF79CC 8024007C AFB00010 */ sw $s0, 0x10($sp) -/* AF79D0 80240080 3C108014 */ lui $s0, %hi(D_80147474) -/* AF79D4 80240084 26107474 */ addiu $s0, $s0, %lo(D_80147474) +/* AF79D0 80240080 3C108014 */ lui $s0, %hi(func_80147474) +/* AF79D4 80240084 26107474 */ addiu $s0, $s0, %lo(func_80147474) /* AF79D8 80240088 08090027 */ j .L8024009C /* AF79DC 8024008C 2404000A */ addiu $a0, $zero, 0xa .L80240090: /* AF79E0 80240090 2404000A */ addiu $a0, $zero, 0xa -/* AF79E4 80240094 3C108014 */ lui $s0, %hi(D_80147574) -/* AF79E8 80240098 26107574 */ addiu $s0, $s0, %lo(D_80147574) +/* AF79E4 80240094 3C108014 */ lui $s0, %hi(func_80147574) +/* AF79E8 80240098 26107574 */ addiu $s0, $s0, %lo(func_80147574) .L8024009C: /* AF79EC 8024009C 0C051F9F */ jal func_80147E7C /* AF79F0 802400A0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s index 57eec0f9e0..5e033ace31 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802400E4_AF7A34 -/* AF7A34 802400E4 3C038024 */ lui $v1, %hi(D_80240E90) -/* AF7A38 802400E8 8C630E90 */ lw $v1, %lo(D_80240E90)($v1) +/* AF7A34 802400E4 3C038024 */ lui $v1, %hi(func_80240E90_A878E0) +/* AF7A38 802400E8 8C630E90 */ lw $v1, %lo(func_80240E90_A878E0)($v1) /* AF7A3C 802400EC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* AF7A40 802400F0 AFB1001C */ sw $s1, 0x1c($sp) /* AF7A44 802400F4 00A0882D */ daddu $s1, $a1, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s index c4b101280e..036425a8ca 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s @@ -3,8 +3,8 @@ glabel func_80240178_AF7AC8 /* AF7AC8 80240178 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF7ACC 8024017C 3C038024 */ lui $v1, %hi(D_80240E90) -/* AF7AD0 80240180 8C630E90 */ lw $v1, %lo(D_80240E90)($v1) +/* AF7ACC 8024017C 3C038024 */ lui $v1, %hi(func_80240E90_A878E0) +/* AF7AD0 80240180 8C630E90 */ lw $v1, %lo(func_80240E90_A878E0)($v1) /* AF7AD4 80240184 3C048024 */ lui $a0, %hi(D_80240E10) /* AF7AD8 80240188 24840E10 */ addiu $a0, $a0, %lo(D_80240E10) /* AF7ADC 8024018C AFBF0018 */ sw $ra, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s index 98ff3dbb36..e6ce84478a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802401FC_AF7B4C.s @@ -3,8 +3,8 @@ glabel func_802401FC_AF7B4C /* AF7B4C 802401FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AF7B50 80240200 3C048024 */ lui $a0, %hi(D_80240068) -/* AF7B54 80240204 24840068 */ addiu $a0, $a0, %lo(D_80240068) +/* AF7B50 80240200 3C048024 */ lui $a0, %hi(func_80240068_AF77BC) +/* AF7B54 80240204 24840068 */ addiu $a0, $a0, %lo(func_80240068_AF77BC) /* AF7B58 80240208 AFBF0024 */ sw $ra, 0x24($sp) /* AF7B5C 8024020C AFB20020 */ sw $s2, 0x20($sp) /* AF7B60 80240210 AFB1001C */ sw $s1, 0x1c($sp) @@ -13,8 +13,8 @@ glabel func_802401FC_AF7B4C /* AF7B6C 8024021C AC200E88 */ sw $zero, %lo(D_80240E88)($at) /* AF7B70 80240220 3C018024 */ lui $at, %hi(D_80240E8C) /* AF7B74 80240224 AC200E8C */ sw $zero, %lo(D_80240E8C)($at) -/* AF7B78 80240228 3C018024 */ lui $at, %hi(D_80240E90) -/* AF7B7C 8024022C AC200E90 */ sw $zero, %lo(D_80240E90)($at) +/* AF7B78 80240228 3C018024 */ lui $at, %hi(func_80240E90_A878E0) +/* AF7B7C 8024022C AC200E90 */ sw $zero, %lo(func_80240E90_A878E0)($at) /* AF7B80 80240230 0C048C8F */ jal bind_dynamic_entity_7 /* AF7B84 80240234 0000282D */ daddu $a1, $zero, $zero /* AF7B88 80240238 0C048D8F */ jal get_dynamic_entity @@ -28,8 +28,8 @@ glabel func_802401FC_AF7B4C /* AF7BA8 80240258 3C118024 */ lui $s1, %hi(D_80240E10) /* AF7BAC 8024025C 26310E10 */ addiu $s1, $s1, %lo(D_80240E10) .L80240260: -/* AF7BB0 80240260 3C048024 */ lui $a0, %hi(D_80240E94) -/* AF7BB4 80240264 24840E94 */ addiu $a0, $a0, %lo(D_80240E94) +/* AF7BB0 80240260 3C048024 */ lui $a0, %hi(func_80240E94_9C6274) +/* AF7BB4 80240264 24840E94 */ addiu $a0, $a0, %lo(func_80240E94_9C6274) /* AF7BB8 80240268 24050080 */ addiu $a1, $zero, 0x80 /* AF7BBC 8024026C AFA00010 */ sw $zero, 0x10($sp) /* AF7BC0 80240270 AFB20014 */ sw $s2, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s index 574bb7b45b..3fc5533349 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802404DC_AF7E2C.s @@ -6,11 +6,11 @@ glabel func_802404DC_AF7E2C /* AF7E30 802404E0 AFBF0010 */ sw $ra, 0x10($sp) /* AF7E34 802404E4 10A00003 */ beqz $a1, .L802404F4 /* AF7E38 802404E8 8C86000C */ lw $a2, 0xc($a0) -/* AF7E3C 802404EC 3C018024 */ lui $at, %hi(D_80241B10) -/* AF7E40 802404F0 AC201B10 */ sw $zero, %lo(D_80241B10)($at) +/* AF7E3C 802404EC 3C018024 */ lui $at, %hi(func_80241B10_88A6E0) +/* AF7E40 802404F0 AC201B10 */ sw $zero, %lo(func_80241B10_88A6E0)($at) .L802404F4: -/* AF7E44 802404F4 3C038024 */ lui $v1, %hi(D_80241B10) -/* AF7E48 802404F8 24631B10 */ addiu $v1, $v1, %lo(D_80241B10) +/* AF7E44 802404F4 3C038024 */ lui $v1, %hi(func_80241B10_88A6E0) +/* AF7E48 802404F8 24631B10 */ addiu $v1, $v1, %lo(func_80241B10_88A6E0) /* AF7E4C 802404FC 8C620000 */ lw $v0, ($v1) /* AF7E50 80240500 54400003 */ bnel $v0, $zero, .L80240510 /* AF7E54 80240504 AC600000 */ sw $zero, ($v1) @@ -18,9 +18,9 @@ glabel func_802404DC_AF7E2C /* AF7E5C 8024050C 0000102D */ daddu $v0, $zero, $zero .L80240510: /* AF7E60 80240510 8CC50000 */ lw $a1, ($a2) -/* AF7E64 80240514 3C068024 */ lui $a2, %hi(D_80241B14) +/* AF7E64 80240514 3C068024 */ lui $a2, %hi(func_80241B14_9A9F04) /* AF7E68 80240518 0C0B2026 */ jal set_variable -/* AF7E6C 8024051C 8CC61B14 */ lw $a2, %lo(D_80241B14)($a2) +/* AF7E6C 8024051C 8CC61B14 */ lw $a2, %lo(func_80241B14_9A9F04)($a2) /* AF7E70 80240520 24020002 */ addiu $v0, $zero, 2 .L80240524: /* AF7E74 80240524 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s index ea7806f04f..c4e460803b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240530_AF7E80.s @@ -7,12 +7,12 @@ glabel func_80240530_AF7E80 /* AF7E88 80240538 8C82000C */ lw $v0, 0xc($a0) /* AF7E8C 8024053C 0C0B1EAF */ jal get_variable /* AF7E90 80240540 8C450000 */ lw $a1, ($v0) -/* AF7E94 80240544 3C018024 */ lui $at, %hi(D_80241B14) -/* AF7E98 80240548 AC221B14 */ sw $v0, %lo(D_80241B14)($at) +/* AF7E94 80240544 3C018024 */ lui $at, %hi(func_80241B14_9A9F04) +/* AF7E98 80240548 AC221B14 */ sw $v0, %lo(func_80241B14_9A9F04)($at) /* AF7E9C 8024054C 24020002 */ addiu $v0, $zero, 2 /* AF7EA0 80240550 8FBF0010 */ lw $ra, 0x10($sp) /* AF7EA4 80240554 24030001 */ addiu $v1, $zero, 1 -/* AF7EA8 80240558 3C018024 */ lui $at, %hi(D_80241B10) -/* AF7EAC 8024055C AC231B10 */ sw $v1, %lo(D_80241B10)($at) +/* AF7EA8 80240558 3C018024 */ lui $at, %hi(func_80241B10_88A6E0) +/* AF7EAC 8024055C AC231B10 */ sw $v1, %lo(func_80241B10_88A6E0)($at) /* AF7EB0 80240560 03E00008 */ jr $ra /* AF7EB4 80240564 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s index ebd81b9b32..17b4bdea12 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406C4_AF8014.s @@ -30,8 +30,8 @@ glabel func_802406C4_AF8014 /* AF8074 80240724 8CC50000 */ lw $a1, ($a2) /* AF8078 80240728 0C0B1EAF */ jal get_variable /* AF807C 8024072C 24140009 */ addiu $s4, $zero, 9 -/* AF8080 80240730 3C058024 */ lui $a1, %hi(D_802406A0) -/* AF8084 80240734 24A506A0 */ addiu $a1, $a1, %lo(D_802406A0) +/* AF8080 80240730 3C058024 */ lui $a1, %hi(func_802406A0_AF7BDC) +/* AF8084 80240734 24A506A0 */ addiu $a1, $a1, %lo(func_802406A0_AF7BDC) /* AF8088 80240738 3C018024 */ lui $at, %hi(D_80246534) /* AF808C 8024073C AC226534 */ sw $v0, %lo(D_80246534)($at) /* AF8090 80240740 0C048C8F */ jal bind_dynamic_entity_7 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s index 1f8d9e1c6c..7455bf01bf 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDB40/func_80240000_AFDB40.s @@ -4,8 +4,8 @@ glabel func_80240000_AFDB40 /* AFDB40 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 /* AFDB44 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* AFDB48 80240008 3C108024 */ lui $s0, %hi(D_80240880) -/* AFDB4C 8024000C 26100880 */ addiu $s0, $s0, %lo(D_80240880) +/* AFDB48 80240008 3C108024 */ lui $s0, %hi(func_80240880_A2AAC0) +/* AFDB4C 8024000C 26100880 */ addiu $s0, $s0, %lo(func_80240880_A2AAC0) /* AFDB50 80240010 AFBF0018 */ sw $ra, 0x18($sp) /* AFDB54 80240014 AFB10014 */ sw $s1, 0x14($sp) /* AFDB58 80240018 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240000_AFDB40 /* AFDBBC 8024007C 28620010 */ slti $v0, $v1, 0x10 /* AFDBC0 80240080 1440FFFA */ bnez $v0, .L8024006C /* AFDBC4 80240084 24840004 */ addiu $a0, $a0, 4 -/* AFDBC8 80240088 3C108024 */ lui $s0, %hi(D_80240880) -/* AFDBCC 8024008C 26100880 */ addiu $s0, $s0, %lo(D_80240880) +/* AFDBC8 80240088 3C108024 */ lui $s0, %hi(func_80240880_A2AAC0) +/* AFDBCC 8024008C 26100880 */ addiu $s0, $s0, %lo(func_80240880_A2AAC0) /* AFDBD0 80240090 0C00AB4B */ jal heap_free /* AFDBD4 80240094 8E040000 */ lw $a0, ($s0) /* AFDBD8 80240098 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s index f5ad368848..25b99743fc 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s @@ -53,8 +53,8 @@ glabel func_802406EC_B070EC /* B071AC 802407AC 0C04E9C1 */ jal func_8013A704 /* B071B0 802407B0 E6020018 */ swc1 $f2, 0x18($s0) /* B071B4 802407B4 0000202D */ daddu $a0, $zero, $zero -/* B071B8 802407B8 3C058024 */ lui $a1, %hi(D_80240310) -/* B071BC 802407BC 24A50310 */ addiu $a1, $a1, %lo(D_80240310) +/* B071B8 802407B8 3C058024 */ lui $a1, %hi(func_80240310_B06934) +/* B071BC 802407BC 24A50310 */ addiu $a1, $a1, %lo(func_80240310_B06934) /* B071C0 802407C0 0C048C56 */ jal bind_dynamic_entity_3 /* B071C4 802407C4 AE020000 */ sw $v0, ($s0) /* B071C8 802407C8 0260202D */ daddu $a0, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s index c6fa4668ec..4244ee167e 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_8024041C_B1418C.s @@ -8,8 +8,8 @@ glabel func_8024041C_B1418C /* B14198 80240428 0C0B1EAF */ jal get_variable /* B1419C 8024042C 8C450000 */ lw $a1, ($v0) /* B141A0 80240430 8FBF0010 */ lw $ra, 0x10($sp) -/* B141A4 80240434 3C018024 */ lui $at, %hi(D_80240B00) -/* B141A8 80240438 AC220B00 */ sw $v0, %lo(D_80240B00)($at) +/* B141A4 80240434 3C018024 */ lui $at, %hi(func_80240B00_900170) +/* B141A8 80240438 AC220B00 */ sw $v0, %lo(func_80240B00_900170)($at) /* B141AC 8024043C 24020002 */ addiu $v0, $zero, 2 /* B141B0 80240440 03E00008 */ jr $ra /* B141B4 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s index c95776236e..007ea738e4 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_27/B14080/func_80240448_B141B8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_B141B8 -/* B141B8 80240448 3C068024 */ lui $a2, %hi(D_80240B00) -/* B141BC 8024044C 8CC60B00 */ lw $a2, %lo(D_80240B00)($a2) +/* B141B8 80240448 3C068024 */ lui $a2, %hi(func_80240B00_900170) +/* B141BC 8024044C 8CC60B00 */ lw $a2, %lo(func_80240B00_900170)($a2) /* B141C0 80240450 18C00011 */ blez $a2, .L80240498 /* B141C4 80240454 3C02FC12 */ lui $v0, 0xfc12 /* B141C8 80240458 3C04800A */ lui $a0, %hi(D_8009A66C) diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s index 39ecc54a74..147a4b3ba8 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240000_8ABF90.s @@ -28,8 +28,8 @@ glabel func_80240000_8ABF90 /* 8ABFEC 8024005C 26100004 */ addiu $s0, $s0, 4 /* 8ABFF0 80240060 0C0B1EAF */ jal get_variable /* 8ABFF4 80240064 0220202D */ daddu $a0, $s1, $zero -/* 8ABFF8 80240068 3C018024 */ lui $at, %hi(D_802440E8) -/* 8ABFFC 8024006C AC2240E8 */ sw $v0, %lo(D_802440E8)($at) +/* 8ABFF8 80240068 3C018024 */ lui $at, %hi(func_802440E8_804968) +/* 8ABFFC 8024006C AC2240E8 */ sw $v0, %lo(func_802440E8_804968)($at) /* 8AC000 80240070 8E050000 */ lw $a1, ($s0) /* 8AC004 80240074 26100004 */ addiu $s0, $s0, 4 /* 8AC008 80240078 0C0B1EAF */ jal get_variable @@ -58,8 +58,8 @@ glabel func_80240000_8ABF90 /* 8AC064 802400D4 26100004 */ addiu $s0, $s0, 4 /* 8AC068 802400D8 0C0B1EAF */ jal get_variable /* 8AC06C 802400DC 0220202D */ daddu $a0, $s1, $zero -/* 8AC070 802400E0 3C018024 */ lui $at, %hi(D_802440FC) -/* 8AC074 802400E4 AC2240FC */ sw $v0, %lo(D_802440FC)($at) +/* 8AC070 802400E0 3C018024 */ lui $at, %hi(func_802440FC_80497C) +/* 8AC074 802400E4 AC2240FC */ sw $v0, %lo(func_802440FC_80497C)($at) /* 8AC078 802400E8 8E050000 */ lw $a1, ($s0) /* 8AC07C 802400EC 0C0B1EAF */ jal get_variable /* 8AC080 802400F0 0220202D */ daddu $a0, $s1, $zero @@ -78,8 +78,8 @@ glabel func_80240000_8ABF90 /* 8AC0B0 80240120 8E030000 */ lw $v1, ($s0) /* 8AC0B4 80240124 3C048024 */ lui $a0, %hi(D_802440E0) /* 8AC0B8 80240128 908440E0 */ lbu $a0, %lo(D_802440E0)($a0) -/* 8AC0BC 8024012C 3C028024 */ lui $v0, %hi(D_802440E8) -/* 8AC0C0 80240130 8C4240E8 */ lw $v0, %lo(D_802440E8)($v0) +/* 8AC0BC 8024012C 3C028024 */ lui $v0, %hi(func_802440E8_804968) +/* 8AC0C0 80240130 8C4240E8 */ lw $v0, %lo(func_802440E8_804968)($v0) /* 8AC0C4 80240134 24630001 */ addiu $v1, $v1, 1 /* 8AC0C8 80240138 00441023 */ subu $v0, $v0, $a0 /* 8AC0CC 8024013C 00430018 */ mult $v0, $v1 @@ -179,8 +179,8 @@ glabel func_80240000_8ABF90 /* 8AC21C 8024028C 00005012 */ mflo $t2 /* 8AC220 80240290 3C088024 */ lui $t0, %hi(D_802440E5) /* 8AC224 80240294 910840E5 */ lbu $t0, %lo(D_802440E5)($t0) -/* 8AC228 80240298 3C028024 */ lui $v0, %hi(D_802440FC) -/* 8AC22C 8024029C 8C4240FC */ lw $v0, %lo(D_802440FC)($v0) +/* 8AC228 80240298 3C028024 */ lui $v0, %hi(func_802440FC_80497C) +/* 8AC22C 8024029C 8C4240FC */ lw $v0, %lo(func_802440FC_80497C)($v0) /* 8AC230 802402A0 00481023 */ subu $v0, $v0, $t0 /* 8AC234 802402A4 00430018 */ mult $v0, $v1 /* 8AC238 802402A8 0000C812 */ mflo $t9 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s index f15248a0e9..d60cc58fc6 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s @@ -9,8 +9,8 @@ glabel func_802406F0_8B0760 /* 8B0770 80240700 8C84014C */ lw $a0, 0x14c($a0) /* 8B0774 80240704 24040008 */ addiu $a0, $zero, 8 /* 8B0778 80240708 0040802D */ daddu $s0, $v0, $zero -/* 8B077C 8024070C 3C028024 */ lui $v0, %hi(D_8024075C) -/* 8B0780 80240710 2442075C */ addiu $v0, $v0, %lo(D_8024075C) +/* 8B077C 8024070C 3C028024 */ lui $v0, %hi(func_8024075C_8B00DC) +/* 8B0780 80240710 2442075C */ addiu $v0, $v0, %lo(func_8024075C_8B00DC) /* 8B0784 80240714 0C00AB39 */ jal heap_malloc /* 8B0788 80240718 AE020008 */ sw $v0, 8($s0) /* 8B078C 8024071C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s index ee2693860d..2f108c2965 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s @@ -3,8 +3,8 @@ glabel func_802413F4_8B1464 /* 8B1464 802413F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B1468 802413F8 3C058024 */ lui $a1, %hi(D_80241388) -/* 8B146C 802413FC 24A51388 */ addiu $a1, $a1, %lo(D_80241388) +/* 8B1468 802413F8 3C058024 */ lui $a1, %hi(func_80241388_8B0004) +/* 8B146C 802413FC 24A51388 */ addiu $a1, $a1, %lo(func_80241388_8B0004) /* 8B1470 80241400 AFBF0010 */ sw $ra, 0x10($sp) /* 8B1474 80241404 0C048C8F */ jal bind_dynamic_entity_7 /* 8B1478 80241408 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s index 315bc9a5b8..0f7bb3cbc3 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -119,11 +119,11 @@ glabel func_80241C18_8B1C88 /* 8B1E3C 80241DCC 00000000 */ nop /* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero /* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E48 80241DD8 0C09057E */ jal kmr_02_NpcJumpFunc3 +/* 8B1E48 80241DD8 0C09057E */ jal func_802415F8_8B1668 /* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero /* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E58 80241DE8 0C090596 */ jal kmr_02_NpcJumpFunc +/* 8B1E58 80241DE8 0C090596 */ jal func_80241658_8B16C8 /* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero /* 8B1E60 80241DF0 0809079A */ j .L80241E68 /* 8B1E64 80241DF4 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_80241C18_8B1C88 /* 8B1E74 80241E04 02A0302D */ daddu $a2, $s5, $zero /* 8B1E78 80241E08 0280202D */ daddu $a0, $s4, $zero /* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* 8B1E80 80241E10 0C090600 */ jal kmr_02_UnkNpcAIFunc11 +/* 8B1E80 80241E10 0C090600 */ jal func_80241800_8B1870 /* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 8B1E88 80241E18 0809079A */ j .L80241E68 /* 8B1E8C 80241E1C 00000000 */ nop /* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8B1E98 80241E28 0C090647 */ jal kmr_02_UnkNpcAIFunc10 +/* 8B1E98 80241E28 0C090647 */ jal func_8024191C_8B198C /* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8B1EA0 80241E30 0809079A */ j .L80241E68 /* 8B1EA4 80241E34 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index 79d8522d8a..7452c8bae8 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8CF37C /* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8CF4B0 80241440 0280202D */ daddu $a0, $s4, $zero /* 8CF4B4 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8CF4B8 80241448 0C0901F6 */ jal kmr_05_UnkNpcAIFunc1 +/* 8CF4B8 80241448 0C0901F6 */ jal func_802407D8_8CE848 /* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero /* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_8CF37C /* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero /* 8CF4D8 80241468 0280202D */ daddu $a0, $s4, $zero /* 8CF4DC 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4E0 80241470 0C0902F7 */ jal kmr_05_UnkNpcAIFunc2 +/* 8CF4E0 80241470 0C0902F7 */ jal func_80240BDC_8CEC4C /* 8CF4E4 80241474 0260302D */ daddu $a2, $s3, $zero /* 8CF4E8 80241478 0280202D */ daddu $a0, $s4, $zero /* 8CF4EC 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_8CF37C /* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8CF520 802414B0 0C09037D */ jal kmr_05_UnkNpcAIFunc3 +/* 8CF520 802414B0 0C09037D */ jal func_80240DF4_8CEE64 /* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8CF528 802414B8 08090535 */ j .L802414D4 /* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s index 58415e1540..7a94493ea9 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802401B0_8D16C0.s @@ -131,8 +131,8 @@ glabel func_802401B0_8D16C0 /* 8D18AC 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) /* 8D18B0 802403A0 461A2100 */ add.s $f4, $f4, $f26 /* 8D18B4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8D18B8 802403A8 3C018024 */ lui $at, %hi(D_80242860) -/* 8D18BC 802403AC D4202860 */ ldc1 $f0, %lo(D_80242860)($at) +/* 8D18B8 802403A8 3C018024 */ lui $at, %hi(func_80242860_8B28D0) +/* 8D18BC 802403AC D4202860 */ ldc1 $f0, %lo(func_80242860_8B28D0)($at) /* 8D18C0 802403B0 460010A1 */ cvt.d.s $f2, $f2 /* 8D18C4 802403B4 46201082 */ mul.d $f2, $f2, $f0 /* 8D18C8 802403B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index ca8f296294..2d772ec6f7 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8D281C /* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D2950 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D2954 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D2958 80241448 0C0901F6 */ jal kmr_06_UnkNpcAIFunc1 +/* 8D2958 80241448 0C0901F6 */ jal func_802407D8_8D1CE8 /* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_8D281C /* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D2978 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D297C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D2980 80241470 0C0902F7 */ jal kmr_06_UnkNpcAIFunc2 +/* 8D2980 80241470 0C0902F7 */ jal func_80240BDC_8D20EC /* 8D2984 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D2988 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D298C 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_8D281C /* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D29C0 802414B0 0C09037D */ jal kmr_06_UnkNpcAIFunc3 +/* 8D29C0 802414B0 0C09037D */ jal func_80240DF4_8D2304 /* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D29C8 802414B8 08090535 */ j .L802414D4 /* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s index d29d61945e..40e1229f50 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s @@ -5,8 +5,8 @@ glabel func_802417A8_8D2CB8 /* 8D2CB8 802417A8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 8D2CBC 802417AC 2402000D */ addiu $v0, $zero, 0xd /* 8D2CC0 802417B0 AFA20010 */ sw $v0, 0x10($sp) -/* 8D2CC4 802417B4 3C028024 */ lui $v0, %hi(D_80241500) -/* 8D2CC8 802417B8 24421500 */ addiu $v0, $v0, %lo(D_80241500) +/* 8D2CC4 802417B4 3C028024 */ lui $v0, %hi(func_80241500_8D2768) +/* 8D2CC8 802417B8 24421500 */ addiu $v0, $v0, %lo(func_80241500_8D2768) /* 8D2CCC 802417BC 27A40010 */ addiu $a0, $sp, 0x10 /* 8D2CD0 802417C0 AFBF0020 */ sw $ra, 0x20($sp) /* 8D2CD4 802417C4 AFA00018 */ sw $zero, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s index 15aa373ad9..284cbc4079 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s @@ -64,8 +64,8 @@ glabel func_802417E0_8D2CF0 /* 8D2DDC 802418CC 0C04E9C1 */ jal func_8013A704 /* 8D2DE0 802418D0 24040001 */ addiu $a0, $zero, 1 /* 8D2DE4 802418D4 0000202D */ daddu $a0, $zero, $zero -/* 8D2DE8 802418D8 3C058024 */ lui $a1, %hi(D_802417A8) -/* 8D2DEC 802418DC 24A517A8 */ addiu $a1, $a1, %lo(D_802417A8) +/* 8D2DE8 802418D8 3C058024 */ lui $a1, %hi(func_802417A8_8D29D8) +/* 8D2DEC 802418DC 24A517A8 */ addiu $a1, $a1, %lo(func_802417A8_8D29D8) /* 8D2DF0 802418E0 0C048C56 */ jal bind_dynamic_entity_3 /* 8D2DF4 802418E4 AE020000 */ sw $v0, ($s0) /* 8D2DF8 802418E8 0260202D */ daddu $a0, $s3, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s index 65f77d1ff6..da9906030f 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240000_8D3DC0.s @@ -35,8 +35,8 @@ glabel func_80240000_8D3DC0 /* 8D3E34 80240074 08090027 */ j .L8024009C /* 8D3E38 80240078 E4800018 */ swc1 $f0, 0x18($a0) .L8024007C: -/* 8D3E3C 8024007C 3C018024 */ lui $at, %hi(D_80241E90) -/* 8D3E40 80240080 D4221E90 */ ldc1 $f2, %lo(D_80241E90)($at) +/* 8D3E3C 8024007C 3C018024 */ lui $at, %hi(func_80241E90_8B1F00) +/* 8D3E40 80240080 D4221E90 */ ldc1 $f2, %lo(func_80241E90_8B1F00)($at) /* 8D3E44 80240084 44820000 */ mtc1 $v0, $f0 /* 8D3E48 80240088 00000000 */ nop /* 8D3E4C 8024008C 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s index 64f843f0f0..55eb61af27 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -119,11 +119,11 @@ glabel func_802407F4_8D45B4 /* 8D4768 802409A8 00000000 */ nop /* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 8D4774 802409B4 0C090075 */ jal kmr_07_NpcJumpFunc3 +/* 8D4774 802409B4 0C090075 */ jal func_802401D4_8D3F94 /* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 8D4784 802409C4 0C09008D */ jal kmr_07_NpcJumpFunc +/* 8D4784 802409C4 0C09008D */ jal func_80240234_8D3FF4 /* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 8D478C 802409CC 08090291 */ j .L80240A44 /* 8D4790 802409D0 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802407F4_8D45B4 /* 8D47A0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* 8D47A4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 8D47AC 802409EC 0C0900F7 */ jal kmr_07_UnkNpcAIFunc11 +/* 8D47AC 802409EC 0C0900F7 */ jal func_802403DC_8D419C /* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 8D47B4 802409F4 08090291 */ j .L80240A44 /* 8D47B8 802409F8 00000000 */ nop /* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 8D47C4 80240A04 0C09013E */ jal kmr_07_UnkNpcAIFunc10 +/* 8D47C4 80240A04 0C09013E */ jal func_802404F8_8D42B8 /* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 8D47CC 80240A0C 08090291 */ j .L80240A44 /* 8D47D0 80240A10 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s index 3291ee3e36..8e09ebbc96 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802401B0_8D5FB0.s @@ -131,8 +131,8 @@ glabel func_802401B0_8D5FB0 /* 8D619C 8024039C C7A4002C */ lwc1 $f4, 0x2c($sp) /* 8D61A0 802403A0 461A2100 */ add.s $f4, $f4, $f26 /* 8D61A4 802403A4 46142081 */ sub.s $f2, $f4, $f20 -/* 8D61A8 802403A8 3C018024 */ lui $at, %hi(D_80242680) -/* 8D61AC 802403AC D4202680 */ ldc1 $f0, %lo(D_80242680)($at) +/* 8D61A8 802403A8 3C018024 */ lui $at, %hi(func_80242680_802F00) +/* 8D61AC 802403AC D4202680 */ ldc1 $f0, %lo(func_80242680_802F00)($at) /* 8D61B0 802403B0 460010A1 */ cvt.d.s $f2, $f2 /* 8D61B4 802403B4 46201082 */ mul.d $f2, $f2, $f0 /* 8D61B8 802403B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index a3d1c05d99..a20a20ea86 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -83,7 +83,7 @@ glabel func_8024130C_8D710C /* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D7240 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D7244 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D7248 80241448 0C0901F6 */ jal kmr_09_UnkNpcAIFunc1 +/* 8D7248 80241448 0C0901F6 */ jal func_802407D8_8D65D8 /* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024130C_8D710C /* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D7268 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D726C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D7270 80241470 0C0902F7 */ jal kmr_09_UnkNpcAIFunc2 +/* 8D7270 80241470 0C0902F7 */ jal func_80240BDC_8D69DC /* 8D7274 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D7278 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D727C 8024147C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024130C_8D710C /* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D72B0 802414B0 0C09037D */ jal kmr_09_UnkNpcAIFunc3 +/* 8D72B0 802414B0 0C09037D */ jal func_80240DF4_8D6BF4 /* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D72B8 802414B8 08090535 */ j .L802414D4 /* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s index 2d43a6b8d3..3d9d056607 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240000_8D84D0.s @@ -4,8 +4,8 @@ glabel func_80240000_8D84D0 /* 8D84D0 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 8D84D4 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* 8D84D8 80240008 3C108024 */ lui $s0, %hi(D_80240C20) -/* 8D84DC 8024000C 26100C20 */ addiu $s0, $s0, %lo(D_80240C20) +/* 8D84D8 80240008 3C108024 */ lui $s0, %hi(func_80240C20_872650) +/* 8D84DC 8024000C 26100C20 */ addiu $s0, $s0, %lo(func_80240C20_872650) /* 8D84E0 80240010 AFBF0018 */ sw $ra, 0x18($sp) /* 8D84E4 80240014 AFB10014 */ sw $s1, 0x14($sp) /* 8D84E8 80240018 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240000_8D84D0 /* 8D854C 8024007C 28620010 */ slti $v0, $v1, 0x10 /* 8D8550 80240080 1440FFFA */ bnez $v0, .L8024006C /* 8D8554 80240084 24840004 */ addiu $a0, $a0, 4 -/* 8D8558 80240088 3C108024 */ lui $s0, %hi(D_80240C20) -/* 8D855C 8024008C 26100C20 */ addiu $s0, $s0, %lo(D_80240C20) +/* 8D8558 80240088 3C108024 */ lui $s0, %hi(func_80240C20_872650) +/* 8D855C 8024008C 26100C20 */ addiu $s0, $s0, %lo(func_80240C20_872650) /* 8D8560 80240090 0C00AB4B */ jal heap_free /* 8D8564 80240094 8E040000 */ lw $a0, ($s0) /* 8D8568 80240098 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s index 84020f1c0b..f390bddc39 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -119,11 +119,11 @@ glabel func_80240B64_8DAC64 /* 8DAE18 80240D18 00000000 */ nop /* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 8DAE24 80240D24 0C090151 */ jal kmr_11_NpcJumpFunc3 +/* 8DAE24 80240D24 0C090151 */ jal func_80240544_8DA644 /* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 8DAE34 80240D34 0C090169 */ jal kmr_11_NpcJumpFunc +/* 8DAE34 80240D34 0C090169 */ jal func_802405A4_8DA6A4 /* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 8DAE3C 80240D3C 0809036D */ j .L80240DB4 /* 8DAE40 80240D40 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_80240B64_8DAC64 /* 8DAE50 80240D50 02A0302D */ daddu $a2, $s5, $zero /* 8DAE54 80240D54 0280202D */ daddu $a0, $s4, $zero /* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 8DAE5C 80240D5C 0C0901D3 */ jal kmr_11_UnkNpcAIFunc11 +/* 8DAE5C 80240D5C 0C0901D3 */ jal func_8024074C_8DA84C /* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 8DAE64 80240D64 0809036D */ j .L80240DB4 /* 8DAE68 80240D68 00000000 */ nop /* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 8DAE74 80240D74 0C09021A */ jal kmr_11_UnkNpcAIFunc10 +/* 8DAE74 80240D74 0C09021A */ jal func_80240868_8DA968 /* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 8DAE7C 80240D7C 0809036D */ j .L80240DB4 /* 8DAE80 80240D80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index 10939d30fc..5bb5e910d7 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -276,8 +276,8 @@ glabel func_802406C8_8EC4E8 /* 8EC8D8 80240AB8 A622001E */ sh $v0, 0x1e($s1) /* 8EC8DC 80240ABC AE370020 */ sw $s7, 0x20($s1) /* 8EC8E0 80240AC0 8FA70010 */ lw $a3, 0x10($sp) -/* 8EC8E4 80240AC4 3C058024 */ lui $a1, %hi(D_802405BC) -/* 8EC8E8 80240AC8 24A505BC */ addiu $a1, $a1, %lo(D_802405BC) +/* 8EC8E4 80240AC4 3C058024 */ lui $a1, %hi(func_802405BC_8EBD44) +/* 8EC8E8 80240AC8 24A505BC */ addiu $a1, $a1, %lo(func_802405BC_8EBD44) /* 8EC8EC 80240ACC 0C048C8F */ jal bind_dynamic_entity_7 /* 8EC8F0 80240AD0 AE270024 */ sw $a3, 0x24($s1) /* 8EC8F4 80240AD4 3C018026 */ lui $at, %hi(D_8025B2A8) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s index b085e2cc43..5c0e29aada 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s @@ -5,8 +5,8 @@ glabel func_80242A04_8EE824 /* 8EE824 80242A04 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 8EE828 80242A08 2402002D */ addiu $v0, $zero, 0x2d /* 8EE82C 80242A0C AFA20010 */ sw $v0, 0x10($sp) -/* 8EE830 80242A10 3C028024 */ lui $v0, %hi(D_80242870) -/* 8EE834 80242A14 24422870 */ addiu $v0, $v0, %lo(D_80242870) +/* 8EE830 80242A10 3C028024 */ lui $v0, %hi(func_80242870_8EDE2C) +/* 8EE834 80242A14 24422870 */ addiu $v0, $v0, %lo(func_80242870_8EDE2C) /* 8EE838 80242A18 27A40010 */ addiu $a0, $sp, 0x10 /* 8EE83C 80242A1C AFBF0020 */ sw $ra, 0x20($sp) /* 8EE840 80242A20 AFA00018 */ sw $zero, 0x18($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s index 44b855c9d1..c4e44325c4 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s @@ -12,8 +12,8 @@ glabel func_80242B04_8EE924 /* 8EE940 80242B20 2404002C */ addiu $a0, $zero, 0x2c /* 8EE944 80242B24 0040802D */ daddu $s0, $v0, $zero /* 8EE948 80242B28 0000202D */ daddu $a0, $zero, $zero -/* 8EE94C 80242B2C 3C058024 */ lui $a1, %hi(D_80242A04) -/* 8EE950 80242B30 24A52A04 */ addiu $a1, $a1, %lo(D_80242A04) +/* 8EE94C 80242B2C 3C058024 */ lui $a1, %hi(func_80242A04_8EDEC0) +/* 8EE950 80242B30 24A52A04 */ addiu $a1, $a1, %lo(func_80242A04_8EDEC0) /* 8EE954 80242B34 240200FF */ addiu $v0, $zero, 0xff /* 8EE958 80242B38 AE300070 */ sw $s0, 0x70($s1) /* 8EE95C 80242B3C A6000000 */ sh $zero, ($s0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s index 942629e282..647076df33 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s @@ -10,8 +10,8 @@ glabel func_80240010_8FEE90 /* 8FEEA4 80240024 3C0EFD18 */ lui $t6, 0xfd18 /* 8FEEA8 80240028 35CE00C7 */ ori $t6, $t6, 0xc7 /* 8FEEAC 8024002C AFB3000C */ sw $s3, 0xc($sp) -/* 8FEEB0 80240030 3C138024 */ lui $s3, %hi(D_802407F4) -/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, %lo(D_802407F4) +/* 8FEEB0 80240030 3C138024 */ lui $s3, %hi(func_802407F4_8D45B4) +/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, %lo(func_802407F4_8D45B4) /* 8FEEB8 80240038 3C0BF518 */ lui $t3, 0xf518 /* 8FEEBC 8024003C 356B6400 */ ori $t3, $t3, 0x6400 /* 8FEEC0 80240040 AFB20008 */ sw $s2, 8($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s index 182c41d43c..70b1132205 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s @@ -15,19 +15,19 @@ glabel func_80240210_8FF090 /* 8FF0B8 80240238 0040882D */ daddu $s1, $v0, $zero /* 8FF0BC 8024023C 0220202D */ daddu $a0, $s1, $zero /* 8FF0C0 80240240 0040282D */ daddu $a1, $v0, $zero -/* 8FF0C4 80240244 3C108024 */ lui $s0, %hi(D_802407F0) -/* 8FF0C8 80240248 261007F0 */ addiu $s0, $s0, %lo(D_802407F0) +/* 8FF0C4 80240244 3C108024 */ lui $s0, %hi(func_802407F0_87A3D0) +/* 8FF0C8 80240248 261007F0 */ addiu $s0, $s0, %lo(func_802407F0_87A3D0) /* 8FF0CC 8024024C 0C01BB7C */ jal decode_yay0 /* 8FF0D0 80240250 AE050000 */ sw $a1, ($s0) /* 8FF0D4 80240254 0C00AB1E */ jal general_heap_free /* 8FF0D8 80240258 0220202D */ daddu $a0, $s1, $zero /* 8FF0DC 8024025C 8E030000 */ lw $v1, ($s0) /* 8FF0E0 80240260 8C620000 */ lw $v0, ($v1) -/* 8FF0E4 80240264 3C058024 */ lui $a1, %hi(D_80240010) -/* 8FF0E8 80240268 24A50010 */ addiu $a1, $a1, %lo(D_80240010) +/* 8FF0E4 80240264 3C058024 */ lui $a1, %hi(func_80240010_8FEC90) +/* 8FF0E8 80240268 24A50010 */ addiu $a1, $a1, %lo(func_80240010_8FEC90) /* 8FF0EC 8024026C 00431021 */ addu $v0, $v0, $v1 -/* 8FF0F0 80240270 3C018024 */ lui $at, %hi(D_802407F4) -/* 8FF0F4 80240274 AC2207F4 */ sw $v0, %lo(D_802407F4)($at) +/* 8FF0F0 80240270 3C018024 */ lui $at, %hi(func_802407F4_8D45B4) +/* 8FF0F4 80240274 AC2207F4 */ sw $v0, %lo(func_802407F4_8D45B4)($at) /* 8FF0F8 80240278 0C048C8F */ jal bind_dynamic_entity_7 /* 8FF0FC 8024027C 0000202D */ daddu $a0, $zero, $zero /* 8FF100 80240280 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s index 7ce890d710..d77e17f2aa 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s @@ -3,7 +3,7 @@ glabel func_802402B4_8FF134 /* 8FF134 802402B4 8C820084 */ lw $v0, 0x84($a0) -/* 8FF138 802402B8 3C018024 */ lui $at, %hi(D_80240330) -/* 8FF13C 802402BC AC220330 */ sw $v0, %lo(D_80240330)($at) +/* 8FF138 802402B8 3C018024 */ lui $at, %hi(func_80240330_8EC150) +/* 8FF13C 802402BC AC220330 */ sw $v0, %lo(func_80240330_8EC150)($at) /* 8FF140 802402C0 03E00008 */ jr $ra /* 8FF144 802402C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s index 411d2c629c..f4c84120fb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s @@ -151,10 +151,10 @@ glabel func_8024056C_8FFBDC /* 8FFDEC 8024077C 24620008 */ addiu $v0, $v1, 8 /* 8FFDF0 80240780 AC800004 */ sw $zero, 4($a0) /* 8FFDF4 80240784 AD020000 */ sw $v0, ($t0) -/* 8FFDF8 80240788 3C02DE00 */ lui $v0, %hi(D_DE001F00) +/* 8FFDF8 80240788 3C02DE00 */ lui $v0, 0xde00 /* 8FFDFC 8024078C AC620000 */ sw $v0, ($v1) -/* 8FFE00 80240790 3C028024 */ lui $v0, %hi(D_80241F00) -/* 8FFE04 80240794 24421F00 */ addiu $v0, $v0, %lo(D_DE001F00) +/* 8FFE00 80240790 3C028024 */ lui $v0, %hi(func_80241F00_854070) +/* 8FFE04 80240794 24421F00 */ addiu $v0, $v0, %lo(func_80241F00_854070) /* 8FFE08 80240798 AC620004 */ sw $v0, 4($v1) .L8024079C: /* 8FFE0C 8024079C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s index f54170a0ac..c5ec138d11 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B00_900170.s @@ -3,8 +3,8 @@ glabel func_80240B00_900170 /* 900170 80240B00 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 900174 80240B04 3C028024 */ lui $v0, %hi(D_8024056C) -/* 900178 80240B08 2442056C */ addiu $v0, $v0, %lo(D_8024056C) +/* 900174 80240B04 3C028024 */ lui $v0, %hi(func_8024056C_8FF31C) +/* 900178 80240B08 2442056C */ addiu $v0, $v0, %lo(func_8024056C_8FF31C) /* 90017C 80240B0C AFA2001C */ sw $v0, 0x1c($sp) /* 900180 80240B10 2402000A */ addiu $v0, $zero, 0xa /* 900184 80240B14 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s index 774d3ac36b..f4768f0b5e 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B4C_9001BC.s @@ -14,8 +14,8 @@ glabel func_80240B4C_9001BC /* 9001E0 80240B70 0C0B2026 */ jal set_variable /* 9001E4 80240B74 0040302D */ daddu $a2, $v0, $zero /* 9001E8 80240B78 2402FFFF */ addiu $v0, $zero, -1 -/* 9001EC 80240B7C 3C058024 */ lui $a1, %hi(D_80240B00) -/* 9001F0 80240B80 24A50B00 */ addiu $a1, $a1, %lo(D_80240B00) +/* 9001EC 80240B7C 3C058024 */ lui $a1, %hi(func_80240B00_8FF864) +/* 9001F0 80240B80 24A50B00 */ addiu $a1, $a1, %lo(func_80240B00_8FF864) /* 9001F4 80240B84 3C018025 */ lui $at, %hi(D_802483D0) /* 9001F8 80240B88 AC2283D0 */ sw $v0, %lo(D_802483D0)($at) /* 9001FC 80240B8C 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s index 73731e233e..403e92eb76 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240040_907A70.s @@ -65,8 +65,8 @@ glabel func_80240040_907A70 /* 907B60 80240130 A0620034 */ sb $v0, 0x34($v1) /* 907B64 80240134 8E020028 */ lw $v0, 0x28($s0) /* 907B68 80240138 8C42000C */ lw $v0, 0xc($v0) -/* 907B6C 8024013C 3C048024 */ lui $a0, %hi(D_80240DA4) -/* 907B70 80240140 24840DA4 */ addiu $a0, $a0, %lo(D_80240DA4) +/* 907B6C 8024013C 3C048024 */ lui $a0, %hi(func_80240DA4_9087A4) +/* 907B70 80240140 24840DA4 */ addiu $a0, $a0, %lo(func_80240DA4_9087A4) /* 907B74 80240144 0C00AFC1 */ jal set_curtain_draw_callback /* 907B78 80240148 AC400020 */ sw $zero, 0x20($v0) .L8024014C: diff --git a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s index 6a0573cb2a..8d0188c8c5 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s +++ b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s @@ -3,8 +3,8 @@ glabel func_80240074_90B2B4 /* 90B2B4 80240074 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 90B2B8 80240078 3C048024 */ lui $a0, %hi(D_80240480) -/* 90B2BC 8024007C 24840480 */ addiu $a0, $a0, %lo(D_80240480) +/* 90B2B8 80240078 3C048024 */ lui $a0, %hi(func_80240480_8C8410) +/* 90B2BC 8024007C 24840480 */ addiu $a0, $a0, %lo(func_80240480_8C8410) /* 90B2C0 80240080 AFB00018 */ sw $s0, 0x18($sp) /* 90B2C4 80240084 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 90B2C8 80240088 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index 937f6a1dae..330e6f8312 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -55,7 +55,7 @@ glabel func_802404F4_A47454 /* A47518 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) /* A4751C 802405BC 30420004 */ andi $v0, $v0, 4 /* A47520 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A47524 802405C4 00000000 */ nop +/* A47524 802405C4 00000000 */ nop .L802405C8: /* A47528 802405C8 AE600070 */ sw $zero, 0x70($s3) /* A4752C 802405CC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802404F4_A47454 /* A475D0 80240670 24020028 */ addiu $v0, $zero, 0x28 /* A475D4 80240674 AFA2001C */ sw $v0, 0x1c($sp) /* A475D8 80240678 44833000 */ mtc1 $v1, $f6 -/* A475DC 8024067C 00000000 */ nop +/* A475DC 8024067C 00000000 */ nop /* A475E0 80240680 468031A0 */ cvt.s.w $f6, $f6 /* A475E4 80240684 44073000 */ mfc1 $a3, $f6 /* A475E8 80240688 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802404F4_A47454 /* A476A0 80240740 10600015 */ beqz $v1, .L80240798 /* A476A4 80240744 0260202D */ daddu $a0, $s3, $zero /* A476A8 80240748 08090228 */ j .L802408A0 -/* A476AC 8024074C 00000000 */ nop +/* A476AC 8024074C 00000000 */ nop .L80240750: /* A476B0 80240750 1062001C */ beq $v1, $v0, .L802407C4 /* A476B4 80240754 24020003 */ addiu $v0, $zero, 3 /* A476B8 80240758 10620035 */ beq $v1, $v0, .L80240830 /* A476BC 8024075C 0260202D */ daddu $a0, $s3, $zero /* A476C0 80240760 08090228 */ j .L802408A0 -/* A476C4 80240764 00000000 */ nop +/* A476C4 80240764 00000000 */ nop .L80240768: /* A476C8 80240768 2402000E */ addiu $v0, $zero, 0xe /* A476CC 8024076C 1062003F */ beq $v1, $v0, .L8024086C @@ -177,9 +177,9 @@ glabel func_802404F4_A47454 /* A476E0 80240780 10620040 */ beq $v1, $v0, .L80240884 /* A476E4 80240784 24020063 */ addiu $v0, $zero, 0x63 /* A476E8 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A476EC 8024078C 00000000 */ nop +/* A476EC 8024078C 00000000 */ nop /* A476F0 80240790 08090228 */ j .L802408A0 -/* A476F4 80240794 00000000 */ nop +/* A476F4 80240794 00000000 */ nop .L80240798: /* A476F8 80240798 0280282D */ daddu $a1, $s4, $zero /* A476FC 8024079C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802404F4_A47454 /* A47714 802407B4 0C0125AE */ jal func_800496B8 /* A47718 802407B8 02A0302D */ daddu $a2, $s5, $zero /* A4771C 802407BC 08090228 */ j .L802408A0 -/* A47720 802407C0 00000000 */ nop +/* A47720 802407C0 00000000 */ nop .L802407C4: /* A47724 802407C4 0260202D */ daddu $a0, $s3, $zero /* A47728 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A4772C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A4772C 802407CC 0C0126D1 */ jal func_80049B44 /* A47730 802407D0 02A0302D */ daddu $a2, $s5, $zero /* A47734 802407D4 8E230088 */ lw $v1, 0x88($s1) /* A47738 802407D8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802404F4_A47454 /* A47794 80240834 0C012701 */ jal func_80049C04 /* A47798 80240838 02A0302D */ daddu $a2, $s5, $zero /* A4779C 8024083C 08090228 */ j .L802408A0 -/* A477A0 80240840 00000000 */ nop +/* A477A0 80240840 00000000 */ nop .L80240844: /* A477A4 80240844 0260202D */ daddu $a0, $s3, $zero /* A477A8 80240848 0280282D */ daddu $a1, $s4, $zero -/* A477AC 8024084C 0C090058 */ jal kpa_01_set_script_owner_npc_anim +/* A477AC 8024084C 0C090058 */ jal func_80240160_A470C0 /* A477B0 80240850 02A0302D */ daddu $a2, $s5, $zero /* A477B4 80240854 0260202D */ daddu $a0, $s3, $zero .L80240858: @@ -240,20 +240,20 @@ glabel func_802404F4_A47454 /* A477BC 8024085C 0C090077 */ jal func_802401DC_A4713C /* A477C0 80240860 02A0302D */ daddu $a2, $s5, $zero /* A477C4 80240864 08090228 */ j .L802408A0 -/* A477C8 80240868 00000000 */ nop +/* A477C8 80240868 00000000 */ nop .L8024086C: /* A477CC 8024086C 0260202D */ daddu $a0, $s3, $zero /* A477D0 80240870 0280282D */ daddu $a1, $s4, $zero -/* A477D4 80240874 0C0900C4 */ jal kpa_01_UnkNpcAIFunc12 +/* A477D4 80240874 0C0900C4 */ jal func_80240310_A47270 /* A477D8 80240878 02A0302D */ daddu $a2, $s5, $zero /* A477DC 8024087C 08090228 */ j .L802408A0 -/* A477E0 80240880 00000000 */ nop +/* A477E0 80240880 00000000 */ nop .L80240884: /* A477E4 80240884 0280282D */ daddu $a1, $s4, $zero -/* A477E8 80240888 0C09011D */ jal kpa_01_set_script_owner_npc_col_height +/* A477E8 80240888 0C09011D */ jal func_80240474_A473D4 /* A477EC 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A477F0 80240890 08090228 */ j .L802408A0 -/* A477F4 80240894 00000000 */ nop +/* A477F4 80240894 00000000 */ nop .L80240898: /* A477F8 80240898 0C0129CF */ jal func_8004A73C /* A477FC 8024089C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802404F4_A47454 /* A47850 802408F0 00220821 */ addu $at, $at, $v0 /* A47854 802408F4 8C221608 */ lw $v0, %lo(D_80241608)($at) /* A47858 802408F8 00400008 */ jr $v0 -/* A4785C 802408FC 00000000 */ nop +/* A4785C 802408FC 00000000 */ nop /* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) /* A47864 80240904 24420001 */ addiu $v0, $v0, 1 /* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s index 4e838458f0..6aff5b15a1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s @@ -55,8 +55,8 @@ glabel func_802401DC_A4879C /* A48858 80240298 8C470030 */ lw $a3, 0x30($v0) /* A4885C 8024029C C6020018 */ lwc1 $f2, 0x18($s0) /* A48860 802402A0 46020003 */ div.s $f0, $f0, $f2 -/* A48864 802402A4 3C018024 */ lui $at, %hi(D_80243880) -/* A48868 802402A8 D4223880 */ ldc1 $f2, %lo(D_80243880)($at) +/* A48864 802402A4 3C018024 */ lui $at, %hi(func_80243880_95EA80) +/* A48868 802402A8 D4223880 */ ldc1 $f2, %lo(func_80243880_95EA80)($at) /* A4886C 802402AC 46000021 */ cvt.d.s $f0, $f0 /* A48870 802402B0 46220000 */ add.d $f0, $f0, $f2 /* A48874 802402B4 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index 298626ccf0..79659ebf86 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -55,7 +55,7 @@ glabel func_802404F4_A48AB4 /* A48B78 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) /* A48B7C 802405BC 30420004 */ andi $v0, $v0, 4 /* A48B80 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A48B84 802405C4 00000000 */ nop +/* A48B84 802405C4 00000000 */ nop .L802405C8: /* A48B88 802405C8 AE600070 */ sw $zero, 0x70($s3) /* A48B8C 802405CC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802404F4_A48AB4 /* A48C30 80240670 24020028 */ addiu $v0, $zero, 0x28 /* A48C34 80240674 AFA2001C */ sw $v0, 0x1c($sp) /* A48C38 80240678 44833000 */ mtc1 $v1, $f6 -/* A48C3C 8024067C 00000000 */ nop +/* A48C3C 8024067C 00000000 */ nop /* A48C40 80240680 468031A0 */ cvt.s.w $f6, $f6 /* A48C44 80240684 44073000 */ mfc1 $a3, $f6 /* A48C48 80240688 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802404F4_A48AB4 /* A48D00 80240740 10600015 */ beqz $v1, .L80240798 /* A48D04 80240744 0260202D */ daddu $a0, $s3, $zero /* A48D08 80240748 08090228 */ j .L802408A0 -/* A48D0C 8024074C 00000000 */ nop +/* A48D0C 8024074C 00000000 */ nop .L80240750: /* A48D10 80240750 1062001C */ beq $v1, $v0, .L802407C4 /* A48D14 80240754 24020003 */ addiu $v0, $zero, 3 /* A48D18 80240758 10620035 */ beq $v1, $v0, .L80240830 /* A48D1C 8024075C 0260202D */ daddu $a0, $s3, $zero /* A48D20 80240760 08090228 */ j .L802408A0 -/* A48D24 80240764 00000000 */ nop +/* A48D24 80240764 00000000 */ nop .L80240768: /* A48D28 80240768 2402000E */ addiu $v0, $zero, 0xe /* A48D2C 8024076C 1062003F */ beq $v1, $v0, .L8024086C @@ -177,9 +177,9 @@ glabel func_802404F4_A48AB4 /* A48D40 80240780 10620040 */ beq $v1, $v0, .L80240884 /* A48D44 80240784 24020063 */ addiu $v0, $zero, 0x63 /* A48D48 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A48D4C 8024078C 00000000 */ nop +/* A48D4C 8024078C 00000000 */ nop /* A48D50 80240790 08090228 */ j .L802408A0 -/* A48D54 80240794 00000000 */ nop +/* A48D54 80240794 00000000 */ nop .L80240798: /* A48D58 80240798 0280282D */ daddu $a1, $s4, $zero /* A48D5C 8024079C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802404F4_A48AB4 /* A48D74 802407B4 0C0125AE */ jal func_800496B8 /* A48D78 802407B8 02A0302D */ daddu $a2, $s5, $zero /* A48D7C 802407BC 08090228 */ j .L802408A0 -/* A48D80 802407C0 00000000 */ nop +/* A48D80 802407C0 00000000 */ nop .L802407C4: /* A48D84 802407C4 0260202D */ daddu $a0, $s3, $zero /* A48D88 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A48D8C 802407CC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A48D8C 802407CC 0C0126D1 */ jal func_80049B44 /* A48D90 802407D0 02A0302D */ daddu $a2, $s5, $zero /* A48D94 802407D4 8E230088 */ lw $v1, 0x88($s1) /* A48D98 802407D8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802404F4_A48AB4 /* A48DF4 80240834 0C012701 */ jal func_80049C04 /* A48DF8 80240838 02A0302D */ daddu $a2, $s5, $zero /* A48DFC 8024083C 08090228 */ j .L802408A0 -/* A48E00 80240840 00000000 */ nop +/* A48E00 80240840 00000000 */ nop .L80240844: /* A48E04 80240844 0260202D */ daddu $a0, $s3, $zero /* A48E08 80240848 0280282D */ daddu $a1, $s4, $zero -/* A48E0C 8024084C 0C090058 */ jal kpa_03_set_script_owner_npc_anim +/* A48E0C 8024084C 0C090058 */ jal func_80240160_A48720 /* A48E10 80240850 02A0302D */ daddu $a2, $s5, $zero /* A48E14 80240854 0260202D */ daddu $a0, $s3, $zero .L80240858: @@ -240,20 +240,20 @@ glabel func_802404F4_A48AB4 /* A48E1C 8024085C 0C090077 */ jal func_802401DC_A4879C /* A48E20 80240860 02A0302D */ daddu $a2, $s5, $zero /* A48E24 80240864 08090228 */ j .L802408A0 -/* A48E28 80240868 00000000 */ nop +/* A48E28 80240868 00000000 */ nop .L8024086C: /* A48E2C 8024086C 0260202D */ daddu $a0, $s3, $zero /* A48E30 80240870 0280282D */ daddu $a1, $s4, $zero -/* A48E34 80240874 0C0900C4 */ jal kpa_03_UnkNpcAIFunc12 +/* A48E34 80240874 0C0900C4 */ jal func_80240310_A488D0 /* A48E38 80240878 02A0302D */ daddu $a2, $s5, $zero /* A48E3C 8024087C 08090228 */ j .L802408A0 -/* A48E40 80240880 00000000 */ nop +/* A48E40 80240880 00000000 */ nop .L80240884: /* A48E44 80240884 0280282D */ daddu $a1, $s4, $zero -/* A48E48 80240888 0C09011D */ jal kpa_03_set_script_owner_npc_col_height +/* A48E48 80240888 0C09011D */ jal func_80240474_A48A34 /* A48E4C 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A48E50 80240890 08090228 */ j .L802408A0 -/* A48E54 80240894 00000000 */ nop +/* A48E54 80240894 00000000 */ nop .L80240898: /* A48E58 80240898 0C0129CF */ jal func_8004A73C /* A48E5C 8024089C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802404F4_A48AB4 /* A48EB0 802408F0 00220821 */ addu $at, $at, $v0 /* A48EB4 802408F4 8C223888 */ lw $v0, %lo(D_80243888)($at) /* A48EB8 802408F8 00400008 */ jr $v0 -/* A48EBC 802408FC 00000000 */ nop +/* A48EBC 802408FC 00000000 */ nop /* A48EC0 80240900 8E420028 */ lw $v0, 0x28($s2) /* A48EC4 80240904 24420001 */ addiu $v0, $v0, 1 /* A48EC8 80240908 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s index 475eb32d0e..292e94ade5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s @@ -84,8 +84,8 @@ glabel func_80240A48_A49008 /* A49140 80240B80 44060000 */ mfc1 $a2, $f0 /* A49144 80240B84 0C00A720 */ jal atan2 /* A49148 80240B88 00000000 */ nop -/* A4914C 80240B8C 3C018024 */ lui $at, %hi(D_802438F0) -/* A49150 80240B90 D42238F0 */ ldc1 $f2, %lo(D_802438F0)($at) +/* A4914C 80240B8C 3C018024 */ lui $at, %hi(func_802438F0_95EAF0) +/* A49150 80240B90 D42238F0 */ ldc1 $f2, %lo(func_802438F0_95EAF0)($at) /* A49154 80240B94 46000021 */ cvt.d.s $f0, $f0 /* A49158 80240B98 46220001 */ sub.d $f0, $f0, $f2 /* A4915C 80240B9C 3C018024 */ lui $at, %hi(D_802438F8) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s index 3352650c9c..66e93131c0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024119C_A4975C.s @@ -14,14 +14,14 @@ glabel func_8024119C_A4975C /* A49780 802411C0 86440008 */ lh $a0, 8($s2) /* A49784 802411C4 0040802D */ daddu $s0, $v0, $zero /* A49788 802411C8 8603008E */ lh $v1, 0x8e($s0) -/* A4978C 802411CC 3C118024 */ lui $s1, %hi(D_802425E0) -/* A49790 802411D0 263125E0 */ addiu $s1, $s1, %lo(D_802425E0) +/* A4978C 802411CC 3C118024 */ lui $s1, %hi(func_802425E0_A1D6E0) +/* A49790 802411D0 263125E0 */ addiu $s1, $s1, %lo(func_802425E0_A1D6E0) /* A49794 802411D4 00031040 */ sll $v0, $v1, 1 /* A49798 802411D8 00431021 */ addu $v0, $v0, $v1 /* A4979C 802411DC 00021080 */ sll $v0, $v0, 2 -/* A497A0 802411E0 3C018024 */ lui $at, %hi(D_802425E0) +/* A497A0 802411E0 3C018024 */ lui $at, %hi(func_802425E0_A1D6E0) /* A497A4 802411E4 00220821 */ addu $at, $at, $v0 -/* A497A8 802411E8 C42025E0 */ lwc1 $f0, %lo(D_802425E0)($at) +/* A497A8 802411E8 C42025E0 */ lwc1 $f0, %lo(func_802425E0_A1D6E0)($at) /* A497AC 802411EC 00031040 */ sll $v0, $v1, 1 /* A497B0 802411F0 00431021 */ addu $v0, $v0, $v1 /* A497B4 802411F4 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s index e503816ca1..fa6db81c0c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s @@ -32,8 +32,8 @@ glabel func_8024150C_A49ACC /* A49B30 80241570 240300FF */ addiu $v1, $zero, 0xff .L80241574: /* A49B34 80241574 8602008E */ lh $v0, 0x8e($s0) -/* A49B38 80241578 3C018024 */ lui $at, %hi(D_80243920) -/* A49B3C 8024157C D4223920 */ ldc1 $f2, %lo(D_80243920)($at) +/* A49B38 80241578 3C018024 */ lui $at, %hi(func_80243920_8041A0) +/* A49B3C 8024157C D4223920 */ ldc1 $f2, %lo(func_80243920_8041A0)($at) /* A49B40 80241580 44820000 */ mtc1 $v0, $f0 /* A49B44 80241584 00000000 */ nop /* A49B48 80241588 46800020 */ cvt.s.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s index a28e4983ce..921b8b5920 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s @@ -60,9 +60,9 @@ glabel func_80240270_A4CC90 /* A4CD64 80240344 2C620005 */ sltiu $v0, $v1, 5 /* A4CD68 80240348 10400101 */ beqz $v0, .L80240750 /* A4CD6C 8024034C 00031080 */ sll $v0, $v1, 2 -/* A4CD70 80240350 3C018024 */ lui $at, %hi(D_80242540) +/* A4CD70 80240350 3C018024 */ lui $at, %hi(func_80242540_A09440) /* A4CD74 80240354 00220821 */ addu $at, $at, $v0 -/* A4CD78 80240358 8C222540 */ lw $v0, %lo(D_80242540)($at) +/* A4CD78 80240358 8C222540 */ lw $v0, %lo(func_80242540_A09440)($at) /* A4CD7C 8024035C 00400008 */ jr $v0 /* A4CD80 80240360 00000000 */ nop /* A4CD84 80240364 3C01C47A */ lui $at, 0xc47a @@ -148,8 +148,8 @@ glabel func_80240270_A4CC90 /* A4CEC4 802404A4 44061000 */ mfc1 $a2, $f2 /* A4CEC8 802404A8 0C00A720 */ jal atan2 /* A4CECC 802404AC 00000000 */ nop -/* A4CED0 802404B0 3C018024 */ lui $at, %hi(D_80242558) -/* A4CED4 802404B4 D4222558 */ ldc1 $f2, %lo(D_80242558)($at) +/* A4CED0 802404B0 3C018024 */ lui $at, %hi(func_80242558_A1D658) +/* A4CED4 802404B4 D4222558 */ ldc1 $f2, %lo(func_80242558_A1D658)($at) /* A4CED8 802404B8 46000021 */ cvt.d.s $f0, $f0 /* A4CEDC 802404BC 46220001 */ sub.d $f0, $f0, $f2 /* A4CEE0 802404C0 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s index a7fc10e919..745d257963 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802407F4_A4D214.s @@ -14,21 +14,21 @@ glabel func_802407F4_A4D214 /* A4D238 80240818 86440008 */ lh $a0, 8($s2) /* A4D23C 8024081C 0040802D */ daddu $s0, $v0, $zero /* A4D240 80240820 8603008E */ lh $v1, 0x8e($s0) -/* A4D244 80240824 3C118024 */ lui $s1, %hi(D_80241CF0) -/* A4D248 80240828 26311CF0 */ addiu $s1, $s1, %lo(D_80241CF0) +/* A4D244 80240824 3C118024 */ lui $s1, %hi(func_80241CF0_9113A0) +/* A4D248 80240828 26311CF0 */ addiu $s1, $s1, %lo(func_80241CF0_9113A0) /* A4D24C 8024082C 00031040 */ sll $v0, $v1, 1 /* A4D250 80240830 00431021 */ addu $v0, $v0, $v1 /* A4D254 80240834 00021080 */ sll $v0, $v0, 2 -/* A4D258 80240838 3C018024 */ lui $at, %hi(D_80241CF0) +/* A4D258 80240838 3C018024 */ lui $at, %hi(func_80241CF0_9113A0) /* A4D25C 8024083C 00220821 */ addu $at, $at, $v0 -/* A4D260 80240840 C4201CF0 */ lwc1 $f0, %lo(D_80241CF0)($at) +/* A4D260 80240840 C4201CF0 */ lwc1 $f0, %lo(func_80241CF0_9113A0)($at) /* A4D264 80240844 00031040 */ sll $v0, $v1, 1 /* A4D268 80240848 00431021 */ addu $v0, $v0, $v1 /* A4D26C 8024084C 00021080 */ sll $v0, $v0, 2 /* A4D270 80240850 E6000054 */ swc1 $f0, 0x54($s0) -/* A4D274 80240854 3C018024 */ lui $at, %hi(D_80241CF4) +/* A4D274 80240854 3C018024 */ lui $at, %hi(func_80241CF4_88A8C4) /* A4D278 80240858 00220821 */ addu $at, $at, $v0 -/* A4D27C 8024085C C4201CF4 */ lwc1 $f0, %lo(D_80241CF4)($at) +/* A4D27C 8024085C C4201CF4 */ lwc1 $f0, %lo(func_80241CF4_88A8C4)($at) /* A4D280 80240860 00031040 */ sll $v0, $v1, 1 /* A4D284 80240864 00431021 */ addu $v0, $v0, $v1 /* A4D288 80240868 9603008E */ lhu $v1, 0x8e($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s index f1e5d945fe..80b56c553a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240B64_A4D584.s @@ -32,8 +32,8 @@ glabel func_80240B64_A4D584 /* A4D5E8 80240BC8 240300FF */ addiu $v1, $zero, 0xff .L80240BCC: /* A4D5EC 80240BCC 8602008E */ lh $v0, 0x8e($s0) -/* A4D5F0 80240BD0 3C018024 */ lui $at, %hi(D_80242560) -/* A4D5F4 80240BD4 D4222560 */ ldc1 $f2, %lo(D_80242560)($at) +/* A4D5F0 80240BD0 3C018024 */ lui $at, %hi(func_80242560_95D760) +/* A4D5F4 80240BD4 D4222560 */ ldc1 $f2, %lo(func_80242560_95D760)($at) /* A4D5F8 80240BD8 44820000 */ mtc1 $v0, $f0 /* A4D5FC 80240BDC 00000000 */ nop /* A4D600 80240BE0 46800020 */ cvt.s.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s index f6f40aa538..9811df3c5f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s @@ -83,9 +83,9 @@ glabel func_8024110C_A4DB2C /* A4DC58 80241238 2C620019 */ sltiu $v0, $v1, 0x19 /* A4DC5C 8024123C 10400044 */ beqz $v0, .L80241350 /* A4DC60 80241240 00031080 */ sll $v0, $v1, 2 -/* A4DC64 80241244 3C018024 */ lui $at, %hi(D_80242570) +/* A4DC64 80241244 3C018024 */ lui $at, %hi(func_80242570_7ED280) /* A4DC68 80241248 00220821 */ addu $at, $at, $v0 -/* A4DC6C 8024124C 8C222570 */ lw $v0, %lo(D_80242570)($at) +/* A4DC6C 8024124C 8C222570 */ lw $v0, %lo(func_80242570_7ED280)($at) /* A4DC70 80241250 00400008 */ jr $v0 /* A4DC74 80241254 00000000 */ nop /* A4DC78 80241258 02A0202D */ daddu $a0, $s5, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s index 90e9b44748..75c958264a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802400A0_A4F0A0.s @@ -45,8 +45,8 @@ glabel func_802400A0_A4F0A0 /* A4F140 80240140 00000000 */ nop /* A4F144 80240144 0C00A6C9 */ jal clamp_angle /* A4F148 80240148 46000306 */ mov.s $f12, $f0 -/* A4F14C 8024014C 3C018024 */ lui $at, %hi(D_802427C0) -/* A4F150 80240150 D42227C0 */ ldc1 $f2, %lo(D_802427C0)($at) +/* A4F14C 8024014C 3C018024 */ lui $at, %hi(func_802427C0_9C7BA0) +/* A4F150 80240150 D42227C0 */ ldc1 $f2, %lo(func_802427C0_9C7BA0)($at) /* A4F154 80240154 46000021 */ cvt.d.s $f0, $f0 /* A4F158 80240158 4622003C */ c.lt.d $f0, $f2 /* A4F15C 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s index d78433c641..9e5f4be74f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240B38_A4FB38.s @@ -80,8 +80,8 @@ glabel func_80240B38_A4FB38 /* A4FC50 80240C50 C64C006C */ lwc1 $f12, 0x6c($s2) /* A4FC54 80240C54 0C00A6C9 */ jal clamp_angle /* A4FC58 80240C58 00000000 */ nop -/* A4FC5C 80240C5C 3C018024 */ lui $at, %hi(D_802427D0) -/* A4FC60 80240C60 D43827D0 */ ldc1 $f24, %lo(D_802427D0)($at) +/* A4FC5C 80240C5C 3C018024 */ lui $at, %hi(func_802427D0_833FD0) +/* A4FC60 80240C60 D43827D0 */ ldc1 $f24, %lo(func_802427D0_833FD0)($at) /* A4FC64 80240C64 46000521 */ cvt.d.s $f20, $f0 /* A4FC68 80240C68 4638A300 */ add.d $f12, $f20, $f24 /* A4FC6C 80240C6C 3C018024 */ lui $at, %hi(D_802427D8) diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s index 03774026e1..1c17515905 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -46,7 +46,7 @@ glabel func_80240F94_A4FF94 /* A50038 80241038 8E4200B0 */ lw $v0, 0xb0($s2) /* A5003C 8024103C 30420004 */ andi $v0, $v0, 4 /* A50040 80241040 1040002F */ beqz $v0, .L80241100 -/* A50044 80241044 00000000 */ nop +/* A50044 80241044 00000000 */ nop .L80241048: /* A50048 80241048 2404F7FF */ addiu $a0, $zero, -0x801 /* A5004C 8024104C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240F94_A4FF94 /* A50114 80241114 00220821 */ addu $at, $at, $v0 /* A50118 80241118 8C2227E8 */ lw $v0, %lo(D_802427E8)($at) /* A5011C 8024111C 00400008 */ jr $v0 -/* A50120 80241120 00000000 */ nop +/* A50120 80241120 00000000 */ nop /* A50124 80241124 0260202D */ daddu $a0, $s3, $zero /* A50128 80241128 0200282D */ daddu $a1, $s0, $zero /* A5012C 8024112C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240F94_A4FF94 /* A5013C 8024113C 0C0125AE */ jal func_800496B8 /* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero /* A50144 80241144 080904A3 */ j .L8024128C -/* A50148 80241148 00000000 */ nop +/* A50148 80241148 00000000 */ nop /* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero /* A50150 80241150 0200282D */ daddu $a1, $s0, $zero -/* A50154 80241154 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A50154 80241154 0C0126D1 */ jal func_80049B44 /* A50158 80241158 02A0302D */ daddu $a2, $s5, $zero /* A5015C 8024115C 0260202D */ daddu $a0, $s3, $zero /* A50160 80241160 0200282D */ daddu $a1, $s0, $zero /* A50164 80241164 0C012701 */ jal func_80049C04 /* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero /* A5016C 8024116C 080904A3 */ j .L8024128C -/* A50170 80241170 00000000 */ nop +/* A50170 80241170 00000000 */ nop /* A50174 80241174 0260202D */ daddu $a0, $s3, $zero /* A50178 80241178 0200282D */ daddu $a1, $s0, $zero /* A5017C 8024117C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240F94_A4FF94 /* A5018C 8024118C 0C0127B3 */ jal func_80049ECC /* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero /* A50194 80241194 080904A3 */ j .L8024128C -/* A50198 80241198 00000000 */ nop +/* A50198 80241198 00000000 */ nop /* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A501A0 802411A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A501A4 802411A4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240F94_A4FF94 /* A501BC 802411BC 10400008 */ beqz $v0, .L802411E0 /* A501C0 802411C0 46000086 */ mov.s $f2, $f0 /* A501C4 802411C4 44820000 */ mtc1 $v0, $f0 -/* A501C8 802411C8 00000000 */ nop +/* A501C8 802411C8 00000000 */ nop /* A501CC 802411CC 46800020 */ cvt.s.w $f0, $f0 /* A501D0 802411D0 4602003C */ c.lt.s $f0, $f2 -/* A501D4 802411D4 00000000 */ nop +/* A501D4 802411D4 00000000 */ nop /* A501D8 802411D8 4500000B */ bc1f .L80241208 /* A501DC 802411DC 0260202D */ daddu $a0, $s3, $zero .L802411E0: @@ -164,7 +164,7 @@ glabel func_80240F94_A4FF94 /* A501F4 802411F4 8E630070 */ lw $v1, 0x70($s3) /* A501F8 802411F8 2402000C */ addiu $v0, $zero, 0xc /* A501FC 802411FC 14620023 */ bne $v1, $v0, .L8024128C -/* A50200 80241200 00000000 */ nop +/* A50200 80241200 00000000 */ nop /* A50204 80241204 0260202D */ daddu $a0, $s3, $zero .L80241208: /* A50208 80241208 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240F94_A4FF94 /* A5021C 8024121C 0C012849 */ jal func_8004A124 /* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero /* A50224 80241224 080904A3 */ j .L8024128C -/* A50228 80241228 00000000 */ nop +/* A50228 80241228 00000000 */ nop /* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A50230 80241230 0200282D */ daddu $a1, $s0, $zero /* A50234 80241234 0C0128FA */ jal func_8004A3E8 /* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero /* A5023C 8024123C 080904A3 */ j .L8024128C -/* A50240 80241240 00000000 */ nop +/* A50240 80241240 00000000 */ nop /* A50244 80241244 0C0900F5 */ jal func_802403D4_A4F3D4 /* A50248 80241248 0260202D */ daddu $a0, $s3, $zero /* A5024C 8024124C 080904A3 */ j .L8024128C -/* A50250 80241250 00000000 */ nop -/* A50254 80241254 0C090135 */ jal kpa_09_UnkSetDurationFunc +/* A50250 80241250 00000000 */ nop +/* A50254 80241254 0C090135 */ jal func_802404D4_A4F4D4 /* A50258 80241258 0260202D */ daddu $a0, $s3, $zero /* A5025C 8024125C 080904A3 */ j .L8024128C -/* A50260 80241260 00000000 */ nop -/* A50264 80241264 0C090146 */ jal kpa_09_UnkNpcAIFunc9 +/* A50260 80241260 00000000 */ nop +/* A50264 80241264 0C090146 */ jal func_80240518_A4F518 /* A50268 80241268 0260202D */ daddu $a0, $s3, $zero /* A5026C 8024126C 080904A3 */ j .L8024128C -/* A50270 80241270 00000000 */ nop -/* A50274 80241274 0C09016E */ jal kpa_09_UnkDurationCheck +/* A50270 80241270 00000000 */ nop +/* A50274 80241274 0C09016E */ jal func_802405B8_A4F5B8 /* A50278 80241278 0260202D */ daddu $a0, $s3, $zero /* A5027C 8024127C 080904A3 */ j .L8024128C -/* A50280 80241280 00000000 */ nop +/* A50280 80241280 00000000 */ nop /* A50284 80241284 0C0129CF */ jal func_8004A73C /* A50288 80241288 0260202D */ daddu $a0, $s3, $zero .L8024128C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s b/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s index 562d942d92..1258b6349b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s +++ b/asm/nonmatchings/world/area_kpa/kpa_100/A93160/func_80240000_A93160.s @@ -5,8 +5,8 @@ glabel func_80240000_A93160 /* A93160 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A93164 80240004 3C04800E */ lui $a0, %hi(D_800D9230) /* A93168 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) -/* A9316C 8024000C 3C058024 */ lui $a1, %hi(D_802402B0) -/* A93170 80240010 24A502B0 */ addiu $a1, $a1, %lo(D_802402B0) +/* A9316C 8024000C 3C058024 */ lui $a1, %hi(func_802402B0_90CEF0) +/* A93170 80240010 24A502B0 */ addiu $a1, $a1, %lo(func_802402B0_90CEF0) /* A93174 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A93178 80240018 0C01953C */ jal sprintf /* A9317C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s b/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s index 1f47ea3f63..b3cf3044b5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s +++ b/asm/nonmatchings/world/area_kpa/kpa_101/A93440/func_80240000_A93440.s @@ -5,16 +5,16 @@ glabel func_80240000_A93440 /* A93440 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A93444 80240004 3C04800E */ lui $a0, %hi(D_800D9230) /* A93448 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) -/* A9344C 8024000C 3C058024 */ lui $a1, %hi(D_802402D0) -/* A93450 80240010 24A502D0 */ addiu $a1, $a1, %lo(D_802402D0) +/* A9344C 8024000C 3C058024 */ lui $a1, %hi(func_802402D0_A7A7D0) +/* A93450 80240010 24A502D0 */ addiu $a1, $a1, %lo(func_802402D0_A7A7D0) /* A93454 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A93458 80240018 0C01953C */ jal sprintf /* A9345C 8024001C 00000000 */ nop /* A93460 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A93464 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* A93468 80240028 3C058024 */ lui $a1, %hi(D_802402E0) +/* A93468 80240028 3C058024 */ lui $a1, %hi(func_802402E0_A071E0) /* A9346C 8024002C 0C01953C */ jal sprintf -/* A93470 80240030 24A502E0 */ addiu $a1, $a1, %lo(D_802402E0) +/* A93470 80240030 24A502E0 */ addiu $a1, $a1, %lo(func_802402E0_A071E0) /* A93474 80240034 8FBF0010 */ lw $ra, 0x10($sp) /* A93478 80240038 0000102D */ daddu $v0, $zero, $zero /* A9347C 8024003C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index bc82614b1b..d612e1ffdb 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -46,7 +46,7 @@ glabel func_80241204_A94944 /* A949E8 802412A8 8E4200B0 */ lw $v0, 0xb0($s2) /* A949EC 802412AC 30420004 */ andi $v0, $v0, 4 /* A949F0 802412B0 1040002F */ beqz $v0, .L80241370 -/* A949F4 802412B4 00000000 */ nop +/* A949F4 802412B4 00000000 */ nop .L802412B8: /* A949F8 802412B8 2404F7FF */ addiu $a0, $zero, -0x801 /* A949FC 802412BC AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241204_A94944 /* A94AC4 80241384 00220821 */ addu $at, $at, $v0 /* A94AC8 80241388 8C225B48 */ lw $v0, %lo(D_80245B48)($at) /* A94ACC 8024138C 00400008 */ jr $v0 -/* A94AD0 80241390 00000000 */ nop +/* A94AD0 80241390 00000000 */ nop /* A94AD4 80241394 0260202D */ daddu $a0, $s3, $zero /* A94AD8 80241398 0200282D */ daddu $a1, $s0, $zero /* A94ADC 8024139C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241204_A94944 /* A94AEC 802413AC 0C0125AE */ jal func_800496B8 /* A94AF0 802413B0 02A0302D */ daddu $a2, $s5, $zero /* A94AF4 802413B4 0809053F */ j .L802414FC -/* A94AF8 802413B8 00000000 */ nop +/* A94AF8 802413B8 00000000 */ nop /* A94AFC 802413BC 0260202D */ daddu $a0, $s3, $zero /* A94B00 802413C0 0200282D */ daddu $a1, $s0, $zero -/* A94B04 802413C4 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A94B04 802413C4 0C0126D1 */ jal func_80049B44 /* A94B08 802413C8 02A0302D */ daddu $a2, $s5, $zero /* A94B0C 802413CC 0260202D */ daddu $a0, $s3, $zero /* A94B10 802413D0 0200282D */ daddu $a1, $s0, $zero /* A94B14 802413D4 0C012701 */ jal func_80049C04 /* A94B18 802413D8 02A0302D */ daddu $a2, $s5, $zero /* A94B1C 802413DC 0809053F */ j .L802414FC -/* A94B20 802413E0 00000000 */ nop +/* A94B20 802413E0 00000000 */ nop /* A94B24 802413E4 0260202D */ daddu $a0, $s3, $zero /* A94B28 802413E8 0200282D */ daddu $a1, $s0, $zero /* A94B2C 802413EC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241204_A94944 /* A94B3C 802413FC 0C0127B3 */ jal func_80049ECC /* A94B40 80241400 02A0302D */ daddu $a2, $s5, $zero /* A94B44 80241404 0809053F */ j .L802414FC -/* A94B48 80241408 00000000 */ nop +/* A94B48 80241408 00000000 */ nop /* A94B4C 8024140C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A94B50 80241410 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A94B54 80241414 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241204_A94944 /* A94B6C 8024142C 10400008 */ beqz $v0, .L80241450 /* A94B70 80241430 46000086 */ mov.s $f2, $f0 /* A94B74 80241434 44820000 */ mtc1 $v0, $f0 -/* A94B78 80241438 00000000 */ nop +/* A94B78 80241438 00000000 */ nop /* A94B7C 8024143C 46800020 */ cvt.s.w $f0, $f0 /* A94B80 80241440 4602003C */ c.lt.s $f0, $f2 -/* A94B84 80241444 00000000 */ nop +/* A94B84 80241444 00000000 */ nop /* A94B88 80241448 4500000B */ bc1f .L80241478 /* A94B8C 8024144C 0260202D */ daddu $a0, $s3, $zero .L80241450: @@ -164,7 +164,7 @@ glabel func_80241204_A94944 /* A94BA4 80241464 8E630070 */ lw $v1, 0x70($s3) /* A94BA8 80241468 2402000C */ addiu $v0, $zero, 0xc /* A94BAC 8024146C 14620023 */ bne $v1, $v0, .L802414FC -/* A94BB0 80241470 00000000 */ nop +/* A94BB0 80241470 00000000 */ nop /* A94BB4 80241474 0260202D */ daddu $a0, $s3, $zero .L80241478: /* A94BB8 80241478 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241204_A94944 /* A94BCC 8024148C 0C012849 */ jal func_8004A124 /* A94BD0 80241490 02A0302D */ daddu $a2, $s5, $zero /* A94BD4 80241494 0809053F */ j .L802414FC -/* A94BD8 80241498 00000000 */ nop +/* A94BD8 80241498 00000000 */ nop /* A94BDC 8024149C 0260202D */ daddu $a0, $s3, $zero /* A94BE0 802414A0 0200282D */ daddu $a1, $s0, $zero /* A94BE4 802414A4 0C0128FA */ jal func_8004A3E8 /* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero /* A94BEC 802414AC 0809053F */ j .L802414FC -/* A94BF0 802414B0 00000000 */ nop +/* A94BF0 802414B0 00000000 */ nop /* A94BF4 802414B4 0C090191 */ jal func_80240644_A93D84 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC -/* A94C00 802414C0 00000000 */ nop -/* A94C04 802414C4 0C0901D1 */ jal kpa_102_UnkSetDurationFunc +/* A94C00 802414C0 00000000 */ nop +/* A94C04 802414C4 0C0901D1 */ jal func_80240744_A93E84 /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC -/* A94C10 802414D0 00000000 */ nop -/* A94C14 802414D4 0C0901E2 */ jal kpa_102_UnkNpcAIFunc9 +/* A94C10 802414D0 00000000 */ nop +/* A94C14 802414D4 0C0901E2 */ jal func_80240788_A93EC8 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC -/* A94C20 802414E0 00000000 */ nop -/* A94C24 802414E4 0C09020A */ jal kpa_102_UnkDurationCheck +/* A94C20 802414E0 00000000 */ nop +/* A94C24 802414E4 0C09020A */ jal func_80240828_A93F68 /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero /* A94C2C 802414EC 0809053F */ j .L802414FC -/* A94C30 802414F0 00000000 */ nop +/* A94C30 802414F0 00000000 */ nop /* A94C34 802414F4 0C0129CF */ jal func_8004A73C /* A94C38 802414F8 0260202D */ daddu $a0, $s3, $zero .L802414FC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index e469a23cd1..a92efa86d3 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -55,7 +55,7 @@ glabel func_802418F0_A95030 /* A950F4 802419B4 8E2200B0 */ lw $v0, 0xb0($s1) /* A950F8 802419B8 30420004 */ andi $v0, $v0, 4 /* A950FC 802419BC 10400047 */ beqz $v0, .L80241ADC -/* A95100 802419C0 00000000 */ nop +/* A95100 802419C0 00000000 */ nop .L802419C4: /* A95104 802419C4 AE600070 */ sw $zero, 0x70($s3) /* A95108 802419C8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802418F0_A95030 /* A951AC 80241A6C 24020028 */ addiu $v0, $zero, 0x28 /* A951B0 80241A70 AFA2001C */ sw $v0, 0x1c($sp) /* A951B4 80241A74 44833000 */ mtc1 $v1, $f6 -/* A951B8 80241A78 00000000 */ nop +/* A951B8 80241A78 00000000 */ nop /* A951BC 80241A7C 468031A0 */ cvt.s.w $f6, $f6 /* A951C0 80241A80 44073000 */ mfc1 $a3, $f6 /* A951C4 80241A84 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802418F0_A95030 /* A9527C 80241B3C 10600015 */ beqz $v1, .L80241B94 /* A95280 80241B40 0260202D */ daddu $a0, $s3, $zero /* A95284 80241B44 08090727 */ j .L80241C9C -/* A95288 80241B48 00000000 */ nop +/* A95288 80241B48 00000000 */ nop .L80241B4C: /* A9528C 80241B4C 1062001C */ beq $v1, $v0, .L80241BC0 /* A95290 80241B50 24020003 */ addiu $v0, $zero, 3 /* A95294 80241B54 10620035 */ beq $v1, $v0, .L80241C2C /* A95298 80241B58 0260202D */ daddu $a0, $s3, $zero /* A9529C 80241B5C 08090727 */ j .L80241C9C -/* A952A0 80241B60 00000000 */ nop +/* A952A0 80241B60 00000000 */ nop .L80241B64: /* A952A4 80241B64 2402000E */ addiu $v0, $zero, 0xe /* A952A8 80241B68 1062003F */ beq $v1, $v0, .L80241C68 @@ -177,9 +177,9 @@ glabel func_802418F0_A95030 /* A952BC 80241B7C 10620040 */ beq $v1, $v0, .L80241C80 /* A952C0 80241B80 24020063 */ addiu $v0, $zero, 0x63 /* A952C4 80241B84 10620043 */ beq $v1, $v0, .L80241C94 -/* A952C8 80241B88 00000000 */ nop +/* A952C8 80241B88 00000000 */ nop /* A952CC 80241B8C 08090727 */ j .L80241C9C -/* A952D0 80241B90 00000000 */ nop +/* A952D0 80241B90 00000000 */ nop .L80241B94: /* A952D4 80241B94 0280282D */ daddu $a1, $s4, $zero /* A952D8 80241B98 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802418F0_A95030 /* A952F0 80241BB0 0C0125AE */ jal func_800496B8 /* A952F4 80241BB4 02A0302D */ daddu $a2, $s5, $zero /* A952F8 80241BB8 08090727 */ j .L80241C9C -/* A952FC 80241BBC 00000000 */ nop +/* A952FC 80241BBC 00000000 */ nop .L80241BC0: /* A95300 80241BC0 0260202D */ daddu $a0, $s3, $zero /* A95304 80241BC4 0280282D */ daddu $a1, $s4, $zero -/* A95308 80241BC8 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A95308 80241BC8 0C0126D1 */ jal func_80049B44 /* A9530C 80241BCC 02A0302D */ daddu $a2, $s5, $zero /* A95310 80241BD0 8E230088 */ lw $v1, 0x88($s1) /* A95314 80241BD4 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802418F0_A95030 /* A95370 80241C30 0C012701 */ jal func_80049C04 /* A95374 80241C34 02A0302D */ daddu $a2, $s5, $zero /* A95378 80241C38 08090727 */ j .L80241C9C -/* A9537C 80241C3C 00000000 */ nop +/* A9537C 80241C3C 00000000 */ nop .L80241C40: /* A95380 80241C40 0260202D */ daddu $a0, $s3, $zero /* A95384 80241C44 0280282D */ daddu $a1, $s4, $zero -/* A95388 80241C48 0C090557 */ jal kpa_102_set_script_owner_npc_anim +/* A95388 80241C48 0C090557 */ jal func_8024155C_A94C9C /* A9538C 80241C4C 02A0302D */ daddu $a2, $s5, $zero /* A95390 80241C50 0260202D */ daddu $a0, $s3, $zero .L80241C54: @@ -240,20 +240,20 @@ glabel func_802418F0_A95030 /* A95398 80241C58 0C090576 */ jal func_802415D8_A94D18 /* A9539C 80241C5C 02A0302D */ daddu $a2, $s5, $zero /* A953A0 80241C60 08090727 */ j .L80241C9C -/* A953A4 80241C64 00000000 */ nop +/* A953A4 80241C64 00000000 */ nop .L80241C68: /* A953A8 80241C68 0260202D */ daddu $a0, $s3, $zero /* A953AC 80241C6C 0280282D */ daddu $a1, $s4, $zero -/* A953B0 80241C70 0C0905C3 */ jal kpa_102_UnkNpcAIFunc12 +/* A953B0 80241C70 0C0905C3 */ jal func_8024170C_A94E4C /* A953B4 80241C74 02A0302D */ daddu $a2, $s5, $zero /* A953B8 80241C78 08090727 */ j .L80241C9C -/* A953BC 80241C7C 00000000 */ nop +/* A953BC 80241C7C 00000000 */ nop .L80241C80: /* A953C0 80241C80 0280282D */ daddu $a1, $s4, $zero -/* A953C4 80241C84 0C09061C */ jal kpa_102_set_script_owner_npc_col_height +/* A953C4 80241C84 0C09061C */ jal func_80241870_A94FB0 /* A953C8 80241C88 02A0302D */ daddu $a2, $s5, $zero /* A953CC 80241C8C 08090727 */ j .L80241C9C -/* A953D0 80241C90 00000000 */ nop +/* A953D0 80241C90 00000000 */ nop .L80241C94: /* A953D4 80241C94 0C0129CF */ jal func_8004A73C /* A953D8 80241C98 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802418F0_A95030 /* A9542C 80241CEC 00220821 */ addu $at, $at, $v0 /* A95430 80241CF0 8C225CE0 */ lw $v0, %lo(D_80245CE0)($at) /* A95434 80241CF4 00400008 */ jr $v0 -/* A95438 80241CF8 00000000 */ nop +/* A95438 80241CF8 00000000 */ nop /* A9543C 80241CFC 8E420028 */ lw $v0, 0x28($s2) /* A95440 80241D00 24420001 */ addiu $v0, $v0, 1 /* A95444 80241D04 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s index 58b82b455e..7ae5041210 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s @@ -55,8 +55,8 @@ glabel func_8024038C_A52C4C /* A52D08 80240448 8C470030 */ lw $a3, 0x30($v0) /* A52D0C 8024044C C6020018 */ lwc1 $f2, 0x18($s0) /* A52D10 80240450 46020003 */ div.s $f0, $f0, $f2 -/* A52D14 80240454 3C018024 */ lui $at, %hi(D_80242030) -/* A52D18 80240458 D4222030 */ ldc1 $f2, %lo(D_80242030)($at) +/* A52D14 80240454 3C018024 */ lui $at, %hi(func_80242030_8EDE50) +/* A52D18 80240458 D4222030 */ ldc1 $f2, %lo(func_80242030_8EDE50)($at) /* A52D1C 8024045C 46000021 */ cvt.d.s $f0, $f0 /* A52D20 80240460 46220000 */ add.d $f0, $f0, $f2 /* A52D24 80240464 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index 6fd0b68aae..82f8e02377 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -55,7 +55,7 @@ glabel func_802406A4_A52F64 /* A53028 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A5302C 8024076C 30420004 */ andi $v0, $v0, 4 /* A53030 80240770 10400047 */ beqz $v0, .L80240890 -/* A53034 80240774 00000000 */ nop +/* A53034 80240774 00000000 */ nop .L80240778: /* A53038 80240778 AE600070 */ sw $zero, 0x70($s3) /* A5303C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A52F64 /* A530E0 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A530E4 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A530E8 80240828 44833000 */ mtc1 $v1, $f6 -/* A530EC 8024082C 00000000 */ nop +/* A530EC 8024082C 00000000 */ nop /* A530F0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A530F4 80240834 44073000 */ mfc1 $a3, $f6 /* A530F8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A52F64 /* A531B0 802408F0 10600015 */ beqz $v1, .L80240948 /* A531B4 802408F4 0260202D */ daddu $a0, $s3, $zero /* A531B8 802408F8 08090294 */ j .L80240A50 -/* A531BC 802408FC 00000000 */ nop +/* A531BC 802408FC 00000000 */ nop .L80240900: /* A531C0 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A531C4 80240904 24020003 */ addiu $v0, $zero, 3 /* A531C8 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A531CC 8024090C 0260202D */ daddu $a0, $s3, $zero /* A531D0 80240910 08090294 */ j .L80240A50 -/* A531D4 80240914 00000000 */ nop +/* A531D4 80240914 00000000 */ nop .L80240918: /* A531D8 80240918 2402000E */ addiu $v0, $zero, 0xe /* A531DC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A52F64 /* A531F0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A531F4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A531F8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A531FC 8024093C 00000000 */ nop +/* A531FC 8024093C 00000000 */ nop /* A53200 80240940 08090294 */ j .L80240A50 -/* A53204 80240944 00000000 */ nop +/* A53204 80240944 00000000 */ nop .L80240948: /* A53208 80240948 0280282D */ daddu $a1, $s4, $zero /* A5320C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A52F64 /* A53224 80240964 0C0125AE */ jal func_800496B8 /* A53228 80240968 02A0302D */ daddu $a2, $s5, $zero /* A5322C 8024096C 08090294 */ j .L80240A50 -/* A53230 80240970 00000000 */ nop +/* A53230 80240970 00000000 */ nop .L80240974: /* A53234 80240974 0260202D */ daddu $a0, $s3, $zero /* A53238 80240978 0280282D */ daddu $a1, $s4, $zero -/* A5323C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A5323C 8024097C 0C0126D1 */ jal func_80049B44 /* A53240 80240980 02A0302D */ daddu $a2, $s5, $zero /* A53244 80240984 8E230088 */ lw $v1, 0x88($s1) /* A53248 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802406A4_A52F64 /* A532A4 802409E4 0C012701 */ jal func_80049C04 /* A532A8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A532AC 802409EC 08090294 */ j .L80240A50 -/* A532B0 802409F0 00000000 */ nop +/* A532B0 802409F0 00000000 */ nop .L802409F4: /* A532B4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A532B8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A532BC 802409FC 0C0900C4 */ jal kpa_11_set_script_owner_npc_anim +/* A532BC 802409FC 0C0900C4 */ jal func_80240310_A52BD0 /* A532C0 80240A00 02A0302D */ daddu $a2, $s5, $zero /* A532C4 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: @@ -240,20 +240,20 @@ glabel func_802406A4_A52F64 /* A532CC 80240A0C 0C0900E3 */ jal func_8024038C_A52C4C /* A532D0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A532D4 80240A14 08090294 */ j .L80240A50 -/* A532D8 80240A18 00000000 */ nop +/* A532D8 80240A18 00000000 */ nop .L80240A1C: /* A532DC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A532E0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A532E4 80240A24 0C090130 */ jal kpa_11_UnkNpcAIFunc12 +/* A532E4 80240A24 0C090130 */ jal func_802404C0_A52D80 /* A532E8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A532EC 80240A2C 08090294 */ j .L80240A50 -/* A532F0 80240A30 00000000 */ nop +/* A532F0 80240A30 00000000 */ nop .L80240A34: /* A532F4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A532F8 80240A38 0C090189 */ jal kpa_11_set_script_owner_npc_col_height +/* A532F8 80240A38 0C090189 */ jal func_80240624_A52EE4 /* A532FC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A53300 80240A40 08090294 */ j .L80240A50 -/* A53304 80240A44 00000000 */ nop +/* A53304 80240A44 00000000 */ nop .L80240A48: /* A53308 80240A48 0C0129CF */ jal func_8004A73C /* A5330C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A52F64 /* A53360 80240AA0 00220821 */ addu $at, $at, $v0 /* A53364 80240AA4 8C222038 */ lw $v0, %lo(D_80242038)($at) /* A53368 80240AA8 00400008 */ jr $v0 -/* A5336C 80240AAC 00000000 */ nop +/* A5336C 80240AAC 00000000 */ nop /* A53370 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A53374 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A53378 80240AB8 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_802406A4_A52F64 /* A53398 80240AD8 8FB00050 */ lw $s0, 0x50($sp) /* A5339C 80240ADC 03E00008 */ jr $ra /* A533A0 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A533A4 80240AE4 00000000 */ nop -/* A533A8 80240AE8 00000000 */ nop -/* A533AC 80240AEC 00000000 */ nop +/* A533A4 80240AE4 00000000 */ nop +/* A533A8 80240AE8 00000000 */ nop +/* A533AC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index 9dcc178b9f..9f88889f84 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -46,7 +46,7 @@ glabel func_80241064_A9A5F4 /* A9A698 80241108 8E4200B0 */ lw $v0, 0xb0($s2) /* A9A69C 8024110C 30420004 */ andi $v0, $v0, 4 /* A9A6A0 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9A6A4 80241114 00000000 */ nop +/* A9A6A4 80241114 00000000 */ nop .L80241118: /* A9A6A8 80241118 2404F7FF */ addiu $a0, $zero, -0x801 /* A9A6AC 8024111C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241064_A9A5F4 /* A9A774 802411E4 00220821 */ addu $at, $at, $v0 /* A9A778 802411E8 8C223268 */ lw $v0, %lo(D_80243268)($at) /* A9A77C 802411EC 00400008 */ jr $v0 -/* A9A780 802411F0 00000000 */ nop +/* A9A780 802411F0 00000000 */ nop /* A9A784 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9A788 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9A78C 802411FC 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241064_A9A5F4 /* A9A79C 8024120C 0C0125AE */ jal func_800496B8 /* A9A7A0 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9A7A4 80241214 080904D7 */ j .L8024135C -/* A9A7A8 80241218 00000000 */ nop +/* A9A7A8 80241218 00000000 */ nop /* A9A7AC 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9A7B0 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9A7B4 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A9A7B4 80241224 0C0126D1 */ jal func_80049B44 /* A9A7B8 80241228 02A0302D */ daddu $a2, $s5, $zero /* A9A7BC 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9A7C0 80241230 0200282D */ daddu $a1, $s0, $zero /* A9A7C4 80241234 0C012701 */ jal func_80049C04 /* A9A7C8 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9A7CC 8024123C 080904D7 */ j .L8024135C -/* A9A7D0 80241240 00000000 */ nop +/* A9A7D0 80241240 00000000 */ nop /* A9A7D4 80241244 0260202D */ daddu $a0, $s3, $zero /* A9A7D8 80241248 0200282D */ daddu $a1, $s0, $zero /* A9A7DC 8024124C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241064_A9A5F4 /* A9A7EC 8024125C 0C0127B3 */ jal func_80049ECC /* A9A7F0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9A7F4 80241264 080904D7 */ j .L8024135C -/* A9A7F8 80241268 00000000 */ nop +/* A9A7F8 80241268 00000000 */ nop /* A9A7FC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9A800 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9A804 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241064_A9A5F4 /* A9A81C 8024128C 10400008 */ beqz $v0, .L802412B0 /* A9A820 80241290 46000086 */ mov.s $f2, $f0 /* A9A824 80241294 44820000 */ mtc1 $v0, $f0 -/* A9A828 80241298 00000000 */ nop +/* A9A828 80241298 00000000 */ nop /* A9A82C 8024129C 46800020 */ cvt.s.w $f0, $f0 /* A9A830 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9A834 802412A4 00000000 */ nop +/* A9A834 802412A4 00000000 */ nop /* A9A838 802412A8 4500000B */ bc1f .L802412D8 /* A9A83C 802412AC 0260202D */ daddu $a0, $s3, $zero .L802412B0: @@ -164,7 +164,7 @@ glabel func_80241064_A9A5F4 /* A9A854 802412C4 8E630070 */ lw $v1, 0x70($s3) /* A9A858 802412C8 2402000C */ addiu $v0, $zero, 0xc /* A9A85C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* A9A860 802412D0 00000000 */ nop +/* A9A860 802412D0 00000000 */ nop /* A9A864 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: /* A9A868 802412D8 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241064_A9A5F4 /* A9A87C 802412EC 0C012849 */ jal func_8004A124 /* A9A880 802412F0 02A0302D */ daddu $a2, $s5, $zero /* A9A884 802412F4 080904D7 */ j .L8024135C -/* A9A888 802412F8 00000000 */ nop +/* A9A888 802412F8 00000000 */ nop /* A9A88C 802412FC 0260202D */ daddu $a0, $s3, $zero /* A9A890 80241300 0200282D */ daddu $a1, $s0, $zero /* A9A894 80241304 0C0128FA */ jal func_8004A3E8 /* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero /* A9A89C 8024130C 080904D7 */ j .L8024135C -/* A9A8A0 80241310 00000000 */ nop +/* A9A8A0 80241310 00000000 */ nop /* A9A8A4 80241314 0C090129 */ jal func_802404A4_A99A34 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C -/* A9A8B0 80241320 00000000 */ nop -/* A9A8B4 80241324 0C090169 */ jal kpa_111_UnkSetDurationFunc +/* A9A8B0 80241320 00000000 */ nop +/* A9A8B4 80241324 0C090169 */ jal func_802405A4_A99B34 /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C -/* A9A8C0 80241330 00000000 */ nop -/* A9A8C4 80241334 0C09017A */ jal kpa_111_UnkNpcAIFunc9 +/* A9A8C0 80241330 00000000 */ nop +/* A9A8C4 80241334 0C09017A */ jal func_802405E8_A99B78 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C -/* A9A8D0 80241340 00000000 */ nop -/* A9A8D4 80241344 0C0901A2 */ jal kpa_111_UnkDurationCheck +/* A9A8D0 80241340 00000000 */ nop +/* A9A8D4 80241344 0C0901A2 */ jal func_80240688_A99C18 /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero /* A9A8DC 8024134C 080904D7 */ j .L8024135C -/* A9A8E0 80241350 00000000 */ nop +/* A9A8E0 80241350 00000000 */ nop /* A9A8E4 80241354 0C0129CF */ jal func_8004A73C /* A9A8E8 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s index 97fbe2a0c9..a90856ae50 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s @@ -55,8 +55,8 @@ glabel func_8024022C_A9CE5C /* A9CF18 802402E8 8C470030 */ lw $a3, 0x30($v0) /* A9CF1C 802402EC C6020018 */ lwc1 $f2, 0x18($s0) /* A9CF20 802402F0 46020003 */ div.s $f0, $f0, $f2 -/* A9CF24 802402F4 3C018024 */ lui $at, %hi(D_80241CF0) -/* A9CF28 802402F8 D4221CF0 */ ldc1 $f2, %lo(D_80241CF0)($at) +/* A9CF24 802402F4 3C018024 */ lui $at, %hi(func_80241CF0_9113A0) +/* A9CF28 802402F8 D4221CF0 */ ldc1 $f2, %lo(func_80241CF0_9113A0)($at) /* A9CF2C 802402FC 46000021 */ cvt.d.s $f0, $f0 /* A9CF30 80240300 46220000 */ add.d $f0, $f0, $f2 /* A9CF34 80240304 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index 1a466e6492..3e27744c51 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -55,7 +55,7 @@ glabel func_80240544_A9D174 /* A9D238 80240608 8E2200B0 */ lw $v0, 0xb0($s1) /* A9D23C 8024060C 30420004 */ andi $v0, $v0, 4 /* A9D240 80240610 10400047 */ beqz $v0, .L80240730 -/* A9D244 80240614 00000000 */ nop +/* A9D244 80240614 00000000 */ nop .L80240618: /* A9D248 80240618 AE600070 */ sw $zero, 0x70($s3) /* A9D24C 8024061C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240544_A9D174 /* A9D2F0 802406C0 24020028 */ addiu $v0, $zero, 0x28 /* A9D2F4 802406C4 AFA2001C */ sw $v0, 0x1c($sp) /* A9D2F8 802406C8 44833000 */ mtc1 $v1, $f6 -/* A9D2FC 802406CC 00000000 */ nop +/* A9D2FC 802406CC 00000000 */ nop /* A9D300 802406D0 468031A0 */ cvt.s.w $f6, $f6 /* A9D304 802406D4 44073000 */ mfc1 $a3, $f6 /* A9D308 802406D8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240544_A9D174 /* A9D3C0 80240790 10600015 */ beqz $v1, .L802407E8 /* A9D3C4 80240794 0260202D */ daddu $a0, $s3, $zero /* A9D3C8 80240798 0809023C */ j .L802408F0 -/* A9D3CC 8024079C 00000000 */ nop +/* A9D3CC 8024079C 00000000 */ nop .L802407A0: /* A9D3D0 802407A0 1062001C */ beq $v1, $v0, .L80240814 /* A9D3D4 802407A4 24020003 */ addiu $v0, $zero, 3 /* A9D3D8 802407A8 10620035 */ beq $v1, $v0, .L80240880 /* A9D3DC 802407AC 0260202D */ daddu $a0, $s3, $zero /* A9D3E0 802407B0 0809023C */ j .L802408F0 -/* A9D3E4 802407B4 00000000 */ nop +/* A9D3E4 802407B4 00000000 */ nop .L802407B8: /* A9D3E8 802407B8 2402000E */ addiu $v0, $zero, 0xe /* A9D3EC 802407BC 1062003F */ beq $v1, $v0, .L802408BC @@ -177,9 +177,9 @@ glabel func_80240544_A9D174 /* A9D400 802407D0 10620040 */ beq $v1, $v0, .L802408D4 /* A9D404 802407D4 24020063 */ addiu $v0, $zero, 0x63 /* A9D408 802407D8 10620043 */ beq $v1, $v0, .L802408E8 -/* A9D40C 802407DC 00000000 */ nop +/* A9D40C 802407DC 00000000 */ nop /* A9D410 802407E0 0809023C */ j .L802408F0 -/* A9D414 802407E4 00000000 */ nop +/* A9D414 802407E4 00000000 */ nop .L802407E8: /* A9D418 802407E8 0280282D */ daddu $a1, $s4, $zero /* A9D41C 802407EC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240544_A9D174 /* A9D434 80240804 0C0125AE */ jal func_800496B8 /* A9D438 80240808 02A0302D */ daddu $a2, $s5, $zero /* A9D43C 8024080C 0809023C */ j .L802408F0 -/* A9D440 80240810 00000000 */ nop +/* A9D440 80240810 00000000 */ nop .L80240814: /* A9D444 80240814 0260202D */ daddu $a0, $s3, $zero /* A9D448 80240818 0280282D */ daddu $a1, $s4, $zero -/* A9D44C 8024081C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A9D44C 8024081C 0C0126D1 */ jal func_80049B44 /* A9D450 80240820 02A0302D */ daddu $a2, $s5, $zero /* A9D454 80240824 8E230088 */ lw $v1, 0x88($s1) /* A9D458 80240828 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240544_A9D174 /* A9D4B4 80240884 0C012701 */ jal func_80049C04 /* A9D4B8 80240888 02A0302D */ daddu $a2, $s5, $zero /* A9D4BC 8024088C 0809023C */ j .L802408F0 -/* A9D4C0 80240890 00000000 */ nop +/* A9D4C0 80240890 00000000 */ nop .L80240894: /* A9D4C4 80240894 0260202D */ daddu $a0, $s3, $zero /* A9D4C8 80240898 0280282D */ daddu $a1, $s4, $zero -/* A9D4CC 8024089C 0C09006C */ jal kpa_113_set_script_owner_npc_anim +/* A9D4CC 8024089C 0C09006C */ jal func_802401B0_A9CDE0 /* A9D4D0 802408A0 02A0302D */ daddu $a2, $s5, $zero /* A9D4D4 802408A4 0260202D */ daddu $a0, $s3, $zero .L802408A8: @@ -240,20 +240,20 @@ glabel func_80240544_A9D174 /* A9D4DC 802408AC 0C09008B */ jal func_8024022C_A9CE5C /* A9D4E0 802408B0 02A0302D */ daddu $a2, $s5, $zero /* A9D4E4 802408B4 0809023C */ j .L802408F0 -/* A9D4E8 802408B8 00000000 */ nop +/* A9D4E8 802408B8 00000000 */ nop .L802408BC: /* A9D4EC 802408BC 0260202D */ daddu $a0, $s3, $zero /* A9D4F0 802408C0 0280282D */ daddu $a1, $s4, $zero -/* A9D4F4 802408C4 0C0900D8 */ jal kpa_113_UnkNpcAIFunc12 +/* A9D4F4 802408C4 0C0900D8 */ jal func_80240360_A9CF90 /* A9D4F8 802408C8 02A0302D */ daddu $a2, $s5, $zero /* A9D4FC 802408CC 0809023C */ j .L802408F0 -/* A9D500 802408D0 00000000 */ nop +/* A9D500 802408D0 00000000 */ nop .L802408D4: /* A9D504 802408D4 0280282D */ daddu $a1, $s4, $zero -/* A9D508 802408D8 0C090131 */ jal kpa_113_set_script_owner_npc_col_height +/* A9D508 802408D8 0C090131 */ jal func_802404C4_A9D0F4 /* A9D50C 802408DC 02A0302D */ daddu $a2, $s5, $zero /* A9D510 802408E0 0809023C */ j .L802408F0 -/* A9D514 802408E4 00000000 */ nop +/* A9D514 802408E4 00000000 */ nop .L802408E8: /* A9D518 802408E8 0C0129CF */ jal func_8004A73C /* A9D51C 802408EC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240544_A9D174 /* A9D570 80240940 00220821 */ addu $at, $at, $v0 /* A9D574 80240944 8C221CF8 */ lw $v0, %lo(D_80241CF8)($at) /* A9D578 80240948 00400008 */ jr $v0 -/* A9D57C 8024094C 00000000 */ nop +/* A9D57C 8024094C 00000000 */ nop /* A9D580 80240950 8E420028 */ lw $v0, 0x28($s2) /* A9D584 80240954 24420001 */ addiu $v0, $v0, 1 /* A9D588 80240958 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s b/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s index 5865f06925..584247e48b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s +++ b/asm/nonmatchings/world/area_kpa/kpa_114/A9E980/func_80240000_A9E980.s @@ -5,16 +5,16 @@ glabel func_80240000_A9E980 /* A9E980 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A9E984 80240004 3C04800E */ lui $a0, %hi(D_800D9230) /* A9E988 80240008 24849230 */ addiu $a0, $a0, %lo(D_800D9230) -/* A9E98C 8024000C 3C058024 */ lui $a1, %hi(D_80240390) -/* A9E990 80240010 24A50390 */ addiu $a1, $a1, %lo(D_80240390) +/* A9E98C 8024000C 3C058024 */ lui $a1, %hi(func_80240390_8B0400) +/* A9E990 80240010 24A50390 */ addiu $a1, $a1, %lo(func_80240390_8B0400) /* A9E994 80240014 AFBF0010 */ sw $ra, 0x10($sp) /* A9E998 80240018 0C01953C */ jal sprintf /* A9E99C 8024001C 00000000 */ nop /* A9E9A0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A9E9A4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* A9E9A8 80240028 3C058024 */ lui $a1, %hi(D_802403A0) +/* A9E9A8 80240028 3C058024 */ lui $a1, %hi(func_802403A0_9FAB90) /* A9E9AC 8024002C 0C01953C */ jal sprintf -/* A9E9B0 80240030 24A503A0 */ addiu $a1, $a1, %lo(D_802403A0) +/* A9E9B0 80240030 24A503A0 */ addiu $a1, $a1, %lo(func_802403A0_9FAB90) /* A9E9B4 80240034 8FBF0010 */ lw $ra, 0x10($sp) /* A9E9B8 80240038 0000102D */ daddu $v0, $zero, $zero /* A9E9BC 8024003C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s index 66c747f413..81083cd0f1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240170_A9EEB0.s @@ -45,8 +45,8 @@ glabel func_80240170_A9EEB0 /* A9EF50 80240210 00000000 */ nop /* A9EF54 80240214 0C00A6C9 */ jal clamp_angle /* A9EF58 80240218 46000306 */ mov.s $f12, $f0 -/* A9EF5C 8024021C 3C018024 */ lui $at, %hi(D_80242FE0) -/* A9EF60 80240220 D4222FE0 */ ldc1 $f2, %lo(D_80242FE0)($at) +/* A9EF5C 8024021C 3C018024 */ lui $at, %hi(func_80242FE0_A1E0E0) +/* A9EF60 80240220 D4222FE0 */ ldc1 $f2, %lo(func_80242FE0_A1E0E0)($at) /* A9EF64 80240224 46000021 */ cvt.d.s $f0, $f0 /* A9EF68 80240228 4622003C */ c.lt.d $f0, $f2 /* A9EF6C 8024022C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s index 24147f3026..30a2b8ff1e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240C08_A9F948.s @@ -113,8 +113,8 @@ glabel func_80240C08_A9F948 /* A9FAE4 80240DA4 E616000C */ swc1 $f22, 0xc($s0) .L80240DA8: /* A9FAE8 80240DA8 C6000018 */ lwc1 $f0, 0x18($s0) -/* A9FAEC 80240DAC 3C018024 */ lui $at, %hi(D_80243000) -/* A9FAF0 80240DB0 D4223000 */ ldc1 $f2, %lo(D_80243000)($at) +/* A9FAEC 80240DAC 3C018024 */ lui $at, %hi(func_80243000_9AB3F0) +/* A9FAF0 80240DB0 D4223000 */ ldc1 $f2, %lo(func_80243000_9AB3F0)($at) /* A9FAF4 80240DB4 46000021 */ cvt.d.s $f0, $f0 /* A9FAF8 80240DB8 46220002 */ mul.d $f0, $f0, $f2 /* A9FAFC 80240DBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index 7863bc3697..2c2656a0e2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -46,7 +46,7 @@ glabel func_80241064_A9FDA4 /* A9FE48 80241108 8E4200B0 */ lw $v0, 0xb0($s2) /* A9FE4C 8024110C 30420004 */ andi $v0, $v0, 4 /* A9FE50 80241110 1040002F */ beqz $v0, .L802411D0 -/* A9FE54 80241114 00000000 */ nop +/* A9FE54 80241114 00000000 */ nop .L80241118: /* A9FE58 80241118 2404F7FF */ addiu $a0, $zero, -0x801 /* A9FE5C 8024111C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80241064_A9FDA4 /* A9FF24 802411E4 00220821 */ addu $at, $at, $v0 /* A9FF28 802411E8 8C223008 */ lw $v0, %lo(D_80243008)($at) /* A9FF2C 802411EC 00400008 */ jr $v0 -/* A9FF30 802411F0 00000000 */ nop +/* A9FF30 802411F0 00000000 */ nop /* A9FF34 802411F4 0260202D */ daddu $a0, $s3, $zero /* A9FF38 802411F8 0200282D */ daddu $a1, $s0, $zero /* A9FF3C 802411FC 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80241064_A9FDA4 /* A9FF4C 8024120C 0C0125AE */ jal func_800496B8 /* A9FF50 80241210 02A0302D */ daddu $a2, $s5, $zero /* A9FF54 80241214 080904D7 */ j .L8024135C -/* A9FF58 80241218 00000000 */ nop +/* A9FF58 80241218 00000000 */ nop /* A9FF5C 8024121C 0260202D */ daddu $a0, $s3, $zero /* A9FF60 80241220 0200282D */ daddu $a1, $s0, $zero -/* A9FF64 80241224 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A9FF64 80241224 0C0126D1 */ jal func_80049B44 /* A9FF68 80241228 02A0302D */ daddu $a2, $s5, $zero /* A9FF6C 8024122C 0260202D */ daddu $a0, $s3, $zero /* A9FF70 80241230 0200282D */ daddu $a1, $s0, $zero /* A9FF74 80241234 0C012701 */ jal func_80049C04 /* A9FF78 80241238 02A0302D */ daddu $a2, $s5, $zero /* A9FF7C 8024123C 080904D7 */ j .L8024135C -/* A9FF80 80241240 00000000 */ nop +/* A9FF80 80241240 00000000 */ nop /* A9FF84 80241244 0260202D */ daddu $a0, $s3, $zero /* A9FF88 80241248 0200282D */ daddu $a1, $s0, $zero /* A9FF8C 8024124C 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80241064_A9FDA4 /* A9FF9C 8024125C 0C0127B3 */ jal func_80049ECC /* A9FFA0 80241260 02A0302D */ daddu $a2, $s5, $zero /* A9FFA4 80241264 080904D7 */ j .L8024135C -/* A9FFA8 80241268 00000000 */ nop +/* A9FFA8 80241268 00000000 */ nop /* A9FFAC 8024126C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A9FFB0 80241270 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A9FFB4 80241274 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80241064_A9FDA4 /* A9FFCC 8024128C 10400008 */ beqz $v0, .L802412B0 /* A9FFD0 80241290 46000086 */ mov.s $f2, $f0 /* A9FFD4 80241294 44820000 */ mtc1 $v0, $f0 -/* A9FFD8 80241298 00000000 */ nop +/* A9FFD8 80241298 00000000 */ nop /* A9FFDC 8024129C 46800020 */ cvt.s.w $f0, $f0 /* A9FFE0 802412A0 4602003C */ c.lt.s $f0, $f2 -/* A9FFE4 802412A4 00000000 */ nop +/* A9FFE4 802412A4 00000000 */ nop /* A9FFE8 802412A8 4500000B */ bc1f .L802412D8 /* A9FFEC 802412AC 0260202D */ daddu $a0, $s3, $zero .L802412B0: @@ -164,7 +164,7 @@ glabel func_80241064_A9FDA4 /* AA0004 802412C4 8E630070 */ lw $v1, 0x70($s3) /* AA0008 802412C8 2402000C */ addiu $v0, $zero, 0xc /* AA000C 802412CC 14620023 */ bne $v1, $v0, .L8024135C -/* AA0010 802412D0 00000000 */ nop +/* AA0010 802412D0 00000000 */ nop /* AA0014 802412D4 0260202D */ daddu $a0, $s3, $zero .L802412D8: /* AA0018 802412D8 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80241064_A9FDA4 /* AA002C 802412EC 0C012849 */ jal func_8004A124 /* AA0030 802412F0 02A0302D */ daddu $a2, $s5, $zero /* AA0034 802412F4 080904D7 */ j .L8024135C -/* AA0038 802412F8 00000000 */ nop +/* AA0038 802412F8 00000000 */ nop /* AA003C 802412FC 0260202D */ daddu $a0, $s3, $zero /* AA0040 80241300 0200282D */ daddu $a1, $s0, $zero /* AA0044 80241304 0C0128FA */ jal func_8004A3E8 /* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero /* AA004C 8024130C 080904D7 */ j .L8024135C -/* AA0050 80241310 00000000 */ nop +/* AA0050 80241310 00000000 */ nop /* AA0054 80241314 0C090129 */ jal func_802404A4_A9F1E4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C -/* AA0060 80241320 00000000 */ nop -/* AA0064 80241324 0C090169 */ jal kpa_115_UnkSetDurationFunc +/* AA0060 80241320 00000000 */ nop +/* AA0064 80241324 0C090169 */ jal func_802405A4_A9F2E4 /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C -/* AA0070 80241330 00000000 */ nop -/* AA0074 80241334 0C09017A */ jal kpa_115_UnkNpcAIFunc9 +/* AA0070 80241330 00000000 */ nop +/* AA0074 80241334 0C09017A */ jal func_802405E8_A9F328 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C -/* AA0080 80241340 00000000 */ nop -/* AA0084 80241344 0C0901A2 */ jal kpa_115_UnkDurationCheck +/* AA0080 80241340 00000000 */ nop +/* AA0084 80241344 0C0901A2 */ jal func_80240688_A9F3C8 /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero /* AA008C 8024134C 080904D7 */ j .L8024135C -/* AA0090 80241350 00000000 */ nop +/* AA0090 80241350 00000000 */ nop /* AA0094 80241354 0C0129CF */ jal func_8004A73C /* AA0098 80241358 0260202D */ daddu $a0, $s3, $zero .L8024135C: diff --git a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s index 3a51f34bd7..702fc27b7d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_15/A596A0/func_80240310_A596A0.s @@ -4,8 +4,8 @@ glabel func_80240310_A596A0 /* A596A0 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 /* A596A4 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* A596A8 80240318 3C108024 */ lui $s0, %hi(D_80240AA0) -/* A596AC 8024031C 26100AA0 */ addiu $s0, $s0, %lo(D_80240AA0) +/* A596A8 80240318 3C108024 */ lui $s0, %hi(func_80240AA0_95BCA0) +/* A596AC 8024031C 26100AA0 */ addiu $s0, $s0, %lo(func_80240AA0_95BCA0) /* A596B0 80240320 AFBF0018 */ sw $ra, 0x18($sp) /* A596B4 80240324 AFB10014 */ sw $s1, 0x14($sp) /* A596B8 80240328 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240310_A596A0 /* A5971C 8024038C 28620010 */ slti $v0, $v1, 0x10 /* A59720 80240390 1440FFFA */ bnez $v0, .L8024037C /* A59724 80240394 24840004 */ addiu $a0, $a0, 4 -/* A59728 80240398 3C108024 */ lui $s0, %hi(D_80240AA0) -/* A5972C 8024039C 26100AA0 */ addiu $s0, $s0, %lo(D_80240AA0) +/* A59728 80240398 3C108024 */ lui $s0, %hi(func_80240AA0_95BCA0) +/* A5972C 8024039C 26100AA0 */ addiu $s0, $s0, %lo(func_80240AA0_95BCA0) /* A59730 802403A0 0C00AB4B */ jal heap_free /* A59734 802403A4 8E040000 */ lw $a0, ($s0) /* A59738 802403A8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index 1fdb6c0389..17018a79a6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -46,7 +46,7 @@ glabel func_80240EF4_A618C4 /* A61968 80240F98 8E4200B0 */ lw $v0, 0xb0($s2) /* A6196C 80240F9C 30420004 */ andi $v0, $v0, 4 /* A61970 80240FA0 1040002F */ beqz $v0, .L80241060 -/* A61974 80240FA4 00000000 */ nop +/* A61974 80240FA4 00000000 */ nop .L80240FA8: /* A61978 80240FA8 2404F7FF */ addiu $a0, $zero, -0x801 /* A6197C 80240FAC AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240EF4_A618C4 /* A61A44 80241074 00220821 */ addu $at, $at, $v0 /* A61A48 80241078 8C2234C8 */ lw $v0, %lo(D_802434C8)($at) /* A61A4C 8024107C 00400008 */ jr $v0 -/* A61A50 80241080 00000000 */ nop +/* A61A50 80241080 00000000 */ nop /* A61A54 80241084 0260202D */ daddu $a0, $s3, $zero /* A61A58 80241088 0200282D */ daddu $a1, $s0, $zero /* A61A5C 8024108C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240EF4_A618C4 /* A61A6C 8024109C 0C0125AE */ jal func_800496B8 /* A61A70 802410A0 02A0302D */ daddu $a2, $s5, $zero /* A61A74 802410A4 0809047B */ j .L802411EC -/* A61A78 802410A8 00000000 */ nop +/* A61A78 802410A8 00000000 */ nop /* A61A7C 802410AC 0260202D */ daddu $a0, $s3, $zero /* A61A80 802410B0 0200282D */ daddu $a1, $s0, $zero -/* A61A84 802410B4 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A61A84 802410B4 0C0126D1 */ jal func_80049B44 /* A61A88 802410B8 02A0302D */ daddu $a2, $s5, $zero /* A61A8C 802410BC 0260202D */ daddu $a0, $s3, $zero /* A61A90 802410C0 0200282D */ daddu $a1, $s0, $zero /* A61A94 802410C4 0C012701 */ jal func_80049C04 /* A61A98 802410C8 02A0302D */ daddu $a2, $s5, $zero /* A61A9C 802410CC 0809047B */ j .L802411EC -/* A61AA0 802410D0 00000000 */ nop +/* A61AA0 802410D0 00000000 */ nop /* A61AA4 802410D4 0260202D */ daddu $a0, $s3, $zero /* A61AA8 802410D8 0200282D */ daddu $a1, $s0, $zero /* A61AAC 802410DC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240EF4_A618C4 /* A61ABC 802410EC 0C0127B3 */ jal func_80049ECC /* A61AC0 802410F0 02A0302D */ daddu $a2, $s5, $zero /* A61AC4 802410F4 0809047B */ j .L802411EC -/* A61AC8 802410F8 00000000 */ nop +/* A61AC8 802410F8 00000000 */ nop /* A61ACC 802410FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A61AD0 80241100 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A61AD4 80241104 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240EF4_A618C4 /* A61AEC 8024111C 10400008 */ beqz $v0, .L80241140 /* A61AF0 80241120 46000086 */ mov.s $f2, $f0 /* A61AF4 80241124 44820000 */ mtc1 $v0, $f0 -/* A61AF8 80241128 00000000 */ nop +/* A61AF8 80241128 00000000 */ nop /* A61AFC 8024112C 46800020 */ cvt.s.w $f0, $f0 /* A61B00 80241130 4602003C */ c.lt.s $f0, $f2 -/* A61B04 80241134 00000000 */ nop +/* A61B04 80241134 00000000 */ nop /* A61B08 80241138 4500000B */ bc1f .L80241168 /* A61B0C 8024113C 0260202D */ daddu $a0, $s3, $zero .L80241140: @@ -164,7 +164,7 @@ glabel func_80240EF4_A618C4 /* A61B24 80241154 8E630070 */ lw $v1, 0x70($s3) /* A61B28 80241158 2402000C */ addiu $v0, $zero, 0xc /* A61B2C 8024115C 14620023 */ bne $v1, $v0, .L802411EC -/* A61B30 80241160 00000000 */ nop +/* A61B30 80241160 00000000 */ nop /* A61B34 80241164 0260202D */ daddu $a0, $s3, $zero .L80241168: /* A61B38 80241168 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240EF4_A618C4 /* A61B4C 8024117C 0C012849 */ jal func_8004A124 /* A61B50 80241180 02A0302D */ daddu $a2, $s5, $zero /* A61B54 80241184 0809047B */ j .L802411EC -/* A61B58 80241188 00000000 */ nop +/* A61B58 80241188 00000000 */ nop /* A61B5C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A61B60 80241190 0200282D */ daddu $a1, $s0, $zero /* A61B64 80241194 0C0128FA */ jal func_8004A3E8 /* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero /* A61B6C 8024119C 0809047B */ j .L802411EC -/* A61B70 802411A0 00000000 */ nop +/* A61B70 802411A0 00000000 */ nop /* A61B74 802411A4 0C0900CD */ jal func_80240334_A60D04 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC -/* A61B80 802411B0 00000000 */ nop -/* A61B84 802411B4 0C09010D */ jal kpa_50_UnkSetDurationFunc +/* A61B80 802411B0 00000000 */ nop +/* A61B84 802411B4 0C09010D */ jal func_80240434_A60E04 /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC -/* A61B90 802411C0 00000000 */ nop -/* A61B94 802411C4 0C09011E */ jal kpa_50_UnkNpcAIFunc9 +/* A61B90 802411C0 00000000 */ nop +/* A61B94 802411C4 0C09011E */ jal func_80240478_A60E48 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC -/* A61BA0 802411D0 00000000 */ nop -/* A61BA4 802411D4 0C090146 */ jal kpa_50_UnkDurationCheck +/* A61BA0 802411D0 00000000 */ nop +/* A61BA4 802411D4 0C090146 */ jal func_80240518_A60EE8 /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero /* A61BAC 802411DC 0809047B */ j .L802411EC -/* A61BB0 802411E0 00000000 */ nop +/* A61BB0 802411E0 00000000 */ nop /* A61BB4 802411E4 0C0129CF */ jal func_8004A73C /* A61BB8 802411E8 0260202D */ daddu $a0, $s3, $zero .L802411EC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index 3c6688e6cf..5d51c1003d 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -55,7 +55,7 @@ glabel func_802415E0_A61FB0 /* A62074 802416A4 8E2200B0 */ lw $v0, 0xb0($s1) /* A62078 802416A8 30420004 */ andi $v0, $v0, 4 /* A6207C 802416AC 10400047 */ beqz $v0, .L802417CC -/* A62080 802416B0 00000000 */ nop +/* A62080 802416B0 00000000 */ nop .L802416B4: /* A62084 802416B4 AE600070 */ sw $zero, 0x70($s3) /* A62088 802416B8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802415E0_A61FB0 /* A6212C 8024175C 24020028 */ addiu $v0, $zero, 0x28 /* A62130 80241760 AFA2001C */ sw $v0, 0x1c($sp) /* A62134 80241764 44833000 */ mtc1 $v1, $f6 -/* A62138 80241768 00000000 */ nop +/* A62138 80241768 00000000 */ nop /* A6213C 8024176C 468031A0 */ cvt.s.w $f6, $f6 /* A62140 80241770 44073000 */ mfc1 $a3, $f6 /* A62144 80241774 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802415E0_A61FB0 /* A621FC 8024182C 10600015 */ beqz $v1, .L80241884 /* A62200 80241830 0260202D */ daddu $a0, $s3, $zero /* A62204 80241834 08090663 */ j .L8024198C -/* A62208 80241838 00000000 */ nop +/* A62208 80241838 00000000 */ nop .L8024183C: /* A6220C 8024183C 1062001C */ beq $v1, $v0, .L802418B0 /* A62210 80241840 24020003 */ addiu $v0, $zero, 3 /* A62214 80241844 10620035 */ beq $v1, $v0, .L8024191C /* A62218 80241848 0260202D */ daddu $a0, $s3, $zero /* A6221C 8024184C 08090663 */ j .L8024198C -/* A62220 80241850 00000000 */ nop +/* A62220 80241850 00000000 */ nop .L80241854: /* A62224 80241854 2402000E */ addiu $v0, $zero, 0xe /* A62228 80241858 1062003F */ beq $v1, $v0, .L80241958 @@ -177,9 +177,9 @@ glabel func_802415E0_A61FB0 /* A6223C 8024186C 10620040 */ beq $v1, $v0, .L80241970 /* A62240 80241870 24020063 */ addiu $v0, $zero, 0x63 /* A62244 80241874 10620043 */ beq $v1, $v0, .L80241984 -/* A62248 80241878 00000000 */ nop +/* A62248 80241878 00000000 */ nop /* A6224C 8024187C 08090663 */ j .L8024198C -/* A62250 80241880 00000000 */ nop +/* A62250 80241880 00000000 */ nop .L80241884: /* A62254 80241884 0280282D */ daddu $a1, $s4, $zero /* A62258 80241888 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802415E0_A61FB0 /* A62270 802418A0 0C0125AE */ jal func_800496B8 /* A62274 802418A4 02A0302D */ daddu $a2, $s5, $zero /* A62278 802418A8 08090663 */ j .L8024198C -/* A6227C 802418AC 00000000 */ nop +/* A6227C 802418AC 00000000 */ nop .L802418B0: /* A62280 802418B0 0260202D */ daddu $a0, $s3, $zero /* A62284 802418B4 0280282D */ daddu $a1, $s4, $zero -/* A62288 802418B8 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A62288 802418B8 0C0126D1 */ jal func_80049B44 /* A6228C 802418BC 02A0302D */ daddu $a2, $s5, $zero /* A62290 802418C0 8E230088 */ lw $v1, 0x88($s1) /* A62294 802418C4 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802415E0_A61FB0 /* A622F0 80241920 0C012701 */ jal func_80049C04 /* A622F4 80241924 02A0302D */ daddu $a2, $s5, $zero /* A622F8 80241928 08090663 */ j .L8024198C -/* A622FC 8024192C 00000000 */ nop +/* A622FC 8024192C 00000000 */ nop .L80241930: /* A62300 80241930 0260202D */ daddu $a0, $s3, $zero /* A62304 80241934 0280282D */ daddu $a1, $s4, $zero -/* A62308 80241938 0C090493 */ jal kpa_50_set_script_owner_npc_anim +/* A62308 80241938 0C090493 */ jal func_8024124C_A61C1C /* A6230C 8024193C 02A0302D */ daddu $a2, $s5, $zero /* A62310 80241940 0260202D */ daddu $a0, $s3, $zero .L80241944: @@ -240,20 +240,20 @@ glabel func_802415E0_A61FB0 /* A62318 80241948 0C0904B2 */ jal func_802412C8_A61C98 /* A6231C 8024194C 02A0302D */ daddu $a2, $s5, $zero /* A62320 80241950 08090663 */ j .L8024198C -/* A62324 80241954 00000000 */ nop +/* A62324 80241954 00000000 */ nop .L80241958: /* A62328 80241958 0260202D */ daddu $a0, $s3, $zero /* A6232C 8024195C 0280282D */ daddu $a1, $s4, $zero -/* A62330 80241960 0C0904FF */ jal kpa_50_UnkNpcAIFunc12 +/* A62330 80241960 0C0904FF */ jal func_802413FC_A61DCC /* A62334 80241964 02A0302D */ daddu $a2, $s5, $zero /* A62338 80241968 08090663 */ j .L8024198C -/* A6233C 8024196C 00000000 */ nop +/* A6233C 8024196C 00000000 */ nop .L80241970: /* A62340 80241970 0280282D */ daddu $a1, $s4, $zero -/* A62344 80241974 0C090558 */ jal kpa_50_set_script_owner_npc_col_height +/* A62344 80241974 0C090558 */ jal func_80241560_A61F30 /* A62348 80241978 02A0302D */ daddu $a2, $s5, $zero /* A6234C 8024197C 08090663 */ j .L8024198C -/* A62350 80241980 00000000 */ nop +/* A62350 80241980 00000000 */ nop .L80241984: /* A62354 80241984 0C0129CF */ jal func_8004A73C /* A62358 80241988 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802415E0_A61FB0 /* A623AC 802419DC 00220821 */ addu $at, $at, $v0 /* A623B0 802419E0 8C223660 */ lw $v0, %lo(D_80243660)($at) /* A623B4 802419E4 00400008 */ jr $v0 -/* A623B8 802419E8 00000000 */ nop +/* A623B8 802419E8 00000000 */ nop /* A623BC 802419EC 8E420028 */ lw $v0, 0x28($s2) /* A623C0 802419F0 24420001 */ addiu $v0, $v0, 1 /* A623C4 802419F4 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s index 65c783bdd5..52557f896e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240050_A640E0.s @@ -84,12 +84,12 @@ glabel func_80240050_A640E0 /* A64218 80240188 44060000 */ mfc1 $a2, $f0 /* A6421C 8024018C 0C00A720 */ jal atan2 /* A64220 80240190 00000000 */ nop -/* A64224 80240194 3C018024 */ lui $at, %hi(D_80242F60) -/* A64228 80240198 D4222F60 */ ldc1 $f2, %lo(D_80242F60)($at) +/* A64224 80240194 3C018024 */ lui $at, %hi(func_80242F60_826220) +/* A64228 80240198 D4222F60 */ ldc1 $f2, %lo(func_80242F60_826220)($at) /* A6422C 8024019C 46000021 */ cvt.d.s $f0, $f0 /* A64230 802401A0 46220001 */ sub.d $f0, $f0, $f2 -/* A64234 802401A4 3C018024 */ lui $at, %hi(D_80242F68) -/* A64238 802401A8 D4222F68 */ ldc1 $f2, %lo(D_80242F68)($at) +/* A64234 802401A4 3C018024 */ lui $at, %hi(func_80242F68) +/* A64238 802401A8 D4222F68 */ ldc1 $f2, %lo(func_80242F68)($at) /* A6423C 802401AC 46200020 */ cvt.s.d $f0, $f0 /* A64240 802401B0 46000005 */ abs.s $f0, $f0 /* A64244 802401B4 46000021 */ cvt.d.s $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s index 70e3583488..76fab76fce 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s @@ -14,14 +14,14 @@ glabel func_802407A4_A64834 /* A64858 802407C8 86440008 */ lh $a0, 8($s2) /* A6485C 802407CC 0040802D */ daddu $s0, $v0, $zero /* A64860 802407D0 8603008E */ lh $v1, 0x8e($s0) -/* A64864 802407D4 3C118024 */ lui $s1, %hi(D_80242050) -/* A64868 802407D8 26312050 */ addiu $s1, $s1, %lo(D_80242050) +/* A64864 802407D4 3C118024 */ lui $s1, %hi(func_80242050_95D250) +/* A64868 802407D8 26312050 */ addiu $s1, $s1, %lo(func_80242050_95D250) /* A6486C 802407DC 00031040 */ sll $v0, $v1, 1 /* A64870 802407E0 00431021 */ addu $v0, $v0, $v1 /* A64874 802407E4 00021080 */ sll $v0, $v0, 2 -/* A64878 802407E8 3C018024 */ lui $at, %hi(D_80242050) +/* A64878 802407E8 3C018024 */ lui $at, %hi(func_80242050_95D250) /* A6487C 802407EC 00220821 */ addu $at, $at, $v0 -/* A64880 802407F0 C4202050 */ lwc1 $f0, %lo(D_80242050)($at) +/* A64880 802407F0 C4202050 */ lwc1 $f0, %lo(func_80242050_95D250)($at) /* A64884 802407F4 00031040 */ sll $v0, $v1, 1 /* A64888 802407F8 00431021 */ addu $v0, $v0, $v1 /* A6488C 802407FC 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s index cfdceac11a..140b0d1879 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s @@ -32,8 +32,8 @@ glabel func_80240B14_A64BA4 /* A64C08 80240B78 240300FF */ addiu $v1, $zero, 0xff .L80240B7C: /* A64C0C 80240B7C 8602008E */ lh $v0, 0x8e($s0) -/* A64C10 80240B80 3C018024 */ lui $at, %hi(D_80242F90) -/* A64C14 80240B84 D4222F90 */ ldc1 $f2, %lo(D_80242F90)($at) +/* A64C10 80240B80 3C018024 */ lui $at, %hi(func_80242F90) +/* A64C14 80240B84 D4222F90 */ ldc1 $f2, %lo(func_80242F90)($at) /* A64C18 80240B88 44820000 */ mtc1 $v0, $f0 /* A64C1C 80240B8C 00000000 */ nop /* A64C20 80240B90 46800020 */ cvt.s.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index 726ea1285d..1b861345bc 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -55,7 +55,7 @@ glabel func_802417E0_A65870 /* A65934 802418A4 8E2200B0 */ lw $v0, 0xb0($s1) /* A65938 802418A8 30420004 */ andi $v0, $v0, 4 /* A6593C 802418AC 10400047 */ beqz $v0, .L802419CC -/* A65940 802418B0 00000000 */ nop +/* A65940 802418B0 00000000 */ nop .L802418B4: /* A65944 802418B4 AE600070 */ sw $zero, 0x70($s3) /* A65948 802418B8 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802417E0_A65870 /* A659EC 8024195C 24020028 */ addiu $v0, $zero, 0x28 /* A659F0 80241960 AFA2001C */ sw $v0, 0x1c($sp) /* A659F4 80241964 44833000 */ mtc1 $v1, $f6 -/* A659F8 80241968 00000000 */ nop +/* A659F8 80241968 00000000 */ nop /* A659FC 8024196C 468031A0 */ cvt.s.w $f6, $f6 /* A65A00 80241970 44073000 */ mfc1 $a3, $f6 /* A65A04 80241974 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802417E0_A65870 /* A65ABC 80241A2C 10600015 */ beqz $v1, .L80241A84 /* A65AC0 80241A30 0260202D */ daddu $a0, $s3, $zero /* A65AC4 80241A34 080906E3 */ j .L80241B8C -/* A65AC8 80241A38 00000000 */ nop +/* A65AC8 80241A38 00000000 */ nop .L80241A3C: /* A65ACC 80241A3C 1062001C */ beq $v1, $v0, .L80241AB0 /* A65AD0 80241A40 24020003 */ addiu $v0, $zero, 3 /* A65AD4 80241A44 10620035 */ beq $v1, $v0, .L80241B1C /* A65AD8 80241A48 0260202D */ daddu $a0, $s3, $zero /* A65ADC 80241A4C 080906E3 */ j .L80241B8C -/* A65AE0 80241A50 00000000 */ nop +/* A65AE0 80241A50 00000000 */ nop .L80241A54: /* A65AE4 80241A54 2402000E */ addiu $v0, $zero, 0xe /* A65AE8 80241A58 1062003F */ beq $v1, $v0, .L80241B58 @@ -177,9 +177,9 @@ glabel func_802417E0_A65870 /* A65AFC 80241A6C 10620040 */ beq $v1, $v0, .L80241B70 /* A65B00 80241A70 24020063 */ addiu $v0, $zero, 0x63 /* A65B04 80241A74 10620043 */ beq $v1, $v0, .L80241B84 -/* A65B08 80241A78 00000000 */ nop +/* A65B08 80241A78 00000000 */ nop /* A65B0C 80241A7C 080906E3 */ j .L80241B8C -/* A65B10 80241A80 00000000 */ nop +/* A65B10 80241A80 00000000 */ nop .L80241A84: /* A65B14 80241A84 0280282D */ daddu $a1, $s4, $zero /* A65B18 80241A88 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802417E0_A65870 /* A65B30 80241AA0 0C0125AE */ jal func_800496B8 /* A65B34 80241AA4 02A0302D */ daddu $a2, $s5, $zero /* A65B38 80241AA8 080906E3 */ j .L80241B8C -/* A65B3C 80241AAC 00000000 */ nop +/* A65B3C 80241AAC 00000000 */ nop .L80241AB0: /* A65B40 80241AB0 0260202D */ daddu $a0, $s3, $zero /* A65B44 80241AB4 0280282D */ daddu $a1, $s4, $zero -/* A65B48 80241AB8 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A65B48 80241AB8 0C0126D1 */ jal func_80049B44 /* A65B4C 80241ABC 02A0302D */ daddu $a2, $s5, $zero /* A65B50 80241AC0 8E230088 */ lw $v1, 0x88($s1) /* A65B54 80241AC4 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802417E0_A65870 /* A65BB0 80241B20 0C012701 */ jal func_80049C04 /* A65BB4 80241B24 02A0302D */ daddu $a2, $s5, $zero /* A65BB8 80241B28 080906E3 */ j .L80241B8C -/* A65BBC 80241B2C 00000000 */ nop +/* A65BBC 80241B2C 00000000 */ nop .L80241B30: /* A65BC0 80241B30 0260202D */ daddu $a0, $s3, $zero /* A65BC4 80241B34 0280282D */ daddu $a1, $s4, $zero -/* A65BC8 80241B38 0C090513 */ jal kpa_51_set_script_owner_npc_anim +/* A65BC8 80241B38 0C090513 */ jal func_8024144C_A654DC /* A65BCC 80241B3C 02A0302D */ daddu $a2, $s5, $zero /* A65BD0 80241B40 0260202D */ daddu $a0, $s3, $zero .L80241B44: @@ -240,20 +240,20 @@ glabel func_802417E0_A65870 /* A65BD8 80241B48 0C090532 */ jal func_802414C8_A65558 /* A65BDC 80241B4C 02A0302D */ daddu $a2, $s5, $zero /* A65BE0 80241B50 080906E3 */ j .L80241B8C -/* A65BE4 80241B54 00000000 */ nop +/* A65BE4 80241B54 00000000 */ nop .L80241B58: /* A65BE8 80241B58 0260202D */ daddu $a0, $s3, $zero /* A65BEC 80241B5C 0280282D */ daddu $a1, $s4, $zero -/* A65BF0 80241B60 0C09057F */ jal kpa_51_UnkNpcAIFunc12 +/* A65BF0 80241B60 0C09057F */ jal func_802415FC_A6568C /* A65BF4 80241B64 02A0302D */ daddu $a2, $s5, $zero /* A65BF8 80241B68 080906E3 */ j .L80241B8C -/* A65BFC 80241B6C 00000000 */ nop +/* A65BFC 80241B6C 00000000 */ nop .L80241B70: /* A65C00 80241B70 0280282D */ daddu $a1, $s4, $zero -/* A65C04 80241B74 0C0905D8 */ jal kpa_51_set_script_owner_npc_col_height +/* A65C04 80241B74 0C0905D8 */ jal func_80241760_A657F0 /* A65C08 80241B78 02A0302D */ daddu $a2, $s5, $zero /* A65C0C 80241B7C 080906E3 */ j .L80241B8C -/* A65C10 80241B80 00000000 */ nop +/* A65C10 80241B80 00000000 */ nop .L80241B84: /* A65C14 80241B84 0C0129CF */ jal func_8004A73C /* A65C18 80241B88 0260202D */ daddu $a0, $s3, $zero @@ -279,11 +279,11 @@ glabel func_802417E0_A65870 /* A65C5C 80241BCC 2C620015 */ sltiu $v0, $v1, 0x15 /* A65C60 80241BD0 10400009 */ beqz $v0, .L80241BF8 /* A65C64 80241BD4 00031080 */ sll $v0, $v1, 2 -/* A65C68 80241BD8 3C018024 */ lui $at, %hi(D_80243010) +/* A65C68 80241BD8 3C018024 */ lui $at, %hi(func_80243010_A1E110) /* A65C6C 80241BDC 00220821 */ addu $at, $at, $v0 -/* A65C70 80241BE0 8C223010 */ lw $v0, %lo(D_80243010)($at) +/* A65C70 80241BE0 8C223010 */ lw $v0, %lo(func_80243010_A1E110)($at) /* A65C74 80241BE4 00400008 */ jr $v0 -/* A65C78 80241BE8 00000000 */ nop +/* A65C78 80241BE8 00000000 */ nop /* A65C7C 80241BEC 8E420028 */ lw $v0, 0x28($s2) /* A65C80 80241BF0 24420001 */ addiu $v0, $v0, 1 /* A65C84 80241BF4 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index 5349ae3aba..0d86a83d67 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -46,7 +46,7 @@ glabel func_80240FD4_A680D4 /* A68178 80241078 8E4200B0 */ lw $v0, 0xb0($s2) /* A6817C 8024107C 30420004 */ andi $v0, $v0, 4 /* A68180 80241080 1040002F */ beqz $v0, .L80241140 -/* A68184 80241084 00000000 */ nop +/* A68184 80241084 00000000 */ nop .L80241088: /* A68188 80241088 2404F7FF */ addiu $a0, $zero, -0x801 /* A6818C 8024108C AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_80240FD4_A680D4 /* A68254 80241154 00220821 */ addu $at, $at, $v0 /* A68258 80241158 8C223A08 */ lw $v0, %lo(D_80243A08)($at) /* A6825C 8024115C 00400008 */ jr $v0 -/* A68260 80241160 00000000 */ nop +/* A68260 80241160 00000000 */ nop /* A68264 80241164 0260202D */ daddu $a0, $s3, $zero /* A68268 80241168 0200282D */ daddu $a1, $s0, $zero /* A6826C 8024116C 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_80240FD4_A680D4 /* A6827C 8024117C 0C0125AE */ jal func_800496B8 /* A68280 80241180 02A0302D */ daddu $a2, $s5, $zero /* A68284 80241184 080904B3 */ j .L802412CC -/* A68288 80241188 00000000 */ nop +/* A68288 80241188 00000000 */ nop /* A6828C 8024118C 0260202D */ daddu $a0, $s3, $zero /* A68290 80241190 0200282D */ daddu $a1, $s0, $zero -/* A68294 80241194 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A68294 80241194 0C0126D1 */ jal func_80049B44 /* A68298 80241198 02A0302D */ daddu $a2, $s5, $zero /* A6829C 8024119C 0260202D */ daddu $a0, $s3, $zero /* A682A0 802411A0 0200282D */ daddu $a1, $s0, $zero /* A682A4 802411A4 0C012701 */ jal func_80049C04 /* A682A8 802411A8 02A0302D */ daddu $a2, $s5, $zero /* A682AC 802411AC 080904B3 */ j .L802412CC -/* A682B0 802411B0 00000000 */ nop +/* A682B0 802411B0 00000000 */ nop /* A682B4 802411B4 0260202D */ daddu $a0, $s3, $zero /* A682B8 802411B8 0200282D */ daddu $a1, $s0, $zero /* A682BC 802411BC 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_80240FD4_A680D4 /* A682CC 802411CC 0C0127B3 */ jal func_80049ECC /* A682D0 802411D0 02A0302D */ daddu $a2, $s5, $zero /* A682D4 802411D4 080904B3 */ j .L802412CC -/* A682D8 802411D8 00000000 */ nop +/* A682D8 802411D8 00000000 */ nop /* A682DC 802411DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* A682E0 802411E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* A682E4 802411E4 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_80240FD4_A680D4 /* A682FC 802411FC 10400008 */ beqz $v0, .L80241220 /* A68300 80241200 46000086 */ mov.s $f2, $f0 /* A68304 80241204 44820000 */ mtc1 $v0, $f0 -/* A68308 80241208 00000000 */ nop +/* A68308 80241208 00000000 */ nop /* A6830C 8024120C 46800020 */ cvt.s.w $f0, $f0 /* A68310 80241210 4602003C */ c.lt.s $f0, $f2 -/* A68314 80241214 00000000 */ nop +/* A68314 80241214 00000000 */ nop /* A68318 80241218 4500000B */ bc1f .L80241248 /* A6831C 8024121C 0260202D */ daddu $a0, $s3, $zero .L80241220: @@ -164,7 +164,7 @@ glabel func_80240FD4_A680D4 /* A68334 80241234 8E630070 */ lw $v1, 0x70($s3) /* A68338 80241238 2402000C */ addiu $v0, $zero, 0xc /* A6833C 8024123C 14620023 */ bne $v1, $v0, .L802412CC -/* A68340 80241240 00000000 */ nop +/* A68340 80241240 00000000 */ nop /* A68344 80241244 0260202D */ daddu $a0, $s3, $zero .L80241248: /* A68348 80241248 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_80240FD4_A680D4 /* A6835C 8024125C 0C012849 */ jal func_8004A124 /* A68360 80241260 02A0302D */ daddu $a2, $s5, $zero /* A68364 80241264 080904B3 */ j .L802412CC -/* A68368 80241268 00000000 */ nop +/* A68368 80241268 00000000 */ nop /* A6836C 8024126C 0260202D */ daddu $a0, $s3, $zero /* A68370 80241270 0200282D */ daddu $a1, $s0, $zero /* A68374 80241274 0C0128FA */ jal func_8004A3E8 /* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero /* A6837C 8024127C 080904B3 */ j .L802412CC -/* A68380 80241280 00000000 */ nop +/* A68380 80241280 00000000 */ nop /* A68384 80241284 0C090105 */ jal func_80240414_A67514 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC -/* A68390 80241290 00000000 */ nop -/* A68394 80241294 0C090145 */ jal kpa_52_UnkSetDurationFunc +/* A68390 80241290 00000000 */ nop +/* A68394 80241294 0C090145 */ jal func_80240514_A67614 /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC -/* A683A0 802412A0 00000000 */ nop -/* A683A4 802412A4 0C090156 */ jal kpa_52_UnkNpcAIFunc9 +/* A683A0 802412A0 00000000 */ nop +/* A683A4 802412A4 0C090156 */ jal func_80240558_A67658 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC -/* A683B0 802412B0 00000000 */ nop -/* A683B4 802412B4 0C09017E */ jal kpa_52_UnkDurationCheck +/* A683B0 802412B0 00000000 */ nop +/* A683B4 802412B4 0C09017E */ jal func_802405F8_A676F8 /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC -/* A683C0 802412C0 00000000 */ nop +/* A683C0 802412C0 00000000 */ nop /* A683C4 802412C4 0C0129CF */ jal func_8004A73C /* A683C8 802412C8 0260202D */ daddu $a0, $s3, $zero .L802412CC: diff --git a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s index d866de6d9c..72c865d449 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_53/A6ACA0/func_80240050_A6ACF0.s @@ -22,8 +22,8 @@ glabel func_80240050_A6ACF0 /* A6AD34 80240094 1060002F */ beqz $v1, .L80240154 /* A6AD38 80240098 24020002 */ addiu $v0, $zero, 2 /* A6AD3C 8024009C C6000028 */ lwc1 $f0, 0x28($s0) -/* A6AD40 802400A0 3C018024 */ lui $at, %hi(D_80241E50) -/* A6AD44 802400A4 D4221E50 */ ldc1 $f2, %lo(D_80241E50)($at) +/* A6AD40 802400A0 3C018024 */ lui $at, %hi(func_80241E50_A4A410) +/* A6AD44 802400A4 D4221E50 */ ldc1 $f2, %lo(func_80241E50_A4A410)($at) /* A6AD48 802400A8 4600010D */ trunc.w.s $f4, $f0 /* A6AD4C 802400AC 44022000 */ mfc1 $v0, $f4 /* A6AD50 802400B0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index 200425ef5f..30cc1edae7 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -55,7 +55,7 @@ glabel func_802406A4_A6EA84 /* A6EB48 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A6EB4C 8024076C 30420004 */ andi $v0, $v0, 4 /* A6EB50 80240770 10400047 */ beqz $v0, .L80240890 -/* A6EB54 80240774 00000000 */ nop +/* A6EB54 80240774 00000000 */ nop .L80240778: /* A6EB58 80240778 AE600070 */ sw $zero, 0x70($s3) /* A6EB5C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A6EA84 /* A6EC00 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A6EC04 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A6EC08 80240828 44833000 */ mtc1 $v1, $f6 -/* A6EC0C 8024082C 00000000 */ nop +/* A6EC0C 8024082C 00000000 */ nop /* A6EC10 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A6EC14 80240834 44073000 */ mfc1 $a3, $f6 /* A6EC18 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A6EA84 /* A6ECD0 802408F0 10600015 */ beqz $v1, .L80240948 /* A6ECD4 802408F4 0260202D */ daddu $a0, $s3, $zero /* A6ECD8 802408F8 08090294 */ j .L80240A50 -/* A6ECDC 802408FC 00000000 */ nop +/* A6ECDC 802408FC 00000000 */ nop .L80240900: /* A6ECE0 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A6ECE4 80240904 24020003 */ addiu $v0, $zero, 3 /* A6ECE8 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A6ECEC 8024090C 0260202D */ daddu $a0, $s3, $zero /* A6ECF0 80240910 08090294 */ j .L80240A50 -/* A6ECF4 80240914 00000000 */ nop +/* A6ECF4 80240914 00000000 */ nop .L80240918: /* A6ECF8 80240918 2402000E */ addiu $v0, $zero, 0xe /* A6ECFC 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A6EA84 /* A6ED10 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A6ED14 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A6ED18 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A6ED1C 8024093C 00000000 */ nop +/* A6ED1C 8024093C 00000000 */ nop /* A6ED20 80240940 08090294 */ j .L80240A50 -/* A6ED24 80240944 00000000 */ nop +/* A6ED24 80240944 00000000 */ nop .L80240948: /* A6ED28 80240948 0280282D */ daddu $a1, $s4, $zero /* A6ED2C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A6EA84 /* A6ED44 80240964 0C0125AE */ jal func_800496B8 /* A6ED48 80240968 02A0302D */ daddu $a2, $s5, $zero /* A6ED4C 8024096C 08090294 */ j .L80240A50 -/* A6ED50 80240970 00000000 */ nop +/* A6ED50 80240970 00000000 */ nop .L80240974: /* A6ED54 80240974 0260202D */ daddu $a0, $s3, $zero /* A6ED58 80240978 0280282D */ daddu $a1, $s4, $zero -/* A6ED5C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A6ED5C 8024097C 0C0126D1 */ jal func_80049B44 /* A6ED60 80240980 02A0302D */ daddu $a2, $s5, $zero /* A6ED64 80240984 8E230088 */ lw $v1, 0x88($s1) /* A6ED68 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802406A4_A6EA84 /* A6EDC4 802409E4 0C012701 */ jal func_80049C04 /* A6EDC8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A6EDCC 802409EC 08090294 */ j .L80240A50 -/* A6EDD0 802409F0 00000000 */ nop +/* A6EDD0 802409F0 00000000 */ nop .L802409F4: /* A6EDD4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A6EDD8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A6EDDC 802409FC 0C0900C4 */ jal kpa_61_set_script_owner_npc_anim +/* A6EDDC 802409FC 0C0900C4 */ jal func_80240310_A6E6F0 /* A6EDE0 80240A00 02A0302D */ daddu $a2, $s5, $zero /* A6EDE4 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: @@ -240,20 +240,20 @@ glabel func_802406A4_A6EA84 /* A6EDEC 80240A0C 0C0900E3 */ jal func_8024038C_A6E76C /* A6EDF0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A6EDF4 80240A14 08090294 */ j .L80240A50 -/* A6EDF8 80240A18 00000000 */ nop +/* A6EDF8 80240A18 00000000 */ nop .L80240A1C: /* A6EDFC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A6EE00 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A6EE04 80240A24 0C090130 */ jal kpa_61_UnkNpcAIFunc12 +/* A6EE04 80240A24 0C090130 */ jal func_802404C0_A6E8A0 /* A6EE08 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A6EE0C 80240A2C 08090294 */ j .L80240A50 -/* A6EE10 80240A30 00000000 */ nop +/* A6EE10 80240A30 00000000 */ nop .L80240A34: /* A6EE14 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A6EE18 80240A38 0C090189 */ jal kpa_61_set_script_owner_npc_col_height +/* A6EE18 80240A38 0C090189 */ jal func_80240624_A6EA04 /* A6EE1C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A6EE20 80240A40 08090294 */ j .L80240A50 -/* A6EE24 80240A44 00000000 */ nop +/* A6EE24 80240A44 00000000 */ nop .L80240A48: /* A6EE28 80240A48 0C0129CF */ jal func_8004A73C /* A6EE2C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A6EA84 /* A6EE80 80240AA0 00220821 */ addu $at, $at, $v0 /* A6EE84 80240AA4 8C223CD8 */ lw $v0, %lo(D_80243CD8)($at) /* A6EE88 80240AA8 00400008 */ jr $v0 -/* A6EE8C 80240AAC 00000000 */ nop +/* A6EE8C 80240AAC 00000000 */ nop /* A6EE90 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A6EE94 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A6EE98 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s index 10c7c7b47f..436b1c01a5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s @@ -106,9 +106,9 @@ glabel func_8024138C_A6F76C /* A6F8FC 8024151C E600000C */ swc1 $f0, 0xc($s0) /* A6F900 80241520 0C00A67F */ jal rand_int /* A6F904 80241524 2404000A */ addiu $a0, $zero, 0xa -/* A6F908 80241528 3C018024 */ lui $at, %hi(D_80243D78) +/* A6F908 80241528 3C018024 */ lui $at, %hi(func_80243D78_855EE8) /* A6F90C 8024152C 08090551 */ j .L80241544 -/* A6F910 80241530 D4203D78 */ ldc1 $f0, %lo(D_80243D78)($at) +/* A6F910 80241530 D4203D78 */ ldc1 $f0, %lo(func_80243D78_855EE8)($at) .L80241534: /* A6F914 80241534 0C00A67F */ jal rand_int /* A6F918 80241538 2404000A */ addiu $a0, $zero, 0xa diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 97a2726d6b..4d69ceb281 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -55,7 +55,7 @@ glabel func_802406A4_A74F14 /* A74FD8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* A74FDC 8024076C 30420004 */ andi $v0, $v0, 4 /* A74FE0 80240770 10400047 */ beqz $v0, .L80240890 -/* A74FE4 80240774 00000000 */ nop +/* A74FE4 80240774 00000000 */ nop .L80240778: /* A74FE8 80240778 AE600070 */ sw $zero, 0x70($s3) /* A74FEC 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_A74F14 /* A75090 80240820 24020028 */ addiu $v0, $zero, 0x28 /* A75094 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* A75098 80240828 44833000 */ mtc1 $v1, $f6 -/* A7509C 8024082C 00000000 */ nop +/* A7509C 8024082C 00000000 */ nop /* A750A0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* A750A4 80240834 44073000 */ mfc1 $a3, $f6 /* A750A8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_A74F14 /* A75160 802408F0 10600015 */ beqz $v1, .L80240948 /* A75164 802408F4 0260202D */ daddu $a0, $s3, $zero /* A75168 802408F8 08090294 */ j .L80240A50 -/* A7516C 802408FC 00000000 */ nop +/* A7516C 802408FC 00000000 */ nop .L80240900: /* A75170 80240900 1062001C */ beq $v1, $v0, .L80240974 /* A75174 80240904 24020003 */ addiu $v0, $zero, 3 /* A75178 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* A7517C 8024090C 0260202D */ daddu $a0, $s3, $zero /* A75180 80240910 08090294 */ j .L80240A50 -/* A75184 80240914 00000000 */ nop +/* A75184 80240914 00000000 */ nop .L80240918: /* A75188 80240918 2402000E */ addiu $v0, $zero, 0xe /* A7518C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_A74F14 /* A751A0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* A751A4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* A751A8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* A751AC 8024093C 00000000 */ nop +/* A751AC 8024093C 00000000 */ nop /* A751B0 80240940 08090294 */ j .L80240A50 -/* A751B4 80240944 00000000 */ nop +/* A751B4 80240944 00000000 */ nop .L80240948: /* A751B8 80240948 0280282D */ daddu $a1, $s4, $zero /* A751BC 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_A74F14 /* A751D4 80240964 0C0125AE */ jal func_800496B8 /* A751D8 80240968 02A0302D */ daddu $a2, $s5, $zero /* A751DC 8024096C 08090294 */ j .L80240A50 -/* A751E0 80240970 00000000 */ nop +/* A751E0 80240970 00000000 */ nop .L80240974: /* A751E4 80240974 0260202D */ daddu $a0, $s3, $zero /* A751E8 80240978 0280282D */ daddu $a1, $s4, $zero -/* A751EC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A751EC 8024097C 0C0126D1 */ jal func_80049B44 /* A751F0 80240980 02A0302D */ daddu $a2, $s5, $zero /* A751F4 80240984 8E230088 */ lw $v1, 0x88($s1) /* A751F8 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802406A4_A74F14 /* A75254 802409E4 0C012701 */ jal func_80049C04 /* A75258 802409E8 02A0302D */ daddu $a2, $s5, $zero /* A7525C 802409EC 08090294 */ j .L80240A50 -/* A75260 802409F0 00000000 */ nop +/* A75260 802409F0 00000000 */ nop .L802409F4: /* A75264 802409F4 0260202D */ daddu $a0, $s3, $zero /* A75268 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A7526C 802409FC 0C0900C4 */ jal kpa_70_set_script_owner_npc_anim +/* A7526C 802409FC 0C0900C4 */ jal func_80240310_A74B80 /* A75270 80240A00 02A0302D */ daddu $a2, $s5, $zero /* A75274 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: @@ -240,20 +240,20 @@ glabel func_802406A4_A74F14 /* A7527C 80240A0C 0C0900E3 */ jal func_8024038C_A74BFC /* A75280 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A75284 80240A14 08090294 */ j .L80240A50 -/* A75288 80240A18 00000000 */ nop +/* A75288 80240A18 00000000 */ nop .L80240A1C: /* A7528C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A75290 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A75294 80240A24 0C090130 */ jal kpa_70_UnkNpcAIFunc12 +/* A75294 80240A24 0C090130 */ jal func_802404C0_A74D30 /* A75298 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A7529C 80240A2C 08090294 */ j .L80240A50 -/* A752A0 80240A30 00000000 */ nop +/* A752A0 80240A30 00000000 */ nop .L80240A34: /* A752A4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A752A8 80240A38 0C090189 */ jal kpa_70_set_script_owner_npc_col_height +/* A752A8 80240A38 0C090189 */ jal func_80240624_A74E94 /* A752AC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A752B0 80240A40 08090294 */ j .L80240A50 -/* A752B4 80240A44 00000000 */ nop +/* A752B4 80240A44 00000000 */ nop .L80240A48: /* A752B8 80240A48 0C0129CF */ jal func_8004A73C /* A752BC 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_A74F14 /* A75310 80240AA0 00220821 */ addu $at, $at, $v0 /* A75314 80240AA4 8C223BF8 */ lw $v0, %lo(D_80243BF8)($at) /* A75318 80240AA8 00400008 */ jr $v0 -/* A7531C 80240AAC 00000000 */ nop +/* A7531C 80240AAC 00000000 */ nop /* A75320 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* A75324 80240AB4 24420001 */ addiu $v0, $v0, 1 /* A75328 80240AB8 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_802406A4_A74F14 /* A75348 80240AD8 8FB00050 */ lw $s0, 0x50($sp) /* A7534C 80240ADC 03E00008 */ jr $ra /* A75350 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 -/* A75354 80240AE4 00000000 */ nop -/* A75358 80240AE8 00000000 */ nop -/* A7535C 80240AEC 00000000 */ nop +/* A75354 80240AE4 00000000 */ nop +/* A75358 80240AE8 00000000 */ nop +/* A7535C 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s index 6b9ff760b2..10e7cc7fbd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_8024027C_A7873C.s @@ -6,11 +6,11 @@ glabel func_8024027C_A7873C /* A78740 80240280 AFBF0010 */ sw $ra, 0x10($sp) /* A78744 80240284 10A00003 */ beqz $a1, .L80240294 /* A78748 80240288 8C86000C */ lw $a2, 0xc($a0) -/* A7874C 8024028C 3C018024 */ lui $at, %hi(D_80240D98) -/* A78750 80240290 AC200D98 */ sw $zero, %lo(D_80240D98)($at) +/* A7874C 8024028C 3C018024 */ lui $at, %hi(func_80240D98_99D728) +/* A78750 80240290 AC200D98 */ sw $zero, %lo(func_80240D98_99D728)($at) .L80240294: -/* A78754 80240294 3C038024 */ lui $v1, %hi(D_80240D98) -/* A78758 80240298 24630D98 */ addiu $v1, $v1, %lo(D_80240D98) +/* A78754 80240294 3C038024 */ lui $v1, %hi(func_80240D98_99D728) +/* A78758 80240298 24630D98 */ addiu $v1, $v1, %lo(func_80240D98_99D728) /* A7875C 8024029C 8C620000 */ lw $v0, ($v1) /* A78760 802402A0 54400003 */ bnel $v0, $zero, .L802402B0 /* A78764 802402A4 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s index 1efa66c68f..78ce5e1ec2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802402D0_A78790.s @@ -12,7 +12,7 @@ glabel func_802402D0_A78790 /* A787AC 802402EC 24020002 */ addiu $v0, $zero, 2 /* A787B0 802402F0 8FBF0010 */ lw $ra, 0x10($sp) /* A787B4 802402F4 24030001 */ addiu $v1, $zero, 1 -/* A787B8 802402F8 3C018024 */ lui $at, %hi(D_80240D98) -/* A787BC 802402FC AC230D98 */ sw $v1, %lo(D_80240D98)($at) +/* A787B8 802402F8 3C018024 */ lui $at, %hi(func_80240D98_99D728) +/* A787BC 802402FC AC230D98 */ sw $v1, %lo(func_80240D98_99D728)($at) /* A787C0 80240300 03E00008 */ jr $ra /* A787C4 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s index cba4307122..810c4a27be 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s @@ -13,8 +13,8 @@ glabel func_80240308_A787C8 /* A787E8 80240328 8C620000 */ lw $v0, ($v1) /* A787EC 8024032C 5040000A */ beql $v0, $zero, .L80240358 /* A787F0 80240330 00041080 */ sll $v0, $a0, 2 -/* A787F4 80240334 3C058024 */ lui $a1, %hi(D_80242040) -/* A787F8 80240338 24A52040 */ addiu $a1, $a1, %lo(D_80242040) +/* A787F4 80240334 3C058024 */ lui $a1, %hi(func_80242040_8B20B0) +/* A787F8 80240338 24A52040 */ addiu $a1, $a1, %lo(func_80242040_8B20B0) .L8024033C: /* A787FC 8024033C 24630004 */ addiu $v1, $v1, 4 /* A78800 80240340 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_80240308_A787C8 /* A78810 80240350 24A50004 */ addiu $a1, $a1, 4 /* A78814 80240354 00041080 */ sll $v0, $a0, 2 .L80240358: -/* A78818 80240358 3C018024 */ lui $at, %hi(D_80242040) +/* A78818 80240358 3C018024 */ lui $at, %hi(func_80242040_8B20B0) /* A7881C 8024035C 00220821 */ addu $at, $at, $v0 -/* A78820 80240360 AC202040 */ sw $zero, %lo(D_80242040)($at) +/* A78820 80240360 AC202040 */ sw $zero, %lo(func_80242040_8B20B0)($at) /* A78824 80240364 080900E5 */ j .L80240394 /* A78828 80240368 00000000 */ nop .L8024036C: -/* A7882C 8024036C 3C038024 */ lui $v1, %hi(D_80242040) -/* A78830 80240370 24632040 */ addiu $v1, $v1, %lo(D_80242040) +/* A7882C 8024036C 3C038024 */ lui $v1, %hi(func_80242040_8B20B0) +/* A78830 80240370 24632040 */ addiu $v1, $v1, %lo(func_80242040_8B20B0) /* A78834 80240374 0060282D */ daddu $a1, $v1, $zero .L80240378: /* A78838 80240378 24820010 */ addiu $v0, $a0, 0x10 diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s index 48bd6d28ee..54c83f201c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_8024027C_A7A77C.s @@ -6,11 +6,11 @@ glabel func_8024027C_A7A77C /* A7A780 80240280 AFBF0010 */ sw $ra, 0x10($sp) /* A7A784 80240284 10A00003 */ beqz $a1, .L80240294 /* A7A788 80240288 8C86000C */ lw $a2, 0xc($a0) -/* A7A78C 8024028C 3C018024 */ lui $at, %hi(D_80240C20) -/* A7A790 80240290 AC200C20 */ sw $zero, %lo(D_80240C20)($at) +/* A7A78C 8024028C 3C018024 */ lui $at, %hi(func_80240C20_872650) +/* A7A790 80240290 AC200C20 */ sw $zero, %lo(func_80240C20_872650)($at) .L80240294: -/* A7A794 80240294 3C038024 */ lui $v1, %hi(D_80240C20) -/* A7A798 80240298 24630C20 */ addiu $v1, $v1, %lo(D_80240C20) +/* A7A794 80240294 3C038024 */ lui $v1, %hi(func_80240C20_872650) +/* A7A798 80240298 24630C20 */ addiu $v1, $v1, %lo(func_80240C20_872650) /* A7A79C 8024029C 8C620000 */ lw $v0, ($v1) /* A7A7A0 802402A0 54400003 */ bnel $v0, $zero, .L802402B0 /* A7A7A4 802402A4 AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s index ad0848b503..fc4c9187af 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_82/A7A550/func_802402D0_A7A7D0.s @@ -12,7 +12,7 @@ glabel func_802402D0_A7A7D0 /* A7A7EC 802402EC 24020002 */ addiu $v0, $zero, 2 /* A7A7F0 802402F0 8FBF0010 */ lw $ra, 0x10($sp) /* A7A7F4 802402F4 24030001 */ addiu $v1, $zero, 1 -/* A7A7F8 802402F8 3C018024 */ lui $at, %hi(D_80240C20) -/* A7A7FC 802402FC AC230C20 */ sw $v1, %lo(D_80240C20)($at) +/* A7A7F8 802402F8 3C018024 */ lui $at, %hi(func_80240C20_872650) +/* A7A7FC 802402FC AC230C20 */ sw $v1, %lo(func_80240C20_872650)($at) /* A7A800 80240300 03E00008 */ jr $ra /* A7A804 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s b/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s index eb66fc606e..87ae8d7ce5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s +++ b/asm/nonmatchings/world/area_kpa/kpa_83/A83490/func_80240000_A83490.s @@ -12,9 +12,9 @@ glabel func_80240000_A83490 /* A834AC 8024001C 00000000 */ nop /* A834B0 80240020 3C04800E */ lui $a0, %hi(D_800D91E0) /* A834B4 80240024 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* A834B8 80240028 3C058024 */ lui $a1, %hi(D_80243300) +/* A834B8 80240028 3C058024 */ lui $a1, %hi(func_80243300_8B3370) /* A834BC 8024002C 0C01953C */ jal sprintf -/* A834C0 80240030 24A53300 */ addiu $a1, $a1, %lo(D_80243300) +/* A834C0 80240030 24A53300 */ addiu $a1, $a1, %lo(func_80243300_8B3370) /* A834C4 80240034 8FBF0010 */ lw $ra, 0x10($sp) /* A834C8 80240038 0000102D */ daddu $v0, $zero, $zero /* A834CC 8024003C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 5c86ede959..436da91a19 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -124,9 +124,9 @@ glabel func_80240B94_A875E4 /* A877A8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 /* A877AC 80240D5C 10400042 */ beqz $v0, .L80240E68 /* A877B0 80240D60 00031080 */ sll $v0, $v1, 2 -/* A877B4 80240D64 3C018024 */ lui $at, %hi(D_80245A40) +/* A877B4 80240D64 3C018024 */ lui $at, %hi(func_80245A40) /* A877B8 80240D68 00220821 */ addu $at, $at, $v0 -/* A877BC 80240D6C 8C225A40 */ lw $v0, %lo(D_80245A40)($at) +/* A877BC 80240D6C 8C225A40 */ lw $v0, %lo(func_80245A40)($at) /* A877C0 80240D70 00400008 */ jr $v0 /* A877C4 80240D74 00000000 */ nop /* A877C8 80240D78 0280202D */ daddu $a0, $s4, $zero @@ -141,7 +141,7 @@ glabel func_80240B94_A875E4 /* A877EC 80240D9C 00000000 */ nop /* A877F0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* A877F4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* A877F8 80240DA8 0C090100 */ jal kpa_91_UnkNpcAIFunc1 +/* A877F8 80240DA8 0C090100 */ jal func_80240400_A86E50 /* A877FC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero /* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240B94_A875E4 /* A8782C 80240DDC 00000000 */ nop /* A87830 80240DE0 0280202D */ daddu $a0, $s4, $zero /* A87834 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* A87838 80240DE8 0C0901CC */ jal kpa_91_NpcJumpFunc2 +/* A87838 80240DE8 0C0901CC */ jal func_80240730_A87180 /* A8783C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* A87840 80240DF0 0280202D */ daddu $a0, $s4, $zero /* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* A87848 80240DF8 0C0901E9 */ jal kpa_91_NpcJumpFunc +/* A87848 80240DF8 0C0901E9 */ jal func_802407A4_A871F4 /* A8784C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* A87850 80240E00 0809039A */ j .L80240E68 /* A87854 80240E04 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240B94_A875E4 /* A8787C 80240E2C 00000000 */ nop /* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero /* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero -/* A87888 80240E38 0C09029B */ jal kpa_91_UnkNpcDurationFlagFunc +/* A87888 80240E38 0C09029B */ jal func_80240A6C_A874BC /* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* A87890 80240E40 0809039A */ j .L80240E68 /* A87894 80240E44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 4cac1a1f46..b2831a368b 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -53,7 +53,7 @@ glabel func_80241224_A87C74 /* A87D30 802412E0 8E2200B0 */ lw $v0, 0xb0($s1) /* A87D34 802412E4 30420004 */ andi $v0, $v0, 4 /* A87D38 802412E8 10400048 */ beqz $v0, .L8024140C -/* A87D3C 802412EC 00000000 */ nop +/* A87D3C 802412EC 00000000 */ nop .L802412F0: /* A87D40 802412F0 A640008E */ sh $zero, 0x8e($s2) /* A87D44 802412F4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241224_A87C74 /* A87DEC 8024139C 24020028 */ addiu $v0, $zero, 0x28 /* A87DF0 802413A0 AFA2001C */ sw $v0, 0x1c($sp) /* A87DF4 802413A4 44833000 */ mtc1 $v1, $f6 -/* A87DF8 802413A8 00000000 */ nop +/* A87DF8 802413A8 00000000 */ nop /* A87DFC 802413AC 468031A0 */ cvt.s.w $f6, $f6 /* A87E00 802413B0 44073000 */ mfc1 $a3, $f6 /* A87E04 802413B4 27A20048 */ addiu $v0, $sp, 0x48 @@ -138,7 +138,7 @@ glabel func_80241224_A87C74 /* A87E70 80241420 00220821 */ addu $at, $at, $v0 /* A87E74 80241424 8C225BD8 */ lw $v0, %lo(D_80245BD8)($at) /* A87E78 80241428 00400008 */ jr $v0 -/* A87E7C 8024142C 00000000 */ nop +/* A87E7C 8024142C 00000000 */ nop /* A87E80 80241430 0260202D */ daddu $a0, $s3, $zero /* A87E84 80241434 0280282D */ daddu $a1, $s4, $zero /* A87E88 80241438 0C090000 */ jal func_80240000_A86A50 @@ -150,45 +150,45 @@ glabel func_80241224_A87C74 /* A87EA0 80241450 0C090056 */ jal func_80240158_A86BA8 /* A87EA4 80241454 02A0302D */ daddu $a2, $s5, $zero /* A87EA8 80241458 08090540 */ j .L80241500 -/* A87EAC 8024145C 00000000 */ nop +/* A87EAC 8024145C 00000000 */ nop /* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero /* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero -/* A87EB8 80241468 0C090100 */ jal kpa_91_UnkNpcAIFunc1 +/* A87EB8 80241468 0C090100 */ jal func_80240400_A86E50 /* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero /* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero /* A87EC8 80241478 0C090130 */ jal func_802404C0_A86F10 /* A87ECC 8024147C 02A0302D */ daddu $a2, $s5, $zero /* A87ED0 80241480 08090540 */ j .L80241500 -/* A87ED4 80241484 00000000 */ nop +/* A87ED4 80241484 00000000 */ nop /* A87ED8 80241488 0260202D */ daddu $a0, $s3, $zero /* A87EDC 8024148C 0280282D */ daddu $a1, $s4, $zero /* A87EE0 80241490 0C09019F */ jal func_8024067C_A870CC /* A87EE4 80241494 02A0302D */ daddu $a2, $s5, $zero /* A87EE8 80241498 08090540 */ j .L80241500 -/* A87EEC 8024149C 00000000 */ nop +/* A87EEC 8024149C 00000000 */ nop /* A87EF0 802414A0 0260202D */ daddu $a0, $s3, $zero /* A87EF4 802414A4 0280282D */ daddu $a1, $s4, $zero -/* A87EF8 802414A8 0C0903A4 */ jal kpa_91_set_script_owner_npc_anim +/* A87EF8 802414A8 0C0903A4 */ jal func_80240E90_A878E0 /* A87EFC 802414AC 02A0302D */ daddu $a2, $s5, $zero /* A87F00 802414B0 0260202D */ daddu $a0, $s3, $zero /* A87F04 802414B4 0280282D */ daddu $a1, $s4, $zero /* A87F08 802414B8 0C0903C3 */ jal func_80240F0C_A8795C /* A87F0C 802414BC 02A0302D */ daddu $a2, $s5, $zero /* A87F10 802414C0 08090540 */ j .L80241500 -/* A87F14 802414C4 00000000 */ nop +/* A87F14 802414C4 00000000 */ nop /* A87F18 802414C8 0260202D */ daddu $a0, $s3, $zero /* A87F1C 802414CC 0280282D */ daddu $a1, $s4, $zero -/* A87F20 802414D0 0C090410 */ jal kpa_91_UnkNpcAIFunc12 +/* A87F20 802414D0 0C090410 */ jal func_80241040_A87A90 /* A87F24 802414D4 02A0302D */ daddu $a2, $s5, $zero /* A87F28 802414D8 08090540 */ j .L80241500 -/* A87F2C 802414DC 00000000 */ nop +/* A87F2C 802414DC 00000000 */ nop /* A87F30 802414E0 0260202D */ daddu $a0, $s3, $zero /* A87F34 802414E4 0280282D */ daddu $a1, $s4, $zero -/* A87F38 802414E8 0C090469 */ jal kpa_91_set_script_owner_npc_col_height +/* A87F38 802414E8 0C090469 */ jal func_802411A4_A87BF4 /* A87F3C 802414EC 02A0302D */ daddu $a2, $s5, $zero /* A87F40 802414F0 08090540 */ j .L80241500 -/* A87F44 802414F4 00000000 */ nop +/* A87F44 802414F4 00000000 */ nop /* A87F48 802414F8 0C0129CF */ jal func_8004A73C /* A87F4C 802414FC 0260202D */ daddu $a0, $s3, $zero .L80241500: diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index 879224dec4..52be627ae0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -124,9 +124,9 @@ glabel func_80240C74_A8D6F4 /* A8D8B8 80240E38 2C620064 */ sltiu $v0, $v1, 0x64 /* A8D8BC 80240E3C 10400042 */ beqz $v0, .L80240F48 /* A8D8C0 80240E40 00031080 */ sll $v0, $v1, 2 -/* A8D8C4 80240E44 3C018024 */ lui $at, %hi(D_80245A10) +/* A8D8C4 80240E44 3C018024 */ lui $at, %hi(func_80245A10_806290) /* A8D8C8 80240E48 00220821 */ addu $at, $at, $v0 -/* A8D8CC 80240E4C 8C225A10 */ lw $v0, %lo(D_80245A10)($at) +/* A8D8CC 80240E4C 8C225A10 */ lw $v0, %lo(func_80245A10_806290)($at) /* A8D8D0 80240E50 00400008 */ jr $v0 /* A8D8D4 80240E54 00000000 */ nop /* A8D8D8 80240E58 0280202D */ daddu $a0, $s4, $zero @@ -141,7 +141,7 @@ glabel func_80240C74_A8D6F4 /* A8D8FC 80240E7C 00000000 */ nop /* A8D900 80240E80 0280202D */ daddu $a0, $s4, $zero /* A8D904 80240E84 0260282D */ daddu $a1, $s3, $zero -/* A8D908 80240E88 0C090138 */ jal kpa_95_UnkNpcAIFunc1 +/* A8D908 80240E88 0C090138 */ jal func_802404E0_A8CF60 /* A8D90C 80240E8C 02A0302D */ daddu $a2, $s5, $zero /* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240C74_A8D6F4 /* A8D93C 80240EBC 00000000 */ nop /* A8D940 80240EC0 0280202D */ daddu $a0, $s4, $zero /* A8D944 80240EC4 0260282D */ daddu $a1, $s3, $zero -/* A8D948 80240EC8 0C090204 */ jal kpa_95_NpcJumpFunc2 +/* A8D948 80240EC8 0C090204 */ jal func_80240810_A8D290 /* A8D94C 80240ECC 02A0302D */ daddu $a2, $s5, $zero /* A8D950 80240ED0 0280202D */ daddu $a0, $s4, $zero /* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero -/* A8D958 80240ED8 0C090221 */ jal kpa_95_NpcJumpFunc +/* A8D958 80240ED8 0C090221 */ jal func_80240884_A8D304 /* A8D95C 80240EDC 02A0302D */ daddu $a2, $s5, $zero /* A8D960 80240EE0 080903D2 */ j .L80240F48 /* A8D964 80240EE4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240C74_A8D6F4 /* A8D98C 80240F0C 00000000 */ nop /* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero /* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero -/* A8D998 80240F18 0C0902D3 */ jal kpa_95_UnkNpcDurationFlagFunc +/* A8D998 80240F18 0C0902D3 */ jal func_80240B4C_A8D5CC /* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero /* A8D9A0 80240F20 080903D2 */ j .L80240F48 /* A8D9A4 80240F24 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index 1f4a9bf32d..a357f08505 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -53,7 +53,7 @@ glabel func_80241304_A8DD84 /* A8DE40 802413C0 8E2200B0 */ lw $v0, 0xb0($s1) /* A8DE44 802413C4 30420004 */ andi $v0, $v0, 4 /* A8DE48 802413C8 10400048 */ beqz $v0, .L802414EC -/* A8DE4C 802413CC 00000000 */ nop +/* A8DE4C 802413CC 00000000 */ nop .L802413D0: /* A8DE50 802413D0 A640008E */ sh $zero, 0x8e($s2) /* A8DE54 802413D4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241304_A8DD84 /* A8DEFC 8024147C 24020028 */ addiu $v0, $zero, 0x28 /* A8DF00 80241480 AFA2001C */ sw $v0, 0x1c($sp) /* A8DF04 80241484 44833000 */ mtc1 $v1, $f6 -/* A8DF08 80241488 00000000 */ nop +/* A8DF08 80241488 00000000 */ nop /* A8DF0C 8024148C 468031A0 */ cvt.s.w $f6, $f6 /* A8DF10 80241490 44073000 */ mfc1 $a3, $f6 /* A8DF14 80241494 27A20048 */ addiu $v0, $sp, 0x48 @@ -138,7 +138,7 @@ glabel func_80241304_A8DD84 /* A8DF80 80241500 00220821 */ addu $at, $at, $v0 /* A8DF84 80241504 8C225BA8 */ lw $v0, %lo(D_80245BA8)($at) /* A8DF88 80241508 00400008 */ jr $v0 -/* A8DF8C 8024150C 00000000 */ nop +/* A8DF8C 8024150C 00000000 */ nop /* A8DF90 80241510 0260202D */ daddu $a0, $s3, $zero /* A8DF94 80241514 0280282D */ daddu $a1, $s4, $zero /* A8DF98 80241518 0C090038 */ jal func_802400E0_A8CB60 @@ -150,45 +150,45 @@ glabel func_80241304_A8DD84 /* A8DFB0 80241530 0C09008E */ jal func_80240238_A8CCB8 /* A8DFB4 80241534 02A0302D */ daddu $a2, $s5, $zero /* A8DFB8 80241538 08090578 */ j .L802415E0 -/* A8DFBC 8024153C 00000000 */ nop +/* A8DFBC 8024153C 00000000 */ nop /* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero /* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero -/* A8DFC8 80241548 0C090138 */ jal kpa_95_UnkNpcAIFunc1 +/* A8DFC8 80241548 0C090138 */ jal func_802404E0_A8CF60 /* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero /* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero /* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero /* A8DFD8 80241558 0C090168 */ jal func_802405A0_A8D020 /* A8DFDC 8024155C 02A0302D */ daddu $a2, $s5, $zero /* A8DFE0 80241560 08090578 */ j .L802415E0 -/* A8DFE4 80241564 00000000 */ nop +/* A8DFE4 80241564 00000000 */ nop /* A8DFE8 80241568 0260202D */ daddu $a0, $s3, $zero /* A8DFEC 8024156C 0280282D */ daddu $a1, $s4, $zero /* A8DFF0 80241570 0C0901D7 */ jal func_8024075C_A8D1DC /* A8DFF4 80241574 02A0302D */ daddu $a2, $s5, $zero /* A8DFF8 80241578 08090578 */ j .L802415E0 -/* A8DFFC 8024157C 00000000 */ nop +/* A8DFFC 8024157C 00000000 */ nop /* A8E000 80241580 0260202D */ daddu $a0, $s3, $zero /* A8E004 80241584 0280282D */ daddu $a1, $s4, $zero -/* A8E008 80241588 0C0903DC */ jal kpa_95_set_script_owner_npc_anim +/* A8E008 80241588 0C0903DC */ jal func_80240F70_A8D9F0 /* A8E00C 8024158C 02A0302D */ daddu $a2, $s5, $zero /* A8E010 80241590 0260202D */ daddu $a0, $s3, $zero /* A8E014 80241594 0280282D */ daddu $a1, $s4, $zero /* A8E018 80241598 0C0903FB */ jal func_80240FEC_A8DA6C /* A8E01C 8024159C 02A0302D */ daddu $a2, $s5, $zero /* A8E020 802415A0 08090578 */ j .L802415E0 -/* A8E024 802415A4 00000000 */ nop +/* A8E024 802415A4 00000000 */ nop /* A8E028 802415A8 0260202D */ daddu $a0, $s3, $zero /* A8E02C 802415AC 0280282D */ daddu $a1, $s4, $zero -/* A8E030 802415B0 0C090448 */ jal kpa_95_UnkNpcAIFunc12 +/* A8E030 802415B0 0C090448 */ jal func_80241120_A8DBA0 /* A8E034 802415B4 02A0302D */ daddu $a2, $s5, $zero /* A8E038 802415B8 08090578 */ j .L802415E0 -/* A8E03C 802415BC 00000000 */ nop +/* A8E03C 802415BC 00000000 */ nop /* A8E040 802415C0 0260202D */ daddu $a0, $s3, $zero /* A8E044 802415C4 0280282D */ daddu $a1, $s4, $zero -/* A8E048 802415C8 0C0904A1 */ jal kpa_95_set_script_owner_npc_col_height +/* A8E048 802415C8 0C0904A1 */ jal func_80241284_A8DD04 /* A8E04C 802415CC 02A0302D */ daddu $a2, $s5, $zero /* A8E050 802415D0 08090578 */ j .L802415E0 -/* A8E054 802415D4 00000000 */ nop +/* A8E054 802415D4 00000000 */ nop /* A8E058 802415D8 0C0129CF */ jal func_8004A73C /* A8E05C 802415DC 0260202D */ daddu $a0, $s3, $zero .L802415E0: diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s index 2f58782aa5..d84dd320fc 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s @@ -87,8 +87,8 @@ glabel func_802404E0_C5AC20 /* C5AD60 80240620 08090192 */ j .L80240648 /* C5AD64 80240624 E6000018 */ swc1 $f0, 0x18($s0) .L80240628: -/* C5AD68 80240628 3C018024 */ lui $at, %hi(D_80246500) -/* C5AD6C 8024062C D4226500 */ ldc1 $f2, %lo(D_80246500)($at) +/* C5AD68 80240628 3C018024 */ lui $at, %hi(func_80246500_806D80) +/* C5AD6C 8024062C D4226500 */ ldc1 $f2, %lo(func_80246500_806D80)($at) /* C5AD70 80240630 44820000 */ mtc1 $v0, $f0 /* C5AD74 80240634 00000000 */ nop /* C5AD78 80240638 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 3952c85804..2f5d8468c9 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -83,7 +83,7 @@ glabel func_802417EC_C5BF2C /* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero /* C5C060 80241920 0280202D */ daddu $a0, $s4, $zero /* C5C064 80241924 0200282D */ daddu $a1, $s0, $zero -/* C5C068 80241928 0C09032E */ jal kzn_02_UnkNpcAIFunc1 +/* C5C068 80241928 0C09032E */ jal func_80240CB8_C5B3F8 /* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero /* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero /* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802417EC_C5BF2C /* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero /* C5C088 80241948 0280202D */ daddu $a0, $s4, $zero /* C5C08C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* C5C090 80241950 0C09042F */ jal kzn_02_UnkNpcAIFunc2 +/* C5C090 80241950 0C09042F */ jal func_802410BC_C5B7FC /* C5C094 80241954 0260302D */ daddu $a2, $s3, $zero /* C5C098 80241958 0280202D */ daddu $a0, $s4, $zero /* C5C09C 8024195C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802417EC_C5BF2C /* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero /* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero /* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero -/* C5C0D0 80241990 0C0904B5 */ jal kzn_02_UnkNpcAIFunc3 +/* C5C0D0 80241990 0C0904B5 */ jal func_802412D4_C5BA14 /* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero /* C5C0D8 80241998 0809066D */ j .L802419B4 /* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 3463cc4bf9..9162628e00 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -84,7 +84,7 @@ glabel func_80241DE4_C5C524 /* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero /* C5C65C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* C5C660 80241F20 0200282D */ daddu $a1, $s0, $zero -/* C5C664 80241F24 0C09032E */ jal kzn_02_UnkNpcAIFunc1 +/* C5C664 80241F24 0C09032E */ jal func_80240CB8_C5B3F8 /* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero /* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80241DE4_C5C524 /* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero /* C5C684 80241F44 0280202D */ daddu $a0, $s4, $zero /* C5C688 80241F48 0200282D */ daddu $a1, $s0, $zero -/* C5C68C 80241F4C 0C09042F */ jal kzn_02_UnkNpcAIFunc2 +/* C5C68C 80241F4C 0C09042F */ jal func_802410BC_C5B7FC /* C5C690 80241F50 0260302D */ daddu $a2, $s3, $zero /* C5C694 80241F54 0280202D */ daddu $a0, $s4, $zero /* C5C698 80241F58 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index e6d902d04f..120ae57c71 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -55,7 +55,7 @@ glabel func_802406A4_C613B4 /* C61478 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* C6147C 8024076C 30420004 */ andi $v0, $v0, 4 /* C61480 80240770 10400047 */ beqz $v0, .L80240890 -/* C61484 80240774 00000000 */ nop +/* C61484 80240774 00000000 */ nop .L80240778: /* C61488 80240778 AE600070 */ sw $zero, 0x70($s3) /* C6148C 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_C613B4 /* C61530 80240820 24020028 */ addiu $v0, $zero, 0x28 /* C61534 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* C61538 80240828 44833000 */ mtc1 $v1, $f6 -/* C6153C 8024082C 00000000 */ nop +/* C6153C 8024082C 00000000 */ nop /* C61540 80240830 468031A0 */ cvt.s.w $f6, $f6 /* C61544 80240834 44073000 */ mfc1 $a3, $f6 /* C61548 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_C613B4 /* C61600 802408F0 10600015 */ beqz $v1, .L80240948 /* C61604 802408F4 0260202D */ daddu $a0, $s3, $zero /* C61608 802408F8 08090294 */ j .L80240A50 -/* C6160C 802408FC 00000000 */ nop +/* C6160C 802408FC 00000000 */ nop .L80240900: /* C61610 80240900 1062001C */ beq $v1, $v0, .L80240974 /* C61614 80240904 24020003 */ addiu $v0, $zero, 3 /* C61618 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* C6161C 8024090C 0260202D */ daddu $a0, $s3, $zero /* C61620 80240910 08090294 */ j .L80240A50 -/* C61624 80240914 00000000 */ nop +/* C61624 80240914 00000000 */ nop .L80240918: /* C61628 80240918 2402000E */ addiu $v0, $zero, 0xe /* C6162C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_C613B4 /* C61640 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* C61644 80240934 24020063 */ addiu $v0, $zero, 0x63 /* C61648 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* C6164C 8024093C 00000000 */ nop +/* C6164C 8024093C 00000000 */ nop /* C61650 80240940 08090294 */ j .L80240A50 -/* C61654 80240944 00000000 */ nop +/* C61654 80240944 00000000 */ nop .L80240948: /* C61658 80240948 0280282D */ daddu $a1, $s4, $zero /* C6165C 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_C613B4 /* C61674 80240964 0C0125AE */ jal func_800496B8 /* C61678 80240968 02A0302D */ daddu $a2, $s5, $zero /* C6167C 8024096C 08090294 */ j .L80240A50 -/* C61680 80240970 00000000 */ nop +/* C61680 80240970 00000000 */ nop .L80240974: /* C61684 80240974 0260202D */ daddu $a0, $s3, $zero /* C61688 80240978 0280282D */ daddu $a1, $s4, $zero -/* C6168C 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C6168C 8024097C 0C0126D1 */ jal func_80049B44 /* C61690 80240980 02A0302D */ daddu $a2, $s5, $zero /* C61694 80240984 8E230088 */ lw $v1, 0x88($s1) /* C61698 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802406A4_C613B4 /* C616F4 802409E4 0C012701 */ jal func_80049C04 /* C616F8 802409E8 02A0302D */ daddu $a2, $s5, $zero /* C616FC 802409EC 08090294 */ j .L80240A50 -/* C61700 802409F0 00000000 */ nop +/* C61700 802409F0 00000000 */ nop .L802409F4: /* C61704 802409F4 0260202D */ daddu $a0, $s3, $zero /* C61708 802409F8 0280282D */ daddu $a1, $s4, $zero -/* C6170C 802409FC 0C0900C4 */ jal kzn_03_set_script_owner_npc_anim +/* C6170C 802409FC 0C0900C4 */ jal func_80240310_C61020 /* C61710 80240A00 02A0302D */ daddu $a2, $s5, $zero /* C61714 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: @@ -240,20 +240,20 @@ glabel func_802406A4_C613B4 /* C6171C 80240A0C 0C0900E3 */ jal func_8024038C_C6109C /* C61720 80240A10 02A0302D */ daddu $a2, $s5, $zero /* C61724 80240A14 08090294 */ j .L80240A50 -/* C61728 80240A18 00000000 */ nop +/* C61728 80240A18 00000000 */ nop .L80240A1C: /* C6172C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* C61730 80240A20 0280282D */ daddu $a1, $s4, $zero -/* C61734 80240A24 0C090130 */ jal kzn_03_UnkNpcAIFunc12 +/* C61734 80240A24 0C090130 */ jal func_802404C0_C611D0 /* C61738 80240A28 02A0302D */ daddu $a2, $s5, $zero /* C6173C 80240A2C 08090294 */ j .L80240A50 -/* C61740 80240A30 00000000 */ nop +/* C61740 80240A30 00000000 */ nop .L80240A34: /* C61744 80240A34 0280282D */ daddu $a1, $s4, $zero -/* C61748 80240A38 0C090189 */ jal kzn_03_set_script_owner_npc_col_height +/* C61748 80240A38 0C090189 */ jal func_80240624_C61334 /* C6174C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* C61750 80240A40 08090294 */ j .L80240A50 -/* C61754 80240A44 00000000 */ nop +/* C61754 80240A44 00000000 */ nop .L80240A48: /* C61758 80240A48 0C0129CF */ jal func_8004A73C /* C6175C 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_C613B4 /* C617B0 80240AA0 00220821 */ addu $at, $at, $v0 /* C617B4 80240AA4 8C2271E8 */ lw $v0, %lo(D_802471E8)($at) /* C617B8 80240AA8 00400008 */ jr $v0 -/* C617BC 80240AAC 00000000 */ nop +/* C617BC 80240AAC 00000000 */ nop /* C617C0 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* C617C4 80240AB4 24420001 */ addiu $v0, $v0, 1 /* C617C8 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index 5adcf8f414..88e25f4f46 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -46,7 +46,7 @@ glabel func_80241214_C61F24 /* C61FC8 802412B8 8E2200B0 */ lw $v0, 0xb0($s1) /* C61FCC 802412BC 30420004 */ andi $v0, $v0, 4 /* C61FD0 802412C0 10400020 */ beqz $v0, .L80241344 -/* C61FD4 802412C4 00000000 */ nop +/* C61FD4 802412C4 00000000 */ nop .L802412C8: /* C61FD8 802412C8 2404F7FF */ addiu $a0, $zero, -0x801 /* C61FDC 802412CC AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241214_C61F24 /* C62054 80241344 8E420070 */ lw $v0, 0x70($s2) /* C62058 80241348 2842001E */ slti $v0, $v0, 0x1e /* C6205C 8024134C 10400009 */ beqz $v0, .L80241374 -/* C62060 80241350 00000000 */ nop +/* C62060 80241350 00000000 */ nop /* C62064 80241354 8E22006C */ lw $v0, 0x6c($s1) /* C62068 80241358 14400006 */ bnez $v0, .L80241374 -/* C6206C 8024135C 00000000 */ nop +/* C6206C 8024135C 00000000 */ nop /* C62070 80241360 0C090380 */ jal func_80240E00_C61B10 /* C62074 80241364 0240202D */ daddu $a0, $s2, $zero /* C62078 80241368 10400002 */ beqz $v0, .L80241374 @@ -104,7 +104,7 @@ glabel func_80241214_C61F24 /* C62098 80241388 00220821 */ addu $at, $at, $v0 /* C6209C 8024138C 8C227248 */ lw $v0, %lo(D_80247248)($at) /* C620A0 80241390 00400008 */ jr $v0 -/* C620A4 80241394 00000000 */ nop +/* C620A4 80241394 00000000 */ nop /* C620A8 80241398 0240202D */ daddu $a0, $s2, $zero /* C620AC 8024139C 0260282D */ daddu $a1, $s3, $zero /* C620B0 802413A0 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241214_C61F24 /* C620C0 802413B0 0C0125AE */ jal func_800496B8 /* C620C4 802413B4 0280302D */ daddu $a2, $s4, $zero /* C620C8 802413B8 08090528 */ j .L802414A0 -/* C620CC 802413BC 00000000 */ nop +/* C620CC 802413BC 00000000 */ nop /* C620D0 802413C0 0240202D */ daddu $a0, $s2, $zero /* C620D4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* C620D8 802413C8 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C620D8 802413C8 0C0126D1 */ jal func_80049B44 /* C620DC 802413CC 0280302D */ daddu $a2, $s4, $zero /* C620E0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C620E4 802413D4 0260282D */ daddu $a1, $s3, $zero /* C620E8 802413D8 0C012701 */ jal func_80049C04 /* C620EC 802413DC 0280302D */ daddu $a2, $s4, $zero /* C620F0 802413E0 08090528 */ j .L802414A0 -/* C620F4 802413E4 00000000 */ nop +/* C620F4 802413E4 00000000 */ nop /* C620F8 802413E8 0240202D */ daddu $a0, $s2, $zero /* C620FC 802413EC 0260282D */ daddu $a1, $s3, $zero /* C62100 802413F0 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241214_C61F24 /* C62110 80241400 0C0127B3 */ jal func_80049ECC /* C62114 80241404 0280302D */ daddu $a2, $s4, $zero /* C62118 80241408 08090528 */ j .L802414A0 -/* C6211C 8024140C 00000000 */ nop +/* C6211C 8024140C 00000000 */ nop /* C62120 80241410 0240202D */ daddu $a0, $s2, $zero /* C62124 80241414 0260282D */ daddu $a1, $s3, $zero /* C62128 80241418 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241214_C61F24 /* C62138 80241428 0C012849 */ jal func_8004A124 /* C6213C 8024142C 0280302D */ daddu $a2, $s4, $zero /* C62140 80241430 08090528 */ j .L802414A0 -/* C62144 80241434 00000000 */ nop +/* C62144 80241434 00000000 */ nop /* C62148 80241438 0240202D */ daddu $a0, $s2, $zero /* C6214C 8024143C 0260282D */ daddu $a1, $s3, $zero /* C62150 80241440 0C0128FA */ jal func_8004A3E8 /* C62154 80241444 0280302D */ daddu $a2, $s4, $zero /* C62158 80241448 08090528 */ j .L802414A0 -/* C6215C 8024144C 00000000 */ nop -/* C62160 80241450 0C0902FE */ jal kzn_03_UnkNpcAIFunc6 +/* C6215C 8024144C 00000000 */ nop +/* C62160 80241450 0C0902FE */ jal func_80240BF8_C61908 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero -/* C62168 80241458 0C090319 */ jal kzn_03_UnkNpcAIFunc7 +/* C62168 80241458 0C090319 */ jal func_80240C64_C61974 /* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero /* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 /* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 -/* C6217C 8024146C 00000000 */ nop -/* C62180 80241470 0C090335 */ jal kzn_03_UnkNpcAIFunc8 +/* C6217C 8024146C 00000000 */ nop +/* C62180 80241470 0C090335 */ jal func_80240CD4_C619E4 /* C62184 80241474 0240202D */ daddu $a0, $s2, $zero /* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 /* C62190 80241480 14620007 */ bne $v1, $v0, .L802414A0 -/* C62194 80241484 00000000 */ nop -/* C62198 80241488 0C09036B */ jal kzn_03_UnkNpcAIFunc5 +/* C62194 80241484 00000000 */ nop +/* C62198 80241488 0C09036B */ jal func_80240DAC_C61ABC /* C6219C 8024148C 0240202D */ daddu $a0, $s2, $zero /* C621A0 80241490 08090528 */ j .L802414A0 -/* C621A4 80241494 00000000 */ nop +/* C621A4 80241494 00000000 */ nop /* C621A8 80241498 0C0129CF */ jal func_8004A73C /* C621AC 8024149C 0240202D */ daddu $a0, $s2, $zero .L802414A0: diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s index fee76fa7bd..6655b3d100 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s @@ -26,8 +26,8 @@ glabel func_802404DC_C6860C /* C68660 80240530 26941C48 */ addiu $s4, $s4, %lo(D_80241C48) /* C68664 80240534 0260882D */ daddu $s1, $s3, $zero /* C68668 80240538 8EA200B4 */ lw $v0, 0xb4($s5) -/* C6866C 8024053C 3C038024 */ lui $v1, %hi(D_80241C40) -/* C68670 80240540 24631C40 */ addiu $v1, $v1, %lo(D_80241C40) +/* C6866C 8024053C 3C038024 */ lui $v1, %hi(func_80241C40_844810) +/* C68670 80240540 24631C40 */ addiu $v1, $v1, %lo(func_80241C40_844810) /* C68674 80240544 AEB30078 */ sw $s3, 0x78($s5) /* C68678 80240548 00021027 */ nor $v0, $zero, $v0 /* C6867C 8024054C 0002BFC2 */ srl $s7, $v0, 0x1f diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s index e9ebd3c84e..3d465d46de 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241050_C69180.s @@ -228,9 +228,9 @@ glabel func_80241050_C69180 /* C694D8 802413A8 E6040028 */ swc1 $f4, 0x28($s0) /* C694DC 802413AC 00021080 */ sll $v0, $v0, 2 /* C694E0 802413B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C694E4 802413B4 3C048024 */ lui $a0, %hi(D_802422F0) +/* C694E4 802413B4 3C048024 */ lui $a0, %hi(func_802422F0_A706D0) /* C694E8 802413B8 00822021 */ addu $a0, $a0, $v0 -/* C694EC 802413BC 8C8422F0 */ lw $a0, %lo(D_802422F0)($a0) +/* C694EC 802413BC 8C8422F0 */ lw $a0, %lo(func_802422F0_A706D0)($a0) /* C694F0 802413C0 8E060004 */ lw $a2, 4($s0) /* C694F4 802413C4 8E070008 */ lw $a3, 8($s0) /* C694F8 802413C8 0C052757 */ jal play_sound_at_position diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s index 8de9bc5bcb..277ad55991 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s @@ -46,8 +46,8 @@ glabel func_80241644_C69774 /* C6980C 802416DC 2402000A */ addiu $v0, $zero, 0xa /* C69810 802416E0 1462001B */ bne $v1, $v0, .L80241750 /* C69814 802416E4 E6000010 */ swc1 $f0, 0x10($s0) -/* C69818 802416E8 3C048024 */ lui $a0, %hi(D_8024231C) -/* C6981C 802416EC 2484231C */ addiu $a0, $a0, %lo(D_8024231C) +/* C69818 802416E8 3C048024 */ lui $a0, %hi(func_8024231C_A1D41C) +/* C6981C 802416EC 2484231C */ addiu $a0, $a0, %lo(func_8024231C_A1D41C) /* C69820 802416F0 24050001 */ addiu $a1, $zero, 1 /* C69824 802416F4 0C0B0CF8 */ jal start_script /* C69828 802416F8 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s index 9beb6c8c1c..d87939ce40 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CC30/func_80240310_C6CC30.s @@ -11,9 +11,9 @@ glabel func_80240310_C6CC30 /* C6CC48 80240328 3C0141C8 */ lui $at, 0x41c8 /* C6CC4C 8024032C 44810000 */ mtc1 $at, $f0 /* C6CC50 80240330 00021080 */ sll $v0, $v0, 2 -/* C6CC54 80240334 3C018024 */ lui $at, %hi(D_80241120) +/* C6CC54 80240334 3C018024 */ lui $at, %hi(func_80241120_A8DBA0) /* C6CC58 80240338 00220821 */ addu $at, $at, $v0 -/* C6CC5C 8024033C C4221120 */ lwc1 $f2, %lo(D_80241120)($at) +/* C6CC5C 8024033C C4221120 */ lwc1 $f2, %lo(func_80241120_A8DBA0)($at) /* C6CC60 80240340 46001082 */ mul.s $f2, $f2, $f0 /* C6CC64 80240344 00000000 */ nop /* C6CC68 80240348 C6200084 */ lwc1 $f0, 0x84($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s index b56341bc21..eb42cdf885 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802403F0_C6CD10.s @@ -61,8 +61,8 @@ glabel func_802403F0_C6CD10 /* C6CDE0 802404C0 1440FFF7 */ bnez $v0, .L802404A0 /* C6CDE4 802404C4 26310004 */ addiu $s1, $s1, 4 .L802404C8: -/* C6CDE8 802404C8 3C028024 */ lui $v0, %hi(D_80241370) -/* C6CDEC 802404CC 24421370 */ addiu $v0, $v0, %lo(D_80241370) +/* C6CDE8 802404C8 3C028024 */ lui $v0, %hi(func_80241370_843F40) +/* C6CDEC 802404CC 24421370 */ addiu $v0, $v0, %lo(func_80241370_843F40) /* C6CDF0 802404D0 C4420000 */ lwc1 $f2, ($v0) /* C6CDF4 802404D4 3C013F80 */ lui $at, 0x3f80 /* C6CDF8 802404D8 44810000 */ mtc1 $at, $f0 @@ -154,8 +154,8 @@ glabel func_802403F0_C6CD10 /* C6CF34 80240614 4481B000 */ mtc1 $at, $f22 /* C6CF38 80240618 241103CA */ addiu $s1, $zero, 0x3ca .L8024061C: -/* C6CF3C 8024061C 3C108024 */ lui $s0, %hi(D_80241370) -/* C6CF40 80240620 26101370 */ addiu $s0, $s0, %lo(D_80241370) +/* C6CF3C 8024061C 3C108024 */ lui $s0, %hi(func_80241370_843F40) +/* C6CF40 80240620 26101370 */ addiu $s0, $s0, %lo(func_80241370_843F40) /* C6CF44 80240624 C6000000 */ lwc1 $f0, ($s0) /* C6CF48 80240628 3C014040 */ lui $at, 0x4040 /* C6CF4C 8024062C 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s index 78931ebd16..5d79142e40 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240720_C6EA50.s @@ -11,9 +11,9 @@ glabel func_80240720_C6EA50 /* C6EA68 80240738 3C0141C8 */ lui $at, 0x41c8 /* C6EA6C 8024073C 44810000 */ mtc1 $at, $f0 /* C6EA70 80240740 00021080 */ sll $v0, $v0, 2 -/* C6EA74 80240744 3C018024 */ lui $at, %hi(D_80242930) +/* C6EA74 80240744 3C018024 */ lui $at, %hi(func_80242930_9C7D10) /* C6EA78 80240748 00220821 */ addu $at, $at, $v0 -/* C6EA7C 8024074C C4222930 */ lwc1 $f2, %lo(D_80242930)($at) +/* C6EA7C 8024074C C4222930 */ lwc1 $f2, %lo(func_80242930_9C7D10)($at) /* C6EA80 80240750 46001082 */ mul.s $f2, $f2, $f0 /* C6EA84 80240754 00000000 */ nop /* C6EA88 80240758 C6200084 */ lwc1 $f0, 0x84($s1) diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s index e7ba4b1a9d..e4efe2f146 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s @@ -87,8 +87,8 @@ glabel func_80240820_C6EB50 /* C6EC90 80240960 08090262 */ j .L80240988 /* C6EC94 80240964 E6000018 */ swc1 $f0, 0x18($s0) .L80240968: -/* C6EC98 80240968 3C018024 */ lui $at, %hi(D_80243090) -/* C6EC9C 8024096C D4223090 */ ldc1 $f2, %lo(D_80243090)($at) +/* C6EC98 80240968 3C018024 */ lui $at, %hi(func_80243090_C395C0) +/* C6EC9C 8024096C D4223090 */ ldc1 $f2, %lo(func_80243090_C395C0)($at) /* C6ECA0 80240970 44820000 */ mtc1 $v0, $f0 /* C6ECA4 80240974 00000000 */ nop /* C6ECA8 80240978 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s index 5a388ecda8..0d7005ac11 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241474_C6F7A4.s @@ -15,9 +15,9 @@ glabel func_80241474_C6F7A4 /* C6F7CC 8024149C 00031C00 */ sll $v1, $v1, 0x10 /* C6F7D0 802414A0 00031B83 */ sra $v1, $v1, 0xe /* C6F7D4 802414A4 A444008E */ sh $a0, 0x8e($v0) -/* C6F7D8 802414A8 3C018024 */ lui $at, %hi(D_80242B90) +/* C6F7D8 802414A8 3C018024 */ lui $at, %hi(func_80242B90_A1DC90) /* C6F7DC 802414AC 00230821 */ addu $at, $at, $v1 -/* C6F7E0 802414B0 C4222B90 */ lwc1 $f2, %lo(D_80242B90)($at) +/* C6F7E0 802414B0 C4222B90 */ lwc1 $f2, %lo(func_80242B90_A1DC90)($at) /* C6F7E4 802414B4 8443008E */ lh $v1, 0x8e($v0) /* C6F7E8 802414B8 46020000 */ add.s $f0, $f0, $f2 /* C6F7EC 802414BC 28630005 */ slti $v1, $v1, 5 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 75f5cc08df..41c8334698 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -66,9 +66,9 @@ glabel func_80241B2C_C6FE5C /* C6FF48 80241C18 2C62000F */ sltiu $v0, $v1, 0xf /* C6FF4C 80241C1C 10400034 */ beqz $v0, .L80241CF0 /* C6FF50 80241C20 00031080 */ sll $v0, $v1, 2 -/* C6FF54 80241C24 3C018024 */ lui $at, %hi(D_802430A8) +/* C6FF54 80241C24 3C018024 */ lui $at, %hi(func_802430A8_A967E8) /* C6FF58 80241C28 00220821 */ addu $at, $at, $v0 -/* C6FF5C 80241C2C 8C2230A8 */ lw $v0, %lo(D_802430A8)($at) +/* C6FF5C 80241C2C 8C2230A8 */ lw $v0, %lo(func_802430A8_A967E8)($at) /* C6FF60 80241C30 00400008 */ jr $v0 /* C6FF64 80241C34 00000000 */ nop /* C6FF68 80241C38 0280202D */ daddu $a0, $s4, $zero @@ -83,7 +83,7 @@ glabel func_80241B2C_C6FE5C /* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero /* C6FF90 80241C60 0280202D */ daddu $a0, $s4, $zero /* C6FF94 80241C64 0200282D */ daddu $a1, $s0, $zero -/* C6FF98 80241C68 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 +/* C6FF98 80241C68 0C0903FE */ jal func_80240FF8_C6F328 /* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero /* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero /* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241B2C_C6FE5C /* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero /* C6FFB8 80241C88 0280202D */ daddu $a0, $s4, $zero /* C6FFBC 80241C8C 0200282D */ daddu $a1, $s0, $zero -/* C6FFC0 80241C90 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 +/* C6FFC0 80241C90 0C0904FF */ jal func_802413FC_C6F72C /* C6FFC4 80241C94 0260302D */ daddu $a2, $s3, $zero /* C6FFC8 80241C98 0280202D */ daddu $a0, $s4, $zero /* C6FFCC 80241C9C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241B2C_C6FE5C /* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero /* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero /* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero -/* C70000 80241CD0 0C090585 */ jal kzn_07_UnkNpcAIFunc3 +/* C70000 80241CD0 0C090585 */ jal func_80241614_C6F944 /* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero /* C70008 80241CD8 0809073D */ j .L80241CF4 /* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index 1d1d51f18c..34c4662ed5 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -67,9 +67,9 @@ glabel func_80242124_C70454 /* C70544 80242214 2C620015 */ sltiu $v0, $v1, 0x15 /* C70548 80242218 10400032 */ beqz $v0, .L802422E4 /* C7054C 8024221C 00031080 */ sll $v0, $v1, 2 -/* C70550 80242220 3C018024 */ lui $at, %hi(D_802430F0) +/* C70550 80242220 3C018024 */ lui $at, %hi(func_802430F0_C49CD0) /* C70554 80242224 00220821 */ addu $at, $at, $v0 -/* C70558 80242228 8C2230F0 */ lw $v0, %lo(D_802430F0)($at) +/* C70558 80242228 8C2230F0 */ lw $v0, %lo(func_802430F0_C49CD0)($at) /* C7055C 8024222C 00400008 */ jr $v0 /* C70560 80242230 00000000 */ nop /* C70564 80242234 0280202D */ daddu $a0, $s4, $zero @@ -84,7 +84,7 @@ glabel func_80242124_C70454 /* C70588 80242258 0000102D */ daddu $v0, $zero, $zero /* C7058C 8024225C 0280202D */ daddu $a0, $s4, $zero /* C70590 80242260 0200282D */ daddu $a1, $s0, $zero -/* C70594 80242264 0C0903FE */ jal kzn_07_UnkNpcAIFunc1 +/* C70594 80242264 0C0903FE */ jal func_80240FF8_C6F328 /* C70598 80242268 0260302D */ daddu $a2, $s3, $zero /* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero /* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80242124_C70454 /* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero /* C705B4 80242284 0280202D */ daddu $a0, $s4, $zero /* C705B8 80242288 0200282D */ daddu $a1, $s0, $zero -/* C705BC 8024228C 0C0904FF */ jal kzn_07_UnkNpcAIFunc2 +/* C705BC 8024228C 0C0904FF */ jal func_802413FC_C6F72C /* C705C0 80242290 0260302D */ daddu $a2, $s3, $zero /* C705C4 80242294 0280202D */ daddu $a0, $s4, $zero /* C705C8 80242298 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index ce3d782e5b..a785c89b70 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -83,7 +83,7 @@ glabel func_80241D5C_C731DC /* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero /* C73310 80241E90 0280202D */ daddu $a0, $s4, $zero /* C73314 80241E94 0200282D */ daddu $a1, $s0, $zero -/* C73318 80241E98 0C09048A */ jal kzn_08_UnkNpcAIFunc1 +/* C73318 80241E98 0C09048A */ jal func_80241228_C726A8 /* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero /* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero /* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241D5C_C731DC /* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero /* C73338 80241EB8 0280202D */ daddu $a0, $s4, $zero /* C7333C 80241EBC 0200282D */ daddu $a1, $s0, $zero -/* C73340 80241EC0 0C09058B */ jal kzn_08_UnkNpcAIFunc2 +/* C73340 80241EC0 0C09058B */ jal func_8024162C_C72AAC /* C73344 80241EC4 0260302D */ daddu $a2, $s3, $zero /* C73348 80241EC8 0280202D */ daddu $a0, $s4, $zero /* C7334C 80241ECC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241D5C_C731DC /* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero /* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero /* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero -/* C73380 80241F00 0C090611 */ jal kzn_08_UnkNpcAIFunc3 +/* C73380 80241F00 0C090611 */ jal func_80241844_C72CC4 /* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero /* C73388 80241F08 080907C9 */ j .L80241F24 /* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index b664349a5e..a11c11c3e1 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -84,7 +84,7 @@ glabel func_80242354_C737D4 /* C73908 80242488 0000102D */ daddu $v0, $zero, $zero /* C7390C 8024248C 0280202D */ daddu $a0, $s4, $zero /* C73910 80242490 0200282D */ daddu $a1, $s0, $zero -/* C73914 80242494 0C09048A */ jal kzn_08_UnkNpcAIFunc1 +/* C73914 80242494 0C09048A */ jal func_80241228_C726A8 /* C73918 80242498 0260302D */ daddu $a2, $s3, $zero /* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero /* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80242354_C737D4 /* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero /* C73934 802424B4 0280202D */ daddu $a0, $s4, $zero /* C73938 802424B8 0200282D */ daddu $a1, $s0, $zero -/* C7393C 802424BC 0C09058B */ jal kzn_08_UnkNpcAIFunc2 +/* C7393C 802424BC 0C09058B */ jal func_8024162C_C72AAC /* C73940 802424C0 0260302D */ daddu $a2, $s3, $zero /* C73944 802424C4 0280202D */ daddu $a0, $s4, $zero /* C73948 802424C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s index e93ff16833..2df785288f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -46,7 +46,7 @@ glabel func_80242B58_C73FD8 /* C7407C 80242BFC 8E2200B0 */ lw $v0, 0xb0($s1) /* C74080 80242C00 30420004 */ andi $v0, $v0, 4 /* C74084 80242C04 10400020 */ beqz $v0, .L80242C88 -/* C74088 80242C08 00000000 */ nop +/* C74088 80242C08 00000000 */ nop .L80242C0C: /* C7408C 80242C0C 2404F7FF */ addiu $a0, $zero, -0x801 /* C74090 80242C10 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80242B58_C73FD8 /* C74108 80242C88 8E420070 */ lw $v0, 0x70($s2) /* C7410C 80242C8C 2842001E */ slti $v0, $v0, 0x1e /* C74110 80242C90 10400009 */ beqz $v0, .L80242CB8 -/* C74114 80242C94 00000000 */ nop +/* C74114 80242C94 00000000 */ nop /* C74118 80242C98 8E22006C */ lw $v0, 0x6c($s1) /* C7411C 80242C9C 14400006 */ bnez $v0, .L80242CB8 -/* C74120 80242CA0 00000000 */ nop +/* C74120 80242CA0 00000000 */ nop /* C74124 80242CA4 0C0909D1 */ jal func_80242744_C73BC4 /* C74128 80242CA8 0240202D */ daddu $a0, $s2, $zero /* C7412C 80242CAC 10400002 */ beqz $v0, .L80242CB8 @@ -104,7 +104,7 @@ glabel func_80242B58_C73FD8 /* C7414C 80242CCC 00220821 */ addu $at, $at, $v0 /* C74150 80242CD0 8C2256A0 */ lw $v0, %lo(D_802456A0)($at) /* C74154 80242CD4 00400008 */ jr $v0 -/* C74158 80242CD8 00000000 */ nop +/* C74158 80242CD8 00000000 */ nop /* C7415C 80242CDC 0240202D */ daddu $a0, $s2, $zero /* C74160 80242CE0 0260282D */ daddu $a1, $s3, $zero /* C74164 80242CE4 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80242B58_C73FD8 /* C74174 80242CF4 0C0125AE */ jal func_800496B8 /* C74178 80242CF8 0280302D */ daddu $a2, $s4, $zero /* C7417C 80242CFC 08090B79 */ j .L80242DE4 -/* C74180 80242D00 00000000 */ nop +/* C74180 80242D00 00000000 */ nop /* C74184 80242D04 0240202D */ daddu $a0, $s2, $zero /* C74188 80242D08 0260282D */ daddu $a1, $s3, $zero -/* C7418C 80242D0C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C7418C 80242D0C 0C0126D1 */ jal func_80049B44 /* C74190 80242D10 0280302D */ daddu $a2, $s4, $zero /* C74194 80242D14 0240202D */ daddu $a0, $s2, $zero /* C74198 80242D18 0260282D */ daddu $a1, $s3, $zero /* C7419C 80242D1C 0C012701 */ jal func_80049C04 /* C741A0 80242D20 0280302D */ daddu $a2, $s4, $zero /* C741A4 80242D24 08090B79 */ j .L80242DE4 -/* C741A8 80242D28 00000000 */ nop +/* C741A8 80242D28 00000000 */ nop /* C741AC 80242D2C 0240202D */ daddu $a0, $s2, $zero /* C741B0 80242D30 0260282D */ daddu $a1, $s3, $zero /* C741B4 80242D34 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80242B58_C73FD8 /* C741C4 80242D44 0C0127B3 */ jal func_80049ECC /* C741C8 80242D48 0280302D */ daddu $a2, $s4, $zero /* C741CC 80242D4C 08090B79 */ j .L80242DE4 -/* C741D0 80242D50 00000000 */ nop +/* C741D0 80242D50 00000000 */ nop /* C741D4 80242D54 0240202D */ daddu $a0, $s2, $zero /* C741D8 80242D58 0260282D */ daddu $a1, $s3, $zero /* C741DC 80242D5C 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80242B58_C73FD8 /* C741EC 80242D6C 0C012849 */ jal func_8004A124 /* C741F0 80242D70 0280302D */ daddu $a2, $s4, $zero /* C741F4 80242D74 08090B79 */ j .L80242DE4 -/* C741F8 80242D78 00000000 */ nop +/* C741F8 80242D78 00000000 */ nop /* C741FC 80242D7C 0240202D */ daddu $a0, $s2, $zero /* C74200 80242D80 0260282D */ daddu $a1, $s3, $zero /* C74204 80242D84 0C0128FA */ jal func_8004A3E8 /* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero /* C7420C 80242D8C 08090B79 */ j .L80242DE4 -/* C74210 80242D90 00000000 */ nop -/* C74214 80242D94 0C09094F */ jal kzn_08_UnkNpcAIFunc6 +/* C74210 80242D90 00000000 */ nop +/* C74214 80242D94 0C09094F */ jal func_8024253C_C739BC /* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero -/* C7421C 80242D9C 0C09096A */ jal kzn_08_UnkNpcAIFunc7 +/* C7421C 80242D9C 0C09096A */ jal func_802425A8_C73A28 /* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero /* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) /* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 /* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 -/* C74230 80242DB0 00000000 */ nop -/* C74234 80242DB4 0C090986 */ jal kzn_08_UnkNpcAIFunc8 +/* C74230 80242DB0 00000000 */ nop +/* C74234 80242DB4 0C090986 */ jal func_80242618_C73A98 /* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero /* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) /* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 /* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 -/* C74248 80242DC8 00000000 */ nop -/* C7424C 80242DCC 0C0909BC */ jal kzn_08_UnkNpcAIFunc5 +/* C74248 80242DC8 00000000 */ nop +/* C7424C 80242DCC 0C0909BC */ jal func_802426F0_C73B70 /* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero /* C74254 80242DD4 08090B79 */ j .L80242DE4 -/* C74258 80242DD8 00000000 */ nop +/* C74258 80242DD8 00000000 */ nop /* C7425C 80242DDC 0C0129CF */ jal func_8004A73C /* C74260 80242DE0 0240202D */ daddu $a0, $s2, $zero .L80242DE4: diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s index 546079b9c8..290f922bcf 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -46,7 +46,7 @@ glabel func_8024163C_C7831C /* C783C0 802416E0 8E2200B0 */ lw $v0, 0xb0($s1) /* C783C4 802416E4 30420004 */ andi $v0, $v0, 4 /* C783C8 802416E8 10400020 */ beqz $v0, .L8024176C -/* C783CC 802416EC 00000000 */ nop +/* C783CC 802416EC 00000000 */ nop .L802416F0: /* C783D0 802416F0 2404F7FF */ addiu $a0, $zero, -0x801 /* C783D4 802416F4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024163C_C7831C /* C7844C 8024176C 8E420070 */ lw $v0, 0x70($s2) /* C78450 80241770 2842001E */ slti $v0, $v0, 0x1e /* C78454 80241774 10400009 */ beqz $v0, .L8024179C -/* C78458 80241778 00000000 */ nop +/* C78458 80241778 00000000 */ nop /* C7845C 8024177C 8E22006C */ lw $v0, 0x6c($s1) /* C78460 80241780 14400006 */ bnez $v0, .L8024179C -/* C78464 80241784 00000000 */ nop +/* C78464 80241784 00000000 */ nop /* C78468 80241788 0C09048A */ jal func_80241228_C77F08 /* C7846C 8024178C 0240202D */ daddu $a0, $s2, $zero /* C78470 80241790 10400002 */ beqz $v0, .L8024179C @@ -104,7 +104,7 @@ glabel func_8024163C_C7831C /* C78490 802417B0 00220821 */ addu $at, $at, $v0 /* C78494 802417B4 8C227278 */ lw $v0, %lo(D_80247278)($at) /* C78498 802417B8 00400008 */ jr $v0 -/* C7849C 802417BC 00000000 */ nop +/* C7849C 802417BC 00000000 */ nop /* C784A0 802417C0 0240202D */ daddu $a0, $s2, $zero /* C784A4 802417C4 0260282D */ daddu $a1, $s3, $zero /* C784A8 802417C8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024163C_C7831C /* C784B8 802417D8 0C0125AE */ jal func_800496B8 /* C784BC 802417DC 0280302D */ daddu $a2, $s4, $zero /* C784C0 802417E0 08090632 */ j .L802418C8 -/* C784C4 802417E4 00000000 */ nop +/* C784C4 802417E4 00000000 */ nop /* C784C8 802417E8 0240202D */ daddu $a0, $s2, $zero /* C784CC 802417EC 0260282D */ daddu $a1, $s3, $zero -/* C784D0 802417F0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C784D0 802417F0 0C0126D1 */ jal func_80049B44 /* C784D4 802417F4 0280302D */ daddu $a2, $s4, $zero /* C784D8 802417F8 0240202D */ daddu $a0, $s2, $zero /* C784DC 802417FC 0260282D */ daddu $a1, $s3, $zero /* C784E0 80241800 0C012701 */ jal func_80049C04 /* C784E4 80241804 0280302D */ daddu $a2, $s4, $zero /* C784E8 80241808 08090632 */ j .L802418C8 -/* C784EC 8024180C 00000000 */ nop +/* C784EC 8024180C 00000000 */ nop /* C784F0 80241810 0240202D */ daddu $a0, $s2, $zero /* C784F4 80241814 0260282D */ daddu $a1, $s3, $zero /* C784F8 80241818 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024163C_C7831C /* C78508 80241828 0C0127B3 */ jal func_80049ECC /* C7850C 8024182C 0280302D */ daddu $a2, $s4, $zero /* C78510 80241830 08090632 */ j .L802418C8 -/* C78514 80241834 00000000 */ nop +/* C78514 80241834 00000000 */ nop /* C78518 80241838 0240202D */ daddu $a0, $s2, $zero /* C7851C 8024183C 0260282D */ daddu $a1, $s3, $zero /* C78520 80241840 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024163C_C7831C /* C78530 80241850 0C012849 */ jal func_8004A124 /* C78534 80241854 0280302D */ daddu $a2, $s4, $zero /* C78538 80241858 08090632 */ j .L802418C8 -/* C7853C 8024185C 00000000 */ nop +/* C7853C 8024185C 00000000 */ nop /* C78540 80241860 0240202D */ daddu $a0, $s2, $zero /* C78544 80241864 0260282D */ daddu $a1, $s3, $zero /* C78548 80241868 0C0128FA */ jal func_8004A3E8 /* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero /* C78550 80241870 08090632 */ j .L802418C8 -/* C78554 80241874 00000000 */ nop -/* C78558 80241878 0C090408 */ jal kzn_09_UnkNpcAIFunc6 +/* C78554 80241874 00000000 */ nop +/* C78558 80241878 0C090408 */ jal func_80241020_C77D00 /* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero -/* C78560 80241880 0C090423 */ jal kzn_09_UnkNpcAIFunc7 +/* C78560 80241880 0C090423 */ jal func_8024108C_C77D6C /* C78564 80241884 0240202D */ daddu $a0, $s2, $zero /* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) /* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 /* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 -/* C78574 80241894 00000000 */ nop -/* C78578 80241898 0C09043F */ jal kzn_09_UnkNpcAIFunc8 +/* C78574 80241894 00000000 */ nop +/* C78578 80241898 0C09043F */ jal func_802410FC_C77DDC /* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero /* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) /* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 /* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 -/* C7858C 802418AC 00000000 */ nop -/* C78590 802418B0 0C090475 */ jal kzn_09_UnkNpcAIFunc5 +/* C7858C 802418AC 00000000 */ nop +/* C78590 802418B0 0C090475 */ jal func_802411D4_C77EB4 /* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero /* C78598 802418B8 08090632 */ j .L802418C8 -/* C7859C 802418BC 00000000 */ nop +/* C7859C 802418BC 00000000 */ nop /* C785A0 802418C0 0C0129CF */ jal func_8004A73C /* C785A4 802418C4 0240202D */ daddu $a0, $s2, $zero .L802418C8: diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index 0707daf779..ff08eda5f2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -55,7 +55,7 @@ glabel func_80242D58_C79A38 /* C79AFC 80242E1C 8E2200B0 */ lw $v0, 0xb0($s1) /* C79B00 80242E20 30420004 */ andi $v0, $v0, 4 /* C79B04 80242E24 10400047 */ beqz $v0, .L80242F44 -/* C79B08 80242E28 00000000 */ nop +/* C79B08 80242E28 00000000 */ nop .L80242E2C: /* C79B0C 80242E2C AE600070 */ sw $zero, 0x70($s3) /* C79B10 80242E30 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80242D58_C79A38 /* C79BB4 80242ED4 24020028 */ addiu $v0, $zero, 0x28 /* C79BB8 80242ED8 AFA2001C */ sw $v0, 0x1c($sp) /* C79BBC 80242EDC 44833000 */ mtc1 $v1, $f6 -/* C79BC0 80242EE0 00000000 */ nop +/* C79BC0 80242EE0 00000000 */ nop /* C79BC4 80242EE4 468031A0 */ cvt.s.w $f6, $f6 /* C79BC8 80242EE8 44073000 */ mfc1 $a3, $f6 /* C79BCC 80242EEC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80242D58_C79A38 /* C79C84 80242FA4 10600015 */ beqz $v1, .L80242FFC /* C79C88 80242FA8 0260202D */ daddu $a0, $s3, $zero /* C79C8C 80242FAC 08090C41 */ j .L80243104 -/* C79C90 80242FB0 00000000 */ nop +/* C79C90 80242FB0 00000000 */ nop .L80242FB4: /* C79C94 80242FB4 1062001C */ beq $v1, $v0, .L80243028 /* C79C98 80242FB8 24020003 */ addiu $v0, $zero, 3 /* C79C9C 80242FBC 10620035 */ beq $v1, $v0, .L80243094 /* C79CA0 80242FC0 0260202D */ daddu $a0, $s3, $zero /* C79CA4 80242FC4 08090C41 */ j .L80243104 -/* C79CA8 80242FC8 00000000 */ nop +/* C79CA8 80242FC8 00000000 */ nop .L80242FCC: /* C79CAC 80242FCC 2402000E */ addiu $v0, $zero, 0xe /* C79CB0 80242FD0 1062003F */ beq $v1, $v0, .L802430D0 @@ -177,9 +177,9 @@ glabel func_80242D58_C79A38 /* C79CC4 80242FE4 10620040 */ beq $v1, $v0, .L802430E8 /* C79CC8 80242FE8 24020063 */ addiu $v0, $zero, 0x63 /* C79CCC 80242FEC 10620043 */ beq $v1, $v0, .L802430FC -/* C79CD0 80242FF0 00000000 */ nop +/* C79CD0 80242FF0 00000000 */ nop /* C79CD4 80242FF4 08090C41 */ j .L80243104 -/* C79CD8 80242FF8 00000000 */ nop +/* C79CD8 80242FF8 00000000 */ nop .L80242FFC: /* C79CDC 80242FFC 0280282D */ daddu $a1, $s4, $zero /* C79CE0 80243000 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80242D58_C79A38 /* C79CF8 80243018 0C0125AE */ jal func_800496B8 /* C79CFC 8024301C 02A0302D */ daddu $a2, $s5, $zero /* C79D00 80243020 08090C41 */ j .L80243104 -/* C79D04 80243024 00000000 */ nop +/* C79D04 80243024 00000000 */ nop .L80243028: /* C79D08 80243028 0260202D */ daddu $a0, $s3, $zero /* C79D0C 8024302C 0280282D */ daddu $a1, $s4, $zero -/* C79D10 80243030 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C79D10 80243030 0C0126D1 */ jal func_80049B44 /* C79D14 80243034 02A0302D */ daddu $a2, $s5, $zero /* C79D18 80243038 8E230088 */ lw $v1, 0x88($s1) /* C79D1C 8024303C 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80242D58_C79A38 /* C79D78 80243098 0C012701 */ jal func_80049C04 /* C79D7C 8024309C 02A0302D */ daddu $a2, $s5, $zero /* C79D80 802430A0 08090C41 */ j .L80243104 -/* C79D84 802430A4 00000000 */ nop +/* C79D84 802430A4 00000000 */ nop .L802430A8: /* C79D88 802430A8 0260202D */ daddu $a0, $s3, $zero /* C79D8C 802430AC 0280282D */ daddu $a1, $s4, $zero -/* C79D90 802430B0 0C090A71 */ jal kzn_09_set_script_owner_npc_anim +/* C79D90 802430B0 0C090A71 */ jal func_802429C4_C796A4 /* C79D94 802430B4 02A0302D */ daddu $a2, $s5, $zero /* C79D98 802430B8 0260202D */ daddu $a0, $s3, $zero .L802430BC: @@ -240,20 +240,20 @@ glabel func_80242D58_C79A38 /* C79DA0 802430C0 0C090A90 */ jal func_80242A40_C79720 /* C79DA4 802430C4 02A0302D */ daddu $a2, $s5, $zero /* C79DA8 802430C8 08090C41 */ j .L80243104 -/* C79DAC 802430CC 00000000 */ nop +/* C79DAC 802430CC 00000000 */ nop .L802430D0: /* C79DB0 802430D0 0260202D */ daddu $a0, $s3, $zero /* C79DB4 802430D4 0280282D */ daddu $a1, $s4, $zero -/* C79DB8 802430D8 0C090ADD */ jal kzn_09_UnkNpcAIFunc12 +/* C79DB8 802430D8 0C090ADD */ jal func_80242B74_C79854 /* C79DBC 802430DC 02A0302D */ daddu $a2, $s5, $zero /* C79DC0 802430E0 08090C41 */ j .L80243104 -/* C79DC4 802430E4 00000000 */ nop +/* C79DC4 802430E4 00000000 */ nop .L802430E8: /* C79DC8 802430E8 0280282D */ daddu $a1, $s4, $zero -/* C79DCC 802430EC 0C090B36 */ jal kzn_09_set_script_owner_npc_col_height +/* C79DCC 802430EC 0C090B36 */ jal func_80242CD8_C799B8 /* C79DD0 802430F0 02A0302D */ daddu $a2, $s5, $zero /* C79DD4 802430F4 08090C41 */ j .L80243104 -/* C79DD8 802430F8 00000000 */ nop +/* C79DD8 802430F8 00000000 */ nop .L802430FC: /* C79DDC 802430FC 0C0129CF */ jal func_8004A73C /* C79DE0 80243100 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80242D58_C79A38 /* C79E34 80243154 00220821 */ addu $at, $at, $v0 /* C79E38 80243158 8C227440 */ lw $v0, %lo(D_80247440)($at) /* C79E3C 8024315C 00400008 */ jr $v0 -/* C79E40 80243160 00000000 */ nop +/* C79E40 80243160 00000000 */ nop /* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) /* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 /* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s index 803fd09a9d..4bd6fb2bba 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s @@ -9,8 +9,8 @@ glabel func_802404EC_C7E66C /* C7E67C 802404FC F7B40018 */ sdc1 $f20, 0x18($sp) /* C7E680 80240500 C60C0090 */ lwc1 $f12, 0x90($s0) /* C7E684 80240504 46806320 */ cvt.s.w $f12, $f12 -/* C7E688 80240508 3C018024 */ lui $at, %hi(D_80242000) -/* C7E68C 8024050C D4342000 */ ldc1 $f20, %lo(D_80242000)($at) +/* C7E688 80240508 3C018024 */ lui $at, %hi(func_80242000_C48BE0) +/* C7E68C 8024050C D4342000 */ ldc1 $f20, %lo(func_80242000_C48BE0)($at) /* C7E690 80240510 46006307 */ neg.s $f12, $f12 /* C7E694 80240514 46006321 */ cvt.d.s $f12, $f12 /* C7E698 80240518 46346301 */ sub.d $f12, $f12, $f20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 6d5c22eb2e..14d795b517 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -83,7 +83,7 @@ glabel func_8024176C_C8190C /* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero /* C81A40 802418A0 0280202D */ daddu $a0, $s4, $zero /* C81A44 802418A4 0200282D */ daddu $a1, $s0, $zero -/* C81A48 802418A8 0C09030E */ jal kzn_11_UnkNpcAIFunc1 +/* C81A48 802418A8 0C09030E */ jal func_80240C38_C80DD8 /* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero /* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero /* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024176C_C8190C /* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero /* C81A68 802418C8 0280202D */ daddu $a0, $s4, $zero /* C81A6C 802418CC 0200282D */ daddu $a1, $s0, $zero -/* C81A70 802418D0 0C09040F */ jal kzn_11_UnkNpcAIFunc2 +/* C81A70 802418D0 0C09040F */ jal func_8024103C_C811DC /* C81A74 802418D4 0260302D */ daddu $a2, $s3, $zero /* C81A78 802418D8 0280202D */ daddu $a0, $s4, $zero /* C81A7C 802418DC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024176C_C8190C /* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero /* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero /* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C81AB0 80241910 0C090495 */ jal kzn_11_UnkNpcAIFunc3 +/* C81AB0 80241910 0C090495 */ jal func_80241254_C813F4 /* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero /* C81AB8 80241918 0809064D */ j .L80241934 /* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index 6468cd9b29..cfd3fa8196 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -84,7 +84,7 @@ glabel func_80241D64_C81F04 /* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero /* C8203C 80241E9C 0280202D */ daddu $a0, $s4, $zero /* C82040 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C82044 80241EA4 0C09030E */ jal kzn_11_UnkNpcAIFunc1 +/* C82044 80241EA4 0C09030E */ jal func_80240C38_C80DD8 /* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero /* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero @@ -94,7 +94,7 @@ glabel func_80241D64_C81F04 /* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero /* C82064 80241EC4 0280202D */ daddu $a0, $s4, $zero /* C82068 80241EC8 0200282D */ daddu $a1, $s0, $zero -/* C8206C 80241ECC 0C09040F */ jal kzn_11_UnkNpcAIFunc2 +/* C8206C 80241ECC 0C09040F */ jal func_8024103C_C811DC /* C82070 80241ED0 0260302D */ daddu $a2, $s3, $zero /* C82074 80241ED4 0280202D */ daddu $a0, $s4, $zero /* C82078 80241ED8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index b74f6a2dad..6bc94256f2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -46,7 +46,7 @@ glabel func_8024092C_C863DC /* C86480 802409D0 8E2200B0 */ lw $v0, 0xb0($s1) /* C86484 802409D4 30420004 */ andi $v0, $v0, 4 /* C86488 802409D8 10400020 */ beqz $v0, .L80240A5C -/* C8648C 802409DC 00000000 */ nop +/* C8648C 802409DC 00000000 */ nop .L802409E0: /* C86490 802409E0 2404F7FF */ addiu $a0, $zero, -0x801 /* C86494 802409E4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024092C_C863DC /* C8650C 80240A5C 8E420070 */ lw $v0, 0x70($s2) /* C86510 80240A60 2842001E */ slti $v0, $v0, 0x1e /* C86514 80240A64 10400009 */ beqz $v0, .L80240A8C -/* C86518 80240A68 00000000 */ nop +/* C86518 80240A68 00000000 */ nop /* C8651C 80240A6C 8E22006C */ lw $v0, 0x6c($s1) /* C86520 80240A70 14400006 */ bnez $v0, .L80240A8C -/* C86524 80240A74 00000000 */ nop +/* C86524 80240A74 00000000 */ nop /* C86528 80240A78 0C090146 */ jal func_80240518_C85FC8 /* C8652C 80240A7C 0240202D */ daddu $a0, $s2, $zero /* C86530 80240A80 10400002 */ beqz $v0, .L80240A8C @@ -104,7 +104,7 @@ glabel func_8024092C_C863DC /* C86550 80240AA0 00220821 */ addu $at, $at, $v0 /* C86554 80240AA4 8C2263A8 */ lw $v0, %lo(D_802463A8)($at) /* C86558 80240AA8 00400008 */ jr $v0 -/* C8655C 80240AAC 00000000 */ nop +/* C8655C 80240AAC 00000000 */ nop /* C86560 80240AB0 0240202D */ daddu $a0, $s2, $zero /* C86564 80240AB4 0260282D */ daddu $a1, $s3, $zero /* C86568 80240AB8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024092C_C863DC /* C86578 80240AC8 0C0125AE */ jal func_800496B8 /* C8657C 80240ACC 0280302D */ daddu $a2, $s4, $zero /* C86580 80240AD0 080902EE */ j .L80240BB8 -/* C86584 80240AD4 00000000 */ nop +/* C86584 80240AD4 00000000 */ nop /* C86588 80240AD8 0240202D */ daddu $a0, $s2, $zero /* C8658C 80240ADC 0260282D */ daddu $a1, $s3, $zero -/* C86590 80240AE0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C86590 80240AE0 0C0126D1 */ jal func_80049B44 /* C86594 80240AE4 0280302D */ daddu $a2, $s4, $zero /* C86598 80240AE8 0240202D */ daddu $a0, $s2, $zero /* C8659C 80240AEC 0260282D */ daddu $a1, $s3, $zero /* C865A0 80240AF0 0C012701 */ jal func_80049C04 /* C865A4 80240AF4 0280302D */ daddu $a2, $s4, $zero /* C865A8 80240AF8 080902EE */ j .L80240BB8 -/* C865AC 80240AFC 00000000 */ nop +/* C865AC 80240AFC 00000000 */ nop /* C865B0 80240B00 0240202D */ daddu $a0, $s2, $zero /* C865B4 80240B04 0260282D */ daddu $a1, $s3, $zero /* C865B8 80240B08 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024092C_C863DC /* C865C8 80240B18 0C0127B3 */ jal func_80049ECC /* C865CC 80240B1C 0280302D */ daddu $a2, $s4, $zero /* C865D0 80240B20 080902EE */ j .L80240BB8 -/* C865D4 80240B24 00000000 */ nop +/* C865D4 80240B24 00000000 */ nop /* C865D8 80240B28 0240202D */ daddu $a0, $s2, $zero /* C865DC 80240B2C 0260282D */ daddu $a1, $s3, $zero /* C865E0 80240B30 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024092C_C863DC /* C865F0 80240B40 0C012849 */ jal func_8004A124 /* C865F4 80240B44 0280302D */ daddu $a2, $s4, $zero /* C865F8 80240B48 080902EE */ j .L80240BB8 -/* C865FC 80240B4C 00000000 */ nop +/* C865FC 80240B4C 00000000 */ nop /* C86600 80240B50 0240202D */ daddu $a0, $s2, $zero /* C86604 80240B54 0260282D */ daddu $a1, $s3, $zero /* C86608 80240B58 0C0128FA */ jal func_8004A3E8 /* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero /* C86610 80240B60 080902EE */ j .L80240BB8 -/* C86614 80240B64 00000000 */ nop -/* C86618 80240B68 0C0900C4 */ jal kzn_17_UnkNpcAIFunc6 +/* C86614 80240B64 00000000 */ nop +/* C86618 80240B68 0C0900C4 */ jal func_80240310_C85DC0 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero -/* C86620 80240B70 0C0900DF */ jal kzn_17_UnkNpcAIFunc7 +/* C86620 80240B70 0C0900DF */ jal func_8024037C_C85E2C /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero /* C86628 80240B78 8E430070 */ lw $v1, 0x70($s2) /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 /* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 -/* C86634 80240B84 00000000 */ nop -/* C86638 80240B88 0C0900FB */ jal kzn_17_UnkNpcAIFunc8 +/* C86634 80240B84 00000000 */ nop +/* C86638 80240B88 0C0900FB */ jal func_802403EC_C85E9C /* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero /* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 /* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 -/* C8664C 80240B9C 00000000 */ nop -/* C86650 80240BA0 0C090131 */ jal kzn_17_UnkNpcAIFunc5 +/* C8664C 80240B9C 00000000 */ nop +/* C86650 80240BA0 0C090131 */ jal func_802404C4_C85F74 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero /* C86658 80240BA8 080902EE */ j .L80240BB8 -/* C8665C 80240BAC 00000000 */ nop +/* C8665C 80240BAC 00000000 */ nop /* C86660 80240BB0 0C0129CF */ jal func_8004A73C /* C86664 80240BB4 0240202D */ daddu $a0, $s2, $zero .L80240BB8: diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index 8af99721a7..3ddaf2d8ea 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -55,7 +55,7 @@ glabel func_80242048_C87AF8 /* C87BBC 8024210C 8E2200B0 */ lw $v0, 0xb0($s1) /* C87BC0 80242110 30420004 */ andi $v0, $v0, 4 /* C87BC4 80242114 10400047 */ beqz $v0, .L80242234 -/* C87BC8 80242118 00000000 */ nop +/* C87BC8 80242118 00000000 */ nop .L8024211C: /* C87BCC 8024211C AE600070 */ sw $zero, 0x70($s3) /* C87BD0 80242120 A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80242048_C87AF8 /* C87C74 802421C4 24020028 */ addiu $v0, $zero, 0x28 /* C87C78 802421C8 AFA2001C */ sw $v0, 0x1c($sp) /* C87C7C 802421CC 44833000 */ mtc1 $v1, $f6 -/* C87C80 802421D0 00000000 */ nop +/* C87C80 802421D0 00000000 */ nop /* C87C84 802421D4 468031A0 */ cvt.s.w $f6, $f6 /* C87C88 802421D8 44073000 */ mfc1 $a3, $f6 /* C87C8C 802421DC 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80242048_C87AF8 /* C87D44 80242294 10600015 */ beqz $v1, .L802422EC /* C87D48 80242298 0260202D */ daddu $a0, $s3, $zero /* C87D4C 8024229C 080908FD */ j .L802423F4 -/* C87D50 802422A0 00000000 */ nop +/* C87D50 802422A0 00000000 */ nop .L802422A4: /* C87D54 802422A4 1062001C */ beq $v1, $v0, .L80242318 /* C87D58 802422A8 24020003 */ addiu $v0, $zero, 3 /* C87D5C 802422AC 10620035 */ beq $v1, $v0, .L80242384 /* C87D60 802422B0 0260202D */ daddu $a0, $s3, $zero /* C87D64 802422B4 080908FD */ j .L802423F4 -/* C87D68 802422B8 00000000 */ nop +/* C87D68 802422B8 00000000 */ nop .L802422BC: /* C87D6C 802422BC 2402000E */ addiu $v0, $zero, 0xe /* C87D70 802422C0 1062003F */ beq $v1, $v0, .L802423C0 @@ -177,9 +177,9 @@ glabel func_80242048_C87AF8 /* C87D84 802422D4 10620040 */ beq $v1, $v0, .L802423D8 /* C87D88 802422D8 24020063 */ addiu $v0, $zero, 0x63 /* C87D8C 802422DC 10620043 */ beq $v1, $v0, .L802423EC -/* C87D90 802422E0 00000000 */ nop +/* C87D90 802422E0 00000000 */ nop /* C87D94 802422E4 080908FD */ j .L802423F4 -/* C87D98 802422E8 00000000 */ nop +/* C87D98 802422E8 00000000 */ nop .L802422EC: /* C87D9C 802422EC 0280282D */ daddu $a1, $s4, $zero /* C87DA0 802422F0 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80242048_C87AF8 /* C87DB8 80242308 0C0125AE */ jal func_800496B8 /* C87DBC 8024230C 02A0302D */ daddu $a2, $s5, $zero /* C87DC0 80242310 080908FD */ j .L802423F4 -/* C87DC4 80242314 00000000 */ nop +/* C87DC4 80242314 00000000 */ nop .L80242318: /* C87DC8 80242318 0260202D */ daddu $a0, $s3, $zero /* C87DCC 8024231C 0280282D */ daddu $a1, $s4, $zero -/* C87DD0 80242320 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* C87DD0 80242320 0C0126D1 */ jal func_80049B44 /* C87DD4 80242324 02A0302D */ daddu $a2, $s5, $zero /* C87DD8 80242328 8E230088 */ lw $v1, 0x88($s1) /* C87DDC 8024232C 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80242048_C87AF8 /* C87E38 80242388 0C012701 */ jal func_80049C04 /* C87E3C 8024238C 02A0302D */ daddu $a2, $s5, $zero /* C87E40 80242390 080908FD */ j .L802423F4 -/* C87E44 80242394 00000000 */ nop +/* C87E44 80242394 00000000 */ nop .L80242398: /* C87E48 80242398 0260202D */ daddu $a0, $s3, $zero /* C87E4C 8024239C 0280282D */ daddu $a1, $s4, $zero -/* C87E50 802423A0 0C09072D */ jal kzn_17_set_script_owner_npc_anim +/* C87E50 802423A0 0C09072D */ jal func_80241CB4_C87764 /* C87E54 802423A4 02A0302D */ daddu $a2, $s5, $zero /* C87E58 802423A8 0260202D */ daddu $a0, $s3, $zero .L802423AC: @@ -240,20 +240,20 @@ glabel func_80242048_C87AF8 /* C87E60 802423B0 0C09074C */ jal func_80241D30_C877E0 /* C87E64 802423B4 02A0302D */ daddu $a2, $s5, $zero /* C87E68 802423B8 080908FD */ j .L802423F4 -/* C87E6C 802423BC 00000000 */ nop +/* C87E6C 802423BC 00000000 */ nop .L802423C0: /* C87E70 802423C0 0260202D */ daddu $a0, $s3, $zero /* C87E74 802423C4 0280282D */ daddu $a1, $s4, $zero -/* C87E78 802423C8 0C090799 */ jal kzn_17_UnkNpcAIFunc12 +/* C87E78 802423C8 0C090799 */ jal func_80241E64_C87914 /* C87E7C 802423CC 02A0302D */ daddu $a2, $s5, $zero /* C87E80 802423D0 080908FD */ j .L802423F4 -/* C87E84 802423D4 00000000 */ nop +/* C87E84 802423D4 00000000 */ nop .L802423D8: /* C87E88 802423D8 0280282D */ daddu $a1, $s4, $zero -/* C87E8C 802423DC 0C0907F2 */ jal kzn_17_set_script_owner_npc_col_height +/* C87E8C 802423DC 0C0907F2 */ jal func_80241FC8_C87A78 /* C87E90 802423E0 02A0302D */ daddu $a2, $s5, $zero /* C87E94 802423E4 080908FD */ j .L802423F4 -/* C87E98 802423E8 00000000 */ nop +/* C87E98 802423E8 00000000 */ nop .L802423EC: /* C87E9C 802423EC 0C0129CF */ jal func_8004A73C /* C87EA0 802423F0 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80242048_C87AF8 /* C87EF4 80242444 00220821 */ addu $at, $at, $v0 /* C87EF8 80242448 8C226570 */ lw $v0, %lo(D_80246570)($at) /* C87EFC 8024244C 00400008 */ jr $v0 -/* C87F00 80242450 00000000 */ nop +/* C87F00 80242450 00000000 */ nop /* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) /* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 /* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s index 5c691d1fd6..bddca0a6e4 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s @@ -151,10 +151,10 @@ glabel func_80240E2C_C8E9DC /* C8EBEC 8024103C 24620008 */ addiu $v0, $v1, 8 /* C8EBF0 80241040 AC800004 */ sw $zero, 4($a0) /* C8EBF4 80241044 AD020000 */ sw $v0, ($t0) -/* C8EBF8 80241048 3C02DE00 */ lui $v0, %hi(D_DE003AD8) +/* C8EBF8 80241048 3C02DE00 */ lui $v0, 0xde00 /* C8EBFC 8024104C AC620000 */ sw $v0, ($v1) /* C8EC00 80241050 3C028024 */ lui $v0, %hi(D_80243AD8) -/* C8EC04 80241054 24423AD8 */ addiu $v0, $v0, %lo(D_DE003AD8) +/* C8EC04 80241054 24423AD8 */ addiu $v0, $v0, %lo(D_80243AD8) /* C8EC08 80241058 AC620004 */ sw $v0, 4($v1) .L8024105C: /* C8EC0C 8024105C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s index 60f09b5764..3d648810fd 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802413C0_C8EF70.s @@ -3,8 +3,8 @@ glabel func_802413C0_C8EF70 /* C8EF70 802413C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8EF74 802413C4 3C028024 */ lui $v0, %hi(D_80240E2C) -/* C8EF78 802413C8 24420E2C */ addiu $v0, $v0, %lo(D_80240E2C) +/* C8EF74 802413C4 3C028024 */ lui $v0, %hi(func_80240E2C_C8D61C) +/* C8EF78 802413C8 24420E2C */ addiu $v0, $v0, %lo(func_80240E2C_C8D61C) /* C8EF7C 802413CC AFA2001C */ sw $v0, 0x1c($sp) /* C8EF80 802413D0 2402000A */ addiu $v0, $zero, 0xa /* C8EF84 802413D4 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s index f13f8961fe..70268ad6bb 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s @@ -14,8 +14,8 @@ glabel func_8024140C_C8EFBC /* C8EFE0 80241430 0C0B2026 */ jal set_variable /* C8EFE4 80241434 0040302D */ daddu $a2, $v0, $zero /* C8EFE8 80241438 2402FFFF */ addiu $v0, $zero, -1 -/* C8EFEC 8024143C 3C058024 */ lui $a1, %hi(D_802413C0) -/* C8EFF0 80241440 24A513C0 */ addiu $a1, $a1, %lo(D_802413C0) +/* C8EFEC 8024143C 3C058024 */ lui $a1, %hi(func_802413C0_C8DB64) +/* C8EFF0 80241440 24A513C0 */ addiu $a1, $a1, %lo(func_802413C0_C8DB64) /* C8EFF4 80241444 3C018025 */ lui $at, %hi(D_80248380) /* C8EFF8 80241448 AC228380 */ sw $v0, %lo(D_80248380)($at) /* C8EFFC 8024144C 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s index 691a829efa..b9dcc26013 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s +++ b/asm/nonmatchings/world/area_kzn/kzn_20/C96240/func_80240310_C96240.s @@ -4,8 +4,8 @@ glabel func_80240310_C96240 /* C96240 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 /* C96244 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* C96248 80240318 3C108024 */ lui $s0, %hi(D_80241780) -/* C9624C 8024031C 26101780 */ addiu $s0, $s0, %lo(D_80241780) +/* C96248 80240318 3C108024 */ lui $s0, %hi(func_80241780_8ED5A0) +/* C9624C 8024031C 26101780 */ addiu $s0, $s0, %lo(func_80241780_8ED5A0) /* C96250 80240320 AFBF0018 */ sw $ra, 0x18($sp) /* C96254 80240324 AFB10014 */ sw $s1, 0x14($sp) /* C96258 80240328 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240310_C96240 /* C962BC 8024038C 28620010 */ slti $v0, $v1, 0x10 /* C962C0 80240390 1440FFFA */ bnez $v0, .L8024037C /* C962C4 80240394 24840004 */ addiu $a0, $a0, 4 -/* C962C8 80240398 3C108024 */ lui $s0, %hi(D_80241780) -/* C962CC 8024039C 26101780 */ addiu $s0, $s0, %lo(D_80241780) +/* C962C8 80240398 3C108024 */ lui $s0, %hi(func_80241780_8ED5A0) +/* C962CC 8024039C 26101780 */ addiu $s0, $s0, %lo(func_80241780_8ED5A0) /* C962D0 802403A0 0C00AB4B */ jal heap_free /* C962D4 802403A4 8E040000 */ lw $a0, ($s0) /* C962D8 802403A8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s index e173dddddc..9be6f41efe 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s @@ -9,8 +9,8 @@ glabel func_80240990_7EB6A0 /* 7EB6B0 802409A0 8C84014C */ lw $a0, 0x14c($a0) /* 7EB6B4 802409A4 24040008 */ addiu $a0, $zero, 8 /* 7EB6B8 802409A8 0040802D */ daddu $s0, $v0, $zero -/* 7EB6BC 802409AC 3C028024 */ lui $v0, %hi(D_802409FC) -/* 7EB6C0 802409B0 244209FC */ addiu $v0, $v0, %lo(D_802409FC) +/* 7EB6BC 802409AC 3C028024 */ lui $v0, %hi(func_802409FC_7EB3AC) +/* 7EB6C0 802409B0 244209FC */ addiu $v0, $v0, %lo(func_802409FC_7EB3AC) /* 7EB6C4 802409B4 0C00AB39 */ jal heap_malloc /* 7EB6C8 802409B8 AE020008 */ sw $v0, 8($s0) /* 7EB6CC 802409BC 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s index b71e4425b0..a026d490aa 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s @@ -3,8 +3,8 @@ glabel func_80241694_7EC3A4 /* 7EC3A4 80241694 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC3A8 80241698 3C058024 */ lui $a1, %hi(D_80241628) -/* 7EC3AC 8024169C 24A51628 */ addiu $a1, $a1, %lo(D_80241628) +/* 7EC3A8 80241698 3C058024 */ lui $a1, %hi(func_80241628_7EB2D4) +/* 7EC3AC 8024169C 24A51628 */ addiu $a1, $a1, %lo(func_80241628_7EB2D4) /* 7EC3B0 802416A0 AFBF0010 */ sw $ra, 0x10($sp) /* 7EC3B4 802416A4 0C048C8F */ jal bind_dynamic_entity_7 /* 7EC3B8 802416A8 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index c2d0caeeaf..1f098c09f1 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -141,7 +141,7 @@ glabel func_80243104_7EDE14 /* 7EE01C 8024330C 00000000 */ nop /* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero /* 7EE024 80243314 0260282D */ daddu $a1, $s3, $zero -/* 7EE028 80243318 0C090A5C */ jal mac_00_UnkNpcAIFunc1 +/* 7EE028 80243318 0C090A5C */ jal func_80242970_7ED680 /* 7EE02C 8024331C 02A0302D */ daddu $a2, $s5, $zero /* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero /* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80243104_7EDE14 /* 7EE05C 8024334C 00000000 */ nop /* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero /* 7EE064 80243354 0260282D */ daddu $a1, $s3, $zero -/* 7EE068 80243358 0C090B28 */ jal mac_00_NpcJumpFunc2 +/* 7EE068 80243358 0C090B28 */ jal func_80242CA0_7ED9B0 /* 7EE06C 8024335C 02A0302D */ daddu $a2, $s5, $zero /* 7EE070 80243360 0280202D */ daddu $a0, $s4, $zero /* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero -/* 7EE078 80243368 0C090B45 */ jal mac_00_NpcJumpFunc +/* 7EE078 80243368 0C090B45 */ jal func_80242D14_7EDA24 /* 7EE07C 8024336C 02A0302D */ daddu $a2, $s5, $zero /* 7EE080 80243370 08090CF6 */ j .L802433D8 /* 7EE084 80243374 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80243104_7EDE14 /* 7EE0AC 8024339C 00000000 */ nop /* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero /* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero -/* 7EE0B8 802433A8 0C090BF7 */ jal mac_00_UnkNpcDurationFlagFunc +/* 7EE0B8 802433A8 0C090BF7 */ jal func_80242FDC_7EDCEC /* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero /* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 /* 7EE0C4 802433B4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index 790c958201..0565f7f050 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -46,7 +46,7 @@ glabel func_80241C14_802494 /* 802538 80241CB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 80253C 80241CBC 30420004 */ andi $v0, $v0, 4 /* 802540 80241CC0 10400044 */ beqz $v0, .L80241DD4 -/* 802544 80241CC4 00000000 */ nop +/* 802544 80241CC4 00000000 */ nop .L80241CC8: /* 802548 80241CC8 2404F7FF */ addiu $a0, $zero, -0x801 /* 80254C 80241CCC AE800070 */ sw $zero, 0x70($s4) @@ -101,7 +101,7 @@ glabel func_80241C14_802494 /* 802600 80241D80 3C0142C8 */ lui $at, 0x42c8 /* 802604 80241D84 44812000 */ mtc1 $at, $f4 /* 802608 80241D88 44823000 */ mtc1 $v0, $f6 -/* 80260C 80241D8C 00000000 */ nop +/* 80260C 80241D8C 00000000 */ nop /* 802610 80241D90 468031A0 */ cvt.s.w $f6, $f6 /* 802614 80241D94 27A20044 */ addiu $v0, $sp, 0x44 /* 802618 80241D98 E7A00038 */ swc1 $f0, 0x38($sp) @@ -116,7 +116,7 @@ glabel func_80241C14_802494 /* 80263C 80241DBC 0C0372DF */ jal func_800DCB7C /* 802640 80241DC0 27A70040 */ addiu $a3, $sp, 0x40 /* 802644 80241DC4 10400003 */ beqz $v0, .L80241DD4 -/* 802648 80241DC8 00000000 */ nop +/* 802648 80241DC8 00000000 */ nop /* 80264C 80241DCC C7A0003C */ lwc1 $f0, 0x3c($sp) /* 802650 80241DD0 E640003C */ swc1 $f0, 0x3c($s2) .L80241DD4: @@ -128,7 +128,7 @@ glabel func_80241C14_802494 /* 802668 80241DE8 00220821 */ addu $at, $at, $v0 /* 80266C 80241DEC 8C2226F0 */ lw $v0, %lo(D_802626F0)($at) /* 802670 80241DF0 00400008 */ jr $v0 -/* 802674 80241DF4 00000000 */ nop +/* 802674 80241DF4 00000000 */ nop /* 802678 80241DF8 0280202D */ daddu $a0, $s4, $zero /* 80267C 80241DFC 0260282D */ daddu $a1, $s3, $zero /* 802680 80241E00 0C090420 */ jal func_80241080_801900 @@ -138,33 +138,33 @@ glabel func_80241C14_802494 /* 802690 80241E10 0C090476 */ jal func_802411D8_801A58 /* 802694 80241E14 02A0302D */ daddu $a2, $s5, $zero /* 802698 80241E18 080907BA */ j .L80241EE8 -/* 80269C 80241E1C 00000000 */ nop +/* 80269C 80241E1C 00000000 */ nop /* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8026A4 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8026A8 80241E28 0C090520 */ jal dup_mac_01_UnkNpcAIFunc1 +/* 8026A8 80241E28 0C090520 */ jal func_80241480_801D00 /* 8026AC 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero /* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero /* 8026B8 80241E38 0C090550 */ jal func_80241540_801DC0 /* 8026BC 80241E3C 02A0302D */ daddu $a2, $s5, $zero /* 8026C0 80241E40 080907BA */ j .L80241EE8 -/* 8026C4 80241E44 00000000 */ nop +/* 8026C4 80241E44 00000000 */ nop /* 8026C8 80241E48 0280202D */ daddu $a0, $s4, $zero /* 8026CC 80241E4C 0260282D */ daddu $a1, $s3, $zero /* 8026D0 80241E50 0C0905BF */ jal func_802416FC_801F7C /* 8026D4 80241E54 02A0302D */ daddu $a2, $s5, $zero /* 8026D8 80241E58 080907BA */ j .L80241EE8 -/* 8026DC 80241E5C 00000000 */ nop +/* 8026DC 80241E5C 00000000 */ nop /* 8026E0 80241E60 0280202D */ daddu $a0, $s4, $zero /* 8026E4 80241E64 0260282D */ daddu $a1, $s3, $zero -/* 8026E8 80241E68 0C0905EC */ jal dup_mac_01_NpcJumpFunc2 +/* 8026E8 80241E68 0C0905EC */ jal func_802417B0_802030 /* 8026EC 80241E6C 02A0302D */ daddu $a2, $s5, $zero /* 8026F0 80241E70 0280202D */ daddu $a0, $s4, $zero /* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero -/* 8026F8 80241E78 0C090609 */ jal dup_mac_01_NpcJumpFunc +/* 8026F8 80241E78 0C090609 */ jal func_80241824_8020A4 /* 8026FC 80241E7C 02A0302D */ daddu $a2, $s5, $zero /* 802700 80241E80 080907BA */ j .L80241EE8 -/* 802704 80241E84 00000000 */ nop +/* 802704 80241E84 00000000 */ nop /* 802708 80241E88 0280202D */ daddu $a0, $s4, $zero /* 80270C 80241E8C 0260282D */ daddu $a1, $s3, $zero /* 802710 80241E90 0C090627 */ jal func_8024189C_80211C @@ -174,19 +174,19 @@ glabel func_80241C14_802494 /* 802720 80241EA0 0C090673 */ jal func_802419CC_80224C /* 802724 80241EA4 02A0302D */ daddu $a2, $s5, $zero /* 802728 80241EA8 080907BA */ j .L80241EE8 -/* 80272C 80241EAC 00000000 */ nop +/* 80272C 80241EAC 00000000 */ nop /* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero /* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero -/* 802738 80241EB8 0C0906BB */ jal dup_mac_01_UnkNpcDurationFlagFunc +/* 802738 80241EB8 0C0906BB */ jal func_80241AEC_80236C /* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero /* 802740 80241EC0 080907BA */ j .L80241EE8 -/* 802744 80241EC4 00000000 */ nop +/* 802744 80241EC4 00000000 */ nop /* 802748 80241EC8 0280202D */ daddu $a0, $s4, $zero /* 80274C 80241ECC 0260282D */ daddu $a1, $s3, $zero /* 802750 80241ED0 0C0906D5 */ jal func_80241B54_8023D4 /* 802754 80241ED4 02A0302D */ daddu $a2, $s5, $zero /* 802758 80241ED8 080907BA */ j .L80241EE8 -/* 80275C 80241EDC 00000000 */ nop +/* 80275C 80241EDC 00000000 */ nop /* 802760 80241EE0 0C0129CF */ jal func_8004A73C /* 802764 80241EE4 0280202D */ daddu $a0, $s4, $zero .L80241EE8: diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s index f08b9a12df..122e58e4e4 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s @@ -9,8 +9,8 @@ glabel func_80242270_802AF0 /* 802B00 80242280 8C84014C */ lw $a0, 0x14c($a0) /* 802B04 80242284 24040008 */ addiu $a0, $zero, 8 /* 802B08 80242288 0040802D */ daddu $s0, $v0, $zero -/* 802B0C 8024228C 3C028024 */ lui $v0, %hi(D_802422DC) -/* 802B10 80242290 244222DC */ addiu $v0, $v0, %lo(D_802422DC) +/* 802B0C 8024228C 3C028024 */ lui $v0, %hi(func_802422DC_80183C) +/* 802B10 80242290 244222DC */ addiu $v0, $v0, %lo(func_802422DC_80183C) /* 802B14 80242294 0C00AB39 */ jal heap_malloc /* 802B18 80242298 AE020008 */ sw $v0, 8($s0) /* 802B1C 8024229C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s index 81c89c5482..52b2f84032 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s @@ -3,8 +3,8 @@ glabel func_80242F74_8037F4 /* 8037F4 80242F74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8037F8 80242F78 3C058024 */ lui $a1, %hi(D_80242F08) -/* 8037FC 80242F7C 24A52F08 */ addiu $a1, $a1, %lo(D_80242F08) +/* 8037F8 80242F78 3C058024 */ lui $a1, %hi(func_80242F08_801764) +/* 8037FC 80242F7C 24A52F08 */ addiu $a1, $a1, %lo(func_80242F08_801764) /* 803800 80242F80 AFBF0010 */ sw $ra, 0x10($sp) /* 803804 80242F84 0C048C8F */ jal bind_dynamic_entity_7 /* 803808 80242F88 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s index 41d1cd840e..d065269fb6 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243380_803C00.s @@ -53,8 +53,8 @@ glabel func_80243380_803C00 /* 803CC0 80243440 0C04E9C1 */ jal func_8013A704 /* 803CC4 80243444 E6020018 */ swc1 $f2, 0x18($s0) /* 803CC8 80243448 0000202D */ daddu $a0, $zero, $zero -/* 803CCC 8024344C 3C058024 */ lui $a1, %hi(D_80242FA4) -/* 803CD0 80243450 24A52FA4 */ addiu $a1, $a1, %lo(D_80242FA4) +/* 803CCC 8024344C 3C058024 */ lui $a1, %hi(func_80242FA4_8013F4) +/* 803CD0 80243450 24A52FA4 */ addiu $a1, $a1, %lo(func_80242FA4_8013F4) /* 803CD4 80243454 0C048C56 */ jal bind_dynamic_entity_3 /* 803CD8 80243458 AE020000 */ sw $v0, ($s0) /* 803CDC 8024345C 0260202D */ daddu $a0, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index c58e774790..2bbfba9024 100644 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -141,7 +141,7 @@ glabel func_802460E4_806964 /* 806B6C 802462EC 00000000 */ nop /* 806B70 802462F0 0280202D */ daddu $a0, $s4, $zero /* 806B74 802462F4 0260282D */ daddu $a1, $s3, $zero -/* 806B78 802462F8 0C091654 */ jal mac_01_UnkNpcAIFunc1 +/* 806B78 802462F8 0C091654 */ jal func_80245950_8061D0 /* 806B7C 802462FC 02A0302D */ daddu $a2, $s5, $zero /* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero /* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802460E4_806964 /* 806BAC 8024632C 00000000 */ nop /* 806BB0 80246330 0280202D */ daddu $a0, $s4, $zero /* 806BB4 80246334 0260282D */ daddu $a1, $s3, $zero -/* 806BB8 80246338 0C091720 */ jal mac_01_NpcJumpFunc2 +/* 806BB8 80246338 0C091720 */ jal func_80245C80_806500 /* 806BBC 8024633C 02A0302D */ daddu $a2, $s5, $zero /* 806BC0 80246340 0280202D */ daddu $a0, $s4, $zero /* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero -/* 806BC8 80246348 0C09173D */ jal mac_01_NpcJumpFunc +/* 806BC8 80246348 0C09173D */ jal func_80245CF4_806574 /* 806BCC 8024634C 02A0302D */ daddu $a2, $s5, $zero /* 806BD0 80246350 080918EE */ j .L802463B8 /* 806BD4 80246354 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802460E4_806964 /* 806BFC 8024637C 00000000 */ nop /* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero /* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero -/* 806C08 80246388 0C0917EF */ jal mac_01_UnkNpcDurationFlagFunc +/* 806C08 80246388 0C0917EF */ jal func_80245FBC_80683C /* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero /* 806C10 80246390 080918EE */ j .L802463B8 /* 806C14 80246394 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index c013e33e15..404d54d897 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -141,7 +141,7 @@ glabel func_802414C4_824784 /* 82498C 802416CC 00000000 */ nop /* 824990 802416D0 0280202D */ daddu $a0, $s4, $zero /* 824994 802416D4 0260282D */ daddu $a1, $s3, $zero -/* 824998 802416D8 0C09034C */ jal mac_02_UnkNpcAIFunc1 +/* 824998 802416D8 0C09034C */ jal func_80240D30_823FF0 /* 82499C 802416DC 02A0302D */ daddu $a2, $s5, $zero /* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero /* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802414C4_824784 /* 8249CC 8024170C 00000000 */ nop /* 8249D0 80241710 0280202D */ daddu $a0, $s4, $zero /* 8249D4 80241714 0260282D */ daddu $a1, $s3, $zero -/* 8249D8 80241718 0C090418 */ jal mac_02_NpcJumpFunc2 +/* 8249D8 80241718 0C090418 */ jal func_80241060_824320 /* 8249DC 8024171C 02A0302D */ daddu $a2, $s5, $zero /* 8249E0 80241720 0280202D */ daddu $a0, $s4, $zero /* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero -/* 8249E8 80241728 0C090435 */ jal mac_02_NpcJumpFunc +/* 8249E8 80241728 0C090435 */ jal func_802410D4_824394 /* 8249EC 8024172C 02A0302D */ daddu $a2, $s5, $zero /* 8249F0 80241730 080905E6 */ j .L80241798 /* 8249F4 80241734 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802414C4_824784 /* 824A1C 8024175C 00000000 */ nop /* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero /* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero -/* 824A28 80241768 0C0904E7 */ jal mac_02_UnkNpcDurationFlagFunc +/* 824A28 80241768 0C0904E7 */ jal func_8024139C_82465C /* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero /* 824A30 80241770 080905E6 */ j .L80241798 /* 824A34 80241774 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s index f3a127311c..0f44e0db3c 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s @@ -9,8 +9,8 @@ glabel func_80241B20_824DE0 /* 824DF0 80241B30 8C84014C */ lw $a0, 0x14c($a0) /* 824DF4 80241B34 24040008 */ addiu $a0, $zero, 8 /* 824DF8 80241B38 0040802D */ daddu $s0, $v0, $zero -/* 824DFC 80241B3C 3C028024 */ lui $v0, %hi(D_80241B8C) -/* 824E00 80241B40 24421B8C */ addiu $v0, $v0, %lo(D_80241B8C) +/* 824DFC 80241B3C 3C028024 */ lui $v0, %hi(func_80241B8C_823C5C) +/* 824E00 80241B40 24421B8C */ addiu $v0, $v0, %lo(func_80241B8C_823C5C) /* 824E04 80241B44 0C00AB39 */ jal heap_malloc /* 824E08 80241B48 AE020008 */ sw $v0, 8($s0) /* 824E0C 80241B4C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s index 7b8134fc4a..1e5a3768bc 100644 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s @@ -3,8 +3,8 @@ glabel func_80242824_825AE4 /* 825AE4 80242824 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825AE8 80242828 3C058024 */ lui $a1, %hi(D_802427B8) -/* 825AEC 8024282C 24A527B8 */ addiu $a1, $a1, %lo(D_802427B8) +/* 825AE8 80242828 3C058024 */ lui $a1, %hi(func_802427B8_823B84) +/* 825AEC 8024282C 24A527B8 */ addiu $a1, $a1, %lo(func_802427B8_823B84) /* 825AF0 80242830 AFBF0010 */ sw $ra, 0x10($sp) /* 825AF4 80242834 0C048C8F */ jal bind_dynamic_entity_7 /* 825AF8 80242838 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s index b667b6e728..ea12851c8f 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s @@ -9,8 +9,8 @@ glabel func_80240810_832010 /* 832020 80240820 8C84014C */ lw $a0, 0x14c($a0) /* 832024 80240824 24040008 */ addiu $a0, $zero, 8 /* 832028 80240828 0040802D */ daddu $s0, $v0, $zero -/* 83202C 8024082C 3C028024 */ lui $v0, %hi(D_8024087C) -/* 832030 80240830 2442087C */ addiu $v0, $v0, %lo(D_8024087C) +/* 83202C 8024082C 3C028024 */ lui $v0, %hi(func_8024087C_831B8C) +/* 832030 80240830 2442087C */ addiu $v0, $v0, %lo(func_8024087C_831B8C) /* 832034 80240834 0C00AB39 */ jal heap_malloc /* 832038 80240838 AE020008 */ sw $v0, 8($s0) /* 83203C 8024083C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s index cc777eddf3..64ebfd28bc 100644 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s @@ -3,8 +3,8 @@ glabel func_80241514_832D14 /* 832D14 80241514 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832D18 80241518 3C058024 */ lui $a1, %hi(D_802414A8) -/* 832D1C 8024151C 24A514A8 */ addiu $a1, $a1, %lo(D_802414A8) +/* 832D18 80241518 3C058024 */ lui $a1, %hi(func_802414A8_831AB4) +/* 832D1C 8024151C 24A514A8 */ addiu $a1, $a1, %lo(func_802414A8_831AB4) /* 832D20 80241520 AFBF0010 */ sw $ra, 0x10($sp) /* 832D24 80241524 0C048C8F */ jal bind_dynamic_entity_7 /* 832D28 80241528 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s index 7118e000f1..3fc3a2e370 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s @@ -9,8 +9,8 @@ glabel func_802407C0_843390 /* 8433A0 802407D0 8C84014C */ lw $a0, 0x14c($a0) /* 8433A4 802407D4 24040008 */ addiu $a0, $zero, 8 /* 8433A8 802407D8 0040802D */ daddu $s0, $v0, $zero -/* 8433AC 802407DC 3C028024 */ lui $v0, %hi(D_8024082C) -/* 8433B0 802407E0 2442082C */ addiu $v0, $v0, %lo(D_8024082C) +/* 8433AC 802407DC 3C028024 */ lui $v0, %hi(func_8024082C_84309C) +/* 8433B0 802407E0 2442082C */ addiu $v0, $v0, %lo(func_8024082C_84309C) /* 8433B4 802407E4 0C00AB39 */ jal heap_malloc /* 8433B8 802407E8 AE020008 */ sw $v0, 8($s0) /* 8433BC 802407EC 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s index 85b82638af..9d608a2949 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802414C4_844094.s @@ -3,8 +3,8 @@ glabel func_802414C4_844094 /* 844094 802414C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844098 802414C8 3C058024 */ lui $a1, %hi(D_80241458) -/* 84409C 802414CC 24A51458 */ addiu $a1, $a1, %lo(D_80241458) +/* 844098 802414C8 3C058024 */ lui $a1, %hi(func_80241458_842FC4) +/* 84409C 802414CC 24A51458 */ addiu $a1, $a1, %lo(func_80241458_842FC4) /* 8440A0 802414D0 AFBF0010 */ sw $ra, 0x10($sp) /* 8440A4 802414D4 0C048C8F */ jal bind_dynamic_entity_7 /* 8440A8 802414D8 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s index 061fc9a2cc..8a2cc87aab 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s +++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s @@ -10,8 +10,8 @@ glabel func_80241C90_844860 /* 844874 80241CA4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* 844878 80241CA8 AFBF0014 */ sw $ra, 0x14($sp) /* 84487C 80241CAC 8C620004 */ lw $v0, 4($v1) -/* 844880 80241CB0 3C058024 */ lui $a1, %hi(D_80241D30) -/* 844884 80241CB4 24A51D30 */ addiu $a1, $a1, %lo(D_80241D30) +/* 844880 80241CB0 3C058024 */ lui $a1, %hi(func_80241D30_844900) +/* 844884 80241CB4 24A51D30 */ addiu $a1, $a1, %lo(func_80241D30_844900) /* 844888 80241CB8 34422000 */ ori $v0, $v0, 0x2000 /* 84488C 80241CBC 0C048C56 */ jal bind_dynamic_entity_3 /* 844890 80241CC0 AC620004 */ sw $v0, 4($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s index fb43473f58..bbd88e142a 100644 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s +++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241D30_844900.s @@ -23,8 +23,8 @@ glabel func_80241D30_844900 /* 844948 80241D78 AFB00028 */ sw $s0, 0x28($sp) /* 84494C 80241D7C 820300BE */ lb $v1, 0xbe($s0) /* 844950 80241D80 8FA50038 */ lw $a1, 0x38($sp) -/* 844954 80241D84 3C028024 */ lui $v0, %hi(D_80241DAC) -/* 844958 80241D88 24421DAC */ addiu $v0, $v0, %lo(D_80241DAC) +/* 844954 80241D84 3C028024 */ lui $v0, %hi(func_80241DAC_8448DC) +/* 844958 80241D88 24421DAC */ addiu $v0, $v0, %lo(func_80241DAC_8448DC) /* 84495C 80241D8C AFA2002C */ sw $v0, 0x2c($sp) /* 844960 80241D90 AFA30020 */ sw $v1, 0x20($sp) /* 844964 80241D94 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index cd6c2ee893..ac99c9c7a3 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -141,7 +141,7 @@ glabel func_80241024_853194 /* 85339C 8024122C 00000000 */ nop /* 8533A0 80241230 0280202D */ daddu $a0, $s4, $zero /* 8533A4 80241234 0260282D */ daddu $a1, $s3, $zero -/* 8533A8 80241238 0C090224 */ jal mac_05_UnkNpcAIFunc1 +/* 8533A8 80241238 0C090224 */ jal func_80240890_852A00 /* 8533AC 8024123C 02A0302D */ daddu $a2, $s5, $zero /* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero /* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241024_853194 /* 8533DC 8024126C 00000000 */ nop /* 8533E0 80241270 0280202D */ daddu $a0, $s4, $zero /* 8533E4 80241274 0260282D */ daddu $a1, $s3, $zero -/* 8533E8 80241278 0C0902F0 */ jal mac_05_NpcJumpFunc2 +/* 8533E8 80241278 0C0902F0 */ jal func_80240BC0_852D30 /* 8533EC 8024127C 02A0302D */ daddu $a2, $s5, $zero /* 8533F0 80241280 0280202D */ daddu $a0, $s4, $zero /* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero -/* 8533F8 80241288 0C09030D */ jal mac_05_NpcJumpFunc +/* 8533F8 80241288 0C09030D */ jal func_80240C34_852DA4 /* 8533FC 8024128C 02A0302D */ daddu $a2, $s5, $zero /* 853400 80241290 080904BE */ j .L802412F8 /* 853404 80241294 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241024_853194 /* 85342C 802412BC 00000000 */ nop /* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero /* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero -/* 853438 802412C8 0C0903BF */ jal mac_05_UnkNpcDurationFlagFunc +/* 853438 802412C8 0C0903BF */ jal func_80240EFC_85306C /* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* 853440 802412D0 080904BE */ j .L802412F8 /* 853444 802412D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s index 34560faf5f..21997da232 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s @@ -9,8 +9,8 @@ glabel func_80241680_8537F0 /* 853800 80241690 8C84014C */ lw $a0, 0x14c($a0) /* 853804 80241694 24040008 */ addiu $a0, $zero, 8 /* 853808 80241698 0040802D */ daddu $s0, $v0, $zero -/* 85380C 8024169C 3C028024 */ lui $v0, %hi(D_802416EC) -/* 853810 802416A0 244216EC */ addiu $v0, $v0, %lo(D_802416EC) +/* 85380C 8024169C 3C028024 */ lui $v0, %hi(func_802416EC_8521DC) +/* 853810 802416A0 244216EC */ addiu $v0, $v0, %lo(func_802416EC_8521DC) /* 853814 802416A4 0C00AB39 */ jal heap_malloc /* 853818 802416A8 AE020008 */ sw $v0, 8($s0) /* 85381C 802416AC 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s index c16daa9de4..17c1b0169f 100644 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242384_8544F4.s @@ -3,8 +3,8 @@ glabel func_80242384_8544F4 /* 8544F4 80242384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8544F8 80242388 3C058024 */ lui $a1, %hi(D_80242318) -/* 8544FC 8024238C 24A52318 */ addiu $a1, $a1, %lo(D_80242318) +/* 8544F8 80242388 3C058024 */ lui $a1, %hi(func_80242318_852104) +/* 8544FC 8024238C 24A52318 */ addiu $a1, $a1, %lo(func_80242318_852104) /* 854500 80242390 AFBF0010 */ sw $ra, 0x10($sp) /* 854504 80242394 0C048C8F */ jal bind_dynamic_entity_7 /* 854508 80242398 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s index 0d85f225f1..90db9085bb 100644 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s @@ -10,8 +10,8 @@ glabel func_80241098_865BD8 /* 865BEC 802410AC 8C500010 */ lw $s0, 0x10($v0) /* 865BF0 802410B0 0C00EAD2 */ jal get_npc_safe /* 865BF4 802410B4 0000202D */ daddu $a0, $zero, $zero -/* 865BF8 802410B8 3C048024 */ lui $a0, %hi(D_8024343C) -/* 865BFC 802410BC 2484343C */ addiu $a0, $a0, %lo(D_8024343C) +/* 865BF8 802410B8 3C048024 */ lui $a0, %hi(func_8024343C_8555AC) +/* 865BFC 802410BC 2484343C */ addiu $a0, $a0, %lo(func_8024343C_8555AC) /* 865C00 802410C0 8C830000 */ lw $v1, ($a0) /* 865C04 802410C4 1060000E */ beqz $v1, .L80241100 /* 865C08 802410C8 0040282D */ daddu $a1, $v0, $zero @@ -100,8 +100,8 @@ glabel func_80241098_865BD8 /* 865D34 802411F4 34630001 */ ori $v1, $v1, 1 /* 865D38 802411F8 14430021 */ bne $v0, $v1, .L80241280 /* 865D3C 802411FC 0000102D */ daddu $v0, $zero, $zero -/* 865D40 80241200 3C038024 */ lui $v1, %hi(D_8024343C) -/* 865D44 80241204 2463343C */ addiu $v1, $v1, %lo(D_8024343C) +/* 865D40 80241200 3C038024 */ lui $v1, %hi(func_8024343C_8555AC) +/* 865D44 80241204 2463343C */ addiu $v1, $v1, %lo(func_8024343C_8555AC) /* 865D48 80241208 8C620000 */ lw $v0, ($v1) /* 865D4C 8024120C 3C014080 */ lui $at, 0x4080 /* 865D50 80241210 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index 6ca0ae1445..5f319148ff 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -141,7 +141,7 @@ glabel func_80240E74_E0F614 /* E0F81C 8024107C 00000000 */ nop /* E0F820 80241080 0280202D */ daddu $a0, $s4, $zero /* E0F824 80241084 0260282D */ daddu $a1, $s3, $zero -/* E0F828 80241088 0C0901B8 */ jal mgm_00_UnkNpcAIFunc1 +/* E0F828 80241088 0C0901B8 */ jal func_802406E0_E0EE80 /* E0F82C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero /* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80240E74_E0F614 /* E0F85C 802410BC 00000000 */ nop /* E0F860 802410C0 0280202D */ daddu $a0, $s4, $zero /* E0F864 802410C4 0260282D */ daddu $a1, $s3, $zero -/* E0F868 802410C8 0C090284 */ jal mgm_00_NpcJumpFunc2 +/* E0F868 802410C8 0C090284 */ jal func_80240A10_E0F1B0 /* E0F86C 802410CC 02A0302D */ daddu $a2, $s5, $zero /* E0F870 802410D0 0280202D */ daddu $a0, $s4, $zero /* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero -/* E0F878 802410D8 0C0902A1 */ jal mgm_00_NpcJumpFunc +/* E0F878 802410D8 0C0902A1 */ jal func_80240A84_E0F224 /* E0F87C 802410DC 02A0302D */ daddu $a2, $s5, $zero /* E0F880 802410E0 08090452 */ j .L80241148 /* E0F884 802410E4 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80240E74_E0F614 /* E0F8AC 8024110C 00000000 */ nop /* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero /* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero -/* E0F8B8 80241118 0C090353 */ jal mgm_00_UnkNpcDurationFlagFunc +/* E0F8B8 80241118 0C090353 */ jal func_80240D4C_E0F4EC /* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero /* E0F8C0 80241120 08090452 */ j .L80241148 /* E0F8C4 80241124 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s index 51fb1ac6df..593f78af18 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s @@ -23,8 +23,8 @@ glabel func_802411E0_E0F980 /* E0F9C8 80241228 24630008 */ addiu $v1, $v1, 8 /* E0F9CC 8024122C AC830000 */ sw $v1, ($a0) /* E0F9D0 80241230 ACA20000 */ sw $v0, ($a1) -/* E0F9D4 80241234 3C028024 */ lui $v0, %hi(D_80243C50) -/* E0F9D8 80241238 24423C50 */ addiu $v0, $v0, %lo(D_80243C50) +/* E0F9D4 80241234 3C028024 */ lui $v0, %hi(func_80243C50_C43A00) +/* E0F9D8 80241238 24423C50 */ addiu $v0, $v0, %lo(func_80243C50_C43A00) /* E0F9DC 8024123C ACA20004 */ sw $v0, 4($a1) /* E0F9E0 80241240 24620008 */ addiu $v0, $v1, 8 /* E0F9E4 80241244 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s index 0c105a2e51..e6122b1eb0 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416C0_E0FE60.s @@ -5,8 +5,8 @@ glabel func_802416C0_E0FE60 /* E0FE60 802416C0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* E0FE64 802416C4 2402002D */ addiu $v0, $zero, 0x2d /* E0FE68 802416C8 AFA20010 */ sw $v0, 0x10($sp) -/* E0FE6C 802416CC 3C028024 */ lui $v0, %hi(D_80241540) -/* E0FE70 802416D0 24421540 */ addiu $v0, $v0, %lo(D_80241540) +/* E0FE6C 802416CC 3C028024 */ lui $v0, %hi(func_80241540_E0F800) +/* E0FE70 802416D0 24421540 */ addiu $v0, $v0, %lo(func_80241540_E0F800) /* E0FE74 802416D4 27A40010 */ addiu $a0, $sp, 0x10 /* E0FE78 802416D8 AFBF0020 */ sw $ra, 0x20($sp) /* E0FE7C 802416DC AFA00018 */ sw $zero, 0x18($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s index 5fe4d9e85d..1a88350e8d 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802416F8_E0FE98.s @@ -18,8 +18,8 @@ glabel func_802416F8_E0FE98 /* E0FECC 8024172C 24040018 */ addiu $a0, $zero, 0x18 /* E0FED0 80241730 0040802D */ daddu $s0, $v0, $zero /* E0FED4 80241734 0000202D */ daddu $a0, $zero, $zero -/* E0FED8 80241738 3C058024 */ lui $a1, %hi(D_802416C0) -/* E0FEDC 8024173C 24A516C0 */ addiu $a1, $a1, %lo(D_802416C0) +/* E0FED8 80241738 3C058024 */ lui $a1, %hi(func_802416C0_E0F948) +/* E0FEDC 8024173C 24A516C0 */ addiu $a1, $a1, %lo(func_802416C0_E0F948) /* E0FEE0 80241740 240200FF */ addiu $v0, $zero, 0xff /* E0FEE4 80241744 AE300070 */ sw $s0, 0x70($s1) /* E0FEE8 80241748 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s index 511ce1361d..b3abb62f26 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12760/func_80240000_E12760.s @@ -17,19 +17,19 @@ glabel func_80240000_E12760 /* E12790 80240030 D42235B0 */ ldc1 $f2, %lo(D_802435B0)($at) /* E12794 80240034 46002021 */ cvt.d.s $f0, $f4 /* E12798 80240038 4622003C */ c.lt.d $f0, $f2 -/* E1279C 8024003C 00000000 */ nop +/* E1279C 8024003C 00000000 */ nop /* E127A0 80240040 45000003 */ bc1f .L80240050 /* E127A4 80240044 0080802D */ daddu $s0, $a0, $zero -/* E127A8 80240048 3C01C2BE */ lui $at, %hi(D_C2BE35B8) +/* E127A8 80240048 3C01C2BE */ lui $at, 0xc2be /* E127AC 8024004C 44812000 */ mtc1 $at, $f4 .L80240050: -/* E127B0 80240050 3C018024 */ lui $at, %hi(D_802435B8) -/* E127B4 80240054 D42235B8 */ ldc1 $f2, %lo(D_C2BE35B8)($at) +/* E127B0 80240050 3C018024 */ lui $at, %hi(func_802435B8_DD0288) +/* E127B4 80240054 D42235B8 */ ldc1 $f2, %lo(func_802435B8_DD0288)($at) /* E127B8 80240058 46002021 */ cvt.d.s $f0, $f4 /* E127BC 8024005C 4620103C */ c.lt.d $f2, $f0 -/* E127C0 80240060 00000000 */ nop +/* E127C0 80240060 00000000 */ nop /* E127C4 80240064 45000003 */ bc1f .L80240074 -/* E127C8 80240068 00000000 */ nop +/* E127C8 80240068 00000000 */ nop /* E127CC 8024006C 3C0142BE */ lui $at, 0x42be /* E127D0 80240070 44812000 */ mtc1 $at, $f4 .L80240074: @@ -39,9 +39,9 @@ glabel func_80240000_E12760 /* E127E0 80240080 44801000 */ mtc1 $zero, $f2 /* E127E4 80240084 4600C021 */ cvt.d.s $f0, $f24 /* E127E8 80240088 4622003C */ c.lt.d $f0, $f2 -/* E127EC 8024008C 00000000 */ nop +/* E127EC 8024008C 00000000 */ nop /* E127F0 80240090 45000003 */ bc1f .L802400A0 -/* E127F4 80240094 00000000 */ nop +/* E127F4 80240094 00000000 */ nop /* E127F8 80240098 3C01C2A0 */ lui $at, 0xc2a0 /* E127FC 8024009C 4481C000 */ mtc1 $at, $f24 .L802400A0: @@ -50,26 +50,26 @@ glabel func_80240000_E12760 /* E12808 802400A8 44801000 */ mtc1 $zero, $f2 /* E1280C 802400AC 4600C021 */ cvt.d.s $f0, $f24 /* E12810 802400B0 4620103C */ c.lt.d $f2, $f0 -/* E12814 802400B4 00000000 */ nop +/* E12814 802400B4 00000000 */ nop /* E12818 802400B8 45000003 */ bc1f .L802400C8 -/* E1281C 802400BC 00000000 */ nop +/* E1281C 802400BC 00000000 */ nop /* E12820 802400C0 3C0142A0 */ lui $at, 0x42a0 /* E12824 802400C4 4481C000 */ mtc1 $at, $f24 .L802400C8: -/* E12828 802400C8 3C018024 */ lui $at, %hi(D_802435C0) -/* E1282C 802400CC D42035C0 */ ldc1 $f0, %lo(D_802435C0)($at) +/* E12828 802400C8 3C018024 */ lui $at, %hi(func_802435C0_95E7C0) +/* E1282C 802400CC D42035C0 */ ldc1 $f0, %lo(func_802435C0_95E7C0)($at) /* E12830 802400D0 4600C521 */ cvt.d.s $f20, $f24 /* E12834 802400D4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12838 802400D8 00000000 */ nop -/* E1283C 802400DC 3C018024 */ lui $at, %hi(D_802435C8) -/* E12840 802400E0 D42035C8 */ ldc1 $f0, %lo(D_802435C8)($at) +/* E12838 802400D8 00000000 */ nop +/* E1283C 802400DC 3C018024 */ lui $at, %hi(func_802435C8_96C788) +/* E12840 802400E0 D42035C8 */ ldc1 $f0, %lo(func_802435C8_96C788)($at) /* E12844 802400E4 4620A502 */ mul.d $f20, $f20, $f0 -/* E12848 802400E8 00000000 */ nop -/* E1284C 802400EC 3C018024 */ lui $at, %hi(D_802435D0) -/* E12850 802400F0 D42035D0 */ ldc1 $f0, %lo(D_802435D0)($at) +/* E12848 802400E8 00000000 */ nop +/* E1284C 802400EC 3C018024 */ lui $at, %hi(func_802435D0_CC6DE0) +/* E12850 802400F0 D42035D0 */ ldc1 $f0, %lo(func_802435D0_CC6DE0)($at) /* E12854 802400F4 460025A1 */ cvt.d.s $f22, $f4 /* E12858 802400F8 4620B582 */ mul.d $f22, $f22, $f0 -/* E1285C 802400FC 00000000 */ nop +/* E1285C 802400FC 00000000 */ nop /* E12860 80240100 0200202D */ daddu $a0, $s0, $zero /* E12864 80240104 3C05FE36 */ lui $a1, 0xfe36 /* E12868 80240108 34A53C80 */ ori $a1, $a1, 0x3c80 @@ -94,16 +94,16 @@ glabel func_80240000_E12760 /* E128B4 80240154 34A53C83 */ ori $a1, $a1, 0x3c83 /* E128B8 80240158 8E230000 */ lw $v1, ($s1) /* E128BC 8024015C C4600028 */ lwc1 $f0, 0x28($v1) -/* E128C0 80240160 3C018024 */ lui $at, %hi(D_802435D8) -/* E128C4 80240164 D42235D8 */ ldc1 $f2, %lo(D_802435D8)($at) +/* E128C0 80240160 3C018024 */ lui $at, %hi(func_802435D8_C43388) +/* E128C4 80240164 D42235D8 */ ldc1 $f2, %lo(func_802435D8_C43388)($at) /* E128C8 80240168 46000021 */ cvt.d.s $f0, $f0 /* E128CC 8024016C 46220002 */ mul.d $f0, $f0, $f2 -/* E128D0 80240170 00000000 */ nop +/* E128D0 80240170 00000000 */ nop /* E128D4 80240174 3C028015 */ lui $v0, %hi(D_80151328) /* E128D8 80240178 8C421328 */ lw $v0, %lo(D_80151328)($v0) /* E128DC 8024017C 3C0142A0 */ lui $at, 0x42a0 /* E128E0 80240180 44811000 */ mtc1 $at, $f2 -/* E128E4 80240184 00000000 */ nop +/* E128E4 80240184 00000000 */ nop /* E128E8 80240188 E442000C */ swc1 $f2, 0xc($v0) /* E128EC 8024018C 3C014248 */ lui $at, 0x4248 /* E128F0 80240190 44811000 */ mtc1 $at, $f2 @@ -121,4 +121,4 @@ glabel func_80240000_E12760 /* E12920 802401C0 24020002 */ addiu $v0, $zero, 2 /* E12924 802401C4 03E00008 */ jr $ra /* E12928 802401C8 27BD0038 */ addiu $sp, $sp, 0x38 -/* E1292C 802401CC 00000000 */ nop +/* E1292C 802401CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s index eb3de467d7..a8b3a08ee6 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802403C4_E12B24.s @@ -5,8 +5,8 @@ glabel func_802403C4_E12B24 /* E12B24 802403C4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* E12B28 802403C8 2402002D */ addiu $v0, $zero, 0x2d /* E12B2C 802403CC AFA20010 */ sw $v0, 0x10($sp) -/* E12B30 802403D0 3C028024 */ lui $v0, %hi(D_802401D0) -/* E12B34 802403D4 244201D0 */ addiu $v0, $v0, %lo(D_802401D0) +/* E12B30 802403D0 3C028024 */ lui $v0, %hi(func_802401D0_E1273C) +/* E12B34 802403D4 244201D0 */ addiu $v0, $v0, %lo(func_802401D0_E1273C) /* E12B38 802403D8 27A40010 */ addiu $a0, $sp, 0x10 /* E12B3C 802403DC AFBF0020 */ sw $ra, 0x20($sp) /* E12B40 802403E0 AFA00018 */ sw $zero, 0x18($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s index 1e7d427106..12dd2c760a 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_8024058C_E12CEC.s @@ -23,16 +23,16 @@ glabel func_8024058C_E12CEC /* E12D34 802405D4 24020005 */ addiu $v0, $zero, 5 /* E12D38 802405D8 AE00008C */ sw $zero, 0x8c($s0) /* E12D3C 802405DC AE020090 */ sw $v0, 0x90($s0) -/* E12D40 802405E0 3C028024 */ lui $v0, %hi(D_80241AC8) +/* E12D40 802405E0 3C028024 */ lui $v0, %hi(func_80241AC8_D2D7F8) /* E12D44 802405E4 00431021 */ addu $v0, $v0, $v1 -/* E12D48 802405E8 80421AC8 */ lb $v0, %lo(D_80241AC8)($v0) +/* E12D48 802405E8 80421AC8 */ lb $v0, %lo(func_80241AC8_D2D7F8)($v0) /* E12D4C 802405EC 44820000 */ mtc1 $v0, $f0 /* E12D50 802405F0 00000000 */ nop /* E12D54 802405F4 46800020 */ cvt.s.w $f0, $f0 /* E12D58 802405F8 E6000094 */ swc1 $f0, 0x94($s0) -/* E12D5C 802405FC 3C028024 */ lui $v0, %hi(D_80241AD4) +/* E12D5C 802405FC 3C028024 */ lui $v0, %hi(func_80241AD4_B4C544) /* E12D60 80240600 00431021 */ addu $v0, $v0, $v1 -/* E12D64 80240604 80421AD4 */ lb $v0, %lo(D_80241AD4)($v0) +/* E12D64 80240604 80421AD4 */ lb $v0, %lo(func_80241AD4_B4C544)($v0) /* E12D68 80240608 3C01402E */ lui $at, 0x402e /* E12D6C 8024060C 44811800 */ mtc1 $at, $f3 /* E12D70 80240610 44801000 */ mtc1 $zero, $f2 @@ -45,9 +45,9 @@ glabel func_8024058C_E12CEC /* E12D8C 8024062C C6020094 */ lwc1 $f2, 0x94($s0) /* E12D90 80240630 46200020 */ cvt.s.d $f0, $f0 /* E12D94 80240634 E6000098 */ swc1 $f0, 0x98($s0) -/* E12D98 80240638 3C018024 */ lui $at, %hi(D_80241AE0) +/* E12D98 80240638 3C018024 */ lui $at, %hi(func_80241AE0_DCE7B0) /* E12D9C 8024063C 00230821 */ addu $at, $at, $v1 -/* E12DA0 80240640 80231AE0 */ lb $v1, %lo(D_80241AE0)($at) +/* E12DA0 80240640 80231AE0 */ lb $v1, %lo(func_80241AE0_DCE7B0)($at) /* E12DA4 80240644 3C013F80 */ lui $at, 0x3f80 /* E12DA8 80240648 44810000 */ mtc1 $at, $f0 /* E12DAC 8024064C 46001106 */ mov.s $f4, $f2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s index 2d56a593de..be343765ec 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s @@ -38,9 +38,9 @@ glabel func_802408EC_E1304C /* E130D0 80240970 3C0142DC */ lui $at, 0x42dc /* E130D4 80240974 44812000 */ mtc1 $at, $f4 /* E130D8 80240978 00021080 */ sll $v0, $v0, 2 -/* E130DC 8024097C 3C018024 */ lui $at, %hi(D_80241AEC) +/* E130DC 8024097C 3C018024 */ lui $at, %hi(func_80241AEC_80236C) /* E130E0 80240980 00220821 */ addu $at, $at, $v0 -/* E130E4 80240984 C4201AEC */ lwc1 $f0, %lo(D_80241AEC)($at) +/* E130E4 80240984 C4201AEC */ lwc1 $f0, %lo(func_80241AEC_80236C)($at) /* E130E8 80240988 8C820084 */ lw $v0, 0x84($a0) /* E130EC 8024098C 3C013F80 */ lui $at, 0x3f80 /* E130F0 80240990 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s index 0007a782b0..7135fbc278 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s @@ -37,9 +37,9 @@ glabel func_80240DB8_E13518 /* E1358C 80240E2C 8E020084 */ lw $v0, 0x84($s0) /* E13590 80240E30 3C05FE36 */ lui $a1, 0xfe36 /* E13594 80240E34 00021080 */ sll $v0, $v0, 2 -/* E13598 80240E38 3C018024 */ lui $at, %hi(D_80241AEC) +/* E13598 80240E38 3C018024 */ lui $at, %hi(func_80241AEC_80236C) /* E1359C 80240E3C 00220821 */ addu $at, $at, $v0 -/* E135A0 80240E40 C4201AEC */ lwc1 $f0, %lo(D_80241AEC)($at) +/* E135A0 80240E40 C4201AEC */ lwc1 $f0, %lo(func_80241AEC_80236C)($at) /* E135A4 80240E44 8E020084 */ lw $v0, 0x84($s0) /* E135A8 80240E48 8E060078 */ lw $a2, 0x78($s0) /* E135AC 80240E4C 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s index 10aca4b22f..f5b0c944b4 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240F90_E136F0.s @@ -12,12 +12,12 @@ glabel func_80240F90_E136F0 /* E1370C 80240FAC 0C00FB3A */ jal get_enemy /* E13710 80240FB0 AFB00018 */ sw $s0, 0x18($sp) /* E13714 80240FB4 0000802D */ daddu $s0, $zero, $zero -/* E13718 80240FB8 3C148024 */ lui $s4, %hi(D_80241AC8) -/* E1371C 80240FBC 26941AC8 */ addiu $s4, $s4, %lo(D_80241AC8) -/* E13720 80240FC0 3C138024 */ lui $s3, %hi(D_80241AD4) -/* E13724 80240FC4 26731AD4 */ addiu $s3, $s3, %lo(D_80241AD4) -/* E13728 80240FC8 3C128024 */ lui $s2, %hi(D_80241AE0) -/* E1372C 80240FCC 26521AE0 */ addiu $s2, $s2, %lo(D_80241AE0) +/* E13718 80240FB8 3C148024 */ lui $s4, %hi(func_80241AC8_D2D7F8) +/* E1371C 80240FBC 26941AC8 */ addiu $s4, $s4, %lo(func_80241AC8_D2D7F8) +/* E13720 80240FC0 3C138024 */ lui $s3, %hi(func_80241AD4_B4C544) +/* E13724 80240FC4 26731AD4 */ addiu $s3, $s3, %lo(func_80241AD4_B4C544) +/* E13728 80240FC8 3C128024 */ lui $s2, %hi(func_80241AE0_DCE7B0) +/* E1372C 80240FCC 26521AE0 */ addiu $s2, $s2, %lo(func_80241AE0_DCE7B0) /* E13730 80240FD0 8C510080 */ lw $s1, 0x80($v0) .L80240FD4: /* E13734 80240FD4 8E220088 */ lw $v0, 0x88($s1) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s index 9c049733b9..1fdfe27821 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s @@ -16,8 +16,8 @@ glabel func_80241234_E13994 /* E139C0 80241260 AFB1005C */ sw $s1, 0x5c($sp) /* E139C4 80241264 27A30028 */ addiu $v1, $sp, 0x28 /* E139C8 80241268 8C540080 */ lw $s4, 0x80($v0) -/* E139CC 8024126C 3C028024 */ lui $v0, %hi(D_802435E8) -/* E139D0 80241270 244235E8 */ addiu $v0, $v0, %lo(D_802435E8) +/* E139CC 8024126C 3C028024 */ lui $v0, %hi(func_802435E8_DD02B8) +/* E139D0 80241270 244235E8 */ addiu $v0, $v0, %lo(func_802435E8_DD02B8) /* E139D4 80241274 24440020 */ addiu $a0, $v0, 0x20 .L80241278: /* E139D8 80241278 8C480000 */ lw $t0, ($v0) @@ -48,8 +48,8 @@ glabel func_80241234_E13994 /* E13A38 802412D8 00041080 */ sll $v0, $a0, 2 /* E13A3C 802412DC 00622023 */ subu $a0, $v1, $v0 /* E13A40 802412E0 0000882D */ daddu $s1, $zero, $zero -/* E13A44 802412E4 3C058024 */ lui $a1, %hi(D_80241B9C) -/* E13A48 802412E8 24A51B9C */ addiu $a1, $a1, %lo(D_80241B9C) +/* E13A44 802412E4 3C058024 */ lui $a1, %hi(func_80241B9C_B3676C) +/* E13A48 802412E8 24A51B9C */ addiu $a1, $a1, %lo(func_80241B9C_B3676C) /* E13A4C 802412EC 00041040 */ sll $v0, $a0, 1 /* E13A50 802412F0 00441021 */ addu $v0, $v0, $a0 /* E13A54 802412F4 00021080 */ sll $v0, $v0, 2 @@ -114,12 +114,12 @@ glabel func_80241234_E13994 /* E13B30 802413D0 2442FFFF */ addiu $v0, $v0, -1 /* E13B34 802413D4 1C400041 */ bgtz $v0, .L802414DC /* E13B38 802413D8 AEA20070 */ sw $v0, 0x70($s5) -/* E13B3C 802413DC 3C138024 */ lui $s3, %hi(D_80241AC8) -/* E13B40 802413E0 26731AC8 */ addiu $s3, $s3, %lo(D_80241AC8) -/* E13B44 802413E4 3C128024 */ lui $s2, %hi(D_80241AD4) -/* E13B48 802413E8 26521AD4 */ addiu $s2, $s2, %lo(D_80241AD4) -/* E13B4C 802413EC 3C118024 */ lui $s1, %hi(D_80241AE0) -/* E13B50 802413F0 26311AE0 */ addiu $s1, $s1, %lo(D_80241AE0) +/* E13B3C 802413DC 3C138024 */ lui $s3, %hi(func_80241AC8_D2D7F8) +/* E13B40 802413E0 26731AC8 */ addiu $s3, $s3, %lo(func_80241AC8_D2D7F8) +/* E13B44 802413E4 3C128024 */ lui $s2, %hi(func_80241AD4_B4C544) +/* E13B48 802413E8 26521AD4 */ addiu $s2, $s2, %lo(func_80241AD4_B4C544) +/* E13B4C 802413EC 3C118024 */ lui $s1, %hi(func_80241AE0_DCE7B0) +/* E13B50 802413F0 26311AE0 */ addiu $s1, $s1, %lo(func_80241AE0_DCE7B0) /* E13B54 802413F4 8EB00074 */ lw $s0, 0x74($s5) /* E13B58 802413F8 3C04802F */ lui $a0, %hi(D_802EA0C4) /* E13B5C 802413FC 2484A0C4 */ addiu $a0, $a0, %lo(D_802EA0C4) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s index e1990fe78d..f9dd26f79d 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241574_E13CD4.s @@ -11,8 +11,8 @@ glabel func_80241574_E13CD4 /* E13CEC 8024158C 3C058024 */ lui $a1, %hi(D_80241B70) /* E13CF0 80241590 24A51B70 */ addiu $a1, $a1, %lo(D_80241B70) /* E13CF4 80241594 8C420080 */ lw $v0, 0x80($v0) -/* E13CF8 80241598 3C048024 */ lui $a0, %hi(D_80241B44) -/* E13CFC 8024159C 24841B44 */ addiu $a0, $a0, %lo(D_80241B44) +/* E13CF8 80241598 3C048024 */ lui $a0, %hi(func_80241B44_E06EA4) +/* E13CFC 8024159C 24841B44 */ addiu $a0, $a0, %lo(func_80241B44_E06EA4) /* E13D00 802415A0 0040182D */ daddu $v1, $v0, $zero /* E13D04 802415A4 AC60000C */ sw $zero, 0xc($v1) /* E13D08 802415A8 AC600010 */ sw $zero, 0x10($v1) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s index 22b7cba59b..dbe1a8829d 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802415EC_E13D4C.s @@ -12,8 +12,8 @@ glabel func_802415EC_E13D4C /* E13D68 80241608 0C00AB0A */ jal general_heap_malloc /* E13D6C 8024160C 0040882D */ daddu $s1, $v0, $zero /* E13D70 80241610 0000202D */ daddu $a0, $zero, $zero -/* E13D74 80241614 3C058024 */ lui $a1, %hi(D_802403C4) -/* E13D78 80241618 24A503C4 */ addiu $a1, $a1, %lo(D_802403C4) +/* E13D74 80241614 3C058024 */ lui $a1, %hi(func_802403C4_E11708) +/* E13D78 80241618 24A503C4 */ addiu $a1, $a1, %lo(func_802403C4_E11708) /* E13D7C 8024161C 0040802D */ daddu $s0, $v0, $zero /* E13D80 80241620 0C048C56 */ jal bind_dynamic_entity_3 /* E13D84 80241624 AE300080 */ sw $s0, 0x80($s1) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s index 6abe29c059..20891ef837 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240430_E161B0.s @@ -5,8 +5,8 @@ glabel func_80240430_E161B0 /* E161B0 80240430 27BDFFD8 */ addiu $sp, $sp, -0x28 /* E161B4 80240434 2402002D */ addiu $v0, $zero, 0x2d /* E161B8 80240438 AFA20010 */ sw $v0, 0x10($sp) -/* E161BC 8024043C 3C028024 */ lui $v0, %hi(D_80240000) -/* E161C0 80240440 24420000 */ addiu $v0, $v0, %lo(D_80240000) +/* E161BC 8024043C 3C028024 */ lui $v0, %hi(func_80240000_E15950) +/* E161C0 80240440 24420000 */ addiu $v0, $v0, %lo(func_80240000_E15950) /* E161C4 80240444 27A40010 */ addiu $a0, $sp, 0x10 /* E161C8 80240448 AFBF0020 */ sw $ra, 0x20($sp) /* E161CC 8024044C AFA00018 */ sw $zero, 0x18($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s index 665f1e161a..658454a20f 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240468_E161E8.s @@ -13,8 +13,8 @@ glabel func_80240468_E161E8 /* E16208 80240488 8C52006C */ lw $s2, 0x6c($v0) /* E1620C 8024048C 12000026 */ beqz $s0, .L80240528 /* E16210 80240490 00000000 */ nop -/* E16214 80240494 3C058024 */ lui $a1, %hi(D_80240430) -/* E16218 80240498 24A50430 */ addiu $a1, $a1, %lo(D_80240430) +/* E16214 80240494 3C058024 */ lui $a1, %hi(func_80240430_E15D48) +/* E16218 80240498 24A50430 */ addiu $a1, $a1, %lo(func_80240430_E15D48) /* E1621C 8024049C 0C048C56 */ jal bind_dynamic_entity_3 /* E16220 802404A0 0000202D */ daddu $a0, $zero, $zero /* E16224 802404A4 3C118011 */ lui $s1, %hi(D_80108B28) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s index 7e8e1fb93e..2516aef1f1 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802405D0_E16350.s @@ -23,8 +23,8 @@ glabel func_802405D0_E16350 /* E16398 80240618 0040202D */ daddu $a0, $v0, $zero /* E1639C 8024061C 0C04417A */ jal get_entity_by_index /* E163A0 80240620 AE04001C */ sw $a0, 0x1c($s0) -/* E163A4 80240624 3C038024 */ lui $v1, %hi(D_80242A3C) -/* E163A8 80240628 24632A3C */ addiu $v1, $v1, %lo(D_80242A3C) +/* E163A4 80240624 3C038024 */ lui $v1, %hi(func_80242A3C_8EE85C) +/* E163A8 80240628 24632A3C */ addiu $v1, $v1, %lo(func_80242A3C_8EE85C) /* E163AC 8024062C AC430028 */ sw $v1, 0x28($v0) /* E163B0 80240630 8FBF002C */ lw $ra, 0x2c($sp) /* E163B4 80240634 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s index dd8e543058..04c54a4d89 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80240790_E16510.s @@ -95,10 +95,10 @@ glabel func_80240790_E16510 /* E1666C 802408EC 1440FFDA */ bnez $v0, .L80240858 /* E16670 802408F0 2407FFFF */ addiu $a3, $zero, -1 /* E16674 802408F4 0000802D */ daddu $s0, $zero, $zero -/* E16678 802408F8 3C068024 */ lui $a2, %hi(D_8024296C) -/* E1667C 802408FC 24C6296C */ addiu $a2, $a2, %lo(D_8024296C) -/* E16680 80240900 3C058024 */ lui $a1, %hi(D_802428E0) -/* E16684 80240904 24A528E0 */ addiu $a1, $a1, %lo(D_802428E0) +/* E16678 802408F8 3C068024 */ lui $a2, %hi(func_8024296C_C8841C) +/* E1667C 802408FC 24C6296C */ addiu $a2, $a2, %lo(func_8024296C_C8841C) +/* E16680 80240900 3C058024 */ lui $a1, %hi(func_802428E0_DF1780) +/* E16684 80240904 24A528E0 */ addiu $a1, $a1, %lo(func_802428E0_DF1780) /* E16688 80240908 27A40010 */ addiu $a0, $sp, 0x10 /* E1668C 8024090C 02A0182D */ daddu $v1, $s5, $zero .L80240910: diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index adf31b25a4..26fad4b033 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -46,7 +46,7 @@ glabel func_80240B1C_B93F5C /* B94000 80240BC0 8E2200B0 */ lw $v0, 0xb0($s1) /* B94004 80240BC4 30420004 */ andi $v0, $v0, 4 /* B94008 80240BC8 10400020 */ beqz $v0, .L80240C4C -/* B9400C 80240BCC 00000000 */ nop +/* B9400C 80240BCC 00000000 */ nop .L80240BD0: /* B94010 80240BD0 2404F7FF */ addiu $a0, $zero, -0x801 /* B94014 80240BD4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240B1C_B93F5C /* B9408C 80240C4C 8E420070 */ lw $v0, 0x70($s2) /* B94090 80240C50 2842001E */ slti $v0, $v0, 0x1e /* B94094 80240C54 10400009 */ beqz $v0, .L80240C7C -/* B94098 80240C58 00000000 */ nop +/* B94098 80240C58 00000000 */ nop /* B9409C 80240C5C 8E22006C */ lw $v0, 0x6c($s1) /* B940A0 80240C60 14400006 */ bnez $v0, .L80240C7C -/* B940A4 80240C64 00000000 */ nop +/* B940A4 80240C64 00000000 */ nop /* B940A8 80240C68 0C0901C2 */ jal func_80240708_B93B48 /* B940AC 80240C6C 0240202D */ daddu $a0, $s2, $zero /* B940B0 80240C70 10400002 */ beqz $v0, .L80240C7C @@ -104,7 +104,7 @@ glabel func_80240B1C_B93F5C /* B940D0 80240C90 00220821 */ addu $at, $at, $v0 /* B940D4 80240C94 8C2245F8 */ lw $v0, %lo(D_802445F8)($at) /* B940D8 80240C98 00400008 */ jr $v0 -/* B940DC 80240C9C 00000000 */ nop +/* B940DC 80240C9C 00000000 */ nop /* B940E0 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B940E4 80240CA4 0260282D */ daddu $a1, $s3, $zero /* B940E8 80240CA8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80240B1C_B93F5C /* B940F8 80240CB8 0C0125AE */ jal func_800496B8 /* B940FC 80240CBC 0280302D */ daddu $a2, $s4, $zero /* B94100 80240CC0 0809036A */ j .L80240DA8 -/* B94104 80240CC4 00000000 */ nop +/* B94104 80240CC4 00000000 */ nop /* B94108 80240CC8 0240202D */ daddu $a0, $s2, $zero /* B9410C 80240CCC 0260282D */ daddu $a1, $s3, $zero -/* B94110 80240CD0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* B94110 80240CD0 0C0126D1 */ jal func_80049B44 /* B94114 80240CD4 0280302D */ daddu $a2, $s4, $zero /* B94118 80240CD8 0240202D */ daddu $a0, $s2, $zero /* B9411C 80240CDC 0260282D */ daddu $a1, $s3, $zero /* B94120 80240CE0 0C012701 */ jal func_80049C04 /* B94124 80240CE4 0280302D */ daddu $a2, $s4, $zero /* B94128 80240CE8 0809036A */ j .L80240DA8 -/* B9412C 80240CEC 00000000 */ nop +/* B9412C 80240CEC 00000000 */ nop /* B94130 80240CF0 0240202D */ daddu $a0, $s2, $zero /* B94134 80240CF4 0260282D */ daddu $a1, $s3, $zero /* B94138 80240CF8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240B1C_B93F5C /* B94148 80240D08 0C0127B3 */ jal func_80049ECC /* B9414C 80240D0C 0280302D */ daddu $a2, $s4, $zero /* B94150 80240D10 0809036A */ j .L80240DA8 -/* B94154 80240D14 00000000 */ nop +/* B94154 80240D14 00000000 */ nop /* B94158 80240D18 0240202D */ daddu $a0, $s2, $zero /* B9415C 80240D1C 0260282D */ daddu $a1, $s3, $zero /* B94160 80240D20 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80240B1C_B93F5C /* B94170 80240D30 0C012849 */ jal func_8004A124 /* B94174 80240D34 0280302D */ daddu $a2, $s4, $zero /* B94178 80240D38 0809036A */ j .L80240DA8 -/* B9417C 80240D3C 00000000 */ nop +/* B9417C 80240D3C 00000000 */ nop /* B94180 80240D40 0240202D */ daddu $a0, $s2, $zero /* B94184 80240D44 0260282D */ daddu $a1, $s3, $zero /* B94188 80240D48 0C0128FA */ jal func_8004A3E8 /* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero /* B94190 80240D50 0809036A */ j .L80240DA8 -/* B94194 80240D54 00000000 */ nop -/* B94198 80240D58 0C090140 */ jal mim_01_UnkNpcAIFunc6 +/* B94194 80240D54 00000000 */ nop +/* B94198 80240D58 0C090140 */ jal func_80240500_B93940 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero -/* B941A0 80240D60 0C09015B */ jal mim_01_UnkNpcAIFunc7 +/* B941A0 80240D60 0C09015B */ jal func_8024056C_B939AC /* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero /* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 /* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 -/* B941B4 80240D74 00000000 */ nop -/* B941B8 80240D78 0C090177 */ jal mim_01_UnkNpcAIFunc8 +/* B941B4 80240D74 00000000 */ nop +/* B941B8 80240D78 0C090177 */ jal func_802405DC_B93A1C /* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero /* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 /* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 -/* B941CC 80240D8C 00000000 */ nop -/* B941D0 80240D90 0C0901AD */ jal mim_01_UnkNpcAIFunc5 +/* B941CC 80240D8C 00000000 */ nop +/* B941D0 80240D90 0C0901AD */ jal func_802406B4_B93AF4 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero /* B941D8 80240D98 0809036A */ j .L80240DA8 -/* B941DC 80240D9C 00000000 */ nop +/* B941DC 80240D9C 00000000 */ nop /* B941E0 80240DA0 0C0129CF */ jal func_8004A73C /* B941E4 80240DA4 0240202D */ daddu $a0, $s2, $zero .L80240DA8: diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index 33a29ae316..9464e3cc09 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -105,7 +105,7 @@ glabel func_80240C60_B98860 /* B989E8 80240DE8 0000102D */ daddu $v0, $zero, $zero /* B989EC 80240DEC 0260202D */ daddu $a0, $s3, $zero /* B989F0 80240DF0 0280282D */ daddu $a1, $s4, $zero -/* B989F4 80240DF4 0C090176 */ jal mim_02_UnkNpcAIFunc1 +/* B989F4 80240DF4 0C090176 */ jal func_802405D8_B981D8 /* B989F8 80240DF8 0200302D */ daddu $a2, $s0, $zero /* B989FC 80240DFC 8E630070 */ lw $v1, 0x70($s3) /* B98A00 80240E00 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240C60_B98860 /* B98A48 80240E48 0000102D */ daddu $v0, $zero, $zero /* B98A4C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* B98A50 80240E50 0280282D */ daddu $a1, $s4, $zero -/* B98A54 80240E54 0C090307 */ jal mim_02_UnkDurationCheck +/* B98A54 80240E54 0C090307 */ jal func_80240C1C_B9881C /* B98A58 80240E58 0200302D */ daddu $a2, $s0, $zero .L80240E5C: /* B98A5C 80240E5C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s index 66a4e93546..734d9fd0ff 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s @@ -18,9 +18,9 @@ glabel func_802410B0_B98CB0 /* B98CE0 802410E0 0000102D */ daddu $v0, $zero, $zero .L802410E4: /* B98CE4 802410E4 8CC50000 */ lw $a1, ($a2) -/* B98CE8 802410E8 3C068024 */ lui $a2, %hi(D_802416B0) +/* B98CE8 802410E8 3C068024 */ lui $a2, %hi(func_802416B0_A49C70) /* B98CEC 802410EC 0C0B2026 */ jal set_variable -/* B98CF0 802410F0 8CC616B0 */ lw $a2, %lo(D_802416B0)($a2) +/* B98CF0 802410F0 8CC616B0 */ lw $a2, %lo(func_802416B0_A49C70)($a2) /* B98CF4 802410F4 24020002 */ addiu $v0, $zero, 2 .L802410F8: /* B98CF8 802410F8 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s index bafd3297da..01bd473c82 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s @@ -7,8 +7,8 @@ glabel func_80241104_B98D04 /* B98D0C 8024110C 8C82000C */ lw $v0, 0xc($a0) /* B98D10 80241110 0C0B1EAF */ jal get_variable /* B98D14 80241114 8C450000 */ lw $a1, ($v0) -/* B98D18 80241118 3C018024 */ lui $at, %hi(D_802416B0) -/* B98D1C 8024111C AC2216B0 */ sw $v0, %lo(D_802416B0)($at) +/* B98D18 80241118 3C018024 */ lui $at, %hi(func_802416B0_A49C70) +/* B98D1C 8024111C AC2216B0 */ sw $v0, %lo(func_802416B0_A49C70)($at) /* B98D20 80241120 24020002 */ addiu $v0, $zero, 2 /* B98D24 80241124 8FBF0010 */ lw $ra, 0x10($sp) /* B98D28 80241128 24030001 */ addiu $v1, $zero, 1 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s index e60d5eebdf..1152784682 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s @@ -13,8 +13,8 @@ glabel func_8024113C_B98D3C /* B98D5C 8024115C 8C620000 */ lw $v0, ($v1) /* B98D60 80241160 5040000A */ beql $v0, $zero, .L8024118C /* B98D64 80241164 00041080 */ sll $v0, $a0, 2 -/* B98D68 80241168 3C058024 */ lui $a1, %hi(D_80243880) -/* B98D6C 8024116C 24A53880 */ addiu $a1, $a1, %lo(D_80243880) +/* B98D68 80241168 3C058024 */ lui $a1, %hi(func_80243880_95EA80) +/* B98D6C 8024116C 24A53880 */ addiu $a1, $a1, %lo(func_80243880_95EA80) .L80241170: /* B98D70 80241170 24630004 */ addiu $v1, $v1, 4 /* B98D74 80241174 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_8024113C_B98D3C /* B98D84 80241184 24A50004 */ addiu $a1, $a1, 4 /* B98D88 80241188 00041080 */ sll $v0, $a0, 2 .L8024118C: -/* B98D8C 8024118C 3C018024 */ lui $at, %hi(D_80243880) +/* B98D8C 8024118C 3C018024 */ lui $at, %hi(func_80243880_95EA80) /* B98D90 80241190 00220821 */ addu $at, $at, $v0 -/* B98D94 80241194 AC203880 */ sw $zero, %lo(D_80243880)($at) +/* B98D94 80241194 AC203880 */ sw $zero, %lo(func_80243880_95EA80)($at) /* B98D98 80241198 08090472 */ j .L802411C8 /* B98D9C 8024119C 00000000 */ nop .L802411A0: -/* B98DA0 802411A0 3C038024 */ lui $v1, %hi(D_80243880) -/* B98DA4 802411A4 24633880 */ addiu $v1, $v1, %lo(D_80243880) +/* B98DA0 802411A0 3C038024 */ lui $v1, %hi(func_80243880_95EA80) +/* B98DA4 802411A4 24633880 */ addiu $v1, $v1, %lo(func_80243880_95EA80) /* B98DA8 802411A8 0060282D */ daddu $a1, $v1, $zero .L802411AC: /* B98DAC 802411AC 24820010 */ addiu $v0, $a0, 0x10 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s index 6e8b32b33d..824afbf682 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_80240070_B9D9D0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240070_B9D9D0 -/* B9D9D0 80240070 3C058024 */ lui $a1, %hi(D_80241530) -/* B9D9D4 80240074 24A51530 */ addiu $a1, $a1, %lo(D_80241530) +/* B9D9D0 80240070 3C058024 */ lui $a1, %hi(func_80241530_8ED350) +/* B9D9D4 80240074 24A51530 */ addiu $a1, $a1, %lo(func_80241530_8ED350) /* B9D9D8 80240078 8CA30000 */ lw $v1, ($a1) /* B9D9DC 8024007C 24040002 */ addiu $a0, $zero, 2 /* B9D9E0 80240080 10640012 */ beq $v1, $a0, .L802400CC diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s index 5cfc9494f8..cb6ebe4c9c 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802401DC_B9DB3C -/* B9DB3C 802401DC 3C038024 */ lui $v1, %hi(D_80241530) -/* B9DB40 802401E0 24631530 */ addiu $v1, $v1, %lo(D_80241530) +/* B9DB3C 802401DC 3C038024 */ lui $v1, %hi(func_80241530_8ED350) +/* B9DB40 802401E0 24631530 */ addiu $v1, $v1, %lo(func_80241530_8ED350) /* B9DB44 802401E4 8C620000 */ lw $v0, ($v1) /* B9DB48 802401E8 14400002 */ bnez $v0, .L802401F4 /* B9DB4C 802401EC 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index 481d374cec..5a33d91cae 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -105,7 +105,7 @@ glabel func_80240DF0_B9E750 /* B9E8D8 80240F78 0000102D */ daddu $v0, $zero, $zero /* B9E8DC 80240F7C 0260202D */ daddu $a0, $s3, $zero /* B9E8E0 80240F80 0280282D */ daddu $a1, $s4, $zero -/* B9E8E4 80240F84 0C0901DA */ jal mim_04_UnkNpcAIFunc1 +/* B9E8E4 80240F84 0C0901DA */ jal func_80240768_B9E0C8 /* B9E8E8 80240F88 0200302D */ daddu $a2, $s0, $zero /* B9E8EC 80240F8C 8E630070 */ lw $v1, 0x70($s3) /* B9E8F0 80240F90 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240DF0_B9E750 /* B9E938 80240FD8 0000102D */ daddu $v0, $zero, $zero /* B9E93C 80240FDC 0260202D */ daddu $a0, $s3, $zero /* B9E940 80240FE0 0280282D */ daddu $a1, $s4, $zero -/* B9E944 80240FE4 0C09036B */ jal mim_04_UnkDurationCheck +/* B9E944 80240FE4 0C09036B */ jal func_80240DAC_B9E70C /* B9E948 80240FE8 0200302D */ daddu $a2, $s0, $zero .L80240FEC: /* B9E94C 80240FEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index cba9a0a814..2df64fff82 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -46,7 +46,7 @@ glabel func_8024068C_BA0DBC /* BA0E60 80240730 8E2200B0 */ lw $v0, 0xb0($s1) /* BA0E64 80240734 30420004 */ andi $v0, $v0, 4 /* BA0E68 80240738 10400020 */ beqz $v0, .L802407BC -/* BA0E6C 8024073C 00000000 */ nop +/* BA0E6C 8024073C 00000000 */ nop .L80240740: /* BA0E70 80240740 2404F7FF */ addiu $a0, $zero, -0x801 /* BA0E74 80240744 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024068C_BA0DBC /* BA0EEC 802407BC 8E420070 */ lw $v0, 0x70($s2) /* BA0EF0 802407C0 2842001E */ slti $v0, $v0, 0x1e /* BA0EF4 802407C4 10400009 */ beqz $v0, .L802407EC -/* BA0EF8 802407C8 00000000 */ nop +/* BA0EF8 802407C8 00000000 */ nop /* BA0EFC 802407CC 8E22006C */ lw $v0, 0x6c($s1) /* BA0F00 802407D0 14400006 */ bnez $v0, .L802407EC -/* BA0F04 802407D4 00000000 */ nop +/* BA0F04 802407D4 00000000 */ nop /* BA0F08 802407D8 0C09009E */ jal func_80240278_BA09A8 /* BA0F0C 802407DC 0240202D */ daddu $a0, $s2, $zero /* BA0F10 802407E0 10400002 */ beqz $v0, .L802407EC @@ -104,7 +104,7 @@ glabel func_8024068C_BA0DBC /* BA0F30 80240800 00220821 */ addu $at, $at, $v0 /* BA0F34 80240804 8C223E88 */ lw $v0, %lo(D_80243E88)($at) /* BA0F38 80240808 00400008 */ jr $v0 -/* BA0F3C 8024080C 00000000 */ nop +/* BA0F3C 8024080C 00000000 */ nop /* BA0F40 80240810 0240202D */ daddu $a0, $s2, $zero /* BA0F44 80240814 0260282D */ daddu $a1, $s3, $zero /* BA0F48 80240818 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024068C_BA0DBC /* BA0F58 80240828 0C0125AE */ jal func_800496B8 /* BA0F5C 8024082C 0280302D */ daddu $a2, $s4, $zero /* BA0F60 80240830 08090246 */ j .L80240918 -/* BA0F64 80240834 00000000 */ nop +/* BA0F64 80240834 00000000 */ nop /* BA0F68 80240838 0240202D */ daddu $a0, $s2, $zero /* BA0F6C 8024083C 0260282D */ daddu $a1, $s3, $zero -/* BA0F70 80240840 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* BA0F70 80240840 0C0126D1 */ jal func_80049B44 /* BA0F74 80240844 0280302D */ daddu $a2, $s4, $zero /* BA0F78 80240848 0240202D */ daddu $a0, $s2, $zero /* BA0F7C 8024084C 0260282D */ daddu $a1, $s3, $zero /* BA0F80 80240850 0C012701 */ jal func_80049C04 /* BA0F84 80240854 0280302D */ daddu $a2, $s4, $zero /* BA0F88 80240858 08090246 */ j .L80240918 -/* BA0F8C 8024085C 00000000 */ nop +/* BA0F8C 8024085C 00000000 */ nop /* BA0F90 80240860 0240202D */ daddu $a0, $s2, $zero /* BA0F94 80240864 0260282D */ daddu $a1, $s3, $zero /* BA0F98 80240868 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024068C_BA0DBC /* BA0FA8 80240878 0C0127B3 */ jal func_80049ECC /* BA0FAC 8024087C 0280302D */ daddu $a2, $s4, $zero /* BA0FB0 80240880 08090246 */ j .L80240918 -/* BA0FB4 80240884 00000000 */ nop +/* BA0FB4 80240884 00000000 */ nop /* BA0FB8 80240888 0240202D */ daddu $a0, $s2, $zero /* BA0FBC 8024088C 0260282D */ daddu $a1, $s3, $zero /* BA0FC0 80240890 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024068C_BA0DBC /* BA0FD0 802408A0 0C012849 */ jal func_8004A124 /* BA0FD4 802408A4 0280302D */ daddu $a2, $s4, $zero /* BA0FD8 802408A8 08090246 */ j .L80240918 -/* BA0FDC 802408AC 00000000 */ nop +/* BA0FDC 802408AC 00000000 */ nop /* BA0FE0 802408B0 0240202D */ daddu $a0, $s2, $zero /* BA0FE4 802408B4 0260282D */ daddu $a1, $s3, $zero /* BA0FE8 802408B8 0C0128FA */ jal func_8004A3E8 /* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero /* BA0FF0 802408C0 08090246 */ j .L80240918 -/* BA0FF4 802408C4 00000000 */ nop -/* BA0FF8 802408C8 0C09001C */ jal mim_05_UnkNpcAIFunc6 +/* BA0FF4 802408C4 00000000 */ nop +/* BA0FF8 802408C8 0C09001C */ jal func_80240070_BA07A0 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero -/* BA1000 802408D0 0C090037 */ jal mim_05_UnkNpcAIFunc7 +/* BA1000 802408D0 0C090037 */ jal func_802400DC_BA080C /* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero /* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 /* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 -/* BA1014 802408E4 00000000 */ nop -/* BA1018 802408E8 0C090053 */ jal mim_05_UnkNpcAIFunc8 +/* BA1014 802408E4 00000000 */ nop +/* BA1018 802408E8 0C090053 */ jal func_8024014C_BA087C /* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero /* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 /* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 -/* BA102C 802408FC 00000000 */ nop -/* BA1030 80240900 0C090089 */ jal mim_05_UnkNpcAIFunc5 +/* BA102C 802408FC 00000000 */ nop +/* BA1030 80240900 0C090089 */ jal func_80240224_BA0954 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero /* BA1038 80240908 08090246 */ j .L80240918 -/* BA103C 8024090C 00000000 */ nop +/* BA103C 8024090C 00000000 */ nop /* BA1040 80240910 0C0129CF */ jal func_8004A73C /* BA1044 80240914 0240202D */ daddu $a0, $s2, $zero .L80240918: diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s index 1100f328bd..42df0843aa 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240AA8_BA11D8.s @@ -239,8 +239,8 @@ glabel func_80240AA8_BA11D8 /* BA1550 80240E20 08090392 */ j .L80240E48 /* BA1554 80240E24 34C68000 */ ori $a2, $a2, 0x8000 .L80240E28: -/* BA1558 80240E28 3C018024 */ lui $at, %hi(D_80244030) -/* BA155C 80240E2C D4204030 */ ldc1 $f0, %lo(D_80244030)($at) +/* BA1558 80240E28 3C018024 */ lui $at, %hi(func_80244030) +/* BA155C 80240E2C D4204030 */ ldc1 $f0, %lo(func_80244030)($at) /* BA1560 80240E30 4622003C */ c.lt.d $f0, $f2 /* BA1564 80240E34 00000000 */ nop /* BA1568 80240E38 450000FA */ bc1f .L80241224 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index d93ea4be7d..e12f96de33 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -46,7 +46,7 @@ glabel func_80240B8C_BA530C /* BA53B0 80240C30 8E2200B0 */ lw $v0, 0xb0($s1) /* BA53B4 80240C34 30420004 */ andi $v0, $v0, 4 /* BA53B8 80240C38 10400020 */ beqz $v0, .L80240CBC -/* BA53BC 80240C3C 00000000 */ nop +/* BA53BC 80240C3C 00000000 */ nop .L80240C40: /* BA53C0 80240C40 2404F7FF */ addiu $a0, $zero, -0x801 /* BA53C4 80240C44 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240B8C_BA530C /* BA543C 80240CBC 8E420070 */ lw $v0, 0x70($s2) /* BA5440 80240CC0 2842001E */ slti $v0, $v0, 0x1e /* BA5444 80240CC4 10400009 */ beqz $v0, .L80240CEC -/* BA5448 80240CC8 00000000 */ nop +/* BA5448 80240CC8 00000000 */ nop /* BA544C 80240CCC 8E22006C */ lw $v0, 0x6c($s1) /* BA5450 80240CD0 14400006 */ bnez $v0, .L80240CEC -/* BA5454 80240CD4 00000000 */ nop +/* BA5454 80240CD4 00000000 */ nop /* BA5458 80240CD8 0C0901DE */ jal func_80240778_BA4EF8 /* BA545C 80240CDC 0240202D */ daddu $a0, $s2, $zero /* BA5460 80240CE0 10400002 */ beqz $v0, .L80240CEC @@ -100,11 +100,11 @@ glabel func_80240B8C_BA530C /* BA5470 80240CF0 2C620064 */ sltiu $v0, $v1, 0x64 /* BA5474 80240CF4 10400048 */ beqz $v0, .L80240E18 /* BA5478 80240CF8 00031080 */ sll $v0, $v1, 2 -/* BA547C 80240CFC 3C018024 */ lui $at, %hi(D_802457B8) +/* BA547C 80240CFC 3C018024 */ lui $at, %hi(func_802457B8) /* BA5480 80240D00 00220821 */ addu $at, $at, $v0 -/* BA5484 80240D04 8C2257B8 */ lw $v0, %lo(D_802457B8)($at) +/* BA5484 80240D04 8C2257B8 */ lw $v0, %lo(func_802457B8)($at) /* BA5488 80240D08 00400008 */ jr $v0 -/* BA548C 80240D0C 00000000 */ nop +/* BA548C 80240D0C 00000000 */ nop /* BA5490 80240D10 0240202D */ daddu $a0, $s2, $zero /* BA5494 80240D14 0260282D */ daddu $a1, $s3, $zero /* BA5498 80240D18 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80240B8C_BA530C /* BA54A8 80240D28 0C0125AE */ jal func_800496B8 /* BA54AC 80240D2C 0280302D */ daddu $a2, $s4, $zero /* BA54B0 80240D30 08090386 */ j .L80240E18 -/* BA54B4 80240D34 00000000 */ nop +/* BA54B4 80240D34 00000000 */ nop /* BA54B8 80240D38 0240202D */ daddu $a0, $s2, $zero /* BA54BC 80240D3C 0260282D */ daddu $a1, $s3, $zero -/* BA54C0 80240D40 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* BA54C0 80240D40 0C0126D1 */ jal func_80049B44 /* BA54C4 80240D44 0280302D */ daddu $a2, $s4, $zero /* BA54C8 80240D48 0240202D */ daddu $a0, $s2, $zero /* BA54CC 80240D4C 0260282D */ daddu $a1, $s3, $zero /* BA54D0 80240D50 0C012701 */ jal func_80049C04 /* BA54D4 80240D54 0280302D */ daddu $a2, $s4, $zero /* BA54D8 80240D58 08090386 */ j .L80240E18 -/* BA54DC 80240D5C 00000000 */ nop +/* BA54DC 80240D5C 00000000 */ nop /* BA54E0 80240D60 0240202D */ daddu $a0, $s2, $zero /* BA54E4 80240D64 0260282D */ daddu $a1, $s3, $zero /* BA54E8 80240D68 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240B8C_BA530C /* BA54F8 80240D78 0C0127B3 */ jal func_80049ECC /* BA54FC 80240D7C 0280302D */ daddu $a2, $s4, $zero /* BA5500 80240D80 08090386 */ j .L80240E18 -/* BA5504 80240D84 00000000 */ nop +/* BA5504 80240D84 00000000 */ nop /* BA5508 80240D88 0240202D */ daddu $a0, $s2, $zero /* BA550C 80240D8C 0260282D */ daddu $a1, $s3, $zero /* BA5510 80240D90 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80240B8C_BA530C /* BA5520 80240DA0 0C012849 */ jal func_8004A124 /* BA5524 80240DA4 0280302D */ daddu $a2, $s4, $zero /* BA5528 80240DA8 08090386 */ j .L80240E18 -/* BA552C 80240DAC 00000000 */ nop +/* BA552C 80240DAC 00000000 */ nop /* BA5530 80240DB0 0240202D */ daddu $a0, $s2, $zero /* BA5534 80240DB4 0260282D */ daddu $a1, $s3, $zero /* BA5538 80240DB8 0C0128FA */ jal func_8004A3E8 /* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero /* BA5540 80240DC0 08090386 */ j .L80240E18 -/* BA5544 80240DC4 00000000 */ nop -/* BA5548 80240DC8 0C09015C */ jal mim_06_UnkNpcAIFunc6 +/* BA5544 80240DC4 00000000 */ nop +/* BA5548 80240DC8 0C09015C */ jal func_80240570_BA4CF0 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero -/* BA5550 80240DD0 0C090177 */ jal mim_06_UnkNpcAIFunc7 +/* BA5550 80240DD0 0C090177 */ jal func_802405DC_BA4D5C /* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero /* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 /* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 -/* BA5564 80240DE4 00000000 */ nop -/* BA5568 80240DE8 0C090193 */ jal mim_06_UnkNpcAIFunc8 +/* BA5564 80240DE4 00000000 */ nop +/* BA5568 80240DE8 0C090193 */ jal func_8024064C_BA4DCC /* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero /* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 /* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 -/* BA557C 80240DFC 00000000 */ nop -/* BA5580 80240E00 0C0901C9 */ jal mim_06_UnkNpcAIFunc5 +/* BA557C 80240DFC 00000000 */ nop +/* BA5580 80240E00 0C0901C9 */ jal func_80240724_BA4EA4 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero /* BA5588 80240E08 08090386 */ j .L80240E18 -/* BA558C 80240E0C 00000000 */ nop +/* BA558C 80240E0C 00000000 */ nop /* BA5590 80240E10 0C0129CF */ jal func_8004A73C /* BA5594 80240E14 0240202D */ daddu $a0, $s2, $zero .L80240E18: diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s index 24ae106e01..d75e84f5a8 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240FA8_BA5728.s @@ -170,8 +170,8 @@ glabel func_80240FA8_BA5728 /* BA59A0 80241220 E6200038 */ swc1 $f0, 0x38($s1) .L80241224: /* BA59A4 80241224 C6200038 */ lwc1 $f0, 0x38($s1) -/* BA59A8 80241228 3C018024 */ lui $at, %hi(D_80245950) -/* BA59AC 8024122C D4225950 */ ldc1 $f2, %lo(D_80245950)($at) +/* BA59A8 80241228 3C018024 */ lui $at, %hi(func_80245950_8061D0) +/* BA59AC 8024122C D4225950 */ ldc1 $f2, %lo(func_80245950_8061D0)($at) /* BA59B0 80241230 46000021 */ cvt.d.s $f0, $f0 /* BA59B4 80241234 4622003C */ c.lt.d $f0, $f2 /* BA59B8 80241238 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 4f8a941805..047faa9710 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -105,7 +105,7 @@ glabel func_80242B04_BA7284 /* BA740C 80242C8C 0000102D */ daddu $v0, $zero, $zero /* BA7410 80242C90 0260202D */ daddu $a0, $s3, $zero /* BA7414 80242C94 0280282D */ daddu $a1, $s4, $zero -/* BA7418 80242C98 0C09091F */ jal mim_06_UnkNpcAIFunc1 +/* BA7418 80242C98 0C09091F */ jal func_8024247C_BA6BFC /* BA741C 80242C9C 0200302D */ daddu $a2, $s0, $zero /* BA7420 80242CA0 8E630070 */ lw $v1, 0x70($s3) /* BA7424 80242CA4 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80242B04_BA7284 /* BA746C 80242CEC 0000102D */ daddu $v0, $zero, $zero /* BA7470 80242CF0 0260202D */ daddu $a0, $s3, $zero /* BA7474 80242CF4 0280282D */ daddu $a1, $s4, $zero -/* BA7478 80242CF8 0C090AB0 */ jal mim_06_UnkDurationCheck +/* BA7478 80242CF8 0C090AB0 */ jal func_80242AC0_BA7240 /* BA747C 80242CFC 0200302D */ daddu $a2, $s0, $zero .L80242D00: /* BA7480 80242D00 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s index cdffc95a20..6801a041da 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802400D8_BAA218 -/* BAA218 802400D8 3C058024 */ lui $a1, %hi(D_80241680) -/* BAA21C 802400DC 24A51680 */ addiu $a1, $a1, %lo(D_80241680) +/* BAA218 802400D8 3C058024 */ lui $a1, %hi(func_80241680_8537F0) +/* BAA21C 802400DC 24A51680 */ addiu $a1, $a1, %lo(func_80241680_8537F0) /* BAA220 802400E0 8CA30000 */ lw $v1, ($a1) /* BAA224 802400E4 24040002 */ addiu $a0, $zero, 2 /* BAA228 802400E8 10640012 */ beq $v1, $a0, .L80240134 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s index f3c3c8f4a8..4e567eae2d 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240244_BAA384 -/* BAA384 80240244 3C038024 */ lui $v1, %hi(D_80241680) -/* BAA388 80240248 24631680 */ addiu $v1, $v1, %lo(D_80241680) +/* BAA384 80240244 3C038024 */ lui $v1, %hi(func_80241680_8537F0) +/* BAA388 80240248 24631680 */ addiu $v1, $v1, %lo(func_80241680_8537F0) /* BAA38C 8024024C 8C620000 */ lw $v0, ($v1) /* BAA390 80240250 14400003 */ bnez $v0, .L80240260 /* BAA394 80240254 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index ceafb759b2..eca27b499f 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -88,9 +88,9 @@ glabel func_80240E60_BAAFA0 /* BAB0E4 80240FA4 2C62000F */ sltiu $v0, $v1, 0xf /* BAB0E8 80240FA8 1040002C */ beqz $v0, .L8024105C /* BAB0EC 80240FAC 00031080 */ sll $v0, $v1, 2 -/* BAB0F0 80240FB0 3C018024 */ lui $at, %hi(D_802437B8) +/* BAB0F0 80240FB0 3C018024 */ lui $at, %hi(func_802437B8) /* BAB0F4 80240FB4 00220821 */ addu $at, $at, $v0 -/* BAB0F8 80240FB8 8C2237B8 */ lw $v0, %lo(D_802437B8)($at) +/* BAB0F8 80240FB8 8C2237B8 */ lw $v0, %lo(func_802437B8)($at) /* BAB0FC 80240FBC 00400008 */ jr $v0 /* BAB100 80240FC0 00000000 */ nop /* BAB104 80240FC4 0260202D */ daddu $a0, $s3, $zero @@ -105,7 +105,7 @@ glabel func_80240E60_BAAFA0 /* BAB128 80240FE8 0000102D */ daddu $v0, $zero, $zero /* BAB12C 80240FEC 0260202D */ daddu $a0, $s3, $zero /* BAB130 80240FF0 0280282D */ daddu $a1, $s4, $zero -/* BAB134 80240FF4 0C0901F6 */ jal mim_07_UnkNpcAIFunc1 +/* BAB134 80240FF4 0C0901F6 */ jal func_802407D8_BAA918 /* BAB138 80240FF8 0200302D */ daddu $a2, $s0, $zero /* BAB13C 80240FFC 8E630070 */ lw $v1, 0x70($s3) /* BAB140 80241000 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240E60_BAAFA0 /* BAB188 80241048 0000102D */ daddu $v0, $zero, $zero /* BAB18C 8024104C 0260202D */ daddu $a0, $s3, $zero /* BAB190 80241050 0280282D */ daddu $a1, $s4, $zero -/* BAB194 80241054 0C090387 */ jal mim_07_UnkDurationCheck +/* BAB194 80241054 0C090387 */ jal func_80240E1C_BAAF5C /* BAB198 80241058 0200302D */ daddu $a2, $s0, $zero .L8024105C: /* BAB19C 8024105C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 36dfa55f54..10eecb3f26 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -83,7 +83,7 @@ glabel func_802413AC_BAECEC /* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero /* BAEE20 802414E0 0280202D */ daddu $a0, $s4, $zero /* BAEE24 802414E4 0200282D */ daddu $a1, $s0, $zero -/* BAEE28 802414E8 0C09021E */ jal mim_08_UnkNpcAIFunc1 +/* BAEE28 802414E8 0C09021E */ jal func_80240878_BAE1B8 /* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero /* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero /* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802413AC_BAECEC /* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero /* BAEE48 80241508 0280202D */ daddu $a0, $s4, $zero /* BAEE4C 8024150C 0200282D */ daddu $a1, $s0, $zero -/* BAEE50 80241510 0C09031F */ jal mim_08_UnkNpcAIFunc2 +/* BAEE50 80241510 0C09031F */ jal func_80240C7C_BAE5BC /* BAEE54 80241514 0260302D */ daddu $a2, $s3, $zero /* BAEE58 80241518 0280202D */ daddu $a0, $s4, $zero /* BAEE5C 8024151C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802413AC_BAECEC /* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero /* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero /* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BAEE90 80241550 0C0903A5 */ jal mim_08_UnkNpcAIFunc3 +/* BAEE90 80241550 0C0903A5 */ jal func_80240E94_BAE7D4 /* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero /* BAEE98 80241558 0809055D */ j .L80241574 /* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s index 46a1c55cd3..5ea4c0ecb6 100644 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -46,7 +46,7 @@ glabel func_80241BB4_BAF4F4 /* BAF598 80241C58 8E2200B0 */ lw $v0, 0xb0($s1) /* BAF59C 80241C5C 30420004 */ andi $v0, $v0, 4 /* BAF5A0 80241C60 10400020 */ beqz $v0, .L80241CE4 -/* BAF5A4 80241C64 00000000 */ nop +/* BAF5A4 80241C64 00000000 */ nop .L80241C68: /* BAF5A8 80241C68 2404F7FF */ addiu $a0, $zero, -0x801 /* BAF5AC 80241C6C AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80241BB4_BAF4F4 /* BAF624 80241CE4 8E420070 */ lw $v0, 0x70($s2) /* BAF628 80241CE8 2842001E */ slti $v0, $v0, 0x1e /* BAF62C 80241CEC 10400009 */ beqz $v0, .L80241D14 -/* BAF630 80241CF0 00000000 */ nop +/* BAF630 80241CF0 00000000 */ nop /* BAF634 80241CF4 8E22006C */ lw $v0, 0x6c($s1) /* BAF638 80241CF8 14400006 */ bnez $v0, .L80241D14 -/* BAF63C 80241CFC 00000000 */ nop +/* BAF63C 80241CFC 00000000 */ nop /* BAF640 80241D00 0C0905E8 */ jal func_802417A0_BAF0E0 /* BAF644 80241D04 0240202D */ daddu $a0, $s2, $zero /* BAF648 80241D08 10400002 */ beqz $v0, .L80241D14 @@ -104,7 +104,7 @@ glabel func_80241BB4_BAF4F4 /* BAF668 80241D28 00220821 */ addu $at, $at, $v0 /* BAF66C 80241D2C 8C225300 */ lw $v0, %lo(D_80245300)($at) /* BAF670 80241D30 00400008 */ jr $v0 -/* BAF674 80241D34 00000000 */ nop +/* BAF674 80241D34 00000000 */ nop /* BAF678 80241D38 0240202D */ daddu $a0, $s2, $zero /* BAF67C 80241D3C 0260282D */ daddu $a1, $s3, $zero /* BAF680 80241D40 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80241BB4_BAF4F4 /* BAF690 80241D50 0C0125AE */ jal func_800496B8 /* BAF694 80241D54 0280302D */ daddu $a2, $s4, $zero /* BAF698 80241D58 08090790 */ j .L80241E40 -/* BAF69C 80241D5C 00000000 */ nop +/* BAF69C 80241D5C 00000000 */ nop /* BAF6A0 80241D60 0240202D */ daddu $a0, $s2, $zero /* BAF6A4 80241D64 0260282D */ daddu $a1, $s3, $zero -/* BAF6A8 80241D68 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* BAF6A8 80241D68 0C0126D1 */ jal func_80049B44 /* BAF6AC 80241D6C 0280302D */ daddu $a2, $s4, $zero /* BAF6B0 80241D70 0240202D */ daddu $a0, $s2, $zero /* BAF6B4 80241D74 0260282D */ daddu $a1, $s3, $zero /* BAF6B8 80241D78 0C012701 */ jal func_80049C04 /* BAF6BC 80241D7C 0280302D */ daddu $a2, $s4, $zero /* BAF6C0 80241D80 08090790 */ j .L80241E40 -/* BAF6C4 80241D84 00000000 */ nop +/* BAF6C4 80241D84 00000000 */ nop /* BAF6C8 80241D88 0240202D */ daddu $a0, $s2, $zero /* BAF6CC 80241D8C 0260282D */ daddu $a1, $s3, $zero /* BAF6D0 80241D90 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80241BB4_BAF4F4 /* BAF6E0 80241DA0 0C0127B3 */ jal func_80049ECC /* BAF6E4 80241DA4 0280302D */ daddu $a2, $s4, $zero /* BAF6E8 80241DA8 08090790 */ j .L80241E40 -/* BAF6EC 80241DAC 00000000 */ nop +/* BAF6EC 80241DAC 00000000 */ nop /* BAF6F0 80241DB0 0240202D */ daddu $a0, $s2, $zero /* BAF6F4 80241DB4 0260282D */ daddu $a1, $s3, $zero /* BAF6F8 80241DB8 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80241BB4_BAF4F4 /* BAF708 80241DC8 0C012849 */ jal func_8004A124 /* BAF70C 80241DCC 0280302D */ daddu $a2, $s4, $zero /* BAF710 80241DD0 08090790 */ j .L80241E40 -/* BAF714 80241DD4 00000000 */ nop +/* BAF714 80241DD4 00000000 */ nop /* BAF718 80241DD8 0240202D */ daddu $a0, $s2, $zero /* BAF71C 80241DDC 0260282D */ daddu $a1, $s3, $zero /* BAF720 80241DE0 0C0128FA */ jal func_8004A3E8 /* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero /* BAF728 80241DE8 08090790 */ j .L80241E40 -/* BAF72C 80241DEC 00000000 */ nop -/* BAF730 80241DF0 0C090566 */ jal mim_08_UnkNpcAIFunc6 +/* BAF72C 80241DEC 00000000 */ nop +/* BAF730 80241DF0 0C090566 */ jal func_80241598_BAEED8 /* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero -/* BAF738 80241DF8 0C090581 */ jal mim_08_UnkNpcAIFunc7 +/* BAF738 80241DF8 0C090581 */ jal func_80241604_BAEF44 /* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) /* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 /* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 -/* BAF74C 80241E0C 00000000 */ nop -/* BAF750 80241E10 0C09059D */ jal mim_08_UnkNpcAIFunc8 +/* BAF74C 80241E0C 00000000 */ nop +/* BAF750 80241E10 0C09059D */ jal func_80241674_BAEFB4 /* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero /* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) /* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 /* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 -/* BAF764 80241E24 00000000 */ nop -/* BAF768 80241E28 0C0905D3 */ jal mim_08_UnkNpcAIFunc5 +/* BAF764 80241E24 00000000 */ nop +/* BAF768 80241E28 0C0905D3 */ jal func_8024174C_BAF08C /* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero /* BAF770 80241E30 08090790 */ j .L80241E40 -/* BAF774 80241E34 00000000 */ nop +/* BAF774 80241E34 00000000 */ nop /* BAF778 80241E38 0C0129CF */ jal func_8004A73C /* BAF77C 80241E3C 0240202D */ daddu $a0, $s2, $zero .L80241E40: diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s index b96a99fd53..d7ca5c7896 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_802402D0_BB30D0.s @@ -83,8 +83,8 @@ glabel func_802402D0_BB30D0 /* BB31FC 802403FC 27A5002C */ addiu $a1, $sp, 0x2c /* BB3200 80240400 C6000038 */ lwc1 $f0, 0x38($s0) /* BB3204 80240404 860200A6 */ lh $v0, 0xa6($s0) -/* BB3208 80240408 3C018024 */ lui $at, %hi(D_80242B90) -/* BB320C 8024040C D4222B90 */ ldc1 $f2, %lo(D_80242B90)($at) +/* BB3208 80240408 3C018024 */ lui $at, %hi(func_80242B90_A1DC90) +/* BB320C 8024040C D4222B90 */ ldc1 $f2, %lo(func_80242B90_A1DC90)($at) /* BB3210 80240410 27A60030 */ addiu $a2, $sp, 0x30 /* BB3214 80240414 E7A0002C */ swc1 $f0, 0x2c($sp) /* BB3218 80240418 44820000 */ mtc1 $v0, $f0 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index 920abea87f..106f70c28e 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -105,7 +105,7 @@ glabel func_80240C90_BB3A90 /* BB3C18 80240E18 0000102D */ daddu $v0, $zero, $zero /* BB3C1C 80240E1C 0260202D */ daddu $a0, $s3, $zero /* BB3C20 80240E20 0280282D */ daddu $a1, $s4, $zero -/* BB3C24 80240E24 0C090182 */ jal mim_09_UnkNpcAIFunc1 +/* BB3C24 80240E24 0C090182 */ jal func_80240608_BB3408 /* BB3C28 80240E28 0200302D */ daddu $a2, $s0, $zero /* BB3C2C 80240E2C 8E630070 */ lw $v1, 0x70($s3) /* BB3C30 80240E30 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240C90_BB3A90 /* BB3C78 80240E78 0000102D */ daddu $v0, $zero, $zero /* BB3C7C 80240E7C 0260202D */ daddu $a0, $s3, $zero /* BB3C80 80240E80 0280282D */ daddu $a1, $s4, $zero -/* BB3C84 80240E84 0C090313 */ jal mim_09_UnkDurationCheck +/* BB3C84 80240E84 0C090313 */ jal func_80240C4C_BB3A4C /* BB3C88 80240E88 0200302D */ daddu $a2, $s0, $zero .L80240E8C: /* BB3C8C 80240E8C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index 12b30a4aea..e191844d92 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -119,11 +119,11 @@ glabel func_802407F4_9C5BD4 /* 9C5D88 802409A8 00000000 */ nop /* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 9C5D94 802409B4 0C090075 */ jal nok_01_NpcJumpFunc3 +/* 9C5D94 802409B4 0C090075 */ jal func_802401D4_9C55B4 /* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 9C5DA4 802409C4 0C09008D */ jal nok_01_NpcJumpFunc +/* 9C5DA4 802409C4 0C09008D */ jal func_80240234_9C5614 /* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 9C5DAC 802409CC 08090291 */ j .L80240A44 /* 9C5DB0 802409D0 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802407F4_9C5BD4 /* 9C5DC0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DC4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DCC 802409EC 0C0900F7 */ jal nok_01_UnkNpcAIFunc11 +/* 9C5DCC 802409EC 0C0900F7 */ jal func_802403DC_9C57BC /* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DD4 802409F4 08090291 */ j .L80240A44 /* 9C5DD8 802409F8 00000000 */ nop /* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 9C5DE4 80240A04 0C09013E */ jal nok_01_UnkNpcAIFunc10 +/* 9C5DE4 80240A04 0C09013E */ jal func_802404F8_9C58D8 /* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 9C5DEC 80240A0C 08090291 */ j .L80240A44 /* 9C5DF0 80240A10 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s index a28c805d9d..c7eba4155b 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s @@ -9,8 +9,8 @@ glabel func_802410C8_9C64A8 /* 9C64B8 802410D8 8C84014C */ lw $a0, 0x14c($a0) /* 9C64BC 802410DC 24040008 */ addiu $a0, $zero, 8 /* 9C64C0 802410E0 0040802D */ daddu $s0, $v0, $zero -/* 9C64C4 802410E4 3C028024 */ lui $v0, %hi(D_80241134) -/* 9C64C8 802410E8 24421134 */ addiu $v0, $v0, %lo(D_80241134) +/* 9C64C4 802410E4 3C028024 */ lui $v0, %hi(func_80241134_9C544C) +/* 9C64C8 802410E8 24421134 */ addiu $v0, $v0, %lo(func_80241134_9C544C) /* 9C64CC 802410EC 0C00AB39 */ jal heap_malloc /* 9C64D0 802410F0 AE020008 */ sw $v0, 8($s0) /* 9C64D4 802410F4 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s index 5afacd3052..b80e971758 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s @@ -3,8 +3,8 @@ glabel func_80241DCC_9C71AC /* 9C71AC 80241DCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C71B0 80241DD0 3C058024 */ lui $a1, %hi(D_80241D60) -/* 9C71B4 80241DD4 24A51D60 */ addiu $a1, $a1, %lo(D_80241D60) +/* 9C71B0 80241DD0 3C058024 */ lui $a1, %hi(func_80241D60_9C5374) +/* 9C71B4 80241DD4 24A51D60 */ addiu $a1, $a1, %lo(func_80241D60_9C5374) /* 9C71B8 80241DD8 AFBF0010 */ sw $ra, 0x10($sp) /* 9C71BC 80241DDC 0C048C8F */ jal bind_dynamic_entity_7 /* 9C71C0 80241DE0 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s index 3ad68d311c..2e1e4f3f41 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240624_9D7644.s @@ -18,9 +18,9 @@ glabel func_80240624_9D7644 /* 9D7674 80240654 0000102D */ daddu $v0, $zero, $zero .L80240658: /* 9D7678 80240658 8CC50000 */ lw $a1, ($a2) -/* 9D767C 8024065C 3C068024 */ lui $a2, %hi(D_80245438) +/* 9D767C 8024065C 3C068024 */ lui $a2, %hi(func_80245438) /* 9D7680 80240660 0C0B2026 */ jal set_variable -/* 9D7684 80240664 8CC65438 */ lw $a2, %lo(D_80245438)($a2) +/* 9D7684 80240664 8CC65438 */ lw $a2, %lo(func_80245438)($a2) /* 9D7688 80240668 24020002 */ addiu $v0, $zero, 2 .L8024066C: /* 9D768C 8024066C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s index 92e7abf055..d08f513e5f 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s @@ -7,8 +7,8 @@ glabel func_80240678_9D7698 /* 9D76A0 80240680 8C82000C */ lw $v0, 0xc($a0) /* 9D76A4 80240684 0C0B1EAF */ jal get_variable /* 9D76A8 80240688 8C450000 */ lw $a1, ($v0) -/* 9D76AC 8024068C 3C018024 */ lui $at, %hi(D_80245438) -/* 9D76B0 80240690 AC225438 */ sw $v0, %lo(D_80245438)($at) +/* 9D76AC 8024068C 3C018024 */ lui $at, %hi(func_80245438) +/* 9D76B0 80240690 AC225438 */ sw $v0, %lo(func_80245438)($at) /* 9D76B4 80240694 24020002 */ addiu $v0, $zero, 2 /* 9D76B8 80240698 8FBF0010 */ lw $ra, 0x10($sp) /* 9D76BC 8024069C 24030001 */ addiu $v1, $zero, 1 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index cadb95c592..faa0f405f7 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -141,7 +141,7 @@ glabel func_80241614_9D8634 /* 9D883C 8024181C 00000000 */ nop /* 9D8840 80241820 0280202D */ daddu $a0, $s4, $zero /* 9D8844 80241824 0260282D */ daddu $a1, $s3, $zero -/* 9D8848 80241828 0C0903A0 */ jal nok_02_UnkNpcAIFunc1 +/* 9D8848 80241828 0C0903A0 */ jal func_80240E80_9D7EA0 /* 9D884C 8024182C 02A0302D */ daddu $a2, $s5, $zero /* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero /* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241614_9D8634 /* 9D887C 8024185C 00000000 */ nop /* 9D8880 80241860 0280202D */ daddu $a0, $s4, $zero /* 9D8884 80241864 0260282D */ daddu $a1, $s3, $zero -/* 9D8888 80241868 0C09046C */ jal nok_02_NpcJumpFunc2 +/* 9D8888 80241868 0C09046C */ jal func_802411B0_9D81D0 /* 9D888C 8024186C 02A0302D */ daddu $a2, $s5, $zero /* 9D8890 80241870 0280202D */ daddu $a0, $s4, $zero /* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero -/* 9D8898 80241878 0C090489 */ jal nok_02_NpcJumpFunc +/* 9D8898 80241878 0C090489 */ jal func_80241224_9D8244 /* 9D889C 8024187C 02A0302D */ daddu $a2, $s5, $zero /* 9D88A0 80241880 0809063A */ j .L802418E8 /* 9D88A4 80241884 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241614_9D8634 /* 9D88CC 802418AC 00000000 */ nop /* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero /* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero -/* 9D88D8 802418B8 0C09053B */ jal nok_02_UnkNpcDurationFlagFunc +/* 9D88D8 802418B8 0C09053B */ jal func_802414EC_9D850C /* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero /* 9D88E0 802418C0 0809063A */ j .L802418E8 /* 9D88E4 802418C4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s index 5b73283065..25b023664a 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s @@ -9,8 +9,8 @@ glabel func_80241C70_9D8C90 /* 9D8CA0 80241C80 8C84014C */ lw $a0, 0x14c($a0) /* 9D8CA4 80241C84 24040008 */ addiu $a0, $zero, 8 /* 9D8CA8 80241C88 0040802D */ daddu $s0, $v0, $zero -/* 9D8CAC 80241C8C 3C028024 */ lui $v0, %hi(D_80241CDC) -/* 9D8CB0 80241C90 24421CDC */ addiu $v0, $v0, %lo(D_80241CDC) +/* 9D8CAC 80241C8C 3C028024 */ lui $v0, %hi(func_80241CDC_9D7B0C) +/* 9D8CB0 80241C90 24421CDC */ addiu $v0, $v0, %lo(func_80241CDC_9D7B0C) /* 9D8CB4 80241C94 0C00AB39 */ jal heap_malloc /* 9D8CB8 80241C98 AE020008 */ sw $v0, 8($s0) /* 9D8CBC 80241C9C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s index 1147a17fc6..a3662a8f85 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s @@ -38,8 +38,8 @@ glabel func_80242080_9D90A0 /* 9D9124 80242104 0220202D */ daddu $a0, $s1, $zero /* 9D9128 80242108 3C05F4AC */ lui $a1, 0xf4ac /* 9D912C 8024210C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9D9130 80242110 3C108025 */ lui $s0, %hi(D_802549C0) -/* 9D9134 80242114 261049C0 */ addiu $s0, $s0, %lo(D_802549C0) +/* 9D9130 80242110 3C108025 */ lui $s0, %hi(func_802549C0) +/* 9D9134 80242114 261049C0 */ addiu $s0, $s0, %lo(func_802549C0) /* 9D9138 80242118 0C0B1EAF */ jal get_variable /* 9D913C 8024211C AE020000 */ sw $v0, ($s0) /* 9D9140 80242120 0220202D */ daddu $a0, $s1, $zero @@ -106,8 +106,8 @@ glabel func_80242080_9D90A0 /* 9D9234 80242214 AC800028 */ sw $zero, 0x28($a0) /* 9D9238 80242218 AC80001C */ sw $zero, 0x1c($a0) .L8024221C: -/* 9D923C 8024221C 3C028025 */ lui $v0, %hi(D_802549C0) -/* 9D9240 80242220 8C4249C0 */ lw $v0, %lo(D_802549C0)($v0) +/* 9D923C 8024221C 3C028025 */ lui $v0, %hi(func_802549C0) +/* 9D9240 80242220 8C4249C0 */ lw $v0, %lo(func_802549C0)($v0) /* 9D9244 80242224 8C44000C */ lw $a0, 0xc($v0) /* 9D9248 80242228 8C820020 */ lw $v0, 0x20($a0) /* 9D924C 8024222C 8C830028 */ lw $v1, 0x28($a0) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s index a15fe79d32..ef80ec6e97 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s @@ -16,8 +16,8 @@ glabel func_80242298_9D92B8 /* 9D92E4 802422C4 34420010 */ ori $v0, $v0, 0x10 /* 9D92E8 802422C8 AC820000 */ sw $v0, ($a0) .L802422CC: -/* 9D92EC 802422CC 3C048025 */ lui $a0, %hi(D_802549C0) -/* 9D92F0 802422D0 8C8449C0 */ lw $a0, %lo(D_802549C0)($a0) +/* 9D92EC 802422CC 3C048025 */ lui $a0, %hi(func_802549C0) +/* 9D92F0 802422D0 8C8449C0 */ lw $a0, %lo(func_802549C0)($a0) /* 9D92F4 802422D4 8C85000C */ lw $a1, 0xc($a0) /* 9D92F8 802422D8 8CA20018 */ lw $v0, 0x18($a1) /* 9D92FC 802422DC 8CA30020 */ lw $v1, 0x20($a1) @@ -41,8 +41,8 @@ glabel func_80242298_9D92B8 .L80242324: /* 9D9344 80242324 0C016914 */ jal remove_effect /* 9D9348 80242328 ACA00018 */ sw $zero, 0x18($a1) -/* 9D934C 8024232C 3C048025 */ lui $a0, %hi(D_802549A0) -/* 9D9350 80242330 8C8449A0 */ lw $a0, %lo(D_802549A0)($a0) +/* 9D934C 8024232C 3C048025 */ lui $a0, %hi(func_802549A0) +/* 9D9350 80242330 8C8449A0 */ lw $a0, %lo(func_802549A0)($a0) /* 9D9354 80242334 0C048D70 */ jal func_801235C0 /* 9D9358 80242338 00000000 */ nop /* 9D935C 8024233C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s index 7108dcf9e9..716983a372 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s @@ -7,8 +7,8 @@ glabel func_8024234C_9D936C /* 9D9374 80242354 8C82000C */ lw $v0, 0xc($a0) /* 9D9378 80242358 0C0B1EAF */ jal get_variable /* 9D937C 8024235C 8C450000 */ lw $a1, ($v0) -/* 9D9380 80242360 3C038025 */ lui $v1, %hi(D_802549C0) -/* 9D9384 80242364 8C6349C0 */ lw $v1, %lo(D_802549C0)($v1) +/* 9D9380 80242360 3C038025 */ lui $v1, %hi(func_802549C0) +/* 9D9384 80242364 8C6349C0 */ lw $v1, %lo(func_802549C0)($v1) /* 9D9388 80242368 8C63000C */ lw $v1, 0xc($v1) /* 9D938C 8024236C AC620034 */ sw $v0, 0x34($v1) /* 9D9390 80242370 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s index 5dde5f1c7a..f27a08036f 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242380_9D93A0.s @@ -8,8 +8,8 @@ glabel func_80242380_9D93A0 /* 9D93AC 8024238C 0C0B1EAF */ jal get_variable /* 9D93B0 80242390 8C450000 */ lw $a1, ($v0) /* 9D93B4 80242394 0040202D */ daddu $a0, $v0, $zero -/* 9D93B8 80242398 3C028025 */ lui $v0, %hi(D_802549C0) -/* 9D93BC 8024239C 8C4249C0 */ lw $v0, %lo(D_802549C0)($v0) +/* 9D93B8 80242398 3C028025 */ lui $v0, %hi(func_802549C0) +/* 9D93BC 8024239C 8C4249C0 */ lw $v0, %lo(func_802549C0)($v0) /* 9D93C0 802423A0 24030001 */ addiu $v1, $zero, 1 /* 9D93C4 802423A4 8C45000C */ lw $a1, 0xc($v0) /* 9D93C8 802423A8 1083000D */ beq $a0, $v1, .L802423E0 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s index 8cf4d8bd20..9a31d2d5a6 100644 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s @@ -3,14 +3,14 @@ glabel func_80242974_9D9994 /* 9D9994 80242974 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9998 80242978 3C058024 */ lui $a1, %hi(D_80242908) -/* 9D999C 8024297C 24A52908 */ addiu $a1, $a1, %lo(D_80242908) +/* 9D9998 80242978 3C058024 */ lui $a1, %hi(func_80242908_9D7A34) +/* 9D999C 8024297C 24A52908 */ addiu $a1, $a1, %lo(func_80242908_9D7A34) /* 9D99A0 80242980 AFBF0010 */ sw $ra, 0x10($sp) /* 9D99A4 80242984 0C048C8F */ jal bind_dynamic_entity_7 /* 9D99A8 80242988 0000202D */ daddu $a0, $zero, $zero /* 9D99AC 8024298C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D99B0 80242990 3C018025 */ lui $at, %hi(D_802549A0) -/* 9D99B4 80242994 AC2249A0 */ sw $v0, %lo(D_802549A0)($at) +/* 9D99B0 80242990 3C018025 */ lui $at, %hi(func_802549A0) +/* 9D99B4 80242994 AC2249A0 */ sw $v0, %lo(func_802549A0)($at) /* 9D99B8 80242998 24020002 */ addiu $v0, $zero, 2 /* 9D99BC 8024299C 03E00008 */ jr $ra /* 9D99C0 802429A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index b2860dadb0..1fe18108f9 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_9EC3E0 /* 9EC568 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9EC56C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9EC570 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9EC574 80240D84 0C09015A */ jal nok_03_UnkNpcAIFunc1 +/* 9EC574 80240D84 0C09015A */ jal func_80240568_9EBD58 /* 9EC578 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9EC57C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9EC580 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240BF0_9EC3E0 /* 9EC5C8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9EC5CC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9EC5D0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9EC5D4 80240DE4 0C0902EB */ jal nok_03_UnkDurationCheck +/* 9EC5D4 80240DE4 0C0902EB */ jal func_80240BAC_9EC39C /* 9EC5D8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9EC5DC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s index 87f28573f1..7f070e5889 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s @@ -8,8 +8,8 @@ glabel func_8024051C_9EE10C /* 9EE118 80240528 0C0B1EAF */ jal get_variable /* 9EE11C 8024052C 8C450000 */ lw $a1, ($v0) /* 9EE120 80240530 8FBF0010 */ lw $ra, 0x10($sp) -/* 9EE124 80240534 3C018024 */ lui $at, %hi(D_80241438) -/* 9EE128 80240538 AC221438 */ sw $v0, %lo(D_80241438)($at) +/* 9EE124 80240534 3C018024 */ lui $at, %hi(func_80241438_8535A8) +/* 9EE128 80240538 AC221438 */ sw $v0, %lo(func_80241438_8535A8)($at) /* 9EE12C 8024053C 24020002 */ addiu $v0, $zero, 2 /* 9EE130 80240540 03E00008 */ jr $ra /* 9EE134 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s index b668a558c3..de9e1a0b9a 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240574_9EE164.s @@ -18,9 +18,9 @@ glabel func_80240574_9EE164 /* 9EE198 802405A8 00028840 */ sll $s1, $v0, 1 /* 9EE19C 802405AC 02228821 */ addu $s1, $s1, $v0 /* 9EE1A0 802405B0 00111080 */ sll $v0, $s1, 2 -/* 9EE1A4 802405B4 3C068024 */ lui $a2, %hi(D_80241440) +/* 9EE1A4 802405B4 3C068024 */ lui $a2, %hi(func_80241440_8ED260) /* 9EE1A8 802405B8 00C23021 */ addu $a2, $a2, $v0 -/* 9EE1AC 802405BC 8CC61440 */ lw $a2, %lo(D_80241440)($a2) +/* 9EE1AC 802405BC 8CC61440 */ lw $a2, %lo(func_80241440_8ED260)($a2) /* 9EE1B0 802405C0 8E130000 */ lw $s3, ($s0) /* 9EE1B4 802405C4 8E100004 */ lw $s0, 4($s0) /* 9EE1B8 802405C8 0C0B2026 */ jal set_variable @@ -28,17 +28,17 @@ glabel func_80240574_9EE164 /* 9EE1C0 802405D0 0240202D */ daddu $a0, $s2, $zero /* 9EE1C4 802405D4 26220001 */ addiu $v0, $s1, 1 /* 9EE1C8 802405D8 00021080 */ sll $v0, $v0, 2 -/* 9EE1CC 802405DC 3C068024 */ lui $a2, %hi(D_80241440) +/* 9EE1CC 802405DC 3C068024 */ lui $a2, %hi(func_80241440_8ED260) /* 9EE1D0 802405E0 00C23021 */ addu $a2, $a2, $v0 -/* 9EE1D4 802405E4 8CC61440 */ lw $a2, %lo(D_80241440)($a2) +/* 9EE1D4 802405E4 8CC61440 */ lw $a2, %lo(func_80241440_8ED260)($a2) /* 9EE1D8 802405E8 0C0B2026 */ jal set_variable /* 9EE1DC 802405EC 0260282D */ daddu $a1, $s3, $zero /* 9EE1E0 802405F0 0240202D */ daddu $a0, $s2, $zero /* 9EE1E4 802405F4 26310002 */ addiu $s1, $s1, 2 /* 9EE1E8 802405F8 00118880 */ sll $s1, $s1, 2 -/* 9EE1EC 802405FC 3C068024 */ lui $a2, %hi(D_80241440) +/* 9EE1EC 802405FC 3C068024 */ lui $a2, %hi(func_80241440_8ED260) /* 9EE1F0 80240600 00D13021 */ addu $a2, $a2, $s1 -/* 9EE1F4 80240604 8CC61440 */ lw $a2, %lo(D_80241440)($a2) +/* 9EE1F4 80240604 8CC61440 */ lw $a2, %lo(func_80241440_8ED260)($a2) /* 9EE1F8 80240608 0C0B2026 */ jal set_variable /* 9EE1FC 8024060C 0200282D */ daddu $a1, $s0, $zero /* 9EE200 80240610 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s index 970ec2dc32..7b91b4b47d 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_802406C4_9EE2B4.s @@ -44,8 +44,8 @@ glabel func_802406C4_9EE2B4 /* 9EE34C 8024075C 0C0B102B */ jal kill_script_by_ID /* 9EE350 80240760 8E040084 */ lw $a0, 0x84($s0) .L80240764: -/* 9EE354 80240764 3C048024 */ lui $a0, %hi(D_80241470) -/* 9EE358 80240768 24841470 */ addiu $a0, $a0, %lo(D_80241470) +/* 9EE354 80240764 3C048024 */ lui $a0, %hi(func_80241470_95C670) +/* 9EE358 80240768 24841470 */ addiu $a0, $a0, %lo(func_80241470_95C670) /* 9EE35C 8024076C 12400005 */ beqz $s2, .L80240784 /* 9EE360 80240770 24020001 */ addiu $v0, $zero, 1 /* 9EE364 80240774 16420004 */ bne $s2, $v0, .L80240788 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s index ced67981f5..ae926219b6 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240814_9EE404.s @@ -345,10 +345,10 @@ glabel func_80240814_9EE404 /* 9EE940 80240D50 AC830000 */ sw $v1, ($a0) /* 9EE944 80240D54 24030040 */ addiu $v1, $zero, 0x40 /* 9EE948 80240D58 AC830004 */ sw $v1, 4($a0) -/* 9EE94C 80240D5C 3C03E700 */ lui $v1, %hi(D_E70013F8) +/* 9EE94C 80240D5C 3C03E700 */ lui $v1, 0xe700 /* 9EE950 80240D60 AC430000 */ sw $v1, ($v0) /* 9EE954 80240D64 3C038024 */ lui $v1, %hi(D_802413F8) -/* 9EE958 80240D68 246313F8 */ addiu $v1, $v1, %lo(D_E70013F8) +/* 9EE958 80240D68 246313F8 */ addiu $v1, $v1, %lo(D_802413F8) /* 9EE95C 80240D6C AC400004 */ sw $zero, 4($v0) /* 9EE960 80240D70 8C640040 */ lw $a0, 0x40($v1) /* 9EE964 80240D74 24420008 */ addiu $v0, $v0, 8 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s index 751172aa4a..6f4ac9b19e 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s @@ -4,11 +4,11 @@ glabel func_80240E4C_9EEA3C /* 9EEA3C 80240E4C 10A00003 */ beqz $a1, .L80240E5C /* 9EEA40 80240E50 00000000 */ nop -/* 9EEA44 80240E54 3C018024 */ lui $at, %hi(D_80243254) -/* 9EEA48 80240E58 AC203254 */ sw $zero, %lo(D_80243254)($at) +/* 9EEA44 80240E54 3C018024 */ lui $at, %hi(func_80243254_8553C4) +/* 9EEA48 80240E58 AC203254 */ sw $zero, %lo(func_80243254_8553C4)($at) .L80240E5C: -/* 9EEA4C 80240E5C 3C028024 */ lui $v0, %hi(D_80243254) -/* 9EEA50 80240E60 8C423254 */ lw $v0, %lo(D_80243254)($v0) +/* 9EEA4C 80240E5C 3C028024 */ lui $v0, %hi(func_80243254_8553C4) +/* 9EEA50 80240E60 8C423254 */ lw $v0, %lo(func_80243254_8553C4)($v0) /* 9EEA54 80240E64 0002102B */ sltu $v0, $zero, $v0 /* 9EEA58 80240E68 03E00008 */ jr $ra /* 9EEA5C 80240E6C 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s index 5196c6b43f..a80fdd7606 100644 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E70_9EEA60.s @@ -3,8 +3,8 @@ glabel func_80240E70_9EEA60 /* 9EEA60 80240E70 24020001 */ addiu $v0, $zero, 1 -/* 9EEA64 80240E74 3C018024 */ lui $at, %hi(D_80243254) -/* 9EEA68 80240E78 AC223254 */ sw $v0, %lo(D_80243254)($at) +/* 9EEA64 80240E74 3C018024 */ lui $at, %hi(func_80243254_8553C4) +/* 9EEA68 80240E78 AC223254 */ sw $v0, %lo(func_80243254_8553C4)($at) /* 9EEA6C 80240E7C 03E00008 */ jr $ra /* 9EEA70 80240E80 24020002 */ addiu $v0, $zero, 2 /* 9EEA74 80240E84 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index ffd8e84d0d..1cdd8cf71d 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -55,7 +55,7 @@ glabel func_80240394_9F4DD4 /* 9F4E98 80240458 8E2200B0 */ lw $v0, 0xb0($s1) /* 9F4E9C 8024045C 30420004 */ andi $v0, $v0, 4 /* 9F4EA0 80240460 10400047 */ beqz $v0, .L80240580 -/* 9F4EA4 80240464 00000000 */ nop +/* 9F4EA4 80240464 00000000 */ nop .L80240468: /* 9F4EA8 80240468 AE600070 */ sw $zero, 0x70($s3) /* 9F4EAC 8024046C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240394_9F4DD4 /* 9F4F50 80240510 24020028 */ addiu $v0, $zero, 0x28 /* 9F4F54 80240514 AFA2001C */ sw $v0, 0x1c($sp) /* 9F4F58 80240518 44833000 */ mtc1 $v1, $f6 -/* 9F4F5C 8024051C 00000000 */ nop +/* 9F4F5C 8024051C 00000000 */ nop /* 9F4F60 80240520 468031A0 */ cvt.s.w $f6, $f6 /* 9F4F64 80240524 44073000 */ mfc1 $a3, $f6 /* 9F4F68 80240528 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240394_9F4DD4 /* 9F5020 802405E0 10600015 */ beqz $v1, .L80240638 /* 9F5024 802405E4 0260202D */ daddu $a0, $s3, $zero /* 9F5028 802405E8 080901D0 */ j .L80240740 -/* 9F502C 802405EC 00000000 */ nop +/* 9F502C 802405EC 00000000 */ nop .L802405F0: /* 9F5030 802405F0 1062001C */ beq $v1, $v0, .L80240664 /* 9F5034 802405F4 24020003 */ addiu $v0, $zero, 3 /* 9F5038 802405F8 10620035 */ beq $v1, $v0, .L802406D0 /* 9F503C 802405FC 0260202D */ daddu $a0, $s3, $zero /* 9F5040 80240600 080901D0 */ j .L80240740 -/* 9F5044 80240604 00000000 */ nop +/* 9F5044 80240604 00000000 */ nop .L80240608: /* 9F5048 80240608 2402000E */ addiu $v0, $zero, 0xe /* 9F504C 8024060C 1062003F */ beq $v1, $v0, .L8024070C @@ -177,9 +177,9 @@ glabel func_80240394_9F4DD4 /* 9F5060 80240620 10620040 */ beq $v1, $v0, .L80240724 /* 9F5064 80240624 24020063 */ addiu $v0, $zero, 0x63 /* 9F5068 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 9F506C 8024062C 00000000 */ nop +/* 9F506C 8024062C 00000000 */ nop /* 9F5070 80240630 080901D0 */ j .L80240740 -/* 9F5074 80240634 00000000 */ nop +/* 9F5074 80240634 00000000 */ nop .L80240638: /* 9F5078 80240638 0280282D */ daddu $a1, $s4, $zero /* 9F507C 8024063C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240394_9F4DD4 /* 9F5094 80240654 0C0125AE */ jal func_800496B8 /* 9F5098 80240658 02A0302D */ daddu $a2, $s5, $zero /* 9F509C 8024065C 080901D0 */ j .L80240740 -/* 9F50A0 80240660 00000000 */ nop +/* 9F50A0 80240660 00000000 */ nop .L80240664: /* 9F50A4 80240664 0260202D */ daddu $a0, $s3, $zero /* 9F50A8 80240668 0280282D */ daddu $a1, $s4, $zero -/* 9F50AC 8024066C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9F50AC 8024066C 0C0126D1 */ jal func_80049B44 /* 9F50B0 80240670 02A0302D */ daddu $a2, $s5, $zero /* 9F50B4 80240674 8E230088 */ lw $v1, 0x88($s1) /* 9F50B8 80240678 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240394_9F4DD4 /* 9F5114 802406D4 0C012701 */ jal func_80049C04 /* 9F5118 802406D8 02A0302D */ daddu $a2, $s5, $zero /* 9F511C 802406DC 080901D0 */ j .L80240740 -/* 9F5120 802406E0 00000000 */ nop +/* 9F5120 802406E0 00000000 */ nop .L802406E4: /* 9F5124 802406E4 0260202D */ daddu $a0, $s3, $zero /* 9F5128 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 9F512C 802406EC 0C090000 */ jal nok_11_set_script_owner_npc_anim +/* 9F512C 802406EC 0C090000 */ jal func_80240000_9F4A40 /* 9F5130 802406F0 02A0302D */ daddu $a2, $s5, $zero /* 9F5134 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: @@ -240,20 +240,20 @@ glabel func_80240394_9F4DD4 /* 9F513C 802406FC 0C09001F */ jal func_8024007C_9F4ABC /* 9F5140 80240700 02A0302D */ daddu $a2, $s5, $zero /* 9F5144 80240704 080901D0 */ j .L80240740 -/* 9F5148 80240708 00000000 */ nop +/* 9F5148 80240708 00000000 */ nop .L8024070C: /* 9F514C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 9F5150 80240710 0280282D */ daddu $a1, $s4, $zero -/* 9F5154 80240714 0C09006C */ jal nok_11_UnkNpcAIFunc12 +/* 9F5154 80240714 0C09006C */ jal func_802401B0_9F4BF0 /* 9F5158 80240718 02A0302D */ daddu $a2, $s5, $zero /* 9F515C 8024071C 080901D0 */ j .L80240740 -/* 9F5160 80240720 00000000 */ nop +/* 9F5160 80240720 00000000 */ nop .L80240724: /* 9F5164 80240724 0280282D */ daddu $a1, $s4, $zero -/* 9F5168 80240728 0C0900C5 */ jal nok_11_set_script_owner_npc_col_height +/* 9F5168 80240728 0C0900C5 */ jal func_80240314_9F4D54 /* 9F516C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9F5170 80240730 080901D0 */ j .L80240740 -/* 9F5174 80240734 00000000 */ nop +/* 9F5174 80240734 00000000 */ nop .L80240738: /* 9F5178 80240738 0C0129CF */ jal func_8004A73C /* 9F517C 8024073C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240394_9F4DD4 /* 9F51D0 80240790 00220821 */ addu $at, $at, $v0 /* 9F51D4 80240794 8C225CF8 */ lw $v0, %lo(D_80245CF8)($at) /* 9F51D8 80240798 00400008 */ jr $v0 -/* 9F51DC 8024079C 00000000 */ nop +/* 9F51DC 8024079C 00000000 */ nop /* 9F51E0 802407A0 8E420028 */ lw $v0, 0x28($s2) /* 9F51E4 802407A4 24420001 */ addiu $v0, $v0, 1 /* 9F51E8 802407A8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 90635b292a..bbd2a923a0 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -83,7 +83,7 @@ glabel func_80241AE0_9F6520 /* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero /* 9F6654 80241C14 0280202D */ daddu $a0, $s4, $zero /* 9F6658 80241C18 0200282D */ daddu $a1, $s0, $zero -/* 9F665C 80241C1C 0C0903EB */ jal nok_11_UnkNpcAIFunc1 +/* 9F665C 80241C1C 0C0903EB */ jal func_80240FAC_9F59EC /* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero /* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero /* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241AE0_9F6520 /* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero /* 9F667C 80241C3C 0280202D */ daddu $a0, $s4, $zero /* 9F6680 80241C40 0200282D */ daddu $a1, $s0, $zero -/* 9F6684 80241C44 0C0904EC */ jal nok_11_UnkNpcAIFunc2 +/* 9F6684 80241C44 0C0904EC */ jal func_802413B0_9F5DF0 /* 9F6688 80241C48 0260302D */ daddu $a2, $s3, $zero /* 9F668C 80241C4C 0280202D */ daddu $a0, $s4, $zero /* 9F6690 80241C50 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241AE0_9F6520 /* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero /* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero /* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero -/* 9F66C4 80241C84 0C090572 */ jal nok_11_UnkNpcAIFunc3 +/* 9F66C4 80241C84 0C090572 */ jal func_802415C8_9F6008 /* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero /* 9F66CC 80241C8C 0809072A */ j .L80241CA8 /* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index 233efc8070..2fd68b73d2 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -55,7 +55,7 @@ glabel func_80240904_9FB0F4 /* 9FB1B8 802409C8 8E2200B0 */ lw $v0, 0xb0($s1) /* 9FB1BC 802409CC 30420004 */ andi $v0, $v0, 4 /* 9FB1C0 802409D0 10400047 */ beqz $v0, .L80240AF0 -/* 9FB1C4 802409D4 00000000 */ nop +/* 9FB1C4 802409D4 00000000 */ nop .L802409D8: /* 9FB1C8 802409D8 AE600070 */ sw $zero, 0x70($s3) /* 9FB1CC 802409DC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240904_9FB0F4 /* 9FB270 80240A80 24020028 */ addiu $v0, $zero, 0x28 /* 9FB274 80240A84 AFA2001C */ sw $v0, 0x1c($sp) /* 9FB278 80240A88 44833000 */ mtc1 $v1, $f6 -/* 9FB27C 80240A8C 00000000 */ nop +/* 9FB27C 80240A8C 00000000 */ nop /* 9FB280 80240A90 468031A0 */ cvt.s.w $f6, $f6 /* 9FB284 80240A94 44073000 */ mfc1 $a3, $f6 /* 9FB288 80240A98 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240904_9FB0F4 /* 9FB340 80240B50 10600015 */ beqz $v1, .L80240BA8 /* 9FB344 80240B54 0260202D */ daddu $a0, $s3, $zero /* 9FB348 80240B58 0809032C */ j .L80240CB0 -/* 9FB34C 80240B5C 00000000 */ nop +/* 9FB34C 80240B5C 00000000 */ nop .L80240B60: /* 9FB350 80240B60 1062001C */ beq $v1, $v0, .L80240BD4 /* 9FB354 80240B64 24020003 */ addiu $v0, $zero, 3 /* 9FB358 80240B68 10620035 */ beq $v1, $v0, .L80240C40 /* 9FB35C 80240B6C 0260202D */ daddu $a0, $s3, $zero /* 9FB360 80240B70 0809032C */ j .L80240CB0 -/* 9FB364 80240B74 00000000 */ nop +/* 9FB364 80240B74 00000000 */ nop .L80240B78: /* 9FB368 80240B78 2402000E */ addiu $v0, $zero, 0xe /* 9FB36C 80240B7C 1062003F */ beq $v1, $v0, .L80240C7C @@ -177,9 +177,9 @@ glabel func_80240904_9FB0F4 /* 9FB380 80240B90 10620040 */ beq $v1, $v0, .L80240C94 /* 9FB384 80240B94 24020063 */ addiu $v0, $zero, 0x63 /* 9FB388 80240B98 10620043 */ beq $v1, $v0, .L80240CA8 -/* 9FB38C 80240B9C 00000000 */ nop +/* 9FB38C 80240B9C 00000000 */ nop /* 9FB390 80240BA0 0809032C */ j .L80240CB0 -/* 9FB394 80240BA4 00000000 */ nop +/* 9FB394 80240BA4 00000000 */ nop .L80240BA8: /* 9FB398 80240BA8 0280282D */ daddu $a1, $s4, $zero /* 9FB39C 80240BAC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240904_9FB0F4 /* 9FB3B4 80240BC4 0C0125AE */ jal func_800496B8 /* 9FB3B8 80240BC8 02A0302D */ daddu $a2, $s5, $zero /* 9FB3BC 80240BCC 0809032C */ j .L80240CB0 -/* 9FB3C0 80240BD0 00000000 */ nop +/* 9FB3C0 80240BD0 00000000 */ nop .L80240BD4: /* 9FB3C4 80240BD4 0260202D */ daddu $a0, $s3, $zero /* 9FB3C8 80240BD8 0280282D */ daddu $a1, $s4, $zero -/* 9FB3CC 80240BDC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9FB3CC 80240BDC 0C0126D1 */ jal func_80049B44 /* 9FB3D0 80240BE0 02A0302D */ daddu $a2, $s5, $zero /* 9FB3D4 80240BE4 8E230088 */ lw $v1, 0x88($s1) /* 9FB3D8 80240BE8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240904_9FB0F4 /* 9FB434 80240C44 0C012701 */ jal func_80049C04 /* 9FB438 80240C48 02A0302D */ daddu $a2, $s5, $zero /* 9FB43C 80240C4C 0809032C */ j .L80240CB0 -/* 9FB440 80240C50 00000000 */ nop +/* 9FB440 80240C50 00000000 */ nop .L80240C54: /* 9FB444 80240C54 0260202D */ daddu $a0, $s3, $zero /* 9FB448 80240C58 0280282D */ daddu $a1, $s4, $zero -/* 9FB44C 80240C5C 0C09015C */ jal nok_12_set_script_owner_npc_anim +/* 9FB44C 80240C5C 0C09015C */ jal func_80240570_9FAD60 /* 9FB450 80240C60 02A0302D */ daddu $a2, $s5, $zero /* 9FB454 80240C64 0260202D */ daddu $a0, $s3, $zero .L80240C68: @@ -240,20 +240,20 @@ glabel func_80240904_9FB0F4 /* 9FB45C 80240C6C 0C09017B */ jal func_802405EC_9FADDC /* 9FB460 80240C70 02A0302D */ daddu $a2, $s5, $zero /* 9FB464 80240C74 0809032C */ j .L80240CB0 -/* 9FB468 80240C78 00000000 */ nop +/* 9FB468 80240C78 00000000 */ nop .L80240C7C: /* 9FB46C 80240C7C 0260202D */ daddu $a0, $s3, $zero /* 9FB470 80240C80 0280282D */ daddu $a1, $s4, $zero -/* 9FB474 80240C84 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 +/* 9FB474 80240C84 0C0901C8 */ jal func_80240720_9FAF10 /* 9FB478 80240C88 02A0302D */ daddu $a2, $s5, $zero /* 9FB47C 80240C8C 0809032C */ j .L80240CB0 -/* 9FB480 80240C90 00000000 */ nop +/* 9FB480 80240C90 00000000 */ nop .L80240C94: /* 9FB484 80240C94 0280282D */ daddu $a1, $s4, $zero -/* 9FB488 80240C98 0C090221 */ jal nok_12_set_script_owner_npc_col_height +/* 9FB488 80240C98 0C090221 */ jal func_80240884_9FB074 /* 9FB48C 80240C9C 02A0302D */ daddu $a2, $s5, $zero /* 9FB490 80240CA0 0809032C */ j .L80240CB0 -/* 9FB494 80240CA4 00000000 */ nop +/* 9FB494 80240CA4 00000000 */ nop .L80240CA8: /* 9FB498 80240CA8 0C0129CF */ jal func_8004A73C /* 9FB49C 80240CAC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240904_9FB0F4 /* 9FB4F0 80240D00 00220821 */ addu $at, $at, $v0 /* 9FB4F4 80240D04 8C225A78 */ lw $v0, %lo(D_80245A78)($at) /* 9FB4F8 80240D08 00400008 */ jr $v0 -/* 9FB4FC 80240D0C 00000000 */ nop +/* 9FB4FC 80240D0C 00000000 */ nop /* 9FB500 80240D10 8E420028 */ lw $v0, 0x28($s2) /* 9FB504 80240D14 24420001 */ addiu $v0, $v0, 1 /* 9FB508 80240D18 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index 1da85de331..45048ad574 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -141,7 +141,7 @@ glabel func_802418D8_9FC0C8 /* 9FC2D0 80241AE0 00000000 */ nop /* 9FC2D4 80241AE4 0280202D */ daddu $a0, $s4, $zero /* 9FC2D8 80241AE8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2DC 80241AEC 0C090451 */ jal nok_12_UnkNpcAIFunc1 +/* 9FC2DC 80241AEC 0C090451 */ jal func_80241144_9FB934 /* 9FC2E0 80241AF0 02A0302D */ daddu $a2, $s5, $zero /* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_802418D8_9FC0C8 /* 9FC310 80241B20 00000000 */ nop /* 9FC314 80241B24 0280202D */ daddu $a0, $s4, $zero /* 9FC318 80241B28 0260282D */ daddu $a1, $s3, $zero -/* 9FC31C 80241B2C 0C09051D */ jal nok_12_NpcJumpFunc2 +/* 9FC31C 80241B2C 0C09051D */ jal func_80241474_9FBC64 /* 9FC320 80241B30 02A0302D */ daddu $a2, $s5, $zero /* 9FC324 80241B34 0280202D */ daddu $a0, $s4, $zero /* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero -/* 9FC32C 80241B3C 0C09053A */ jal nok_12_NpcJumpFunc +/* 9FC32C 80241B3C 0C09053A */ jal func_802414E8_9FBCD8 /* 9FC330 80241B40 02A0302D */ daddu $a2, $s5, $zero /* 9FC334 80241B44 080906EB */ j .L80241BAC /* 9FC338 80241B48 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_802418D8_9FC0C8 /* 9FC360 80241B70 00000000 */ nop /* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero /* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero -/* 9FC36C 80241B7C 0C0905EC */ jal nok_12_UnkNpcDurationFlagFunc +/* 9FC36C 80241B7C 0C0905EC */ jal func_802417B0_9FBFA0 /* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero /* 9FC374 80241B84 080906EB */ j .L80241BAC /* 9FC378 80241B88 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index 75e8163db7..5ffe924cce 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -53,7 +53,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC480 80241C90 8E2200B0 */ lw $v0, 0xb0($s1) /* 9FC484 80241C94 30420004 */ andi $v0, $v0, 4 /* 9FC488 80241C98 10400048 */ beqz $v0, .L80241DBC -/* 9FC48C 80241C9C 00000000 */ nop +/* 9FC48C 80241C9C 00000000 */ nop .L80241CA0: /* 9FC490 80241CA0 A640008E */ sh $zero, 0x8e($s2) /* 9FC494 80241CA4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC53C 80241D4C 24020028 */ addiu $v0, $zero, 0x28 /* 9FC540 80241D50 AFA2001C */ sw $v0, 0x1c($sp) /* 9FC544 80241D54 44833000 */ mtc1 $v1, $f6 -/* 9FC548 80241D58 00000000 */ nop +/* 9FC548 80241D58 00000000 */ nop /* 9FC54C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 /* 9FC550 80241D60 44073000 */ mfc1 $a3, $f6 /* 9FC554 80241D64 27A20048 */ addiu $v0, $sp, 0x48 @@ -138,7 +138,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC5C0 80241DD0 00220821 */ addu $at, $at, $v0 /* 9FC5C4 80241DD4 8C225C70 */ lw $v0, %lo(D_80245C70)($at) /* 9FC5C8 80241DD8 00400008 */ jr $v0 -/* 9FC5CC 80241DDC 00000000 */ nop +/* 9FC5CC 80241DDC 00000000 */ nop /* 9FC5D0 80241DE0 0260202D */ daddu $a0, $s3, $zero /* 9FC5D4 80241DE4 0280282D */ daddu $a1, $s4, $zero /* 9FC5D8 80241DE8 0C090351 */ jal func_80240D44_9FB534 @@ -150,45 +150,45 @@ glabel func_80241BD4_9FC3C4 /* 9FC5F0 80241E00 0C0903A7 */ jal func_80240E9C_9FB68C /* 9FC5F4 80241E04 02A0302D */ daddu $a2, $s5, $zero /* 9FC5F8 80241E08 080907AC */ j .L80241EB0 -/* 9FC5FC 80241E0C 00000000 */ nop +/* 9FC5FC 80241E0C 00000000 */ nop /* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero /* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero -/* 9FC608 80241E18 0C090451 */ jal nok_12_UnkNpcAIFunc1 +/* 9FC608 80241E18 0C090451 */ jal func_80241144_9FB934 /* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero /* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero /* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero /* 9FC618 80241E28 0C090481 */ jal func_80241204_9FB9F4 /* 9FC61C 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 9FC620 80241E30 080907AC */ j .L80241EB0 -/* 9FC624 80241E34 00000000 */ nop +/* 9FC624 80241E34 00000000 */ nop /* 9FC628 80241E38 0260202D */ daddu $a0, $s3, $zero /* 9FC62C 80241E3C 0280282D */ daddu $a1, $s4, $zero /* 9FC630 80241E40 0C0904F0 */ jal func_802413C0_9FBBB0 /* 9FC634 80241E44 02A0302D */ daddu $a2, $s5, $zero /* 9FC638 80241E48 080907AC */ j .L80241EB0 -/* 9FC63C 80241E4C 00000000 */ nop +/* 9FC63C 80241E4C 00000000 */ nop /* 9FC640 80241E50 0260202D */ daddu $a0, $s3, $zero /* 9FC644 80241E54 0280282D */ daddu $a1, $s4, $zero -/* 9FC648 80241E58 0C09015C */ jal nok_12_set_script_owner_npc_anim +/* 9FC648 80241E58 0C09015C */ jal func_80240570_9FAD60 /* 9FC64C 80241E5C 02A0302D */ daddu $a2, $s5, $zero /* 9FC650 80241E60 0260202D */ daddu $a0, $s3, $zero /* 9FC654 80241E64 0280282D */ daddu $a1, $s4, $zero /* 9FC658 80241E68 0C09017B */ jal func_802405EC_9FADDC /* 9FC65C 80241E6C 02A0302D */ daddu $a2, $s5, $zero /* 9FC660 80241E70 080907AC */ j .L80241EB0 -/* 9FC664 80241E74 00000000 */ nop +/* 9FC664 80241E74 00000000 */ nop /* 9FC668 80241E78 0260202D */ daddu $a0, $s3, $zero /* 9FC66C 80241E7C 0280282D */ daddu $a1, $s4, $zero -/* 9FC670 80241E80 0C0901C8 */ jal nok_12_UnkNpcAIFunc12 +/* 9FC670 80241E80 0C0901C8 */ jal func_80240720_9FAF10 /* 9FC674 80241E84 02A0302D */ daddu $a2, $s5, $zero /* 9FC678 80241E88 080907AC */ j .L80241EB0 -/* 9FC67C 80241E8C 00000000 */ nop +/* 9FC67C 80241E8C 00000000 */ nop /* 9FC680 80241E90 0260202D */ daddu $a0, $s3, $zero /* 9FC684 80241E94 0280282D */ daddu $a1, $s4, $zero -/* 9FC688 80241E98 0C090221 */ jal nok_12_set_script_owner_npc_col_height +/* 9FC688 80241E98 0C090221 */ jal func_80240884_9FB074 /* 9FC68C 80241E9C 02A0302D */ daddu $a2, $s5, $zero /* 9FC690 80241EA0 080907AC */ j .L80241EB0 -/* 9FC694 80241EA4 00000000 */ nop +/* 9FC694 80241EA4 00000000 */ nop /* 9FC698 80241EA8 0C0129CF */ jal func_8004A73C /* 9FC69C 80241EAC 0260202D */ daddu $a0, $s3, $zero .L80241EB0: @@ -202,5 +202,5 @@ glabel func_80241BD4_9FC3C4 /* 9FC6BC 80241ECC 0000102D */ daddu $v0, $zero, $zero /* 9FC6C0 80241ED0 03E00008 */ jr $ra /* 9FC6C4 80241ED4 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9FC6C8 80241ED8 00000000 */ nop -/* 9FC6CC 80241EDC 00000000 */ nop +/* 9FC6C8 80241ED8 00000000 */ nop +/* 9FC6CC 80241EDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s index 1c0e2f2a65..b7c43c6017 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240230_A00830.s @@ -83,8 +83,8 @@ glabel func_80240230_A00830 /* A0095C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c /* A00960 80240360 C6000038 */ lwc1 $f0, 0x38($s0) /* A00964 80240364 860200A6 */ lh $v0, 0xa6($s0) -/* A00968 80240368 3C018024 */ lui $at, %hi(D_802421D0) -/* A0096C 8024036C D42221D0 */ ldc1 $f2, %lo(D_802421D0)($at) +/* A00968 80240368 3C018024 */ lui $at, %hi(func_802421D0_7ECEE0) +/* A0096C 8024036C D42221D0 */ ldc1 $f2, %lo(func_802421D0_7ECEE0)($at) /* A00970 80240370 27A60030 */ addiu $a2, $sp, 0x30 /* A00974 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) /* A00978 80240378 44820000 */ mtc1 $v0, $f0 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index b9cb4b3e99..ec1977ccc1 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -105,7 +105,7 @@ glabel func_80240BF0_A011F0 /* A01378 80240D78 0000102D */ daddu $v0, $zero, $zero /* A0137C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* A01380 80240D80 0280282D */ daddu $a1, $s4, $zero -/* A01384 80240D84 0C09015A */ jal nok_13_UnkNpcAIFunc1 +/* A01384 80240D84 0C09015A */ jal func_80240568_A00B68 /* A01388 80240D88 0200302D */ daddu $a2, $s0, $zero /* A0138C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* A01390 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -129,7 +129,7 @@ glabel func_80240BF0_A011F0 /* A013D8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* A013DC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* A013E0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* A013E4 80240DE4 0C0902EB */ jal nok_13_UnkDurationCheck +/* A013E4 80240DE4 0C0902EB */ jal func_80240BAC_A011AC /* A013E8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* A013EC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s index 88295f316e..c3cf7992fa 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_802413CC_A019CC.s @@ -22,8 +22,8 @@ glabel func_802413CC_A019CC /* A01A0C 8024140C 0809051B */ j .L8024146C /* A01A10 80241410 00000000 */ nop .L80241414: -/* A01A14 80241414 3C048024 */ lui $a0, %hi(D_80242134) -/* A01A18 80241418 24842134 */ addiu $a0, $a0, %lo(D_80242134) +/* A01A14 80241414 3C048024 */ lui $a0, %hi(func_80242134_88AD04) +/* A01A18 80241418 24842134 */ addiu $a0, $a0, %lo(func_80242134_88AD04) /* A01A1C 8024141C 0C0B0CF8 */ jal start_script /* A01A20 80241420 0000302D */ daddu $a2, $zero, $zero /* A01A24 80241424 08090520 */ j .L80241480 @@ -46,8 +46,8 @@ glabel func_802413CC_A019CC /* A01A64 80241464 08090521 */ j .L80241484 /* A01A68 80241468 00000000 */ nop .L8024146C: -/* A01A6C 8024146C 3C048024 */ lui $a0, %hi(D_80242134) -/* A01A70 80241470 24842134 */ addiu $a0, $a0, %lo(D_80242134) +/* A01A6C 8024146C 3C048024 */ lui $a0, %hi(func_80242134_88AD04) +/* A01A70 80241470 24842134 */ addiu $a0, $a0, %lo(func_80242134_88AD04) /* A01A74 80241474 0C0B0CF8 */ jal start_script /* A01A78 80241478 0000302D */ daddu $a2, $zero, $zero /* A01A7C 8024147C 24030011 */ addiu $v1, $zero, 0x11 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s index e65952094a..7dda0243c1 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -55,7 +55,7 @@ glabel func_80240554_A02D94 /* A02E58 80240618 8E2200B0 */ lw $v0, 0xb0($s1) /* A02E5C 8024061C 30420004 */ andi $v0, $v0, 4 /* A02E60 80240620 10400047 */ beqz $v0, .L80240740 -/* A02E64 80240624 00000000 */ nop +/* A02E64 80240624 00000000 */ nop .L80240628: /* A02E68 80240628 AE600070 */ sw $zero, 0x70($s3) /* A02E6C 8024062C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240554_A02D94 /* A02F10 802406D0 24020028 */ addiu $v0, $zero, 0x28 /* A02F14 802406D4 AFA2001C */ sw $v0, 0x1c($sp) /* A02F18 802406D8 44833000 */ mtc1 $v1, $f6 -/* A02F1C 802406DC 00000000 */ nop +/* A02F1C 802406DC 00000000 */ nop /* A02F20 802406E0 468031A0 */ cvt.s.w $f6, $f6 /* A02F24 802406E4 44073000 */ mfc1 $a3, $f6 /* A02F28 802406E8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240554_A02D94 /* A02FE0 802407A0 10600015 */ beqz $v1, .L802407F8 /* A02FE4 802407A4 0260202D */ daddu $a0, $s3, $zero /* A02FE8 802407A8 08090240 */ j .L80240900 -/* A02FEC 802407AC 00000000 */ nop +/* A02FEC 802407AC 00000000 */ nop .L802407B0: /* A02FF0 802407B0 1062001C */ beq $v1, $v0, .L80240824 /* A02FF4 802407B4 24020003 */ addiu $v0, $zero, 3 /* A02FF8 802407B8 10620035 */ beq $v1, $v0, .L80240890 /* A02FFC 802407BC 0260202D */ daddu $a0, $s3, $zero /* A03000 802407C0 08090240 */ j .L80240900 -/* A03004 802407C4 00000000 */ nop +/* A03004 802407C4 00000000 */ nop .L802407C8: /* A03008 802407C8 2402000E */ addiu $v0, $zero, 0xe /* A0300C 802407CC 1062003F */ beq $v1, $v0, .L802408CC @@ -177,9 +177,9 @@ glabel func_80240554_A02D94 /* A03020 802407E0 10620040 */ beq $v1, $v0, .L802408E4 /* A03024 802407E4 24020063 */ addiu $v0, $zero, 0x63 /* A03028 802407E8 10620043 */ beq $v1, $v0, .L802408F8 -/* A0302C 802407EC 00000000 */ nop +/* A0302C 802407EC 00000000 */ nop /* A03030 802407F0 08090240 */ j .L80240900 -/* A03034 802407F4 00000000 */ nop +/* A03034 802407F4 00000000 */ nop .L802407F8: /* A03038 802407F8 0280282D */ daddu $a1, $s4, $zero /* A0303C 802407FC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240554_A02D94 /* A03054 80240814 0C0125AE */ jal func_800496B8 /* A03058 80240818 02A0302D */ daddu $a2, $s5, $zero /* A0305C 8024081C 08090240 */ j .L80240900 -/* A03060 80240820 00000000 */ nop +/* A03060 80240820 00000000 */ nop .L80240824: /* A03064 80240824 0260202D */ daddu $a0, $s3, $zero /* A03068 80240828 0280282D */ daddu $a1, $s4, $zero -/* A0306C 8024082C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A0306C 8024082C 0C0126D1 */ jal func_80049B44 /* A03070 80240830 02A0302D */ daddu $a2, $s5, $zero /* A03074 80240834 8E230088 */ lw $v1, 0x88($s1) /* A03078 80240838 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240554_A02D94 /* A030D4 80240894 0C012701 */ jal func_80049C04 /* A030D8 80240898 02A0302D */ daddu $a2, $s5, $zero /* A030DC 8024089C 08090240 */ j .L80240900 -/* A030E0 802408A0 00000000 */ nop +/* A030E0 802408A0 00000000 */ nop .L802408A4: /* A030E4 802408A4 0260202D */ daddu $a0, $s3, $zero /* A030E8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* A030EC 802408AC 0C090070 */ jal nok_14_set_script_owner_npc_anim +/* A030EC 802408AC 0C090070 */ jal func_802401C0_A02A00 /* A030F0 802408B0 02A0302D */ daddu $a2, $s5, $zero /* A030F4 802408B4 0260202D */ daddu $a0, $s3, $zero .L802408B8: @@ -240,20 +240,20 @@ glabel func_80240554_A02D94 /* A030FC 802408BC 0C09008F */ jal func_8024023C_A02A7C /* A03100 802408C0 02A0302D */ daddu $a2, $s5, $zero /* A03104 802408C4 08090240 */ j .L80240900 -/* A03108 802408C8 00000000 */ nop +/* A03108 802408C8 00000000 */ nop .L802408CC: /* A0310C 802408CC 0260202D */ daddu $a0, $s3, $zero /* A03110 802408D0 0280282D */ daddu $a1, $s4, $zero -/* A03114 802408D4 0C0900DC */ jal nok_14_UnkNpcAIFunc12 +/* A03114 802408D4 0C0900DC */ jal func_80240370_A02BB0 /* A03118 802408D8 02A0302D */ daddu $a2, $s5, $zero /* A0311C 802408DC 08090240 */ j .L80240900 -/* A03120 802408E0 00000000 */ nop +/* A03120 802408E0 00000000 */ nop .L802408E4: /* A03124 802408E4 0280282D */ daddu $a1, $s4, $zero -/* A03128 802408E8 0C090135 */ jal nok_14_set_script_owner_npc_col_height +/* A03128 802408E8 0C090135 */ jal func_802404D4_A02D14 /* A0312C 802408EC 02A0302D */ daddu $a2, $s5, $zero /* A03130 802408F0 08090240 */ j .L80240900 -/* A03134 802408F4 00000000 */ nop +/* A03134 802408F4 00000000 */ nop .L802408F8: /* A03138 802408F8 0C0129CF */ jal func_8004A73C /* A0313C 802408FC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240554_A02D94 /* A03190 80240950 00220821 */ addu $at, $at, $v0 /* A03194 80240954 8C2245C8 */ lw $v0, %lo(D_802445C8)($at) /* A03198 80240958 00400008 */ jr $v0 -/* A0319C 8024095C 00000000 */ nop +/* A0319C 8024095C 00000000 */ nop /* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) /* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 /* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 48d7de839b..22f3816252 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -83,7 +83,7 @@ glabel func_80241CA0_A044E0 /* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero /* A04614 80241DD4 0280202D */ daddu $a0, $s4, $zero /* A04618 80241DD8 0200282D */ daddu $a1, $s0, $zero -/* A0461C 80241DDC 0C09045B */ jal nok_14_UnkNpcAIFunc1 +/* A0461C 80241DDC 0C09045B */ jal func_8024116C_A039AC /* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero /* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero /* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241CA0_A044E0 /* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero /* A0463C 80241DFC 0280202D */ daddu $a0, $s4, $zero /* A04640 80241E00 0200282D */ daddu $a1, $s0, $zero -/* A04644 80241E04 0C09055C */ jal nok_14_UnkNpcAIFunc2 +/* A04644 80241E04 0C09055C */ jal func_80241570_A03DB0 /* A04648 80241E08 0260302D */ daddu $a2, $s3, $zero /* A0464C 80241E0C 0280202D */ daddu $a0, $s4, $zero /* A04650 80241E10 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241CA0_A044E0 /* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero /* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero /* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero -/* A04684 80241E44 0C0905E2 */ jal nok_14_UnkNpcAIFunc3 +/* A04684 80241E44 0C0905E2 */ jal func_80241788_A03FC8 /* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero /* A0468C 80241E4C 0809079A */ j .L80241E68 /* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index 5b36f0b92a..1786ef1d07 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -88,7 +88,7 @@ glabel func_802421CC_A04A0C /* A04B50 80242310 0000102D */ daddu $v0, $zero, $zero /* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero /* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero -/* A04B5C 8024231C 0C09045B */ jal nok_14_UnkNpcAIFunc1 +/* A04B5C 8024231C 0C09045B */ jal func_8024116C_A039AC /* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero /* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero /* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero @@ -100,7 +100,7 @@ glabel func_802421CC_A04A0C /* A04B80 80242340 0000102D */ daddu $v0, $zero, $zero /* A04B84 80242344 0260202D */ daddu $a0, $s3, $zero /* A04B88 80242348 0200282D */ daddu $a1, $s0, $zero -/* A04B8C 8024234C 0C09055C */ jal nok_14_UnkNpcAIFunc2 +/* A04B8C 8024234C 0C09055C */ jal func_80241570_A03DB0 /* A04B90 80242350 0280302D */ daddu $a2, $s4, $zero /* A04B94 80242354 8E630070 */ lw $v1, 0x70($s3) /* A04B98 80242358 2402000B */ addiu $v0, $zero, 0xb @@ -140,7 +140,7 @@ glabel func_802421CC_A04A0C /* A04C20 802423E0 0000102D */ daddu $v0, $zero, $zero /* A04C24 802423E4 0260202D */ daddu $a0, $s3, $zero /* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero -/* A04C2C 802423EC 0C090862 */ jal nok_14_UnkDurationCheck +/* A04C2C 802423EC 0C090862 */ jal func_80242188_A049C8 /* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero .L802423F4: /* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s index 5011b79dbe..c31cf0ae6c 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -55,7 +55,7 @@ glabel func_80240674_A07574 /* A07638 80240738 8E2200B0 */ lw $v0, 0xb0($s1) /* A0763C 8024073C 30420004 */ andi $v0, $v0, 4 /* A07640 80240740 10400047 */ beqz $v0, .L80240860 -/* A07644 80240744 00000000 */ nop +/* A07644 80240744 00000000 */ nop .L80240748: /* A07648 80240748 AE600070 */ sw $zero, 0x70($s3) /* A0764C 8024074C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240674_A07574 /* A076F0 802407F0 24020028 */ addiu $v0, $zero, 0x28 /* A076F4 802407F4 AFA2001C */ sw $v0, 0x1c($sp) /* A076F8 802407F8 44833000 */ mtc1 $v1, $f6 -/* A076FC 802407FC 00000000 */ nop +/* A076FC 802407FC 00000000 */ nop /* A07700 80240800 468031A0 */ cvt.s.w $f6, $f6 /* A07704 80240804 44073000 */ mfc1 $a3, $f6 /* A07708 80240808 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240674_A07574 /* A077C0 802408C0 10600015 */ beqz $v1, .L80240918 /* A077C4 802408C4 0260202D */ daddu $a0, $s3, $zero /* A077C8 802408C8 08090288 */ j .L80240A20 -/* A077CC 802408CC 00000000 */ nop +/* A077CC 802408CC 00000000 */ nop .L802408D0: /* A077D0 802408D0 1062001C */ beq $v1, $v0, .L80240944 /* A077D4 802408D4 24020003 */ addiu $v0, $zero, 3 /* A077D8 802408D8 10620035 */ beq $v1, $v0, .L802409B0 /* A077DC 802408DC 0260202D */ daddu $a0, $s3, $zero /* A077E0 802408E0 08090288 */ j .L80240A20 -/* A077E4 802408E4 00000000 */ nop +/* A077E4 802408E4 00000000 */ nop .L802408E8: /* A077E8 802408E8 2402000E */ addiu $v0, $zero, 0xe /* A077EC 802408EC 1062003F */ beq $v1, $v0, .L802409EC @@ -177,9 +177,9 @@ glabel func_80240674_A07574 /* A07800 80240900 10620040 */ beq $v1, $v0, .L80240A04 /* A07804 80240904 24020063 */ addiu $v0, $zero, 0x63 /* A07808 80240908 10620043 */ beq $v1, $v0, .L80240A18 -/* A0780C 8024090C 00000000 */ nop +/* A0780C 8024090C 00000000 */ nop /* A07810 80240910 08090288 */ j .L80240A20 -/* A07814 80240914 00000000 */ nop +/* A07814 80240914 00000000 */ nop .L80240918: /* A07818 80240918 0280282D */ daddu $a1, $s4, $zero /* A0781C 8024091C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240674_A07574 /* A07834 80240934 0C0125AE */ jal func_800496B8 /* A07838 80240938 02A0302D */ daddu $a2, $s5, $zero /* A0783C 8024093C 08090288 */ j .L80240A20 -/* A07840 80240940 00000000 */ nop +/* A07840 80240940 00000000 */ nop .L80240944: /* A07844 80240944 0260202D */ daddu $a0, $s3, $zero /* A07848 80240948 0280282D */ daddu $a1, $s4, $zero -/* A0784C 8024094C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* A0784C 8024094C 0C0126D1 */ jal func_80049B44 /* A07850 80240950 02A0302D */ daddu $a2, $s5, $zero /* A07854 80240954 8E230088 */ lw $v1, 0x88($s1) /* A07858 80240958 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240674_A07574 /* A078B4 802409B4 0C012701 */ jal func_80049C04 /* A078B8 802409B8 02A0302D */ daddu $a2, $s5, $zero /* A078BC 802409BC 08090288 */ j .L80240A20 -/* A078C0 802409C0 00000000 */ nop +/* A078C0 802409C0 00000000 */ nop .L802409C4: /* A078C4 802409C4 0260202D */ daddu $a0, $s3, $zero /* A078C8 802409C8 0280282D */ daddu $a1, $s4, $zero -/* A078CC 802409CC 0C0900B8 */ jal nok_15_set_script_owner_npc_anim +/* A078CC 802409CC 0C0900B8 */ jal func_802402E0_A071E0 /* A078D0 802409D0 02A0302D */ daddu $a2, $s5, $zero /* A078D4 802409D4 0260202D */ daddu $a0, $s3, $zero .L802409D8: @@ -240,20 +240,20 @@ glabel func_80240674_A07574 /* A078DC 802409DC 0C0900D7 */ jal func_8024035C_A0725C /* A078E0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* A078E4 802409E4 08090288 */ j .L80240A20 -/* A078E8 802409E8 00000000 */ nop +/* A078E8 802409E8 00000000 */ nop .L802409EC: /* A078EC 802409EC 0260202D */ daddu $a0, $s3, $zero /* A078F0 802409F0 0280282D */ daddu $a1, $s4, $zero -/* A078F4 802409F4 0C090124 */ jal nok_15_UnkNpcAIFunc12 +/* A078F4 802409F4 0C090124 */ jal func_80240490_A07390 /* A078F8 802409F8 02A0302D */ daddu $a2, $s5, $zero /* A078FC 802409FC 08090288 */ j .L80240A20 -/* A07900 80240A00 00000000 */ nop +/* A07900 80240A00 00000000 */ nop .L80240A04: /* A07904 80240A04 0280282D */ daddu $a1, $s4, $zero -/* A07908 80240A08 0C09017D */ jal nok_15_set_script_owner_npc_col_height +/* A07908 80240A08 0C09017D */ jal func_802405F4_A074F4 /* A0790C 80240A0C 02A0302D */ daddu $a2, $s5, $zero /* A07910 80240A10 08090288 */ j .L80240A20 -/* A07914 80240A14 00000000 */ nop +/* A07914 80240A14 00000000 */ nop .L80240A18: /* A07918 80240A18 0C0129CF */ jal func_8004A73C /* A0791C 80240A1C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240674_A07574 /* A07970 80240A70 00220821 */ addu $at, $at, $v0 /* A07974 80240A74 8C224CF8 */ lw $v0, %lo(D_80244CF8)($at) /* A07978 80240A78 00400008 */ jr $v0 -/* A0797C 80240A7C 00000000 */ nop +/* A0797C 80240A7C 00000000 */ nop /* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) /* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 /* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s index c001a8de6f..e195743d09 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240C64_A07B64.s @@ -131,8 +131,8 @@ glabel func_80240C64_A07B64 /* A07D50 80240E50 C7A4002C */ lwc1 $f4, 0x2c($sp) /* A07D54 80240E54 461A2100 */ add.s $f4, $f4, $f26 /* A07D58 80240E58 46142081 */ sub.s $f2, $f4, $f20 -/* A07D5C 80240E5C 3C018024 */ lui $at, %hi(D_80244D60) -/* A07D60 80240E60 D4204D60 */ ldc1 $f0, %lo(D_80244D60)($at) +/* A07D5C 80240E5C 3C018024 */ lui $at, %hi(func_80244D60) +/* A07D60 80240E60 D4204D60 */ ldc1 $f0, %lo(func_80244D60)($at) /* A07D64 80240E64 460010A1 */ cvt.d.s $f2, $f2 /* A07D68 80240E68 46201082 */ mul.d $f2, $f2, $f0 /* A07D6C 80240E6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index 87a3df2aaa..5695db2f1f 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -66,9 +66,9 @@ glabel func_80241DC0_A08CC0 /* A08DAC 80241EAC 2C62000F */ sltiu $v0, $v1, 0xf /* A08DB0 80241EB0 10400034 */ beqz $v0, .L80241F84 /* A08DB4 80241EB4 00031080 */ sll $v0, $v1, 2 -/* A08DB8 80241EB8 3C018024 */ lui $at, %hi(D_80244D68) +/* A08DB8 80241EB8 3C018024 */ lui $at, %hi(func_80244D68_8055E8) /* A08DBC 80241EBC 00220821 */ addu $at, $at, $v0 -/* A08DC0 80241EC0 8C224D68 */ lw $v0, %lo(D_80244D68)($at) +/* A08DC0 80241EC0 8C224D68 */ lw $v0, %lo(func_80244D68_8055E8)($at) /* A08DC4 80241EC4 00400008 */ jr $v0 /* A08DC8 80241EC8 00000000 */ nop /* A08DCC 80241ECC 0280202D */ daddu $a0, $s4, $zero @@ -83,7 +83,7 @@ glabel func_80241DC0_A08CC0 /* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero /* A08DF4 80241EF4 0280202D */ daddu $a0, $s4, $zero /* A08DF8 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* A08DFC 80241EFC 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 +/* A08DFC 80241EFC 0C0904A3 */ jal func_8024128C_A0818C /* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero /* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero /* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241DC0_A08CC0 /* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero /* A08E1C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* A08E20 80241F20 0200282D */ daddu $a1, $s0, $zero -/* A08E24 80241F24 0C0905A4 */ jal nok_15_UnkNpcAIFunc2 +/* A08E24 80241F24 0C0905A4 */ jal func_80241690_A08590 /* A08E28 80241F28 0260302D */ daddu $a2, $s3, $zero /* A08E2C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* A08E30 80241F30 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241DC0_A08CC0 /* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero /* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero /* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero -/* A08E64 80241F64 0C09062A */ jal nok_15_UnkNpcAIFunc3 +/* A08E64 80241F64 0C09062A */ jal func_802418A8_A087A8 /* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero /* A08E6C 80241F6C 080907E2 */ j .L80241F88 /* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index 8b8b59ea5e..b348c0717f 100644 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -88,7 +88,7 @@ glabel func_802422EC_A091EC /* A09330 80242430 0000102D */ daddu $v0, $zero, $zero /* A09334 80242434 0260202D */ daddu $a0, $s3, $zero /* A09338 80242438 0200282D */ daddu $a1, $s0, $zero -/* A0933C 8024243C 0C0904A3 */ jal nok_15_UnkNpcAIFunc1 +/* A0933C 8024243C 0C0904A3 */ jal func_8024128C_A0818C /* A09340 80242440 0280302D */ daddu $a2, $s4, $zero /* A09344 80242444 0260202D */ daddu $a0, $s3, $zero /* A09348 80242448 0200282D */ daddu $a1, $s0, $zero @@ -100,7 +100,7 @@ glabel func_802422EC_A091EC /* A09360 80242460 0000102D */ daddu $v0, $zero, $zero /* A09364 80242464 0260202D */ daddu $a0, $s3, $zero /* A09368 80242468 0200282D */ daddu $a1, $s0, $zero -/* A0936C 8024246C 0C0905A4 */ jal nok_15_UnkNpcAIFunc2 +/* A0936C 8024246C 0C0905A4 */ jal func_80241690_A08590 /* A09370 80242470 0280302D */ daddu $a2, $s4, $zero /* A09374 80242474 8E630070 */ lw $v1, 0x70($s3) /* A09378 80242478 2402000B */ addiu $v0, $zero, 0xb @@ -140,7 +140,7 @@ glabel func_802422EC_A091EC /* A09400 80242500 0000102D */ daddu $v0, $zero, $zero /* A09404 80242504 0260202D */ daddu $a0, $s3, $zero /* A09408 80242508 0200282D */ daddu $a1, $s0, $zero -/* A0940C 8024250C 0C0908AA */ jal nok_15_UnkDurationCheck +/* A0940C 8024250C 0C0908AA */ jal func_802422A8_A091A8 /* A09410 80242510 0280302D */ daddu $a2, $s4, $zero .L80242514: /* A09414 80242514 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s index 992f685201..6512a29755 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s @@ -158,8 +158,8 @@ glabel func_80240564_BCF154 /* BCF38C 8024079C 10400017 */ beqz $v0, .L802407FC /* BCF390 802407A0 0220202D */ daddu $a0, $s1, $zero /* BCF394 802407A4 0080302D */ daddu $a2, $a0, $zero -/* BCF398 802407A8 3C0B8024 */ lui $t3, %hi(D_802430C0) -/* BCF39C 802407AC 256B30C0 */ addiu $t3, $t3, %lo(D_802430C0) +/* BCF398 802407A8 3C0B8024 */ lui $t3, %hi(func_802430C0_B37C90) +/* BCF39C 802407AC 256B30C0 */ addiu $t3, $t3, %lo(func_802430C0_B37C90) /* BCF3A0 802407B0 02EB1021 */ addu $v0, $s7, $t3 /* BCF3A4 802407B4 904A0000 */ lbu $t2, ($v0) /* BCF3A8 802407B8 02CB1021 */ addu $v0, $s6, $t3 @@ -196,8 +196,8 @@ glabel func_80240564_BCF154 /* BCF41C 8024082C 25620005 */ addiu $v0, $t3, 5 /* BCF420 80240830 00021400 */ sll $v0, $v0, 0x10 /* BCF424 80240834 00021403 */ sra $v0, $v0, 0x10 -/* BCF428 80240838 3C0B8024 */ lui $t3, %hi(D_802430C0) -/* BCF42C 8024083C 256B30C0 */ addiu $t3, $t3, %lo(D_802430C0) +/* BCF428 80240838 3C0B8024 */ lui $t3, %hi(func_802430C0_B37C90) +/* BCF42C 8024083C 256B30C0 */ addiu $t3, $t3, %lo(func_802430C0_B37C90) /* BCF430 80240840 AFAB0038 */ sw $t3, 0x38($sp) /* BCF434 80240844 240B0004 */ addiu $t3, $zero, 4 /* BCF438 80240848 AFA20034 */ sw $v0, 0x34($sp) @@ -279,8 +279,8 @@ glabel func_80240564_BCF154 /* BCF550 80240960 0200202D */ daddu $a0, $s0, $zero /* BCF554 80240964 0080302D */ daddu $a2, $a0, $zero /* BCF558 80240968 0291A021 */ addu $s4, $s4, $s1 -/* BCF55C 8024096C 3C0B8024 */ lui $t3, %hi(D_802430C0) -/* BCF560 80240970 256B30C0 */ addiu $t3, $t3, %lo(D_802430C0) +/* BCF55C 8024096C 3C0B8024 */ lui $t3, %hi(func_802430C0_B37C90) +/* BCF560 80240970 256B30C0 */ addiu $t3, $t3, %lo(func_802430C0_B37C90) /* BCF564 80240974 02CB4021 */ addu $t0, $s6, $t3 /* BCF568 80240978 26D60003 */ addiu $s6, $s6, 3 /* BCF56C 8024097C 026B1021 */ addu $v0, $s3, $t3 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s index cf2d1b46af..9951ca585d 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241130_BCFD20.s @@ -3,8 +3,8 @@ glabel func_80241130_BCFD20 /* BCFD20 80241130 0000302D */ daddu $a2, $zero, $zero -/* BCFD24 80241134 3C058024 */ lui $a1, %hi(D_80243090) -/* BCFD28 80241138 24A53090 */ addiu $a1, $a1, %lo(D_80243090) +/* BCFD24 80241134 3C058024 */ lui $a1, %hi(func_80243090_8B3100) +/* BCFD28 80241138 24A53090 */ addiu $a1, $a1, %lo(func_80243090_8B3100) .L8024113C: /* BCFD2C 8024113C 8CA30000 */ lw $v1, ($a1) /* BCFD30 80241140 50600006 */ beql $v1, $zero, .L8024115C diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s index 8a87acf54f..97f208b2d4 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s @@ -7,12 +7,12 @@ glabel func_80241168_BCFD58 /* BCFD60 80241170 AFB10014 */ sw $s1, 0x14($sp) /* BCFD64 80241174 0C090150 */ jal func_80240540_BCF130 /* BCFD68 80241178 AFB00010 */ sw $s0, 0x10($sp) -/* BCFD6C 8024117C 3C048024 */ lui $a0, %hi(D_80240A6C) -/* BCFD70 80241180 24840A6C */ addiu $a0, $a0, %lo(D_80240A6C) +/* BCFD6C 8024117C 3C048024 */ lui $a0, %hi(func_80240A6C_BCE9F4) +/* BCFD70 80241180 24840A6C */ addiu $a0, $a0, %lo(func_80240A6C_BCE9F4) /* BCFD74 80241184 3C06800A */ lui $a2, %hi(D_8009A650) /* BCFD78 80241188 24C6A650 */ addiu $a2, $a2, %lo(D_8009A650) -/* BCFD7C 8024118C 3C058024 */ lui $a1, %hi(D_802410C0) -/* BCFD80 80241190 24A510C0 */ addiu $a1, $a1, %lo(D_802410C0) +/* BCFD7C 8024118C 3C058024 */ lui $a1, %hi(func_802410C0_BCF048) +/* BCFD80 80241190 24A510C0 */ addiu $a1, $a1, %lo(func_802410C0_BCF048) /* BCFD84 80241194 8CC30000 */ lw $v1, ($a2) /* BCFD88 80241198 0040882D */ daddu $s1, $v0, $zero /* BCFD8C 8024119C 34630010 */ ori $v1, $v1, 0x10 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s index 415c369886..8290354ff6 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802403DC_BD3C4C.s @@ -53,8 +53,8 @@ glabel func_802403DC_BD3C4C /* BD3D0C 8024049C 0C04E9C1 */ jal func_8013A704 /* BD3D10 802404A0 E6020018 */ swc1 $f2, 0x18($s0) /* BD3D14 802404A4 0000202D */ daddu $a0, $zero, $zero -/* BD3D18 802404A8 3C058024 */ lui $a1, %hi(D_80240000) -/* BD3D1C 802404AC 24A50000 */ addiu $a1, $a1, %lo(D_80240000) +/* BD3D18 802404A8 3C058024 */ lui $a1, %hi(func_80240000_BD3494) +/* BD3D1C 802404AC 24A50000 */ addiu $a1, $a1, %lo(func_80240000_BD3494) /* BD3D20 802404B0 0C048C56 */ jal bind_dynamic_entity_3 /* BD3D24 802404B4 AE020000 */ sw $v0, ($s0) /* BD3D28 802404B8 0260202D */ daddu $a0, $s3, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s b/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s index b0873cc962..462d840711 100644 --- a/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s +++ b/asm/nonmatchings/world/area_obk/obk_09/BDAB00/func_80240350_BDAB00.s @@ -12,16 +12,16 @@ glabel func_80240350_BDAB00 /* BDAB1C 8024036C AFB00018 */ sw $s0, 0x18($sp) /* BDAB20 80240370 0040802D */ daddu $s0, $v0, $zero /* BDAB24 80240374 0200202D */ daddu $a0, $s0, $zero -/* BDAB28 80240378 3C118024 */ lui $s1, %hi(D_80242A00) -/* BDAB2C 8024037C 26312A00 */ addiu $s1, $s1, %lo(D_80242A00) +/* BDAB28 80240378 3C118024 */ lui $s1, %hi(func_80242A00_9D9A20) +/* BDAB2C 8024037C 26312A00 */ addiu $s1, $s1, %lo(func_80242A00_9D9A20) /* BDAB30 80240380 0C01BB7C */ jal decode_yay0 /* BDAB34 80240384 0220282D */ daddu $a1, $s1, $zero /* BDAB38 80240388 0C00AB1E */ jal general_heap_free /* BDAB3C 8024038C 0200202D */ daddu $a0, $s0, $zero /* BDAB40 80240390 3C048024 */ lui $a0, %hi(D_80246990) /* BDAB44 80240394 24846990 */ addiu $a0, $a0, %lo(D_80246990) -/* BDAB48 80240398 3C028024 */ lui $v0, %hi(D_80242C00) -/* BDAB4C 8024039C 24422C00 */ addiu $v0, $v0, %lo(D_80242C00) +/* BDAB48 80240398 3C028024 */ lui $v0, %hi(func_80242C00_BB0540) +/* BDAB4C 8024039C 24422C00 */ addiu $v0, $v0, %lo(func_80242C00_BB0540) /* BDAB50 802403A0 AC820000 */ sw $v0, ($a0) /* BDAB54 802403A4 24020096 */ addiu $v0, $zero, 0x96 /* BDAB58 802403A8 A4820008 */ sh $v0, 8($a0) diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s b/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s index 86695dfa72..d64eebff28 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9AEF0/func_80240000_D9AEF0.s @@ -23,8 +23,8 @@ glabel func_80240000_D9AEF0 /* D9AF38 80240048 26700008 */ addiu $s0, $s3, 8 /* D9AF3C 8024004C 3C014060 */ lui $at, 0x4060 /* D9AF40 80240050 4481A000 */ mtc1 $at, $f20 -/* D9AF44 80240054 3C128024 */ lui $s2, %hi(D_802412A0) -/* D9AF48 80240058 265212A0 */ addiu $s2, $s2, %lo(D_802412A0) +/* D9AF44 80240054 3C128024 */ lui $s2, %hi(func_802412A0_CBA4A0) +/* D9AF48 80240058 265212A0 */ addiu $s2, $s2, %lo(func_802412A0_CBA4A0) /* D9AF4C 8024005C AED30070 */ sw $s3, 0x70($s6) .L80240060: /* D9AF50 80240060 8E440000 */ lw $a0, ($s2) diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s index e539298598..11ae0146d2 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s @@ -46,7 +46,7 @@ glabel func_802409EC_D9B8DC /* D9B980 80240A90 8E2200B0 */ lw $v0, 0xb0($s1) /* D9B984 80240A94 30420004 */ andi $v0, $v0, 4 /* D9B988 80240A98 1040001F */ beqz $v0, .L80240B18 -/* D9B98C 80240A9C 00000000 */ nop +/* D9B98C 80240A9C 00000000 */ nop .L80240AA0: /* D9B990 80240AA0 2404F7FF */ addiu $a0, $zero, -0x801 /* D9B994 80240AA4 AE800070 */ sw $zero, 0x70($s4) @@ -85,11 +85,11 @@ glabel func_802409EC_D9B8DC /* D9BA0C 80240B1C 2C620064 */ sltiu $v0, $v1, 0x64 /* D9BA10 80240B20 10400036 */ beqz $v0, .L80240BFC /* D9BA14 80240B24 00031080 */ sll $v0, $v1, 2 -/* D9BA18 80240B28 3C018024 */ lui $at, %hi(D_80242448) +/* D9BA18 80240B28 3C018024 */ lui $at, %hi(func_80242448_CC5C58) /* D9BA1C 80240B2C 00220821 */ addu $at, $at, $v0 -/* D9BA20 80240B30 8C222448 */ lw $v0, %lo(D_80242448)($at) +/* D9BA20 80240B30 8C222448 */ lw $v0, %lo(func_80242448_CC5C58)($at) /* D9BA24 80240B34 00400008 */ jr $v0 -/* D9BA28 80240B38 00000000 */ nop +/* D9BA28 80240B38 00000000 */ nop /* D9BA2C 80240B3C 0280202D */ daddu $a0, $s4, $zero /* D9BA30 80240B40 0240282D */ daddu $a1, $s2, $zero /* D9BA34 80240B44 0C012568 */ jal func_800495A0 @@ -99,17 +99,17 @@ glabel func_802409EC_D9B8DC /* D9BA44 80240B54 0C0125AE */ jal func_800496B8 /* D9BA48 80240B58 0260302D */ daddu $a2, $s3, $zero /* D9BA4C 80240B5C 080902FF */ j .L80240BFC -/* D9BA50 80240B60 00000000 */ nop +/* D9BA50 80240B60 00000000 */ nop /* D9BA54 80240B64 0280202D */ daddu $a0, $s4, $zero /* D9BA58 80240B68 0240282D */ daddu $a1, $s2, $zero -/* D9BA5C 80240B6C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D9BA5C 80240B6C 0C0126D1 */ jal func_80049B44 /* D9BA60 80240B70 0260302D */ daddu $a2, $s3, $zero /* D9BA64 80240B74 0280202D */ daddu $a0, $s4, $zero /* D9BA68 80240B78 0240282D */ daddu $a1, $s2, $zero /* D9BA6C 80240B7C 0C012701 */ jal func_80049C04 /* D9BA70 80240B80 0260302D */ daddu $a2, $s3, $zero /* D9BA74 80240B84 080902FF */ j .L80240BFC -/* D9BA78 80240B88 00000000 */ nop +/* D9BA78 80240B88 00000000 */ nop /* D9BA7C 80240B8C 0280202D */ daddu $a0, $s4, $zero /* D9BA80 80240B90 0240282D */ daddu $a1, $s2, $zero /* D9BA84 80240B94 0C01278F */ jal func_80049E3C @@ -119,7 +119,7 @@ glabel func_802409EC_D9B8DC /* D9BA94 80240BA4 0C0127B3 */ jal func_80049ECC /* D9BA98 80240BA8 0260302D */ daddu $a2, $s3, $zero /* D9BA9C 80240BAC 080902FF */ j .L80240BFC -/* D9BAA0 80240BB0 00000000 */ nop +/* D9BAA0 80240BB0 00000000 */ nop /* D9BAA4 80240BB4 0280202D */ daddu $a0, $s4, $zero /* D9BAA8 80240BB8 0240282D */ daddu $a1, $s2, $zero /* D9BAAC 80240BBC 0C090098 */ jal func_80240260_D9B150 @@ -129,13 +129,13 @@ glabel func_802409EC_D9B8DC /* D9BABC 80240BCC 0C090211 */ jal func_80240844_D9B734 /* D9BAC0 80240BD0 0260302D */ daddu $a2, $s3, $zero /* D9BAC4 80240BD4 080902FF */ j .L80240BFC -/* D9BAC8 80240BD8 00000000 */ nop +/* D9BAC8 80240BD8 00000000 */ nop /* D9BACC 80240BDC 0280202D */ daddu $a0, $s4, $zero /* D9BAD0 80240BE0 0240282D */ daddu $a1, $s2, $zero /* D9BAD4 80240BE4 0C09026A */ jal func_802409A8_D9B898 /* D9BAD8 80240BE8 0260302D */ daddu $a2, $s3, $zero /* D9BADC 80240BEC 080902FF */ j .L80240BFC -/* D9BAE0 80240BF0 00000000 */ nop +/* D9BAE0 80240BF0 00000000 */ nop /* D9BAE4 80240BF4 0C0129CF */ jal func_8004A73C /* D9BAE8 80240BF8 0280202D */ daddu $a0, $s4, $zero .L80240BFC: @@ -149,6 +149,6 @@ glabel func_802409EC_D9B8DC /* D9BB08 80240C18 0000102D */ daddu $v0, $zero, $zero /* D9BB0C 80240C1C 03E00008 */ jr $ra /* D9BB10 80240C20 27BD0050 */ addiu $sp, $sp, 0x50 -/* D9BB14 80240C24 00000000 */ nop -/* D9BB18 80240C28 00000000 */ nop -/* D9BB1C 80240C2C 00000000 */ nop +/* D9BB14 80240C24 00000000 */ nop +/* D9BB18 80240C28 00000000 */ nop +/* D9BB1C 80240C2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s index 2bed2a59ba..d7c2f46f8c 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s @@ -46,7 +46,7 @@ glabel func_80240BA8_D9E078 /* D9E11C 80240C4C 8E2200B0 */ lw $v0, 0xb0($s1) /* D9E120 80240C50 30420004 */ andi $v0, $v0, 4 /* D9E124 80240C54 10400044 */ beqz $v0, .L80240D68 -/* D9E128 80240C58 00000000 */ nop +/* D9E128 80240C58 00000000 */ nop .L80240C5C: /* D9E12C 80240C5C 2404F7FF */ addiu $a0, $zero, -0x801 /* D9E130 80240C60 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240BA8_D9E078 /* D9E1F0 80240D20 C640003C */ lwc1 $f0, 0x3c($s2) /* D9E1F4 80240D24 C6420040 */ lwc1 $f2, 0x40($s2) /* D9E1F8 80240D28 44822000 */ mtc1 $v0, $f4 -/* D9E1FC 80240D2C 00000000 */ nop +/* D9E1FC 80240D2C 00000000 */ nop /* D9E200 80240D30 46802120 */ cvt.s.w $f4, $f4 /* D9E204 80240D34 27A20044 */ addiu $v0, $sp, 0x44 /* D9E208 80240D38 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240BA8_D9E078 /* D9E220 80240D50 0C0372DF */ jal func_800DCB7C /* D9E224 80240D54 27A6003C */ addiu $a2, $sp, 0x3c /* D9E228 80240D58 10400003 */ beqz $v0, .L80240D68 -/* D9E22C 80240D5C 00000000 */ nop +/* D9E22C 80240D5C 00000000 */ nop /* D9E230 80240D60 C7A0003C */ lwc1 $f0, 0x3c($sp) /* D9E234 80240D64 E640003C */ swc1 $f0, 0x3c($s2) .L80240D68: @@ -128,7 +128,7 @@ glabel func_80240BA8_D9E078 /* D9E24C 80240D7C 00220821 */ addu $at, $at, $v0 /* D9E250 80240D80 8C227880 */ lw $v0, %lo(D_80247880)($at) /* D9E254 80240D84 00400008 */ jr $v0 -/* D9E258 80240D88 00000000 */ nop +/* D9E258 80240D88 00000000 */ nop /* D9E25C 80240D8C 0260202D */ daddu $a0, $s3, $zero /* D9E260 80240D90 0280282D */ daddu $a1, $s4, $zero /* D9E264 80240D94 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240BA8_D9E078 /* D9E274 80240DA4 0C0125AE */ jal func_800496B8 /* D9E278 80240DA8 02A0302D */ daddu $a2, $s5, $zero /* D9E27C 80240DAC 080903AD */ j .L80240EB4 -/* D9E280 80240DB0 00000000 */ nop +/* D9E280 80240DB0 00000000 */ nop /* D9E284 80240DB4 0260202D */ daddu $a0, $s3, $zero /* D9E288 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* D9E28C 80240DBC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D9E28C 80240DBC 0C0126D1 */ jal func_80049B44 /* D9E290 80240DC0 02A0302D */ daddu $a2, $s5, $zero /* D9E294 80240DC4 0260202D */ daddu $a0, $s3, $zero /* D9E298 80240DC8 0280282D */ daddu $a1, $s4, $zero /* D9E29C 80240DCC 0C012701 */ jal func_80049C04 /* D9E2A0 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* D9E2A4 80240DD4 080903AD */ j .L80240EB4 -/* D9E2A8 80240DD8 00000000 */ nop +/* D9E2A8 80240DD8 00000000 */ nop /* D9E2AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* D9E2B0 80240DE0 0280282D */ daddu $a1, $s4, $zero /* D9E2B4 80240DE4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240BA8_D9E078 /* D9E2C4 80240DF4 0C0127B3 */ jal func_80049ECC /* D9E2C8 80240DF8 02A0302D */ daddu $a2, $s5, $zero /* D9E2CC 80240DFC 080903AD */ j .L80240EB4 -/* D9E2D0 80240E00 00000000 */ nop +/* D9E2D0 80240E00 00000000 */ nop /* D9E2D4 80240E04 0260202D */ daddu $a0, $s3, $zero /* D9E2D8 80240E08 0280282D */ daddu $a1, $s4, $zero /* D9E2DC 80240E0C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240BA8_D9E078 /* D9E2F4 80240E24 8E630070 */ lw $v1, 0x70($s3) /* D9E2F8 80240E28 2402000E */ addiu $v0, $zero, 0xe /* D9E2FC 80240E2C 14620021 */ bne $v1, $v0, .L80240EB4 -/* D9E300 80240E30 00000000 */ nop +/* D9E300 80240E30 00000000 */ nop /* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero /* D9E308 80240E38 0280282D */ daddu $a1, $s4, $zero /* D9E30C 80240E3C 0C09025C */ jal func_80240970_D9DE40 @@ -178,7 +178,7 @@ glabel func_80240BA8_D9E078 /* D9E314 80240E44 8E630070 */ lw $v1, 0x70($s3) /* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf /* D9E31C 80240E4C 14620019 */ bne $v1, $v0, .L80240EB4 -/* D9E320 80240E50 00000000 */ nop +/* D9E320 80240E50 00000000 */ nop /* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero /* D9E328 80240E58 0280282D */ daddu $a1, $s4, $zero /* D9E32C 80240E5C 0C090278 */ jal func_802409E0_D9DEB0 @@ -186,7 +186,7 @@ glabel func_80240BA8_D9E078 /* D9E334 80240E64 8E630070 */ lw $v1, 0x70($s3) /* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 /* D9E33C 80240E6C 14620011 */ bne $v1, $v0, .L80240EB4 -/* D9E340 80240E70 00000000 */ nop +/* D9E340 80240E70 00000000 */ nop /* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero /* D9E348 80240E78 0280282D */ daddu $a1, $s4, $zero /* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0_D9DF80 @@ -194,13 +194,13 @@ glabel func_80240BA8_D9E078 /* D9E354 80240E84 8E630070 */ lw $v1, 0x70($s3) /* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 /* D9E35C 80240E8C 14620009 */ bne $v1, $v0, .L80240EB4 -/* D9E360 80240E90 00000000 */ nop +/* D9E360 80240E90 00000000 */ nop /* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero /* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero /* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48_D9E018 /* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero /* D9E374 80240EA4 080903AD */ j .L80240EB4 -/* D9E378 80240EA8 00000000 */ nop +/* D9E378 80240EA8 00000000 */ nop /* D9E37C 80240EAC 0C0129CF */ jal func_8004A73C /* D9E380 80240EB0 0260202D */ daddu $a0, $s3, $zero .L80240EB4: diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index 17a0960e10..ab1f7adaba 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -119,11 +119,11 @@ glabel func_802416D0_D9EBA0 /* D9ED54 80241884 00000000 */ nop /* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero /* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero -/* D9ED60 80241890 0C09042C */ jal omo_02_NpcJumpFunc3 +/* D9ED60 80241890 0C09042C */ jal func_802410B0_D9E580 /* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero /* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero /* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* D9ED70 802418A0 0C090444 */ jal omo_02_NpcJumpFunc +/* D9ED70 802418A0 0C090444 */ jal func_80241110_D9E5E0 /* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero /* D9ED78 802418A8 08090648 */ j .L80241920 /* D9ED7C 802418AC 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802416D0_D9EBA0 /* D9ED8C 802418BC 02A0302D */ daddu $a2, $s5, $zero /* D9ED90 802418C0 0280202D */ daddu $a0, $s4, $zero /* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero -/* D9ED98 802418C8 0C0904AE */ jal omo_02_UnkNpcAIFunc11 +/* D9ED98 802418C8 0C0904AE */ jal func_802412B8_D9E788 /* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero /* D9EDA0 802418D0 08090648 */ j .L80241920 /* D9EDA4 802418D4 00000000 */ nop /* D9EDA8 802418D8 0280202D */ daddu $a0, $s4, $zero /* D9EDAC 802418DC 0260282D */ daddu $a1, $s3, $zero -/* D9EDB0 802418E0 0C0904F5 */ jal omo_02_UnkNpcAIFunc10 +/* D9EDB0 802418E0 0C0904F5 */ jal func_802413D4_D9E8A4 /* D9EDB4 802418E4 02A0302D */ daddu $a2, $s5, $zero /* D9EDB8 802418E8 08090648 */ j .L80241920 /* D9EDBC 802418EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s index a5f47f64fb..8ff8dbc28f 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -46,7 +46,7 @@ glabel func_8024283C_D9FD0C /* D9FDB0 802428E0 8E4200B0 */ lw $v0, 0xb0($s2) /* D9FDB4 802428E4 30420004 */ andi $v0, $v0, 4 /* D9FDB8 802428E8 1040002F */ beqz $v0, .L802429A8 -/* D9FDBC 802428EC 00000000 */ nop +/* D9FDBC 802428EC 00000000 */ nop .L802428F0: /* D9FDC0 802428F0 2404F7FF */ addiu $a0, $zero, -0x801 /* D9FDC4 802428F4 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_8024283C_D9FD0C /* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 /* D9FE90 802429C0 8C227BE0 */ lw $v0, %lo(D_80247BE0)($at) /* D9FE94 802429C4 00400008 */ jr $v0 -/* D9FE98 802429C8 00000000 */ nop +/* D9FE98 802429C8 00000000 */ nop /* D9FE9C 802429CC 0260202D */ daddu $a0, $s3, $zero /* D9FEA0 802429D0 0200282D */ daddu $a1, $s0, $zero /* D9FEA4 802429D4 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_8024283C_D9FD0C /* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 /* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero /* D9FEBC 802429EC 08090ACD */ j .L80242B34 -/* D9FEC0 802429F0 00000000 */ nop +/* D9FEC0 802429F0 00000000 */ nop /* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero /* D9FEC8 802429F8 0200282D */ daddu $a1, $s0, $zero -/* D9FECC 802429FC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D9FECC 802429FC 0C0126D1 */ jal func_80049B44 /* D9FED0 80242A00 02A0302D */ daddu $a2, $s5, $zero /* D9FED4 80242A04 0260202D */ daddu $a0, $s3, $zero /* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero /* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 /* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero /* D9FEE4 80242A14 08090ACD */ j .L80242B34 -/* D9FEE8 80242A18 00000000 */ nop +/* D9FEE8 80242A18 00000000 */ nop /* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero /* D9FEF0 80242A20 0200282D */ daddu $a1, $s0, $zero /* D9FEF4 80242A24 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_8024283C_D9FD0C /* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC /* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero /* D9FF0C 80242A3C 08090ACD */ j .L80242B34 -/* D9FF10 80242A40 00000000 */ nop +/* D9FF10 80242A40 00000000 */ nop /* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* D9FF18 80242A48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* D9FF1C 80242A4C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_8024283C_D9FD0C /* D9FF34 80242A64 10400008 */ beqz $v0, .L80242A88 /* D9FF38 80242A68 46000086 */ mov.s $f2, $f0 /* D9FF3C 80242A6C 44820000 */ mtc1 $v0, $f0 -/* D9FF40 80242A70 00000000 */ nop +/* D9FF40 80242A70 00000000 */ nop /* D9FF44 80242A74 46800020 */ cvt.s.w $f0, $f0 /* D9FF48 80242A78 4602003C */ c.lt.s $f0, $f2 -/* D9FF4C 80242A7C 00000000 */ nop +/* D9FF4C 80242A7C 00000000 */ nop /* D9FF50 80242A80 4500000B */ bc1f .L80242AB0 /* D9FF54 80242A84 0260202D */ daddu $a0, $s3, $zero .L80242A88: @@ -164,7 +164,7 @@ glabel func_8024283C_D9FD0C /* D9FF6C 80242A9C 8E630070 */ lw $v1, 0x70($s3) /* D9FF70 80242AA0 2402000C */ addiu $v0, $zero, 0xc /* D9FF74 80242AA4 14620023 */ bne $v1, $v0, .L80242B34 -/* D9FF78 80242AA8 00000000 */ nop +/* D9FF78 80242AA8 00000000 */ nop /* D9FF7C 80242AAC 0260202D */ daddu $a0, $s3, $zero .L80242AB0: /* D9FF80 80242AB0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_8024283C_D9FD0C /* D9FF94 80242AC4 0C012849 */ jal func_8004A124 /* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero /* D9FF9C 80242ACC 08090ACD */ j .L80242B34 -/* D9FFA0 80242AD0 00000000 */ nop +/* D9FFA0 80242AD0 00000000 */ nop /* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero /* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero /* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 /* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero /* D9FFB4 80242AE4 08090ACD */ j .L80242B34 -/* D9FFB8 80242AE8 00000000 */ nop +/* D9FFB8 80242AE8 00000000 */ nop /* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C_D9F14C /* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero /* D9FFC4 80242AF4 08090ACD */ j .L80242B34 -/* D9FFC8 80242AF8 00000000 */ nop -/* D9FFCC 80242AFC 0C09075F */ jal omo_02_UnkSetDurationFunc +/* D9FFC8 80242AF8 00000000 */ nop +/* D9FFCC 80242AFC 0C09075F */ jal func_80241D7C_D9F24C /* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero /* D9FFD4 80242B04 08090ACD */ j .L80242B34 -/* D9FFD8 80242B08 00000000 */ nop -/* D9FFDC 80242B0C 0C090770 */ jal omo_02_UnkNpcAIFunc9 +/* D9FFD8 80242B08 00000000 */ nop +/* D9FFDC 80242B0C 0C090770 */ jal func_80241DC0_D9F290 /* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero /* D9FFE4 80242B14 08090ACD */ j .L80242B34 -/* D9FFE8 80242B18 00000000 */ nop -/* D9FFEC 80242B1C 0C090798 */ jal omo_02_UnkDurationCheck +/* D9FFE8 80242B18 00000000 */ nop +/* D9FFEC 80242B1C 0C090798 */ jal func_80241E60_D9F330 /* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero /* D9FFF4 80242B24 08090ACD */ j .L80242B34 -/* D9FFF8 80242B28 00000000 */ nop +/* D9FFF8 80242B28 00000000 */ nop /* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C /* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero .L80242B34: diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s index b4ff9eeaa2..e8176d5f03 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240550_DAD950.s @@ -131,8 +131,8 @@ glabel func_80240550_DAD950 /* DADB3C 8024073C C7A4002C */ lwc1 $f4, 0x2c($sp) /* DADB40 80240740 461A2100 */ add.s $f4, $f4, $f26 /* DADB44 80240744 46142081 */ sub.s $f2, $f4, $f20 -/* DADB48 80240748 3C018024 */ lui $at, %hi(pause_tabs_draw_badges) -/* DADB4C 8024074C D4204CC0 */ ldc1 $f0, %lo(pause_tabs_draw_badges)($at) +/* DADB48 80240748 3C018024 */ lui $at, %hi(pause_tabs_draw_badges_A2EF00) +/* DADB4C 8024074C D4204CC0 */ ldc1 $f0, %lo(pause_tabs_draw_badges_A2EF00)($at) /* DADB50 80240750 460010A1 */ cvt.d.s $f2, $f2 /* DADB54 80240754 46201082 */ mul.d $f2, $f2, $f0 /* DADB58 80240758 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s index c1fbce1d63..b424050c86 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s @@ -15,9 +15,9 @@ glabel func_80240FF4_DAE3F4 /* DAE41C 8024101C 00031C00 */ sll $v1, $v1, 0x10 /* DAE420 80241020 00031B83 */ sra $v1, $v1, 0xe /* DAE424 80241024 A444008E */ sh $a0, 0x8e($v0) -/* DAE428 80241028 3C018024 */ lui $at, %hi(D_80242EF0) +/* DAE428 80241028 3C018024 */ lui $at, %hi(func_80242EF0_BE66A0) /* DAE42C 8024102C 00230821 */ addu $at, $at, $v1 -/* DAE430 80241030 C4222EF0 */ lwc1 $f2, %lo(D_80242EF0)($at) +/* DAE430 80241030 C4222EF0 */ lwc1 $f2, %lo(func_80242EF0_BE66A0)($at) /* DAE434 80241034 8443008E */ lh $v1, 0x8e($v0) /* DAE438 80241038 46020000 */ add.s $f0, $f0, $f2 /* DAE43C 8024103C 28630005 */ slti $v1, $v1, 5 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index 1d8d4e7505..b0ea1f449f 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -83,7 +83,7 @@ glabel func_802416AC_DAEAAC /* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero /* DAEBE0 802417E0 0280202D */ daddu $a0, $s4, $zero /* DAEBE4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* DAEBE8 802417E8 0C0902DE */ jal omo_04_UnkNpcAIFunc1 +/* DAEBE8 802417E8 0C0902DE */ jal func_80240B78_DADF78 /* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero /* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero /* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802416AC_DAEAAC /* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero /* DAEC08 80241808 0280202D */ daddu $a0, $s4, $zero /* DAEC0C 8024180C 0200282D */ daddu $a1, $s0, $zero -/* DAEC10 80241810 0C0903DF */ jal omo_04_UnkNpcAIFunc2 +/* DAEC10 80241810 0C0903DF */ jal func_80240F7C_DAE37C /* DAEC14 80241814 0260302D */ daddu $a2, $s3, $zero /* DAEC18 80241818 0280202D */ daddu $a0, $s4, $zero /* DAEC1C 8024181C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802416AC_DAEAAC /* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero /* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero /* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero -/* DAEC50 80241850 0C090465 */ jal omo_04_UnkNpcAIFunc3 +/* DAEC50 80241850 0C090465 */ jal func_80241194_DAE594 /* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero /* DAEC58 80241858 0809061D */ j .L80241874 /* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s index 133db90d8d..f614d7a69d 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s @@ -46,7 +46,7 @@ glabel func_80241AD0_DAEED0 /* DAEF74 80241B74 8E2200B0 */ lw $v0, 0xb0($s1) /* DAEF78 80241B78 30420004 */ andi $v0, $v0, 4 /* DAEF7C 80241B7C 10400044 */ beqz $v0, .L80241C90 -/* DAEF80 80241B80 00000000 */ nop +/* DAEF80 80241B80 00000000 */ nop .L80241B84: /* DAEF84 80241B84 2404F7FF */ addiu $a0, $zero, -0x801 /* DAEF88 80241B88 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80241AD0_DAEED0 /* DAF048 80241C48 C640003C */ lwc1 $f0, 0x3c($s2) /* DAF04C 80241C4C C6420040 */ lwc1 $f2, 0x40($s2) /* DAF050 80241C50 44822000 */ mtc1 $v0, $f4 -/* DAF054 80241C54 00000000 */ nop +/* DAF054 80241C54 00000000 */ nop /* DAF058 80241C58 46802120 */ cvt.s.w $f4, $f4 /* DAF05C 80241C5C 27A20044 */ addiu $v0, $sp, 0x44 /* DAF060 80241C60 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80241AD0_DAEED0 /* DAF078 80241C78 0C0372DF */ jal func_800DCB7C /* DAF07C 80241C7C 27A6003C */ addiu $a2, $sp, 0x3c /* DAF080 80241C80 10400003 */ beqz $v0, .L80241C90 -/* DAF084 80241C84 00000000 */ nop +/* DAF084 80241C84 00000000 */ nop /* DAF088 80241C88 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DAF08C 80241C8C E640003C */ swc1 $f0, 0x3c($s2) .L80241C90: @@ -128,7 +128,7 @@ glabel func_80241AD0_DAEED0 /* DAF0A4 80241CA4 00220821 */ addu $at, $at, $v0 /* DAF0A8 80241CA8 8C224D18 */ lw $v0, %lo(D_80244D18)($at) /* DAF0AC 80241CAC 00400008 */ jr $v0 -/* DAF0B0 80241CB0 00000000 */ nop +/* DAF0B0 80241CB0 00000000 */ nop /* DAF0B4 80241CB4 0260202D */ daddu $a0, $s3, $zero /* DAF0B8 80241CB8 0280282D */ daddu $a1, $s4, $zero /* DAF0BC 80241CBC 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80241AD0_DAEED0 /* DAF0CC 80241CCC 0C0125AE */ jal func_800496B8 /* DAF0D0 80241CD0 02A0302D */ daddu $a2, $s5, $zero /* DAF0D4 80241CD4 08090777 */ j .L80241DDC -/* DAF0D8 80241CD8 00000000 */ nop +/* DAF0D8 80241CD8 00000000 */ nop /* DAF0DC 80241CDC 0260202D */ daddu $a0, $s3, $zero /* DAF0E0 80241CE0 0280282D */ daddu $a1, $s4, $zero -/* DAF0E4 80241CE4 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DAF0E4 80241CE4 0C0126D1 */ jal func_80049B44 /* DAF0E8 80241CE8 02A0302D */ daddu $a2, $s5, $zero /* DAF0EC 80241CEC 0260202D */ daddu $a0, $s3, $zero /* DAF0F0 80241CF0 0280282D */ daddu $a1, $s4, $zero /* DAF0F4 80241CF4 0C012701 */ jal func_80049C04 /* DAF0F8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DAF0FC 80241CFC 08090777 */ j .L80241DDC -/* DAF100 80241D00 00000000 */ nop +/* DAF100 80241D00 00000000 */ nop /* DAF104 80241D04 0260202D */ daddu $a0, $s3, $zero /* DAF108 80241D08 0280282D */ daddu $a1, $s4, $zero /* DAF10C 80241D0C 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80241AD0_DAEED0 /* DAF11C 80241D1C 0C0127B3 */ jal func_80049ECC /* DAF120 80241D20 02A0302D */ daddu $a2, $s5, $zero /* DAF124 80241D24 08090777 */ j .L80241DDC -/* DAF128 80241D28 00000000 */ nop +/* DAF128 80241D28 00000000 */ nop /* DAF12C 80241D2C 0260202D */ daddu $a0, $s3, $zero /* DAF130 80241D30 0280282D */ daddu $a1, $s4, $zero /* DAF134 80241D34 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80241AD0_DAEED0 /* DAF14C 80241D4C 8E630070 */ lw $v1, 0x70($s3) /* DAF150 80241D50 2402000E */ addiu $v0, $zero, 0xe /* DAF154 80241D54 14620021 */ bne $v1, $v0, .L80241DDC -/* DAF158 80241D58 00000000 */ nop +/* DAF158 80241D58 00000000 */ nop /* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero /* DAF160 80241D60 0280282D */ daddu $a1, $s4, $zero /* DAF164 80241D64 0C090626 */ jal func_80241898_DAEC98 @@ -178,7 +178,7 @@ glabel func_80241AD0_DAEED0 /* DAF16C 80241D6C 8E630070 */ lw $v1, 0x70($s3) /* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf /* DAF174 80241D74 14620019 */ bne $v1, $v0, .L80241DDC -/* DAF178 80241D78 00000000 */ nop +/* DAF178 80241D78 00000000 */ nop /* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero /* DAF180 80241D80 0280282D */ daddu $a1, $s4, $zero /* DAF184 80241D84 0C090642 */ jal func_80241908_DAED08 @@ -186,7 +186,7 @@ glabel func_80241AD0_DAEED0 /* DAF18C 80241D8C 8E630070 */ lw $v1, 0x70($s3) /* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 /* DAF194 80241D94 14620011 */ bne $v1, $v0, .L80241DDC -/* DAF198 80241D98 00000000 */ nop +/* DAF198 80241D98 00000000 */ nop /* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero /* DAF1A0 80241DA0 0280282D */ daddu $a1, $s4, $zero /* DAF1A4 80241DA4 0C090676 */ jal func_802419D8_DAEDD8 @@ -194,13 +194,13 @@ glabel func_80241AD0_DAEED0 /* DAF1AC 80241DAC 8E630070 */ lw $v1, 0x70($s3) /* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 /* DAF1B4 80241DB4 14620009 */ bne $v1, $v0, .L80241DDC -/* DAF1B8 80241DB8 00000000 */ nop +/* DAF1B8 80241DB8 00000000 */ nop /* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero /* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero /* DAF1C4 80241DC4 0C09069C */ jal func_80241A70_DAEE70 /* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero /* DAF1CC 80241DCC 08090777 */ j .L80241DDC -/* DAF1D0 80241DD0 00000000 */ nop +/* DAF1D0 80241DD0 00000000 */ nop /* DAF1D4 80241DD4 0C0129CF */ jal func_8004A73C /* DAF1D8 80241DD8 0260202D */ daddu $a0, $s3, $zero .L80241DDC: diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s index 975358390e..628cdb3330 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s @@ -46,7 +46,7 @@ glabel func_80240238_DB24F8 /* DB259C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) /* DB25A0 802402E0 30420004 */ andi $v0, $v0, 4 /* DB25A4 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DB25A8 802402E8 00000000 */ nop +/* DB25A8 802402E8 00000000 */ nop .L802402EC: /* DB25AC 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 /* DB25B0 802402F0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240238_DB24F8 /* DB2670 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) /* DB2674 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) /* DB2678 802403B8 44822000 */ mtc1 $v0, $f4 -/* DB267C 802403BC 00000000 */ nop +/* DB267C 802403BC 00000000 */ nop /* DB2680 802403C0 46802120 */ cvt.s.w $f4, $f4 /* DB2684 802403C4 27A20044 */ addiu $v0, $sp, 0x44 /* DB2688 802403C8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240238_DB24F8 /* DB26A0 802403E0 0C0372DF */ jal func_800DCB7C /* DB26A4 802403E4 27A6003C */ addiu $a2, $sp, 0x3c /* DB26A8 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DB26AC 802403EC 00000000 */ nop +/* DB26AC 802403EC 00000000 */ nop /* DB26B0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DB26B4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) .L802403F8: @@ -128,7 +128,7 @@ glabel func_80240238_DB24F8 /* DB26CC 8024040C 00220821 */ addu $at, $at, $v0 /* DB26D0 80240410 8C2252C0 */ lw $v0, %lo(D_802452C0)($at) /* DB26D4 80240414 00400008 */ jr $v0 -/* DB26D8 80240418 00000000 */ nop +/* DB26D8 80240418 00000000 */ nop /* DB26DC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DB26E0 80240420 0280282D */ daddu $a1, $s4, $zero /* DB26E4 80240424 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240238_DB24F8 /* DB26F4 80240434 0C0125AE */ jal func_800496B8 /* DB26F8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DB26FC 8024043C 08090151 */ j .L80240544 -/* DB2700 80240440 00000000 */ nop +/* DB2700 80240440 00000000 */ nop /* DB2704 80240444 0260202D */ daddu $a0, $s3, $zero /* DB2708 80240448 0280282D */ daddu $a1, $s4, $zero -/* DB270C 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DB270C 8024044C 0C0126D1 */ jal func_80049B44 /* DB2710 80240450 02A0302D */ daddu $a2, $s5, $zero /* DB2714 80240454 0260202D */ daddu $a0, $s3, $zero /* DB2718 80240458 0280282D */ daddu $a1, $s4, $zero /* DB271C 8024045C 0C012701 */ jal func_80049C04 /* DB2720 80240460 02A0302D */ daddu $a2, $s5, $zero /* DB2724 80240464 08090151 */ j .L80240544 -/* DB2728 80240468 00000000 */ nop +/* DB2728 80240468 00000000 */ nop /* DB272C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DB2730 80240470 0280282D */ daddu $a1, $s4, $zero /* DB2734 80240474 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240238_DB24F8 /* DB2744 80240484 0C0127B3 */ jal func_80049ECC /* DB2748 80240488 02A0302D */ daddu $a2, $s5, $zero /* DB274C 8024048C 08090151 */ j .L80240544 -/* DB2750 80240490 00000000 */ nop +/* DB2750 80240490 00000000 */ nop /* DB2754 80240494 0260202D */ daddu $a0, $s3, $zero /* DB2758 80240498 0280282D */ daddu $a1, $s4, $zero /* DB275C 8024049C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240238_DB24F8 /* DB2774 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DB2778 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DB277C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DB2780 802404C0 00000000 */ nop +/* DB2780 802404C0 00000000 */ nop /* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero /* DB2788 802404C8 0280282D */ daddu $a1, $s4, $zero /* DB278C 802404CC 0C090000 */ jal func_80240000_DB22C0 @@ -178,7 +178,7 @@ glabel func_80240238_DB24F8 /* DB2794 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DB279C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DB27A0 802404E0 00000000 */ nop +/* DB27A0 802404E0 00000000 */ nop /* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero /* DB27A8 802404E8 0280282D */ daddu $a1, $s4, $zero /* DB27AC 802404EC 0C09001C */ jal func_80240070_DB2330 @@ -186,7 +186,7 @@ glabel func_80240238_DB24F8 /* DB27B4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DB27BC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DB27C0 80240500 00000000 */ nop +/* DB27C0 80240500 00000000 */ nop /* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero /* DB27C8 80240508 0280282D */ daddu $a1, $s4, $zero /* DB27CC 8024050C 0C090050 */ jal func_80240140_DB2400 @@ -194,13 +194,13 @@ glabel func_80240238_DB24F8 /* DB27D4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DB27DC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DB27E0 80240520 00000000 */ nop +/* DB27E0 80240520 00000000 */ nop /* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero /* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero /* DB27EC 8024052C 0C090076 */ jal func_802401D8_DB2498 /* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DB27F4 80240534 08090151 */ j .L80240544 -/* DB27F8 80240538 00000000 */ nop +/* DB27F8 80240538 00000000 */ nop /* DB27FC 8024053C 0C0129CF */ jal func_8004A73C /* DB2800 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s index c75a59a00c..408cf64bda 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s @@ -141,7 +141,7 @@ glabel func_80240780_DB2A40 /* DB2C48 80240988 00000000 */ nop /* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero /* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero -/* DB2C54 80240994 0C09015B */ jal omo_05_UnkNpcAIFunc4 +/* DB2C54 80240994 0C09015B */ jal func_8024056C_DB282C /* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero /* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero /* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index e2810645f5..7048956c08 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -83,7 +83,7 @@ glabel func_80241D60_DB4020 /* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero /* DB4154 80241E94 0280202D */ daddu $a0, $s4, $zero /* DB4158 80241E98 0200282D */ daddu $a1, $s0, $zero -/* DB415C 80241E9C 0C09048B */ jal omo_05_UnkNpcAIFunc1 +/* DB415C 80241E9C 0C09048B */ jal func_8024122C_DB34EC /* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero /* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero /* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241D60_DB4020 /* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero /* DB417C 80241EBC 0280202D */ daddu $a0, $s4, $zero /* DB4180 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* DB4184 80241EC4 0C09058C */ jal omo_05_UnkNpcAIFunc2 +/* DB4184 80241EC4 0C09058C */ jal func_80241630_DB38F0 /* DB4188 80241EC8 0260302D */ daddu $a2, $s3, $zero /* DB418C 80241ECC 0280202D */ daddu $a0, $s4, $zero /* DB4190 80241ED0 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241D60_DB4020 /* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero /* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* DB41C4 80241F04 0C090612 */ jal omo_05_UnkNpcAIFunc3 +/* DB41C4 80241F04 0C090612 */ jal func_80241848_DB3B08 /* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero /* DB41CC 80241F0C 080907CA */ j .L80241F28 /* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s index 304868b3e8..c85e0ccb88 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242178_DB4438.s @@ -18,9 +18,9 @@ glabel func_80242178_DB4438 /* DB4468 802421A8 0000102D */ daddu $v0, $zero, $zero .L802421AC: /* DB446C 802421AC 8CC50000 */ lw $a1, ($a2) -/* DB4470 802421B0 3C068024 */ lui $a2, %hi(D_8024309C) +/* DB4470 802421B0 3C068024 */ lui $a2, %hi(func_8024309C_95E29C) /* DB4474 802421B4 0C0B2026 */ jal set_variable -/* DB4478 802421B8 8CC6309C */ lw $a2, %lo(D_8024309C)($a2) +/* DB4478 802421B8 8CC6309C */ lw $a2, %lo(func_8024309C_95E29C)($a2) /* DB447C 802421BC 24020002 */ addiu $v0, $zero, 2 .L802421C0: /* DB4480 802421C0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s index c113fa38ae..6ca463f79e 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802421CC_DB448C.s @@ -7,8 +7,8 @@ glabel func_802421CC_DB448C /* DB4494 802421D4 8C82000C */ lw $v0, 0xc($a0) /* DB4498 802421D8 0C0B1EAF */ jal get_variable /* DB449C 802421DC 8C450000 */ lw $a1, ($v0) -/* DB44A0 802421E0 3C018024 */ lui $at, %hi(D_8024309C) -/* DB44A4 802421E4 AC22309C */ sw $v0, %lo(D_8024309C)($at) +/* DB44A0 802421E0 3C018024 */ lui $at, %hi(func_8024309C_95E29C) +/* DB44A4 802421E4 AC22309C */ sw $v0, %lo(func_8024309C_95E29C)($at) /* DB44A8 802421E8 24020002 */ addiu $v0, $zero, 2 /* DB44AC 802421EC 8FBF0010 */ lw $ra, 0x10($sp) /* DB44B0 802421F0 24030001 */ addiu $v1, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s index d24da2544d..95e5a246ea 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s @@ -46,7 +46,7 @@ glabel func_80240238_DBD4E8 /* DBD58C 802402DC 8E2200B0 */ lw $v0, 0xb0($s1) /* DBD590 802402E0 30420004 */ andi $v0, $v0, 4 /* DBD594 802402E4 10400044 */ beqz $v0, .L802403F8 -/* DBD598 802402E8 00000000 */ nop +/* DBD598 802402E8 00000000 */ nop .L802402EC: /* DBD59C 802402EC 2404F7FF */ addiu $a0, $zero, -0x801 /* DBD5A0 802402F0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240238_DBD4E8 /* DBD660 802403B0 C640003C */ lwc1 $f0, 0x3c($s2) /* DBD664 802403B4 C6420040 */ lwc1 $f2, 0x40($s2) /* DBD668 802403B8 44822000 */ mtc1 $v0, $f4 -/* DBD66C 802403BC 00000000 */ nop +/* DBD66C 802403BC 00000000 */ nop /* DBD670 802403C0 46802120 */ cvt.s.w $f4, $f4 /* DBD674 802403C4 27A20044 */ addiu $v0, $sp, 0x44 /* DBD678 802403C8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240238_DBD4E8 /* DBD690 802403E0 0C0372DF */ jal func_800DCB7C /* DBD694 802403E4 27A6003C */ addiu $a2, $sp, 0x3c /* DBD698 802403E8 10400003 */ beqz $v0, .L802403F8 -/* DBD69C 802403EC 00000000 */ nop +/* DBD69C 802403EC 00000000 */ nop /* DBD6A0 802403F0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DBD6A4 802403F4 E640003C */ swc1 $f0, 0x3c($s2) .L802403F8: @@ -128,7 +128,7 @@ glabel func_80240238_DBD4E8 /* DBD6BC 8024040C 00220821 */ addu $at, $at, $v0 /* DBD6C0 80240410 8C226BE0 */ lw $v0, %lo(D_80246BE0)($at) /* DBD6C4 80240414 00400008 */ jr $v0 -/* DBD6C8 80240418 00000000 */ nop +/* DBD6C8 80240418 00000000 */ nop /* DBD6CC 8024041C 0260202D */ daddu $a0, $s3, $zero /* DBD6D0 80240420 0280282D */ daddu $a1, $s4, $zero /* DBD6D4 80240424 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240238_DBD4E8 /* DBD6E4 80240434 0C0125AE */ jal func_800496B8 /* DBD6E8 80240438 02A0302D */ daddu $a2, $s5, $zero /* DBD6EC 8024043C 08090151 */ j .L80240544 -/* DBD6F0 80240440 00000000 */ nop +/* DBD6F0 80240440 00000000 */ nop /* DBD6F4 80240444 0260202D */ daddu $a0, $s3, $zero /* DBD6F8 80240448 0280282D */ daddu $a1, $s4, $zero -/* DBD6FC 8024044C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DBD6FC 8024044C 0C0126D1 */ jal func_80049B44 /* DBD700 80240450 02A0302D */ daddu $a2, $s5, $zero /* DBD704 80240454 0260202D */ daddu $a0, $s3, $zero /* DBD708 80240458 0280282D */ daddu $a1, $s4, $zero /* DBD70C 8024045C 0C012701 */ jal func_80049C04 /* DBD710 80240460 02A0302D */ daddu $a2, $s5, $zero /* DBD714 80240464 08090151 */ j .L80240544 -/* DBD718 80240468 00000000 */ nop +/* DBD718 80240468 00000000 */ nop /* DBD71C 8024046C 0260202D */ daddu $a0, $s3, $zero /* DBD720 80240470 0280282D */ daddu $a1, $s4, $zero /* DBD724 80240474 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240238_DBD4E8 /* DBD734 80240484 0C0127B3 */ jal func_80049ECC /* DBD738 80240488 02A0302D */ daddu $a2, $s5, $zero /* DBD73C 8024048C 08090151 */ j .L80240544 -/* DBD740 80240490 00000000 */ nop +/* DBD740 80240490 00000000 */ nop /* DBD744 80240494 0260202D */ daddu $a0, $s3, $zero /* DBD748 80240498 0280282D */ daddu $a1, $s4, $zero /* DBD74C 8024049C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240238_DBD4E8 /* DBD764 802404B4 8E630070 */ lw $v1, 0x70($s3) /* DBD768 802404B8 2402000E */ addiu $v0, $zero, 0xe /* DBD76C 802404BC 14620021 */ bne $v1, $v0, .L80240544 -/* DBD770 802404C0 00000000 */ nop +/* DBD770 802404C0 00000000 */ nop /* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero /* DBD778 802404C8 0280282D */ daddu $a1, $s4, $zero /* DBD77C 802404CC 0C090000 */ jal func_80240000_DBD2B0 @@ -178,7 +178,7 @@ glabel func_80240238_DBD4E8 /* DBD784 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf /* DBD78C 802404DC 14620019 */ bne $v1, $v0, .L80240544 -/* DBD790 802404E0 00000000 */ nop +/* DBD790 802404E0 00000000 */ nop /* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero /* DBD798 802404E8 0280282D */ daddu $a1, $s4, $zero /* DBD79C 802404EC 0C09001C */ jal func_80240070_DBD320 @@ -186,7 +186,7 @@ glabel func_80240238_DBD4E8 /* DBD7A4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 /* DBD7AC 802404FC 14620011 */ bne $v1, $v0, .L80240544 -/* DBD7B0 80240500 00000000 */ nop +/* DBD7B0 80240500 00000000 */ nop /* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero /* DBD7B8 80240508 0280282D */ daddu $a1, $s4, $zero /* DBD7BC 8024050C 0C090050 */ jal func_80240140_DBD3F0 @@ -194,13 +194,13 @@ glabel func_80240238_DBD4E8 /* DBD7C4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 /* DBD7CC 8024051C 14620009 */ bne $v1, $v0, .L80240544 -/* DBD7D0 80240520 00000000 */ nop +/* DBD7D0 80240520 00000000 */ nop /* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero /* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero /* DBD7DC 8024052C 0C090076 */ jal func_802401D8_DBD488 /* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DBD7E4 80240534 08090151 */ j .L80240544 -/* DBD7E8 80240538 00000000 */ nop +/* DBD7E8 80240538 00000000 */ nop /* DBD7EC 8024053C 0C0129CF */ jal func_8004A73C /* DBD7F0 80240540 0260202D */ daddu $a0, $s3, $zero .L80240544: diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index bb20c9b94e..abaf124b16 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -141,7 +141,7 @@ glabel func_80241100_DBE3B0 /* DBE5B8 80241308 00000000 */ nop /* DBE5BC 8024130C 0280202D */ daddu $a0, $s4, $zero /* DBE5C0 80241310 0260282D */ daddu $a1, $s3, $zero -/* DBE5C4 80241314 0C09025B */ jal omo_07_UnkNpcAIFunc1 +/* DBE5C4 80241314 0C09025B */ jal func_8024096C_DBDC1C /* DBE5C8 80241318 02A0302D */ daddu $a2, $s5, $zero /* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero /* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241100_DBE3B0 /* DBE5F8 80241348 00000000 */ nop /* DBE5FC 8024134C 0280202D */ daddu $a0, $s4, $zero /* DBE600 80241350 0260282D */ daddu $a1, $s3, $zero -/* DBE604 80241354 0C090327 */ jal omo_07_NpcJumpFunc2 +/* DBE604 80241354 0C090327 */ jal func_80240C9C_DBDF4C /* DBE608 80241358 02A0302D */ daddu $a2, $s5, $zero /* DBE60C 8024135C 0280202D */ daddu $a0, $s4, $zero /* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero -/* DBE614 80241364 0C090344 */ jal omo_07_NpcJumpFunc +/* DBE614 80241364 0C090344 */ jal func_80240D10_DBDFC0 /* DBE618 80241368 02A0302D */ daddu $a2, $s5, $zero /* DBE61C 8024136C 080904F5 */ j .L802413D4 /* DBE620 80241370 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241100_DBE3B0 /* DBE648 80241398 00000000 */ nop /* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero /* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero -/* DBE654 802413A4 0C0903F6 */ jal omo_07_UnkNpcDurationFlagFunc +/* DBE654 802413A4 0C0903F6 */ jal func_80240FD8_DBE288 /* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero /* DBE65C 802413AC 080904F5 */ j .L802413D4 /* DBE660 802413B0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index 7e9621b20c..cc4bf9f4d6 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -141,7 +141,7 @@ glabel func_80241634_DBE8E4 /* DBEAEC 8024183C 00000000 */ nop /* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero /* DBEAF4 80241844 0280282D */ daddu $a1, $s4, $zero -/* DBEAF8 80241848 0C09025B */ jal omo_07_UnkNpcAIFunc1 +/* DBEAF8 80241848 0C09025B */ jal func_8024096C_DBDC1C /* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero /* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero @@ -157,11 +157,11 @@ glabel func_80241634_DBE8E4 /* DBEB2C 8024187C 00000000 */ nop /* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero /* DBEB34 80241884 0280282D */ daddu $a1, $s4, $zero -/* DBEB38 80241888 0C090327 */ jal omo_07_NpcJumpFunc2 +/* DBEB38 80241888 0C090327 */ jal func_80240C9C_DBDF4C /* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero /* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero /* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero -/* DBEB48 80241898 0C090344 */ jal omo_07_NpcJumpFunc +/* DBEB48 80241898 0C090344 */ jal func_80240D10_DBDFC0 /* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero /* DBEB50 802418A0 08090654 */ j .L80241950 /* DBEB54 802418A4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index f101fdd50f..296178814d 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -54,7 +54,7 @@ glabel func_80242C84_DBFF34 /* DBFFF4 80242D44 8E4300B0 */ lw $v1, 0xb0($s2) /* DBFFF8 80242D48 30620004 */ andi $v0, $v1, 4 /* DBFFFC 80242D4C 10400007 */ beqz $v0, .L80242D6C -/* DC0000 80242D50 00000000 */ nop +/* DC0000 80242D50 00000000 */ nop /* DC0004 80242D54 824200B4 */ lb $v0, 0xb4($s2) /* DC0008 80242D58 1440003C */ bnez $v0, .L80242E4C /* DC000C 80242D5C 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_80242C84_DBFF34 /* DC0030 80242D80 00220821 */ addu $at, $at, $v0 /* DC0034 80242D84 8C2270C8 */ lw $v0, %lo(D_802470C8)($at) /* DC0038 80242D88 00400008 */ jr $v0 -/* DC003C 80242D8C 00000000 */ nop +/* DC003C 80242D8C 00000000 */ nop /* DC0040 80242D90 0280202D */ daddu $a0, $s4, $zero /* DC0044 80242D94 0200282D */ daddu $a1, $s0, $zero /* DC0048 80242D98 0C09065E */ jal func_80241978_DBEC28 @@ -83,7 +83,7 @@ glabel func_80242C84_DBFF34 /* DC0064 80242DB4 0000102D */ daddu $v0, $zero, $zero /* DC0068 80242DB8 0280202D */ daddu $a0, $s4, $zero /* DC006C 80242DBC 0200282D */ daddu $a1, $s0, $zero -/* DC0070 80242DC0 0C090854 */ jal dup_omo_07_UnkNpcAIFunc1 +/* DC0070 80242DC0 0C090854 */ jal func_80242150_DBF400 /* DC0074 80242DC4 0260302D */ daddu $a2, $s3, $zero /* DC0078 80242DC8 0280202D */ daddu $a0, $s4, $zero /* DC007C 80242DCC 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80242C84_DBFF34 /* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero /* DC0090 80242DE0 0280202D */ daddu $a0, $s4, $zero /* DC0094 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* DC0098 80242DE8 0C090955 */ jal omo_07_UnkNpcAIFunc2 +/* DC0098 80242DE8 0C090955 */ jal func_80242554_DBF804 /* DC009C 80242DEC 0260302D */ daddu $a2, $s3, $zero /* DC00A0 80242DF0 0280202D */ daddu $a0, $s4, $zero /* DC00A4 80242DF4 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80242C84_DBFF34 /* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero /* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero /* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero -/* DC00D8 80242E28 0C0909DB */ jal omo_07_UnkNpcAIFunc3 +/* DC00D8 80242E28 0C0909DB */ jal func_8024276C_DBFA1C /* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero /* DC00E0 80242E30 08090B93 */ j .L80242E4C /* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s index 69bb1b12c3..4e62038c1e 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s @@ -46,7 +46,7 @@ glabel func_80240AA8_DC4E78 /* DC4F1C 80240B4C 8E2200B0 */ lw $v0, 0xb0($s1) /* DC4F20 80240B50 30420004 */ andi $v0, $v0, 4 /* DC4F24 80240B54 10400044 */ beqz $v0, .L80240C68 -/* DC4F28 80240B58 00000000 */ nop +/* DC4F28 80240B58 00000000 */ nop .L80240B5C: /* DC4F2C 80240B5C 2404F7FF */ addiu $a0, $zero, -0x801 /* DC4F30 80240B60 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240AA8_DC4E78 /* DC4FF0 80240C20 C640003C */ lwc1 $f0, 0x3c($s2) /* DC4FF4 80240C24 C6420040 */ lwc1 $f2, 0x40($s2) /* DC4FF8 80240C28 44822000 */ mtc1 $v0, $f4 -/* DC4FFC 80240C2C 00000000 */ nop +/* DC4FFC 80240C2C 00000000 */ nop /* DC5000 80240C30 46802120 */ cvt.s.w $f4, $f4 /* DC5004 80240C34 27A20044 */ addiu $v0, $sp, 0x44 /* DC5008 80240C38 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240AA8_DC4E78 /* DC5020 80240C50 0C0372DF */ jal func_800DCB7C /* DC5024 80240C54 27A6003C */ addiu $a2, $sp, 0x3c /* DC5028 80240C58 10400003 */ beqz $v0, .L80240C68 -/* DC502C 80240C5C 00000000 */ nop +/* DC502C 80240C5C 00000000 */ nop /* DC5030 80240C60 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DC5034 80240C64 E640003C */ swc1 $f0, 0x3c($s2) .L80240C68: @@ -128,7 +128,7 @@ glabel func_80240AA8_DC4E78 /* DC504C 80240C7C 00220821 */ addu $at, $at, $v0 /* DC5050 80240C80 8C228770 */ lw $v0, %lo(D_80248770)($at) /* DC5054 80240C84 00400008 */ jr $v0 -/* DC5058 80240C88 00000000 */ nop +/* DC5058 80240C88 00000000 */ nop /* DC505C 80240C8C 0260202D */ daddu $a0, $s3, $zero /* DC5060 80240C90 0280282D */ daddu $a1, $s4, $zero /* DC5064 80240C94 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240AA8_DC4E78 /* DC5074 80240CA4 0C0125AE */ jal func_800496B8 /* DC5078 80240CA8 02A0302D */ daddu $a2, $s5, $zero /* DC507C 80240CAC 0809036D */ j .L80240DB4 -/* DC5080 80240CB0 00000000 */ nop +/* DC5080 80240CB0 00000000 */ nop /* DC5084 80240CB4 0260202D */ daddu $a0, $s3, $zero /* DC5088 80240CB8 0280282D */ daddu $a1, $s4, $zero -/* DC508C 80240CBC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DC508C 80240CBC 0C0126D1 */ jal func_80049B44 /* DC5090 80240CC0 02A0302D */ daddu $a2, $s5, $zero /* DC5094 80240CC4 0260202D */ daddu $a0, $s3, $zero /* DC5098 80240CC8 0280282D */ daddu $a1, $s4, $zero /* DC509C 80240CCC 0C012701 */ jal func_80049C04 /* DC50A0 80240CD0 02A0302D */ daddu $a2, $s5, $zero /* DC50A4 80240CD4 0809036D */ j .L80240DB4 -/* DC50A8 80240CD8 00000000 */ nop +/* DC50A8 80240CD8 00000000 */ nop /* DC50AC 80240CDC 0260202D */ daddu $a0, $s3, $zero /* DC50B0 80240CE0 0280282D */ daddu $a1, $s4, $zero /* DC50B4 80240CE4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240AA8_DC4E78 /* DC50C4 80240CF4 0C0127B3 */ jal func_80049ECC /* DC50C8 80240CF8 02A0302D */ daddu $a2, $s5, $zero /* DC50CC 80240CFC 0809036D */ j .L80240DB4 -/* DC50D0 80240D00 00000000 */ nop +/* DC50D0 80240D00 00000000 */ nop /* DC50D4 80240D04 0260202D */ daddu $a0, $s3, $zero /* DC50D8 80240D08 0280282D */ daddu $a1, $s4, $zero /* DC50DC 80240D0C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240AA8_DC4E78 /* DC50F4 80240D24 8E630070 */ lw $v1, 0x70($s3) /* DC50F8 80240D28 2402000E */ addiu $v0, $zero, 0xe /* DC50FC 80240D2C 14620021 */ bne $v1, $v0, .L80240DB4 -/* DC5100 80240D30 00000000 */ nop +/* DC5100 80240D30 00000000 */ nop /* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero /* DC5108 80240D38 0280282D */ daddu $a1, $s4, $zero /* DC510C 80240D3C 0C09021C */ jal func_80240870_DC4C40 @@ -178,7 +178,7 @@ glabel func_80240AA8_DC4E78 /* DC5114 80240D44 8E630070 */ lw $v1, 0x70($s3) /* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf /* DC511C 80240D4C 14620019 */ bne $v1, $v0, .L80240DB4 -/* DC5120 80240D50 00000000 */ nop +/* DC5120 80240D50 00000000 */ nop /* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero /* DC5128 80240D58 0280282D */ daddu $a1, $s4, $zero /* DC512C 80240D5C 0C090238 */ jal func_802408E0_DC4CB0 @@ -186,7 +186,7 @@ glabel func_80240AA8_DC4E78 /* DC5134 80240D64 8E630070 */ lw $v1, 0x70($s3) /* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 /* DC513C 80240D6C 14620011 */ bne $v1, $v0, .L80240DB4 -/* DC5140 80240D70 00000000 */ nop +/* DC5140 80240D70 00000000 */ nop /* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero /* DC5148 80240D78 0280282D */ daddu $a1, $s4, $zero /* DC514C 80240D7C 0C09026C */ jal func_802409B0_DC4D80 @@ -194,13 +194,13 @@ glabel func_80240AA8_DC4E78 /* DC5154 80240D84 8E630070 */ lw $v1, 0x70($s3) /* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 /* DC515C 80240D8C 14620009 */ bne $v1, $v0, .L80240DB4 -/* DC5160 80240D90 00000000 */ nop +/* DC5160 80240D90 00000000 */ nop /* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero /* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero /* DC516C 80240D9C 0C090292 */ jal func_80240A48_DC4E18 /* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* DC5174 80240DA4 0809036D */ j .L80240DB4 -/* DC5178 80240DA8 00000000 */ nop +/* DC5178 80240DA8 00000000 */ nop /* DC517C 80240DAC 0C0129CF */ jal func_8004A73C /* DC5180 80240DB0 0260202D */ daddu $a0, $s3, $zero .L80240DB4: @@ -214,4 +214,4 @@ glabel func_80240AA8_DC4E78 /* DC51A0 80240DD0 0000102D */ daddu $v0, $zero, $zero /* DC51A4 80240DD4 03E00008 */ jr $ra /* DC51A8 80240DD8 27BD0068 */ addiu $sp, $sp, 0x68 -/* DC51AC 80240DDC 00000000 */ nop +/* DC51AC 80240DDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s index f9640a304a..05e9c993c7 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s @@ -46,7 +46,7 @@ glabel func_80240C18_DCD8E8 /* DCD98C 80240CBC 8E2200B0 */ lw $v0, 0xb0($s1) /* DCD990 80240CC0 30420004 */ andi $v0, $v0, 4 /* DCD994 80240CC4 10400044 */ beqz $v0, .L80240DD8 -/* DCD998 80240CC8 00000000 */ nop +/* DCD998 80240CC8 00000000 */ nop .L80240CCC: /* DCD99C 80240CCC 2404F7FF */ addiu $a0, $zero, -0x801 /* DCD9A0 80240CD0 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240C18_DCD8E8 /* DCDA60 80240D90 C640003C */ lwc1 $f0, 0x3c($s2) /* DCDA64 80240D94 C6420040 */ lwc1 $f2, 0x40($s2) /* DCDA68 80240D98 44822000 */ mtc1 $v0, $f4 -/* DCDA6C 80240D9C 00000000 */ nop +/* DCDA6C 80240D9C 00000000 */ nop /* DCDA70 80240DA0 46802120 */ cvt.s.w $f4, $f4 /* DCDA74 80240DA4 27A20044 */ addiu $v0, $sp, 0x44 /* DCDA78 80240DA8 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240C18_DCD8E8 /* DCDA90 80240DC0 0C0372DF */ jal func_800DCB7C /* DCDA94 80240DC4 27A6003C */ addiu $a2, $sp, 0x3c /* DCDA98 80240DC8 10400003 */ beqz $v0, .L80240DD8 -/* DCDA9C 80240DCC 00000000 */ nop +/* DCDA9C 80240DCC 00000000 */ nop /* DCDAA0 80240DD0 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DCDAA4 80240DD4 E640003C */ swc1 $f0, 0x3c($s2) .L80240DD8: @@ -128,7 +128,7 @@ glabel func_80240C18_DCD8E8 /* DCDABC 80240DEC 00220821 */ addu $at, $at, $v0 /* DCDAC0 80240DF0 8C22A640 */ lw $v0, %lo(D_8024A640)($at) /* DCDAC4 80240DF4 00400008 */ jr $v0 -/* DCDAC8 80240DF8 00000000 */ nop +/* DCDAC8 80240DF8 00000000 */ nop /* DCDACC 80240DFC 0260202D */ daddu $a0, $s3, $zero /* DCDAD0 80240E00 0280282D */ daddu $a1, $s4, $zero /* DCDAD4 80240E04 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240C18_DCD8E8 /* DCDAE4 80240E14 0C0125AE */ jal func_800496B8 /* DCDAE8 80240E18 02A0302D */ daddu $a2, $s5, $zero /* DCDAEC 80240E1C 080903C9 */ j .L80240F24 -/* DCDAF0 80240E20 00000000 */ nop +/* DCDAF0 80240E20 00000000 */ nop /* DCDAF4 80240E24 0260202D */ daddu $a0, $s3, $zero /* DCDAF8 80240E28 0280282D */ daddu $a1, $s4, $zero -/* DCDAFC 80240E2C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DCDAFC 80240E2C 0C0126D1 */ jal func_80049B44 /* DCDB00 80240E30 02A0302D */ daddu $a2, $s5, $zero /* DCDB04 80240E34 0260202D */ daddu $a0, $s3, $zero /* DCDB08 80240E38 0280282D */ daddu $a1, $s4, $zero /* DCDB0C 80240E3C 0C012701 */ jal func_80049C04 /* DCDB10 80240E40 02A0302D */ daddu $a2, $s5, $zero /* DCDB14 80240E44 080903C9 */ j .L80240F24 -/* DCDB18 80240E48 00000000 */ nop +/* DCDB18 80240E48 00000000 */ nop /* DCDB1C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* DCDB20 80240E50 0280282D */ daddu $a1, $s4, $zero /* DCDB24 80240E54 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240C18_DCD8E8 /* DCDB34 80240E64 0C0127B3 */ jal func_80049ECC /* DCDB38 80240E68 02A0302D */ daddu $a2, $s5, $zero /* DCDB3C 80240E6C 080903C9 */ j .L80240F24 -/* DCDB40 80240E70 00000000 */ nop +/* DCDB40 80240E70 00000000 */ nop /* DCDB44 80240E74 0260202D */ daddu $a0, $s3, $zero /* DCDB48 80240E78 0280282D */ daddu $a1, $s4, $zero /* DCDB4C 80240E7C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240C18_DCD8E8 /* DCDB64 80240E94 8E630070 */ lw $v1, 0x70($s3) /* DCDB68 80240E98 2402000E */ addiu $v0, $zero, 0xe /* DCDB6C 80240E9C 14620021 */ bne $v1, $v0, .L80240F24 -/* DCDB70 80240EA0 00000000 */ nop +/* DCDB70 80240EA0 00000000 */ nop /* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero /* DCDB78 80240EA8 0280282D */ daddu $a1, $s4, $zero /* DCDB7C 80240EAC 0C090278 */ jal func_802409E0_DCD6B0 @@ -178,7 +178,7 @@ glabel func_80240C18_DCD8E8 /* DCDB84 80240EB4 8E630070 */ lw $v1, 0x70($s3) /* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf /* DCDB8C 80240EBC 14620019 */ bne $v1, $v0, .L80240F24 -/* DCDB90 80240EC0 00000000 */ nop +/* DCDB90 80240EC0 00000000 */ nop /* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero /* DCDB98 80240EC8 0280282D */ daddu $a1, $s4, $zero /* DCDB9C 80240ECC 0C090294 */ jal func_80240A50_DCD720 @@ -186,7 +186,7 @@ glabel func_80240C18_DCD8E8 /* DCDBA4 80240ED4 8E630070 */ lw $v1, 0x70($s3) /* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 /* DCDBAC 80240EDC 14620011 */ bne $v1, $v0, .L80240F24 -/* DCDBB0 80240EE0 00000000 */ nop +/* DCDBB0 80240EE0 00000000 */ nop /* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero /* DCDBB8 80240EE8 0280282D */ daddu $a1, $s4, $zero /* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20_DCD7F0 @@ -194,13 +194,13 @@ glabel func_80240C18_DCD8E8 /* DCDBC4 80240EF4 8E630070 */ lw $v1, 0x70($s3) /* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 /* DCDBCC 80240EFC 14620009 */ bne $v1, $v0, .L80240F24 -/* DCDBD0 80240F00 00000000 */ nop +/* DCDBD0 80240F00 00000000 */ nop /* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero /* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero /* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8_DCD888 /* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero /* DCDBE4 80240F14 080903C9 */ j .L80240F24 -/* DCDBE8 80240F18 00000000 */ nop +/* DCDBE8 80240F18 00000000 */ nop /* DCDBEC 80240F1C 0C0129CF */ jal func_8004A73C /* DCDBF0 80240F20 0260202D */ daddu $a0, $s3, $zero .L80240F24: diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 348163d71c..a9ae4e798d 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -141,7 +141,7 @@ glabel func_80241AE0_DCE7B0 /* DCE9B8 80241CE8 00000000 */ nop /* DCE9BC 80241CEC 0280202D */ daddu $a0, $s4, $zero /* DCE9C0 80241CF0 0260282D */ daddu $a1, $s3, $zero -/* DCE9C4 80241CF4 0C0904D3 */ jal omo_09_UnkNpcAIFunc1 +/* DCE9C4 80241CF4 0C0904D3 */ jal func_8024134C_DCE01C /* DCE9C8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241AE0_DCE7B0 /* DCE9F8 80241D28 00000000 */ nop /* DCE9FC 80241D2C 0280202D */ daddu $a0, $s4, $zero /* DCEA00 80241D30 0260282D */ daddu $a1, $s3, $zero -/* DCEA04 80241D34 0C09059F */ jal omo_09_NpcJumpFunc2 +/* DCEA04 80241D34 0C09059F */ jal func_8024167C_DCE34C /* DCEA08 80241D38 02A0302D */ daddu $a2, $s5, $zero /* DCEA0C 80241D3C 0280202D */ daddu $a0, $s4, $zero /* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero -/* DCEA14 80241D44 0C0905BC */ jal omo_09_NpcJumpFunc +/* DCEA14 80241D44 0C0905BC */ jal func_802416F0_DCE3C0 /* DCEA18 80241D48 02A0302D */ daddu $a2, $s5, $zero /* DCEA1C 80241D4C 0809076D */ j .L80241DB4 /* DCEA20 80241D50 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241AE0_DCE7B0 /* DCEA48 80241D78 00000000 */ nop /* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero /* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero -/* DCEA54 80241D84 0C09066E */ jal omo_09_UnkNpcDurationFlagFunc +/* DCEA54 80241D84 0C09066E */ jal func_802419B8_DCE688 /* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DCEA5C 80241D8C 0809076D */ j .L80241DB4 /* DCEA60 80241D90 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 5a7ae50085..23c002f0c1 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -141,7 +141,7 @@ glabel func_80242014_DCECE4 /* DCEEEC 8024221C 00000000 */ nop /* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero /* DCEEF4 80242224 0280282D */ daddu $a1, $s4, $zero -/* DCEEF8 80242228 0C0904D3 */ jal omo_09_UnkNpcAIFunc1 +/* DCEEF8 80242228 0C0904D3 */ jal func_8024134C_DCE01C /* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero /* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero @@ -157,11 +157,11 @@ glabel func_80242014_DCECE4 /* DCEF2C 8024225C 00000000 */ nop /* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero /* DCEF34 80242264 0280282D */ daddu $a1, $s4, $zero -/* DCEF38 80242268 0C09059F */ jal omo_09_NpcJumpFunc2 +/* DCEF38 80242268 0C09059F */ jal func_8024167C_DCE34C /* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero /* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero /* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero -/* DCEF48 80242278 0C0905BC */ jal omo_09_NpcJumpFunc +/* DCEF48 80242278 0C0905BC */ jal func_802416F0_DCE3C0 /* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero /* DCEF50 80242280 080908CC */ j .L80242330 /* DCEF54 80242284 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s index d53d83def5..d82f4f8546 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -46,7 +46,7 @@ glabel func_8024324C_DCFF1C /* DCFFC0 802432F0 8E4200B0 */ lw $v0, 0xb0($s2) /* DCFFC4 802432F4 30420004 */ andi $v0, $v0, 4 /* DCFFC8 802432F8 1040002F */ beqz $v0, .L802433B8 -/* DCFFCC 802432FC 00000000 */ nop +/* DCFFCC 802432FC 00000000 */ nop .L80243300: /* DCFFD0 80243300 2404F7FF */ addiu $a0, $zero, -0x801 /* DCFFD4 80243304 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_8024324C_DCFF1C /* DD009C 802433CC 00220821 */ addu $at, $at, $v0 /* DD00A0 802433D0 8C22AB38 */ lw $v0, %lo(D_8024AB38)($at) /* DD00A4 802433D4 00400008 */ jr $v0 -/* DD00A8 802433D8 00000000 */ nop +/* DD00A8 802433D8 00000000 */ nop /* DD00AC 802433DC 0260202D */ daddu $a0, $s3, $zero /* DD00B0 802433E0 0200282D */ daddu $a1, $s0, $zero /* DD00B4 802433E4 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_8024324C_DCFF1C /* DD00C4 802433F4 0C0125AE */ jal func_800496B8 /* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero /* DD00CC 802433FC 08090D51 */ j .L80243544 -/* DD00D0 80243400 00000000 */ nop +/* DD00D0 80243400 00000000 */ nop /* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero /* DD00D8 80243408 0200282D */ daddu $a1, $s0, $zero -/* DD00DC 8024340C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DD00DC 8024340C 0C0126D1 */ jal func_80049B44 /* DD00E0 80243410 02A0302D */ daddu $a2, $s5, $zero /* DD00E4 80243414 0260202D */ daddu $a0, $s3, $zero /* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero /* DD00EC 8024341C 0C012701 */ jal func_80049C04 /* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero /* DD00F4 80243424 08090D51 */ j .L80243544 -/* DD00F8 80243428 00000000 */ nop +/* DD00F8 80243428 00000000 */ nop /* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero /* DD0100 80243430 0200282D */ daddu $a1, $s0, $zero /* DD0104 80243434 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_8024324C_DCFF1C /* DD0114 80243444 0C0127B3 */ jal func_80049ECC /* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero /* DD011C 8024344C 08090D51 */ j .L80243544 -/* DD0120 80243450 00000000 */ nop +/* DD0120 80243450 00000000 */ nop /* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DD0128 80243458 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DD012C 8024345C C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_8024324C_DCFF1C /* DD0144 80243474 10400008 */ beqz $v0, .L80243498 /* DD0148 80243478 46000086 */ mov.s $f2, $f0 /* DD014C 8024347C 44820000 */ mtc1 $v0, $f0 -/* DD0150 80243480 00000000 */ nop +/* DD0150 80243480 00000000 */ nop /* DD0154 80243484 46800020 */ cvt.s.w $f0, $f0 /* DD0158 80243488 4602003C */ c.lt.s $f0, $f2 -/* DD015C 8024348C 00000000 */ nop +/* DD015C 8024348C 00000000 */ nop /* DD0160 80243490 4500000B */ bc1f .L802434C0 /* DD0164 80243494 0260202D */ daddu $a0, $s3, $zero .L80243498: @@ -164,7 +164,7 @@ glabel func_8024324C_DCFF1C /* DD017C 802434AC 8E630070 */ lw $v1, 0x70($s3) /* DD0180 802434B0 2402000C */ addiu $v0, $zero, 0xc /* DD0184 802434B4 14620023 */ bne $v1, $v0, .L80243544 -/* DD0188 802434B8 00000000 */ nop +/* DD0188 802434B8 00000000 */ nop /* DD018C 802434BC 0260202D */ daddu $a0, $s3, $zero .L802434C0: /* DD0190 802434C0 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_8024324C_DCFF1C /* DD01A4 802434D4 0C012849 */ jal func_8004A124 /* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero /* DD01AC 802434DC 08090D51 */ j .L80243544 -/* DD01B0 802434E0 00000000 */ nop +/* DD01B0 802434E0 00000000 */ nop /* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero /* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero /* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 /* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero /* DD01C4 802434F4 08090D51 */ j .L80243544 -/* DD01C8 802434F8 00000000 */ nop +/* DD01C8 802434F8 00000000 */ nop /* DD01CC 802434FC 0C0909A3 */ jal func_8024268C_DCF35C /* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero /* DD01D4 80243504 08090D51 */ j .L80243544 -/* DD01D8 80243508 00000000 */ nop -/* DD01DC 8024350C 0C0909E3 */ jal omo_09_UnkSetDurationFunc +/* DD01D8 80243508 00000000 */ nop +/* DD01DC 8024350C 0C0909E3 */ jal func_8024278C_DCF45C /* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero /* DD01E4 80243514 08090D51 */ j .L80243544 -/* DD01E8 80243518 00000000 */ nop -/* DD01EC 8024351C 0C0909F4 */ jal omo_09_UnkNpcAIFunc9 +/* DD01E8 80243518 00000000 */ nop +/* DD01EC 8024351C 0C0909F4 */ jal func_802427D0_DCF4A0 /* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero /* DD01F4 80243524 08090D51 */ j .L80243544 -/* DD01F8 80243528 00000000 */ nop -/* DD01FC 8024352C 0C090A1C */ jal omo_09_UnkDurationCheck +/* DD01F8 80243528 00000000 */ nop +/* DD01FC 8024352C 0C090A1C */ jal func_80242870_DCF540 /* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero /* DD0204 80243534 08090D51 */ j .L80243544 -/* DD0208 80243538 00000000 */ nop +/* DD0208 80243538 00000000 */ nop /* DD020C 8024353C 0C0129CF */ jal func_8004A73C /* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero .L80243544: diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s index c5d3a9d86b..f87ea6671f 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_80240000_DDC830.s @@ -18,8 +18,8 @@ glabel func_80240000_DDC830 /* DDC864 80240034 0040802D */ daddu $s0, $v0, $zero /* DDC868 80240038 3C0142C8 */ lui $at, 0x42c8 /* DDC86C 8024003C 4481A000 */ mtc1 $at, $f20 -/* DDC870 80240040 3C118024 */ lui $s1, %hi(D_80241740) -/* DDC874 80240044 26311740 */ addiu $s1, $s1, %lo(D_80241740) +/* DDC870 80240040 3C118024 */ lui $s1, %hi(func_80241740_B36310) +/* DDC874 80240044 26311740 */ addiu $s1, $s1, %lo(func_80241740_B36310) /* DDC878 80240048 AE900070 */ sw $s0, 0x70($s4) .L8024004C: /* DDC87C 8024004C 8E240000 */ lw $a0, ($s1) @@ -41,8 +41,8 @@ glabel func_80240000_DDC830 /* DDC8BC 8024008C 26100004 */ addiu $s0, $s0, 4 .L80240090: /* DDC8C0 80240090 0000902D */ daddu $s2, $zero, $zero -/* DDC8C4 80240094 3C138024 */ lui $s3, %hi(D_80241740) -/* DDC8C8 80240098 26731740 */ addiu $s3, $s3, %lo(D_80241740) +/* DDC8C4 80240094 3C138024 */ lui $s3, %hi(func_80241740_B36310) +/* DDC8C8 80240098 26731740 */ addiu $s3, $s3, %lo(func_80241740_B36310) /* DDC8CC 8024009C 3C014040 */ lui $at, 0x4040 /* DDC8D0 802400A0 4481A000 */ mtc1 $at, $f20 /* DDC8D4 802400A4 8E910070 */ lw $s1, 0x70($s4) diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s index a65b9581d9..04e470d19f 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDC830/func_802401A0_DDC9D0.s @@ -43,8 +43,8 @@ glabel func_802401A0_DDC9D0 /* DDCA68 80240238 3C0742FA */ lui $a3, 0x42fa /* DDCA6C 8024023C 3C01C2C8 */ lui $at, 0xc2c8 /* DDCA70 80240240 44810000 */ mtc1 $at, $f0 -/* DDCA74 80240244 3C148024 */ lui $s4, %hi(D_80241760) -/* DDCA78 80240248 26941760 */ addiu $s4, $s4, %lo(D_80241760) +/* DDCA74 80240244 3C148024 */ lui $s4, %hi(func_80241760_C50C70) +/* DDCA78 80240248 26941760 */ addiu $s4, $s4, %lo(func_80241760_C50C70) /* DDCA7C 8024024C 0C052757 */ jal play_sound_at_position /* DDCA80 80240250 E7A00010 */ swc1 $f0, 0x10($sp) /* DDCA84 80240254 0C00AB39 */ jal heap_malloc @@ -93,8 +93,8 @@ glabel func_802401A0_DDC9D0 /* DDCB24 802402F4 1440FFF4 */ bnez $v0, .L802402C8 /* DDCB28 802402F8 0000282D */ daddu $a1, $zero, $zero /* DDCB2C 802402FC 26310058 */ addiu $s1, $s1, 0x58 -/* DDCB30 80240300 3C098024 */ lui $t1, %hi(D_80241760) -/* DDCB34 80240304 25291760 */ addiu $t1, $t1, %lo(D_80241760) +/* DDCB30 80240300 3C098024 */ lui $t1, %hi(func_80241760_C50C70) +/* DDCB34 80240304 25291760 */ addiu $t1, $t1, %lo(func_80241760_C50C70) /* DDCB38 80240308 02A91021 */ addu $v0, $s5, $t1 /* DDCB3C 8024030C 8C440000 */ lw $a0, ($v0) /* DDCB40 80240310 0C046C04 */ jal get_model_list_index_from_tree_index @@ -148,10 +148,10 @@ glabel func_802401A0_DDC9D0 /* DDCBF4 802403C4 26510014 */ addiu $s1, $s2, 0x14 .L802403C8: /* DDCBF8 802403C8 8FA90134 */ lw $t1, 0x134($sp) -/* DDCBFC 802403CC 3C048024 */ lui $a0, %hi(D_80241760) +/* DDCBFC 802403CC 3C048024 */ lui $a0, %hi(func_80241760_C50C70) /* DDCC00 802403D0 00892021 */ addu $a0, $a0, $t1 /* DDCC04 802403D4 0C046C04 */ jal get_model_list_index_from_tree_index -/* DDCC08 802403D8 8C841760 */ lw $a0, %lo(D_80241760)($a0) +/* DDCC08 802403D8 8C841760 */ lw $a0, %lo(func_80241760_C50C70)($a0) /* DDCC0C 802403DC 0C046B4C */ jal get_model_from_list_index /* DDCC10 802403E0 0040202D */ daddu $a0, $v0, $zero /* DDCC14 802403E4 0040802D */ daddu $s0, $v0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s index b8fd3d239e..eb9dbfeb28 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s @@ -22,12 +22,12 @@ glabel func_8024095C_DDD18C /* DDD1D0 802409A0 0040982D */ daddu $s3, $v0, $zero /* DDD1D4 802409A4 0000B02D */ daddu $s6, $zero, $zero /* DDD1D8 802409A8 02C0902D */ daddu $s2, $s6, $zero -/* DDD1DC 802409AC 3C148024 */ lui $s4, %hi(D_80241E48) -/* DDD1E0 802409B0 26941E48 */ addiu $s4, $s4, %lo(D_80241E48) +/* DDD1DC 802409AC 3C148024 */ lui $s4, %hi(func_80241E48_C70178) +/* DDD1E0 802409B0 26941E48 */ addiu $s4, $s4, %lo(func_80241E48_C70178) /* DDD1E4 802409B4 0260882D */ daddu $s1, $s3, $zero /* DDD1E8 802409B8 8EA200B4 */ lw $v0, 0xb4($s5) -/* DDD1EC 802409BC 3C038024 */ lui $v1, %hi(D_80241E40) -/* DDD1F0 802409C0 24631E40 */ addiu $v1, $v1, %lo(D_80241E40) +/* DDD1EC 802409BC 3C038024 */ lui $v1, %hi(func_80241E40_DAF240) +/* DDD1F0 802409C0 24631E40 */ addiu $v1, $v1, %lo(func_80241E40_DAF240) /* DDD1F4 802409C4 AEB30078 */ sw $s3, 0x78($s5) /* DDD1F8 802409C8 00021027 */ nor $v0, $zero, $v0 /* DDD1FC 802409CC 0002BFC2 */ srl $s7, $v0, 0x1f @@ -61,8 +61,8 @@ glabel func_8024095C_DDD18C /* DDD268 80240A38 24020001 */ addiu $v0, $zero, 1 /* DDD26C 80240A3C AE22018C */ sw $v0, 0x18c($s1) /* DDD270 80240A40 00041080 */ sll $v0, $a0, 2 -/* DDD274 80240A44 3C068024 */ lui $a2, %hi(D_80241E58) -/* DDD278 80240A48 24C61E58 */ addiu $a2, $a2, %lo(D_80241E58) +/* DDD274 80240A44 3C068024 */ lui $a2, %hi(func_80241E58_9C7238) +/* DDD278 80240A48 24C61E58 */ addiu $a2, $a2, %lo(func_80241E58_9C7238) /* DDD27C 80240A4C AE230000 */ sw $v1, ($s1) /* DDD280 80240A50 001218C0 */ sll $v1, $s2, 3 /* DDD284 80240A54 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s index e2b9eabcd3..ad674cf46e 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240D90_DDD5C0.s @@ -79,8 +79,8 @@ glabel func_80240D90_DDD5C0 /* DDD6E4 80240EB4 26100004 */ addiu $s0, $s0, 4 /* DDD6E8 80240EB8 0000882D */ daddu $s1, $zero, $zero /* DDD6EC 80240EBC 0240802D */ daddu $s0, $s2, $zero -/* DDD6F0 80240EC0 3C148024 */ lui $s4, %hi(D_80241E98) -/* DDD6F4 80240EC4 26941E98 */ addiu $s4, $s4, %lo(D_80241E98) +/* DDD6F0 80240EC0 3C148024 */ lui $s4, %hi(func_80241E98_A1CF98) +/* DDD6F4 80240EC4 26941E98 */ addiu $s4, $s4, %lo(func_80241E98_A1CF98) /* DDD6F8 80240EC8 3C014248 */ lui $at, 0x4248 /* DDD6FC 80240ECC 4481A000 */ mtc1 $at, $f20 /* DDD700 80240ED0 24130044 */ addiu $s3, $zero, 0x44 @@ -150,8 +150,8 @@ glabel func_80240D90_DDD5C0 /* DDD7F4 80240FC4 00000000 */ nop .L80240FC8: /* DDD7F8 80240FC8 0000882D */ daddu $s1, $zero, $zero -/* DDD7FC 80240FCC 3C148024 */ lui $s4, %hi(D_80241E98) -/* DDD800 80240FD0 26941E98 */ addiu $s4, $s4, %lo(D_80241E98) +/* DDD7FC 80240FCC 3C148024 */ lui $s4, %hi(func_80241E98_A1CF98) +/* DDD800 80240FD0 26941E98 */ addiu $s4, $s4, %lo(func_80241E98_A1CF98) /* DDD804 80240FD4 24130020 */ addiu $s3, $zero, 0x20 /* DDD808 80240FD8 3C064248 */ lui $a2, 0x4248 /* DDD80C 80240FDC 44800000 */ mtc1 $zero, $f0 @@ -197,8 +197,8 @@ glabel func_80240D90_DDD5C0 /* DDD8A8 80241078 AE400060 */ sw $zero, 0x60($s2) .L8024107C: /* DDD8AC 8024107C 0000882D */ daddu $s1, $zero, $zero -/* DDD8B0 80241080 3C148024 */ lui $s4, %hi(D_80241E98) -/* DDD8B4 80241084 26941E98 */ addiu $s4, $s4, %lo(D_80241E98) +/* DDD8B0 80241080 3C148024 */ lui $s4, %hi(func_80241E98_A1CF98) +/* DDD8B4 80241084 26941E98 */ addiu $s4, $s4, %lo(func_80241E98_A1CF98) /* DDD8B8 80241088 24130020 */ addiu $s3, $zero, 0x20 /* DDD8BC 8024108C 0240802D */ daddu $s0, $s2, $zero /* DDD8C0 80241090 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s b/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s index 36f9fe8c60..137657a5d2 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2490/func_80240000_DE2490.s @@ -23,8 +23,8 @@ glabel func_80240000_DE2490 /* DE24D8 80240048 26700008 */ addiu $s0, $s3, 8 /* DE24DC 8024004C 3C014060 */ lui $at, 0x4060 /* DE24E0 80240050 4481A000 */ mtc1 $at, $f20 -/* DE24E4 80240054 3C128024 */ lui $s2, %hi(D_80241A78) -/* DE24E8 80240058 26521A78 */ addiu $s2, $s2, %lo(D_80241A78) +/* DE24E4 80240054 3C128024 */ lui $s2, %hi(func_80241A78_BA61F8) +/* DE24E8 80240058 26521A78 */ addiu $s2, $s2, %lo(func_80241A78_BA61F8) /* DE24EC 8024005C AED30070 */ sw $s3, 0x70($s6) .L80240060: /* DE24F0 80240060 8E440000 */ lw $a0, ($s2) diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s index 8727da1aea..29d14cef3a 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240280_DE2710.s @@ -11,8 +11,8 @@ glabel func_80240280_DE2710 /* DE2728 80240298 0C00EABB */ jal get_npc_unsafe /* DE272C 8024029C 86040008 */ lh $a0, 8($s0) /* DE2730 802402A0 C4400018 */ lwc1 $f0, 0x18($v0) -/* DE2734 802402A4 3C018024 */ lui $at, %hi(D_80242EE0) -/* DE2738 802402A8 D4222EE0 */ ldc1 $f2, %lo(D_80242EE0)($at) +/* DE2734 802402A4 3C018024 */ lui $at, %hi(func_80242EE0_A1DFE0) +/* DE2738 802402A8 D4222EE0 */ ldc1 $f2, %lo(func_80242EE0_A1DFE0)($at) /* DE273C 802402AC 46000021 */ cvt.d.s $f0, $f0 /* DE2740 802402B0 46220002 */ mul.d $f0, $f0, $f2 /* DE2744 802402B4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s index 8660eff67d..3ad76348ce 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s @@ -46,7 +46,7 @@ glabel func_802404B8_DE2948 /* DE29EC 8024055C 8E2200B0 */ lw $v0, 0xb0($s1) /* DE29F0 80240560 30420004 */ andi $v0, $v0, 4 /* DE29F4 80240564 10400044 */ beqz $v0, .L80240678 -/* DE29F8 80240568 00000000 */ nop +/* DE29F8 80240568 00000000 */ nop .L8024056C: /* DE29FC 8024056C 2404F7FF */ addiu $a0, $zero, -0x801 /* DE2A00 80240570 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_802404B8_DE2948 /* DE2AC0 80240630 C640003C */ lwc1 $f0, 0x3c($s2) /* DE2AC4 80240634 C6420040 */ lwc1 $f2, 0x40($s2) /* DE2AC8 80240638 44822000 */ mtc1 $v0, $f4 -/* DE2ACC 8024063C 00000000 */ nop +/* DE2ACC 8024063C 00000000 */ nop /* DE2AD0 80240640 46802120 */ cvt.s.w $f4, $f4 /* DE2AD4 80240644 27A20044 */ addiu $v0, $sp, 0x44 /* DE2AD8 80240648 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_802404B8_DE2948 /* DE2AF0 80240660 0C0372DF */ jal func_800DCB7C /* DE2AF4 80240664 27A6003C */ addiu $a2, $sp, 0x3c /* DE2AF8 80240668 10400003 */ beqz $v0, .L80240678 -/* DE2AFC 8024066C 00000000 */ nop +/* DE2AFC 8024066C 00000000 */ nop /* DE2B00 80240670 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DE2B04 80240674 E640003C */ swc1 $f0, 0x3c($s2) .L80240678: @@ -124,11 +124,11 @@ glabel func_802404B8_DE2948 /* DE2B0C 8024067C 2C620064 */ sltiu $v0, $v1, 0x64 /* DE2B10 80240680 10400050 */ beqz $v0, .L802407C4 /* DE2B14 80240684 00031080 */ sll $v0, $v1, 2 -/* DE2B18 80240688 3C018024 */ lui $at, %hi(D_80242EF0) +/* DE2B18 80240688 3C018024 */ lui $at, %hi(func_80242EF0_BE66A0) /* DE2B1C 8024068C 00220821 */ addu $at, $at, $v0 -/* DE2B20 80240690 8C222EF0 */ lw $v0, %lo(D_80242EF0)($at) +/* DE2B20 80240690 8C222EF0 */ lw $v0, %lo(func_80242EF0_BE66A0)($at) /* DE2B24 80240694 00400008 */ jr $v0 -/* DE2B28 80240698 00000000 */ nop +/* DE2B28 80240698 00000000 */ nop /* DE2B2C 8024069C 0260202D */ daddu $a0, $s3, $zero /* DE2B30 802406A0 0280282D */ daddu $a1, $s4, $zero /* DE2B34 802406A4 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_802404B8_DE2948 /* DE2B44 802406B4 0C0125AE */ jal func_800496B8 /* DE2B48 802406B8 02A0302D */ daddu $a2, $s5, $zero /* DE2B4C 802406BC 080901F1 */ j .L802407C4 -/* DE2B50 802406C0 00000000 */ nop +/* DE2B50 802406C0 00000000 */ nop /* DE2B54 802406C4 0260202D */ daddu $a0, $s3, $zero /* DE2B58 802406C8 0280282D */ daddu $a1, $s4, $zero -/* DE2B5C 802406CC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DE2B5C 802406CC 0C0126D1 */ jal func_80049B44 /* DE2B60 802406D0 02A0302D */ daddu $a2, $s5, $zero /* DE2B64 802406D4 0260202D */ daddu $a0, $s3, $zero /* DE2B68 802406D8 0280282D */ daddu $a1, $s4, $zero /* DE2B6C 802406DC 0C012701 */ jal func_80049C04 /* DE2B70 802406E0 02A0302D */ daddu $a2, $s5, $zero /* DE2B74 802406E4 080901F1 */ j .L802407C4 -/* DE2B78 802406E8 00000000 */ nop +/* DE2B78 802406E8 00000000 */ nop /* DE2B7C 802406EC 0260202D */ daddu $a0, $s3, $zero /* DE2B80 802406F0 0280282D */ daddu $a1, $s4, $zero /* DE2B84 802406F4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_802404B8_DE2948 /* DE2B94 80240704 0C0127B3 */ jal func_80049ECC /* DE2B98 80240708 02A0302D */ daddu $a2, $s5, $zero /* DE2B9C 8024070C 080901F1 */ j .L802407C4 -/* DE2BA0 80240710 00000000 */ nop +/* DE2BA0 80240710 00000000 */ nop /* DE2BA4 80240714 0260202D */ daddu $a0, $s3, $zero /* DE2BA8 80240718 0280282D */ daddu $a1, $s4, $zero /* DE2BAC 8024071C 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_802404B8_DE2948 /* DE2BC4 80240734 8E630070 */ lw $v1, 0x70($s3) /* DE2BC8 80240738 2402000E */ addiu $v0, $zero, 0xe /* DE2BCC 8024073C 14620021 */ bne $v1, $v0, .L802407C4 -/* DE2BD0 80240740 00000000 */ nop +/* DE2BD0 80240740 00000000 */ nop /* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero /* DE2BD8 80240748 0280282D */ daddu $a1, $s4, $zero /* DE2BDC 8024074C 0C0900A0 */ jal func_80240280_DE2710 @@ -178,7 +178,7 @@ glabel func_802404B8_DE2948 /* DE2BE4 80240754 8E630070 */ lw $v1, 0x70($s3) /* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf /* DE2BEC 8024075C 14620019 */ bne $v1, $v0, .L802407C4 -/* DE2BF0 80240760 00000000 */ nop +/* DE2BF0 80240760 00000000 */ nop /* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero /* DE2BF8 80240768 0280282D */ daddu $a1, $s4, $zero /* DE2BFC 8024076C 0C0900BC */ jal func_802402F0_DE2780 @@ -186,7 +186,7 @@ glabel func_802404B8_DE2948 /* DE2C04 80240774 8E630070 */ lw $v1, 0x70($s3) /* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 /* DE2C0C 8024077C 14620011 */ bne $v1, $v0, .L802407C4 -/* DE2C10 80240780 00000000 */ nop +/* DE2C10 80240780 00000000 */ nop /* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero /* DE2C18 80240788 0280282D */ daddu $a1, $s4, $zero /* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0_DE2850 @@ -194,13 +194,13 @@ glabel func_802404B8_DE2948 /* DE2C24 80240794 8E630070 */ lw $v1, 0x70($s3) /* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 /* DE2C2C 8024079C 14620009 */ bne $v1, $v0, .L802407C4 -/* DE2C30 802407A0 00000000 */ nop +/* DE2C30 802407A0 00000000 */ nop /* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero /* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero /* DE2C3C 802407AC 0C090116 */ jal func_80240458_DE28E8 /* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero /* DE2C44 802407B4 080901F1 */ j .L802407C4 -/* DE2C48 802407B8 00000000 */ nop +/* DE2C48 802407B8 00000000 */ nop /* DE2C4C 802407BC 0C0129CF */ jal func_8004A73C /* DE2C50 802407C0 0260202D */ daddu $a0, $s3, $zero .L802407C4: diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s index 4f2cb1d9c2..f9b03643e1 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_8024083C_DE2CCC.s @@ -93,8 +93,8 @@ glabel func_8024083C_DE2CCC /* DE2E00 80240970 D4223080 */ ldc1 $f2, %lo(D_80243080)($at) /* DE2E04 80240974 46000021 */ cvt.d.s $f0, $f0 /* DE2E08 80240978 46220000 */ add.d $f0, $f0, $f2 -/* DE2E0C 8024097C 3C018024 */ lui $at, %hi(D_80243088) -/* DE2E10 80240980 D4223088 */ ldc1 $f2, %lo(D_80243088)($at) +/* DE2E0C 8024097C 3C018024 */ lui $at, %hi(func_80243088_8551F8) +/* DE2E10 80240980 D4223088 */ ldc1 $f2, %lo(func_80243088_8551F8)($at) /* DE2E14 80240984 46200020 */ cvt.s.d $f0, $f0 /* DE2E18 80240988 E6200048 */ swc1 $f0, 0x48($s1) /* DE2E1C 8024098C 46000021 */ cvt.d.s $f0, $f0 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s index a3a45048d2..f7eb61ed4b 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s @@ -124,9 +124,9 @@ glabel func_80240A00_DE2E90 /* DE3054 80240BC4 2C620064 */ sltiu $v0, $v1, 0x64 /* DE3058 80240BC8 10400038 */ beqz $v0, .L80240CAC /* DE305C 80240BCC 00031080 */ sll $v0, $v1, 2 -/* DE3060 80240BD0 3C018024 */ lui $at, %hi(D_80243090) +/* DE3060 80240BD0 3C018024 */ lui $at, %hi(func_80243090_C395C0) /* DE3064 80240BD4 00220821 */ addu $at, $at, $v0 -/* DE3068 80240BD8 8C223090 */ lw $v0, %lo(D_80243090)($at) +/* DE3068 80240BD8 8C223090 */ lw $v0, %lo(func_80243090_C395C0)($at) /* DE306C 80240BDC 00400008 */ jr $v0 /* DE3070 80240BE0 00000000 */ nop /* DE3074 80240BE4 0260202D */ daddu $a0, $s3, $zero @@ -141,7 +141,7 @@ glabel func_80240A00_DE2E90 /* DE3098 80240C08 00000000 */ nop /* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero /* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero -/* DE30A4 80240C14 0C0901FB */ jal omo_13_UnkNpcAIFunc4 +/* DE30A4 80240C14 0C0901FB */ jal func_802407EC_DE2C7C /* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero /* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero /* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s index 28ece0d959..792f276814 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240F8C_DE341C.s @@ -13,8 +13,8 @@ glabel func_80240F8C_DE341C /* DE343C 80240FAC 8C620000 */ lw $v0, ($v1) /* DE3440 80240FB0 5040000A */ beql $v0, $zero, .L80240FDC /* DE3444 80240FB4 00041080 */ sll $v0, $a0, 2 -/* DE3448 80240FB8 3C058024 */ lui $a1, %hi(D_80243220) -/* DE344C 80240FBC 24A53220 */ addiu $a1, $a1, %lo(D_80243220) +/* DE3448 80240FB8 3C058024 */ lui $a1, %hi(func_80243220_DC04D0) +/* DE344C 80240FBC 24A53220 */ addiu $a1, $a1, %lo(func_80243220_DC04D0) .L80240FC0: /* DE3450 80240FC0 24630004 */ addiu $v1, $v1, 4 /* DE3454 80240FC4 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_80240F8C_DE341C /* DE3464 80240FD4 24A50004 */ addiu $a1, $a1, 4 /* DE3468 80240FD8 00041080 */ sll $v0, $a0, 2 .L80240FDC: -/* DE346C 80240FDC 3C018024 */ lui $at, %hi(D_80243220) +/* DE346C 80240FDC 3C018024 */ lui $at, %hi(func_80243220_DC04D0) /* DE3470 80240FE0 00220821 */ addu $at, $at, $v0 -/* DE3474 80240FE4 AC203220 */ sw $zero, %lo(D_80243220)($at) +/* DE3474 80240FE4 AC203220 */ sw $zero, %lo(func_80243220_DC04D0)($at) /* DE3478 80240FE8 08090406 */ j .L80241018 /* DE347C 80240FEC 00000000 */ nop .L80240FF0: -/* DE3480 80240FF0 3C038024 */ lui $v1, %hi(D_80243220) -/* DE3484 80240FF4 24633220 */ addiu $v1, $v1, %lo(D_80243220) +/* DE3480 80240FF0 3C038024 */ lui $v1, %hi(func_80243220_DC04D0) +/* DE3484 80240FF4 24633220 */ addiu $v1, $v1, %lo(func_80243220_DC04D0) /* DE3488 80240FF8 0060282D */ daddu $a1, $v1, $zero .L80240FFC: /* DE348C 80240FFC 24820080 */ addiu $v0, $a0, 0x80 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s index be4081a1f5..519bba57f5 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241230_DE36C0.s @@ -4,8 +4,8 @@ glabel func_80241230_DE36C0 /* DE36C0 80241230 27BDFFE0 */ addiu $sp, $sp, -0x20 /* DE36C4 80241234 AFB00010 */ sw $s0, 0x10($sp) -/* DE36C8 80241238 3C108024 */ lui $s0, %hi(D_80242C70) -/* DE36CC 8024123C 26102C70 */ addiu $s0, $s0, %lo(D_80242C70) +/* DE36C8 80241238 3C108024 */ lui $s0, %hi(func_80242C70_9AB060) +/* DE36CC 8024123C 26102C70 */ addiu $s0, $s0, %lo(func_80242C70_9AB060) /* DE36D0 80241240 AFBF0018 */ sw $ra, 0x18($sp) /* DE36D4 80241244 AFB10014 */ sw $s1, 0x14($sp) /* DE36D8 80241248 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80241230_DE36C0 /* DE373C 802412AC 28620010 */ slti $v0, $v1, 0x10 /* DE3740 802412B0 1440FFFA */ bnez $v0, .L8024129C /* DE3744 802412B4 24840004 */ addiu $a0, $a0, 4 -/* DE3748 802412B8 3C108024 */ lui $s0, %hi(D_80242C70) -/* DE374C 802412BC 26102C70 */ addiu $s0, $s0, %lo(D_80242C70) +/* DE3748 802412B8 3C108024 */ lui $s0, %hi(func_80242C70_9AB060) +/* DE374C 802412BC 26102C70 */ addiu $s0, $s0, %lo(func_80242C70_9AB060) /* DE3750 802412C0 0C00AB4B */ jal heap_free /* DE3754 802412C4 8E040000 */ lw $a0, ($s0) /* DE3758 802412C8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s index 3100e65740..91adcf6c4c 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s @@ -46,7 +46,7 @@ glabel func_80240798_DEF638 /* DEF6DC 8024083C 8E2200B0 */ lw $v0, 0xb0($s1) /* DEF6E0 80240840 30420004 */ andi $v0, $v0, 4 /* DEF6E4 80240844 10400044 */ beqz $v0, .L80240958 -/* DEF6E8 80240848 00000000 */ nop +/* DEF6E8 80240848 00000000 */ nop .L8024084C: /* DEF6EC 8024084C 2404F7FF */ addiu $a0, $zero, -0x801 /* DEF6F0 80240850 AE600070 */ sw $zero, 0x70($s3) @@ -104,7 +104,7 @@ glabel func_80240798_DEF638 /* DEF7B0 80240910 C640003C */ lwc1 $f0, 0x3c($s2) /* DEF7B4 80240914 C6420040 */ lwc1 $f2, 0x40($s2) /* DEF7B8 80240918 44822000 */ mtc1 $v0, $f4 -/* DEF7BC 8024091C 00000000 */ nop +/* DEF7BC 8024091C 00000000 */ nop /* DEF7C0 80240920 46802120 */ cvt.s.w $f4, $f4 /* DEF7C4 80240924 27A20044 */ addiu $v0, $sp, 0x44 /* DEF7C8 80240928 46040000 */ add.s $f0, $f0, $f4 @@ -116,7 +116,7 @@ glabel func_80240798_DEF638 /* DEF7E0 80240940 0C0372DF */ jal func_800DCB7C /* DEF7E4 80240944 27A6003C */ addiu $a2, $sp, 0x3c /* DEF7E8 80240948 10400003 */ beqz $v0, .L80240958 -/* DEF7EC 8024094C 00000000 */ nop +/* DEF7EC 8024094C 00000000 */ nop /* DEF7F0 80240950 C7A0003C */ lwc1 $f0, 0x3c($sp) /* DEF7F4 80240954 E640003C */ swc1 $f0, 0x3c($s2) .L80240958: @@ -128,7 +128,7 @@ glabel func_80240798_DEF638 /* DEF80C 8024096C 00220821 */ addu $at, $at, $v0 /* DEF810 80240970 8C227620 */ lw $v0, %lo(D_80247620)($at) /* DEF814 80240974 00400008 */ jr $v0 -/* DEF818 80240978 00000000 */ nop +/* DEF818 80240978 00000000 */ nop /* DEF81C 8024097C 0260202D */ daddu $a0, $s3, $zero /* DEF820 80240980 0280282D */ daddu $a1, $s4, $zero /* DEF824 80240984 0C012568 */ jal func_800495A0 @@ -138,17 +138,17 @@ glabel func_80240798_DEF638 /* DEF834 80240994 0C0125AE */ jal func_800496B8 /* DEF838 80240998 02A0302D */ daddu $a2, $s5, $zero /* DEF83C 8024099C 080902A9 */ j .L80240AA4 -/* DEF840 802409A0 00000000 */ nop +/* DEF840 802409A0 00000000 */ nop /* DEF844 802409A4 0260202D */ daddu $a0, $s3, $zero /* DEF848 802409A8 0280282D */ daddu $a1, $s4, $zero -/* DEF84C 802409AC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DEF84C 802409AC 0C0126D1 */ jal func_80049B44 /* DEF850 802409B0 02A0302D */ daddu $a2, $s5, $zero /* DEF854 802409B4 0260202D */ daddu $a0, $s3, $zero /* DEF858 802409B8 0280282D */ daddu $a1, $s4, $zero /* DEF85C 802409BC 0C012701 */ jal func_80049C04 /* DEF860 802409C0 02A0302D */ daddu $a2, $s5, $zero /* DEF864 802409C4 080902A9 */ j .L80240AA4 -/* DEF868 802409C8 00000000 */ nop +/* DEF868 802409C8 00000000 */ nop /* DEF86C 802409CC 0260202D */ daddu $a0, $s3, $zero /* DEF870 802409D0 0280282D */ daddu $a1, $s4, $zero /* DEF874 802409D4 0C01278F */ jal func_80049E3C @@ -158,7 +158,7 @@ glabel func_80240798_DEF638 /* DEF884 802409E4 0C0127B3 */ jal func_80049ECC /* DEF888 802409E8 02A0302D */ daddu $a2, $s5, $zero /* DEF88C 802409EC 080902A9 */ j .L80240AA4 -/* DEF890 802409F0 00000000 */ nop +/* DEF890 802409F0 00000000 */ nop /* DEF894 802409F4 0260202D */ daddu $a0, $s3, $zero /* DEF898 802409F8 0280282D */ daddu $a1, $s4, $zero /* DEF89C 802409FC 0C0127DF */ jal func_80049F7C @@ -170,7 +170,7 @@ glabel func_80240798_DEF638 /* DEF8B4 80240A14 8E630070 */ lw $v1, 0x70($s3) /* DEF8B8 80240A18 2402000E */ addiu $v0, $zero, 0xe /* DEF8BC 80240A1C 14620021 */ bne $v1, $v0, .L80240AA4 -/* DEF8C0 80240A20 00000000 */ nop +/* DEF8C0 80240A20 00000000 */ nop /* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero /* DEF8C8 80240A28 0280282D */ daddu $a1, $s4, $zero /* DEF8CC 80240A2C 0C090158 */ jal func_80240560_DEF400 @@ -178,7 +178,7 @@ glabel func_80240798_DEF638 /* DEF8D4 80240A34 8E630070 */ lw $v1, 0x70($s3) /* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf /* DEF8DC 80240A3C 14620019 */ bne $v1, $v0, .L80240AA4 -/* DEF8E0 80240A40 00000000 */ nop +/* DEF8E0 80240A40 00000000 */ nop /* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero /* DEF8E8 80240A48 0280282D */ daddu $a1, $s4, $zero /* DEF8EC 80240A4C 0C090174 */ jal func_802405D0_DEF470 @@ -186,7 +186,7 @@ glabel func_80240798_DEF638 /* DEF8F4 80240A54 8E630070 */ lw $v1, 0x70($s3) /* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 /* DEF8FC 80240A5C 14620011 */ bne $v1, $v0, .L80240AA4 -/* DEF900 80240A60 00000000 */ nop +/* DEF900 80240A60 00000000 */ nop /* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero /* DEF908 80240A68 0280282D */ daddu $a1, $s4, $zero /* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0_DEF540 @@ -194,13 +194,13 @@ glabel func_80240798_DEF638 /* DEF914 80240A74 8E630070 */ lw $v1, 0x70($s3) /* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 /* DEF91C 80240A7C 14620009 */ bne $v1, $v0, .L80240AA4 -/* DEF920 80240A80 00000000 */ nop +/* DEF920 80240A80 00000000 */ nop /* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero /* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero /* DEF92C 80240A8C 0C0901CE */ jal func_80240738_DEF5D8 /* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero /* DEF934 80240A94 080902A9 */ j .L80240AA4 -/* DEF938 80240A98 00000000 */ nop +/* DEF938 80240A98 00000000 */ nop /* DEF93C 80240A9C 0C0129CF */ jal func_8004A73C /* DEF940 80240AA0 0260202D */ daddu $a0, $s3, $zero .L80240AA4: diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s index 7d896b3580..25dc8b6de9 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s @@ -141,7 +141,7 @@ glabel func_80240CE0_DEFB80 /* DEFD88 80240EE8 00000000 */ nop /* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero /* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero -/* DEFD94 80240EF4 0C0902B3 */ jal omo_17_UnkNpcAIFunc4 +/* DEFD94 80240EF4 0C0902B3 */ jal func_80240ACC_DEF96C /* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero /* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero /* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 3504d0e0ed..3ab984091c 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -83,7 +83,7 @@ glabel func_802422C0_DF1160 /* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero /* DF1294 802423F4 0280202D */ daddu $a0, $s4, $zero /* DF1298 802423F8 0200282D */ daddu $a1, $s0, $zero -/* DF129C 802423FC 0C0905E3 */ jal omo_17_UnkNpcAIFunc1 +/* DF129C 802423FC 0C0905E3 */ jal func_8024178C_DF062C /* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero /* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero /* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802422C0_DF1160 /* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero /* DF12BC 8024241C 0280202D */ daddu $a0, $s4, $zero /* DF12C0 80242420 0200282D */ daddu $a1, $s0, $zero -/* DF12C4 80242424 0C0906E4 */ jal omo_17_UnkNpcAIFunc2 +/* DF12C4 80242424 0C0906E4 */ jal func_80241B90_DF0A30 /* DF12C8 80242428 0260302D */ daddu $a2, $s3, $zero /* DF12CC 8024242C 0280202D */ daddu $a0, $s4, $zero /* DF12D0 80242430 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802422C0_DF1160 /* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero /* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero /* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero -/* DF1304 80242464 0C09076A */ jal omo_17_UnkNpcAIFunc3 +/* DF1304 80242464 0C09076A */ jal func_80241DA8_DF0C48 /* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero /* DF130C 8024246C 08090922 */ j .L80242488 /* DF1310 80242470 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s index e056ec8745..6a91270f40 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -46,7 +46,7 @@ glabel func_802433A0_DF2240 /* DF22E4 80243444 8E4200B0 */ lw $v0, 0xb0($s2) /* DF22E8 80243448 30420004 */ andi $v0, $v0, 4 /* DF22EC 8024344C 1040002F */ beqz $v0, .L8024350C -/* DF22F0 80243450 00000000 */ nop +/* DF22F0 80243450 00000000 */ nop .L80243454: /* DF22F4 80243454 2404F7FF */ addiu $a0, $zero, -0x801 /* DF22F8 80243458 AE600070 */ sw $zero, 0x70($s3) @@ -107,7 +107,7 @@ glabel func_802433A0_DF2240 /* DF23C0 80243520 00220821 */ addu $at, $at, $v0 /* DF23C4 80243524 8C2279D0 */ lw $v0, %lo(D_802479D0)($at) /* DF23C8 80243528 00400008 */ jr $v0 -/* DF23CC 8024352C 00000000 */ nop +/* DF23CC 8024352C 00000000 */ nop /* DF23D0 80243530 0260202D */ daddu $a0, $s3, $zero /* DF23D4 80243534 0200282D */ daddu $a1, $s0, $zero /* DF23D8 80243538 0C012568 */ jal func_800495A0 @@ -117,17 +117,17 @@ glabel func_802433A0_DF2240 /* DF23E8 80243548 0C0125AE */ jal func_800496B8 /* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero /* DF23F0 80243550 08090DA6 */ j .L80243698 -/* DF23F4 80243554 00000000 */ nop +/* DF23F4 80243554 00000000 */ nop /* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero /* DF23FC 8024355C 0200282D */ daddu $a1, $s0, $zero -/* DF2400 80243560 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* DF2400 80243560 0C0126D1 */ jal func_80049B44 /* DF2404 80243564 02A0302D */ daddu $a2, $s5, $zero /* DF2408 80243568 0260202D */ daddu $a0, $s3, $zero /* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero /* DF2410 80243570 0C012701 */ jal func_80049C04 /* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero /* DF2418 80243578 08090DA6 */ j .L80243698 -/* DF241C 8024357C 00000000 */ nop +/* DF241C 8024357C 00000000 */ nop /* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero /* DF2424 80243584 0200282D */ daddu $a1, $s0, $zero /* DF2428 80243588 0C01278F */ jal func_80049E3C @@ -137,7 +137,7 @@ glabel func_802433A0_DF2240 /* DF2438 80243598 0C0127B3 */ jal func_80049ECC /* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero /* DF2440 802435A0 08090DA6 */ j .L80243698 -/* DF2444 802435A4 00000000 */ nop +/* DF2444 802435A4 00000000 */ nop /* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) /* DF244C 802435AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) /* DF2450 802435B0 C68C0038 */ lwc1 $f12, 0x38($s4) @@ -149,10 +149,10 @@ glabel func_802433A0_DF2240 /* DF2468 802435C8 10400008 */ beqz $v0, .L802435EC /* DF246C 802435CC 46000086 */ mov.s $f2, $f0 /* DF2470 802435D0 44820000 */ mtc1 $v0, $f0 -/* DF2474 802435D4 00000000 */ nop +/* DF2474 802435D4 00000000 */ nop /* DF2478 802435D8 46800020 */ cvt.s.w $f0, $f0 /* DF247C 802435DC 4602003C */ c.lt.s $f0, $f2 -/* DF2480 802435E0 00000000 */ nop +/* DF2480 802435E0 00000000 */ nop /* DF2484 802435E4 4500000B */ bc1f .L80243614 /* DF2488 802435E8 0260202D */ daddu $a0, $s3, $zero .L802435EC: @@ -164,7 +164,7 @@ glabel func_802433A0_DF2240 /* DF24A0 80243600 8E630070 */ lw $v1, 0x70($s3) /* DF24A4 80243604 2402000C */ addiu $v0, $zero, 0xc /* DF24A8 80243608 14620023 */ bne $v1, $v0, .L80243698 -/* DF24AC 8024360C 00000000 */ nop +/* DF24AC 8024360C 00000000 */ nop /* DF24B0 80243610 0260202D */ daddu $a0, $s3, $zero .L80243614: /* DF24B4 80243614 0200282D */ daddu $a1, $s0, $zero @@ -175,29 +175,29 @@ glabel func_802433A0_DF2240 /* DF24C8 80243628 0C012849 */ jal func_8004A124 /* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero /* DF24D0 80243630 08090DA6 */ j .L80243698 -/* DF24D4 80243634 00000000 */ nop +/* DF24D4 80243634 00000000 */ nop /* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero /* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero /* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 /* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero /* DF24E8 80243648 08090DA6 */ j .L80243698 -/* DF24EC 8024364C 00000000 */ nop +/* DF24EC 8024364C 00000000 */ nop /* DF24F0 80243650 0C0909F8 */ jal func_802427E0_DF1680 /* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero /* DF24F8 80243658 08090DA6 */ j .L80243698 -/* DF24FC 8024365C 00000000 */ nop -/* DF2500 80243660 0C090A38 */ jal omo_17_UnkSetDurationFunc +/* DF24FC 8024365C 00000000 */ nop +/* DF2500 80243660 0C090A38 */ jal func_802428E0_DF1780 /* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero /* DF2508 80243668 08090DA6 */ j .L80243698 -/* DF250C 8024366C 00000000 */ nop -/* DF2510 80243670 0C090A49 */ jal omo_17_UnkNpcAIFunc9 +/* DF250C 8024366C 00000000 */ nop +/* DF2510 80243670 0C090A49 */ jal func_80242924_DF17C4 /* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero /* DF2518 80243678 08090DA6 */ j .L80243698 -/* DF251C 8024367C 00000000 */ nop -/* DF2520 80243680 0C090A71 */ jal omo_17_UnkDurationCheck +/* DF251C 8024367C 00000000 */ nop +/* DF2520 80243680 0C090A71 */ jal func_802429C4_DF1864 /* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero /* DF2528 80243688 08090DA6 */ j .L80243698 -/* DF252C 8024368C 00000000 */ nop +/* DF252C 8024368C 00000000 */ nop /* DF2530 80243690 0C0129CF */ jal func_8004A73C /* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero .L80243698: diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s index da3c87f62a..b74b985084 100644 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_80240360_AB0350.s @@ -4,8 +4,8 @@ glabel func_80240360_AB0350 /* AB0350 80240360 27BDFFE0 */ addiu $sp, $sp, -0x20 /* AB0354 80240364 AFB00010 */ sw $s0, 0x10($sp) -/* AB0358 80240368 3C108024 */ lui $s0, %hi(D_802411B8) -/* AB035C 8024036C 261011B8 */ addiu $s0, $s0, %lo(D_802411B8) +/* AB0358 80240368 3C108024 */ lui $s0, %hi(func_802411B8_887578) +/* AB035C 8024036C 261011B8 */ addiu $s0, $s0, %lo(func_802411B8_887578) /* AB0360 80240370 AFBF0018 */ sw $ra, 0x18($sp) /* AB0364 80240374 AFB10014 */ sw $s1, 0x14($sp) /* AB0368 80240378 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240360_AB0350 /* AB03CC 802403DC 28620010 */ slti $v0, $v1, 0x10 /* AB03D0 802403E0 1440FFFA */ bnez $v0, .L802403CC /* AB03D4 802403E4 24840004 */ addiu $a0, $a0, 4 -/* AB03D8 802403E8 3C108024 */ lui $s0, %hi(D_802411B8) -/* AB03DC 802403EC 261011B8 */ addiu $s0, $s0, %lo(D_802411B8) +/* AB03D8 802403E8 3C108024 */ lui $s0, %hi(func_802411B8_887578) +/* AB03DC 802403EC 261011B8 */ addiu $s0, $s0, %lo(func_802411B8_887578) /* AB03E0 802403F0 0C00AB4B */ jal heap_free /* AB03E4 802403F4 8E040000 */ lw $a0, ($s0) /* AB03E8 802403F8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s index ef77044311..cd3ff7d0e0 100644 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406A4_AB0694.s @@ -6,11 +6,11 @@ glabel func_802406A4_AB0694 /* AB0698 802406A8 AFBF0010 */ sw $ra, 0x10($sp) /* AB069C 802406AC 10A00003 */ beqz $a1, .L802406BC /* AB06A0 802406B0 8C86000C */ lw $a2, 0xc($a0) -/* AB06A4 802406B4 3C018024 */ lui $at, %hi(D_8024121C) -/* AB06A8 802406B8 AC20121C */ sw $zero, %lo(D_8024121C)($at) +/* AB06A4 802406B4 3C018024 */ lui $at, %hi(func_8024121C_889DEC) +/* AB06A8 802406B8 AC20121C */ sw $zero, %lo(func_8024121C_889DEC)($at) .L802406BC: -/* AB06AC 802406BC 3C038024 */ lui $v1, %hi(D_8024121C) -/* AB06B0 802406C0 2463121C */ addiu $v1, $v1, %lo(D_8024121C) +/* AB06AC 802406BC 3C038024 */ lui $v1, %hi(func_8024121C_889DEC) +/* AB06B0 802406C0 2463121C */ addiu $v1, $v1, %lo(func_8024121C_889DEC) /* AB06B4 802406C4 8C620000 */ lw $v0, ($v1) /* AB06B8 802406C8 54400003 */ bnel $v0, $zero, .L802406D8 /* AB06BC 802406CC AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s index 21da6b90ef..6aefe2e55f 100644 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s @@ -12,7 +12,7 @@ glabel func_802406F8_AB06E8 /* AB0704 80240714 24020002 */ addiu $v0, $zero, 2 /* AB0708 80240718 8FBF0010 */ lw $ra, 0x10($sp) /* AB070C 8024071C 24030001 */ addiu $v1, $zero, 1 -/* AB0710 80240720 3C018024 */ lui $at, %hi(D_8024121C) -/* AB0714 80240724 AC23121C */ sw $v1, %lo(D_8024121C)($at) +/* AB0710 80240720 3C018024 */ lui $at, %hi(func_8024121C_889DEC) +/* AB0714 80240724 AC23121C */ sw $v1, %lo(func_8024121C_889DEC)($at) /* AB0718 80240728 03E00008 */ jr $ra /* AB071C 8024072C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s index 246e58bdce..52325db1b4 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802400EC_D4D12C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D4D12C /* D4D12C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D4D130 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D4D134 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D4D138 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D4D13C 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D4D138 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D4D09C) +/* D4D13C 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D4D09C) /* D4D140 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D4D144 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D4D148 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s index c660536ff7..70c1eec616 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s @@ -37,7 +37,7 @@ glabel func_80240128_D4D168 /* D4D1E8 802401A8 0C00B94E */ jal get_screen_coords /* D4D1EC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D4D1F0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D4D1F4 802401B4 0C090008 */ jal pra_01_UnkFunc2 +/* D4D1F4 802401B4 0C090008 */ jal func_80240020_D4D060 /* D4D1F8 802401B8 00000000 */ nop /* D4D1FC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D4D200 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D4D168 /* D4D2F4 802402B4 AC910000 */ sw $s1, ($a0) /* D4D2F8 802402B8 AC900008 */ sw $s0, 8($a0) /* D4D2FC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D4D300 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D4D304 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D4D300 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D4D228) +/* D4D304 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D4D228) /* D4D308 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D4D30C 802402CC 00021023 */ negu $v0, $v0 /* D4D310 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s index 67df0828ab..bf0f47449e 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802402F0_D4D330.s @@ -33,7 +33,7 @@ glabel func_802402F0_D4D330 /* D4D3A0 80240360 E7B40010 */ swc1 $f20, 0x10($sp) /* D4D3A4 80240364 C62C008C */ lwc1 $f12, 0x8c($s1) /* D4D3A8 80240368 0C00A6C9 */ jal clamp_angle -/* D4D3AC 8024036C 00000000 */ nop +/* D4D3AC 8024036C 00000000 */ nop /* D4D3B0 80240370 44050000 */ mfc1 $a1, $f0 /* D4D3B4 80240374 4406A000 */ mfc1 $a2, $f20 /* D4D3B8 80240378 4407A000 */ mfc1 $a3, $f20 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s index 8458a322bc..e401fa65ed 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_8024049C_D4D4DC.s @@ -11,8 +11,8 @@ glabel func_8024049C_D4D4DC /* D4D4F4 802404B4 28420002 */ slti $v0, $v0, 2 /* D4D4F8 802404B8 1040000C */ beqz $v0, .L802404EC /* D4D4FC 802404BC 00000000 */ nop -/* D4D500 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D4D504 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D4D500 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D4D0C4) +/* D4D504 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D4D0C4) /* D4D508 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D4D50C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D4D510 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s index c9e1fc93bc..b865bf3a52 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240500_D4D540.s @@ -84,8 +84,8 @@ glabel func_80240500_D4D540 /* D4D66C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D4D670 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D4D674 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D4D678 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D4D674 80240634 3C048024 */ lui $a0, %hi(func_80240870_D4D3D0) +/* D4D678 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D4D3D0) /* D4D67C 8024063C AE320000 */ sw $s2, ($s1) /* D4D680 80240640 AE300008 */ sw $s0, 8($s1) /* D4D684 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D4D540 /* D4D694 80240654 00431024 */ and $v0, $v0, $v1 /* D4D698 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D4D69C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D4D6A0 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D4D6A4 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D4D6A0 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D4D1EC) +/* D4D6A4 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D4D1EC) /* D4D6A8 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D4D6AC 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s index deaff8d50e..7d54bd86bf 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240D3C_D4DD7C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D4DD7C /* D4DDC8 80240D88 08090378 */ j .L80240DE0 /* D4DDCC 80240D8C 00000000 */ nop .L80240D90: -/* D4DDD0 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D4DDD4 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D4DDD0 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D4D1A8) +/* D4DDD4 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D4D1A8) /* D4DDD8 80240D98 08090374 */ j .L80240DD0 /* D4DDDC 80240D9C 00000000 */ nop .L80240DA0: -/* D4DDE0 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D4DDE4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D4DDE0 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D4D210) +/* D4DDE4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D4D210) /* D4DDE8 80240DA8 08090374 */ j .L80240DD0 /* D4DDEC 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D4DD7C /* D4DE00 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D4DE04 80240DC4 00000000 */ nop .L80240DC8: -/* D4DE08 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D4DE0C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D4DE08 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D4D1DC) +/* D4DE0C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D4D1DC) .L80240DD0: /* D4DE10 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D4DE14 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s index 503bffa8a7..c15ec2bf13 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_802411AC_D4E1EC.s @@ -6,11 +6,11 @@ glabel func_802411AC_D4E1EC /* D4E1F0 802411B0 AFBF0010 */ sw $ra, 0x10($sp) /* D4E1F4 802411B4 10A00003 */ beqz $a1, .L802411C4 /* D4E1F8 802411B8 8C86000C */ lw $a2, 0xc($a0) -/* D4E1FC 802411BC 3C018024 */ lui $at, %hi(D_80241F94) -/* D4E200 802411C0 AC201F94 */ sw $zero, %lo(D_80241F94)($at) +/* D4E1FC 802411BC 3C018024 */ lui $at, %hi(func_80241F94_95D194) +/* D4E200 802411C0 AC201F94 */ sw $zero, %lo(func_80241F94_95D194)($at) .L802411C4: -/* D4E204 802411C4 3C038024 */ lui $v1, %hi(D_80241F94) -/* D4E208 802411C8 24631F94 */ addiu $v1, $v1, %lo(D_80241F94) +/* D4E204 802411C4 3C038024 */ lui $v1, %hi(func_80241F94_95D194) +/* D4E208 802411C8 24631F94 */ addiu $v1, $v1, %lo(func_80241F94_95D194) /* D4E20C 802411CC 8C620000 */ lw $v0, ($v1) /* D4E210 802411D0 54400003 */ bnel $v0, $zero, .L802411E0 /* D4E214 802411D4 AC600000 */ sw $zero, ($v1) @@ -18,9 +18,9 @@ glabel func_802411AC_D4E1EC /* D4E21C 802411DC 0000102D */ daddu $v0, $zero, $zero .L802411E0: /* D4E220 802411E0 8CC50000 */ lw $a1, ($a2) -/* D4E224 802411E4 3C068024 */ lui $a2, %hi(D_80241F98) +/* D4E224 802411E4 3C068024 */ lui $a2, %hi(func_80241F98_D21E28) /* D4E228 802411E8 0C0B2026 */ jal set_variable -/* D4E22C 802411EC 8CC61F98 */ lw $a2, %lo(D_80241F98)($a2) +/* D4E22C 802411EC 8CC61F98 */ lw $a2, %lo(func_80241F98_D21E28)($a2) /* D4E230 802411F0 24020002 */ addiu $v0, $zero, 2 .L802411F4: /* D4E234 802411F4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s index 45a03cdb3c..2cbb262911 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241200_D4E240.s @@ -7,12 +7,12 @@ glabel func_80241200_D4E240 /* D4E248 80241208 8C82000C */ lw $v0, 0xc($a0) /* D4E24C 8024120C 0C0B1EAF */ jal get_variable /* D4E250 80241210 8C450000 */ lw $a1, ($v0) -/* D4E254 80241214 3C018024 */ lui $at, %hi(D_80241F98) -/* D4E258 80241218 AC221F98 */ sw $v0, %lo(D_80241F98)($at) +/* D4E254 80241214 3C018024 */ lui $at, %hi(func_80241F98_D21E28) +/* D4E258 80241218 AC221F98 */ sw $v0, %lo(func_80241F98_D21E28)($at) /* D4E25C 8024121C 24020002 */ addiu $v0, $zero, 2 /* D4E260 80241220 8FBF0010 */ lw $ra, 0x10($sp) /* D4E264 80241224 24030001 */ addiu $v1, $zero, 1 -/* D4E268 80241228 3C018024 */ lui $at, %hi(D_80241F94) -/* D4E26C 8024122C AC231F94 */ sw $v1, %lo(D_80241F94)($at) +/* D4E268 80241228 3C018024 */ lui $at, %hi(func_80241F94_95D194) +/* D4E26C 8024122C AC231F94 */ sw $v1, %lo(func_80241F94_95D194)($at) /* D4E270 80241230 03E00008 */ jr $ra /* D4E274 80241234 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s index bafdded706..5223eb700b 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802400EC_D500DC.s @@ -5,8 +5,8 @@ glabel func_802400EC_D500DC /* D500DC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D500E0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D500E4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D500E8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D500EC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D500E8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D5004C) +/* D500EC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D5004C) /* D500F0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D500F4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D500F8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s index c35673f1ec..df1ec54982 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s @@ -37,7 +37,7 @@ glabel func_80240128_D50118 /* D50198 802401A8 0C00B94E */ jal get_screen_coords /* D5019C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D501A0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D501A4 802401B4 0C090008 */ jal pra_02_UnkFunc2 +/* D501A4 802401B4 0C090008 */ jal func_80240020_D50010 /* D501A8 802401B8 00000000 */ nop /* D501AC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D501B0 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D50118 /* D502A4 802402B4 AC910000 */ sw $s1, ($a0) /* D502A8 802402B8 AC900008 */ sw $s0, 8($a0) /* D502AC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D502B0 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D502B4 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D502B0 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D501D8) +/* D502B4 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D501D8) /* D502B8 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D502BC 802402CC 00021023 */ negu $v0, $v0 /* D502C0 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s index 5e24edf666..40239e6ebe 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_8024049C_D5048C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D5048C /* D504A4 802404B4 28420002 */ slti $v0, $v0, 2 /* D504A8 802404B8 1040000C */ beqz $v0, .L802404EC /* D504AC 802404BC 00000000 */ nop -/* D504B0 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D504B4 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D504B0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D50074) +/* D504B4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D50074) /* D504B8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D504BC 802404CC 0000202D */ daddu $a0, $zero, $zero /* D504C0 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s index b2068deb66..fe56b1a7ac 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240500_D504F0.s @@ -84,8 +84,8 @@ glabel func_80240500_D504F0 /* D5061C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D50620 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D50624 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D50628 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D50624 80240634 3C048024 */ lui $a0, %hi(func_80240870_D50380) +/* D50628 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D50380) /* D5062C 8024063C AE320000 */ sw $s2, ($s1) /* D50630 80240640 AE300008 */ sw $s0, 8($s1) /* D50634 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D504F0 /* D50644 80240654 00431024 */ and $v0, $v0, $v1 /* D50648 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D5064C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D50650 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D50654 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D50650 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D5019C) +/* D50654 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D5019C) /* D50658 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D5065C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s index cb54debb32..7fa3a245e3 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240D3C_D50D2C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D50D2C /* D50D78 80240D88 08090378 */ j .L80240DE0 /* D50D7C 80240D8C 00000000 */ nop .L80240D90: -/* D50D80 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D50D84 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D50D80 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D50158) +/* D50D84 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D50158) /* D50D88 80240D98 08090374 */ j .L80240DD0 /* D50D8C 80240D9C 00000000 */ nop .L80240DA0: -/* D50D90 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D50D94 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D50D90 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D501C0) +/* D50D94 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D501C0) /* D50D98 80240DA8 08090374 */ j .L80240DD0 /* D50D9C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D50D2C /* D50DB0 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D50DB4 80240DC4 00000000 */ nop .L80240DC8: -/* D50DB8 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D50DBC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D50DB8 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D5018C) +/* D50DBC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D5018C) .L80240DD0: /* D50DC0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D50DC4 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s index 5feb55367d..e5f6b71f15 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802411D8_D511C8.s @@ -13,8 +13,8 @@ glabel func_802411D8_D511C8 /* D511E8 802411F8 8C620000 */ lw $v0, ($v1) /* D511EC 802411FC 5040000A */ beql $v0, $zero, .L80241228 /* D511F0 80241200 00041080 */ sll $v0, $a0, 2 -/* D511F4 80241204 3C058024 */ lui $a1, %hi(D_80243CC0) -/* D511F8 80241208 24A53CC0 */ addiu $a1, $a1, %lo(D_80243CC0) +/* D511F4 80241204 3C058024 */ lui $a1, %hi(func_80243CC0_A2DF00) +/* D511F8 80241208 24A53CC0 */ addiu $a1, $a1, %lo(func_80243CC0_A2DF00) .L8024120C: /* D511FC 8024120C 24630004 */ addiu $v1, $v1, 4 /* D51200 80241210 24840001 */ addiu $a0, $a0, 1 @@ -24,14 +24,14 @@ glabel func_802411D8_D511C8 /* D51210 80241220 24A50004 */ addiu $a1, $a1, 4 /* D51214 80241224 00041080 */ sll $v0, $a0, 2 .L80241228: -/* D51218 80241228 3C018024 */ lui $at, %hi(D_80243CC0) +/* D51218 80241228 3C018024 */ lui $at, %hi(func_80243CC0_A2DF00) /* D5121C 8024122C 00220821 */ addu $at, $at, $v0 -/* D51220 80241230 AC203CC0 */ sw $zero, %lo(D_80243CC0)($at) +/* D51220 80241230 AC203CC0 */ sw $zero, %lo(func_80243CC0_A2DF00)($at) /* D51224 80241234 08090499 */ j .L80241264 /* D51228 80241238 00000000 */ nop .L8024123C: -/* D5122C 8024123C 3C038024 */ lui $v1, %hi(D_80243CC0) -/* D51230 80241240 24633CC0 */ addiu $v1, $v1, %lo(D_80243CC0) +/* D5122C 8024123C 3C038024 */ lui $v1, %hi(func_80243CC0_A2DF00) +/* D51230 80241240 24633CC0 */ addiu $v1, $v1, %lo(func_80243CC0_A2DF00) /* D51234 80241244 0060282D */ daddu $a1, $v1, $zero .L80241248: /* D51238 80241248 24820010 */ addiu $v0, $a0, 0x10 diff --git a/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s b/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s index fe8481b33f..a62d3c0a29 100644 --- a/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s +++ b/asm/nonmatchings/world/area_pra/pra_04/D54840/func_802401B0_D54840.s @@ -87,9 +87,9 @@ glabel func_802401B0_D54840 /* D54980 802402F0 2C620010 */ sltiu $v0, $v1, 0x10 /* D54984 802402F4 10400185 */ beqz $v0, .L8024090C /* D54988 802402F8 00031080 */ sll $v0, $v1, 2 -/* D5498C 802402FC 3C018024 */ lui $at, %hi(D_802414D0) +/* D5498C 802402FC 3C018024 */ lui $at, %hi(func_802414D0_CC4CE0) /* D54990 80240300 00220821 */ addu $at, $at, $v0 -/* D54994 80240304 8C2214D0 */ lw $v0, %lo(D_802414D0)($at) +/* D54994 80240304 8C2214D0 */ lw $v0, %lo(func_802414D0_CC4CE0)($at) /* D54998 80240308 00400008 */ jr $v0 /* D5499C 8024030C 00000000 */ nop /* D549A0 80240310 8E4200CC */ lw $v0, 0xcc($s2) @@ -171,8 +171,8 @@ glabel func_802401B0_D54840 /* D54AC4 80240434 C6440070 */ lwc1 $f4, 0x70($s2) /* D54AC8 80240438 46802120 */ cvt.s.w $f4, $f4 /* D54ACC 8024043C 46040001 */ sub.s $f0, $f0, $f4 -/* D54AD0 80240440 3C018024 */ lui $at, %hi(D_80241510) -/* D54AD4 80240444 D4221510 */ ldc1 $f2, %lo(D_80241510)($at) +/* D54AD0 80240440 3C018024 */ lui $at, %hi(func_80241510_91FA80) +/* D54AD4 80240444 D4221510 */ ldc1 $f2, %lo(func_80241510_91FA80)($at) /* D54AD8 80240448 46000021 */ cvt.d.s $f0, $f0 /* D54ADC 8024044C 46220002 */ mul.d $f0, $f0, $f2 /* D54AE0 80240450 00000000 */ nop @@ -186,8 +186,8 @@ glabel func_802401B0_D54840 /* D54AFC 8024046C C6A0002C */ lwc1 $f0, 0x2c($s5) /* D54B00 80240470 C622003C */ lwc1 $f2, 0x3c($s1) /* D54B04 80240474 46001081 */ sub.s $f2, $f2, $f0 -/* D54B08 80240478 3C018024 */ lui $at, %hi(D_80241518) -/* D54B0C 8024047C D4241518 */ ldc1 $f4, %lo(D_80241518)($at) +/* D54B08 80240478 3C018024 */ lui $at, %hi(func_80241518_BD0108) +/* D54B0C 8024047C D4241518 */ ldc1 $f4, %lo(func_80241518_BD0108)($at) /* D54B10 80240480 460010A1 */ cvt.d.s $f2, $f2 /* D54B14 80240484 46241082 */ mul.d $f2, $f2, $f4 /* D54B18 80240488 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s index 24cceac940..a96e7aa74d 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_802400EC_D55C9C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D55C9C /* D55C9C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D55CA0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D55CA4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D55CA8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D55CAC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D55CA8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D55C0C) +/* D55CAC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D55C0C) /* D55CB0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D55CB4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D55CB8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s index cf1b246c8b..15336c57d0 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D55CD8 /* D55D58 802401A8 0C00B94E */ jal get_screen_coords /* D55D5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D55D60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D55D64 802401B4 0C090008 */ jal pra_05_UnkFunc2 +/* D55D64 802401B4 0C090008 */ jal func_80240020_D55BD0 /* D55D68 802401B8 00000000 */ nop /* D55D6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D55D70 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D55CD8 /* D55E64 802402B4 AC910000 */ sw $s1, ($a0) /* D55E68 802402B8 AC900008 */ sw $s0, 8($a0) /* D55E6C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D55E70 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D55E74 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D55E70 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D55D98) +/* D55E74 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D55D98) /* D55E78 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D55E7C 802402CC 00021023 */ negu $v0, $v0 /* D55E80 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s index c87b828f9d..83b78d5e17 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_8024049C_D5604C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D5604C /* D56064 802404B4 28420002 */ slti $v0, $v0, 2 /* D56068 802404B8 1040000C */ beqz $v0, .L802404EC /* D5606C 802404BC 00000000 */ nop -/* D56070 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D56074 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D56070 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D55C34) +/* D56074 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D55C34) /* D56078 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D5607C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D56080 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s index e796f23d49..c86f9ee18c 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240500_D560B0.s @@ -84,8 +84,8 @@ glabel func_80240500_D560B0 /* D561DC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D561E0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D561E4 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D561E8 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D561E4 80240634 3C048024 */ lui $a0, %hi(func_80240870_D55F40) +/* D561E8 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D55F40) /* D561EC 8024063C AE320000 */ sw $s2, ($s1) /* D561F0 80240640 AE300008 */ sw $s0, 8($s1) /* D561F4 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D560B0 /* D56204 80240654 00431024 */ and $v0, $v0, $v1 /* D56208 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D5620C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D56210 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D56214 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D56210 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D55D5C) +/* D56214 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D55D5C) /* D56218 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D5621C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s index f7da2b8002..b2c5792375 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240D3C_D568EC.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D568EC /* D56938 80240D88 08090378 */ j .L80240DE0 /* D5693C 80240D8C 00000000 */ nop .L80240D90: -/* D56940 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D56944 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D56940 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D55D18) +/* D56944 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D55D18) /* D56948 80240D98 08090374 */ j .L80240DD0 /* D5694C 80240D9C 00000000 */ nop .L80240DA0: -/* D56950 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D56954 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D56950 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D55D80) +/* D56954 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D55D80) /* D56958 80240DA8 08090374 */ j .L80240DD0 /* D5695C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D568EC /* D56970 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D56974 80240DC4 00000000 */ nop .L80240DC8: -/* D56978 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D5697C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D56978 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D55D4C) +/* D5697C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D55D4C) .L80240DD0: /* D56980 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D56984 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s index e455681c7d..96e14fbe58 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240F20_D56AD0.s @@ -4,8 +4,8 @@ glabel func_80240F20_D56AD0 /* D56AD0 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D56AD4 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D56AD8 80240F28 3C108024 */ lui $s0, %hi(D_80241680) -/* D56ADC 80240F2C 26101680 */ addiu $s0, $s0, %lo(D_80241680) +/* D56AD8 80240F28 3C108024 */ lui $s0, %hi(func_80241680_BE0410) +/* D56ADC 80240F2C 26101680 */ addiu $s0, $s0, %lo(func_80241680_BE0410) /* D56AE0 80240F30 AFBF0018 */ sw $ra, 0x18($sp) /* D56AE4 80240F34 AFB10014 */ sw $s1, 0x14($sp) /* D56AE8 80240F38 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240F20_D56AD0 /* D56B4C 80240F9C 28620010 */ slti $v0, $v1, 0x10 /* D56B50 80240FA0 1440FFFA */ bnez $v0, .L80240F8C /* D56B54 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D56B58 80240FA8 3C108024 */ lui $s0, %hi(D_80241680) -/* D56B5C 80240FAC 26101680 */ addiu $s0, $s0, %lo(D_80241680) +/* D56B58 80240FA8 3C108024 */ lui $s0, %hi(func_80241680_BE0410) +/* D56B5C 80240FAC 26101680 */ addiu $s0, $s0, %lo(func_80241680_BE0410) /* D56B60 80240FB0 0C00AB4B */ jal heap_free /* D56B64 80240FB4 8E040000 */ lw $a0, ($s0) /* D56B68 80240FB8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s index 4309fc65b0..373b6076af 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240000_D57430.s @@ -15,9 +15,9 @@ glabel func_80240000_D57430 /* D57458 80240028 A0620084 */ sb $v0, 0x84($v1) /* D5745C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) /* D57460 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* D57464 80240034 3C058024 */ lui $a1, %hi(D_80241440) +/* D57464 80240034 3C058024 */ lui $a1, %hi(func_80241440_B855C0) /* D57468 80240038 0C01953C */ jal sprintf -/* D5746C 8024003C 24A51440 */ addiu $a1, $a1, %lo(D_80241440) +/* D5746C 8024003C 24A51440 */ addiu $a1, $a1, %lo(func_80241440_B855C0) /* D57470 80240040 8FBF0010 */ lw $ra, 0x10($sp) /* D57474 80240044 0000102D */ daddu $v0, $zero, $zero /* D57478 80240048 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s index d830d6c6b5..ce39d5e52c 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_8024011C_D5754C.s @@ -5,8 +5,8 @@ glabel func_8024011C_D5754C /* D5754C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D57550 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D57554 80240124 0080802D */ daddu $s0, $a0, $zero -/* D57558 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D5755C 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D57558 80240128 3C058024 */ lui $a1, %hi(func_80240158_D5746C) +/* D5755C 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D5746C) /* D57560 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D57564 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D57568 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s index 2e1f7db1c3..73b815a404 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s @@ -37,7 +37,7 @@ glabel func_80240158_D57588 /* D57608 802401D8 0C00B94E */ jal get_screen_coords /* D5760C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D57610 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D57614 802401E4 0C090014 */ jal pra_06_UnkFunc2 +/* D57614 802401E4 0C090014 */ jal func_80240050_D57480 /* D57618 802401E8 00000000 */ nop /* D5761C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D57620 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D57588 /* D57714 802402E4 AC910000 */ sw $s1, ($a0) /* D57718 802402E8 AC900008 */ sw $s0, 8($a0) /* D5771C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D57720 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D57724 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D57720 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D575F8) +/* D57724 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D575F8) /* D57728 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D5772C 802402FC 00021023 */ negu $v0, $v0 /* D57730 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s index 353a1146eb..ce1d4f13da 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_802404CC_D578FC.s @@ -11,8 +11,8 @@ glabel func_802404CC_D578FC /* D57914 802404E4 28420002 */ slti $v0, $v0, 2 /* D57918 802404E8 1040000C */ beqz $v0, .L8024051C /* D5791C 802404EC 00000000 */ nop -/* D57920 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D57924 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D57920 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D57494) +/* D57924 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D57494) /* D57928 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D5792C 802404FC 0000202D */ daddu $a0, $zero, $zero /* D57930 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s index 36c135bf05..61b1893112 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240530_D57960.s @@ -84,8 +84,8 @@ glabel func_80240530_D57960 /* D57A8C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D57A90 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D57A94 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D57A98 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D57A94 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D577A0) +/* D57A98 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D577A0) /* D57A9C 8024066C AE320000 */ sw $s2, ($s1) /* D57AA0 80240670 AE300008 */ sw $s0, 8($s1) /* D57AA4 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D57960 /* D57AB4 80240684 00431024 */ and $v0, $v0, $v1 /* D57AB8 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D57ABC 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D57AC0 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D57AC4 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D57AC0 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D575BC) +/* D57AC4 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D575BC) /* D57AC8 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D57ACC 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s index a66d5cce59..1f0fe690d7 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240D6C_D5819C.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D5819C /* D581E8 80240DB8 08090384 */ j .L80240E10 /* D581EC 80240DBC 00000000 */ nop .L80240DC0: -/* D581F0 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D581F4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D581F0 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D57578) +/* D581F4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D57578) /* D581F8 80240DC8 08090380 */ j .L80240E00 /* D581FC 80240DCC 00000000 */ nop .L80240DD0: -/* D58200 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D58204 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D58200 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D575E0) +/* D58204 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D575E0) /* D58208 80240DD8 08090380 */ j .L80240E00 /* D5820C 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D5819C /* D58220 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D58224 80240DF4 00000000 */ nop .L80240DF8: -/* D58228 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D5822C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D58228 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D575AC) +/* D5822C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D575AC) .L80240E00: /* D58230 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D58234 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s index ad0726a390..cb47dddfcb 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_802400EC_D5897C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D5897C /* D5897C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D58980 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D58984 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D58988 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D5898C 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D58988 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D588EC) +/* D5898C 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D588EC) /* D58990 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D58994 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D58998 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s index b5d42cf693..1f71e1836c 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s @@ -37,7 +37,7 @@ glabel func_80240128_D589B8 /* D58A38 802401A8 0C00B94E */ jal get_screen_coords /* D58A3C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D58A40 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D58A44 802401B4 0C090008 */ jal pra_09_UnkFunc2 +/* D58A44 802401B4 0C090008 */ jal func_80240020_D588B0 /* D58A48 802401B8 00000000 */ nop /* D58A4C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D58A50 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D589B8 /* D58B44 802402B4 AC910000 */ sw $s1, ($a0) /* D58B48 802402B8 AC900008 */ sw $s0, 8($a0) /* D58B4C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D58B50 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D58B54 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D58B50 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D58A78) +/* D58B54 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D58A78) /* D58B58 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D58B5C 802402CC 00021023 */ negu $v0, $v0 /* D58B60 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s index a441c2eea5..44c5107e02 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_8024049C_D58D2C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D58D2C /* D58D44 802404B4 28420002 */ slti $v0, $v0, 2 /* D58D48 802404B8 1040000C */ beqz $v0, .L802404EC /* D58D4C 802404BC 00000000 */ nop -/* D58D50 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D58D54 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D58D50 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D58914) +/* D58D54 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D58914) /* D58D58 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D58D5C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D58D60 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s index 36f7ac21ab..58aa2ff9e6 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240500_D58D90.s @@ -84,8 +84,8 @@ glabel func_80240500_D58D90 /* D58EBC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D58EC0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D58EC4 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D58EC8 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D58EC4 80240634 3C048024 */ lui $a0, %hi(func_80240870_D58C20) +/* D58EC8 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D58C20) /* D58ECC 8024063C AE320000 */ sw $s2, ($s1) /* D58ED0 80240640 AE300008 */ sw $s0, 8($s1) /* D58ED4 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D58D90 /* D58EE4 80240654 00431024 */ and $v0, $v0, $v1 /* D58EE8 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D58EEC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D58EF0 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D58EF4 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D58EF0 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D58A3C) +/* D58EF4 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D58A3C) /* D58EF8 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D58EFC 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s index 8875b4737f..79c22d268a 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240D3C_D595CC.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D595CC /* D59618 80240D88 08090378 */ j .L80240DE0 /* D5961C 80240D8C 00000000 */ nop .L80240D90: -/* D59620 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D59624 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D59620 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D589F8) +/* D59624 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D589F8) /* D59628 80240D98 08090374 */ j .L80240DD0 /* D5962C 80240D9C 00000000 */ nop .L80240DA0: -/* D59630 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D59634 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D59630 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D58A60) +/* D59634 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D58A60) /* D59638 80240DA8 08090374 */ j .L80240DD0 /* D5963C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D595CC /* D59650 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D59654 80240DC4 00000000 */ nop .L80240DC8: -/* D59658 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D5965C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D59658 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D58A2C) +/* D5965C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D58A2C) .L80240DD0: /* D59660 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D59664 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s index 646b5de5d7..34f571e9f2 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_802400EC_D5F39C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D5F39C /* D5F39C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D5F3A0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D5F3A4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D5F3A8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D5F3AC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D5F3A8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D5F30C) +/* D5F3AC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D5F30C) /* D5F3B0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D5F3B4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D5F3B8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s index 92436d8375..9040a6973f 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D5F3D8 /* D5F458 802401A8 0C00B94E */ jal get_screen_coords /* D5F45C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D5F460 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D5F464 802401B4 0C090008 */ jal pra_10_UnkFunc2 +/* D5F464 802401B4 0C090008 */ jal func_80240020_D5F2D0 /* D5F468 802401B8 00000000 */ nop /* D5F46C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D5F470 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D5F3D8 /* D5F564 802402B4 AC910000 */ sw $s1, ($a0) /* D5F568 802402B8 AC900008 */ sw $s0, 8($a0) /* D5F56C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D5F570 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D5F574 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D5F570 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D5F498) +/* D5F574 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D5F498) /* D5F578 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D5F57C 802402CC 00021023 */ negu $v0, $v0 /* D5F580 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s index 7291f46b88..27feb77a2b 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_8024049C_D5F74C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D5F74C /* D5F764 802404B4 28420002 */ slti $v0, $v0, 2 /* D5F768 802404B8 1040000C */ beqz $v0, .L802404EC /* D5F76C 802404BC 00000000 */ nop -/* D5F770 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D5F774 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D5F770 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D5F334) +/* D5F774 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D5F334) /* D5F778 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D5F77C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D5F780 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s index 0dabd451e7..95871f2278 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240500_D5F7B0.s @@ -84,8 +84,8 @@ glabel func_80240500_D5F7B0 /* D5F8DC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D5F8E0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D5F8E4 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D5F8E8 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D5F8E4 80240634 3C048024 */ lui $a0, %hi(func_80240870_D5F640) +/* D5F8E8 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D5F640) /* D5F8EC 8024063C AE320000 */ sw $s2, ($s1) /* D5F8F0 80240640 AE300008 */ sw $s0, 8($s1) /* D5F8F4 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D5F7B0 /* D5F904 80240654 00431024 */ and $v0, $v0, $v1 /* D5F908 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D5F90C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D5F910 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D5F914 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D5F910 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D5F45C) +/* D5F914 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D5F45C) /* D5F918 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D5F91C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s index c44af779a0..b55b19700a 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240D3C_D5FFEC.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D5FFEC /* D60038 80240D88 08090378 */ j .L80240DE0 /* D6003C 80240D8C 00000000 */ nop .L80240D90: -/* D60040 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D60044 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D60040 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D5F418) +/* D60044 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D5F418) /* D60048 80240D98 08090374 */ j .L80240DD0 /* D6004C 80240D9C 00000000 */ nop .L80240DA0: -/* D60050 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D60054 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D60050 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D5F480) +/* D60054 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D5F480) /* D60058 80240DA8 08090374 */ j .L80240DD0 /* D6005C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D5FFEC /* D60070 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D60074 80240DC4 00000000 */ nop .L80240DC8: -/* D60078 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D6007C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D60078 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D5F44C) +/* D6007C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D5F44C) .L80240DD0: /* D60080 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D60084 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s index ae45b453e6..dbec7e0767 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240F20_D601D0.s @@ -87,9 +87,9 @@ glabel func_80240F20_D601D0 /* D60310 80241060 2C620010 */ sltiu $v0, $v1, 0x10 /* D60314 80241064 10400185 */ beqz $v0, .L8024167C /* D60318 80241068 00031080 */ sll $v0, $v1, 2 -/* D6031C 8024106C 3C018024 */ lui $at, %hi(D_80242200) +/* D6031C 8024106C 3C018024 */ lui $at, %hi(func_80242200_C62F10) /* D60320 80241070 00220821 */ addu $at, $at, $v0 -/* D60324 80241074 8C222200 */ lw $v0, %lo(D_80242200)($at) +/* D60324 80241074 8C222200 */ lw $v0, %lo(func_80242200_C62F10)($at) /* D60328 80241078 00400008 */ jr $v0 /* D6032C 8024107C 00000000 */ nop /* D60330 80241080 8E4200CC */ lw $v0, 0xcc($s2) @@ -171,8 +171,8 @@ glabel func_80240F20_D601D0 /* D60454 802411A4 C6440070 */ lwc1 $f4, 0x70($s2) /* D60458 802411A8 46802120 */ cvt.s.w $f4, $f4 /* D6045C 802411AC 46040001 */ sub.s $f0, $f0, $f4 -/* D60460 802411B0 3C018024 */ lui $at, %hi(D_80242240) -/* D60464 802411B4 D4222240 */ ldc1 $f2, %lo(D_80242240)($at) +/* D60460 802411B0 3C018024 */ lui $at, %hi(func_80242240_9C7620) +/* D60464 802411B4 D4222240 */ ldc1 $f2, %lo(func_80242240_9C7620)($at) /* D60468 802411B8 46000021 */ cvt.d.s $f0, $f0 /* D6046C 802411BC 46220002 */ mul.d $f0, $f0, $f2 /* D60470 802411C0 00000000 */ nop @@ -186,8 +186,8 @@ glabel func_80240F20_D601D0 /* D6048C 802411DC C6A0002C */ lwc1 $f0, 0x2c($s5) /* D60490 802411E0 C622003C */ lwc1 $f2, 0x3c($s1) /* D60494 802411E4 46001081 */ sub.s $f2, $f2, $f0 -/* D60498 802411E8 3C018024 */ lui $at, %hi(D_80242248) -/* D6049C 802411EC D4242248 */ ldc1 $f4, %lo(D_80242248)($at) +/* D60498 802411E8 3C018024 */ lui $at, %hi(func_80242248_87BE28) +/* D6049C 802411EC D4242248 */ ldc1 $f4, %lo(func_80242248_87BE28)($at) /* D604A0 802411F0 460010A1 */ cvt.d.s $f2, $f2 /* D604A4 802411F4 46241082 */ mul.d $f2, $f2, $f4 /* D604A8 802411F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s index 2aac8d8e12..9ddc37625e 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_802400EC_D615EC.s @@ -5,8 +5,8 @@ glabel func_802400EC_D615EC /* D615EC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D615F0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D615F4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D615F8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D615FC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D615F8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D6155C) +/* D615FC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D6155C) /* D61600 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D61604 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D61608 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s index 70248388e5..44d640c620 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s @@ -37,7 +37,7 @@ glabel func_80240128_D61628 /* D616A8 802401A8 0C00B94E */ jal get_screen_coords /* D616AC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D616B0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D616B4 802401B4 0C090008 */ jal pra_11_UnkFunc2 +/* D616B4 802401B4 0C090008 */ jal func_80240020_D61520 /* D616B8 802401B8 00000000 */ nop /* D616BC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D616C0 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D61628 /* D617B4 802402B4 AC910000 */ sw $s1, ($a0) /* D617B8 802402B8 AC900008 */ sw $s0, 8($a0) /* D617BC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D617C0 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D617C4 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D617C0 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D616E8) +/* D617C4 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D616E8) /* D617C8 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D617CC 802402CC 00021023 */ negu $v0, $v0 /* D617D0 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s index 3f92eaa856..e6c0abe803 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_8024049C_D6199C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D6199C /* D619B4 802404B4 28420002 */ slti $v0, $v0, 2 /* D619B8 802404B8 1040000C */ beqz $v0, .L802404EC /* D619BC 802404BC 00000000 */ nop -/* D619C0 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D619C4 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D619C0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D61584) +/* D619C4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D61584) /* D619C8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D619CC 802404CC 0000202D */ daddu $a0, $zero, $zero /* D619D0 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s index f22923c825..144917bac2 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240500_D61A00.s @@ -84,8 +84,8 @@ glabel func_80240500_D61A00 /* D61B2C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D61B30 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D61B34 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D61B38 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D61B34 80240634 3C048024 */ lui $a0, %hi(func_80240870_D61890) +/* D61B38 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D61890) /* D61B3C 8024063C AE320000 */ sw $s2, ($s1) /* D61B40 80240640 AE300008 */ sw $s0, 8($s1) /* D61B44 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D61A00 /* D61B54 80240654 00431024 */ and $v0, $v0, $v1 /* D61B58 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D61B5C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D61B60 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D61B64 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D61B60 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D616AC) +/* D61B64 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D616AC) /* D61B68 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D61B6C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s index 629c05ae85..60270ce700 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240D3C_D6223C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D6223C /* D62288 80240D88 08090378 */ j .L80240DE0 /* D6228C 80240D8C 00000000 */ nop .L80240D90: -/* D62290 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D62294 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D62290 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D61668) +/* D62294 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D61668) /* D62298 80240D98 08090374 */ j .L80240DD0 /* D6229C 80240D9C 00000000 */ nop .L80240DA0: -/* D622A0 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D622A4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D622A0 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D616D0) +/* D622A4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D616D0) /* D622A8 80240DA8 08090374 */ j .L80240DD0 /* D622AC 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D6223C /* D622C0 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D622C4 80240DC4 00000000 */ nop .L80240DC8: -/* D622C8 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D622CC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D622C8 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D6169C) +/* D622CC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D6169C) .L80240DD0: /* D622D0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D622D4 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s index aea6643384..e630b2d284 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240F20_D62420.s @@ -4,8 +4,8 @@ glabel func_80240F20_D62420 /* D62420 80240F20 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D62424 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* D62428 80240F28 3C108024 */ lui $s0, %hi(D_80241610) -/* D6242C 80240F2C 26101610 */ addiu $s0, $s0, %lo(D_80241610) +/* D62428 80240F28 3C108024 */ lui $s0, %hi(func_80241610_D31290) +/* D6242C 80240F2C 26101610 */ addiu $s0, $s0, %lo(func_80241610_D31290) /* D62430 80240F30 AFBF0018 */ sw $ra, 0x18($sp) /* D62434 80240F34 AFB10014 */ sw $s1, 0x14($sp) /* D62438 80240F38 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240F20_D62420 /* D6249C 80240F9C 28620010 */ slti $v0, $v1, 0x10 /* D624A0 80240FA0 1440FFFA */ bnez $v0, .L80240F8C /* D624A4 80240FA4 24840004 */ addiu $a0, $a0, 4 -/* D624A8 80240FA8 3C108024 */ lui $s0, %hi(D_80241610) -/* D624AC 80240FAC 26101610 */ addiu $s0, $s0, %lo(D_80241610) +/* D624A8 80240FA8 3C108024 */ lui $s0, %hi(func_80241610_D31290) +/* D624AC 80240FAC 26101610 */ addiu $s0, $s0, %lo(func_80241610_D31290) /* D624B0 80240FB0 0C00AB4B */ jal heap_free /* D624B4 80240FB4 8E040000 */ lw $a0, ($s0) /* D624B8 80240FB8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s index c7ed520aff..1e26735e79 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_8024011C_D62E2C.s @@ -5,8 +5,8 @@ glabel func_8024011C_D62E2C /* D62E2C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D62E30 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D62E34 80240124 0080802D */ daddu $s0, $a0, $zero -/* D62E38 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D62E3C 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D62E38 80240128 3C058024 */ lui $a1, %hi(func_80240158_D62D4C) +/* D62E3C 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D62D4C) /* D62E40 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D62E44 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D62E48 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s index 0ac2a5fd6d..a78182a2ce 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s @@ -37,7 +37,7 @@ glabel func_80240158_D62E68 /* D62EE8 802401D8 0C00B94E */ jal get_screen_coords /* D62EEC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D62EF0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D62EF4 802401E4 0C090014 */ jal pra_12_UnkFunc2 +/* D62EF4 802401E4 0C090014 */ jal func_80240050_D62D60 /* D62EF8 802401E8 00000000 */ nop /* D62EFC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D62F00 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D62E68 /* D62FF4 802402E4 AC910000 */ sw $s1, ($a0) /* D62FF8 802402E8 AC900008 */ sw $s0, 8($a0) /* D62FFC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D63000 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D63004 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D63000 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D62ED8) +/* D63004 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D62ED8) /* D63008 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D6300C 802402FC 00021023 */ negu $v0, $v0 /* D63010 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s index 6fe72ca280..bfcc24e770 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_802404CC_D631DC.s @@ -11,8 +11,8 @@ glabel func_802404CC_D631DC /* D631F4 802404E4 28420002 */ slti $v0, $v0, 2 /* D631F8 802404E8 1040000C */ beqz $v0, .L8024051C /* D631FC 802404EC 00000000 */ nop -/* D63200 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D63204 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D63200 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D62D74) +/* D63204 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D62D74) /* D63208 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D6320C 802404FC 0000202D */ daddu $a0, $zero, $zero /* D63210 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s index 8b84046b82..829f17540c 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240530_D63240.s @@ -84,8 +84,8 @@ glabel func_80240530_D63240 /* D6336C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D63370 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D63374 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D63378 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D63374 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D63080) +/* D63378 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D63080) /* D6337C 8024066C AE320000 */ sw $s2, ($s1) /* D63380 80240670 AE300008 */ sw $s0, 8($s1) /* D63384 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D63240 /* D63394 80240684 00431024 */ and $v0, $v0, $v1 /* D63398 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D6339C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D633A0 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D633A4 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D633A0 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D62E9C) +/* D633A4 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D62E9C) /* D633A8 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D633AC 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s index 6de8bd74c9..0e173f8c08 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240D6C_D63A7C.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D63A7C /* D63AC8 80240DB8 08090384 */ j .L80240E10 /* D63ACC 80240DBC 00000000 */ nop .L80240DC0: -/* D63AD0 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D63AD4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D63AD0 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D62E58) +/* D63AD4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D62E58) /* D63AD8 80240DC8 08090380 */ j .L80240E00 /* D63ADC 80240DCC 00000000 */ nop .L80240DD0: -/* D63AE0 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D63AE4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D63AE0 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D62EC0) +/* D63AE4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D62EC0) /* D63AE8 80240DD8 08090380 */ j .L80240E00 /* D63AEC 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D63A7C /* D63B00 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D63B04 80240DF4 00000000 */ nop .L80240DF8: -/* D63B08 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D63B0C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D63B08 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D62E8C) +/* D63B0C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D62E8C) .L80240E00: /* D63B10 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D63B14 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s index 0295fd9bbb..e106b135a0 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F50_D63C60.s @@ -4,8 +4,8 @@ glabel func_80240F50_D63C60 /* D63C60 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D63C64 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D63C68 80240F58 3C108024 */ lui $s0, %hi(D_802416B0) -/* D63C6C 80240F5C 261016B0 */ addiu $s0, $s0, %lo(D_802416B0) +/* D63C68 80240F58 3C108024 */ lui $s0, %hi(func_802416B0_A49C70) +/* D63C6C 80240F5C 261016B0 */ addiu $s0, $s0, %lo(func_802416B0_A49C70) /* D63C70 80240F60 AFBF0018 */ sw $ra, 0x18($sp) /* D63C74 80240F64 AFB10014 */ sw $s1, 0x14($sp) /* D63C78 80240F68 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240F50_D63C60 /* D63CDC 80240FCC 28620010 */ slti $v0, $v1, 0x10 /* D63CE0 80240FD0 1440FFFA */ bnez $v0, .L80240FBC /* D63CE4 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D63CE8 80240FD8 3C108024 */ lui $s0, %hi(D_802416B0) -/* D63CEC 80240FDC 261016B0 */ addiu $s0, $s0, %lo(D_802416B0) +/* D63CE8 80240FD8 3C108024 */ lui $s0, %hi(func_802416B0_A49C70) +/* D63CEC 80240FDC 261016B0 */ addiu $s0, $s0, %lo(func_802416B0_A49C70) /* D63CF0 80240FE0 0C00AB4B */ jal heap_free /* D63CF4 80240FE4 8E040000 */ lw $a0, ($s0) /* D63CF8 80240FE8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s index 93ff82a114..f7f69ba839 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802400EC_D646CC.s @@ -5,8 +5,8 @@ glabel func_802400EC_D646CC /* D646CC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D646D0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D646D4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D646D8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D646DC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D646D8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D6463C) +/* D646DC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D6463C) /* D646E0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D646E4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D646E8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s index 30079eb62f..8a52164f48 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s @@ -37,7 +37,7 @@ glabel func_80240128_D64708 /* D64788 802401A8 0C00B94E */ jal get_screen_coords /* D6478C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D64790 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D64794 802401B4 0C090008 */ jal pra_13_UnkFunc2 +/* D64794 802401B4 0C090008 */ jal func_80240020_D64600 /* D64798 802401B8 00000000 */ nop /* D6479C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D647A0 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D64708 /* D64894 802402B4 AC910000 */ sw $s1, ($a0) /* D64898 802402B8 AC900008 */ sw $s0, 8($a0) /* D6489C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D648A0 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D648A4 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D648A0 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D647C8) +/* D648A4 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D647C8) /* D648A8 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D648AC 802402CC 00021023 */ negu $v0, $v0 /* D648B0 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s index e7ba04672c..299986fd9e 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024049C_D64A7C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D64A7C /* D64A94 802404B4 28420002 */ slti $v0, $v0, 2 /* D64A98 802404B8 1040000C */ beqz $v0, .L802404EC /* D64A9C 802404BC 00000000 */ nop -/* D64AA0 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D64AA4 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D64AA0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D64664) +/* D64AA4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D64664) /* D64AA8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D64AAC 802404CC 0000202D */ daddu $a0, $zero, $zero /* D64AB0 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s index 678b11738c..fd4c617cde 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240500_D64AE0.s @@ -84,8 +84,8 @@ glabel func_80240500_D64AE0 /* D64C0C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D64C10 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D64C14 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D64C18 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D64C14 80240634 3C048024 */ lui $a0, %hi(func_80240870_D64970) +/* D64C18 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D64970) /* D64C1C 8024063C AE320000 */ sw $s2, ($s1) /* D64C20 80240640 AE300008 */ sw $s0, 8($s1) /* D64C24 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D64AE0 /* D64C34 80240654 00431024 */ and $v0, $v0, $v1 /* D64C38 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D64C3C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D64C40 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D64C44 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D64C40 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D6478C) +/* D64C44 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D6478C) /* D64C48 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D64C4C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s index 2a3005ccb3..963998595d 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240D3C_D6531C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D6531C /* D65368 80240D88 08090378 */ j .L80240DE0 /* D6536C 80240D8C 00000000 */ nop .L80240D90: -/* D65370 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D65374 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D65370 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D64748) +/* D65374 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D64748) /* D65378 80240D98 08090374 */ j .L80240DD0 /* D6537C 80240D9C 00000000 */ nop .L80240DA0: -/* D65380 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D65384 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D65380 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D647B0) +/* D65384 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D647B0) /* D65388 80240DA8 08090374 */ j .L80240DD0 /* D6538C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D6531C /* D653A0 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D653A4 80240DC4 00000000 */ nop .L80240DC8: -/* D653A8 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D653AC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D653A8 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D6477C) +/* D653AC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D6477C) .L80240DD0: /* D653B0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D653B4 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s index 457db02ef5..5a907b6d63 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_802413D0_D659B0.s @@ -5,8 +5,8 @@ glabel func_802413D0_D659B0 /* D659B0 802413D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D659B4 802413D4 AFB00010 */ sw $s0, 0x10($sp) /* D659B8 802413D8 0080802D */ daddu $s0, $a0, $zero -/* D659BC 802413DC 3C058024 */ lui $a1, %hi(D_8024140C) -/* D659C0 802413E0 24A5140C */ addiu $a1, $a1, %lo(D_8024140C) +/* D659BC 802413DC 3C058024 */ lui $a1, %hi(func_8024140C_D6463C) +/* D659C0 802413E0 24A5140C */ addiu $a1, $a1, %lo(func_8024140C_D6463C) /* D659C4 802413E4 AFBF0014 */ sw $ra, 0x14($sp) /* D659C8 802413E8 0C048C56 */ jal bind_dynamic_entity_3 /* D659CC 802413EC 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s index 0feb09bf28..9215bb071c 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_8024140C_D659EC.s @@ -33,8 +33,8 @@ glabel func_8024140C_D659EC /* D65A5C 8024147C 0220202D */ daddu $a0, $s1, $zero /* D65A60 80241480 820500AA */ lb $a1, 0xaa($s0) /* D65A64 80241484 8FA30038 */ lw $v1, 0x38($sp) -/* D65A68 80241488 3C028024 */ lui $v0, %hi(D_802414BC) -/* D65A6C 8024148C 244214BC */ addiu $v0, $v0, %lo(D_802414BC) +/* D65A68 80241488 3C028024 */ lui $v0, %hi(func_802414BC_D646B0) +/* D65A6C 8024148C 244214BC */ addiu $v0, $v0, %lo(func_802414BC_D646B0) /* D65A70 80241490 AFB00028 */ sw $s0, 0x28($sp) /* D65A74 80241494 AFA2002C */ sw $v0, 0x2c($sp) /* D65A78 80241498 00031823 */ negu $v1, $v1 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s index a21cc4adf4..230c7dc607 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_802400EC_D67DEC.s @@ -5,8 +5,8 @@ glabel func_802400EC_D67DEC /* D67DEC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D67DF0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D67DF4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D67DF8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D67DFC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D67DF8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D67D5C) +/* D67DFC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D67D5C) /* D67E00 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D67E04 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D67E08 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s index 9678828904..524c97179b 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s @@ -37,7 +37,7 @@ glabel func_80240128_D67E28 /* D67EA8 802401A8 0C00B94E */ jal get_screen_coords /* D67EAC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D67EB0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D67EB4 802401B4 0C090008 */ jal pra_14_UnkFunc2 +/* D67EB4 802401B4 0C090008 */ jal func_80240020_D67D20 /* D67EB8 802401B8 00000000 */ nop /* D67EBC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D67EC0 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D67E28 /* D67FB4 802402B4 AC910000 */ sw $s1, ($a0) /* D67FB8 802402B8 AC900008 */ sw $s0, 8($a0) /* D67FBC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D67FC0 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D67FC4 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D67FC0 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D67EE8) +/* D67FC4 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D67EE8) /* D67FC8 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D67FCC 802402CC 00021023 */ negu $v0, $v0 /* D67FD0 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s index 9186a7ced5..40e04967de 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_8024049C_D6819C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D6819C /* D681B4 802404B4 28420002 */ slti $v0, $v0, 2 /* D681B8 802404B8 1040000C */ beqz $v0, .L802404EC /* D681BC 802404BC 00000000 */ nop -/* D681C0 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D681C4 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D681C0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D67D84) +/* D681C4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D67D84) /* D681C8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D681CC 802404CC 0000202D */ daddu $a0, $zero, $zero /* D681D0 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s index 4e1b8dfa09..b1e1226194 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240500_D68200.s @@ -84,8 +84,8 @@ glabel func_80240500_D68200 /* D6832C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D68330 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D68334 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D68338 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D68334 80240634 3C048024 */ lui $a0, %hi(func_80240870_D68090) +/* D68338 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D68090) /* D6833C 8024063C AE320000 */ sw $s2, ($s1) /* D68340 80240640 AE300008 */ sw $s0, 8($s1) /* D68344 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D68200 /* D68354 80240654 00431024 */ and $v0, $v0, $v1 /* D68358 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D6835C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D68360 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D68364 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D68360 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D67EAC) +/* D68364 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D67EAC) /* D68368 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D6836C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s index 658339a42a..de290a054a 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240D3C_D68A3C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D68A3C /* D68A88 80240D88 08090378 */ j .L80240DE0 /* D68A8C 80240D8C 00000000 */ nop .L80240D90: -/* D68A90 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D68A94 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D68A90 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D67E68) +/* D68A94 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D67E68) /* D68A98 80240D98 08090374 */ j .L80240DD0 /* D68A9C 80240D9C 00000000 */ nop .L80240DA0: -/* D68AA0 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D68AA4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D68AA0 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D67ED0) +/* D68AA4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D67ED0) /* D68AA8 80240DA8 08090374 */ j .L80240DD0 /* D68AAC 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D68A3C /* D68AC0 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D68AC4 80240DC4 00000000 */ nop .L80240DC8: -/* D68AC8 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D68ACC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D68AC8 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D67E9C) +/* D68ACC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D67E9C) .L80240DD0: /* D68AD0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D68AD4 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s index 1bef43c109..a36331b043 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_802400EC_D69C0C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D69C0C /* D69C0C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D69C10 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D69C14 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D69C18 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D69C1C 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D69C18 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D69B7C) +/* D69C1C 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D69B7C) /* D69C20 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D69C24 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D69C28 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s index 7038d41f22..e7a17f9b2a 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s @@ -37,7 +37,7 @@ glabel func_80240128_D69C48 /* D69CC8 802401A8 0C00B94E */ jal get_screen_coords /* D69CCC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D69CD0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D69CD4 802401B4 0C090008 */ jal pra_16_UnkFunc2 +/* D69CD4 802401B4 0C090008 */ jal func_80240020_D69B40 /* D69CD8 802401B8 00000000 */ nop /* D69CDC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D69CE0 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D69C48 /* D69DD4 802402B4 AC910000 */ sw $s1, ($a0) /* D69DD8 802402B8 AC900008 */ sw $s0, 8($a0) /* D69DDC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D69DE0 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D69DE4 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D69DE0 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D69D08) +/* D69DE4 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D69D08) /* D69DE8 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D69DEC 802402CC 00021023 */ negu $v0, $v0 /* D69DF0 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s index 7d0c1187e9..14d3183621 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_8024049C_D69FBC.s @@ -11,8 +11,8 @@ glabel func_8024049C_D69FBC /* D69FD4 802404B4 28420002 */ slti $v0, $v0, 2 /* D69FD8 802404B8 1040000C */ beqz $v0, .L802404EC /* D69FDC 802404BC 00000000 */ nop -/* D69FE0 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D69FE4 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D69FE0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D69BA4) +/* D69FE4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D69BA4) /* D69FE8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D69FEC 802404CC 0000202D */ daddu $a0, $zero, $zero /* D69FF0 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s index 25a865ed9e..789a0fc013 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240500_D6A020.s @@ -84,8 +84,8 @@ glabel func_80240500_D6A020 /* D6A14C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D6A150 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D6A154 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D6A158 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D6A154 80240634 3C048024 */ lui $a0, %hi(func_80240870_D69EB0) +/* D6A158 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D69EB0) /* D6A15C 8024063C AE320000 */ sw $s2, ($s1) /* D6A160 80240640 AE300008 */ sw $s0, 8($s1) /* D6A164 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D6A020 /* D6A174 80240654 00431024 */ and $v0, $v0, $v1 /* D6A178 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D6A17C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D6A180 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D6A184 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D6A180 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D69CCC) +/* D6A184 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D69CCC) /* D6A188 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D6A18C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s index 663f64d05f..0507182a9a 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240D3C_D6A85C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D6A85C /* D6A8A8 80240D88 08090378 */ j .L80240DE0 /* D6A8AC 80240D8C 00000000 */ nop .L80240D90: -/* D6A8B0 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D6A8B4 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D6A8B0 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D69C88) +/* D6A8B4 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D69C88) /* D6A8B8 80240D98 08090374 */ j .L80240DD0 /* D6A8BC 80240D9C 00000000 */ nop .L80240DA0: -/* D6A8C0 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D6A8C4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D6A8C0 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D69CF0) +/* D6A8C4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D69CF0) /* D6A8C8 80240DA8 08090374 */ j .L80240DD0 /* D6A8CC 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D6A85C /* D6A8E0 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D6A8E4 80240DC4 00000000 */ nop .L80240DC8: -/* D6A8E8 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D6A8EC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D6A8E8 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D69CBC) +/* D6A8EC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D69CBC) .L80240DD0: /* D6A8F0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D6A8F4 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s index 3a3a29d94f..c7a5b350db 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_802400EC_D6B70C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D6B70C /* D6B70C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D6B710 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D6B714 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D6B718 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D6B71C 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D6B718 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D6B67C) +/* D6B71C 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D6B67C) /* D6B720 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D6B724 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D6B728 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s index eddcb0a257..e916c87115 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s @@ -37,7 +37,7 @@ glabel func_80240128_D6B748 /* D6B7C8 802401A8 0C00B94E */ jal get_screen_coords /* D6B7CC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6B7D0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6B7D4 802401B4 0C090008 */ jal pra_18_UnkFunc2 +/* D6B7D4 802401B4 0C090008 */ jal func_80240020_D6B640 /* D6B7D8 802401B8 00000000 */ nop /* D6B7DC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6B7E0 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D6B748 /* D6B8D4 802402B4 AC910000 */ sw $s1, ($a0) /* D6B8D8 802402B8 AC900008 */ sw $s0, 8($a0) /* D6B8DC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D6B8E0 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D6B8E4 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D6B8E0 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D6B808) +/* D6B8E4 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D6B808) /* D6B8E8 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D6B8EC 802402CC 00021023 */ negu $v0, $v0 /* D6B8F0 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s index b42387a6d3..1a04447040 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_8024049C_D6BABC.s @@ -11,8 +11,8 @@ glabel func_8024049C_D6BABC /* D6BAD4 802404B4 28420002 */ slti $v0, $v0, 2 /* D6BAD8 802404B8 1040000C */ beqz $v0, .L802404EC /* D6BADC 802404BC 00000000 */ nop -/* D6BAE0 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D6BAE4 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D6BAE0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D6B6A4) +/* D6BAE4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D6B6A4) /* D6BAE8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D6BAEC 802404CC 0000202D */ daddu $a0, $zero, $zero /* D6BAF0 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s index afbf5aff56..c7a14cd1f4 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240500_D6BB20.s @@ -84,8 +84,8 @@ glabel func_80240500_D6BB20 /* D6BC4C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D6BC50 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D6BC54 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D6BC58 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D6BC54 80240634 3C048024 */ lui $a0, %hi(func_80240870_D6B9B0) +/* D6BC58 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D6B9B0) /* D6BC5C 8024063C AE320000 */ sw $s2, ($s1) /* D6BC60 80240640 AE300008 */ sw $s0, 8($s1) /* D6BC64 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D6BB20 /* D6BC74 80240654 00431024 */ and $v0, $v0, $v1 /* D6BC78 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D6BC7C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D6BC80 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D6BC84 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D6BC80 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D6B7CC) +/* D6BC84 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D6B7CC) /* D6BC88 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D6BC8C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s index f9c674ed3f..d63b6df6b7 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240D3C_D6C35C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D6C35C /* D6C3A8 80240D88 08090378 */ j .L80240DE0 /* D6C3AC 80240D8C 00000000 */ nop .L80240D90: -/* D6C3B0 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D6C3B4 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D6C3B0 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D6B788) +/* D6C3B4 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D6B788) /* D6C3B8 80240D98 08090374 */ j .L80240DD0 /* D6C3BC 80240D9C 00000000 */ nop .L80240DA0: -/* D6C3C0 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D6C3C4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D6C3C0 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D6B7F0) +/* D6C3C4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D6B7F0) /* D6C3C8 80240DA8 08090374 */ j .L80240DD0 /* D6C3CC 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D6C35C /* D6C3E0 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D6C3E4 80240DC4 00000000 */ nop .L80240DC8: -/* D6C3E8 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D6C3EC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D6C3E8 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D6B7BC) +/* D6C3EC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D6B7BC) .L80240DD0: /* D6C3F0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D6C3F4 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s index 808fde4cd3..ff916d52c0 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802400EC_D6EA9C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D6EA9C /* D6EA9C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D6EAA0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D6EAA4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D6EAA8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D6EAAC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D6EAA8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D6EA0C) +/* D6EAAC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D6EA0C) /* D6EAB0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D6EAB4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D6EAB8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s index 8d86d9207c..fa1a0ee471 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D6EAD8 /* D6EB58 802401A8 0C00B94E */ jal get_screen_coords /* D6EB5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6EB60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6EB64 802401B4 0C090008 */ jal pra_19_UnkFunc2 +/* D6EB64 802401B4 0C090008 */ jal func_80240020_D6E9D0 /* D6EB68 802401B8 00000000 */ nop /* D6EB6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6EB70 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D6EAD8 /* D6EC64 802402B4 AC910000 */ sw $s1, ($a0) /* D6EC68 802402B8 AC900008 */ sw $s0, 8($a0) /* D6EC6C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D6EC70 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D6EC74 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D6EC70 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D6EB98) +/* D6EC74 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D6EB98) /* D6EC78 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D6EC7C 802402CC 00021023 */ negu $v0, $v0 /* D6EC80 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s index bf5138f851..a65cf9e31b 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024049C_D6EE4C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D6EE4C /* D6EE64 802404B4 28420002 */ slti $v0, $v0, 2 /* D6EE68 802404B8 1040000C */ beqz $v0, .L802404EC /* D6EE6C 802404BC 00000000 */ nop -/* D6EE70 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D6EE74 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D6EE70 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D6EA34) +/* D6EE74 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D6EA34) /* D6EE78 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D6EE7C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D6EE80 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s index 86c0483ca4..d900bbdbc1 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240500_D6EEB0.s @@ -84,8 +84,8 @@ glabel func_80240500_D6EEB0 /* D6EFDC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D6EFE0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D6EFE4 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D6EFE8 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D6EFE4 80240634 3C048024 */ lui $a0, %hi(func_80240870_D6ED40) +/* D6EFE8 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D6ED40) /* D6EFEC 8024063C AE320000 */ sw $s2, ($s1) /* D6EFF0 80240640 AE300008 */ sw $s0, 8($s1) /* D6EFF4 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D6EEB0 /* D6F004 80240654 00431024 */ and $v0, $v0, $v1 /* D6F008 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D6F00C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D6F010 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D6F014 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D6F010 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D6EB5C) +/* D6F014 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D6EB5C) /* D6F018 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D6F01C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s index 85b2ed8267..e0d5e75039 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240D3C_D6F6EC.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D6F6EC /* D6F738 80240D88 08090378 */ j .L80240DE0 /* D6F73C 80240D8C 00000000 */ nop .L80240D90: -/* D6F740 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D6F744 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D6F740 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D6EB18) +/* D6F744 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D6EB18) /* D6F748 80240D98 08090374 */ j .L80240DD0 /* D6F74C 80240D9C 00000000 */ nop .L80240DA0: -/* D6F750 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D6F754 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D6F750 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D6EB80) +/* D6F754 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D6EB80) /* D6F758 80240DA8 08090374 */ j .L80240DD0 /* D6F75C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D6F6EC /* D6F770 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D6F774 80240DC4 00000000 */ nop .L80240DC8: -/* D6F778 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D6F77C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D6F778 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D6EB4C) +/* D6F77C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D6EB4C) .L80240DD0: /* D6F780 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D6F784 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s index 10b2a07fa5..ac8376e207 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024114C_D6FAFC.s @@ -6,11 +6,11 @@ glabel func_8024114C_D6FAFC /* D6FB00 80241150 AFBF0010 */ sw $ra, 0x10($sp) /* D6FB04 80241154 10A00003 */ beqz $a1, .L80241164 /* D6FB08 80241158 8C86000C */ lw $a2, 0xc($a0) -/* D6FB0C 8024115C 3C018024 */ lui $at, %hi(D_8024219C) -/* D6FB10 80241160 AC20219C */ sw $zero, %lo(D_8024219C)($at) +/* D6FB0C 8024115C 3C018024 */ lui $at, %hi(func_8024219C_BE594C) +/* D6FB10 80241160 AC20219C */ sw $zero, %lo(func_8024219C_BE594C)($at) .L80241164: -/* D6FB14 80241164 3C038024 */ lui $v1, %hi(D_8024219C) -/* D6FB18 80241168 2463219C */ addiu $v1, $v1, %lo(D_8024219C) +/* D6FB14 80241164 3C038024 */ lui $v1, %hi(func_8024219C_BE594C) +/* D6FB18 80241168 2463219C */ addiu $v1, $v1, %lo(func_8024219C_BE594C) /* D6FB1C 8024116C 8C620000 */ lw $v0, ($v1) /* D6FB20 80241170 54400003 */ bnel $v0, $zero, .L80241180 /* D6FB24 80241174 AC600000 */ sw $zero, ($v1) @@ -18,9 +18,9 @@ glabel func_8024114C_D6FAFC /* D6FB2C 8024117C 0000102D */ daddu $v0, $zero, $zero .L80241180: /* D6FB30 80241180 8CC50000 */ lw $a1, ($a2) -/* D6FB34 80241184 3C068024 */ lui $a2, %hi(D_802421A0) +/* D6FB34 80241184 3C068024 */ lui $a2, %hi(func_802421A0_8EDFC0) /* D6FB38 80241188 0C0B2026 */ jal set_variable -/* D6FB3C 8024118C 8CC621A0 */ lw $a2, %lo(D_802421A0)($a2) +/* D6FB3C 8024118C 8CC621A0 */ lw $a2, %lo(func_802421A0_8EDFC0)($a2) /* D6FB40 80241190 24020002 */ addiu $v0, $zero, 2 .L80241194: /* D6FB44 80241194 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s index 546ce55414..6daf360079 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802411A0_D6FB50.s @@ -7,12 +7,12 @@ glabel func_802411A0_D6FB50 /* D6FB58 802411A8 8C82000C */ lw $v0, 0xc($a0) /* D6FB5C 802411AC 0C0B1EAF */ jal get_variable /* D6FB60 802411B0 8C450000 */ lw $a1, ($v0) -/* D6FB64 802411B4 3C018024 */ lui $at, %hi(D_802421A0) -/* D6FB68 802411B8 AC2221A0 */ sw $v0, %lo(D_802421A0)($at) +/* D6FB64 802411B4 3C018024 */ lui $at, %hi(func_802421A0_8EDFC0) +/* D6FB68 802411B8 AC2221A0 */ sw $v0, %lo(func_802421A0_8EDFC0)($at) /* D6FB6C 802411BC 24020002 */ addiu $v0, $zero, 2 /* D6FB70 802411C0 8FBF0010 */ lw $ra, 0x10($sp) /* D6FB74 802411C4 24030001 */ addiu $v1, $zero, 1 -/* D6FB78 802411C8 3C018024 */ lui $at, %hi(D_8024219C) -/* D6FB7C 802411CC AC23219C */ sw $v1, %lo(D_8024219C)($at) +/* D6FB78 802411C8 3C018024 */ lui $at, %hi(func_8024219C_BE594C) +/* D6FB7C 802411CC AC23219C */ sw $v1, %lo(func_8024219C_BE594C)($at) /* D6FB80 802411D0 03E00008 */ jr $ra /* D6FB84 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s index bf52ca55e7..3a2e2ff6bc 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_802414F4_D6FEA4.s @@ -5,8 +5,8 @@ glabel func_802414F4_D6FEA4 /* D6FEA4 802414F4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D6FEA8 802414F8 AFB00010 */ sw $s0, 0x10($sp) /* D6FEAC 802414FC 0080802D */ daddu $s0, $a0, $zero -/* D6FEB0 80241500 3C058024 */ lui $a1, %hi(D_80241530) -/* D6FEB4 80241504 24A51530 */ addiu $a1, $a1, %lo(D_80241530) +/* D6FEB0 80241500 3C058024 */ lui $a1, %hi(func_80241530_D6EA0C) +/* D6FEB4 80241504 24A51530 */ addiu $a1, $a1, %lo(func_80241530_D6EA0C) /* D6FEB8 80241508 AFBF0014 */ sw $ra, 0x14($sp) /* D6FEBC 8024150C 0C048C56 */ jal bind_dynamic_entity_3 /* D6FEC0 80241510 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s index e2b1a958b7..717e0113f9 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80241530_D6FEE0.s @@ -33,8 +33,8 @@ glabel func_80241530_D6FEE0 /* D6FF50 802415A0 0220202D */ daddu $a0, $s1, $zero /* D6FF54 802415A4 820500AA */ lb $a1, 0xaa($s0) /* D6FF58 802415A8 8FA30038 */ lw $v1, 0x38($sp) -/* D6FF5C 802415AC 3C028024 */ lui $v0, %hi(D_802415E0) -/* D6FF60 802415B0 244215E0 */ addiu $v0, $v0, %lo(D_802415E0) +/* D6FF5C 802415AC 3C028024 */ lui $v0, %hi(func_802415E0_D6EA80) +/* D6FF60 802415B0 244215E0 */ addiu $v0, $v0, %lo(func_802415E0_D6EA80) /* D6FF64 802415B4 AFB00028 */ sw $s0, 0x28($sp) /* D6FF68 802415B8 AFA2002C */ sw $v0, 0x2c($sp) /* D6FF6C 802415BC 00031823 */ negu $v1, $v1 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s index bb75f167fe..d6d8d6d522 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_802400EC_D7648C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D7648C /* D7648C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D76490 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D76494 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D76498 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D7649C 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D76498 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D763FC) +/* D7649C 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D763FC) /* D764A0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D764A4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D764A8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s index 3c3a570345..1154ccf397 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s @@ -37,7 +37,7 @@ glabel func_80240128_D764C8 /* D76548 802401A8 0C00B94E */ jal get_screen_coords /* D7654C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D76550 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D76554 802401B4 0C090008 */ jal pra_20_UnkFunc2 +/* D76554 802401B4 0C090008 */ jal func_80240020_D763C0 /* D76558 802401B8 00000000 */ nop /* D7655C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D76560 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D764C8 /* D76654 802402B4 AC910000 */ sw $s1, ($a0) /* D76658 802402B8 AC900008 */ sw $s0, 8($a0) /* D7665C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D76660 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D76664 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D76660 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D76588) +/* D76664 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D76588) /* D76668 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D7666C 802402CC 00021023 */ negu $v0, $v0 /* D76670 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s index 53d2bd23f5..289bc94f26 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_8024049C_D7683C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D7683C /* D76854 802404B4 28420002 */ slti $v0, $v0, 2 /* D76858 802404B8 1040000C */ beqz $v0, .L802404EC /* D7685C 802404BC 00000000 */ nop -/* D76860 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D76864 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D76860 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D76424) +/* D76864 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D76424) /* D76868 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D7686C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D76870 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s index 392452eaaa..56ce61de40 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240500_D768A0.s @@ -84,8 +84,8 @@ glabel func_80240500_D768A0 /* D769CC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D769D0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D769D4 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D769D8 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D769D4 80240634 3C048024 */ lui $a0, %hi(func_80240870_D76730) +/* D769D8 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D76730) /* D769DC 8024063C AE320000 */ sw $s2, ($s1) /* D769E0 80240640 AE300008 */ sw $s0, 8($s1) /* D769E4 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D768A0 /* D769F4 80240654 00431024 */ and $v0, $v0, $v1 /* D769F8 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D769FC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D76A00 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D76A04 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D76A00 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D7654C) +/* D76A04 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D7654C) /* D76A08 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D76A0C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s index 38e1766b6f..beb1397779 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240D3C_D770DC.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D770DC /* D77128 80240D88 08090378 */ j .L80240DE0 /* D7712C 80240D8C 00000000 */ nop .L80240D90: -/* D77130 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D77134 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D77130 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D76508) +/* D77134 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D76508) /* D77138 80240D98 08090374 */ j .L80240DD0 /* D7713C 80240D9C 00000000 */ nop .L80240DA0: -/* D77140 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D77144 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D77140 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D76570) +/* D77144 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D76570) /* D77148 80240DA8 08090374 */ j .L80240DD0 /* D7714C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D770DC /* D77160 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D77164 80240DC4 00000000 */ nop .L80240DC8: -/* D77168 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D7716C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D77168 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D7653C) +/* D7716C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D7653C) .L80240DD0: /* D77170 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D77174 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s index 325534adac..a9364a9816 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_8024011C_D79B0C.s @@ -5,8 +5,8 @@ glabel func_8024011C_D79B0C /* D79B0C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D79B10 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D79B14 80240124 0080802D */ daddu $s0, $a0, $zero -/* D79B18 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D79B1C 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D79B18 80240128 3C058024 */ lui $a1, %hi(func_80240158_D79A2C) +/* D79B1C 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D79A2C) /* D79B20 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D79B24 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D79B28 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s index a440950114..b88e5c7c3d 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s @@ -37,7 +37,7 @@ glabel func_80240158_D79B48 /* D79BC8 802401D8 0C00B94E */ jal get_screen_coords /* D79BCC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D79BD0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D79BD4 802401E4 0C090014 */ jal pra_27_UnkFunc2 +/* D79BD4 802401E4 0C090014 */ jal func_80240050_D79A40 /* D79BD8 802401E8 00000000 */ nop /* D79BDC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D79BE0 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D79B48 /* D79CD4 802402E4 AC910000 */ sw $s1, ($a0) /* D79CD8 802402E8 AC900008 */ sw $s0, 8($a0) /* D79CDC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D79CE0 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D79CE4 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D79CE0 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D79BB8) +/* D79CE4 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D79BB8) /* D79CE8 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D79CEC 802402FC 00021023 */ negu $v0, $v0 /* D79CF0 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s index 5e4a40bf94..d3b4eabb00 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_802404CC_D79EBC.s @@ -11,8 +11,8 @@ glabel func_802404CC_D79EBC /* D79ED4 802404E4 28420002 */ slti $v0, $v0, 2 /* D79ED8 802404E8 1040000C */ beqz $v0, .L8024051C /* D79EDC 802404EC 00000000 */ nop -/* D79EE0 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D79EE4 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D79EE0 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D79A54) +/* D79EE4 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D79A54) /* D79EE8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D79EEC 802404FC 0000202D */ daddu $a0, $zero, $zero /* D79EF0 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s index 2cc84dcfa8..f204659a35 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240530_D79F20.s @@ -84,8 +84,8 @@ glabel func_80240530_D79F20 /* D7A04C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D7A050 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D7A054 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D7A058 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D7A054 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D79D60) +/* D7A058 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D79D60) /* D7A05C 8024066C AE320000 */ sw $s2, ($s1) /* D7A060 80240670 AE300008 */ sw $s0, 8($s1) /* D7A064 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D79F20 /* D7A074 80240684 00431024 */ and $v0, $v0, $v1 /* D7A078 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D7A07C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D7A080 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D7A084 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D7A080 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D79B7C) +/* D7A084 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D79B7C) /* D7A088 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D7A08C 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s index 4c7f2ca0c2..c51c70ed27 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240D6C_D7A75C.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D7A75C /* D7A7A8 80240DB8 08090384 */ j .L80240E10 /* D7A7AC 80240DBC 00000000 */ nop .L80240DC0: -/* D7A7B0 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D7A7B4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D7A7B0 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D79B38) +/* D7A7B4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D79B38) /* D7A7B8 80240DC8 08090380 */ j .L80240E00 /* D7A7BC 80240DCC 00000000 */ nop .L80240DD0: -/* D7A7C0 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D7A7C4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D7A7C0 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D79BA0) +/* D7A7C4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D79BA0) /* D7A7C8 80240DD8 08090380 */ j .L80240E00 /* D7A7CC 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D7A75C /* D7A7E0 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D7A7E4 80240DF4 00000000 */ nop .L80240DF8: -/* D7A7E8 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D7A7EC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D7A7E8 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D79B6C) +/* D7A7EC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D79B6C) .L80240E00: /* D7A7F0 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D7A7F4 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s index c092cd533a..8ede3bd7a5 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F50_D7A940.s @@ -4,8 +4,8 @@ glabel func_80240F50_D7A940 /* D7A940 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D7A944 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D7A948 80240F58 3C108024 */ lui $s0, %hi(D_80241690) -/* D7A94C 80240F5C 26101690 */ addiu $s0, $s0, %lo(D_80241690) +/* D7A948 80240F58 3C108024 */ lui $s0, %hi(func_80241690_A08590) +/* D7A94C 80240F5C 26101690 */ addiu $s0, $s0, %lo(func_80241690_A08590) /* D7A950 80240F60 AFBF0018 */ sw $ra, 0x18($sp) /* D7A954 80240F64 AFB10014 */ sw $s1, 0x14($sp) /* D7A958 80240F68 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240F50_D7A940 /* D7A9BC 80240FCC 28620010 */ slti $v0, $v1, 0x10 /* D7A9C0 80240FD0 1440FFFA */ bnez $v0, .L80240FBC /* D7A9C4 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D7A9C8 80240FD8 3C108024 */ lui $s0, %hi(D_80241690) -/* D7A9CC 80240FDC 26101690 */ addiu $s0, $s0, %lo(D_80241690) +/* D7A9C8 80240FD8 3C108024 */ lui $s0, %hi(func_80241690_A08590) +/* D7A9CC 80240FDC 26101690 */ addiu $s0, $s0, %lo(func_80241690_A08590) /* D7A9D0 80240FE0 0C00AB4B */ jal heap_free /* D7A9D4 80240FE4 8E040000 */ lw $a0, ($s0) /* D7A9D8 80240FE8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s index 3a25f5e8a3..95d52d9157 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_8024011C_D7B3BC.s @@ -5,8 +5,8 @@ glabel func_8024011C_D7B3BC /* D7B3BC 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D7B3C0 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D7B3C4 80240124 0080802D */ daddu $s0, $a0, $zero -/* D7B3C8 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D7B3CC 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D7B3C8 80240128 3C058024 */ lui $a1, %hi(func_80240158_D7B2DC) +/* D7B3CC 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D7B2DC) /* D7B3D0 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D7B3D4 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D7B3D8 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s index 8e30fad629..d8fda8457f 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s @@ -37,7 +37,7 @@ glabel func_80240158_D7B3F8 /* D7B478 802401D8 0C00B94E */ jal get_screen_coords /* D7B47C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D7B480 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7B484 802401E4 0C090014 */ jal pra_28_UnkFunc2 +/* D7B484 802401E4 0C090014 */ jal func_80240050_D7B2F0 /* D7B488 802401E8 00000000 */ nop /* D7B48C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D7B490 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D7B3F8 /* D7B584 802402E4 AC910000 */ sw $s1, ($a0) /* D7B588 802402E8 AC900008 */ sw $s0, 8($a0) /* D7B58C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D7B590 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D7B594 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D7B590 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D7B468) +/* D7B594 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D7B468) /* D7B598 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D7B59C 802402FC 00021023 */ negu $v0, $v0 /* D7B5A0 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s index 944a8c0249..e91d84948a 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_802404CC_D7B76C.s @@ -11,8 +11,8 @@ glabel func_802404CC_D7B76C /* D7B784 802404E4 28420002 */ slti $v0, $v0, 2 /* D7B788 802404E8 1040000C */ beqz $v0, .L8024051C /* D7B78C 802404EC 00000000 */ nop -/* D7B790 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D7B794 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D7B790 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D7B304) +/* D7B794 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D7B304) /* D7B798 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D7B79C 802404FC 0000202D */ daddu $a0, $zero, $zero /* D7B7A0 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s index aba631da1e..4b173c906d 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240530_D7B7D0.s @@ -84,8 +84,8 @@ glabel func_80240530_D7B7D0 /* D7B8FC 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D7B900 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D7B904 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D7B908 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D7B904 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D7B610) +/* D7B908 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D7B610) /* D7B90C 8024066C AE320000 */ sw $s2, ($s1) /* D7B910 80240670 AE300008 */ sw $s0, 8($s1) /* D7B914 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D7B7D0 /* D7B924 80240684 00431024 */ and $v0, $v0, $v1 /* D7B928 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D7B92C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D7B930 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D7B934 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D7B930 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D7B42C) +/* D7B934 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D7B42C) /* D7B938 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D7B93C 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s index 58a47b1344..8c67b9cfb3 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240D6C_D7C00C.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D7C00C /* D7C058 80240DB8 08090384 */ j .L80240E10 /* D7C05C 80240DBC 00000000 */ nop .L80240DC0: -/* D7C060 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D7C064 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D7C060 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D7B3E8) +/* D7C064 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D7B3E8) /* D7C068 80240DC8 08090380 */ j .L80240E00 /* D7C06C 80240DCC 00000000 */ nop .L80240DD0: -/* D7C070 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D7C074 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D7C070 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D7B450) +/* D7C074 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D7B450) /* D7C078 80240DD8 08090380 */ j .L80240E00 /* D7C07C 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D7C00C /* D7C090 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D7C094 80240DF4 00000000 */ nop .L80240DF8: -/* D7C098 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D7C09C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D7C098 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D7B41C) +/* D7C09C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D7B41C) .L80240E00: /* D7C0A0 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D7C0A4 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s index 220dd6aab1..6a09d36288 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F50_D7C1F0.s @@ -4,8 +4,8 @@ glabel func_80240F50_D7C1F0 /* D7C1F0 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D7C1F4 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* D7C1F8 80240F58 3C108024 */ lui $s0, %hi(D_80241690) -/* D7C1FC 80240F5C 26101690 */ addiu $s0, $s0, %lo(D_80241690) +/* D7C1F8 80240F58 3C108024 */ lui $s0, %hi(func_80241690_A08590) +/* D7C1FC 80240F5C 26101690 */ addiu $s0, $s0, %lo(func_80241690_A08590) /* D7C200 80240F60 AFBF0018 */ sw $ra, 0x18($sp) /* D7C204 80240F64 AFB10014 */ sw $s1, 0x14($sp) /* D7C208 80240F68 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240F50_D7C1F0 /* D7C26C 80240FCC 28620010 */ slti $v0, $v1, 0x10 /* D7C270 80240FD0 1440FFFA */ bnez $v0, .L80240FBC /* D7C274 80240FD4 24840004 */ addiu $a0, $a0, 4 -/* D7C278 80240FD8 3C108024 */ lui $s0, %hi(D_80241690) -/* D7C27C 80240FDC 26101690 */ addiu $s0, $s0, %lo(D_80241690) +/* D7C278 80240FD8 3C108024 */ lui $s0, %hi(func_80241690_A08590) +/* D7C27C 80240FDC 26101690 */ addiu $s0, $s0, %lo(func_80241690_A08590) /* D7C280 80240FE0 0C00AB4B */ jal heap_free /* D7C284 80240FE4 8E040000 */ lw $a0, ($s0) /* D7C288 80240FE8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s index 802f09d1ea..3b6711be07 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_802400EC_D7CC3C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D7CC3C /* D7CC3C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D7CC40 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D7CC44 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D7CC48 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D7CC4C 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D7CC48 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D7CBAC) +/* D7CC4C 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D7CBAC) /* D7CC50 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D7CC54 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D7CC58 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s index 46b1b9cb58..2ceb710ee2 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s @@ -37,7 +37,7 @@ glabel func_80240128_D7CC78 /* D7CCF8 802401A8 0C00B94E */ jal get_screen_coords /* D7CCFC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D7CD00 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7CD04 802401B4 0C090008 */ jal pra_29_UnkFunc2 +/* D7CD04 802401B4 0C090008 */ jal func_80240020_D7CB70 /* D7CD08 802401B8 00000000 */ nop /* D7CD0C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D7CD10 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D7CC78 /* D7CE04 802402B4 AC910000 */ sw $s1, ($a0) /* D7CE08 802402B8 AC900008 */ sw $s0, 8($a0) /* D7CE0C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D7CE10 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D7CE14 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D7CE10 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D7CD38) +/* D7CE14 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D7CD38) /* D7CE18 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D7CE1C 802402CC 00021023 */ negu $v0, $v0 /* D7CE20 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s index 5bf0acc8de..21d3f80e36 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_8024049C_D7CFEC.s @@ -11,8 +11,8 @@ glabel func_8024049C_D7CFEC /* D7D004 802404B4 28420002 */ slti $v0, $v0, 2 /* D7D008 802404B8 1040000C */ beqz $v0, .L802404EC /* D7D00C 802404BC 00000000 */ nop -/* D7D010 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D7D014 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D7D010 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D7CBD4) +/* D7D014 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D7CBD4) /* D7D018 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D7D01C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D7D020 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s index e89a2b693b..b7899b17ca 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240500_D7D050.s @@ -84,8 +84,8 @@ glabel func_80240500_D7D050 /* D7D17C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D7D180 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D7D184 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D7D188 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D7D184 80240634 3C048024 */ lui $a0, %hi(func_80240870_D7CEE0) +/* D7D188 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D7CEE0) /* D7D18C 8024063C AE320000 */ sw $s2, ($s1) /* D7D190 80240640 AE300008 */ sw $s0, 8($s1) /* D7D194 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D7D050 /* D7D1A4 80240654 00431024 */ and $v0, $v0, $v1 /* D7D1A8 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D7D1AC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D7D1B0 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D7D1B4 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D7D1B0 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D7CCFC) +/* D7D1B4 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D7CCFC) /* D7D1B8 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D7D1BC 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s index afc18d4c11..d34992acf9 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240D3C_D7D88C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D7D88C /* D7D8D8 80240D88 08090378 */ j .L80240DE0 /* D7D8DC 80240D8C 00000000 */ nop .L80240D90: -/* D7D8E0 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D7D8E4 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D7D8E0 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D7CCB8) +/* D7D8E4 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D7CCB8) /* D7D8E8 80240D98 08090374 */ j .L80240DD0 /* D7D8EC 80240D9C 00000000 */ nop .L80240DA0: -/* D7D8F0 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D7D8F4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D7D8F0 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D7CD20) +/* D7D8F4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D7CD20) /* D7D8F8 80240DA8 08090374 */ j .L80240DD0 /* D7D8FC 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D7D88C /* D7D910 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D7D914 80240DC4 00000000 */ nop .L80240DC8: -/* D7D918 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D7D91C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D7D918 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D7CCEC) +/* D7D91C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D7CCEC) .L80240DD0: /* D7D920 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D7D924 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s index 0677399527..ada8a4713b 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_8024024C_D7EFAC.s @@ -6,11 +6,11 @@ glabel func_8024024C_D7EFAC /* D7EFB0 80240250 AFBF0010 */ sw $ra, 0x10($sp) /* D7EFB4 80240254 10A00003 */ beqz $a1, .L80240264 /* D7EFB8 80240258 8C86000C */ lw $a2, 0xc($a0) -/* D7EFBC 8024025C 3C018024 */ lui $at, %hi(D_8024119C) -/* D7EFC0 80240260 AC20119C */ sw $zero, %lo(D_8024119C)($at) +/* D7EFBC 8024025C 3C018024 */ lui $at, %hi(func_8024119C_C3267C) +/* D7EFC0 80240260 AC20119C */ sw $zero, %lo(func_8024119C_C3267C)($at) .L80240264: -/* D7EFC4 80240264 3C038024 */ lui $v1, %hi(D_8024119C) -/* D7EFC8 80240268 2463119C */ addiu $v1, $v1, %lo(D_8024119C) +/* D7EFC4 80240264 3C038024 */ lui $v1, %hi(func_8024119C_C3267C) +/* D7EFC8 80240268 2463119C */ addiu $v1, $v1, %lo(func_8024119C_C3267C) /* D7EFCC 8024026C 8C620000 */ lw $v0, ($v1) /* D7EFD0 80240270 54400003 */ bnel $v0, $zero, .L80240280 /* D7EFD4 80240274 AC600000 */ sw $zero, ($v1) @@ -18,9 +18,9 @@ glabel func_8024024C_D7EFAC /* D7EFDC 8024027C 0000102D */ daddu $v0, $zero, $zero .L80240280: /* D7EFE0 80240280 8CC50000 */ lw $a1, ($a2) -/* D7EFE4 80240284 3C068024 */ lui $a2, %hi(D_802411A0) +/* D7EFE4 80240284 3C068024 */ lui $a2, %hi(func_802411A0_D6FB50) /* D7EFE8 80240288 0C0B2026 */ jal set_variable -/* D7EFEC 8024028C 8CC611A0 */ lw $a2, %lo(D_802411A0)($a2) +/* D7EFEC 8024028C 8CC611A0 */ lw $a2, %lo(func_802411A0_D6FB50)($a2) /* D7EFF0 80240290 24020002 */ addiu $v0, $zero, 2 .L80240294: /* D7EFF4 80240294 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s index 41aca60151..f2863465b1 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402A0_D7F000.s @@ -7,12 +7,12 @@ glabel func_802402A0_D7F000 /* D7F008 802402A8 8C82000C */ lw $v0, 0xc($a0) /* D7F00C 802402AC 0C0B1EAF */ jal get_variable /* D7F010 802402B0 8C450000 */ lw $a1, ($v0) -/* D7F014 802402B4 3C018024 */ lui $at, %hi(D_802411A0) -/* D7F018 802402B8 AC2211A0 */ sw $v0, %lo(D_802411A0)($at) +/* D7F014 802402B4 3C018024 */ lui $at, %hi(func_802411A0_D6FB50) +/* D7F018 802402B8 AC2211A0 */ sw $v0, %lo(func_802411A0_D6FB50)($at) /* D7F01C 802402BC 24020002 */ addiu $v0, $zero, 2 /* D7F020 802402C0 8FBF0010 */ lw $ra, 0x10($sp) /* D7F024 802402C4 24030001 */ addiu $v1, $zero, 1 -/* D7F028 802402C8 3C018024 */ lui $at, %hi(D_8024119C) -/* D7F02C 802402CC AC23119C */ sw $v1, %lo(D_8024119C)($at) +/* D7F028 802402C8 3C018024 */ lui $at, %hi(func_8024119C_C3267C) +/* D7F02C 802402CC AC23119C */ sw $v1, %lo(func_8024119C_C3267C)($at) /* D7F030 802402D0 03E00008 */ jr $ra /* D7F034 802402D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s index dddf8e5709..a7e6a16afd 100644 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240510_D7F270.s @@ -42,10 +42,10 @@ glabel func_80240510_D7F270 /* D7F2FC 8024059C 28AA0055 */ slti $t2, $a1, 0x55 /* D7F300 802405A0 240BFFFF */ addiu $t3, $zero, -1 /* D7F304 802405A4 26050002 */ addiu $a1, $s0, 2 -/* D7F308 802405A8 3C098024 */ lui $t1, %hi(D_80242514) -/* D7F30C 802405AC 25292514 */ addiu $t1, $t1, %lo(D_80242514) -/* D7F310 802405B0 3C088024 */ lui $t0, %hi(D_802424F0) -/* D7F314 802405B4 250824F0 */ addiu $t0, $t0, %lo(D_802424F0) +/* D7F308 802405A8 3C098024 */ lui $t1, %hi(func_80242514_9C78F4) +/* D7F30C 802405AC 25292514 */ addiu $t1, $t1, %lo(func_80242514_9C78F4) +/* D7F310 802405B0 3C088024 */ lui $t0, %hi(func_802424F0_C38A20) +/* D7F314 802405B4 250824F0 */ addiu $t0, $t0, %lo(func_802424F0_C38A20) .L802405B8: /* D7F318 802405B8 11400009 */ beqz $t2, .L802405E0 /* D7F31C 802405BC 00000000 */ nop @@ -171,8 +171,8 @@ glabel func_80240510_D7F270 /* D7F4DC 8024077C 24630018 */ addiu $v1, $v1, 0x18 /* D7F4E0 80240780 0000482D */ daddu $t1, $zero, $zero /* D7F4E4 80240784 0120382D */ daddu $a3, $t1, $zero -/* D7F4E8 80240788 3C0A8024 */ lui $t2, %hi(D_80242538) -/* D7F4EC 8024078C 254A2538 */ addiu $t2, $t2, %lo(D_80242538) +/* D7F4E8 80240788 3C0A8024 */ lui $t2, %hi(func_80242538_D223C8) +/* D7F4EC 8024078C 254A2538 */ addiu $t2, $t2, %lo(func_80242538_D223C8) /* D7F4F0 80240790 0120402D */ daddu $t0, $t1, $zero .L80240794: /* D7F4F4 80240794 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s index 7e7aa779b2..6d9842c250 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_802400EC_D897CC.s @@ -5,8 +5,8 @@ glabel func_802400EC_D897CC /* D897CC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D897D0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D897D4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D897D8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D897DC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D897D8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D8973C) +/* D897DC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D8973C) /* D897E0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D897E4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D897E8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s index ee4ffc6c5c..8037bfd9fe 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s @@ -37,7 +37,7 @@ glabel func_80240128_D89808 /* D89888 802401A8 0C00B94E */ jal get_screen_coords /* D8988C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D89890 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D89894 802401B4 0C090008 */ jal pra_33_UnkFunc2 +/* D89894 802401B4 0C090008 */ jal func_80240020_D89700 /* D89898 802401B8 00000000 */ nop /* D8989C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D898A0 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D89808 /* D89994 802402B4 AC910000 */ sw $s1, ($a0) /* D89998 802402B8 AC900008 */ sw $s0, 8($a0) /* D8999C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D899A0 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D899A4 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D899A0 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D898C8) +/* D899A4 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D898C8) /* D899A8 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D899AC 802402CC 00021023 */ negu $v0, $v0 /* D899B0 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s index e1015b220b..da791d40ef 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_8024049C_D89B7C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D89B7C /* D89B94 802404B4 28420002 */ slti $v0, $v0, 2 /* D89B98 802404B8 1040000C */ beqz $v0, .L802404EC /* D89B9C 802404BC 00000000 */ nop -/* D89BA0 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D89BA4 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D89BA0 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D89764) +/* D89BA4 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D89764) /* D89BA8 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D89BAC 802404CC 0000202D */ daddu $a0, $zero, $zero /* D89BB0 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s index 660143cd55..e0a86fa5c1 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240500_D89BE0.s @@ -84,8 +84,8 @@ glabel func_80240500_D89BE0 /* D89D0C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D89D10 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D89D14 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D89D18 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D89D14 80240634 3C048024 */ lui $a0, %hi(func_80240870_D89A70) +/* D89D18 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D89A70) /* D89D1C 8024063C AE320000 */ sw $s2, ($s1) /* D89D20 80240640 AE300008 */ sw $s0, 8($s1) /* D89D24 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D89BE0 /* D89D34 80240654 00431024 */ and $v0, $v0, $v1 /* D89D38 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D89D3C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D89D40 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D89D44 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D89D40 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D8988C) +/* D89D44 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D8988C) /* D89D48 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D89D4C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s index 0f77f1526b..13bb0c55d3 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240D3C_D8A41C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D8A41C /* D8A468 80240D88 08090378 */ j .L80240DE0 /* D8A46C 80240D8C 00000000 */ nop .L80240D90: -/* D8A470 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D8A474 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D8A470 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D89848) +/* D8A474 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D89848) /* D8A478 80240D98 08090374 */ j .L80240DD0 /* D8A47C 80240D9C 00000000 */ nop .L80240DA0: -/* D8A480 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D8A484 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D8A480 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D898B0) +/* D8A484 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D898B0) /* D8A488 80240DA8 08090374 */ j .L80240DD0 /* D8A48C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D8A41C /* D8A4A0 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D8A4A4 80240DC4 00000000 */ nop .L80240DC8: -/* D8A4A8 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D8A4AC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D8A4A8 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D8987C) +/* D8A4AC 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D8987C) .L80240DD0: /* D8A4B0 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D8A4B4 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s index 6fa2137b90..fe9f3c6703 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_802400EC_D8B49C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D8B49C /* D8B49C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D8B4A0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D8B4A4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D8B4A8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D8B4AC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D8B4A8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D8B40C) +/* D8B4AC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D8B40C) /* D8B4B0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D8B4B4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D8B4B8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s index 4a777af638..f2a9f13e98 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D8B4D8 /* D8B558 802401A8 0C00B94E */ jal get_screen_coords /* D8B55C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8B560 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8B564 802401B4 0C090008 */ jal pra_34_UnkFunc2 +/* D8B564 802401B4 0C090008 */ jal func_80240020_D8B3D0 /* D8B568 802401B8 00000000 */ nop /* D8B56C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8B570 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D8B4D8 /* D8B664 802402B4 AC910000 */ sw $s1, ($a0) /* D8B668 802402B8 AC900008 */ sw $s0, 8($a0) /* D8B66C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D8B670 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D8B674 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D8B670 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D8B598) +/* D8B674 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D8B598) /* D8B678 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D8B67C 802402CC 00021023 */ negu $v0, $v0 /* D8B680 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s index dea1993047..7fe8ea6928 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_8024049C_D8B84C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D8B84C /* D8B864 802404B4 28420002 */ slti $v0, $v0, 2 /* D8B868 802404B8 1040000C */ beqz $v0, .L802404EC /* D8B86C 802404BC 00000000 */ nop -/* D8B870 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D8B874 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D8B870 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D8B434) +/* D8B874 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D8B434) /* D8B878 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D8B87C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D8B880 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s index 064692f230..8f8f09cb6d 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240500_D8B8B0.s @@ -84,8 +84,8 @@ glabel func_80240500_D8B8B0 /* D8B9DC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D8B9E0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D8B9E4 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D8B9E8 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D8B9E4 80240634 3C048024 */ lui $a0, %hi(func_80240870_D8B740) +/* D8B9E8 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D8B740) /* D8B9EC 8024063C AE320000 */ sw $s2, ($s1) /* D8B9F0 80240640 AE300008 */ sw $s0, 8($s1) /* D8B9F4 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D8B8B0 /* D8BA04 80240654 00431024 */ and $v0, $v0, $v1 /* D8BA08 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D8BA0C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D8BA10 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D8BA14 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D8BA10 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D8B55C) +/* D8BA14 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D8B55C) /* D8BA18 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D8BA1C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s index b9daa9dc99..1ee0526281 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240D3C_D8C0EC.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D8C0EC /* D8C138 80240D88 08090378 */ j .L80240DE0 /* D8C13C 80240D8C 00000000 */ nop .L80240D90: -/* D8C140 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D8C144 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D8C140 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D8B518) +/* D8C144 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D8B518) /* D8C148 80240D98 08090374 */ j .L80240DD0 /* D8C14C 80240D9C 00000000 */ nop .L80240DA0: -/* D8C150 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D8C154 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D8C150 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D8B580) +/* D8C154 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D8B580) /* D8C158 80240DA8 08090374 */ j .L80240DD0 /* D8C15C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D8C0EC /* D8C170 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D8C174 80240DC4 00000000 */ nop .L80240DC8: -/* D8C178 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D8C17C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D8C178 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D8B54C) +/* D8C17C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D8B54C) .L80240DD0: /* D8C180 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D8C184 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s index ad7485ec78..cc06ab7c01 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802400EC_D8D33C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D8D33C /* D8D33C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D8D340 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D8D344 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D8D348 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D8D34C 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D8D348 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D8D2AC) +/* D8D34C 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D8D2AC) /* D8D350 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D8D354 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D8D358 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s index a951b1bca0..d1785c5ae7 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s @@ -37,7 +37,7 @@ glabel func_80240128_D8D378 /* D8D3F8 802401A8 0C00B94E */ jal get_screen_coords /* D8D3FC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8D400 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8D404 802401B4 0C090008 */ jal pra_35_UnkFunc2 +/* D8D404 802401B4 0C090008 */ jal func_80240020_D8D270 /* D8D408 802401B8 00000000 */ nop /* D8D40C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8D410 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D8D378 /* D8D504 802402B4 AC910000 */ sw $s1, ($a0) /* D8D508 802402B8 AC900008 */ sw $s0, 8($a0) /* D8D50C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D8D510 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D8D514 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D8D510 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D8D438) +/* D8D514 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D8D438) /* D8D518 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D8D51C 802402CC 00021023 */ negu $v0, $v0 /* D8D520 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s index 28e2a7ea51..ce46e28c4b 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024049C_D8D6EC.s @@ -11,8 +11,8 @@ glabel func_8024049C_D8D6EC /* D8D704 802404B4 28420002 */ slti $v0, $v0, 2 /* D8D708 802404B8 1040000C */ beqz $v0, .L802404EC /* D8D70C 802404BC 00000000 */ nop -/* D8D710 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D8D714 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D8D710 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D8D2D4) +/* D8D714 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D8D2D4) /* D8D718 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D8D71C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D8D720 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s index 028ada2b18..3a3d28a3ad 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240500_D8D750.s @@ -84,8 +84,8 @@ glabel func_80240500_D8D750 /* D8D87C 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D8D880 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D8D884 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D8D888 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D8D884 80240634 3C048024 */ lui $a0, %hi(func_80240870_D8D5E0) +/* D8D888 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D8D5E0) /* D8D88C 8024063C AE320000 */ sw $s2, ($s1) /* D8D890 80240640 AE300008 */ sw $s0, 8($s1) /* D8D894 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D8D750 /* D8D8A4 80240654 00431024 */ and $v0, $v0, $v1 /* D8D8A8 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D8D8AC 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D8D8B0 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D8D8B4 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D8D8B0 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D8D3FC) +/* D8D8B4 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D8D3FC) /* D8D8B8 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D8D8BC 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s index 493b3c40cb..30b9e38d2b 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240D3C_D8DF8C.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D8DF8C /* D8DFD8 80240D88 08090378 */ j .L80240DE0 /* D8DFDC 80240D8C 00000000 */ nop .L80240D90: -/* D8DFE0 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D8DFE4 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D8DFE0 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D8D3B8) +/* D8DFE4 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D8D3B8) /* D8DFE8 80240D98 08090374 */ j .L80240DD0 /* D8DFEC 80240D9C 00000000 */ nop .L80240DA0: -/* D8DFF0 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D8DFF4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D8DFF0 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D8D420) +/* D8DFF4 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D8D420) /* D8DFF8 80240DA8 08090374 */ j .L80240DD0 /* D8DFFC 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D8DF8C /* D8E010 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D8E014 80240DC4 00000000 */ nop .L80240DC8: -/* D8E018 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D8E01C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D8E018 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D8D3EC) +/* D8E01C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D8D3EC) .L80240DD0: /* D8E020 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D8E024 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 3bfe2d61e8..89027b624a 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -141,7 +141,7 @@ glabel func_80241AB4_D8ED04 /* D8EF0C 80241CBC 00000000 */ nop /* D8EF10 80241CC0 0280202D */ daddu $a0, $s4, $zero /* D8EF14 80241CC4 0260282D */ daddu $a1, $s3, $zero -/* D8EF18 80241CC8 0C0904C8 */ jal pra_35_UnkNpcAIFunc1 +/* D8EF18 80241CC8 0C0904C8 */ jal func_80241320_D8E570 /* D8EF1C 80241CCC 02A0302D */ daddu $a2, $s5, $zero /* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241AB4_D8ED04 /* D8EF4C 80241CFC 00000000 */ nop /* D8EF50 80241D00 0280202D */ daddu $a0, $s4, $zero /* D8EF54 80241D04 0260282D */ daddu $a1, $s3, $zero -/* D8EF58 80241D08 0C090594 */ jal pra_35_NpcJumpFunc2 +/* D8EF58 80241D08 0C090594 */ jal func_80241650_D8E8A0 /* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero /* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero -/* D8EF68 80241D18 0C0905B1 */ jal pra_35_NpcJumpFunc +/* D8EF68 80241D18 0C0905B1 */ jal func_802416C4_D8E914 /* D8EF6C 80241D1C 02A0302D */ daddu $a2, $s5, $zero /* D8EF70 80241D20 08090762 */ j .L80241D88 /* D8EF74 80241D24 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241AB4_D8ED04 /* D8EF9C 80241D4C 00000000 */ nop /* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero /* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero -/* D8EFA8 80241D58 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc +/* D8EFA8 80241D58 0C090663 */ jal func_8024198C_D8EBDC /* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* D8EFB0 80241D60 08090762 */ j .L80241D88 /* D8EFB4 80241D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index b166d5385b..e6094c5c53 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -46,7 +46,7 @@ glabel func_802423CC_D8F61C /* D8F6C0 80242470 8E2200B0 */ lw $v0, 0xb0($s1) /* D8F6C4 80242474 30420004 */ andi $v0, $v0, 4 /* D8F6C8 80242478 10400020 */ beqz $v0, .L802424FC -/* D8F6CC 8024247C 00000000 */ nop +/* D8F6CC 8024247C 00000000 */ nop .L80242480: /* D8F6D0 80242480 2404F7FF */ addiu $a0, $zero, -0x801 /* D8F6D4 80242484 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802423CC_D8F61C /* D8F74C 802424FC 8E420070 */ lw $v0, 0x70($s2) /* D8F750 80242500 2842001E */ slti $v0, $v0, 0x1e /* D8F754 80242504 10400009 */ beqz $v0, .L8024252C -/* D8F758 80242508 00000000 */ nop +/* D8F758 80242508 00000000 */ nop /* D8F75C 8024250C 8E22006C */ lw $v0, 0x6c($s1) /* D8F760 80242510 14400006 */ bnez $v0, .L8024252C -/* D8F764 80242514 00000000 */ nop +/* D8F764 80242514 00000000 */ nop /* D8F768 80242518 0C0907EE */ jal func_80241FB8_D8F208 /* D8F76C 8024251C 0240202D */ daddu $a0, $s2, $zero /* D8F770 80242520 10400002 */ beqz $v0, .L8024252C @@ -104,7 +104,7 @@ glabel func_802423CC_D8F61C /* D8F790 80242540 00220821 */ addu $at, $at, $v0 /* D8F794 80242544 8C224188 */ lw $v0, %lo(D_80244188)($at) /* D8F798 80242548 00400008 */ jr $v0 -/* D8F79C 8024254C 00000000 */ nop +/* D8F79C 8024254C 00000000 */ nop /* D8F7A0 80242550 0240202D */ daddu $a0, $s2, $zero /* D8F7A4 80242554 0260282D */ daddu $a1, $s3, $zero /* D8F7A8 80242558 0C0903C8 */ jal func_80240F20_D8E170 @@ -114,33 +114,33 @@ glabel func_802423CC_D8F61C /* D8F7B8 80242568 0C09041E */ jal func_80241078_D8E2C8 /* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero /* D8F7C0 80242570 0809099C */ j .L80242670 -/* D8F7C4 80242574 00000000 */ nop +/* D8F7C4 80242574 00000000 */ nop /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero -/* D8F7D0 80242580 0C0904C8 */ jal pra_35_UnkNpcAIFunc1 +/* D8F7D0 80242580 0C0904C8 */ jal func_80241320_D8E570 /* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero /* D8F7E0 80242590 0C0904F8 */ jal func_802413E0_D8E630 /* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero /* D8F7E8 80242598 0809099C */ j .L80242670 -/* D8F7EC 8024259C 00000000 */ nop +/* D8F7EC 8024259C 00000000 */ nop /* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero /* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero /* D8F7F8 802425A8 0C090567 */ jal func_8024159C_D8E7EC /* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero /* D8F800 802425B0 0809099C */ j .L80242670 -/* D8F804 802425B4 00000000 */ nop +/* D8F804 802425B4 00000000 */ nop /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero /* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero -/* D8F810 802425C0 0C090594 */ jal pra_35_NpcJumpFunc2 +/* D8F810 802425C0 0C090594 */ jal func_80241650_D8E8A0 /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero -/* D8F820 802425D0 0C0905B1 */ jal pra_35_NpcJumpFunc +/* D8F820 802425D0 0C0905B1 */ jal func_802416C4_D8E914 /* D8F824 802425D4 0280302D */ daddu $a2, $s4, $zero /* D8F828 802425D8 0809099C */ j .L80242670 -/* D8F82C 802425DC 00000000 */ nop +/* D8F82C 802425DC 00000000 */ nop /* D8F830 802425E0 0240202D */ daddu $a0, $s2, $zero /* D8F834 802425E4 0260282D */ daddu $a1, $s3, $zero /* D8F838 802425E8 0C0905CF */ jal func_8024173C_D8E98C @@ -150,31 +150,31 @@ glabel func_802423CC_D8F61C /* D8F848 802425F8 0C09061B */ jal func_8024186C_D8EABC /* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero /* D8F850 80242600 0809099C */ j .L80242670 -/* D8F854 80242604 00000000 */ nop +/* D8F854 80242604 00000000 */ nop /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero -/* D8F860 80242610 0C090663 */ jal pra_35_UnkNpcDurationFlagFunc +/* D8F860 80242610 0C090663 */ jal func_8024198C_D8EBDC /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 -/* D8F86C 8024261C 00000000 */ nop -/* D8F870 80242620 0C09076C */ jal pra_35_UnkNpcAIFunc6 +/* D8F86C 8024261C 00000000 */ nop +/* D8F870 80242620 0C09076C */ jal func_80241DB0_D8F000 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero -/* D8F878 80242628 0C090787 */ jal pra_35_UnkNpcAIFunc7 +/* D8F878 80242628 0C090787 */ jal func_80241E1C_D8F06C /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 /* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 -/* D8F88C 8024263C 00000000 */ nop -/* D8F890 80242640 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 +/* D8F88C 8024263C 00000000 */ nop +/* D8F890 80242640 0C0907A3 */ jal func_80241E8C_D8F0DC /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 -/* D8F8A4 80242654 00000000 */ nop -/* D8F8A8 80242658 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 +/* D8F8A4 80242654 00000000 */ nop +/* D8F8A8 80242658 0C0907D9 */ jal func_80241F64_D8F1B4 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670 -/* D8F8B4 80242664 00000000 */ nop +/* D8F8B4 80242664 00000000 */ nop /* D8F8B8 80242668 0C0129CF */ jal func_8004A73C /* D8F8BC 8024266C 0240202D */ daddu $a0, $s2, $zero .L80242670: diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s index 5f7b82026d..1b4f49013f 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -46,7 +46,7 @@ glabel func_80242698_D8F8E8 /* D8F98C 8024273C 8E2200B0 */ lw $v0, 0xb0($s1) /* D8F990 80242740 30420004 */ andi $v0, $v0, 4 /* D8F994 80242744 10400020 */ beqz $v0, .L802427C8 -/* D8F998 80242748 00000000 */ nop +/* D8F998 80242748 00000000 */ nop .L8024274C: /* D8F99C 8024274C 2404F7FF */ addiu $a0, $zero, -0x801 /* D8F9A0 80242750 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80242698_D8F8E8 /* D8FA18 802427C8 8E420070 */ lw $v0, 0x70($s2) /* D8FA1C 802427CC 2842001E */ slti $v0, $v0, 0x1e /* D8FA20 802427D0 10400009 */ beqz $v0, .L802427F8 -/* D8FA24 802427D4 00000000 */ nop +/* D8FA24 802427D4 00000000 */ nop /* D8FA28 802427D8 8E22006C */ lw $v0, 0x6c($s1) /* D8FA2C 802427DC 14400006 */ bnez $v0, .L802427F8 -/* D8FA30 802427E0 00000000 */ nop +/* D8FA30 802427E0 00000000 */ nop /* D8FA34 802427E4 0C0907EE */ jal func_80241FB8_D8F208 /* D8FA38 802427E8 0240202D */ daddu $a0, $s2, $zero /* D8FA3C 802427EC 10400002 */ beqz $v0, .L802427F8 @@ -104,7 +104,7 @@ glabel func_80242698_D8F8E8 /* D8FA5C 8024280C 00220821 */ addu $at, $at, $v0 /* D8FA60 80242810 8C224318 */ lw $v0, %lo(D_80244318)($at) /* D8FA64 80242814 00400008 */ jr $v0 -/* D8FA68 80242818 00000000 */ nop +/* D8FA68 80242818 00000000 */ nop /* D8FA6C 8024281C 0240202D */ daddu $a0, $s2, $zero /* D8FA70 80242820 0260282D */ daddu $a1, $s3, $zero /* D8FA74 80242824 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80242698_D8F8E8 /* D8FA84 80242834 0C0125AE */ jal func_800496B8 /* D8FA88 80242838 0280302D */ daddu $a2, $s4, $zero /* D8FA8C 8024283C 08090A49 */ j .L80242924 -/* D8FA90 80242840 00000000 */ nop +/* D8FA90 80242840 00000000 */ nop /* D8FA94 80242844 0240202D */ daddu $a0, $s2, $zero /* D8FA98 80242848 0260282D */ daddu $a1, $s3, $zero -/* D8FA9C 8024284C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D8FA9C 8024284C 0C0126D1 */ jal func_80049B44 /* D8FAA0 80242850 0280302D */ daddu $a2, $s4, $zero /* D8FAA4 80242854 0240202D */ daddu $a0, $s2, $zero /* D8FAA8 80242858 0260282D */ daddu $a1, $s3, $zero /* D8FAAC 8024285C 0C012701 */ jal func_80049C04 /* D8FAB0 80242860 0280302D */ daddu $a2, $s4, $zero /* D8FAB4 80242864 08090A49 */ j .L80242924 -/* D8FAB8 80242868 00000000 */ nop +/* D8FAB8 80242868 00000000 */ nop /* D8FABC 8024286C 0240202D */ daddu $a0, $s2, $zero /* D8FAC0 80242870 0260282D */ daddu $a1, $s3, $zero /* D8FAC4 80242874 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80242698_D8F8E8 /* D8FAD4 80242884 0C0127B3 */ jal func_80049ECC /* D8FAD8 80242888 0280302D */ daddu $a2, $s4, $zero /* D8FADC 8024288C 08090A49 */ j .L80242924 -/* D8FAE0 80242890 00000000 */ nop +/* D8FAE0 80242890 00000000 */ nop /* D8FAE4 80242894 0240202D */ daddu $a0, $s2, $zero /* D8FAE8 80242898 0260282D */ daddu $a1, $s3, $zero /* D8FAEC 8024289C 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80242698_D8F8E8 /* D8FAFC 802428AC 0C012849 */ jal func_8004A124 /* D8FB00 802428B0 0280302D */ daddu $a2, $s4, $zero /* D8FB04 802428B4 08090A49 */ j .L80242924 -/* D8FB08 802428B8 00000000 */ nop +/* D8FB08 802428B8 00000000 */ nop /* D8FB0C 802428BC 0240202D */ daddu $a0, $s2, $zero /* D8FB10 802428C0 0260282D */ daddu $a1, $s3, $zero /* D8FB14 802428C4 0C0128FA */ jal func_8004A3E8 /* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero /* D8FB1C 802428CC 08090A49 */ j .L80242924 -/* D8FB20 802428D0 00000000 */ nop -/* D8FB24 802428D4 0C09076C */ jal pra_35_UnkNpcAIFunc6 +/* D8FB20 802428D0 00000000 */ nop +/* D8FB24 802428D4 0C09076C */ jal func_80241DB0_D8F000 /* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero -/* D8FB2C 802428DC 0C090787 */ jal pra_35_UnkNpcAIFunc7 +/* D8FB2C 802428DC 0C090787 */ jal func_80241E1C_D8F06C /* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero /* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) /* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 /* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 -/* D8FB40 802428F0 00000000 */ nop -/* D8FB44 802428F4 0C0907A3 */ jal pra_35_UnkNpcAIFunc8 +/* D8FB40 802428F0 00000000 */ nop +/* D8FB44 802428F4 0C0907A3 */ jal func_80241E8C_D8F0DC /* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero /* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) /* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 /* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 -/* D8FB58 80242908 00000000 */ nop -/* D8FB5C 8024290C 0C0907D9 */ jal pra_35_UnkNpcAIFunc5 +/* D8FB58 80242908 00000000 */ nop +/* D8FB5C 8024290C 0C0907D9 */ jal func_80241F64_D8F1B4 /* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero /* D8FB64 80242914 08090A49 */ j .L80242924 -/* D8FB68 80242918 00000000 */ nop +/* D8FB68 80242918 00000000 */ nop /* D8FB6C 8024291C 0C0129CF */ jal func_8004A73C /* D8FB70 80242920 0240202D */ daddu $a0, $s2, $zero .L80242924: @@ -182,4 +182,4 @@ glabel func_80242698_D8F8E8 /* D8FB90 80242940 0000102D */ daddu $v0, $zero, $zero /* D8FB94 80242944 03E00008 */ jr $ra /* D8FB98 80242948 27BD0050 */ addiu $sp, $sp, 0x50 -/* D8FB9C 8024294C 00000000 */ nop +/* D8FB9C 8024294C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s index 69c7a4677e..5537eda131 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_8024011C_D9181C.s @@ -5,8 +5,8 @@ glabel func_8024011C_D9181C /* D9181C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D91820 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D91824 80240124 0080802D */ daddu $s0, $a0, $zero -/* D91828 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D9182C 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D91828 80240128 3C058024 */ lui $a1, %hi(func_80240158_D9173C) +/* D9182C 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D9173C) /* D91830 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D91834 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D91838 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s index 58894fcfdd..4a23ba99b9 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s @@ -37,7 +37,7 @@ glabel func_80240158_D91858 /* D918D8 802401D8 0C00B94E */ jal get_screen_coords /* D918DC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D918E0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D918E4 802401E4 0C090014 */ jal pra_36_UnkFunc2 +/* D918E4 802401E4 0C090014 */ jal func_80240050_D91750 /* D918E8 802401E8 00000000 */ nop /* D918EC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D918F0 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D91858 /* D919E4 802402E4 AC910000 */ sw $s1, ($a0) /* D919E8 802402E8 AC900008 */ sw $s0, 8($a0) /* D919EC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D919F0 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D919F4 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D919F0 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D918C8) +/* D919F4 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D918C8) /* D919F8 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D919FC 802402FC 00021023 */ negu $v0, $v0 /* D91A00 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s index 3c323aeb73..b1ebfc9063 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_802404CC_D91BCC.s @@ -11,8 +11,8 @@ glabel func_802404CC_D91BCC /* D91BE4 802404E4 28420002 */ slti $v0, $v0, 2 /* D91BE8 802404E8 1040000C */ beqz $v0, .L8024051C /* D91BEC 802404EC 00000000 */ nop -/* D91BF0 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D91BF4 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D91BF0 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D91764) +/* D91BF4 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D91764) /* D91BF8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D91BFC 802404FC 0000202D */ daddu $a0, $zero, $zero /* D91C00 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s index 63b2f3a542..e8446be461 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240530_D91C30.s @@ -84,8 +84,8 @@ glabel func_80240530_D91C30 /* D91D5C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D91D60 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D91D64 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D91D68 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D91D64 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D91A70) +/* D91D68 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D91A70) /* D91D6C 8024066C AE320000 */ sw $s2, ($s1) /* D91D70 80240670 AE300008 */ sw $s0, 8($s1) /* D91D74 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D91C30 /* D91D84 80240684 00431024 */ and $v0, $v0, $v1 /* D91D88 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D91D8C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D91D90 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D91D94 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D91D90 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D9188C) +/* D91D94 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D9188C) /* D91D98 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D91D9C 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s index ce55025da7..3352cb2621 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240D6C_D9246C.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D9246C /* D924B8 80240DB8 08090384 */ j .L80240E10 /* D924BC 80240DBC 00000000 */ nop .L80240DC0: -/* D924C0 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D924C4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D924C0 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D91848) +/* D924C4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D91848) /* D924C8 80240DC8 08090380 */ j .L80240E00 /* D924CC 80240DCC 00000000 */ nop .L80240DD0: -/* D924D0 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D924D4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D924D0 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D918B0) +/* D924D4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D918B0) /* D924D8 80240DD8 08090380 */ j .L80240E00 /* D924DC 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D9246C /* D924F0 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D924F4 80240DF4 00000000 */ nop .L80240DF8: -/* D924F8 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D924FC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D924F8 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D9187C) +/* D924FC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D9187C) .L80240E00: /* D92500 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D92504 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s index ff536a8597..678debe96b 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240000_D92F40.s @@ -15,9 +15,9 @@ glabel func_80240000_D92F40 /* D92F68 80240028 A0620084 */ sb $v0, 0x84($v1) /* D92F6C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) /* D92F70 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* D92F74 80240034 3C058024 */ lui $a1, %hi(D_802424F0) +/* D92F74 80240034 3C058024 */ lui $a1, %hi(func_802424F0_C38A20) /* D92F78 80240038 0C01953C */ jal sprintf -/* D92F7C 8024003C 24A524F0 */ addiu $a1, $a1, %lo(D_802424F0) +/* D92F7C 8024003C 24A524F0 */ addiu $a1, $a1, %lo(func_802424F0_C38A20) /* D92F80 80240040 8FBF0010 */ lw $ra, 0x10($sp) /* D92F84 80240044 0000102D */ daddu $v0, $zero, $zero /* D92F88 80240048 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s index eb5da8089a..806bbea699 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024011C_D9305C.s @@ -5,8 +5,8 @@ glabel func_8024011C_D9305C /* D9305C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D93060 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D93064 80240124 0080802D */ daddu $s0, $a0, $zero -/* D93068 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D9306C 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D93068 80240128 3C058024 */ lui $a1, %hi(func_80240158_D92F7C) +/* D9306C 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D92F7C) /* D93070 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D93074 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D93078 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s index 63eeb19d46..abbc42b412 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s @@ -37,7 +37,7 @@ glabel func_80240158_D93098 /* D93118 802401D8 0C00B94E */ jal get_screen_coords /* D9311C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D93120 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D93124 802401E4 0C090014 */ jal pra_37_UnkFunc2 +/* D93124 802401E4 0C090014 */ jal func_80240050_D92F90 /* D93128 802401E8 00000000 */ nop /* D9312C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D93130 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D93098 /* D93224 802402E4 AC910000 */ sw $s1, ($a0) /* D93228 802402E8 AC900008 */ sw $s0, 8($a0) /* D9322C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D93230 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D93234 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D93230 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D93108) +/* D93234 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D93108) /* D93238 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D9323C 802402FC 00021023 */ negu $v0, $v0 /* D93240 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s index ffaa151c34..f8e024e191 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_802404CC_D9340C.s @@ -11,8 +11,8 @@ glabel func_802404CC_D9340C /* D93424 802404E4 28420002 */ slti $v0, $v0, 2 /* D93428 802404E8 1040000C */ beqz $v0, .L8024051C /* D9342C 802404EC 00000000 */ nop -/* D93430 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D93434 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D93430 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D92FA4) +/* D93434 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D92FA4) /* D93438 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D9343C 802404FC 0000202D */ daddu $a0, $zero, $zero /* D93440 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s index da69982655..d2f456349f 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240530_D93470.s @@ -84,8 +84,8 @@ glabel func_80240530_D93470 /* D9359C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D935A0 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D935A4 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D935A8 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D935A4 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D932B0) +/* D935A8 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D932B0) /* D935AC 8024066C AE320000 */ sw $s2, ($s1) /* D935B0 80240670 AE300008 */ sw $s0, 8($s1) /* D935B4 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D93470 /* D935C4 80240684 00431024 */ and $v0, $v0, $v1 /* D935C8 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D935CC 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D935D0 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D935D4 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D935D0 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D930CC) +/* D935D4 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D930CC) /* D935D8 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D935DC 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s index b9986f92ca..963f99c562 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240D6C_D93CAC.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D93CAC /* D93CF8 80240DB8 08090384 */ j .L80240E10 /* D93CFC 80240DBC 00000000 */ nop .L80240DC0: -/* D93D00 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D93D04 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D93D00 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D93088) +/* D93D04 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D93088) /* D93D08 80240DC8 08090380 */ j .L80240E00 /* D93D0C 80240DCC 00000000 */ nop .L80240DD0: -/* D93D10 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D93D14 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D93D10 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D930F0) +/* D93D14 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D930F0) /* D93D18 80240DD8 08090380 */ j .L80240E00 /* D93D1C 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D93CAC /* D93D30 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D93D34 80240DF4 00000000 */ nop .L80240DF8: -/* D93D38 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D93D3C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D93D38 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D930BC) +/* D93D3C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D930BC) .L80240E00: /* D93D40 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D93D44 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s index 147187671f..c2c31fc3ca 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -46,7 +46,7 @@ glabel func_8024156C_D944AC /* D94550 80241610 8E2200B0 */ lw $v0, 0xb0($s1) /* D94554 80241614 30420004 */ andi $v0, $v0, 4 /* D94558 80241618 10400020 */ beqz $v0, .L8024169C -/* D9455C 8024161C 00000000 */ nop +/* D9455C 8024161C 00000000 */ nop .L80241620: /* D94560 80241620 2404F7FF */ addiu $a0, $zero, -0x801 /* D94564 80241624 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024156C_D944AC /* D945DC 8024169C 8E420070 */ lw $v0, 0x70($s2) /* D945E0 802416A0 2842001E */ slti $v0, $v0, 0x1e /* D945E4 802416A4 10400009 */ beqz $v0, .L802416CC -/* D945E8 802416A8 00000000 */ nop +/* D945E8 802416A8 00000000 */ nop /* D945EC 802416AC 8E22006C */ lw $v0, 0x6c($s1) /* D945F0 802416B0 14400006 */ bnez $v0, .L802416CC -/* D945F4 802416B4 00000000 */ nop +/* D945F4 802416B4 00000000 */ nop /* D945F8 802416B8 0C090456 */ jal func_80241158_D94098 /* D945FC 802416BC 0240202D */ daddu $a0, $s2, $zero /* D94600 802416C0 10400002 */ beqz $v0, .L802416CC @@ -104,7 +104,7 @@ glabel func_8024156C_D944AC /* D94620 802416E0 00220821 */ addu $at, $at, $v0 /* D94624 802416E4 8C222518 */ lw $v0, %lo(D_80242518)($at) /* D94628 802416E8 00400008 */ jr $v0 -/* D9462C 802416EC 00000000 */ nop +/* D9462C 802416EC 00000000 */ nop /* D94630 802416F0 0240202D */ daddu $a0, $s2, $zero /* D94634 802416F4 0260282D */ daddu $a1, $s3, $zero /* D94638 802416F8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024156C_D944AC /* D94648 80241708 0C0125AE */ jal func_800496B8 /* D9464C 8024170C 0280302D */ daddu $a2, $s4, $zero /* D94650 80241710 080905FE */ j .L802417F8 -/* D94654 80241714 00000000 */ nop +/* D94654 80241714 00000000 */ nop /* D94658 80241718 0240202D */ daddu $a0, $s2, $zero /* D9465C 8024171C 0260282D */ daddu $a1, $s3, $zero -/* D94660 80241720 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D94660 80241720 0C0126D1 */ jal func_80049B44 /* D94664 80241724 0280302D */ daddu $a2, $s4, $zero /* D94668 80241728 0240202D */ daddu $a0, $s2, $zero /* D9466C 8024172C 0260282D */ daddu $a1, $s3, $zero /* D94670 80241730 0C012701 */ jal func_80049C04 /* D94674 80241734 0280302D */ daddu $a2, $s4, $zero /* D94678 80241738 080905FE */ j .L802417F8 -/* D9467C 8024173C 00000000 */ nop +/* D9467C 8024173C 00000000 */ nop /* D94680 80241740 0240202D */ daddu $a0, $s2, $zero /* D94684 80241744 0260282D */ daddu $a1, $s3, $zero /* D94688 80241748 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024156C_D944AC /* D94698 80241758 0C0127B3 */ jal func_80049ECC /* D9469C 8024175C 0280302D */ daddu $a2, $s4, $zero /* D946A0 80241760 080905FE */ j .L802417F8 -/* D946A4 80241764 00000000 */ nop +/* D946A4 80241764 00000000 */ nop /* D946A8 80241768 0240202D */ daddu $a0, $s2, $zero /* D946AC 8024176C 0260282D */ daddu $a1, $s3, $zero /* D946B0 80241770 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024156C_D944AC /* D946C0 80241780 0C012849 */ jal func_8004A124 /* D946C4 80241784 0280302D */ daddu $a2, $s4, $zero /* D946C8 80241788 080905FE */ j .L802417F8 -/* D946CC 8024178C 00000000 */ nop +/* D946CC 8024178C 00000000 */ nop /* D946D0 80241790 0240202D */ daddu $a0, $s2, $zero /* D946D4 80241794 0260282D */ daddu $a1, $s3, $zero /* D946D8 80241798 0C0128FA */ jal func_8004A3E8 /* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero /* D946E0 802417A0 080905FE */ j .L802417F8 -/* D946E4 802417A4 00000000 */ nop -/* D946E8 802417A8 0C0903D4 */ jal pra_37_UnkNpcAIFunc6 +/* D946E4 802417A4 00000000 */ nop +/* D946E8 802417A8 0C0903D4 */ jal func_80240F50_D93E90 /* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero -/* D946F0 802417B0 0C0903EF */ jal pra_37_UnkNpcAIFunc7 +/* D946F0 802417B0 0C0903EF */ jal func_80240FBC_D93EFC /* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero /* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) /* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 /* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 -/* D94704 802417C4 00000000 */ nop -/* D94708 802417C8 0C09040B */ jal pra_37_UnkNpcAIFunc8 +/* D94704 802417C4 00000000 */ nop +/* D94708 802417C8 0C09040B */ jal func_8024102C_D93F6C /* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero /* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) /* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 /* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 -/* D9471C 802417DC 00000000 */ nop -/* D94720 802417E0 0C090441 */ jal pra_37_UnkNpcAIFunc5 +/* D9471C 802417DC 00000000 */ nop +/* D94720 802417E0 0C090441 */ jal func_80241104_D94044 /* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero /* D94728 802417E8 080905FE */ j .L802417F8 -/* D9472C 802417EC 00000000 */ nop +/* D9472C 802417EC 00000000 */ nop /* D94730 802417F0 0C0129CF */ jal func_8004A73C /* D94734 802417F4 0240202D */ daddu $a0, $s2, $zero .L802417F8: diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s index fd58d99e93..21aa9ed9a7 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240000_D955F0.s @@ -15,9 +15,9 @@ glabel func_80240000_D955F0 /* D95618 80240028 A0620084 */ sb $v0, 0x84($v1) /* D9561C 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) /* D95620 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* D95624 80240034 3C058024 */ lui $a1, %hi(D_80242230) +/* D95624 80240034 3C058024 */ lui $a1, %hi(func_80242230_CF4E00) /* D95628 80240038 0C01953C */ jal sprintf -/* D9562C 8024003C 24A52230 */ addiu $a1, $a1, %lo(D_80242230) +/* D9562C 8024003C 24A52230 */ addiu $a1, $a1, %lo(func_80242230_CF4E00) /* D95630 80240040 8FBF0010 */ lw $ra, 0x10($sp) /* D95634 80240044 0000102D */ daddu $v0, $zero, $zero /* D95638 80240048 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s index 5418993d2b..2dd6962fb7 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_8024011C_D9570C.s @@ -5,8 +5,8 @@ glabel func_8024011C_D9570C /* D9570C 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D95710 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D95714 80240124 0080802D */ daddu $s0, $a0, $zero -/* D95718 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D9571C 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D95718 80240128 3C058024 */ lui $a1, %hi(func_80240158_D9562C) +/* D9571C 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D9562C) /* D95720 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D95724 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D95728 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s index 1998f1721e..3d00a82cda 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s @@ -37,7 +37,7 @@ glabel func_80240158_D95748 /* D957C8 802401D8 0C00B94E */ jal get_screen_coords /* D957CC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D957D0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D957D4 802401E4 0C090014 */ jal pra_38_UnkFunc2 +/* D957D4 802401E4 0C090014 */ jal func_80240050_D95640 /* D957D8 802401E8 00000000 */ nop /* D957DC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D957E0 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D95748 /* D958D4 802402E4 AC910000 */ sw $s1, ($a0) /* D958D8 802402E8 AC900008 */ sw $s0, 8($a0) /* D958DC 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D958E0 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D958E4 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D958E0 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D957B8) +/* D958E4 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D957B8) /* D958E8 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D958EC 802402FC 00021023 */ negu $v0, $v0 /* D958F0 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s index 82d3e2ecd4..eb9673b0a8 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_802404CC_D95ABC.s @@ -11,8 +11,8 @@ glabel func_802404CC_D95ABC /* D95AD4 802404E4 28420002 */ slti $v0, $v0, 2 /* D95AD8 802404E8 1040000C */ beqz $v0, .L8024051C /* D95ADC 802404EC 00000000 */ nop -/* D95AE0 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D95AE4 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D95AE0 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D95654) +/* D95AE4 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D95654) /* D95AE8 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D95AEC 802404FC 0000202D */ daddu $a0, $zero, $zero /* D95AF0 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s index c0f5d4fb0b..90f20b0a46 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240530_D95B20.s @@ -84,8 +84,8 @@ glabel func_80240530_D95B20 /* D95C4C 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D95C50 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D95C54 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D95C58 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D95C54 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D95960) +/* D95C58 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D95960) /* D95C5C 8024066C AE320000 */ sw $s2, ($s1) /* D95C60 80240670 AE300008 */ sw $s0, 8($s1) /* D95C64 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D95B20 /* D95C74 80240684 00431024 */ and $v0, $v0, $v1 /* D95C78 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D95C7C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D95C80 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D95C84 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D95C80 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D9577C) +/* D95C84 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D9577C) /* D95C88 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D95C8C 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s index 4c6daf0925..18d3bafac1 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240D6C_D9635C.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D9635C /* D963A8 80240DB8 08090384 */ j .L80240E10 /* D963AC 80240DBC 00000000 */ nop .L80240DC0: -/* D963B0 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D963B4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D963B0 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D95738) +/* D963B4 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D95738) /* D963B8 80240DC8 08090380 */ j .L80240E00 /* D963BC 80240DCC 00000000 */ nop .L80240DD0: -/* D963C0 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D963C4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D963C0 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D957A0) +/* D963C4 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D957A0) /* D963C8 80240DD8 08090380 */ j .L80240E00 /* D963CC 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D9635C /* D963E0 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D963E4 80240DF4 00000000 */ nop .L80240DF8: -/* D963E8 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D963EC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D963E8 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D9576C) +/* D963EC 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D9576C) .L80240E00: /* D963F0 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D963F4 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s index 7b2d26c6d2..04706bcb17 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F50_D96540.s @@ -87,9 +87,9 @@ glabel func_80240F50_D96540 /* D96680 80241090 2C620010 */ sltiu $v0, $v1, 0x10 /* D96684 80241094 10400185 */ beqz $v0, .L802416AC /* D96688 80241098 00031080 */ sll $v0, $v1, 2 -/* D9668C 8024109C 3C018024 */ lui $at, %hi(D_80242250) +/* D9668C 8024109C 3C018024 */ lui $at, %hi(func_80242250_7ECF60) /* D96690 802410A0 00220821 */ addu $at, $at, $v0 -/* D96694 802410A4 8C222250 */ lw $v0, %lo(D_80242250)($at) +/* D96694 802410A4 8C222250 */ lw $v0, %lo(func_80242250_7ECF60)($at) /* D96698 802410A8 00400008 */ jr $v0 /* D9669C 802410AC 00000000 */ nop /* D966A0 802410B0 8E4200CC */ lw $v0, 0xcc($s2) @@ -186,8 +186,8 @@ glabel func_80240F50_D96540 /* D967FC 8024120C C6A0002C */ lwc1 $f0, 0x2c($s5) /* D96800 80241210 C622003C */ lwc1 $f2, 0x3c($s1) /* D96804 80241214 46001081 */ sub.s $f2, $f2, $f0 -/* D96808 80241218 3C018024 */ lui $at, %hi(D_80242298) -/* D9680C 8024121C D4242298 */ ldc1 $f4, %lo(D_80242298)($at) +/* D96808 80241218 3C018024 */ lui $at, %hi(func_80242298_CC5AA8) +/* D9680C 8024121C D4242298 */ ldc1 $f4, %lo(func_80242298_CC5AA8)($at) /* D96810 80241220 460010A1 */ cvt.d.s $f2, $f2 /* D96814 80241224 46241082 */ mul.d $f2, $f2, $f4 /* D96818 80241228 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s index 429fb6d72a..c0dfca9361 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240000_D97890.s @@ -15,9 +15,9 @@ glabel func_80240000_D97890 /* D978B8 80240028 A0620084 */ sb $v0, 0x84($v1) /* D978BC 8024002C 3C04800E */ lui $a0, %hi(D_800D91E0) /* D978C0 80240030 248491E0 */ addiu $a0, $a0, %lo(D_800D91E0) -/* D978C4 80240034 3C058024 */ lui $a1, %hi(D_802420B0) +/* D978C4 80240034 3C058024 */ lui $a1, %hi(func_802420B0_87BC90) /* D978C8 80240038 0C01953C */ jal sprintf -/* D978CC 8024003C 24A520B0 */ addiu $a1, $a1, %lo(D_802420B0) +/* D978CC 8024003C 24A520B0 */ addiu $a1, $a1, %lo(func_802420B0_87BC90) /* D978D0 80240040 8FBF0010 */ lw $ra, 0x10($sp) /* D978D4 80240044 0000102D */ daddu $v0, $zero, $zero /* D978D8 80240048 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s index 20e047124e..684794b7b8 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_8024011C_D979AC.s @@ -5,8 +5,8 @@ glabel func_8024011C_D979AC /* D979AC 8024011C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D979B0 80240120 AFB00010 */ sw $s0, 0x10($sp) /* D979B4 80240124 0080802D */ daddu $s0, $a0, $zero -/* D979B8 80240128 3C058024 */ lui $a1, %hi(D_80240158) -/* D979BC 8024012C 24A50158 */ addiu $a1, $a1, %lo(D_80240158) +/* D979B8 80240128 3C058024 */ lui $a1, %hi(func_80240158_D978CC) +/* D979BC 8024012C 24A50158 */ addiu $a1, $a1, %lo(func_80240158_D978CC) /* D979C0 80240130 AFBF0014 */ sw $ra, 0x14($sp) /* D979C4 80240134 0C048C56 */ jal bind_dynamic_entity_3 /* D979C8 80240138 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s index 21943d90c1..0407305854 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s @@ -37,7 +37,7 @@ glabel func_80240158_D979E8 /* D97A68 802401D8 0C00B94E */ jal get_screen_coords /* D97A6C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D97A70 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D97A74 802401E4 0C090014 */ jal pra_39_UnkFunc2 +/* D97A74 802401E4 0C090014 */ jal func_80240050_D978E0 /* D97A78 802401E8 00000000 */ nop /* D97A7C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D97A80 802401F0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240158_D979E8 /* D97B74 802402E4 AC910000 */ sw $s1, ($a0) /* D97B78 802402E8 AC900008 */ sw $s0, 8($a0) /* D97B7C 802402EC 8FA20038 */ lw $v0, 0x38($sp) -/* D97B80 802402F0 3C038024 */ lui $v1, %hi(D_80240320) -/* D97B84 802402F4 24630320 */ addiu $v1, $v1, %lo(D_80240320) +/* D97B80 802402F0 3C038024 */ lui $v1, %hi(func_80240320_D97A58) +/* D97B84 802402F4 24630320 */ addiu $v1, $v1, %lo(func_80240320_D97A58) /* D97B88 802402F8 AC83000C */ sw $v1, 0xc($a0) /* D97B8C 802402FC 00021023 */ negu $v0, $v0 /* D97B90 80240300 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s index 5e55b54ff8..629bb5a08c 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_802404CC_D97D5C.s @@ -11,8 +11,8 @@ glabel func_802404CC_D97D5C /* D97D74 802404E4 28420002 */ slti $v0, $v0, 2 /* D97D78 802404E8 1040000C */ beqz $v0, .L8024051C /* D97D7C 802404EC 00000000 */ nop -/* D97D80 802404F0 3C058024 */ lui $a1, %hi(D_80240530) -/* D97D84 802404F4 24A50530 */ addiu $a1, $a1, %lo(D_80240530) +/* D97D80 802404F0 3C058024 */ lui $a1, %hi(func_80240530_D978F4) +/* D97D84 802404F4 24A50530 */ addiu $a1, $a1, %lo(func_80240530_D978F4) /* D97D88 802404F8 0C048C56 */ jal bind_dynamic_entity_3 /* D97D8C 802404FC 0000202D */ daddu $a0, $zero, $zero /* D97D90 80240500 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s index 2bf13ce0ba..fd68855cb7 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240530_D97DC0.s @@ -84,8 +84,8 @@ glabel func_80240530_D97DC0 /* D97EEC 8024065C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240660: /* D97EF0 80240660 8FA20038 */ lw $v0, 0x38($sp) -/* D97EF4 80240664 3C048024 */ lui $a0, %hi(D_802408A0) -/* D97EF8 80240668 248408A0 */ addiu $a0, $a0, %lo(D_802408A0) +/* D97EF4 80240664 3C048024 */ lui $a0, %hi(func_802408A0_D97C00) +/* D97EF8 80240668 248408A0 */ addiu $a0, $a0, %lo(func_802408A0_D97C00) /* D97EFC 8024066C AE320000 */ sw $s2, ($s1) /* D97F00 80240670 AE300008 */ sw $s0, 8($s1) /* D97F04 80240674 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240530_D97DC0 /* D97F14 80240684 00431024 */ and $v0, $v0, $v1 /* D97F18 80240688 54400004 */ bnel $v0, $zero, .L8024069C /* D97F1C 8024068C AE24000C */ sw $a0, 0xc($s1) -/* D97F20 80240690 3C048024 */ lui $a0, %hi(D_802406BC) -/* D97F24 80240694 248406BC */ addiu $a0, $a0, %lo(D_802406BC) +/* D97F20 80240690 3C048024 */ lui $a0, %hi(func_802406BC_D97A1C) +/* D97F24 80240694 248406BC */ addiu $a0, $a0, %lo(func_802406BC_D97A1C) /* D97F28 80240698 AE24000C */ sw $a0, 0xc($s1) .L8024069C: /* D97F2C 8024069C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s index cc0a898034..17f1614e44 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240D6C_D985FC.s @@ -25,13 +25,13 @@ glabel func_80240D6C_D985FC /* D98648 80240DB8 08090384 */ j .L80240E10 /* D9864C 80240DBC 00000000 */ nop .L80240DC0: -/* D98650 80240DC0 3C048024 */ lui $a0, %hi(D_80240EB4) -/* D98654 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(D_80240EB4) +/* D98650 80240DC0 3C048024 */ lui $a0, %hi(func_80240EB4_D979D8) +/* D98654 80240DC4 24840EB4 */ addiu $a0, $a0, %lo(func_80240EB4_D979D8) /* D98658 80240DC8 08090380 */ j .L80240E00 /* D9865C 80240DCC 00000000 */ nop .L80240DD0: -/* D98660 80240DD0 3C048024 */ lui $a0, %hi(D_80240F1C) -/* D98664 80240DD4 24840F1C */ addiu $a0, $a0, %lo(D_80240F1C) +/* D98660 80240DD0 3C048024 */ lui $a0, %hi(func_80240F1C_D97A40) +/* D98664 80240DD4 24840F1C */ addiu $a0, $a0, %lo(func_80240F1C_D97A40) /* D98668 80240DD8 08090380 */ j .L80240E00 /* D9866C 80240DDC 00000000 */ nop .L80240DE0: @@ -42,8 +42,8 @@ glabel func_80240D6C_D985FC /* D98680 80240DF0 10400007 */ beqz $v0, .L80240E10 /* D98684 80240DF4 00000000 */ nop .L80240DF8: -/* D98688 80240DF8 3C048024 */ lui $a0, %hi(D_80240EE8) -/* D9868C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(D_80240EE8) +/* D98688 80240DF8 3C048024 */ lui $a0, %hi(func_80240EE8_D97A0C) +/* D9868C 80240DFC 24840EE8 */ addiu $a0, $a0, %lo(func_80240EE8_D97A0C) .L80240E00: /* D98690 80240E00 0C048C56 */ jal bind_dynamic_entity_3 /* D98694 80240E04 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s index d6b8039045..2f82030f15 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F50_D987E0.s @@ -171,8 +171,8 @@ glabel func_80240F50_D987E0 /* D98A64 802411D4 C6440070 */ lwc1 $f4, 0x70($s2) /* D98A68 802411D8 46802120 */ cvt.s.w $f4, $f4 /* D98A6C 802411DC 46040001 */ sub.s $f0, $f0, $f4 -/* D98A70 802411E0 3C018024 */ lui $at, %hi(D_80242110) -/* D98A74 802411E4 D4222110 */ ldc1 $f2, %lo(D_80242110)($at) +/* D98A70 802411E0 3C018024 */ lui $at, %hi(func_80242110_D21FA0) +/* D98A74 802411E4 D4222110 */ ldc1 $f2, %lo(func_80242110_D21FA0)($at) /* D98A78 802411E8 46000021 */ cvt.d.s $f0, $f0 /* D98A7C 802411EC 46220002 */ mul.d $f0, $f0, $f2 /* D98A80 802411F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s index a933c92fd2..d5ce886641 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_802400EC_D99A9C.s @@ -5,8 +5,8 @@ glabel func_802400EC_D99A9C /* D99A9C 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D99AA0 802400F0 AFB00010 */ sw $s0, 0x10($sp) /* D99AA4 802400F4 0080802D */ daddu $s0, $a0, $zero -/* D99AA8 802400F8 3C058024 */ lui $a1, %hi(D_80240128) -/* D99AAC 802400FC 24A50128 */ addiu $a1, $a1, %lo(D_80240128) +/* D99AA8 802400F8 3C058024 */ lui $a1, %hi(func_80240128_D99A0C) +/* D99AAC 802400FC 24A50128 */ addiu $a1, $a1, %lo(func_80240128_D99A0C) /* D99AB0 80240100 AFBF0014 */ sw $ra, 0x14($sp) /* D99AB4 80240104 0C048C56 */ jal bind_dynamic_entity_3 /* D99AB8 80240108 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s index fb305fa3bf..c73b7600e9 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D99AD8 /* D99B58 802401A8 0C00B94E */ jal get_screen_coords /* D99B5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D99B60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D99B64 802401B4 0C090008 */ jal pra_40_UnkFunc2 +/* D99B64 802401B4 0C090008 */ jal func_80240020_D999D0 /* D99B68 802401B8 00000000 */ nop /* D99B6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D99B70 802401C0 3C014307 */ lui $at, 0x4307 @@ -110,8 +110,8 @@ glabel func_80240128_D99AD8 /* D99C64 802402B4 AC910000 */ sw $s1, ($a0) /* D99C68 802402B8 AC900008 */ sw $s0, 8($a0) /* D99C6C 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D99C70 802402C0 3C038024 */ lui $v1, %hi(D_802402F0) -/* D99C74 802402C4 246302F0 */ addiu $v1, $v1, %lo(D_802402F0) +/* D99C70 802402C0 3C038024 */ lui $v1, %hi(func_802402F0_D99B98) +/* D99C74 802402C4 246302F0 */ addiu $v1, $v1, %lo(func_802402F0_D99B98) /* D99C78 802402C8 AC83000C */ sw $v1, 0xc($a0) /* D99C7C 802402CC 00021023 */ negu $v0, $v0 /* D99C80 802402D0 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s index 62b757c204..77f38d2e23 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_8024049C_D99E4C.s @@ -11,8 +11,8 @@ glabel func_8024049C_D99E4C /* D99E64 802404B4 28420002 */ slti $v0, $v0, 2 /* D99E68 802404B8 1040000C */ beqz $v0, .L802404EC /* D99E6C 802404BC 00000000 */ nop -/* D99E70 802404C0 3C058024 */ lui $a1, %hi(D_80240500) -/* D99E74 802404C4 24A50500 */ addiu $a1, $a1, %lo(D_80240500) +/* D99E70 802404C0 3C058024 */ lui $a1, %hi(func_80240500_D99A34) +/* D99E74 802404C4 24A50500 */ addiu $a1, $a1, %lo(func_80240500_D99A34) /* D99E78 802404C8 0C048C56 */ jal bind_dynamic_entity_3 /* D99E7C 802404CC 0000202D */ daddu $a0, $zero, $zero /* D99E80 802404D0 8E03013C */ lw $v1, 0x13c($s0) diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s index 26be70f83f..ffcb578910 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240500_D99EB0.s @@ -84,8 +84,8 @@ glabel func_80240500_D99EB0 /* D99FDC 8024062C A0209D71 */ sb $zero, %lo(D_802D9D71)($at) .L80240630: /* D99FE0 80240630 8FA20038 */ lw $v0, 0x38($sp) -/* D99FE4 80240634 3C048024 */ lui $a0, %hi(D_80240870) -/* D99FE8 80240638 24840870 */ addiu $a0, $a0, %lo(D_80240870) +/* D99FE4 80240634 3C048024 */ lui $a0, %hi(func_80240870_D99D40) +/* D99FE8 80240638 24840870 */ addiu $a0, $a0, %lo(func_80240870_D99D40) /* D99FEC 8024063C AE320000 */ sw $s2, ($s1) /* D99FF0 80240640 AE300008 */ sw $s0, 8($s1) /* D99FF4 80240644 00021023 */ negu $v0, $v0 @@ -95,8 +95,8 @@ glabel func_80240500_D99EB0 /* D9A004 80240654 00431024 */ and $v0, $v0, $v1 /* D9A008 80240658 54400004 */ bnel $v0, $zero, .L8024066C /* D9A00C 8024065C AE24000C */ sw $a0, 0xc($s1) -/* D9A010 80240660 3C048024 */ lui $a0, %hi(D_8024068C) -/* D9A014 80240664 2484068C */ addiu $a0, $a0, %lo(D_8024068C) +/* D9A010 80240660 3C048024 */ lui $a0, %hi(func_8024068C_D99B5C) +/* D9A014 80240664 2484068C */ addiu $a0, $a0, %lo(func_8024068C_D99B5C) /* D9A018 80240668 AE24000C */ sw $a0, 0xc($s1) .L8024066C: /* D9A01C 8024066C 0C047644 */ jal queue_render_task diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s index d604d39017..df7cfef180 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240D3C_D9A6EC.s @@ -25,13 +25,13 @@ glabel func_80240D3C_D9A6EC /* D9A738 80240D88 08090378 */ j .L80240DE0 /* D9A73C 80240D8C 00000000 */ nop .L80240D90: -/* D9A740 80240D90 3C048024 */ lui $a0, %hi(D_80240E84) -/* D9A744 80240D94 24840E84 */ addiu $a0, $a0, %lo(D_80240E84) +/* D9A740 80240D90 3C048024 */ lui $a0, %hi(func_80240E84_D99B18) +/* D9A744 80240D94 24840E84 */ addiu $a0, $a0, %lo(func_80240E84_D99B18) /* D9A748 80240D98 08090374 */ j .L80240DD0 /* D9A74C 80240D9C 00000000 */ nop .L80240DA0: -/* D9A750 80240DA0 3C048024 */ lui $a0, %hi(D_80240EEC) -/* D9A754 80240DA4 24840EEC */ addiu $a0, $a0, %lo(D_80240EEC) +/* D9A750 80240DA0 3C048024 */ lui $a0, %hi(func_80240EEC_D99B80) +/* D9A754 80240DA4 24840EEC */ addiu $a0, $a0, %lo(func_80240EEC_D99B80) /* D9A758 80240DA8 08090374 */ j .L80240DD0 /* D9A75C 80240DAC 00000000 */ nop .L80240DB0: @@ -42,8 +42,8 @@ glabel func_80240D3C_D9A6EC /* D9A770 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* D9A774 80240DC4 00000000 */ nop .L80240DC8: -/* D9A778 80240DC8 3C048024 */ lui $a0, %hi(D_80240EB8) -/* D9A77C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(D_80240EB8) +/* D9A778 80240DC8 3C048024 */ lui $a0, %hi(func_80240EB8_D99B4C) +/* D9A77C 80240DCC 24840EB8 */ addiu $a0, $a0, %lo(func_80240EB8_D99B4C) .L80240DD0: /* D9A780 80240DD0 0C048C56 */ jal bind_dynamic_entity_3 /* D9A784 80240DD4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s index c3e9cdb20e..77fae4b4df 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s @@ -4,8 +4,8 @@ glabel func_80240700_CF8270 /* CF8270 80240700 27BDFFE0 */ addiu $sp, $sp, -0x20 /* CF8274 80240704 AFB00010 */ sw $s0, 0x10($sp) -/* CF8278 80240708 3C108024 */ lui $s0, %hi(D_802435F0) -/* CF827C 8024070C 261035F0 */ addiu $s0, $s0, %lo(D_802435F0) +/* CF8278 80240708 3C108024 */ lui $s0, %hi(func_802435F0_C7A2D0) +/* CF827C 8024070C 261035F0 */ addiu $s0, $s0, %lo(func_802435F0_C7A2D0) /* CF8280 80240710 AFBF0018 */ sw $ra, 0x18($sp) /* CF8284 80240714 AFB10014 */ sw $s1, 0x14($sp) /* CF8288 80240718 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240700_CF8270 /* CF82EC 8024077C 28620010 */ slti $v0, $v1, 0x10 /* CF82F0 80240780 1440FFFA */ bnez $v0, .L8024076C /* CF82F4 80240784 24840004 */ addiu $a0, $a0, 4 -/* CF82F8 80240788 3C108024 */ lui $s0, %hi(D_802435F0) -/* CF82FC 8024078C 261035F0 */ addiu $s0, $s0, %lo(D_802435F0) +/* CF82F8 80240788 3C108024 */ lui $s0, %hi(func_802435F0_C7A2D0) +/* CF82FC 8024078C 261035F0 */ addiu $s0, $s0, %lo(func_802435F0_C7A2D0) /* CF8300 80240790 0C00AB4B */ jal heap_free /* CF8304 80240794 8E040000 */ lw $a0, ($s0) /* CF8308 80240798 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s index 355c9989c7..e722f8dacd 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240A60_CF85D0.s @@ -9,8 +9,8 @@ glabel func_80240A60_CF85D0 /* CF85E0 80240A70 8C84014C */ lw $a0, 0x14c($a0) /* CF85E4 80240A74 24040008 */ addiu $a0, $zero, 8 /* CF85E8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* CF85EC 80240A7C 3C028024 */ lui $v0, %hi(D_80240ACC) -/* CF85F0 80240A80 24420ACC */ addiu $v0, $v0, %lo(D_80240ACC) +/* CF85EC 80240A7C 3C028024 */ lui $v0, %hi(func_80240ACC_CF7EEC) +/* CF85F0 80240A80 24420ACC */ addiu $v0, $v0, %lo(func_80240ACC_CF7EEC) /* CF85F4 80240A84 0C00AB39 */ jal heap_malloc /* CF85F8 80240A88 AE020008 */ sw $v0, 8($s0) /* CF85FC 80240A8C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s index 4cc083ea92..7893e424a0 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240DEC_CF895C.s @@ -19,9 +19,9 @@ glabel func_80240DEC_CF895C /* CF8990 80240E20 34A502E0 */ ori $a1, $a1, 0x2e0 /* CF8994 80240E24 0C0B1EAF */ jal get_variable /* CF8998 80240E28 0000202D */ daddu $a0, $zero, $zero -/* CF899C 80240E2C 3C038024 */ lui $v1, %hi(D_802436FC) +/* CF899C 80240E2C 3C038024 */ lui $v1, %hi(func_802436FC_8B376C) /* CF89A0 80240E30 00621821 */ addu $v1, $v1, $v0 -/* CF89A4 80240E34 906336FC */ lbu $v1, %lo(D_802436FC)($v1) +/* CF89A4 80240E34 906336FC */ lbu $v1, %lo(func_802436FC_8B376C)($v1) /* CF89A8 80240E38 8E220084 */ lw $v0, 0x84($s1) /* CF89AC 80240E3C 54430006 */ bnel $v0, $v1, .L80240E58 /* CF89B0 80240E40 AE200084 */ sw $zero, 0x84($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s index b614f7899e..57b4fe7b28 100644 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241764_CF92D4.s @@ -3,8 +3,8 @@ glabel func_80241764_CF92D4 /* CF92D4 80241764 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF92D8 80241768 3C058024 */ lui $a1, %hi(D_802416F8) -/* CF92DC 8024176C 24A516F8 */ addiu $a1, $a1, %lo(D_802416F8) +/* CF92D8 80241768 3C058024 */ lui $a1, %hi(func_802416F8_CF7E14) +/* CF92DC 8024176C 24A516F8 */ addiu $a1, $a1, %lo(func_802416F8_CF7E14) /* CF92E0 80241770 AFBF0010 */ sw $ra, 0x10($sp) /* CF92E4 80241774 0C048C8F */ jal bind_dynamic_entity_7 /* CF92E8 80241778 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s index f96c4183dd..a4fb855ee7 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s @@ -9,8 +9,8 @@ glabel func_80240E8C_D065BC /* D065CC 80240E9C 8C84014C */ lw $a0, 0x14c($a0) /* D065D0 80240EA0 24040008 */ addiu $a0, $zero, 8 /* D065D4 80240EA4 0040802D */ daddu $s0, $v0, $zero -/* D065D8 80240EA8 3C028024 */ lui $v0, %hi(D_80240EF8) -/* D065DC 80240EAC 24420EF8 */ addiu $v0, $v0, %lo(D_80240EF8) +/* D065D8 80240EA8 3C028024 */ lui $v0, %hi(func_80240EF8_D05FCC) +/* D065DC 80240EAC 24420EF8 */ addiu $v0, $v0, %lo(func_80240EF8_D05FCC) /* D065E0 80240EB0 0C00AB39 */ jal heap_malloc /* D065E4 80240EB4 AE020008 */ sw $v0, 8($s0) /* D065E8 80240EB8 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s index 47bdde6773..b10a2077d9 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B90_D072C0.s @@ -3,8 +3,8 @@ glabel func_80241B90_D072C0 /* D072C0 80241B90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D072C4 80241B94 3C058024 */ lui $a1, %hi(D_80241B24) -/* D072C8 80241B98 24A51B24 */ addiu $a1, $a1, %lo(D_80241B24) +/* D072C4 80241B94 3C058024 */ lui $a1, %hi(func_80241B24_D05EF4) +/* D072C8 80241B98 24A51B24 */ addiu $a1, $a1, %lo(func_80241B24_D05EF4) /* D072CC 80241B9C AFBF0010 */ sw $ra, 0x10($sp) /* D072D0 80241BA0 0C048C8F */ jal bind_dynamic_entity_7 /* D072D4 80241BA4 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index 8e6611b3c7..c8961e7751 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -46,7 +46,7 @@ glabel func_8024066C_D1172C /* D117D0 80240710 8E2200B0 */ lw $v0, 0xb0($s1) /* D117D4 80240714 30420004 */ andi $v0, $v0, 4 /* D117D8 80240718 10400020 */ beqz $v0, .L8024079C -/* D117DC 8024071C 00000000 */ nop +/* D117DC 8024071C 00000000 */ nop .L80240720: /* D117E0 80240720 2404F7FF */ addiu $a0, $zero, -0x801 /* D117E4 80240724 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024066C_D1172C /* D1185C 8024079C 8E420070 */ lw $v0, 0x70($s2) /* D11860 802407A0 2842001E */ slti $v0, $v0, 0x1e /* D11864 802407A4 10400009 */ beqz $v0, .L802407CC -/* D11868 802407A8 00000000 */ nop +/* D11868 802407A8 00000000 */ nop /* D1186C 802407AC 8E22006C */ lw $v0, 0x6c($s1) /* D11870 802407B0 14400006 */ bnez $v0, .L802407CC -/* D11874 802407B4 00000000 */ nop +/* D11874 802407B4 00000000 */ nop /* D11878 802407B8 0C090096 */ jal func_80240258_D11318 /* D1187C 802407BC 0240202D */ daddu $a0, $s2, $zero /* D11880 802407C0 10400002 */ beqz $v0, .L802407CC @@ -104,7 +104,7 @@ glabel func_8024066C_D1172C /* D118A0 802407E0 00220821 */ addu $at, $at, $v0 /* D118A4 802407E4 8C222378 */ lw $v0, %lo(D_80242378)($at) /* D118A8 802407E8 00400008 */ jr $v0 -/* D118AC 802407EC 00000000 */ nop +/* D118AC 802407EC 00000000 */ nop /* D118B0 802407F0 0240202D */ daddu $a0, $s2, $zero /* D118B4 802407F4 0260282D */ daddu $a1, $s3, $zero /* D118B8 802407F8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024066C_D1172C /* D118C8 80240808 0C0125AE */ jal func_800496B8 /* D118CC 8024080C 0280302D */ daddu $a2, $s4, $zero /* D118D0 80240810 0809023E */ j .L802408F8 -/* D118D4 80240814 00000000 */ nop +/* D118D4 80240814 00000000 */ nop /* D118D8 80240818 0240202D */ daddu $a0, $s2, $zero /* D118DC 8024081C 0260282D */ daddu $a1, $s3, $zero -/* D118E0 80240820 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D118E0 80240820 0C0126D1 */ jal func_80049B44 /* D118E4 80240824 0280302D */ daddu $a2, $s4, $zero /* D118E8 80240828 0240202D */ daddu $a0, $s2, $zero /* D118EC 8024082C 0260282D */ daddu $a1, $s3, $zero /* D118F0 80240830 0C012701 */ jal func_80049C04 /* D118F4 80240834 0280302D */ daddu $a2, $s4, $zero /* D118F8 80240838 0809023E */ j .L802408F8 -/* D118FC 8024083C 00000000 */ nop +/* D118FC 8024083C 00000000 */ nop /* D11900 80240840 0240202D */ daddu $a0, $s2, $zero /* D11904 80240844 0260282D */ daddu $a1, $s3, $zero /* D11908 80240848 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024066C_D1172C /* D11918 80240858 0C0127B3 */ jal func_80049ECC /* D1191C 8024085C 0280302D */ daddu $a2, $s4, $zero /* D11920 80240860 0809023E */ j .L802408F8 -/* D11924 80240864 00000000 */ nop +/* D11924 80240864 00000000 */ nop /* D11928 80240868 0240202D */ daddu $a0, $s2, $zero /* D1192C 8024086C 0260282D */ daddu $a1, $s3, $zero /* D11930 80240870 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024066C_D1172C /* D11940 80240880 0C012849 */ jal func_8004A124 /* D11944 80240884 0280302D */ daddu $a2, $s4, $zero /* D11948 80240888 0809023E */ j .L802408F8 -/* D1194C 8024088C 00000000 */ nop +/* D1194C 8024088C 00000000 */ nop /* D11950 80240890 0240202D */ daddu $a0, $s2, $zero /* D11954 80240894 0260282D */ daddu $a1, $s3, $zero /* D11958 80240898 0C0128FA */ jal func_8004A3E8 /* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero /* D11960 802408A0 0809023E */ j .L802408F8 -/* D11964 802408A4 00000000 */ nop -/* D11968 802408A8 0C090014 */ jal sam_03_UnkNpcAIFunc6 +/* D11964 802408A4 00000000 */ nop +/* D11968 802408A8 0C090014 */ jal func_80240050_D11110 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero -/* D11970 802408B0 0C09002F */ jal sam_03_UnkNpcAIFunc7 +/* D11970 802408B0 0C09002F */ jal func_802400BC_D1117C /* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero /* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 /* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 -/* D11984 802408C4 00000000 */ nop -/* D11988 802408C8 0C09004B */ jal sam_03_UnkNpcAIFunc8 +/* D11984 802408C4 00000000 */ nop +/* D11988 802408C8 0C09004B */ jal func_8024012C_D111EC /* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero /* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 /* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 -/* D1199C 802408DC 00000000 */ nop -/* D119A0 802408E0 0C090081 */ jal sam_03_UnkNpcAIFunc5 +/* D1199C 802408DC 00000000 */ nop +/* D119A0 802408E0 0C090081 */ jal func_80240204_D112C4 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero /* D119A8 802408E8 0809023E */ j .L802408F8 -/* D119AC 802408EC 00000000 */ nop +/* D119AC 802408EC 00000000 */ nop /* D119B0 802408F0 0C0129CF */ jal func_8004A73C /* D119B4 802408F4 0240202D */ daddu $a0, $s2, $zero .L802408F8: diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s index d8cf108bde..5b372721db 100644 --- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s +++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_8024053C_D13B0C.s @@ -18,9 +18,9 @@ glabel func_8024053C_D13B0C /* D13B3C 8024056C 0000102D */ daddu $v0, $zero, $zero .L80240570: /* D13B40 80240570 8CC50000 */ lw $a1, ($a2) -/* D13B44 80240574 3C068024 */ lui $a2, %hi(D_80243880) +/* D13B44 80240574 3C068024 */ lui $a2, %hi(func_80243880_95EA80) /* D13B48 80240578 0C0B2026 */ jal set_variable -/* D13B4C 8024057C 8CC63880 */ lw $a2, %lo(D_80243880)($a2) +/* D13B4C 8024057C 8CC63880 */ lw $a2, %lo(func_80243880_95EA80)($a2) /* D13B50 80240580 24020002 */ addiu $v0, $zero, 2 .L80240584: /* D13B54 80240584 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s index b96f0de615..6182df01e8 100644 --- a/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s +++ b/asm/nonmatchings/world/area_sam/sam_04/D138E0/func_80240590_D13B60.s @@ -7,8 +7,8 @@ glabel func_80240590_D13B60 /* D13B68 80240598 8C82000C */ lw $v0, 0xc($a0) /* D13B6C 8024059C 0C0B1EAF */ jal get_variable /* D13B70 802405A0 8C450000 */ lw $a1, ($v0) -/* D13B74 802405A4 3C018024 */ lui $at, %hi(D_80243880) -/* D13B78 802405A8 AC223880 */ sw $v0, %lo(D_80243880)($at) +/* D13B74 802405A4 3C018024 */ lui $at, %hi(func_80243880_95EA80) +/* D13B78 802405A8 AC223880 */ sw $v0, %lo(func_80243880_95EA80)($at) /* D13B7C 802405AC 24020002 */ addiu $v0, $zero, 2 /* D13B80 802405B0 8FBF0010 */ lw $ra, 0x10($sp) /* D13B84 802405B4 24030001 */ addiu $v1, $zero, 1 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index 62c9a72cd2..5e92e8a98c 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -46,7 +46,7 @@ glabel func_8024061C_D18DFC /* D18EA0 802406C0 8E2200B0 */ lw $v0, 0xb0($s1) /* D18EA4 802406C4 30420004 */ andi $v0, $v0, 4 /* D18EA8 802406C8 10400020 */ beqz $v0, .L8024074C -/* D18EAC 802406CC 00000000 */ nop +/* D18EAC 802406CC 00000000 */ nop .L802406D0: /* D18EB0 802406D0 2404F7FF */ addiu $a0, $zero, -0x801 /* D18EB4 802406D4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024061C_D18DFC /* D18F2C 8024074C 8E420070 */ lw $v0, 0x70($s2) /* D18F30 80240750 2842001E */ slti $v0, $v0, 0x1e /* D18F34 80240754 10400009 */ beqz $v0, .L8024077C -/* D18F38 80240758 00000000 */ nop +/* D18F38 80240758 00000000 */ nop /* D18F3C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* D18F40 80240760 14400006 */ bnez $v0, .L8024077C -/* D18F44 80240764 00000000 */ nop +/* D18F44 80240764 00000000 */ nop /* D18F48 80240768 0C090082 */ jal func_80240208_D189E8 /* D18F4C 8024076C 0240202D */ daddu $a0, $s2, $zero /* D18F50 80240770 10400002 */ beqz $v0, .L8024077C @@ -104,7 +104,7 @@ glabel func_8024061C_D18DFC /* D18F70 80240790 00220821 */ addu $at, $at, $v0 /* D18F74 80240794 8C2274E8 */ lw $v0, %lo(D_802474E8)($at) /* D18F78 80240798 00400008 */ jr $v0 -/* D18F7C 8024079C 00000000 */ nop +/* D18F7C 8024079C 00000000 */ nop /* D18F80 802407A0 0240202D */ daddu $a0, $s2, $zero /* D18F84 802407A4 0260282D */ daddu $a1, $s3, $zero /* D18F88 802407A8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024061C_D18DFC /* D18F98 802407B8 0C0125AE */ jal func_800496B8 /* D18F9C 802407BC 0280302D */ daddu $a2, $s4, $zero /* D18FA0 802407C0 0809022A */ j .L802408A8 -/* D18FA4 802407C4 00000000 */ nop +/* D18FA4 802407C4 00000000 */ nop /* D18FA8 802407C8 0240202D */ daddu $a0, $s2, $zero /* D18FAC 802407CC 0260282D */ daddu $a1, $s3, $zero -/* D18FB0 802407D0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D18FB0 802407D0 0C0126D1 */ jal func_80049B44 /* D18FB4 802407D4 0280302D */ daddu $a2, $s4, $zero /* D18FB8 802407D8 0240202D */ daddu $a0, $s2, $zero /* D18FBC 802407DC 0260282D */ daddu $a1, $s3, $zero /* D18FC0 802407E0 0C012701 */ jal func_80049C04 /* D18FC4 802407E4 0280302D */ daddu $a2, $s4, $zero /* D18FC8 802407E8 0809022A */ j .L802408A8 -/* D18FCC 802407EC 00000000 */ nop +/* D18FCC 802407EC 00000000 */ nop /* D18FD0 802407F0 0240202D */ daddu $a0, $s2, $zero /* D18FD4 802407F4 0260282D */ daddu $a1, $s3, $zero /* D18FD8 802407F8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024061C_D18DFC /* D18FE8 80240808 0C0127B3 */ jal func_80049ECC /* D18FEC 8024080C 0280302D */ daddu $a2, $s4, $zero /* D18FF0 80240810 0809022A */ j .L802408A8 -/* D18FF4 80240814 00000000 */ nop +/* D18FF4 80240814 00000000 */ nop /* D18FF8 80240818 0240202D */ daddu $a0, $s2, $zero /* D18FFC 8024081C 0260282D */ daddu $a1, $s3, $zero /* D19000 80240820 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024061C_D18DFC /* D19010 80240830 0C012849 */ jal func_8004A124 /* D19014 80240834 0280302D */ daddu $a2, $s4, $zero /* D19018 80240838 0809022A */ j .L802408A8 -/* D1901C 8024083C 00000000 */ nop +/* D1901C 8024083C 00000000 */ nop /* D19020 80240840 0240202D */ daddu $a0, $s2, $zero /* D19024 80240844 0260282D */ daddu $a1, $s3, $zero /* D19028 80240848 0C0128FA */ jal func_8004A3E8 /* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero /* D19030 80240850 0809022A */ j .L802408A8 -/* D19034 80240854 00000000 */ nop -/* D19038 80240858 0C090000 */ jal sam_05_UnkNpcAIFunc6 +/* D19034 80240854 00000000 */ nop +/* D19038 80240858 0C090000 */ jal func_80240000_D187E0 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* D19040 80240860 0C09001B */ jal sam_05_UnkNpcAIFunc7 +/* D19040 80240860 0C09001B */ jal func_8024006C_D1884C /* D19044 80240864 0240202D */ daddu $a0, $s2, $zero /* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 -/* D19054 80240874 00000000 */ nop -/* D19058 80240878 0C090037 */ jal sam_05_UnkNpcAIFunc8 +/* D19054 80240874 00000000 */ nop +/* D19058 80240878 0C090037 */ jal func_802400DC_D188BC /* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero /* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 /* D19068 80240888 14620007 */ bne $v1, $v0, .L802408A8 -/* D1906C 8024088C 00000000 */ nop -/* D19070 80240890 0C09006D */ jal sam_05_UnkNpcAIFunc5 +/* D1906C 8024088C 00000000 */ nop +/* D19070 80240890 0C09006D */ jal func_802401B4_D18994 /* D19074 80240894 0240202D */ daddu $a0, $s2, $zero /* D19078 80240898 0809022A */ j .L802408A8 -/* D1907C 8024089C 00000000 */ nop +/* D1907C 8024089C 00000000 */ nop /* D19080 802408A0 0C0129CF */ jal func_8004A73C /* D19084 802408A4 0240202D */ daddu $a0, $s2, $zero .L802408A8: diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s index 255ecf0526..ce118e0b37 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s @@ -217,8 +217,8 @@ glabel func_802419A4_D1A184 /* D1A4A8 80241CC8 AFA20018 */ sw $v0, 0x18($sp) .L80241CCC: /* D1A4AC 80241CCC 8EC40024 */ lw $a0, 0x24($s6) -/* D1A4B0 80241CD0 3C078024 */ lui $a3, %hi(D_80242F90) -/* D1A4B4 80241CD4 24E72F90 */ addiu $a3, $a3, %lo(D_80242F90) +/* D1A4B0 80241CD0 3C078024 */ lui $a3, %hi(func_80242F90) +/* D1A4B4 80241CD4 24E72F90 */ addiu $a3, $a3, %lo(func_80242F90) .L80241CD8: /* D1A4B8 80241CD8 0C0B79E0 */ jal func_802DE780 /* D1A4BC 80241CDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index b84dd5d954..0add94d64d 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -83,7 +83,7 @@ glabel func_8024185C_D216EC /* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero /* D21820 80241990 0280202D */ daddu $a0, $s4, $zero /* D21824 80241994 0200282D */ daddu $a1, $s0, $zero -/* D21828 80241998 0C09034A */ jal sam_06_UnkNpcAIFunc1 +/* D21828 80241998 0C09034A */ jal func_80240D28_D20BB8 /* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero /* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero /* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_8024185C_D216EC /* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero /* D21848 802419B8 0280202D */ daddu $a0, $s4, $zero /* D2184C 802419BC 0200282D */ daddu $a1, $s0, $zero -/* D21850 802419C0 0C09044B */ jal sam_06_UnkNpcAIFunc2 +/* D21850 802419C0 0C09044B */ jal func_8024112C_D20FBC /* D21854 802419C4 0260302D */ daddu $a2, $s3, $zero /* D21858 802419C8 0280202D */ daddu $a0, $s4, $zero /* D2185C 802419CC 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_8024185C_D216EC /* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero /* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero /* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero -/* D21890 80241A00 0C0904D1 */ jal sam_06_UnkNpcAIFunc3 +/* D21890 80241A00 0C0904D1 */ jal func_80241344_D211D4 /* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero /* D21898 80241A08 08090689 */ j .L80241A24 /* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s index cbc757d2f5..a5ad542b83 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s @@ -4,8 +4,8 @@ glabel func_80241A48_D218D8 /* D218D8 80241A48 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D218DC 80241A4C AFB00010 */ sw $s0, 0x10($sp) -/* D218E0 80241A50 3C108024 */ lui $s0, %hi(D_802443D0) -/* D218E4 80241A54 261043D0 */ addiu $s0, $s0, %lo(D_802443D0) +/* D218E0 80241A50 3C108024 */ lui $s0, %hi(func_802443D0_9DB3F0) +/* D218E4 80241A54 261043D0 */ addiu $s0, $s0, %lo(func_802443D0_9DB3F0) /* D218E8 80241A58 AFBF0018 */ sw $ra, 0x18($sp) /* D218EC 80241A5C AFB10014 */ sw $s1, 0x14($sp) /* D218F0 80241A60 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80241A48_D218D8 /* D21954 80241AC4 28620010 */ slti $v0, $v1, 0x10 /* D21958 80241AC8 1440FFFA */ bnez $v0, .L80241AB4 /* D2195C 80241ACC 24840004 */ addiu $a0, $a0, 4 -/* D21960 80241AD0 3C108024 */ lui $s0, %hi(D_802443D0) -/* D21964 80241AD4 261043D0 */ addiu $s0, $s0, %lo(D_802443D0) +/* D21960 80241AD0 3C108024 */ lui $s0, %hi(func_802443D0_9DB3F0) +/* D21964 80241AD4 261043D0 */ addiu $s0, $s0, %lo(func_802443D0_9DB3F0) /* D21968 80241AD8 0C00AB4B */ jal heap_free /* D2196C 80241ADC 8E040000 */ lw $a0, ($s0) /* D21970 80241AE0 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s index 74c532acd0..0af76feb75 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240000_D2BD30.s @@ -24,8 +24,8 @@ glabel func_80240000_D2BD30 /* D2BD7C 8024004C 0000982D */ daddu $s3, $zero, $zero /* D2BD80 80240050 AEE20070 */ sw $v0, 0x70($s7) /* D2BD84 80240054 0040882D */ daddu $s1, $v0, $zero -/* D2BD88 80240058 3C148024 */ lui $s4, %hi(D_802424C0) -/* D2BD8C 8024005C 269424C0 */ addiu $s4, $s4, %lo(D_802424C0) +/* D2BD88 80240058 3C148024 */ lui $s4, %hi(func_802424C0_B4CF30) +/* D2BD8C 8024005C 269424C0 */ addiu $s4, $s4, %lo(func_802424C0_B4CF30) /* D2BD90 80240060 2630003C */ addiu $s0, $s1, 0x3c /* D2BD94 80240064 AEE00074 */ sw $zero, 0x74($s7) .L80240068: @@ -130,10 +130,10 @@ glabel func_80240000_D2BD30 /* D2BF14 802401E4 26300024 */ addiu $s0, $s1, 0x24 /* D2BF18 802401E8 00131080 */ sll $v0, $s3, 2 .L802401EC: -/* D2BF1C 802401EC 3C048024 */ lui $a0, %hi(D_802424C0) +/* D2BF1C 802401EC 3C048024 */ lui $a0, %hi(func_802424C0_B4CF30) /* D2BF20 802401F0 00822021 */ addu $a0, $a0, $v0 /* D2BF24 802401F4 0C046C04 */ jal get_model_list_index_from_tree_index -/* D2BF28 802401F8 8C8424C0 */ lw $a0, %lo(D_802424C0)($a0) +/* D2BF28 802401F8 8C8424C0 */ lw $a0, %lo(func_802424C0_B4CF30)($a0) /* D2BF2C 802401FC 0C046B4C */ jal get_model_from_list_index /* D2BF30 80240200 0040202D */ daddu $a0, $v0, $zero /* D2BF34 80240204 8E230000 */ lw $v1, ($s1) diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s index 19347d235e..8ba2976f38 100644 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -46,7 +46,7 @@ glabel func_80240C6C_D2C99C /* D2CA40 80240D10 8E2200B0 */ lw $v0, 0xb0($s1) /* D2CA44 80240D14 30420004 */ andi $v0, $v0, 4 /* D2CA48 80240D18 10400020 */ beqz $v0, .L80240D9C -/* D2CA4C 80240D1C 00000000 */ nop +/* D2CA4C 80240D1C 00000000 */ nop .L80240D20: /* D2CA50 80240D20 2404F7FF */ addiu $a0, $zero, -0x801 /* D2CA54 80240D24 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_80240C6C_D2C99C /* D2CACC 80240D9C 8E420070 */ lw $v0, 0x70($s2) /* D2CAD0 80240DA0 2842001E */ slti $v0, $v0, 0x1e /* D2CAD4 80240DA4 10400009 */ beqz $v0, .L80240DCC -/* D2CAD8 80240DA8 00000000 */ nop +/* D2CAD8 80240DA8 00000000 */ nop /* D2CADC 80240DAC 8E22006C */ lw $v0, 0x6c($s1) /* D2CAE0 80240DB0 14400006 */ bnez $v0, .L80240DCC -/* D2CAE4 80240DB4 00000000 */ nop +/* D2CAE4 80240DB4 00000000 */ nop /* D2CAE8 80240DB8 0C090216 */ jal func_80240858_D2C588 /* D2CAEC 80240DBC 0240202D */ daddu $a0, $s2, $zero /* D2CAF0 80240DC0 10400002 */ beqz $v0, .L80240DCC @@ -104,7 +104,7 @@ glabel func_80240C6C_D2C99C /* D2CB10 80240DE0 00220821 */ addu $at, $at, $v0 /* D2CB14 80240DE4 8C223D88 */ lw $v0, %lo(D_80243D88)($at) /* D2CB18 80240DE8 00400008 */ jr $v0 -/* D2CB1C 80240DEC 00000000 */ nop +/* D2CB1C 80240DEC 00000000 */ nop /* D2CB20 80240DF0 0240202D */ daddu $a0, $s2, $zero /* D2CB24 80240DF4 0260282D */ daddu $a1, $s3, $zero /* D2CB28 80240DF8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_80240C6C_D2C99C /* D2CB38 80240E08 0C0125AE */ jal func_800496B8 /* D2CB3C 80240E0C 0280302D */ daddu $a2, $s4, $zero /* D2CB40 80240E10 080903BE */ j .L80240EF8 -/* D2CB44 80240E14 00000000 */ nop +/* D2CB44 80240E14 00000000 */ nop /* D2CB48 80240E18 0240202D */ daddu $a0, $s2, $zero /* D2CB4C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* D2CB50 80240E20 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D2CB50 80240E20 0C0126D1 */ jal func_80049B44 /* D2CB54 80240E24 0280302D */ daddu $a2, $s4, $zero /* D2CB58 80240E28 0240202D */ daddu $a0, $s2, $zero /* D2CB5C 80240E2C 0260282D */ daddu $a1, $s3, $zero /* D2CB60 80240E30 0C012701 */ jal func_80049C04 /* D2CB64 80240E34 0280302D */ daddu $a2, $s4, $zero /* D2CB68 80240E38 080903BE */ j .L80240EF8 -/* D2CB6C 80240E3C 00000000 */ nop +/* D2CB6C 80240E3C 00000000 */ nop /* D2CB70 80240E40 0240202D */ daddu $a0, $s2, $zero /* D2CB74 80240E44 0260282D */ daddu $a1, $s3, $zero /* D2CB78 80240E48 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_80240C6C_D2C99C /* D2CB88 80240E58 0C0127B3 */ jal func_80049ECC /* D2CB8C 80240E5C 0280302D */ daddu $a2, $s4, $zero /* D2CB90 80240E60 080903BE */ j .L80240EF8 -/* D2CB94 80240E64 00000000 */ nop +/* D2CB94 80240E64 00000000 */ nop /* D2CB98 80240E68 0240202D */ daddu $a0, $s2, $zero /* D2CB9C 80240E6C 0260282D */ daddu $a1, $s3, $zero /* D2CBA0 80240E70 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_80240C6C_D2C99C /* D2CBB0 80240E80 0C012849 */ jal func_8004A124 /* D2CBB4 80240E84 0280302D */ daddu $a2, $s4, $zero /* D2CBB8 80240E88 080903BE */ j .L80240EF8 -/* D2CBBC 80240E8C 00000000 */ nop +/* D2CBBC 80240E8C 00000000 */ nop /* D2CBC0 80240E90 0240202D */ daddu $a0, $s2, $zero /* D2CBC4 80240E94 0260282D */ daddu $a1, $s3, $zero /* D2CBC8 80240E98 0C0128FA */ jal func_8004A3E8 /* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero /* D2CBD0 80240EA0 080903BE */ j .L80240EF8 -/* D2CBD4 80240EA4 00000000 */ nop -/* D2CBD8 80240EA8 0C090194 */ jal sam_07_UnkNpcAIFunc6 +/* D2CBD4 80240EA4 00000000 */ nop +/* D2CBD8 80240EA8 0C090194 */ jal func_80240650_D2C380 /* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero -/* D2CBE0 80240EB0 0C0901AF */ jal sam_07_UnkNpcAIFunc7 +/* D2CBE0 80240EB0 0C0901AF */ jal func_802406BC_D2C3EC /* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero /* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) /* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 /* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 -/* D2CBF4 80240EC4 00000000 */ nop -/* D2CBF8 80240EC8 0C0901CB */ jal sam_07_UnkNpcAIFunc8 +/* D2CBF4 80240EC4 00000000 */ nop +/* D2CBF8 80240EC8 0C0901CB */ jal func_8024072C_D2C45C /* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero /* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) /* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 /* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 -/* D2CC0C 80240EDC 00000000 */ nop -/* D2CC10 80240EE0 0C090201 */ jal sam_07_UnkNpcAIFunc5 +/* D2CC0C 80240EDC 00000000 */ nop +/* D2CC10 80240EE0 0C090201 */ jal func_80240804_D2C534 /* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero /* D2CC18 80240EE8 080903BE */ j .L80240EF8 -/* D2CC1C 80240EEC 00000000 */ nop +/* D2CC1C 80240EEC 00000000 */ nop /* D2CC20 80240EF0 0C0129CF */ jal func_8004A73C /* D2CC24 80240EF4 0240202D */ daddu $a0, $s2, $zero .L80240EF8: diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s index 413e0d9a68..631ab0eb8b 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s @@ -26,8 +26,8 @@ glabel func_802401CC_D2FE4C /* D2FEA0 80240220 26941AE8 */ addiu $s4, $s4, %lo(D_80241AE8) /* D2FEA4 80240224 0260882D */ daddu $s1, $s3, $zero /* D2FEA8 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* D2FEAC 8024022C 3C038024 */ lui $v1, %hi(D_80241AE0) -/* D2FEB0 80240230 24631AE0 */ addiu $v1, $v1, %lo(D_80241AE0) +/* D2FEAC 8024022C 3C038024 */ lui $v1, %hi(func_80241AE0_9F6520) +/* D2FEB0 80240230 24631AE0 */ addiu $v1, $v1, %lo(func_80241AE0_9F6520) /* D2FEB4 80240234 AEB30078 */ sw $s3, 0x78($s5) /* D2FEB8 80240238 00021027 */ nor $v0, $zero, $v0 /* D2FEBC 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s index 64d3a2af18..dfb665afcf 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240600_D30280.s @@ -79,8 +79,8 @@ glabel func_80240600_D30280 /* D303A4 80240724 26100004 */ addiu $s0, $s0, 4 /* D303A8 80240728 0000882D */ daddu $s1, $zero, $zero /* D303AC 8024072C 0240802D */ daddu $s0, $s2, $zero -/* D303B0 80240730 3C148024 */ lui $s4, %hi(D_80241B38) -/* D303B4 80240734 26941B38 */ addiu $s4, $s4, %lo(D_80241B38) +/* D303B0 80240730 3C148024 */ lui $s4, %hi(func_80241B38_BEE928) +/* D303B4 80240734 26941B38 */ addiu $s4, $s4, %lo(func_80241B38_BEE928) /* D303B8 80240738 3C014248 */ lui $at, 0x4248 /* D303BC 8024073C 4481A000 */ mtc1 $at, $f20 /* D303C0 80240740 24130044 */ addiu $s3, $zero, 0x44 @@ -150,8 +150,8 @@ glabel func_80240600_D30280 /* D304B4 80240834 00000000 */ nop .L80240838: /* D304B8 80240838 0000882D */ daddu $s1, $zero, $zero -/* D304BC 8024083C 3C148024 */ lui $s4, %hi(D_80241B38) -/* D304C0 80240840 26941B38 */ addiu $s4, $s4, %lo(D_80241B38) +/* D304BC 8024083C 3C148024 */ lui $s4, %hi(func_80241B38_BEE928) +/* D304C0 80240840 26941B38 */ addiu $s4, $s4, %lo(func_80241B38_BEE928) /* D304C4 80240844 24130020 */ addiu $s3, $zero, 0x20 /* D304C8 80240848 3C064248 */ lui $a2, 0x4248 /* D304CC 8024084C 44800000 */ mtc1 $zero, $f0 @@ -197,8 +197,8 @@ glabel func_80240600_D30280 /* D30568 802408E8 AE400060 */ sw $zero, 0x60($s2) .L802408EC: /* D3056C 802408EC 0000882D */ daddu $s1, $zero, $zero -/* D30570 802408F0 3C148024 */ lui $s4, %hi(D_80241B38) -/* D30574 802408F4 26941B38 */ addiu $s4, $s4, %lo(D_80241B38) +/* D30570 802408F0 3C148024 */ lui $s4, %hi(func_80241B38_BEE928) +/* D30574 802408F4 26941B38 */ addiu $s4, $s4, %lo(func_80241B38_BEE928) /* D30578 802408F8 24130020 */ addiu $s3, $zero, 0x20 /* D3057C 802408FC 0240802D */ daddu $s0, $s2, $zero /* D30580 80240900 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s index 5e775f29db..d2c4af339f 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -46,7 +46,7 @@ glabel func_8024135C_D30FDC /* D31080 80241400 8E2200B0 */ lw $v0, 0xb0($s1) /* D31084 80241404 30420004 */ andi $v0, $v0, 4 /* D31088 80241408 10400020 */ beqz $v0, .L8024148C -/* D3108C 8024140C 00000000 */ nop +/* D3108C 8024140C 00000000 */ nop .L80241410: /* D31090 80241410 2404F7FF */ addiu $a0, $zero, -0x801 /* D31094 80241414 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_8024135C_D30FDC /* D3110C 8024148C 8E420070 */ lw $v0, 0x70($s2) /* D31110 80241490 2842001E */ slti $v0, $v0, 0x1e /* D31114 80241494 10400009 */ beqz $v0, .L802414BC -/* D31118 80241498 00000000 */ nop +/* D31118 80241498 00000000 */ nop /* D3111C 8024149C 8E22006C */ lw $v0, 0x6c($s1) /* D31120 802414A0 14400006 */ bnez $v0, .L802414BC -/* D31124 802414A4 00000000 */ nop +/* D31124 802414A4 00000000 */ nop /* D31128 802414A8 0C0903D2 */ jal func_80240F48_D30BC8 /* D3112C 802414AC 0240202D */ daddu $a0, $s2, $zero /* D31130 802414B0 10400002 */ beqz $v0, .L802414BC @@ -104,7 +104,7 @@ glabel func_8024135C_D30FDC /* D31150 802414D0 00220821 */ addu $at, $at, $v0 /* D31154 802414D4 8C2264D8 */ lw $v0, %lo(D_802464D8)($at) /* D31158 802414D8 00400008 */ jr $v0 -/* D3115C 802414DC 00000000 */ nop +/* D3115C 802414DC 00000000 */ nop /* D31160 802414E0 0240202D */ daddu $a0, $s2, $zero /* D31164 802414E4 0260282D */ daddu $a1, $s3, $zero /* D31168 802414E8 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_8024135C_D30FDC /* D31178 802414F8 0C0125AE */ jal func_800496B8 /* D3117C 802414FC 0280302D */ daddu $a2, $s4, $zero /* D31180 80241500 0809057A */ j .L802415E8 -/* D31184 80241504 00000000 */ nop +/* D31184 80241504 00000000 */ nop /* D31188 80241508 0240202D */ daddu $a0, $s2, $zero /* D3118C 8024150C 0260282D */ daddu $a1, $s3, $zero -/* D31190 80241510 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D31190 80241510 0C0126D1 */ jal func_80049B44 /* D31194 80241514 0280302D */ daddu $a2, $s4, $zero /* D31198 80241518 0240202D */ daddu $a0, $s2, $zero /* D3119C 8024151C 0260282D */ daddu $a1, $s3, $zero /* D311A0 80241520 0C012701 */ jal func_80049C04 /* D311A4 80241524 0280302D */ daddu $a2, $s4, $zero /* D311A8 80241528 0809057A */ j .L802415E8 -/* D311AC 8024152C 00000000 */ nop +/* D311AC 8024152C 00000000 */ nop /* D311B0 80241530 0240202D */ daddu $a0, $s2, $zero /* D311B4 80241534 0260282D */ daddu $a1, $s3, $zero /* D311B8 80241538 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_8024135C_D30FDC /* D311C8 80241548 0C0127B3 */ jal func_80049ECC /* D311CC 8024154C 0280302D */ daddu $a2, $s4, $zero /* D311D0 80241550 0809057A */ j .L802415E8 -/* D311D4 80241554 00000000 */ nop +/* D311D4 80241554 00000000 */ nop /* D311D8 80241558 0240202D */ daddu $a0, $s2, $zero /* D311DC 8024155C 0260282D */ daddu $a1, $s3, $zero /* D311E0 80241560 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_8024135C_D30FDC /* D311F0 80241570 0C012849 */ jal func_8004A124 /* D311F4 80241574 0280302D */ daddu $a2, $s4, $zero /* D311F8 80241578 0809057A */ j .L802415E8 -/* D311FC 8024157C 00000000 */ nop +/* D311FC 8024157C 00000000 */ nop /* D31200 80241580 0240202D */ daddu $a0, $s2, $zero /* D31204 80241584 0260282D */ daddu $a1, $s3, $zero /* D31208 80241588 0C0128FA */ jal func_8004A3E8 /* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero /* D31210 80241590 0809057A */ j .L802415E8 -/* D31214 80241594 00000000 */ nop -/* D31218 80241598 0C090350 */ jal sam_08_UnkNpcAIFunc6 +/* D31214 80241594 00000000 */ nop +/* D31218 80241598 0C090350 */ jal func_80240D40_D309C0 /* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero -/* D31220 802415A0 0C09036B */ jal sam_08_UnkNpcAIFunc7 +/* D31220 802415A0 0C09036B */ jal func_80240DAC_D30A2C /* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero /* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) /* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 /* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 -/* D31234 802415B4 00000000 */ nop -/* D31238 802415B8 0C090387 */ jal sam_08_UnkNpcAIFunc8 +/* D31234 802415B4 00000000 */ nop +/* D31238 802415B8 0C090387 */ jal func_80240E1C_D30A9C /* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero /* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) /* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 /* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 -/* D3124C 802415CC 00000000 */ nop -/* D31250 802415D0 0C0903BD */ jal sam_08_UnkNpcAIFunc5 +/* D3124C 802415CC 00000000 */ nop +/* D31250 802415D0 0C0903BD */ jal func_80240EF4_D30B74 /* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero /* D31258 802415D8 0809057A */ j .L802415E8 -/* D3125C 802415DC 00000000 */ nop +/* D3125C 802415DC 00000000 */ nop /* D31260 802415E0 0C0129CF */ jal func_8004A73C /* D31264 802415E4 0240202D */ daddu $a0, $s2, $zero .L802415E8: diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s index 9e2eaf753d..d46df7607b 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37800/func_80240000_D37800.s @@ -4,8 +4,8 @@ glabel func_80240000_D37800 /* D37800 80240000 27BDFFE0 */ addiu $sp, $sp, -0x20 /* D37804 80240004 AFB00010 */ sw $s0, 0x10($sp) -/* D37808 80240008 3C108024 */ lui $s0, %hi(D_80241040) -/* D3780C 8024000C 26101040 */ addiu $s0, $s0, %lo(D_80241040) +/* D37808 80240008 3C108024 */ lui $s0, %hi(func_80241040_BE47F0) +/* D3780C 8024000C 26101040 */ addiu $s0, $s0, %lo(func_80241040_BE47F0) /* D37810 80240010 AFBF0018 */ sw $ra, 0x18($sp) /* D37814 80240014 AFB10014 */ sw $s1, 0x14($sp) /* D37818 80240018 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240000_D37800 /* D3787C 8024007C 28620010 */ slti $v0, $v1, 0x10 /* D37880 80240080 1440FFFA */ bnez $v0, .L8024006C /* D37884 80240084 24840004 */ addiu $a0, $a0, 4 -/* D37888 80240088 3C108024 */ lui $s0, %hi(D_80241040) -/* D3788C 8024008C 26101040 */ addiu $s0, $s0, %lo(D_80241040) +/* D37888 80240088 3C108024 */ lui $s0, %hi(func_80241040_BE47F0) +/* D3788C 8024008C 26101040 */ addiu $s0, $s0, %lo(func_80241040_BE47F0) /* D37890 80240090 0C00AB4B */ jal heap_free /* D37894 80240094 8E040000 */ lw $a0, ($s0) /* D37898 80240098 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s index 42d0c747a8..edaccb4ec9 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802405D8_D37DD8.s @@ -54,8 +54,8 @@ glabel func_802405D8_D37DD8 /* D37E98 80240698 00000000 */ nop /* D37E9C 8024069C 0C00A6C9 */ jal clamp_angle /* D37EA0 802406A0 46000306 */ mov.s $f12, $f0 -/* D37EA4 802406A4 3C018024 */ lui $at, %hi(D_80242C30) -/* D37EA8 802406A8 D4222C30 */ ldc1 $f2, %lo(D_80242C30)($at) +/* D37EA4 802406A4 3C018024 */ lui $at, %hi(func_80242C30_B37800) +/* D37EA8 802406A8 D4222C30 */ ldc1 $f2, %lo(func_80242C30_B37800)($at) /* D37EAC 802406AC 46000021 */ cvt.d.s $f0, $f0 /* D37EB0 802406B0 4622003C */ c.lt.d $f0, $f2 /* D37EB4 802406B4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index ae999a71d0..9c3101dc1e 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -46,7 +46,7 @@ glabel func_802409EC_D381EC /* D38290 80240A90 8E2200B0 */ lw $v0, 0xb0($s1) /* D38294 80240A94 30420004 */ andi $v0, $v0, 4 /* D38298 80240A98 10400020 */ beqz $v0, .L80240B1C -/* D3829C 80240A9C 00000000 */ nop +/* D3829C 80240A9C 00000000 */ nop .L80240AA0: /* D382A0 80240AA0 2404F7FF */ addiu $a0, $zero, -0x801 /* D382A4 80240AA4 AE400070 */ sw $zero, 0x70($s2) @@ -86,10 +86,10 @@ glabel func_802409EC_D381EC /* D3831C 80240B1C 8E420070 */ lw $v0, 0x70($s2) /* D38320 80240B20 2842001E */ slti $v0, $v0, 0x1e /* D38324 80240B24 10400009 */ beqz $v0, .L80240B4C -/* D38328 80240B28 00000000 */ nop +/* D38328 80240B28 00000000 */ nop /* D3832C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) /* D38330 80240B30 14400006 */ bnez $v0, .L80240B4C -/* D38334 80240B34 00000000 */ nop +/* D38334 80240B34 00000000 */ nop /* D38338 80240B38 0C090176 */ jal func_802405D8_D37DD8 /* D3833C 80240B3C 0240202D */ daddu $a0, $s2, $zero /* D38340 80240B40 10400002 */ beqz $v0, .L80240B4C @@ -104,7 +104,7 @@ glabel func_802409EC_D381EC /* D38360 80240B60 00220821 */ addu $at, $at, $v0 /* D38364 80240B64 8C222C38 */ lw $v0, %lo(D_80242C38)($at) /* D38368 80240B68 00400008 */ jr $v0 -/* D3836C 80240B6C 00000000 */ nop +/* D3836C 80240B6C 00000000 */ nop /* D38370 80240B70 0240202D */ daddu $a0, $s2, $zero /* D38374 80240B74 0260282D */ daddu $a1, $s3, $zero /* D38378 80240B78 0C012568 */ jal func_800495A0 @@ -114,17 +114,17 @@ glabel func_802409EC_D381EC /* D38388 80240B88 0C0125AE */ jal func_800496B8 /* D3838C 80240B8C 0280302D */ daddu $a2, $s4, $zero /* D38390 80240B90 0809031E */ j .L80240C78 -/* D38394 80240B94 00000000 */ nop +/* D38394 80240B94 00000000 */ nop /* D38398 80240B98 0240202D */ daddu $a0, $s2, $zero /* D3839C 80240B9C 0260282D */ daddu $a1, $s3, $zero -/* D383A0 80240BA0 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* D383A0 80240BA0 0C0126D1 */ jal func_80049B44 /* D383A4 80240BA4 0280302D */ daddu $a2, $s4, $zero /* D383A8 80240BA8 0240202D */ daddu $a0, $s2, $zero /* D383AC 80240BAC 0260282D */ daddu $a1, $s3, $zero /* D383B0 80240BB0 0C012701 */ jal func_80049C04 /* D383B4 80240BB4 0280302D */ daddu $a2, $s4, $zero /* D383B8 80240BB8 0809031E */ j .L80240C78 -/* D383BC 80240BBC 00000000 */ nop +/* D383BC 80240BBC 00000000 */ nop /* D383C0 80240BC0 0240202D */ daddu $a0, $s2, $zero /* D383C4 80240BC4 0260282D */ daddu $a1, $s3, $zero /* D383C8 80240BC8 0C01278F */ jal func_80049E3C @@ -134,7 +134,7 @@ glabel func_802409EC_D381EC /* D383D8 80240BD8 0C0127B3 */ jal func_80049ECC /* D383DC 80240BDC 0280302D */ daddu $a2, $s4, $zero /* D383E0 80240BE0 0809031E */ j .L80240C78 -/* D383E4 80240BE4 00000000 */ nop +/* D383E4 80240BE4 00000000 */ nop /* D383E8 80240BE8 0240202D */ daddu $a0, $s2, $zero /* D383EC 80240BEC 0260282D */ daddu $a1, $s3, $zero /* D383F0 80240BF0 0C0127DF */ jal func_80049F7C @@ -144,31 +144,31 @@ glabel func_802409EC_D381EC /* D38400 80240C00 0C012849 */ jal func_8004A124 /* D38404 80240C04 0280302D */ daddu $a2, $s4, $zero /* D38408 80240C08 0809031E */ j .L80240C78 -/* D3840C 80240C0C 00000000 */ nop +/* D3840C 80240C0C 00000000 */ nop /* D38410 80240C10 0240202D */ daddu $a0, $s2, $zero /* D38414 80240C14 0260282D */ daddu $a1, $s3, $zero /* D38418 80240C18 0C0128FA */ jal func_8004A3E8 /* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero /* D38420 80240C20 0809031E */ j .L80240C78 -/* D38424 80240C24 00000000 */ nop -/* D38428 80240C28 0C0900F4 */ jal sam_10_UnkNpcAIFunc6 +/* D38424 80240C24 00000000 */ nop +/* D38428 80240C28 0C0900F4 */ jal func_802403D0_D37BD0 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero -/* D38430 80240C30 0C09010F */ jal sam_10_UnkNpcAIFunc7 +/* D38430 80240C30 0C09010F */ jal func_8024043C_D37C3C /* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero /* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 /* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 -/* D38444 80240C44 00000000 */ nop -/* D38448 80240C48 0C09012B */ jal sam_10_UnkNpcAIFunc8 +/* D38444 80240C44 00000000 */ nop +/* D38448 80240C48 0C09012B */ jal func_802404AC_D37CAC /* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero /* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 /* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 -/* D3845C 80240C5C 00000000 */ nop -/* D38460 80240C60 0C090161 */ jal sam_10_UnkNpcAIFunc5 +/* D3845C 80240C5C 00000000 */ nop +/* D38460 80240C60 0C090161 */ jal func_80240584_D37D84 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero /* D38468 80240C68 0809031E */ j .L80240C78 -/* D3846C 80240C6C 00000000 */ nop +/* D3846C 80240C6C 00000000 */ nop /* D38470 80240C70 0C0129CF */ jal func_8004A73C /* D38474 80240C74 0240202D */ daddu $a0, $s2, $zero .L80240C78: diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s index 72f748a979..6ee01e0186 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240360_D3A930.s @@ -58,8 +58,8 @@ glabel func_80240360_D3A930 /* D3A9F0 80240420 0080302D */ daddu $a2, $a0, $zero /* D3A9F4 80240424 240600FF */ addiu $a2, $zero, 0xff /* D3A9F8 80240428 93A20013 */ lbu $v0, 0x13($sp) -/* D3A9FC 8024042C 3C038024 */ lui $v1, %hi(D_80243CC0) -/* D3AA00 80240430 8C633CC0 */ lw $v1, %lo(D_80243CC0)($v1) +/* D3A9FC 8024042C 3C038024 */ lui $v1, %hi(func_80243CC0_A2DF00) +/* D3AA00 80240430 8C633CC0 */ lw $v1, %lo(func_80243CC0_A2DF00)($v1) /* D3AA04 80240434 00C23023 */ subu $a2, $a2, $v0 /* D3AA08 80240438 00660018 */ mult $v1, $a2 /* D3AA0C 8024043C 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s index 0d2ec58dd3..058e9ca944 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B30_D3B100.s @@ -9,8 +9,8 @@ glabel func_80240B30_D3B100 /* D3B110 80240B40 8C84014C */ lw $a0, 0x14c($a0) /* D3B114 80240B44 24040008 */ addiu $a0, $zero, 8 /* D3B118 80240B48 0040802D */ daddu $s0, $v0, $zero -/* D3B11C 80240B4C 3C028024 */ lui $v0, %hi(D_80240B9C) -/* D3B120 80240B50 24420B9C */ addiu $v0, $v0, %lo(D_80240B9C) +/* D3B11C 80240B4C 3C028024 */ lui $v0, %hi(func_80240B9C_D3AE0C) +/* D3B120 80240B50 24420B9C */ addiu $v0, $v0, %lo(func_80240B9C_D3AE0C) /* D3B124 80240B54 0C00AB39 */ jal heap_malloc /* D3B128 80240B58 AE020008 */ sw $v0, 8($s0) /* D3B12C 80240B5C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s index f32e3a37e8..c524248c1a 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240F40_D3B510.s @@ -66,8 +66,8 @@ glabel func_80240F40_D3B510 /* D3B604 80241034 0000202D */ daddu $a0, $zero, $zero /* D3B608 80241038 0220202D */ daddu $a0, $s1, $zero /* D3B60C 8024103C 3C05F4AC */ lui $a1, 0xf4ac -/* D3B610 80241040 3C018025 */ lui $at, %hi(D_80251474) -/* D3B614 80241044 AC221474 */ sw $v0, %lo(D_80251474)($at) +/* D3B610 80241040 3C018025 */ lui $at, %hi(func_80251474) +/* D3B614 80241044 AC221474 */ sw $v0, %lo(func_80251474)($at) /* D3B618 80241048 0C0B1EAF */ jal get_variable /* D3B61C 8024104C 34A5D481 */ ori $a1, $a1, 0xd481 /* D3B620 80241050 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s index 14706a7e67..3acf225817 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241158_D3B728.s @@ -5,8 +5,8 @@ glabel func_80241158_D3B728 /* D3B728 80241158 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D3B72C 8024115C 10A0000B */ beqz $a1, .L8024118C /* D3B730 80241160 AFBF0010 */ sw $ra, 0x10($sp) -/* D3B734 80241164 3C038025 */ lui $v1, %hi(D_80251474) -/* D3B738 80241168 8C631474 */ lw $v1, %lo(D_80251474)($v1) +/* D3B734 80241164 3C038025 */ lui $v1, %hi(func_80251474) +/* D3B738 80241168 8C631474 */ lw $v1, %lo(func_80251474)($v1) /* D3B73C 8024116C 8C620000 */ lw $v0, ($v1) /* D3B740 80241170 3C048025 */ lui $a0, %hi(D_80251478) /* D3B744 80241174 8C841478 */ lw $a0, %lo(D_80251478)($a0) diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s index 29a2a7dba8..77830dede3 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s @@ -3,8 +3,8 @@ glabel func_80241834_D3BE04 /* D3BE04 80241834 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3BE08 80241838 3C058024 */ lui $a1, %hi(D_802417C8) -/* D3BE0C 8024183C 24A517C8 */ addiu $a1, $a1, %lo(D_802417C8) +/* D3BE08 80241838 3C058024 */ lui $a1, %hi(func_802417C8_D3AD34) +/* D3BE0C 8024183C 24A517C8 */ addiu $a1, $a1, %lo(func_802417C8_D3AD34) /* D3BE10 80241840 AFBF0010 */ sw $ra, 0x10($sp) /* D3BE14 80241844 0C048C8F */ jal bind_dynamic_entity_7 /* D3BE18 80241848 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s index 695df809c1..90fe3cb1bd 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240370_93F920.s @@ -35,8 +35,8 @@ glabel func_80240370_93F920 /* 93F994 802403E4 08090103 */ j .L8024040C /* 93F998 802403E8 E4800018 */ swc1 $f0, 0x18($a0) .L802403EC: -/* 93F99C 802403EC 3C018024 */ lui $at, %hi(D_802448A0) -/* 93F9A0 802403F0 D42248A0 */ ldc1 $f2, %lo(D_802448A0)($at) +/* 93F99C 802403EC 3C018024 */ lui $at, %hi(func_802448A0_805120) +/* 93F9A0 802403F0 D42248A0 */ ldc1 $f2, %lo(func_802448A0_805120)($at) /* 93F9A4 802403F4 44820000 */ mtc1 $v0, $f0 /* 93F9A8 802403F8 00000000 */ nop /* 93F9AC 802403FC 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index f516102c51..2dd6358752 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -119,11 +119,11 @@ glabel func_80240B64_940114 /* 9402C8 80240D18 00000000 */ nop /* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 9402D4 80240D24 0C090151 */ jal sbk_30_NpcJumpFunc3 +/* 9402D4 80240D24 0C090151 */ jal func_80240544_93FAF4 /* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 9402E4 80240D34 0C090169 */ jal sbk_30_NpcJumpFunc +/* 9402E4 80240D34 0C090169 */ jal func_802405A4_93FB54 /* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 9402EC 80240D3C 0809036D */ j .L80240DB4 /* 9402F0 80240D40 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_80240B64_940114 /* 940300 80240D50 02A0302D */ daddu $a2, $s5, $zero /* 940304 80240D54 0280202D */ daddu $a0, $s4, $zero /* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 94030C 80240D5C 0C0901D3 */ jal sbk_30_UnkNpcAIFunc11 +/* 94030C 80240D5C 0C0901D3 */ jal func_8024074C_93FCFC /* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 940314 80240D64 0809036D */ j .L80240DB4 /* 940318 80240D68 00000000 */ nop /* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 940324 80240D74 0C09021A */ jal sbk_30_UnkNpcAIFunc10 +/* 940324 80240D74 0C09021A */ jal func_80240868_93FE18 /* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 94032C 80240D7C 0809036D */ j .L80240DB4 /* 940330 80240D80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s index 4eb2aeb9d7..9e91aeb613 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s +++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s @@ -6,11 +6,11 @@ glabel func_80240384_946254 /* 946258 80240388 AFBF0010 */ sw $ra, 0x10($sp) /* 94625C 8024038C 10A00003 */ beqz $a1, .L8024039C /* 946260 80240390 8C86000C */ lw $a2, 0xc($a0) -/* 946264 80240394 3C018024 */ lui $at, %hi(D_80240E00) -/* 946268 80240398 AC200E00 */ sw $zero, %lo(D_80240E00)($at) +/* 946264 80240394 3C018024 */ lui $at, %hi(func_80240E00_8B0E70) +/* 946268 80240398 AC200E00 */ sw $zero, %lo(func_80240E00_8B0E70)($at) .L8024039C: -/* 94626C 8024039C 3C038024 */ lui $v1, %hi(D_80240E00) -/* 946270 802403A0 24630E00 */ addiu $v1, $v1, %lo(D_80240E00) +/* 94626C 8024039C 3C038024 */ lui $v1, %hi(func_80240E00_8B0E70) +/* 946270 802403A0 24630E00 */ addiu $v1, $v1, %lo(func_80240E00_8B0E70) /* 946274 802403A4 8C620000 */ lw $v0, ($v1) /* 946278 802403A8 54400003 */ bnel $v0, $zero, .L802403B8 /* 94627C 802403AC AC600000 */ sw $zero, ($v1) diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s index 23098014bd..9275ac31fd 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s +++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s @@ -12,7 +12,7 @@ glabel func_802403D8_9462A8 /* 9462C4 802403F4 24020002 */ addiu $v0, $zero, 2 /* 9462C8 802403F8 8FBF0010 */ lw $ra, 0x10($sp) /* 9462CC 802403FC 24030001 */ addiu $v1, $zero, 1 -/* 9462D0 80240400 3C018024 */ lui $at, %hi(D_80240E00) -/* 9462D4 80240404 AC230E00 */ sw $v1, %lo(D_80240E00)($at) +/* 9462D0 80240400 3C018024 */ lui $at, %hi(func_80240E00_8B0E70) +/* 9462D4 80240404 AC230E00 */ sw $v1, %lo(func_80240E00_8B0E70)($at) /* 9462D8 80240408 03E00008 */ jr $ra /* 9462DC 8024040C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s index 0431ec42ec..186bc07488 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s @@ -22,8 +22,8 @@ glabel func_8024024C_95420C /* 954250 80240290 0040982D */ daddu $s3, $v0, $zero /* 954254 80240294 0000B02D */ daddu $s6, $zero, $zero /* 954258 80240298 02C0902D */ daddu $s2, $s6, $zero -/* 95425C 8024029C 3C148024 */ lui $s4, %hi(D_80241438) -/* 954260 802402A0 26941438 */ addiu $s4, $s4, %lo(D_80241438) +/* 95425C 8024029C 3C148024 */ lui $s4, %hi(func_80241438_8535A8) +/* 954260 802402A0 26941438 */ addiu $s4, $s4, %lo(func_80241438_8535A8) /* 954264 802402A4 0260882D */ daddu $s1, $s3, $zero /* 954268 802402A8 8EA200B4 */ lw $v0, 0xb4($s5) /* 95426C 802402AC 3C038024 */ lui $v1, %hi(D_80241430) diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s index a47dbe6a20..140f53ade8 100644 --- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s +++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s @@ -3,8 +3,8 @@ glabel func_802409E0_86F4E0 /* 86F4E0 802409E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86F4E4 802409E4 3C048024 */ lui $a0, %hi(D_80242EBC) -/* 86F4E8 802409E8 24842EBC */ addiu $a0, $a0, %lo(D_80242EBC) +/* 86F4E4 802409E4 3C048024 */ lui $a0, %hi(func_80242EBC_7EDBCC) +/* 86F4E8 802409E8 24842EBC */ addiu $a0, $a0, %lo(func_80242EBC_7EDBCC) /* 86F4EC 802409EC AFBF0018 */ sw $ra, 0x18($sp) /* 86F4F0 802409F0 AFB10014 */ sw $s1, 0x14($sp) /* 86F4F4 802409F4 AFB00010 */ sw $s0, 0x10($sp) diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index f2534c3754..ea69e766bf 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -83,7 +83,7 @@ glabel func_802426FC_87C2DC /* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero /* 87C410 80242830 0280202D */ daddu $a0, $s4, $zero /* 87C414 80242834 0200282D */ daddu $a1, $s0, $zero -/* 87C418 80242838 0C0906F2 */ jal tik_07_UnkNpcAIFunc1 +/* 87C418 80242838 0C0906F2 */ jal func_80241BC8_87B7A8 /* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero /* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero /* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_802426FC_87C2DC /* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero /* 87C438 80242858 0280202D */ daddu $a0, $s4, $zero /* 87C43C 8024285C 0200282D */ daddu $a1, $s0, $zero -/* 87C440 80242860 0C0907F3 */ jal tik_07_UnkNpcAIFunc2 +/* 87C440 80242860 0C0907F3 */ jal func_80241FCC_87BBAC /* 87C444 80242864 0260302D */ daddu $a2, $s3, $zero /* 87C448 80242868 0280202D */ daddu $a0, $s4, $zero /* 87C44C 8024286C 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_802426FC_87C2DC /* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero /* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero /* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero -/* 87C480 802428A0 0C090879 */ jal tik_07_UnkNpcAIFunc3 +/* 87C480 802428A0 0C090879 */ jal func_802421E4_87BDC4 /* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero /* 87C488 802428A8 08090A31 */ j .L802428C4 /* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s index b3c38c1fcc..ff9eaba6cd 100644 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -55,7 +55,7 @@ glabel func_80240DC4_882F84 /* 883048 80240E88 8E2200B0 */ lw $v0, 0xb0($s1) /* 88304C 80240E8C 30420004 */ andi $v0, $v0, 4 /* 883050 80240E90 10400047 */ beqz $v0, .L80240FB0 -/* 883054 80240E94 00000000 */ nop +/* 883054 80240E94 00000000 */ nop .L80240E98: /* 883058 80240E98 AE600070 */ sw $zero, 0x70($s3) /* 88305C 80240E9C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240DC4_882F84 /* 883100 80240F40 24020028 */ addiu $v0, $zero, 0x28 /* 883104 80240F44 AFA2001C */ sw $v0, 0x1c($sp) /* 883108 80240F48 44833000 */ mtc1 $v1, $f6 -/* 88310C 80240F4C 00000000 */ nop +/* 88310C 80240F4C 00000000 */ nop /* 883110 80240F50 468031A0 */ cvt.s.w $f6, $f6 /* 883114 80240F54 44073000 */ mfc1 $a3, $f6 /* 883118 80240F58 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240DC4_882F84 /* 8831D0 80241010 10600015 */ beqz $v1, .L80241068 /* 8831D4 80241014 0260202D */ daddu $a0, $s3, $zero /* 8831D8 80241018 0809045C */ j .L80241170 -/* 8831DC 8024101C 00000000 */ nop +/* 8831DC 8024101C 00000000 */ nop .L80241020: /* 8831E0 80241020 1062001C */ beq $v1, $v0, .L80241094 /* 8831E4 80241024 24020003 */ addiu $v0, $zero, 3 /* 8831E8 80241028 10620035 */ beq $v1, $v0, .L80241100 /* 8831EC 8024102C 0260202D */ daddu $a0, $s3, $zero /* 8831F0 80241030 0809045C */ j .L80241170 -/* 8831F4 80241034 00000000 */ nop +/* 8831F4 80241034 00000000 */ nop .L80241038: /* 8831F8 80241038 2402000E */ addiu $v0, $zero, 0xe /* 8831FC 8024103C 1062003F */ beq $v1, $v0, .L8024113C @@ -177,9 +177,9 @@ glabel func_80240DC4_882F84 /* 883210 80241050 10620040 */ beq $v1, $v0, .L80241154 /* 883214 80241054 24020063 */ addiu $v0, $zero, 0x63 /* 883218 80241058 10620043 */ beq $v1, $v0, .L80241168 -/* 88321C 8024105C 00000000 */ nop +/* 88321C 8024105C 00000000 */ nop /* 883220 80241060 0809045C */ j .L80241170 -/* 883224 80241064 00000000 */ nop +/* 883224 80241064 00000000 */ nop .L80241068: /* 883228 80241068 0280282D */ daddu $a1, $s4, $zero /* 88322C 8024106C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240DC4_882F84 /* 883244 80241084 0C0125AE */ jal func_800496B8 /* 883248 80241088 02A0302D */ daddu $a2, $s5, $zero /* 88324C 8024108C 0809045C */ j .L80241170 -/* 883250 80241090 00000000 */ nop +/* 883250 80241090 00000000 */ nop .L80241094: /* 883254 80241094 0260202D */ daddu $a0, $s3, $zero /* 883258 80241098 0280282D */ daddu $a1, $s4, $zero -/* 88325C 8024109C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 88325C 8024109C 0C0126D1 */ jal func_80049B44 /* 883260 802410A0 02A0302D */ daddu $a2, $s5, $zero /* 883264 802410A4 8E230088 */ lw $v1, 0x88($s1) /* 883268 802410A8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240DC4_882F84 /* 8832C4 80241104 0C012701 */ jal func_80049C04 /* 8832C8 80241108 02A0302D */ daddu $a2, $s5, $zero /* 8832CC 8024110C 0809045C */ j .L80241170 -/* 8832D0 80241110 00000000 */ nop +/* 8832D0 80241110 00000000 */ nop .L80241114: /* 8832D4 80241114 0260202D */ daddu $a0, $s3, $zero /* 8832D8 80241118 0280282D */ daddu $a1, $s4, $zero -/* 8832DC 8024111C 0C09028C */ jal tik_09_set_script_owner_npc_anim +/* 8832DC 8024111C 0C09028C */ jal func_80240A30_882BF0 /* 8832E0 80241120 02A0302D */ daddu $a2, $s5, $zero /* 8832E4 80241124 0260202D */ daddu $a0, $s3, $zero .L80241128: @@ -240,20 +240,20 @@ glabel func_80240DC4_882F84 /* 8832EC 8024112C 0C0902AB */ jal func_80240AAC_882C6C /* 8832F0 80241130 02A0302D */ daddu $a2, $s5, $zero /* 8832F4 80241134 0809045C */ j .L80241170 -/* 8832F8 80241138 00000000 */ nop +/* 8832F8 80241138 00000000 */ nop .L8024113C: /* 8832FC 8024113C 0260202D */ daddu $a0, $s3, $zero /* 883300 80241140 0280282D */ daddu $a1, $s4, $zero -/* 883304 80241144 0C0902F8 */ jal tik_09_UnkNpcAIFunc12 +/* 883304 80241144 0C0902F8 */ jal func_80240BE0_882DA0 /* 883308 80241148 02A0302D */ daddu $a2, $s5, $zero /* 88330C 8024114C 0809045C */ j .L80241170 -/* 883310 80241150 00000000 */ nop +/* 883310 80241150 00000000 */ nop .L80241154: /* 883314 80241154 0280282D */ daddu $a1, $s4, $zero -/* 883318 80241158 0C090351 */ jal tik_09_set_script_owner_npc_col_height +/* 883318 80241158 0C090351 */ jal func_80240D44_882F04 /* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero /* 883320 80241160 0809045C */ j .L80241170 -/* 883324 80241164 00000000 */ nop +/* 883324 80241164 00000000 */ nop .L80241168: /* 883328 80241168 0C0129CF */ jal func_8004A73C /* 88332C 8024116C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240DC4_882F84 /* 883380 802411C0 00220821 */ addu $at, $at, $v0 /* 883384 802411C4 8C2241A8 */ lw $v0, %lo(D_802441A8)($at) /* 883388 802411C8 00400008 */ jr $v0 -/* 88338C 802411CC 00000000 */ nop +/* 88338C 802411CC 00000000 */ nop /* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) /* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 /* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index 2ad97eda62..d39cd9b1c5 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -55,7 +55,7 @@ glabel func_80241CF4_88A8C4 /* 88A988 80241DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 88A98C 80241DBC 30420004 */ andi $v0, $v0, 4 /* 88A990 80241DC0 10400047 */ beqz $v0, .L80241EE0 -/* 88A994 80241DC4 00000000 */ nop +/* 88A994 80241DC4 00000000 */ nop .L80241DC8: /* 88A998 80241DC8 AE600070 */ sw $zero, 0x70($s3) /* 88A99C 80241DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80241CF4_88A8C4 /* 88AA40 80241E70 24020028 */ addiu $v0, $zero, 0x28 /* 88AA44 80241E74 AFA2001C */ sw $v0, 0x1c($sp) /* 88AA48 80241E78 44833000 */ mtc1 $v1, $f6 -/* 88AA4C 80241E7C 00000000 */ nop +/* 88AA4C 80241E7C 00000000 */ nop /* 88AA50 80241E80 468031A0 */ cvt.s.w $f6, $f6 /* 88AA54 80241E84 44073000 */ mfc1 $a3, $f6 /* 88AA58 80241E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80241CF4_88A8C4 /* 88AB10 80241F40 10600015 */ beqz $v1, .L80241F98 /* 88AB14 80241F44 0260202D */ daddu $a0, $s3, $zero /* 88AB18 80241F48 08090828 */ j .L802420A0 -/* 88AB1C 80241F4C 00000000 */ nop +/* 88AB1C 80241F4C 00000000 */ nop .L80241F50: /* 88AB20 80241F50 1062001C */ beq $v1, $v0, .L80241FC4 /* 88AB24 80241F54 24020003 */ addiu $v0, $zero, 3 /* 88AB28 80241F58 10620035 */ beq $v1, $v0, .L80242030 /* 88AB2C 80241F5C 0260202D */ daddu $a0, $s3, $zero /* 88AB30 80241F60 08090828 */ j .L802420A0 -/* 88AB34 80241F64 00000000 */ nop +/* 88AB34 80241F64 00000000 */ nop .L80241F68: /* 88AB38 80241F68 2402000E */ addiu $v0, $zero, 0xe /* 88AB3C 80241F6C 1062003F */ beq $v1, $v0, .L8024206C @@ -177,9 +177,9 @@ glabel func_80241CF4_88A8C4 /* 88AB50 80241F80 10620040 */ beq $v1, $v0, .L80242084 /* 88AB54 80241F84 24020063 */ addiu $v0, $zero, 0x63 /* 88AB58 80241F88 10620043 */ beq $v1, $v0, .L80242098 -/* 88AB5C 80241F8C 00000000 */ nop +/* 88AB5C 80241F8C 00000000 */ nop /* 88AB60 80241F90 08090828 */ j .L802420A0 -/* 88AB64 80241F94 00000000 */ nop +/* 88AB64 80241F94 00000000 */ nop .L80241F98: /* 88AB68 80241F98 0280282D */ daddu $a1, $s4, $zero /* 88AB6C 80241F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80241CF4_88A8C4 /* 88AB84 80241FB4 0C0125AE */ jal func_800496B8 /* 88AB88 80241FB8 02A0302D */ daddu $a2, $s5, $zero /* 88AB8C 80241FBC 08090828 */ j .L802420A0 -/* 88AB90 80241FC0 00000000 */ nop +/* 88AB90 80241FC0 00000000 */ nop .L80241FC4: /* 88AB94 80241FC4 0260202D */ daddu $a0, $s3, $zero /* 88AB98 80241FC8 0280282D */ daddu $a1, $s4, $zero -/* 88AB9C 80241FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 88AB9C 80241FCC 0C0126D1 */ jal func_80049B44 /* 88ABA0 80241FD0 02A0302D */ daddu $a2, $s5, $zero /* 88ABA4 80241FD4 8E230088 */ lw $v1, 0x88($s1) /* 88ABA8 80241FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80241CF4_88A8C4 /* 88AC04 80242034 0C012701 */ jal func_80049C04 /* 88AC08 80242038 02A0302D */ daddu $a2, $s5, $zero /* 88AC0C 8024203C 08090828 */ j .L802420A0 -/* 88AC10 80242040 00000000 */ nop +/* 88AC10 80242040 00000000 */ nop .L80242044: /* 88AC14 80242044 0260202D */ daddu $a0, $s3, $zero /* 88AC18 80242048 0280282D */ daddu $a1, $s4, $zero -/* 88AC1C 8024204C 0C090658 */ jal tik_12_set_script_owner_npc_anim +/* 88AC1C 8024204C 0C090658 */ jal func_80241960_88A530 /* 88AC20 80242050 02A0302D */ daddu $a2, $s5, $zero /* 88AC24 80242054 0260202D */ daddu $a0, $s3, $zero .L80242058: @@ -240,20 +240,20 @@ glabel func_80241CF4_88A8C4 /* 88AC2C 8024205C 0C090677 */ jal func_802419DC_88A5AC /* 88AC30 80242060 02A0302D */ daddu $a2, $s5, $zero /* 88AC34 80242064 08090828 */ j .L802420A0 -/* 88AC38 80242068 00000000 */ nop +/* 88AC38 80242068 00000000 */ nop .L8024206C: /* 88AC3C 8024206C 0260202D */ daddu $a0, $s3, $zero /* 88AC40 80242070 0280282D */ daddu $a1, $s4, $zero -/* 88AC44 80242074 0C0906C4 */ jal tik_12_UnkNpcAIFunc12 +/* 88AC44 80242074 0C0906C4 */ jal func_80241B10_88A6E0 /* 88AC48 80242078 02A0302D */ daddu $a2, $s5, $zero /* 88AC4C 8024207C 08090828 */ j .L802420A0 -/* 88AC50 80242080 00000000 */ nop +/* 88AC50 80242080 00000000 */ nop .L80242084: /* 88AC54 80242084 0280282D */ daddu $a1, $s4, $zero -/* 88AC58 80242088 0C09071D */ jal tik_12_set_script_owner_npc_col_height +/* 88AC58 80242088 0C09071D */ jal func_80241C74_88A844 /* 88AC5C 8024208C 02A0302D */ daddu $a2, $s5, $zero /* 88AC60 80242090 08090828 */ j .L802420A0 -/* 88AC64 80242094 00000000 */ nop +/* 88AC64 80242094 00000000 */ nop .L80242098: /* 88AC68 80242098 0C0129CF */ jal func_8004A73C /* 88AC6C 8024209C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80241CF4_88A8C4 /* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 /* 88ACC4 802420F4 8C2249D8 */ lw $v0, %lo(D_802449D8)($at) /* 88ACC8 802420F8 00400008 */ jr $v0 -/* 88ACCC 802420FC 00000000 */ nop +/* 88ACCC 802420FC 00000000 */ nop /* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) /* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 /* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s index 58f0a9cae9..8798444061 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s @@ -61,8 +61,8 @@ glabel func_802401FC_892C1C /* 892CF8 802402D8 24020001 */ addiu $v0, $zero, 1 /* 892CFC 802402DC AE22018C */ sw $v0, 0x18c($s1) /* 892D00 802402E0 00041080 */ sll $v0, $a0, 2 -/* 892D04 802402E4 3C068024 */ lui $a2, %hi(D_80241438) -/* 892D08 802402E8 24C61438 */ addiu $a2, $a2, %lo(D_80241438) +/* 892D04 802402E4 3C068024 */ lui $a2, %hi(func_80241438_8535A8) +/* 892D08 802402E8 24C61438 */ addiu $a2, $a2, %lo(func_80241438_8535A8) /* 892D0C 802402EC AE230000 */ sw $v1, ($s1) /* 892D10 802402F0 001218C0 */ sll $v1, $s2, 3 /* 892D14 802402F4 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s index ca2b1d2f86..22ad4581eb 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s @@ -61,8 +61,8 @@ glabel func_802407BC_897D9C /* 897E78 80240898 24020001 */ addiu $v0, $zero, 1 /* 897E7C 8024089C AE22018C */ sw $v0, 0x18c($s1) /* 897E80 802408A0 00041080 */ sll $v0, $a0, 2 -/* 897E84 802408A4 3C068024 */ lui $a2, %hi(D_802426C8) -/* 897E88 802408A8 24C626C8 */ addiu $a2, $a2, %lo(D_802426C8) +/* 897E84 802408A4 3C068024 */ lui $a2, %hi(func_802426C8_7ED3D8) +/* 897E88 802408A8 24C626C8 */ addiu $a2, $a2, %lo(func_802426C8_7ED3D8) /* 897E8C 802408AC AE230000 */ sw $v1, ($s1) /* 897E90 802408B0 001218C0 */ sll $v1, $s2, 3 /* 897E94 802408B4 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s index ec84efe2a8..2e78be19e3 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s @@ -79,8 +79,8 @@ glabel func_80240BF0_8981D0 /* 8982F4 80240D14 26100004 */ addiu $s0, $s0, 4 /* 8982F8 80240D18 0000882D */ daddu $s1, $zero, $zero /* 8982FC 80240D1C 0240802D */ daddu $s0, $s2, $zero -/* 898300 80240D20 3C148024 */ lui $s4, %hi(D_80242708) -/* 898304 80240D24 26942708 */ addiu $s4, $s4, %lo(D_80242708) +/* 898300 80240D20 3C148024 */ lui $s4, %hi(func_80242708_854878) +/* 898304 80240D24 26942708 */ addiu $s4, $s4, %lo(func_80242708_854878) /* 898308 80240D28 3C014248 */ lui $at, 0x4248 /* 89830C 80240D2C 4481A000 */ mtc1 $at, $f20 /* 898310 80240D30 24130044 */ addiu $s3, $zero, 0x44 @@ -150,8 +150,8 @@ glabel func_80240BF0_8981D0 /* 898404 80240E24 00000000 */ nop .L80240E28: /* 898408 80240E28 0000882D */ daddu $s1, $zero, $zero -/* 89840C 80240E2C 3C148024 */ lui $s4, %hi(D_80242708) -/* 898410 80240E30 26942708 */ addiu $s4, $s4, %lo(D_80242708) +/* 89840C 80240E2C 3C148024 */ lui $s4, %hi(func_80242708_854878) +/* 898410 80240E30 26942708 */ addiu $s4, $s4, %lo(func_80242708_854878) /* 898414 80240E34 24130020 */ addiu $s3, $zero, 0x20 /* 898418 80240E38 3C064248 */ lui $a2, 0x4248 /* 89841C 80240E3C 44800000 */ mtc1 $zero, $f0 @@ -197,8 +197,8 @@ glabel func_80240BF0_8981D0 /* 8984B8 80240ED8 AE400060 */ sw $zero, 0x60($s2) .L80240EDC: /* 8984BC 80240EDC 0000882D */ daddu $s1, $zero, $zero -/* 8984C0 80240EE0 3C148024 */ lui $s4, %hi(D_80242708) -/* 8984C4 80240EE4 26942708 */ addiu $s4, $s4, %lo(D_80242708) +/* 8984C0 80240EE0 3C148024 */ lui $s4, %hi(func_80242708_854878) +/* 8984C4 80240EE4 26942708 */ addiu $s4, $s4, %lo(func_80242708_854878) /* 8984C8 80240EE8 24130020 */ addiu $s3, $zero, 0x20 /* 8984CC 80240EEC 0240802D */ daddu $s0, $s2, $zero /* 8984D0 80240EF0 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s index 4ff000ae98..8b2d5c1a91 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s @@ -55,8 +55,8 @@ glabel func_802409DC_89AD2C /* 89ADE8 80240A98 8C470030 */ lw $a3, 0x30($v0) /* 89ADEC 80240A9C C6020018 */ lwc1 $f2, 0x18($s0) /* 89ADF0 80240AA0 46020003 */ div.s $f0, $f0, $f2 -/* 89ADF4 80240AA4 3C018024 */ lui $at, %hi(D_802433F0) -/* 89ADF8 80240AA8 D42233F0 */ ldc1 $f2, %lo(D_802433F0)($at) +/* 89ADF4 80240AA4 3C018024 */ lui $at, %hi(func_802433F0_855560) +/* 89ADF8 80240AA8 D42233F0 */ ldc1 $f2, %lo(func_802433F0_855560)($at) /* 89ADFC 80240AAC 46000021 */ cvt.d.s $f0, $f0 /* 89AE00 80240AB0 46220000 */ add.d $f0, $f0, $f2 /* 89AE04 80240AB4 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s index df3a6325fd..42f27bcd4e 100644 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -55,7 +55,7 @@ glabel func_80240CF4_89B044 /* 89B108 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 89B10C 80240DBC 30420004 */ andi $v0, $v0, 4 /* 89B110 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 89B114 80240DC4 00000000 */ nop +/* 89B114 80240DC4 00000000 */ nop .L80240DC8: /* 89B118 80240DC8 AE600070 */ sw $zero, 0x70($s3) /* 89B11C 80240DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240CF4_89B044 /* 89B1C0 80240E70 24020028 */ addiu $v0, $zero, 0x28 /* 89B1C4 80240E74 AFA2001C */ sw $v0, 0x1c($sp) /* 89B1C8 80240E78 44833000 */ mtc1 $v1, $f6 -/* 89B1CC 80240E7C 00000000 */ nop +/* 89B1CC 80240E7C 00000000 */ nop /* 89B1D0 80240E80 468031A0 */ cvt.s.w $f6, $f6 /* 89B1D4 80240E84 44073000 */ mfc1 $a3, $f6 /* 89B1D8 80240E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240CF4_89B044 /* 89B290 80240F40 10600015 */ beqz $v1, .L80240F98 /* 89B294 80240F44 0260202D */ daddu $a0, $s3, $zero /* 89B298 80240F48 08090428 */ j .L802410A0 -/* 89B29C 80240F4C 00000000 */ nop +/* 89B29C 80240F4C 00000000 */ nop .L80240F50: /* 89B2A0 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 /* 89B2A4 80240F54 24020003 */ addiu $v0, $zero, 3 /* 89B2A8 80240F58 10620035 */ beq $v1, $v0, .L80241030 /* 89B2AC 80240F5C 0260202D */ daddu $a0, $s3, $zero /* 89B2B0 80240F60 08090428 */ j .L802410A0 -/* 89B2B4 80240F64 00000000 */ nop +/* 89B2B4 80240F64 00000000 */ nop .L80240F68: /* 89B2B8 80240F68 2402000E */ addiu $v0, $zero, 0xe /* 89B2BC 80240F6C 1062003F */ beq $v1, $v0, .L8024106C @@ -177,9 +177,9 @@ glabel func_80240CF4_89B044 /* 89B2D0 80240F80 10620040 */ beq $v1, $v0, .L80241084 /* 89B2D4 80240F84 24020063 */ addiu $v0, $zero, 0x63 /* 89B2D8 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 89B2DC 80240F8C 00000000 */ nop +/* 89B2DC 80240F8C 00000000 */ nop /* 89B2E0 80240F90 08090428 */ j .L802410A0 -/* 89B2E4 80240F94 00000000 */ nop +/* 89B2E4 80240F94 00000000 */ nop .L80240F98: /* 89B2E8 80240F98 0280282D */ daddu $a1, $s4, $zero /* 89B2EC 80240F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240CF4_89B044 /* 89B304 80240FB4 0C0125AE */ jal func_800496B8 /* 89B308 80240FB8 02A0302D */ daddu $a2, $s5, $zero /* 89B30C 80240FBC 08090428 */ j .L802410A0 -/* 89B310 80240FC0 00000000 */ nop +/* 89B310 80240FC0 00000000 */ nop .L80240FC4: /* 89B314 80240FC4 0260202D */ daddu $a0, $s3, $zero /* 89B318 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 89B31C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 89B31C 80240FCC 0C0126D1 */ jal func_80049B44 /* 89B320 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* 89B324 80240FD4 8E230088 */ lw $v1, 0x88($s1) /* 89B328 80240FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240CF4_89B044 /* 89B384 80241034 0C012701 */ jal func_80049C04 /* 89B388 80241038 02A0302D */ daddu $a2, $s5, $zero /* 89B38C 8024103C 08090428 */ j .L802410A0 -/* 89B390 80241040 00000000 */ nop +/* 89B390 80241040 00000000 */ nop .L80241044: /* 89B394 80241044 0260202D */ daddu $a0, $s3, $zero /* 89B398 80241048 0280282D */ daddu $a1, $s4, $zero -/* 89B39C 8024104C 0C090258 */ jal tik_20_set_script_owner_npc_anim +/* 89B39C 8024104C 0C090258 */ jal func_80240960_89ACB0 /* 89B3A0 80241050 02A0302D */ daddu $a2, $s5, $zero /* 89B3A4 80241054 0260202D */ daddu $a0, $s3, $zero .L80241058: @@ -240,20 +240,20 @@ glabel func_80240CF4_89B044 /* 89B3AC 8024105C 0C090277 */ jal func_802409DC_89AD2C /* 89B3B0 80241060 02A0302D */ daddu $a2, $s5, $zero /* 89B3B4 80241064 08090428 */ j .L802410A0 -/* 89B3B8 80241068 00000000 */ nop +/* 89B3B8 80241068 00000000 */ nop .L8024106C: /* 89B3BC 8024106C 0260202D */ daddu $a0, $s3, $zero /* 89B3C0 80241070 0280282D */ daddu $a1, $s4, $zero -/* 89B3C4 80241074 0C0902C4 */ jal tik_20_UnkNpcAIFunc12 +/* 89B3C4 80241074 0C0902C4 */ jal func_80240B10_89AE60 /* 89B3C8 80241078 02A0302D */ daddu $a2, $s5, $zero /* 89B3CC 8024107C 08090428 */ j .L802410A0 -/* 89B3D0 80241080 00000000 */ nop +/* 89B3D0 80241080 00000000 */ nop .L80241084: /* 89B3D4 80241084 0280282D */ daddu $a1, $s4, $zero -/* 89B3D8 80241088 0C09031D */ jal tik_20_set_script_owner_npc_col_height +/* 89B3D8 80241088 0C09031D */ jal func_80240C74_89AFC4 /* 89B3DC 8024108C 02A0302D */ daddu $a2, $s5, $zero /* 89B3E0 80241090 08090428 */ j .L802410A0 -/* 89B3E4 80241094 00000000 */ nop +/* 89B3E4 80241094 00000000 */ nop .L80241098: /* 89B3E8 80241098 0C0129CF */ jal func_8004A73C /* 89B3EC 8024109C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240CF4_89B044 /* 89B440 802410F0 00220821 */ addu $at, $at, $v0 /* 89B444 802410F4 8C2233F8 */ lw $v0, %lo(D_802433F8)($at) /* 89B448 802410F8 00400008 */ jr $v0 -/* 89B44C 802410FC 00000000 */ nop +/* 89B44C 802410FC 00000000 */ nop /* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) /* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 /* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240CF4_89B044 /* 89B478 80241128 8FB00050 */ lw $s0, 0x50($sp) /* 89B47C 8024112C 03E00008 */ jr $ra /* 89B480 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 89B484 80241134 00000000 */ nop -/* 89B488 80241138 00000000 */ nop -/* 89B48C 8024113C 00000000 */ nop +/* 89B484 80241134 00000000 */ nop +/* 89B488 80241138 00000000 */ nop +/* 89B48C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index b56fe0495d..1538d70411 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -55,7 +55,7 @@ glabel func_80240CF4_8A30C4 /* 8A3188 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) /* 8A318C 80240DBC 30420004 */ andi $v0, $v0, 4 /* 8A3190 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 8A3194 80240DC4 00000000 */ nop +/* 8A3194 80240DC4 00000000 */ nop .L80240DC8: /* 8A3198 80240DC8 AE600070 */ sw $zero, 0x70($s3) /* 8A319C 80240DCC A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240CF4_8A30C4 /* 8A3240 80240E70 24020028 */ addiu $v0, $zero, 0x28 /* 8A3244 80240E74 AFA2001C */ sw $v0, 0x1c($sp) /* 8A3248 80240E78 44833000 */ mtc1 $v1, $f6 -/* 8A324C 80240E7C 00000000 */ nop +/* 8A324C 80240E7C 00000000 */ nop /* 8A3250 80240E80 468031A0 */ cvt.s.w $f6, $f6 /* 8A3254 80240E84 44073000 */ mfc1 $a3, $f6 /* 8A3258 80240E88 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240CF4_8A30C4 /* 8A3310 80240F40 10600015 */ beqz $v1, .L80240F98 /* 8A3314 80240F44 0260202D */ daddu $a0, $s3, $zero /* 8A3318 80240F48 08090428 */ j .L802410A0 -/* 8A331C 80240F4C 00000000 */ nop +/* 8A331C 80240F4C 00000000 */ nop .L80240F50: /* 8A3320 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 /* 8A3324 80240F54 24020003 */ addiu $v0, $zero, 3 /* 8A3328 80240F58 10620035 */ beq $v1, $v0, .L80241030 /* 8A332C 80240F5C 0260202D */ daddu $a0, $s3, $zero /* 8A3330 80240F60 08090428 */ j .L802410A0 -/* 8A3334 80240F64 00000000 */ nop +/* 8A3334 80240F64 00000000 */ nop .L80240F68: /* 8A3338 80240F68 2402000E */ addiu $v0, $zero, 0xe /* 8A333C 80240F6C 1062003F */ beq $v1, $v0, .L8024106C @@ -177,9 +177,9 @@ glabel func_80240CF4_8A30C4 /* 8A3350 80240F80 10620040 */ beq $v1, $v0, .L80241084 /* 8A3354 80240F84 24020063 */ addiu $v0, $zero, 0x63 /* 8A3358 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 8A335C 80240F8C 00000000 */ nop +/* 8A335C 80240F8C 00000000 */ nop /* 8A3360 80240F90 08090428 */ j .L802410A0 -/* 8A3364 80240F94 00000000 */ nop +/* 8A3364 80240F94 00000000 */ nop .L80240F98: /* 8A3368 80240F98 0280282D */ daddu $a1, $s4, $zero /* 8A336C 80240F9C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240CF4_8A30C4 /* 8A3384 80240FB4 0C0125AE */ jal func_800496B8 /* 8A3388 80240FB8 02A0302D */ daddu $a2, $s5, $zero /* 8A338C 80240FBC 08090428 */ j .L802410A0 -/* 8A3390 80240FC0 00000000 */ nop +/* 8A3390 80240FC0 00000000 */ nop .L80240FC4: /* 8A3394 80240FC4 0260202D */ daddu $a0, $s3, $zero /* 8A3398 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 8A339C 80240FCC 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 8A339C 80240FCC 0C0126D1 */ jal func_80049B44 /* 8A33A0 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* 8A33A4 80240FD4 8E230088 */ lw $v1, 0x88($s1) /* 8A33A8 80240FD8 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240CF4_8A30C4 /* 8A3404 80241034 0C012701 */ jal func_80049C04 /* 8A3408 80241038 02A0302D */ daddu $a2, $s5, $zero /* 8A340C 8024103C 08090428 */ j .L802410A0 -/* 8A3410 80241040 00000000 */ nop +/* 8A3410 80241040 00000000 */ nop .L80241044: /* 8A3414 80241044 0260202D */ daddu $a0, $s3, $zero /* 8A3418 80241048 0280282D */ daddu $a1, $s4, $zero -/* 8A341C 8024104C 0C090258 */ jal tik_23_set_script_owner_npc_anim +/* 8A341C 8024104C 0C090258 */ jal func_80240960_8A2D30 /* 8A3420 80241050 02A0302D */ daddu $a2, $s5, $zero /* 8A3424 80241054 0260202D */ daddu $a0, $s3, $zero .L80241058: @@ -240,20 +240,20 @@ glabel func_80240CF4_8A30C4 /* 8A342C 8024105C 0C090277 */ jal func_802409DC_8A2DAC /* 8A3430 80241060 02A0302D */ daddu $a2, $s5, $zero /* 8A3434 80241064 08090428 */ j .L802410A0 -/* 8A3438 80241068 00000000 */ nop +/* 8A3438 80241068 00000000 */ nop .L8024106C: /* 8A343C 8024106C 0260202D */ daddu $a0, $s3, $zero /* 8A3440 80241070 0280282D */ daddu $a1, $s4, $zero -/* 8A3444 80241074 0C0902C4 */ jal tik_23_UnkNpcAIFunc12 +/* 8A3444 80241074 0C0902C4 */ jal func_80240B10_8A2EE0 /* 8A3448 80241078 02A0302D */ daddu $a2, $s5, $zero /* 8A344C 8024107C 08090428 */ j .L802410A0 -/* 8A3450 80241080 00000000 */ nop +/* 8A3450 80241080 00000000 */ nop .L80241084: /* 8A3454 80241084 0280282D */ daddu $a1, $s4, $zero -/* 8A3458 80241088 0C09031D */ jal tik_23_set_script_owner_npc_col_height +/* 8A3458 80241088 0C09031D */ jal func_80240C74_8A3044 /* 8A345C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* 8A3460 80241090 08090428 */ j .L802410A0 -/* 8A3464 80241094 00000000 */ nop +/* 8A3464 80241094 00000000 */ nop .L80241098: /* 8A3468 80241098 0C0129CF */ jal func_8004A73C /* 8A346C 8024109C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240CF4_8A30C4 /* 8A34C0 802410F0 00220821 */ addu $at, $at, $v0 /* 8A34C4 802410F4 8C223658 */ lw $v0, %lo(D_80243658)($at) /* 8A34C8 802410F8 00400008 */ jr $v0 -/* 8A34CC 802410FC 00000000 */ nop +/* 8A34CC 802410FC 00000000 */ nop /* 8A34D0 80241100 8E420028 */ lw $v0, 0x28($s2) /* 8A34D4 80241104 24420001 */ addiu $v0, $v0, 1 /* 8A34D8 80241108 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240CF4_8A30C4 /* 8A34F8 80241128 8FB00050 */ lw $s0, 0x50($sp) /* 8A34FC 8024112C 03E00008 */ jr $ra /* 8A3500 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A3504 80241134 00000000 */ nop -/* 8A3508 80241138 00000000 */ nop -/* 8A350C 8024113C 00000000 */ nop +/* 8A3504 80241134 00000000 */ nop +/* 8A3508 80241138 00000000 */ nop +/* 8A350C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s index 451d6ce77b..cd3cc7b540 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s @@ -55,8 +55,8 @@ glabel func_8024074C_8A61CC /* 8A6288 80240808 8C470030 */ lw $a3, 0x30($v0) /* 8A628C 8024080C C6020018 */ lwc1 $f2, 0x18($s0) /* 8A6290 80240810 46020003 */ div.s $f0, $f0, $f2 -/* 8A6294 80240814 3C018024 */ lui $at, %hi(D_802424A0) -/* 8A6298 80240818 D42224A0 */ ldc1 $f2, %lo(D_802424A0)($at) +/* 8A6294 80240814 3C018024 */ lui $at, %hi(func_802424A0_833CA0) +/* 8A6298 80240818 D42224A0 */ ldc1 $f2, %lo(func_802424A0_833CA0)($at) /* 8A629C 8024081C 46000021 */ cvt.d.s $f0, $f0 /* 8A62A0 80240820 46220000 */ add.d $f0, $f0, $f2 /* 8A62A4 80240824 4620010D */ trunc.w.d $f4, $f0 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s index 65c42afce4..9b23102e70 100644 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -55,7 +55,7 @@ glabel func_80240A64_8A64E4 /* 8A65A8 80240B28 8E2200B0 */ lw $v0, 0xb0($s1) /* 8A65AC 80240B2C 30420004 */ andi $v0, $v0, 4 /* 8A65B0 80240B30 10400047 */ beqz $v0, .L80240C50 -/* 8A65B4 80240B34 00000000 */ nop +/* 8A65B4 80240B34 00000000 */ nop .L80240B38: /* 8A65B8 80240B38 AE600070 */ sw $zero, 0x70($s3) /* 8A65BC 80240B3C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240A64_8A64E4 /* 8A6660 80240BE0 24020028 */ addiu $v0, $zero, 0x28 /* 8A6664 80240BE4 AFA2001C */ sw $v0, 0x1c($sp) /* 8A6668 80240BE8 44833000 */ mtc1 $v1, $f6 -/* 8A666C 80240BEC 00000000 */ nop +/* 8A666C 80240BEC 00000000 */ nop /* 8A6670 80240BF0 468031A0 */ cvt.s.w $f6, $f6 /* 8A6674 80240BF4 44073000 */ mfc1 $a3, $f6 /* 8A6678 80240BF8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240A64_8A64E4 /* 8A6730 80240CB0 10600015 */ beqz $v1, .L80240D08 /* 8A6734 80240CB4 0260202D */ daddu $a0, $s3, $zero /* 8A6738 80240CB8 08090384 */ j .L80240E10 -/* 8A673C 80240CBC 00000000 */ nop +/* 8A673C 80240CBC 00000000 */ nop .L80240CC0: /* 8A6740 80240CC0 1062001C */ beq $v1, $v0, .L80240D34 /* 8A6744 80240CC4 24020003 */ addiu $v0, $zero, 3 /* 8A6748 80240CC8 10620035 */ beq $v1, $v0, .L80240DA0 /* 8A674C 80240CCC 0260202D */ daddu $a0, $s3, $zero /* 8A6750 80240CD0 08090384 */ j .L80240E10 -/* 8A6754 80240CD4 00000000 */ nop +/* 8A6754 80240CD4 00000000 */ nop .L80240CD8: /* 8A6758 80240CD8 2402000E */ addiu $v0, $zero, 0xe /* 8A675C 80240CDC 1062003F */ beq $v1, $v0, .L80240DDC @@ -177,9 +177,9 @@ glabel func_80240A64_8A64E4 /* 8A6770 80240CF0 10620040 */ beq $v1, $v0, .L80240DF4 /* 8A6774 80240CF4 24020063 */ addiu $v0, $zero, 0x63 /* 8A6778 80240CF8 10620043 */ beq $v1, $v0, .L80240E08 -/* 8A677C 80240CFC 00000000 */ nop +/* 8A677C 80240CFC 00000000 */ nop /* 8A6780 80240D00 08090384 */ j .L80240E10 -/* 8A6784 80240D04 00000000 */ nop +/* 8A6784 80240D04 00000000 */ nop .L80240D08: /* 8A6788 80240D08 0280282D */ daddu $a1, $s4, $zero /* 8A678C 80240D0C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240A64_8A64E4 /* 8A67A4 80240D24 0C0125AE */ jal func_800496B8 /* 8A67A8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 8A67AC 80240D2C 08090384 */ j .L80240E10 -/* 8A67B0 80240D30 00000000 */ nop +/* 8A67B0 80240D30 00000000 */ nop .L80240D34: /* 8A67B4 80240D34 0260202D */ daddu $a0, $s3, $zero /* 8A67B8 80240D38 0280282D */ daddu $a1, $s4, $zero -/* 8A67BC 80240D3C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 8A67BC 80240D3C 0C0126D1 */ jal func_80049B44 /* 8A67C0 80240D40 02A0302D */ daddu $a2, $s5, $zero /* 8A67C4 80240D44 8E230088 */ lw $v1, 0x88($s1) /* 8A67C8 80240D48 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240A64_8A64E4 /* 8A6824 80240DA4 0C012701 */ jal func_80049C04 /* 8A6828 80240DA8 02A0302D */ daddu $a2, $s5, $zero /* 8A682C 80240DAC 08090384 */ j .L80240E10 -/* 8A6830 80240DB0 00000000 */ nop +/* 8A6830 80240DB0 00000000 */ nop .L80240DB4: /* 8A6834 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 8A6838 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 8A683C 80240DBC 0C0901B4 */ jal tik_24_set_script_owner_npc_anim +/* 8A683C 80240DBC 0C0901B4 */ jal func_802406D0_8A6150 /* 8A6840 80240DC0 02A0302D */ daddu $a2, $s5, $zero /* 8A6844 80240DC4 0260202D */ daddu $a0, $s3, $zero .L80240DC8: @@ -240,20 +240,20 @@ glabel func_80240A64_8A64E4 /* 8A684C 80240DCC 0C0901D3 */ jal func_8024074C_8A61CC /* 8A6850 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* 8A6854 80240DD4 08090384 */ j .L80240E10 -/* 8A6858 80240DD8 00000000 */ nop +/* 8A6858 80240DD8 00000000 */ nop .L80240DDC: /* 8A685C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 8A6860 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 8A6864 80240DE4 0C090220 */ jal tik_24_UnkNpcAIFunc12 +/* 8A6864 80240DE4 0C090220 */ jal func_80240880_8A6300 /* 8A6868 80240DE8 02A0302D */ daddu $a2, $s5, $zero /* 8A686C 80240DEC 08090384 */ j .L80240E10 -/* 8A6870 80240DF0 00000000 */ nop +/* 8A6870 80240DF0 00000000 */ nop .L80240DF4: /* 8A6874 80240DF4 0280282D */ daddu $a1, $s4, $zero -/* 8A6878 80240DF8 0C090279 */ jal tik_24_set_script_owner_npc_col_height +/* 8A6878 80240DF8 0C090279 */ jal func_802409E4_8A6464 /* 8A687C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* 8A6880 80240E00 08090384 */ j .L80240E10 -/* 8A6884 80240E04 00000000 */ nop +/* 8A6884 80240E04 00000000 */ nop .L80240E08: /* 8A6888 80240E08 0C0129CF */ jal func_8004A73C /* 8A688C 80240E0C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240A64_8A64E4 /* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 /* 8A68E4 80240E64 8C2224A8 */ lw $v0, %lo(D_802424A8)($at) /* 8A68E8 80240E68 00400008 */ jr $v0 -/* 8A68EC 80240E6C 00000000 */ nop +/* 8A68EC 80240E6C 00000000 */ nop /* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) /* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 /* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240A64_8A64E4 /* 8A6918 80240E98 8FB00050 */ lw $s0, 0x50($sp) /* 8A691C 80240E9C 03E00008 */ jr $ra /* 8A6920 80240EA0 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A6924 80240EA4 00000000 */ nop -/* 8A6928 80240EA8 00000000 */ nop -/* 8A692C 80240EAC 00000000 */ nop +/* 8A6924 80240EA4 00000000 */ nop +/* 8A6928 80240EA8 00000000 */ nop +/* 8A692C 80240EAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s index 4168849032..2fb91d7d93 100644 --- a/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s +++ b/asm/nonmatchings/world/area_trd/trd_00/999F80/func_80240310_999F80.s @@ -4,8 +4,8 @@ glabel func_80240310_999F80 /* 999F80 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 999F84 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* 999F88 80240318 3C108024 */ lui $s0, %hi(D_80241340) -/* 999F8C 8024031C 26101340 */ addiu $s0, $s0, %lo(D_80241340) +/* 999F88 80240318 3C108024 */ lui $s0, %hi(func_80241340_887700) +/* 999F8C 8024031C 26101340 */ addiu $s0, $s0, %lo(func_80241340_887700) /* 999F90 80240320 AFBF0018 */ sw $ra, 0x18($sp) /* 999F94 80240324 AFB10014 */ sw $s1, 0x14($sp) /* 999F98 80240328 8E020000 */ lw $v0, ($s0) @@ -39,8 +39,8 @@ glabel func_80240310_999F80 /* 999FFC 8024038C 28620010 */ slti $v0, $v1, 0x10 /* 99A000 80240390 1440FFFA */ bnez $v0, .L8024037C /* 99A004 80240394 24840004 */ addiu $a0, $a0, 4 -/* 99A008 80240398 3C108024 */ lui $s0, %hi(D_80241340) -/* 99A00C 8024039C 26101340 */ addiu $s0, $s0, %lo(D_80241340) +/* 99A008 80240398 3C108024 */ lui $s0, %hi(func_80241340_887700) +/* 99A00C 8024039C 26101340 */ addiu $s0, $s0, %lo(func_80241340_887700) /* 99A010 802403A0 0C00AB4B */ jal heap_free /* 99A014 802403A4 8E040000 */ lw $a0, ($s0) /* 99A018 802403A8 AE000000 */ sw $zero, ($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s index fb3f2394d3..fe2245969a 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -55,7 +55,7 @@ glabel func_80240784_99D114 /* 99D1D8 80240848 8E2200B0 */ lw $v0, 0xb0($s1) /* 99D1DC 8024084C 30420004 */ andi $v0, $v0, 4 /* 99D1E0 80240850 10400047 */ beqz $v0, .L80240970 -/* 99D1E4 80240854 00000000 */ nop +/* 99D1E4 80240854 00000000 */ nop .L80240858: /* 99D1E8 80240858 AE600070 */ sw $zero, 0x70($s3) /* 99D1EC 8024085C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240784_99D114 /* 99D290 80240900 24020028 */ addiu $v0, $zero, 0x28 /* 99D294 80240904 AFA2001C */ sw $v0, 0x1c($sp) /* 99D298 80240908 44833000 */ mtc1 $v1, $f6 -/* 99D29C 8024090C 00000000 */ nop +/* 99D29C 8024090C 00000000 */ nop /* 99D2A0 80240910 468031A0 */ cvt.s.w $f6, $f6 /* 99D2A4 80240914 44073000 */ mfc1 $a3, $f6 /* 99D2A8 80240918 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240784_99D114 /* 99D360 802409D0 10600015 */ beqz $v1, .L80240A28 /* 99D364 802409D4 0260202D */ daddu $a0, $s3, $zero /* 99D368 802409D8 080902CC */ j .L80240B30 -/* 99D36C 802409DC 00000000 */ nop +/* 99D36C 802409DC 00000000 */ nop .L802409E0: /* 99D370 802409E0 1062001C */ beq $v1, $v0, .L80240A54 /* 99D374 802409E4 24020003 */ addiu $v0, $zero, 3 /* 99D378 802409E8 10620035 */ beq $v1, $v0, .L80240AC0 /* 99D37C 802409EC 0260202D */ daddu $a0, $s3, $zero /* 99D380 802409F0 080902CC */ j .L80240B30 -/* 99D384 802409F4 00000000 */ nop +/* 99D384 802409F4 00000000 */ nop .L802409F8: /* 99D388 802409F8 2402000E */ addiu $v0, $zero, 0xe /* 99D38C 802409FC 1062003F */ beq $v1, $v0, .L80240AFC @@ -177,9 +177,9 @@ glabel func_80240784_99D114 /* 99D3A0 80240A10 10620040 */ beq $v1, $v0, .L80240B14 /* 99D3A4 80240A14 24020063 */ addiu $v0, $zero, 0x63 /* 99D3A8 80240A18 10620043 */ beq $v1, $v0, .L80240B28 -/* 99D3AC 80240A1C 00000000 */ nop +/* 99D3AC 80240A1C 00000000 */ nop /* 99D3B0 80240A20 080902CC */ j .L80240B30 -/* 99D3B4 80240A24 00000000 */ nop +/* 99D3B4 80240A24 00000000 */ nop .L80240A28: /* 99D3B8 80240A28 0280282D */ daddu $a1, $s4, $zero /* 99D3BC 80240A2C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240784_99D114 /* 99D3D4 80240A44 0C0125AE */ jal func_800496B8 /* 99D3D8 80240A48 02A0302D */ daddu $a2, $s5, $zero /* 99D3DC 80240A4C 080902CC */ j .L80240B30 -/* 99D3E0 80240A50 00000000 */ nop +/* 99D3E0 80240A50 00000000 */ nop .L80240A54: /* 99D3E4 80240A54 0260202D */ daddu $a0, $s3, $zero /* 99D3E8 80240A58 0280282D */ daddu $a1, $s4, $zero -/* 99D3EC 80240A5C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 99D3EC 80240A5C 0C0126D1 */ jal func_80049B44 /* 99D3F0 80240A60 02A0302D */ daddu $a2, $s5, $zero /* 99D3F4 80240A64 8E230088 */ lw $v1, 0x88($s1) /* 99D3F8 80240A68 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240784_99D114 /* 99D454 80240AC4 0C012701 */ jal func_80049C04 /* 99D458 80240AC8 02A0302D */ daddu $a2, $s5, $zero /* 99D45C 80240ACC 080902CC */ j .L80240B30 -/* 99D460 80240AD0 00000000 */ nop +/* 99D460 80240AD0 00000000 */ nop .L80240AD4: /* 99D464 80240AD4 0260202D */ daddu $a0, $s3, $zero /* 99D468 80240AD8 0280282D */ daddu $a1, $s4, $zero -/* 99D46C 80240ADC 0C0900FC */ jal trd_01_set_script_owner_npc_anim +/* 99D46C 80240ADC 0C0900FC */ jal func_802403F0_99CD80 /* 99D470 80240AE0 02A0302D */ daddu $a2, $s5, $zero /* 99D474 80240AE4 0260202D */ daddu $a0, $s3, $zero .L80240AE8: @@ -240,20 +240,20 @@ glabel func_80240784_99D114 /* 99D47C 80240AEC 0C09011B */ jal func_8024046C_99CDFC /* 99D480 80240AF0 02A0302D */ daddu $a2, $s5, $zero /* 99D484 80240AF4 080902CC */ j .L80240B30 -/* 99D488 80240AF8 00000000 */ nop +/* 99D488 80240AF8 00000000 */ nop .L80240AFC: /* 99D48C 80240AFC 0260202D */ daddu $a0, $s3, $zero /* 99D490 80240B00 0280282D */ daddu $a1, $s4, $zero -/* 99D494 80240B04 0C090168 */ jal trd_01_UnkNpcAIFunc12 +/* 99D494 80240B04 0C090168 */ jal func_802405A0_99CF30 /* 99D498 80240B08 02A0302D */ daddu $a2, $s5, $zero /* 99D49C 80240B0C 080902CC */ j .L80240B30 -/* 99D4A0 80240B10 00000000 */ nop +/* 99D4A0 80240B10 00000000 */ nop .L80240B14: /* 99D4A4 80240B14 0280282D */ daddu $a1, $s4, $zero -/* 99D4A8 80240B18 0C0901C1 */ jal trd_01_set_script_owner_npc_col_height +/* 99D4A8 80240B18 0C0901C1 */ jal func_80240704_99D094 /* 99D4AC 80240B1C 02A0302D */ daddu $a2, $s5, $zero /* 99D4B0 80240B20 080902CC */ j .L80240B30 -/* 99D4B4 80240B24 00000000 */ nop +/* 99D4B4 80240B24 00000000 */ nop .L80240B28: /* 99D4B8 80240B28 0C0129CF */ jal func_8004A73C /* 99D4BC 80240B2C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240784_99D114 /* 99D510 80240B80 00220821 */ addu $at, $at, $v0 /* 99D514 80240B84 8C224448 */ lw $v0, %lo(D_80244448)($at) /* 99D518 80240B88 00400008 */ jr $v0 -/* 99D51C 80240B8C 00000000 */ nop +/* 99D51C 80240B8C 00000000 */ nop /* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) /* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 /* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s index 8aed8b9956..2d4904a691 100644 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -119,11 +119,11 @@ glabel func_802413B8_99DD48 /* 99DEFC 8024156C 00000000 */ nop /* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero /* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero -/* 99DF08 80241578 0C090366 */ jal trd_01_NpcJumpFunc3 +/* 99DF08 80241578 0C090366 */ jal func_80240D98_99D728 /* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero /* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero /* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero -/* 99DF18 80241588 0C09037E */ jal trd_01_NpcJumpFunc +/* 99DF18 80241588 0C09037E */ jal func_80240DF8_99D788 /* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero /* 99DF20 80241590 08090582 */ j .L80241608 /* 99DF24 80241594 00000000 */ nop @@ -133,13 +133,13 @@ glabel func_802413B8_99DD48 /* 99DF34 802415A4 02A0302D */ daddu $a2, $s5, $zero /* 99DF38 802415A8 0280202D */ daddu $a0, $s4, $zero /* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero -/* 99DF40 802415B0 0C0903E8 */ jal trd_01_UnkNpcAIFunc11 +/* 99DF40 802415B0 0C0903E8 */ jal func_80240FA0_99D930 /* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero /* 99DF48 802415B8 08090582 */ j .L80241608 /* 99DF4C 802415BC 00000000 */ nop /* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero /* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero -/* 99DF58 802415C8 0C09042F */ jal trd_01_UnkNpcAIFunc10 +/* 99DF58 802415C8 0C09042F */ jal func_802410BC_99DA4C /* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero /* 99DF60 802415D0 08090582 */ j .L80241608 /* 99DF64 802415D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s index b63f13bb3a..227f8cef20 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -55,7 +55,7 @@ glabel func_80240474_9A1454 /* 9A1518 80240538 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A151C 8024053C 30420004 */ andi $v0, $v0, 4 /* 9A1520 80240540 10400047 */ beqz $v0, .L80240660 -/* 9A1524 80240544 00000000 */ nop +/* 9A1524 80240544 00000000 */ nop .L80240548: /* 9A1528 80240548 AE600070 */ sw $zero, 0x70($s3) /* 9A152C 8024054C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240474_9A1454 /* 9A15D0 802405F0 24020028 */ addiu $v0, $zero, 0x28 /* 9A15D4 802405F4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A15D8 802405F8 44833000 */ mtc1 $v1, $f6 -/* 9A15DC 802405FC 00000000 */ nop +/* 9A15DC 802405FC 00000000 */ nop /* 9A15E0 80240600 468031A0 */ cvt.s.w $f6, $f6 /* 9A15E4 80240604 44073000 */ mfc1 $a3, $f6 /* 9A15E8 80240608 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240474_9A1454 /* 9A16A0 802406C0 10600015 */ beqz $v1, .L80240718 /* 9A16A4 802406C4 0260202D */ daddu $a0, $s3, $zero /* 9A16A8 802406C8 08090208 */ j .L80240820 -/* 9A16AC 802406CC 00000000 */ nop +/* 9A16AC 802406CC 00000000 */ nop .L802406D0: /* 9A16B0 802406D0 1062001C */ beq $v1, $v0, .L80240744 /* 9A16B4 802406D4 24020003 */ addiu $v0, $zero, 3 /* 9A16B8 802406D8 10620035 */ beq $v1, $v0, .L802407B0 /* 9A16BC 802406DC 0260202D */ daddu $a0, $s3, $zero /* 9A16C0 802406E0 08090208 */ j .L80240820 -/* 9A16C4 802406E4 00000000 */ nop +/* 9A16C4 802406E4 00000000 */ nop .L802406E8: /* 9A16C8 802406E8 2402000E */ addiu $v0, $zero, 0xe /* 9A16CC 802406EC 1062003F */ beq $v1, $v0, .L802407EC @@ -177,9 +177,9 @@ glabel func_80240474_9A1454 /* 9A16E0 80240700 10620040 */ beq $v1, $v0, .L80240804 /* 9A16E4 80240704 24020063 */ addiu $v0, $zero, 0x63 /* 9A16E8 80240708 10620043 */ beq $v1, $v0, .L80240818 -/* 9A16EC 8024070C 00000000 */ nop +/* 9A16EC 8024070C 00000000 */ nop /* 9A16F0 80240710 08090208 */ j .L80240820 -/* 9A16F4 80240714 00000000 */ nop +/* 9A16F4 80240714 00000000 */ nop .L80240718: /* 9A16F8 80240718 0280282D */ daddu $a1, $s4, $zero /* 9A16FC 8024071C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240474_9A1454 /* 9A1714 80240734 0C0125AE */ jal func_800496B8 /* 9A1718 80240738 02A0302D */ daddu $a2, $s5, $zero /* 9A171C 8024073C 08090208 */ j .L80240820 -/* 9A1720 80240740 00000000 */ nop +/* 9A1720 80240740 00000000 */ nop .L80240744: /* 9A1724 80240744 0260202D */ daddu $a0, $s3, $zero /* 9A1728 80240748 0280282D */ daddu $a1, $s4, $zero -/* 9A172C 8024074C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9A172C 8024074C 0C0126D1 */ jal func_80049B44 /* 9A1730 80240750 02A0302D */ daddu $a2, $s5, $zero /* 9A1734 80240754 8E230088 */ lw $v1, 0x88($s1) /* 9A1738 80240758 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240474_9A1454 /* 9A1794 802407B4 0C012701 */ jal func_80049C04 /* 9A1798 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A179C 802407BC 08090208 */ j .L80240820 -/* 9A17A0 802407C0 00000000 */ nop +/* 9A17A0 802407C0 00000000 */ nop .L802407C4: /* 9A17A4 802407C4 0260202D */ daddu $a0, $s3, $zero /* 9A17A8 802407C8 0280282D */ daddu $a1, $s4, $zero -/* 9A17AC 802407CC 0C090038 */ jal trd_02_set_script_owner_npc_anim +/* 9A17AC 802407CC 0C090038 */ jal func_802400E0_9A10C0 /* 9A17B0 802407D0 02A0302D */ daddu $a2, $s5, $zero /* 9A17B4 802407D4 0260202D */ daddu $a0, $s3, $zero .L802407D8: @@ -240,20 +240,20 @@ glabel func_80240474_9A1454 /* 9A17BC 802407DC 0C090057 */ jal func_8024015C_9A113C /* 9A17C0 802407E0 02A0302D */ daddu $a2, $s5, $zero /* 9A17C4 802407E4 08090208 */ j .L80240820 -/* 9A17C8 802407E8 00000000 */ nop +/* 9A17C8 802407E8 00000000 */ nop .L802407EC: /* 9A17CC 802407EC 0260202D */ daddu $a0, $s3, $zero /* 9A17D0 802407F0 0280282D */ daddu $a1, $s4, $zero -/* 9A17D4 802407F4 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 +/* 9A17D4 802407F4 0C0900A4 */ jal func_80240290_9A1270 /* 9A17D8 802407F8 02A0302D */ daddu $a2, $s5, $zero /* 9A17DC 802407FC 08090208 */ j .L80240820 -/* 9A17E0 80240800 00000000 */ nop +/* 9A17E0 80240800 00000000 */ nop .L80240804: /* 9A17E4 80240804 0280282D */ daddu $a1, $s4, $zero -/* 9A17E8 80240808 0C0900FD */ jal trd_02_set_script_owner_npc_col_height +/* 9A17E8 80240808 0C0900FD */ jal func_802403F4_9A13D4 /* 9A17EC 8024080C 02A0302D */ daddu $a2, $s5, $zero /* 9A17F0 80240810 08090208 */ j .L80240820 -/* 9A17F4 80240814 00000000 */ nop +/* 9A17F4 80240814 00000000 */ nop .L80240818: /* 9A17F8 80240818 0C0129CF */ jal func_8004A73C /* 9A17FC 8024081C 0260202D */ daddu $a0, $s3, $zero @@ -279,11 +279,11 @@ glabel func_80240474_9A1454 /* 9A1840 80240860 2C620015 */ sltiu $v0, $v1, 0x15 /* 9A1844 80240864 10400009 */ beqz $v0, .L8024088C /* 9A1848 80240868 00031080 */ sll $v0, $v1, 2 -/* 9A184C 8024086C 3C018024 */ lui $at, %hi(D_802432E8) +/* 9A184C 8024086C 3C018024 */ lui $at, %hi(func_802432E8) /* 9A1850 80240870 00220821 */ addu $at, $at, $v0 -/* 9A1854 80240874 8C2232E8 */ lw $v0, %lo(D_802432E8)($at) +/* 9A1854 80240874 8C2232E8 */ lw $v0, %lo(func_802432E8)($at) /* 9A1858 80240878 00400008 */ jr $v0 -/* 9A185C 8024087C 00000000 */ nop +/* 9A185C 8024087C 00000000 */ nop /* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) /* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 /* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index f93aab24a1..7d15d0fe05 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -124,9 +124,9 @@ glabel func_80241448_9A2428 /* 9A25EC 8024160C 2C620064 */ sltiu $v0, $v1, 0x64 /* 9A25F0 80241610 10400042 */ beqz $v0, .L8024171C /* 9A25F4 80241614 00031080 */ sll $v0, $v1, 2 -/* 9A25F8 80241618 3C018024 */ lui $at, %hi(D_80243350) +/* 9A25F8 80241618 3C018024 */ lui $at, %hi(func_80243350_95E550) /* 9A25FC 8024161C 00220821 */ addu $at, $at, $v0 -/* 9A2600 80241620 8C223350 */ lw $v0, %lo(D_80243350)($at) +/* 9A2600 80241620 8C223350 */ lw $v0, %lo(func_80243350_95E550)($at) /* 9A2604 80241624 00400008 */ jr $v0 /* 9A2608 80241628 00000000 */ nop /* 9A260C 8024162C 0280202D */ daddu $a0, $s4, $zero @@ -141,7 +141,7 @@ glabel func_80241448_9A2428 /* 9A2630 80241650 00000000 */ nop /* 9A2634 80241654 0280202D */ daddu $a0, $s4, $zero /* 9A2638 80241658 0260282D */ daddu $a1, $s3, $zero -/* 9A263C 8024165C 0C09032D */ jal trd_02_UnkNpcAIFunc1 +/* 9A263C 8024165C 0C09032D */ jal func_80240CB4_9A1C94 /* 9A2640 80241660 02A0302D */ daddu $a2, $s5, $zero /* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero /* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241448_9A2428 /* 9A2670 80241690 00000000 */ nop /* 9A2674 80241694 0280202D */ daddu $a0, $s4, $zero /* 9A2678 80241698 0260282D */ daddu $a1, $s3, $zero -/* 9A267C 8024169C 0C0903F9 */ jal trd_02_NpcJumpFunc2 +/* 9A267C 8024169C 0C0903F9 */ jal func_80240FE4_9A1FC4 /* 9A2680 802416A0 02A0302D */ daddu $a2, $s5, $zero /* 9A2684 802416A4 0280202D */ daddu $a0, $s4, $zero /* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero -/* 9A268C 802416AC 0C090416 */ jal trd_02_NpcJumpFunc +/* 9A268C 802416AC 0C090416 */ jal func_80241058_9A2038 /* 9A2690 802416B0 02A0302D */ daddu $a2, $s5, $zero /* 9A2694 802416B4 080905C7 */ j .L8024171C /* 9A2698 802416B8 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241448_9A2428 /* 9A26C0 802416E0 00000000 */ nop /* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero /* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero -/* 9A26CC 802416EC 0C0904C8 */ jal trd_02_UnkNpcDurationFlagFunc +/* 9A26CC 802416EC 0C0904C8 */ jal func_80241320_9A2300 /* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero /* 9A26D4 802416F4 080905C7 */ j .L8024171C /* 9A26D8 802416F8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index 40bb9457fd..f3aba9af69 100644 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -53,7 +53,7 @@ glabel func_80241744_9A2724 /* 9A27E0 80241800 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A27E4 80241804 30420004 */ andi $v0, $v0, 4 /* 9A27E8 80241808 10400048 */ beqz $v0, .L8024192C -/* 9A27EC 8024180C 00000000 */ nop +/* 9A27EC 8024180C 00000000 */ nop .L80241810: /* 9A27F0 80241810 A640008E */ sh $zero, 0x8e($s2) /* 9A27F4 80241814 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241744_9A2724 /* 9A289C 802418BC 24020028 */ addiu $v0, $zero, 0x28 /* 9A28A0 802418C0 AFA2001C */ sw $v0, 0x1c($sp) /* 9A28A4 802418C4 44833000 */ mtc1 $v1, $f6 -/* 9A28A8 802418C8 00000000 */ nop +/* 9A28A8 802418C8 00000000 */ nop /* 9A28AC 802418CC 468031A0 */ cvt.s.w $f6, $f6 /* 9A28B0 802418D0 44073000 */ mfc1 $a3, $f6 /* 9A28B4 802418D4 27A20048 */ addiu $v0, $sp, 0x48 @@ -138,7 +138,7 @@ glabel func_80241744_9A2724 /* 9A2920 80241940 00220821 */ addu $at, $at, $v0 /* 9A2924 80241944 8C2234E0 */ lw $v0, %lo(D_802434E0)($at) /* 9A2928 80241948 00400008 */ jr $v0 -/* 9A292C 8024194C 00000000 */ nop +/* 9A292C 8024194C 00000000 */ nop /* 9A2930 80241950 0260202D */ daddu $a0, $s3, $zero /* 9A2934 80241954 0280282D */ daddu $a1, $s4, $zero /* 9A2938 80241958 0C09022D */ jal func_802408B4_9A1894 @@ -150,45 +150,45 @@ glabel func_80241744_9A2724 /* 9A2950 80241970 0C090283 */ jal func_80240A0C_9A19EC /* 9A2954 80241974 02A0302D */ daddu $a2, $s5, $zero /* 9A2958 80241978 08090688 */ j .L80241A20 -/* 9A295C 8024197C 00000000 */ nop +/* 9A295C 8024197C 00000000 */ nop /* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero /* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero -/* 9A2968 80241988 0C09032D */ jal trd_02_UnkNpcAIFunc1 +/* 9A2968 80241988 0C09032D */ jal func_80240CB4_9A1C94 /* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero /* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero /* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero /* 9A2978 80241998 0C09035D */ jal func_80240D74_9A1D54 /* 9A297C 8024199C 02A0302D */ daddu $a2, $s5, $zero /* 9A2980 802419A0 08090688 */ j .L80241A20 -/* 9A2984 802419A4 00000000 */ nop +/* 9A2984 802419A4 00000000 */ nop /* 9A2988 802419A8 0260202D */ daddu $a0, $s3, $zero /* 9A298C 802419AC 0280282D */ daddu $a1, $s4, $zero /* 9A2990 802419B0 0C0903CC */ jal func_80240F30_9A1F10 /* 9A2994 802419B4 02A0302D */ daddu $a2, $s5, $zero /* 9A2998 802419B8 08090688 */ j .L80241A20 -/* 9A299C 802419BC 00000000 */ nop +/* 9A299C 802419BC 00000000 */ nop /* 9A29A0 802419C0 0260202D */ daddu $a0, $s3, $zero /* 9A29A4 802419C4 0280282D */ daddu $a1, $s4, $zero -/* 9A29A8 802419C8 0C090038 */ jal trd_02_set_script_owner_npc_anim +/* 9A29A8 802419C8 0C090038 */ jal func_802400E0_9A10C0 /* 9A29AC 802419CC 02A0302D */ daddu $a2, $s5, $zero /* 9A29B0 802419D0 0260202D */ daddu $a0, $s3, $zero /* 9A29B4 802419D4 0280282D */ daddu $a1, $s4, $zero /* 9A29B8 802419D8 0C090057 */ jal func_8024015C_9A113C /* 9A29BC 802419DC 02A0302D */ daddu $a2, $s5, $zero /* 9A29C0 802419E0 08090688 */ j .L80241A20 -/* 9A29C4 802419E4 00000000 */ nop +/* 9A29C4 802419E4 00000000 */ nop /* 9A29C8 802419E8 0260202D */ daddu $a0, $s3, $zero /* 9A29CC 802419EC 0280282D */ daddu $a1, $s4, $zero -/* 9A29D0 802419F0 0C0900A4 */ jal trd_02_UnkNpcAIFunc12 +/* 9A29D0 802419F0 0C0900A4 */ jal func_80240290_9A1270 /* 9A29D4 802419F4 02A0302D */ daddu $a2, $s5, $zero /* 9A29D8 802419F8 08090688 */ j .L80241A20 -/* 9A29DC 802419FC 00000000 */ nop +/* 9A29DC 802419FC 00000000 */ nop /* 9A29E0 80241A00 0260202D */ daddu $a0, $s3, $zero /* 9A29E4 80241A04 0280282D */ daddu $a1, $s4, $zero -/* 9A29E8 80241A08 0C0900FD */ jal trd_02_set_script_owner_npc_col_height +/* 9A29E8 80241A08 0C0900FD */ jal func_802403F4_9A13D4 /* 9A29EC 80241A0C 02A0302D */ daddu $a2, $s5, $zero /* 9A29F0 80241A10 08090688 */ j .L80241A20 -/* 9A29F4 80241A14 00000000 */ nop +/* 9A29F4 80241A14 00000000 */ nop /* 9A29F8 80241A18 0C0129CF */ jal func_8004A73C /* 9A29FC 80241A1C 0260202D */ daddu $a0, $s3, $zero .L80241A20: @@ -202,5 +202,5 @@ glabel func_80241744_9A2724 /* 9A2A1C 80241A3C 0000102D */ daddu $v0, $zero, $zero /* 9A2A20 80241A40 03E00008 */ jr $ra /* 9A2A24 80241A44 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A2A28 80241A48 00000000 */ nop -/* 9A2A2C 80241A4C 00000000 */ nop +/* 9A2A28 80241A48 00000000 */ nop +/* 9A2A2C 80241A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index 7260016571..0a669b5e70 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -55,7 +55,7 @@ glabel func_80240434_9A4A84 /* 9A4B48 802404F8 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A4B4C 802404FC 30420004 */ andi $v0, $v0, 4 /* 9A4B50 80240500 10400047 */ beqz $v0, .L80240620 -/* 9A4B54 80240504 00000000 */ nop +/* 9A4B54 80240504 00000000 */ nop .L80240508: /* 9A4B58 80240508 AE600070 */ sw $zero, 0x70($s3) /* 9A4B5C 8024050C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240434_9A4A84 /* 9A4C00 802405B0 24020028 */ addiu $v0, $zero, 0x28 /* 9A4C04 802405B4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A4C08 802405B8 44833000 */ mtc1 $v1, $f6 -/* 9A4C0C 802405BC 00000000 */ nop +/* 9A4C0C 802405BC 00000000 */ nop /* 9A4C10 802405C0 468031A0 */ cvt.s.w $f6, $f6 /* 9A4C14 802405C4 44073000 */ mfc1 $a3, $f6 /* 9A4C18 802405C8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240434_9A4A84 /* 9A4CD0 80240680 10600015 */ beqz $v1, .L802406D8 /* 9A4CD4 80240684 0260202D */ daddu $a0, $s3, $zero /* 9A4CD8 80240688 080901F8 */ j .L802407E0 -/* 9A4CDC 8024068C 00000000 */ nop +/* 9A4CDC 8024068C 00000000 */ nop .L80240690: /* 9A4CE0 80240690 1062001C */ beq $v1, $v0, .L80240704 /* 9A4CE4 80240694 24020003 */ addiu $v0, $zero, 3 /* 9A4CE8 80240698 10620035 */ beq $v1, $v0, .L80240770 /* 9A4CEC 8024069C 0260202D */ daddu $a0, $s3, $zero /* 9A4CF0 802406A0 080901F8 */ j .L802407E0 -/* 9A4CF4 802406A4 00000000 */ nop +/* 9A4CF4 802406A4 00000000 */ nop .L802406A8: /* 9A4CF8 802406A8 2402000E */ addiu $v0, $zero, 0xe /* 9A4CFC 802406AC 1062003F */ beq $v1, $v0, .L802407AC @@ -177,9 +177,9 @@ glabel func_80240434_9A4A84 /* 9A4D10 802406C0 10620040 */ beq $v1, $v0, .L802407C4 /* 9A4D14 802406C4 24020063 */ addiu $v0, $zero, 0x63 /* 9A4D18 802406C8 10620043 */ beq $v1, $v0, .L802407D8 -/* 9A4D1C 802406CC 00000000 */ nop +/* 9A4D1C 802406CC 00000000 */ nop /* 9A4D20 802406D0 080901F8 */ j .L802407E0 -/* 9A4D24 802406D4 00000000 */ nop +/* 9A4D24 802406D4 00000000 */ nop .L802406D8: /* 9A4D28 802406D8 0280282D */ daddu $a1, $s4, $zero /* 9A4D2C 802406DC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240434_9A4A84 /* 9A4D44 802406F4 0C0125AE */ jal func_800496B8 /* 9A4D48 802406F8 02A0302D */ daddu $a2, $s5, $zero /* 9A4D4C 802406FC 080901F8 */ j .L802407E0 -/* 9A4D50 80240700 00000000 */ nop +/* 9A4D50 80240700 00000000 */ nop .L80240704: /* 9A4D54 80240704 0260202D */ daddu $a0, $s3, $zero /* 9A4D58 80240708 0280282D */ daddu $a1, $s4, $zero -/* 9A4D5C 8024070C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9A4D5C 8024070C 0C0126D1 */ jal func_80049B44 /* 9A4D60 80240710 02A0302D */ daddu $a2, $s5, $zero /* 9A4D64 80240714 8E230088 */ lw $v1, 0x88($s1) /* 9A4D68 80240718 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240434_9A4A84 /* 9A4DC4 80240774 0C012701 */ jal func_80049C04 /* 9A4DC8 80240778 02A0302D */ daddu $a2, $s5, $zero /* 9A4DCC 8024077C 080901F8 */ j .L802407E0 -/* 9A4DD0 80240780 00000000 */ nop +/* 9A4DD0 80240780 00000000 */ nop .L80240784: /* 9A4DD4 80240784 0260202D */ daddu $a0, $s3, $zero /* 9A4DD8 80240788 0280282D */ daddu $a1, $s4, $zero -/* 9A4DDC 8024078C 0C090028 */ jal trd_03_set_script_owner_npc_anim +/* 9A4DDC 8024078C 0C090028 */ jal func_802400A0_9A46F0 /* 9A4DE0 80240790 02A0302D */ daddu $a2, $s5, $zero /* 9A4DE4 80240794 0260202D */ daddu $a0, $s3, $zero .L80240798: @@ -240,20 +240,20 @@ glabel func_80240434_9A4A84 /* 9A4DEC 8024079C 0C090047 */ jal func_8024011C_9A476C /* 9A4DF0 802407A0 02A0302D */ daddu $a2, $s5, $zero /* 9A4DF4 802407A4 080901F8 */ j .L802407E0 -/* 9A4DF8 802407A8 00000000 */ nop +/* 9A4DF8 802407A8 00000000 */ nop .L802407AC: /* 9A4DFC 802407AC 0260202D */ daddu $a0, $s3, $zero /* 9A4E00 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 9A4E04 802407B4 0C090094 */ jal trd_03_UnkNpcAIFunc12 +/* 9A4E04 802407B4 0C090094 */ jal func_80240250_9A48A0 /* 9A4E08 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A4E0C 802407BC 080901F8 */ j .L802407E0 -/* 9A4E10 802407C0 00000000 */ nop +/* 9A4E10 802407C0 00000000 */ nop .L802407C4: /* 9A4E14 802407C4 0280282D */ daddu $a1, $s4, $zero -/* 9A4E18 802407C8 0C0900ED */ jal trd_03_set_script_owner_npc_col_height +/* 9A4E18 802407C8 0C0900ED */ jal func_802403B4_9A4A04 /* 9A4E1C 802407CC 02A0302D */ daddu $a2, $s5, $zero /* 9A4E20 802407D0 080901F8 */ j .L802407E0 -/* 9A4E24 802407D4 00000000 */ nop +/* 9A4E24 802407D4 00000000 */ nop .L802407D8: /* 9A4E28 802407D8 0C0129CF */ jal func_8004A73C /* 9A4E2C 802407DC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240434_9A4A84 /* 9A4E80 80240830 00220821 */ addu $at, $at, $v0 /* 9A4E84 80240834 8C223D48 */ lw $v0, %lo(D_80243D48)($at) /* 9A4E88 80240838 00400008 */ jr $v0 -/* 9A4E8C 8024083C 00000000 */ nop +/* 9A4E8C 8024083C 00000000 */ nop /* 9A4E90 80240840 8E420028 */ lw $v0, 0x28($s2) /* 9A4E94 80240844 24420001 */ addiu $v0, $v0, 1 /* 9A4E98 80240848 AE420028 */ sw $v0, 0x28($s2) @@ -299,6 +299,6 @@ glabel func_80240434_9A4A84 /* 9A4EB8 80240868 8FB00050 */ lw $s0, 0x50($sp) /* 9A4EBC 8024086C 03E00008 */ jr $ra /* 9A4EC0 80240870 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A4EC4 80240874 00000000 */ nop -/* 9A4EC8 80240878 00000000 */ nop -/* 9A4ECC 8024087C 00000000 */ nop +/* 9A4EC4 80240874 00000000 */ nop +/* 9A4EC8 80240878 00000000 */ nop +/* 9A4ECC 8024087C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s index 9fde73625f..aa2a0bb835 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -55,7 +55,7 @@ glabel func_80240844_9A8C34 /* 9A8CF8 80240908 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A8CFC 8024090C 30420004 */ andi $v0, $v0, 4 /* 9A8D00 80240910 10400047 */ beqz $v0, .L80240A30 -/* 9A8D04 80240914 00000000 */ nop +/* 9A8D04 80240914 00000000 */ nop .L80240918: /* 9A8D08 80240918 AE600070 */ sw $zero, 0x70($s3) /* 9A8D0C 8024091C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_80240844_9A8C34 /* 9A8DB0 802409C0 24020028 */ addiu $v0, $zero, 0x28 /* 9A8DB4 802409C4 AFA2001C */ sw $v0, 0x1c($sp) /* 9A8DB8 802409C8 44833000 */ mtc1 $v1, $f6 -/* 9A8DBC 802409CC 00000000 */ nop +/* 9A8DBC 802409CC 00000000 */ nop /* 9A8DC0 802409D0 468031A0 */ cvt.s.w $f6, $f6 /* 9A8DC4 802409D4 44073000 */ mfc1 $a3, $f6 /* 9A8DC8 802409D8 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_80240844_9A8C34 /* 9A8E80 80240A90 10600015 */ beqz $v1, .L80240AE8 /* 9A8E84 80240A94 0260202D */ daddu $a0, $s3, $zero /* 9A8E88 80240A98 080902FC */ j .L80240BF0 -/* 9A8E8C 80240A9C 00000000 */ nop +/* 9A8E8C 80240A9C 00000000 */ nop .L80240AA0: /* 9A8E90 80240AA0 1062001C */ beq $v1, $v0, .L80240B14 /* 9A8E94 80240AA4 24020003 */ addiu $v0, $zero, 3 /* 9A8E98 80240AA8 10620035 */ beq $v1, $v0, .L80240B80 /* 9A8E9C 80240AAC 0260202D */ daddu $a0, $s3, $zero /* 9A8EA0 80240AB0 080902FC */ j .L80240BF0 -/* 9A8EA4 80240AB4 00000000 */ nop +/* 9A8EA4 80240AB4 00000000 */ nop .L80240AB8: /* 9A8EA8 80240AB8 2402000E */ addiu $v0, $zero, 0xe /* 9A8EAC 80240ABC 1062003F */ beq $v1, $v0, .L80240BBC @@ -177,9 +177,9 @@ glabel func_80240844_9A8C34 /* 9A8EC0 80240AD0 10620040 */ beq $v1, $v0, .L80240BD4 /* 9A8EC4 80240AD4 24020063 */ addiu $v0, $zero, 0x63 /* 9A8EC8 80240AD8 10620043 */ beq $v1, $v0, .L80240BE8 -/* 9A8ECC 80240ADC 00000000 */ nop +/* 9A8ECC 80240ADC 00000000 */ nop /* 9A8ED0 80240AE0 080902FC */ j .L80240BF0 -/* 9A8ED4 80240AE4 00000000 */ nop +/* 9A8ED4 80240AE4 00000000 */ nop .L80240AE8: /* 9A8ED8 80240AE8 0280282D */ daddu $a1, $s4, $zero /* 9A8EDC 80240AEC 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_80240844_9A8C34 /* 9A8EF4 80240B04 0C0125AE */ jal func_800496B8 /* 9A8EF8 80240B08 02A0302D */ daddu $a2, $s5, $zero /* 9A8EFC 80240B0C 080902FC */ j .L80240BF0 -/* 9A8F00 80240B10 00000000 */ nop +/* 9A8F00 80240B10 00000000 */ nop .L80240B14: /* 9A8F04 80240B14 0260202D */ daddu $a0, $s3, $zero /* 9A8F08 80240B18 0280282D */ daddu $a1, $s4, $zero -/* 9A8F0C 80240B1C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9A8F0C 80240B1C 0C0126D1 */ jal func_80049B44 /* 9A8F10 80240B20 02A0302D */ daddu $a2, $s5, $zero /* 9A8F14 80240B24 8E230088 */ lw $v1, 0x88($s1) /* 9A8F18 80240B28 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_80240844_9A8C34 /* 9A8F74 80240B84 0C012701 */ jal func_80049C04 /* 9A8F78 80240B88 02A0302D */ daddu $a2, $s5, $zero /* 9A8F7C 80240B8C 080902FC */ j .L80240BF0 -/* 9A8F80 80240B90 00000000 */ nop +/* 9A8F80 80240B90 00000000 */ nop .L80240B94: /* 9A8F84 80240B94 0260202D */ daddu $a0, $s3, $zero /* 9A8F88 80240B98 0280282D */ daddu $a1, $s4, $zero -/* 9A8F8C 80240B9C 0C09012C */ jal trd_04_set_script_owner_npc_anim +/* 9A8F8C 80240B9C 0C09012C */ jal func_802404B0_9A88A0 /* 9A8F90 80240BA0 02A0302D */ daddu $a2, $s5, $zero /* 9A8F94 80240BA4 0260202D */ daddu $a0, $s3, $zero .L80240BA8: @@ -240,20 +240,20 @@ glabel func_80240844_9A8C34 /* 9A8F9C 80240BAC 0C09014B */ jal func_8024052C_9A891C /* 9A8FA0 80240BB0 02A0302D */ daddu $a2, $s5, $zero /* 9A8FA4 80240BB4 080902FC */ j .L80240BF0 -/* 9A8FA8 80240BB8 00000000 */ nop +/* 9A8FA8 80240BB8 00000000 */ nop .L80240BBC: /* 9A8FAC 80240BBC 0260202D */ daddu $a0, $s3, $zero /* 9A8FB0 80240BC0 0280282D */ daddu $a1, $s4, $zero -/* 9A8FB4 80240BC4 0C090198 */ jal trd_04_UnkNpcAIFunc12 +/* 9A8FB4 80240BC4 0C090198 */ jal func_80240660_9A8A50 /* 9A8FB8 80240BC8 02A0302D */ daddu $a2, $s5, $zero /* 9A8FBC 80240BCC 080902FC */ j .L80240BF0 -/* 9A8FC0 80240BD0 00000000 */ nop +/* 9A8FC0 80240BD0 00000000 */ nop .L80240BD4: /* 9A8FC4 80240BD4 0280282D */ daddu $a1, $s4, $zero -/* 9A8FC8 80240BD8 0C0901F1 */ jal trd_04_set_script_owner_npc_col_height +/* 9A8FC8 80240BD8 0C0901F1 */ jal func_802407C4_9A8BB4 /* 9A8FCC 80240BDC 02A0302D */ daddu $a2, $s5, $zero /* 9A8FD0 80240BE0 080902FC */ j .L80240BF0 -/* 9A8FD4 80240BE4 00000000 */ nop +/* 9A8FD4 80240BE4 00000000 */ nop .L80240BE8: /* 9A8FD8 80240BE8 0C0129CF */ jal func_8004A73C /* 9A8FDC 80240BEC 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_80240844_9A8C34 /* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 /* 9A9034 80240C44 8C225EE8 */ lw $v0, %lo(D_80245EE8)($at) /* 9A9038 80240C48 00400008 */ jr $v0 -/* 9A903C 80240C4C 00000000 */ nop +/* 9A903C 80240C4C 00000000 */ nop /* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) /* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 /* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index 216a091d1b..fe566b7859 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -141,7 +141,7 @@ glabel func_80241818_9A9C08 /* 9A9E10 80241A20 00000000 */ nop /* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero /* 9A9E18 80241A28 0260282D */ daddu $a1, $s3, $zero -/* 9A9E1C 80241A2C 0C090421 */ jal trd_04_UnkNpcAIFunc1 +/* 9A9E1C 80241A2C 0C090421 */ jal func_80241084_9A9474 /* 9A9E20 80241A30 02A0302D */ daddu $a2, $s5, $zero /* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero /* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero @@ -157,11 +157,11 @@ glabel func_80241818_9A9C08 /* 9A9E50 80241A60 00000000 */ nop /* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero /* 9A9E58 80241A68 0260282D */ daddu $a1, $s3, $zero -/* 9A9E5C 80241A6C 0C0904ED */ jal trd_04_NpcJumpFunc2 +/* 9A9E5C 80241A6C 0C0904ED */ jal func_802413B4_9A97A4 /* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero /* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero /* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero -/* 9A9E6C 80241A7C 0C09050A */ jal trd_04_NpcJumpFunc +/* 9A9E6C 80241A7C 0C09050A */ jal func_80241428_9A9818 /* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero /* 9A9E74 80241A84 080906BB */ j .L80241AEC /* 9A9E78 80241A88 00000000 */ nop @@ -177,7 +177,7 @@ glabel func_80241818_9A9C08 /* 9A9EA0 80241AB0 00000000 */ nop /* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero /* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero -/* 9A9EAC 80241ABC 0C0905BC */ jal trd_04_UnkNpcDurationFlagFunc +/* 9A9EAC 80241ABC 0C0905BC */ jal func_802416F0_9A9AE0 /* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero /* 9A9EB4 80241AC4 080906BB */ j .L80241AEC /* 9A9EB8 80241AC8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index 33cd130f43..8dfcb4fb6b 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -53,7 +53,7 @@ glabel func_80241B14_9A9F04 /* 9A9FC0 80241BD0 8E2200B0 */ lw $v0, 0xb0($s1) /* 9A9FC4 80241BD4 30420004 */ andi $v0, $v0, 4 /* 9A9FC8 80241BD8 10400048 */ beqz $v0, .L80241CFC -/* 9A9FCC 80241BDC 00000000 */ nop +/* 9A9FCC 80241BDC 00000000 */ nop .L80241BE0: /* 9A9FD0 80241BE0 A640008E */ sh $zero, 0x8e($s2) /* 9A9FD4 80241BE4 AE600070 */ sw $zero, 0x70($s3) @@ -103,7 +103,7 @@ glabel func_80241B14_9A9F04 /* 9AA07C 80241C8C 24020028 */ addiu $v0, $zero, 0x28 /* 9AA080 80241C90 AFA2001C */ sw $v0, 0x1c($sp) /* 9AA084 80241C94 44833000 */ mtc1 $v1, $f6 -/* 9AA088 80241C98 00000000 */ nop +/* 9AA088 80241C98 00000000 */ nop /* 9AA08C 80241C9C 468031A0 */ cvt.s.w $f6, $f6 /* 9AA090 80241CA0 44073000 */ mfc1 $a3, $f6 /* 9AA094 80241CA4 27A20048 */ addiu $v0, $sp, 0x48 @@ -138,7 +138,7 @@ glabel func_80241B14_9A9F04 /* 9AA100 80241D10 00220821 */ addu $at, $at, $v0 /* 9AA104 80241D14 8C2260E0 */ lw $v0, %lo(D_802460E0)($at) /* 9AA108 80241D18 00400008 */ jr $v0 -/* 9AA10C 80241D1C 00000000 */ nop +/* 9AA10C 80241D1C 00000000 */ nop /* 9AA110 80241D20 0260202D */ daddu $a0, $s3, $zero /* 9AA114 80241D24 0280282D */ daddu $a1, $s4, $zero /* 9AA118 80241D28 0C090321 */ jal func_80240C84_9A9074 @@ -150,45 +150,45 @@ glabel func_80241B14_9A9F04 /* 9AA130 80241D40 0C090377 */ jal func_80240DDC_9A91CC /* 9AA134 80241D44 02A0302D */ daddu $a2, $s5, $zero /* 9AA138 80241D48 0809077C */ j .L80241DF0 -/* 9AA13C 80241D4C 00000000 */ nop +/* 9AA13C 80241D4C 00000000 */ nop /* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero /* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero -/* 9AA148 80241D58 0C090421 */ jal trd_04_UnkNpcAIFunc1 +/* 9AA148 80241D58 0C090421 */ jal func_80241084_9A9474 /* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero /* 9AA158 80241D68 0C090451 */ jal func_80241144_9A9534 /* 9AA15C 80241D6C 02A0302D */ daddu $a2, $s5, $zero /* 9AA160 80241D70 0809077C */ j .L80241DF0 -/* 9AA164 80241D74 00000000 */ nop +/* 9AA164 80241D74 00000000 */ nop /* 9AA168 80241D78 0260202D */ daddu $a0, $s3, $zero /* 9AA16C 80241D7C 0280282D */ daddu $a1, $s4, $zero /* 9AA170 80241D80 0C0904C0 */ jal func_80241300_9A96F0 /* 9AA174 80241D84 02A0302D */ daddu $a2, $s5, $zero /* 9AA178 80241D88 0809077C */ j .L80241DF0 -/* 9AA17C 80241D8C 00000000 */ nop +/* 9AA17C 80241D8C 00000000 */ nop /* 9AA180 80241D90 0260202D */ daddu $a0, $s3, $zero /* 9AA184 80241D94 0280282D */ daddu $a1, $s4, $zero -/* 9AA188 80241D98 0C09012C */ jal trd_04_set_script_owner_npc_anim +/* 9AA188 80241D98 0C09012C */ jal func_802404B0_9A88A0 /* 9AA18C 80241D9C 02A0302D */ daddu $a2, $s5, $zero /* 9AA190 80241DA0 0260202D */ daddu $a0, $s3, $zero /* 9AA194 80241DA4 0280282D */ daddu $a1, $s4, $zero /* 9AA198 80241DA8 0C09014B */ jal func_8024052C_9A891C /* 9AA19C 80241DAC 02A0302D */ daddu $a2, $s5, $zero /* 9AA1A0 80241DB0 0809077C */ j .L80241DF0 -/* 9AA1A4 80241DB4 00000000 */ nop +/* 9AA1A4 80241DB4 00000000 */ nop /* 9AA1A8 80241DB8 0260202D */ daddu $a0, $s3, $zero /* 9AA1AC 80241DBC 0280282D */ daddu $a1, $s4, $zero -/* 9AA1B0 80241DC0 0C090198 */ jal trd_04_UnkNpcAIFunc12 +/* 9AA1B0 80241DC0 0C090198 */ jal func_80240660_9A8A50 /* 9AA1B4 80241DC4 02A0302D */ daddu $a2, $s5, $zero /* 9AA1B8 80241DC8 0809077C */ j .L80241DF0 -/* 9AA1BC 80241DCC 00000000 */ nop +/* 9AA1BC 80241DCC 00000000 */ nop /* 9AA1C0 80241DD0 0260202D */ daddu $a0, $s3, $zero /* 9AA1C4 80241DD4 0280282D */ daddu $a1, $s4, $zero -/* 9AA1C8 80241DD8 0C0901F1 */ jal trd_04_set_script_owner_npc_col_height +/* 9AA1C8 80241DD8 0C0901F1 */ jal func_802407C4_9A8BB4 /* 9AA1CC 80241DDC 02A0302D */ daddu $a2, $s5, $zero /* 9AA1D0 80241DE0 0809077C */ j .L80241DF0 -/* 9AA1D4 80241DE4 00000000 */ nop +/* 9AA1D4 80241DE4 00000000 */ nop /* 9AA1D8 80241DE8 0C0129CF */ jal func_8004A73C /* 9AA1DC 80241DEC 0260202D */ daddu $a0, $s3, $zero .L80241DF0: diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index 465dea439d..d0c543152a 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -54,7 +54,7 @@ glabel func_80243124_9AB514 /* 9AB5D4 802431E4 8E4300B0 */ lw $v1, 0xb0($s2) /* 9AB5D8 802431E8 30620004 */ andi $v0, $v1, 4 /* 9AB5DC 802431EC 10400007 */ beqz $v0, .L8024320C -/* 9AB5E0 802431F0 00000000 */ nop +/* 9AB5E0 802431F0 00000000 */ nop /* 9AB5E4 802431F4 824200B4 */ lb $v0, 0xb4($s2) /* 9AB5E8 802431F8 1440003C */ bnez $v0, .L802432EC /* 9AB5EC 802431FC 0000102D */ daddu $v0, $zero, $zero @@ -70,7 +70,7 @@ glabel func_80243124_9AB514 /* 9AB610 80243220 00220821 */ addu $at, $at, $v0 /* 9AB614 80243224 8C226288 */ lw $v0, %lo(D_80246288)($at) /* 9AB618 80243228 00400008 */ jr $v0 -/* 9AB61C 8024322C 00000000 */ nop +/* 9AB61C 8024322C 00000000 */ nop /* 9AB620 80243230 0280202D */ daddu $a0, $s4, $zero /* 9AB624 80243234 0200282D */ daddu $a1, $s0, $zero /* 9AB628 80243238 0C090786 */ jal func_80241E18_9AA208 @@ -83,7 +83,7 @@ glabel func_80243124_9AB514 /* 9AB644 80243254 0000102D */ daddu $v0, $zero, $zero /* 9AB648 80243258 0280202D */ daddu $a0, $s4, $zero /* 9AB64C 8024325C 0200282D */ daddu $a1, $s0, $zero -/* 9AB650 80243260 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 +/* 9AB650 80243260 0C09097C */ jal func_802425F0_9AA9E0 /* 9AB654 80243264 0260302D */ daddu $a2, $s3, $zero /* 9AB658 80243268 0280202D */ daddu $a0, $s4, $zero /* 9AB65C 8024326C 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80243124_9AB514 /* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero /* 9AB670 80243280 0280202D */ daddu $a0, $s4, $zero /* 9AB674 80243284 0200282D */ daddu $a1, $s0, $zero -/* 9AB678 80243288 0C090A7D */ jal trd_04_UnkNpcAIFunc2 +/* 9AB678 80243288 0C090A7D */ jal func_802429F4_9AADE4 /* 9AB67C 8024328C 0260302D */ daddu $a2, $s3, $zero /* 9AB680 80243290 0280202D */ daddu $a0, $s4, $zero /* 9AB684 80243294 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80243124_9AB514 /* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero /* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero /* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero -/* 9AB6B8 802432C8 0C090B03 */ jal trd_04_UnkNpcAIFunc3 +/* 9AB6B8 802432C8 0C090B03 */ jal func_80242C0C_9AAFFC /* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero /* 9AB6C0 802432D0 08090CBB */ j .L802432EC /* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index 05c1452920..97aa8f6d6f 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -57,7 +57,7 @@ glabel func_80243650_9ABA40 /* 9ABB0C 8024371C 8E4300B0 */ lw $v1, 0xb0($s2) /* 9ABB10 80243720 30620004 */ andi $v0, $v1, 4 /* 9ABB14 80243724 10400007 */ beqz $v0, .L80243744 -/* 9ABB18 80243728 00000000 */ nop +/* 9ABB18 80243728 00000000 */ nop /* 9ABB1C 8024372C 824200B4 */ lb $v0, 0xb4($s2) /* 9ABB20 80243730 14400052 */ bnez $v0, .L8024387C /* 9ABB24 80243734 0000102D */ daddu $v0, $zero, $zero @@ -73,7 +73,7 @@ glabel func_80243650_9ABA40 /* 9ABB48 80243758 00220821 */ addu $at, $at, $v0 /* 9ABB4C 8024375C 8C2262C8 */ lw $v0, %lo(D_802462C8)($at) /* 9ABB50 80243760 00400008 */ jr $v0 -/* 9ABB54 80243764 00000000 */ nop +/* 9ABB54 80243764 00000000 */ nop /* 9ABB58 80243768 0260202D */ daddu $a0, $s3, $zero /* 9ABB5C 8024376C 0200282D */ daddu $a1, $s0, $zero /* 9ABB60 80243770 0C090786 */ jal func_80241E18_9AA208 @@ -88,7 +88,7 @@ glabel func_80243650_9ABA40 /* 9ABB84 80243794 0000102D */ daddu $v0, $zero, $zero /* 9ABB88 80243798 0260202D */ daddu $a0, $s3, $zero /* 9ABB8C 8024379C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB90 802437A0 0C09097C */ jal dup_trd_04_UnkNpcAIFunc1 +/* 9ABB90 802437A0 0C09097C */ jal func_802425F0_9AA9E0 /* 9ABB94 802437A4 0280302D */ daddu $a2, $s4, $zero /* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero /* 9ABB9C 802437AC 0200282D */ daddu $a1, $s0, $zero @@ -100,7 +100,7 @@ glabel func_80243650_9ABA40 /* 9ABBB4 802437C4 0000102D */ daddu $v0, $zero, $zero /* 9ABBB8 802437C8 0260202D */ daddu $a0, $s3, $zero /* 9ABBBC 802437CC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBC0 802437D0 0C090A7D */ jal trd_04_UnkNpcAIFunc2 +/* 9ABBC0 802437D0 0C090A7D */ jal func_802429F4_9AADE4 /* 9ABBC4 802437D4 0280302D */ daddu $a2, $s4, $zero /* 9ABBC8 802437D8 8E630070 */ lw $v1, 0x70($s3) /* 9ABBCC 802437DC 2402000B */ addiu $v0, $zero, 0xb @@ -140,7 +140,7 @@ glabel func_80243650_9ABA40 /* 9ABC54 80243864 0000102D */ daddu $v0, $zero, $zero /* 9ABC58 80243868 0260202D */ daddu $a0, $s3, $zero /* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC60 80243870 0C090D83 */ jal trd_04_UnkDurationCheck +/* 9ABC60 80243870 0C090D83 */ jal func_8024360C_9AB9FC /* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero .L80243878: /* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s index 2c9c4846f2..7634dba5bd 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240020_9AE720.s @@ -97,8 +97,8 @@ glabel func_80240020_9AE720 /* 9AE890 80240190 AC500048 */ sw $s0, 0x48($v0) /* 9AE894 80240194 AC43004C */ sw $v1, 0x4c($v0) /* 9AE898 80240198 AC530050 */ sw $s3, 0x50($v0) -/* 9AE89C 8024019C 3C138024 */ lui $s3, %hi(D_80243090) -/* 9AE8A0 802401A0 26733090 */ addiu $s3, $s3, %lo(D_80243090) +/* 9AE89C 8024019C 3C138024 */ lui $s3, %hi(func_80243090_8B3100) +/* 9AE8A0 802401A0 26733090 */ addiu $s3, $s3, %lo(func_80243090_8B3100) /* 9AE8A4 802401A4 24430058 */ addiu $v1, $v0, 0x58 /* 9AE8A8 802401A8 AC400054 */ sw $zero, 0x54($v0) /* 9AE8AC 802401AC AC540058 */ sw $s4, 0x58($v0) diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s index 14d50166b7..0ee1c7e6ef 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240404_9AEB04.s @@ -8,16 +8,16 @@ glabel func_80240404_9AEB04 /* 9AEB10 80240410 AFBF0014 */ sw $ra, 0x14($sp) /* 9AEB14 80240414 AFB00010 */ sw $s0, 0x10($sp) /* 9AEB18 80240418 844300B0 */ lh $v1, 0xb0($v0) -/* 9AEB1C 8024041C 3C018024 */ lui $at, %hi(D_80243070) -/* 9AEB20 80240420 D4203070 */ ldc1 $f0, %lo(D_80243070)($at) +/* 9AEB1C 8024041C 3C018024 */ lui $at, %hi(func_80243070_8B30E0) +/* 9AEB20 80240420 D4203070 */ ldc1 $f0, %lo(func_80243070_8B30E0)($at) /* 9AEB24 80240424 44831000 */ mtc1 $v1, $f2 /* 9AEB28 80240428 00000000 */ nop /* 9AEB2C 8024042C 468010A1 */ cvt.d.w $f2, $f2 /* 9AEB30 80240430 46201082 */ mul.d $f2, $f2, $f0 /* 9AEB34 80240434 00000000 */ nop /* 9AEB38 80240438 24040001 */ addiu $a0, $zero, 1 -/* 9AEB3C 8024043C 3C108024 */ lui $s0, %hi(D_80243090) -/* 9AEB40 80240440 26103090 */ addiu $s0, $s0, %lo(D_80243090) +/* 9AEB3C 8024043C 3C108024 */ lui $s0, %hi(func_80243090_8B3100) +/* 9AEB40 80240440 26103090 */ addiu $s0, $s0, %lo(func_80243090_8B3100) /* 9AEB44 80240444 C44A0028 */ lwc1 $f10, 0x28($v0) /* 9AEB48 80240448 3C013FE0 */ lui $at, 0x3fe0 /* 9AEB4C 8024044C 44812800 */ mtc1 $at, $f5 @@ -43,8 +43,8 @@ glabel func_80240404_9AEB04 /* 9AEB9C 8024049C 0C04E9C1 */ jal func_8013A704 /* 9AEBA0 802404A0 E6000014 */ swc1 $f0, 0x14($s0) /* 9AEBA4 802404A4 0000202D */ daddu $a0, $zero, $zero -/* 9AEBA8 802404A8 3C058024 */ lui $a1, %hi(D_80240020) -/* 9AEBAC 802404AC 24A50020 */ addiu $a1, $a1, %lo(D_80240020) +/* 9AEBA8 802404A8 3C058024 */ lui $a1, %hi(func_80240020_9AE31C) +/* 9AEBAC 802404AC 24A50020 */ addiu $a1, $a1, %lo(func_80240020_9AE31C) /* 9AEBB0 802404B0 0C048C56 */ jal bind_dynamic_entity_3 /* 9AEBB4 802404B4 AE020000 */ sw $v0, ($s0) /* 9AEBB8 802404B8 AE020004 */ sw $v0, 4($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s index a7f21f9d8c..0a41416760 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802404D0_9AEBD0.s @@ -4,8 +4,8 @@ glabel func_802404D0_9AEBD0 /* 9AEBD0 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 9AEBD4 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9AEBD8 802404D8 3C108024 */ lui $s0, %hi(D_80243090) -/* 9AEBDC 802404DC 26103090 */ addiu $s0, $s0, %lo(D_80243090) +/* 9AEBD8 802404D8 3C108024 */ lui $s0, %hi(func_80243090_8B3100) +/* 9AEBDC 802404DC 26103090 */ addiu $s0, $s0, %lo(func_80243090_8B3100) /* 9AEBE0 802404E0 AFBF0014 */ sw $ra, 0x14($sp) /* 9AEBE4 802404E4 0C04EA15 */ jal func_8013A854 /* 9AEBE8 802404E8 8E040000 */ lw $a0, ($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s index b35ce5179e..ebb186455d 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s @@ -43,8 +43,8 @@ glabel func_80240508_9AEC08 /* 9AECA0 802405A0 44900000 */ mtc1 $s0, $f0 /* 9AECA4 802405A4 00000000 */ nop /* 9AECA8 802405A8 46800021 */ cvt.d.w $f0, $f0 -/* 9AECAC 802405AC 3C028024 */ lui $v0, %hi(D_80243090) -/* 9AECB0 802405B0 24423090 */ addiu $v0, $v0, %lo(D_80243090) +/* 9AECAC 802405AC 3C028024 */ lui $v0, %hi(func_80243090_8B3100) +/* 9AECB0 802405B0 24423090 */ addiu $v0, $v0, %lo(func_80243090_8B3100) /* 9AECB4 802405B4 44921000 */ mtc1 $s2, $f2 /* 9AECB8 802405B8 00000000 */ nop /* 9AECBC 802405BC 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s index 97af6748e0..8db3192f28 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_802405FC_9AECFC.s @@ -31,8 +31,8 @@ glabel func_802405FC_9AECFC /* 9AED64 80240664 0220202D */ daddu $a0, $s1, $zero /* 9AED68 80240668 4600020D */ trunc.w.s $f8, $f0 /* 9AED6C 8024066C 44044000 */ mfc1 $a0, $f8 -/* 9AED70 80240670 3C028024 */ lui $v0, %hi(D_80243090) -/* 9AED74 80240674 24423090 */ addiu $v0, $v0, %lo(D_80243090) +/* 9AED70 80240670 3C028024 */ lui $v0, %hi(func_80243090_8B3100) +/* 9AED74 80240674 24423090 */ addiu $v0, $v0, %lo(func_80243090_8B3100) /* 9AED78 80240678 1640000E */ bnez $s2, .L802406B4 /* 9AED7C 8024067C 0040182D */ daddu $v1, $v0, $zero /* 9AED80 80240680 44930000 */ mtc1 $s3, $f0 diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s index ce624a98a3..fea1977b47 100644 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s +++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s @@ -54,8 +54,8 @@ glabel func_80240724_9B1EB4 /* 9B1F78 802407E8 0C04E9C1 */ jal func_8013A704 /* 9B1F7C 802407EC E6000018 */ swc1 $f0, 0x18($s0) /* 9B1F80 802407F0 0000202D */ daddu $a0, $zero, $zero -/* 9B1F84 802407F4 3C058024 */ lui $a1, %hi(D_80240310) -/* 9B1F88 802407F8 24A50310 */ addiu $a1, $a1, %lo(D_80240310) +/* 9B1F84 802407F4 3C058024 */ lui $a1, %hi(func_80240310_9B168C) +/* 9B1F88 802407F8 24A50310 */ addiu $a1, $a1, %lo(func_80240310_9B168C) /* 9B1F8C 802407FC 0C048C56 */ jal bind_dynamic_entity_3 /* 9B1F90 80240800 AE020004 */ sw $v0, 4($s0) /* 9B1F94 80240804 AE020008 */ sw $v0, 8($s0) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s index a3fa68dca6..0a29b623b0 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -55,7 +55,7 @@ glabel func_802406A4_9B7024 /* 9B70E8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) /* 9B70EC 8024076C 30420004 */ andi $v0, $v0, 4 /* 9B70F0 80240770 10400047 */ beqz $v0, .L80240890 -/* 9B70F4 80240774 00000000 */ nop +/* 9B70F4 80240774 00000000 */ nop .L80240778: /* 9B70F8 80240778 AE600070 */ sw $zero, 0x70($s3) /* 9B70FC 8024077C A640008E */ sh $zero, 0x8e($s2) @@ -104,7 +104,7 @@ glabel func_802406A4_9B7024 /* 9B71A0 80240820 24020028 */ addiu $v0, $zero, 0x28 /* 9B71A4 80240824 AFA2001C */ sw $v0, 0x1c($sp) /* 9B71A8 80240828 44833000 */ mtc1 $v1, $f6 -/* 9B71AC 8024082C 00000000 */ nop +/* 9B71AC 8024082C 00000000 */ nop /* 9B71B0 80240830 468031A0 */ cvt.s.w $f6, $f6 /* 9B71B4 80240834 44073000 */ mfc1 $a3, $f6 /* 9B71B8 80240838 27A20048 */ addiu $v0, $sp, 0x48 @@ -159,14 +159,14 @@ glabel func_802406A4_9B7024 /* 9B7270 802408F0 10600015 */ beqz $v1, .L80240948 /* 9B7274 802408F4 0260202D */ daddu $a0, $s3, $zero /* 9B7278 802408F8 08090294 */ j .L80240A50 -/* 9B727C 802408FC 00000000 */ nop +/* 9B727C 802408FC 00000000 */ nop .L80240900: /* 9B7280 80240900 1062001C */ beq $v1, $v0, .L80240974 /* 9B7284 80240904 24020003 */ addiu $v0, $zero, 3 /* 9B7288 80240908 10620035 */ beq $v1, $v0, .L802409E0 /* 9B728C 8024090C 0260202D */ daddu $a0, $s3, $zero /* 9B7290 80240910 08090294 */ j .L80240A50 -/* 9B7294 80240914 00000000 */ nop +/* 9B7294 80240914 00000000 */ nop .L80240918: /* 9B7298 80240918 2402000E */ addiu $v0, $zero, 0xe /* 9B729C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C @@ -177,9 +177,9 @@ glabel func_802406A4_9B7024 /* 9B72B0 80240930 10620040 */ beq $v1, $v0, .L80240A34 /* 9B72B4 80240934 24020063 */ addiu $v0, $zero, 0x63 /* 9B72B8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* 9B72BC 8024093C 00000000 */ nop +/* 9B72BC 8024093C 00000000 */ nop /* 9B72C0 80240940 08090294 */ j .L80240A50 -/* 9B72C4 80240944 00000000 */ nop +/* 9B72C4 80240944 00000000 */ nop .L80240948: /* 9B72C8 80240948 0280282D */ daddu $a1, $s4, $zero /* 9B72CC 8024094C 0C012568 */ jal func_800495A0 @@ -192,11 +192,11 @@ glabel func_802406A4_9B7024 /* 9B72E4 80240964 0C0125AE */ jal func_800496B8 /* 9B72E8 80240968 02A0302D */ daddu $a2, $s5, $zero /* 9B72EC 8024096C 08090294 */ j .L80240A50 -/* 9B72F0 80240970 00000000 */ nop +/* 9B72F0 80240970 00000000 */ nop .L80240974: /* 9B72F4 80240974 0260202D */ daddu $a0, $s3, $zero /* 9B72F8 80240978 0280282D */ daddu $a1, $s4, $zero -/* 9B72FC 8024097C 0C0126D1 */ jal base_UnkNpcAIFunc1 +/* 9B72FC 8024097C 0C0126D1 */ jal func_80049B44 /* 9B7300 80240980 02A0302D */ daddu $a2, $s5, $zero /* 9B7304 80240984 8E230088 */ lw $v1, 0x88($s1) /* 9B7308 80240988 24020006 */ addiu $v0, $zero, 6 @@ -228,11 +228,11 @@ glabel func_802406A4_9B7024 /* 9B7364 802409E4 0C012701 */ jal func_80049C04 /* 9B7368 802409E8 02A0302D */ daddu $a2, $s5, $zero /* 9B736C 802409EC 08090294 */ j .L80240A50 -/* 9B7370 802409F0 00000000 */ nop +/* 9B7370 802409F0 00000000 */ nop .L802409F4: /* 9B7374 802409F4 0260202D */ daddu $a0, $s3, $zero /* 9B7378 802409F8 0280282D */ daddu $a1, $s4, $zero -/* 9B737C 802409FC 0C0900C4 */ jal trd_07_set_script_owner_npc_anim +/* 9B737C 802409FC 0C0900C4 */ jal func_80240310_9B6C90 /* 9B7380 80240A00 02A0302D */ daddu $a2, $s5, $zero /* 9B7384 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: @@ -240,20 +240,20 @@ glabel func_802406A4_9B7024 /* 9B738C 80240A0C 0C0900E3 */ jal func_8024038C_9B6D0C /* 9B7390 80240A10 02A0302D */ daddu $a2, $s5, $zero /* 9B7394 80240A14 08090294 */ j .L80240A50 -/* 9B7398 80240A18 00000000 */ nop +/* 9B7398 80240A18 00000000 */ nop .L80240A1C: /* 9B739C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* 9B73A0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* 9B73A4 80240A24 0C090130 */ jal trd_07_UnkNpcAIFunc12 +/* 9B73A4 80240A24 0C090130 */ jal func_802404C0_9B6E40 /* 9B73A8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* 9B73AC 80240A2C 08090294 */ j .L80240A50 -/* 9B73B0 80240A30 00000000 */ nop +/* 9B73B0 80240A30 00000000 */ nop .L80240A34: /* 9B73B4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* 9B73B8 80240A38 0C090189 */ jal trd_07_set_script_owner_npc_col_height +/* 9B73B8 80240A38 0C090189 */ jal func_80240624_9B6FA4 /* 9B73BC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* 9B73C0 80240A40 08090294 */ j .L80240A50 -/* 9B73C4 80240A44 00000000 */ nop +/* 9B73C4 80240A44 00000000 */ nop .L80240A48: /* 9B73C8 80240A48 0C0129CF */ jal func_8004A73C /* 9B73CC 80240A4C 0260202D */ daddu $a0, $s3, $zero @@ -283,7 +283,7 @@ glabel func_802406A4_9B7024 /* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 /* 9B7424 80240AA4 8C224828 */ lw $v0, %lo(D_80244828)($at) /* 9B7428 80240AA8 00400008 */ jr $v0 -/* 9B742C 80240AAC 00000000 */ nop +/* 9B742C 80240AAC 00000000 */ nop /* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) /* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 /* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s index 97dbd6e7a5..89b35f0e93 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241738_9B80B8.s @@ -15,9 +15,9 @@ glabel func_80241738_9B80B8 /* 9B80E0 80241760 00031C00 */ sll $v1, $v1, 0x10 /* 9B80E4 80241764 00031B83 */ sra $v1, $v1, 0xe /* 9B80E8 80241768 A444008E */ sh $a0, 0x8e($v0) -/* 9B80EC 8024176C 3C018024 */ lui $at, %hi(D_80242EAC) +/* 9B80EC 8024176C 3C018024 */ lui $at, %hi(func_80242EAC_96C06C) /* 9B80F0 80241770 00230821 */ addu $at, $at, $v1 -/* 9B80F4 80241774 C4222EAC */ lwc1 $f2, %lo(D_80242EAC)($at) +/* 9B80F4 80241774 C4222EAC */ lwc1 $f2, %lo(func_80242EAC_96C06C)($at) /* 9B80F8 80241778 8443008E */ lh $v1, 0x8e($v0) /* 9B80FC 8024177C 46020000 */ add.s $f0, $f0, $f2 /* 9B8100 80241780 28630005 */ slti $v1, $v1, 5 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index 44c3f3baf6..86fac4c946 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -83,7 +83,7 @@ glabel func_80241DF0_9B8770 /* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero /* 9B88A4 80241F24 0280202D */ daddu $a0, $s4, $zero /* 9B88A8 80241F28 0200282D */ daddu $a1, $s0, $zero -/* 9B88AC 80241F2C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 +/* 9B88AC 80241F2C 0C0904AF */ jal func_802412BC_9B7C3C /* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero /* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero @@ -93,7 +93,7 @@ glabel func_80241DF0_9B8770 /* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero /* 9B88CC 80241F4C 0280202D */ daddu $a0, $s4, $zero /* 9B88D0 80241F50 0200282D */ daddu $a1, $s0, $zero -/* 9B88D4 80241F54 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 +/* 9B88D4 80241F54 0C0905B0 */ jal func_802416C0_9B8040 /* 9B88D8 80241F58 0260302D */ daddu $a2, $s3, $zero /* 9B88DC 80241F5C 0280202D */ daddu $a0, $s4, $zero /* 9B88E0 80241F60 0200282D */ daddu $a1, $s0, $zero @@ -109,7 +109,7 @@ glabel func_80241DF0_9B8770 /* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero /* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero /* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero -/* 9B8914 80241F94 0C090636 */ jal trd_07_UnkNpcAIFunc3 +/* 9B8914 80241F94 0C090636 */ jal func_802418D8_9B8258 /* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero /* 9B891C 80241F9C 080907EE */ j .L80241FB8 /* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index 1280ab68af..038ee83c18 100644 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -88,7 +88,7 @@ glabel func_8024231C_9B8C9C /* 9B8DE0 80242460 0000102D */ daddu $v0, $zero, $zero /* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero /* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero -/* 9B8DEC 8024246C 0C0904AF */ jal trd_07_UnkNpcAIFunc1 +/* 9B8DEC 8024246C 0C0904AF */ jal func_802412BC_9B7C3C /* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero /* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero /* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero @@ -100,7 +100,7 @@ glabel func_8024231C_9B8C9C /* 9B8E10 80242490 0000102D */ daddu $v0, $zero, $zero /* 9B8E14 80242494 0260202D */ daddu $a0, $s3, $zero /* 9B8E18 80242498 0200282D */ daddu $a1, $s0, $zero -/* 9B8E1C 8024249C 0C0905B0 */ jal trd_07_UnkNpcAIFunc2 +/* 9B8E1C 8024249C 0C0905B0 */ jal func_802416C0_9B8040 /* 9B8E20 802424A0 0280302D */ daddu $a2, $s4, $zero /* 9B8E24 802424A4 8E630070 */ lw $v1, 0x70($s3) /* 9B8E28 802424A8 2402000B */ addiu $v0, $zero, 0xb @@ -140,7 +140,7 @@ glabel func_8024231C_9B8C9C /* 9B8EB0 80242530 0000102D */ daddu $v0, $zero, $zero /* 9B8EB4 80242534 0260202D */ daddu $a0, $s3, $zero /* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero -/* 9B8EBC 8024253C 0C0908B6 */ jal trd_07_UnkDurationCheck +/* 9B8EBC 8024253C 0C0908B6 */ jal func_802422D8_9B8C58 /* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero .L80242544: /* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s index 5a1a58fb39..4214195bef 100644 --- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s +++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s @@ -46,8 +46,8 @@ glabel func_80240904_9BBBA4 /* 9BBC3C 8024099C 2402000A */ addiu $v0, $zero, 0xa /* 9BBC40 802409A0 1462001B */ bne $v1, $v0, .L80240A10 /* 9BBC44 802409A4 E6000010 */ swc1 $f0, 0x10($s0) -/* 9BBC48 802409A8 3C048024 */ lui $a0, %hi(D_80240F2C) -/* 9BBC4C 802409AC 24840F2C */ addiu $a0, $a0, %lo(D_80240F2C) +/* 9BBC48 802409A8 3C048024 */ lui $a0, %hi(func_80240F2C_95C12C) +/* 9BBC4C 802409AC 24840F2C */ addiu $a0, $a0, %lo(func_80240F2C_95C12C) /* 9BBC50 802409B0 24050001 */ addiu $a1, $zero, 1 /* 9BBC54 802409B4 0C0B0CF8 */ jal start_script /* 9BBC58 802409B8 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s index 5a558724ac..b6d44a6d87 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s @@ -5,8 +5,8 @@ glabel func_80240260_B1B7D0 /* B1B7D0 80240260 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B1B7D4 80240264 AFB00010 */ sw $s0, 0x10($sp) /* B1B7D8 80240268 0080802D */ daddu $s0, $a0, $zero -/* B1B7DC 8024026C 3C058024 */ lui $a1, %hi(D_8024029C) -/* B1B7E0 80240270 24A5029C */ addiu $a1, $a1, %lo(D_8024029C) +/* B1B7DC 8024026C 3C058024 */ lui $a1, %hi(func_8024029C_B1B5AC) +/* B1B7E0 80240270 24A5029C */ addiu $a1, $a1, %lo(func_8024029C_B1B5AC) /* B1B7E4 80240274 AFBF0014 */ sw $ra, 0x14($sp) /* B1B7E8 80240278 0C048C8F */ jal bind_dynamic_entity_7 /* B1B7EC 8024027C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s index 6bd95703ca..523ecd1877 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_8024029C_B1B80C.s @@ -39,8 +39,8 @@ glabel func_8024029C_B1B80C /* B1B894 80240324 AFB00028 */ sw $s0, 0x28($sp) /* B1B898 80240328 820500BE */ lb $a1, 0xbe($s0) /* B1B89C 8024032C 8FA30038 */ lw $v1, 0x38($sp) -/* B1B8A0 80240330 3C028024 */ lui $v0, %hi(D_80240360) -/* B1B8A4 80240334 24420360 */ addiu $v0, $v0, %lo(D_80240360) +/* B1B8A0 80240330 3C028024 */ lui $v0, %hi(func_80240360_B1B634) +/* B1B8A4 80240334 24420360 */ addiu $v0, $v0, %lo(func_80240360_B1B634) /* B1B8A8 80240338 AFA2002C */ sw $v0, 0x2c($sp) /* B1B8AC 8024033C 00031823 */ negu $v1, $v1 /* B1B8B0 80240340 AFA50020 */ sw $a1, 0x20($sp) diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s index 2eecf43005..ea8db77ffb 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240510_B1BA80.s @@ -5,8 +5,8 @@ glabel func_80240510_B1BA80 /* B1BA80 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B1BA84 80240514 AFB00010 */ sw $s0, 0x10($sp) /* B1BA88 80240518 0080802D */ daddu $s0, $a0, $zero -/* B1BA8C 8024051C 3C048024 */ lui $a0, %hi(D_80240574) -/* B1BA90 80240520 24840574 */ addiu $a0, $a0, %lo(D_80240574) +/* B1BA8C 8024051C 3C048024 */ lui $a0, %hi(func_80240574_B1B5D4) +/* B1BA90 80240520 24840574 */ addiu $a0, $a0, %lo(func_80240574_B1B5D4) /* B1BA94 80240524 AFBF0014 */ sw $ra, 0x14($sp) /* B1BA98 80240528 0C048C56 */ jal bind_dynamic_entity_3 /* B1BA9C 8024052C 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s index 165c76ecfa..04de2ac00e 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802405B0_B1BB20 -/* B1BB20 802405B0 3C048024 */ lui $a0, %hi(D_80240FD0) -/* B1BB24 802405B4 8C840FD0 */ lw $a0, %lo(D_80240FD0)($a0) +/* B1BB20 802405B0 3C048024 */ lui $a0, %hi(func_80240FD0_A3A4B0) +/* B1BB24 802405B4 8C840FD0 */ lw $a0, %lo(func_80240FD0_A3A4B0)($a0) /* B1BB28 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B1BB2C 802405BC AFBF0010 */ sw $ra, 0x10($sp) /* B1BB30 802405C0 0C047A2F */ jal func_8011E8BC diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s index 8f9cce883f..969f4426ae 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s @@ -15,8 +15,8 @@ glabel func_802405D4_B1BB44 /* B1BB6C 802405FC 27B00110 */ addiu $s0, $sp, 0x110 /* B1BB70 80240600 0C019D40 */ jal guMtxF2L /* B1BB74 80240604 0200282D */ daddu $a1, $s0, $zero -/* B1BB78 80240608 3C048024 */ lui $a0, %hi(D_80240FD0) -/* B1BB7C 8024060C 8C840FD0 */ lw $a0, %lo(D_80240FD0)($a0) +/* B1BB78 80240608 3C048024 */ lui $a0, %hi(func_80240FD0_A3A4B0) +/* B1BB7C 8024060C 8C840FD0 */ lw $a0, %lo(func_80240FD0_A3A4B0)($a0) /* B1BB80 80240610 0C047CC1 */ jal func_8011F304 /* B1BB84 80240614 0200282D */ daddu $a1, $s0, $zero /* B1BB88 80240618 8FBF0154 */ lw $ra, 0x154($sp) diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s index a1e9badb97..e40c3e9fdf 100644 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240628_B1BB98.s @@ -3,10 +3,10 @@ glabel func_80240628_B1BB98 /* B1BB98 80240628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BB9C 8024062C 3C048024 */ lui $a0, %hi(D_802405B0) -/* B1BBA0 80240630 248405B0 */ addiu $a0, $a0, %lo(D_802405B0) -/* B1BBA4 80240634 3C058024 */ lui $a1, %hi(D_802405D4) -/* B1BBA8 80240638 24A505D4 */ addiu $a1, $a1, %lo(D_802405D4) +/* B1BB9C 8024062C 3C048024 */ lui $a0, %hi(func_802405B0_B1B4F8) +/* B1BBA0 80240630 248405B0 */ addiu $a0, $a0, %lo(func_802405B0_B1B4F8) +/* B1BBA4 80240634 3C058024 */ lui $a1, %hi(func_802405D4_B1B51C) +/* B1BBA8 80240638 24A505D4 */ addiu $a1, $a1, %lo(func_802405D4_B1B51C) /* B1BBAC 8024063C AFBF0010 */ sw $ra, 0x10($sp) /* B1BBB0 80240640 0C048C56 */ jal bind_dynamic_entity_3 /* B1BBB4 80240644 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s index 3cf93fb834..427c83e51c 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240000_B1CA50.s @@ -5,8 +5,8 @@ glabel func_80240000_B1CA50 /* B1CA50 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B1CA54 80240004 AFB00010 */ sw $s0, 0x10($sp) /* B1CA58 80240008 0080802D */ daddu $s0, $a0, $zero -/* B1CA5C 8024000C 3C058024 */ lui $a1, %hi(D_8024003C) -/* B1CA60 80240010 24A5003C */ addiu $a1, $a1, %lo(D_8024003C) +/* B1CA5C 8024000C 3C058024 */ lui $a1, %hi(func_8024003C_B1CA8C) +/* B1CA60 80240010 24A5003C */ addiu $a1, $a1, %lo(func_8024003C_B1CA8C) /* B1CA64 80240014 AFBF0014 */ sw $ra, 0x14($sp) /* B1CA68 80240018 0C048C8F */ jal bind_dynamic_entity_7 /* B1CA6C 8024001C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s index ffe4823b39..6ec7b3d5b0 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_8024003C_B1CA8C.s @@ -39,8 +39,8 @@ glabel func_8024003C_B1CA8C /* B1CB14 802400C4 AFB00028 */ sw $s0, 0x28($sp) /* B1CB18 802400C8 820500BE */ lb $a1, 0xbe($s0) /* B1CB1C 802400CC 8FA30038 */ lw $v1, 0x38($sp) -/* B1CB20 802400D0 3C028024 */ lui $v0, %hi(D_80240100) -/* B1CB24 802400D4 24420100 */ addiu $v0, $v0, %lo(D_80240100) +/* B1CB20 802400D0 3C028024 */ lui $v0, %hi(func_80240100_B1CB14) +/* B1CB24 802400D4 24420100 */ addiu $v0, $v0, %lo(func_80240100_B1CB14) /* B1CB28 802400D8 AFA2002C */ sw $v0, 0x2c($sp) /* B1CB2C 802400DC 00031823 */ negu $v1, $v1 /* B1CB30 802400E0 AFA50020 */ sw $a1, 0x20($sp) diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s index e3bb6faa3c..d2235234e2 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s @@ -5,8 +5,8 @@ glabel func_802402B8_B1CD08 /* B1CD08 802402B8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B1CD0C 802402BC AFB00010 */ sw $s0, 0x10($sp) /* B1CD10 802402C0 0080802D */ daddu $s0, $a0, $zero -/* B1CD14 802402C4 3C058024 */ lui $a1, %hi(D_802402F4) -/* B1CD18 802402C8 24A502F4 */ addiu $a1, $a1, %lo(D_802402F4) +/* B1CD14 802402C4 3C058024 */ lui $a1, %hi(func_802402F4_B1CA8C) +/* B1CD18 802402C8 24A502F4 */ addiu $a1, $a1, %lo(func_802402F4_B1CA8C) /* B1CD1C 802402CC AFBF0014 */ sw $ra, 0x14($sp) /* B1CD20 802402D0 0C048C8F */ jal bind_dynamic_entity_7 /* B1CD24 802402D4 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s index e82c066e04..86ee112312 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s @@ -39,8 +39,8 @@ glabel func_802402F4_B1CD44 /* B1CDCC 8024037C AFB00028 */ sw $s0, 0x28($sp) /* B1CDD0 80240380 820500BE */ lb $a1, 0xbe($s0) /* B1CDD4 80240384 8FA30038 */ lw $v1, 0x38($sp) -/* B1CDD8 80240388 3C028024 */ lui $v0, %hi(D_802403B8) -/* B1CDDC 8024038C 244203B8 */ addiu $v0, $v0, %lo(D_802403B8) +/* B1CDD8 80240388 3C028024 */ lui $v0, %hi(func_802403B8_B1CB14) +/* B1CDDC 8024038C 244203B8 */ addiu $v0, $v0, %lo(func_802403B8_B1CB14) /* B1CDE0 80240390 AFA2002C */ sw $v0, 0x2c($sp) /* B1CDE4 80240394 00031823 */ negu $v1, $v1 /* B1CDE8 80240398 AFA50020 */ sw $a1, 0x20($sp) diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s index e9e7b194cc..fbb7ef99e9 100644 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s @@ -5,8 +5,8 @@ glabel func_802406D4_B1D124 /* B1D124 802406D4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B1D128 802406D8 AFB00010 */ sw $s0, 0x10($sp) /* B1D12C 802406DC 0080802D */ daddu $s0, $a0, $zero -/* B1D130 802406E0 3C048024 */ lui $a0, %hi(D_80240730) -/* B1D134 802406E4 24840730 */ addiu $a0, $a0, %lo(D_80240730) +/* B1D130 802406E0 3C048024 */ lui $a0, %hi(func_80240730_B1CAAC) +/* B1D134 802406E4 24840730 */ addiu $a0, $a0, %lo(func_80240730_B1CAAC) /* B1D138 802406E8 AFBF0014 */ sw $ra, 0x14($sp) /* B1D13C 802406EC 0C048C56 */ jal bind_dynamic_entity_3 /* B1D140 802406F0 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s index 45c4c53eac..5818c3187c 100644 --- a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s +++ b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s @@ -50,8 +50,8 @@ glabel func_8024013C_B1D89C /* B1D950 802401F0 46000506 */ mov.s $f20, $f0 /* B1D954 802401F4 4600A502 */ mul.s $f20, $f20, $f0 /* B1D958 802401F8 00000000 */ nop -/* B1D95C 802401FC 3C018024 */ lui $at, %hi(D_80242D00) -/* B1D960 80240200 D4202D00 */ ldc1 $f0, %lo(D_80242D00)($at) +/* B1D95C 802401FC 3C018024 */ lui $at, %hi(func_80242D00_A96440) +/* B1D960 80240200 D4202D00 */ ldc1 $f0, %lo(func_80242D00_A96440)($at) /* B1D964 80240204 4600A521 */ cvt.d.s $f20, $f20 /* B1D968 80240208 4620A500 */ add.d $f20, $f20, $f0 /* B1D96C 8024020C C60C0000 */ lwc1 $f12, ($s0) @@ -88,8 +88,8 @@ glabel func_8024013C_B1D89C /* B1D9E8 80240288 0C019D40 */ jal guMtxF2L /* B1D9EC 8024028C 00452821 */ addu $a1, $v0, $a1 /* B1D9F0 80240290 24040001 */ addiu $a0, $zero, 1 -/* B1D9F4 80240294 3C138024 */ lui $s3, %hi(D_80242860) -/* B1D9F8 80240298 26732860 */ addiu $s3, $s3, %lo(D_80242860) +/* B1D9F4 80240294 3C138024 */ lui $s3, %hi(func_80242860_8B28D0) +/* B1D9F8 80240298 26732860 */ addiu $s3, $s3, %lo(func_80242860_8B28D0) /* B1D9FC 8024029C 0260282D */ daddu $a1, $s3, $zero /* B1DA00 802402A0 27A60010 */ addiu $a2, $sp, 0x10 /* B1DA04 802402A4 0C0470CB */ jal func_8011C32C diff --git a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s index 3673fff54a..e2a9cf7898 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s +++ b/asm/nonmatchings/world/script_api/7E0E80/MakeShop.s @@ -187,8 +187,8 @@ glabel MakeShop /* 7E299C 80281B1C 24070078 */ addiu $a3, $zero, 0x78 /* 7E29A0 80281B20 2402001C */ addiu $v0, $zero, 0x1c /* 7E29A4 80281B24 AFA20010 */ sw $v0, 0x10($sp) -/* 7E29A8 80281B28 3C028028 */ lui $v0, %hi(D_80281434) -/* 7E29AC 80281B2C 24421434 */ addiu $v0, $v0, %lo(D_80281434) +/* 7E29A8 80281B28 3C028028 */ lui $v0, %hi(func_80281434) +/* 7E29AC 80281B2C 24421434 */ addiu $v0, $v0, %lo(func_80281434) /* 7E29B0 80281B30 AFA00014 */ sw $zero, 0x14($sp) /* 7E29B4 80281B34 AFA20018 */ sw $v0, 0x18($sp) /* 7E29B8 80281B38 AFA0001C */ sw $zero, 0x1c($sp) @@ -202,8 +202,8 @@ glabel MakeShop /* 7E29D8 80281B58 AFA20010 */ sw $v0, 0x10($sp) /* 7E29DC 80281B5C 24020001 */ addiu $v0, $zero, 1 /* 7E29E0 80281B60 AFA20014 */ sw $v0, 0x14($sp) -/* 7E29E4 80281B64 3C028028 */ lui $v0, %hi(D_802814D0) -/* 7E29E8 80281B68 244214D0 */ addiu $v0, $v0, %lo(D_802814D0) +/* 7E29E4 80281B64 3C028028 */ lui $v0, %hi(func_802814D0) +/* 7E29E8 80281B68 244214D0 */ addiu $v0, $v0, %lo(func_802814D0) /* 7E29EC 80281B6C AFA20018 */ sw $v0, 0x18($sp) /* 7E29F0 80281B70 AFA0001C */ sw $zero, 0x1c($sp) /* 7E29F4 80281B74 0C051F32 */ jal set_ui_panel_properties diff --git a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s index 89553acca3..d31f39ed67 100644 --- a/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s +++ b/asm/nonmatchings/world/script_api/7E0E80/draw_shop_items.s @@ -22,13 +22,13 @@ glabel draw_shop_items /* 7E23E8 80281568 30420001 */ andi $v0, $v0, 1 /* 7E23EC 8028156C 10400005 */ beqz $v0, .L80281584 /* 7E23F0 80281570 2404000A */ addiu $a0, $zero, 0xa -/* 7E23F4 80281574 3C108014 */ lui $s0, %hi(D_80147474) -/* 7E23F8 80281578 26107474 */ addiu $s0, $s0, %lo(D_80147474) +/* 7E23F4 80281574 3C108014 */ lui $s0, %hi(func_80147474) +/* 7E23F8 80281578 26107474 */ addiu $s0, $s0, %lo(func_80147474) /* 7E23FC 8028157C 080A0563 */ j .L8028158C /* 7E2400 80281580 00000000 */ nop .L80281584: -/* 7E2404 80281584 3C108014 */ lui $s0, %hi(D_80147574) -/* 7E2408 80281588 26107574 */ addiu $s0, $s0, %lo(D_80147574) +/* 7E2404 80281584 3C108014 */ lui $s0, %hi(func_80147574) +/* 7E2408 80281588 26107574 */ addiu $s0, $s0, %lo(func_80147574) .L8028158C: /* 7E240C 8028158C 0C051F9F */ jal func_80147E7C /* 7E2410 80281590 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/world/func_80059F94.s b/asm/nonmatchings/world/world/func_80059F94.s index fbca85e72f..7093388450 100644 --- a/asm/nonmatchings/world/world/func_80059F94.s +++ b/asm/nonmatchings/world/world/func_80059F94.s @@ -50,8 +50,8 @@ glabel func_80059F94 .L8005A040: /* 35440 8005A040 8DC20010 */ lw $v0, 0x10($t6) /* 35444 8005A044 8C4F0018 */ lw $t7, 0x18($v0) -/* 35448 8005A048 3C028006 */ lui $v0, %hi(D_80059C80) -/* 3544C 8005A04C 24429C80 */ addiu $v0, $v0, %lo(D_80059C80) +/* 35448 8005A048 3C028006 */ lui $v0, %hi(func_80059C80) +/* 3544C 8005A04C 24429C80 */ addiu $v0, $v0, %lo(func_80059C80) /* 35450 8005A050 51E2008D */ beql $t7, $v0, .L8005A288 /* 35454 8005A054 26520001 */ addiu $s2, $s2, 1 /* 35458 8005A058 12200088 */ beqz $s1, .L8005A27C diff --git a/asm/nonmatchings/world/world/func_8005A2BC.s b/asm/nonmatchings/world/world/func_8005A2BC.s index 658159fcef..e56f23037e 100644 --- a/asm/nonmatchings/world/world/func_8005A2BC.s +++ b/asm/nonmatchings/world/world/func_8005A2BC.s @@ -74,23 +74,23 @@ glabel func_8005A2BC /* 357A4 8005A3A4 8E42000C */ lw $v0, 0xc($s2) /* 357A8 8005A3A8 14400004 */ bnez $v0, .L8005A3BC /* 357AC 8005A3AC AC820010 */ sw $v0, 0x10($a0) -/* 357B0 8005A3B0 3C028006 */ lui $v0, %hi(D_80059C80) -/* 357B4 8005A3B4 24429C80 */ addiu $v0, $v0, %lo(D_80059C80) +/* 357B0 8005A3B0 3C028006 */ lui $v0, %hi(func_80059C80) +/* 357B4 8005A3B4 24429C80 */ addiu $v0, $v0, %lo(func_80059C80) /* 357B8 8005A3B8 AC820014 */ sw $v0, 0x14($a0) .L8005A3BC: /* 357BC 8005A3BC 8E420010 */ lw $v0, 0x10($s2) /* 357C0 8005A3C0 8C830018 */ lw $v1, 0x18($a0) /* 357C4 8005A3C4 14600004 */ bnez $v1, .L8005A3D8 /* 357C8 8005A3C8 AC820014 */ sw $v0, 0x14($a0) -/* 357CC 8005A3CC 3C028006 */ lui $v0, %hi(D_80059C80) -/* 357D0 8005A3D0 24429C80 */ addiu $v0, $v0, %lo(D_80059C80) +/* 357CC 8005A3CC 3C028006 */ lui $v0, %hi(func_80059C80) +/* 357D0 8005A3D0 24429C80 */ addiu $v0, $v0, %lo(func_80059C80) /* 357D4 8005A3D4 AC820018 */ sw $v0, 0x18($a0) .L8005A3D8: /* 357D8 8005A3D8 8E420014 */ lw $v0, 0x14($s2) /* 357DC 8005A3DC 14400004 */ bnez $v0, .L8005A3F0 /* 357E0 8005A3E0 AC820018 */ sw $v0, 0x18($a0) -/* 357E4 8005A3E4 3C028006 */ lui $v0, %hi(D_80059C80) -/* 357E8 8005A3E8 24429C80 */ addiu $v0, $v0, %lo(D_80059C80) +/* 357E4 8005A3E4 3C028006 */ lui $v0, %hi(func_80059C80) +/* 357E8 8005A3E8 24429C80 */ addiu $v0, $v0, %lo(func_80059C80) /* 357EC 8005A3EC AC820018 */ sw $v0, 0x18($a0) .L8005A3F0: /* 357F0 8005A3F0 8C820008 */ lw $v0, 8($a0) diff --git a/asm/os/code_45df0_len_970.s b/asm/os/code_45df0_len_970.s index 654575d3d7..cc1cfc5786 100644 --- a/asm/os/code_45df0_len_970.s +++ b/asm/os/code_45df0_len_970.s @@ -654,6 +654,8 @@ glabel osDispatchThread /* 46744 8006B344 00000000 */ nop /* 46748 8006B348 00000000 */ nop /* 4674C 8006B34C 42000018 */ eret + +glabel osCleanupThread /* 46750 8006B350 00002021 */ addu $a0, $zero, $zero /* 46754 8006B354 0C01B254 */ jal osDestroyThread /* 46758 8006B358 00000000 */ nop diff --git a/bs.py b/bs.py new file mode 100644 index 0000000000..eef6576ecc --- /dev/null +++ b/bs.py @@ -0,0 +1,25 @@ +with open("out.txt") as f: + inlines = f.readlines() + +renames = {} + +for line in inlines: + components = line.split() + + area = None + for c in components: + if area: + break + if "src" in c: + subcomponents = c.split("/") + for i, sc in enumerate(subcomponents): + if "area" in sc: + area = subcomponents[i + 1] + break + + if area: + fname = line[line.rfind("`") + 1:line.rfind("'")] + renames[fname] = area + +for k, v in sorted(renames.items()): + print(f"{k} : {v}") diff --git a/include/variables.h b/include/variables.h index 762a4acb3f..918aca0d73 100644 --- a/include/variables.h +++ b/include/variables.h @@ -80,7 +80,6 @@ extern s16 D_8010CD10; extern s16 D_8010CD12; extern s32 D_8010CD20; extern s32 D_8010EF08; -extern s32 D_8010F094; // player shadow index? extern s32 D_801595A0; extern BackgroundHeader gBackgroundImage; diff --git a/out.txt b/out.txt new file mode 100644 index 0000000000..c345af3634 --- /dev/null +++ b/out.txt @@ -0,0 +1,1325 @@ +src/world/area_mac/mac_00/7EB340.c:(.text+0x37c): undefined reference to `func_802409FC_7EB3AC' +mips-linux-gnu-ld: src/world/area_mac/mac_00/7EB340.c:(.text+0x380): undefined reference to `func_802409FC_7EB3AC' +src/world/area_mac/mac_00/7EB340.c:(.text+0x1068): undefined reference to `func_80241628_7EB2D4' +mips-linux-gnu-ld: src/world/area_mac/mac_00/7EB340.c:(.text+0x106c): undefined reference to `func_80241628_7EB2D4' +src/world/area_mac/mac_00/7ED280.c:(.text+0xde8): undefined reference to `func_80242CA0_7ED9B0' +mips-linux-gnu-ld: src/world/area_mac/mac_00/7ED280.c:(.text+0xdf8): undefined reference to `func_80242D14_7EDA24' +mips-linux-gnu-ld: src/world/area_mac/mac_00/7ED280.c:(.text+0xe38): undefined reference to `func_80242FDC_7EDCEC' +src/world/area_mac/mac_01/8017D0.c:(.text+0xed8): undefined reference to `func_80241480_801D00' +mips-linux-gnu-ld: src/world/area_mac/mac_01/8017D0.c:(.text+0xf18): undefined reference to `func_802417B0_802030' +mips-linux-gnu-ld: src/world/area_mac/mac_01/8017D0.c:(.text+0xf28): undefined reference to `func_80241824_8020A4' +src/world/area_mac/mac_01/8017D0.c:(.text+0x133c): undefined reference to `func_802422DC_80183C' +mips-linux-gnu-ld: src/world/area_mac/mac_01/8017D0.c:(.text+0x1340): undefined reference to `func_802422DC_80183C' +src/world/area_mac/mac_01/8017D0.c:(.text+0x2028): undefined reference to `func_80242F08_801764' +mips-linux-gnu-ld: src/world/area_mac/mac_01/8017D0.c:(.text+0x202c): undefined reference to `func_80242F08_801764' +src/world/area_mac/mac_01/8017D0.c:(.text+0x24fc): undefined reference to `func_80242FA4_8013F4' +mips-linux-gnu-ld: src/world/area_mac/mac_01/8017D0.c:(.text+0x2500): undefined reference to `func_80242FA4_8013F4' +src/world/area_mac/mac_01/805DD0.c:(.text+0xde8): undefined reference to `func_80245C80_806500' +mips-linux-gnu-ld: src/world/area_mac/mac_01/805DD0.c:(.text+0xdf8): undefined reference to `func_80245CF4_806574' +mips-linux-gnu-ld: src/world/area_mac/mac_01/805DD0.c:(.text+0xe38): undefined reference to `func_80245FBC_80683C' +src/world/area_mac/mac_02/823BF0.c:(.text+0xda8): undefined reference to `func_80240D30_823FF0' +mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0xde8): undefined reference to `func_80241060_824320' +mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0xdf8): undefined reference to `func_802410D4_824394' +mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0xe38): undefined reference to `func_8024139C_82465C' +src/world/area_mac/mac_02/823BF0.c:(.text+0x120c): undefined reference to `func_80241B8C_823C5C' +mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0x1210): undefined reference to `func_80241B8C_823C5C' +src/world/area_mac/mac_02/823BF0.c:(.text+0x1ef8): undefined reference to `func_802427B8_823B84' +mips-linux-gnu-ld: src/world/area_mac/mac_02/823BF0.c:(.text+0x1efc): undefined reference to `func_802427B8_823B84' +src/world/area_mac/mac_03/831B20.c:(.text+0x50c): undefined reference to `func_8024087C_831B8C' +mips-linux-gnu-ld: src/world/area_mac/mac_03/831B20.c:(.text+0x510): undefined reference to `func_8024087C_831B8C' +src/world/area_mac/mac_03/831B20.c:(.text+0x11f8): undefined reference to `func_802414A8_831AB4' +mips-linux-gnu-ld: src/world/area_mac/mac_03/831B20.c:(.text+0x11fc): undefined reference to `func_802414A8_831AB4' +src/world/area_mac/mac_04/843030.c:(.text+0x37c): undefined reference to `func_8024082C_84309C' +mips-linux-gnu-ld: src/world/area_mac/mac_04/843030.c:(.text+0x380): undefined reference to `func_8024082C_84309C' +src/world/area_mac/mac_04/843030.c:(.text+0x1068): undefined reference to `func_80241458_842FC4' +mips-linux-gnu-ld: src/world/area_mac/mac_04/843030.c:(.text+0x106c): undefined reference to `func_80241458_842FC4' +src/world/area_mac/mac_04/844860.c:(.text+0xf4): undefined reference to `func_80241DAC_8448DC' +mips-linux-gnu-ld: src/world/area_mac/mac_04/844860.c:(.text+0xf8): undefined reference to `func_80241DAC_8448DC' +src/world/area_mac/mac_05/852170.c:(.text+0x1238): undefined reference to `func_80240890_852A00' +mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x1278): undefined reference to `func_80240BC0_852D30' +mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x1288): undefined reference to `func_80240C34_852DA4' +mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x12c8): undefined reference to `func_80240EFC_85306C' +src/world/area_mac/mac_05/852170.c:(.text+0x169c): undefined reference to `func_802416EC_8521DC' +mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x16a0): undefined reference to `func_802416EC_8521DC' +src/world/area_mac/mac_05/852170.c:(.text+0x2388): undefined reference to `func_80242318_852104' +mips-linux-gnu-ld: src/world/area_mac/mac_05/852170.c:(.text+0x238c): undefined reference to `func_80242318_852104' +src/world/area_tik/tik_07/87AC00.c:(.text+0x1818): undefined reference to `func_80241BC8_87B7A8' +mips-linux-gnu-ld: src/world/area_tik/tik_07/87AC00.c:(.text+0x1840): undefined reference to `func_80241FCC_87BBAC' +mips-linux-gnu-ld: src/world/area_tik/tik_07/87AC00.c:(.text+0x1880): undefined reference to `func_802421E4_87BDC4' +src/world/area_tik/tik_09/882BF0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_tik/tik_09/882BF0.c:(.text+0x714): undefined reference to `func_80240BE0_882DA0' +mips-linux-gnu-ld: src/world/area_tik/tik_09/882BF0.c:(.text+0x728): undefined reference to `func_80240D44_882F04' +src/world/area_tik/tik_12/88A530.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_tik/tik_12/88A530.c:(.text+0x6ec): undefined reference to `func_80241960_88A530' +mips-linux-gnu-ld: src/world/area_tik/tik_12/88A530.c:(.text+0x728): undefined reference to `func_80241C74_88A844' +src/world/area_tik/tik_20/89ACB0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_tik/tik_20/89ACB0.c:(.text+0x6ec): undefined reference to `func_80240960_89ACB0' +mips-linux-gnu-ld: src/world/area_tik/tik_20/89ACB0.c:(.text+0x714): undefined reference to `func_80240B10_89AE60' +mips-linux-gnu-ld: src/world/area_tik/tik_20/89ACB0.c:(.text+0x728): undefined reference to `func_80240C74_89AFC4' +src/world/area_tik/tik_23/8A2D30.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_tik/tik_23/8A2D30.c:(.text+0x6ec): undefined reference to `func_80240960_8A2D30' +mips-linux-gnu-ld: src/world/area_tik/tik_23/8A2D30.c:(.text+0x714): undefined reference to `func_80240B10_8A2EE0' +mips-linux-gnu-ld: src/world/area_tik/tik_23/8A2D30.c:(.text+0x728): undefined reference to `func_80240C74_8A3044' +src/world/area_tik/tik_24/8A5DE0.c:(.text+0x9dc): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_tik/tik_24/8A5DE0.c:(.text+0xa5c): undefined reference to `func_802406D0_8A6150' +mips-linux-gnu-ld: src/world/area_tik/tik_24/8A5DE0.c:(.text+0xa84): undefined reference to `func_80240880_8A6300' +mips-linux-gnu-ld: src/world/area_tik/tik_24/8A5DE0.c:(.text+0xa98): undefined reference to `func_802409E4_8A6464' +src/world/area_kmr/kmr_02/8B0070.c:(.text+0x70c): undefined reference to `func_8024075C_8B00DC' +mips-linux-gnu-ld: src/world/area_kmr/kmr_02/8B0070.c:(.text+0x710): undefined reference to `func_8024075C_8B00DC' +src/world/area_kmr/kmr_02/8B0070.c:(.text+0x13f8): undefined reference to `func_80241388_8B0004' +mips-linux-gnu-ld: src/world/area_kmr/kmr_02/8B0070.c:(.text+0x13fc): undefined reference to `func_80241388_8B0004' +src/world/area_kmr/kmr_02/8B0070.c:(.text+0x1dd8): undefined reference to `func_802415F8_8B1668' +mips-linux-gnu-ld: src/world/area_kmr/kmr_02/8B0070.c:(.text+0x1e28): undefined reference to `func_8024191C_8B198C' +src/world/area_kmr/kmr_05/8CE070.c:(.text+0x1448): undefined reference to `func_802407D8_8CE848' +mips-linux-gnu-ld: src/world/area_kmr/kmr_05/8CE070.c:(.text+0x1470): undefined reference to `func_80240BDC_8CEC4C' +mips-linux-gnu-ld: src/world/area_kmr/kmr_05/8CE070.c:(.text+0x14b0): undefined reference to `func_80240DF4_8CEE64' +src/world/area_kmr/kmr_06/8D1510.c:(.text+0x1448): undefined reference to `func_802407D8_8D1CE8' +mips-linux-gnu-ld: src/world/area_kmr/kmr_06/8D1510.c:(.text+0x1470): undefined reference to `func_80240BDC_8D20EC' +mips-linux-gnu-ld: src/world/area_kmr/kmr_06/8D1510.c:(.text+0x14b0): undefined reference to `func_80240DF4_8D2304' +src/world/area_kmr/kmr_06/8D2A10.c:(.text+0x2b4): undefined reference to `func_80241500_8D2768' +mips-linux-gnu-ld: src/world/area_kmr/kmr_06/8D2A10.c:(.text+0x2b8): undefined reference to `func_80241500_8D2768' +src/world/area_kmr/kmr_06/8D2A10.c:(.text+0x3d8): undefined reference to `func_802417A8_8D29D8' +mips-linux-gnu-ld: src/world/area_kmr/kmr_06/8D2A10.c:(.text+0x3dc): undefined reference to `func_802417A8_8D29D8' +src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0x9b4): undefined reference to `func_802401D4_8D3F94' +mips-linux-gnu-ld: src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0x9c4): undefined reference to `func_80240234_8D3FF4' +mips-linux-gnu-ld: src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0x9ec): undefined reference to `func_802403DC_8D419C' +mips-linux-gnu-ld: src/world/area_kmr/kmr_07/8D3DC0.c:(.text+0xa04): undefined reference to `func_802404F8_8D42B8' +src/world/area_kmr/kmr_09/8D5E00.c:(.text+0x1448): undefined reference to `func_802407D8_8D65D8' +mips-linux-gnu-ld: src/world/area_kmr/kmr_09/8D5E00.c:(.text+0x1470): undefined reference to `func_80240BDC_8D69DC' +mips-linux-gnu-ld: src/world/area_kmr/kmr_09/8D5E00.c:(.text+0x14b0): undefined reference to `func_80240DF4_8D6BF4' +src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xa84): undefined reference to `func_80240544_8DA644' +mips-linux-gnu-ld: src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xa94): undefined reference to `func_802405A4_8DA6A4' +mips-linux-gnu-ld: src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xabc): undefined reference to `func_8024074C_8DA84C' +mips-linux-gnu-ld: src/world/area_kmr/kmr_11/8DA3A0.c:(.text+0xad4): undefined reference to `func_80240868_8DA968' +src/world/area_kmr/kmr_20/8EBE50.c:(.text+0xa94): undefined reference to `func_802405BC_8EBD44' +mips-linux-gnu-ld: src/world/area_kmr/kmr_20/8EBE50.c:(.text+0xa98): undefined reference to `func_802405BC_8EBD44' +src/world/area_kmr/kmr_20/8EDFC0.c:(.text+0x870): undefined reference to `func_80242870_8EDE2C' +mips-linux-gnu-ld: src/world/area_kmr/kmr_20/8EDFC0.c:(.text+0x874): undefined reference to `func_80242870_8EDE2C' +src/world/area_kmr/kmr_20/8EDFC0.c:(.text+0x98c): undefined reference to `func_80242A04_8EDEC0' +mips-linux-gnu-ld: src/world/area_kmr/kmr_20/8EDFC0.c:(.text+0x990): undefined reference to `func_80242A04_8EDEC0' +src/world/area_kmr/kmr_21/8FEE90.c:(.text+0x254): undefined reference to `func_80240010_8FEC90' +mips-linux-gnu-ld: src/world/area_kmr/kmr_21/8FEE90.c:(.text+0x258): undefined reference to `func_80240010_8FEC90' +src/world/area_kmr/kmr_22/8FF8B0.c:(.text+0x8c4): undefined reference to `func_8024056C_8FF31C' +mips-linux-gnu-ld: src/world/area_kmr/kmr_22/8FF8B0.c:(.text+0x8c8): undefined reference to `func_8024056C_8FF31C' +src/world/area_kmr/kmr_22/8FF8B0.c:(.text+0x93c): undefined reference to `func_80240B00_8FF864' +mips-linux-gnu-ld: src/world/area_kmr/kmr_22/8FF8B0.c:(.text+0x940): undefined reference to `func_80240B00_8FF864' +src/world/area_kmr/kmr_23/907A40.c:(.text+0x12c): undefined reference to `func_80240DA4_9087A4' +mips-linux-gnu-ld: src/world/area_kmr/kmr_23/907A40.c:(.text+0x130): undefined reference to `func_80240DA4_9087A4' +src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1c0c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1d0c): undefined reference to `func_80240954_910004' +mips-linux-gnu-ld: src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1d1c): undefined reference to `func_80240998_910048' +mips-linux-gnu-ld: src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x1d2c): undefined reference to `func_80240A38_9100E8' +src/world/area_iwa/iwa_01/90FBD0.c:(.text+0x2d54): undefined reference to `func_80242F10_9125C0' +src/world/area_iwa/iwa_02/915D70.c:(.text+0xfb0): undefined reference to `func_80240C4C_9169BC' +src/world/area_iwa/iwa_03/918EF0.c:(.text+0xfb0): undefined reference to `func_80240F8C_919B3C' +src/world/area_iwa/iwa_04/91B8E0.c:(.text+0x1030): undefined reference to `func_80240CCC_91C5AC' +src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd24): undefined reference to `func_80240544_93FAF4' +mips-linux-gnu-ld: src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd34): undefined reference to `func_802405A4_93FB54' +mips-linux-gnu-ld: src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd5c): undefined reference to `func_8024074C_93FCFC' +mips-linux-gnu-ld: src/world/area_sbk/sbk_30/93F5B0.c:(.text+0xd74): undefined reference to `func_80240868_93FE18' +src/world/area_dro/dro_01/95B7E0.c:(.text+0xda8): undefined reference to `func_802409E0_95BBE0' +mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0xde8): undefined reference to `func_80240D10_95BF10' +mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0xdf8): undefined reference to `func_80240D84_95BF84' +mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0xe38): undefined reference to `func_8024104C_95C24C' +src/world/area_dro/dro_01/95B7E0.c:(.text+0x120c): undefined reference to `func_8024183C_95B84C' +mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0x1210): undefined reference to `func_8024183C_95B84C' +src/world/area_dro/dro_01/95B7E0.c:(.text+0x1ef8): undefined reference to `func_80242468_95B774' +mips-linux-gnu-ld: src/world/area_dro/dro_01/95B7E0.c:(.text+0x1efc): undefined reference to `func_80242468_95B774' +src/world/area_dro/dro_02/9694C0.c:(.text+0x37c): undefined reference to `func_802406CC_96952C' +mips-linux-gnu-ld: src/world/area_dro/dro_02/9694C0.c:(.text+0x380): undefined reference to `func_802406CC_96952C' +src/world/area_dro/dro_02/9694C0.c:(.text+0x1068): undefined reference to `func_802412F8_969454' +mips-linux-gnu-ld: src/world/area_dro/dro_02/9694C0.c:(.text+0x106c): undefined reference to `func_802412F8_969454' +src/world/area_dro/dro_02/9694C0.c:(.text+0x1528): undefined reference to `func_8024240C_96A1D0' +mips-linux-gnu-ld: src/world/area_dro/dro_02/9694C0.c:(.text+0x152c): undefined reference to `func_8024240C_96A1D0' +mips-linux-gnu-ld: src/world/area_dro/dro_02/9694C0.c:(.text+0x1530): undefined reference to `func_80242EAC_96AC70' +mips-linux-gnu-ld: src/world/area_dro/dro_02/9694C0.c:(.text+0x1534): undefined reference to `func_80242EAC_96AC70' +src/world/area_isk/isk_04/97B670.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_isk/isk_04/97B670.c:(.text+0x6ec): undefined reference to `func_80240040_97B670' +mips-linux-gnu-ld: src/world/area_isk/isk_04/97B670.c:(.text+0x714): undefined reference to `func_802401F0_97B820' +mips-linux-gnu-ld: src/world/area_isk/isk_04/97B670.c:(.text+0x728): undefined reference to `func_80240354_97B984' +src/world/area_isk/isk_05/97DAD0.c:(.text+0xd84): undefined reference to `func_80240568_97E038' +mips-linux-gnu-ld: src/world/area_isk/isk_05/97DAD0.c:(.text+0xde4): undefined reference to `func_80240BAC_97E67C' +src/world/area_isk/isk_05/97DAD0.c:(.text+0x1088): undefined reference to `func_80240568_97E038' +mips-linux-gnu-ld: src/world/area_isk/isk_05/97DAD0.c:(.text+0x10d8): undefined reference to `func_80240BAC_97E67C' +src/world/area_isk/isk_05/97DAD0.c:(.text+0x1be4): undefined reference to `func_80241610_97D5B8' +mips-linux-gnu-ld: src/world/area_isk/isk_05/97DAD0.c:(.text+0x1be8): undefined reference to `func_80241610_97D5B8' +src/world/area_isk/isk_08/984E30.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_isk/isk_08/984E30.c:(.text+0x6ec): undefined reference to `func_80240000_984E30' +mips-linux-gnu-ld: src/world/area_isk/isk_08/984E30.c:(.text+0x714): undefined reference to `func_802401B0_984FE0' +mips-linux-gnu-ld: src/world/area_isk/isk_08/984E30.c:(.text+0x728): undefined reference to `func_80240314_985144' +src/world/area_isk/isk_13/98F7E0.c:(.text+0xd84): undefined reference to `func_80240568_98FD48' +mips-linux-gnu-ld: src/world/area_isk/isk_13/98F7E0.c:(.text+0xde4): undefined reference to `func_80240BAC_99038C' +src/world/area_isk/isk_13/98F7E0.c:(.text+0x1088): undefined reference to `func_80240568_98FD48' +mips-linux-gnu-ld: src/world/area_isk/isk_13/98F7E0.c:(.text+0x10d8): undefined reference to `func_80240BAC_99038C' +src/world/area_isk/isk_13/98F7E0.c:(.text+0x1c94): undefined reference to `func_80241610_98F248' +mips-linux-gnu-ld: src/world/area_isk/isk_13/98F7E0.c:(.text+0x1c98): undefined reference to `func_80241610_98F248' +src/world/area_isk/isk_14/992730.c:(.text+0xd84): undefined reference to `func_80240568_992C98' +mips-linux-gnu-ld: src/world/area_isk/isk_14/992730.c:(.text+0xde4): undefined reference to `func_80240BAC_9932DC' +src/world/area_isk/isk_14/992730.c:(.text+0x1088): undefined reference to `func_80240568_992C98' +mips-linux-gnu-ld: src/world/area_isk/isk_14/992730.c:(.text+0x10d8): undefined reference to `func_80240BAC_9932DC' +src/world/area_isk/isk_14/992730.c:(.text+0x1b78): undefined reference to `func_80241610_992250' +mips-linux-gnu-ld: src/world/area_isk/isk_14/992730.c:(.text+0x1b7c): undefined reference to `func_80241610_992250' +src/world/area_isk/isk_18/997F70.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_isk/isk_18/997F70.c:(.text+0x6ec): undefined reference to `func_80240000_997F70' +mips-linux-gnu-ld: src/world/area_isk/isk_18/997F70.c:(.text+0x714): undefined reference to `func_802401B0_998120' +mips-linux-gnu-ld: src/world/area_isk/isk_18/997F70.c:(.text+0x728): undefined reference to `func_80240314_998284' +src/world/area_trd/trd_01/99CD80.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x6ec): undefined reference to `func_802403F0_99CD80' +mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x714): undefined reference to `func_802405A0_99CF30' +mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x728): undefined reference to `func_80240704_99D094' +src/world/area_trd/trd_01/99CD80.c:(.text+0x1198): undefined reference to `func_80240DF8_99D788' +mips-linux-gnu-ld: src/world/area_trd/trd_01/99CD80.c:(.text+0x11c0): undefined reference to `func_80240FA0_99D930' +src/world/area_trd/trd_01/99CD80.c:(.text+0x11d8): undefined reference to `func_802410BC_99DA4C' +src/world/area_trd/trd_02/9A10C0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x6ec): undefined reference to `func_802400E0_9A10C0' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x714): undefined reference to `func_80240290_9A1270' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x728): undefined reference to `func_802403F4_9A13D4' +src/world/area_trd/trd_02/9A10C0.c:(.text+0x157c): undefined reference to `func_80240CB4_9A1C94' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x15bc): undefined reference to `func_80240FE4_9A1FC4' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x15cc): undefined reference to `func_80241058_9A2038' +src/world/area_trd/trd_02/9A10C0.c:(.text+0x160c): undefined reference to `func_80241320_9A2300' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x18a8): undefined reference to `func_80240CB4_9A1C94' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x18e8): undefined reference to `func_802400E0_9A10C0' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x1910): undefined reference to `func_80240290_9A1270' +mips-linux-gnu-ld: src/world/area_trd/trd_02/9A10C0.c:(.text+0x1928): undefined reference to `func_802403F4_9A13D4' +src/world/area_trd/trd_03/9A46F0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_trd/trd_03/9A46F0.c:(.text+0x6ec): undefined reference to `func_802400A0_9A46F0' +mips-linux-gnu-ld: src/world/area_trd/trd_03/9A46F0.c:(.text+0x714): undefined reference to `func_80240250_9A48A0' +mips-linux-gnu-ld: src/world/area_trd/trd_03/9A46F0.c:(.text+0x728): undefined reference to `func_802403B4_9A4A04' +src/world/area_trd/trd_04/9A88A0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x6ec): undefined reference to `func_802404B0_9A88A0' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x714): undefined reference to `func_80240660_9A8A50' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x728): undefined reference to `func_802407C4_9A8BB4' +src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x157c): undefined reference to `func_80241084_9A9474' +mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x15bc): undefined reference to `func_802413B4_9A97A4' +mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x15cc): undefined reference to `func_80241428_9A9818' +src/world/area_trd/trd_04/9A88A0.c:(.text+0x160c): undefined reference to `func_802416F0_9A9AE0' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x18a8): undefined reference to `func_80241084_9A9474' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x18e8): undefined reference to `func_802404B0_9A88A0' +src/world/area_trd/trd_04/9A88A0.c:(.text+0x1910): undefined reference to `func_80240660_9A8A50' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x1928): undefined reference to `func_802407C4_9A8BB4' +src/world/area_trd/trd_04/9A88A0.c:(.text+0x2db0): undefined reference to `func_802425F0_9AA9E0' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x2dd8): undefined reference to `func_802429F4_9AADE4' +src/world/area_trd/trd_04/9A88A0.c:(.text+0x2e18): undefined reference to `func_80242C0C_9AAFFC' +src/world/area_trd/trd_04/9A88A0.c:(.text+0x32f0): undefined reference to `func_802425F0_9AA9E0' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x3320): undefined reference to `func_802429F4_9AADE4' +mips-linux-gnu-ld: src/world/area_trd/trd_04/9A88A0.c:(.text+0x33c0): undefined reference to `func_8024360C_9AB9FC' +src/world/area_trd/trd_05/9AE700.c:(.text+0x4a8): undefined reference to `func_80240020_9AE31C' +mips-linux-gnu-ld: src/world/area_trd/trd_05/9AE700.c:(.text+0x4ac): undefined reference to `func_80240020_9AE31C' +src/world/area_trd/trd_06/9B1AA0.c:(.text+0x4e4): undefined reference to `func_80240310_9B168C' +mips-linux-gnu-ld: src/world/area_trd/trd_06/9B1AA0.c:(.text+0x4e8): undefined reference to `func_80240310_9B168C' +src/world/area_trd/trd_07/9B6C90.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x6ec): undefined reference to `func_80240310_9B6C90' +mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x714): undefined reference to `func_802404C0_9B6E40' +mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x728): undefined reference to `func_80240624_9B6FA4' +src/world/area_trd/trd_07/9B6C90.c:(.text+0x1c1c): undefined reference to `func_802412BC_9B7C3C' +mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x1c44): undefined reference to `func_802416C0_9B8040' +src/world/area_trd/trd_07/9B6C90.c:(.text+0x1c84): undefined reference to `func_802418D8_9B8258' +src/world/area_trd/trd_07/9B6C90.c:(.text+0x215c): undefined reference to `func_802412BC_9B7C3C' +mips-linux-gnu-ld: src/world/area_trd/trd_07/9B6C90.c:(.text+0x218c): undefined reference to `func_802416C0_9B8040' +src/world/area_trd/trd_07/9B6C90.c:(.text+0x222c): undefined reference to `func_802422D8_9B8C58' +src/world/area_nok/nok_01/9C53E0.c:(.text+0x9b4): undefined reference to `func_802401D4_9C55B4' +mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0x9c4): undefined reference to `func_80240234_9C5614' +mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0x9ec): undefined reference to `func_802403DC_9C57BC' +mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0xa04): undefined reference to `func_802404F8_9C58D8' +src/world/area_nok/nok_01/9C53E0.c:(.text+0x10e4): undefined reference to `func_80241134_9C544C' +mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0x10e8): undefined reference to `func_80241134_9C544C' +src/world/area_nok/nok_01/9C53E0.c:(.text+0x1dd0): undefined reference to `func_80241D60_9C5374' +mips-linux-gnu-ld: src/world/area_nok/nok_01/9C53E0.c:(.text+0x1dd4): undefined reference to `func_80241D60_9C5374' +src/world/area_nok/nok_02/9D7AA0.c:(.text+0xda8): undefined reference to `func_80240E80_9D7EA0' +mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0xde8): undefined reference to `func_802411B0_9D81D0' +mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0xdf8): undefined reference to `func_80241224_9D8244' +mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0xe38): undefined reference to `func_802414EC_9D850C' +src/world/area_nok/nok_02/9D7AA0.c:(.text+0x120c): undefined reference to `func_80241CDC_9D7B0C' +mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0x1210): undefined reference to `func_80241CDC_9D7B0C' +src/world/area_nok/nok_02/9D7AA0.c:(.text+0x1ef8): undefined reference to `func_80242908_9D7A34' +mips-linux-gnu-ld: src/world/area_nok/nok_02/9D7AA0.c:(.text+0x1efc): undefined reference to `func_80242908_9D7A34' +src/world/area_nok/nok_03/9EB7F0.c:(.text+0xd84): undefined reference to `func_80240568_9EBD58' +mips-linux-gnu-ld: src/world/area_nok/nok_03/9EB7F0.c:(.text+0xde4): undefined reference to `func_80240BAC_9EC39C' +src/world/area_nok/nok_11/9F4A40.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x6ec): undefined reference to `func_80240000_9F4A40' +mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x714): undefined reference to `func_802401B0_9F4BF0' +mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x728): undefined reference to `func_80240314_9F4D54' +src/world/area_nok/nok_11/9F4A40.c:(.text+0x1c1c): undefined reference to `func_80240FAC_9F59EC' +mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x1c44): undefined reference to `func_802413B0_9F5DF0' +mips-linux-gnu-ld: src/world/area_nok/nok_11/9F4A40.c:(.text+0x1c84): undefined reference to `func_802415C8_9F6008' +src/world/area_nok/nok_12/9FAD60.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x6ec): undefined reference to `func_80240570_9FAD60' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x714): undefined reference to `func_80240720_9FAF10' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x728): undefined reference to `func_80240884_9FB074' +src/world/area_nok/nok_12/9FAD60.c:(.text+0x157c): undefined reference to `func_80241144_9FB934' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x15bc): undefined reference to `func_80241474_9FBC64' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x15cc): undefined reference to `func_802414E8_9FBCD8' +src/world/area_nok/nok_12/9FAD60.c:(.text+0x160c): undefined reference to `func_802417B0_9FBFA0' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x18a8): undefined reference to `func_80241144_9FB934' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x18e8): undefined reference to `func_80240570_9FAD60' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x1910): undefined reference to `func_80240720_9FAF10' +mips-linux-gnu-ld: src/world/area_nok/nok_12/9FAD60.c:(.text+0x1928): undefined reference to `func_80240884_9FB074' +src/world/area_nok/nok_13/A00600.c:(.text+0xd84): undefined reference to `func_80240568_A00B68' +mips-linux-gnu-ld: src/world/area_nok/nok_13/A00600.c:(.text+0xde4): undefined reference to `func_80240BAC_A011AC' +src/world/area_nok/nok_14/A02A00.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x6ec): undefined reference to `func_802401C0_A02A00' +mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x714): undefined reference to `func_80240370_A02BB0' +mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x728): undefined reference to `func_802404D4_A02D14' +src/world/area_nok/nok_14/A02A00.c:(.text+0x1c1c): undefined reference to `func_8024116C_A039AC' +mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x1c44): undefined reference to `func_80241570_A03DB0' +src/world/area_nok/nok_14/A02A00.c:(.text+0x1c84): undefined reference to `func_80241788_A03FC8' +src/world/area_nok/nok_14/A02A00.c:(.text+0x215c): undefined reference to `func_8024116C_A039AC' +mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x218c): undefined reference to `func_80241570_A03DB0' +mips-linux-gnu-ld: src/world/area_nok/nok_14/A02A00.c:(.text+0x222c): undefined reference to `func_80242188_A049C8' +src/world/area_nok/nok_15/A06F00.c:(.text+0x94c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0x9f4): undefined reference to `func_80240490_A07390' +mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0xa08): undefined reference to `func_802405F4_A074F4' +src/world/area_nok/nok_15/A06F00.c:(.text+0x1efc): undefined reference to `func_8024128C_A0818C' +mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0x1f64): undefined reference to `func_802418A8_A087A8' +src/world/area_nok/nok_15/A06F00.c:(.text+0x243c): undefined reference to `func_8024128C_A0818C' +mips-linux-gnu-ld: src/world/area_nok/nok_15/A06F00.c:(.text+0x250c): undefined reference to `func_802422A8_A091A8' +src/world/area_hos/hos_02/A17210.c:(.text+0x1448): undefined reference to `func_802417C8_A179E8' +mips-linux-gnu-ld: src/world/area_hos/hos_02/A17210.c:(.text+0x1470): undefined reference to `func_80241BCC_A17DEC' +mips-linux-gnu-ld: src/world/area_hos/hos_02/A17210.c:(.text+0x14b0): undefined reference to `func_80241DE4_A18004' +src/world/area_hos/hos_02/A17210.c:(.text+0x1a44): undefined reference to `func_802417C8_A179E8' +mips-linux-gnu-ld: src/world/area_hos/hos_02/A17210.c:(.text+0x1a6c): undefined reference to `func_80241BCC_A17DEC' +src/world/area_hos/hos_03/A1BDB0.c:(.text+0x1448): undefined reference to `func_80241488_A1C588' +mips-linux-gnu-ld: src/world/area_hos/hos_03/A1BDB0.c:(.text+0x1470): undefined reference to `func_8024188C_A1C98C' +mips-linux-gnu-ld: src/world/area_hos/hos_03/A1BDB0.c:(.text+0x14b0): undefined reference to `func_80241AA4_A1CBA4' +src/world/area_hos/hos_03/A1BDB0.c:(.text+0x1b70): undefined reference to `func_80242870_A1BE1C' +mips-linux-gnu-ld: src/world/area_hos/hos_03/A1BDB0.c:(.text+0x1b74): undefined reference to `func_80242870_A1BE1C' +src/world/area_hos/hos_03/A1BDB0.c:(.text+0x285c): undefined reference to `func_8024349C_A1BD44' +mips-linux-gnu-ld: src/world/area_hos/hos_03/A1BDB0.c:(.text+0x2860): undefined reference to `func_8024349C_A1BD44' +src/world/area_hos/hos_05/A2AAC0.c:(.text+0x374c): undefined reference to `func_80243CC0_A2A7BC' +mips-linux-gnu-ld: src/world/area_hos/hos_05/A2AAC0.c:(.text+0x3750): undefined reference to `func_80243CC0_A2A7BC' +src/world/area_kpa/kpa_01/A470C0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_01/A470C0.c:(.text+0x6ec): undefined reference to `func_80240160_A470C0' +mips-linux-gnu-ld: src/world/area_kpa/kpa_01/A470C0.c:(.text+0x714): undefined reference to `func_80240310_A47270' +mips-linux-gnu-ld: src/world/area_kpa/kpa_01/A470C0.c:(.text+0x728): undefined reference to `func_80240474_A473D4' +src/world/area_kpa/kpa_03/A48720.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_03/A48720.c:(.text+0x6ec): undefined reference to `func_80240160_A48720' +mips-linux-gnu-ld: src/world/area_kpa/kpa_03/A48720.c:(.text+0x714): undefined reference to `func_80240310_A488D0' +mips-linux-gnu-ld: src/world/area_kpa/kpa_03/A48720.c:(.text+0x728): undefined reference to `func_80240474_A48A34' +src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x10b4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x11b4): undefined reference to `func_802404D4_A4F4D4' +mips-linux-gnu-ld: src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x11c4): undefined reference to `func_80240518_A4F518' +mips-linux-gnu-ld: src/world/area_kpa/kpa_09/A4F0A0.c:(.text+0x11d4): undefined reference to `func_802405B8_A4F5B8' +src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x6ec): undefined reference to `func_80240310_A52BD0' +mips-linux-gnu-ld: src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x714): undefined reference to `func_802404C0_A52D80' +mips-linux-gnu-ld: src/world/area_kpa/kpa_11/A52BD0.c:(.text+0x728): undefined reference to `func_80240624_A52EE4' +src/world/area_kpa/kpa_50/A609D0.c:(.text+0x10b4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x11b4): undefined reference to `func_80240434_A60E04' +mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x11c4): undefined reference to `func_80240478_A60E48' +mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x11d4): undefined reference to `func_80240518_A60EE8' +src/world/area_kpa/kpa_50/A609D0.c:(.text+0x18b8): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x1938): undefined reference to `func_8024124C_A61C1C' +mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x1960): undefined reference to `func_802413FC_A61DCC' +mips-linux-gnu-ld: src/world/area_kpa/kpa_50/A609D0.c:(.text+0x1974): undefined reference to `func_80241560_A61F30' +src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1a68): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1ae8): undefined reference to `func_8024144C_A654DC' +mips-linux-gnu-ld: src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1b10): undefined reference to `func_802415FC_A6568C' +mips-linux-gnu-ld: src/world/area_kpa/kpa_51/A640E0.c:(.text+0x1b24): undefined reference to `func_80241760_A657F0' +src/world/area_kpa/kpa_52/A671E0.c:(.text+0x10b4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_52/A671E0.c:(.text+0x11b4): undefined reference to `func_80240514_A67614' +mips-linux-gnu-ld: src/world/area_kpa/kpa_52/A671E0.c:(.text+0x11c4): undefined reference to `func_80240558_A67658' +mips-linux-gnu-ld: src/world/area_kpa/kpa_52/A671E0.c:(.text+0x11d4): undefined reference to `func_802405F8_A676F8' +src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x6ec): undefined reference to `func_80240310_A6E6F0' +mips-linux-gnu-ld: src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x714): undefined reference to `func_802404C0_A6E8A0' +mips-linux-gnu-ld: src/world/area_kpa/kpa_61/A6E6F0.c:(.text+0x728): undefined reference to `func_80240624_A6EA04' +src/world/area_kpa/kpa_70/A74B80.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_70/A74B80.c:(.text+0x6ec): undefined reference to `func_80240310_A74B80' +mips-linux-gnu-ld: src/world/area_kpa/kpa_70/A74B80.c:(.text+0x714): undefined reference to `func_802404C0_A74D30' +mips-linux-gnu-ld: src/world/area_kpa/kpa_70/A74B80.c:(.text+0x728): undefined reference to `func_80240624_A74E94' +src/world/area_kpa/kpa_91/A86A50.c:(.text+0xda8): undefined reference to `func_80240400_A86E50' +mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0xde8): undefined reference to `func_80240730_A87180' +mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0xdf8): undefined reference to `func_802407A4_A871F4' +mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0xe38): undefined reference to `func_80240A6C_A874BC' +src/world/area_kpa/kpa_91/A86A50.c:(.text+0x1468): undefined reference to `func_80240400_A86E50' +mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0x14d0): undefined reference to `func_80241040_A87A90' +mips-linux-gnu-ld: src/world/area_kpa/kpa_91/A86A50.c:(.text+0x14e8): undefined reference to `func_802411A4_A87BF4' +src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xda8): undefined reference to `func_802404E0_A8CF60' +mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xde8): undefined reference to `func_80240810_A8D290' +mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xdf8): undefined reference to `func_80240884_A8D304' +mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0xe38): undefined reference to `func_80240B4C_A8D5CC' +src/world/area_kpa/kpa_95/A8CB60.c:(.text+0x1468): undefined reference to `func_802404E0_A8CF60' +mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0x14a8): undefined reference to `func_80240F70_A8D9F0' +mips-linux-gnu-ld: src/world/area_kpa/kpa_95/A8CB60.c:(.text+0x14e8): undefined reference to `func_80241284_A8DD04' +src/world/area_kpa/kpa_102/A93A50.c:(.text+0x10b4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x11b4): undefined reference to `func_80240744_A93E84' +mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x11c4): undefined reference to `func_80240788_A93EC8' +mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x11d4): undefined reference to `func_80240828_A93F68' +src/world/area_kpa/kpa_102/A93A50.c:(.text+0x18b8): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x1938): undefined reference to `func_8024155C_A94C9C' +mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x1960): undefined reference to `func_8024170C_A94E4C' +mips-linux-gnu-ld: src/world/area_kpa/kpa_102/A93A50.c:(.text+0x1974): undefined reference to `func_80241870_A94FB0' +src/world/area_kpa/kpa_111/A99590.c:(.text+0x1224): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_111/A99590.c:(.text+0x1324): undefined reference to `func_802405A4_A99B34' +mips-linux-gnu-ld: src/world/area_kpa/kpa_111/A99590.c:(.text+0x1334): undefined reference to `func_802405E8_A99B78' +mips-linux-gnu-ld: src/world/area_kpa/kpa_111/A99590.c:(.text+0x1344): undefined reference to `func_80240688_A99C18' +src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x7dc): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x85c): undefined reference to `func_802401B0_A9CDE0' +mips-linux-gnu-ld: src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x884): undefined reference to `func_80240360_A9CF90' +mips-linux-gnu-ld: src/world/area_kpa/kpa_113/A9CC70.c:(.text+0x898): undefined reference to `func_802404C4_A9D0F4' +src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1224): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1324): undefined reference to `func_802405A4_A9F2E4' +mips-linux-gnu-ld: src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1334): undefined reference to `func_802405E8_A9F328' +mips-linux-gnu-ld: src/world/area_kpa/kpa_115/A9ED40.c:(.text+0x1344): undefined reference to `func_80240688_A9F3C8' +src/world/area_kkj/kkj_00/ABB340.c:(.text+0xda8): undefined reference to `func_802404B0_ABB740' +mips-linux-gnu-ld: src/world/area_kkj/kkj_00/ABB340.c:(.text+0xde8): undefined reference to `func_802407E0_ABBA70' +mips-linux-gnu-ld: src/world/area_kkj/kkj_00/ABB340.c:(.text+0xdf8): undefined reference to `func_80240854_ABBAE4' +mips-linux-gnu-ld: src/world/area_kkj/kkj_00/ABB340.c:(.text+0xe38): undefined reference to `func_80240B1C_ABBDAC' +src/world/area_kkj/kkj_01/AC5170.c:(.text+0xda8): undefined reference to `func_80240400_AC5570' +mips-linux-gnu-ld: src/world/area_kkj/kkj_01/AC5170.c:(.text+0xde8): undefined reference to `func_80240730_AC58A0' +mips-linux-gnu-ld: src/world/area_kkj/kkj_01/AC5170.c:(.text+0xdf8): undefined reference to `func_802407A4_AC5914' +mips-linux-gnu-ld: src/world/area_kkj/kkj_01/AC5170.c:(.text+0xe38): undefined reference to `func_80240A6C_AC5BDC' +src/world/area_kkj/kkj_19/AF7950.c:(.text+0x200): undefined reference to `func_80240068_AF77BC' +mips-linux-gnu-ld: src/world/area_kkj/kkj_19/AF7950.c:(.text+0x204): undefined reference to `func_80240068_AF77BC' +src/world/area_kkj/kkj_19/AF7C00.c:(.text+0x480): undefined reference to `func_802406A0_AF7BDC' +mips-linux-gnu-ld: src/world/area_kkj/kkj_19/AF7C00.c:(.text+0x484): undefined reference to `func_802406A0_AF7BDC' +src/world/area_kkj/kkj_25/B06D10.c:(.text+0x4a8): undefined reference to `func_80240310_B06934' +mips-linux-gnu-ld: src/world/area_kkj/kkj_25/B06D10.c:(.text+0x4ac): undefined reference to `func_80240310_B06934' +src/world/area_tst/tst_04/B1B570.c:(.text+0x26c): undefined reference to `func_8024029C_B1B5AC' +mips-linux-gnu-ld: src/world/area_tst/tst_04/B1B570.c:(.text+0x270): undefined reference to `func_8024029C_B1B5AC' +src/world/area_tst/tst_04/B1B570.c:(.text+0x330): undefined reference to `func_80240360_B1B634' +mips-linux-gnu-ld: src/world/area_tst/tst_04/B1B570.c:(.text+0x334): undefined reference to `func_80240360_B1B634' +src/world/area_tst/tst_04/B1B570.c:(.text+0x51c): undefined reference to `func_80240574_B1B5D4' +mips-linux-gnu-ld: src/world/area_tst/tst_04/B1B570.c:(.text+0x520): undefined reference to `func_80240574_B1B5D4' +src/world/area_tst/tst_04/B1B570.c:(.text+0x62c): undefined reference to `func_802405B0_B1B4F8' +mips-linux-gnu-ld: src/world/area_tst/tst_04/B1B570.c:(.text+0x630): undefined reference to `func_802405B0_B1B4F8' +mips-linux-gnu-ld: src/world/area_tst/tst_04/B1B570.c:(.text+0x634): undefined reference to `func_802405D4_B1B51C' +mips-linux-gnu-ld: src/world/area_tst/tst_04/B1B570.c:(.text+0x638): undefined reference to `func_802405D4_B1B51C' +src/world/area_tst/tst_11/B1CA50.c:(.text+0xd0): undefined reference to `func_80240100_B1CB14' +mips-linux-gnu-ld: src/world/area_tst/tst_11/B1CA50.c:(.text+0xd4): undefined reference to `func_80240100_B1CB14' +src/world/area_tst/tst_11/B1CA50.c:(.text+0x2c4): undefined reference to `func_802402F4_B1CA8C' +mips-linux-gnu-ld: src/world/area_tst/tst_11/B1CA50.c:(.text+0x2c8): undefined reference to `func_802402F4_B1CA8C' +src/world/area_tst/tst_11/B1CA50.c:(.text+0x388): undefined reference to `func_802403B8_B1CB14' +mips-linux-gnu-ld: src/world/area_tst/tst_11/B1CA50.c:(.text+0x38c): undefined reference to `func_802403B8_B1CB14' +src/world/area_tst/tst_11/B1CA50.c:(.text+0x6e0): undefined reference to `func_80240730_B1CAAC' +mips-linux-gnu-ld: src/world/area_tst/tst_11/B1CA50.c:(.text+0x6e4): undefined reference to `func_80240730_B1CAAC' +src/world/area_jan/jan_01/B28030.c:(.text+0x10c4): undefined reference to `func_802408A8_B288D8' +mips-linux-gnu-ld: src/world/area_jan/jan_01/B28030.c:(.text+0x1124): undefined reference to `func_80240EEC_B28F1C' +src/world/area_jan/jan_02/B2C8A0.c:(.text+0xda8): undefined reference to `func_80240830_B2CCA0' +mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0xde8): undefined reference to `func_80240B60_B2CFD0' +mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0xdf8): undefined reference to `func_80240BD4_B2D044' +mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0xe38): undefined reference to `func_80240E9C_B2D30C' +src/world/area_jan/jan_02/B2C8A0.c:(.text+0x1560): undefined reference to `func_802419E0_B2C90C' +mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0x1564): undefined reference to `func_802419E0_B2C90C' +src/world/area_jan/jan_02/B2C8A0.c:(.text+0x224c): undefined reference to `func_8024260C_B2C834' +mips-linux-gnu-ld: src/world/area_jan/jan_02/B2C8A0.c:(.text+0x2250): undefined reference to `func_8024260C_B2C834' +src/world/area_jan/jan_03/B34BD0.c:(.text+0x13c8): undefined reference to `func_80240A20_B355F0' +mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x1408): undefined reference to `func_80240D50_B35920' +mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x1418): undefined reference to `func_80240DC4_B35994' +mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x1458): undefined reference to `func_8024108C_B35C5C' +src/world/area_jan/jan_03/B34BD0.c:(.text+0x1f18): undefined reference to `func_80241F68_B34C3C' +mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x1f1c): undefined reference to `func_80241F68_B34C3C' +src/world/area_jan/jan_03/B34BD0.c:(.text+0x2c04): undefined reference to `func_80242B94_B34B64' +mips-linux-gnu-ld: src/world/area_jan/jan_03/B34BD0.c:(.text+0x2c08): undefined reference to `func_80242B94_B34B64' +src/world/area_jan/jan_05/B4B260.c:(.text+0xe38): undefined reference to `func_80240E0C_B4B87C' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0xe98): undefined reference to `func_80241450_B4BEC0' +src/world/area_jan/jan_05/B4B260.c:(.text+0x18ac): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1934): undefined reference to `func_802418CC_B4C33C' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x193c): undefined reference to `func_80241938_B4C3A8' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1954): undefined reference to `func_802419A8_B4C418' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x196c): undefined reference to `func_80241A80_B4C4F0' +src/world/area_jan/jan_05/B4B260.c:(.text+0x1b60): undefined reference to `func_802416B8_B4C128' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1be8): undefined reference to `func_802418CC_B4C33C' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1bf0): undefined reference to `func_80241938_B4C3A8' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1c08): undefined reference to `func_802419A8_B4C418' +mips-linux-gnu-ld: src/world/area_jan/jan_05/B4B260.c:(.text+0x1c20): undefined reference to `func_80241A80_B4C4F0' +src/world/area_jan/jan_06/B52F70.c:(.text+0xd84): undefined reference to `func_80240CA8_B534D8' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0xde4): undefined reference to `func_802412EC_B53B1C' +src/world/area_jan/jan_06/B52F70.c:(.text+0x18ac): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1934): undefined reference to `func_8024181C_B5404C' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x193c): undefined reference to `func_80241888_B540B8' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1954): undefined reference to `func_802418F8_B54128' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x196c): undefined reference to `func_802419D0_B54200' +src/world/area_jan/jan_06/B52F70.c:(.text+0x1b60): undefined reference to `func_80241608_B53E38' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1be8): undefined reference to `func_8024181C_B5404C' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1bf0): undefined reference to `func_80241888_B540B8' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1c08): undefined reference to `func_802418F8_B54128' +mips-linux-gnu-ld: src/world/area_jan/jan_06/B52F70.c:(.text+0x1c20): undefined reference to `func_802419D0_B54200' +src/world/area_jan/jan_07/B59870.c:(.text+0x9e4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xa6c): undefined reference to `func_80240214_B59A84' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xa74): undefined reference to `func_80240280_B59AF0' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xa8c): undefined reference to `func_802402F0_B59B60' +src/world/area_jan/jan_07/B59870.c:(.text+0xaa4): undefined reference to `func_802403C8_B59C38' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xc98): undefined reference to `func_80240000_B59870' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd20): undefined reference to `func_80240214_B59A84' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd28): undefined reference to `func_80240280_B59AF0' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd40): undefined reference to `func_802402F0_B59B60' +mips-linux-gnu-ld: src/world/area_jan/jan_07/B59870.c:(.text+0xd58): undefined reference to `func_802403C8_B59C38' +src/world/area_jan/jan_08/B5F650.c:(.text+0xa98): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb20): undefined reference to `func_80241668_B5F918' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb28): undefined reference to `func_802416D4_B5F984' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb40): undefined reference to `func_80241744_B5F9F4' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xb58): undefined reference to `func_8024181C_B5FACC' +src/world/area_jan/jan_08/B5F650.c:(.text+0xd4c): undefined reference to `func_80241454_B5F704' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xdd4): undefined reference to `func_80241668_B5F918' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xddc): undefined reference to `func_802416D4_B5F984' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xdf4): undefined reference to `func_80241744_B5F9F4' +mips-linux-gnu-ld: src/world/area_jan/jan_08/B5F650.c:(.text+0xe0c): undefined reference to `func_8024181C_B5FACC' +src/world/area_jan/jan_09/B663F0.c:(.text+0x9e4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xa6c): undefined reference to `func_80240B54_B66604' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xa74): undefined reference to `func_80240BC0_B66670' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xa8c): undefined reference to `func_80240C30_B666E0' +src/world/area_jan/jan_09/B663F0.c:(.text+0xaa4): undefined reference to `func_80240D08_B667B8' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xc98): undefined reference to `func_80240940_B663F0' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd20): undefined reference to `func_80240B54_B66604' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd28): undefined reference to `func_80240BC0_B66670' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd40): undefined reference to `func_80240C30_B666E0' +mips-linux-gnu-ld: src/world/area_jan/jan_09/B663F0.c:(.text+0xd58): undefined reference to `func_80240D08_B667B8' +src/world/area_jan/jan_10/B6C6A0.c:(.text+0xd84): undefined reference to `func_80240878_B6CC08' +mips-linux-gnu-ld: src/world/area_jan/jan_10/B6C6A0.c:(.text+0xde4): undefined reference to `func_80240EBC_B6D24C' +src/world/area_jan/jan_12/B73570.c:(.text+0x9e4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xa6c): undefined reference to `func_802406D4_B73784' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xa74): undefined reference to `func_80240740_B737F0' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xa8c): undefined reference to `func_802407B0_B73860' +src/world/area_jan/jan_12/B73570.c:(.text+0xaa4): undefined reference to `func_80240888_B73938' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xc98): undefined reference to `func_802404C0_B73570' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd20): undefined reference to `func_802406D4_B73784' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd28): undefined reference to `func_80240740_B737F0' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd40): undefined reference to `func_802407B0_B73860' +mips-linux-gnu-ld: src/world/area_jan/jan_12/B73570.c:(.text+0xd58): undefined reference to `func_80240888_B73938' +src/world/area_jan/jan_14/B7A510.c:(.text+0xd84): undefined reference to `func_80240A28_B7AA78' +mips-linux-gnu-ld: src/world/area_jan/jan_14/B7A510.c:(.text+0xde4): undefined reference to `func_8024106C_B7B0BC' +src/world/area_jan/jan_22/B84180.c:(.text+0xda8): undefined reference to `func_80240400_B84580' +mips-linux-gnu-ld: src/world/area_jan/jan_22/B84180.c:(.text+0xde8): undefined reference to `func_80240730_B848B0' +mips-linux-gnu-ld: src/world/area_jan/jan_22/B84180.c:(.text+0xdf8): undefined reference to `func_802407A4_B84924' +mips-linux-gnu-ld: src/world/area_jan/jan_22/B84180.c:(.text+0xe38): undefined reference to `func_80240A6C_B84BEC' +src/world/area_mim/mim_01/B93940.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_mim/mim_01/B93940.c:(.text+0x858): undefined reference to `func_80240500_B93940' +mips-linux-gnu-ld: src/world/area_mim/mim_01/B93940.c:(.text+0x860): undefined reference to `func_8024056C_B939AC' +mips-linux-gnu-ld: src/world/area_mim/mim_01/B93940.c:(.text+0x878): undefined reference to `func_802405DC_B93A1C' +mips-linux-gnu-ld: src/world/area_mim/mim_01/B93940.c:(.text+0x890): undefined reference to `func_802406B4_B93AF4' +src/world/area_mim/mim_02/B97C70.c:(.text+0xd84): undefined reference to `func_802405D8_B981D8' +mips-linux-gnu-ld: src/world/area_mim/mim_02/B97C70.c:(.text+0xde4): undefined reference to `func_80240C1C_B9881C' +src/world/area_mim/mim_04/B9DB60.c:(.text+0xd84): undefined reference to `func_80240768_B9E0C8' +mips-linux-gnu-ld: src/world/area_mim/mim_04/B9DB60.c:(.text+0xde4): undefined reference to `func_80240DAC_B9E70C' +src/world/area_mim/mim_05/BA07A0.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_mim/mim_05/BA07A0.c:(.text+0x858): undefined reference to `func_80240070_BA07A0' +mips-linux-gnu-ld: src/world/area_mim/mim_05/BA07A0.c:(.text+0x860): undefined reference to `func_802400DC_BA080C' +mips-linux-gnu-ld: src/world/area_mim/mim_05/BA07A0.c:(.text+0x878): undefined reference to `func_8024014C_BA087C' +mips-linux-gnu-ld: src/world/area_mim/mim_05/BA07A0.c:(.text+0x890): undefined reference to `func_80240224_BA0954' +src/world/area_mim/mim_06/BA4CF0.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_mim/mim_06/BA4CF0.c:(.text+0x858): undefined reference to `func_80240570_BA4CF0' +mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x860): undefined reference to `func_802405DC_BA4D5C' +mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x878): undefined reference to `func_8024064C_BA4DCC' +mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x890): undefined reference to `func_80240724_BA4EA4' +src/world/area_mim/mim_06/BA4CF0.c:(.text+0x2728): undefined reference to `func_8024247C_BA6BFC' +mips-linux-gnu-ld: src/world/area_mim/mim_06/BA4CF0.c:(.text+0x2788): undefined reference to `func_80242AC0_BA7240' +src/world/area_mim/mim_07/BAA3B0.c:(.text+0xd84): undefined reference to `func_802407D8_BAA918' +mips-linux-gnu-ld: src/world/area_mim/mim_07/BAA3B0.c:(.text+0xde4): undefined reference to `func_80240E1C_BAAF5C' +src/world/area_mim/mim_08/BAD940.c:(.text+0x14e8): undefined reference to `func_80240878_BAE1B8' +mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1510): undefined reference to `func_80240C7C_BAE5BC' +mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1550): undefined reference to `func_80240E94_BAE7D4' +src/world/area_mim/mim_08/BAD940.c:(.text+0x1d68): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1df0): undefined reference to `func_80241598_BAEED8' +mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1df8): undefined reference to `func_80241604_BAEF44' +mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1e10): undefined reference to `func_80241674_BAEFB4' +mips-linux-gnu-ld: src/world/area_mim/mim_08/BAD940.c:(.text+0x1e28): undefined reference to `func_8024174C_BAF08C' +src/world/area_mim/mim_09/BB2E00.c:(.text+0xe24): undefined reference to `func_80240608_BB3408' +mips-linux-gnu-ld: src/world/area_mim/mim_09/BB2E00.c:(.text+0xe84): undefined reference to `func_80240C4C_BB3A4C' +src/world/area_obk/obk_07/BCF0F0.c:(.text+0xc7c): undefined reference to `func_80240A6C_BCE9F4' +mips-linux-gnu-ld: src/world/area_obk/obk_07/BCF0F0.c:(.text+0xc80): undefined reference to `func_80240A6C_BCE9F4' +mips-linux-gnu-ld: src/world/area_obk/obk_07/BCF0F0.c:(.text+0xc8c): undefined reference to `func_802410C0_BCF048' +mips-linux-gnu-ld: src/world/area_obk/obk_07/BCF0F0.c:(.text+0xc90): undefined reference to `func_802410C0_BCF048' +src/world/area_obk/obk_08/BD3870.c:(.text+0x4a8): undefined reference to `func_80240000_BD3494' +mips-linux-gnu-ld: src/world/area_obk/obk_08/BD3870.c:(.text+0x4ac): undefined reference to `func_80240000_BD3494' +src/world/area_arn/arn_02/BDD1B0.c:(.text+0xfb0): undefined reference to `func_80240C4C_BDDDFC' +src/world/area_arn/arn_03/BDED90.c:(.text+0xda8): undefined reference to `func_80240400_BDF190' +mips-linux-gnu-ld: src/world/area_arn/arn_03/BDED90.c:(.text+0xde8): undefined reference to `func_80240730_BDF4C0' +mips-linux-gnu-ld: src/world/area_arn/arn_03/BDED90.c:(.text+0xdf8): undefined reference to `func_802407A4_BDF534' +mips-linux-gnu-ld: src/world/area_arn/arn_03/BDED90.c:(.text+0xe38): undefined reference to `func_80240A6C_BDF7FC' +src/world/area_arn/arn_03/BDED90.c:(.text+0x124c): undefined reference to `func_80240400_BDF190' +src/world/area_arn/arn_04/BE37B0.c:(.text+0xda8): undefined reference to `func_80240400_BE3BB0' +mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0xde8): undefined reference to `func_80240730_BE3EE0' +mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0xdf8): undefined reference to `func_802407A4_BE3F54' +mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0xe38): undefined reference to `func_80240A6C_BE421C' +src/world/area_arn/arn_04/BE37B0.c:(.text+0x22d8): undefined reference to `func_80241668_BE4E18' +mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0x2300): undefined reference to `func_80241A6C_BE521C' +mips-linux-gnu-ld: src/world/area_arn/arn_04/BE37B0.c:(.text+0x2340): undefined reference to `func_80241C84_BE5434' +src/world/area_arn/arn_04/BE37B0.c:(.text+0x3338): undefined reference to `func_80242FD4_BE6784' +src/world/area_arn/arn_05/BE7BE0.c:(.text+0xda8): undefined reference to `func_80240400_BE7FE0' +mips-linux-gnu-ld: src/world/area_arn/arn_05/BE7BE0.c:(.text+0xde8): undefined reference to `func_80240730_BE8310' +mips-linux-gnu-ld: src/world/area_arn/arn_05/BE7BE0.c:(.text+0xdf8): undefined reference to `func_802407A4_BE8384' +mips-linux-gnu-ld: src/world/area_arn/arn_05/BE7BE0.c:(.text+0xe38): undefined reference to `func_80240A6C_BE864C' +src/world/area_arn/arn_05/BE7BE0.c:(.text+0x124c): undefined reference to `func_80240400_BE7FE0' +src/world/area_arn/arn_07/BED740.c:(.text+0x1448): undefined reference to `func_80241128_BEDF18' +mips-linux-gnu-ld: src/world/area_arn/arn_07/BED740.c:(.text+0x1470): undefined reference to `func_8024152C_BEE31C' +mips-linux-gnu-ld: src/world/area_arn/arn_07/BED740.c:(.text+0x14b0): undefined reference to `func_80241744_BEE534' +src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x1448): undefined reference to `func_802408F8_BFE178' +mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x1470): undefined reference to `func_80240CFC_BFE57C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x14b0): undefined reference to `func_80240F14_BFE794' +src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x22c0): undefined reference to `func_802408F8_BFE178' +src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x31b4): undefined reference to `func_8024292C_C001AC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x31f4): undefined reference to `func_80242C5C_C004DC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x3204): undefined reference to `func_80242CD0_C00550' +mips-linux-gnu-ld: src/world/area_dgb/dgb_01/BFD9A0.c:(.text+0x3244): undefined reference to `func_80242F98_C00818' +src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x7d0): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x858): undefined reference to `func_80240000_C2EBA0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x860): undefined reference to `func_8024006C_C2EC0C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x878): undefined reference to `func_802400DC_C2EC7C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x890): undefined reference to `func_802401B4_C2ED54' +src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x1354): undefined reference to `func_80240000_C2EBA0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x136c): undefined reference to `func_8024006C_C2EC0C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x1384): undefined reference to `func_802400DC_C2EC7C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_02/C2EBA0.c:(.text+0x1394): undefined reference to `func_802401B4_C2ED54' +src/world/area_dgb/dgb_03/C31730.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_dgb/dgb_03/C31730.c:(.text+0x858): undefined reference to `func_80240250_C31730' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x860): undefined reference to `func_802402BC_C3179C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x878): undefined reference to `func_8024032C_C3180C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x890): undefined reference to `func_80240404_C318E4' +src/world/area_dgb/dgb_03/C31730.c:(.text+0x1678): undefined reference to `func_80240F20_C32400' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x16b8): undefined reference to `func_80241250_C32730' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x16c8): undefined reference to `func_802412C4_C327A4' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x1708): undefined reference to `func_8024158C_C32A6C' +src/world/area_dgb/dgb_03/C31730.c:(.text+0x1914): undefined reference to `func_80240F20_C32400' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x1954): undefined reference to `func_80241250_C32730' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x1964): undefined reference to `func_802412C4_C327A4' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19a4): undefined reference to `func_8024158C_C32A6C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19b4): undefined reference to `func_80240250_C31730' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19bc): undefined reference to `func_802402BC_C3179C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19d4): undefined reference to `func_8024032C_C3180C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x19ec): undefined reference to `func_80240404_C318E4' +src/world/area_dgb/dgb_03/C31730.c:(.text+0x24b0): undefined reference to `func_80240250_C31730' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x24c8): undefined reference to `func_802402BC_C3179C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x24e0): undefined reference to `func_8024032C_C3180C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_03/C31730.c:(.text+0x24f0): undefined reference to `func_80240404_C318E4' +src/world/area_dgb/dgb_04/C36530.c:(.text+0x1448): undefined reference to `func_802407D8_C36D08' +mips-linux-gnu-ld: src/world/area_dgb/dgb_04/C36530.c:(.text+0x1470): undefined reference to `func_80240BDC_C3710C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_04/C36530.c:(.text+0x14b0): undefined reference to `func_80240DF4_C37324' +src/world/area_dgb/dgb_04/C36530.c:(.text+0x2284): undefined reference to `func_802407D8_C36D08' +src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1100): undefined reference to `func_80240060_C3AA70' +mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1118): undefined reference to `func_802400CC_C3AADC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1130): undefined reference to `func_8024013C_C3AB4C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1140): undefined reference to `func_80240214_C3AC24' +src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1384): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x140c): undefined reference to `func_80240060_C3AA70' +mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1414): undefined reference to `func_802400CC_C3AADC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x142c): undefined reference to `func_8024013C_C3AB4C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_05/C3AA10.c:(.text+0x1444): undefined reference to `func_80240214_C3AC24' +src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10a0): undefined reference to `func_80240000_C3DBF0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10b8): undefined reference to `func_8024006C_C3DC5C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10d0): undefined reference to `func_802400DC_C3DCCC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x10e0): undefined reference to `func_802401B4_C3DDA4' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x1324): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13ac): undefined reference to `func_80240000_C3DBF0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13b4): undefined reference to `func_8024006C_C3DC5C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13cc): undefined reference to `func_802400DC_C3DCCC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_07/C3DBF0.c:(.text+0x13e4): undefined reference to `func_802401B4_C3DDA4' +src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xda8): undefined reference to `func_80240400_C401B0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xde8): undefined reference to `func_80240730_C404E0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xdf8): undefined reference to `func_802407A4_C40554' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0xe38): undefined reference to `func_80240A6C_C4081C' +src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x1660): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x16e8): undefined reference to `func_80240E90_C40C40' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x16f0): undefined reference to `func_80240EFC_C40CAC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x1708): undefined reference to `func_80240F6C_C40D1C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x1720): undefined reference to `func_80241044_C40DF4' +src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x2ba8): undefined reference to `func_80241F38_C41CE8' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x2bd0): undefined reference to `func_8024233C_C420EC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x2c10): undefined reference to `func_80242554_C42304' +src/world/area_dgb/dgb_08/C3FDB0.c:(.text+0x3a20): undefined reference to `func_80241F38_C41CE8' +src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x7d0): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x858): undefined reference to `func_80240000_C46BE0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x860): undefined reference to `func_8024006C_C46C4C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x878): undefined reference to `func_802400DC_C46CBC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x890): undefined reference to `func_802401B4_C46D94' +src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x1354): undefined reference to `func_80240000_C46BE0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x136c): undefined reference to `func_8024006C_C46C4C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x1384): undefined reference to `func_802400DC_C46CBC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x1394): undefined reference to `func_802401B4_C46D94' +src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x286c): undefined reference to `func_80241BFC_C487DC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x28d4): undefined reference to `func_80242218_C48DF8' +src/world/area_dgb/dgb_09/C46BE0.c:(.text+0x36a8): undefined reference to `func_80241BFC_C487DC' +src/world/area_dgb/dgb_15/C4F510.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_dgb/dgb_15/C4F510.c:(.text+0x858): undefined reference to `func_80240000_C4F510' +mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x860): undefined reference to `func_8024006C_C4F57C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x878): undefined reference to `func_802400DC_C4F5EC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x890): undefined reference to `func_802401B4_C4F6C4' +src/world/area_dgb/dgb_15/C4F510.c:(.text+0x1678): undefined reference to `func_80240CD0_C501E0' +mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x16b8): undefined reference to `func_80241000_C50510' +mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x16c8): undefined reference to `func_80241074_C50584' +mips-linux-gnu-ld: src/world/area_dgb/dgb_15/C4F510.c:(.text+0x1708): undefined reference to `func_8024133C_C5084C' +src/world/area_dgb/dgb_16/C52540.c:(.text+0x10a0): undefined reference to `func_80240000_C52540' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x10b8): undefined reference to `func_8024006C_C525AC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x10d0): undefined reference to `func_802400DC_C5261C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x10e0): undefined reference to `func_802401B4_C526F4' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x1324): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13ac): undefined reference to `func_80240000_C52540' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13b4): undefined reference to `func_8024006C_C525AC' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13cc): undefined reference to `func_802400DC_C5261C' +mips-linux-gnu-ld: src/world/area_dgb/dgb_16/C52540.c:(.text+0x13e4): undefined reference to `func_802401B4_C526F4' +src/world/area_dgb/dgb_18/C55F40.c:(.text+0xda8): undefined reference to `func_80240400_C56340' +mips-linux-gnu-ld: src/world/area_dgb/dgb_18/C55F40.c:(.text+0xde8): undefined reference to `func_80240730_C56670' +mips-linux-gnu-ld: src/world/area_dgb/dgb_18/C55F40.c:(.text+0xdf8): undefined reference to `func_802407A4_C566E4' +mips-linux-gnu-ld: src/world/area_dgb/dgb_18/C55F40.c:(.text+0xe38): undefined reference to `func_80240A6C_C569AC' +src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1448): undefined reference to `func_80240CB8_C5B3F8' +mips-linux-gnu-ld: src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1470): undefined reference to `func_802410BC_C5B7FC' +mips-linux-gnu-ld: src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x14b0): undefined reference to `func_802412D4_C5BA14' +src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1a44): undefined reference to `func_80240CB8_C5B3F8' +mips-linux-gnu-ld: src/world/area_kzn/kzn_02/C5AC20.c:(.text+0x1a6c): undefined reference to `func_802410BC_C5B7FC' +src/world/area_kzn/kzn_03/C61020.c:(.text+0x66c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x6ec): undefined reference to `func_80240310_C61020' +mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x714): undefined reference to `func_802404C0_C611D0' +mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x728): undefined reference to `func_80240624_C61334' +src/world/area_kzn/kzn_03/C61020.c:(.text+0x10b8): undefined reference to `func_80049B44' +src/world/area_kzn/kzn_03/C61020.c:(.text+0x1140): undefined reference to `func_80240BF8_C61908' +mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x1148): undefined reference to `func_80240C64_C61974' +mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x1160): undefined reference to `func_80240CD4_C619E4' +mips-linux-gnu-ld: src/world/area_kzn/kzn_03/C61020.c:(.text+0x1178): undefined reference to `func_80240DAC_C61ABC' +src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1548): undefined reference to `func_80240FF8_C6F328' +mips-linux-gnu-ld: src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1570): undefined reference to `func_802413FC_C6F72C' +mips-linux-gnu-ld: src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x15b0): undefined reference to `func_80241614_C6F944' +src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1b44): undefined reference to `func_80240FF8_C6F328' +mips-linux-gnu-ld: src/world/area_kzn/kzn_07/C6EA50.c:(.text+0x1b6c): undefined reference to `func_802413FC_C6F72C' +src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1448): undefined reference to `func_80241228_C726A8' +mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1470): undefined reference to `func_8024162C_C72AAC' +mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x14b0): undefined reference to `func_80241844_C72CC4' +src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1a44): undefined reference to `func_80241228_C726A8' +mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x1a6c): undefined reference to `func_8024162C_C72AAC' +src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x22bc): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x2344): undefined reference to `func_8024253C_C739BC' +mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x234c): undefined reference to `func_802425A8_C73A28' +mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x2364): undefined reference to `func_80242618_C73A98' +mips-linux-gnu-ld: src/world/area_kzn/kzn_08/C71ED0.c:(.text+0x237c): undefined reference to `func_802426F0_C73B70' +src/world/area_kzn/kzn_09/C77D00.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_kzn/kzn_09/C77D00.c:(.text+0x858): undefined reference to `func_80241020_C77D00' +mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x860): undefined reference to `func_8024108C_C77D6C' +mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x878): undefined reference to `func_802410FC_C77DDC' +mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x890): undefined reference to `func_802411D4_C77EB4' +src/world/area_kzn/kzn_09/C77D00.c:(.text+0x2010): undefined reference to `func_80049B44' +src/world/area_kzn/kzn_09/C77D00.c:(.text+0x2090): undefined reference to `func_802429C4_C796A4' +mips-linux-gnu-ld: src/world/area_kzn/kzn_09/C77D00.c:(.text+0x20b8): undefined reference to `func_80242B74_C79854' +src/world/area_kzn/kzn_11/C80600.c:(.text+0x1448): undefined reference to `func_80240C38_C80DD8' +mips-linux-gnu-ld: src/world/area_kzn/kzn_11/C80600.c:(.text+0x1470): undefined reference to `func_8024103C_C811DC' +mips-linux-gnu-ld: src/world/area_kzn/kzn_11/C80600.c:(.text+0x14b0): undefined reference to `func_80241254_C813F4' +src/world/area_kzn/kzn_11/C80600.c:(.text+0x1a44): undefined reference to `func_80240C38_C80DD8' +mips-linux-gnu-ld: src/world/area_kzn/kzn_11/C80600.c:(.text+0x1a6c): undefined reference to `func_8024103C_C811DC' +src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x858): undefined reference to `func_80240310_C85DC0' +mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x860): undefined reference to `func_8024037C_C85E2C' +mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x878): undefined reference to `func_802403EC_C85E9C' +mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x890): undefined reference to `func_802404C4_C85F74' +src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x2010): undefined reference to `func_80049B44' +src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x2090): undefined reference to `func_80241CB4_C87764' +mips-linux-gnu-ld: src/world/area_kzn/kzn_17/C85DC0.c:(.text+0x20b8): undefined reference to `func_80241E64_C87914' +src/world/area_kzn/kzn_19/C8DBB0.c:(.text+0x13c4): undefined reference to `func_80240E2C_C8D61C' +mips-linux-gnu-ld: src/world/area_kzn/kzn_19/C8DBB0.c:(.text+0x13c8): undefined reference to `func_80240E2C_C8D61C' +mips-linux-gnu-ld: src/world/area_kzn/kzn_19/C8DBB0.c:(.text+0x143c): undefined reference to `func_802413C0_C8DB64' +mips-linux-gnu-ld: src/world/area_kzn/kzn_19/C8DBB0.c:(.text+0x1440): undefined reference to `func_802413C0_C8DB64' +src/world/area_flo/flo_00/C9DF60.c:(.text+0xda8): undefined reference to `func_80240440_C9E360' +mips-linux-gnu-ld: src/world/area_flo/flo_00/C9DF60.c:(.text+0xde8): undefined reference to `func_80240770_C9E690' +mips-linux-gnu-ld: src/world/area_flo/flo_00/C9DF60.c:(.text+0xdf8): undefined reference to `func_802407E4_C9E704' +mips-linux-gnu-ld: src/world/area_flo/flo_00/C9DF60.c:(.text+0xe38): undefined reference to `func_80240AAC_C9E9CC' +src/world/area_flo/flo_08/CAFAC0.c:(.text+0x90c): undefined reference to `func_80049B44' +src/world/area_flo/flo_09/CB5320.c:(.text+0x1448): undefined reference to `func_80240AF8_CB5AF8' +mips-linux-gnu-ld: src/world/area_flo/flo_09/CB5320.c:(.text+0x1470): undefined reference to `func_80240EFC_CB5EFC' +mips-linux-gnu-ld: src/world/area_flo/flo_09/CB5320.c:(.text+0x14b0): undefined reference to `func_80241114_CB6114' +src/world/area_flo/flo_13/CC3850.c:(.text+0x15cc): undefined reference to `func_8024099C_CC41AC' +mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x15f4): undefined reference to `func_80240DA0_CC45B0' +mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x1634): undefined reference to `func_80240FB8_CC47C8' +src/world/area_flo/flo_13/CC3850.c:(.text+0x1edc): undefined reference to `func_8024099C_CC41AC' +mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x1fbc): undefined reference to `func_80240FB8_CC47C8' +src/world/area_flo/flo_13/CC3850.c:(.text+0x28c4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x2980): undefined reference to `func_802425AC_CC5DBC' +src/world/area_flo/flo_13/CC3850.c:(.text+0x2de4): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_flo/flo_13/CC3850.c:(.text+0x2e4c): undefined reference to `func_802425AC_CC5DBC' +src/world/area_flo/flo_14/CCBE20.c:(.text+0x1448): undefined reference to `func_802412E8_CCC5F8' +mips-linux-gnu-ld: src/world/area_flo/flo_14/CCBE20.c:(.text+0x1470): undefined reference to `func_802416EC_CCC9FC' +mips-linux-gnu-ld: src/world/area_flo/flo_14/CCBE20.c:(.text+0x14b0): undefined reference to `func_80241904_CCCC14' +src/world/area_flo/flo_16/CD2C80.c:(.text+0x1448): undefined reference to `func_80241628_CD3458' +mips-linux-gnu-ld: src/world/area_flo/flo_16/CD2C80.c:(.text+0x1470): undefined reference to `func_80241A2C_CD385C' +mips-linux-gnu-ld: src/world/area_flo/flo_16/CD2C80.c:(.text+0x14b0): undefined reference to `func_80241C44_CD3A74' +src/world/area_flo/flo_16/CD2C80.c:(.text+0x1a44): undefined reference to `func_80241628_CD3458' +mips-linux-gnu-ld: src/world/area_flo/flo_16/CD2C80.c:(.text+0x1a6c): undefined reference to `func_80241A2C_CD385C' +src/world/area_flo/flo_17/CD7350.c:(.text+0x1448): undefined reference to `func_80240848_CD7B28' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x1470): undefined reference to `func_80240C4C_CD7F2C' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x14b0): undefined reference to `func_80240E64_CD8144' +src/world/area_flo/flo_17/CD7350.c:(.text+0x1d58): undefined reference to `func_80240848_CD7B28' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x1e38): undefined reference to `func_80240E64_CD8144' +src/world/area_flo/flo_17/CD7350.c:(.text+0x2740): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x27c0): undefined reference to `func_80242144_CD9424' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x27e8): undefined reference to `func_802422F4_CD95D4' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x27fc): undefined reference to `func_80242458_CD9738' +src/world/area_flo/flo_17/CD7350.c:(.text+0x2c60): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x2c84): undefined reference to `func_80242144_CD9424' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x2cb0): undefined reference to `func_802422F4_CD95D4' +mips-linux-gnu-ld: src/world/area_flo/flo_17/CD7350.c:(.text+0x2cc8): undefined reference to `func_80242458_CD9738' +src/world/area_flo/flo_23/CEE2A0.c:(.text+0x9c0): undefined reference to `func_80049B44' +src/world/area_flo/flo_23/CEE2A0.c:(.text+0xa40): undefined reference to `func_80240394_CEE5F4' +mips-linux-gnu-ld: src/world/area_flo/flo_23/CEE2A0.c:(.text+0xa68): undefined reference to `func_80240544_CEE7A4' +mips-linux-gnu-ld: src/world/area_flo/flo_23/CEE2A0.c:(.text+0xa7c): undefined reference to `func_802406A8_CEE908' +src/world/area_flo/flo_25/CF2C10.c:(.text+0x1448): undefined reference to `func_80240818_CF33E8' +mips-linux-gnu-ld: src/world/area_flo/flo_25/CF2C10.c:(.text+0x1470): undefined reference to `func_80240C1C_CF37EC' +mips-linux-gnu-ld: src/world/area_flo/flo_25/CF2C10.c:(.text+0x14b0): undefined reference to `func_80240E34_CF3A04' +src/world/area_flo/flo_25/CF2C10.c:(.text+0x1a44): undefined reference to `func_80240818_CF33E8' +mips-linux-gnu-ld: src/world/area_flo/flo_25/CF2C10.c:(.text+0x1a6c): undefined reference to `func_80240C1C_CF37EC' +src/world/area_sam/sam_01/CF7E80.c:(.text+0x76c): undefined reference to `func_80240ACC_CF7EEC' +mips-linux-gnu-ld: src/world/area_sam/sam_01/CF7E80.c:(.text+0x770): undefined reference to `func_80240ACC_CF7EEC' +src/world/area_sam/sam_01/CF7E80.c:(.text+0x1458): undefined reference to `func_802416F8_CF7E14' +mips-linux-gnu-ld: src/world/area_sam/sam_01/CF7E80.c:(.text+0x145c): undefined reference to `func_802416F8_CF7E14' +src/world/area_sam/sam_02/D05F60.c:(.text+0x678): undefined reference to `func_80240EF8_D05FCC' +mips-linux-gnu-ld: src/world/area_sam/sam_02/D05F60.c:(.text+0x67c): undefined reference to `func_80240EF8_D05FCC' +src/world/area_sam/sam_02/D05F60.c:(.text+0x1364): undefined reference to `func_80241B24_D05EF4' +mips-linux-gnu-ld: src/world/area_sam/sam_02/D05F60.c:(.text+0x1368): undefined reference to `func_80241B24_D05EF4' +src/world/area_sam/sam_03/D110C0.c:(.text+0x820): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8a8): undefined reference to `func_80240050_D11110' +mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8b0): undefined reference to `func_802400BC_D1117C' +mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8c8): undefined reference to `func_8024012C_D111EC' +mips-linux-gnu-ld: src/world/area_sam/sam_03/D110C0.c:(.text+0x8e0): undefined reference to `func_80240204_D112C4' +src/world/area_sam/sam_05/D187E0.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_sam/sam_05/D187E0.c:(.text+0x858): undefined reference to `func_80240000_D187E0' +mips-linux-gnu-ld: src/world/area_sam/sam_05/D187E0.c:(.text+0x860): undefined reference to `func_8024006C_D1884C' +mips-linux-gnu-ld: src/world/area_sam/sam_05/D187E0.c:(.text+0x878): undefined reference to `func_802400DC_D188BC' +mips-linux-gnu-ld: src/world/area_sam/sam_05/D187E0.c:(.text+0x890): undefined reference to `func_802401B4_D18994' +src/world/area_sam/sam_06/D203E0.c:(.text+0x1448): undefined reference to `func_80240D28_D20BB8' +mips-linux-gnu-ld: src/world/area_sam/sam_06/D203E0.c:(.text+0x1470): undefined reference to `func_8024112C_D20FBC' +mips-linux-gnu-ld: src/world/area_sam/sam_06/D203E0.c:(.text+0x14b0): undefined reference to `func_80241344_D211D4' +src/world/area_sam/sam_07/D2BD30.c:(.text+0xe20): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xea8): undefined reference to `func_80240650_D2C380' +mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xeb0): undefined reference to `func_802406BC_D2C3EC' +mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xec8): undefined reference to `func_8024072C_D2C45C' +mips-linux-gnu-ld: src/world/area_sam/sam_07/D2BD30.c:(.text+0xee0): undefined reference to `func_80240804_D2C534' +src/world/area_sam/sam_08/D309C0.c:(.text+0x7d0): undefined reference to `func_80049B44' +src/world/area_sam/sam_08/D309C0.c:(.text+0x858): undefined reference to `func_80240D40_D309C0' +mips-linux-gnu-ld: src/world/area_sam/sam_08/D309C0.c:(.text+0x860): undefined reference to `func_80240DAC_D30A2C' +mips-linux-gnu-ld: src/world/area_sam/sam_08/D309C0.c:(.text+0x878): undefined reference to `func_80240E1C_D30A9C' +mips-linux-gnu-ld: src/world/area_sam/sam_08/D309C0.c:(.text+0x890): undefined reference to `func_80240EF4_D30B74' +src/world/area_sam/sam_10/D37BD0.c:(.text+0x7d0): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x858): undefined reference to `func_802403D0_D37BD0' +mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x860): undefined reference to `func_8024043C_D37C3C' +mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x878): undefined reference to `func_802404AC_D37CAC' +mips-linux-gnu-ld: src/world/area_sam/sam_10/D37BD0.c:(.text+0x890): undefined reference to `func_80240584_D37D84' +src/world/area_sam/sam_11/D3ADA0.c:(.text+0x37c): undefined reference to `func_80240B9C_D3AE0C' +mips-linux-gnu-ld: src/world/area_sam/sam_11/D3ADA0.c:(.text+0x380): undefined reference to `func_80240B9C_D3AE0C' +src/world/area_sam/sam_11/D3ADA0.c:(.text+0x1068): undefined reference to `func_802417C8_D3AD34' +mips-linux-gnu-ld: src/world/area_sam/sam_11/D3ADA0.c:(.text+0x106c): undefined reference to `func_802417C8_D3AD34' +src/world/area_pra/pra_01/D4D060.c:(.text+0xd8): undefined reference to `func_80240128_D4D09C' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xdc): undefined reference to `func_80240128_D4D09C' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0x194): undefined reference to `func_80240020_D4D060' +src/world/area_pra/pra_01/D4D060.c:(.text+0x2a0): undefined reference to `func_802402F0_D4D228' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0x2a4): undefined reference to `func_802402F0_D4D228' +src/world/area_pra/pra_01/D4D060.c:(.text+0x4a0): undefined reference to `func_80240500_D4D0C4' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0x4a4): undefined reference to `func_80240500_D4D0C4' +src/world/area_pra/pra_01/D4D060.c:(.text+0x614): undefined reference to `func_80240870_D4D3D0' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0x618): undefined reference to `func_80240870_D4D3D0' +src/world/area_pra/pra_01/D4D060.c:(.text+0x640): undefined reference to `func_8024068C_D4D1EC' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0x644): undefined reference to `func_8024068C_D4D1EC' +src/world/area_pra/pra_01/D4D060.c:(.text+0xd70): undefined reference to `func_80240E84_D4D1A8' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xd74): undefined reference to `func_80240E84_D4D1A8' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xd80): undefined reference to `func_80240EEC_D4D210' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xd84): undefined reference to `func_80240EEC_D4D210' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xda8): undefined reference to `func_80240EB8_D4D1DC' +mips-linux-gnu-ld: src/world/area_pra/pra_01/D4D060.c:(.text+0xdac): undefined reference to `func_80240EB8_D4D1DC' +src/world/area_pra/pra_02/D50010.c:(.text+0xd8): undefined reference to `func_80240128_D5004C' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xdc): undefined reference to `func_80240128_D5004C' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0x194): undefined reference to `func_80240020_D50010' +src/world/area_pra/pra_02/D50010.c:(.text+0x2a0): undefined reference to `func_802402F0_D501D8' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0x2a4): undefined reference to `func_802402F0_D501D8' +src/world/area_pra/pra_02/D50010.c:(.text+0x4a0): undefined reference to `func_80240500_D50074' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0x4a4): undefined reference to `func_80240500_D50074' +src/world/area_pra/pra_02/D50010.c:(.text+0x614): undefined reference to `func_80240870_D50380' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0x618): undefined reference to `func_80240870_D50380' +src/world/area_pra/pra_02/D50010.c:(.text+0x640): undefined reference to `func_8024068C_D5019C' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0x644): undefined reference to `func_8024068C_D5019C' +src/world/area_pra/pra_02/D50010.c:(.text+0xd70): undefined reference to `func_80240E84_D50158' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xd74): undefined reference to `func_80240E84_D50158' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xd80): undefined reference to `func_80240EEC_D501C0' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xd84): undefined reference to `func_80240EEC_D501C0' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xda8): undefined reference to `func_80240EB8_D5018C' +mips-linux-gnu-ld: src/world/area_pra/pra_02/D50010.c:(.text+0xdac): undefined reference to `func_80240EB8_D5018C' +src/world/area_pra/pra_05/D55BD0.c:(.text+0xd8): undefined reference to `func_80240128_D55C0C' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xdc): undefined reference to `func_80240128_D55C0C' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0x194): undefined reference to `func_80240020_D55BD0' +src/world/area_pra/pra_05/D55BD0.c:(.text+0x2a0): undefined reference to `func_802402F0_D55D98' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0x2a4): undefined reference to `func_802402F0_D55D98' +src/world/area_pra/pra_05/D55BD0.c:(.text+0x4a0): undefined reference to `func_80240500_D55C34' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0x4a4): undefined reference to `func_80240500_D55C34' +src/world/area_pra/pra_05/D55BD0.c:(.text+0x614): undefined reference to `func_80240870_D55F40' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0x618): undefined reference to `func_80240870_D55F40' +src/world/area_pra/pra_05/D55BD0.c:(.text+0x640): undefined reference to `func_8024068C_D55D5C' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0x644): undefined reference to `func_8024068C_D55D5C' +src/world/area_pra/pra_05/D55BD0.c:(.text+0xd70): undefined reference to `func_80240E84_D55D18' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xd74): undefined reference to `func_80240E84_D55D18' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xd80): undefined reference to `func_80240EEC_D55D80' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xd84): undefined reference to `func_80240EEC_D55D80' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xda8): undefined reference to `func_80240EB8_D55D4C' +mips-linux-gnu-ld: src/world/area_pra/pra_05/D55BD0.c:(.text+0xdac): undefined reference to `func_80240EB8_D55D4C' +src/world/area_pra/pra_06/D57430.c:(.text+0x128): undefined reference to `func_80240158_D5746C' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0x12c): undefined reference to `func_80240158_D5746C' +src/world/area_pra/pra_06/D57430.c:(.text+0x1e4): undefined reference to `func_80240050_D57480' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0x2f0): undefined reference to `func_80240320_D575F8' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0x2f4): undefined reference to `func_80240320_D575F8' +src/world/area_pra/pra_06/D57430.c:(.text+0x4f0): undefined reference to `func_80240530_D57494' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0x4f4): undefined reference to `func_80240530_D57494' +src/world/area_pra/pra_06/D57430.c:(.text+0x664): undefined reference to `func_802408A0_D577A0' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0x668): undefined reference to `func_802408A0_D577A0' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0x690): undefined reference to `func_802406BC_D575BC' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0x694): undefined reference to `func_802406BC_D575BC' +src/world/area_pra/pra_06/D57430.c:(.text+0xdc0): undefined reference to `func_80240EB4_D57578' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdc4): undefined reference to `func_80240EB4_D57578' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdd0): undefined reference to `func_80240F1C_D575E0' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdd4): undefined reference to `func_80240F1C_D575E0' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdf8): undefined reference to `func_80240EE8_D575AC' +mips-linux-gnu-ld: src/world/area_pra/pra_06/D57430.c:(.text+0xdfc): undefined reference to `func_80240EE8_D575AC' +src/world/area_pra/pra_09/D588B0.c:(.text+0xd8): undefined reference to `func_80240128_D588EC' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xdc): undefined reference to `func_80240128_D588EC' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0x194): undefined reference to `func_80240020_D588B0' +src/world/area_pra/pra_09/D588B0.c:(.text+0x2a0): undefined reference to `func_802402F0_D58A78' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0x2a4): undefined reference to `func_802402F0_D58A78' +src/world/area_pra/pra_09/D588B0.c:(.text+0x4a0): undefined reference to `func_80240500_D58914' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0x4a4): undefined reference to `func_80240500_D58914' +src/world/area_pra/pra_09/D588B0.c:(.text+0x614): undefined reference to `func_80240870_D58C20' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0x618): undefined reference to `func_80240870_D58C20' +src/world/area_pra/pra_09/D588B0.c:(.text+0x640): undefined reference to `func_8024068C_D58A3C' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0x644): undefined reference to `func_8024068C_D58A3C' +src/world/area_pra/pra_09/D588B0.c:(.text+0xd70): undefined reference to `func_80240E84_D589F8' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xd74): undefined reference to `func_80240E84_D589F8' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xd80): undefined reference to `func_80240EEC_D58A60' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xd84): undefined reference to `func_80240EEC_D58A60' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xda8): undefined reference to `func_80240EB8_D58A2C' +mips-linux-gnu-ld: src/world/area_pra/pra_09/D588B0.c:(.text+0xdac): undefined reference to `func_80240EB8_D58A2C' +src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd8): undefined reference to `func_80240128_D5F30C' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xdc): undefined reference to `func_80240128_D5F30C' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0x194): undefined reference to `func_80240020_D5F2D0' +src/world/area_pra/pra_10/D5F2D0.c:(.text+0x2a0): undefined reference to `func_802402F0_D5F498' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0x2a4): undefined reference to `func_802402F0_D5F498' +src/world/area_pra/pra_10/D5F2D0.c:(.text+0x4a0): undefined reference to `func_80240500_D5F334' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0x4a4): undefined reference to `func_80240500_D5F334' +src/world/area_pra/pra_10/D5F2D0.c:(.text+0x614): undefined reference to `func_80240870_D5F640' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0x618): undefined reference to `func_80240870_D5F640' +src/world/area_pra/pra_10/D5F2D0.c:(.text+0x640): undefined reference to `func_8024068C_D5F45C' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0x644): undefined reference to `func_8024068C_D5F45C' +src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd70): undefined reference to `func_80240E84_D5F418' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd74): undefined reference to `func_80240E84_D5F418' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D5F480' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D5F480' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D5F44C' +mips-linux-gnu-ld: src/world/area_pra/pra_10/D5F2D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D5F44C' +src/world/area_pra/pra_11/D61520.c:(.text+0xd8): undefined reference to `func_80240128_D6155C' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xdc): undefined reference to `func_80240128_D6155C' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0x194): undefined reference to `func_80240020_D61520' +src/world/area_pra/pra_11/D61520.c:(.text+0x2a0): undefined reference to `func_802402F0_D616E8' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0x2a4): undefined reference to `func_802402F0_D616E8' +src/world/area_pra/pra_11/D61520.c:(.text+0x4a0): undefined reference to `func_80240500_D61584' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0x4a4): undefined reference to `func_80240500_D61584' +src/world/area_pra/pra_11/D61520.c:(.text+0x614): undefined reference to `func_80240870_D61890' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0x618): undefined reference to `func_80240870_D61890' +src/world/area_pra/pra_11/D61520.c:(.text+0x640): undefined reference to `func_8024068C_D616AC' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0x644): undefined reference to `func_8024068C_D616AC' +src/world/area_pra/pra_11/D61520.c:(.text+0xd70): undefined reference to `func_80240E84_D61668' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xd74): undefined reference to `func_80240E84_D61668' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xd80): undefined reference to `func_80240EEC_D616D0' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xd84): undefined reference to `func_80240EEC_D616D0' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xda8): undefined reference to `func_80240EB8_D6169C' +mips-linux-gnu-ld: src/world/area_pra/pra_11/D61520.c:(.text+0xdac): undefined reference to `func_80240EB8_D6169C' +src/world/area_pra/pra_12/D62D10.c:(.text+0x128): undefined reference to `func_80240158_D62D4C' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0x12c): undefined reference to `func_80240158_D62D4C' +src/world/area_pra/pra_12/D62D10.c:(.text+0x1e4): undefined reference to `func_80240050_D62D60' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0x2f0): undefined reference to `func_80240320_D62ED8' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0x2f4): undefined reference to `func_80240320_D62ED8' +src/world/area_pra/pra_12/D62D10.c:(.text+0x4f0): undefined reference to `func_80240530_D62D74' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0x4f4): undefined reference to `func_80240530_D62D74' +src/world/area_pra/pra_12/D62D10.c:(.text+0x664): undefined reference to `func_802408A0_D63080' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0x668): undefined reference to `func_802408A0_D63080' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0x690): undefined reference to `func_802406BC_D62E9C' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0x694): undefined reference to `func_802406BC_D62E9C' +src/world/area_pra/pra_12/D62D10.c:(.text+0xdc0): undefined reference to `func_80240EB4_D62E58' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdc4): undefined reference to `func_80240EB4_D62E58' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdd0): undefined reference to `func_80240F1C_D62EC0' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdd4): undefined reference to `func_80240F1C_D62EC0' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdf8): undefined reference to `func_80240EE8_D62E8C' +mips-linux-gnu-ld: src/world/area_pra/pra_12/D62D10.c:(.text+0xdfc): undefined reference to `func_80240EE8_D62E8C' +src/world/area_pra/pra_13/D64600.c:(.text+0xd8): undefined reference to `func_80240128_D6463C' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xdc): undefined reference to `func_80240128_D6463C' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0x194): undefined reference to `func_80240020_D64600' +src/world/area_pra/pra_13/D64600.c:(.text+0x2a0): undefined reference to `func_802402F0_D647C8' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0x2a4): undefined reference to `func_802402F0_D647C8' +src/world/area_pra/pra_13/D64600.c:(.text+0x4a0): undefined reference to `func_80240500_D64664' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0x4a4): undefined reference to `func_80240500_D64664' +src/world/area_pra/pra_13/D64600.c:(.text+0x614): undefined reference to `func_80240870_D64970' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0x618): undefined reference to `func_80240870_D64970' +src/world/area_pra/pra_13/D64600.c:(.text+0x640): undefined reference to `func_8024068C_D6478C' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0x644): undefined reference to `func_8024068C_D6478C' +src/world/area_pra/pra_13/D64600.c:(.text+0xd70): undefined reference to `func_80240E84_D64748' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xd74): undefined reference to `func_80240E84_D64748' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xd80): undefined reference to `func_80240EEC_D647B0' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xd84): undefined reference to `func_80240EEC_D647B0' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xda8): undefined reference to `func_80240EB8_D6477C' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0xdac): undefined reference to `func_80240EB8_D6477C' +src/world/area_pra/pra_13/D64600.c:(.text+0x13bc): undefined reference to `func_8024140C_D6463C' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0x13c0): undefined reference to `func_8024140C_D6463C' +src/world/area_pra/pra_13/D64600.c:(.text+0x1468): undefined reference to `func_802414BC_D646B0' +mips-linux-gnu-ld: src/world/area_pra/pra_13/D64600.c:(.text+0x146c): undefined reference to `func_802414BC_D646B0' +src/world/area_pra/pra_14/D67D20.c:(.text+0xd8): undefined reference to `func_80240128_D67D5C' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xdc): undefined reference to `func_80240128_D67D5C' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0x194): undefined reference to `func_80240020_D67D20' +src/world/area_pra/pra_14/D67D20.c:(.text+0x2a0): undefined reference to `func_802402F0_D67EE8' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0x2a4): undefined reference to `func_802402F0_D67EE8' +src/world/area_pra/pra_14/D67D20.c:(.text+0x4a0): undefined reference to `func_80240500_D67D84' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0x4a4): undefined reference to `func_80240500_D67D84' +src/world/area_pra/pra_14/D67D20.c:(.text+0x614): undefined reference to `func_80240870_D68090' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0x618): undefined reference to `func_80240870_D68090' +src/world/area_pra/pra_14/D67D20.c:(.text+0x640): undefined reference to `func_8024068C_D67EAC' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0x644): undefined reference to `func_8024068C_D67EAC' +src/world/area_pra/pra_14/D67D20.c:(.text+0xd70): undefined reference to `func_80240E84_D67E68' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xd74): undefined reference to `func_80240E84_D67E68' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xd80): undefined reference to `func_80240EEC_D67ED0' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xd84): undefined reference to `func_80240EEC_D67ED0' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xda8): undefined reference to `func_80240EB8_D67E9C' +mips-linux-gnu-ld: src/world/area_pra/pra_14/D67D20.c:(.text+0xdac): undefined reference to `func_80240EB8_D67E9C' +src/world/area_pra/pra_16/D69B40.c:(.text+0xd8): undefined reference to `func_80240128_D69B7C' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xdc): undefined reference to `func_80240128_D69B7C' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0x194): undefined reference to `func_80240020_D69B40' +src/world/area_pra/pra_16/D69B40.c:(.text+0x2a0): undefined reference to `func_802402F0_D69D08' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0x2a4): undefined reference to `func_802402F0_D69D08' +src/world/area_pra/pra_16/D69B40.c:(.text+0x4a0): undefined reference to `func_80240500_D69BA4' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0x4a4): undefined reference to `func_80240500_D69BA4' +src/world/area_pra/pra_16/D69B40.c:(.text+0x614): undefined reference to `func_80240870_D69EB0' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0x618): undefined reference to `func_80240870_D69EB0' +src/world/area_pra/pra_16/D69B40.c:(.text+0x640): undefined reference to `func_8024068C_D69CCC' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0x644): undefined reference to `func_8024068C_D69CCC' +src/world/area_pra/pra_16/D69B40.c:(.text+0xd70): undefined reference to `func_80240E84_D69C88' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xd74): undefined reference to `func_80240E84_D69C88' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xd80): undefined reference to `func_80240EEC_D69CF0' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xd84): undefined reference to `func_80240EEC_D69CF0' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xda8): undefined reference to `func_80240EB8_D69CBC' +mips-linux-gnu-ld: src/world/area_pra/pra_16/D69B40.c:(.text+0xdac): undefined reference to `func_80240EB8_D69CBC' +src/world/area_pra/pra_18/D6B640.c:(.text+0xd8): undefined reference to `func_80240128_D6B67C' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xdc): undefined reference to `func_80240128_D6B67C' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0x194): undefined reference to `func_80240020_D6B640' +src/world/area_pra/pra_18/D6B640.c:(.text+0x2a0): undefined reference to `func_802402F0_D6B808' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0x2a4): undefined reference to `func_802402F0_D6B808' +src/world/area_pra/pra_18/D6B640.c:(.text+0x4a0): undefined reference to `func_80240500_D6B6A4' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0x4a4): undefined reference to `func_80240500_D6B6A4' +src/world/area_pra/pra_18/D6B640.c:(.text+0x614): undefined reference to `func_80240870_D6B9B0' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0x618): undefined reference to `func_80240870_D6B9B0' +src/world/area_pra/pra_18/D6B640.c:(.text+0x640): undefined reference to `func_8024068C_D6B7CC' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0x644): undefined reference to `func_8024068C_D6B7CC' +src/world/area_pra/pra_18/D6B640.c:(.text+0xd70): undefined reference to `func_80240E84_D6B788' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xd74): undefined reference to `func_80240E84_D6B788' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xd80): undefined reference to `func_80240EEC_D6B7F0' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xd84): undefined reference to `func_80240EEC_D6B7F0' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xda8): undefined reference to `func_80240EB8_D6B7BC' +mips-linux-gnu-ld: src/world/area_pra/pra_18/D6B640.c:(.text+0xdac): undefined reference to `func_80240EB8_D6B7BC' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd8): undefined reference to `func_80240128_D6EA0C' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xdc): undefined reference to `func_80240128_D6EA0C' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0x194): undefined reference to `func_80240020_D6E9D0' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0x2a0): undefined reference to `func_802402F0_D6EB98' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0x2a4): undefined reference to `func_802402F0_D6EB98' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0x4a0): undefined reference to `func_80240500_D6EA34' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0x4a4): undefined reference to `func_80240500_D6EA34' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0x614): undefined reference to `func_80240870_D6ED40' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0x618): undefined reference to `func_80240870_D6ED40' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0x640): undefined reference to `func_8024068C_D6EB5C' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0x644): undefined reference to `func_8024068C_D6EB5C' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd70): undefined reference to `func_80240E84_D6EB18' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd74): undefined reference to `func_80240E84_D6EB18' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D6EB80' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D6EB80' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D6EB4C' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D6EB4C' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0x14e0): undefined reference to `func_80241530_D6EA0C' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0x14e4): undefined reference to `func_80241530_D6EA0C' +src/world/area_pra/pra_19/D6E9D0.c:(.text+0x158c): undefined reference to `func_802415E0_D6EA80' +mips-linux-gnu-ld: src/world/area_pra/pra_19/D6E9D0.c:(.text+0x1590): undefined reference to `func_802415E0_D6EA80' +src/world/area_pra/pra_20/D763C0.c:(.text+0xd8): undefined reference to `func_80240128_D763FC' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xdc): undefined reference to `func_80240128_D763FC' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0x194): undefined reference to `func_80240020_D763C0' +src/world/area_pra/pra_20/D763C0.c:(.text+0x2a0): undefined reference to `func_802402F0_D76588' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0x2a4): undefined reference to `func_802402F0_D76588' +src/world/area_pra/pra_20/D763C0.c:(.text+0x4a0): undefined reference to `func_80240500_D76424' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0x4a4): undefined reference to `func_80240500_D76424' +src/world/area_pra/pra_20/D763C0.c:(.text+0x614): undefined reference to `func_80240870_D76730' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0x618): undefined reference to `func_80240870_D76730' +src/world/area_pra/pra_20/D763C0.c:(.text+0x640): undefined reference to `func_8024068C_D7654C' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0x644): undefined reference to `func_8024068C_D7654C' +src/world/area_pra/pra_20/D763C0.c:(.text+0xd70): undefined reference to `func_80240E84_D76508' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xd74): undefined reference to `func_80240E84_D76508' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xd80): undefined reference to `func_80240EEC_D76570' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xd84): undefined reference to `func_80240EEC_D76570' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xda8): undefined reference to `func_80240EB8_D7653C' +mips-linux-gnu-ld: src/world/area_pra/pra_20/D763C0.c:(.text+0xdac): undefined reference to `func_80240EB8_D7653C' +src/world/area_pra/pra_27/D799F0.c:(.text+0x128): undefined reference to `func_80240158_D79A2C' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0x12c): undefined reference to `func_80240158_D79A2C' +src/world/area_pra/pra_27/D799F0.c:(.text+0x1e4): undefined reference to `func_80240050_D79A40' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0x2f0): undefined reference to `func_80240320_D79BB8' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0x2f4): undefined reference to `func_80240320_D79BB8' +src/world/area_pra/pra_27/D799F0.c:(.text+0x4f0): undefined reference to `func_80240530_D79A54' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0x4f4): undefined reference to `func_80240530_D79A54' +src/world/area_pra/pra_27/D799F0.c:(.text+0x664): undefined reference to `func_802408A0_D79D60' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0x668): undefined reference to `func_802408A0_D79D60' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0x690): undefined reference to `func_802406BC_D79B7C' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0x694): undefined reference to `func_802406BC_D79B7C' +src/world/area_pra/pra_27/D799F0.c:(.text+0xdc0): undefined reference to `func_80240EB4_D79B38' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdc4): undefined reference to `func_80240EB4_D79B38' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdd0): undefined reference to `func_80240F1C_D79BA0' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdd4): undefined reference to `func_80240F1C_D79BA0' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdf8): undefined reference to `func_80240EE8_D79B6C' +mips-linux-gnu-ld: src/world/area_pra/pra_27/D799F0.c:(.text+0xdfc): undefined reference to `func_80240EE8_D79B6C' +src/world/area_pra/pra_28/D7B2A0.c:(.text+0x128): undefined reference to `func_80240158_D7B2DC' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0x12c): undefined reference to `func_80240158_D7B2DC' +src/world/area_pra/pra_28/D7B2A0.c:(.text+0x1e4): undefined reference to `func_80240050_D7B2F0' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0x2f0): undefined reference to `func_80240320_D7B468' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0x2f4): undefined reference to `func_80240320_D7B468' +src/world/area_pra/pra_28/D7B2A0.c:(.text+0x4f0): undefined reference to `func_80240530_D7B304' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0x4f4): undefined reference to `func_80240530_D7B304' +src/world/area_pra/pra_28/D7B2A0.c:(.text+0x664): undefined reference to `func_802408A0_D7B610' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0x668): undefined reference to `func_802408A0_D7B610' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0x690): undefined reference to `func_802406BC_D7B42C' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0x694): undefined reference to `func_802406BC_D7B42C' +src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdc0): undefined reference to `func_80240EB4_D7B3E8' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdc4): undefined reference to `func_80240EB4_D7B3E8' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdd0): undefined reference to `func_80240F1C_D7B450' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdd4): undefined reference to `func_80240F1C_D7B450' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdf8): undefined reference to `func_80240EE8_D7B41C' +mips-linux-gnu-ld: src/world/area_pra/pra_28/D7B2A0.c:(.text+0xdfc): undefined reference to `func_80240EE8_D7B41C' +src/world/area_pra/pra_29/D7CB70.c:(.text+0xd8): undefined reference to `func_80240128_D7CBAC' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xdc): undefined reference to `func_80240128_D7CBAC' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0x194): undefined reference to `func_80240020_D7CB70' +src/world/area_pra/pra_29/D7CB70.c:(.text+0x2a0): undefined reference to `func_802402F0_D7CD38' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0x2a4): undefined reference to `func_802402F0_D7CD38' +src/world/area_pra/pra_29/D7CB70.c:(.text+0x4a0): undefined reference to `func_80240500_D7CBD4' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0x4a4): undefined reference to `func_80240500_D7CBD4' +src/world/area_pra/pra_29/D7CB70.c:(.text+0x614): undefined reference to `func_80240870_D7CEE0' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0x618): undefined reference to `func_80240870_D7CEE0' +src/world/area_pra/pra_29/D7CB70.c:(.text+0x640): undefined reference to `func_8024068C_D7CCFC' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0x644): undefined reference to `func_8024068C_D7CCFC' +src/world/area_pra/pra_29/D7CB70.c:(.text+0xd70): undefined reference to `func_80240E84_D7CCB8' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xd74): undefined reference to `func_80240E84_D7CCB8' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xd80): undefined reference to `func_80240EEC_D7CD20' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xd84): undefined reference to `func_80240EEC_D7CD20' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xda8): undefined reference to `func_80240EB8_D7CCEC' +mips-linux-gnu-ld: src/world/area_pra/pra_29/D7CB70.c:(.text+0xdac): undefined reference to `func_80240EB8_D7CCEC' +src/world/area_pra/pra_33/D89700.c:(.text+0xd8): undefined reference to `func_80240128_D8973C' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xdc): undefined reference to `func_80240128_D8973C' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0x194): undefined reference to `func_80240020_D89700' +src/world/area_pra/pra_33/D89700.c:(.text+0x2a0): undefined reference to `func_802402F0_D898C8' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0x2a4): undefined reference to `func_802402F0_D898C8' +src/world/area_pra/pra_33/D89700.c:(.text+0x4a0): undefined reference to `func_80240500_D89764' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0x4a4): undefined reference to `func_80240500_D89764' +src/world/area_pra/pra_33/D89700.c:(.text+0x614): undefined reference to `func_80240870_D89A70' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0x618): undefined reference to `func_80240870_D89A70' +src/world/area_pra/pra_33/D89700.c:(.text+0x640): undefined reference to `func_8024068C_D8988C' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0x644): undefined reference to `func_8024068C_D8988C' +src/world/area_pra/pra_33/D89700.c:(.text+0xd70): undefined reference to `func_80240E84_D89848' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xd74): undefined reference to `func_80240E84_D89848' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xd80): undefined reference to `func_80240EEC_D898B0' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xd84): undefined reference to `func_80240EEC_D898B0' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xda8): undefined reference to `func_80240EB8_D8987C' +mips-linux-gnu-ld: src/world/area_pra/pra_33/D89700.c:(.text+0xdac): undefined reference to `func_80240EB8_D8987C' +src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd8): undefined reference to `func_80240128_D8B40C' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xdc): undefined reference to `func_80240128_D8B40C' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0x194): undefined reference to `func_80240020_D8B3D0' +src/world/area_pra/pra_34/D8B3D0.c:(.text+0x2a0): undefined reference to `func_802402F0_D8B598' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0x2a4): undefined reference to `func_802402F0_D8B598' +src/world/area_pra/pra_34/D8B3D0.c:(.text+0x4a0): undefined reference to `func_80240500_D8B434' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0x4a4): undefined reference to `func_80240500_D8B434' +src/world/area_pra/pra_34/D8B3D0.c:(.text+0x614): undefined reference to `func_80240870_D8B740' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0x618): undefined reference to `func_80240870_D8B740' +src/world/area_pra/pra_34/D8B3D0.c:(.text+0x640): undefined reference to `func_8024068C_D8B55C' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0x644): undefined reference to `func_8024068C_D8B55C' +src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd70): undefined reference to `func_80240E84_D8B518' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd74): undefined reference to `func_80240E84_D8B518' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D8B580' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D8B580' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D8B54C' +mips-linux-gnu-ld: src/world/area_pra/pra_34/D8B3D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D8B54C' +src/world/area_pra/pra_35/D8D270.c:(.text+0xd8): undefined reference to `func_80240128_D8D2AC' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xdc): undefined reference to `func_80240128_D8D2AC' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x194): undefined reference to `func_80240020_D8D270' +src/world/area_pra/pra_35/D8D270.c:(.text+0x2a0): undefined reference to `func_802402F0_D8D438' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2a4): undefined reference to `func_802402F0_D8D438' +src/world/area_pra/pra_35/D8D270.c:(.text+0x4a0): undefined reference to `func_80240500_D8D2D4' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x4a4): undefined reference to `func_80240500_D8D2D4' +src/world/area_pra/pra_35/D8D270.c:(.text+0x614): undefined reference to `func_80240870_D8D5E0' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x618): undefined reference to `func_80240870_D8D5E0' +src/world/area_pra/pra_35/D8D270.c:(.text+0x640): undefined reference to `func_8024068C_D8D3FC' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x644): undefined reference to `func_8024068C_D8D3FC' +src/world/area_pra/pra_35/D8D270.c:(.text+0xd70): undefined reference to `func_80240E84_D8D3B8' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xd74): undefined reference to `func_80240E84_D8D3B8' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xd80): undefined reference to `func_80240EEC_D8D420' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xd84): undefined reference to `func_80240EEC_D8D420' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xda8): undefined reference to `func_80240EB8_D8D3EC' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0xdac): undefined reference to `func_80240EB8_D8D3EC' +src/world/area_pra/pra_35/D8D270.c:(.text+0x1ca8): undefined reference to `func_80241320_D8E570' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x1ce8): undefined reference to `func_80241650_D8E8A0' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x1cf8): undefined reference to `func_802416C4_D8E914' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x1d38): undefined reference to `func_8024198C_D8EBDC' +src/world/area_pra/pra_35/D8D270.c:(.text+0x2560): undefined reference to `func_80241320_D8E570' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x25a0): undefined reference to `func_80241650_D8E8A0' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x25b0): undefined reference to `func_802416C4_D8E914' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x25f0): undefined reference to `func_8024198C_D8EBDC' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2600): undefined reference to `func_80241DB0_D8F000' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2608): undefined reference to `func_80241E1C_D8F06C' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2620): undefined reference to `func_80241E8C_D8F0DC' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x2638): undefined reference to `func_80241F64_D8F1B4' +src/world/area_pra/pra_35/D8D270.c:(.text+0x282c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28b4): undefined reference to `func_80241DB0_D8F000' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28bc): undefined reference to `func_80241E1C_D8F06C' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28d4): undefined reference to `func_80241E8C_D8F0DC' +mips-linux-gnu-ld: src/world/area_pra/pra_35/D8D270.c:(.text+0x28ec): undefined reference to `func_80241F64_D8F1B4' +src/world/area_pra/pra_36/D91700.c:(.text+0x128): undefined reference to `func_80240158_D9173C' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0x12c): undefined reference to `func_80240158_D9173C' +src/world/area_pra/pra_36/D91700.c:(.text+0x1e4): undefined reference to `func_80240050_D91750' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0x2f0): undefined reference to `func_80240320_D918C8' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0x2f4): undefined reference to `func_80240320_D918C8' +src/world/area_pra/pra_36/D91700.c:(.text+0x4f0): undefined reference to `func_80240530_D91764' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0x4f4): undefined reference to `func_80240530_D91764' +src/world/area_pra/pra_36/D91700.c:(.text+0x664): undefined reference to `func_802408A0_D91A70' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0x668): undefined reference to `func_802408A0_D91A70' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0x690): undefined reference to `func_802406BC_D9188C' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0x694): undefined reference to `func_802406BC_D9188C' +src/world/area_pra/pra_36/D91700.c:(.text+0xdc0): undefined reference to `func_80240EB4_D91848' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdc4): undefined reference to `func_80240EB4_D91848' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdd0): undefined reference to `func_80240F1C_D918B0' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdd4): undefined reference to `func_80240F1C_D918B0' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdf8): undefined reference to `func_80240EE8_D9187C' +mips-linux-gnu-ld: src/world/area_pra/pra_36/D91700.c:(.text+0xdfc): undefined reference to `func_80240EE8_D9187C' +src/world/area_pra/pra_37/D92F40.c:(.text+0x128): undefined reference to `func_80240158_D92F7C' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x12c): undefined reference to `func_80240158_D92F7C' +src/world/area_pra/pra_37/D92F40.c:(.text+0x1e4): undefined reference to `func_80240050_D92F90' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x2f0): undefined reference to `func_80240320_D93108' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x2f4): undefined reference to `func_80240320_D93108' +src/world/area_pra/pra_37/D92F40.c:(.text+0x4f0): undefined reference to `func_80240530_D92FA4' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x4f4): undefined reference to `func_80240530_D92FA4' +src/world/area_pra/pra_37/D92F40.c:(.text+0x664): undefined reference to `func_802408A0_D932B0' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x668): undefined reference to `func_802408A0_D932B0' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x690): undefined reference to `func_802406BC_D930CC' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x694): undefined reference to `func_802406BC_D930CC' +src/world/area_pra/pra_37/D92F40.c:(.text+0xdc0): undefined reference to `func_80240EB4_D93088' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdc4): undefined reference to `func_80240EB4_D93088' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdd0): undefined reference to `func_80240F1C_D930F0' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdd4): undefined reference to `func_80240F1C_D930F0' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdf8): undefined reference to `func_80240EE8_D930BC' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0xdfc): undefined reference to `func_80240EE8_D930BC' +src/world/area_pra/pra_37/D92F40.c:(.text+0x1720): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17a8): undefined reference to `func_80240F50_D93E90' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17b0): undefined reference to `func_80240FBC_D93EFC' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17c8): undefined reference to `func_8024102C_D93F6C' +mips-linux-gnu-ld: src/world/area_pra/pra_37/D92F40.c:(.text+0x17e0): undefined reference to `func_80241104_D94044' +src/world/area_pra/pra_38/D955F0.c:(.text+0x128): undefined reference to `func_80240158_D9562C' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0x12c): undefined reference to `func_80240158_D9562C' +src/world/area_pra/pra_38/D955F0.c:(.text+0x1e4): undefined reference to `func_80240050_D95640' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0x2f0): undefined reference to `func_80240320_D957B8' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0x2f4): undefined reference to `func_80240320_D957B8' +src/world/area_pra/pra_38/D955F0.c:(.text+0x4f0): undefined reference to `func_80240530_D95654' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0x4f4): undefined reference to `func_80240530_D95654' +src/world/area_pra/pra_38/D955F0.c:(.text+0x664): undefined reference to `func_802408A0_D95960' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0x668): undefined reference to `func_802408A0_D95960' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0x690): undefined reference to `func_802406BC_D9577C' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0x694): undefined reference to `func_802406BC_D9577C' +src/world/area_pra/pra_38/D955F0.c:(.text+0xdc0): undefined reference to `func_80240EB4_D95738' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdc4): undefined reference to `func_80240EB4_D95738' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdd0): undefined reference to `func_80240F1C_D957A0' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdd4): undefined reference to `func_80240F1C_D957A0' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdf8): undefined reference to `func_80240EE8_D9576C' +mips-linux-gnu-ld: src/world/area_pra/pra_38/D955F0.c:(.text+0xdfc): undefined reference to `func_80240EE8_D9576C' +src/world/area_pra/pra_39/D97890.c:(.text+0x128): undefined reference to `func_80240158_D978CC' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0x12c): undefined reference to `func_80240158_D978CC' +src/world/area_pra/pra_39/D97890.c:(.text+0x1e4): undefined reference to `func_80240050_D978E0' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0x2f0): undefined reference to `func_80240320_D97A58' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0x2f4): undefined reference to `func_80240320_D97A58' +src/world/area_pra/pra_39/D97890.c:(.text+0x4f0): undefined reference to `func_80240530_D978F4' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0x4f4): undefined reference to `func_80240530_D978F4' +src/world/area_pra/pra_39/D97890.c:(.text+0x664): undefined reference to `func_802408A0_D97C00' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0x668): undefined reference to `func_802408A0_D97C00' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0x690): undefined reference to `func_802406BC_D97A1C' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0x694): undefined reference to `func_802406BC_D97A1C' +src/world/area_pra/pra_39/D97890.c:(.text+0xdc0): undefined reference to `func_80240EB4_D979D8' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdc4): undefined reference to `func_80240EB4_D979D8' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdd0): undefined reference to `func_80240F1C_D97A40' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdd4): undefined reference to `func_80240F1C_D97A40' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdf8): undefined reference to `func_80240EE8_D97A0C' +mips-linux-gnu-ld: src/world/area_pra/pra_39/D97890.c:(.text+0xdfc): undefined reference to `func_80240EE8_D97A0C' +src/world/area_pra/pra_40/D999D0.c:(.text+0xd8): undefined reference to `func_80240128_D99A0C' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xdc): undefined reference to `func_80240128_D99A0C' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0x194): undefined reference to `func_80240020_D999D0' +src/world/area_pra/pra_40/D999D0.c:(.text+0x2a0): undefined reference to `func_802402F0_D99B98' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0x2a4): undefined reference to `func_802402F0_D99B98' +src/world/area_pra/pra_40/D999D0.c:(.text+0x4a0): undefined reference to `func_80240500_D99A34' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0x4a4): undefined reference to `func_80240500_D99A34' +src/world/area_pra/pra_40/D999D0.c:(.text+0x614): undefined reference to `func_80240870_D99D40' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0x618): undefined reference to `func_80240870_D99D40' +src/world/area_pra/pra_40/D999D0.c:(.text+0x640): undefined reference to `func_8024068C_D99B5C' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0x644): undefined reference to `func_8024068C_D99B5C' +src/world/area_pra/pra_40/D999D0.c:(.text+0xd70): undefined reference to `func_80240E84_D99B18' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xd74): undefined reference to `func_80240E84_D99B18' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xd80): undefined reference to `func_80240EEC_D99B80' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xd84): undefined reference to `func_80240EEC_D99B80' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xda8): undefined reference to `func_80240EB8_D99B4C' +mips-linux-gnu-ld: src/world/area_pra/pra_40/D999D0.c:(.text+0xdac): undefined reference to `func_80240EB8_D99B4C' +src/world/area_omo/omo_01/D9B150.c:(.text+0x90c): undefined reference to `func_80049B44' +src/world/area_omo/omo_02/D9D510.c:(.text+0xd7c): undefined reference to `func_80049B44' +src/world/area_omo/omo_02/D9D510.c:(.text+0x1850): undefined reference to `func_802410B0_D9E580' +mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x1860): undefined reference to `func_80241110_D9E5E0' +mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x1888): undefined reference to `func_802412B8_D9E788' +mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x18a0): undefined reference to `func_802413D4_D9E8A4' +src/world/area_omo/omo_02/D9D510.c:(.text+0x29bc): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x2abc): undefined reference to `func_80241D7C_D9F24C' +mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x2acc): undefined reference to `func_80241DC0_D9F290' +mips-linux-gnu-ld: src/world/area_omo/omo_02/D9D510.c:(.text+0x2adc): undefined reference to `func_80241E60_D9F330' +src/world/area_omo/omo_04/DAD400.c:(.text+0x17e8): undefined reference to `func_80240B78_DADF78' +mips-linux-gnu-ld: src/world/area_omo/omo_04/DAD400.c:(.text+0x1810): undefined reference to `func_80240F7C_DAE37C' +mips-linux-gnu-ld: src/world/area_omo/omo_04/DAD400.c:(.text+0x1850): undefined reference to `func_80241194_DAE594' +src/world/area_omo/omo_04/DAD400.c:(.text+0x1ce4): undefined reference to `func_80049B44' +src/world/area_omo/omo_05/DB22C0.c:(.text+0x44c): undefined reference to `func_80049B44' +src/world/area_omo/omo_05/DB22C0.c:(.text+0x994): undefined reference to `func_8024056C_DB282C' +src/world/area_omo/omo_05/DB22C0.c:(.text+0x1e9c): undefined reference to `func_8024122C_DB34EC' +mips-linux-gnu-ld: src/world/area_omo/omo_05/DB22C0.c:(.text+0x1ec4): undefined reference to `func_80241630_DB38F0' +mips-linux-gnu-ld: src/world/area_omo/omo_05/DB22C0.c:(.text+0x1f04): undefined reference to `func_80241848_DB3B08' +src/world/area_omo/omo_07/DBD2B0.c:(.text+0x44c): undefined reference to `func_80049B44' +src/world/area_omo/omo_07/DBD2B0.c:(.text+0x1314): undefined reference to `func_8024096C_DBDC1C' +mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x1354): undefined reference to `func_80240C9C_DBDF4C' +mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x1364): undefined reference to `func_80240D10_DBDFC0' +mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x13a4): undefined reference to `func_80240FD8_DBE288' +src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x1848): undefined reference to `func_8024096C_DBDC1C' +mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x1888): undefined reference to `func_80240C9C_DBDF4C' +mips-linux-gnu-ld: src/world/common/UnkNpcAIFunc1.inc.c:(.text+0x1898): undefined reference to `func_80240D10_DBDFC0' +src/world/area_omo/omo_07/DBD2B0.c:(.text+0x2dc0): undefined reference to `func_80242150_DBF400' +mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x2de8): undefined reference to `func_80242554_DBF804' +mips-linux-gnu-ld: src/world/area_omo/omo_07/DBD2B0.c:(.text+0x2e28): undefined reference to `func_8024276C_DBFA1C' +src/world/area_omo/omo_08/DC4C40.c:(.text+0x44c): undefined reference to `func_80049B44' +src/world/area_omo/omo_09/DCD6B0.c:(.text+0x44c): undefined reference to `func_80049B44' +src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1314): undefined reference to `func_8024134C_DCE01C' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1354): undefined reference to `func_8024167C_DCE34C' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1364): undefined reference to `func_802416F0_DCE3C0' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x13a4): undefined reference to `func_802419B8_DCE688' +src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1848): undefined reference to `func_8024134C_DCE01C' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1888): undefined reference to `func_8024167C_DCE34C' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x1898): undefined reference to `func_802416F0_DCE3C0' +src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2a2c): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2b2c): undefined reference to `func_8024278C_DCF45C' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2b3c): undefined reference to `func_802427D0_DCF4A0' +mips-linux-gnu-ld: src/world/area_omo/omo_09/DCD6B0.c:(.text+0x2b4c): undefined reference to `func_80242870_DCF540' +src/world/area_omo/omo_13/DE2710.c:(.text+0x44c): undefined reference to `func_80049B44' +src/world/area_omo/omo_13/DE2710.c:(.text+0x994): undefined reference to `func_802407EC_DE2C7C' +src/world/area_omo/omo_17/DEF400.c:(.text+0x44c): undefined reference to `func_80049B44' +src/world/area_omo/omo_17/DEF400.c:(.text+0x994): undefined reference to `func_80240ACC_DEF96C' +src/world/area_omo/omo_17/DEF400.c:(.text+0x1e9c): undefined reference to `func_8024178C_DF062C' +mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x1ec4): undefined reference to `func_80241B90_DF0A30' +mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x1f04): undefined reference to `func_80241DA8_DF0C48' +src/world/area_omo/omo_17/DEF400.c:(.text+0x3000): undefined reference to `func_80049B44' +mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x3110): undefined reference to `func_80242924_DF17C4' +mips-linux-gnu-ld: src/world/area_omo/omo_17/DEF400.c:(.text+0x3120): undefined reference to `func_802429C4_DF1864' +src/world/area_end/end_00/DF6A20.c:(.text+0x24f0): undefined reference to `func_802421D8_DF66F8' +mips-linux-gnu-ld: src/world/area_end/end_00/DF6A20.c:(.text+0x24f4): undefined reference to `func_802421D8_DF66F8' +src/world/area_end/end_01/E05390.c:(.text+0x24f0): undefined reference to `func_802421E8_E05068' +mips-linux-gnu-ld: src/world/area_end/end_01/E05390.c:(.text+0x24f4): undefined reference to `func_802421E8_E05068' +src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x1088): undefined reference to `func_802406E0_E0EE80' +mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x10c8): undefined reference to `func_80240A10_E0F1B0' +mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x10d8): undefined reference to `func_80240A84_E0F224' +mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0E7A0.c:(.text+0x1118): undefined reference to `func_80240D4C_E0F4EC' +src/world/area_mgm/mgm_00/E0F980.c:(.text+0x4ec): undefined reference to `func_80241540_E0F800' +mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0F980.c:(.text+0x4f0): undefined reference to `func_80241540_E0F800' +src/world/area_mgm/mgm_00/E0F980.c:(.text+0x558): undefined reference to `func_802416C0_E0F948' +mips-linux-gnu-ld: src/world/area_mgm/mgm_00/E0F980.c:(.text+0x55c): undefined reference to `func_802416C0_E0F948' +src/world/area_mgm/mgm_01/E12930.c:(.text+0x200): undefined reference to `func_802401D0_E1273C' +mips-linux-gnu-ld: src/world/area_mgm/mgm_01/E12930.c:(.text+0x204): undefined reference to `func_802401D0_E1273C' +src/world/area_mgm/mgm_01/E12930.c:(.text+0x1444): undefined reference to `func_802403C4_E11708' +mips-linux-gnu-ld: src/world/area_mgm/mgm_01/E12930.c:(.text+0x1448): undefined reference to `func_802403C4_E11708' +src/world/area_mgm/mgm_02/E15D80.c:(.text+0x43c): undefined reference to `func_80240000_E15950' +mips-linux-gnu-ld: src/world/area_mgm/mgm_02/E15D80.c:(.text+0x440): undefined reference to `func_80240000_E15950' +src/world/area_mgm/mgm_02/E15D80.c:(.text+0x494): undefined reference to `func_80240430_E15D48' +mips-linux-gnu-ld: src/world/area_mgm/mgm_02/E15D80.c:(.text+0x498): undefined reference to `func_80240430_E15D48' +src/code_E225B0.c:(.text+0x344): undefined reference to `func_802B735C_E2264C' +mips-linux-gnu-ld: src/code_E225B0.c:(.text+0x348): undefined reference to `func_802B735C_E2264C' diff --git a/out2.txt b/out2.txt new file mode 100644 index 0000000000..41e7914d27 --- /dev/null +++ b/out2.txt @@ -0,0 +1,831 @@ +func_80240000_984E30 : isk_08 +func_80240000_997F70 : isk_18 +func_80240000_9F4A40 : nok_11 +func_80240000_B59870 : jan_07 +func_80240000_BD3494 : obk_08 +func_80240000_C2EBA0 : dgb_02 +func_80240000_C3DBF0 : dgb_07 +func_80240000_C46BE0 : dgb_09 +func_80240000_C4F510 : dgb_15 +func_80240000_C52540 : dgb_16 +func_80240000_D187E0 : sam_05 +func_80240000_E15950 : mgm_02 +func_80240010_8FEC90 : kmr_21 +func_80240020_9AE31C : trd_05 +func_80240020_D4D060 : pra_01 +func_80240020_D50010 : pra_02 +func_80240020_D55BD0 : pra_05 +func_80240020_D588B0 : pra_09 +func_80240020_D5F2D0 : pra_10 +func_80240020_D61520 : pra_11 +func_80240020_D64600 : pra_13 +func_80240020_D67D20 : pra_14 +func_80240020_D69B40 : pra_16 +func_80240020_D6B640 : pra_18 +func_80240020_D6E9D0 : pra_19 +func_80240020_D763C0 : pra_20 +func_80240020_D7CB70 : pra_29 +func_80240020_D89700 : pra_33 +func_80240020_D8B3D0 : pra_34 +func_80240020_D8D270 : pra_35 +func_80240020_D999D0 : pra_40 +func_80240040_97B670 : isk_04 +func_80240050_D11110 : sam_03 +func_80240050_D57480 : pra_06 +func_80240050_D62D60 : pra_12 +func_80240050_D79A40 : pra_27 +func_80240050_D7B2F0 : pra_28 +func_80240050_D91750 : pra_36 +func_80240050_D92F90 : pra_37 +func_80240050_D95640 : pra_38 +func_80240050_D978E0 : pra_39 +func_80240060_C3AA70 : dgb_05 +func_80240068_AF77BC : kkj_19 +func_8024006C_C2EC0C : dgb_02 +func_8024006C_C3DC5C : dgb_07 +func_8024006C_C46C4C : dgb_09 +func_8024006C_C4F57C : dgb_15 +func_8024006C_C525AC : dgb_16 +func_8024006C_D1884C : sam_05 +func_80240070_BA07A0 : mim_05 +func_802400A0_9A46F0 : trd_03 +func_802400BC_D1117C : sam_03 +func_802400CC_C3AADC : dgb_05 +func_802400DC_BA080C : mim_05 +func_802400DC_C2EC7C : dgb_02 +func_802400DC_C3DCCC : dgb_07 +func_802400DC_C46CBC : dgb_09 +func_802400DC_C4F5EC : dgb_15 +func_802400DC_C5261C : dgb_16 +func_802400DC_D188BC : sam_05 +func_802400E0_9A10C0 : trd_02 +func_80240100_B1CB14 : tst_11 +func_80240128_D4D09C : pra_01 +func_80240128_D5004C : pra_02 +func_80240128_D55C0C : pra_05 +func_80240128_D588EC : pra_09 +func_80240128_D5F30C : pra_10 +func_80240128_D6155C : pra_11 +func_80240128_D6463C : pra_13 +func_80240128_D67D5C : pra_14 +func_80240128_D69B7C : pra_16 +func_80240128_D6B67C : pra_18 +func_80240128_D6EA0C : pra_19 +func_80240128_D763FC : pra_20 +func_80240128_D7CBAC : pra_29 +func_80240128_D8973C : pra_33 +func_80240128_D8B40C : pra_34 +func_80240128_D8D2AC : pra_35 +func_80240128_D99A0C : pra_40 +func_8024012C_D111EC : sam_03 +func_8024013C_C3AB4C : dgb_05 +func_8024014C_BA087C : mim_05 +func_80240158_D5746C : pra_06 +func_80240158_D62D4C : pra_12 +func_80240158_D79A2C : pra_27 +func_80240158_D7B2DC : pra_28 +func_80240158_D9173C : pra_36 +func_80240158_D92F7C : pra_37 +func_80240158_D9562C : pra_38 +func_80240158_D978CC : pra_39 +func_80240160_A470C0 : kpa_01 +func_80240160_A48720 : kpa_03 +func_802401B0_984FE0 : isk_08 +func_802401B0_998120 : isk_18 +func_802401B0_9F4BF0 : nok_11 +func_802401B0_A9CDE0 : kpa_113 +func_802401B4_C2ED54 : dgb_02 +func_802401B4_C3DDA4 : dgb_07 +func_802401B4_C46D94 : dgb_09 +func_802401B4_C4F6C4 : dgb_15 +func_802401B4_C526F4 : dgb_16 +func_802401B4_D18994 : sam_05 +func_802401C0_A02A00 : nok_14 +func_802401D0_E1273C : mgm_01 +func_802401D4_8D3F94 : kmr_07 +func_802401D4_9C55B4 : nok_01 +func_802401F0_97B820 : isk_04 +func_80240204_D112C4 : sam_03 +func_80240214_B59A84 : jan_07 +func_80240214_C3AC24 : dgb_05 +func_80240224_BA0954 : mim_05 +func_80240234_8D3FF4 : kmr_07 +func_80240234_9C5614 : nok_01 +func_80240250_9A48A0 : trd_03 +func_80240250_C31730 : dgb_03 +func_80240280_B59AF0 : jan_07 +func_80240290_9A1270 : trd_02 +func_8024029C_B1B5AC : tst_04 +func_802402BC_C3179C : dgb_03 +func_802402F0_B59B60 : jan_07 +func_802402F0_D4D228 : pra_01 +func_802402F0_D501D8 : pra_02 +func_802402F0_D55D98 : pra_05 +func_802402F0_D58A78 : pra_09 +func_802402F0_D5F498 : pra_10 +func_802402F0_D616E8 : pra_11 +func_802402F0_D647C8 : pra_13 +func_802402F0_D67EE8 : pra_14 +func_802402F0_D69D08 : pra_16 +func_802402F0_D6B808 : pra_18 +func_802402F0_D6EB98 : pra_19 +func_802402F0_D76588 : pra_20 +func_802402F0_D7CD38 : pra_29 +func_802402F0_D898C8 : pra_33 +func_802402F0_D8B598 : pra_34 +func_802402F0_D8D438 : pra_35 +func_802402F0_D99B98 : pra_40 +func_802402F4_B1CA8C : tst_11 +func_80240310_9B168C : trd_06 +func_80240310_9B6C90 : trd_07 +func_80240310_A47270 : kpa_01 +func_80240310_A488D0 : kpa_03 +func_80240310_A52BD0 : kpa_11 +func_80240310_A6E6F0 : kpa_61 +func_80240310_A74B80 : kpa_70 +func_80240310_B06934 : kkj_25 +func_80240310_C61020 : kzn_03 +func_80240310_C85DC0 : kzn_17 +func_80240314_985144 : isk_08 +func_80240314_998284 : isk_18 +func_80240314_9F4D54 : nok_11 +func_80240320_D575F8 : pra_06 +func_80240320_D62ED8 : pra_12 +func_80240320_D79BB8 : pra_27 +func_80240320_D7B468 : pra_28 +func_80240320_D918C8 : pra_36 +func_80240320_D93108 : pra_37 +func_80240320_D957B8 : pra_38 +func_80240320_D97A58 : pra_39 +func_8024032C_C3180C : dgb_03 +func_80240354_97B984 : isk_04 +func_80240360_A9CF90 : kpa_113 +func_80240360_B1B634 : tst_04 +func_80240370_A02BB0 : nok_14 +func_8024037C_C85E2C : kzn_17 +func_80240394_CEE5F4 : flo_23 +func_802403B4_9A4A04 : trd_03 +func_802403B8_B1CB14 : tst_11 +func_802403C4_E11708 : mgm_01 +func_802403C8_B59C38 : jan_07 +func_802403D0_D37BD0 : sam_10 +func_802403DC_8D419C : kmr_07 +func_802403DC_9C57BC : nok_01 +func_802403EC_C85E9C : kzn_17 +func_802403F0_99CD80 : trd_01 +func_802403F4_9A13D4 : trd_02 +func_80240400_A86E50 : kpa_91 +func_80240400_AC5570 : kkj_01 +func_80240400_B84580 : jan_22 +func_80240400_BDF190 : arn_03 +func_80240400_BE3BB0 : arn_04 +func_80240400_BE7FE0 : arn_05 +func_80240400_C401B0 : dgb_08 +func_80240400_C56340 : dgb_18 +func_80240404_C318E4 : dgb_03 +func_80240430_E15D48 : mgm_02 +func_80240434_A60E04 : kpa_50 +func_8024043C_D37C3C : sam_10 +func_80240440_C9E360 : flo_00 +func_80240474_A473D4 : kpa_01 +func_80240474_A48A34 : kpa_03 +func_80240478_A60E48 : kpa_50 +func_80240490_A07390 : nok_15 +func_802404AC_D37CAC : sam_10 +func_802404B0_9A88A0 : trd_04 +func_802404B0_ABB740 : kkj_00 +func_802404C0_9B6E40 : trd_07 +func_802404C0_A52D80 : kpa_11 +func_802404C0_A6E8A0 : kpa_61 +func_802404C0_A74D30 : kpa_70 +func_802404C0_B73570 : jan_12 +func_802404C0_C611D0 : kzn_03 +func_802404C4_A9D0F4 : kpa_113 +func_802404C4_C85F74 : kzn_17 +func_802404D4_A02D14 : nok_14 +func_802404D4_A4F4D4 : kpa_09 +func_802404E0_A8CF60 : kpa_95 +func_802404F8_8D42B8 : kmr_07 +func_802404F8_9C58D8 : nok_01 +func_80240500_B93940 : mim_01 +func_80240500_D4D0C4 : pra_01 +func_80240500_D50074 : pra_02 +func_80240500_D55C34 : pra_05 +func_80240500_D58914 : pra_09 +func_80240500_D5F334 : pra_10 +func_80240500_D61584 : pra_11 +func_80240500_D64664 : pra_13 +func_80240500_D67D84 : pra_14 +func_80240500_D69BA4 : pra_16 +func_80240500_D6B6A4 : pra_18 +func_80240500_D6EA34 : pra_19 +func_80240500_D76424 : pra_20 +func_80240500_D7CBD4 : pra_29 +func_80240500_D89764 : pra_33 +func_80240500_D8B434 : pra_34 +func_80240500_D8D2D4 : pra_35 +func_80240500_D99A34 : pra_40 +func_80240514_A67614 : kpa_52 +func_80240518_A4F518 : kpa_09 +func_80240518_A60EE8 : kpa_50 +func_80240530_D57494 : pra_06 +func_80240530_D62D74 : pra_12 +func_80240530_D79A54 : pra_27 +func_80240530_D7B304 : pra_28 +func_80240530_D91764 : pra_36 +func_80240530_D92FA4 : pra_37 +func_80240530_D95654 : pra_38 +func_80240530_D978F4 : pra_39 +func_80240544_8DA644 : kmr_11 +func_80240544_93FAF4 : sbk_30 +func_80240544_CEE7A4 : flo_23 +func_80240558_A67658 : kpa_52 +func_80240568_97E038 : isk_05 +func_80240568_98FD48 : isk_13 +func_80240568_992C98 : isk_14 +func_80240568_9EBD58 : nok_03 +func_80240568_A00B68 : nok_13 +func_8024056C_8FF31C : kmr_22 +func_8024056C_B939AC : mim_01 +func_8024056C_DB282C : omo_05 +func_80240570_9FAD60 : nok_12 +func_80240570_BA4CF0 : mim_06 +func_80240574_B1B5D4 : tst_04 +func_80240584_D37D84 : sam_10 +func_802405A0_99CF30 : trd_01 +func_802405A4_8DA6A4 : kmr_11 +func_802405A4_93FB54 : sbk_30 +func_802405A4_A99B34 : kpa_111 +func_802405A4_A9F2E4 : kpa_115 +func_802405B0_B1B4F8 : tst_04 +func_802405B8_A4F5B8 : kpa_09 +func_802405BC_8EBD44 : kmr_20 +func_802405D4_B1B51C : tst_04 +func_802405D8_B981D8 : mim_02 +func_802405DC_B93A1C : mim_01 +func_802405DC_BA4D5C : mim_06 +func_802405E8_A99B78 : kpa_111 +func_802405E8_A9F328 : kpa_115 +func_802405F4_A074F4 : nok_15 +func_802405F8_A676F8 : kpa_52 +func_80240608_BB3408 : mim_09 +func_80240624_9B6FA4 : trd_07 +func_80240624_A52EE4 : kpa_11 +func_80240624_A6EA04 : kpa_61 +func_80240624_A74E94 : kpa_70 +func_80240624_C61334 : kzn_03 +func_8024064C_BA4DCC : mim_06 +func_80240650_D2C380 : sam_07 +func_80240660_9A8A50 : trd_04 +func_80240688_A99C18 : kpa_111 +func_80240688_A9F3C8 : kpa_115 +func_8024068C_D4D1EC : pra_01 +func_8024068C_D5019C : pra_02 +func_8024068C_D55D5C : pra_05 +func_8024068C_D58A3C : pra_09 +func_8024068C_D5F45C : pra_10 +func_8024068C_D616AC : pra_11 +func_8024068C_D6478C : pra_13 +func_8024068C_D67EAC : pra_14 +func_8024068C_D69CCC : pra_16 +func_8024068C_D6B7CC : pra_18 +func_8024068C_D6EB5C : pra_19 +func_8024068C_D7654C : pra_20 +func_8024068C_D7CCFC : pra_29 +func_8024068C_D8988C : pra_33 +func_8024068C_D8B55C : pra_34 +func_8024068C_D8D3FC : pra_35 +func_8024068C_D99B5C : pra_40 +func_802406A0_AF7BDC : kkj_19 +func_802406A8_CEE908 : flo_23 +func_802406B4_B93AF4 : mim_01 +func_802406BC_D2C3EC : sam_07 +func_802406BC_D575BC : pra_06 +func_802406BC_D62E9C : pra_12 +func_802406BC_D79B7C : pra_27 +func_802406BC_D7B42C : pra_28 +func_802406BC_D9188C : pra_36 +func_802406BC_D930CC : pra_37 +func_802406BC_D9577C : pra_38 +func_802406BC_D97A1C : pra_39 +func_802406CC_96952C : dro_02 +func_802406D0_8A6150 : tik_24 +func_802406D4_B73784 : jan_12 +func_802406E0_E0EE80 : mgm_00 +func_80240704_99D094 : trd_01 +func_80240720_9FAF10 : nok_12 +func_80240724_BA4EA4 : mim_06 +func_8024072C_D2C45C : sam_07 +func_80240730_A87180 : kpa_91 +func_80240730_AC58A0 : kkj_01 +func_80240730_B1CAAC : tst_11 +func_80240730_B848B0 : jan_22 +func_80240730_BDF4C0 : arn_03 +func_80240730_BE3EE0 : arn_04 +func_80240730_BE8310 : arn_05 +func_80240730_C404E0 : dgb_08 +func_80240730_C56670 : dgb_18 +func_80240740_B737F0 : jan_12 +func_80240744_A93E84 : kpa_102 +func_8024074C_8DA84C : kmr_11 +func_8024074C_93FCFC : sbk_30 +func_8024075C_8B00DC : kmr_02 +func_80240768_B9E0C8 : mim_04 +func_80240770_C9E690 : flo_00 +func_80240788_A93EC8 : kpa_102 +func_802407A4_A871F4 : kpa_91 +func_802407A4_AC5914 : kkj_01 +func_802407A4_B84924 : jan_22 +func_802407A4_BDF534 : arn_03 +func_802407A4_BE3F54 : arn_04 +func_802407A4_BE8384 : arn_05 +func_802407A4_C40554 : dgb_08 +func_802407A4_C566E4 : dgb_18 +func_802407B0_B73860 : jan_12 +func_802407C4_9A8BB4 : trd_04 +func_802407D8_8CE848 : kmr_05 +func_802407D8_8D1CE8 : kmr_06 +func_802407D8_8D65D8 : kmr_09 +func_802407D8_BAA918 : mim_07 +func_802407D8_C36D08 : dgb_04 +func_802407E0_ABBA70 : kkj_00 +func_802407E4_C9E704 : flo_00 +func_802407EC_DE2C7C : omo_13 +func_80240804_D2C534 : sam_07 +func_80240810_A8D290 : kpa_95 +func_80240818_CF33E8 : flo_25 +func_80240828_A93F68 : kpa_102 +func_8024082C_84309C : mac_04 +func_80240830_B2CCA0 : jan_02 +func_80240848_CD7B28 : flo_17 +func_80240854_ABBAE4 : kkj_00 +func_80240868_8DA968 : kmr_11 +func_80240868_93FE18 : sbk_30 +func_80240870_D4D3D0 : pra_01 +func_80240870_D50380 : pra_02 +func_80240870_D55F40 : pra_05 +func_80240870_D58C20 : pra_09 +func_80240870_D5F640 : pra_10 +func_80240870_D61890 : pra_11 +func_80240870_D64970 : pra_13 +func_80240870_D68090 : pra_14 +func_80240870_D69EB0 : pra_16 +func_80240870_D6B9B0 : pra_18 +func_80240870_D6ED40 : pra_19 +func_80240870_D76730 : pra_20 +func_80240870_D7CEE0 : pra_29 +func_80240870_D89A70 : pra_33 +func_80240870_D8B740 : pra_34 +func_80240870_D8D5E0 : pra_35 +func_80240870_D99D40 : pra_40 +func_80240878_B6CC08 : jan_10 +func_80240878_BAE1B8 : mim_08 +func_8024087C_831B8C : mac_03 +func_80240880_8A6300 : tik_24 +func_80240884_9FB074 : nok_12 +func_80240884_A8D304 : kpa_95 +func_80240888_B73938 : jan_12 +func_80240890_852A00 : mac_05 +func_802408A0_D577A0 : pra_06 +func_802408A0_D63080 : pra_12 +func_802408A0_D79D60 : pra_27 +func_802408A0_D7B610 : pra_28 +func_802408A0_D91A70 : pra_36 +func_802408A0_D932B0 : pra_37 +func_802408A0_D95960 : pra_38 +func_802408A0_D97C00 : pra_39 +func_802408A8_B288D8 : jan_01 +func_802408F8_BFE178 : dgb_01 +func_80240940_B663F0 : jan_09 +func_80240954_910004 : iwa_01 +func_80240960_89ACB0 : tik_20 +func_80240960_8A2D30 : tik_23 +func_8024096C_DBDC1C : omo_07 +func_80240998_910048 : iwa_01 +func_8024099C_CC41AC : flo_13 +func_802409E0_95BBE0 : dro_01 +func_802409E4_8A6464 : tik_24 +func_802409FC_7EB3AC : mac_00 +func_80240A10_E0F1B0 : mgm_00 +func_80240A20_B355F0 : jan_03 +func_80240A28_B7AA78 : jan_14 +func_80240A38_9100E8 : iwa_01 +func_80240A6C_A874BC : kpa_91 +func_80240A6C_AC5BDC : kkj_01 +func_80240A6C_B84BEC : jan_22 +func_80240A6C_BCE9F4 : obk_07 +func_80240A6C_BDF7FC : arn_03 +func_80240A6C_BE421C : arn_04 +func_80240A6C_BE864C : arn_05 +func_80240A6C_C4081C : dgb_08 +func_80240A6C_C569AC : dgb_18 +func_80240A84_E0F224 : mgm_00 +func_80240AAC_C9E9CC : flo_00 +func_80240ACC_CF7EEC : sam_01 +func_80240ACC_DEF96C : omo_17 +func_80240AF8_CB5AF8 : flo_09 +func_80240B00_8FF864 : kmr_22 +func_80240B10_89AE60 : tik_20 +func_80240B10_8A2EE0 : tik_23 +func_80240B1C_ABBDAC : kkj_00 +func_80240B4C_A8D5CC : kpa_95 +func_80240B54_B66604 : jan_09 +func_80240B60_B2CFD0 : jan_02 +func_80240B78_DADF78 : omo_04 +func_80240B9C_D3AE0C : sam_11 +func_80240BAC_97E67C : isk_05 +func_80240BAC_99038C : isk_13 +func_80240BAC_9932DC : isk_14 +func_80240BAC_9EC39C : nok_03 +func_80240BAC_A011AC : nok_13 +func_80240BC0_852D30 : mac_05 +func_80240BC0_B66670 : jan_09 +func_80240BD4_B2D044 : jan_02 +func_80240BDC_8CEC4C : kmr_05 +func_80240BDC_8D20EC : kmr_06 +func_80240BDC_8D69DC : kmr_09 +func_80240BDC_C3710C : dgb_04 +func_80240BE0_882DA0 : tik_09 +func_80240BF8_C61908 : kzn_03 +func_80240C1C_B9881C : mim_02 +func_80240C1C_CF37EC : flo_25 +func_80240C30_B666E0 : jan_09 +func_80240C34_852DA4 : mac_05 +func_80240C38_C80DD8 : kzn_11 +func_80240C4C_9169BC : iwa_02 +func_80240C4C_BB3A4C : mim_09 +func_80240C4C_BDDDFC : arn_02 +func_80240C4C_CD7F2C : flo_17 +func_80240C64_C61974 : kzn_03 +func_80240C74_89AFC4 : tik_20 +func_80240C74_8A3044 : tik_23 +func_80240C7C_BAE5BC : mim_08 +func_80240C9C_DBDF4C : omo_07 +func_80240CA8_B534D8 : jan_06 +func_80240CB4_9A1C94 : trd_02 +func_80240CB8_C5B3F8 : kzn_02 +func_80240CCC_91C5AC : iwa_04 +func_80240CD0_C501E0 : dgb_15 +func_80240CD4_C619E4 : kzn_03 +func_80240CFC_BFE57C : dgb_01 +func_80240D08_B667B8 : jan_09 +func_80240D10_95BF10 : dro_01 +func_80240D10_DBDFC0 : omo_07 +func_80240D28_D20BB8 : sam_06 +func_80240D30_823FF0 : mac_02 +func_80240D40_D309C0 : sam_08 +func_80240D44_882F04 : tik_09 +func_80240D4C_E0F4EC : mgm_00 +func_80240D50_B35920 : jan_03 +func_80240D84_95BF84 : dro_01 +func_80240DA0_CC45B0 : flo_13 +func_80240DA4_9087A4 : kmr_23 +func_80240DAC_B9E70C : mim_04 +func_80240DAC_C61ABC : kzn_03 +func_80240DAC_D30A2C : sam_08 +func_80240DC4_B35994 : jan_03 +func_80240DF4_8CEE64 : kmr_05 +func_80240DF4_8D2304 : kmr_06 +func_80240DF4_8D6BF4 : kmr_09 +func_80240DF4_C37324 : dgb_04 +func_80240DF8_99D788 : trd_01 +func_80240E0C_B4B87C : jan_05 +func_80240E1C_BAAF5C : mim_07 +func_80240E1C_D30A9C : sam_08 +func_80240E2C_C8D61C : kzn_19 +func_80240E34_CF3A04 : flo_25 +func_80240E64_CD8144 : flo_17 +func_80240E80_9D7EA0 : nok_02 +func_80240E84_D4D1A8 : pra_01 +func_80240E84_D50158 : pra_02 +func_80240E84_D55D18 : pra_05 +func_80240E84_D589F8 : pra_09 +func_80240E84_D5F418 : pra_10 +func_80240E84_D61668 : pra_11 +func_80240E84_D64748 : pra_13 +func_80240E84_D67E68 : pra_14 +func_80240E84_D69C88 : pra_16 +func_80240E84_D6B788 : pra_18 +func_80240E84_D6EB18 : pra_19 +func_80240E84_D76508 : pra_20 +func_80240E84_D7CCB8 : pra_29 +func_80240E84_D89848 : pra_33 +func_80240E84_D8B518 : pra_34 +func_80240E84_D8D3B8 : pra_35 +func_80240E84_D99B18 : pra_40 +func_80240E90_C40C40 : dgb_08 +func_80240E94_BAE7D4 : mim_08 +func_80240E9C_B2D30C : jan_02 +func_80240EB4_D57578 : pra_06 +func_80240EB4_D62E58 : pra_12 +func_80240EB4_D79B38 : pra_27 +func_80240EB4_D7B3E8 : pra_28 +func_80240EB4_D91848 : pra_36 +func_80240EB4_D93088 : pra_37 +func_80240EB4_D95738 : pra_38 +func_80240EB4_D979D8 : pra_39 +func_80240EB8_D4D1DC : pra_01 +func_80240EB8_D5018C : pra_02 +func_80240EB8_D55D4C : pra_05 +func_80240EB8_D58A2C : pra_09 +func_80240EB8_D5F44C : pra_10 +func_80240EB8_D6169C : pra_11 +func_80240EB8_D6477C : pra_13 +func_80240EB8_D67E9C : pra_14 +func_80240EB8_D69CBC : pra_16 +func_80240EB8_D6B7BC : pra_18 +func_80240EB8_D6EB4C : pra_19 +func_80240EB8_D7653C : pra_20 +func_80240EB8_D7CCEC : pra_29 +func_80240EB8_D8987C : pra_33 +func_80240EB8_D8B54C : pra_34 +func_80240EB8_D8D3EC : pra_35 +func_80240EB8_D99B4C : pra_40 +func_80240EBC_B6D24C : jan_10 +func_80240EE8_D575AC : pra_06 +func_80240EE8_D62E8C : pra_12 +func_80240EE8_D79B6C : pra_27 +func_80240EE8_D7B41C : pra_28 +func_80240EE8_D9187C : pra_36 +func_80240EE8_D930BC : pra_37 +func_80240EE8_D9576C : pra_38 +func_80240EE8_D97A0C : pra_39 +func_80240EEC_B28F1C : jan_01 +func_80240EEC_D4D210 : pra_01 +func_80240EEC_D501C0 : pra_02 +func_80240EEC_D55D80 : pra_05 +func_80240EEC_D58A60 : pra_09 +func_80240EEC_D5F480 : pra_10 +func_80240EEC_D616D0 : pra_11 +func_80240EEC_D647B0 : pra_13 +func_80240EEC_D67ED0 : pra_14 +func_80240EEC_D69CF0 : pra_16 +func_80240EEC_D6B7F0 : pra_18 +func_80240EEC_D6EB80 : pra_19 +func_80240EEC_D76570 : pra_20 +func_80240EEC_D7CD20 : pra_29 +func_80240EEC_D898B0 : pra_33 +func_80240EEC_D8B580 : pra_34 +func_80240EEC_D8D420 : pra_35 +func_80240EEC_D99B80 : pra_40 +func_80240EF4_D30B74 : sam_08 +func_80240EF8_D05FCC : sam_02 +func_80240EFC_85306C : mac_05 +func_80240EFC_C40CAC : dgb_08 +func_80240EFC_CB5EFC : flo_09 +func_80240F14_BFE794 : dgb_01 +func_80240F1C_D575E0 : pra_06 +func_80240F1C_D62EC0 : pra_12 +func_80240F1C_D79BA0 : pra_27 +func_80240F1C_D7B450 : pra_28 +func_80240F1C_D918B0 : pra_36 +func_80240F1C_D930F0 : pra_37 +func_80240F1C_D957A0 : pra_38 +func_80240F1C_D97A40 : pra_39 +func_80240F20_C32400 : dgb_03 +func_80240F50_D93E90 : pra_37 +func_80240F6C_C40D1C : dgb_08 +func_80240F70_A8D9F0 : kpa_95 +func_80240F7C_DAE37C : omo_04 +func_80240F8C_919B3C : iwa_03 +func_80240FA0_99D930 : trd_01 +func_80240FAC_9F59EC : nok_11 +func_80240FB8_CC47C8 : flo_13 +func_80240FBC_D93EFC : pra_37 +func_80240FD8_DBE288 : omo_07 +func_80240FE4_9A1FC4 : trd_02 +func_80240FF8_C6F328 : kzn_07 +func_80241000_C50510 : dgb_15 +func_80241020_C77D00 : kzn_09 +func_8024102C_D93F6C : pra_37 +func_8024103C_C811DC : kzn_11 +func_80241040_A87A90 : kpa_91 +func_80241044_C40DF4 : dgb_08 +func_8024104C_95C24C : dro_01 +func_80241058_9A2038 : trd_02 +func_80241060_824320 : mac_02 +func_8024106C_B7B0BC : jan_14 +func_80241074_C50584 : dgb_15 +func_80241084_9A9474 : trd_04 +func_8024108C_B35C5C : jan_03 +func_8024108C_C77D6C : kzn_09 +func_802410B0_D9E580 : omo_02 +func_802410BC_99DA4C : trd_01 +func_802410BC_C5B7FC : kzn_02 +func_802410C0_BCF048 : obk_07 +func_802410D4_824394 : mac_02 +func_802410FC_C77DDC : kzn_09 +func_80241104_D94044 : pra_37 +func_80241110_D9E5E0 : omo_02 +func_80241114_CB6114 : flo_09 +func_80241128_BEDF18 : arn_07 +func_8024112C_D20FBC : sam_06 +func_80241134_9C544C : nok_01 +func_80241144_9FB934 : nok_12 +func_8024116C_A039AC : nok_14 +func_80241194_DAE594 : omo_04 +func_802411A4_A87BF4 : kpa_91 +func_802411B0_9D81D0 : nok_02 +func_802411D4_C77EB4 : kzn_09 +func_80241224_9D8244 : nok_02 +func_80241228_C726A8 : kzn_08 +func_8024122C_DB34EC : omo_05 +func_8024124C_A61C1C : kpa_50 +func_80241250_C32730 : dgb_03 +func_80241254_C813F4 : kzn_11 +func_80241284_A8DD04 : kpa_95 +func_8024128C_A0818C : nok_15 +func_802412B8_D9E788 : omo_02 +func_802412BC_9B7C3C : trd_07 +func_802412C4_C327A4 : dgb_03 +func_802412D4_C5BA14 : kzn_02 +func_802412E8_CCC5F8 : flo_14 +func_802412EC_B53B1C : jan_06 +func_802412F8_969454 : dro_02 +func_80241320_9A2300 : trd_02 +func_80241320_D8E570 : pra_35 +func_8024133C_C5084C : dgb_15 +func_80241344_D211D4 : sam_06 +func_8024134C_DCE01C : omo_09 +func_80241388_8B0004 : kmr_02 +func_8024139C_82465C : mac_02 +func_802413B0_9F5DF0 : nok_11 +func_802413C0_C8DB64 : kzn_19 +func_802413D4_D9E8A4 : omo_02 +func_802413FC_A61DCC : kpa_50 +func_802413FC_C6F72C : kzn_07 +func_8024140C_D6463C : pra_13 +func_8024144C_A654DC : kpa_51 +func_80241450_B4BEC0 : jan_05 +func_80241454_B5F704 : jan_08 +func_80241458_842FC4 : mac_04 +func_80241474_9FBC64 : nok_12 +func_80241480_801D00 : mac_01 +func_80241488_A1C588 : hos_03 +func_802414A8_831AB4 : mac_03 +func_802414BC_D646B0 : pra_13 +func_802414E8_9FBCD8 : nok_12 +func_802414EC_9D850C : nok_02 +func_80241500_8D2768 : kmr_06 +func_8024152C_BEE31C : arn_07 +func_80241530_D6EA0C : pra_19 +func_80241540_E0F800 : mgm_00 +func_8024155C_A94C9C : kpa_102 +func_80241560_A61F30 : kpa_50 +func_80241570_A03DB0 : nok_14 +func_8024158C_C32A6C : dgb_03 +func_80241598_BAEED8 : mim_08 +func_802415C8_9F6008 : nok_11 +func_802415E0_D6EA80 : pra_19 +func_802415F8_8B1668 : kmr_02 +func_802415FC_A6568C : kpa_51 +func_80241604_BAEF44 : mim_08 +func_80241608_B53E38 : jan_06 +func_80241610_97D5B8 : isk_05 +func_80241610_98F248 : isk_13 +func_80241610_992250 : isk_14 +func_80241614_C6F944 : kzn_07 +func_80241628_7EB2D4 : mac_00 +func_80241628_CD3458 : flo_16 +func_8024162C_C72AAC : kzn_08 +func_80241630_DB38F0 : omo_05 +func_80241650_D8E8A0 : pra_35 +func_80241668_B5F918 : jan_08 +func_80241668_BE4E18 : arn_04 +func_80241674_BAEFB4 : mim_08 +func_8024167C_DCE34C : omo_09 +func_802416B8_B4C128 : jan_05 +func_802416C0_9B8040 : trd_07 +func_802416C0_E0F948 : mgm_00 +func_802416C4_D8E914 : pra_35 +func_802416D4_B5F984 : jan_08 +func_802416EC_8521DC : mac_05 +func_802416EC_CCC9FC : flo_14 +func_802416F0_9A9AE0 : trd_04 +func_802416F0_DCE3C0 : omo_09 +func_802416F8_CF7E14 : sam_01 +func_8024170C_A94E4C : kpa_102 +func_80241744_B5F9F4 : jan_08 +func_80241744_BEE534 : arn_07 +func_8024174C_BAF08C : mim_08 +func_80241760_A657F0 : kpa_51 +func_80241788_A03FC8 : nok_14 +func_8024178C_DF062C : omo_17 +func_802417A8_8D29D8 : kmr_06 +func_802417B0_802030 : mac_01 +func_802417B0_9FBFA0 : nok_12 +func_802417C8_A179E8 : hos_02 +func_802417C8_D3AD34 : sam_11 +func_8024181C_B5404C : jan_06 +func_8024181C_B5FACC : jan_08 +func_80241824_8020A4 : mac_01 +func_8024183C_95B84C : dro_01 +func_80241844_C72CC4 : kzn_08 +func_80241848_DB3B08 : omo_05 +func_80241870_A94FB0 : kpa_102 +func_80241888_B540B8 : jan_06 +func_8024188C_A1C98C : hos_03 +func_802418A8_A087A8 : nok_15 +func_802418CC_B4C33C : jan_05 +func_802418D8_9B8258 : trd_07 +func_802418F8_B54128 : jan_06 +func_80241904_CCCC14 : flo_14 +func_8024191C_8B198C : kmr_02 +func_80241938_B4C3A8 : jan_05 +func_80241960_88A530 : tik_12 +func_8024198C_D8EBDC : pra_35 +func_802419A8_B4C418 : jan_05 +func_802419B8_DCE688 : omo_09 +func_802419D0_B54200 : jan_06 +func_802419E0_B2C90C : jan_02 +func_80241A2C_CD385C : flo_16 +func_80241A6C_BE521C : arn_04 +func_80241A80_B4C4F0 : jan_05 +func_80241AA4_A1CBA4 : hos_03 +func_80241B24_D05EF4 : sam_02 +func_80241B8C_823C5C : mac_02 +func_80241B90_DF0A30 : omo_17 +func_80241BC8_87B7A8 : tik_07 +func_80241BCC_A17DEC : hos_02 +func_80241BFC_C487DC : dgb_09 +func_80241C44_CD3A74 : flo_16 +func_80241C74_88A844 : tik_12 +func_80241C84_BE5434 : arn_04 +func_80241CB4_C87764 : kzn_17 +func_80241CDC_9D7B0C : nok_02 +func_80241D60_9C5374 : nok_01 +func_80241D7C_D9F24C : omo_02 +func_80241DA8_DF0C48 : omo_17 +func_80241DAC_8448DC : mac_04 +func_80241DB0_D8F000 : pra_35 +func_80241DC0_D9F290 : omo_02 +func_80241DE4_A18004 : hos_02 +func_80241E1C_D8F06C : pra_35 +func_80241E60_D9F330 : omo_02 +func_80241E64_C87914 : kzn_17 +func_80241E8C_D8F0DC : pra_35 +func_80241F38_C41CE8 : dgb_08 +func_80241F64_D8F1B4 : pra_35 +func_80241F68_B34C3C : jan_03 +func_80241FCC_87BBAC : tik_07 +func_80242144_CD9424 : flo_17 +func_80242150_DBF400 : omo_07 +func_80242188_A049C8 : nok_14 +func_802421D8_DF66F8 : end_00 +func_802421E4_87BDC4 : tik_07 +func_802421E8_E05068 : end_01 +func_80242218_C48DF8 : dgb_09 +func_802422A8_A091A8 : nok_15 +func_802422D8_9B8C58 : trd_07 +func_802422DC_80183C : mac_01 +func_802422F4_CD95D4 : flo_17 +func_80242318_852104 : mac_05 +func_8024233C_C420EC : dgb_08 +func_8024240C_96A1D0 : dro_02 +func_80242458_CD9738 : flo_17 +func_80242468_95B774 : dro_01 +func_8024247C_BA6BFC : mim_06 +func_8024253C_C739BC : kzn_08 +func_80242554_C42304 : dgb_08 +func_80242554_DBF804 : omo_07 +func_802425A8_C73A28 : kzn_08 +func_802425AC_CC5DBC : flo_13 +func_802425F0_9AA9E0 : trd_04 +func_8024260C_B2C834 : jan_02 +func_80242618_C73A98 : kzn_08 +func_802426F0_C73B70 : kzn_08 +func_8024276C_DBFA1C : omo_07 +func_8024278C_DCF45C : omo_09 +func_802427B8_823B84 : mac_02 +func_802427D0_DCF4A0 : omo_09 +func_80242870_8EDE2C : kmr_20 +func_80242870_A1BE1C : hos_03 +func_80242870_DCF540 : omo_09 +func_80242908_9D7A34 : nok_02 +func_80242924_DF17C4 : omo_17 +func_8024292C_C001AC : dgb_01 +func_802429C4_C796A4 : kzn_09 +func_802429C4_DF1864 : omo_17 +func_802429F4_9AADE4 : trd_04 +func_80242A04_8EDEC0 : kmr_20 +func_80242AC0_BA7240 : mim_06 +func_80242B74_C79854 : kzn_09 +func_80242B94_B34B64 : jan_03 +func_80242C0C_9AAFFC : trd_04 +func_80242C5C_C004DC : dgb_01 +func_80242CA0_7ED9B0 : mac_00 +func_80242CD0_C00550 : dgb_01 +func_80242D14_7EDA24 : mac_00 +func_80242EAC_96AC70 : dro_02 +func_80242F08_801764 : mac_01 +func_80242F10_9125C0 : iwa_01 +func_80242F98_C00818 : dgb_01 +func_80242FA4_8013F4 : mac_01 +func_80242FD4_BE6784 : arn_04 +func_80242FDC_7EDCEC : mac_00 +func_8024349C_A1BD44 : hos_03 +func_8024360C_9AB9FC : trd_04 +func_80243CC0_A2A7BC : hos_05 +func_80245C80_806500 : mac_01 +func_80245CF4_806574 : mac_01 +func_80245FBC_80683C : mac_01 diff --git a/src/battle/battle.c b/src/battle/battle.c index 2128ed2714..f1f514a58c 100644 --- a/src/battle/battle.c +++ b/src/battle/battle.c @@ -18,73 +18,6 @@ typedef struct BattleArea { .dmaEnd = &code_##id##_ROM_END, \ .dmaDest = &code_##id##_VRAM -const s32 rodata_75240[] = { - /* 0x75240 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404, - /* 0x75250 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505, - /* 0x75260 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75270 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75280 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x75290 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x752A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x752B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x752C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x752D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x752E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x752F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75300 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75310 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75320 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75330 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75340 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404, - /* 0x75350 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505, - /* 0x75360 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75370 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75380 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x75390 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x753A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x753B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x753C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x753D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x753E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x753F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75400 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75410 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75420 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75430 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75440 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404, - /* 0x75450 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505, - /* 0x75460 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75470 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75480 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x75490 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x754A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x754B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x754C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x754D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x754E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x754F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75500 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75510 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75520 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75530 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75540 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404, - /* 0x75550 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505, - /* 0x75560 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75570 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606, - /* 0x75580 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x75590 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x755A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x755B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707, - /* 0x755C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x755D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x755E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x755F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75600 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75610 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75620 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, - /* 0x75630 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808, -}; - BattleList area_kmr_part_1_battles; StageList area_kmr_part_1_stages; @@ -357,12 +290,3 @@ BattleArea gBattleAreas[0x30] = { }, {}, }; - -// possibly a jump table -// vram 0x8009A578 -const s32 rodata_75978[] = { - 0x80072F38, 0x80072F4C, - 0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000, - 0x8007301C, 0x80073070, 0x80073094, 0x800730CC, - 0x800730F8, -}; diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c index 8c51800204..3d8232b5eb 100644 --- a/src/code_759b0_len_61b0.c +++ b/src/code_759b0_len_61b0.c @@ -155,11 +155,11 @@ f32 func_800E0088(f32 x, f32 z) { } void enable_player_shadow(void) { - get_shadow_by_index(D_8010F094)->flags &= ~1; + get_shadow_by_index(PLAYER_STATUS->shadowID)->flags &= ~1; } void disable_player_shadow(void) { - get_shadow_by_index(D_8010F094)->flags |= 1; + get_shadow_by_index(PLAYER_STATUS->shadowID)->flags |= 1; } s32 disable_player_static_collisions(void) { diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index 30a366801a..29329bac57 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -468,7 +468,7 @@ void show_coin_counter(void) { } if (uiStatus->unk_6C[0] == 0) { - set_ui_panel_properties(0x14, 0x20, 0xa4, 0x40, 0x14, 0x15, &D_800E92D8, 0, -1); + set_ui_panel_properties(0x14, 0x20, 0xa4, 0x40, 0x14, 0x15, coin_counter_draw_content, 0, -1); func_80147E7C(0x14, &D_80147474); index = create_icon(&D_80109270); uiStatus->iconIndex10 = index; diff --git a/tools/duplicate_renames.txt b/tools/duplicate_renames.txt new file mode 100644 index 0000000000..bb32766deb --- /dev/null +++ b/tools/duplicate_renames.txt @@ -0,0 +1 @@ +func_80049B44,base_UnkNpcAIFunc1 diff --git a/tools/splat.yaml b/tools/splat.yaml index f5de63c6f8..9db9c5d5c1 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -218,7 +218,7 @@ segments: - [0x71430, bin] - [0x73DA0, .rodata, world/world] - [0x74EA0, bin] - - [0x75240, .rodata, battle/battle] # ram 80099E40 + - [0x75240, rodata, battle/battle] # ram 80099E40 - type: code start: 0x759B0 vram: 0x800DC500 @@ -420,6 +420,7 @@ segments: ld_name: world_partner_goombario start: 0x317020 vram: 0x802BD100 + overlay: True files: - [0x317020, c, world/partner/goombario] - [0x317b60, .data, world/partner/goombario] @@ -428,6 +429,7 @@ segments: ld_name: world_partner_bombette start: 0x317e50 vram: 0x802BD100 + overlay: True files: - [0x317e50, c, world/partner/bombette] - [0x3195d0, bin] @@ -435,6 +437,7 @@ segments: ld_name: world_partner_parakarry start: 0x319670 vram: 0x802BD100 + overlay: True files: - [0x319670, c, world/partner/parakarry] - [0x31b000, bin] @@ -442,6 +445,7 @@ segments: ld_name: world_partner_kooper start: 0x31b120 vram: 0x802BD100 + overlay: True files: - [0x31b120, c, world/partner/kooper] - [0x31cb60, bin] @@ -449,6 +453,7 @@ segments: ld_name: world_partner_watt start: 0x31cc70 vram: 0x802BD100 + overlay: True files: - [0x31cc70, c, world/partner/watt] - [0x31ddc0, bin] @@ -456,6 +461,7 @@ segments: ld_name: world_partner_sushie start: 0x31de70 vram: 0x802BD100 + overlay: True files: - [0x31de70, c, world/partner/sushie] - [0x320b20, bin] @@ -463,6 +469,7 @@ segments: ld_name: world_partner_lakilester start: 0x320c50 vram: 0x802BD100 + overlay: True files: - [0x320c50, c, world/partner/lakilester] - [0x3239b0, bin] @@ -470,6 +477,7 @@ segments: ld_name: world_partner_bow start: 0x323A50 vram: 0x802BD100 + overlay: True files: - [0x323A50, c, world/partner/bow] - [0x324930, bin] @@ -477,6 +485,7 @@ segments: ld_name: world_partner_goompa start: 0x324a10 vram: 0x802BD100 + overlay: True files: - [0x324a10, c, world/partner/goompa] - [0x324e80, .data, world/partner/goompa] @@ -485,6 +494,7 @@ segments: ld_name: world_partner_goombaria start: 0x324f10 vram: 0x802BD100 + overlay: True files: - [0x324f10, c, world/partner/goombaria] - [0x325000, .data, world/partner/goombaria] @@ -492,12 +502,14 @@ segments: ld_name: world_partner_twink start: 0x325070 vram: 0x802BD100 + overlay: True files: - [0x325070, c, world/partner/twink] - [0x325160, .data, world/partner/twink] - type: code start: 0x3251d0 vram: 0x802BD100 + overlay: True files: - [0x3251d0, c] - [0x3255e0, bin] diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 111a83c0a5..8cef065e19 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -1,3 +1,4 @@ +osTvType = 0x80000300; entry_point = 0x80025C00; boot_main = 0x80025F70; gfxRetrace_Callback = 0x8002605C; // ! @@ -271,6 +272,7 @@ test_ray_entities = 0x8005D448; get_npc_pos = 0x8005DE10; nuBoot = 0x8005E8B0; boot_idle = 0x8005E90C; +nusched = 0x800DA440; nuScCreateScheduler = 0x8005E9B0; nuScExecuteAudio = 0x8005EBE0; nuScExecuteGraphics = 0x8005ED14; // ! @@ -305,7 +307,7 @@ contPakFileDelete = 0x8005F864; contPakFileState = 0x8005F8A4; contPakFileNum = 0x8005F8D0; contPakRepairId = 0x8005F8FC; -contRmbControl = 0x8005F920; +contRmbControl = 0x8005FB10; contRmbRetrace = 0x8005FB20; nuContRmbMgrInit = 0x8005FC8C; nuContRmbMgrRemove = 0x8005FCEC; @@ -560,6 +562,8 @@ fx_sleep_bubble = 0x800707F0; load_battle = 0x80072C90; setup_demo_player = 0x80072D2C; load_demo_battle = 0x80072E14; +gGameStatusPtr = 0x8007419C; +gCurrentCameraID = 0x80077410; EnemyNpcHit = 0x80077F70; EnemyNpcDefeat = 0x8007809C; nuAuPreNMIFunc = 0x80078174; @@ -1929,3 +1933,116 @@ entity_init_HammerBlock_small = 0x802E3E30; entity_init_Chest = 0x802E7D84; player_enter_blue_pipe = 0x802E8CCC; push_entity_matrix = 0x802E8E4C; +FrameBuf = 0x80093BA8; +nuContPakCompanyCode = 0x80093CA0; +nuContPakGameCode = 0x80093CA4; +nuContCallBack = 0x80093CD0; +nuContRmbSearchTime = 0x80093CE0; +nuContRmbCallBack = 0x80093D00; +nuGfxFunc = 0x80093D10; +nuGfxPreNMIFunc = 0x80093D14; +osViModeTable = 0x800946A0; +nuGfxZBuffer = 0x8009A5DC; +nuGfxDisplay = 0x8009A5F8; +gGameState = 0x8009A600; +nuGfxTaskSpool = 0x8009A618; +carthandle = 0x8009A638; +gCurtainScale = 0x8009BA90; +gCurtainScaleGoal = 0x8009BA94; +gCurtainFade = 0x8009BA98; +gCurtainFadeGoal = 0x8009BA9C; +gCurtainDrawCallback = 0x8009BAA0; +gMapTransitionAlpha = 0x800A0940; +gWorldNpcList = 0x800A0990; +gBattleNpcList = 0x800A0A90; +gCurrentNpcListPtr = 0x800A0B90; +nuScStack = 0x800A65D0; +nuScAudioStack = 0x800A85D0; +nuScGraphicsStack = 0x800AA5D0; +nuContRmbCtl = 0x800B1D40; +nuContData = 0x800B1D68; +gCameras = 0x800B1D80; +nuContPfs = 0x800DAAD8; +nuSiMesgQ = 0x800DAC78; +gCurrentSaveFile = 0x800DACC0; +gPlayerStatusPtr = 0x800F7B30; +gUIStatus = 0x8010EF58; +gPlayerActionState = 0x8010F07C; +gPlayerAnimation = 0x8010F080; +gCurrentModelListPtr = 0x801512CC; +gCurrentModelSpecialDlsPtr = 0x801512E8; +gLastCreatedEntityIndex = 0x801512EC; +gTriggerCount = 0x80151334; +gCurrentDoorSoundsSet = 0x80151340; +gWorldEntityList = 0x80151380; +gBattleEntityList = 0x801513F8; +gCurrentEntityListPtr = 0x80151470; +gWorldShadowList = 0x80151478; +gBattleShadowList = 0x80151568; +gCurrentShadowListPtr = 0x80151658; +gMainGameState = 0x80151700; +gWorldModelList = 0x80151770; +gBattleModelList = 0x80151B70; +gWorldModelSpecialDls = 0x80151F90; +gBattleModelSpecialDls = 0x80152010; +gWorldDynamicEntityList = 0x801543A0; +gBattleDynamicEntityList = 0x801543E0; +gCurrentDynamicEntityListPtr = 0x80154420; +gTriggerList1 = 0x80159190; +gTriggerList2 = 0x80159290; +gCurrentTriggerListPtr = 0x80159390; +gUIPanels = 0x80159D50; +gBackgroundImage = 0x80200000; +gPauseMenuIconScripts = 0x8024EF60; +gPauseMenuTabs = 0x8024EF80; +gPauseMenuCursorPosX = 0x8024EF9C; +gPauseMenuCursorPosY = 0x8024EFA0; +gPauseMenuCursorOpacity = 0x8024EFA4; +gPauseMenuTargetPosX = 0x8024EFA8; +gPauseMenuTargetPosY = 0x8024EFAC; +gPauseMenuCursorTargetOpacity = 0x8024EFB0; +gPauseMenuTextScrollInterpEasingLUT = 0x8024F0AC; +gPauseMenuPageScrollInterpEasingLUT = 0x8024F0BC; +gPauseMenuHeldButtons = 0x802700C0; +gPauseMenuPressedButtons = 0x802700C4; +gPauseMenuCurrentDescString = 0x802700C8; +gPauseMenuCurrentDescIconScript = 0x802700CC; +gPauseMenuCurrentTab = 0x802700D4; +gPauseMenuCommonIconIDs = 0x802700E8; +gPauseMenuTabIconIDs = 0x80270130; +gStatsMenuIconIDs = 0x80270150; +gBadgeMenuItemIDs = 0x80270180; +gBadgeMenuCurrentPage = 0x80270280; +gBadgeMenuPages = 0x80270288; +gBadgeMenuSelectedIndex = 0x80270378; +gBadgeMenuSelectedItemID = 0x80270380; +gBadgeMenuNumItems = 0x80270384; +gBadgeMenuCurrentScrollPos = 0x8027038C; +gBadgeMenuTargetScrollPos = 0x80270390; +gBadgeMenuLevel = 0x80270398; +gBadgeMenuCurrentTab = 0x8027039C; +gBadgeMenuBShowNotEnoughBP = 0x802703A0; +gItemMenuItemIDs = 0x80270400; +gItemMenuCurrentPage = 0x802704C8; +gItemMenuPages = 0x802704D0; +gItemMenuSelectedIndex = 0x802705C0; +gItemMenuSelectedItemID = 0x802705C8; +gItemMenuNumItems = 0x802705CC; +gItemMenuCurrentScrollPos = 0x802705D4; +gItemMenuTargetScrollPos = 0x802705D8; +gItemMenuLevel = 0x802705E0; +gItemMenuCurrentTab = 0x802705E4; +gMapFlags = 0x802DA480; +gMapVars = 0x802DA484; +gNumScripts = 0x802DA488; +gWorldScriptList = 0x802DA490; +gBattleScriptList = 0x802DA690; +gCurrentScriptListPtr = 0x802DA890; +gScriptIndexList = 0x802DA898; +gScriptIdList = 0x802DAA98; +gScriptListCount = 0x802DAC98; +gCurrentPrintContext = 0x802DB260; +SCRIPT_NpcDefeat = 0x80077E38; +gPlayerNpcPtr = 0x802D9D20; +gRandSeed = 0x80074410; +osCleanupThread = 0x8006B350; // ! diff --git a/undefined_funcs.txt b/undefined_funcs.txt index 53e88de141..167a4421d9 100644 --- a/undefined_funcs.txt +++ b/undefined_funcs.txt @@ -1,4 +1,3 @@ -func_E00AE000 = 0xE00AE000; func_802A91F8 = 0x802A91F8; func_802A9208 = 0x802A9208; func_802A9228 = 0x802A9228; diff --git a/undefined_funcs_auto.txt b/undefined_funcs_auto.txt index 9bd84dbddb..48b20783b1 100644 --- a/undefined_funcs_auto.txt +++ b/undefined_funcs_auto.txt @@ -1,2 +1,5 @@ +func_802409F4 = 0x802409F4; +func_80240AA8 = 0x80240AA8; +func_80241190 = 0x80241190; func_802B7000 = 0x802B7000; func_802B71C8 = 0x802B71C8; diff --git a/undefined_syms.txt b/undefined_syms.txt index 4b4333841d..819354f1d1 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -1,375 +1,27 @@ -osTvType = 0x80000300; - -gGameStatusPtr = 0x8007419C; -gRandSeed = 0x80074410; -gUIStatus = 0x8010EF58; -gPlayerData = 0x8010F290; -gPlayerActionState = 0x8010F07C; -gPlayerAnimation = 0x8010F080; -gPlayerStatusPtr = 0x800F7B30; -gPlayerStatus = 0x8010EFC8; -gItemTable = 0x800878E0; -gWorldScriptList = 0x802DA490; -gBattleScriptList = 0x802DA690; -gNumScripts = 0x802DA488; -gCurrentScriptListPtr = 0x802DA890; -gPlayerNpcPtr = 0x802D9D20; -D_80147574 = 0x80147574; -D_8010EBB0 = 0x8010EBB0; -D_8010F250 = 0x8010F250; -gUIPanels = 0x80159D50; - -gWorldMapVars = 0x802DBCA8; -gBattleMapVars = 0x802DBCE8; - -gWorldMapFlags = 0x802DBC70; -gBattleMapFlags = 0x802DBD34; - -gMapTransitionAlpha = 0x800A0940; -D_800A0942 = 0x800A0942; -D_800A0944 = 0x800A0944; -D_800A0946 = 0x800A0946; -D_800A0948 = 0x800A0948; -D_800A0954 = 0x800A0954; -D_800A0956 = 0x800A0956; -D_800A0958 = 0x800A0958; -D_800A095A = 0x800A095A; -D_800A095B = 0x800A095B; -D_800A095C = 0x800A095C; -D_800A095D = 0x800A095D; -D_800A095E = 0x800A095E; -D_800A095F = 0x800A095D; -D_800A0960 = 0x800A0960; -D_800A0963 = 0x800A0963; -D_800A0964 = 0x800A0964; - -D_800A4270 = 0x800A4270; -D_800A4420 = 0x800A4420; -D_800B8590 = 0x800B8590; - -D_800E92D8 = 0x800E92D8; - -gPartnerAnimations = 0x800F8348; - -D_80147474 = 0x80147474; -D_80109270 = 0x80109270; -D_80108558 = 0x80108558; -D_800779B0 = 0x800779B0; - -D_8010CD10 = 0x8010CD10; -D_8010CD12 = 0x8010CD12; -D_8010CD20 = 0x8010CD20; -D_8010EF08 = 0x8010EF08; -D_8010F094 = 0x8010F094; - -D_800D9620 = 0x800D9620; - -gSpeakingActorPrintCtx = 0x8029FA60; -D_8029FA64 = 0x8029FA64; -gSpeakingActorPrintIsDone = 0x8029FA68; -gSpeakingActorTalkAnim = 0x8029FA6C; -gSpeakingActorIdleAnim = 0x8029FA70; -gSpeakingActor = 0x8029FA74; -gSpeakingActorPart = 0x8029FA78; - -gBattleDmaDest = 0x80284000; -gBattleState = 0x800DC068; -gBattleStatus = 0x800DC070; -gPauseMenuStrings = 0x8026F778; - -D_000759B0 = 0x000759B0; -D_000759B0_end = 0x000A5DD0; -D_000A5DD0 = 0x000A5DD0; -D_000A5DD0_end = 0x000E79B0; -D_000E79B0 = 0x000E79B0; -D_000E79B0_end = 0x000FEE30; -D_000FEE30 = 0x000FEE30; -D_000FEE30_end = 0x00102610; -D_00102610 = 0x00102610; -D_00102610_end = 0x0010CC10; -D_0010CC10 = 0x0010CC10; -D_0010CC10_end = 0x0010F1B0; -D_80074021 = 0x80074021; - -gCurrentCameraID = 0x80077410; -D_80093BA0 = 0x80093BA0; -FrameBuf = 0x80093BA8; -rdpstateinit_dl = 0x80093BB8; -nuContPakCompanyCode = 0x80093CA0; -nuContPakGameCode = 0x80093CA4; -nuContCallBack = 0x80093CD0; -nuContRmbSearchTime = 0x80093CE0; -nuContRmbCallBack = 0x80093D00; -nuGfxFunc = 0x80093D10; -nuGfxPreNMIFunc = 0x80093D14; - -nuAuDmaState = 0x800A3BD0; -nuAuDmaBuf = 0x800A3BE0; - -osViModeTable = 0x800946A0; -D_800959D4 = 0x800959D4; -D_80099E40 = 0x80099E40; -D_80099F40 = 0x80099F40; -D_8009A040 = 0x8009A040; -D_8009A140 = 0x8009A140; -D_8009A578 = 0x8009A578; -D_8009A590 = 0x8009A590; -D_8009A5B0 = 0x8009A5B0; -D_8009A5D8 = 0x8009A5D8; -nuGfxZBuffer = 0x8009A5DC; -nuGfxDisplay = 0x8009A5F8; -gGameState = 0x8009A600; -D_8009A610 = 0x8009A610; -D_8009A630 = 0x8009A630; - -nuGfxTaskSpool = 0x8009A618; -carthandle = 0x8009A638; - -D_8009A650 = 0x8009A650; -D_8009A6A0 = 0x8009A6A0; -D_8009A6A2 = 0x8009A6A2; -D_8009A6A4 = 0x8009A6A4; -D_8009A6A6 = 0x8009A6A6; - -gCurtainScale = 0x8009BA90; -gCurtainScaleGoal = 0x8009BA94; -gCurtainFade = 0x8009BA98; -gCurtainFadeGoal = 0x8009BA9C; -gCurtainDrawCallback = 0x8009BAA0; - -D_800A0900 = 0x800A0900; -nuScStack = 0x800A65D0; -nuScAudioStack = 0x800A85D0; -nuScGraphicsStack = 0x800AA5D0; -D_800AC5D0 = 0x800AC5D0; -D_800AC5E8 = 0x800AC5E8; - -gCurrentEncounter = 0x800B0F10; -nuContRmbCtl = 0x800B1d40; -nuContData = 0x800B1D68; -gCameras = 0x800B1D80; - -nusched = 0x800DA440; -nuContPfs = 0x800DAAD8; -nuSiMesgQ = 0x800DAC78; - -gCurrentCameraID = 0x80077410; -SCRIPT_NpcDefeat = 0x80077E38; - -D_800DC500 = 0x800DC500; -D_8010F6D0 = 0x8010F6D0; - -gBackgroundImage = 0x80200000; - -gPauseMenuIconScripts = 0x8024EF60; -gPauseMenuTabs = 0x8024EF80; -gPauseMenuCursorPosX = 0x8024EF9C; -gPauseMenuCursorPosY = 0x8024EFA0; -gPauseMenuCursorOpacity = 0x8024EFA4; -gPauseMenuTargetPosX = 0x8024EFA8; -gPauseMenuTargetPosY = 0x8024EFAC; -gPauseMenuCursorTargetOpacity = 0x8024EFB0; - -gPauseMenuTextScrollInterpEasingLUT = 0x8024F0AC; -gPauseMenuPageScrollInterpEasingLUT = 0x8024F0BC; - -gPauseMenuHeldButtons = 0x802700C0; -gPauseMenuPressedButtons = 0x802700C4; -gPauseMenuCurrentDescString = 0x802700C8; -gPauseMenuCurrentDescIconScript = 0x802700CC; -gPauseMenuCurrentTab = 0x802700D4; -gPauseMenuCommonIconIDs = 0x802700E8; - -gPauseMenuTabIconIDs = 0x80270130; -gStatsMenuIconIDs = 0x80270150; -gBadgeMenuItemIDs = 0x80270180; -gBadgeMenuCurrentPage = 0x80270280; -gBadgeMenuPages = 0x80270288; -gBadgeMenuSelectedIndex = 0x80270378; -gBadgeMenuSelectedItemID = 0x80270380; -gBadgeMenuNumItems = 0x80270384; -D_80270388 = 0x80270388; -gBadgeMenuCurrentScrollPos = 0x8027038C; -gBadgeMenuTargetScrollPos = 0x80270390; -D_80270394 = 0x80270394; -gBadgeMenuLevel = 0x80270398; -gBadgeMenuCurrentTab = 0x8027039C; -gBadgeMenuBShowNotEnoughBP = 0x802703A0; -D_802703A4 = 0x802703A4; -D_802703A8 = 0x802703A8; - -gItemMenuItemIDs = 0x80270400; -gItemMenuCurrentPage = 0x802704C8; -gItemMenuPages = 0x802704D0; -gItemMenuSelectedIndex = 0x802705C0; -gItemMenuSelectedItemID = 0x802705C8; -gItemMenuNumItems = 0x802705CC; -D_802705D0 = 0x802705D0; -gItemMenuCurrentScrollPos = 0x802705D4; -gItemMenuTargetScrollPos = 0x802705D8; -D_802705DC = 0x802705DC; -gItemMenuLevel = 0x802705E0; -gItemMenuCurrentTab = 0x802705E4; -gItemMenuScrollUpIcon = 0x80270628; - -D_802C3000 = 0x802C3000; -D_802DBD40 = 0x802DBD40; -gCurrentPrintContext = 0x802DB260; -D_802DB264 = 0x802DB264; -D_802DB268 = 0x802DB268; -D_802E0D90 = 0x802E0D90; -D_802EB3D0 = 0x802EB3D0; - -D_80268000 = 0x80268000; -D_80286540 = 0x80286540; -D_802FB800 = 0x802FB800; -D_803DA800 = 0x803DA800; - -D_003169F0 = 0x003169F0; -D_00316A70 = 0x00316A70; -D_00316C00 = 0x00316C00; -D_00316D90 = 0x00316D90; -D_00316F30 = 0x00316F30; - -D_8010D000 = 0x8010D000; -D_8014F140 = 0x8014F140; -D_80151308 = 0x80151308; -D_80151310 = 0x80151310; -D_80151328 = 0x80151328; - -gCurrentDoorSoundsSet = 0x80151340; - -gTriggerCount = 0x80151334; -D_80156954 = 0x80156954; -gTriggerList1 = 0x80159190; -gTriggerList2 = 0x80159290; -gCurrentTriggerListPtr = 0x80159390; - -D_801595A0 = 0x801595A0; -gMusicUnkVolume = 0x80159AE0; -gMusicTargetVolume = 0x80159AE2; -gMusicUnkVolume2 = 0x80159AE4; -gMusicCurrentVolume = 0x80159AE6; -gMusicPlayers = 0x80159AF0; -D_8014F6F0 = 0x8014F6F0; - -gCollisionStatus = 0x8015A550; -D_8015C7C0 = 0x8015C7C0; -gLastCreatedEntityIndex = 0x801512EC; - -gWorldModelList = 0x80151770; -gBattleModelList = 0x80151B70; -gCurrentModelListPtr = 0x801512CC; - -gCurrentAnimMeshListPtr = 0x80153A40; - -gCurrentModelSpecialDlsPtr = 0x801512E8; -gWorldModelSpecialDls = 0x80151F90; -gBattleModelSpecialDls = 0x80152010; - -gWorldEntityList = 0x80151380; -gBattleEntityList = 0x801513F8; -gCurrentEntityListPtr = 0x80151470; - -gWorldShadowList = 0x80151478; -gBattleShadowList = 0x80151568; -gCurrentShadowListPtr = 0x80151658; - -gWorldNpcList = 0x800A0990; -gBattleNpcList = 0x800A0A90; -gCurrentNpcListPtr = 0x800A0B90; - -gMoveScriptTable = 0x80293E80; - -gMainGameState = 0x80151700; -gCurrentUpdateFunction = 0x8015170C; - -gWorldDynamicEntityList = 0x801543A0; -gBattleDynamicEntityList = 0x801543E0; -gCurrentDynamicEntityListPtr = 0x80154420; - -D_802D9D50 = 0x802D9D50; - -gScriptIndexList = 0x802DA898; -gScriptIdList = 0x802DAA98; -gScriptListCount = 0x802DAC98; - -gCurrentSaveFile = 0x800DACC0; - -gMapFlags = 0x802DA480; -gMapVars = 0x802DA484; - -gBattleMeshAnimationList = 0x802DADB0; -gWorldMeshAnimationList = 0x802DADF0; -gCurrentMeshAnimationListPtr = 0x802DAE30; - -gEffectTable = 0x8007F214; - -gPauseMenuStrings = 0x8026F778; - EnterWalk = 0x80285960; ExitWalk = 0x80285CF4; - -MarioEnterStage = 0x80284A40; -PeachEnterStage = 0x80284D04; -HandleEvent_Player = 0x802852D4; -PlayerScriptDispatcher = 0x80284EBC; -PeachScriptDispatcher = 0x80285010; -BtlBringPartnerOut = 0x80280B6C; -BtlPutPartnerAway = 0x80280A34; -RegainAbility = 0x80289110; -DoDizzyAttack = 0x8028907C; -DoDizzyHit = 0x802945FC; -DoFreezeHit = 0x8029466C; DoImmune = 0x8029AC70; DoJumpBack = 0x8029BD70; DoNormalHit = 0x80299044; -DoNpcDefeat = 0x8004462C; -DoParalyzeHit = 0x80294618; -DoPoisonHit = 0x80294634; DoRecover = 0x8029BFA0; DoReturnHome = 0x8029BEB8; DoScareAway = 0x8029B22C; -DoShinkHit = 0x802946B8; DoShockHit = 0x8029A6FC; -DoSleepHit = 0x802945E0; DoSpinSmashHit = 0x8029B998; -DoStopHit = 0x80294650; DoAirLift = 0x8029C37C; DoBlowAway = 0x8029C4A8; DoBurnHit = 0x8029A0D0; DoDeath = 0x8029AEC0; -ShakeCam1 = 0x802D9CB0; -ShakeCamX = 0x802D9CE8; - EnemyNpcHit = 0x80077F70; EnemyNpcDefeat = 0x8007809C; -D_80078DB0 = 0x80078DB0; -D_80078DB4 = 0x80078DB4; - -gSongsUsingVariationFlag = 0x8014F720; -D_8014F738 = 0x8014F738; - -D_802BDF64 = 0x802BDF64; -D_802BDD88 = 0x802BDD88; - -D_802BD58C = 0x802BD58C; -D_802BDC40 = 0x802BDC40; - - -D_C2BE35B8 = 0xC2BE35B8; -D_DE003AD8 = 0xDE003AD8; -D_DDFFAA28 = 0xDDFFAA28; -D_E70013F8 = 0xE70013F8; -D_C479EFF4 = 0xC479EFF4; -D_DE007A38 = 0xDE007A38; -D_DE0079B8 = 0xDE0079B8; -D_DE003E00 = 0xDE003E00; -D_C1F06370 = 0xC1F06370; -D_DE001F00 = 0xDE001F00; -D_DE007C00 = 0xDE007C00; -D_8021A194 = 0x8021A194; - +rdpstateinit_dl = 0x80093BB8; paragoomba = 0x8021CD00; spiked_goomba = 0x8021B0AC; + +nusched = 0x800DA440; +D_800A095D = 0x800A095D; +D_A4000768 = 0xA4000768; +D_802428E0 = 0x802428E0; +D_8024296C = 0x8024296C; +D_80242A3C = 0x80242A3C; diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt index 62dca55d88..2a7240b222 100644 --- a/undefined_syms_auto.txt +++ b/undefined_syms_auto.txt @@ -1,278 +1,23 @@ D_80000000 = 0x80000000; +osTvType = 0x80000300; D_80000308 = 0x80000308; D_8000030C = 0x8000030C; D_80000318 = 0x80000318; D_8000031C = 0x8000031C; -D_80025D74 = 0x80025D74; D_80026AC7 = 0x80026AC7; -D_8002C1D4 = 0x8002C1D4; -D_80035DCC = 0x80035DCC; -D_80037638 = 0x80037638; -D_8003E670 = 0x8003E670; -D_80045BC8 = 0x80045BC8; -D_80045D7C = 0x80045D7C; -D_80045E4C = 0x80045E4C; -D_80045ED0 = 0x80045ED0; -D_80046030 = 0x80046030; -D_800465E0 = 0x800465E0; D_8004AA85 = 0x8004AA85; -D_8004AE08 = 0x8004AE08; -D_8004B328 = 0x8004B328; -D_80059C80 = 0x80059C80; -D_8006A9F0 = 0x8006A9F0; -D_8006B350 = 0x8006B350; -D_800731A0 = 0x800731A0; -D_80073E00 = 0x80073E00; -D_80073E04 = 0x80073E04; -D_80073E08 = 0x80073E08; -D_80073E0A = 0x80073E0A; -D_80073E10 = 0x80073E10; -D_80074010 = 0x80074010; -D_80074020 = 0x80074020; -D_800741A0 = 0x800741A0; -D_800741A2 = 0x800741A2; -D_800741A8 = 0x800741A8; +osEPiReadIo = 0x80060DC0; +gGameStatusPtr = 0x8007419C; D_800741F0 = 0x800741F0; D_800741F4 = 0x800741F4; -D_800741F8 = 0x800741F8; -D_80074260 = 0x80074260; -D_80074264 = 0x80074264; -D_80074270 = 0x80074270; -D_80074274 = 0x80074274; -D_800743E0 = 0x800743E0; -D_80074414 = 0x80074414; -D_80074580 = 0x80074580; -D_800745D0 = 0x800745D0; -D_80076078 = 0x80076078; -D_800760C0 = 0x800760C0; -D_80077140 = 0x80077140; -D_800771E8 = 0x800771E8; -D_80077210 = 0x80077210; -D_80077290 = 0x80077290; -D_80077390 = 0x80077390; -D_800773D8 = 0x800773D8; D_800773F0 = 0x800773F0; -D_800773F4 = 0x800773F4; -D_800773F8 = 0x800773F8; -D_800773FC = 0x800773FC; -D_80077400 = 0x80077400; -D_80077850 = 0x80077850; -D_800778A0 = 0x800778A0; -D_80077908 = 0x80077908; -D_80077950 = 0x80077950; -D_8007795C = 0x8007795C; -D_80077980 = 0x80077980; -D_8007798C = 0x8007798C; -D_800779C0 = 0x800779C0; +gCurrentCameraID = 0x80077410; +D_800779B0 = 0x800779B0; D_800779C4 = 0x800779C4; -D_800779C8 = 0x800779C8; -D_800779CA = 0x800779CA; D_800779CB = 0x800779CB; -D_800779CC = 0x800779CC; -D_800779D0 = 0x800779D0; -D_800779D4 = 0x800779D4; -D_800779D8 = 0x800779D8; D_80077A24 = 0x80077A24; -D_80077A28 = 0x80077A28; -D_80077A2B = 0x80077A2B; -D_80077A2C = 0x80077A2C; -D_80077A30 = 0x80077A30; -D_80077A34 = 0x80077A34; -D_80077A40 = 0x80077A40; -D_80077A50 = 0x80077A50; -D_80077AE0 = 0x80077AE0; -D_80077BF0 = 0x80077BF0; -D_80077C10 = 0x80077C10; -D_80077C14 = 0x80077C14; -D_80077C18 = 0x80077C18; -D_80077C1C = 0x80077C1C; -D_80077C1E = 0x80077C1E; -D_80077C20 = 0x80077C20; -D_80077C24 = 0x80077C24; -D_80077C28 = 0x80077C28; -D_80077C2C = 0x80077C2C; -D_80077C30 = 0x80077C30; -D_80077C34 = 0x80077C34; -D_80077C38 = 0x80077C38; -D_80077C3A = 0x80077C3A; -D_80077C40 = 0x80077C40; -D_80077C44 = 0x80077C44; -D_80077E9C = 0x80077E9C; -D_80077EB8 = 0x80077EB8; -D_80078160 = 0x80078160; -D_80078164 = 0x80078164; -D_80078168 = 0x80078168; -D_80078190 = 0x80078190; -D_800781D0 = 0x800781D0; -D_80078290 = 0x80078290; -D_800782F8 = 0x800782F8; -D_80078320 = 0x80078320; -D_80078348 = 0x80078348; -D_8007836A = 0x8007836A; -D_800783C0 = 0x800783C0; -D_80078400 = 0x80078400; -D_80078410 = 0x80078410; -D_80078464 = 0x80078464; -D_80078470 = 0x80078470; -D_80078510 = 0x80078510; -D_80078520 = 0x80078520; -D_80078530 = 0x80078530; -D_80078544 = 0x80078544; -D_8007854C = 0x8007854C; -D_80078554 = 0x80078554; -D_80078558 = 0x80078558; -D_80078580 = 0x80078580; -D_800785A0 = 0x800785A0; -D_80078730 = 0x80078730; -D_80078EE0 = 0x80078EE0; -D_8007EFE0 = 0x8007EFE0; -D_8007F048 = 0x8007F048; -D_8007F158 = 0x8007F158; -D_8007F180 = 0x8007F180; -D_8007F1A8 = 0x8007F1A8; -D_8007F1D0 = 0x8007F1D0; -D_8007F1F8 = 0x8007F1F8; -D_8007F1FC = 0x8007F1FC; -D_8007F200 = 0x8007F200; -D_8007F204 = 0x8007F204; -D_8007F210 = 0x8007F210; -D_8007F228 = 0x8007F228; -D_8007F240 = 0x8007F240; -D_8007F258 = 0x8007F258; -D_8007F270 = 0x8007F270; -D_8007F288 = 0x8007F288; -D_8007F2A0 = 0x8007F2A0; -D_8007F2B8 = 0x8007F2B8; -D_8007F2D0 = 0x8007F2D0; -D_8007F2E8 = 0x8007F2E8; -D_8007F300 = 0x8007F300; -D_8007F318 = 0x8007F318; -D_8007F330 = 0x8007F330; -D_8007F348 = 0x8007F348; -D_8007F360 = 0x8007F360; -D_8007F378 = 0x8007F378; -D_8007F390 = 0x8007F390; -D_8007F3A8 = 0x8007F3A8; -D_8007F3C0 = 0x8007F3C0; -D_8007F3D8 = 0x8007F3D8; -D_8007F3F0 = 0x8007F3F0; -D_8007F408 = 0x8007F408; -D_8007F420 = 0x8007F420; -D_8007F438 = 0x8007F438; -D_8007F450 = 0x8007F450; -D_8007F468 = 0x8007F468; -D_8007F480 = 0x8007F480; -D_8007F498 = 0x8007F498; -D_8007F4B0 = 0x8007F4B0; -D_8007F4C8 = 0x8007F4C8; -D_8007F4E0 = 0x8007F4E0; -D_8007F4F8 = 0x8007F4F8; -D_8007F510 = 0x8007F510; -D_8007F528 = 0x8007F528; -D_8007F540 = 0x8007F540; -D_8007F558 = 0x8007F558; -D_8007F570 = 0x8007F570; -D_8007F588 = 0x8007F588; -D_8007F5A0 = 0x8007F5A0; -D_8007F5B8 = 0x8007F5B8; -D_8007F5D0 = 0x8007F5D0; -D_8007F5E8 = 0x8007F5E8; -D_8007F600 = 0x8007F600; -D_8007F618 = 0x8007F618; -D_8007F630 = 0x8007F630; -D_8007F648 = 0x8007F648; -D_8007F660 = 0x8007F660; -D_8007F678 = 0x8007F678; -D_8007F690 = 0x8007F690; -D_8007F6A8 = 0x8007F6A8; -D_8007F6C0 = 0x8007F6C0; -D_8007F6D8 = 0x8007F6D8; -D_8007F6F0 = 0x8007F6F0; -D_8007F708 = 0x8007F708; -D_8007F720 = 0x8007F720; -D_8007F738 = 0x8007F738; -D_8007F750 = 0x8007F750; -D_8007F768 = 0x8007F768; -D_8007F780 = 0x8007F780; -D_8007F798 = 0x8007F798; -D_8007F7B0 = 0x8007F7B0; -D_8007F7C8 = 0x8007F7C8; -D_8007F7E0 = 0x8007F7E0; -D_8007F7F8 = 0x8007F7F8; -D_8007F810 = 0x8007F810; -D_8007F828 = 0x8007F828; -D_8007F840 = 0x8007F840; -D_8007F858 = 0x8007F858; -D_8007F870 = 0x8007F870; -D_8007F888 = 0x8007F888; -D_8007F8A0 = 0x8007F8A0; -D_8007F8B8 = 0x8007F8B8; -D_8007F8D0 = 0x8007F8D0; -D_8007F8E8 = 0x8007F8E8; -D_8007F900 = 0x8007F900; -D_8007F918 = 0x8007F918; -D_8007F930 = 0x8007F930; -D_8007F948 = 0x8007F948; -D_8007F960 = 0x8007F960; -D_8007F978 = 0x8007F978; -D_8007F990 = 0x8007F990; -D_8007F9A8 = 0x8007F9A8; -D_8007F9C0 = 0x8007F9C0; -D_8007F9D8 = 0x8007F9D8; -D_8007F9F0 = 0x8007F9F0; -D_8007FA08 = 0x8007FA08; -D_8007FA20 = 0x8007FA20; -D_8007FA38 = 0x8007FA38; -D_8007FA50 = 0x8007FA50; -D_8007FA68 = 0x8007FA68; -D_8007FA80 = 0x8007FA80; -D_8007FA98 = 0x8007FA98; -D_8007FAB0 = 0x8007FAB0; -D_8007FAC8 = 0x8007FAC8; -D_8007FAE0 = 0x8007FAE0; -D_8007FAF8 = 0x8007FAF8; -D_8007FB10 = 0x8007FB10; -D_8007FB28 = 0x8007FB28; -D_8007FB40 = 0x8007FB40; -D_8007FB58 = 0x8007FB58; -D_8007FB70 = 0x8007FB70; -D_8007FB88 = 0x8007FB88; -D_8007FBA0 = 0x8007FBA0; -D_8007FBB8 = 0x8007FBB8; -D_8007FBD0 = 0x8007FBD0; -D_8007FBE8 = 0x8007FBE8; -D_8007FC00 = 0x8007FC00; -D_8007FC18 = 0x8007FC18; -D_8007FC30 = 0x8007FC30; -D_8007FC48 = 0x8007FC48; -D_8007FC60 = 0x8007FC60; -D_8007FC78 = 0x8007FC78; -D_8007FC90 = 0x8007FC90; -D_8007FCA8 = 0x8007FCA8; -D_8007FCC0 = 0x8007FCC0; -D_8007FCD8 = 0x8007FCD8; -D_8007FCF0 = 0x8007FCF0; -D_8007FD08 = 0x8007FD08; -D_8007FD20 = 0x8007FD20; -D_8007FD38 = 0x8007FD38; -D_8007FD50 = 0x8007FD50; -D_8007FD68 = 0x8007FD68; -D_8007FD80 = 0x8007FD80; -D_8007FD98 = 0x8007FD98; -D_8007FDB0 = 0x8007FDB0; -D_8007FDC8 = 0x8007FDC8; -D_8007FDE0 = 0x8007FDE0; -D_8007FDF8 = 0x8007FDF8; -D_8007FE10 = 0x8007FE10; -D_8007FE28 = 0x8007FE28; -D_8007FE40 = 0x8007FE40; -D_8007FE58 = 0x8007FE58; -D_8007FE70 = 0x8007FE70; -D_8007FE88 = 0x8007FE88; -D_8007FEA0 = 0x8007FEA0; D_8007FF20 = 0x8007FF20; D_80080208 = 0x80080208; -D_800804F0 = 0x800804F0; D_800806A0 = 0x800806A0; D_800806D0 = 0x800806D0; D_80080700 = 0x80080700; @@ -288,6 +33,7 @@ D_800822F8 = 0x800822F8; D_80082328 = 0x80082328; D_80082358 = 0x80082358; D_80082388 = 0x80082388; +gItemTable = 0x800878E0; D_8008A680 = 0x8008A680; D_8008DDD4 = 0x8008DDD4; D_8008E3D8 = 0x8008E3D8; @@ -315,12 +61,19 @@ D_8008FA78 = 0x8008FA78; D_8008FA8C = 0x8008FA8C; D_8008FC44 = 0x8008FC44; D_8008FEE0 = 0x8008FEE0; -D_8008FF60 = 0x8008FF60; -D_8008FF70 = 0x8008FF70; -D_8008FFB8 = 0x8008FFB8; +gAreas = 0x800934F0; D_800934F4 = 0x800934F4; D_80093B80 = 0x80093B80; D_80093B94 = 0x80093B94; +D_80093BA0 = 0x80093BA0; +FrameBuf = 0x80093BA8; +nuContPakCompanyCode = 0x80093CA0; +nuContPakGameCode = 0x80093CA4; +nuContCallBack = 0x80093CD0; +nuContRmbSearchTime = 0x80093CE0; +nuContRmbCallBack = 0x80093D00; +nuGfxFunc = 0x80093D10; +nuGfxPreNMIFunc = 0x80093D14; D_80093D20 = 0x80093D20; D_80093D38 = 0x80093D38; D_80093D50 = 0x80093D50; @@ -357,6 +110,7 @@ D_80094690 = 0x80094690; D_80094694 = 0x80094694; D_80094698 = 0x80094698; D_8009469C = 0x8009469C; +osViModeTable = 0x800946A0; D_80095820 = 0x80095820; D_80095870 = 0x80095870; D_800958C0 = 0x800958C0; @@ -379,6 +133,7 @@ D_800959A2 = 0x800959A2; D_800959A4 = 0x800959A4; D_800959A8 = 0x800959A8; D_800959D0 = 0x800959D0; +D_800959D4 = 0x800959D4; D_800959E0 = 0x800959E0; D_80095A30 = 0x80095A30; D_80095A4C = 0x80095A4C; @@ -524,32 +279,42 @@ D_80099E1C = 0x80099E1C; D_80099E20 = 0x80099E20; D_80099E28 = 0x80099E28; D_80099E30 = 0x80099E30; +D_8009A5B0 = 0x8009A5B0; D_8009A5B8 = 0x8009A5B8; D_8009A5C0 = 0x8009A5C0; D_8009A5C8 = 0x8009A5C8; D_8009A5CC = 0x8009A5CC; D_8009A5D0 = 0x8009A5D0; D_8009A5D4 = 0x8009A5D4; +D_8009A5D8 = 0x8009A5D8; +nuGfxZBuffer = 0x8009A5DC; D_8009A5E0 = 0x8009A5E0; D_8009A5E4 = 0x8009A5E4; D_8009A5E8 = 0x8009A5E8; D_8009A5EC = 0x8009A5EC; D_8009A5F0 = 0x8009A5F0; D_8009A5F4 = 0x8009A5F4; +nuGfxDisplay = 0x8009A5F8; D_8009A5FC = 0x8009A5FC; +gGameState = 0x8009A600; D_8009A604 = 0x8009A604; D_8009A606 = 0x8009A606; D_8009A608 = 0x8009A608; D_8009A60C = 0x8009A60C; +D_8009A610 = 0x8009A610; D_8009A614 = 0x8009A614; +nuGfxTaskSpool = 0x8009A618; D_8009A61C = 0x8009A61C; D_8009A620 = 0x8009A620; D_8009A628 = 0x8009A628; D_8009A62C = 0x8009A62C; +D_8009A630 = 0x8009A630; D_8009A634 = 0x8009A634; +carthandle = 0x8009A638; D_8009A63C = 0x8009A63C; D_8009A640 = 0x8009A640; D_8009A64C = 0x8009A64C; +D_8009A650 = 0x8009A650; D_8009A654 = 0x8009A654; D_8009A658 = 0x8009A658; D_8009A660 = 0x8009A660; @@ -561,10 +326,19 @@ D_8009A674 = 0x8009A674; D_8009A678 = 0x8009A678; D_8009A680 = 0x8009A680; D_8009A690 = 0x8009A690; +D_8009A6A0 = 0x8009A6A0; +D_8009A6A2 = 0x8009A6A2; +D_8009A6A4 = 0x8009A6A4; +D_8009A6A6 = 0x8009A6A6; D_8009A6B0 = 0x8009A6B0; D_8009BA30 = 0x8009BA30; D_8009BA50 = 0x8009BA50; D_8009BA80 = 0x8009BA80; +gCurtainScale = 0x8009BA90; +gCurtainScaleGoal = 0x8009BA94; +gCurtainFade = 0x8009BA98; +gCurtainFadeGoal = 0x8009BA9C; +gCurtainDrawCallback = 0x8009BAA0; D_8009BAA8 = 0x8009BAA8; D_8009BB30 = 0x8009BB30; D_8009C4E0 = 0x8009C4E0; @@ -583,6 +357,7 @@ D_800A08E4 = 0x800A08E4; D_800A08E8 = 0x800A08E8; D_800A08EC = 0x800A08EC; D_800A08F0 = 0x800A08F0; +D_800A0900 = 0x800A0900; D_800A0904 = 0x800A0904; D_800A0908 = 0x800A0908; D_800A0910 = 0x800A0910; @@ -596,14 +371,33 @@ D_800A0924 = 0x800A0924; D_800A0930 = 0x800A0930; D_800A0931 = 0x800A0931; D_800A0932 = 0x800A0932; +gMapTransitionAlpha = 0x800A0940; +D_800A0942 = 0x800A0942; +D_800A0944 = 0x800A0944; +D_800A0946 = 0x800A0946; +D_800A0948 = 0x800A0948; D_800A0950 = 0x800A0950; +D_800A0954 = 0x800A0954; +D_800A0956 = 0x800A0956; +D_800A0958 = 0x800A0958; +D_800A095A = 0x800A095A; +D_800A095B = 0x800A095B; +D_800A095C = 0x800A095C; +D_800A095D = 0x800A095D; +D_800A095E = 0x800A095E; D_800A095F = 0x800A095F; +D_800A0960 = 0x800A0960; +D_800A0963 = 0x800A0963; +D_800A0964 = 0x800A0964; D_800A0970 = 0x800A0970; D_800A0974 = 0x800A0974; D_800A0978 = 0x800A0978; D_800A097C = 0x800A097C; D_800A0980 = 0x800A0980; D_800A0988 = 0x800A0988; +gWorldNpcList = 0x800A0990; +gBattleNpcList = 0x800A0A90; +gCurrentNpcListPtr = 0x800A0B90; D_800A0B94 = 0x800A0B94; D_800A0BA0 = 0x800A0BA0; D_800A0BA4 = 0x800A0BA4; @@ -625,7 +419,9 @@ D_800A3638 = 0x800A3638; D_800A3640 = 0x800A3640; D_800A3658 = 0x800A3658; D_800A3720 = 0x800A3720; +nuAuDmaState = 0x800A3BD0; D_800A3BD4 = 0x800A3BD4; +nuAuDmaBuf = 0x800A3BE0; D_800A3BF0 = 0x800A3BF0; D_800A3FD0 = 0x800A3FD0; D_800A3FE0 = 0x800A3FE0; @@ -653,6 +449,13 @@ D_800A425C = 0x800A425C; D_800A4260 = 0x800A4260; D_800A4264 = 0x800A4264; D_800A4268 = 0x800A4268; +D_800A4270 = 0x800A4270; +D_800A4420 = 0x800A4420; +nuScStack = 0x800A65D0; +nuScAudioStack = 0x800A85D0; +nuScGraphicsStack = 0x800AA5D0; +D_800AC5D0 = 0x800AC5D0; +D_800AC5E8 = 0x800AC5E8; D_800AC6B0 = 0x800AC6B0; D_800AE6D0 = 0x800AE6D0; D_800AE6D4 = 0x800AE6D4; @@ -709,6 +512,7 @@ D_800B0EB8 = 0x800B0EB8; D_800B0ED0 = 0x800B0ED0; D_800B0F08 = 0x800B0F08; D_800B0F0C = 0x800B0F0C; +gCurrentEncounter = 0x800B0F10; D_800B1B0C = 0x800B1B0C; D_800B1B0D = 0x800B1B0D; D_800B1B0E = 0x800B1B0E; @@ -717,12 +521,15 @@ D_800B1B10 = 0x800B1B10; D_800B1B7C = 0x800B1B7C; D_800B1B7F = 0x800B1B7F; D_800B1B90 = 0x800B1B90; +nuContRmbCtl = 0x800B1D40; D_800B1D42 = 0x800B1D42; D_800B1D44 = 0x800B1D44; D_800B1D46 = 0x800B1D46; D_800B1D47 = 0x800B1D47; D_800B1D48 = 0x800B1D48; D_800B1D49 = 0x800B1D49; +nuContData = 0x800B1D68; +gCameras = 0x800B1D80; D_800B1D98 = 0x800B1D98; D_800B1DEC = 0x800B1DEC; D_800B1E54 = 0x800B1E54; @@ -758,6 +565,7 @@ D_800B451E = 0x800B451E; D_800B451F = 0x800B451F; D_800B4520 = 0x800B4520; D_800B6590 = 0x800B6590; +D_800B8590 = 0x800B8590; D_800B91A0 = 0x800B91A0; D_800B91D0 = 0x800B91D0; D_800D91D0 = 0x800D91D0; @@ -769,6 +577,7 @@ D_800D9230 = 0x800D9230; D_800D9248 = 0x800D9248; D_800D9278 = 0x800D9278; D_800D95E8 = 0x800D95E8; +D_800D9620 = 0x800D9620; D_800D9668 = 0x800D9668; D_800D9680 = 0x800D9680; D_800D9780 = 0x800D9780; @@ -786,8 +595,11 @@ D_800DAAB8 = 0x800DAAB8; D_800DAABC = 0x800DAABC; D_800DAABD = 0x800DAABD; D_800DAAC0 = 0x800DAAC0; +nuContPfs = 0x800DAAD8; +nuSiMesgQ = 0x800DAC78; D_800DAC90 = 0x800DAC90; D_800DACA8 = 0x800DACA8; +gCurrentSaveFile = 0x800DACC0; D_800DBC70 = 0x800DBC70; D_800DBD70 = 0x800DBD70; D_800DBF70 = 0x800DBF70; @@ -795,15 +607,10 @@ D_800DBF90 = 0x800DBF90; D_800DC040 = 0x800DC040; D_800DC060 = 0x800DC060; D_800DC064 = 0x800DC064; -D_800EA6CC = 0x800EA6CC; -D_800F1A10 = 0x800F1A10; -D_800F3680 = 0x800F3680; -D_800F48F4 = 0x800F48F4; -D_800F4944 = 0x800F4944; -D_800F4C1C = 0x800F4C1C; -D_800F4C6C = 0x800F4C6C; -D_800F4CF0 = 0x800F4CF0; -D_800F4D28 = 0x800F4D28; +gBattleState = 0x800DC068; +gBattleStatus = 0x800DC070; +D_800DC500 = 0x800DC500; +gPlayerStatusPtr = 0x800F7B30; D_800F7B40 = 0x800F7B40; D_800F7B44 = 0x800F7B44; D_800F7B48 = 0x800F7B48; @@ -843,6 +650,7 @@ D_800F803C = 0x800F803C; D_800F833C = 0x800F833C; D_800F8340 = 0x800F8340; D_800F8344 = 0x800F8344; +gPartnerAnimations = 0x800F8348; D_800F84F8 = 0x800F84F8; D_800FBB60 = 0x800FBB60; D_800FBBE0 = 0x800FBBE0; @@ -897,6 +705,7 @@ D_801083D8 = 0x801083D8; D_801084F0 = 0x801084F0; D_80108518 = 0x80108518; D_80108538 = 0x80108538; +D_80108558 = 0x80108558; D_801086AC = 0x801086AC; D_80108974 = 0x80108974; D_801089C4 = 0x801089C4; @@ -917,6 +726,7 @@ D_80108F30 = 0x80108F30; D_80108F90 = 0x80108F90; D_801091E4 = 0x801091E4; D_80109244 = 0x80109244; +D_80109270 = 0x80109270; D_80109480 = 0x80109480; D_80109484 = 0x80109484; D_80109488 = 0x80109488; @@ -1032,6 +842,9 @@ D_8010CCFA = 0x8010CCFA; D_8010CCFC = 0x8010CCFC; D_8010CCFE = 0x8010CCFE; D_8010CD00 = 0x8010CD00; +D_8010CD10 = 0x8010CD10; +D_8010CD12 = 0x8010CD12; +D_8010CD20 = 0x8010CD20; D_8010CD30 = 0x8010CD30; D_8010CD34 = 0x8010CD34; D_8010CD38 = 0x8010CD38; @@ -1053,6 +866,7 @@ D_8010CFE8 = 0x8010CFE8; D_8010CFEC = 0x8010CFEC; D_8010CFF0 = 0x8010CFF0; D_8010CFF4 = 0x8010CFF4; +D_8010D000 = 0x8010D000; D_8010D640 = 0x8010D640; D_8010D644 = 0x8010D644; D_8010D648 = 0x8010D648; @@ -1094,120 +908,38 @@ D_8010D69C = 0x8010D69C; D_8010D6A0 = 0x8010D6A0; D_8010D6A4 = 0x8010D6A4; D_8010D6B0 = 0x8010D6B0; +D_8010EBB0 = 0x8010EBB0; D_8010EBB1 = 0x8010EBB1; D_8010EBB3 = 0x8010EBB3; D_8010EBB4 = 0x8010EBB4; +D_8010EF08 = 0x8010EF08; D_8010EF10 = 0x8010EF10; D_8010EF28 = 0x8010EF28; D_8010EF40 = 0x8010EF40; +gUIStatus = 0x8010EF58; D_8010EF92 = 0x8010EF92; D_8010EF9C = 0x8010EF9C; D_8010EF9D = 0x8010EF9D; D_8010EF9E = 0x8010EF9E; +gPlayerStatus = 0x8010EFC8; +gPlayerActionState = 0x8010F07C; +gPlayerAnimation = 0x8010F080; +D_8010F250 = 0x8010F250; +gPlayerData = 0x8010F290; D_8010F6B8 = 0x8010F6B8; -D_8010FE44 = 0x8010FE44; -D_8010FE68 = 0x8010FE68; -D_8011800C = 0x8011800C; -D_8011F4D4 = 0x8011F4D4; -D_80121184 = 0x80121184; -D_80127B70 = 0x80127B70; -D_80132D94 = 0x80132D94; -D_8013673C = 0x8013673C; -D_801369D0 = 0x801369D0; -D_80136A08 = 0x80136A08; -D_80147650 = 0x80147650; -D_8014AFB0 = 0x8014AFB0; -D_8014AFC0 = 0x8014AFC0; -D_8014B000 = 0x8014B000; -D_8014B0B8 = 0x8014B0B8; -D_8014B0BC = 0x8014B0BC; -D_8014B400 = 0x8014B400; -D_8014B404 = 0x8014B404; -D_8014B748 = 0x8014B748; -D_8014B74C = 0x8014B74C; -D_8014B74D = 0x8014B74D; -D_8014B74E = 0x8014B74E; -D_8014B74F = 0x8014B74F; -D_8014B750 = 0x8014B750; -D_8014B751 = 0x8014B751; -D_8014B752 = 0x8014B752; -D_8014B753 = 0x8014B753; -D_8014B754 = 0x8014B754; -D_8014B755 = 0x8014B755; -D_8014B756 = 0x8014B756; -D_8014B758 = 0x8014B758; -D_8014B75C = 0x8014B75C; -D_8014B760 = 0x8014B760; -D_8014B761 = 0x8014B761; -D_8014B762 = 0x8014B762; -D_8014B763 = 0x8014B763; -D_8014B764 = 0x8014B764; -D_8014B765 = 0x8014B765; -D_8014B768 = 0x8014B768; -D_8014B7A8 = 0x8014B7A8; +update_entities = 0x8010F6D0; +D_80147474 = 0x80147474; +func_80147474 = 0x80147474; +D_80147574 = 0x80147574; +func_80147574 = 0x80147574; +func_80147650 = 0x80147650; D_8014B7F0 = 0x8014B7F0; -D_8014B7F8 = 0x8014B7F8; -D_8014B820 = 0x8014B820; -D_8014B848 = 0x8014B848; -D_8014B870 = 0x8014B870; -D_8014B898 = 0x8014B898; -D_8014B8C0 = 0x8014B8C0; -D_8014B8E8 = 0x8014B8E8; -D_8014B988 = 0x8014B988; -D_8014B9B0 = 0x8014B9B0; -D_8014B9D8 = 0x8014B9D8; -D_8014BA00 = 0x8014BA00; -D_8014BA48 = 0x8014BA48; -D_8014BA70 = 0x8014BA70; -D_8014BA98 = 0x8014BA98; -D_8014BAE8 = 0x8014BAE8; -D_8014BBD8 = 0x8014BBD8; -D_8014BE78 = 0x8014BE78; -D_8014BEA0 = 0x8014BEA0; -D_8014BEC8 = 0x8014BEC8; -D_8014BEF0 = 0x8014BEF0; -D_8014BF18 = 0x8014BF18; -D_8014BF40 = 0x8014BF40; -D_8014BF68 = 0x8014BF68; -D_8014C188 = 0x8014C188; D_8014C248 = 0x8014C248; -D_8014C250 = 0x8014C250; -D_8014C260 = 0x8014C260; -D_8014C270 = 0x8014C270; -D_8014C280 = 0x8014C280; D_8014C290 = 0x8014C290; D_8014C294 = 0x8014C294; -D_8014C296 = 0x8014C296; -D_8014C298 = 0x8014C298; -D_8014C2D8 = 0x8014C2D8; -D_8014C340 = 0x8014C340; -D_8014C368 = 0x8014C368; -D_8014C3C0 = 0x8014C3C0; -D_8014C400 = 0x8014C400; -D_8014C440 = 0x8014C440; -D_8014C480 = 0x8014C480; -D_8014C4C0 = 0x8014C4C0; -D_8014C500 = 0x8014C500; -D_8014C580 = 0x8014C580; -D_8014C588 = 0x8014C588; -D_8014C620 = 0x8014C620; -D_8014C678 = 0x8014C678; -D_8014C6A0 = 0x8014C6A0; -D_8014C6D0 = 0x8014C6D0; -D_8014C6E0 = 0x8014C6E0; -D_8014C6E4 = 0x8014C6E4; -D_8014C6F0 = 0x8014C6F0; -D_8014E618 = 0x8014E618; -D_8014E670 = 0x8014E670; -D_8014E6C0 = 0x8014E6C0; -D_8014E718 = 0x8014E718; -D_8014E8F0 = 0x8014E8F0; -D_8014E9A8 = 0x8014E9A8; -D_8014EA48 = 0x8014EA48; -D_8014ED98 = 0x8014ED98; -D_8014EDE8 = 0x8014EDE8; D_8014F130 = 0x8014F130; D_8014F134 = 0x8014F134; +D_8014F140 = 0x8014F140; D_8014F150 = 0x8014F150; D_8014F250 = 0x8014F250; D_8014F298 = 0x8014F298; @@ -1220,6 +952,9 @@ D_8014F2C0 = 0x8014F2C0; D_8014F2D0 = 0x8014F2D0; D_8014F5A4 = 0x8014F5A4; D_8014F6B4 = 0x8014F6B4; +D_8014F6F0 = 0x8014F6F0; +gSongsUsingVariationFlag = 0x8014F720; +D_8014F738 = 0x8014F738; D_8014F740 = 0x8014F740; D_8014F768 = 0x8014F768; D_8014F7E8 = 0x8014F7E8; @@ -1392,29 +1127,43 @@ D_801512BC = 0x801512BC; D_801512C0 = 0x801512C0; D_801512C4 = 0x801512C4; D_801512C8 = 0x801512C8; +gCurrentModelListPtr = 0x801512CC; D_801512D0 = 0x801512D0; D_801512D4 = 0x801512D4; D_801512D8 = 0x801512D8; D_801512DA = 0x801512DA; D_801512E0 = 0x801512E0; D_801512E4 = 0x801512E4; +gCurrentModelSpecialDlsPtr = 0x801512E8; +gLastCreatedEntityIndex = 0x801512EC; D_801512F0 = 0x801512F0; D_801512F4 = 0x801512F4; D_801512F8 = 0x801512F8; D_801512FC = 0x801512FC; D_80151300 = 0x80151300; D_80151304 = 0x80151304; +D_80151308 = 0x80151308; D_8015130C = 0x8015130C; D_8015130E = 0x8015130E; +D_80151310 = 0x80151310; D_80151314 = 0x80151314; D_80151318 = 0x80151318; D_8015131C = 0x8015131C; D_80151324 = 0x80151324; +D_80151328 = 0x80151328; D_8015132C = 0x8015132C; D_80151330 = 0x80151330; +gTriggerCount = 0x80151334; D_80151338 = 0x80151338; D_8015133C = 0x8015133C; +gCurrentDoorSoundsSet = 0x80151340; D_80151344 = 0x80151344; +gWorldEntityList = 0x80151380; +gBattleEntityList = 0x801513F8; +gCurrentEntityListPtr = 0x80151470; +gWorldShadowList = 0x80151478; +gBattleShadowList = 0x80151568; +gCurrentShadowListPtr = 0x80151658; D_8015165C = 0x8015165C; D_80151660 = 0x80151660; D_80151668 = 0x80151668; @@ -1422,9 +1171,14 @@ D_801516DC = 0x801516DC; D_801516E8 = 0x801516E8; D_801516F4 = 0x801516F4; D_801516FC = 0x801516FC; +gMainGameState = 0x80151700; D_80151740 = 0x80151740; +gWorldModelList = 0x80151770; +gBattleModelList = 0x80151B70; D_80151F70 = 0x80151F70; D_80151F80 = 0x80151F80; +gWorldModelSpecialDls = 0x80151F90; +gBattleModelSpecialDls = 0x80152010; D_80152090 = 0x80152090; D_80152110 = 0x80152110; D_80152190 = 0x80152190; @@ -1462,6 +1216,7 @@ D_801536C0 = 0x801536C0; D_801539B8 = 0x801539B8; D_801539C0 = 0x801539C0; D_80153A00 = 0x80153A00; +gCurrentAnimMeshListPtr = 0x80153A40; D_80153A44 = 0x80153A44; D_80153A48 = 0x80153A48; D_80153A4B = 0x80153A4B; @@ -1494,6 +1249,9 @@ D_80154388 = 0x80154388; D_8015438B = 0x8015438B; D_8015438C = 0x8015438C; D_80154390 = 0x80154390; +gWorldDynamicEntityList = 0x801543A0; +gBattleDynamicEntityList = 0x801543E0; +gCurrentDynamicEntityListPtr = 0x80154420; D_80154430 = 0x80154430; D_80154C30 = 0x80154C30; D_80155C38 = 0x80155C38; @@ -1530,6 +1288,7 @@ D_8015690B = 0x8015690B; D_8015690C = 0x8015690C; D_80156948 = 0x80156948; D_80156950 = 0x80156950; +D_80156954 = 0x80156954; D_80156958 = 0x80156958; D_80156960 = 0x80156960; D_80156968 = 0x80156968; @@ -1548,8 +1307,12 @@ D_80158574 = 0x80158574; D_80158580 = 0x80158580; D_80158B80 = 0x80158B80; D_80159180 = 0x80159180; +gTriggerList1 = 0x80159190; +gTriggerList2 = 0x80159290; +gCurrentTriggerListPtr = 0x80159390; D_801593A0 = 0x801593A0; D_8015959E = 0x8015959E; +D_801595A0 = 0x801595A0; D_801595C0 = 0x801595C0; D_80159670 = 0x80159670; D_80159720 = 0x80159720; @@ -1559,8 +1322,14 @@ D_801598A0 = 0x801598A0; D_801599B8 = 0x801599B8; D_80159AD0 = 0x80159AD0; D_80159AD4 = 0x80159AD4; +gMusicUnkVolume = 0x80159AE0; +gMusicTargetVolume = 0x80159AE2; +gMusicUnkVolume2 = 0x80159AE4; +gMusicCurrentVolume = 0x80159AE6; +gMusicPlayers = 0x80159AF0; D_80159B08 = 0x80159B08; D_80159B50 = 0x80159B50; +gUIPanels = 0x80159D50; D_80159D54 = 0x80159D54; D_80159E7E = 0x80159E7E; D_8015A010 = 0x8015A010; @@ -1571,6 +1340,7 @@ D_8015A2BC = 0x8015A2BC; D_8015A2BE = 0x8015A2BE; D_8015A2D0 = 0x8015A2D0; D_8015A370 = 0x8015A370; +gCollisionStatus = 0x8015A550; D_8015A578 = 0x8015A578; D_8015A57A = 0x8015A57A; D_8015A590 = 0x8015A590; @@ -1578,6 +1348,7 @@ D_8015C74C = 0x8015C74C; D_8015C790 = 0x8015C790; D_8015C7A4 = 0x8015C7A4; D_8015C7A8 = 0x8015C7A8; +D_8015C7C0 = 0x8015C7C0; D_8015C7D0 = 0x8015C7D0; D_8015C7D2 = 0x8015C7D2; D_8015C7D8 = 0x8015C7D8; @@ -1587,12 +1358,11 @@ D_80197000 = 0x80197000; D_801A6000 = 0x801A6000; D_801A7000 = 0x801A7000; D_801AA000 = 0x801AA000; -D_80200080 = 0x80200080; +gBackgroundImage = 0x80200000; +func_80200080 = 0x80200080; D_80210000 = 0x80210000; -D_8021835C = 0x8021835C; D_802187E4 = 0x802187E4; -D_802188B0 = 0x802188B0; -D_80218DF4 = 0x80218DF4; +func_80218DF4_465284 = 0x80218DF4; D_80219040 = 0x80219040; D_8021A2B8 = 0x8021A2B8; D_8021A2D4 = 0x8021A2D4; @@ -1830,197 +1600,134 @@ D_80236040 = 0x80236040; D_802362D0 = 0x802362D0; D_80236560 = 0x80236560; D_802367F0 = 0x802367F0; -D_8023ED5C = 0x8023ED5C; -D_8023F088 = 0x8023F088; -D_8023FF84 = 0x8023FF84; -D_80240000 = 0x80240000; -D_80240010 = 0x80240010; -D_80240020 = 0x80240020; -D_8024003C = 0x8024003C; -D_80240068 = 0x80240068; -D_80240100 = 0x80240100; -D_80240128 = 0x80240128; -D_80240158 = 0x80240158; -D_802401D0 = 0x802401D0; -D_8024029C = 0x8024029C; -D_802402B0 = 0x802402B0; +get_dpad_input_radial = 0x8023E000; +func_802402B0_90CEF0 = 0x802402B0; D_802402C0 = 0x802402C0; -D_802402D0 = 0x802402D0; -D_802402E0 = 0x802402E0; -D_802402F0 = 0x802402F0; -D_802402F4 = 0x802402F4; -D_80240310 = 0x80240310; -D_80240320 = 0x80240320; -D_80240330 = 0x80240330; +func_802402D0_A7A7D0 = 0x802402D0; +func_802402E0_A071E0 = 0x802402E0; +func_80240330_8EC150 = 0x80240330; D_80240333 = 0x80240333; D_80240334 = 0x80240334; D_80240338 = 0x80240338; -D_80240360 = 0x80240360; -D_80240390 = 0x80240390; -D_802403A0 = 0x802403A0; -D_802403B8 = 0x802403B8; -D_802403C4 = 0x802403C4; -D_80240430 = 0x80240430; -D_80240480 = 0x80240480; -D_80240500 = 0x80240500; -D_80240530 = 0x80240530; -D_8024056C = 0x8024056C; -D_80240574 = 0x80240574; -D_802405B0 = 0x802405B0; -D_802405BC = 0x802405BC; -D_802405D4 = 0x802405D4; -D_80240620 = 0x80240620; -D_8024068C = 0x8024068C; -D_802406A0 = 0x802406A0; -D_802406BC = 0x802406BC; +func_80240390_8B0400 = 0x80240390; +func_802403A0_9FAB90 = 0x802403A0; +func_80240480_8C8410 = 0x80240480; +func_80240620_B351F0 = 0x80240620; D_802406C0 = 0x802406C0; -D_802406CC = 0x802406CC; -D_802406F0 = 0x802406F0; -D_80240730 = 0x80240730; -D_8024075C = 0x8024075C; -D_802407C0 = 0x802407C0; +func_802406F0_92A9A0 = 0x802406F0; +func_802407C0_843390 = 0x802407C0; D_802407D0 = 0x802407D0; D_802407E0 = 0x802407E0; -D_802407F0 = 0x802407F0; -D_802407F4 = 0x802407F4; -D_8024082C = 0x8024082C; -D_80240850 = 0x80240850; -D_80240870 = 0x80240870; -D_8024087C = 0x8024087C; -D_80240880 = 0x80240880; -D_802408A0 = 0x802408A0; +func_802407F0_87A3D0 = 0x802407F0; +func_802407F4_8D45B4 = 0x802407F4; +func_80240850_AEDC60 = 0x80240850; +func_80240870_BED660 = 0x80240870; +func_80240880_A2AAC0 = 0x80240880; D_802408C0 = 0x802408C0; D_8024092C = 0x8024092C; D_80240970 = 0x80240970; D_802409F0 = 0x802409F0; -D_802409FC = 0x802409FC; -D_80240A30 = 0x80240A30; -D_80240A38 = 0x80240A38; -D_80240A6C = 0x80240A6C; -D_80240AA0 = 0x80240AA0; -D_80240ACC = 0x80240ACC; -D_80240B00 = 0x80240B00; -D_80240B9C = 0x80240B9C; +func_80240A30_882BF0 = 0x80240A30; +func_80240A38_898018 = 0x80240A38; +func_80240AA0_95BCA0 = 0x80240AA0; +func_80240B00_900170 = 0x80240B00; D_80240C0C = 0x80240C0C; D_80240C0F = 0x80240C0F; -D_80240C20 = 0x80240C20; +func_80240C20_872650 = 0x80240C20; D_80240C24 = 0x80240C24; D_80240CBC = 0x80240CBC; -D_80240D98 = 0x80240D98; +func_80240D98_99D728 = 0x80240D98; D_80240D9C = 0x80240D9C; -D_80240DA4 = 0x80240DA4; D_80240DE0 = 0x80240DE0; -D_80240E00 = 0x80240E00; +func_80240E00_8B0E70 = 0x80240E00; D_80240E04 = 0x80240E04; D_80240E10 = 0x80240E10; -D_80240E2C = 0x80240E2C; -D_80240E84 = 0x80240E84; D_80240E88 = 0x80240E88; D_80240E8C = 0x80240E8C; -D_80240E90 = 0x80240E90; -D_80240E94 = 0x80240E94; -D_80240EB4 = 0x80240EB4; -D_80240EB8 = 0x80240EB8; -D_80240EE8 = 0x80240EE8; -D_80240EEC = 0x80240EEC; +func_80240E90_A878E0 = 0x80240E90; +func_80240E94_9C6274 = 0x80240E94; D_80240EF0 = 0x80240EF0; -D_80240EF8 = 0x80240EF8; D_80240F00 = 0x80240F00; D_80240F08 = 0x80240F08; -D_80240F1C = 0x80240F1C; -D_80240F2C = 0x80240F2C; -D_80240FD0 = 0x80240FD0; +func_80240F2C_95C12C = 0x80240F2C; +func_80240FD0_A3A4B0 = 0x80240FD0; D_80240FF8 = 0x80240FF8; D_8024100C = 0x8024100C; -D_80241040 = 0x80241040; +func_80241040_BE47F0 = 0x80241040; D_802410C0 = 0x802410C0; D_80241100 = 0x80241100; -D_80241108 = 0x80241108; +func_80241108_97EBD8 = 0x80241108; D_80241118 = 0x80241118; -D_80241120 = 0x80241120; -D_80241134 = 0x80241134; +func_80241120_A8DBA0 = 0x80241120; D_80241158 = 0x80241158; D_80241180 = 0x80241180; D_80241188 = 0x80241188; -D_8024119C = 0x8024119C; -D_802411A0 = 0x802411A0; -D_802411B8 = 0x802411B8; -D_8024121C = 0x8024121C; +func_8024119C_C3267C = 0x8024119C; +func_802411A0_D6FB50 = 0x802411A0; +func_802411B8_887578 = 0x802411B8; +func_8024121C_889DEC = 0x8024121C; D_80241220 = 0x80241220; -D_802412A0 = 0x802412A0; -D_802412F8 = 0x802412F8; -D_8024130C = 0x8024130C; +func_802412A0_CBA4A0 = 0x802412A0; +func_8024130C_C3783C = 0x8024130C; D_80241310 = 0x80241310; -D_80241340 = 0x80241340; -D_80241370 = 0x80241370; -D_80241388 = 0x80241388; -D_802413C0 = 0x802413C0; +func_80241340_887700 = 0x80241340; +func_80241370_843F40 = 0x80241370; D_802413F8 = 0x802413F8; -D_8024140C = 0x8024140C; D_80241420 = 0x80241420; D_80241428 = 0x80241428; D_80241430 = 0x80241430; -D_80241438 = 0x80241438; +func_80241438_8535A8 = 0x80241438; D_8024143C = 0x8024143C; -D_80241440 = 0x80241440; +func_80241440_8ED260 = 0x80241440; +func_80241440_B855C0 = 0x80241440; D_80241448 = 0x80241448; -D_80241458 = 0x80241458; -D_80241470 = 0x80241470; +func_80241470_95C670 = 0x80241470; D_80241478 = 0x80241478; D_80241488 = 0x80241488; -D_802414A8 = 0x802414A8; -D_802414BC = 0x802414BC; -D_802414D0 = 0x802414D0; -D_80241500 = 0x80241500; -D_80241510 = 0x80241510; -D_80241518 = 0x80241518; -D_80241530 = 0x80241530; +func_802414D0_CC4CE0 = 0x802414D0; +func_80241510_91FA80 = 0x80241510; +func_80241518_BD0108 = 0x80241518; +func_80241530_8ED350 = 0x80241530; D_80241534 = 0x80241534; D_80241538 = 0x80241538; D_8024153B = 0x8024153B; -D_80241540 = 0x80241540; -D_802415E0 = 0x802415E0; D_80241600 = 0x80241600; D_80241608 = 0x80241608; D_8024160C = 0x8024160C; -D_80241610 = 0x80241610; +func_80241610_D31290 = 0x80241610; D_8024161C = 0x8024161C; -D_80241628 = 0x80241628; -D_8024162C = 0x8024162C; +func_8024162C_9F606C = 0x8024162C; D_80241650 = 0x80241650; -D_80241658 = 0x80241658; -D_80241680 = 0x80241680; +func_80241658_8B16C8 = 0x80241658; +func_80241680_8537F0 = 0x80241680; +func_80241680_BE0410 = 0x80241680; D_80241684 = 0x80241684; D_80241688 = 0x80241688; D_8024168B = 0x8024168B; D_8024168C = 0x8024168C; -D_80241690 = 0x80241690; +func_80241690_A08590 = 0x80241690; D_802416AC = 0x802416AC; -D_802416B0 = 0x802416B0; -D_802416C0 = 0x802416C0; -D_802416EC = 0x802416EC; -D_802416F0 = 0x802416F0; -D_802416F8 = 0x802416F8; -D_80241740 = 0x80241740; +func_802416B0_A49C70 = 0x802416B0; +func_802416F0_9C6AD0 = 0x802416F0; +func_80241740_B36310 = 0x80241740; D_80241748 = 0x80241748; -D_80241760 = 0x80241760; +func_80241760_C50C70 = 0x80241760; D_80241768 = 0x80241768; -D_80241770 = 0x80241770; +func_80241770_832F70 = 0x80241770; D_80241778 = 0x80241778; -D_80241780 = 0x80241780; -D_802417A8 = 0x802417A8; +func_80241780_8ED5A0 = 0x80241780; D_802417C8 = 0x802417C8; D_802417CC = 0x802417CC; D_802417D0 = 0x802417D0; D_802417D8 = 0x802417D8; D_802417E4 = 0x802417E4; D_802417E8 = 0x802417E8; -D_802417EC = 0x802417EC; +func_802417EC_C5BF2C = 0x802417EC; D_80241800 = 0x80241800; +func_80241800_8B1870 = 0x80241800; D_80241810 = 0x80241810; D_80241820 = 0x80241820; -D_8024183C = 0x8024183C; -D_80241850 = 0x80241850; +func_80241850_A2BA90 = 0x80241850; D_80241854 = 0x80241854; D_8024186C = 0x8024186C; D_80241880 = 0x80241880; @@ -2029,37 +1736,35 @@ D_802418A0 = 0x802418A0; D_802418B0 = 0x802418B0; D_80241900 = 0x80241900; D_80241930 = 0x80241930; -D_802419E0 = 0x802419E0; D_80241A00 = 0x80241A00; -D_80241A78 = 0x80241A78; -D_80241AC8 = 0x80241AC8; -D_80241AD4 = 0x80241AD4; -D_80241AE0 = 0x80241AE0; +func_80241A78_BA61F8 = 0x80241A78; +func_80241AC8_D2D7F8 = 0x80241AC8; +func_80241AD4_B4C544 = 0x80241AD4; +func_80241AE0_9F6520 = 0x80241AE0; +func_80241AE0_DCE7B0 = 0x80241AE0; D_80241AE8 = 0x80241AE8; -D_80241AEC = 0x80241AEC; -D_80241AF0 = 0x80241AF0; +func_80241AEC_80236C = 0x80241AEC; +func_80241AF0_A6FED0 = 0x80241AF0; D_80241AF8 = 0x80241AF8; -D_80241B00 = 0x80241B00; -D_80241B08 = 0x80241B08; -D_80241B10 = 0x80241B10; -D_80241B14 = 0x80241B14; +func_80241B00_B366D0 = 0x80241B00; +func_80241B08_B94F48 = 0x80241B08; +func_80241B10_88A6E0 = 0x80241B10; +func_80241B14_9A9F04 = 0x80241B14; D_80241B18 = 0x80241B18; -D_80241B24 = 0x80241B24; D_80241B2C = 0x80241B2C; -D_80241B38 = 0x80241B38; -D_80241B44 = 0x80241B44; -D_80241B54 = 0x80241B54; +func_80241B38_BEE928 = 0x80241B38; +func_80241B44_E06EA4 = 0x80241B44; +func_80241B54_8023D4 = 0x80241B54; D_80241B60 = 0x80241B60; D_80241B64 = 0x80241B64; D_80241B68 = 0x80241B68; D_80241B70 = 0x80241B70; -D_80241B74 = 0x80241B74; -D_80241B7C = 0x80241B7C; +func_80241B74_911224 = 0x80241B74; +func_80241B7C_A043BC = 0x80241B7C; D_80241B80 = 0x80241B80; -D_80241B84 = 0x80241B84; +func_80241B84_9C6F64 = 0x80241B84; D_80241B88 = 0x80241B88; -D_80241B8C = 0x80241B8C; -D_80241B9C = 0x80241B9C; +func_80241B9C_B3676C = 0x80241B9C; D_80241BAE = 0x80241BAE; D_80241BB0 = 0x80241BB0; D_80241BF0 = 0x80241BF0; @@ -2070,98 +1775,93 @@ D_80241C2C = 0x80241C2C; D_80241C2F = 0x80241C2F; D_80241C30 = 0x80241C30; D_80241C33 = 0x80241C33; -D_80241C40 = 0x80241C40; +func_80241C40_844810 = 0x80241C40; D_80241C48 = 0x80241C48; D_80241C58 = 0x80241C58; D_80241C68 = 0x80241C68; D_80241C98 = 0x80241C98; -D_80241CB0 = 0x80241CB0; -D_80241CCC = 0x80241CCC; +func_80241CB0_A17ED0 = 0x80241CB0; +func_80241CCC_A3B1AC = 0x80241CCC; D_80241CD0 = 0x80241CD0; -D_80241CDC = 0x80241CDC; -D_80241CF0 = 0x80241CF0; -D_80241CF4 = 0x80241CF4; +func_80241CF0_9113A0 = 0x80241CF0; +func_80241CF4_88A8C4 = 0x80241CF4; D_80241CF8 = 0x80241CF8; -D_80241D30 = 0x80241D30; -D_80241D38 = 0x80241D38; +func_80241D38_991518 = 0x80241D38; D_80241D3B = 0x80241D3B; -D_80241D60 = 0x80241D60; D_80241D98 = 0x80241D98; D_80241D9C = 0x80241D9C; D_80241DA8 = 0x80241DA8; -D_80241DAC = 0x80241DAC; D_80241DD0 = 0x80241DD0; D_80241E20 = 0x80241E20; -D_80241E28 = 0x80241E28; +func_80241E28_853F98 = 0x80241E28; D_80241E30 = 0x80241E30; -D_80241E40 = 0x80241E40; -D_80241E48 = 0x80241E48; -D_80241E50 = 0x80241E50; -D_80241E58 = 0x80241E58; -D_80241E90 = 0x80241E90; +func_80241E40_DAF240 = 0x80241E40; +func_80241E48_C70178 = 0x80241E48; +func_80241E50_A4A410 = 0x80241E50; +func_80241E58_9C7238 = 0x80241E58; +func_80241E90_8B1F00 = 0x80241E90; +func_80241E98_A1CF98 = 0x80241E98; D_80241E98 = 0x80241E98; D_80241EA0 = 0x80241EA0; D_80241EA8 = 0x80241EA8; D_80241ECC = 0x80241ECC; -D_80241F00 = 0x80241F00; -D_80241F10 = 0x80241F10; +func_80241F00_854070 = 0x80241F00; +func_80241F10_802790 = 0x80241F10; D_80241F14 = 0x80241F14; -D_80241F68 = 0x80241F68; -D_80241F94 = 0x80241F94; -D_80241F98 = 0x80241F98; +func_80241F94_95D194 = 0x80241F94; +func_80241F98_D21E28 = 0x80241F98; D_80241FB0 = 0x80241FB0; D_80241FB8 = 0x80241FB8; D_80241FC0 = 0x80241FC0; -D_80241FC8 = 0x80241FC8; +func_80241FC8_C87A78 = 0x80241FC8; D_80241FE0 = 0x80241FE0; D_80241FF4 = 0x80241FF4; D_80242000 = 0x80242000; +func_80242000_C48BE0 = 0x80242000; D_80242008 = 0x80242008; D_80242010 = 0x80242010; D_80242030 = 0x80242030; +func_80242030_8EDE50 = 0x80242030; D_80242038 = 0x80242038; -D_80242040 = 0x80242040; +func_80242040_8B20B0 = 0x80242040; D_80242048 = 0x80242048; -D_80242050 = 0x80242050; +func_80242050_95D250 = 0x80242050; D_80242054 = 0x80242054; D_80242058 = 0x80242058; D_8024205C = 0x8024205C; D_80242070 = 0x80242070; D_80242088 = 0x80242088; D_802420A0 = 0x802420A0; -D_802420B0 = 0x802420B0; +func_802420B0_87BC90 = 0x802420B0; D_802420BC = 0x802420BC; D_802420D0 = 0x802420D0; -D_80242110 = 0x80242110; +func_80242110_D21FA0 = 0x80242110; D_80242118 = 0x80242118; -D_80242134 = 0x80242134; -D_80242148 = 0x80242148; +func_80242134_88AD04 = 0x80242134; +func_80242148_825408 = 0x80242148; D_80242160 = 0x80242160; D_80242180 = 0x80242180; -D_8024219C = 0x8024219C; -D_802421A0 = 0x802421A0; -D_802421D0 = 0x802421D0; +func_8024219C_BE594C = 0x8024219C; +func_802421A0_8EDFC0 = 0x802421A0; +func_802421D0_7ECEE0 = 0x802421D0; D_802421D8 = 0x802421D8; -D_802421E8 = 0x802421E8; -D_80242200 = 0x80242200; +func_80242200_C62F10 = 0x80242200; D_80242208 = 0x80242208; D_80242220 = 0x80242220; -D_80242230 = 0x80242230; -D_80242240 = 0x80242240; -D_80242248 = 0x80242248; -D_80242250 = 0x80242250; +func_80242230_CF4E00 = 0x80242230; +func_80242240_9C7620 = 0x80242240; +func_80242248_87BE28 = 0x80242248; +func_80242250_7ECF60 = 0x80242250; D_80242288 = 0x80242288; D_80242290 = 0x80242290; -D_80242298 = 0x80242298; +func_80242298_CC5AA8 = 0x80242298; D_802422CC = 0x802422CC; D_802422D0 = 0x802422D0; -D_802422DC = 0x802422DC; -D_802422F0 = 0x802422F0; -D_80242318 = 0x80242318; -D_8024231C = 0x8024231C; +func_802422F0_A706D0 = 0x802422F0; +func_8024231C_A1D41C = 0x8024231C; D_80242340 = 0x80242340; D_80242344 = 0x80242344; -D_80242348 = 0x80242348; +func_80242348_A1D448 = 0x80242348; D_80242350 = 0x80242350; D_80242370 = 0x80242370; D_80242378 = 0x80242378; @@ -2169,119 +1869,119 @@ D_802423B0 = 0x802423B0; D_802423B8 = 0x802423B8; D_802423C8 = 0x802423C8; D_802423E0 = 0x802423E0; -D_8024240C = 0x8024240C; D_8024242C = 0x8024242C; D_80242430 = 0x80242430; D_80242438 = 0x80242438; -D_80242448 = 0x80242448; -D_80242468 = 0x80242468; +func_80242448_CC5C58 = 0x80242448; D_80242470 = 0x80242470; D_80242480 = 0x80242480; -D_802424A0 = 0x802424A0; +func_802424A0_833CA0 = 0x802424A0; D_802424A8 = 0x802424A8; -D_802424C0 = 0x802424C0; +func_802424C0_B4CF30 = 0x802424C0; D_802424E0 = 0x802424E0; -D_802424F0 = 0x802424F0; +func_802424F0_C38A20 = 0x802424F0; D_80242510 = 0x80242510; -D_80242514 = 0x80242514; +func_80242514_9C78F4 = 0x80242514; D_80242518 = 0x80242518; D_80242520 = 0x80242520; D_80242528 = 0x80242528; D_80242530 = 0x80242530; D_80242538 = 0x80242538; +func_80242538_D223C8 = 0x80242538; D_8024253C = 0x8024253C; -D_80242540 = 0x80242540; -D_80242558 = 0x80242558; -D_80242560 = 0x80242560; +func_80242540_A09440 = 0x80242540; +func_80242558_A1D658 = 0x80242558; +func_80242560_95D760 = 0x80242560; D_80242568 = 0x80242568; -D_80242570 = 0x80242570; -D_802425BC = 0x802425BC; -D_802425E0 = 0x802425E0; +func_80242570_7ED280 = 0x80242570; +func_802425BC_A1D6BC = 0x802425BC; +func_802425E0_A1D6E0 = 0x802425E0; D_802425E4 = 0x802425E4; D_802425E8 = 0x802425E8; -D_8024260C = 0x8024260C; D_80242610 = 0x80242610; D_80242614 = 0x80242614; D_80242618 = 0x80242618; +func_80242618_A18838 = 0x80242618; D_80242630 = 0x80242630; D_8024264C = 0x8024264C; D_80242670 = 0x80242670; D_80242678 = 0x80242678; -D_80242680 = 0x80242680; +func_80242680_802F00 = 0x80242680; +func_80242688_C79368 = 0x80242688; D_80242688 = 0x80242688; D_802426B0 = 0x802426B0; D_802426B8 = 0x802426B8; -D_802426C8 = 0x802426C8; -D_802426E0 = 0x802426E0; -D_80242708 = 0x80242708; +func_802426C8_7ED3D8 = 0x802426C8; +func_802426E0_BA6E60 = 0x802426E0; +func_80242708_854878 = 0x80242708; D_8024273C = 0x8024273C; D_80242758 = 0x80242758; D_802427A8 = 0x802427A8; -D_802427B0 = 0x802427B0; -D_802427B8 = 0x802427B8; +func_802427B0_BE5F60 = 0x802427B0; D_802427BC = 0x802427BC; -D_802427C0 = 0x802427C0; +func_802427C0_9C7BA0 = 0x802427C0; D_802427C8 = 0x802427C8; -D_802427D0 = 0x802427D0; +func_802427D0_833FD0 = 0x802427D0; D_802427D8 = 0x802427D8; D_802427E0 = 0x802427E0; D_802427E8 = 0x802427E8; D_80242850 = 0x80242850; D_80242858 = 0x80242858; -D_80242860 = 0x80242860; +func_80242860_8B28D0 = 0x80242860; D_80242868 = 0x80242868; -D_80242870 = 0x80242870; D_80242888 = 0x80242888; -D_802428E0 = 0x802428E0; -D_80242908 = 0x80242908; -D_8024291C = 0x8024291C; +func_802428E0_DF1780 = 0x802428E0; +func_8024291C_C494FC = 0x8024291C; D_8024292C = 0x8024292C; D_80242930 = 0x80242930; -D_8024296C = 0x8024296C; -D_80242970 = 0x80242970; +func_80242930_9C7D10 = 0x80242930; +func_8024296C_C8841C = 0x8024296C; +func_80242970_7ED680 = 0x80242970; D_802429A4 = 0x802429A4; -D_802429B8 = 0x802429B8; +func_802429B8_B37588 = 0x802429B8; D_802429BC = 0x802429BC; D_802429E0 = 0x802429E0; D_802429E8 = 0x802429E8; D_802429F4 = 0x802429F4; D_802429F8 = 0x802429F8; -D_80242A00 = 0x80242A00; -D_80242A04 = 0x80242A04; -D_80242A30 = 0x80242A30; +func_80242A00_9D9A20 = 0x80242A00; +func_80242A30_7ED740 = 0x80242A30; D_80242A38 = 0x80242A38; -D_80242A3C = 0x80242A3C; +func_80242A3C_8EE85C = 0x80242A3C; D_80242A78 = 0x80242A78; D_80242AA0 = 0x80242AA0; -D_80242AC0 = 0x80242AC0; +func_80242AC0 = 0x80242AC0; D_80242AC4 = 0x80242AC4; D_80242ACC = 0x80242ACC; D_80242AD0 = 0x80242AD0; D_80242B7E = 0x80242B7E; -D_80242B90 = 0x80242B90; -D_80242B94 = 0x80242B94; +func_80242B90_803410 = 0x80242B90; +func_80242B90_A1DC90 = 0x80242B90; D_80242B98 = 0x80242B98; D_80242B9C = 0x80242B9C; -D_80242BA8 = 0x80242BA8; +pause_set_cursor_opacity = 0x80242BA0; +func_80242BA8_8B2C18 = 0x80242BA8; +update_end_player_turn = 0x80242BB0; D_80242BB8 = 0x80242BB8; D_80242BD8 = 0x80242BD8; D_80242BF8 = 0x80242BF8; -D_80242C00 = 0x80242C00; +func_80242C00_BB0540 = 0x80242C00; D_80242C08 = 0x80242C08; D_80242C0E = 0x80242C0E; D_80242C30 = 0x80242C30; +func_80242C30_B37800 = 0x80242C30; D_80242C38 = 0x80242C38; D_80242C40 = 0x80242C40; -D_80242C48 = 0x80242C48; +func_80242C48_9122F8 = 0x80242C48; D_80242C50 = 0x80242C50; D_80242C58 = 0x80242C58; D_80242C6C = 0x80242C6C; -D_80242C70 = 0x80242C70; +func_80242C70_9AB060 = 0x80242C70; D_80242CB0 = 0x80242CB0; -D_80242CD8 = 0x80242CD8; +func_80242CD8_C799B8 = 0x80242CD8; D_80242CF0 = 0x80242CF0; -D_80242CF8 = 0x80242CF8; -D_80242D00 = 0x80242D00; +func_80242CF8_9D9D18 = 0x80242CF8; +func_80242D00_A96440 = 0x80242D00; D_80242D40 = 0x80242D40; D_80242D48 = 0x80242D48; D_80242D50 = 0x80242D50; @@ -2291,19 +1991,18 @@ D_80242D68 = 0x80242D68; D_80242D70 = 0x80242D70; D_80242D80 = 0x80242D80; D_80242D88 = 0x80242D88; -D_80242E88 = 0x80242E88; +func_80242E88_95E088 = 0x80242E88; D_80242E90 = 0x80242E90; D_80242E98 = 0x80242E98; -D_80242EAC = 0x80242EAC; +func_80242EAC_96C06C = 0x80242EAC; D_80242EB0 = 0x80242EB0; D_80242EB8 = 0x80242EB8; -D_80242EBC = 0x80242EBC; +func_80242EBC_7EDBCC = 0x80242EBC; D_80242ECC = 0x80242ECC; -D_80242EE0 = 0x80242EE0; +func_80242EE0_A1DFE0 = 0x80242EE0; D_80242EE8 = 0x80242EE8; -D_80242EF0 = 0x80242EF0; -D_80242EF8 = 0x80242EF8; -D_80242F08 = 0x80242F08; +func_80242EF0_BE66A0 = 0x80242EF0; +func_80242EF8 = 0x80242EF8; D_80242F20 = 0x80242F20; D_80242F30 = 0x80242F30; D_80242F34 = 0x80242F34; @@ -2311,79 +2010,75 @@ D_80242F38 = 0x80242F38; D_80242F40 = 0x80242F40; D_80242F50 = 0x80242F50; D_80242F58 = 0x80242F58; -D_80242F60 = 0x80242F60; -D_80242F68 = 0x80242F68; +func_80242F60_826220 = 0x80242F60; +func_80242F68 = 0x80242F68; D_80242F70 = 0x80242F70; D_80242F88 = 0x80242F88; -D_80242F90 = 0x80242F90; +func_80242F90 = 0x80242F90; D_80242F98 = 0x80242F98; D_80242FA0 = 0x80242FA0; -D_80242FA4 = 0x80242FA4; D_80242FB0 = 0x80242FB0; -D_80242FE0 = 0x80242FE0; +func_80242FE0_A1E0E0 = 0x80242FE0; D_80242FE8 = 0x80242FE8; D_80242FF0 = 0x80242FF0; -D_80242FF4 = 0x80242FF4; D_80242FF8 = 0x80242FF8; -D_80243000 = 0x80243000; +func_80243000_9AB3F0 = 0x80243000; D_80243008 = 0x80243008; -D_80243010 = 0x80243010; +func_80243010_A1E110 = 0x80243010; D_80243048 = 0x80243048; D_8024304C = 0x8024304C; -D_80243070 = 0x80243070; +func_80243070_8B30E0 = 0x80243070; D_80243078 = 0x80243078; D_80243080 = 0x80243080; -D_80243088 = 0x80243088; +func_80243088_8551F8 = 0x80243088; D_8024308C = 0x8024308C; -D_80243090 = 0x80243090; +func_80243090_C395C0 = 0x80243090; +func_80243090_8B3100 = 0x80243090; D_80243098 = 0x80243098; -D_8024309C = 0x8024309C; +func_8024309C_95E29C = 0x8024309C; D_802430A0 = 0x802430A0; -D_802430A8 = 0x802430A8; +func_802430A8_A967E8 = 0x802430A8; D_802430B0 = 0x802430B0; -D_802430C0 = 0x802430C0; +func_802430C0_B37C90 = 0x802430C0; D_802430E8 = 0x802430E8; -D_802430F0 = 0x802430F0; +func_802430F0_C49CD0 = 0x802430F0; D_80243110 = 0x80243110; D_80243168 = 0x80243168; D_80243178 = 0x80243178; -D_80243188 = 0x80243188; D_80243190 = 0x80243190; D_802431CC = 0x802431CC; -D_802431E4 = 0x802431E4; +func_802431E4_8B3254 = 0x802431E4; D_802431F0 = 0x802431F0; D_802431F8 = 0x802431F8; D_80243200 = 0x80243200; -D_80243210 = 0x80243210; -D_80243220 = 0x80243220; -D_80243238 = 0x80243238; +func_80243210_8B3280 = 0x80243210; +func_80243220_DC04D0 = 0x80243220; D_80243240 = 0x80243240; D_80243248 = 0x80243248; D_80243250 = 0x80243250; -D_80243254 = 0x80243254; +func_80243254_8553C4 = 0x80243254; D_80243258 = 0x80243258; D_80243260 = 0x80243260; D_80243268 = 0x80243268; -D_80243284 = 0x80243284; +func_80243284_8B32F4 = 0x80243284; D_80243288 = 0x80243288; D_802432D0 = 0x802432D0; D_802432D4 = 0x802432D4; D_802432E0 = 0x802432E0; -D_802432E8 = 0x802432E8; +func_802432E8 = 0x802432E8; D_802432F0 = 0x802432F0; -D_80243300 = 0x80243300; -D_80243310 = 0x80243310; +func_80243300_8B3370 = 0x80243300; +func_80243310_9AB700 = 0x80243310; D_80243328 = 0x80243328; D_80243340 = 0x80243340; D_80243348 = 0x80243348; -D_80243350 = 0x80243350; +func_80243350_95E550 = 0x80243350; D_80243358 = 0x80243358; -D_80243370 = 0x80243370; +func_80243370_8B33E0 = 0x80243370; D_80243374 = 0x80243374; -D_80243380 = 0x80243380; -D_80243388 = 0x80243388; +func_80243380_8554F0 = 0x80243380; D_80243390 = 0x80243390; -D_802433AC = 0x802433AC; +func_802433AC_8B341C = 0x802433AC; D_802433AE = 0x802433AE; D_802433B0 = 0x802433B0; D_802433B2 = 0x802433B2; @@ -2391,18 +2086,15 @@ D_802433B4 = 0x802433B4; D_802433C0 = 0x802433C0; D_802433D8 = 0x802433D8; D_802433E0 = 0x802433E0; -D_802433F0 = 0x802433F0; -D_802433F4 = 0x802433F4; +func_802433F0_855560 = 0x802433F0; D_802433F8 = 0x802433F8; D_80243434 = 0x80243434; D_80243438 = 0x80243438; -D_8024343C = 0x8024343C; +func_8024343C_8555AC = 0x8024343C; D_80243440 = 0x80243440; D_80243448 = 0x80243448; D_80243450 = 0x80243450; D_80243458 = 0x80243458; -D_80243468 = 0x80243468; -D_8024349C = 0x8024349C; D_802434A0 = 0x802434A0; D_802434A8 = 0x802434A8; D_802434B0 = 0x802434B0; @@ -2412,65 +2104,64 @@ D_802434C8 = 0x802434C8; D_802434E0 = 0x802434E0; D_802434F8 = 0x802434F8; D_80243560 = 0x80243560; +pause_textbox_draw_contents = 0x80243570; D_80243580 = 0x80243580; D_802435B0 = 0x802435B0; -D_802435B8 = 0x802435B8; -D_802435C0 = 0x802435C0; -D_802435C8 = 0x802435C8; -D_802435D0 = 0x802435D0; -D_802435D8 = 0x802435D8; +func_802435B8_DD0288 = 0x802435B8; +func_802435C0_95E7C0 = 0x802435C0; +func_802435C8_96C788 = 0x802435C8; +func_802435D0_CC6DE0 = 0x802435D0; +func_802435D8_C43388 = 0x802435D8; D_802435E0 = 0x802435E0; D_802435E8 = 0x802435E8; +func_802435E8_DD02B8 = 0x802435E8; D_802435EC = 0x802435EC; +func_802435F0_C7A2D0 = 0x802435F0; D_802435F0 = 0x802435F0; D_80243600 = 0x80243600; D_80243608 = 0x80243608; D_80243610 = 0x80243610; D_80243614 = 0x80243614; -D_80243628 = 0x80243628; D_8024362C = 0x8024362C; D_80243650 = 0x80243650; D_80243658 = 0x80243658; D_80243660 = 0x80243660; -D_8024368C = 0x8024368C; D_802436D0 = 0x802436D0; D_802436DC = 0x802436DC; D_802436E0 = 0x802436E0; -D_802436F0 = 0x802436F0; -D_802436FC = 0x802436FC; +func_802436FC_8B376C = 0x802436FC; D_80243700 = 0x80243700; D_80243708 = 0x80243708; -D_80243718 = 0x80243718; +func_80243718_C7A3F8 = 0x80243718; D_80243720 = 0x80243720; D_80243730 = 0x80243730; D_8024373C = 0x8024373C; -D_80243754 = 0x80243754; -D_80243758 = 0x80243758; +func_80243758_A2D998 = 0x80243758; D_80243770 = 0x80243770; D_802437A0 = 0x802437A0; D_802437B0 = 0x802437B0; D_802437B4 = 0x802437B4; -D_802437B8 = 0x802437B8; +func_802437B8 = 0x802437B8; D_802437BC = 0x802437BC; D_802437C0 = 0x802437C0; D_802437E0 = 0x802437E0; D_802437F0 = 0x802437F0; -D_8024381C = 0x8024381C; D_80243830 = 0x80243830; D_80243838 = 0x80243838; -D_80243870 = 0x80243870; +func_80243870_96CA30 = 0x80243870; D_8024387C = 0x8024387C; -D_80243880 = 0x80243880; +func_80243880_95EA80 = 0x80243880; D_80243888 = 0x80243888; D_80243890 = 0x80243890; -D_80243898 = 0x80243898; +func_80243898 = 0x80243898; D_802438E0 = 0x802438E0; D_802438E8 = 0x802438E8; -D_802438F0 = 0x802438F0; +func_802438F0_C436A0 = 0x802438F0; +func_802438F0_95EAF0 = 0x802438F0; D_802438F8 = 0x802438F8; D_80243900 = 0x80243900; -D_80243908 = 0x80243908; -D_80243920 = 0x80243920; +switch_order = 0x80243918; +func_80243920_8041A0 = 0x80243920; D_80243928 = 0x80243928; D_80243930 = 0x80243930; D_80243960 = 0x80243960; @@ -2488,7 +2179,6 @@ D_80243A48 = 0x80243A48; D_80243A80 = 0x80243A80; D_80243A90 = 0x80243A90; D_80243AD8 = 0x80243AD8; -D_80243B10 = 0x80243B10; D_80243B14 = 0x80243B14; D_80243B18 = 0x80243B18; D_80243BB8 = 0x80243BB8; @@ -2503,13 +2193,12 @@ D_80243BE0 = 0x80243BE0; D_80243BF0 = 0x80243BF0; D_80243BF8 = 0x80243BF8; D_80243C40 = 0x80243C40; -D_80243C50 = 0x80243C50; +func_80243C50_C43A00 = 0x80243C50; D_80243CAC = 0x80243CAC; D_80243CB4 = 0x80243CB4; -D_80243CC0 = 0x80243CC0; +func_80243CC0_A2DF00 = 0x80243CC0; D_80243CC4 = 0x80243CC4; D_80243CC8 = 0x80243CC8; -D_80243CCC = 0x80243CCC; D_80243CD0 = 0x80243CD0; D_80243CD8 = 0x80243CD8; D_80243CE0 = 0x80243CE0; @@ -2527,7 +2216,7 @@ D_80243D5C = 0x80243D5C; D_80243D68 = 0x80243D68; D_80243D70 = 0x80243D70; D_80243D74 = 0x80243D74; -D_80243D78 = 0x80243D78; +func_80243D78_855EE8 = 0x80243D78; D_80243D80 = 0x80243D80; D_80243D88 = 0x80243D88; D_80243D90 = 0x80243D90; @@ -2544,7 +2233,6 @@ D_80243E18 = 0x80243E18; D_80243E58 = 0x80243E58; D_80243E80 = 0x80243E80; D_80243E88 = 0x80243E88; -D_80243EEC = 0x80243EEC; D_80243F18 = 0x80243F18; D_80243F20 = 0x80243F20; D_80243F28 = 0x80243F28; @@ -2561,7 +2249,7 @@ D_80244010 = 0x80244010; D_80244018 = 0x80244018; D_80244020 = 0x80244020; D_80244028 = 0x80244028; -D_80244030 = 0x80244030; +func_80244030 = 0x80244030; D_80244038 = 0x80244038; D_80244040 = 0x80244040; D_8024404C = 0x8024404C; @@ -2577,7 +2265,7 @@ D_802440E2 = 0x802440E2; D_802440E3 = 0x802440E3; D_802440E4 = 0x802440E4; D_802440E5 = 0x802440E5; -D_802440E8 = 0x802440E8; +func_802440E8_804968 = 0x802440E8; D_802440EB = 0x802440EB; D_802440EC = 0x802440EC; D_802440EF = 0x802440EF; @@ -2587,7 +2275,7 @@ D_802440F4 = 0x802440F4; D_802440F7 = 0x802440F7; D_802440F8 = 0x802440F8; D_802440FB = 0x802440FB; -D_802440FC = 0x802440FC; +func_802440FC_80497C = 0x802440FC; D_802440FF = 0x802440FF; D_80244100 = 0x80244100; D_80244104 = 0x80244104; @@ -2610,7 +2298,7 @@ D_80244204 = 0x80244204; D_80244208 = 0x80244208; D_802442D0 = 0x802442D0; D_802442D8 = 0x802442D8; -D_802442E0 = 0x802442E0; +func_802442E0_9DB300 = 0x802442E0; D_802442E8 = 0x802442E8; D_80244318 = 0x80244318; D_80244328 = 0x80244328; @@ -2621,7 +2309,7 @@ D_80244348 = 0x80244348; D_80244350 = 0x80244350; D_80244358 = 0x80244358; D_802443C0 = 0x802443C0; -D_802443D0 = 0x802443D0; +func_802443D0_9DB3F0 = 0x802443D0; D_802443F0 = 0x802443F0; D_802443F8 = 0x802443F8; D_80244400 = 0x80244400; @@ -2686,7 +2374,7 @@ D_80244880 = 0x80244880; D_80244888 = 0x80244888; D_80244890 = 0x80244890; D_80244898 = 0x80244898; -D_802448A0 = 0x802448A0; +func_802448A0_805120 = 0x802448A0; D_802448A8 = 0x802448A8; D_802448B0 = 0x802448B0; D_802448B8 = 0x802448B8; @@ -2697,11 +2385,12 @@ D_80244968 = 0x80244968; D_802449B0 = 0x802449B0; D_802449D0 = 0x802449D0; D_802449D8 = 0x802449D8; -D_802449F0 = 0x802449F0; -D_802449F8 = 0x802449F8; +func_802449F0_A2EC30 = 0x802449F0; +func_802449F8_805278 = 0x802449F8; D_80244A00 = 0x80244A00; D_80244A10 = 0x80244A10; D_80244A20 = 0x80244A20; +end_battle = 0x80244A50; D_80244A54 = 0x80244A54; D_80244A74 = 0x80244A74; D_80244A78 = 0x80244A78; @@ -2712,6 +2401,8 @@ D_80244B48 = 0x80244B48; D_80244B50 = 0x80244B50; D_80244B88 = 0x80244B88; D_80244B8C = 0x80244B8C; +pause_tabs_draw_invis = 0x80244B90; +pause_tabs_draw_stats_805418 = 0x80244B98; D_80244BB0 = 0x80244BB0; D_80244C18 = 0x80244C18; D_80244C48 = 0x80244C48; @@ -2719,6 +2410,7 @@ D_80244C4C = 0x80244C4C; D_80244CA0 = 0x80244CA0; D_80244CB0 = 0x80244CB0; D_80244CB8 = 0x80244CB8; +pause_tabs_draw_badges_A2EF00 = 0x80244CC0; D_80244CC8 = 0x80244CC8; D_80244CD0 = 0x80244CD0; D_80244CF0 = 0x80244CF0; @@ -2731,8 +2423,8 @@ D_80244D28 = 0x80244D28; D_80244D50 = 0x80244D50; D_80244D54 = 0x80244D54; D_80244D58 = 0x80244D58; -D_80244D60 = 0x80244D60; -D_80244D68 = 0x80244D68; +func_80244D60 = 0x80244D60; +func_80244D68_8055E8 = 0x80244D68; D_80244D74 = 0x80244D74; D_80244D84 = 0x80244D84; D_80244D88 = 0x80244D88; @@ -2740,16 +2432,17 @@ D_80244DA0 = 0x80244DA0; D_80244DA8 = 0x80244DA8; D_80244DB4 = 0x80244DB4; D_80244DE0 = 0x80244DE0; +pause_tabs_draw_items = 0x80244DE8; D_80244DF0 = 0x80244DF0; D_80244DF8 = 0x80244DF8; D_80244E00 = 0x80244E00; D_80244E08 = 0x80244E08; -D_80244E10 = 0x80244E10; +func_80244E10_805690 = 0x80244E10; D_80244E18 = 0x80244E18; D_80244E20 = 0x80244E20; D_80244E28 = 0x80244E28; D_80244E30 = 0x80244E30; -D_80244E38 = 0x80244E38; +func_80244E38 = 0x80244E38; D_80244E44 = 0x80244E44; D_80244E78 = 0x80244E78; D_80244E80 = 0x80244E80; @@ -2759,7 +2452,7 @@ D_80244EC0 = 0x80244EC0; D_80244EE0 = 0x80244EE0; D_80244EE8 = 0x80244EE8; D_80244EF0 = 0x80244EF0; -D_80244EF8 = 0x80244EF8; +func_80244EF8 = 0x80244EF8; D_80244F38 = 0x80244F38; D_80244F40 = 0x80244F40; D_80244F48 = 0x80244F48; @@ -2767,7 +2460,7 @@ D_80244F78 = 0x80244F78; D_80244FA0 = 0x80244FA0; D_80244FA8 = 0x80244FA8; D_80244FB0 = 0x80244FB0; -D_80244FB8 = 0x80244FB8; +func_80244FB8_A2F1F8 = 0x80244FB8; D_80244FD0 = 0x80244FD0; D_80244FDC = 0x80244FDC; D_80244FEC = 0x80244FEC; @@ -2826,7 +2519,7 @@ D_80245400 = 0x80245400; D_80245408 = 0x80245408; D_80245430 = 0x80245430; D_80245434 = 0x80245434; -D_80245438 = 0x80245438; +func_80245438 = 0x80245438; D_80245448 = 0x80245448; D_80245450 = 0x80245450; D_80245458 = 0x80245458; @@ -2874,14 +2567,15 @@ D_80245674 = 0x80245674; D_80245698 = 0x80245698; D_802456A0 = 0x802456A0; D_802456C0 = 0x802456C0; -D_802456C8 = 0x802456C8; +func_802456C8_A2F908 = 0x802456C8; D_802456D0 = 0x802456D0; +DisablePartnerBlur = 0x802456D8; D_802456F4 = 0x802456F4; -D_80245718 = 0x80245718; +func_80245718_A2F958 = 0x80245718; D_80245720 = 0x80245720; D_80245728 = 0x80245728; D_802457B0 = 0x802457B0; -D_802457B8 = 0x802457B8; +func_802457B8 = 0x802457B8; D_802457F4 = 0x802457F4; D_80245830 = 0x80245830; D_80245838 = 0x80245838; @@ -2898,28 +2592,30 @@ D_802458F0 = 0x802458F0; D_80245928 = 0x80245928; D_8024592C = 0x8024592C; D_80245948 = 0x80245948; -D_80245950 = 0x80245950; +func_80245950_8061D0 = 0x80245950; D_80245954 = 0x80245954; D_80245958 = 0x80245958; D_80245960 = 0x80245960; D_80245968 = 0x80245968; D_80245970 = 0x80245970; D_80245978 = 0x80245978; +pause_stats_draw_contents = 0x80245980; D_802459C0 = 0x802459C0; D_802459CC = 0x802459CC; D_80245A00 = 0x80245A00; D_80245A08 = 0x80245A08; -D_80245A10 = 0x80245A10; +func_80245A10_806290 = 0x80245A10; D_80245A14 = 0x80245A14; D_80245A30 = 0x80245A30; D_80245A38 = 0x80245A38; -D_80245A40 = 0x80245A40; +func_80245A40 = 0x80245A40; D_80245A60 = 0x80245A60; D_80245A68 = 0x80245A68; D_80245A70 = 0x80245A70; D_80245A78 = 0x80245A78; D_80245AB4 = 0x80245AB4; D_80245AB8 = 0x80245AB8; +update_player_action = 0x80245AD0; D_80245AD8 = 0x80245AD8; D_80245AE0 = 0x80245AE0; D_80245B10 = 0x80245B10; @@ -3011,7 +2707,7 @@ D_80246430 = 0x80246430; D_802464A4 = 0x802464A4; D_802464D0 = 0x802464D0; D_802464D8 = 0x802464D8; -D_80246500 = 0x80246500; +func_80246500_806D80 = 0x80246500; D_80246508 = 0x80246508; D_80246510 = 0x80246510; D_80246518 = 0x80246518; @@ -3067,7 +2763,7 @@ D_80246C04 = 0x80246C04; D_80246CB0 = 0x80246CB0; D_80246CB8 = 0x80246CB8; D_80246CF8 = 0x80246CF8; -D_80246D10 = 0x80246D10; +func_80246D10 = 0x80246D10; D_80246D18 = 0x80246D18; D_80246D38 = 0x80246D38; D_80246D40 = 0x80246D40; @@ -3092,6 +2788,7 @@ D_80246F18 = 0x80246F18; D_80246F20 = 0x80246F20; D_80247010 = 0x80247010; D_80247050 = 0x80247050; +pause_badges_count_equipped = 0x802470B0; D_802470B8 = 0x802470B8; D_802470C0 = 0x802470C0; D_802470C8 = 0x802470C8; @@ -3102,6 +2799,7 @@ D_802471E0 = 0x802471E0; D_802471E8 = 0x802471E8; D_80247240 = 0x80247240; D_80247248 = 0x80247248; +pause_badges_is_visible = 0x80247270; D_80247278 = 0x80247278; D_802473D8 = 0x802473D8; D_802473E0 = 0x802473E0; @@ -3203,7 +2901,6 @@ D_8024801C = 0x8024801C; D_80248080 = 0x80248080; D_802480AC = 0x802480AC; D_802480C0 = 0x802480C0; -D_80248170 = 0x80248170; D_802482A0 = 0x802482A0; D_80248340 = 0x80248340; D_80248370 = 0x80248370; @@ -3284,6 +2981,7 @@ D_802498D0 = 0x802498D0; D_802498D4 = 0x802498D4; D_802498D8 = 0x802498D8; D_802498DC = 0x802498DC; +pause_items_get_row = 0x802498E0; D_802498E4 = 0x802498E4; D_802498E8 = 0x802498E8; D_802498EC = 0x802498EC; @@ -3320,7 +3018,7 @@ D_80249A94 = 0x80249A94; D_80249A98 = 0x80249A98; D_80249A9C = 0x80249A9C; D_80249AA0 = 0x80249AA0; -D_80249AA4 = 0x80249AA4; +func_80249AA4 = 0x80249AA4; D_80249B80 = 0x80249B80; D_80249B84 = 0x80249B84; D_80249B88 = 0x80249B88; @@ -3391,6 +3089,7 @@ D_8024A638 = 0x8024A638; D_8024A640 = 0x8024A640; D_8024A6B0 = 0x8024A6B0; D_8024A7D0 = 0x8024A7D0; +pause_items_handle_input = 0x8024A7D8; D_8024A7E0 = 0x8024A7E0; D_8024A908 = 0x8024A908; D_8024A970 = 0x8024A970; @@ -3417,6 +3116,7 @@ D_8024AC7B = 0x8024AC7B; D_8024AC7C = 0x8024AC7C; D_8024AC9C = 0x8024AC9C; D_8024ACB8 = 0x8024ACB8; +pause_partners_load_portrait = 0x8024ADE0; D_8024AEC4 = 0x8024AEC4; D_8024AEC8 = 0x8024AEC8; D_8024B5B0 = 0x8024B5B0; @@ -3430,7 +3130,7 @@ D_8024B7CC = 0x8024B7CC; D_8024B7D0 = 0x8024B7D0; D_8024B7D4 = 0x8024B7D4; D_8024B990 = 0x8024B990; -D_8024B9A0 = 0x8024B9A0; +func_8024B9A0 = 0x8024B9A0; D_8024B9A8 = 0x8024B9A8; D_8024B9B0 = 0x8024B9B0; D_8024B9B4 = 0x8024B9B4; @@ -3464,6 +3164,7 @@ D_8024BFE8 = 0x8024BFE8; D_8024C000 = 0x8024C000; D_8024C018 = 0x8024C018; D_8024C030 = 0x8024C030; +pause_partners_draw_movelist_title = 0x8024C048; D_8024C060 = 0x8024C060; D_8024C068 = 0x8024C068; D_8024C080 = 0x8024C080; @@ -3473,6 +3174,7 @@ D_8024C08C = 0x8024C08C; D_8024C090 = 0x8024C090; D_8024C094 = 0x8024C094; D_8024C098 = 0x8024C098; +pause_partners_draw_movelist_flower = 0x8024C0A0; D_8024C0B0 = 0x8024C0B0; D_8024C100 = 0x8024C100; D_8024C108 = 0x8024C108; @@ -3536,12 +3238,21 @@ D_8024ED4C = 0x8024ED4C; D_8024ED50 = 0x8024ED50; D_8024EF20 = 0x8024EF20; D_8024EF58 = 0x8024EF58; +gPauseMenuIconScripts = 0x8024EF60; +create_popup = 0x8024EF68; D_8024EF70 = 0x8024EF70; D_8024EF78 = 0x8024EF78; +gPauseMenuTabs = 0x8024EF80; D_8024EF84 = 0x8024EF84; D_8024EF88 = 0x8024EF88; D_8024EF90 = 0x8024EF90; D_8024EF98 = 0x8024EF98; +gPauseMenuCursorPosX = 0x8024EF9C; +gPauseMenuCursorPosY = 0x8024EFA0; +gPauseMenuCursorOpacity = 0x8024EFA4; +gPauseMenuTargetPosX = 0x8024EFA8; +gPauseMenuTargetPosY = 0x8024EFAC; +gPauseMenuCursorTargetOpacity = 0x8024EFB0; D_8024EFB4 = 0x8024EFB4; D_8024EFB8 = 0x8024EFB8; D_8024EFC0 = 0x8024EFC0; @@ -3564,6 +3275,8 @@ D_8024F03C = 0x8024F03C; D_8024F058 = 0x8024F058; D_8024F080 = 0x8024F080; D_8024F090 = 0x8024F090; +gPauseMenuTextScrollInterpEasingLUT = 0x8024F0AC; +gPauseMenuPageScrollInterpEasingLUT = 0x8024F0BC; D_8024F0CC = 0x8024F0CC; D_8024F100 = 0x8024F100; D_8024F110 = 0x8024F110; @@ -3632,7 +3345,6 @@ D_8024F374 = 0x8024F374; D_8024F378 = 0x8024F378; D_8024F380 = 0x8024F380; D_8024F390 = 0x8024F390; -D_8024F394 = 0x8024F394; D_8024F3B0 = 0x8024F3B0; D_8024F3B8 = 0x8024F3B8; D_8024F3F8 = 0x8024F3F8; @@ -3675,7 +3387,6 @@ D_8024F59C = 0x8024F59C; D_8024F59F = 0x8024F59F; D_8024F5A0 = 0x8024F5A0; D_8024F5A4 = 0x8024F5A4; -D_8024F5AC = 0x8024F5AC; D_8024F5B8 = 0x8024F5B8; D_8024F5C0 = 0x8024F5C0; D_8024F5C4 = 0x8024F5C4; @@ -3692,7 +3403,6 @@ D_8024F73C = 0x8024F73C; D_8024F744 = 0x8024F744; D_8024F748 = 0x8024F748; D_8024F750 = 0x8024F750; -D_8024F768 = 0x8024F768; D_8024F7C0 = 0x8024F7C0; D_8024F7C4 = 0x8024F7C4; D_8024F7C8 = 0x8024F7C8; @@ -3712,7 +3422,6 @@ D_8024F9F0 = 0x8024F9F0; D_8024F9F8 = 0x8024F9F8; D_8024FA00 = 0x8024FA00; D_8024FA30 = 0x8024FA30; -D_8024FB3C = 0x8024FB3C; D_8024FBA0 = 0x8024FBA0; D_8024FD68 = 0x8024FD68; D_8024FED8 = 0x8024FED8; @@ -3727,7 +3436,6 @@ D_80250560 = 0x80250560; D_80250590 = 0x80250590; D_80250668 = 0x80250668; D_80250810 = 0x80250810; -D_80250818 = 0x80250818; D_80250A50 = 0x80250A50; D_80250A54 = 0x80250A54; D_80250A58 = 0x80250A58; @@ -3738,6 +3446,7 @@ D_802510C0 = 0x802510C0; D_802510C8 = 0x802510C8; D_802513D0 = 0x802513D0; D_802513E8 = 0x802513E8; +ForceCloseMessageBox = 0x802513F0; D_802513F4 = 0x802513F4; D_802513F8 = 0x802513F8; D_80251400 = 0x80251400; @@ -3746,7 +3455,7 @@ D_80251438 = 0x80251438; D_80251450 = 0x80251450; D_80251468 = 0x80251468; D_80251470 = 0x80251470; -D_80251474 = 0x80251474; +func_80251474 = 0x80251474; D_80251478 = 0x80251478; D_802515C4 = 0x802515C4; D_80251A90 = 0x80251A90; @@ -3799,19 +3508,16 @@ D_80254620 = 0x80254620; D_80254628 = 0x80254628; D_80254630 = 0x80254630; D_802547D0 = 0x802547D0; -D_802549A0 = 0x802549A0; +func_802549A0 = 0x802549A0; D_802549B8 = 0x802549B8; -D_802549C0 = 0x802549C0; +func_802549C0 = 0x802549C0; D_802549C4 = 0x802549C4; D_802549C8 = 0x802549C8; D_802549D0 = 0x802549D0; D_80254B94 = 0x80254B94; D_80254BA0 = 0x80254BA0; -D_80254C50 = 0x80254C50; D_80254D68 = 0x80254D68; D_8025578C = 0x8025578C; -D_8025595C = 0x8025595C; -D_8025599C = 0x8025599C; D_802559C0 = 0x802559C0; D_802559C8 = 0x802559C8; D_802559D0 = 0x802559D0; @@ -3830,16 +3536,11 @@ D_80256AEC = 0x80256AEC; D_80257118 = 0x80257118; D_80257320 = 0x80257320; D_80257B00 = 0x80257B00; -D_80257B28 = 0x80257B28; -D_80257B48 = 0x80257B48; -D_80257B68 = 0x80257B68; -D_80257B88 = 0x80257B88; D_80257D00 = 0x80257D00; D_80257D40 = 0x80257D40; D_80257D48 = 0x80257D48; D_80257D50 = 0x80257D50; D_80257D58 = 0x80257D58; -D_80257DA4 = 0x80257DA4; D_80257F08 = 0x80257F08; D_80257F10 = 0x80257F10; D_80257F20 = 0x80257F20; @@ -3864,14 +3565,11 @@ D_80258140 = 0x80258140; D_80258340 = 0x80258340; D_80258404 = 0x80258404; D_80258407 = 0x80258407; -D_80258E14 = 0x80258E14; D_8025B0A8 = 0x8025B0A8; D_8025B2A8 = 0x8025B2A8; D_8025B2AC = 0x8025B2AC; D_8025B2B0 = 0x8025B2B0; D_8025C0D0 = 0x8025C0D0; -D_80260948 = 0x80260948; -D_80260A20 = 0x80260A20; D_802626E0 = 0x802626E0; D_802626E8 = 0x802626E8; D_802626F0 = 0x802626F0; @@ -3897,14 +3595,14 @@ D_80263488 = 0x80263488; D_80263510 = 0x80263510; D_80263518 = 0x80263518; D_80263520 = 0x80263520; -D_80268938 = 0x80268938; -D_80268AF8 = 0x80268AF8; +D_80268000 = 0x80268000; D_8026A2B0 = 0x8026A2B0; D_8026F118 = 0x8026F118; D_8026F1B8 = 0x8026F1B8; D_8026F2A0 = 0x8026F2A0; D_8026F348 = 0x8026F348; D_8026F5A0 = 0x8026F5A0; +gPauseMenuStrings = 0x8026F778; D_8026F8D4 = 0x8026F8D4; D_8026FB30 = 0x8026FB30; D_8026FBD8 = 0x8026FBD8; @@ -3938,23 +3636,57 @@ D_802700A0 = 0x802700A0; D_802700A8 = 0x802700A8; D_802700B0 = 0x802700B0; D_802700B8 = 0x802700B8; +gPauseMenuHeldButtons = 0x802700C0; +gPauseMenuPressedButtons = 0x802700C4; +gPauseMenuCurrentDescString = 0x802700C8; +gPauseMenuCurrentDescIconScript = 0x802700CC; D_802700D0 = 0x802700D0; +gPauseMenuCurrentTab = 0x802700D4; D_802700E0 = 0x802700E0; +gPauseMenuCommonIconIDs = 0x802700E8; D_80270108 = 0x80270108; D_8027010C = 0x8027010C; D_80270110 = 0x80270110; D_80270114 = 0x80270114; D_80270118 = 0x80270118; D_8027011C = 0x8027011C; +gPauseMenuTabIconIDs = 0x80270130; D_80270148 = 0x80270148; D_8027014C = 0x8027014C; +gStatsMenuIconIDs = 0x80270150; +gBadgeMenuItemIDs = 0x80270180; +gBadgeMenuCurrentPage = 0x80270280; +gBadgeMenuPages = 0x80270288; D_80270289 = 0x80270289; D_8027028A = 0x8027028A; +gBadgeMenuSelectedIndex = 0x80270378; D_8027037C = 0x8027037C; +gBadgeMenuSelectedItemID = 0x80270380; +gBadgeMenuNumItems = 0x80270384; +D_80270388 = 0x80270388; +gBadgeMenuCurrentScrollPos = 0x8027038C; +gBadgeMenuTargetScrollPos = 0x80270390; +D_80270394 = 0x80270394; +gBadgeMenuLevel = 0x80270398; +gBadgeMenuCurrentTab = 0x8027039C; +gBadgeMenuBShowNotEnoughBP = 0x802703A0; +D_802703A8 = 0x802703A8; D_802703FC = 0x802703FC; +gItemMenuItemIDs = 0x80270400; +gItemMenuCurrentPage = 0x802704C8; +gItemMenuPages = 0x802704D0; D_802704D1 = 0x802704D1; D_802704D2 = 0x802704D2; +gItemMenuSelectedIndex = 0x802705C0; D_802705C4 = 0x802705C4; +gItemMenuSelectedItemID = 0x802705C8; +gItemMenuNumItems = 0x802705CC; +D_802705D0 = 0x802705D0; +gItemMenuCurrentScrollPos = 0x802705D4; +gItemMenuTargetScrollPos = 0x802705D8; +D_802705DC = 0x802705DC; +gItemMenuLevel = 0x802705E0; +gItemMenuCurrentTab = 0x802705E4; D_802705E8 = 0x802705E8; D_80270634 = 0x80270634; D_80270640 = 0x80270640; @@ -3987,6 +3719,8 @@ D_802809F8 = 0x802809F8; D_802809FA = 0x802809FA; D_802809FC = 0x802809FC; D_80280A30 = 0x80280A30; +BtlPutPartnerAway = 0x80280A34; +BtlBringPartnerOut = 0x80280B6C; D_80280CE0 = 0x80280CE0; D_80280CE4 = 0x80280CE4; D_80280CE8 = 0x80280CE8; @@ -4006,7 +3740,6 @@ D_80280E54 = 0x80280E54; D_80280EB8 = 0x80280EB8; D_80280FC0 = 0x80280FC0; D_80281104 = 0x80281104; -D_80281434 = 0x80281434; D_80281454 = 0x80281454; D_80281468 = 0x80281468; D_8028146C = 0x8028146C; @@ -4016,7 +3749,6 @@ D_80281478 = 0x80281478; D_8028147C = 0x8028147C; D_80281480 = 0x80281480; D_80281482 = 0x80281482; -D_802814D0 = 0x802814D0; D_80282EEB = 0x80282EEB; D_80283238 = 0x80283238; D_802832D4 = 0x802832D4; @@ -4041,6 +3773,7 @@ D_80283EE0 = 0x80283EE0; D_80283F10 = 0x80283F10; D_80283F2C = 0x80283F2C; D_80283F58 = 0x80283F58; +gBattleDmaDest = 0x80284000; D_80284034 = 0x80284034; D_80284044 = 0x80284044; D_80284080 = 0x80284080; @@ -4067,7 +3800,12 @@ D_802847D4 = 0x802847D4; D_80284880 = 0x80284880; D_80284A20 = 0x80284A20; D_80284A30 = 0x80284A30; +MarioEnterStage = 0x80284A40; +PeachEnterStage = 0x80284D04; +PlayerScriptDispatcher = 0x80284EBC; D_80284F80 = 0x80284F80; +PeachScriptDispatcher = 0x80285010; +HandleEvent_Player = 0x802852D4; D_80285640 = 0x80285640; D_80285674 = 0x80285674; D_80286500 = 0x80286500; @@ -4078,6 +3816,9 @@ D_8028652C = 0x8028652C; D_80286530 = 0x80286530; D_80286534 = 0x80286534; D_80286538 = 0x80286538; +D_80286540 = 0x80286540; +DoDizzyAttack = 0x8028907C; +RegainAbility = 0x80289110; D_80291F80 = 0x80291F80; D_8029231C = 0x8029231C; D_80292374 = 0x80292374; @@ -4119,10 +3860,18 @@ D_80293AA0 = 0x80293AA0; D_80293AC4 = 0x80293AC4; D_80293B80 = 0x80293B80; D_80293C04 = 0x80293C04; +gMoveScriptTable = 0x80293E80; D_80294190 = 0x80294190; D_802941A0 = 0x802941A0; D_802941B0 = 0x802941B0; D_802944C0 = 0x802944C0; +DoSleepHit = 0x802945E0; +DoDizzyHit = 0x802945FC; +DoParalyzeHit = 0x80294618; +DoPoisonHit = 0x80294634; +DoStopHit = 0x80294650; +DoFreezeHit = 0x8029466C; +DoShinkHit = 0x802946B8; D_802946E0 = 0x802946E0; D_8029C7D0 = 0x8029C7D0; D_8029C960 = 0x8029C960; @@ -4317,6 +4066,13 @@ D_8029F64A = 0x8029F64A; D_8029F64C = 0x8029F64C; D_8029F64E = 0x8029F64E; D_8029F650 = 0x8029F650; +gSpeakingActorPrintCtx = 0x8029FA60; +D_8029FA64 = 0x8029FA64; +gSpeakingActorPrintIsDone = 0x8029FA68; +gSpeakingActorTalkAnim = 0x8029FA6C; +gSpeakingActorIdleAnim = 0x8029FA70; +gSpeakingActor = 0x8029FA74; +gSpeakingActorPart = 0x8029FA78; D_8029FA80 = 0x8029FA80; D_8029FA88 = 0x8029FA88; D_8029FA90 = 0x8029FA90; @@ -4356,15 +4112,6 @@ D_8029FC2A = 0x8029FC2A; D_8029FC3E = 0x8029FC3E; D_8029FC4C = 0x8029FC4C; D_802A1000 = 0x802A1000; -D_802A3C98 = 0x802A3C98; -D_802A43DC = 0x802A43DC; -D_802A4448 = 0x802A4448; -D_802A4494 = 0x802A4494; -D_802A4534 = 0x802A4534; -D_802A5290 = 0x802A5290; -D_802A56F8 = 0x802A56F8; -D_802A5738 = 0x802A5738; -D_802A57C8 = 0x802A57C8; D_802A9F0C = 0x802A9F0C; D_802A9F34 = 0x802A9F34; D_802A9F5C = 0x802A9F5C; @@ -4549,13 +4296,10 @@ D_802AD6A8 = 0x802AD6A8; D_802AD6AA = 0x802AD6AA; D_802AD6C0 = 0x802AD6C0; D_802AD6D4 = 0x802AD6D4; -D_802AE000 = 0x802AE000; +func_802AE000 = 0x802AE000; D_802B70B4 = 0x802B70B4; D_802B7140 = 0x802B7140; D_802B72C0 = 0x802B72C0; -D_802B735C = 0x802B735C; -D_802B742C = 0x802B742C; -D_802B74F0 = 0x802B74F0; D_802B7580 = 0x802B7580; D_802B7640 = 0x802B7640; D_802B7710 = 0x802B7710; @@ -4582,6 +4326,7 @@ D_802BDF30 = 0x802BDF30; D_802BDF34 = 0x802BDF34; D_802BDF38 = 0x802BDF38; D_802BDF60 = 0x802BDF60; +D_802BDF64 = 0x802BDF64; D_802BDFFC = 0x802BDFFC; D_802BE060 = 0x802BE060; D_802BE068 = 0x802BE068; @@ -4674,56 +4419,33 @@ D_802BFF20 = 0x802BFF20; D_802BFF24 = 0x802BFF24; D_802BFF28 = 0x802BFF28; D_802C0000 = 0x802C0000; -D_802CCAC0 = 0x802CCAC0; -D_802D2FCC = 0x802D2FCC; -D_802D3028 = 0x802D3028; -D_802D31E0 = 0x802D31E0; -D_802D9D30 = 0x802D9D30; -D_802D9D34 = 0x802D9D34; +sort_scripts = 0x802C3000; D_802D9D70 = 0x802D9D70; D_802D9D71 = 0x802D9D71; D_802D9D72 = 0x802D9D72; D_802D9D73 = 0x802D9D73; -D_802D9D98 = 0x802D9D98; -D_802D9DA8 = 0x802D9DA8; -D_802D9DBC = 0x802D9DBC; -D_802D9DCC = 0x802D9DCC; -D_802D9DDC = 0x802D9DDC; -D_802D9DF0 = 0x802D9DF0; -D_802D9E00 = 0x802D9E00; -D_802D9E10 = 0x802D9E10; -D_802D9E24 = 0x802D9E24; -D_802D9E34 = 0x802D9E34; -D_802D9E44 = 0x802D9E44; -D_802D9E58 = 0x802D9E58; -D_802D9E68 = 0x802D9E68; -D_802D9E78 = 0x802D9E78; -D_802D9E88 = 0x802D9E88; -D_802D9E98 = 0x802D9E98; -D_802D9EA8 = 0x802D9EA8; -D_802D9EB8 = 0x802D9EB8; -D_802D9ECC = 0x802D9ECC; -D_802D9EDC = 0x802D9EDC; -D_802D9EEC = 0x802D9EEC; -D_802D9F00 = 0x802D9F00; -D_802D9F10 = 0x802D9F10; -D_802D9F20 = 0x802D9F20; -D_802DA0A0 = 0x802DA0A0; -D_802DA0F0 = 0x802DA0F0; -D_802DA140 = 0x802DA140; -D_802DA1D0 = 0x802DA1D0; -D_802DA1E0 = 0x802DA1E0; -D_802DA1F0 = 0x802DA1F0; -D_802DA208 = 0x802DA208; -D_802DA240 = 0x802DA240; -D_802DA258 = 0x802DA258; +gMapFlags = 0x802DA480; +gMapVars = 0x802DA484; +gNumScripts = 0x802DA488; +gWorldScriptList = 0x802DA490; +gBattleScriptList = 0x802DA690; +gCurrentScriptListPtr = 0x802DA890; +gScriptIndexList = 0x802DA898; +gScriptIdList = 0x802DAA98; +gScriptListCount = 0x802DAC98; D_802DACA0 = 0x802DACA0; D_802DADA0 = 0x802DADA0; D_802DADA4 = 0x802DADA4; +gBattleMeshAnimationList = 0x802DADB0; +gWorldMeshAnimationList = 0x802DADF0; +gCurrentMeshAnimationListPtr = 0x802DAE30; D_802DAE40 = 0x802DAE40; D_802DAE44 = 0x802DAE44; D_802DAE50 = 0x802DAE50; D_802DAE54 = 0x802DAE54; +gCurrentPrintContext = 0x802DB260; +D_802DB264 = 0x802DB264; +D_802DB268 = 0x802DB268; D_802DB5B0 = 0x802DB5B0; D_802DB5C0 = 0x802DB5C0; D_802DB6C0 = 0x802DB6C0; @@ -4734,18 +4456,14 @@ D_802DB800 = 0x802DB800; D_802DB830 = 0x802DB830; D_802DBB60 = 0x802DBB60; D_802DBB68 = 0x802DBB68; +gWorldMapFlags = 0x802DBC70; D_802DBC7C = 0x802DBC7C; D_802DBC88 = 0x802DBC88; +gWorldMapVars = 0x802DBCA8; +gBattleMapVars = 0x802DBCE8; D_802DBD28 = 0x802DBD28; -D_802DF390 = 0x802DF390; -D_802DF3D0 = 0x802DF3D0; -D_802DF3E0 = 0x802DF3E0; -D_802DF3F0 = 0x802DF3F0; -D_802DF428 = 0x802DF428; -D_802DF460 = 0x802DF460; -D_802DF490 = 0x802DF490; -D_802DF4C0 = 0x802DF4C0; -D_802DF4C4 = 0x802DF4C4; +gBattleMapFlags = 0x802DBD34; +D_802DBD40 = 0x802DBD40; D_802DF524 = 0x802DF524; D_802DF530 = 0x802DF530; D_802DF540 = 0x802DF540; @@ -4781,15 +4499,7 @@ D_802E0C60 = 0x802E0C60; D_802E0C64 = 0x802E0C64; D_802E0C68 = 0x802E0C68; D_802E0C70 = 0x802E0C70; -D_802E0DE0 = 0x802E0DE0; -D_802E2BA4 = 0x802E2BA4; -D_802E30C0 = 0x802E30C0; -D_802E455C = 0x802E455C; -D_802E4AEC = 0x802E4AEC; -D_802E586C = 0x802E586C; -D_802E61B0 = 0x802E61B0; -D_802E6ED8 = 0x802E6ED8; -D_802E854C = 0x802E854C; +create_shadow_callback = 0x802E0D90; D_802E98BC = 0x802E98BC; D_802E98E0 = 0x802E98E0; D_802E9904 = 0x802E9904; @@ -4901,6 +4611,7 @@ D_802EB39C = 0x802EB39C; D_802EB3A0 = 0x802EB3A0; D_802EB3B0 = 0x802EB3B0; D_802EB3C0 = 0x802EB3C0; +D_802EB3D0 = 0x802EB3D0; D_802EB5A8 = 0x802EB5A8; D_802EB5C0 = 0x802EB5C0; D_802EB5F0 = 0x802EB5F0; @@ -4933,12 +4644,12 @@ D_802ED970 = 0x802ED970; D_802EE8D0 = 0x802EE8D0; D_802F39D0 = 0x802F39D0; D_802F4560 = 0x802F4560; +D_802FB800 = 0x802FB800; D_8034F800 = 0x8034F800; +D_803DA800 = 0x803DA800; D_8887FFFB = 0x8887FFFB; D_A0000000 = 0xA0000000; D_A4000000 = 0xA4000000; -D_A40004C0 = 0xA40004C0; -D_A4000768 = 0xA4000768; D_A4001000 = 0xA4001000; D_A4040010 = 0xA4040010; D_A4300000 = 0xA4300000; @@ -4958,34 +4669,18 @@ D_B0000000 = 0xB0000000; D_B0000008 = 0xB0000008; D_B0000010 = 0xB0000010; D_D9FCFFFF = 0xD9FCFFFF; -D_E00021B4 = 0xE00021B4; -D_E00021BC = 0xE00021BC; -D_E00022BC = 0xE00022BC; -D_E0002300 = 0xE0002300; D_E0002760 = 0xE0002760; D_E0002788 = 0xE0002788; D_E00027B0 = 0xE00027B0; D_E00027D8 = 0xE00027D8; D_E0002800 = 0xE0002800; -D_E000C64C = 0xE000C64C; -D_E000C654 = 0xE000C654; -D_E000C754 = 0xE000C754; -D_E000C798 = 0xE000C798; D_E000CC10 = 0xE000CC10; D_E000CC24 = 0xE000CC24; D_E000CD24 = 0xE000CD24; D_E000CD40 = 0xE000CD40; D_E000CD58 = 0xE000CD58; D_E000CD70 = 0xE000CD70; -D_E000E16C = 0xE000E16C; -D_E000E174 = 0xE000E174; -D_E000E244 = 0xE000E244; -D_E000E288 = 0xE000E288; D_E000E684 = 0xE000E684; -D_E0014258 = 0xE0014258; -D_E0014260 = 0xE0014260; -D_E001449C = 0xE001449C; -D_E00144E0 = 0xE00144E0; D_E0014780 = 0xE0014780; D_E0014788 = 0xE0014788; D_E0014790 = 0xE0014790; @@ -4993,47 +4688,23 @@ D_E0014798 = 0xE0014798; D_E00147A0 = 0xE00147A0; D_E00147A8 = 0xE00147A8; D_E00147B0 = 0xE00147B0; -D_E0016220 = 0xE0016220; -D_E0016228 = 0xE0016228; -D_E0016410 = 0xE0016410; -D_E0016454 = 0xE0016454; D_E0016720 = 0xE0016720; D_E0016728 = 0xE0016728; D_E0016730 = 0xE0016730; D_E0016738 = 0xE0016738; D_E0016740 = 0xE0016740; -D_E001A21C = 0xE001A21C; -D_E001A224 = 0xE001A224; -D_E001A3FC = 0xE001A3FC; -D_E001A440 = 0xE001A440; D_E001A610 = 0xE001A610; D_E001A620 = 0xE001A620; D_E001A628 = 0xE001A628; -D_E001C120 = 0xE001C120; -D_E001C128 = 0xE001C128; -D_E001C200 = 0xE001C200; -D_E001C30C = 0xE001C30C; D_E001C5E0 = 0xE001C5E0; -D_E001E370 = 0xE001E370; -D_E001E378 = 0xE001E378; -D_E001E6E8 = 0xE001E6E8; -D_E001E730 = 0xE001E730; D_E001ED50 = 0xE001ED50; D_E001ED58 = 0xE001ED58; -D_E0020460 = 0xE0020460; -D_E0020468 = 0xE0020468; -D_E002058C = 0xE002058C; -D_E00205D0 = 0xE00205D0; D_E0020C90 = 0xE0020C90; D_E0020CA4 = 0xE0020CA4; D_E0020D80 = 0xE0020D80; D_E0020D94 = 0xE0020D94; D_E0020D95 = 0xE0020D95; D_E0020D96 = 0xE0020D96; -D_E0022544 = 0xE0022544; -D_E002254C = 0xE002254C; -D_E0022960 = 0xE0022960; -D_E0022998 = 0xE0022998; D_E0022CD0 = 0xE0022CD0; D_E0022CF0 = 0xE0022CF0; D_E0022D14 = 0xE0022D14; @@ -5046,18 +4717,10 @@ D_E0022D60 = 0xE0022D60; D_E0022D68 = 0xE0022D68; D_E0022D70 = 0xE0022D70; D_E0022D78 = 0xE0022D78; -D_E0024180 = 0xE0024180; -D_E0024188 = 0xE0024188; -D_E00242E0 = 0xE00242E0; -D_E0024454 = 0xE0024454; D_E0024CC0 = 0xE0024CC0; D_E0024CF0 = 0xE0024CF0; D_E0024CF8 = 0xE0024CF8; D_E0024D00 = 0xE0024D00; -D_E0026184 = 0xE0026184; -D_E002618C = 0xE002618C; -D_E00264B0 = 0xE00264B0; -D_E00264F4 = 0xE00264F4; D_E00269F0 = 0xE00269F0; D_E00269F8 = 0xE00269F8; D_E0026A00 = 0xE0026A00; @@ -5067,10 +4730,6 @@ D_E0026A30 = 0xE0026A30; D_E0026A38 = 0xE0026A38; D_E0026A40 = 0xE0026A40; D_E0026A48 = 0xE0026A48; -D_E0028240 = 0xE0028240; -D_E0028248 = 0xE0028248; -D_E00284E8 = 0xE00284E8; -D_E002852C = 0xE002852C; D_E00287E0 = 0xE00287E0; D_E00287E8 = 0xE00287E8; D_E00287F0 = 0xE00287F0; @@ -5078,18 +4737,10 @@ D_E00287F8 = 0xE00287F8; D_E0028800 = 0xE0028800; D_E0028808 = 0xE0028808; D_E0028810 = 0xE0028810; -D_E002A284 = 0xE002A284; -D_E002A28C = 0xE002A28C; -D_E002A380 = 0xE002A380; -D_E002A3C4 = 0xE002A3C4; D_E002A720 = 0xE002A720; D_E002A728 = 0xE002A728; D_E002A730 = 0xE002A730; D_E002A738 = 0xE002A738; -D_E002C234 = 0xE002C234; -D_E002C23C = 0xE002C23C; -D_E002C3D0 = 0xE002C3D0; -D_E002C414 = 0xE002C414; D_E002C940 = 0xE002C940; D_E002C944 = 0xE002C944; D_E002C964 = 0xE002C964; @@ -5099,15 +4750,7 @@ D_E002C9D8 = 0xE002C9D8; D_E002C9E0 = 0xE002C9E0; D_E002C9E8 = 0xE002C9E8; D_E002C9F0 = 0xE002C9F0; -D_E002E248 = 0xE002E248; -D_E002E250 = 0xE002E250; -D_E002E330 = 0xE002E330; -D_E002E368 = 0xE002E368; D_E002E754 = 0xE002E754; -D_E0030728 = 0xE0030728; -D_E0030730 = 0xE0030730; -D_E0030A24 = 0xE0030A24; -D_E0030A68 = 0xE0030A68; D_E0030E90 = 0xE0030E90; D_E0030EB4 = 0xE0030EB4; D_E0030EC0 = 0xE0030EC0; @@ -5115,10 +4758,6 @@ D_E0030ED8 = 0xE0030ED8; D_E0030EE0 = 0xE0030EE0; D_E0030EE8 = 0xE0030EE8; D_E0030EF0 = 0xE0030EF0; -D_E00321D0 = 0xE00321D0; -D_E00321D8 = 0xE00321D8; -D_E0032420 = 0xE0032420; -D_E003245C = 0xE003245C; D_E00328B0 = 0xE00328B0; D_E00328C0 = 0xE00328C0; D_E00328C8 = 0xE00328C8; @@ -5126,10 +4765,6 @@ D_E00328D0 = 0xE00328D0; D_E00328D8 = 0xE00328D8; D_E00328E0 = 0xE00328E0; D_E00328E8 = 0xE00328E8; -D_E0034108 = 0xE0034108; -D_E0034110 = 0xE0034110; -D_E00342C8 = 0xE00342C8; -D_E0034310 = 0xE0034310; D_E0034780 = 0xE0034780; D_E0034788 = 0xE0034788; D_E0034790 = 0xE0034790; @@ -5139,36 +4774,20 @@ D_E00347B0 = 0xE00347B0; D_E00347B8 = 0xE00347B8; D_E00347C0 = 0xE00347C0; D_E00347C8 = 0xE00347C8; -D_E00360DC = 0xE00360DC; -D_E00360E4 = 0xE00360E4; -D_E00361D8 = 0xE00361D8; -D_E0036224 = 0xE0036224; D_E0036630 = 0xE0036630; D_E0036640 = 0xE0036640; D_E0036648 = 0xE0036648; D_E0036650 = 0xE0036650; -D_E003841C = 0xE003841C; -D_E0038424 = 0xE0038424; -D_E0038704 = 0xE0038704; -D_E0038748 = 0xE0038748; D_E0038A20 = 0xE0038A20; D_E0038A28 = 0xE0038A28; D_E0038A30 = 0xE0038A30; D_E0038A38 = 0xE0038A38; D_E0038A40 = 0xE0038A40; -D_E003A1D4 = 0xE003A1D4; -D_E003A1DC = 0xE003A1DC; -D_E003A310 = 0xE003A310; -D_E003A354 = 0xE003A354; D_E003A800 = 0xE003A800; D_E003A80C = 0xE003A80C; D_E003A820 = 0xE003A820; D_E003A828 = 0xE003A828; D_E003A830 = 0xE003A830; -D_E003C23C = 0xE003C23C; -D_E003C244 = 0xE003C244; -D_E003C474 = 0xE003C474; -D_E003C47C = 0xE003C47C; D_E003CCA0 = 0xE003CCA0; D_E003CCD0 = 0xE003CCD0; D_E003CCF8 = 0xE003CCF8; @@ -5176,37 +4795,21 @@ D_E003CD1C = 0xE003CD1C; D_E003CD40 = 0xE003CD40; D_E003CD48 = 0xE003CD48; D_E003CD50 = 0xE003CD50; -D_E003E3F8 = 0xE003E3F8; -D_E003E400 = 0xE003E400; -D_E003E5F4 = 0xE003E5F4; -D_E003E638 = 0xE003E638; D_E003E870 = 0xE003E870; D_E003E878 = 0xE003E878; D_E003E880 = 0xE003E880; D_E003E888 = 0xE003E888; D_E003E890 = 0xE003E890; D_E003E898 = 0xE003E898; -D_E0040148 = 0xE0040148; -D_E0040150 = 0xE0040150; -D_E0040210 = 0xE0040210; -D_E0040348 = 0xE0040348; D_E0040840 = 0xE0040840; D_E0040848 = 0xE0040848; D_E0040880 = 0xE0040880; D_E0040890 = 0xE0040890; D_E0040898 = 0xE0040898; D_E00408A0 = 0xE00408A0; -D_E004222C = 0xE004222C; -D_E0042234 = 0xE0042234; -D_E0042374 = 0xE0042374; -D_E00423B8 = 0xE00423B8; D_E0042780 = 0xE0042780; D_E00427B0 = 0xE00427B0; D_E00427B8 = 0xE00427B8; -D_E004441C = 0xE004441C; -D_E0044424 = 0xE0044424; -D_E00448E4 = 0xE00448E4; -D_E004491C = 0xE004491C; D_E0044DB0 = 0xE0044DB0; D_E0044DD0 = 0xE0044DD0; D_E0044DF4 = 0xE0044DF4; @@ -5223,10 +4826,6 @@ D_E0044E70 = 0xE0044E70; D_E0044E78 = 0xE0044E78; D_E0044EF8 = 0xE0044EF8; D_E0044F00 = 0xE0044F00; -D_E0046158 = 0xE0046158; -D_E0046160 = 0xE0046160; -D_E004627C = 0xE004627C; -D_E00462C0 = 0xE00462C0; D_E0046600 = 0xE0046600; D_E0046604 = 0xE0046604; D_E0046614 = 0xE0046614; @@ -5236,17 +4835,9 @@ D_E0046628 = 0xE0046628; D_E0046630 = 0xE0046630; D_E0046638 = 0xE0046638; D_E0046640 = 0xE0046640; -D_E0048128 = 0xE0048128; -D_E0048130 = 0xE0048130; -D_E00481D4 = 0xE00481D4; -D_E0048218 = 0xE0048218; D_E0048A00 = 0xE0048A00; D_E0048A08 = 0xE0048A08; D_E0048A10 = 0xE0048A10; -D_E004A328 = 0xE004A328; -D_E004A330 = 0xE004A330; -D_E004A748 = 0xE004A748; -D_E004A78C = 0xE004A78C; D_E004AE60 = 0xE004AE60; D_E004AE80 = 0xE004AE80; D_E004AE98 = 0xE004AE98; @@ -5258,10 +4849,6 @@ D_E004AED0 = 0xE004AED0; D_E004AED8 = 0xE004AED8; D_E004AEE0 = 0xE004AEE0; D_E004AEE8 = 0xE004AEE8; -D_E004C204 = 0xE004C204; -D_E004C20C = 0xE004C20C; -D_E004C364 = 0xE004C364; -D_E004C3A8 = 0xE004C3A8; D_E004C660 = 0xE004C660; D_E004C67C = 0xE004C67C; D_E004C67D = 0xE004C67D; @@ -5270,29 +4857,13 @@ D_E004C6A0 = 0xE004C6A0; D_E004C6A8 = 0xE004C6A8; D_E004C6B0 = 0xE004C6B0; D_E004C6B8 = 0xE004C6B8; -D_E004E15C = 0xE004E15C; -D_E004E164 = 0xE004E164; -D_E004E1D0 = 0xE004E1D0; -D_E004E214 = 0xE004E214; D_E004E5E0 = 0xE004E5E0; D_E004E5EC = 0xE004E5EC; -D_E00501D0 = 0xE00501D0; -D_E00501D8 = 0xE00501D8; -D_E00502C4 = 0xE00502C4; -D_E0050308 = 0xE0050308; D_E0050560 = 0xE0050560; D_E0050568 = 0xE0050568; D_E0050570 = 0xE0050570; -D_E00520E8 = 0xE00520E8; -D_E00520F0 = 0xE00520F0; -D_E005241C = 0xE005241C; -D_E0052460 = 0xE0052460; D_E0052A80 = 0xE0052A80; D_E0052A88 = 0xE0052A88; -D_E0056304 = 0xE0056304; -D_E005630C = 0xE005630C; -D_E0056B8C = 0xE0056B8C; -D_E0056BD0 = 0xE0056BD0; D_E0056EA0 = 0xE0056EA0; D_E0056EA8 = 0xE0056EA8; D_E0056EB0 = 0xE0056EB0; @@ -5309,10 +4880,6 @@ D_E0056F00 = 0xE0056F00; D_E0056F08 = 0xE0056F08; D_E0056F10 = 0xE0056F10; D_E0056F18 = 0xE0056F18; -D_E00581AC = 0xE00581AC; -D_E00581B4 = 0xE00581B4; -D_E0058490 = 0xE0058490; -D_E00584D4 = 0xE00584D4; D_E0058780 = 0xE0058780; D_E0058788 = 0xE0058788; D_E0058790 = 0xE0058790; @@ -5320,43 +4887,23 @@ D_E0058798 = 0xE0058798; D_E00587A0 = 0xE00587A0; D_E00587A8 = 0xE00587A8; D_E00587B0 = 0xE00587B0; -D_E005A1F4 = 0xE005A1F4; -D_E005A1FC = 0xE005A1FC; -D_E005A3B0 = 0xE005A3B0; -D_E005A3F4 = 0xE005A3F4; D_E005A750 = 0xE005A750; D_E005A758 = 0xE005A758; D_E005A760 = 0xE005A760; -D_E005C178 = 0xE005C178; -D_E005C180 = 0xE005C180; -D_E005C2B4 = 0xE005C2B4; -D_E005C2F8 = 0xE005C2F8; D_E005C700 = 0xE005C700; D_E005C704 = 0xE005C704; D_E005C710 = 0xE005C710; D_E005C718 = 0xE005C718; D_E005C720 = 0xE005C720; -D_E005E1B0 = 0xE005E1B0; -D_E005E1B8 = 0xE005E1B8; -D_E005E310 = 0xE005E310; -D_E005E318 = 0xE005E318; D_E005E670 = 0xE005E670; D_E005E674 = 0xE005E674; D_E005E680 = 0xE005E680; -D_E00601D8 = 0xE00601D8; -D_E00601E0 = 0xE00601E0; -D_E006040C = 0xE006040C; -D_E0060450 = 0xE0060450; D_E0060730 = 0xE0060730; D_E0060738 = 0xE0060738; D_E0060740 = 0xE0060740; D_E0060748 = 0xE0060748; D_E0060750 = 0xE0060750; D_E0060758 = 0xE0060758; -D_E0062218 = 0xE0062218; -D_E0062220 = 0xE0062220; -D_E00624A8 = 0xE00624A8; -D_E00624EC = 0xE00624EC; D_E00628C0 = 0xE00628C0; D_E00628C4 = 0xE00628C4; D_E00628D0 = 0xE00628D0; @@ -5365,52 +4912,28 @@ D_E00628E0 = 0xE00628E0; D_E00628E8 = 0xE00628E8; D_E00628F0 = 0xE00628F0; D_E00628F8 = 0xE00628F8; -D_E006419C = 0xE006419C; -D_E00641A4 = 0xE00641A4; -D_E00643DC = 0xE00643DC; -D_E0064414 = 0xE0064414; D_E0064A60 = 0xE0064A60; D_E0064A70 = 0xE0064A70; D_E0064A78 = 0xE0064A78; D_E0064A80 = 0xE0064A80; D_E0064A88 = 0xE0064A88; D_E0064A90 = 0xE0064A90; -D_E0066490 = 0xE0066490; -D_E0066498 = 0xE0066498; -D_E006672C = 0xE006672C; -D_E0066770 = 0xE0066770; D_E0066C50 = 0xE0066C50; D_E0066C8C = 0xE0066C8C; D_E0066CE0 = 0xE0066CE0; D_E0066D20 = 0xE0066D20; -D_E0068140 = 0xE0068140; -D_E0068148 = 0xE0068148; -D_E00681D8 = 0xE00681D8; -D_E0068234 = 0xE0068234; D_E00685B0 = 0xE00685B0; D_E00685BC = 0xE00685BC; D_E00685F4 = 0xE00685F4; D_E0068600 = 0xE0068600; -D_E006A45C = 0xE006A45C; -D_E006A580 = 0xE006A580; -D_E006A814 = 0xE006A814; -D_E006A94C = 0xE006A94C; D_E006ADF0 = 0xE006ADF0; D_E006AE00 = 0xE006AE00; D_E006AE10 = 0xE006AE10; D_E006AF50 = 0xE006AF50; D_E006AF58 = 0xE006AF58; D_E006AF60 = 0xE006AF60; -D_E006C298 = 0xE006C298; -D_E006C2A0 = 0xE006C2A0; -D_E006C5A0 = 0xE006C5A0; -D_E006C5E8 = 0xE006C5E8; D_E006CB60 = 0xE006CB60; D_E006CB78 = 0xE006CB78; -D_E006E354 = 0xE006E354; -D_E006E35C = 0xE006E35C; -D_E006E6E4 = 0xE006E6E4; -D_E006E764 = 0xE006E764; D_E006EC00 = 0xE006EC00; D_E006EC0C = 0xE006EC0C; D_E006EC20 = 0xE006EC20; @@ -5419,10 +4942,6 @@ D_E006EC30 = 0xE006EC30; D_E006EC38 = 0xE006EC38; D_E006EC40 = 0xE006EC40; D_E006EC48 = 0xE006EC48; -D_E00701EC = 0xE00701EC; -D_E00701F4 = 0xE00701F4; -D_E00706F0 = 0xE00706F0; -D_E0070740 = 0xE0070740; D_E0070CD0 = 0xE0070CD0; D_E0070CF0 = 0xE0070CF0; D_E0070D60 = 0xE0070D60; @@ -5432,25 +4951,13 @@ D_E0070D78 = 0xE0070D78; D_E0070D80 = 0xE0070D80; D_E0070D88 = 0xE0070D88; D_E0070D90 = 0xE0070D90; -D_E0072148 = 0xE0072148; -D_E0072150 = 0xE0072150; -D_E007238C = 0xE007238C; -D_E00723D4 = 0xE00723D4; D_E00726B0 = 0xE00726B0; -D_E00741E0 = 0xE00741E0; -D_E00741E8 = 0xE00741E8; -D_E0074598 = 0xE0074598; -D_E00745E0 = 0xE00745E0; D_E0074B60 = 0xE0074B60; D_E0074B80 = 0xE0074B80; D_E0074BF0 = 0xE0074BF0; D_E0074BF8 = 0xE0074BF8; D_E0074C00 = 0xE0074C00; D_E0074C08 = 0xE0074C08; -D_E0076370 = 0xE0076370; -D_E0076378 = 0xE0076378; -D_E0076808 = 0xE0076808; -D_E007685C = 0xE007685C; D_E0076E90 = 0xE0076E90; D_E0076EA0 = 0xE0076EA0; D_E0076EB0 = 0xE0076EB0; @@ -5461,19 +4968,11 @@ D_E0076EE8 = 0xE0076EE8; D_E0076EF0 = 0xE0076EF0; D_E0076EF8 = 0xE0076EF8; D_E0076F00 = 0xE0076F00; -D_E0078124 = 0xE0078124; -D_E007812C = 0xE007812C; -D_E0078210 = 0xE0078210; -D_E007827C = 0xE007827C; D_E0078900 = 0xE0078900; D_E0078918 = 0xE0078918; D_E00789A8 = 0xE00789A8; D_E00789AC = 0xE00789AC; D_E00789D0 = 0xE00789D0; -D_E007A504 = 0xE007A504; -D_E007A50C = 0xE007A50C; -D_E007A840 = 0xE007A840; -D_E007A88C = 0xE007A88C; D_E007AC00 = 0xE007AC00; D_E007AC08 = 0xE007AC08; D_E007AC10 = 0xE007AC10; @@ -5481,40 +4980,19 @@ D_E007AC18 = 0xE007AC18; D_E007AC20 = 0xE007AC20; D_E007AC28 = 0xE007AC28; D_E007AC30 = 0xE007AC30; -D_E007C128 = 0xE007C128; -D_E007C130 = 0xE007C130; -D_E007C1B0 = 0xE007C1B0; -D_E007C1F4 = 0xE007C1F4; D_E007C510 = 0xE007C510; -D_E007E1FC = 0xE007E1FC; -D_E007E204 = 0xE007E204; -D_E007E508 = 0xE007E508; -D_E007E54C = 0xE007E54C; -D_E007EC2F = 0xE007EC2F; D_E007EC40 = 0xE007EC40; D_E007EC48 = 0xE007EC48; D_E007EC68 = 0xE007EC68; D_E007EC70 = 0xE007EC70; -D_E00801C8 = 0xE00801C8; -D_E00801D0 = 0xE00801D0; -D_E0080424 = 0xE0080424; -D_E008042C = 0xE008042C; D_E0080AC0 = 0xE0080AC0; D_E0080AF0 = 0xE0080AF0; D_E0080B0C = 0xE0080B0C; D_E0080B30 = 0xE0080B30; D_E0080B38 = 0xE0080B38; -D_E00821B0 = 0xE00821B0; -D_E00821B8 = 0xE00821B8; -D_E0082520 = 0xE0082520; -D_E0082528 = 0xE0082528; D_E0082D00 = 0xE0082D00; D_E0082D30 = 0xE0082D30; D_E0082D60 = 0xE0082D60; -D_E0084658 = 0xE0084658; -D_E0084660 = 0xE0084660; -D_E00848E4 = 0xE00848E4; -D_E0084928 = 0xE0084928; D_E0084E10 = 0xE0084E10; D_E0084E1C = 0xE0084E1C; D_E0084E28 = 0xE0084E28; @@ -5529,20 +5007,12 @@ D_E0084E60 = 0xE0084E60; D_E0084E68 = 0xE0084E68; D_E0084E70 = 0xE0084E70; D_E0084E78 = 0xE0084E78; -D_E0086270 = 0xE0086270; -D_E0086278 = 0xE0086278; -D_E0086390 = 0xE0086390; -D_E0086398 = 0xE0086398; D_E0086AA0 = 0xE0086AA0; D_E0086AB4 = 0xE0086AB4; D_E0086AC0 = 0xE0086AC0; D_E0086AC4 = 0xE0086AC4; D_E0086AD4 = 0xE0086AD4; D_E0086AE4 = 0xE0086AE4; -D_E00885A0 = 0xE00885A0; -D_E00885A8 = 0xE00885A8; -D_E00887A8 = 0xE00887A8; -D_E00887E0 = 0xE00887E0; D_E0088CC0 = 0xE0088CC0; D_E0088CDC = 0xE0088CDC; D_E0088D00 = 0xE0088D00; @@ -5557,10 +5027,6 @@ D_E0088D70 = 0xE0088D70; D_E0088D90 = 0xE0088D90; D_E0088D98 = 0xE0088D98; D_E0088DA0 = 0xE0088DA0; -D_E008C3F4 = 0xE008C3F4; -D_E008C3FC = 0xE008C3FC; -D_E008C6B8 = 0xE008C6B8; -D_E008C6FC = 0xE008C6FC; D_E008CB14 = 0xE008CB14; D_E008CB18 = 0xE008CB18; D_E008CB1C = 0xE008CB1C; @@ -5572,16 +5038,8 @@ D_E008CB68 = 0xE008CB68; D_E008CB70 = 0xE008CB70; D_E008CB78 = 0xE008CB78; D_E008CB80 = 0xE008CB80; -D_E008E1FC = 0xE008E1FC; -D_E008E204 = 0xE008E204; -D_E008E498 = 0xE008E498; -D_E008E4E0 = 0xE008E4E0; D_E008E890 = 0xE008E890; D_E008E8A0 = 0xE008E8A0; -D_E00901C0 = 0xE00901C0; -D_E00901C8 = 0xE00901C8; -D_E0090420 = 0xE0090420; -D_E0090428 = 0xE0090428; D_E0090A40 = 0xE0090A40; D_E0090A54 = 0xE0090A54; D_E0090A68 = 0xE0090A68; @@ -5592,47 +5050,19 @@ D_E0090AA8 = 0xE0090AA8; D_E0090AB0 = 0xE0090AB0; D_E0090AB8 = 0xE0090AB8; D_E0090AC0 = 0xE0090AC0; -D_E00921AC = 0xE00921AC; -D_E00921B4 = 0xE00921B4; -D_E0092258 = 0xE0092258; -D_E00922A0 = 0xE00922A0; D_E0092690 = 0xE0092690; D_E00926A4 = 0xE00926A4; D_E0092700 = 0xE0092700; -D_E0094190 = 0xE0094190; -D_E0094198 = 0xE0094198; -D_E00942C0 = 0xE00942C0; -D_E00942FC = 0xE00942FC; D_E00947B0 = 0xE00947B0; D_E00947B8 = 0xE00947B8; D_E00947C0 = 0xE00947C0; D_E00947C8 = 0xE00947C8; -D_E00960EC = 0xE00960EC; -D_E00960F4 = 0xE00960F4; -D_E0096178 = 0xE0096178; -D_E00961BC = 0xE00961BC; D_E00963E0 = 0xE00963E0; -D_E0098168 = 0xE0098168; -D_E0098170 = 0xE0098170; -D_E009829C = 0xE009829C; -D_E00982EC = 0xE00982EC; D_E0098510 = 0xE0098510; D_E0098530 = 0xE0098530; -D_E009A138 = 0xE009A138; -D_E009A140 = 0xE009A140; -D_E009A398 = 0xE009A398; -D_E009A3E0 = 0xE009A3E0; D_E009AA60 = 0xE009AA60; D_E009AA78 = 0xE009AA78; D_E009AA80 = 0xE009AA80; -D_E009C100 = 0xE009C100; -D_E009C108 = 0xE009C108; -D_E009C1DC = 0xE009C1DC; -D_E009C220 = 0xE009C220; -D_E009E1DC = 0xE009E1DC; -D_E009E1E4 = 0xE009E1E4; -D_E009E3DC = 0xE009E3DC; -D_E009E424 = 0xE009E424; D_E009EDF0 = 0xE009EDF0; D_E009EDF4 = 0xE009EDF4; D_E009EDF8 = 0xE009EDF8; @@ -5645,17 +5075,9 @@ D_E009EE20 = 0xE009EE20; D_E009EE28 = 0xE009EE28; D_E009EE30 = 0xE009EE30; D_E009EE38 = 0xE009EE38; -D_E00A2118 = 0xE00A2118; -D_E00A2120 = 0xE00A2120; -D_E00A21EC = 0xE00A21EC; -D_E00A223C = 0xE00A223C; D_E00A29D0 = 0xE00A29D0; D_E00A29DC = 0xE00A29DC; D_E00A2A24 = 0xE00A2A24; -D_E00A41A4 = 0xE00A41A4; -D_E00A41AC = 0xE00A41AC; -D_E00A45DC = 0xE00A45DC; -D_E00A4650 = 0xE00A4650; D_E00A4AD0 = 0xE00A4AD0; D_E00A4AF0 = 0xE00A4AF0; D_E00A4AF8 = 0xE00A4AF8; @@ -5663,27 +5085,11 @@ D_E00A4B20 = 0xE00A4B20; D_E00A4B28 = 0xE00A4B28; D_E00A4B30 = 0xE00A4B30; D_E00A4B38 = 0xE00A4B38; -D_E00A611C = 0xE00A611C; -D_E00A6124 = 0xE00A6124; -D_E00A6358 = 0xE00A6358; -D_E00A63A4 = 0xE00A63A4; -D_E00A80FC = 0xE00A80FC; -D_E00A8104 = 0xE00A8104; -D_E00A82D4 = 0xE00A82D4; -D_E00A8320 = 0xE00A8320; D_E00A8620 = 0xE00A8620; D_E00A8690 = 0xE00A8690; D_E00A86A0 = 0xE00A86A0; -D_E00AA104 = 0xE00AA104; -D_E00AA10C = 0xE00AA10C; -D_E00AA3C0 = 0xE00AA3C0; -D_E00AA404 = 0xE00AA404; D_E00AA6C0 = 0xE00AA6C0; D_E00AA6EC = 0xE00AA6EC; -D_E00AC11C = 0xE00AC11C; -D_E00AC124 = 0xE00AC124; -D_E00AC280 = 0xE00AC280; -D_E00AC288 = 0xE00AC288; D_E00AC7B0 = 0xE00AC7B0; D_E00AC7BC = 0xE00AC7BC; D_E00AC7C8 = 0xE00AC7C8; @@ -5692,25 +5098,9 @@ D_E00AC83C = 0xE00AC83C; D_E00AC880 = 0xE00AC880; D_E00AC8D0 = 0xE00AC8D0; D_E00AC8D8 = 0xE00AC8D8; -D_E00AE1AC = 0xE00AE1AC; -D_E00AE1B4 = 0xE00AE1B4; -D_E00AE4FC = 0xE00AE4FC; -D_E00AE54C = 0xE00AE54C; -D_E00B011C = 0xE00B011C; -D_E00B0124 = 0xE00B0124; -D_E00B01F8 = 0xE00B01F8; -D_E00B0234 = 0xE00B0234; D_E00B07E0 = 0xE00B07E0; D_E00B07E8 = 0xE00B07E8; -D_E00B21DC = 0xE00B21DC; -D_E00B21E4 = 0xE00B21E4; -D_E00B2460 = 0xE00B2460; -D_E00B24B0 = 0xE00B24B0; D_E00B2BA0 = 0xE00B2BA0; -D_E00B4134 = 0xE00B4134; -D_E00B413C = 0xE00B413C; -D_E00B452C = 0xE00B452C; -D_E00B457C = 0xE00B457C; D_E00B4CF0 = 0xE00B4CF0; D_E00B4ED0 = 0xE00B4ED0; D_E00B4ED8 = 0xE00B4ED8; @@ -5718,52 +5108,28 @@ D_E00B4EE0 = 0xE00B4EE0; D_E00B4EE8 = 0xE00B4EE8; D_E00B4EF0 = 0xE00B4EF0; D_E00B4EF8 = 0xE00B4EF8; -D_E00B6178 = 0xE00B6178; -D_E00B6180 = 0xE00B6180; -D_E00B629C = 0xE00B629C; -D_E00B62E0 = 0xE00B62E0; D_E00B6750 = 0xE00B6750; D_E00B6758 = 0xE00B6758; D_E00B6760 = 0xE00B6760; D_E00B6768 = 0xE00B6768; -D_E00B812C = 0xE00B812C; -D_E00B8134 = 0xE00B8134; -D_E00B81B8 = 0xE00B81B8; -D_E00B8208 = 0xE00B8208; D_E00B8900 = 0xE00B8900; D_E00B8B58 = 0xE00B8B58; D_E00B8CA4 = 0xE00B8CA4; D_E00B8CD0 = 0xE00B8CD0; -D_E00BA16C = 0xE00BA16C; -D_E00BA174 = 0xE00BA174; -D_E00BA5DC = 0xE00BA5DC; -D_E00BA620 = 0xE00BA620; D_E00BAE80 = 0xE00BAE80; D_E00BAE88 = 0xE00BAE88; D_E00BAE90 = 0xE00BAE90; -D_E00BC1D0 = 0xE00BC1D0; -D_E00BC238 = 0xE00BC238; -D_E00BC2E8 = 0xE00BC2E8; -D_E00BC374 = 0xE00BC374; D_E00BCE40 = 0xE00BCE40; D_E00BCE50 = 0xE00BCE50; D_E00BCE58 = 0xE00BCE58; D_E00BCE60 = 0xE00BCE60; D_E00BCE68 = 0xE00BCE68; -D_E00BE39C = 0xE00BE39C; -D_E00BE3A4 = 0xE00BE3A4; -D_E00BE578 = 0xE00BE578; -D_E00BE5BC = 0xE00BE5BC; D_E00BEAF0 = 0xE00BEAF0; D_E00BEB00 = 0xE00BEB00; D_E00BEB08 = 0xE00BEB08; D_E00BEB10 = 0xE00BEB10; D_E00BEB18 = 0xE00BEB18; D_E00BEB20 = 0xE00BEB20; -D_E00C0158 = 0xE00C0158; -D_E00C0160 = 0xE00C0160; -D_E00C0710 = 0xE00C0710; -D_E00C0760 = 0xE00C0760; D_E00C0A10 = 0xE00C0A10; D_E00C0A21 = 0xE00C0A21; D_E00C0A24 = 0xE00C0A24; @@ -5774,17 +5140,9 @@ D_E00C0C08 = 0xE00C0C08; D_E00C0C10 = 0xE00C0C10; D_E00C0C18 = 0xE00C0C18; D_E00C0C20 = 0xE00C0C20; -D_E00C2124 = 0xE00C2124; -D_E00C212C = 0xE00C212C; -D_E00C21CC = 0xE00C21CC; -D_E00C221C = 0xE00C221C; D_E00C2990 = 0xE00C2990; D_E00C29A0 = 0xE00C29A0; D_E00C29A8 = 0xE00C29A8; -D_E00C4170 = 0xE00C4170; -D_E00C4178 = 0xE00C4178; -D_E00C42C4 = 0xE00C42C4; -D_E00C4308 = 0xE00C4308; D_E00C49D0 = 0xE00C49D0; D_E00C49D4 = 0xE00C49D4; D_E00C49E8 = 0xE00C49E8; @@ -5792,10 +5150,6 @@ D_E00C49FC = 0xE00C49FC; D_E00C4A10 = 0xE00C4A10; D_E00C4A90 = 0xE00C4A90; D_E00C4A98 = 0xE00C4A98; -D_E00C6394 = 0xE00C6394; -D_E00C639C = 0xE00C639C; -D_E00C6768 = 0xE00C6768; -D_E00C67B0 = 0xE00C67B0; D_E00C6C90 = 0xE00C6C90; D_E00C6C9C = 0xE00C6C9C; D_E00C6CB0 = 0xE00C6CB0; @@ -5807,29 +5161,17 @@ D_E00C6CD8 = 0xE00C6CD8; D_E00C6CE0 = 0xE00C6CE0; D_E00C6CE8 = 0xE00C6CE8; D_E00C6CF0 = 0xE00C6CF0; -D_E00C8218 = 0xE00C8218; -D_E00C8220 = 0xE00C8220; -D_E00C8404 = 0xE00C8404; -D_E00C8454 = 0xE00C8454; D_E00C8710 = 0xE00C8710; D_E00C8718 = 0xE00C8718; D_E00C8720 = 0xE00C8720; D_E00C8730 = 0xE00C8730; D_E00C8738 = 0xE00C8738; D_E00C8740 = 0xE00C8740; -D_E00CA240 = 0xE00CA240; -D_E00CA248 = 0xE00CA248; -D_E00CA484 = 0xE00CA484; -D_E00CA4CC = 0xE00CA4CC; D_E00CACB0 = 0xE00CACB0; D_E00CACC0 = 0xE00CACC0; D_E00CACC8 = 0xE00CACC8; D_E00CACD0 = 0xE00CACD0; D_E00CACD8 = 0xE00CACD8; -D_E00CC250 = 0xE00CC250; -D_E00CC258 = 0xE00CC258; -D_E00CC980 = 0xE00CC980; -D_E00CC9D0 = 0xE00CC9D0; D_E00CCDD0 = 0xE00CCDD0; D_E00CCDD8 = 0xE00CCDD8; D_E00CCDE0 = 0xE00CCDE0; @@ -5841,36 +5183,20 @@ D_E00CCE78 = 0xE00CCE78; D_E00CCED0 = 0xE00CCED0; D_E00CCED8 = 0xE00CCED8; D_E00CCEE0 = 0xE00CCEE0; -D_E00CE21C = 0xE00CE21C; -D_E00CE224 = 0xE00CE224; -D_E00CE428 = 0xE00CE428; -D_E00CE478 = 0xE00CE478; D_E00CEE50 = 0xE00CEE50; D_E00CEE58 = 0xE00CEE58; D_E00CEE60 = 0xE00CEE60; D_E00CEE68 = 0xE00CEE68; -D_E00D018C = 0xE00D018C; -D_E00D0194 = 0xE00D0194; -D_E00D0448 = 0xE00D0448; -D_E00D048C = 0xE00D048C; D_E00D0B10 = 0xE00D0B10; D_E00D0B20 = 0xE00D0B20; D_E00D0B28 = 0xE00D0B28; D_E00D0B30 = 0xE00D0B30; D_E00D0B38 = 0xE00D0B38; D_E00D0B40 = 0xE00D0B40; -D_E00D2118 = 0xE00D2118; -D_E00D2120 = 0xE00D2120; -D_E00D2234 = 0xE00D2234; -D_E00D2284 = 0xE00D2284; D_E00D2500 = 0xE00D2500; D_E00D2508 = 0xE00D2508; D_E00D2510 = 0xE00D2510; D_E00D2518 = 0xE00D2518; -D_E00D6718 = 0xE00D6718; -D_E00D6720 = 0xE00D6720; -D_E00D693C = 0xE00D693C; -D_E00D6980 = 0xE00D6980; D_E00D6E40 = 0xE00D6E40; D_E00D6E74 = 0xE00D6E74; D_E00D6E84 = 0xE00D6E84; @@ -5882,31 +5208,14 @@ D_E00D6EF0 = 0xE00D6EF0; D_E00D6EF8 = 0xE00D6EF8; D_E00D6F00 = 0xE00D6F00; D_E00D6F08 = 0xE00D6F08; -D_E00D8120 = 0xE00D8120; -D_E00D8128 = 0xE00D8128; -D_E00D825C = 0xE00D825C; -D_E00D8264 = 0xE00D8264; -D_E00D8334 = 0xE00D8334; D_E00D87E0 = 0xE00D87E0; D_E00D8818 = 0xE00D8818; -D_E00DA0FC = 0xE00DA0FC; -D_E00DA104 = 0xE00DA104; -D_E00DA1E0 = 0xE00DA1E0; -D_E00DA230 = 0xE00DA230; D_E00DA500 = 0xE00DA500; D_E00DA501 = 0xE00DA501; D_E00DA502 = 0xE00DA502; D_E00DA520 = 0xE00DA520; -D_E00DC190 = 0xE00DC190; -D_E00DC198 = 0xE00DC198; -D_E00DC2C0 = 0xE00DC2C0; -D_E00DC304 = 0xE00DC304; D_E00DC640 = 0xE00DC640; D_E00DC648 = 0xE00DC648; -D_E00DE11C = 0xE00DE11C; -D_E00DE124 = 0xE00DE124; -D_E00DE260 = 0xE00DE260; -D_E00DE2A8 = 0xE00DE2A8; D_E00DE810 = 0xE00DE810; D_E00DE84C = 0xE00DE84C; D_E00DE858 = 0xE00DE858; @@ -5914,10 +5223,6 @@ D_E00DE8B4 = 0xE00DE8B4; D_E00DE910 = 0xE00DE910; D_E00DE96C = 0xE00DE96C; D_E00DE9D0 = 0xE00DE9D0; -D_E00E01D0 = 0xE00E01D0; -D_E00E01D8 = 0xE00E01D8; -D_E00E05B0 = 0xE00E05B0; -D_E00E0600 = 0xE00E0600; D_E00E0A40 = 0xE00E0A40; D_E00E0A44 = 0xE00E0A44; D_E00E0A48 = 0xE00E0A48; @@ -5925,20 +5230,12 @@ D_E00E0AC0 = 0xE00E0AC0; D_E00E0AC8 = 0xE00E0AC8; D_E00E0AD0 = 0xE00E0AD0; D_E00E0AD8 = 0xE00E0AD8; -D_E00E212C = 0xE00E212C; -D_E00E2134 = 0xE00E2134; -D_E00E21C8 = 0xE00E21C8; -D_E00E2218 = 0xE00E2218; D_E00E29F0 = 0xE00E29F0; D_E00E29F4 = 0xE00E29F4; D_E00E2A08 = 0xE00E2A08; D_E00E2A1C = 0xE00E2A1C; D_E00E2A30 = 0xE00E2A30; D_E00E2A38 = 0xE00E2A38; -D_E00E4288 = 0xE00E4288; -D_E00E4290 = 0xE00E4290; -D_E00E490C = 0xE00E490C; -D_E00E495C = 0xE00E495C; D_E00E4D90 = 0xE00E4D90; D_E00E4DA8 = 0xE00E4DA8; D_E00E4DC0 = 0xE00E4DC0; @@ -5952,10 +5249,6 @@ D_E00E4E40 = 0xE00E4E40; D_E00E4E48 = 0xE00E4E48; D_E00E4E50 = 0xE00E4E50; D_E00E4E58 = 0xE00E4E58; -D_E00E617C = 0xE00E617C; -D_E00E6184 = 0xE00E6184; -D_E00E64D4 = 0xE00E64D4; -D_E00E6524 = 0xE00E6524; D_E00E6880 = 0xE00E6880; D_E00E6888 = 0xE00E6888; D_E00E6890 = 0xE00E6890; @@ -5964,25 +5257,13 @@ D_E00E68F8 = 0xE00E68F8; D_E00E6910 = 0xE00E6910; D_E00E6970 = 0xE00E6970; D_E00E6990 = 0xE00E6990; -D_E00E825C = 0xE00E825C; -D_E00E8264 = 0xE00E8264; -D_E00E8374 = 0xE00E8374; -D_E00E83BC = 0xE00E83BC; D_E00E8630 = 0xE00E8630; D_E00E8634 = 0xE00E8634; -D_E00EA190 = 0xE00EA190; -D_E00EA198 = 0xE00EA198; -D_E00EA520 = 0xE00EA520; -D_E00EA66C = 0xE00EA66C; D_E00EAA50 = 0xE00EAA50; D_E00EAA58 = 0xE00EAA58; D_E00EAA60 = 0xE00EAA60; D_E00EAA68 = 0xE00EAA68; D_E00EAA70 = 0xE00EAA70; -D_E010A184 = 0xE010A184; -D_E010A18C = 0xE010A18C; -D_E010A4A0 = 0xE010A4A0; -D_E010A4E8 = 0xE010A4E8; D_E010ACCC = 0xE010ACCC; D_E010AF68 = 0xE010AF68; D_E010AF80 = 0xE010AF80; @@ -5991,43 +5272,23 @@ D_E010AF90 = 0xE010AF90; D_E010AF98 = 0xE010AF98; D_E010AFA0 = 0xE010AFA0; D_E010AFA8 = 0xE010AFA8; -D_E010C190 = 0xE010C190; -D_E010C198 = 0xE010C198; -D_E010C354 = 0xE010C354; -D_E010C39C = 0xE010C39C; D_E010CA10 = 0xE010CA10; D_E010CA14 = 0xE010CA14; D_E010CA18 = 0xE010CA18; D_E010CA38 = 0xE010CA38; D_E010CA60 = 0xE010CA60; D_E010CA68 = 0xE010CA68; -D_E0110224 = 0xE0110224; -D_E011022C = 0xE011022C; -D_E01103A4 = 0xE01103A4; -D_E01103EC = 0xE01103EC; D_E01108B0 = 0xE01108B0; D_E01108B4 = 0xE01108B4; D_E01108C0 = 0xE01108C0; D_E01108C8 = 0xE01108C8; -D_E01121B8 = 0xE01121B8; -D_E01121C0 = 0xE01121C0; -D_E01122E8 = 0xE01122E8; -D_E01124CC = 0xE01124CC; D_E0112630 = 0xE0112630; D_E0112638 = 0xE0112638; D_E0112640 = 0xE0112640; -D_E01140D4 = 0xE01140D4; -D_E01140DC = 0xE01140DC; -D_E0114340 = 0xE0114340; -D_E0114388 = 0xE0114388; D_E01146A0 = 0xE01146A0; D_E0114718 = 0xE0114718; D_E0114740 = 0xE0114740; D_E0114750 = 0xE0114750; -D_E0116184 = 0xE0116184; -D_E011618C = 0xE011618C; -D_E01166A0 = 0xE01166A0; -D_E0116884 = 0xE0116884; D_E0116C60 = 0xE0116C60; D_E0116C64 = 0xE0116C64; D_E0116C68 = 0xE0116C68; @@ -6047,47 +5308,27 @@ D_E0116D90 = 0xE0116D90; D_E0116D98 = 0xE0116D98; D_E0116DB0 = 0xE0116DB0; D_E0116DB8 = 0xE0116DB8; -D_E01182EC = 0xE01182EC; -D_E01182F4 = 0xE01182F4; -D_E0118454 = 0xE0118454; -D_E011849C = 0xE011849C; D_E01187B0 = 0xE01187B0; D_E01187C0 = 0xE01187C0; D_E01187D0 = 0xE01187D0; D_E01187D8 = 0xE01187D8; D_E01187E0 = 0xE01187E0; -D_E011A0FC = 0xE011A0FC; -D_E011A104 = 0xE011A104; -D_E011A398 = 0xE011A398; -D_E011A3A0 = 0xE011A3A0; D_E011AC20 = 0xE011AC20; D_E011AC24 = 0xE011AC24; D_E011AC4C = 0xE011AC4C; D_E011AC58 = 0xE011AC58; D_E011AC64 = 0xE011AC64; D_E011AC70 = 0xE011AC70; -D_E011E18C = 0xE011E18C; -D_E011E194 = 0xE011E194; -D_E011E530 = 0xE011E530; -D_E011E578 = 0xE011E578; D_E011E7F0 = 0xE011E7F0; D_E011E800 = 0xE011E800; D_E011E810 = 0xE011E810; D_E011E818 = 0xE011E818; D_E011E820 = 0xE011E820; D_E011E828 = 0xE011E828; -D_E0120134 = 0xE0120134; -D_E012013C = 0xE012013C; -D_E012039C = 0xE012039C; -D_E01203E4 = 0xE01203E4; D_E0120780 = 0xE0120780; D_E0120794 = 0xE0120794; D_E01207A0 = 0xE01207A0; D_E01207A8 = 0xE01207A8; -D_E0122174 = 0xE0122174; -D_E012217C = 0xE012217C; -D_E01226C4 = 0xE01226C4; -D_E012270C = 0xE012270C; D_E0122B90 = 0xE0122B90; D_E0122BA0 = 0xE0122BA0; D_E0122BA4 = 0xE0122BA4; @@ -6103,10 +5344,6 @@ D_E0122CD0 = 0xE0122CD0; D_E0122CD8 = 0xE0122CD8; D_E0122CE0 = 0xE0122CE0; D_E0122CE8 = 0xE0122CE8; -D_E01242FC = 0xE01242FC; -D_E0124304 = 0xE0124304; -D_E012448C = 0xE012448C; -D_E01244C4 = 0xE01244C4; D_E01248A0 = 0xE01248A0; D_E01248C0 = 0xE01248C0; D_E0124BC0 = 0xE0124BC0; @@ -6117,10 +5354,6 @@ D_E0124C10 = 0xE0124C10; D_E0124C18 = 0xE0124C18; D_E0124C20 = 0xE0124C20; D_E0124C28 = 0xE0124C28; -D_E012612C = 0xE012612C; -D_E0126134 = 0xE0126134; -D_E01264A4 = 0xE01264A4; -D_E01264EC = 0xE01264EC; D_E0126BC0 = 0xE0126BC0; D_E0126BC4 = 0xE0126BC4; D_E0126BC8 = 0xE0126BC8; @@ -6138,10 +5371,6 @@ D_E0126C20 = 0xE0126C20; D_E0126C28 = 0xE0126C28; D_E0126C30 = 0xE0126C30; D_E0126C38 = 0xE0126C38; -D_E0128128 = 0xE0128128; -D_E0128130 = 0xE0128130; -D_E0128198 = 0xE0128198; -D_E01281E0 = 0xE01281E0; D_E0128480 = 0xE0128480; D_E01284B0 = 0xE01284B0; D_E0200000 = 0xE0200000;