From 4b8af37c35a01be289336bfd529e9f10d183803c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 19 Nov 2020 23:08:05 -0500 Subject: [PATCH] UnkNpcAIFunc1 --- .../code_20ec0_len_5040/func_80049B44.s | 52 --------------- .../arn_03/BDED90/func_80240400_BDF190.s | 52 --------------- .../arn_03/BDED90/func_80240B94_BDF924.s | 2 +- .../arn_03/BDED90/func_8024113C_BDFECC.s | 2 +- .../arn_04/BE37B0/func_80240400_BE3BB0.s | 52 --------------- .../arn_04/BE37B0/func_80240B94_BE4344.s | 2 +- .../arn_05/BE7BE0/func_80240400_BE7FE0.s | 52 --------------- .../arn_05/BE7BE0/func_80240B94_BE8774.s | 2 +- .../arn_05/BE7BE0/func_8024113C_BE8D1C.s | 2 +- .../arn_07/BED740/func_80241128_BEDF18.s | 52 --------------- .../arn_07/BED740/func_80241C5C_BEEA4C.s | 2 +- .../dgb_01/BFD9A0/func_802408F8_BFE178.s | 52 --------------- .../dgb_01/BFD9A0/func_8024142C_BFECAC.s | 2 +- .../dgb_01/BFD9A0/func_802422B0_BFFB30.s | 2 +- .../dgb_03/C31730/func_80240F20_C32400.s | 52 --------------- .../dgb_03/C31730/func_802416B4_C32B94.s | 2 +- .../dgb_03/C31730/func_802419B0_C32E90.s | 2 +- .../dgb_04/C36530/func_802407D8_C36D08.s | 52 --------------- .../dgb_04/C36530/func_8024130C_C3783C.s | 2 +- .../dgb_04/C36530/func_80242154_C38684.s | 2 +- .../dgb_08/C3FDB0/func_80240400_C401B0.s | 52 --------------- .../dgb_08/C3FDB0/func_80240B94_C40944.s | 2 +- .../dgb_09/C46BE0/func_80241BFC_C487DC.s | 52 --------------- .../dgb_09/C46BE0/func_80242730_C49310.s | 2 +- .../dgb_09/C46BE0/func_80243578_C4A158.s | 2 +- .../dgb_15/C4F510/func_80240CD0_C501E0.s | 52 --------------- .../dgb_15/C4F510/func_80241464_C50974.s | 2 +- .../dgb_18/C55F40/func_80240400_C56340.s | 52 --------------- .../dgb_18/C55F40/func_80240B94_C56AD4.s | 2 +- .../dro_01/95B7E0/func_802409E0_95BBE0.s | 52 --------------- .../dro_01/95B7E0/func_80241174_95C374.s | 2 +- .../flo_00/C9DF60/func_80240440_C9E360.s | 52 --------------- .../flo_00/C9DF60/func_80240BD4_C9EAF4.s | 2 +- .../flo_09/CB5320/func_80240AF8_CB5AF8.s | 52 --------------- .../flo_09/CB5320/func_8024162C_CB662C.s | 2 +- .../flo_13/CC3850/func_8024099C_CC41AC.s | 52 --------------- .../flo_13/CC3850/func_802414D0_CC4CE0.s | 2 +- .../flo_13/CC3850/func_80241DB8_CC55C8.s | 2 +- .../flo_14/CCBE20/func_802412E8_CCC5F8.s | 52 --------------- .../flo_14/CCBE20/func_80241E1C_CCD12C.s | 2 +- .../flo_16/CD2C80/func_80241628_CD3458.s | 52 --------------- .../flo_16/CD2C80/func_8024215C_CD3F8C.s | 2 +- .../flo_16/CD2C80/func_80242754_CD4584.s | 2 +- .../flo_17/CD7350/func_80240848_CD7B28.s | 52 --------------- .../flo_17/CD7350/func_8024137C_CD865C.s | 2 +- .../flo_17/CD7350/func_80241C64_CD8F44.s | 2 +- .../flo_25/CF2C10/func_80240818_CF33E8.s | 52 --------------- .../flo_25/CF2C10/func_8024134C_CF3F1C.s | 2 +- .../flo_25/CF2C10/func_80241944_CF4514.s | 2 +- .../hos_02/A17210/func_802417C8_A179E8.s | 52 --------------- .../hos_02/A17210/func_802422FC_A1851C.s | 2 +- .../hos_02/A17210/func_802428F4_A18B14.s | 2 +- .../hos_03/A1BDB0/func_80241488_A1C588.s | 52 --------------- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 2 +- .../isk_05/97DAD0/func_80240568_97E038.s | 52 --------------- .../isk_05/97DAD0/func_80240BF0_97E6C0.s | 2 +- .../isk_05/97DAD0/func_80240F3C_97EA0C.s | 2 +- .../isk_13/98F7E0/func_80240568_98FD48.s | 52 --------------- .../isk_13/98F7E0/func_80240BF0_9903D0.s | 2 +- .../isk_13/98F7E0/func_80240F3C_99071C.s | 2 +- .../isk_14/992730/func_80240568_992C98.s | 52 --------------- .../isk_14/992730/func_80240BF0_993320.s | 2 +- .../isk_14/992730/func_80240F3C_99366C.s | 2 +- .../jan_01/B28030/func_802408A8_B288D8.s | 52 --------------- .../jan_01/B28030/func_80240F30_B28F60.s | 2 +- .../jan_02/B2C8A0/func_80240830_B2CCA0.s | 52 --------------- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 2 +- .../jan_03/B34BD0/func_80240A20_B355F0.s | 52 --------------- .../jan_03/B34BD0/func_802411B4_B35D84.s | 2 +- .../jan_05/B4B260/func_80240E0C_B4B87C.s | 52 --------------- .../jan_05/B4B260/func_80241494_B4BF04.s | 2 +- .../jan_06/B52F70/func_80240CA8_B534D8.s | 52 --------------- .../jan_06/B52F70/func_80241330_B53B60.s | 2 +- .../jan_10/B6C6A0/func_80240878_B6CC08.s | 52 --------------- .../jan_10/B6C6A0/func_80240F00_B6D290.s | 2 +- .../jan_14/B7A510/func_80240A28_B7AA78.s | 52 --------------- .../jan_14/B7A510/func_802410B0_B7B100.s | 2 +- .../jan_22/B84180/func_80240400_B84580.s | 52 --------------- .../jan_22/B84180/func_80240B94_B84D14.s | 2 +- .../kkj_00/ABB340/func_802404B0_ABB740.s | 52 --------------- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 2 +- .../kkj_01/AC5170/func_80240400_AC5570.s | 52 --------------- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 2 +- .../kmr_05/8CE070/func_802407D8_8CE848.s | 52 --------------- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 2 +- .../kmr_06/8D1510/func_802407D8_8D1CE8.s | 52 --------------- .../kmr_06/8D1510/func_8024130C_8D281C.s | 2 +- .../kmr_09/8D5E00/func_802407D8_8D65D8.s | 52 --------------- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 2 +- .../kpa_91/A86A50/func_80240400_A86E50.s | 52 --------------- .../kpa_91/A86A50/func_80240B94_A875E4.s | 2 +- .../kpa_91/A86A50/func_80241224_A87C74.s | 2 +- .../kpa_95/A8CB60/func_802404E0_A8CF60.s | 52 --------------- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 2 +- .../kpa_95/A8CB60/func_80241304_A8DD84.s | 2 +- .../kzn_02/C5AC20/func_80240CB8_C5B3F8.s | 52 --------------- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 2 +- .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 2 +- .../kzn_07/C6EA50/func_80240FF8_C6F328.s | 52 --------------- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 2 +- .../kzn_07/C6EA50/func_80242124_C70454.s | 2 +- .../kzn_08/C71ED0/func_80241228_C726A8.s | 52 --------------- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 2 +- .../kzn_08/C71ED0/func_80242354_C737D4.s | 2 +- .../kzn_11/C80600/func_80240C38_C80DD8.s | 52 --------------- .../kzn_11/C80600/func_8024176C_C8190C.s | 2 +- .../kzn_11/C80600/func_80241D64_C81F04.s | 2 +- .../mac_00/7ED280/func_80242970_7ED680.s | 52 --------------- .../mac_00/7ED280/func_80243104_7EDE14.s | 2 +- .../mac_01/8017D0/func_80241480_801D00.s | 52 --------------- .../mac_01/8017D0/func_80241C14_802494.s | 2 +- .../mac_01/805DD0/func_80245950_8061D0.s | 52 --------------- .../mac_01/805DD0/func_802460E4_806964.s | 2 +- .../mac_02/823BF0/func_80240D30_823FF0.s | 52 --------------- .../mac_02/823BF0/func_802414C4_824784.s | 2 +- .../mac_05/852170/func_80240890_852A00.s | 52 --------------- .../mac_05/852170/func_80241024_853194.s | 2 +- .../mgm_00/E0E7A0/func_802406E0_E0EE80.s | 52 --------------- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 2 +- .../mim_02/B97C70/func_802405D8_B981D8.s | 52 --------------- .../mim_02/B97C70/func_80240C60_B98860.s | 2 +- .../mim_04/B9DB60/func_80240768_B9E0C8.s | 52 --------------- .../mim_04/B9DB60/func_80240DF0_B9E750.s | 2 +- .../mim_06/BA4CF0/func_8024247C_BA6BFC.s | 52 --------------- .../mim_06/BA4CF0/func_80242B04_BA7284.s | 2 +- .../mim_07/BAA3B0/func_802407D8_BAA918.s | 52 --------------- .../mim_07/BAA3B0/func_80240E60_BAAFA0.s | 2 +- .../mim_08/BAD940/func_80240878_BAE1B8.s | 52 --------------- .../mim_08/BAD940/func_802413AC_BAECEC.s | 2 +- .../mim_09/BB2E00/func_80240608_BB3408.s | 52 --------------- .../mim_09/BB2E00/func_80240C90_BB3A90.s | 2 +- .../nok_02/9D7AA0/func_80240E80_9D7EA0.s | 52 --------------- .../nok_02/9D7AA0/func_80241614_9D8634.s | 2 +- .../nok_03/9EB7F0/func_80240568_9EBD58.s | 52 --------------- .../nok_03/9EB7F0/func_80240BF0_9EC3E0.s | 2 +- .../nok_11/9F4A40/func_80240FAC_9F59EC.s | 52 --------------- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 2 +- .../nok_12/9FAD60/func_80241144_9FB934.s | 52 --------------- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 2 +- .../nok_12/9FAD60/func_80241BD4_9FC3C4.s | 2 +- .../nok_13/A00600/func_80240568_A00B68.s | 52 --------------- .../nok_13/A00600/func_80240BF0_A011F0.s | 2 +- .../nok_14/A02A00/func_8024116C_A039AC.s | 52 --------------- .../nok_14/A02A00/func_80241CA0_A044E0.s | 2 +- .../nok_14/A02A00/func_802421CC_A04A0C.s | 2 +- .../nok_15/A06F00/func_8024128C_A0818C.s | 52 --------------- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 2 +- .../nok_15/A06F00/func_802422EC_A091EC.s | 2 +- .../omo_04/DAD400/func_80240B78_DADF78.s | 52 --------------- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 2 +- .../omo_05/DB22C0/func_8024122C_DB34EC.s | 52 --------------- .../omo_05/DB22C0/func_80241D60_DB4020.s | 2 +- .../omo_07/DBD2B0/func_8024096C_DBDC1C.s | 52 --------------- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 2 +- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 2 +- .../omo_09/DCD6B0/func_8024134C_DCE01C.s | 52 --------------- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 2 +- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 2 +- .../omo_17/DEF400/func_8024178C_DF062C.s | 52 --------------- .../omo_17/DEF400/func_802422C0_DF1160.s | 2 +- .../pra_35/D8D270/func_80241320_D8E570.s | 52 --------------- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 2 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 2 +- .../sam_06/D203E0/func_80240D28_D20BB8.s | 52 --------------- .../sam_06/D203E0/func_8024185C_D216EC.s | 2 +- .../tik_07/87AC00/func_80241BC8_87B7A8.s | 52 --------------- .../tik_07/87AC00/func_802426FC_87C2DC.s | 2 +- .../trd_02/9A10C0/func_80240CB4_9A1C94.s | 52 --------------- .../trd_02/9A10C0/func_80241448_9A2428.s | 2 +- .../trd_02/9A10C0/func_80241744_9A2724.s | 2 +- .../trd_04/9A88A0/func_80241084_9A9474.s | 52 --------------- .../trd_04/9A88A0/func_80241818_9A9C08.s | 2 +- .../trd_04/9A88A0/func_80241B14_9A9F04.s | 2 +- .../trd_07/9B6C90/func_802412BC_9B7C3C.s | 52 --------------- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 2 +- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 2 +- include/map.h | 1 + src/code_20ec0_len_5040.c | 11 +++- src/world/area_arn/arn_03/BDED90.c | 2 +- src/world/area_arn/arn_04/BE37B0.c | 3 +- src/world/area_arn/arn_05/BE7BE0.c | 2 +- src/world/area_arn/arn_07/BED740.c | 2 +- src/world/area_dgb/dgb_01/BFD9A0.c | 3 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_04/C36530.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 3 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_18/C55F40.c | 2 +- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_flo/flo_00/C9DF60.c | 2 +- src/world/area_flo/flo_09/CB5320.c | 2 +- src/world/area_flo/flo_13/CC3850.c | 2 +- src/world/area_flo/flo_14/CCBE20.c | 2 +- src/world/area_flo/flo_16/CD2C80.c | 2 +- src/world/area_flo/flo_17/CD7350.c | 2 +- src/world/area_flo/flo_25/CF2C10.c | 2 +- src/world/area_hos/hos_02/A17210.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_isk/isk_05/97DAD0.c | 2 +- src/world/area_isk/isk_13/98F7E0.c | 2 +- src/world/area_isk/isk_14/992730.c | 2 +- src/world/area_jan/jan_01/B28030.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_jan/jan_05/B4B260.c | 2 +- src/world/area_jan/jan_06/B52F70.c | 2 +- src/world/area_jan/jan_10/B6C6A0.c | 2 +- src/world/area_jan/jan_14/B7A510.c | 2 +- src/world/area_jan/jan_22/B84180.c | 2 +- src/world/area_kkj/kkj_00/ABB340.c | 2 +- src/world/area_kkj/kkj_01/AC5170.c | 2 +- src/world/area_kmr/kmr_05/8CE070.c | 2 +- src/world/area_kmr/kmr_06/8D1510.c | 2 +- src/world/area_kmr/kmr_09/8D5E00.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_kzn/kzn_02/C5AC20.c | 2 +- src/world/area_kzn/kzn_07/C6EA50.c | 2 +- src/world/area_kzn/kzn_08/C71ED0.c | 2 +- src/world/area_kzn/kzn_11/C80600.c | 2 +- src/world/area_mac/mac_00/7ED280.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_01/805DD0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_mgm/mgm_00/E0E7A0.c | 2 +- src/world/area_mim/mim_02/B97C70.c | 2 +- src/world/area_mim/mim_04/B9DB60.c | 2 +- src/world/area_mim/mim_06/BA4CF0.c | 2 +- src/world/area_mim/mim_07/BAA3B0.c | 2 +- src/world/area_mim/mim_08/BAD940.c | 2 +- src/world/area_mim/mim_09/BB2E00.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_nok/nok_03/9EB7F0.c | 2 +- src/world/area_nok/nok_11/9F4A40.c | 2 +- src/world/area_nok/nok_12/9FAD60.c | 2 +- src/world/area_nok/nok_13/A00600.c | 2 +- src/world/area_nok/nok_14/A02A00.c | 2 +- src/world/area_nok/nok_15/A06F00.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_05/DB22C0.c | 2 +- src/world/area_omo/omo_07/DBD2B0.c | 3 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/area_tik/tik_07/87AC00.c | 2 +- src/world/area_trd/trd_02/9A10C0.c | 2 +- src/world/area_trd/trd_04/9A88A0.c | 3 +- src/world/area_trd/trd_07/9B6C90.c | 2 +- src/world/common/UnkNpcAIFunc1.inc.c | 12 ++++ tools/assist.py | 63 ++++++++++++++++--- tools/substitute.py | 12 +--- tools/substitute_asm.py | 41 ++++++++++++ 255 files changed, 302 insertions(+), 4041 deletions(-) delete mode 100644 asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240400_BE3BB0.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s delete mode 100644 asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241128_BEDF18.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240F20_C32400.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240400_C401B0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s delete mode 100644 asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s delete mode 100644 asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s delete mode 100644 asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s delete mode 100644 asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s delete mode 100644 asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s delete mode 100644 asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s delete mode 100644 asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s create mode 100644 src/world/common/UnkNpcAIFunc1.inc.c create mode 100755 tools/substitute_asm.py diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s deleted file mode 100644 index 3378a4edeb..0000000000 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80049B44 -/* 24F44 80049B44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 24F48 80049B48 AFB3001C */ sw $s3, 0x1c($sp) -/* 24F4C 80049B4C 0080982D */ daddu $s3, $a0, $zero -/* 24F50 80049B50 AFBF0020 */ sw $ra, 0x20($sp) -/* 24F54 80049B54 AFB20018 */ sw $s2, 0x18($sp) -/* 24F58 80049B58 AFB10014 */ sw $s1, 0x14($sp) -/* 24F5C 80049B5C AFB00010 */ sw $s0, 0x10($sp) -/* 24F60 80049B60 8E720148 */ lw $s2, 0x148($s3) -/* 24F64 80049B64 86440008 */ lh $a0, 8($s2) -/* 24F68 80049B68 0C00EABB */ jal get_npc_unsafe -/* 24F6C 80049B6C 00A0882D */ daddu $s1, $a1, $zero -/* 24F70 80049B70 8E240008 */ lw $a0, 8($s1) -/* 24F74 80049B74 0040802D */ daddu $s0, $v0, $zero -/* 24F78 80049B78 00041FC2 */ srl $v1, $a0, 0x1f -/* 24F7C 80049B7C 00832021 */ addu $a0, $a0, $v1 -/* 24F80 80049B80 00042043 */ sra $a0, $a0, 1 -/* 24F84 80049B84 0C00A67F */ jal rand_int -/* 24F88 80049B88 24840001 */ addiu $a0, $a0, 1 -/* 24F8C 80049B8C 8E230008 */ lw $v1, 8($s1) -/* 24F90 80049B90 240400B4 */ addiu $a0, $zero, 0xb4 -/* 24F94 80049B94 00032FC2 */ srl $a1, $v1, 0x1f -/* 24F98 80049B98 00651821 */ addu $v1, $v1, $a1 -/* 24F9C 80049B9C 00031843 */ sra $v1, $v1, 1 -/* 24FA0 80049BA0 00621821 */ addu $v1, $v1, $v0 -/* 24FA4 80049BA4 0C00A67F */ jal rand_int -/* 24FA8 80049BA8 A603008E */ sh $v1, 0x8e($s0) -/* 24FAC 80049BAC C60C000C */ lwc1 $f12, 0xc($s0) -/* 24FB0 80049BB0 44820000 */ mtc1 $v0, $f0 -/* 24FB4 80049BB4 00000000 */ nop -/* 24FB8 80049BB8 46800020 */ cvt.s.w $f0, $f0 -/* 24FBC 80049BBC 46006300 */ add.s $f12, $f12, $f0 -/* 24FC0 80049BC0 3C0142B4 */ lui $at, 0x42b4 -/* 24FC4 80049BC4 44810000 */ mtc1 $at, $f0 -/* 24FC8 80049BC8 0C00A6C9 */ jal clamp_angle -/* 24FCC 80049BCC 46006301 */ sub.s $f12, $f12, $f0 -/* 24FD0 80049BD0 E600000C */ swc1 $f0, 0xc($s0) -/* 24FD4 80049BD4 8E4200CC */ lw $v0, 0xcc($s2) -/* 24FD8 80049BD8 8C420000 */ lw $v0, ($v0) -/* 24FDC 80049BDC AE020028 */ sw $v0, 0x28($s0) -/* 24FE0 80049BE0 24020003 */ addiu $v0, $zero, 3 -/* 24FE4 80049BE4 AE620070 */ sw $v0, 0x70($s3) -/* 24FE8 80049BE8 8FBF0020 */ lw $ra, 0x20($sp) -/* 24FEC 80049BEC 8FB3001C */ lw $s3, 0x1c($sp) -/* 24FF0 80049BF0 8FB20018 */ lw $s2, 0x18($sp) -/* 24FF4 80049BF4 8FB10014 */ lw $s1, 0x14($sp) -/* 24FF8 80049BF8 8FB00010 */ lw $s0, 0x10($sp) -/* 24FFC 80049BFC 03E00008 */ jr $ra -/* 25000 80049C00 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s deleted file mode 100644 index 6f1e670abb..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240400_BDF190.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BDF190 -/* BDF190 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BDF194 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BDF198 80240408 0080982D */ daddu $s3, $a0, $zero -/* BDF19C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BDF1A0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BDF1A4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BDF1A8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BDF1AC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BDF1B0 80240420 86440008 */ lh $a0, 8($s2) -/* BDF1B4 80240424 0C00EABB */ jal get_npc_unsafe -/* BDF1B8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BDF1BC 8024042C 8E240008 */ lw $a0, 8($s1) -/* BDF1C0 80240430 0040802D */ daddu $s0, $v0, $zero -/* BDF1C4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BDF1C8 80240438 00832021 */ addu $a0, $a0, $v1 -/* BDF1CC 8024043C 00042043 */ sra $a0, $a0, 1 -/* BDF1D0 80240440 0C00A67F */ jal rand_int -/* BDF1D4 80240444 24840001 */ addiu $a0, $a0, 1 -/* BDF1D8 80240448 8E230008 */ lw $v1, 8($s1) -/* BDF1DC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BDF1E0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BDF1E4 80240454 00651821 */ addu $v1, $v1, $a1 -/* BDF1E8 80240458 00031843 */ sra $v1, $v1, 1 -/* BDF1EC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BDF1F0 80240460 0C00A67F */ jal rand_int -/* BDF1F4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BDF1F8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BDF1FC 8024046C 44820000 */ mtc1 $v0, $f0 -/* BDF200 80240470 00000000 */ nop -/* BDF204 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BDF208 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BDF20C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BDF210 80240480 44810000 */ mtc1 $at, $f0 -/* BDF214 80240484 0C00A6C9 */ jal clamp_angle -/* BDF218 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BDF21C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BDF220 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BDF224 80240494 8C420000 */ lw $v0, ($v0) -/* BDF228 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BDF22C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BDF230 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BDF234 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BDF238 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BDF23C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BDF240 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BDF244 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BDF248 802404B8 03E00008 */ jr $ra -/* BDF24C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 31689e2bda..3d1cec7372 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 func_80240400_BDF190 +/* BDFB38 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* BDFB3C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BDFB40 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero 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 8958916a22..6c0502cec8 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 func_80240400_BDF190 +/* BDFFDC 8024124C 0C090100 */ jal UnkNpcAIFunc1 /* 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_04/BE37B0/func_80240400_BE3BB0.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240400_BE3BB0.s deleted file mode 100644 index 868f370745..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240400_BE3BB0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BE3BB0 -/* BE3BB0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE3BB4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BE3BB8 80240408 0080982D */ daddu $s3, $a0, $zero -/* BE3BBC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BE3BC0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BE3BC4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BE3BC8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BE3BCC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BE3BD0 80240420 86440008 */ lh $a0, 8($s2) -/* BE3BD4 80240424 0C00EABB */ jal get_npc_unsafe -/* BE3BD8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BE3BDC 8024042C 8E240008 */ lw $a0, 8($s1) -/* BE3BE0 80240430 0040802D */ daddu $s0, $v0, $zero -/* BE3BE4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BE3BE8 80240438 00832021 */ addu $a0, $a0, $v1 -/* BE3BEC 8024043C 00042043 */ sra $a0, $a0, 1 -/* BE3BF0 80240440 0C00A67F */ jal rand_int -/* BE3BF4 80240444 24840001 */ addiu $a0, $a0, 1 -/* BE3BF8 80240448 8E230008 */ lw $v1, 8($s1) -/* BE3BFC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE3C00 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BE3C04 80240454 00651821 */ addu $v1, $v1, $a1 -/* BE3C08 80240458 00031843 */ sra $v1, $v1, 1 -/* BE3C0C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BE3C10 80240460 0C00A67F */ jal rand_int -/* BE3C14 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BE3C18 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE3C1C 8024046C 44820000 */ mtc1 $v0, $f0 -/* BE3C20 80240470 00000000 */ nop -/* BE3C24 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BE3C28 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BE3C2C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BE3C30 80240480 44810000 */ mtc1 $at, $f0 -/* BE3C34 80240484 0C00A6C9 */ jal clamp_angle -/* BE3C38 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BE3C3C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BE3C40 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BE3C44 80240494 8C420000 */ lw $v0, ($v0) -/* BE3C48 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BE3C4C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BE3C50 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BE3C54 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BE3C58 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BE3C5C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BE3C60 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BE3C64 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BE3C68 802404B8 03E00008 */ jr $ra -/* BE3C6C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 92ffdfeb18..1d43ab817f 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 func_80240400_BE3BB0 +/* BE4558 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* BE455C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE4560 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s deleted file mode 100644 index cf7795bcc7..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240400_BE7FE0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_BE7FE0 -/* BE7FE0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE7FE4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* BE7FE8 80240408 0080982D */ daddu $s3, $a0, $zero -/* BE7FEC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* BE7FF0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* BE7FF4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* BE7FF8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* BE7FFC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* BE8000 80240420 86440008 */ lh $a0, 8($s2) -/* BE8004 80240424 0C00EABB */ jal get_npc_unsafe -/* BE8008 80240428 00A0882D */ daddu $s1, $a1, $zero -/* BE800C 8024042C 8E240008 */ lw $a0, 8($s1) -/* BE8010 80240430 0040802D */ daddu $s0, $v0, $zero -/* BE8014 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* BE8018 80240438 00832021 */ addu $a0, $a0, $v1 -/* BE801C 8024043C 00042043 */ sra $a0, $a0, 1 -/* BE8020 80240440 0C00A67F */ jal rand_int -/* BE8024 80240444 24840001 */ addiu $a0, $a0, 1 -/* BE8028 80240448 8E230008 */ lw $v1, 8($s1) -/* BE802C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* BE8030 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* BE8034 80240454 00651821 */ addu $v1, $v1, $a1 -/* BE8038 80240458 00031843 */ sra $v1, $v1, 1 -/* BE803C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* BE8040 80240460 0C00A67F */ jal rand_int -/* BE8044 80240464 A603008E */ sh $v1, 0x8e($s0) -/* BE8048 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE804C 8024046C 44820000 */ mtc1 $v0, $f0 -/* BE8050 80240470 00000000 */ nop -/* BE8054 80240474 46800020 */ cvt.s.w $f0, $f0 -/* BE8058 80240478 46006300 */ add.s $f12, $f12, $f0 -/* BE805C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* BE8060 80240480 44810000 */ mtc1 $at, $f0 -/* BE8064 80240484 0C00A6C9 */ jal clamp_angle -/* BE8068 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* BE806C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* BE8070 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* BE8074 80240494 8C420000 */ lw $v0, ($v0) -/* BE8078 80240498 AE020028 */ sw $v0, 0x28($s0) -/* BE807C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* BE8080 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* BE8084 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* BE8088 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* BE808C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* BE8090 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* BE8094 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* BE8098 802404B8 03E00008 */ jr $ra -/* BE809C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 0848b56829..ba80ae5ba8 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 func_80240400_BE7FE0 +/* BE8988 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* BE898C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE8990 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero 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 3bea1ed3aa..bb5e24aa51 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 func_80240400_BE7FE0 +/* BE8E2C 8024124C 0C090100 */ jal UnkNpcAIFunc1 /* 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_80241128_BEDF18.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241128_BEDF18.s deleted file mode 100644 index 7c80cc7dd9..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241128_BEDF18.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241128_BEDF18 -/* BEDF18 80241128 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BEDF1C 8024112C AFB3001C */ sw $s3, 0x1c($sp) -/* BEDF20 80241130 0080982D */ daddu $s3, $a0, $zero -/* BEDF24 80241134 AFBF0020 */ sw $ra, 0x20($sp) -/* BEDF28 80241138 AFB20018 */ sw $s2, 0x18($sp) -/* BEDF2C 8024113C AFB10014 */ sw $s1, 0x14($sp) -/* BEDF30 80241140 AFB00010 */ sw $s0, 0x10($sp) -/* BEDF34 80241144 8E720148 */ lw $s2, 0x148($s3) -/* BEDF38 80241148 86440008 */ lh $a0, 8($s2) -/* BEDF3C 8024114C 0C00EABB */ jal get_npc_unsafe -/* BEDF40 80241150 00A0882D */ daddu $s1, $a1, $zero -/* BEDF44 80241154 8E240008 */ lw $a0, 8($s1) -/* BEDF48 80241158 0040802D */ daddu $s0, $v0, $zero -/* BEDF4C 8024115C 00041FC2 */ srl $v1, $a0, 0x1f -/* BEDF50 80241160 00832021 */ addu $a0, $a0, $v1 -/* BEDF54 80241164 00042043 */ sra $a0, $a0, 1 -/* BEDF58 80241168 0C00A67F */ jal rand_int -/* BEDF5C 8024116C 24840001 */ addiu $a0, $a0, 1 -/* BEDF60 80241170 8E230008 */ lw $v1, 8($s1) -/* BEDF64 80241174 240400B4 */ addiu $a0, $zero, 0xb4 -/* BEDF68 80241178 00032FC2 */ srl $a1, $v1, 0x1f -/* BEDF6C 8024117C 00651821 */ addu $v1, $v1, $a1 -/* BEDF70 80241180 00031843 */ sra $v1, $v1, 1 -/* BEDF74 80241184 00621821 */ addu $v1, $v1, $v0 -/* BEDF78 80241188 0C00A67F */ jal rand_int -/* BEDF7C 8024118C A603008E */ sh $v1, 0x8e($s0) -/* BEDF80 80241190 C60C000C */ lwc1 $f12, 0xc($s0) -/* BEDF84 80241194 44820000 */ mtc1 $v0, $f0 -/* BEDF88 80241198 00000000 */ nop -/* BEDF8C 8024119C 46800020 */ cvt.s.w $f0, $f0 -/* BEDF90 802411A0 46006300 */ add.s $f12, $f12, $f0 -/* BEDF94 802411A4 3C0142B4 */ lui $at, 0x42b4 -/* BEDF98 802411A8 44810000 */ mtc1 $at, $f0 -/* BEDF9C 802411AC 0C00A6C9 */ jal clamp_angle -/* BEDFA0 802411B0 46006301 */ sub.s $f12, $f12, $f0 -/* BEDFA4 802411B4 E600000C */ swc1 $f0, 0xc($s0) -/* BEDFA8 802411B8 8E4200CC */ lw $v0, 0xcc($s2) -/* BEDFAC 802411BC 8C420000 */ lw $v0, ($v0) -/* BEDFB0 802411C0 AE020028 */ sw $v0, 0x28($s0) -/* BEDFB4 802411C4 24020003 */ addiu $v0, $zero, 3 -/* BEDFB8 802411C8 AE620070 */ sw $v0, 0x70($s3) -/* BEDFBC 802411CC 8FBF0020 */ lw $ra, 0x20($sp) -/* BEDFC0 802411D0 8FB3001C */ lw $s3, 0x1c($sp) -/* BEDFC4 802411D4 8FB20018 */ lw $s2, 0x18($sp) -/* BEDFC8 802411D8 8FB10014 */ lw $s1, 0x14($sp) -/* BEDFCC 802411DC 8FB00010 */ lw $s0, 0x10($sp) -/* BEDFD0 802411E0 03E00008 */ jr $ra -/* BEDFD4 802411E4 27BD0028 */ addiu $sp, $sp, 0x28 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 18dfa59d3f..39f944220f 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 func_80241128_BEDF18 +/* BEEB88 80241D98 0C09044A */ jal UnkNpcAIFunc1 /* BEEB8C 80241D9C 0260302D */ daddu $a2, $s3, $zero /* BEEB90 80241DA0 0280202D */ daddu $a0, $s4, $zero /* BEEB94 80241DA4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s deleted file mode 100644 index f09da8f65c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802408F8_BFE178.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F8_BFE178 -/* BFE178 802408F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BFE17C 802408FC AFB3001C */ sw $s3, 0x1c($sp) -/* BFE180 80240900 0080982D */ daddu $s3, $a0, $zero -/* BFE184 80240904 AFBF0020 */ sw $ra, 0x20($sp) -/* BFE188 80240908 AFB20018 */ sw $s2, 0x18($sp) -/* BFE18C 8024090C AFB10014 */ sw $s1, 0x14($sp) -/* BFE190 80240910 AFB00010 */ sw $s0, 0x10($sp) -/* BFE194 80240914 8E720148 */ lw $s2, 0x148($s3) -/* BFE198 80240918 86440008 */ lh $a0, 8($s2) -/* BFE19C 8024091C 0C00EABB */ jal get_npc_unsafe -/* BFE1A0 80240920 00A0882D */ daddu $s1, $a1, $zero -/* BFE1A4 80240924 8E240008 */ lw $a0, 8($s1) -/* BFE1A8 80240928 0040802D */ daddu $s0, $v0, $zero -/* BFE1AC 8024092C 00041FC2 */ srl $v1, $a0, 0x1f -/* BFE1B0 80240930 00832021 */ addu $a0, $a0, $v1 -/* BFE1B4 80240934 00042043 */ sra $a0, $a0, 1 -/* BFE1B8 80240938 0C00A67F */ jal rand_int -/* BFE1BC 8024093C 24840001 */ addiu $a0, $a0, 1 -/* BFE1C0 80240940 8E230008 */ lw $v1, 8($s1) -/* BFE1C4 80240944 240400B4 */ addiu $a0, $zero, 0xb4 -/* BFE1C8 80240948 00032FC2 */ srl $a1, $v1, 0x1f -/* BFE1CC 8024094C 00651821 */ addu $v1, $v1, $a1 -/* BFE1D0 80240950 00031843 */ sra $v1, $v1, 1 -/* BFE1D4 80240954 00621821 */ addu $v1, $v1, $v0 -/* BFE1D8 80240958 0C00A67F */ jal rand_int -/* BFE1DC 8024095C A603008E */ sh $v1, 0x8e($s0) -/* BFE1E0 80240960 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFE1E4 80240964 44820000 */ mtc1 $v0, $f0 -/* BFE1E8 80240968 00000000 */ nop -/* BFE1EC 8024096C 46800020 */ cvt.s.w $f0, $f0 -/* BFE1F0 80240970 46006300 */ add.s $f12, $f12, $f0 -/* BFE1F4 80240974 3C0142B4 */ lui $at, 0x42b4 -/* BFE1F8 80240978 44810000 */ mtc1 $at, $f0 -/* BFE1FC 8024097C 0C00A6C9 */ jal clamp_angle -/* BFE200 80240980 46006301 */ sub.s $f12, $f12, $f0 -/* BFE204 80240984 E600000C */ swc1 $f0, 0xc($s0) -/* BFE208 80240988 8E4200CC */ lw $v0, 0xcc($s2) -/* BFE20C 8024098C 8C420000 */ lw $v0, ($v0) -/* BFE210 80240990 AE020028 */ sw $v0, 0x28($s0) -/* BFE214 80240994 24020003 */ addiu $v0, $zero, 3 -/* BFE218 80240998 AE620070 */ sw $v0, 0x70($s3) -/* BFE21C 8024099C 8FBF0020 */ lw $ra, 0x20($sp) -/* BFE220 802409A0 8FB3001C */ lw $s3, 0x1c($sp) -/* BFE224 802409A4 8FB20018 */ lw $s2, 0x18($sp) -/* BFE228 802409A8 8FB10014 */ lw $s1, 0x14($sp) -/* BFE22C 802409AC 8FB00010 */ lw $s0, 0x10($sp) -/* BFE230 802409B0 03E00008 */ jr $ra -/* BFE234 802409B4 27BD0028 */ addiu $sp, $sp, 0x28 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 e1acd9ab29..e99604a777 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 func_802408F8_BFE178 +/* BFEDE8 80241568 0C09023E */ jal UnkNpcAIFunc1 /* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero /* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero /* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $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 aaded4aeed..beaa9dfad7 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 func_802408F8_BFE178 +/* BFFC60 802423E0 0C09023E */ jal UnkNpcAIFunc1 /* 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_03/C31730/func_80240F20_C32400.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240F20_C32400.s deleted file mode 100644 index 5578a269b5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240F20_C32400.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20_C32400 -/* C32400 80240F20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C32404 80240F24 AFB3001C */ sw $s3, 0x1c($sp) -/* C32408 80240F28 0080982D */ daddu $s3, $a0, $zero -/* C3240C 80240F2C AFBF0020 */ sw $ra, 0x20($sp) -/* C32410 80240F30 AFB20018 */ sw $s2, 0x18($sp) -/* C32414 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* C32418 80240F38 AFB00010 */ sw $s0, 0x10($sp) -/* C3241C 80240F3C 8E720148 */ lw $s2, 0x148($s3) -/* C32420 80240F40 86440008 */ lh $a0, 8($s2) -/* C32424 80240F44 0C00EABB */ jal get_npc_unsafe -/* C32428 80240F48 00A0882D */ daddu $s1, $a1, $zero -/* C3242C 80240F4C 8E240008 */ lw $a0, 8($s1) -/* C32430 80240F50 0040802D */ daddu $s0, $v0, $zero -/* C32434 80240F54 00041FC2 */ srl $v1, $a0, 0x1f -/* C32438 80240F58 00832021 */ addu $a0, $a0, $v1 -/* C3243C 80240F5C 00042043 */ sra $a0, $a0, 1 -/* C32440 80240F60 0C00A67F */ jal rand_int -/* C32444 80240F64 24840001 */ addiu $a0, $a0, 1 -/* C32448 80240F68 8E230008 */ lw $v1, 8($s1) -/* C3244C 80240F6C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C32450 80240F70 00032FC2 */ srl $a1, $v1, 0x1f -/* C32454 80240F74 00651821 */ addu $v1, $v1, $a1 -/* C32458 80240F78 00031843 */ sra $v1, $v1, 1 -/* C3245C 80240F7C 00621821 */ addu $v1, $v1, $v0 -/* C32460 80240F80 0C00A67F */ jal rand_int -/* C32464 80240F84 A603008E */ sh $v1, 0x8e($s0) -/* C32468 80240F88 C60C000C */ lwc1 $f12, 0xc($s0) -/* C3246C 80240F8C 44820000 */ mtc1 $v0, $f0 -/* C32470 80240F90 00000000 */ nop -/* C32474 80240F94 46800020 */ cvt.s.w $f0, $f0 -/* C32478 80240F98 46006300 */ add.s $f12, $f12, $f0 -/* C3247C 80240F9C 3C0142B4 */ lui $at, 0x42b4 -/* C32480 80240FA0 44810000 */ mtc1 $at, $f0 -/* C32484 80240FA4 0C00A6C9 */ jal clamp_angle -/* C32488 80240FA8 46006301 */ sub.s $f12, $f12, $f0 -/* C3248C 80240FAC E600000C */ swc1 $f0, 0xc($s0) -/* C32490 80240FB0 8E4200CC */ lw $v0, 0xcc($s2) -/* C32494 80240FB4 8C420000 */ lw $v0, ($v0) -/* C32498 80240FB8 AE020028 */ sw $v0, 0x28($s0) -/* C3249C 80240FBC 24020003 */ addiu $v0, $zero, 3 -/* C324A0 80240FC0 AE620070 */ sw $v0, 0x70($s3) -/* C324A4 80240FC4 8FBF0020 */ lw $ra, 0x20($sp) -/* C324A8 80240FC8 8FB3001C */ lw $s3, 0x1c($sp) -/* C324AC 80240FCC 8FB20018 */ lw $s2, 0x18($sp) -/* C324B0 80240FD0 8FB10014 */ lw $s1, 0x14($sp) -/* C324B4 80240FD4 8FB00010 */ lw $s0, 0x10($sp) -/* C324B8 80240FD8 03E00008 */ jr $ra -/* C324BC 80240FDC 27BD0028 */ addiu $sp, $sp, 0x28 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 491b435c0c..c7d7f3a59a 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 @@ -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 func_80240F20_C32400 +/* C32DA8 802418C8 0C0903C8 */ jal UnkNpcAIFunc1 /* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero /* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero /* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero 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 25d19d8de1..4ff2f4253b 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 @@ -117,7 +117,7 @@ glabel func_802419B0_C32E90 /* C33038 80241B58 00000000 */ nop /* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero /* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero -/* C33044 80241B64 0C0903C8 */ jal func_80240F20_C32400 +/* C33044 80241B64 0C0903C8 */ jal UnkNpcAIFunc1 /* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero /* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero /* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s deleted file mode 100644 index 61886d78b9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802407D8_C36D08.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_C36D08 -/* C36D08 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C36D0C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* C36D10 802407E0 0080982D */ daddu $s3, $a0, $zero -/* C36D14 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* C36D18 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* C36D1C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* C36D20 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* C36D24 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* C36D28 802407F8 86440008 */ lh $a0, 8($s2) -/* C36D2C 802407FC 0C00EABB */ jal get_npc_unsafe -/* C36D30 80240800 00A0882D */ daddu $s1, $a1, $zero -/* C36D34 80240804 8E240008 */ lw $a0, 8($s1) -/* C36D38 80240808 0040802D */ daddu $s0, $v0, $zero -/* C36D3C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* C36D40 80240810 00832021 */ addu $a0, $a0, $v1 -/* C36D44 80240814 00042043 */ sra $a0, $a0, 1 -/* C36D48 80240818 0C00A67F */ jal rand_int -/* C36D4C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* C36D50 80240820 8E230008 */ lw $v1, 8($s1) -/* C36D54 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* C36D58 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* C36D5C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* C36D60 80240830 00031843 */ sra $v1, $v1, 1 -/* C36D64 80240834 00621821 */ addu $v1, $v1, $v0 -/* C36D68 80240838 0C00A67F */ jal rand_int -/* C36D6C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* C36D70 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* C36D74 80240844 44820000 */ mtc1 $v0, $f0 -/* C36D78 80240848 00000000 */ nop -/* C36D7C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* C36D80 80240850 46006300 */ add.s $f12, $f12, $f0 -/* C36D84 80240854 3C0142B4 */ lui $at, 0x42b4 -/* C36D88 80240858 44810000 */ mtc1 $at, $f0 -/* C36D8C 8024085C 0C00A6C9 */ jal clamp_angle -/* C36D90 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* C36D94 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* C36D98 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* C36D9C 8024086C 8C420000 */ lw $v0, ($v0) -/* C36DA0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* C36DA4 80240874 24020003 */ addiu $v0, $zero, 3 -/* C36DA8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* C36DAC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* C36DB0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* C36DB4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* C36DB8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* C36DBC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* C36DC0 80240890 03E00008 */ jr $ra -/* C36DC4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 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 99dc044e13..33afb564f2 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 func_802407D8_C36D08 +/* C37978 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero /* C37980 80241450 0280202D */ daddu $a0, $s4, $zero /* C37984 80241454 0200282D */ daddu $a1, $s0, $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 56f9bb2407..00c5eb4d1d 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 func_802407D8_C36D08 +/* C387B4 80242284 0C0901F6 */ jal UnkNpcAIFunc1 /* 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_08/C3FDB0/func_80240400_C401B0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240400_C401B0.s deleted file mode 100644 index 740c062e44..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240400_C401B0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_C401B0 -/* C401B0 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C401B4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* C401B8 80240408 0080982D */ daddu $s3, $a0, $zero -/* C401BC 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* C401C0 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* C401C4 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* C401C8 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C401CC 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* C401D0 80240420 86440008 */ lh $a0, 8($s2) -/* C401D4 80240424 0C00EABB */ jal get_npc_unsafe -/* C401D8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* C401DC 8024042C 8E240008 */ lw $a0, 8($s1) -/* C401E0 80240430 0040802D */ daddu $s0, $v0, $zero -/* C401E4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* C401E8 80240438 00832021 */ addu $a0, $a0, $v1 -/* C401EC 8024043C 00042043 */ sra $a0, $a0, 1 -/* C401F0 80240440 0C00A67F */ jal rand_int -/* C401F4 80240444 24840001 */ addiu $a0, $a0, 1 -/* C401F8 80240448 8E230008 */ lw $v1, 8($s1) -/* C401FC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C40200 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* C40204 80240454 00651821 */ addu $v1, $v1, $a1 -/* C40208 80240458 00031843 */ sra $v1, $v1, 1 -/* C4020C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* C40210 80240460 0C00A67F */ jal rand_int -/* C40214 80240464 A603008E */ sh $v1, 0x8e($s0) -/* C40218 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* C4021C 8024046C 44820000 */ mtc1 $v0, $f0 -/* C40220 80240470 00000000 */ nop -/* C40224 80240474 46800020 */ cvt.s.w $f0, $f0 -/* C40228 80240478 46006300 */ add.s $f12, $f12, $f0 -/* C4022C 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* C40230 80240480 44810000 */ mtc1 $at, $f0 -/* C40234 80240484 0C00A6C9 */ jal clamp_angle -/* C40238 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* C4023C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* C40240 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* C40244 80240494 8C420000 */ lw $v0, ($v0) -/* C40248 80240498 AE020028 */ sw $v0, 0x28($s0) -/* C4024C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* C40250 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* C40254 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C40258 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C4025C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C40260 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C40264 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C40268 802404B8 03E00008 */ jr $ra -/* C4026C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 be9b6b7099..6b48c223b1 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 func_80240400_C401B0 +/* C40B58 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s deleted file mode 100644 index 1bd30c1d62..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BFC_C487DC -/* C487DC 80241BFC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C487E0 80241C00 AFB3001C */ sw $s3, 0x1c($sp) -/* C487E4 80241C04 0080982D */ daddu $s3, $a0, $zero -/* C487E8 80241C08 AFBF0020 */ sw $ra, 0x20($sp) -/* C487EC 80241C0C AFB20018 */ sw $s2, 0x18($sp) -/* C487F0 80241C10 AFB10014 */ sw $s1, 0x14($sp) -/* C487F4 80241C14 AFB00010 */ sw $s0, 0x10($sp) -/* C487F8 80241C18 8E720148 */ lw $s2, 0x148($s3) -/* C487FC 80241C1C 86440008 */ lh $a0, 8($s2) -/* C48800 80241C20 0C00EABB */ jal get_npc_unsafe -/* C48804 80241C24 00A0882D */ daddu $s1, $a1, $zero -/* C48808 80241C28 8E240008 */ lw $a0, 8($s1) -/* C4880C 80241C2C 0040802D */ daddu $s0, $v0, $zero -/* C48810 80241C30 00041FC2 */ srl $v1, $a0, 0x1f -/* C48814 80241C34 00832021 */ addu $a0, $a0, $v1 -/* C48818 80241C38 00042043 */ sra $a0, $a0, 1 -/* C4881C 80241C3C 0C00A67F */ jal rand_int -/* C48820 80241C40 24840001 */ addiu $a0, $a0, 1 -/* C48824 80241C44 8E230008 */ lw $v1, 8($s1) -/* C48828 80241C48 240400B4 */ addiu $a0, $zero, 0xb4 -/* C4882C 80241C4C 00032FC2 */ srl $a1, $v1, 0x1f -/* C48830 80241C50 00651821 */ addu $v1, $v1, $a1 -/* C48834 80241C54 00031843 */ sra $v1, $v1, 1 -/* C48838 80241C58 00621821 */ addu $v1, $v1, $v0 -/* C4883C 80241C5C 0C00A67F */ jal rand_int -/* C48840 80241C60 A603008E */ sh $v1, 0x8e($s0) -/* C48844 80241C64 C60C000C */ lwc1 $f12, 0xc($s0) -/* C48848 80241C68 44820000 */ mtc1 $v0, $f0 -/* C4884C 80241C6C 00000000 */ nop -/* C48850 80241C70 46800020 */ cvt.s.w $f0, $f0 -/* C48854 80241C74 46006300 */ add.s $f12, $f12, $f0 -/* C48858 80241C78 3C0142B4 */ lui $at, 0x42b4 -/* C4885C 80241C7C 44810000 */ mtc1 $at, $f0 -/* C48860 80241C80 0C00A6C9 */ jal clamp_angle -/* C48864 80241C84 46006301 */ sub.s $f12, $f12, $f0 -/* C48868 80241C88 E600000C */ swc1 $f0, 0xc($s0) -/* C4886C 80241C8C 8E4200CC */ lw $v0, 0xcc($s2) -/* C48870 80241C90 8C420000 */ lw $v0, ($v0) -/* C48874 80241C94 AE020028 */ sw $v0, 0x28($s0) -/* C48878 80241C98 24020003 */ addiu $v0, $zero, 3 -/* C4887C 80241C9C AE620070 */ sw $v0, 0x70($s3) -/* C48880 80241CA0 8FBF0020 */ lw $ra, 0x20($sp) -/* C48884 80241CA4 8FB3001C */ lw $s3, 0x1c($sp) -/* C48888 80241CA8 8FB20018 */ lw $s2, 0x18($sp) -/* C4888C 80241CAC 8FB10014 */ lw $s1, 0x14($sp) -/* C48890 80241CB0 8FB00010 */ lw $s0, 0x10($sp) -/* C48894 80241CB4 03E00008 */ jr $ra -/* C48898 80241CB8 27BD0028 */ addiu $sp, $sp, 0x28 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 e2f554ea49..3fcca2692b 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 func_80241BFC_C487DC +/* C4944C 8024286C 0C0906FF */ jal UnkNpcAIFunc1 /* C49450 80242870 0260302D */ daddu $a2, $s3, $zero /* C49454 80242874 0280202D */ daddu $a0, $s4, $zero /* C49458 80242878 0200282D */ daddu $a1, $s0, $zero 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 ac44871b1e..92a943956a 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 func_80241BFC_C487DC +/* C4A288 802436A8 0C0906FF */ jal UnkNpcAIFunc1 /* 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_15/C4F510/func_80240CD0_C501E0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s deleted file mode 100644 index b7bdeae605..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD0_C501E0 -/* C501E0 80240CD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C501E4 80240CD4 AFB3001C */ sw $s3, 0x1c($sp) -/* C501E8 80240CD8 0080982D */ daddu $s3, $a0, $zero -/* C501EC 80240CDC AFBF0020 */ sw $ra, 0x20($sp) -/* C501F0 80240CE0 AFB20018 */ sw $s2, 0x18($sp) -/* C501F4 80240CE4 AFB10014 */ sw $s1, 0x14($sp) -/* C501F8 80240CE8 AFB00010 */ sw $s0, 0x10($sp) -/* C501FC 80240CEC 8E720148 */ lw $s2, 0x148($s3) -/* C50200 80240CF0 86440008 */ lh $a0, 8($s2) -/* C50204 80240CF4 0C00EABB */ jal get_npc_unsafe -/* C50208 80240CF8 00A0882D */ daddu $s1, $a1, $zero -/* C5020C 80240CFC 8E240008 */ lw $a0, 8($s1) -/* C50210 80240D00 0040802D */ daddu $s0, $v0, $zero -/* C50214 80240D04 00041FC2 */ srl $v1, $a0, 0x1f -/* C50218 80240D08 00832021 */ addu $a0, $a0, $v1 -/* C5021C 80240D0C 00042043 */ sra $a0, $a0, 1 -/* C50220 80240D10 0C00A67F */ jal rand_int -/* C50224 80240D14 24840001 */ addiu $a0, $a0, 1 -/* C50228 80240D18 8E230008 */ lw $v1, 8($s1) -/* C5022C 80240D1C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C50230 80240D20 00032FC2 */ srl $a1, $v1, 0x1f -/* C50234 80240D24 00651821 */ addu $v1, $v1, $a1 -/* C50238 80240D28 00031843 */ sra $v1, $v1, 1 -/* C5023C 80240D2C 00621821 */ addu $v1, $v1, $v0 -/* C50240 80240D30 0C00A67F */ jal rand_int -/* C50244 80240D34 A603008E */ sh $v1, 0x8e($s0) -/* C50248 80240D38 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5024C 80240D3C 44820000 */ mtc1 $v0, $f0 -/* C50250 80240D40 00000000 */ nop -/* C50254 80240D44 46800020 */ cvt.s.w $f0, $f0 -/* C50258 80240D48 46006300 */ add.s $f12, $f12, $f0 -/* C5025C 80240D4C 3C0142B4 */ lui $at, 0x42b4 -/* C50260 80240D50 44810000 */ mtc1 $at, $f0 -/* C50264 80240D54 0C00A6C9 */ jal clamp_angle -/* C50268 80240D58 46006301 */ sub.s $f12, $f12, $f0 -/* C5026C 80240D5C E600000C */ swc1 $f0, 0xc($s0) -/* C50270 80240D60 8E4200CC */ lw $v0, 0xcc($s2) -/* C50274 80240D64 8C420000 */ lw $v0, ($v0) -/* C50278 80240D68 AE020028 */ sw $v0, 0x28($s0) -/* C5027C 80240D6C 24020003 */ addiu $v0, $zero, 3 -/* C50280 80240D70 AE620070 */ sw $v0, 0x70($s3) -/* C50284 80240D74 8FBF0020 */ lw $ra, 0x20($sp) -/* C50288 80240D78 8FB3001C */ lw $s3, 0x1c($sp) -/* C5028C 80240D7C 8FB20018 */ lw $s2, 0x18($sp) -/* C50290 80240D80 8FB10014 */ lw $s1, 0x14($sp) -/* C50294 80240D84 8FB00010 */ lw $s0, 0x10($sp) -/* C50298 80240D88 03E00008 */ jr $ra -/* C5029C 80240D8C 27BD0028 */ addiu $sp, $sp, 0x28 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 c7b6f690be..eef2309a87 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 func_80240CD0_C501E0 +/* C50B88 80241678 0C090334 */ jal UnkNpcAIFunc1 /* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero /* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero /* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s deleted file mode 100644 index f9a06a63b5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240400_C56340.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_C56340 -/* C56340 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C56344 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* C56348 80240408 0080982D */ daddu $s3, $a0, $zero -/* C5634C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* C56350 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* C56354 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* C56358 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* C5635C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* C56360 80240420 86440008 */ lh $a0, 8($s2) -/* C56364 80240424 0C00EABB */ jal get_npc_unsafe -/* C56368 80240428 00A0882D */ daddu $s1, $a1, $zero -/* C5636C 8024042C 8E240008 */ lw $a0, 8($s1) -/* C56370 80240430 0040802D */ daddu $s0, $v0, $zero -/* C56374 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* C56378 80240438 00832021 */ addu $a0, $a0, $v1 -/* C5637C 8024043C 00042043 */ sra $a0, $a0, 1 -/* C56380 80240440 0C00A67F */ jal rand_int -/* C56384 80240444 24840001 */ addiu $a0, $a0, 1 -/* C56388 80240448 8E230008 */ lw $v1, 8($s1) -/* C5638C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C56390 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* C56394 80240454 00651821 */ addu $v1, $v1, $a1 -/* C56398 80240458 00031843 */ sra $v1, $v1, 1 -/* C5639C 8024045C 00621821 */ addu $v1, $v1, $v0 -/* C563A0 80240460 0C00A67F */ jal rand_int -/* C563A4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* C563A8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* C563AC 8024046C 44820000 */ mtc1 $v0, $f0 -/* C563B0 80240470 00000000 */ nop -/* C563B4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* C563B8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* C563BC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* C563C0 80240480 44810000 */ mtc1 $at, $f0 -/* C563C4 80240484 0C00A6C9 */ jal clamp_angle -/* C563C8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* C563CC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* C563D0 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* C563D4 80240494 8C420000 */ lw $v0, ($v0) -/* C563D8 80240498 AE020028 */ sw $v0, 0x28($s0) -/* C563DC 8024049C 24020003 */ addiu $v0, $zero, 3 -/* C563E0 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* C563E4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C563E8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C563EC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C563F0 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C563F4 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C563F8 802404B8 03E00008 */ jr $ra -/* C563FC 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 87234dd084..a6292543e4 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 @@ -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 func_80240400_C56340 +/* C56CE8 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s deleted file mode 100644 index af4c82231f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802409E0_95BBE0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E0_95BBE0 -/* 95BBE0 802409E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95BBE4 802409E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 95BBE8 802409E8 0080982D */ daddu $s3, $a0, $zero -/* 95BBEC 802409EC AFBF0020 */ sw $ra, 0x20($sp) -/* 95BBF0 802409F0 AFB20018 */ sw $s2, 0x18($sp) -/* 95BBF4 802409F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95BBF8 802409F8 AFB00010 */ sw $s0, 0x10($sp) -/* 95BBFC 802409FC 8E720148 */ lw $s2, 0x148($s3) -/* 95BC00 80240A00 86440008 */ lh $a0, 8($s2) -/* 95BC04 80240A04 0C00EABB */ jal get_npc_unsafe -/* 95BC08 80240A08 00A0882D */ daddu $s1, $a1, $zero -/* 95BC0C 80240A0C 8E240008 */ lw $a0, 8($s1) -/* 95BC10 80240A10 0040802D */ daddu $s0, $v0, $zero -/* 95BC14 80240A14 00041FC2 */ srl $v1, $a0, 0x1f -/* 95BC18 80240A18 00832021 */ addu $a0, $a0, $v1 -/* 95BC1C 80240A1C 00042043 */ sra $a0, $a0, 1 -/* 95BC20 80240A20 0C00A67F */ jal rand_int -/* 95BC24 80240A24 24840001 */ addiu $a0, $a0, 1 -/* 95BC28 80240A28 8E230008 */ lw $v1, 8($s1) -/* 95BC2C 80240A2C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 95BC30 80240A30 00032FC2 */ srl $a1, $v1, 0x1f -/* 95BC34 80240A34 00651821 */ addu $v1, $v1, $a1 -/* 95BC38 80240A38 00031843 */ sra $v1, $v1, 1 -/* 95BC3C 80240A3C 00621821 */ addu $v1, $v1, $v0 -/* 95BC40 80240A40 0C00A67F */ jal rand_int -/* 95BC44 80240A44 A603008E */ sh $v1, 0x8e($s0) -/* 95BC48 80240A48 C60C000C */ lwc1 $f12, 0xc($s0) -/* 95BC4C 80240A4C 44820000 */ mtc1 $v0, $f0 -/* 95BC50 80240A50 00000000 */ nop -/* 95BC54 80240A54 46800020 */ cvt.s.w $f0, $f0 -/* 95BC58 80240A58 46006300 */ add.s $f12, $f12, $f0 -/* 95BC5C 80240A5C 3C0142B4 */ lui $at, 0x42b4 -/* 95BC60 80240A60 44810000 */ mtc1 $at, $f0 -/* 95BC64 80240A64 0C00A6C9 */ jal clamp_angle -/* 95BC68 80240A68 46006301 */ sub.s $f12, $f12, $f0 -/* 95BC6C 80240A6C E600000C */ swc1 $f0, 0xc($s0) -/* 95BC70 80240A70 8E4200CC */ lw $v0, 0xcc($s2) -/* 95BC74 80240A74 8C420000 */ lw $v0, ($v0) -/* 95BC78 80240A78 AE020028 */ sw $v0, 0x28($s0) -/* 95BC7C 80240A7C 24020003 */ addiu $v0, $zero, 3 -/* 95BC80 80240A80 AE620070 */ sw $v0, 0x70($s3) -/* 95BC84 80240A84 8FBF0020 */ lw $ra, 0x20($sp) -/* 95BC88 80240A88 8FB3001C */ lw $s3, 0x1c($sp) -/* 95BC8C 80240A8C 8FB20018 */ lw $s2, 0x18($sp) -/* 95BC90 80240A90 8FB10014 */ lw $s1, 0x14($sp) -/* 95BC94 80240A94 8FB00010 */ lw $s0, 0x10($sp) -/* 95BC98 80240A98 03E00008 */ jr $ra -/* 95BC9C 80240A9C 27BD0028 */ addiu $sp, $sp, 0x28 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 9d0e0cccec..cc838a9ea9 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 func_802409E0_95BBE0 +/* 95C588 80241388 0C090278 */ jal UnkNpcAIFunc1 /* 95C58C 8024138C 02A0302D */ daddu $a2, $s5, $zero /* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s deleted file mode 100644 index f6cb56f8ac..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240440_C9E360.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240440_C9E360 -/* C9E360 80240440 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C9E364 80240444 AFB3001C */ sw $s3, 0x1c($sp) -/* C9E368 80240448 0080982D */ daddu $s3, $a0, $zero -/* C9E36C 8024044C AFBF0020 */ sw $ra, 0x20($sp) -/* C9E370 80240450 AFB20018 */ sw $s2, 0x18($sp) -/* C9E374 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* C9E378 80240458 AFB00010 */ sw $s0, 0x10($sp) -/* C9E37C 8024045C 8E720148 */ lw $s2, 0x148($s3) -/* C9E380 80240460 86440008 */ lh $a0, 8($s2) -/* C9E384 80240464 0C00EABB */ jal get_npc_unsafe -/* C9E388 80240468 00A0882D */ daddu $s1, $a1, $zero -/* C9E38C 8024046C 8E240008 */ lw $a0, 8($s1) -/* C9E390 80240470 0040802D */ daddu $s0, $v0, $zero -/* C9E394 80240474 00041FC2 */ srl $v1, $a0, 0x1f -/* C9E398 80240478 00832021 */ addu $a0, $a0, $v1 -/* C9E39C 8024047C 00042043 */ sra $a0, $a0, 1 -/* C9E3A0 80240480 0C00A67F */ jal rand_int -/* C9E3A4 80240484 24840001 */ addiu $a0, $a0, 1 -/* C9E3A8 80240488 8E230008 */ lw $v1, 8($s1) -/* C9E3AC 8024048C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C9E3B0 80240490 00032FC2 */ srl $a1, $v1, 0x1f -/* C9E3B4 80240494 00651821 */ addu $v1, $v1, $a1 -/* C9E3B8 80240498 00031843 */ sra $v1, $v1, 1 -/* C9E3BC 8024049C 00621821 */ addu $v1, $v1, $v0 -/* C9E3C0 802404A0 0C00A67F */ jal rand_int -/* C9E3C4 802404A4 A603008E */ sh $v1, 0x8e($s0) -/* C9E3C8 802404A8 C60C000C */ lwc1 $f12, 0xc($s0) -/* C9E3CC 802404AC 44820000 */ mtc1 $v0, $f0 -/* C9E3D0 802404B0 00000000 */ nop -/* C9E3D4 802404B4 46800020 */ cvt.s.w $f0, $f0 -/* C9E3D8 802404B8 46006300 */ add.s $f12, $f12, $f0 -/* C9E3DC 802404BC 3C0142B4 */ lui $at, 0x42b4 -/* C9E3E0 802404C0 44810000 */ mtc1 $at, $f0 -/* C9E3E4 802404C4 0C00A6C9 */ jal clamp_angle -/* C9E3E8 802404C8 46006301 */ sub.s $f12, $f12, $f0 -/* C9E3EC 802404CC E600000C */ swc1 $f0, 0xc($s0) -/* C9E3F0 802404D0 8E4200CC */ lw $v0, 0xcc($s2) -/* C9E3F4 802404D4 8C420000 */ lw $v0, ($v0) -/* C9E3F8 802404D8 AE020028 */ sw $v0, 0x28($s0) -/* C9E3FC 802404DC 24020003 */ addiu $v0, $zero, 3 -/* C9E400 802404E0 AE620070 */ sw $v0, 0x70($s3) -/* C9E404 802404E4 8FBF0020 */ lw $ra, 0x20($sp) -/* C9E408 802404E8 8FB3001C */ lw $s3, 0x1c($sp) -/* C9E40C 802404EC 8FB20018 */ lw $s2, 0x18($sp) -/* C9E410 802404F0 8FB10014 */ lw $s1, 0x14($sp) -/* C9E414 802404F4 8FB00010 */ lw $s0, 0x10($sp) -/* C9E418 802404F8 03E00008 */ jr $ra -/* C9E41C 802404FC 27BD0028 */ addiu $sp, $sp, 0x28 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 9faf6b0d2d..382df070a1 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 func_80240440_C9E360 +/* C9ED08 80240DE8 0C090110 */ jal UnkNpcAIFunc1 /* C9ED0C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s deleted file mode 100644 index 12fe1a077f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240AF8_CB5AF8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF8_CB5AF8 -/* CB5AF8 80240AF8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CB5AFC 80240AFC AFB3001C */ sw $s3, 0x1c($sp) -/* CB5B00 80240B00 0080982D */ daddu $s3, $a0, $zero -/* CB5B04 80240B04 AFBF0020 */ sw $ra, 0x20($sp) -/* CB5B08 80240B08 AFB20018 */ sw $s2, 0x18($sp) -/* CB5B0C 80240B0C AFB10014 */ sw $s1, 0x14($sp) -/* CB5B10 80240B10 AFB00010 */ sw $s0, 0x10($sp) -/* CB5B14 80240B14 8E720148 */ lw $s2, 0x148($s3) -/* CB5B18 80240B18 86440008 */ lh $a0, 8($s2) -/* CB5B1C 80240B1C 0C00EABB */ jal get_npc_unsafe -/* CB5B20 80240B20 00A0882D */ daddu $s1, $a1, $zero -/* CB5B24 80240B24 8E240008 */ lw $a0, 8($s1) -/* CB5B28 80240B28 0040802D */ daddu $s0, $v0, $zero -/* CB5B2C 80240B2C 00041FC2 */ srl $v1, $a0, 0x1f -/* CB5B30 80240B30 00832021 */ addu $a0, $a0, $v1 -/* CB5B34 80240B34 00042043 */ sra $a0, $a0, 1 -/* CB5B38 80240B38 0C00A67F */ jal rand_int -/* CB5B3C 80240B3C 24840001 */ addiu $a0, $a0, 1 -/* CB5B40 80240B40 8E230008 */ lw $v1, 8($s1) -/* CB5B44 80240B44 240400B4 */ addiu $a0, $zero, 0xb4 -/* CB5B48 80240B48 00032FC2 */ srl $a1, $v1, 0x1f -/* CB5B4C 80240B4C 00651821 */ addu $v1, $v1, $a1 -/* CB5B50 80240B50 00031843 */ sra $v1, $v1, 1 -/* CB5B54 80240B54 00621821 */ addu $v1, $v1, $v0 -/* CB5B58 80240B58 0C00A67F */ jal rand_int -/* CB5B5C 80240B5C A603008E */ sh $v1, 0x8e($s0) -/* CB5B60 80240B60 C60C000C */ lwc1 $f12, 0xc($s0) -/* CB5B64 80240B64 44820000 */ mtc1 $v0, $f0 -/* CB5B68 80240B68 00000000 */ nop -/* CB5B6C 80240B6C 46800020 */ cvt.s.w $f0, $f0 -/* CB5B70 80240B70 46006300 */ add.s $f12, $f12, $f0 -/* CB5B74 80240B74 3C0142B4 */ lui $at, 0x42b4 -/* CB5B78 80240B78 44810000 */ mtc1 $at, $f0 -/* CB5B7C 80240B7C 0C00A6C9 */ jal clamp_angle -/* CB5B80 80240B80 46006301 */ sub.s $f12, $f12, $f0 -/* CB5B84 80240B84 E600000C */ swc1 $f0, 0xc($s0) -/* CB5B88 80240B88 8E4200CC */ lw $v0, 0xcc($s2) -/* CB5B8C 80240B8C 8C420000 */ lw $v0, ($v0) -/* CB5B90 80240B90 AE020028 */ sw $v0, 0x28($s0) -/* CB5B94 80240B94 24020003 */ addiu $v0, $zero, 3 -/* CB5B98 80240B98 AE620070 */ sw $v0, 0x70($s3) -/* CB5B9C 80240B9C 8FBF0020 */ lw $ra, 0x20($sp) -/* CB5BA0 80240BA0 8FB3001C */ lw $s3, 0x1c($sp) -/* CB5BA4 80240BA4 8FB20018 */ lw $s2, 0x18($sp) -/* CB5BA8 80240BA8 8FB10014 */ lw $s1, 0x14($sp) -/* CB5BAC 80240BAC 8FB00010 */ lw $s0, 0x10($sp) -/* CB5BB0 80240BB0 03E00008 */ jr $ra -/* CB5BB4 80240BB4 27BD0028 */ addiu $sp, $sp, 0x28 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 4ca8eeb9e2..1cd6689ef8 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 func_80240AF8_CB5AF8 +/* CB6768 80241768 0C0902BE */ jal UnkNpcAIFunc1 /* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s deleted file mode 100644 index c47bfff171..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024099C_CC41AC -/* CC41AC 8024099C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC41B0 802409A0 AFB3001C */ sw $s3, 0x1c($sp) -/* CC41B4 802409A4 0080982D */ daddu $s3, $a0, $zero -/* CC41B8 802409A8 AFBF0020 */ sw $ra, 0x20($sp) -/* CC41BC 802409AC AFB20018 */ sw $s2, 0x18($sp) -/* CC41C0 802409B0 AFB10014 */ sw $s1, 0x14($sp) -/* CC41C4 802409B4 AFB00010 */ sw $s0, 0x10($sp) -/* CC41C8 802409B8 8E720148 */ lw $s2, 0x148($s3) -/* CC41CC 802409BC 86440008 */ lh $a0, 8($s2) -/* CC41D0 802409C0 0C00EABB */ jal get_npc_unsafe -/* CC41D4 802409C4 00A0882D */ daddu $s1, $a1, $zero -/* CC41D8 802409C8 8E240008 */ lw $a0, 8($s1) -/* CC41DC 802409CC 0040802D */ daddu $s0, $v0, $zero -/* CC41E0 802409D0 00041FC2 */ srl $v1, $a0, 0x1f -/* CC41E4 802409D4 00832021 */ addu $a0, $a0, $v1 -/* CC41E8 802409D8 00042043 */ sra $a0, $a0, 1 -/* CC41EC 802409DC 0C00A67F */ jal rand_int -/* CC41F0 802409E0 24840001 */ addiu $a0, $a0, 1 -/* CC41F4 802409E4 8E230008 */ lw $v1, 8($s1) -/* CC41F8 802409E8 240400B4 */ addiu $a0, $zero, 0xb4 -/* CC41FC 802409EC 00032FC2 */ srl $a1, $v1, 0x1f -/* CC4200 802409F0 00651821 */ addu $v1, $v1, $a1 -/* CC4204 802409F4 00031843 */ sra $v1, $v1, 1 -/* CC4208 802409F8 00621821 */ addu $v1, $v1, $v0 -/* CC420C 802409FC 0C00A67F */ jal rand_int -/* CC4210 80240A00 A603008E */ sh $v1, 0x8e($s0) -/* CC4214 80240A04 C60C000C */ lwc1 $f12, 0xc($s0) -/* CC4218 80240A08 44820000 */ mtc1 $v0, $f0 -/* CC421C 80240A0C 00000000 */ nop -/* CC4220 80240A10 46800020 */ cvt.s.w $f0, $f0 -/* CC4224 80240A14 46006300 */ add.s $f12, $f12, $f0 -/* CC4228 80240A18 3C0142B4 */ lui $at, 0x42b4 -/* CC422C 80240A1C 44810000 */ mtc1 $at, $f0 -/* CC4230 80240A20 0C00A6C9 */ jal clamp_angle -/* CC4234 80240A24 46006301 */ sub.s $f12, $f12, $f0 -/* CC4238 80240A28 E600000C */ swc1 $f0, 0xc($s0) -/* CC423C 80240A2C 8E4200CC */ lw $v0, 0xcc($s2) -/* CC4240 80240A30 8C420000 */ lw $v0, ($v0) -/* CC4244 80240A34 AE020028 */ sw $v0, 0x28($s0) -/* CC4248 80240A38 24020003 */ addiu $v0, $zero, 3 -/* CC424C 80240A3C AE620070 */ sw $v0, 0x70($s3) -/* CC4250 80240A40 8FBF0020 */ lw $ra, 0x20($sp) -/* CC4254 80240A44 8FB3001C */ lw $s3, 0x1c($sp) -/* CC4258 80240A48 8FB20018 */ lw $s2, 0x18($sp) -/* CC425C 80240A4C 8FB10014 */ lw $s1, 0x14($sp) -/* CC4260 80240A50 8FB00010 */ lw $s0, 0x10($sp) -/* CC4264 80240A54 03E00008 */ jr $ra -/* CC4268 80240A58 27BD0028 */ addiu $sp, $sp, 0x28 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 943bf90760..0279dfb3dd 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 func_8024099C_CC41AC +/* CC4E1C 8024160C 0C090267 */ jal UnkNpcAIFunc1 /* CC4E20 80241610 0260302D */ daddu $a2, $s3, $zero /* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero /* CC4E28 80241618 0200282D */ daddu $a1, $s0, $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 5f9d6b7b3b..6640612636 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 func_8024099C_CC41AC +/* CC572C 80241F1C 0C090267 */ jal UnkNpcAIFunc1 /* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero /* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero .L80241F28: diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s deleted file mode 100644 index 68df1f2950..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802412E8_CCC5F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E8_CCC5F8 -/* CCC5F8 802412E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CCC5FC 802412EC AFB3001C */ sw $s3, 0x1c($sp) -/* CCC600 802412F0 0080982D */ daddu $s3, $a0, $zero -/* CCC604 802412F4 AFBF0020 */ sw $ra, 0x20($sp) -/* CCC608 802412F8 AFB20018 */ sw $s2, 0x18($sp) -/* CCC60C 802412FC AFB10014 */ sw $s1, 0x14($sp) -/* CCC610 80241300 AFB00010 */ sw $s0, 0x10($sp) -/* CCC614 80241304 8E720148 */ lw $s2, 0x148($s3) -/* CCC618 80241308 86440008 */ lh $a0, 8($s2) -/* CCC61C 8024130C 0C00EABB */ jal get_npc_unsafe -/* CCC620 80241310 00A0882D */ daddu $s1, $a1, $zero -/* CCC624 80241314 8E240008 */ lw $a0, 8($s1) -/* CCC628 80241318 0040802D */ daddu $s0, $v0, $zero -/* CCC62C 8024131C 00041FC2 */ srl $v1, $a0, 0x1f -/* CCC630 80241320 00832021 */ addu $a0, $a0, $v1 -/* CCC634 80241324 00042043 */ sra $a0, $a0, 1 -/* CCC638 80241328 0C00A67F */ jal rand_int -/* CCC63C 8024132C 24840001 */ addiu $a0, $a0, 1 -/* CCC640 80241330 8E230008 */ lw $v1, 8($s1) -/* CCC644 80241334 240400B4 */ addiu $a0, $zero, 0xb4 -/* CCC648 80241338 00032FC2 */ srl $a1, $v1, 0x1f -/* CCC64C 8024133C 00651821 */ addu $v1, $v1, $a1 -/* CCC650 80241340 00031843 */ sra $v1, $v1, 1 -/* CCC654 80241344 00621821 */ addu $v1, $v1, $v0 -/* CCC658 80241348 0C00A67F */ jal rand_int -/* CCC65C 8024134C A603008E */ sh $v1, 0x8e($s0) -/* CCC660 80241350 C60C000C */ lwc1 $f12, 0xc($s0) -/* CCC664 80241354 44820000 */ mtc1 $v0, $f0 -/* CCC668 80241358 00000000 */ nop -/* CCC66C 8024135C 46800020 */ cvt.s.w $f0, $f0 -/* CCC670 80241360 46006300 */ add.s $f12, $f12, $f0 -/* CCC674 80241364 3C0142B4 */ lui $at, 0x42b4 -/* CCC678 80241368 44810000 */ mtc1 $at, $f0 -/* CCC67C 8024136C 0C00A6C9 */ jal clamp_angle -/* CCC680 80241370 46006301 */ sub.s $f12, $f12, $f0 -/* CCC684 80241374 E600000C */ swc1 $f0, 0xc($s0) -/* CCC688 80241378 8E4200CC */ lw $v0, 0xcc($s2) -/* CCC68C 8024137C 8C420000 */ lw $v0, ($v0) -/* CCC690 80241380 AE020028 */ sw $v0, 0x28($s0) -/* CCC694 80241384 24020003 */ addiu $v0, $zero, 3 -/* CCC698 80241388 AE620070 */ sw $v0, 0x70($s3) -/* CCC69C 8024138C 8FBF0020 */ lw $ra, 0x20($sp) -/* CCC6A0 80241390 8FB3001C */ lw $s3, 0x1c($sp) -/* CCC6A4 80241394 8FB20018 */ lw $s2, 0x18($sp) -/* CCC6A8 80241398 8FB10014 */ lw $s1, 0x14($sp) -/* CCC6AC 8024139C 8FB00010 */ lw $s0, 0x10($sp) -/* CCC6B0 802413A0 03E00008 */ jr $ra -/* CCC6B4 802413A4 27BD0028 */ addiu $sp, $sp, 0x28 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 1148e46641..98cba12bb3 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 func_802412E8_CCC5F8 +/* CCD268 80241F58 0C0904BA */ jal UnkNpcAIFunc1 /* CCD26C 80241F5C 0260302D */ daddu $a2, $s3, $zero /* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero /* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s deleted file mode 100644 index 1c832134a3..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80241628_CD3458.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241628_CD3458 -/* CD3458 80241628 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD345C 8024162C AFB3001C */ sw $s3, 0x1c($sp) -/* CD3460 80241630 0080982D */ daddu $s3, $a0, $zero -/* CD3464 80241634 AFBF0020 */ sw $ra, 0x20($sp) -/* CD3468 80241638 AFB20018 */ sw $s2, 0x18($sp) -/* CD346C 8024163C AFB10014 */ sw $s1, 0x14($sp) -/* CD3470 80241640 AFB00010 */ sw $s0, 0x10($sp) -/* CD3474 80241644 8E720148 */ lw $s2, 0x148($s3) -/* CD3478 80241648 86440008 */ lh $a0, 8($s2) -/* CD347C 8024164C 0C00EABB */ jal get_npc_unsafe -/* CD3480 80241650 00A0882D */ daddu $s1, $a1, $zero -/* CD3484 80241654 8E240008 */ lw $a0, 8($s1) -/* CD3488 80241658 0040802D */ daddu $s0, $v0, $zero -/* CD348C 8024165C 00041FC2 */ srl $v1, $a0, 0x1f -/* CD3490 80241660 00832021 */ addu $a0, $a0, $v1 -/* CD3494 80241664 00042043 */ sra $a0, $a0, 1 -/* CD3498 80241668 0C00A67F */ jal rand_int -/* CD349C 8024166C 24840001 */ addiu $a0, $a0, 1 -/* CD34A0 80241670 8E230008 */ lw $v1, 8($s1) -/* CD34A4 80241674 240400B4 */ addiu $a0, $zero, 0xb4 -/* CD34A8 80241678 00032FC2 */ srl $a1, $v1, 0x1f -/* CD34AC 8024167C 00651821 */ addu $v1, $v1, $a1 -/* CD34B0 80241680 00031843 */ sra $v1, $v1, 1 -/* CD34B4 80241684 00621821 */ addu $v1, $v1, $v0 -/* CD34B8 80241688 0C00A67F */ jal rand_int -/* CD34BC 8024168C A603008E */ sh $v1, 0x8e($s0) -/* CD34C0 80241690 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD34C4 80241694 44820000 */ mtc1 $v0, $f0 -/* CD34C8 80241698 00000000 */ nop -/* CD34CC 8024169C 46800020 */ cvt.s.w $f0, $f0 -/* CD34D0 802416A0 46006300 */ add.s $f12, $f12, $f0 -/* CD34D4 802416A4 3C0142B4 */ lui $at, 0x42b4 -/* CD34D8 802416A8 44810000 */ mtc1 $at, $f0 -/* CD34DC 802416AC 0C00A6C9 */ jal clamp_angle -/* CD34E0 802416B0 46006301 */ sub.s $f12, $f12, $f0 -/* CD34E4 802416B4 E600000C */ swc1 $f0, 0xc($s0) -/* CD34E8 802416B8 8E4200CC */ lw $v0, 0xcc($s2) -/* CD34EC 802416BC 8C420000 */ lw $v0, ($v0) -/* CD34F0 802416C0 AE020028 */ sw $v0, 0x28($s0) -/* CD34F4 802416C4 24020003 */ addiu $v0, $zero, 3 -/* CD34F8 802416C8 AE620070 */ sw $v0, 0x70($s3) -/* CD34FC 802416CC 8FBF0020 */ lw $ra, 0x20($sp) -/* CD3500 802416D0 8FB3001C */ lw $s3, 0x1c($sp) -/* CD3504 802416D4 8FB20018 */ lw $s2, 0x18($sp) -/* CD3508 802416D8 8FB10014 */ lw $s1, 0x14($sp) -/* CD350C 802416DC 8FB00010 */ lw $s0, 0x10($sp) -/* CD3510 802416E0 03E00008 */ jr $ra -/* CD3514 802416E4 27BD0028 */ addiu $sp, $sp, 0x28 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 806cbe4ae6..0270f003b5 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 func_80241628_CD3458 +/* CD40C8 80242298 0C09058A */ jal UnkNpcAIFunc1 /* CD40CC 8024229C 0260302D */ daddu $a2, $s3, $zero /* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero /* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $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 7fe1bf8ffe..ecd9ac5a82 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 func_80241628_CD3458 +/* CD46C4 80242894 0C09058A */ jal UnkNpcAIFunc1 /* CD46C8 80242898 0260302D */ daddu $a2, $s3, $zero /* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero /* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s deleted file mode 100644 index 383052f0ee..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240848_CD7B28 -/* CD7B28 80240848 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD7B2C 8024084C AFB3001C */ sw $s3, 0x1c($sp) -/* CD7B30 80240850 0080982D */ daddu $s3, $a0, $zero -/* CD7B34 80240854 AFBF0020 */ sw $ra, 0x20($sp) -/* CD7B38 80240858 AFB20018 */ sw $s2, 0x18($sp) -/* CD7B3C 8024085C AFB10014 */ sw $s1, 0x14($sp) -/* CD7B40 80240860 AFB00010 */ sw $s0, 0x10($sp) -/* CD7B44 80240864 8E720148 */ lw $s2, 0x148($s3) -/* CD7B48 80240868 86440008 */ lh $a0, 8($s2) -/* CD7B4C 8024086C 0C00EABB */ jal get_npc_unsafe -/* CD7B50 80240870 00A0882D */ daddu $s1, $a1, $zero -/* CD7B54 80240874 8E240008 */ lw $a0, 8($s1) -/* CD7B58 80240878 0040802D */ daddu $s0, $v0, $zero -/* CD7B5C 8024087C 00041FC2 */ srl $v1, $a0, 0x1f -/* CD7B60 80240880 00832021 */ addu $a0, $a0, $v1 -/* CD7B64 80240884 00042043 */ sra $a0, $a0, 1 -/* CD7B68 80240888 0C00A67F */ jal rand_int -/* CD7B6C 8024088C 24840001 */ addiu $a0, $a0, 1 -/* CD7B70 80240890 8E230008 */ lw $v1, 8($s1) -/* CD7B74 80240894 240400B4 */ addiu $a0, $zero, 0xb4 -/* CD7B78 80240898 00032FC2 */ srl $a1, $v1, 0x1f -/* CD7B7C 8024089C 00651821 */ addu $v1, $v1, $a1 -/* CD7B80 802408A0 00031843 */ sra $v1, $v1, 1 -/* CD7B84 802408A4 00621821 */ addu $v1, $v1, $v0 -/* CD7B88 802408A8 0C00A67F */ jal rand_int -/* CD7B8C 802408AC A603008E */ sh $v1, 0x8e($s0) -/* CD7B90 802408B0 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD7B94 802408B4 44820000 */ mtc1 $v0, $f0 -/* CD7B98 802408B8 00000000 */ nop -/* CD7B9C 802408BC 46800020 */ cvt.s.w $f0, $f0 -/* CD7BA0 802408C0 46006300 */ add.s $f12, $f12, $f0 -/* CD7BA4 802408C4 3C0142B4 */ lui $at, 0x42b4 -/* CD7BA8 802408C8 44810000 */ mtc1 $at, $f0 -/* CD7BAC 802408CC 0C00A6C9 */ jal clamp_angle -/* CD7BB0 802408D0 46006301 */ sub.s $f12, $f12, $f0 -/* CD7BB4 802408D4 E600000C */ swc1 $f0, 0xc($s0) -/* CD7BB8 802408D8 8E4200CC */ lw $v0, 0xcc($s2) -/* CD7BBC 802408DC 8C420000 */ lw $v0, ($v0) -/* CD7BC0 802408E0 AE020028 */ sw $v0, 0x28($s0) -/* CD7BC4 802408E4 24020003 */ addiu $v0, $zero, 3 -/* CD7BC8 802408E8 AE620070 */ sw $v0, 0x70($s3) -/* CD7BCC 802408EC 8FBF0020 */ lw $ra, 0x20($sp) -/* CD7BD0 802408F0 8FB3001C */ lw $s3, 0x1c($sp) -/* CD7BD4 802408F4 8FB20018 */ lw $s2, 0x18($sp) -/* CD7BD8 802408F8 8FB10014 */ lw $s1, 0x14($sp) -/* CD7BDC 802408FC 8FB00010 */ lw $s0, 0x10($sp) -/* CD7BE0 80240900 03E00008 */ jr $ra -/* CD7BE4 80240904 27BD0028 */ addiu $sp, $sp, 0x28 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 7fb6c9cc63..e959138681 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 func_80240848_CD7B28 +/* CD8798 802414B8 0C090212 */ jal UnkNpcAIFunc1 /* CD879C 802414BC 0260302D */ daddu $a2, $s3, $zero /* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero /* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $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 4c2e22ec04..a136362ea6 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 func_80240848_CD7B28 +/* CD90A8 80241DC8 0C090212 */ jal UnkNpcAIFunc1 /* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero /* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero .L80241DD4: diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s deleted file mode 100644 index 9453cb25bb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240818_CF33E8 -/* CF33E8 80240818 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF33EC 8024081C AFB3001C */ sw $s3, 0x1c($sp) -/* CF33F0 80240820 0080982D */ daddu $s3, $a0, $zero -/* CF33F4 80240824 AFBF0020 */ sw $ra, 0x20($sp) -/* CF33F8 80240828 AFB20018 */ sw $s2, 0x18($sp) -/* CF33FC 8024082C AFB10014 */ sw $s1, 0x14($sp) -/* CF3400 80240830 AFB00010 */ sw $s0, 0x10($sp) -/* CF3404 80240834 8E720148 */ lw $s2, 0x148($s3) -/* CF3408 80240838 86440008 */ lh $a0, 8($s2) -/* CF340C 8024083C 0C00EABB */ jal get_npc_unsafe -/* CF3410 80240840 00A0882D */ daddu $s1, $a1, $zero -/* CF3414 80240844 8E240008 */ lw $a0, 8($s1) -/* CF3418 80240848 0040802D */ daddu $s0, $v0, $zero -/* CF341C 8024084C 00041FC2 */ srl $v1, $a0, 0x1f -/* CF3420 80240850 00832021 */ addu $a0, $a0, $v1 -/* CF3424 80240854 00042043 */ sra $a0, $a0, 1 -/* CF3428 80240858 0C00A67F */ jal rand_int -/* CF342C 8024085C 24840001 */ addiu $a0, $a0, 1 -/* CF3430 80240860 8E230008 */ lw $v1, 8($s1) -/* CF3434 80240864 240400B4 */ addiu $a0, $zero, 0xb4 -/* CF3438 80240868 00032FC2 */ srl $a1, $v1, 0x1f -/* CF343C 8024086C 00651821 */ addu $v1, $v1, $a1 -/* CF3440 80240870 00031843 */ sra $v1, $v1, 1 -/* CF3444 80240874 00621821 */ addu $v1, $v1, $v0 -/* CF3448 80240878 0C00A67F */ jal rand_int -/* CF344C 8024087C A603008E */ sh $v1, 0x8e($s0) -/* CF3450 80240880 C60C000C */ lwc1 $f12, 0xc($s0) -/* CF3454 80240884 44820000 */ mtc1 $v0, $f0 -/* CF3458 80240888 00000000 */ nop -/* CF345C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* CF3460 80240890 46006300 */ add.s $f12, $f12, $f0 -/* CF3464 80240894 3C0142B4 */ lui $at, 0x42b4 -/* CF3468 80240898 44810000 */ mtc1 $at, $f0 -/* CF346C 8024089C 0C00A6C9 */ jal clamp_angle -/* CF3470 802408A0 46006301 */ sub.s $f12, $f12, $f0 -/* CF3474 802408A4 E600000C */ swc1 $f0, 0xc($s0) -/* CF3478 802408A8 8E4200CC */ lw $v0, 0xcc($s2) -/* CF347C 802408AC 8C420000 */ lw $v0, ($v0) -/* CF3480 802408B0 AE020028 */ sw $v0, 0x28($s0) -/* CF3484 802408B4 24020003 */ addiu $v0, $zero, 3 -/* CF3488 802408B8 AE620070 */ sw $v0, 0x70($s3) -/* CF348C 802408BC 8FBF0020 */ lw $ra, 0x20($sp) -/* CF3490 802408C0 8FB3001C */ lw $s3, 0x1c($sp) -/* CF3494 802408C4 8FB20018 */ lw $s2, 0x18($sp) -/* CF3498 802408C8 8FB10014 */ lw $s1, 0x14($sp) -/* CF349C 802408CC 8FB00010 */ lw $s0, 0x10($sp) -/* CF34A0 802408D0 03E00008 */ jr $ra -/* CF34A4 802408D4 27BD0028 */ addiu $sp, $sp, 0x28 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 6085462406..d2189b66b3 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 @@ -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 func_80240818_CF33E8 +/* CF4058 80241488 0C090206 */ jal UnkNpcAIFunc1 /* CF405C 8024148C 0260302D */ daddu $a2, $s3, $zero /* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero /* CF4064 80241494 0200282D */ daddu $a1, $s0, $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 ee924bfe2a..1d8f02e269 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 func_80240818_CF33E8 +/* CF4654 80241A84 0C090206 */ jal UnkNpcAIFunc1 /* CF4658 80241A88 0260302D */ daddu $a2, $s3, $zero /* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s deleted file mode 100644 index f50c6be9a7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C8_A179E8 -/* A179E8 802417C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A179EC 802417CC AFB3001C */ sw $s3, 0x1c($sp) -/* A179F0 802417D0 0080982D */ daddu $s3, $a0, $zero -/* A179F4 802417D4 AFBF0020 */ sw $ra, 0x20($sp) -/* A179F8 802417D8 AFB20018 */ sw $s2, 0x18($sp) -/* A179FC 802417DC AFB10014 */ sw $s1, 0x14($sp) -/* A17A00 802417E0 AFB00010 */ sw $s0, 0x10($sp) -/* A17A04 802417E4 8E720148 */ lw $s2, 0x148($s3) -/* A17A08 802417E8 86440008 */ lh $a0, 8($s2) -/* A17A0C 802417EC 0C00EABB */ jal get_npc_unsafe -/* A17A10 802417F0 00A0882D */ daddu $s1, $a1, $zero -/* A17A14 802417F4 8E240008 */ lw $a0, 8($s1) -/* A17A18 802417F8 0040802D */ daddu $s0, $v0, $zero -/* A17A1C 802417FC 00041FC2 */ srl $v1, $a0, 0x1f -/* A17A20 80241800 00832021 */ addu $a0, $a0, $v1 -/* A17A24 80241804 00042043 */ sra $a0, $a0, 1 -/* A17A28 80241808 0C00A67F */ jal rand_int -/* A17A2C 8024180C 24840001 */ addiu $a0, $a0, 1 -/* A17A30 80241810 8E230008 */ lw $v1, 8($s1) -/* A17A34 80241814 240400B4 */ addiu $a0, $zero, 0xb4 -/* A17A38 80241818 00032FC2 */ srl $a1, $v1, 0x1f -/* A17A3C 8024181C 00651821 */ addu $v1, $v1, $a1 -/* A17A40 80241820 00031843 */ sra $v1, $v1, 1 -/* A17A44 80241824 00621821 */ addu $v1, $v1, $v0 -/* A17A48 80241828 0C00A67F */ jal rand_int -/* A17A4C 8024182C A603008E */ sh $v1, 0x8e($s0) -/* A17A50 80241830 C60C000C */ lwc1 $f12, 0xc($s0) -/* A17A54 80241834 44820000 */ mtc1 $v0, $f0 -/* A17A58 80241838 00000000 */ nop -/* A17A5C 8024183C 46800020 */ cvt.s.w $f0, $f0 -/* A17A60 80241840 46006300 */ add.s $f12, $f12, $f0 -/* A17A64 80241844 3C0142B4 */ lui $at, 0x42b4 -/* A17A68 80241848 44810000 */ mtc1 $at, $f0 -/* A17A6C 8024184C 0C00A6C9 */ jal clamp_angle -/* A17A70 80241850 46006301 */ sub.s $f12, $f12, $f0 -/* A17A74 80241854 E600000C */ swc1 $f0, 0xc($s0) -/* A17A78 80241858 8E4200CC */ lw $v0, 0xcc($s2) -/* A17A7C 8024185C 8C420000 */ lw $v0, ($v0) -/* A17A80 80241860 AE020028 */ sw $v0, 0x28($s0) -/* A17A84 80241864 24020003 */ addiu $v0, $zero, 3 -/* A17A88 80241868 AE620070 */ sw $v0, 0x70($s3) -/* A17A8C 8024186C 8FBF0020 */ lw $ra, 0x20($sp) -/* A17A90 80241870 8FB3001C */ lw $s3, 0x1c($sp) -/* A17A94 80241874 8FB20018 */ lw $s2, 0x18($sp) -/* A17A98 80241878 8FB10014 */ lw $s1, 0x14($sp) -/* A17A9C 8024187C 8FB00010 */ lw $s0, 0x10($sp) -/* A17AA0 80241880 03E00008 */ jr $ra -/* A17AA4 80241884 27BD0028 */ addiu $sp, $sp, 0x28 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 0cdb1ef49b..cbae051cc5 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 @@ -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 func_802417C8_A179E8 +/* A18658 80242438 0C0905F2 */ jal UnkNpcAIFunc1 /* A1865C 8024243C 0260302D */ daddu $a2, $s3, $zero /* A18660 80242440 0280202D */ daddu $a0, $s4, $zero /* A18664 80242444 0200282D */ daddu $a1, $s0, $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 1b2999fc87..36f8571ae7 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 func_802417C8_A179E8 +/* A18C54 80242A34 0C0905F2 */ jal UnkNpcAIFunc1 /* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero /* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero /* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s deleted file mode 100644 index d5cc1f7a71..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241488_A1C588 -/* A1C588 80241488 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1C58C 8024148C AFB3001C */ sw $s3, 0x1c($sp) -/* A1C590 80241490 0080982D */ daddu $s3, $a0, $zero -/* A1C594 80241494 AFBF0020 */ sw $ra, 0x20($sp) -/* A1C598 80241498 AFB20018 */ sw $s2, 0x18($sp) -/* A1C59C 8024149C AFB10014 */ sw $s1, 0x14($sp) -/* A1C5A0 802414A0 AFB00010 */ sw $s0, 0x10($sp) -/* A1C5A4 802414A4 8E720148 */ lw $s2, 0x148($s3) -/* A1C5A8 802414A8 86440008 */ lh $a0, 8($s2) -/* A1C5AC 802414AC 0C00EABB */ jal get_npc_unsafe -/* A1C5B0 802414B0 00A0882D */ daddu $s1, $a1, $zero -/* A1C5B4 802414B4 8E240008 */ lw $a0, 8($s1) -/* A1C5B8 802414B8 0040802D */ daddu $s0, $v0, $zero -/* A1C5BC 802414BC 00041FC2 */ srl $v1, $a0, 0x1f -/* A1C5C0 802414C0 00832021 */ addu $a0, $a0, $v1 -/* A1C5C4 802414C4 00042043 */ sra $a0, $a0, 1 -/* A1C5C8 802414C8 0C00A67F */ jal rand_int -/* A1C5CC 802414CC 24840001 */ addiu $a0, $a0, 1 -/* A1C5D0 802414D0 8E230008 */ lw $v1, 8($s1) -/* A1C5D4 802414D4 240400B4 */ addiu $a0, $zero, 0xb4 -/* A1C5D8 802414D8 00032FC2 */ srl $a1, $v1, 0x1f -/* A1C5DC 802414DC 00651821 */ addu $v1, $v1, $a1 -/* A1C5E0 802414E0 00031843 */ sra $v1, $v1, 1 -/* A1C5E4 802414E4 00621821 */ addu $v1, $v1, $v0 -/* A1C5E8 802414E8 0C00A67F */ jal rand_int -/* A1C5EC 802414EC A603008E */ sh $v1, 0x8e($s0) -/* A1C5F0 802414F0 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1C5F4 802414F4 44820000 */ mtc1 $v0, $f0 -/* A1C5F8 802414F8 00000000 */ nop -/* A1C5FC 802414FC 46800020 */ cvt.s.w $f0, $f0 -/* A1C600 80241500 46006300 */ add.s $f12, $f12, $f0 -/* A1C604 80241504 3C0142B4 */ lui $at, 0x42b4 -/* A1C608 80241508 44810000 */ mtc1 $at, $f0 -/* A1C60C 8024150C 0C00A6C9 */ jal clamp_angle -/* A1C610 80241510 46006301 */ sub.s $f12, $f12, $f0 -/* A1C614 80241514 E600000C */ swc1 $f0, 0xc($s0) -/* A1C618 80241518 8E4200CC */ lw $v0, 0xcc($s2) -/* A1C61C 8024151C 8C420000 */ lw $v0, ($v0) -/* A1C620 80241520 AE020028 */ sw $v0, 0x28($s0) -/* A1C624 80241524 24020003 */ addiu $v0, $zero, 3 -/* A1C628 80241528 AE620070 */ sw $v0, 0x70($s3) -/* A1C62C 8024152C 8FBF0020 */ lw $ra, 0x20($sp) -/* A1C630 80241530 8FB3001C */ lw $s3, 0x1c($sp) -/* A1C634 80241534 8FB20018 */ lw $s2, 0x18($sp) -/* A1C638 80241538 8FB10014 */ lw $s1, 0x14($sp) -/* A1C63C 8024153C 8FB00010 */ lw $s0, 0x10($sp) -/* A1C640 80241540 03E00008 */ jr $ra -/* A1C644 80241544 27BD0028 */ addiu $sp, $sp, 0x28 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 31366f50df..26c553208f 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 func_80241488_A1C588 +/* A1D1F8 802420F8 0C090522 */ jal UnkNpcAIFunc1 /* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero /* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero /* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s deleted file mode 100644 index 8c75c05b17..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_97E038 -/* 97E038 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 97E03C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 97E040 80240570 0080982D */ daddu $s3, $a0, $zero -/* 97E044 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 97E048 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 97E04C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 97E050 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 97E054 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 97E058 80240588 86440008 */ lh $a0, 8($s2) -/* 97E05C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 97E060 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 97E064 80240594 8E240008 */ lw $a0, 8($s1) -/* 97E068 80240598 0040802D */ daddu $s0, $v0, $zero -/* 97E06C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 97E070 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 97E074 802405A4 00042043 */ sra $a0, $a0, 1 -/* 97E078 802405A8 0C00A67F */ jal rand_int -/* 97E07C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 97E080 802405B0 8E230008 */ lw $v1, 8($s1) -/* 97E084 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 97E088 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 97E08C 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 97E090 802405C0 00031843 */ sra $v1, $v1, 1 -/* 97E094 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 97E098 802405C8 0C00A67F */ jal rand_int -/* 97E09C 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 97E0A0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 97E0A4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 97E0A8 802405D8 00000000 */ nop -/* 97E0AC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 97E0B0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 97E0B4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 97E0B8 802405E8 44810000 */ mtc1 $at, $f0 -/* 97E0BC 802405EC 0C00A6C9 */ jal clamp_angle -/* 97E0C0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 97E0C4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 97E0C8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 97E0CC 802405FC 8C420000 */ lw $v0, ($v0) -/* 97E0D0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 97E0D4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 97E0D8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 97E0DC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 97E0E0 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 97E0E4 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 97E0E8 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 97E0EC 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 97E0F0 80240620 03E00008 */ jr $ra -/* 97E0F4 80240624 27BD0028 */ addiu $sp, $sp, 0x28 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 3de351f987..2b01610267 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 func_80240568_97E038 +/* 97E854 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 97E858 80240D88 0200302D */ daddu $a2, $s0, $zero /* 97E85C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 97E860 80240D90 24020003 */ addiu $v0, $zero, 3 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 98ed6be130..52deef631c 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 @@ -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 func_80240568_97E038 +/* 97EB58 80241088 0C09015A */ jal UnkNpcAIFunc1 /* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero /* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s deleted file mode 100644 index a38159cd92..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240568_98FD48.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_98FD48 -/* 98FD48 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 98FD4C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 98FD50 80240570 0080982D */ daddu $s3, $a0, $zero -/* 98FD54 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 98FD58 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 98FD5C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 98FD60 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 98FD64 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 98FD68 80240588 86440008 */ lh $a0, 8($s2) -/* 98FD6C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 98FD70 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 98FD74 80240594 8E240008 */ lw $a0, 8($s1) -/* 98FD78 80240598 0040802D */ daddu $s0, $v0, $zero -/* 98FD7C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 98FD80 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 98FD84 802405A4 00042043 */ sra $a0, $a0, 1 -/* 98FD88 802405A8 0C00A67F */ jal rand_int -/* 98FD8C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 98FD90 802405B0 8E230008 */ lw $v1, 8($s1) -/* 98FD94 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 98FD98 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 98FD9C 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 98FDA0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 98FDA4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 98FDA8 802405C8 0C00A67F */ jal rand_int -/* 98FDAC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 98FDB0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 98FDB4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 98FDB8 802405D8 00000000 */ nop -/* 98FDBC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 98FDC0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 98FDC4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 98FDC8 802405E8 44810000 */ mtc1 $at, $f0 -/* 98FDCC 802405EC 0C00A6C9 */ jal clamp_angle -/* 98FDD0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 98FDD4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 98FDD8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 98FDDC 802405FC 8C420000 */ lw $v0, ($v0) -/* 98FDE0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 98FDE4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 98FDE8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 98FDEC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 98FDF0 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 98FDF4 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 98FDF8 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 98FDFC 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 98FE00 80240620 03E00008 */ jr $ra -/* 98FE04 80240624 27BD0028 */ addiu $sp, $sp, 0x28 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 73c52ce572..2334ece135 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 func_80240568_98FD48 +/* 990564 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 990568 80240D88 0200302D */ daddu $a2, $s0, $zero /* 99056C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 990570 80240D90 24020003 */ addiu $v0, $zero, 3 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 87429e7be5..9455ee17b7 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 @@ -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 func_80240568_98FD48 +/* 990868 80241088 0C09015A */ jal UnkNpcAIFunc1 /* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 990870 80241090 0280202D */ daddu $a0, $s4, $zero /* 990874 80241094 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s deleted file mode 100644 index 1c6989bd2f..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240568_992C98.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_992C98 -/* 992C98 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 992C9C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 992CA0 80240570 0080982D */ daddu $s3, $a0, $zero -/* 992CA4 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 992CA8 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 992CAC 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 992CB0 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 992CB4 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 992CB8 80240588 86440008 */ lh $a0, 8($s2) -/* 992CBC 8024058C 0C00EABB */ jal get_npc_unsafe -/* 992CC0 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 992CC4 80240594 8E240008 */ lw $a0, 8($s1) -/* 992CC8 80240598 0040802D */ daddu $s0, $v0, $zero -/* 992CCC 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 992CD0 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 992CD4 802405A4 00042043 */ sra $a0, $a0, 1 -/* 992CD8 802405A8 0C00A67F */ jal rand_int -/* 992CDC 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 992CE0 802405B0 8E230008 */ lw $v1, 8($s1) -/* 992CE4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 992CE8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 992CEC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 992CF0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 992CF4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 992CF8 802405C8 0C00A67F */ jal rand_int -/* 992CFC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 992D00 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 992D04 802405D4 44820000 */ mtc1 $v0, $f0 -/* 992D08 802405D8 00000000 */ nop -/* 992D0C 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 992D10 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 992D14 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 992D18 802405E8 44810000 */ mtc1 $at, $f0 -/* 992D1C 802405EC 0C00A6C9 */ jal clamp_angle -/* 992D20 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 992D24 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 992D28 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 992D2C 802405FC 8C420000 */ lw $v0, ($v0) -/* 992D30 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 992D34 80240604 24020003 */ addiu $v0, $zero, 3 -/* 992D38 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 992D3C 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 992D40 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 992D44 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 992D48 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 992D4C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 992D50 80240620 03E00008 */ jr $ra -/* 992D54 80240624 27BD0028 */ addiu $sp, $sp, 0x28 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 fdb205c4ad..f82c71d64a 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 func_80240568_992C98 +/* 9934B4 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 9934B8 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9934BC 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9934C0 80240D90 24020003 */ addiu $v0, $zero, 3 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 15ad834cfe..d1ed197fe9 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 func_80240568_992C98 +/* 9937B8 80241088 0C09015A */ jal UnkNpcAIFunc1 /* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero /* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero /* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s deleted file mode 100644 index 1bd60ee474..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A8_B288D8 -/* B288D8 802408A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B288DC 802408AC AFB3001C */ sw $s3, 0x1c($sp) -/* B288E0 802408B0 0080982D */ daddu $s3, $a0, $zero -/* B288E4 802408B4 AFBF0020 */ sw $ra, 0x20($sp) -/* B288E8 802408B8 AFB20018 */ sw $s2, 0x18($sp) -/* B288EC 802408BC AFB10014 */ sw $s1, 0x14($sp) -/* B288F0 802408C0 AFB00010 */ sw $s0, 0x10($sp) -/* B288F4 802408C4 8E720148 */ lw $s2, 0x148($s3) -/* B288F8 802408C8 86440008 */ lh $a0, 8($s2) -/* B288FC 802408CC 0C00EABB */ jal get_npc_unsafe -/* B28900 802408D0 00A0882D */ daddu $s1, $a1, $zero -/* B28904 802408D4 8E240008 */ lw $a0, 8($s1) -/* B28908 802408D8 0040802D */ daddu $s0, $v0, $zero -/* B2890C 802408DC 00041FC2 */ srl $v1, $a0, 0x1f -/* B28910 802408E0 00832021 */ addu $a0, $a0, $v1 -/* B28914 802408E4 00042043 */ sra $a0, $a0, 1 -/* B28918 802408E8 0C00A67F */ jal rand_int -/* B2891C 802408EC 24840001 */ addiu $a0, $a0, 1 -/* B28920 802408F0 8E230008 */ lw $v1, 8($s1) -/* B28924 802408F4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B28928 802408F8 00032FC2 */ srl $a1, $v1, 0x1f -/* B2892C 802408FC 00651821 */ addu $v1, $v1, $a1 -/* B28930 80240900 00031843 */ sra $v1, $v1, 1 -/* B28934 80240904 00621821 */ addu $v1, $v1, $v0 -/* B28938 80240908 0C00A67F */ jal rand_int -/* B2893C 8024090C A603008E */ sh $v1, 0x8e($s0) -/* B28940 80240910 C60C000C */ lwc1 $f12, 0xc($s0) -/* B28944 80240914 44820000 */ mtc1 $v0, $f0 -/* B28948 80240918 00000000 */ nop -/* B2894C 8024091C 46800020 */ cvt.s.w $f0, $f0 -/* B28950 80240920 46006300 */ add.s $f12, $f12, $f0 -/* B28954 80240924 3C0142B4 */ lui $at, 0x42b4 -/* B28958 80240928 44810000 */ mtc1 $at, $f0 -/* B2895C 8024092C 0C00A6C9 */ jal clamp_angle -/* B28960 80240930 46006301 */ sub.s $f12, $f12, $f0 -/* B28964 80240934 E600000C */ swc1 $f0, 0xc($s0) -/* B28968 80240938 8E4200CC */ lw $v0, 0xcc($s2) -/* B2896C 8024093C 8C420000 */ lw $v0, ($v0) -/* B28970 80240940 AE020028 */ sw $v0, 0x28($s0) -/* B28974 80240944 24020003 */ addiu $v0, $zero, 3 -/* B28978 80240948 AE620070 */ sw $v0, 0x70($s3) -/* B2897C 8024094C 8FBF0020 */ lw $ra, 0x20($sp) -/* B28980 80240950 8FB3001C */ lw $s3, 0x1c($sp) -/* B28984 80240954 8FB20018 */ lw $s2, 0x18($sp) -/* B28988 80240958 8FB10014 */ lw $s1, 0x14($sp) -/* B2898C 8024095C 8FB00010 */ lw $s0, 0x10($sp) -/* B28990 80240960 03E00008 */ jr $ra -/* B28994 80240964 27BD0028 */ addiu $sp, $sp, 0x28 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 e0d78b39c2..e7c2a551c2 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 func_802408A8_B288D8 +/* B290F4 802410C4 0C09022A */ jal UnkNpcAIFunc1 /* B290F8 802410C8 0200302D */ daddu $a2, $s0, $zero /* B290FC 802410CC 8E630070 */ lw $v1, 0x70($s3) /* B29100 802410D0 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s deleted file mode 100644 index 140e1a0d97..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240830_B2CCA0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830_B2CCA0 -/* B2CCA0 80240830 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2CCA4 80240834 AFB3001C */ sw $s3, 0x1c($sp) -/* B2CCA8 80240838 0080982D */ daddu $s3, $a0, $zero -/* B2CCAC 8024083C AFBF0020 */ sw $ra, 0x20($sp) -/* B2CCB0 80240840 AFB20018 */ sw $s2, 0x18($sp) -/* B2CCB4 80240844 AFB10014 */ sw $s1, 0x14($sp) -/* B2CCB8 80240848 AFB00010 */ sw $s0, 0x10($sp) -/* B2CCBC 8024084C 8E720148 */ lw $s2, 0x148($s3) -/* B2CCC0 80240850 86440008 */ lh $a0, 8($s2) -/* B2CCC4 80240854 0C00EABB */ jal get_npc_unsafe -/* B2CCC8 80240858 00A0882D */ daddu $s1, $a1, $zero -/* B2CCCC 8024085C 8E240008 */ lw $a0, 8($s1) -/* B2CCD0 80240860 0040802D */ daddu $s0, $v0, $zero -/* B2CCD4 80240864 00041FC2 */ srl $v1, $a0, 0x1f -/* B2CCD8 80240868 00832021 */ addu $a0, $a0, $v1 -/* B2CCDC 8024086C 00042043 */ sra $a0, $a0, 1 -/* B2CCE0 80240870 0C00A67F */ jal rand_int -/* B2CCE4 80240874 24840001 */ addiu $a0, $a0, 1 -/* B2CCE8 80240878 8E230008 */ lw $v1, 8($s1) -/* B2CCEC 8024087C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B2CCF0 80240880 00032FC2 */ srl $a1, $v1, 0x1f -/* B2CCF4 80240884 00651821 */ addu $v1, $v1, $a1 -/* B2CCF8 80240888 00031843 */ sra $v1, $v1, 1 -/* B2CCFC 8024088C 00621821 */ addu $v1, $v1, $v0 -/* B2CD00 80240890 0C00A67F */ jal rand_int -/* B2CD04 80240894 A603008E */ sh $v1, 0x8e($s0) -/* B2CD08 80240898 C60C000C */ lwc1 $f12, 0xc($s0) -/* B2CD0C 8024089C 44820000 */ mtc1 $v0, $f0 -/* B2CD10 802408A0 00000000 */ nop -/* B2CD14 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* B2CD18 802408A8 46006300 */ add.s $f12, $f12, $f0 -/* B2CD1C 802408AC 3C0142B4 */ lui $at, 0x42b4 -/* B2CD20 802408B0 44810000 */ mtc1 $at, $f0 -/* B2CD24 802408B4 0C00A6C9 */ jal clamp_angle -/* B2CD28 802408B8 46006301 */ sub.s $f12, $f12, $f0 -/* B2CD2C 802408BC E600000C */ swc1 $f0, 0xc($s0) -/* B2CD30 802408C0 8E4200CC */ lw $v0, 0xcc($s2) -/* B2CD34 802408C4 8C420000 */ lw $v0, ($v0) -/* B2CD38 802408C8 AE020028 */ sw $v0, 0x28($s0) -/* B2CD3C 802408CC 24020003 */ addiu $v0, $zero, 3 -/* B2CD40 802408D0 AE620070 */ sw $v0, 0x70($s3) -/* B2CD44 802408D4 8FBF0020 */ lw $ra, 0x20($sp) -/* B2CD48 802408D8 8FB3001C */ lw $s3, 0x1c($sp) -/* B2CD4C 802408DC 8FB20018 */ lw $s2, 0x18($sp) -/* B2CD50 802408E0 8FB10014 */ lw $s1, 0x14($sp) -/* B2CD54 802408E4 8FB00010 */ lw $s0, 0x10($sp) -/* B2CD58 802408E8 03E00008 */ jr $ra -/* B2CD5C 802408EC 27BD0028 */ addiu $sp, $sp, 0x28 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 457f621e28..deeb08884f 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 func_80240830_B2CCA0 +/* B2D648 802411D8 0C09020C */ jal UnkNpcAIFunc1 /* B2D64C 802411DC 02A0302D */ daddu $a2, $s5, $zero /* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero /* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s deleted file mode 100644 index ab2ad791e0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A20_B355F0 -/* B355F0 80240A20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B355F4 80240A24 AFB3001C */ sw $s3, 0x1c($sp) -/* B355F8 80240A28 0080982D */ daddu $s3, $a0, $zero -/* B355FC 80240A2C AFBF0020 */ sw $ra, 0x20($sp) -/* B35600 80240A30 AFB20018 */ sw $s2, 0x18($sp) -/* B35604 80240A34 AFB10014 */ sw $s1, 0x14($sp) -/* B35608 80240A38 AFB00010 */ sw $s0, 0x10($sp) -/* B3560C 80240A3C 8E720148 */ lw $s2, 0x148($s3) -/* B35610 80240A40 86440008 */ lh $a0, 8($s2) -/* B35614 80240A44 0C00EABB */ jal get_npc_unsafe -/* B35618 80240A48 00A0882D */ daddu $s1, $a1, $zero -/* B3561C 80240A4C 8E240008 */ lw $a0, 8($s1) -/* B35620 80240A50 0040802D */ daddu $s0, $v0, $zero -/* B35624 80240A54 00041FC2 */ srl $v1, $a0, 0x1f -/* B35628 80240A58 00832021 */ addu $a0, $a0, $v1 -/* B3562C 80240A5C 00042043 */ sra $a0, $a0, 1 -/* B35630 80240A60 0C00A67F */ jal rand_int -/* B35634 80240A64 24840001 */ addiu $a0, $a0, 1 -/* B35638 80240A68 8E230008 */ lw $v1, 8($s1) -/* B3563C 80240A6C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B35640 80240A70 00032FC2 */ srl $a1, $v1, 0x1f -/* B35644 80240A74 00651821 */ addu $v1, $v1, $a1 -/* B35648 80240A78 00031843 */ sra $v1, $v1, 1 -/* B3564C 80240A7C 00621821 */ addu $v1, $v1, $v0 -/* B35650 80240A80 0C00A67F */ jal rand_int -/* B35654 80240A84 A603008E */ sh $v1, 0x8e($s0) -/* B35658 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) -/* B3565C 80240A8C 44820000 */ mtc1 $v0, $f0 -/* B35660 80240A90 00000000 */ nop -/* B35664 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* B35668 80240A98 46006300 */ add.s $f12, $f12, $f0 -/* B3566C 80240A9C 3C0142B4 */ lui $at, 0x42b4 -/* B35670 80240AA0 44810000 */ mtc1 $at, $f0 -/* B35674 80240AA4 0C00A6C9 */ jal clamp_angle -/* B35678 80240AA8 46006301 */ sub.s $f12, $f12, $f0 -/* B3567C 80240AAC E600000C */ swc1 $f0, 0xc($s0) -/* B35680 80240AB0 8E4200CC */ lw $v0, 0xcc($s2) -/* B35684 80240AB4 8C420000 */ lw $v0, ($v0) -/* B35688 80240AB8 AE020028 */ sw $v0, 0x28($s0) -/* B3568C 80240ABC 24020003 */ addiu $v0, $zero, 3 -/* B35690 80240AC0 AE620070 */ sw $v0, 0x70($s3) -/* B35694 80240AC4 8FBF0020 */ lw $ra, 0x20($sp) -/* B35698 80240AC8 8FB3001C */ lw $s3, 0x1c($sp) -/* B3569C 80240ACC 8FB20018 */ lw $s2, 0x18($sp) -/* B356A0 80240AD0 8FB10014 */ lw $s1, 0x14($sp) -/* B356A4 80240AD4 8FB00010 */ lw $s0, 0x10($sp) -/* B356A8 80240AD8 03E00008 */ jr $ra -/* B356AC 80240ADC 27BD0028 */ addiu $sp, $sp, 0x28 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 53561bc3a1..7d5eb2265e 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 func_80240A20_B355F0 +/* B35F98 802413C8 0C090288 */ jal UnkNpcAIFunc1 /* B35F9C 802413CC 02A0302D */ daddu $a2, $s5, $zero /* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s deleted file mode 100644 index c9e6a57acf..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E0C_B4B87C -/* B4B87C 80240E0C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B4B880 80240E10 AFB3001C */ sw $s3, 0x1c($sp) -/* B4B884 80240E14 0080982D */ daddu $s3, $a0, $zero -/* B4B888 80240E18 AFBF0020 */ sw $ra, 0x20($sp) -/* B4B88C 80240E1C AFB20018 */ sw $s2, 0x18($sp) -/* B4B890 80240E20 AFB10014 */ sw $s1, 0x14($sp) -/* B4B894 80240E24 AFB00010 */ sw $s0, 0x10($sp) -/* B4B898 80240E28 8E720148 */ lw $s2, 0x148($s3) -/* B4B89C 80240E2C 86440008 */ lh $a0, 8($s2) -/* B4B8A0 80240E30 0C00EABB */ jal get_npc_unsafe -/* B4B8A4 80240E34 00A0882D */ daddu $s1, $a1, $zero -/* B4B8A8 80240E38 8E240008 */ lw $a0, 8($s1) -/* B4B8AC 80240E3C 0040802D */ daddu $s0, $v0, $zero -/* B4B8B0 80240E40 00041FC2 */ srl $v1, $a0, 0x1f -/* B4B8B4 80240E44 00832021 */ addu $a0, $a0, $v1 -/* B4B8B8 80240E48 00042043 */ sra $a0, $a0, 1 -/* B4B8BC 80240E4C 0C00A67F */ jal rand_int -/* B4B8C0 80240E50 24840001 */ addiu $a0, $a0, 1 -/* B4B8C4 80240E54 8E230008 */ lw $v1, 8($s1) -/* B4B8C8 80240E58 240400B4 */ addiu $a0, $zero, 0xb4 -/* B4B8CC 80240E5C 00032FC2 */ srl $a1, $v1, 0x1f -/* B4B8D0 80240E60 00651821 */ addu $v1, $v1, $a1 -/* B4B8D4 80240E64 00031843 */ sra $v1, $v1, 1 -/* B4B8D8 80240E68 00621821 */ addu $v1, $v1, $v0 -/* B4B8DC 80240E6C 0C00A67F */ jal rand_int -/* B4B8E0 80240E70 A603008E */ sh $v1, 0x8e($s0) -/* B4B8E4 80240E74 C60C000C */ lwc1 $f12, 0xc($s0) -/* B4B8E8 80240E78 44820000 */ mtc1 $v0, $f0 -/* B4B8EC 80240E7C 00000000 */ nop -/* B4B8F0 80240E80 46800020 */ cvt.s.w $f0, $f0 -/* B4B8F4 80240E84 46006300 */ add.s $f12, $f12, $f0 -/* B4B8F8 80240E88 3C0142B4 */ lui $at, 0x42b4 -/* B4B8FC 80240E8C 44810000 */ mtc1 $at, $f0 -/* B4B900 80240E90 0C00A6C9 */ jal clamp_angle -/* B4B904 80240E94 46006301 */ sub.s $f12, $f12, $f0 -/* B4B908 80240E98 E600000C */ swc1 $f0, 0xc($s0) -/* B4B90C 80240E9C 8E4200CC */ lw $v0, 0xcc($s2) -/* B4B910 80240EA0 8C420000 */ lw $v0, ($v0) -/* B4B914 80240EA4 AE020028 */ sw $v0, 0x28($s0) -/* B4B918 80240EA8 24020003 */ addiu $v0, $zero, 3 -/* B4B91C 80240EAC AE620070 */ sw $v0, 0x70($s3) -/* B4B920 80240EB0 8FBF0020 */ lw $ra, 0x20($sp) -/* B4B924 80240EB4 8FB3001C */ lw $s3, 0x1c($sp) -/* B4B928 80240EB8 8FB20018 */ lw $s2, 0x18($sp) -/* B4B92C 80240EBC 8FB10014 */ lw $s1, 0x14($sp) -/* B4B930 80240EC0 8FB00010 */ lw $s0, 0x10($sp) -/* B4B934 80240EC4 03E00008 */ jr $ra -/* B4B938 80240EC8 27BD0028 */ addiu $sp, $sp, 0x28 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 a5fd4040e2..2cc29d90d8 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 func_80240E0C_B4B87C +/* B4C098 80241628 0C090383 */ jal UnkNpcAIFunc1 /* B4C09C 8024162C 0200302D */ daddu $a2, $s0, $zero /* B4C0A0 80241630 8E630070 */ lw $v1, 0x70($s3) /* B4C0A4 80241634 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s deleted file mode 100644 index 4403cad1cb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240CA8_B534D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA8_B534D8 -/* B534D8 80240CA8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B534DC 80240CAC AFB3001C */ sw $s3, 0x1c($sp) -/* B534E0 80240CB0 0080982D */ daddu $s3, $a0, $zero -/* B534E4 80240CB4 AFBF0020 */ sw $ra, 0x20($sp) -/* B534E8 80240CB8 AFB20018 */ sw $s2, 0x18($sp) -/* B534EC 80240CBC AFB10014 */ sw $s1, 0x14($sp) -/* B534F0 80240CC0 AFB00010 */ sw $s0, 0x10($sp) -/* B534F4 80240CC4 8E720148 */ lw $s2, 0x148($s3) -/* B534F8 80240CC8 86440008 */ lh $a0, 8($s2) -/* B534FC 80240CCC 0C00EABB */ jal get_npc_unsafe -/* B53500 80240CD0 00A0882D */ daddu $s1, $a1, $zero -/* B53504 80240CD4 8E240008 */ lw $a0, 8($s1) -/* B53508 80240CD8 0040802D */ daddu $s0, $v0, $zero -/* B5350C 80240CDC 00041FC2 */ srl $v1, $a0, 0x1f -/* B53510 80240CE0 00832021 */ addu $a0, $a0, $v1 -/* B53514 80240CE4 00042043 */ sra $a0, $a0, 1 -/* B53518 80240CE8 0C00A67F */ jal rand_int -/* B5351C 80240CEC 24840001 */ addiu $a0, $a0, 1 -/* B53520 80240CF0 8E230008 */ lw $v1, 8($s1) -/* B53524 80240CF4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B53528 80240CF8 00032FC2 */ srl $a1, $v1, 0x1f -/* B5352C 80240CFC 00651821 */ addu $v1, $v1, $a1 -/* B53530 80240D00 00031843 */ sra $v1, $v1, 1 -/* B53534 80240D04 00621821 */ addu $v1, $v1, $v0 -/* B53538 80240D08 0C00A67F */ jal rand_int -/* B5353C 80240D0C A603008E */ sh $v1, 0x8e($s0) -/* B53540 80240D10 C60C000C */ lwc1 $f12, 0xc($s0) -/* B53544 80240D14 44820000 */ mtc1 $v0, $f0 -/* B53548 80240D18 00000000 */ nop -/* B5354C 80240D1C 46800020 */ cvt.s.w $f0, $f0 -/* B53550 80240D20 46006300 */ add.s $f12, $f12, $f0 -/* B53554 80240D24 3C0142B4 */ lui $at, 0x42b4 -/* B53558 80240D28 44810000 */ mtc1 $at, $f0 -/* B5355C 80240D2C 0C00A6C9 */ jal clamp_angle -/* B53560 80240D30 46006301 */ sub.s $f12, $f12, $f0 -/* B53564 80240D34 E600000C */ swc1 $f0, 0xc($s0) -/* B53568 80240D38 8E4200CC */ lw $v0, 0xcc($s2) -/* B5356C 80240D3C 8C420000 */ lw $v0, ($v0) -/* B53570 80240D40 AE020028 */ sw $v0, 0x28($s0) -/* B53574 80240D44 24020003 */ addiu $v0, $zero, 3 -/* B53578 80240D48 AE620070 */ sw $v0, 0x70($s3) -/* B5357C 80240D4C 8FBF0020 */ lw $ra, 0x20($sp) -/* B53580 80240D50 8FB3001C */ lw $s3, 0x1c($sp) -/* B53584 80240D54 8FB20018 */ lw $s2, 0x18($sp) -/* B53588 80240D58 8FB10014 */ lw $s1, 0x14($sp) -/* B5358C 80240D5C 8FB00010 */ lw $s0, 0x10($sp) -/* B53590 80240D60 03E00008 */ jr $ra -/* B53594 80240D64 27BD0028 */ addiu $sp, $sp, 0x28 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 cdeeae10d7..cb7df1248a 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 func_80240CA8_B534D8 +/* B53CF4 802414C4 0C09032A */ jal UnkNpcAIFunc1 /* B53CF8 802414C8 0200302D */ daddu $a2, $s0, $zero /* B53CFC 802414CC 8E630070 */ lw $v1, 0x70($s3) /* B53D00 802414D0 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s deleted file mode 100644 index d5b113d141..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240878_B6CC08.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878_B6CC08 -/* B6CC08 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6CC0C 8024087C AFB3001C */ sw $s3, 0x1c($sp) -/* B6CC10 80240880 0080982D */ daddu $s3, $a0, $zero -/* B6CC14 80240884 AFBF0020 */ sw $ra, 0x20($sp) -/* B6CC18 80240888 AFB20018 */ sw $s2, 0x18($sp) -/* B6CC1C 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* B6CC20 80240890 AFB00010 */ sw $s0, 0x10($sp) -/* B6CC24 80240894 8E720148 */ lw $s2, 0x148($s3) -/* B6CC28 80240898 86440008 */ lh $a0, 8($s2) -/* B6CC2C 8024089C 0C00EABB */ jal get_npc_unsafe -/* B6CC30 802408A0 00A0882D */ daddu $s1, $a1, $zero -/* B6CC34 802408A4 8E240008 */ lw $a0, 8($s1) -/* B6CC38 802408A8 0040802D */ daddu $s0, $v0, $zero -/* B6CC3C 802408AC 00041FC2 */ srl $v1, $a0, 0x1f -/* B6CC40 802408B0 00832021 */ addu $a0, $a0, $v1 -/* B6CC44 802408B4 00042043 */ sra $a0, $a0, 1 -/* B6CC48 802408B8 0C00A67F */ jal rand_int -/* B6CC4C 802408BC 24840001 */ addiu $a0, $a0, 1 -/* B6CC50 802408C0 8E230008 */ lw $v1, 8($s1) -/* B6CC54 802408C4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B6CC58 802408C8 00032FC2 */ srl $a1, $v1, 0x1f -/* B6CC5C 802408CC 00651821 */ addu $v1, $v1, $a1 -/* B6CC60 802408D0 00031843 */ sra $v1, $v1, 1 -/* B6CC64 802408D4 00621821 */ addu $v1, $v1, $v0 -/* B6CC68 802408D8 0C00A67F */ jal rand_int -/* B6CC6C 802408DC A603008E */ sh $v1, 0x8e($s0) -/* B6CC70 802408E0 C60C000C */ lwc1 $f12, 0xc($s0) -/* B6CC74 802408E4 44820000 */ mtc1 $v0, $f0 -/* B6CC78 802408E8 00000000 */ nop -/* B6CC7C 802408EC 46800020 */ cvt.s.w $f0, $f0 -/* B6CC80 802408F0 46006300 */ add.s $f12, $f12, $f0 -/* B6CC84 802408F4 3C0142B4 */ lui $at, 0x42b4 -/* B6CC88 802408F8 44810000 */ mtc1 $at, $f0 -/* B6CC8C 802408FC 0C00A6C9 */ jal clamp_angle -/* B6CC90 80240900 46006301 */ sub.s $f12, $f12, $f0 -/* B6CC94 80240904 E600000C */ swc1 $f0, 0xc($s0) -/* B6CC98 80240908 8E4200CC */ lw $v0, 0xcc($s2) -/* B6CC9C 8024090C 8C420000 */ lw $v0, ($v0) -/* B6CCA0 80240910 AE020028 */ sw $v0, 0x28($s0) -/* B6CCA4 80240914 24020003 */ addiu $v0, $zero, 3 -/* B6CCA8 80240918 AE620070 */ sw $v0, 0x70($s3) -/* B6CCAC 8024091C 8FBF0020 */ lw $ra, 0x20($sp) -/* B6CCB0 80240920 8FB3001C */ lw $s3, 0x1c($sp) -/* B6CCB4 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* B6CCB8 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* B6CCBC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* B6CCC0 80240930 03E00008 */ jr $ra -/* B6CCC4 80240934 27BD0028 */ addiu $sp, $sp, 0x28 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 736160206b..d10352c659 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 func_80240878_B6CC08 +/* B6D424 80241094 0C09021E */ jal UnkNpcAIFunc1 /* B6D428 80241098 0200302D */ daddu $a2, $s0, $zero /* B6D42C 8024109C 8E630070 */ lw $v1, 0x70($s3) /* B6D430 802410A0 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s deleted file mode 100644 index b2f37f953e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240A28_B7AA78.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A28_B7AA78 -/* B7AA78 80240A28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B7AA7C 80240A2C AFB3001C */ sw $s3, 0x1c($sp) -/* B7AA80 80240A30 0080982D */ daddu $s3, $a0, $zero -/* B7AA84 80240A34 AFBF0020 */ sw $ra, 0x20($sp) -/* B7AA88 80240A38 AFB20018 */ sw $s2, 0x18($sp) -/* B7AA8C 80240A3C AFB10014 */ sw $s1, 0x14($sp) -/* B7AA90 80240A40 AFB00010 */ sw $s0, 0x10($sp) -/* B7AA94 80240A44 8E720148 */ lw $s2, 0x148($s3) -/* B7AA98 80240A48 86440008 */ lh $a0, 8($s2) -/* B7AA9C 80240A4C 0C00EABB */ jal get_npc_unsafe -/* B7AAA0 80240A50 00A0882D */ daddu $s1, $a1, $zero -/* B7AAA4 80240A54 8E240008 */ lw $a0, 8($s1) -/* B7AAA8 80240A58 0040802D */ daddu $s0, $v0, $zero -/* B7AAAC 80240A5C 00041FC2 */ srl $v1, $a0, 0x1f -/* B7AAB0 80240A60 00832021 */ addu $a0, $a0, $v1 -/* B7AAB4 80240A64 00042043 */ sra $a0, $a0, 1 -/* B7AAB8 80240A68 0C00A67F */ jal rand_int -/* B7AABC 80240A6C 24840001 */ addiu $a0, $a0, 1 -/* B7AAC0 80240A70 8E230008 */ lw $v1, 8($s1) -/* B7AAC4 80240A74 240400B4 */ addiu $a0, $zero, 0xb4 -/* B7AAC8 80240A78 00032FC2 */ srl $a1, $v1, 0x1f -/* B7AACC 80240A7C 00651821 */ addu $v1, $v1, $a1 -/* B7AAD0 80240A80 00031843 */ sra $v1, $v1, 1 -/* B7AAD4 80240A84 00621821 */ addu $v1, $v1, $v0 -/* B7AAD8 80240A88 0C00A67F */ jal rand_int -/* B7AADC 80240A8C A603008E */ sh $v1, 0x8e($s0) -/* B7AAE0 80240A90 C60C000C */ lwc1 $f12, 0xc($s0) -/* B7AAE4 80240A94 44820000 */ mtc1 $v0, $f0 -/* B7AAE8 80240A98 00000000 */ nop -/* B7AAEC 80240A9C 46800020 */ cvt.s.w $f0, $f0 -/* B7AAF0 80240AA0 46006300 */ add.s $f12, $f12, $f0 -/* B7AAF4 80240AA4 3C0142B4 */ lui $at, 0x42b4 -/* B7AAF8 80240AA8 44810000 */ mtc1 $at, $f0 -/* B7AAFC 80240AAC 0C00A6C9 */ jal clamp_angle -/* B7AB00 80240AB0 46006301 */ sub.s $f12, $f12, $f0 -/* B7AB04 80240AB4 E600000C */ swc1 $f0, 0xc($s0) -/* B7AB08 80240AB8 8E4200CC */ lw $v0, 0xcc($s2) -/* B7AB0C 80240ABC 8C420000 */ lw $v0, ($v0) -/* B7AB10 80240AC0 AE020028 */ sw $v0, 0x28($s0) -/* B7AB14 80240AC4 24020003 */ addiu $v0, $zero, 3 -/* B7AB18 80240AC8 AE620070 */ sw $v0, 0x70($s3) -/* B7AB1C 80240ACC 8FBF0020 */ lw $ra, 0x20($sp) -/* B7AB20 80240AD0 8FB3001C */ lw $s3, 0x1c($sp) -/* B7AB24 80240AD4 8FB20018 */ lw $s2, 0x18($sp) -/* B7AB28 80240AD8 8FB10014 */ lw $s1, 0x14($sp) -/* B7AB2C 80240ADC 8FB00010 */ lw $s0, 0x10($sp) -/* B7AB30 80240AE0 03E00008 */ jr $ra -/* B7AB34 80240AE4 27BD0028 */ addiu $sp, $sp, 0x28 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 6a0f253321..925ad652d4 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 func_80240A28_B7AA78 +/* B7B294 80241244 0C09028A */ jal UnkNpcAIFunc1 /* B7B298 80241248 0200302D */ daddu $a2, $s0, $zero /* B7B29C 8024124C 8E630070 */ lw $v1, 0x70($s3) /* B7B2A0 80241250 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s deleted file mode 100644 index bf199fac51..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240400_B84580.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_B84580 -/* B84580 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B84584 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* B84588 80240408 0080982D */ daddu $s3, $a0, $zero -/* B8458C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* B84590 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* B84594 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* B84598 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* B8459C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* B845A0 80240420 86440008 */ lh $a0, 8($s2) -/* B845A4 80240424 0C00EABB */ jal get_npc_unsafe -/* B845A8 80240428 00A0882D */ daddu $s1, $a1, $zero -/* B845AC 8024042C 8E240008 */ lw $a0, 8($s1) -/* B845B0 80240430 0040802D */ daddu $s0, $v0, $zero -/* B845B4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* B845B8 80240438 00832021 */ addu $a0, $a0, $v1 -/* B845BC 8024043C 00042043 */ sra $a0, $a0, 1 -/* B845C0 80240440 0C00A67F */ jal rand_int -/* B845C4 80240444 24840001 */ addiu $a0, $a0, 1 -/* B845C8 80240448 8E230008 */ lw $v1, 8($s1) -/* B845CC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B845D0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* B845D4 80240454 00651821 */ addu $v1, $v1, $a1 -/* B845D8 80240458 00031843 */ sra $v1, $v1, 1 -/* B845DC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* B845E0 80240460 0C00A67F */ jal rand_int -/* B845E4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* B845E8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* B845EC 8024046C 44820000 */ mtc1 $v0, $f0 -/* B845F0 80240470 00000000 */ nop -/* B845F4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* B845F8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* B845FC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* B84600 80240480 44810000 */ mtc1 $at, $f0 -/* B84604 80240484 0C00A6C9 */ jal clamp_angle -/* B84608 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* B8460C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* B84610 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* B84614 80240494 8C420000 */ lw $v0, ($v0) -/* B84618 80240498 AE020028 */ sw $v0, 0x28($s0) -/* B8461C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* B84620 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* B84624 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* B84628 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* B8462C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* B84630 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* B84634 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* B84638 802404B8 03E00008 */ jr $ra -/* B8463C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 e43c0183e3..54c39d55d9 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 func_80240400_B84580 +/* B84F28 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* B84F2C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s deleted file mode 100644 index 6e44cc3c5a..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802404B0_ABB740.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0_ABB740 -/* ABB740 802404B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ABB744 802404B4 AFB3001C */ sw $s3, 0x1c($sp) -/* ABB748 802404B8 0080982D */ daddu $s3, $a0, $zero -/* ABB74C 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* ABB750 802404C0 AFB20018 */ sw $s2, 0x18($sp) -/* ABB754 802404C4 AFB10014 */ sw $s1, 0x14($sp) -/* ABB758 802404C8 AFB00010 */ sw $s0, 0x10($sp) -/* ABB75C 802404CC 8E720148 */ lw $s2, 0x148($s3) -/* ABB760 802404D0 86440008 */ lh $a0, 8($s2) -/* ABB764 802404D4 0C00EABB */ jal get_npc_unsafe -/* ABB768 802404D8 00A0882D */ daddu $s1, $a1, $zero -/* ABB76C 802404DC 8E240008 */ lw $a0, 8($s1) -/* ABB770 802404E0 0040802D */ daddu $s0, $v0, $zero -/* ABB774 802404E4 00041FC2 */ srl $v1, $a0, 0x1f -/* ABB778 802404E8 00832021 */ addu $a0, $a0, $v1 -/* ABB77C 802404EC 00042043 */ sra $a0, $a0, 1 -/* ABB780 802404F0 0C00A67F */ jal rand_int -/* ABB784 802404F4 24840001 */ addiu $a0, $a0, 1 -/* ABB788 802404F8 8E230008 */ lw $v1, 8($s1) -/* ABB78C 802404FC 240400B4 */ addiu $a0, $zero, 0xb4 -/* ABB790 80240500 00032FC2 */ srl $a1, $v1, 0x1f -/* ABB794 80240504 00651821 */ addu $v1, $v1, $a1 -/* ABB798 80240508 00031843 */ sra $v1, $v1, 1 -/* ABB79C 8024050C 00621821 */ addu $v1, $v1, $v0 -/* ABB7A0 80240510 0C00A67F */ jal rand_int -/* ABB7A4 80240514 A603008E */ sh $v1, 0x8e($s0) -/* ABB7A8 80240518 C60C000C */ lwc1 $f12, 0xc($s0) -/* ABB7AC 8024051C 44820000 */ mtc1 $v0, $f0 -/* ABB7B0 80240520 00000000 */ nop -/* ABB7B4 80240524 46800020 */ cvt.s.w $f0, $f0 -/* ABB7B8 80240528 46006300 */ add.s $f12, $f12, $f0 -/* ABB7BC 8024052C 3C0142B4 */ lui $at, 0x42b4 -/* ABB7C0 80240530 44810000 */ mtc1 $at, $f0 -/* ABB7C4 80240534 0C00A6C9 */ jal clamp_angle -/* ABB7C8 80240538 46006301 */ sub.s $f12, $f12, $f0 -/* ABB7CC 8024053C E600000C */ swc1 $f0, 0xc($s0) -/* ABB7D0 80240540 8E4200CC */ lw $v0, 0xcc($s2) -/* ABB7D4 80240544 8C420000 */ lw $v0, ($v0) -/* ABB7D8 80240548 AE020028 */ sw $v0, 0x28($s0) -/* ABB7DC 8024054C 24020003 */ addiu $v0, $zero, 3 -/* ABB7E0 80240550 AE620070 */ sw $v0, 0x70($s3) -/* ABB7E4 80240554 8FBF0020 */ lw $ra, 0x20($sp) -/* ABB7E8 80240558 8FB3001C */ lw $s3, 0x1c($sp) -/* ABB7EC 8024055C 8FB20018 */ lw $s2, 0x18($sp) -/* ABB7F0 80240560 8FB10014 */ lw $s1, 0x14($sp) -/* ABB7F4 80240564 8FB00010 */ lw $s0, 0x10($sp) -/* ABB7F8 80240568 03E00008 */ jr $ra -/* ABB7FC 8024056C 27BD0028 */ addiu $sp, $sp, 0x28 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 c6d4f1dcfa..eed4dbacb6 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 func_802404B0_ABB740 +/* ABC0E8 80240E58 0C09012C */ jal UnkNpcAIFunc1 /* ABC0EC 80240E5C 02A0302D */ daddu $a2, $s5, $zero /* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero /* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s deleted file mode 100644 index a844cf06c8..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240400_AC5570.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_AC5570 -/* AC5570 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AC5574 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* AC5578 80240408 0080982D */ daddu $s3, $a0, $zero -/* AC557C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* AC5580 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* AC5584 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* AC5588 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* AC558C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* AC5590 80240420 86440008 */ lh $a0, 8($s2) -/* AC5594 80240424 0C00EABB */ jal get_npc_unsafe -/* AC5598 80240428 00A0882D */ daddu $s1, $a1, $zero -/* AC559C 8024042C 8E240008 */ lw $a0, 8($s1) -/* AC55A0 80240430 0040802D */ daddu $s0, $v0, $zero -/* AC55A4 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* AC55A8 80240438 00832021 */ addu $a0, $a0, $v1 -/* AC55AC 8024043C 00042043 */ sra $a0, $a0, 1 -/* AC55B0 80240440 0C00A67F */ jal rand_int -/* AC55B4 80240444 24840001 */ addiu $a0, $a0, 1 -/* AC55B8 80240448 8E230008 */ lw $v1, 8($s1) -/* AC55BC 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* AC55C0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* AC55C4 80240454 00651821 */ addu $v1, $v1, $a1 -/* AC55C8 80240458 00031843 */ sra $v1, $v1, 1 -/* AC55CC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* AC55D0 80240460 0C00A67F */ jal rand_int -/* AC55D4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* AC55D8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* AC55DC 8024046C 44820000 */ mtc1 $v0, $f0 -/* AC55E0 80240470 00000000 */ nop -/* AC55E4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* AC55E8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* AC55EC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* AC55F0 80240480 44810000 */ mtc1 $at, $f0 -/* AC55F4 80240484 0C00A6C9 */ jal clamp_angle -/* AC55F8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* AC55FC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* AC5600 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* AC5604 80240494 8C420000 */ lw $v0, ($v0) -/* AC5608 80240498 AE020028 */ sw $v0, 0x28($s0) -/* AC560C 8024049C 24020003 */ addiu $v0, $zero, 3 -/* AC5610 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* AC5614 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* AC5618 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* AC561C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* AC5620 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* AC5624 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* AC5628 802404B8 03E00008 */ jr $ra -/* AC562C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 a1579ae11e..da8f68d326 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 func_80240400_AC5570 +/* AC5F18 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* AC5F1C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s deleted file mode 100644 index ad2e909059..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8CE848 -/* 8CE848 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8CE84C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8CE850 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8CE854 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8CE858 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8CE85C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8CE860 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8CE864 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8CE868 802407F8 86440008 */ lh $a0, 8($s2) -/* 8CE86C 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8CE870 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8CE874 80240804 8E240008 */ lw $a0, 8($s1) -/* 8CE878 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8CE87C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8CE880 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8CE884 80240814 00042043 */ sra $a0, $a0, 1 -/* 8CE888 80240818 0C00A67F */ jal rand_int -/* 8CE88C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8CE890 80240820 8E230008 */ lw $v1, 8($s1) -/* 8CE894 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8CE898 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8CE89C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8CE8A0 80240830 00031843 */ sra $v1, $v1, 1 -/* 8CE8A4 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8CE8A8 80240838 0C00A67F */ jal rand_int -/* 8CE8AC 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8CE8B0 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8CE8B4 80240844 44820000 */ mtc1 $v0, $f0 -/* 8CE8B8 80240848 00000000 */ nop -/* 8CE8BC 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE8C0 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8CE8C4 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8CE8C8 80240858 44810000 */ mtc1 $at, $f0 -/* 8CE8CC 8024085C 0C00A6C9 */ jal clamp_angle -/* 8CE8D0 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8CE8D4 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8CE8D8 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8CE8DC 8024086C 8C420000 */ lw $v0, ($v0) -/* 8CE8E0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8CE8E4 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8CE8E8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8CE8EC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8CE8F0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8CE8F4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8CE8F8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8CE8FC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CE900 80240890 03E00008 */ jr $ra -/* 8CE904 80240894 27BD0028 */ addiu $sp, $sp, 0x28 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 c00da65e95..87d5ca00c4 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 func_802407D8_8CE848 +/* 8CF4B8 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero /* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s deleted file mode 100644 index c65ba9dc36..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_802407D8_8D1CE8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8D1CE8 -/* 8D1CE8 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D1CEC 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8D1CF0 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8D1CF4 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D1CF8 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D1CFC 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8D1D00 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D1D04 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8D1D08 802407F8 86440008 */ lh $a0, 8($s2) -/* 8D1D0C 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8D1D10 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8D1D14 80240804 8E240008 */ lw $a0, 8($s1) -/* 8D1D18 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8D1D1C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D1D20 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8D1D24 80240814 00042043 */ sra $a0, $a0, 1 -/* 8D1D28 80240818 0C00A67F */ jal rand_int -/* 8D1D2C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8D1D30 80240820 8E230008 */ lw $v1, 8($s1) -/* 8D1D34 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8D1D38 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8D1D3C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8D1D40 80240830 00031843 */ sra $v1, $v1, 1 -/* 8D1D44 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8D1D48 80240838 0C00A67F */ jal rand_int -/* 8D1D4C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8D1D50 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D1D54 80240844 44820000 */ mtc1 $v0, $f0 -/* 8D1D58 80240848 00000000 */ nop -/* 8D1D5C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8D1D60 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8D1D64 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8D1D68 80240858 44810000 */ mtc1 $at, $f0 -/* 8D1D6C 8024085C 0C00A6C9 */ jal clamp_angle -/* 8D1D70 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8D1D74 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8D1D78 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D1D7C 8024086C 8C420000 */ lw $v0, ($v0) -/* 8D1D80 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8D1D84 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8D1D88 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8D1D8C 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D1D90 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D1D94 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8D1D98 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8D1D9C 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D1DA0 80240890 03E00008 */ jr $ra -/* 8D1DA4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 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 ab694b7555..4c7139ecdb 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 func_802407D8_8D1CE8 +/* 8D2958 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s deleted file mode 100644 index 1caf4f429d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802407D8_8D65D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_8D65D8 -/* 8D65D8 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D65DC 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8D65E0 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8D65E4 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D65E8 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D65EC 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8D65F0 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8D65F4 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8D65F8 802407F8 86440008 */ lh $a0, 8($s2) -/* 8D65FC 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8D6600 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8D6604 80240804 8E240008 */ lw $a0, 8($s1) -/* 8D6608 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8D660C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D6610 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8D6614 80240814 00042043 */ sra $a0, $a0, 1 -/* 8D6618 80240818 0C00A67F */ jal rand_int -/* 8D661C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8D6620 80240820 8E230008 */ lw $v1, 8($s1) -/* 8D6624 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8D6628 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8D662C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8D6630 80240830 00031843 */ sra $v1, $v1, 1 -/* 8D6634 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8D6638 80240838 0C00A67F */ jal rand_int -/* 8D663C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8D6640 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D6644 80240844 44820000 */ mtc1 $v0, $f0 -/* 8D6648 80240848 00000000 */ nop -/* 8D664C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8D6650 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8D6654 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8D6658 80240858 44810000 */ mtc1 $at, $f0 -/* 8D665C 8024085C 0C00A6C9 */ jal clamp_angle -/* 8D6660 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8D6664 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8D6668 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D666C 8024086C 8C420000 */ lw $v0, ($v0) -/* 8D6670 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8D6674 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8D6678 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8D667C 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D6680 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D6684 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8D6688 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8D668C 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8D6690 80240890 03E00008 */ jr $ra -/* 8D6694 80240894 27BD0028 */ addiu $sp, $sp, 0x28 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 870ac969d5..28621b1f99 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 func_802407D8_8D65D8 +/* 8D7248 80241448 0C0901F6 */ jal UnkNpcAIFunc1 /* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s deleted file mode 100644 index ff1bdad222..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240400_A86E50.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400_A86E50 -/* A86E50 80240400 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A86E54 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* A86E58 80240408 0080982D */ daddu $s3, $a0, $zero -/* A86E5C 8024040C AFBF0020 */ sw $ra, 0x20($sp) -/* A86E60 80240410 AFB20018 */ sw $s2, 0x18($sp) -/* A86E64 80240414 AFB10014 */ sw $s1, 0x14($sp) -/* A86E68 80240418 AFB00010 */ sw $s0, 0x10($sp) -/* A86E6C 8024041C 8E720148 */ lw $s2, 0x148($s3) -/* A86E70 80240420 86440008 */ lh $a0, 8($s2) -/* A86E74 80240424 0C00EABB */ jal get_npc_unsafe -/* A86E78 80240428 00A0882D */ daddu $s1, $a1, $zero -/* A86E7C 8024042C 8E240008 */ lw $a0, 8($s1) -/* A86E80 80240430 0040802D */ daddu $s0, $v0, $zero -/* A86E84 80240434 00041FC2 */ srl $v1, $a0, 0x1f -/* A86E88 80240438 00832021 */ addu $a0, $a0, $v1 -/* A86E8C 8024043C 00042043 */ sra $a0, $a0, 1 -/* A86E90 80240440 0C00A67F */ jal rand_int -/* A86E94 80240444 24840001 */ addiu $a0, $a0, 1 -/* A86E98 80240448 8E230008 */ lw $v1, 8($s1) -/* A86E9C 8024044C 240400B4 */ addiu $a0, $zero, 0xb4 -/* A86EA0 80240450 00032FC2 */ srl $a1, $v1, 0x1f -/* A86EA4 80240454 00651821 */ addu $v1, $v1, $a1 -/* A86EA8 80240458 00031843 */ sra $v1, $v1, 1 -/* A86EAC 8024045C 00621821 */ addu $v1, $v1, $v0 -/* A86EB0 80240460 0C00A67F */ jal rand_int -/* A86EB4 80240464 A603008E */ sh $v1, 0x8e($s0) -/* A86EB8 80240468 C60C000C */ lwc1 $f12, 0xc($s0) -/* A86EBC 8024046C 44820000 */ mtc1 $v0, $f0 -/* A86EC0 80240470 00000000 */ nop -/* A86EC4 80240474 46800020 */ cvt.s.w $f0, $f0 -/* A86EC8 80240478 46006300 */ add.s $f12, $f12, $f0 -/* A86ECC 8024047C 3C0142B4 */ lui $at, 0x42b4 -/* A86ED0 80240480 44810000 */ mtc1 $at, $f0 -/* A86ED4 80240484 0C00A6C9 */ jal clamp_angle -/* A86ED8 80240488 46006301 */ sub.s $f12, $f12, $f0 -/* A86EDC 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* A86EE0 80240490 8E4200CC */ lw $v0, 0xcc($s2) -/* A86EE4 80240494 8C420000 */ lw $v0, ($v0) -/* A86EE8 80240498 AE020028 */ sw $v0, 0x28($s0) -/* A86EEC 8024049C 24020003 */ addiu $v0, $zero, 3 -/* A86EF0 802404A0 AE620070 */ sw $v0, 0x70($s3) -/* A86EF4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A86EF8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A86EFC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A86F00 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A86F04 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A86F08 802404B8 03E00008 */ jr $ra -/* A86F0C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 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 8de63aa72e..82e79baa4a 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 @@ -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 func_80240400_A86E50 +/* A877F8 80240DA8 0C090100 */ jal UnkNpcAIFunc1 /* A877FC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero /* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero 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 1eb6ac3dfd..b5090ccd23 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 @@ -153,7 +153,7 @@ glabel func_80241224_A87C74 /* A87EAC 8024145C 00000000 */ nop /* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero /* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero -/* A87EB8 80241468 0C090100 */ jal func_80240400_A86E50 +/* A87EB8 80241468 0C090100 */ jal UnkNpcAIFunc1 /* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero /* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s deleted file mode 100644 index 1f01d6ade5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404E0_A8CF60 -/* A8CF60 802404E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A8CF64 802404E4 AFB3001C */ sw $s3, 0x1c($sp) -/* A8CF68 802404E8 0080982D */ daddu $s3, $a0, $zero -/* A8CF6C 802404EC AFBF0020 */ sw $ra, 0x20($sp) -/* A8CF70 802404F0 AFB20018 */ sw $s2, 0x18($sp) -/* A8CF74 802404F4 AFB10014 */ sw $s1, 0x14($sp) -/* A8CF78 802404F8 AFB00010 */ sw $s0, 0x10($sp) -/* A8CF7C 802404FC 8E720148 */ lw $s2, 0x148($s3) -/* A8CF80 80240500 86440008 */ lh $a0, 8($s2) -/* A8CF84 80240504 0C00EABB */ jal get_npc_unsafe -/* A8CF88 80240508 00A0882D */ daddu $s1, $a1, $zero -/* A8CF8C 8024050C 8E240008 */ lw $a0, 8($s1) -/* A8CF90 80240510 0040802D */ daddu $s0, $v0, $zero -/* A8CF94 80240514 00041FC2 */ srl $v1, $a0, 0x1f -/* A8CF98 80240518 00832021 */ addu $a0, $a0, $v1 -/* A8CF9C 8024051C 00042043 */ sra $a0, $a0, 1 -/* A8CFA0 80240520 0C00A67F */ jal rand_int -/* A8CFA4 80240524 24840001 */ addiu $a0, $a0, 1 -/* A8CFA8 80240528 8E230008 */ lw $v1, 8($s1) -/* A8CFAC 8024052C 240400B4 */ addiu $a0, $zero, 0xb4 -/* A8CFB0 80240530 00032FC2 */ srl $a1, $v1, 0x1f -/* A8CFB4 80240534 00651821 */ addu $v1, $v1, $a1 -/* A8CFB8 80240538 00031843 */ sra $v1, $v1, 1 -/* A8CFBC 8024053C 00621821 */ addu $v1, $v1, $v0 -/* A8CFC0 80240540 0C00A67F */ jal rand_int -/* A8CFC4 80240544 A603008E */ sh $v1, 0x8e($s0) -/* A8CFC8 80240548 C60C000C */ lwc1 $f12, 0xc($s0) -/* A8CFCC 8024054C 44820000 */ mtc1 $v0, $f0 -/* A8CFD0 80240550 00000000 */ nop -/* A8CFD4 80240554 46800020 */ cvt.s.w $f0, $f0 -/* A8CFD8 80240558 46006300 */ add.s $f12, $f12, $f0 -/* A8CFDC 8024055C 3C0142B4 */ lui $at, 0x42b4 -/* A8CFE0 80240560 44810000 */ mtc1 $at, $f0 -/* A8CFE4 80240564 0C00A6C9 */ jal clamp_angle -/* A8CFE8 80240568 46006301 */ sub.s $f12, $f12, $f0 -/* A8CFEC 8024056C E600000C */ swc1 $f0, 0xc($s0) -/* A8CFF0 80240570 8E4200CC */ lw $v0, 0xcc($s2) -/* A8CFF4 80240574 8C420000 */ lw $v0, ($v0) -/* A8CFF8 80240578 AE020028 */ sw $v0, 0x28($s0) -/* A8CFFC 8024057C 24020003 */ addiu $v0, $zero, 3 -/* A8D000 80240580 AE620070 */ sw $v0, 0x70($s3) -/* A8D004 80240584 8FBF0020 */ lw $ra, 0x20($sp) -/* A8D008 80240588 8FB3001C */ lw $s3, 0x1c($sp) -/* A8D00C 8024058C 8FB20018 */ lw $s2, 0x18($sp) -/* A8D010 80240590 8FB10014 */ lw $s1, 0x14($sp) -/* A8D014 80240594 8FB00010 */ lw $s0, 0x10($sp) -/* A8D018 80240598 03E00008 */ jr $ra -/* A8D01C 8024059C 27BD0028 */ addiu $sp, $sp, 0x28 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 5be08d3b0c..e0e2e5dcb1 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 @@ -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 func_802404E0_A8CF60 +/* A8D908 80240E88 0C090138 */ jal UnkNpcAIFunc1 /* A8D90C 80240E8C 02A0302D */ daddu $a2, $s5, $zero /* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero 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 c206c8336a..48cec3e51f 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 @@ -153,7 +153,7 @@ glabel func_80241304_A8DD84 /* A8DFBC 8024153C 00000000 */ nop /* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero /* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero -/* A8DFC8 80241548 0C090138 */ jal func_802404E0_A8CF60 +/* A8DFC8 80241548 0C090138 */ jal UnkNpcAIFunc1 /* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero /* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero /* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s deleted file mode 100644 index bd3e848a31..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240CB8_C5B3F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB8_C5B3F8 -/* C5B3F8 80240CB8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C5B3FC 80240CBC AFB3001C */ sw $s3, 0x1c($sp) -/* C5B400 80240CC0 0080982D */ daddu $s3, $a0, $zero -/* C5B404 80240CC4 AFBF0020 */ sw $ra, 0x20($sp) -/* C5B408 80240CC8 AFB20018 */ sw $s2, 0x18($sp) -/* C5B40C 80240CCC AFB10014 */ sw $s1, 0x14($sp) -/* C5B410 80240CD0 AFB00010 */ sw $s0, 0x10($sp) -/* C5B414 80240CD4 8E720148 */ lw $s2, 0x148($s3) -/* C5B418 80240CD8 86440008 */ lh $a0, 8($s2) -/* C5B41C 80240CDC 0C00EABB */ jal get_npc_unsafe -/* C5B420 80240CE0 00A0882D */ daddu $s1, $a1, $zero -/* C5B424 80240CE4 8E240008 */ lw $a0, 8($s1) -/* C5B428 80240CE8 0040802D */ daddu $s0, $v0, $zero -/* C5B42C 80240CEC 00041FC2 */ srl $v1, $a0, 0x1f -/* C5B430 80240CF0 00832021 */ addu $a0, $a0, $v1 -/* C5B434 80240CF4 00042043 */ sra $a0, $a0, 1 -/* C5B438 80240CF8 0C00A67F */ jal rand_int -/* C5B43C 80240CFC 24840001 */ addiu $a0, $a0, 1 -/* C5B440 80240D00 8E230008 */ lw $v1, 8($s1) -/* C5B444 80240D04 240400B4 */ addiu $a0, $zero, 0xb4 -/* C5B448 80240D08 00032FC2 */ srl $a1, $v1, 0x1f -/* C5B44C 80240D0C 00651821 */ addu $v1, $v1, $a1 -/* C5B450 80240D10 00031843 */ sra $v1, $v1, 1 -/* C5B454 80240D14 00621821 */ addu $v1, $v1, $v0 -/* C5B458 80240D18 0C00A67F */ jal rand_int -/* C5B45C 80240D1C A603008E */ sh $v1, 0x8e($s0) -/* C5B460 80240D20 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5B464 80240D24 44820000 */ mtc1 $v0, $f0 -/* C5B468 80240D28 00000000 */ nop -/* C5B46C 80240D2C 46800020 */ cvt.s.w $f0, $f0 -/* C5B470 80240D30 46006300 */ add.s $f12, $f12, $f0 -/* C5B474 80240D34 3C0142B4 */ lui $at, 0x42b4 -/* C5B478 80240D38 44810000 */ mtc1 $at, $f0 -/* C5B47C 80240D3C 0C00A6C9 */ jal clamp_angle -/* C5B480 80240D40 46006301 */ sub.s $f12, $f12, $f0 -/* C5B484 80240D44 E600000C */ swc1 $f0, 0xc($s0) -/* C5B488 80240D48 8E4200CC */ lw $v0, 0xcc($s2) -/* C5B48C 80240D4C 8C420000 */ lw $v0, ($v0) -/* C5B490 80240D50 AE020028 */ sw $v0, 0x28($s0) -/* C5B494 80240D54 24020003 */ addiu $v0, $zero, 3 -/* C5B498 80240D58 AE620070 */ sw $v0, 0x70($s3) -/* C5B49C 80240D5C 8FBF0020 */ lw $ra, 0x20($sp) -/* C5B4A0 80240D60 8FB3001C */ lw $s3, 0x1c($sp) -/* C5B4A4 80240D64 8FB20018 */ lw $s2, 0x18($sp) -/* C5B4A8 80240D68 8FB10014 */ lw $s1, 0x14($sp) -/* C5B4AC 80240D6C 8FB00010 */ lw $s0, 0x10($sp) -/* C5B4B0 80240D70 03E00008 */ jr $ra -/* C5B4B4 80240D74 27BD0028 */ addiu $sp, $sp, 0x28 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 e28be0f87b..428a0a7d0e 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 func_80240CB8_C5B3F8 +/* C5C068 80241928 0C09032E */ jal UnkNpcAIFunc1 /* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero /* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero /* C5C074 80241934 0200282D */ daddu $a1, $s0, $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 33350c391e..1807b929dd 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 func_80240CB8_C5B3F8 +/* C5C664 80241F24 0C09032E */ jal UnkNpcAIFunc1 /* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero /* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s deleted file mode 100644 index 1c8a07db55..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240FF8_C6F328.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF8_C6F328 -/* C6F328 80240FF8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C6F32C 80240FFC AFB3001C */ sw $s3, 0x1c($sp) -/* C6F330 80241000 0080982D */ daddu $s3, $a0, $zero -/* C6F334 80241004 AFBF0020 */ sw $ra, 0x20($sp) -/* C6F338 80241008 AFB20018 */ sw $s2, 0x18($sp) -/* C6F33C 8024100C AFB10014 */ sw $s1, 0x14($sp) -/* C6F340 80241010 AFB00010 */ sw $s0, 0x10($sp) -/* C6F344 80241014 8E720148 */ lw $s2, 0x148($s3) -/* C6F348 80241018 86440008 */ lh $a0, 8($s2) -/* C6F34C 8024101C 0C00EABB */ jal get_npc_unsafe -/* C6F350 80241020 00A0882D */ daddu $s1, $a1, $zero -/* C6F354 80241024 8E240008 */ lw $a0, 8($s1) -/* C6F358 80241028 0040802D */ daddu $s0, $v0, $zero -/* C6F35C 8024102C 00041FC2 */ srl $v1, $a0, 0x1f -/* C6F360 80241030 00832021 */ addu $a0, $a0, $v1 -/* C6F364 80241034 00042043 */ sra $a0, $a0, 1 -/* C6F368 80241038 0C00A67F */ jal rand_int -/* C6F36C 8024103C 24840001 */ addiu $a0, $a0, 1 -/* C6F370 80241040 8E230008 */ lw $v1, 8($s1) -/* C6F374 80241044 240400B4 */ addiu $a0, $zero, 0xb4 -/* C6F378 80241048 00032FC2 */ srl $a1, $v1, 0x1f -/* C6F37C 8024104C 00651821 */ addu $v1, $v1, $a1 -/* C6F380 80241050 00031843 */ sra $v1, $v1, 1 -/* C6F384 80241054 00621821 */ addu $v1, $v1, $v0 -/* C6F388 80241058 0C00A67F */ jal rand_int -/* C6F38C 8024105C A603008E */ sh $v1, 0x8e($s0) -/* C6F390 80241060 C60C000C */ lwc1 $f12, 0xc($s0) -/* C6F394 80241064 44820000 */ mtc1 $v0, $f0 -/* C6F398 80241068 00000000 */ nop -/* C6F39C 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* C6F3A0 80241070 46006300 */ add.s $f12, $f12, $f0 -/* C6F3A4 80241074 3C0142B4 */ lui $at, 0x42b4 -/* C6F3A8 80241078 44810000 */ mtc1 $at, $f0 -/* C6F3AC 8024107C 0C00A6C9 */ jal clamp_angle -/* C6F3B0 80241080 46006301 */ sub.s $f12, $f12, $f0 -/* C6F3B4 80241084 E600000C */ swc1 $f0, 0xc($s0) -/* C6F3B8 80241088 8E4200CC */ lw $v0, 0xcc($s2) -/* C6F3BC 8024108C 8C420000 */ lw $v0, ($v0) -/* C6F3C0 80241090 AE020028 */ sw $v0, 0x28($s0) -/* C6F3C4 80241094 24020003 */ addiu $v0, $zero, 3 -/* C6F3C8 80241098 AE620070 */ sw $v0, 0x70($s3) -/* C6F3CC 8024109C 8FBF0020 */ lw $ra, 0x20($sp) -/* C6F3D0 802410A0 8FB3001C */ lw $s3, 0x1c($sp) -/* C6F3D4 802410A4 8FB20018 */ lw $s2, 0x18($sp) -/* C6F3D8 802410A8 8FB10014 */ lw $s1, 0x14($sp) -/* C6F3DC 802410AC 8FB00010 */ lw $s0, 0x10($sp) -/* C6F3E0 802410B0 03E00008 */ jr $ra -/* C6F3E4 802410B4 27BD0028 */ addiu $sp, $sp, 0x28 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 2e3999a29d..5ba60e5b5d 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 @@ -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 func_80240FF8_C6F328 +/* C6FF98 80241C68 0C0903FE */ jal UnkNpcAIFunc1 /* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero /* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero /* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $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 3a735c8b1d..e3592a5733 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 @@ -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 func_80240FF8_C6F328 +/* C70594 80242264 0C0903FE */ jal UnkNpcAIFunc1 /* C70598 80242268 0260302D */ daddu $a2, $s3, $zero /* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero /* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s deleted file mode 100644 index 3710c00487..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241228_C726A8 -/* C726A8 80241228 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C726AC 8024122C AFB3001C */ sw $s3, 0x1c($sp) -/* C726B0 80241230 0080982D */ daddu $s3, $a0, $zero -/* C726B4 80241234 AFBF0020 */ sw $ra, 0x20($sp) -/* C726B8 80241238 AFB20018 */ sw $s2, 0x18($sp) -/* C726BC 8024123C AFB10014 */ sw $s1, 0x14($sp) -/* C726C0 80241240 AFB00010 */ sw $s0, 0x10($sp) -/* C726C4 80241244 8E720148 */ lw $s2, 0x148($s3) -/* C726C8 80241248 86440008 */ lh $a0, 8($s2) -/* C726CC 8024124C 0C00EABB */ jal get_npc_unsafe -/* C726D0 80241250 00A0882D */ daddu $s1, $a1, $zero -/* C726D4 80241254 8E240008 */ lw $a0, 8($s1) -/* C726D8 80241258 0040802D */ daddu $s0, $v0, $zero -/* C726DC 8024125C 00041FC2 */ srl $v1, $a0, 0x1f -/* C726E0 80241260 00832021 */ addu $a0, $a0, $v1 -/* C726E4 80241264 00042043 */ sra $a0, $a0, 1 -/* C726E8 80241268 0C00A67F */ jal rand_int -/* C726EC 8024126C 24840001 */ addiu $a0, $a0, 1 -/* C726F0 80241270 8E230008 */ lw $v1, 8($s1) -/* C726F4 80241274 240400B4 */ addiu $a0, $zero, 0xb4 -/* C726F8 80241278 00032FC2 */ srl $a1, $v1, 0x1f -/* C726FC 8024127C 00651821 */ addu $v1, $v1, $a1 -/* C72700 80241280 00031843 */ sra $v1, $v1, 1 -/* C72704 80241284 00621821 */ addu $v1, $v1, $v0 -/* C72708 80241288 0C00A67F */ jal rand_int -/* C7270C 8024128C A603008E */ sh $v1, 0x8e($s0) -/* C72710 80241290 C60C000C */ lwc1 $f12, 0xc($s0) -/* C72714 80241294 44820000 */ mtc1 $v0, $f0 -/* C72718 80241298 00000000 */ nop -/* C7271C 8024129C 46800020 */ cvt.s.w $f0, $f0 -/* C72720 802412A0 46006300 */ add.s $f12, $f12, $f0 -/* C72724 802412A4 3C0142B4 */ lui $at, 0x42b4 -/* C72728 802412A8 44810000 */ mtc1 $at, $f0 -/* C7272C 802412AC 0C00A6C9 */ jal clamp_angle -/* C72730 802412B0 46006301 */ sub.s $f12, $f12, $f0 -/* C72734 802412B4 E600000C */ swc1 $f0, 0xc($s0) -/* C72738 802412B8 8E4200CC */ lw $v0, 0xcc($s2) -/* C7273C 802412BC 8C420000 */ lw $v0, ($v0) -/* C72740 802412C0 AE020028 */ sw $v0, 0x28($s0) -/* C72744 802412C4 24020003 */ addiu $v0, $zero, 3 -/* C72748 802412C8 AE620070 */ sw $v0, 0x70($s3) -/* C7274C 802412CC 8FBF0020 */ lw $ra, 0x20($sp) -/* C72750 802412D0 8FB3001C */ lw $s3, 0x1c($sp) -/* C72754 802412D4 8FB20018 */ lw $s2, 0x18($sp) -/* C72758 802412D8 8FB10014 */ lw $s1, 0x14($sp) -/* C7275C 802412DC 8FB00010 */ lw $s0, 0x10($sp) -/* C72760 802412E0 03E00008 */ jr $ra -/* C72764 802412E4 27BD0028 */ addiu $sp, $sp, 0x28 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 175493694f..5e4bac9545 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 func_80241228_C726A8 +/* C73318 80241E98 0C09048A */ jal UnkNpcAIFunc1 /* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero /* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero /* C73324 80241EA4 0200282D */ daddu $a1, $s0, $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 a9280deae5..e7eef8159c 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 func_80241228_C726A8 +/* C73914 80242494 0C09048A */ jal UnkNpcAIFunc1 /* C73918 80242498 0260302D */ daddu $a2, $s3, $zero /* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero /* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s deleted file mode 100644 index 24bbc93d57..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240C38_C80DD8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C38_C80DD8 -/* C80DD8 80240C38 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C80DDC 80240C3C AFB3001C */ sw $s3, 0x1c($sp) -/* C80DE0 80240C40 0080982D */ daddu $s3, $a0, $zero -/* C80DE4 80240C44 AFBF0020 */ sw $ra, 0x20($sp) -/* C80DE8 80240C48 AFB20018 */ sw $s2, 0x18($sp) -/* C80DEC 80240C4C AFB10014 */ sw $s1, 0x14($sp) -/* C80DF0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* C80DF4 80240C54 8E720148 */ lw $s2, 0x148($s3) -/* C80DF8 80240C58 86440008 */ lh $a0, 8($s2) -/* C80DFC 80240C5C 0C00EABB */ jal get_npc_unsafe -/* C80E00 80240C60 00A0882D */ daddu $s1, $a1, $zero -/* C80E04 80240C64 8E240008 */ lw $a0, 8($s1) -/* C80E08 80240C68 0040802D */ daddu $s0, $v0, $zero -/* C80E0C 80240C6C 00041FC2 */ srl $v1, $a0, 0x1f -/* C80E10 80240C70 00832021 */ addu $a0, $a0, $v1 -/* C80E14 80240C74 00042043 */ sra $a0, $a0, 1 -/* C80E18 80240C78 0C00A67F */ jal rand_int -/* C80E1C 80240C7C 24840001 */ addiu $a0, $a0, 1 -/* C80E20 80240C80 8E230008 */ lw $v1, 8($s1) -/* C80E24 80240C84 240400B4 */ addiu $a0, $zero, 0xb4 -/* C80E28 80240C88 00032FC2 */ srl $a1, $v1, 0x1f -/* C80E2C 80240C8C 00651821 */ addu $v1, $v1, $a1 -/* C80E30 80240C90 00031843 */ sra $v1, $v1, 1 -/* C80E34 80240C94 00621821 */ addu $v1, $v1, $v0 -/* C80E38 80240C98 0C00A67F */ jal rand_int -/* C80E3C 80240C9C A603008E */ sh $v1, 0x8e($s0) -/* C80E40 80240CA0 C60C000C */ lwc1 $f12, 0xc($s0) -/* C80E44 80240CA4 44820000 */ mtc1 $v0, $f0 -/* C80E48 80240CA8 00000000 */ nop -/* C80E4C 80240CAC 46800020 */ cvt.s.w $f0, $f0 -/* C80E50 80240CB0 46006300 */ add.s $f12, $f12, $f0 -/* C80E54 80240CB4 3C0142B4 */ lui $at, 0x42b4 -/* C80E58 80240CB8 44810000 */ mtc1 $at, $f0 -/* C80E5C 80240CBC 0C00A6C9 */ jal clamp_angle -/* C80E60 80240CC0 46006301 */ sub.s $f12, $f12, $f0 -/* C80E64 80240CC4 E600000C */ swc1 $f0, 0xc($s0) -/* C80E68 80240CC8 8E4200CC */ lw $v0, 0xcc($s2) -/* C80E6C 80240CCC 8C420000 */ lw $v0, ($v0) -/* C80E70 80240CD0 AE020028 */ sw $v0, 0x28($s0) -/* C80E74 80240CD4 24020003 */ addiu $v0, $zero, 3 -/* C80E78 80240CD8 AE620070 */ sw $v0, 0x70($s3) -/* C80E7C 80240CDC 8FBF0020 */ lw $ra, 0x20($sp) -/* C80E80 80240CE0 8FB3001C */ lw $s3, 0x1c($sp) -/* C80E84 80240CE4 8FB20018 */ lw $s2, 0x18($sp) -/* C80E88 80240CE8 8FB10014 */ lw $s1, 0x14($sp) -/* C80E8C 80240CEC 8FB00010 */ lw $s0, 0x10($sp) -/* C80E90 80240CF0 03E00008 */ jr $ra -/* C80E94 80240CF4 27BD0028 */ addiu $sp, $sp, 0x28 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 07362dc1c8..2f6164f9a4 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 func_80240C38_C80DD8 +/* C81A48 802418A8 0C09030E */ jal UnkNpcAIFunc1 /* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero /* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero /* C81A54 802418B4 0200282D */ daddu $a1, $s0, $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 699797c083..b6ad4c8516 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 func_80240C38_C80DD8 +/* C82044 80241EA4 0C09030E */ jal UnkNpcAIFunc1 /* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero /* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s deleted file mode 100644 index 1cd908fcbe..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242970_7ED680 -/* 7ED680 80242970 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7ED684 80242974 AFB3001C */ sw $s3, 0x1c($sp) -/* 7ED688 80242978 0080982D */ daddu $s3, $a0, $zero -/* 7ED68C 8024297C AFBF0020 */ sw $ra, 0x20($sp) -/* 7ED690 80242980 AFB20018 */ sw $s2, 0x18($sp) -/* 7ED694 80242984 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED698 80242988 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED69C 8024298C 8E720148 */ lw $s2, 0x148($s3) -/* 7ED6A0 80242990 86440008 */ lh $a0, 8($s2) -/* 7ED6A4 80242994 0C00EABB */ jal get_npc_unsafe -/* 7ED6A8 80242998 00A0882D */ daddu $s1, $a1, $zero -/* 7ED6AC 8024299C 8E240008 */ lw $a0, 8($s1) -/* 7ED6B0 802429A0 0040802D */ daddu $s0, $v0, $zero -/* 7ED6B4 802429A4 00041FC2 */ srl $v1, $a0, 0x1f -/* 7ED6B8 802429A8 00832021 */ addu $a0, $a0, $v1 -/* 7ED6BC 802429AC 00042043 */ sra $a0, $a0, 1 -/* 7ED6C0 802429B0 0C00A67F */ jal rand_int -/* 7ED6C4 802429B4 24840001 */ addiu $a0, $a0, 1 -/* 7ED6C8 802429B8 8E230008 */ lw $v1, 8($s1) -/* 7ED6CC 802429BC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 7ED6D0 802429C0 00032FC2 */ srl $a1, $v1, 0x1f -/* 7ED6D4 802429C4 00651821 */ addu $v1, $v1, $a1 -/* 7ED6D8 802429C8 00031843 */ sra $v1, $v1, 1 -/* 7ED6DC 802429CC 00621821 */ addu $v1, $v1, $v0 -/* 7ED6E0 802429D0 0C00A67F */ jal rand_int -/* 7ED6E4 802429D4 A603008E */ sh $v1, 0x8e($s0) -/* 7ED6E8 802429D8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 7ED6EC 802429DC 44820000 */ mtc1 $v0, $f0 -/* 7ED6F0 802429E0 00000000 */ nop -/* 7ED6F4 802429E4 46800020 */ cvt.s.w $f0, $f0 -/* 7ED6F8 802429E8 46006300 */ add.s $f12, $f12, $f0 -/* 7ED6FC 802429EC 3C0142B4 */ lui $at, 0x42b4 -/* 7ED700 802429F0 44810000 */ mtc1 $at, $f0 -/* 7ED704 802429F4 0C00A6C9 */ jal clamp_angle -/* 7ED708 802429F8 46006301 */ sub.s $f12, $f12, $f0 -/* 7ED70C 802429FC E600000C */ swc1 $f0, 0xc($s0) -/* 7ED710 80242A00 8E4200CC */ lw $v0, 0xcc($s2) -/* 7ED714 80242A04 8C420000 */ lw $v0, ($v0) -/* 7ED718 80242A08 AE020028 */ sw $v0, 0x28($s0) -/* 7ED71C 80242A0C 24020003 */ addiu $v0, $zero, 3 -/* 7ED720 80242A10 AE620070 */ sw $v0, 0x70($s3) -/* 7ED724 80242A14 8FBF0020 */ lw $ra, 0x20($sp) -/* 7ED728 80242A18 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ED72C 80242A1C 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED730 80242A20 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED734 80242A24 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED738 80242A28 03E00008 */ jr $ra -/* 7ED73C 80242A2C 27BD0028 */ addiu $sp, $sp, 0x28 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 604f0404ce..7cd2934269 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 func_80242970_7ED680 +/* 7EE028 80243318 0C090A5C */ jal UnkNpcAIFunc1 /* 7EE02C 8024331C 02A0302D */ daddu $a2, $s5, $zero /* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero /* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s deleted file mode 100644 index d5c06ee3e2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241480_801D00 -/* 801D00 80241480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 801D04 80241484 AFB3001C */ sw $s3, 0x1c($sp) -/* 801D08 80241488 0080982D */ daddu $s3, $a0, $zero -/* 801D0C 8024148C AFBF0020 */ sw $ra, 0x20($sp) -/* 801D10 80241490 AFB20018 */ sw $s2, 0x18($sp) -/* 801D14 80241494 AFB10014 */ sw $s1, 0x14($sp) -/* 801D18 80241498 AFB00010 */ sw $s0, 0x10($sp) -/* 801D1C 8024149C 8E720148 */ lw $s2, 0x148($s3) -/* 801D20 802414A0 86440008 */ lh $a0, 8($s2) -/* 801D24 802414A4 0C00EABB */ jal get_npc_unsafe -/* 801D28 802414A8 00A0882D */ daddu $s1, $a1, $zero -/* 801D2C 802414AC 8E240008 */ lw $a0, 8($s1) -/* 801D30 802414B0 0040802D */ daddu $s0, $v0, $zero -/* 801D34 802414B4 00041FC2 */ srl $v1, $a0, 0x1f -/* 801D38 802414B8 00832021 */ addu $a0, $a0, $v1 -/* 801D3C 802414BC 00042043 */ sra $a0, $a0, 1 -/* 801D40 802414C0 0C00A67F */ jal rand_int -/* 801D44 802414C4 24840001 */ addiu $a0, $a0, 1 -/* 801D48 802414C8 8E230008 */ lw $v1, 8($s1) -/* 801D4C 802414CC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 801D50 802414D0 00032FC2 */ srl $a1, $v1, 0x1f -/* 801D54 802414D4 00651821 */ addu $v1, $v1, $a1 -/* 801D58 802414D8 00031843 */ sra $v1, $v1, 1 -/* 801D5C 802414DC 00621821 */ addu $v1, $v1, $v0 -/* 801D60 802414E0 0C00A67F */ jal rand_int -/* 801D64 802414E4 A603008E */ sh $v1, 0x8e($s0) -/* 801D68 802414E8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 801D6C 802414EC 44820000 */ mtc1 $v0, $f0 -/* 801D70 802414F0 00000000 */ nop -/* 801D74 802414F4 46800020 */ cvt.s.w $f0, $f0 -/* 801D78 802414F8 46006300 */ add.s $f12, $f12, $f0 -/* 801D7C 802414FC 3C0142B4 */ lui $at, 0x42b4 -/* 801D80 80241500 44810000 */ mtc1 $at, $f0 -/* 801D84 80241504 0C00A6C9 */ jal clamp_angle -/* 801D88 80241508 46006301 */ sub.s $f12, $f12, $f0 -/* 801D8C 8024150C E600000C */ swc1 $f0, 0xc($s0) -/* 801D90 80241510 8E4200CC */ lw $v0, 0xcc($s2) -/* 801D94 80241514 8C420000 */ lw $v0, ($v0) -/* 801D98 80241518 AE020028 */ sw $v0, 0x28($s0) -/* 801D9C 8024151C 24020003 */ addiu $v0, $zero, 3 -/* 801DA0 80241520 AE620070 */ sw $v0, 0x70($s3) -/* 801DA4 80241524 8FBF0020 */ lw $ra, 0x20($sp) -/* 801DA8 80241528 8FB3001C */ lw $s3, 0x1c($sp) -/* 801DAC 8024152C 8FB20018 */ lw $s2, 0x18($sp) -/* 801DB0 80241530 8FB10014 */ lw $s1, 0x14($sp) -/* 801DB4 80241534 8FB00010 */ lw $s0, 0x10($sp) -/* 801DB8 80241538 03E00008 */ jr $ra -/* 801DBC 8024153C 27BD0028 */ addiu $sp, $sp, 0x28 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 a21dd82c7f..ea203cc6dc 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 @@ -141,7 +141,7 @@ glabel func_80241C14_802494 /* 80269C 80241E1C 00000000 */ nop /* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero /* 8026A4 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8026A8 80241E28 0C090520 */ jal func_80241480_801D00 +/* 8026A8 80241E28 0C090520 */ jal UnkNpcAIFunc1 /* 8026AC 80241E2C 02A0302D */ daddu $a2, $s5, $zero /* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero /* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s deleted file mode 100644 index e42425150f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245950_8061D0 -/* 8061D0 80245950 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8061D4 80245954 AFB3001C */ sw $s3, 0x1c($sp) -/* 8061D8 80245958 0080982D */ daddu $s3, $a0, $zero -/* 8061DC 8024595C AFBF0020 */ sw $ra, 0x20($sp) -/* 8061E0 80245960 AFB20018 */ sw $s2, 0x18($sp) -/* 8061E4 80245964 AFB10014 */ sw $s1, 0x14($sp) -/* 8061E8 80245968 AFB00010 */ sw $s0, 0x10($sp) -/* 8061EC 8024596C 8E720148 */ lw $s2, 0x148($s3) -/* 8061F0 80245970 86440008 */ lh $a0, 8($s2) -/* 8061F4 80245974 0C00EABB */ jal get_npc_unsafe -/* 8061F8 80245978 00A0882D */ daddu $s1, $a1, $zero -/* 8061FC 8024597C 8E240008 */ lw $a0, 8($s1) -/* 806200 80245980 0040802D */ daddu $s0, $v0, $zero -/* 806204 80245984 00041FC2 */ srl $v1, $a0, 0x1f -/* 806208 80245988 00832021 */ addu $a0, $a0, $v1 -/* 80620C 8024598C 00042043 */ sra $a0, $a0, 1 -/* 806210 80245990 0C00A67F */ jal rand_int -/* 806214 80245994 24840001 */ addiu $a0, $a0, 1 -/* 806218 80245998 8E230008 */ lw $v1, 8($s1) -/* 80621C 8024599C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 806220 802459A0 00032FC2 */ srl $a1, $v1, 0x1f -/* 806224 802459A4 00651821 */ addu $v1, $v1, $a1 -/* 806228 802459A8 00031843 */ sra $v1, $v1, 1 -/* 80622C 802459AC 00621821 */ addu $v1, $v1, $v0 -/* 806230 802459B0 0C00A67F */ jal rand_int -/* 806234 802459B4 A603008E */ sh $v1, 0x8e($s0) -/* 806238 802459B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 80623C 802459BC 44820000 */ mtc1 $v0, $f0 -/* 806240 802459C0 00000000 */ nop -/* 806244 802459C4 46800020 */ cvt.s.w $f0, $f0 -/* 806248 802459C8 46006300 */ add.s $f12, $f12, $f0 -/* 80624C 802459CC 3C0142B4 */ lui $at, 0x42b4 -/* 806250 802459D0 44810000 */ mtc1 $at, $f0 -/* 806254 802459D4 0C00A6C9 */ jal clamp_angle -/* 806258 802459D8 46006301 */ sub.s $f12, $f12, $f0 -/* 80625C 802459DC E600000C */ swc1 $f0, 0xc($s0) -/* 806260 802459E0 8E4200CC */ lw $v0, 0xcc($s2) -/* 806264 802459E4 8C420000 */ lw $v0, ($v0) -/* 806268 802459E8 AE020028 */ sw $v0, 0x28($s0) -/* 80626C 802459EC 24020003 */ addiu $v0, $zero, 3 -/* 806270 802459F0 AE620070 */ sw $v0, 0x70($s3) -/* 806274 802459F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 806278 802459F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 80627C 802459FC 8FB20018 */ lw $s2, 0x18($sp) -/* 806280 80245A00 8FB10014 */ lw $s1, 0x14($sp) -/* 806284 80245A04 8FB00010 */ lw $s0, 0x10($sp) -/* 806288 80245A08 03E00008 */ jr $ra -/* 80628C 80245A0C 27BD0028 */ addiu $sp, $sp, 0x28 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 f76272a2e1..66f8e3902f 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 func_80245950_8061D0 +/* 806B78 802462F8 0C091654 */ jal UnkNpcAIFunc1 /* 806B7C 802462FC 02A0302D */ daddu $a2, $s5, $zero /* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero /* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s deleted file mode 100644 index 707e1674c8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_823FF0 -/* 823FF0 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 823FF4 80240D34 AFB3001C */ sw $s3, 0x1c($sp) -/* 823FF8 80240D38 0080982D */ daddu $s3, $a0, $zero -/* 823FFC 80240D3C AFBF0020 */ sw $ra, 0x20($sp) -/* 824000 80240D40 AFB20018 */ sw $s2, 0x18($sp) -/* 824004 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* 824008 80240D48 AFB00010 */ sw $s0, 0x10($sp) -/* 82400C 80240D4C 8E720148 */ lw $s2, 0x148($s3) -/* 824010 80240D50 86440008 */ lh $a0, 8($s2) -/* 824014 80240D54 0C00EABB */ jal get_npc_unsafe -/* 824018 80240D58 00A0882D */ daddu $s1, $a1, $zero -/* 82401C 80240D5C 8E240008 */ lw $a0, 8($s1) -/* 824020 80240D60 0040802D */ daddu $s0, $v0, $zero -/* 824024 80240D64 00041FC2 */ srl $v1, $a0, 0x1f -/* 824028 80240D68 00832021 */ addu $a0, $a0, $v1 -/* 82402C 80240D6C 00042043 */ sra $a0, $a0, 1 -/* 824030 80240D70 0C00A67F */ jal rand_int -/* 824034 80240D74 24840001 */ addiu $a0, $a0, 1 -/* 824038 80240D78 8E230008 */ lw $v1, 8($s1) -/* 82403C 80240D7C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 824040 80240D80 00032FC2 */ srl $a1, $v1, 0x1f -/* 824044 80240D84 00651821 */ addu $v1, $v1, $a1 -/* 824048 80240D88 00031843 */ sra $v1, $v1, 1 -/* 82404C 80240D8C 00621821 */ addu $v1, $v1, $v0 -/* 824050 80240D90 0C00A67F */ jal rand_int -/* 824054 80240D94 A603008E */ sh $v1, 0x8e($s0) -/* 824058 80240D98 C60C000C */ lwc1 $f12, 0xc($s0) -/* 82405C 80240D9C 44820000 */ mtc1 $v0, $f0 -/* 824060 80240DA0 00000000 */ nop -/* 824064 80240DA4 46800020 */ cvt.s.w $f0, $f0 -/* 824068 80240DA8 46006300 */ add.s $f12, $f12, $f0 -/* 82406C 80240DAC 3C0142B4 */ lui $at, 0x42b4 -/* 824070 80240DB0 44810000 */ mtc1 $at, $f0 -/* 824074 80240DB4 0C00A6C9 */ jal clamp_angle -/* 824078 80240DB8 46006301 */ sub.s $f12, $f12, $f0 -/* 82407C 80240DBC E600000C */ swc1 $f0, 0xc($s0) -/* 824080 80240DC0 8E4200CC */ lw $v0, 0xcc($s2) -/* 824084 80240DC4 8C420000 */ lw $v0, ($v0) -/* 824088 80240DC8 AE020028 */ sw $v0, 0x28($s0) -/* 82408C 80240DCC 24020003 */ addiu $v0, $zero, 3 -/* 824090 80240DD0 AE620070 */ sw $v0, 0x70($s3) -/* 824094 80240DD4 8FBF0020 */ lw $ra, 0x20($sp) -/* 824098 80240DD8 8FB3001C */ lw $s3, 0x1c($sp) -/* 82409C 80240DDC 8FB20018 */ lw $s2, 0x18($sp) -/* 8240A0 80240DE0 8FB10014 */ lw $s1, 0x14($sp) -/* 8240A4 80240DE4 8FB00010 */ lw $s0, 0x10($sp) -/* 8240A8 80240DE8 03E00008 */ jr $ra -/* 8240AC 80240DEC 27BD0028 */ addiu $sp, $sp, 0x28 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 be45d20fa9..214941caa9 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 func_80240D30_823FF0 +/* 824998 802416D8 0C09034C */ jal UnkNpcAIFunc1 /* 82499C 802416DC 02A0302D */ daddu $a2, $s5, $zero /* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero /* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s deleted file mode 100644 index 4fb2757e15..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240890_852A00 -/* 852A00 80240890 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 852A04 80240894 AFB3001C */ sw $s3, 0x1c($sp) -/* 852A08 80240898 0080982D */ daddu $s3, $a0, $zero -/* 852A0C 8024089C AFBF0020 */ sw $ra, 0x20($sp) -/* 852A10 802408A0 AFB20018 */ sw $s2, 0x18($sp) -/* 852A14 802408A4 AFB10014 */ sw $s1, 0x14($sp) -/* 852A18 802408A8 AFB00010 */ sw $s0, 0x10($sp) -/* 852A1C 802408AC 8E720148 */ lw $s2, 0x148($s3) -/* 852A20 802408B0 86440008 */ lh $a0, 8($s2) -/* 852A24 802408B4 0C00EABB */ jal get_npc_unsafe -/* 852A28 802408B8 00A0882D */ daddu $s1, $a1, $zero -/* 852A2C 802408BC 8E240008 */ lw $a0, 8($s1) -/* 852A30 802408C0 0040802D */ daddu $s0, $v0, $zero -/* 852A34 802408C4 00041FC2 */ srl $v1, $a0, 0x1f -/* 852A38 802408C8 00832021 */ addu $a0, $a0, $v1 -/* 852A3C 802408CC 00042043 */ sra $a0, $a0, 1 -/* 852A40 802408D0 0C00A67F */ jal rand_int -/* 852A44 802408D4 24840001 */ addiu $a0, $a0, 1 -/* 852A48 802408D8 8E230008 */ lw $v1, 8($s1) -/* 852A4C 802408DC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 852A50 802408E0 00032FC2 */ srl $a1, $v1, 0x1f -/* 852A54 802408E4 00651821 */ addu $v1, $v1, $a1 -/* 852A58 802408E8 00031843 */ sra $v1, $v1, 1 -/* 852A5C 802408EC 00621821 */ addu $v1, $v1, $v0 -/* 852A60 802408F0 0C00A67F */ jal rand_int -/* 852A64 802408F4 A603008E */ sh $v1, 0x8e($s0) -/* 852A68 802408F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 852A6C 802408FC 44820000 */ mtc1 $v0, $f0 -/* 852A70 80240900 00000000 */ nop -/* 852A74 80240904 46800020 */ cvt.s.w $f0, $f0 -/* 852A78 80240908 46006300 */ add.s $f12, $f12, $f0 -/* 852A7C 8024090C 3C0142B4 */ lui $at, 0x42b4 -/* 852A80 80240910 44810000 */ mtc1 $at, $f0 -/* 852A84 80240914 0C00A6C9 */ jal clamp_angle -/* 852A88 80240918 46006301 */ sub.s $f12, $f12, $f0 -/* 852A8C 8024091C E600000C */ swc1 $f0, 0xc($s0) -/* 852A90 80240920 8E4200CC */ lw $v0, 0xcc($s2) -/* 852A94 80240924 8C420000 */ lw $v0, ($v0) -/* 852A98 80240928 AE020028 */ sw $v0, 0x28($s0) -/* 852A9C 8024092C 24020003 */ addiu $v0, $zero, 3 -/* 852AA0 80240930 AE620070 */ sw $v0, 0x70($s3) -/* 852AA4 80240934 8FBF0020 */ lw $ra, 0x20($sp) -/* 852AA8 80240938 8FB3001C */ lw $s3, 0x1c($sp) -/* 852AAC 8024093C 8FB20018 */ lw $s2, 0x18($sp) -/* 852AB0 80240940 8FB10014 */ lw $s1, 0x14($sp) -/* 852AB4 80240944 8FB00010 */ lw $s0, 0x10($sp) -/* 852AB8 80240948 03E00008 */ jr $ra -/* 852ABC 8024094C 27BD0028 */ addiu $sp, $sp, 0x28 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 19182f02e4..155f83347d 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 func_80240890_852A00 +/* 8533A8 80241238 0C090224 */ jal UnkNpcAIFunc1 /* 8533AC 8024123C 02A0302D */ daddu $a2, $s5, $zero /* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero /* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s deleted file mode 100644 index 3e80b5fc57..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802406E0_E0EE80.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0_E0EE80 -/* E0EE80 802406E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* E0EE84 802406E4 AFB3001C */ sw $s3, 0x1c($sp) -/* E0EE88 802406E8 0080982D */ daddu $s3, $a0, $zero -/* E0EE8C 802406EC AFBF0020 */ sw $ra, 0x20($sp) -/* E0EE90 802406F0 AFB20018 */ sw $s2, 0x18($sp) -/* E0EE94 802406F4 AFB10014 */ sw $s1, 0x14($sp) -/* E0EE98 802406F8 AFB00010 */ sw $s0, 0x10($sp) -/* E0EE9C 802406FC 8E720148 */ lw $s2, 0x148($s3) -/* E0EEA0 80240700 86440008 */ lh $a0, 8($s2) -/* E0EEA4 80240704 0C00EABB */ jal get_npc_unsafe -/* E0EEA8 80240708 00A0882D */ daddu $s1, $a1, $zero -/* E0EEAC 8024070C 8E240008 */ lw $a0, 8($s1) -/* E0EEB0 80240710 0040802D */ daddu $s0, $v0, $zero -/* E0EEB4 80240714 00041FC2 */ srl $v1, $a0, 0x1f -/* E0EEB8 80240718 00832021 */ addu $a0, $a0, $v1 -/* E0EEBC 8024071C 00042043 */ sra $a0, $a0, 1 -/* E0EEC0 80240720 0C00A67F */ jal rand_int -/* E0EEC4 80240724 24840001 */ addiu $a0, $a0, 1 -/* E0EEC8 80240728 8E230008 */ lw $v1, 8($s1) -/* E0EECC 8024072C 240400B4 */ addiu $a0, $zero, 0xb4 -/* E0EED0 80240730 00032FC2 */ srl $a1, $v1, 0x1f -/* E0EED4 80240734 00651821 */ addu $v1, $v1, $a1 -/* E0EED8 80240738 00031843 */ sra $v1, $v1, 1 -/* E0EEDC 8024073C 00621821 */ addu $v1, $v1, $v0 -/* E0EEE0 80240740 0C00A67F */ jal rand_int -/* E0EEE4 80240744 A603008E */ sh $v1, 0x8e($s0) -/* E0EEE8 80240748 C60C000C */ lwc1 $f12, 0xc($s0) -/* E0EEEC 8024074C 44820000 */ mtc1 $v0, $f0 -/* E0EEF0 80240750 00000000 */ nop -/* E0EEF4 80240754 46800020 */ cvt.s.w $f0, $f0 -/* E0EEF8 80240758 46006300 */ add.s $f12, $f12, $f0 -/* E0EEFC 8024075C 3C0142B4 */ lui $at, 0x42b4 -/* E0EF00 80240760 44810000 */ mtc1 $at, $f0 -/* E0EF04 80240764 0C00A6C9 */ jal clamp_angle -/* E0EF08 80240768 46006301 */ sub.s $f12, $f12, $f0 -/* E0EF0C 8024076C E600000C */ swc1 $f0, 0xc($s0) -/* E0EF10 80240770 8E4200CC */ lw $v0, 0xcc($s2) -/* E0EF14 80240774 8C420000 */ lw $v0, ($v0) -/* E0EF18 80240778 AE020028 */ sw $v0, 0x28($s0) -/* E0EF1C 8024077C 24020003 */ addiu $v0, $zero, 3 -/* E0EF20 80240780 AE620070 */ sw $v0, 0x70($s3) -/* E0EF24 80240784 8FBF0020 */ lw $ra, 0x20($sp) -/* E0EF28 80240788 8FB3001C */ lw $s3, 0x1c($sp) -/* E0EF2C 8024078C 8FB20018 */ lw $s2, 0x18($sp) -/* E0EF30 80240790 8FB10014 */ lw $s1, 0x14($sp) -/* E0EF34 80240794 8FB00010 */ lw $s0, 0x10($sp) -/* E0EF38 80240798 03E00008 */ jr $ra -/* E0EF3C 8024079C 27BD0028 */ addiu $sp, $sp, 0x28 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 2ea272337e..90813933a1 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 func_802406E0_E0EE80 +/* E0F828 80241088 0C0901B8 */ jal UnkNpcAIFunc1 /* E0F82C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero /* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s deleted file mode 100644 index 93abcaad68..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802405D8_B981D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D8_B981D8 -/* B981D8 802405D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B981DC 802405DC AFB3001C */ sw $s3, 0x1c($sp) -/* B981E0 802405E0 0080982D */ daddu $s3, $a0, $zero -/* B981E4 802405E4 AFBF0020 */ sw $ra, 0x20($sp) -/* B981E8 802405E8 AFB20018 */ sw $s2, 0x18($sp) -/* B981EC 802405EC AFB10014 */ sw $s1, 0x14($sp) -/* B981F0 802405F0 AFB00010 */ sw $s0, 0x10($sp) -/* B981F4 802405F4 8E720148 */ lw $s2, 0x148($s3) -/* B981F8 802405F8 86440008 */ lh $a0, 8($s2) -/* B981FC 802405FC 0C00EABB */ jal get_npc_unsafe -/* B98200 80240600 00A0882D */ daddu $s1, $a1, $zero -/* B98204 80240604 8E240008 */ lw $a0, 8($s1) -/* B98208 80240608 0040802D */ daddu $s0, $v0, $zero -/* B9820C 8024060C 00041FC2 */ srl $v1, $a0, 0x1f -/* B98210 80240610 00832021 */ addu $a0, $a0, $v1 -/* B98214 80240614 00042043 */ sra $a0, $a0, 1 -/* B98218 80240618 0C00A67F */ jal rand_int -/* B9821C 8024061C 24840001 */ addiu $a0, $a0, 1 -/* B98220 80240620 8E230008 */ lw $v1, 8($s1) -/* B98224 80240624 240400B4 */ addiu $a0, $zero, 0xb4 -/* B98228 80240628 00032FC2 */ srl $a1, $v1, 0x1f -/* B9822C 8024062C 00651821 */ addu $v1, $v1, $a1 -/* B98230 80240630 00031843 */ sra $v1, $v1, 1 -/* B98234 80240634 00621821 */ addu $v1, $v1, $v0 -/* B98238 80240638 0C00A67F */ jal rand_int -/* B9823C 8024063C A603008E */ sh $v1, 0x8e($s0) -/* B98240 80240640 C60C000C */ lwc1 $f12, 0xc($s0) -/* B98244 80240644 44820000 */ mtc1 $v0, $f0 -/* B98248 80240648 00000000 */ nop -/* B9824C 8024064C 46800020 */ cvt.s.w $f0, $f0 -/* B98250 80240650 46006300 */ add.s $f12, $f12, $f0 -/* B98254 80240654 3C0142B4 */ lui $at, 0x42b4 -/* B98258 80240658 44810000 */ mtc1 $at, $f0 -/* B9825C 8024065C 0C00A6C9 */ jal clamp_angle -/* B98260 80240660 46006301 */ sub.s $f12, $f12, $f0 -/* B98264 80240664 E600000C */ swc1 $f0, 0xc($s0) -/* B98268 80240668 8E4200CC */ lw $v0, 0xcc($s2) -/* B9826C 8024066C 8C420000 */ lw $v0, ($v0) -/* B98270 80240670 AE020028 */ sw $v0, 0x28($s0) -/* B98274 80240674 24020003 */ addiu $v0, $zero, 3 -/* B98278 80240678 AE620070 */ sw $v0, 0x70($s3) -/* B9827C 8024067C 8FBF0020 */ lw $ra, 0x20($sp) -/* B98280 80240680 8FB3001C */ lw $s3, 0x1c($sp) -/* B98284 80240684 8FB20018 */ lw $s2, 0x18($sp) -/* B98288 80240688 8FB10014 */ lw $s1, 0x14($sp) -/* B9828C 8024068C 8FB00010 */ lw $s0, 0x10($sp) -/* B98290 80240690 03E00008 */ jr $ra -/* B98294 80240694 27BD0028 */ addiu $sp, $sp, 0x28 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 8eae94b6c4..39bfe07bb8 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 func_802405D8_B981D8 +/* B989F4 80240DF4 0C090176 */ jal UnkNpcAIFunc1 /* B989F8 80240DF8 0200302D */ daddu $a2, $s0, $zero /* B989FC 80240DFC 8E630070 */ lw $v1, 0x70($s3) /* B98A00 80240E00 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s deleted file mode 100644 index a765f3789d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240768_B9E0C8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240768_B9E0C8 -/* B9E0C8 80240768 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B9E0CC 8024076C AFB3001C */ sw $s3, 0x1c($sp) -/* B9E0D0 80240770 0080982D */ daddu $s3, $a0, $zero -/* B9E0D4 80240774 AFBF0020 */ sw $ra, 0x20($sp) -/* B9E0D8 80240778 AFB20018 */ sw $s2, 0x18($sp) -/* B9E0DC 8024077C AFB10014 */ sw $s1, 0x14($sp) -/* B9E0E0 80240780 AFB00010 */ sw $s0, 0x10($sp) -/* B9E0E4 80240784 8E720148 */ lw $s2, 0x148($s3) -/* B9E0E8 80240788 86440008 */ lh $a0, 8($s2) -/* B9E0EC 8024078C 0C00EABB */ jal get_npc_unsafe -/* B9E0F0 80240790 00A0882D */ daddu $s1, $a1, $zero -/* B9E0F4 80240794 8E240008 */ lw $a0, 8($s1) -/* B9E0F8 80240798 0040802D */ daddu $s0, $v0, $zero -/* B9E0FC 8024079C 00041FC2 */ srl $v1, $a0, 0x1f -/* B9E100 802407A0 00832021 */ addu $a0, $a0, $v1 -/* B9E104 802407A4 00042043 */ sra $a0, $a0, 1 -/* B9E108 802407A8 0C00A67F */ jal rand_int -/* B9E10C 802407AC 24840001 */ addiu $a0, $a0, 1 -/* B9E110 802407B0 8E230008 */ lw $v1, 8($s1) -/* B9E114 802407B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B9E118 802407B8 00032FC2 */ srl $a1, $v1, 0x1f -/* B9E11C 802407BC 00651821 */ addu $v1, $v1, $a1 -/* B9E120 802407C0 00031843 */ sra $v1, $v1, 1 -/* B9E124 802407C4 00621821 */ addu $v1, $v1, $v0 -/* B9E128 802407C8 0C00A67F */ jal rand_int -/* B9E12C 802407CC A603008E */ sh $v1, 0x8e($s0) -/* B9E130 802407D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* B9E134 802407D4 44820000 */ mtc1 $v0, $f0 -/* B9E138 802407D8 00000000 */ nop -/* B9E13C 802407DC 46800020 */ cvt.s.w $f0, $f0 -/* B9E140 802407E0 46006300 */ add.s $f12, $f12, $f0 -/* B9E144 802407E4 3C0142B4 */ lui $at, 0x42b4 -/* B9E148 802407E8 44810000 */ mtc1 $at, $f0 -/* B9E14C 802407EC 0C00A6C9 */ jal clamp_angle -/* B9E150 802407F0 46006301 */ sub.s $f12, $f12, $f0 -/* B9E154 802407F4 E600000C */ swc1 $f0, 0xc($s0) -/* B9E158 802407F8 8E4200CC */ lw $v0, 0xcc($s2) -/* B9E15C 802407FC 8C420000 */ lw $v0, ($v0) -/* B9E160 80240800 AE020028 */ sw $v0, 0x28($s0) -/* B9E164 80240804 24020003 */ addiu $v0, $zero, 3 -/* B9E168 80240808 AE620070 */ sw $v0, 0x70($s3) -/* B9E16C 8024080C 8FBF0020 */ lw $ra, 0x20($sp) -/* B9E170 80240810 8FB3001C */ lw $s3, 0x1c($sp) -/* B9E174 80240814 8FB20018 */ lw $s2, 0x18($sp) -/* B9E178 80240818 8FB10014 */ lw $s1, 0x14($sp) -/* B9E17C 8024081C 8FB00010 */ lw $s0, 0x10($sp) -/* B9E180 80240820 03E00008 */ jr $ra -/* B9E184 80240824 27BD0028 */ addiu $sp, $sp, 0x28 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 aa534816a1..5e606892d0 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 func_80240768_B9E0C8 +/* B9E8E4 80240F84 0C0901DA */ jal UnkNpcAIFunc1 /* B9E8E8 80240F88 0200302D */ daddu $a2, $s0, $zero /* B9E8EC 80240F8C 8E630070 */ lw $v1, 0x70($s3) /* B9E8F0 80240F90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s deleted file mode 100644 index d44cb7733c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024247C_BA6BFC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024247C_BA6BFC -/* BA6BFC 8024247C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BA6C00 80242480 AFB3001C */ sw $s3, 0x1c($sp) -/* BA6C04 80242484 0080982D */ daddu $s3, $a0, $zero -/* BA6C08 80242488 AFBF0020 */ sw $ra, 0x20($sp) -/* BA6C0C 8024248C AFB20018 */ sw $s2, 0x18($sp) -/* BA6C10 80242490 AFB10014 */ sw $s1, 0x14($sp) -/* BA6C14 80242494 AFB00010 */ sw $s0, 0x10($sp) -/* BA6C18 80242498 8E720148 */ lw $s2, 0x148($s3) -/* BA6C1C 8024249C 86440008 */ lh $a0, 8($s2) -/* BA6C20 802424A0 0C00EABB */ jal get_npc_unsafe -/* BA6C24 802424A4 00A0882D */ daddu $s1, $a1, $zero -/* BA6C28 802424A8 8E240008 */ lw $a0, 8($s1) -/* BA6C2C 802424AC 0040802D */ daddu $s0, $v0, $zero -/* BA6C30 802424B0 00041FC2 */ srl $v1, $a0, 0x1f -/* BA6C34 802424B4 00832021 */ addu $a0, $a0, $v1 -/* BA6C38 802424B8 00042043 */ sra $a0, $a0, 1 -/* BA6C3C 802424BC 0C00A67F */ jal rand_int -/* BA6C40 802424C0 24840001 */ addiu $a0, $a0, 1 -/* BA6C44 802424C4 8E230008 */ lw $v1, 8($s1) -/* BA6C48 802424C8 240400B4 */ addiu $a0, $zero, 0xb4 -/* BA6C4C 802424CC 00032FC2 */ srl $a1, $v1, 0x1f -/* BA6C50 802424D0 00651821 */ addu $v1, $v1, $a1 -/* BA6C54 802424D4 00031843 */ sra $v1, $v1, 1 -/* BA6C58 802424D8 00621821 */ addu $v1, $v1, $v0 -/* BA6C5C 802424DC 0C00A67F */ jal rand_int -/* BA6C60 802424E0 A603008E */ sh $v1, 0x8e($s0) -/* BA6C64 802424E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* BA6C68 802424E8 44820000 */ mtc1 $v0, $f0 -/* BA6C6C 802424EC 00000000 */ nop -/* BA6C70 802424F0 46800020 */ cvt.s.w $f0, $f0 -/* BA6C74 802424F4 46006300 */ add.s $f12, $f12, $f0 -/* BA6C78 802424F8 3C0142B4 */ lui $at, 0x42b4 -/* BA6C7C 802424FC 44810000 */ mtc1 $at, $f0 -/* BA6C80 80242500 0C00A6C9 */ jal clamp_angle -/* BA6C84 80242504 46006301 */ sub.s $f12, $f12, $f0 -/* BA6C88 80242508 E600000C */ swc1 $f0, 0xc($s0) -/* BA6C8C 8024250C 8E4200CC */ lw $v0, 0xcc($s2) -/* BA6C90 80242510 8C420000 */ lw $v0, ($v0) -/* BA6C94 80242514 AE020028 */ sw $v0, 0x28($s0) -/* BA6C98 80242518 24020003 */ addiu $v0, $zero, 3 -/* BA6C9C 8024251C AE620070 */ sw $v0, 0x70($s3) -/* BA6CA0 80242520 8FBF0020 */ lw $ra, 0x20($sp) -/* BA6CA4 80242524 8FB3001C */ lw $s3, 0x1c($sp) -/* BA6CA8 80242528 8FB20018 */ lw $s2, 0x18($sp) -/* BA6CAC 8024252C 8FB10014 */ lw $s1, 0x14($sp) -/* BA6CB0 80242530 8FB00010 */ lw $s0, 0x10($sp) -/* BA6CB4 80242534 03E00008 */ jr $ra -/* BA6CB8 80242538 27BD0028 */ addiu $sp, $sp, 0x28 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 047faa9710..68d0a7070b 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 func_8024247C_BA6BFC +/* BA7418 80242C98 0C09091F */ jal UnkNpcAIFunc1 /* BA741C 80242C9C 0200302D */ daddu $a2, $s0, $zero /* BA7420 80242CA0 8E630070 */ lw $v1, 0x70($s3) /* BA7424 80242CA4 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s deleted file mode 100644 index 56efa15a05..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_802407D8_BAA918.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8_BAA918 -/* BAA918 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAA91C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* BAA920 802407E0 0080982D */ daddu $s3, $a0, $zero -/* BAA924 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* BAA928 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* BAA92C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* BAA930 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* BAA934 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* BAA938 802407F8 86440008 */ lh $a0, 8($s2) -/* BAA93C 802407FC 0C00EABB */ jal get_npc_unsafe -/* BAA940 80240800 00A0882D */ daddu $s1, $a1, $zero -/* BAA944 80240804 8E240008 */ lw $a0, 8($s1) -/* BAA948 80240808 0040802D */ daddu $s0, $v0, $zero -/* BAA94C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* BAA950 80240810 00832021 */ addu $a0, $a0, $v1 -/* BAA954 80240814 00042043 */ sra $a0, $a0, 1 -/* BAA958 80240818 0C00A67F */ jal rand_int -/* BAA95C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* BAA960 80240820 8E230008 */ lw $v1, 8($s1) -/* BAA964 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* BAA968 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* BAA96C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* BAA970 80240830 00031843 */ sra $v1, $v1, 1 -/* BAA974 80240834 00621821 */ addu $v1, $v1, $v0 -/* BAA978 80240838 0C00A67F */ jal rand_int -/* BAA97C 8024083C A603008E */ sh $v1, 0x8e($s0) -/* BAA980 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAA984 80240844 44820000 */ mtc1 $v0, $f0 -/* BAA988 80240848 00000000 */ nop -/* BAA98C 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* BAA990 80240850 46006300 */ add.s $f12, $f12, $f0 -/* BAA994 80240854 3C0142B4 */ lui $at, 0x42b4 -/* BAA998 80240858 44810000 */ mtc1 $at, $f0 -/* BAA99C 8024085C 0C00A6C9 */ jal clamp_angle -/* BAA9A0 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* BAA9A4 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* BAA9A8 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* BAA9AC 8024086C 8C420000 */ lw $v0, ($v0) -/* BAA9B0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* BAA9B4 80240874 24020003 */ addiu $v0, $zero, 3 -/* BAA9B8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* BAA9BC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* BAA9C0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* BAA9C4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* BAA9C8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* BAA9CC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* BAA9D0 80240890 03E00008 */ jr $ra -/* BAA9D4 80240894 27BD0028 */ addiu $sp, $sp, 0x28 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 3f653198a8..1343cc4399 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 @@ -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 func_802407D8_BAA918 +/* BAB134 80240FF4 0C0901F6 */ jal UnkNpcAIFunc1 /* BAB138 80240FF8 0200302D */ daddu $a2, $s0, $zero /* BAB13C 80240FFC 8E630070 */ lw $v1, 0x70($s3) /* BAB140 80241000 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s deleted file mode 100644 index 99da355b0f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240878_BAE1B8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878_BAE1B8 -/* BAE1B8 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BAE1BC 8024087C AFB3001C */ sw $s3, 0x1c($sp) -/* BAE1C0 80240880 0080982D */ daddu $s3, $a0, $zero -/* BAE1C4 80240884 AFBF0020 */ sw $ra, 0x20($sp) -/* BAE1C8 80240888 AFB20018 */ sw $s2, 0x18($sp) -/* BAE1CC 8024088C AFB10014 */ sw $s1, 0x14($sp) -/* BAE1D0 80240890 AFB00010 */ sw $s0, 0x10($sp) -/* BAE1D4 80240894 8E720148 */ lw $s2, 0x148($s3) -/* BAE1D8 80240898 86440008 */ lh $a0, 8($s2) -/* BAE1DC 8024089C 0C00EABB */ jal get_npc_unsafe -/* BAE1E0 802408A0 00A0882D */ daddu $s1, $a1, $zero -/* BAE1E4 802408A4 8E240008 */ lw $a0, 8($s1) -/* BAE1E8 802408A8 0040802D */ daddu $s0, $v0, $zero -/* BAE1EC 802408AC 00041FC2 */ srl $v1, $a0, 0x1f -/* BAE1F0 802408B0 00832021 */ addu $a0, $a0, $v1 -/* BAE1F4 802408B4 00042043 */ sra $a0, $a0, 1 -/* BAE1F8 802408B8 0C00A67F */ jal rand_int -/* BAE1FC 802408BC 24840001 */ addiu $a0, $a0, 1 -/* BAE200 802408C0 8E230008 */ lw $v1, 8($s1) -/* BAE204 802408C4 240400B4 */ addiu $a0, $zero, 0xb4 -/* BAE208 802408C8 00032FC2 */ srl $a1, $v1, 0x1f -/* BAE20C 802408CC 00651821 */ addu $v1, $v1, $a1 -/* BAE210 802408D0 00031843 */ sra $v1, $v1, 1 -/* BAE214 802408D4 00621821 */ addu $v1, $v1, $v0 -/* BAE218 802408D8 0C00A67F */ jal rand_int -/* BAE21C 802408DC A603008E */ sh $v1, 0x8e($s0) -/* BAE220 802408E0 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAE224 802408E4 44820000 */ mtc1 $v0, $f0 -/* BAE228 802408E8 00000000 */ nop -/* BAE22C 802408EC 46800020 */ cvt.s.w $f0, $f0 -/* BAE230 802408F0 46006300 */ add.s $f12, $f12, $f0 -/* BAE234 802408F4 3C0142B4 */ lui $at, 0x42b4 -/* BAE238 802408F8 44810000 */ mtc1 $at, $f0 -/* BAE23C 802408FC 0C00A6C9 */ jal clamp_angle -/* BAE240 80240900 46006301 */ sub.s $f12, $f12, $f0 -/* BAE244 80240904 E600000C */ swc1 $f0, 0xc($s0) -/* BAE248 80240908 8E4200CC */ lw $v0, 0xcc($s2) -/* BAE24C 8024090C 8C420000 */ lw $v0, ($v0) -/* BAE250 80240910 AE020028 */ sw $v0, 0x28($s0) -/* BAE254 80240914 24020003 */ addiu $v0, $zero, 3 -/* BAE258 80240918 AE620070 */ sw $v0, 0x70($s3) -/* BAE25C 8024091C 8FBF0020 */ lw $ra, 0x20($sp) -/* BAE260 80240920 8FB3001C */ lw $s3, 0x1c($sp) -/* BAE264 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* BAE268 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* BAE26C 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* BAE270 80240930 03E00008 */ jr $ra -/* BAE274 80240934 27BD0028 */ addiu $sp, $sp, 0x28 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 2e99fa01c7..ae02b12f57 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 func_80240878_BAE1B8 +/* BAEE28 802414E8 0C09021E */ jal UnkNpcAIFunc1 /* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero /* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero /* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s deleted file mode 100644 index e3efb6389e..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240608_BB3408 -/* BB3408 80240608 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BB340C 8024060C AFB3001C */ sw $s3, 0x1c($sp) -/* BB3410 80240610 0080982D */ daddu $s3, $a0, $zero -/* BB3414 80240614 AFBF0020 */ sw $ra, 0x20($sp) -/* BB3418 80240618 AFB20018 */ sw $s2, 0x18($sp) -/* BB341C 8024061C AFB10014 */ sw $s1, 0x14($sp) -/* BB3420 80240620 AFB00010 */ sw $s0, 0x10($sp) -/* BB3424 80240624 8E720148 */ lw $s2, 0x148($s3) -/* BB3428 80240628 86440008 */ lh $a0, 8($s2) -/* BB342C 8024062C 0C00EABB */ jal get_npc_unsafe -/* BB3430 80240630 00A0882D */ daddu $s1, $a1, $zero -/* BB3434 80240634 8E240008 */ lw $a0, 8($s1) -/* BB3438 80240638 0040802D */ daddu $s0, $v0, $zero -/* BB343C 8024063C 00041FC2 */ srl $v1, $a0, 0x1f -/* BB3440 80240640 00832021 */ addu $a0, $a0, $v1 -/* BB3444 80240644 00042043 */ sra $a0, $a0, 1 -/* BB3448 80240648 0C00A67F */ jal rand_int -/* BB344C 8024064C 24840001 */ addiu $a0, $a0, 1 -/* BB3450 80240650 8E230008 */ lw $v1, 8($s1) -/* BB3454 80240654 240400B4 */ addiu $a0, $zero, 0xb4 -/* BB3458 80240658 00032FC2 */ srl $a1, $v1, 0x1f -/* BB345C 8024065C 00651821 */ addu $v1, $v1, $a1 -/* BB3460 80240660 00031843 */ sra $v1, $v1, 1 -/* BB3464 80240664 00621821 */ addu $v1, $v1, $v0 -/* BB3468 80240668 0C00A67F */ jal rand_int -/* BB346C 8024066C A603008E */ sh $v1, 0x8e($s0) -/* BB3470 80240670 C60C000C */ lwc1 $f12, 0xc($s0) -/* BB3474 80240674 44820000 */ mtc1 $v0, $f0 -/* BB3478 80240678 00000000 */ nop -/* BB347C 8024067C 46800020 */ cvt.s.w $f0, $f0 -/* BB3480 80240680 46006300 */ add.s $f12, $f12, $f0 -/* BB3484 80240684 3C0142B4 */ lui $at, 0x42b4 -/* BB3488 80240688 44810000 */ mtc1 $at, $f0 -/* BB348C 8024068C 0C00A6C9 */ jal clamp_angle -/* BB3490 80240690 46006301 */ sub.s $f12, $f12, $f0 -/* BB3494 80240694 E600000C */ swc1 $f0, 0xc($s0) -/* BB3498 80240698 8E4200CC */ lw $v0, 0xcc($s2) -/* BB349C 8024069C 8C420000 */ lw $v0, ($v0) -/* BB34A0 802406A0 AE020028 */ sw $v0, 0x28($s0) -/* BB34A4 802406A4 24020003 */ addiu $v0, $zero, 3 -/* BB34A8 802406A8 AE620070 */ sw $v0, 0x70($s3) -/* BB34AC 802406AC 8FBF0020 */ lw $ra, 0x20($sp) -/* BB34B0 802406B0 8FB3001C */ lw $s3, 0x1c($sp) -/* BB34B4 802406B4 8FB20018 */ lw $s2, 0x18($sp) -/* BB34B8 802406B8 8FB10014 */ lw $s1, 0x14($sp) -/* BB34BC 802406BC 8FB00010 */ lw $s0, 0x10($sp) -/* BB34C0 802406C0 03E00008 */ jr $ra -/* BB34C4 802406C4 27BD0028 */ addiu $sp, $sp, 0x28 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 1a598f27f6..2a01c84133 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 func_80240608_BB3408 +/* BB3C24 80240E24 0C090182 */ jal UnkNpcAIFunc1 /* BB3C28 80240E28 0200302D */ daddu $a2, $s0, $zero /* BB3C2C 80240E2C 8E630070 */ lw $v1, 0x70($s3) /* BB3C30 80240E30 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s deleted file mode 100644 index 352b09cc7e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240E80_9D7EA0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_9D7EA0 -/* 9D7EA0 80240E80 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D7EA4 80240E84 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D7EA8 80240E88 0080982D */ daddu $s3, $a0, $zero -/* 9D7EAC 80240E8C AFBF0020 */ sw $ra, 0x20($sp) -/* 9D7EB0 80240E90 AFB20018 */ sw $s2, 0x18($sp) -/* 9D7EB4 80240E94 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7EB8 80240E98 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7EBC 80240E9C 8E720148 */ lw $s2, 0x148($s3) -/* 9D7EC0 80240EA0 86440008 */ lh $a0, 8($s2) -/* 9D7EC4 80240EA4 0C00EABB */ jal get_npc_unsafe -/* 9D7EC8 80240EA8 00A0882D */ daddu $s1, $a1, $zero -/* 9D7ECC 80240EAC 8E240008 */ lw $a0, 8($s1) -/* 9D7ED0 80240EB0 0040802D */ daddu $s0, $v0, $zero -/* 9D7ED4 80240EB4 00041FC2 */ srl $v1, $a0, 0x1f -/* 9D7ED8 80240EB8 00832021 */ addu $a0, $a0, $v1 -/* 9D7EDC 80240EBC 00042043 */ sra $a0, $a0, 1 -/* 9D7EE0 80240EC0 0C00A67F */ jal rand_int -/* 9D7EE4 80240EC4 24840001 */ addiu $a0, $a0, 1 -/* 9D7EE8 80240EC8 8E230008 */ lw $v1, 8($s1) -/* 9D7EEC 80240ECC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9D7EF0 80240ED0 00032FC2 */ srl $a1, $v1, 0x1f -/* 9D7EF4 80240ED4 00651821 */ addu $v1, $v1, $a1 -/* 9D7EF8 80240ED8 00031843 */ sra $v1, $v1, 1 -/* 9D7EFC 80240EDC 00621821 */ addu $v1, $v1, $v0 -/* 9D7F00 80240EE0 0C00A67F */ jal rand_int -/* 9D7F04 80240EE4 A603008E */ sh $v1, 0x8e($s0) -/* 9D7F08 80240EE8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9D7F0C 80240EEC 44820000 */ mtc1 $v0, $f0 -/* 9D7F10 80240EF0 00000000 */ nop -/* 9D7F14 80240EF4 46800020 */ cvt.s.w $f0, $f0 -/* 9D7F18 80240EF8 46006300 */ add.s $f12, $f12, $f0 -/* 9D7F1C 80240EFC 3C0142B4 */ lui $at, 0x42b4 -/* 9D7F20 80240F00 44810000 */ mtc1 $at, $f0 -/* 9D7F24 80240F04 0C00A6C9 */ jal clamp_angle -/* 9D7F28 80240F08 46006301 */ sub.s $f12, $f12, $f0 -/* 9D7F2C 80240F0C E600000C */ swc1 $f0, 0xc($s0) -/* 9D7F30 80240F10 8E4200CC */ lw $v0, 0xcc($s2) -/* 9D7F34 80240F14 8C420000 */ lw $v0, ($v0) -/* 9D7F38 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 9D7F3C 80240F1C 24020003 */ addiu $v0, $zero, 3 -/* 9D7F40 80240F20 AE620070 */ sw $v0, 0x70($s3) -/* 9D7F44 80240F24 8FBF0020 */ lw $ra, 0x20($sp) -/* 9D7F48 80240F28 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D7F4C 80240F2C 8FB20018 */ lw $s2, 0x18($sp) -/* 9D7F50 80240F30 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7F54 80240F34 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7F58 80240F38 03E00008 */ jr $ra -/* 9D7F5C 80240F3C 27BD0028 */ addiu $sp, $sp, 0x28 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 742a272a8a..8b3542f0ab 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 func_80240E80_9D7EA0 +/* 9D8848 80241828 0C0903A0 */ jal UnkNpcAIFunc1 /* 9D884C 8024182C 02A0302D */ daddu $a2, $s5, $zero /* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero /* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s deleted file mode 100644 index 3a1108673d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240568_9EBD58.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_9EBD58 -/* 9EBD58 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9EBD5C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 9EBD60 80240570 0080982D */ daddu $s3, $a0, $zero -/* 9EBD64 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 9EBD68 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 9EBD6C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 9EBD70 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 9EBD74 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 9EBD78 80240588 86440008 */ lh $a0, 8($s2) -/* 9EBD7C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 9EBD80 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 9EBD84 80240594 8E240008 */ lw $a0, 8($s1) -/* 9EBD88 80240598 0040802D */ daddu $s0, $v0, $zero -/* 9EBD8C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 9EBD90 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 9EBD94 802405A4 00042043 */ sra $a0, $a0, 1 -/* 9EBD98 802405A8 0C00A67F */ jal rand_int -/* 9EBD9C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 9EBDA0 802405B0 8E230008 */ lw $v1, 8($s1) -/* 9EBDA4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9EBDA8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 9EBDAC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 9EBDB0 802405C0 00031843 */ sra $v1, $v1, 1 -/* 9EBDB4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 9EBDB8 802405C8 0C00A67F */ jal rand_int -/* 9EBDBC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 9EBDC0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9EBDC4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 9EBDC8 802405D8 00000000 */ nop -/* 9EBDCC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 9EBDD0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 9EBDD4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 9EBDD8 802405E8 44810000 */ mtc1 $at, $f0 -/* 9EBDDC 802405EC 0C00A6C9 */ jal clamp_angle -/* 9EBDE0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 9EBDE4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 9EBDE8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 9EBDEC 802405FC 8C420000 */ lw $v0, ($v0) -/* 9EBDF0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 9EBDF4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 9EBDF8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 9EBDFC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9EBE00 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 9EBE04 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 9EBE08 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 9EBE0C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 9EBE10 80240620 03E00008 */ jr $ra -/* 9EBE14 80240624 27BD0028 */ addiu $sp, $sp, 0x28 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 55a22f6e99..7b835a3d36 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 func_80240568_9EBD58 +/* 9EC574 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* 9EC578 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9EC57C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9EC580 80240D90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s deleted file mode 100644 index bf18817f8e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240FAC_9F59EC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FAC_9F59EC -/* 9F59EC 80240FAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9F59F0 80240FB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9F59F4 80240FB4 0080982D */ daddu $s3, $a0, $zero -/* 9F59F8 80240FB8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9F59FC 80240FBC AFB20018 */ sw $s2, 0x18($sp) -/* 9F5A00 80240FC0 AFB10014 */ sw $s1, 0x14($sp) -/* 9F5A04 80240FC4 AFB00010 */ sw $s0, 0x10($sp) -/* 9F5A08 80240FC8 8E720148 */ lw $s2, 0x148($s3) -/* 9F5A0C 80240FCC 86440008 */ lh $a0, 8($s2) -/* 9F5A10 80240FD0 0C00EABB */ jal get_npc_unsafe -/* 9F5A14 80240FD4 00A0882D */ daddu $s1, $a1, $zero -/* 9F5A18 80240FD8 8E240008 */ lw $a0, 8($s1) -/* 9F5A1C 80240FDC 0040802D */ daddu $s0, $v0, $zero -/* 9F5A20 80240FE0 00041FC2 */ srl $v1, $a0, 0x1f -/* 9F5A24 80240FE4 00832021 */ addu $a0, $a0, $v1 -/* 9F5A28 80240FE8 00042043 */ sra $a0, $a0, 1 -/* 9F5A2C 80240FEC 0C00A67F */ jal rand_int -/* 9F5A30 80240FF0 24840001 */ addiu $a0, $a0, 1 -/* 9F5A34 80240FF4 8E230008 */ lw $v1, 8($s1) -/* 9F5A38 80240FF8 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9F5A3C 80240FFC 00032FC2 */ srl $a1, $v1, 0x1f -/* 9F5A40 80241000 00651821 */ addu $v1, $v1, $a1 -/* 9F5A44 80241004 00031843 */ sra $v1, $v1, 1 -/* 9F5A48 80241008 00621821 */ addu $v1, $v1, $v0 -/* 9F5A4C 8024100C 0C00A67F */ jal rand_int -/* 9F5A50 80241010 A603008E */ sh $v1, 0x8e($s0) -/* 9F5A54 80241014 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9F5A58 80241018 44820000 */ mtc1 $v0, $f0 -/* 9F5A5C 8024101C 00000000 */ nop -/* 9F5A60 80241020 46800020 */ cvt.s.w $f0, $f0 -/* 9F5A64 80241024 46006300 */ add.s $f12, $f12, $f0 -/* 9F5A68 80241028 3C0142B4 */ lui $at, 0x42b4 -/* 9F5A6C 8024102C 44810000 */ mtc1 $at, $f0 -/* 9F5A70 80241030 0C00A6C9 */ jal clamp_angle -/* 9F5A74 80241034 46006301 */ sub.s $f12, $f12, $f0 -/* 9F5A78 80241038 E600000C */ swc1 $f0, 0xc($s0) -/* 9F5A7C 8024103C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9F5A80 80241040 8C420000 */ lw $v0, ($v0) -/* 9F5A84 80241044 AE020028 */ sw $v0, 0x28($s0) -/* 9F5A88 80241048 24020003 */ addiu $v0, $zero, 3 -/* 9F5A8C 8024104C AE620070 */ sw $v0, 0x70($s3) -/* 9F5A90 80241050 8FBF0020 */ lw $ra, 0x20($sp) -/* 9F5A94 80241054 8FB3001C */ lw $s3, 0x1c($sp) -/* 9F5A98 80241058 8FB20018 */ lw $s2, 0x18($sp) -/* 9F5A9C 8024105C 8FB10014 */ lw $s1, 0x14($sp) -/* 9F5AA0 80241060 8FB00010 */ lw $s0, 0x10($sp) -/* 9F5AA4 80241064 03E00008 */ jr $ra -/* 9F5AA8 80241068 27BD0028 */ addiu $sp, $sp, 0x28 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 6e7f600888..d4194e3736 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 func_80240FAC_9F59EC +/* 9F665C 80241C1C 0C0903EB */ jal UnkNpcAIFunc1 /* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero /* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero /* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s deleted file mode 100644 index 661ad56312..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241144_9FB934.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241144_9FB934 -/* 9FB934 80241144 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FB938 80241148 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FB93C 8024114C 0080982D */ daddu $s3, $a0, $zero -/* 9FB940 80241150 AFBF0020 */ sw $ra, 0x20($sp) -/* 9FB944 80241154 AFB20018 */ sw $s2, 0x18($sp) -/* 9FB948 80241158 AFB10014 */ sw $s1, 0x14($sp) -/* 9FB94C 8024115C AFB00010 */ sw $s0, 0x10($sp) -/* 9FB950 80241160 8E720148 */ lw $s2, 0x148($s3) -/* 9FB954 80241164 86440008 */ lh $a0, 8($s2) -/* 9FB958 80241168 0C00EABB */ jal get_npc_unsafe -/* 9FB95C 8024116C 00A0882D */ daddu $s1, $a1, $zero -/* 9FB960 80241170 8E240008 */ lw $a0, 8($s1) -/* 9FB964 80241174 0040802D */ daddu $s0, $v0, $zero -/* 9FB968 80241178 00041FC2 */ srl $v1, $a0, 0x1f -/* 9FB96C 8024117C 00832021 */ addu $a0, $a0, $v1 -/* 9FB970 80241180 00042043 */ sra $a0, $a0, 1 -/* 9FB974 80241184 0C00A67F */ jal rand_int -/* 9FB978 80241188 24840001 */ addiu $a0, $a0, 1 -/* 9FB97C 8024118C 8E230008 */ lw $v1, 8($s1) -/* 9FB980 80241190 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9FB984 80241194 00032FC2 */ srl $a1, $v1, 0x1f -/* 9FB988 80241198 00651821 */ addu $v1, $v1, $a1 -/* 9FB98C 8024119C 00031843 */ sra $v1, $v1, 1 -/* 9FB990 802411A0 00621821 */ addu $v1, $v1, $v0 -/* 9FB994 802411A4 0C00A67F */ jal rand_int -/* 9FB998 802411A8 A603008E */ sh $v1, 0x8e($s0) -/* 9FB99C 802411AC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9FB9A0 802411B0 44820000 */ mtc1 $v0, $f0 -/* 9FB9A4 802411B4 00000000 */ nop -/* 9FB9A8 802411B8 46800020 */ cvt.s.w $f0, $f0 -/* 9FB9AC 802411BC 46006300 */ add.s $f12, $f12, $f0 -/* 9FB9B0 802411C0 3C0142B4 */ lui $at, 0x42b4 -/* 9FB9B4 802411C4 44810000 */ mtc1 $at, $f0 -/* 9FB9B8 802411C8 0C00A6C9 */ jal clamp_angle -/* 9FB9BC 802411CC 46006301 */ sub.s $f12, $f12, $f0 -/* 9FB9C0 802411D0 E600000C */ swc1 $f0, 0xc($s0) -/* 9FB9C4 802411D4 8E4200CC */ lw $v0, 0xcc($s2) -/* 9FB9C8 802411D8 8C420000 */ lw $v0, ($v0) -/* 9FB9CC 802411DC AE020028 */ sw $v0, 0x28($s0) -/* 9FB9D0 802411E0 24020003 */ addiu $v0, $zero, 3 -/* 9FB9D4 802411E4 AE620070 */ sw $v0, 0x70($s3) -/* 9FB9D8 802411E8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FB9DC 802411EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FB9E0 802411F0 8FB20018 */ lw $s2, 0x18($sp) -/* 9FB9E4 802411F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9FB9E8 802411F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9FB9EC 802411FC 03E00008 */ jr $ra -/* 9FB9F0 80241200 27BD0028 */ addiu $sp, $sp, 0x28 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 0d0590e275..379f252e32 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 func_80241144_9FB934 +/* 9FC2DC 80241AEC 0C090451 */ jal UnkNpcAIFunc1 /* 9FC2E0 80241AF0 02A0302D */ daddu $a2, $s5, $zero /* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero 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 5242862212..b39e4bd6e2 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 @@ -153,7 +153,7 @@ glabel func_80241BD4_9FC3C4 /* 9FC5FC 80241E0C 00000000 */ nop /* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero /* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero -/* 9FC608 80241E18 0C090451 */ jal func_80241144_9FB934 +/* 9FC608 80241E18 0C090451 */ jal UnkNpcAIFunc1 /* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero /* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero /* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s deleted file mode 100644 index 9cc04efa17..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240568_A00B68.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568_A00B68 -/* A00B68 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A00B6C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* A00B70 80240570 0080982D */ daddu $s3, $a0, $zero -/* A00B74 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* A00B78 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* A00B7C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* A00B80 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* A00B84 80240584 8E720148 */ lw $s2, 0x148($s3) -/* A00B88 80240588 86440008 */ lh $a0, 8($s2) -/* A00B8C 8024058C 0C00EABB */ jal get_npc_unsafe -/* A00B90 80240590 00A0882D */ daddu $s1, $a1, $zero -/* A00B94 80240594 8E240008 */ lw $a0, 8($s1) -/* A00B98 80240598 0040802D */ daddu $s0, $v0, $zero -/* A00B9C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* A00BA0 802405A0 00832021 */ addu $a0, $a0, $v1 -/* A00BA4 802405A4 00042043 */ sra $a0, $a0, 1 -/* A00BA8 802405A8 0C00A67F */ jal rand_int -/* A00BAC 802405AC 24840001 */ addiu $a0, $a0, 1 -/* A00BB0 802405B0 8E230008 */ lw $v1, 8($s1) -/* A00BB4 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* A00BB8 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* A00BBC 802405BC 00651821 */ addu $v1, $v1, $a1 -/* A00BC0 802405C0 00031843 */ sra $v1, $v1, 1 -/* A00BC4 802405C4 00621821 */ addu $v1, $v1, $v0 -/* A00BC8 802405C8 0C00A67F */ jal rand_int -/* A00BCC 802405CC A603008E */ sh $v1, 0x8e($s0) -/* A00BD0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* A00BD4 802405D4 44820000 */ mtc1 $v0, $f0 -/* A00BD8 802405D8 00000000 */ nop -/* A00BDC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* A00BE0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* A00BE4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* A00BE8 802405E8 44810000 */ mtc1 $at, $f0 -/* A00BEC 802405EC 0C00A6C9 */ jal clamp_angle -/* A00BF0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* A00BF4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* A00BF8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* A00BFC 802405FC 8C420000 */ lw $v0, ($v0) -/* A00C00 80240600 AE020028 */ sw $v0, 0x28($s0) -/* A00C04 80240604 24020003 */ addiu $v0, $zero, 3 -/* A00C08 80240608 AE620070 */ sw $v0, 0x70($s3) -/* A00C0C 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* A00C10 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* A00C14 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* A00C18 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* A00C1C 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* A00C20 80240620 03E00008 */ jr $ra -/* A00C24 80240624 27BD0028 */ addiu $sp, $sp, 0x28 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 75b03c6cf9..9d8648fd55 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 func_80240568_A00B68 +/* A01384 80240D84 0C09015A */ jal UnkNpcAIFunc1 /* A01388 80240D88 0200302D */ daddu $a2, $s0, $zero /* A0138C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* A01390 80240D90 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s deleted file mode 100644 index 62a602931e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024116C_A039AC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024116C_A039AC -/* A039AC 8024116C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A039B0 80241170 AFB3001C */ sw $s3, 0x1c($sp) -/* A039B4 80241174 0080982D */ daddu $s3, $a0, $zero -/* A039B8 80241178 AFBF0020 */ sw $ra, 0x20($sp) -/* A039BC 8024117C AFB20018 */ sw $s2, 0x18($sp) -/* A039C0 80241180 AFB10014 */ sw $s1, 0x14($sp) -/* A039C4 80241184 AFB00010 */ sw $s0, 0x10($sp) -/* A039C8 80241188 8E720148 */ lw $s2, 0x148($s3) -/* A039CC 8024118C 86440008 */ lh $a0, 8($s2) -/* A039D0 80241190 0C00EABB */ jal get_npc_unsafe -/* A039D4 80241194 00A0882D */ daddu $s1, $a1, $zero -/* A039D8 80241198 8E240008 */ lw $a0, 8($s1) -/* A039DC 8024119C 0040802D */ daddu $s0, $v0, $zero -/* A039E0 802411A0 00041FC2 */ srl $v1, $a0, 0x1f -/* A039E4 802411A4 00832021 */ addu $a0, $a0, $v1 -/* A039E8 802411A8 00042043 */ sra $a0, $a0, 1 -/* A039EC 802411AC 0C00A67F */ jal rand_int -/* A039F0 802411B0 24840001 */ addiu $a0, $a0, 1 -/* A039F4 802411B4 8E230008 */ lw $v1, 8($s1) -/* A039F8 802411B8 240400B4 */ addiu $a0, $zero, 0xb4 -/* A039FC 802411BC 00032FC2 */ srl $a1, $v1, 0x1f -/* A03A00 802411C0 00651821 */ addu $v1, $v1, $a1 -/* A03A04 802411C4 00031843 */ sra $v1, $v1, 1 -/* A03A08 802411C8 00621821 */ addu $v1, $v1, $v0 -/* A03A0C 802411CC 0C00A67F */ jal rand_int -/* A03A10 802411D0 A603008E */ sh $v1, 0x8e($s0) -/* A03A14 802411D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A03A18 802411D8 44820000 */ mtc1 $v0, $f0 -/* A03A1C 802411DC 00000000 */ nop -/* A03A20 802411E0 46800020 */ cvt.s.w $f0, $f0 -/* A03A24 802411E4 46006300 */ add.s $f12, $f12, $f0 -/* A03A28 802411E8 3C0142B4 */ lui $at, 0x42b4 -/* A03A2C 802411EC 44810000 */ mtc1 $at, $f0 -/* A03A30 802411F0 0C00A6C9 */ jal clamp_angle -/* A03A34 802411F4 46006301 */ sub.s $f12, $f12, $f0 -/* A03A38 802411F8 E600000C */ swc1 $f0, 0xc($s0) -/* A03A3C 802411FC 8E4200CC */ lw $v0, 0xcc($s2) -/* A03A40 80241200 8C420000 */ lw $v0, ($v0) -/* A03A44 80241204 AE020028 */ sw $v0, 0x28($s0) -/* A03A48 80241208 24020003 */ addiu $v0, $zero, 3 -/* A03A4C 8024120C AE620070 */ sw $v0, 0x70($s3) -/* A03A50 80241210 8FBF0020 */ lw $ra, 0x20($sp) -/* A03A54 80241214 8FB3001C */ lw $s3, 0x1c($sp) -/* A03A58 80241218 8FB20018 */ lw $s2, 0x18($sp) -/* A03A5C 8024121C 8FB10014 */ lw $s1, 0x14($sp) -/* A03A60 80241220 8FB00010 */ lw $s0, 0x10($sp) -/* A03A64 80241224 03E00008 */ jr $ra -/* A03A68 80241228 27BD0028 */ addiu $sp, $sp, 0x28 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 1369a223d6..864bdd13ba 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 func_8024116C_A039AC +/* A0461C 80241DDC 0C09045B */ jal UnkNpcAIFunc1 /* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero /* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero /* A04628 80241DE8 0200282D */ daddu $a1, $s0, $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 19bc860e78..c8d926112f 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 func_8024116C_A039AC +/* A04B5C 8024231C 0C09045B */ jal UnkNpcAIFunc1 /* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero /* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero /* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s deleted file mode 100644 index 808927853c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024128C_A0818C -/* A0818C 8024128C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A08190 80241290 AFB3001C */ sw $s3, 0x1c($sp) -/* A08194 80241294 0080982D */ daddu $s3, $a0, $zero -/* A08198 80241298 AFBF0020 */ sw $ra, 0x20($sp) -/* A0819C 8024129C AFB20018 */ sw $s2, 0x18($sp) -/* A081A0 802412A0 AFB10014 */ sw $s1, 0x14($sp) -/* A081A4 802412A4 AFB00010 */ sw $s0, 0x10($sp) -/* A081A8 802412A8 8E720148 */ lw $s2, 0x148($s3) -/* A081AC 802412AC 86440008 */ lh $a0, 8($s2) -/* A081B0 802412B0 0C00EABB */ jal get_npc_unsafe -/* A081B4 802412B4 00A0882D */ daddu $s1, $a1, $zero -/* A081B8 802412B8 8E240008 */ lw $a0, 8($s1) -/* A081BC 802412BC 0040802D */ daddu $s0, $v0, $zero -/* A081C0 802412C0 00041FC2 */ srl $v1, $a0, 0x1f -/* A081C4 802412C4 00832021 */ addu $a0, $a0, $v1 -/* A081C8 802412C8 00042043 */ sra $a0, $a0, 1 -/* A081CC 802412CC 0C00A67F */ jal rand_int -/* A081D0 802412D0 24840001 */ addiu $a0, $a0, 1 -/* A081D4 802412D4 8E230008 */ lw $v1, 8($s1) -/* A081D8 802412D8 240400B4 */ addiu $a0, $zero, 0xb4 -/* A081DC 802412DC 00032FC2 */ srl $a1, $v1, 0x1f -/* A081E0 802412E0 00651821 */ addu $v1, $v1, $a1 -/* A081E4 802412E4 00031843 */ sra $v1, $v1, 1 -/* A081E8 802412E8 00621821 */ addu $v1, $v1, $v0 -/* A081EC 802412EC 0C00A67F */ jal rand_int -/* A081F0 802412F0 A603008E */ sh $v1, 0x8e($s0) -/* A081F4 802412F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A081F8 802412F8 44820000 */ mtc1 $v0, $f0 -/* A081FC 802412FC 00000000 */ nop -/* A08200 80241300 46800020 */ cvt.s.w $f0, $f0 -/* A08204 80241304 46006300 */ add.s $f12, $f12, $f0 -/* A08208 80241308 3C0142B4 */ lui $at, 0x42b4 -/* A0820C 8024130C 44810000 */ mtc1 $at, $f0 -/* A08210 80241310 0C00A6C9 */ jal clamp_angle -/* A08214 80241314 46006301 */ sub.s $f12, $f12, $f0 -/* A08218 80241318 E600000C */ swc1 $f0, 0xc($s0) -/* A0821C 8024131C 8E4200CC */ lw $v0, 0xcc($s2) -/* A08220 80241320 8C420000 */ lw $v0, ($v0) -/* A08224 80241324 AE020028 */ sw $v0, 0x28($s0) -/* A08228 80241328 24020003 */ addiu $v0, $zero, 3 -/* A0822C 8024132C AE620070 */ sw $v0, 0x70($s3) -/* A08230 80241330 8FBF0020 */ lw $ra, 0x20($sp) -/* A08234 80241334 8FB3001C */ lw $s3, 0x1c($sp) -/* A08238 80241338 8FB20018 */ lw $s2, 0x18($sp) -/* A0823C 8024133C 8FB10014 */ lw $s1, 0x14($sp) -/* A08240 80241340 8FB00010 */ lw $s0, 0x10($sp) -/* A08244 80241344 03E00008 */ jr $ra -/* A08248 80241348 27BD0028 */ addiu $sp, $sp, 0x28 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 3e90afdc4b..6caa7d6db5 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 @@ -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 func_8024128C_A0818C +/* A08DFC 80241EFC 0C0904A3 */ jal UnkNpcAIFunc1 /* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero /* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero /* A08E08 80241F08 0200282D */ daddu $a1, $s0, $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 9c6f0d252b..dd76dbfda5 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 func_8024128C_A0818C +/* A0933C 8024243C 0C0904A3 */ jal UnkNpcAIFunc1 /* A09340 80242440 0280302D */ daddu $a2, $s4, $zero /* A09344 80242444 0260202D */ daddu $a0, $s3, $zero /* A09348 80242448 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s deleted file mode 100644 index 7a4d79f352..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240B78_DADF78.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B78_DADF78 -/* DADF78 80240B78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DADF7C 80240B7C AFB3001C */ sw $s3, 0x1c($sp) -/* DADF80 80240B80 0080982D */ daddu $s3, $a0, $zero -/* DADF84 80240B84 AFBF0020 */ sw $ra, 0x20($sp) -/* DADF88 80240B88 AFB20018 */ sw $s2, 0x18($sp) -/* DADF8C 80240B8C AFB10014 */ sw $s1, 0x14($sp) -/* DADF90 80240B90 AFB00010 */ sw $s0, 0x10($sp) -/* DADF94 80240B94 8E720148 */ lw $s2, 0x148($s3) -/* DADF98 80240B98 86440008 */ lh $a0, 8($s2) -/* DADF9C 80240B9C 0C00EABB */ jal get_npc_unsafe -/* DADFA0 80240BA0 00A0882D */ daddu $s1, $a1, $zero -/* DADFA4 80240BA4 8E240008 */ lw $a0, 8($s1) -/* DADFA8 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* DADFAC 80240BAC 00041FC2 */ srl $v1, $a0, 0x1f -/* DADFB0 80240BB0 00832021 */ addu $a0, $a0, $v1 -/* DADFB4 80240BB4 00042043 */ sra $a0, $a0, 1 -/* DADFB8 80240BB8 0C00A67F */ jal rand_int -/* DADFBC 80240BBC 24840001 */ addiu $a0, $a0, 1 -/* DADFC0 80240BC0 8E230008 */ lw $v1, 8($s1) -/* DADFC4 80240BC4 240400B4 */ addiu $a0, $zero, 0xb4 -/* DADFC8 80240BC8 00032FC2 */ srl $a1, $v1, 0x1f -/* DADFCC 80240BCC 00651821 */ addu $v1, $v1, $a1 -/* DADFD0 80240BD0 00031843 */ sra $v1, $v1, 1 -/* DADFD4 80240BD4 00621821 */ addu $v1, $v1, $v0 -/* DADFD8 80240BD8 0C00A67F */ jal rand_int -/* DADFDC 80240BDC A603008E */ sh $v1, 0x8e($s0) -/* DADFE0 80240BE0 C60C000C */ lwc1 $f12, 0xc($s0) -/* DADFE4 80240BE4 44820000 */ mtc1 $v0, $f0 -/* DADFE8 80240BE8 00000000 */ nop -/* DADFEC 80240BEC 46800020 */ cvt.s.w $f0, $f0 -/* DADFF0 80240BF0 46006300 */ add.s $f12, $f12, $f0 -/* DADFF4 80240BF4 3C0142B4 */ lui $at, 0x42b4 -/* DADFF8 80240BF8 44810000 */ mtc1 $at, $f0 -/* DADFFC 80240BFC 0C00A6C9 */ jal clamp_angle -/* DAE000 80240C00 46006301 */ sub.s $f12, $f12, $f0 -/* DAE004 80240C04 E600000C */ swc1 $f0, 0xc($s0) -/* DAE008 80240C08 8E4200CC */ lw $v0, 0xcc($s2) -/* DAE00C 80240C0C 8C420000 */ lw $v0, ($v0) -/* DAE010 80240C10 AE020028 */ sw $v0, 0x28($s0) -/* DAE014 80240C14 24020003 */ addiu $v0, $zero, 3 -/* DAE018 80240C18 AE620070 */ sw $v0, 0x70($s3) -/* DAE01C 80240C1C 8FBF0020 */ lw $ra, 0x20($sp) -/* DAE020 80240C20 8FB3001C */ lw $s3, 0x1c($sp) -/* DAE024 80240C24 8FB20018 */ lw $s2, 0x18($sp) -/* DAE028 80240C28 8FB10014 */ lw $s1, 0x14($sp) -/* DAE02C 80240C2C 8FB00010 */ lw $s0, 0x10($sp) -/* DAE030 80240C30 03E00008 */ jr $ra -/* DAE034 80240C34 27BD0028 */ addiu $sp, $sp, 0x28 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 c2cc66c093..ddf06ed8a0 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 func_80240B78_DADF78 +/* DAEBE8 802417E8 0C0902DE */ jal UnkNpcAIFunc1 /* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero /* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero /* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s deleted file mode 100644 index 7b754499ce..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_8024122C_DB34EC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024122C_DB34EC -/* DB34EC 8024122C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DB34F0 80241230 AFB3001C */ sw $s3, 0x1c($sp) -/* DB34F4 80241234 0080982D */ daddu $s3, $a0, $zero -/* DB34F8 80241238 AFBF0020 */ sw $ra, 0x20($sp) -/* DB34FC 8024123C AFB20018 */ sw $s2, 0x18($sp) -/* DB3500 80241240 AFB10014 */ sw $s1, 0x14($sp) -/* DB3504 80241244 AFB00010 */ sw $s0, 0x10($sp) -/* DB3508 80241248 8E720148 */ lw $s2, 0x148($s3) -/* DB350C 8024124C 86440008 */ lh $a0, 8($s2) -/* DB3510 80241250 0C00EABB */ jal get_npc_unsafe -/* DB3514 80241254 00A0882D */ daddu $s1, $a1, $zero -/* DB3518 80241258 8E240008 */ lw $a0, 8($s1) -/* DB351C 8024125C 0040802D */ daddu $s0, $v0, $zero -/* DB3520 80241260 00041FC2 */ srl $v1, $a0, 0x1f -/* DB3524 80241264 00832021 */ addu $a0, $a0, $v1 -/* DB3528 80241268 00042043 */ sra $a0, $a0, 1 -/* DB352C 8024126C 0C00A67F */ jal rand_int -/* DB3530 80241270 24840001 */ addiu $a0, $a0, 1 -/* DB3534 80241274 8E230008 */ lw $v1, 8($s1) -/* DB3538 80241278 240400B4 */ addiu $a0, $zero, 0xb4 -/* DB353C 8024127C 00032FC2 */ srl $a1, $v1, 0x1f -/* DB3540 80241280 00651821 */ addu $v1, $v1, $a1 -/* DB3544 80241284 00031843 */ sra $v1, $v1, 1 -/* DB3548 80241288 00621821 */ addu $v1, $v1, $v0 -/* DB354C 8024128C 0C00A67F */ jal rand_int -/* DB3550 80241290 A603008E */ sh $v1, 0x8e($s0) -/* DB3554 80241294 C60C000C */ lwc1 $f12, 0xc($s0) -/* DB3558 80241298 44820000 */ mtc1 $v0, $f0 -/* DB355C 8024129C 00000000 */ nop -/* DB3560 802412A0 46800020 */ cvt.s.w $f0, $f0 -/* DB3564 802412A4 46006300 */ add.s $f12, $f12, $f0 -/* DB3568 802412A8 3C0142B4 */ lui $at, 0x42b4 -/* DB356C 802412AC 44810000 */ mtc1 $at, $f0 -/* DB3570 802412B0 0C00A6C9 */ jal clamp_angle -/* DB3574 802412B4 46006301 */ sub.s $f12, $f12, $f0 -/* DB3578 802412B8 E600000C */ swc1 $f0, 0xc($s0) -/* DB357C 802412BC 8E4200CC */ lw $v0, 0xcc($s2) -/* DB3580 802412C0 8C420000 */ lw $v0, ($v0) -/* DB3584 802412C4 AE020028 */ sw $v0, 0x28($s0) -/* DB3588 802412C8 24020003 */ addiu $v0, $zero, 3 -/* DB358C 802412CC AE620070 */ sw $v0, 0x70($s3) -/* DB3590 802412D0 8FBF0020 */ lw $ra, 0x20($sp) -/* DB3594 802412D4 8FB3001C */ lw $s3, 0x1c($sp) -/* DB3598 802412D8 8FB20018 */ lw $s2, 0x18($sp) -/* DB359C 802412DC 8FB10014 */ lw $s1, 0x14($sp) -/* DB35A0 802412E0 8FB00010 */ lw $s0, 0x10($sp) -/* DB35A4 802412E4 03E00008 */ jr $ra -/* DB35A8 802412E8 27BD0028 */ addiu $sp, $sp, 0x28 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 be38ea0d45..45d65e20dc 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 func_8024122C_DB34EC +/* DB415C 80241E9C 0C09048B */ jal UnkNpcAIFunc1 /* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero /* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero /* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s deleted file mode 100644 index 1fd4d54aeb..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024096C_DBDC1C -/* DBDC1C 8024096C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DBDC20 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* DBDC24 80240974 0080982D */ daddu $s3, $a0, $zero -/* DBDC28 80240978 AFBF0020 */ sw $ra, 0x20($sp) -/* DBDC2C 8024097C AFB20018 */ sw $s2, 0x18($sp) -/* DBDC30 80240980 AFB10014 */ sw $s1, 0x14($sp) -/* DBDC34 80240984 AFB00010 */ sw $s0, 0x10($sp) -/* DBDC38 80240988 8E720148 */ lw $s2, 0x148($s3) -/* DBDC3C 8024098C 86440008 */ lh $a0, 8($s2) -/* DBDC40 80240990 0C00EABB */ jal get_npc_unsafe -/* DBDC44 80240994 00A0882D */ daddu $s1, $a1, $zero -/* DBDC48 80240998 8E240008 */ lw $a0, 8($s1) -/* DBDC4C 8024099C 0040802D */ daddu $s0, $v0, $zero -/* DBDC50 802409A0 00041FC2 */ srl $v1, $a0, 0x1f -/* DBDC54 802409A4 00832021 */ addu $a0, $a0, $v1 -/* DBDC58 802409A8 00042043 */ sra $a0, $a0, 1 -/* DBDC5C 802409AC 0C00A67F */ jal rand_int -/* DBDC60 802409B0 24840001 */ addiu $a0, $a0, 1 -/* DBDC64 802409B4 8E230008 */ lw $v1, 8($s1) -/* DBDC68 802409B8 240400B4 */ addiu $a0, $zero, 0xb4 -/* DBDC6C 802409BC 00032FC2 */ srl $a1, $v1, 0x1f -/* DBDC70 802409C0 00651821 */ addu $v1, $v1, $a1 -/* DBDC74 802409C4 00031843 */ sra $v1, $v1, 1 -/* DBDC78 802409C8 00621821 */ addu $v1, $v1, $v0 -/* DBDC7C 802409CC 0C00A67F */ jal rand_int -/* DBDC80 802409D0 A603008E */ sh $v1, 0x8e($s0) -/* DBDC84 802409D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DBDC88 802409D8 44820000 */ mtc1 $v0, $f0 -/* DBDC8C 802409DC 00000000 */ nop -/* DBDC90 802409E0 46800020 */ cvt.s.w $f0, $f0 -/* DBDC94 802409E4 46006300 */ add.s $f12, $f12, $f0 -/* DBDC98 802409E8 3C0142B4 */ lui $at, 0x42b4 -/* DBDC9C 802409EC 44810000 */ mtc1 $at, $f0 -/* DBDCA0 802409F0 0C00A6C9 */ jal clamp_angle -/* DBDCA4 802409F4 46006301 */ sub.s $f12, $f12, $f0 -/* DBDCA8 802409F8 E600000C */ swc1 $f0, 0xc($s0) -/* DBDCAC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* DBDCB0 80240A00 8C420000 */ lw $v0, ($v0) -/* DBDCB4 80240A04 AE020028 */ sw $v0, 0x28($s0) -/* DBDCB8 80240A08 24020003 */ addiu $v0, $zero, 3 -/* DBDCBC 80240A0C AE620070 */ sw $v0, 0x70($s3) -/* DBDCC0 80240A10 8FBF0020 */ lw $ra, 0x20($sp) -/* DBDCC4 80240A14 8FB3001C */ lw $s3, 0x1c($sp) -/* DBDCC8 80240A18 8FB20018 */ lw $s2, 0x18($sp) -/* DBDCCC 80240A1C 8FB10014 */ lw $s1, 0x14($sp) -/* DBDCD0 80240A20 8FB00010 */ lw $s0, 0x10($sp) -/* DBDCD4 80240A24 03E00008 */ jr $ra -/* DBDCD8 80240A28 27BD0028 */ addiu $sp, $sp, 0x28 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 2552222db7..c0b3c23372 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 func_8024096C_DBDC1C +/* DBE5C4 80241314 0C09025B */ jal UnkNpcAIFunc1 /* DBE5C8 80241318 02A0302D */ daddu $a2, $s5, $zero /* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero /* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero 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 0555f0e4a1..57c4af48bd 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 func_8024096C_DBDC1C +/* DBEAF8 80241848 0C09025B */ jal UnkNpcAIFunc1 /* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero /* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s deleted file mode 100644 index 3c6d2aba76..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024134C_DCE01C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024134C_DCE01C -/* DCE01C 8024134C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DCE020 80241350 AFB3001C */ sw $s3, 0x1c($sp) -/* DCE024 80241354 0080982D */ daddu $s3, $a0, $zero -/* DCE028 80241358 AFBF0020 */ sw $ra, 0x20($sp) -/* DCE02C 8024135C AFB20018 */ sw $s2, 0x18($sp) -/* DCE030 80241360 AFB10014 */ sw $s1, 0x14($sp) -/* DCE034 80241364 AFB00010 */ sw $s0, 0x10($sp) -/* DCE038 80241368 8E720148 */ lw $s2, 0x148($s3) -/* DCE03C 8024136C 86440008 */ lh $a0, 8($s2) -/* DCE040 80241370 0C00EABB */ jal get_npc_unsafe -/* DCE044 80241374 00A0882D */ daddu $s1, $a1, $zero -/* DCE048 80241378 8E240008 */ lw $a0, 8($s1) -/* DCE04C 8024137C 0040802D */ daddu $s0, $v0, $zero -/* DCE050 80241380 00041FC2 */ srl $v1, $a0, 0x1f -/* DCE054 80241384 00832021 */ addu $a0, $a0, $v1 -/* DCE058 80241388 00042043 */ sra $a0, $a0, 1 -/* DCE05C 8024138C 0C00A67F */ jal rand_int -/* DCE060 80241390 24840001 */ addiu $a0, $a0, 1 -/* DCE064 80241394 8E230008 */ lw $v1, 8($s1) -/* DCE068 80241398 240400B4 */ addiu $a0, $zero, 0xb4 -/* DCE06C 8024139C 00032FC2 */ srl $a1, $v1, 0x1f -/* DCE070 802413A0 00651821 */ addu $v1, $v1, $a1 -/* DCE074 802413A4 00031843 */ sra $v1, $v1, 1 -/* DCE078 802413A8 00621821 */ addu $v1, $v1, $v0 -/* DCE07C 802413AC 0C00A67F */ jal rand_int -/* DCE080 802413B0 A603008E */ sh $v1, 0x8e($s0) -/* DCE084 802413B4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DCE088 802413B8 44820000 */ mtc1 $v0, $f0 -/* DCE08C 802413BC 00000000 */ nop -/* DCE090 802413C0 46800020 */ cvt.s.w $f0, $f0 -/* DCE094 802413C4 46006300 */ add.s $f12, $f12, $f0 -/* DCE098 802413C8 3C0142B4 */ lui $at, 0x42b4 -/* DCE09C 802413CC 44810000 */ mtc1 $at, $f0 -/* DCE0A0 802413D0 0C00A6C9 */ jal clamp_angle -/* DCE0A4 802413D4 46006301 */ sub.s $f12, $f12, $f0 -/* DCE0A8 802413D8 E600000C */ swc1 $f0, 0xc($s0) -/* DCE0AC 802413DC 8E4200CC */ lw $v0, 0xcc($s2) -/* DCE0B0 802413E0 8C420000 */ lw $v0, ($v0) -/* DCE0B4 802413E4 AE020028 */ sw $v0, 0x28($s0) -/* DCE0B8 802413E8 24020003 */ addiu $v0, $zero, 3 -/* DCE0BC 802413EC AE620070 */ sw $v0, 0x70($s3) -/* DCE0C0 802413F0 8FBF0020 */ lw $ra, 0x20($sp) -/* DCE0C4 802413F4 8FB3001C */ lw $s3, 0x1c($sp) -/* DCE0C8 802413F8 8FB20018 */ lw $s2, 0x18($sp) -/* DCE0CC 802413FC 8FB10014 */ lw $s1, 0x14($sp) -/* DCE0D0 80241400 8FB00010 */ lw $s0, 0x10($sp) -/* DCE0D4 80241404 03E00008 */ jr $ra -/* DCE0D8 80241408 27BD0028 */ addiu $sp, $sp, 0x28 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 b96af05373..4486b65964 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 func_8024134C_DCE01C +/* DCE9C4 80241CF4 0C0904D3 */ jal UnkNpcAIFunc1 /* DCE9C8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero 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 0ed26c1877..2361334362 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 func_8024134C_DCE01C +/* DCEEF8 80242228 0C0904D3 */ jal UnkNpcAIFunc1 /* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero /* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s deleted file mode 100644 index 1fa9a42b98..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024178C_DF062C -/* DF062C 8024178C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF0630 80241790 AFB3001C */ sw $s3, 0x1c($sp) -/* DF0634 80241794 0080982D */ daddu $s3, $a0, $zero -/* DF0638 80241798 AFBF0020 */ sw $ra, 0x20($sp) -/* DF063C 8024179C AFB20018 */ sw $s2, 0x18($sp) -/* DF0640 802417A0 AFB10014 */ sw $s1, 0x14($sp) -/* DF0644 802417A4 AFB00010 */ sw $s0, 0x10($sp) -/* DF0648 802417A8 8E720148 */ lw $s2, 0x148($s3) -/* DF064C 802417AC 86440008 */ lh $a0, 8($s2) -/* DF0650 802417B0 0C00EABB */ jal get_npc_unsafe -/* DF0654 802417B4 00A0882D */ daddu $s1, $a1, $zero -/* DF0658 802417B8 8E240008 */ lw $a0, 8($s1) -/* DF065C 802417BC 0040802D */ daddu $s0, $v0, $zero -/* DF0660 802417C0 00041FC2 */ srl $v1, $a0, 0x1f -/* DF0664 802417C4 00832021 */ addu $a0, $a0, $v1 -/* DF0668 802417C8 00042043 */ sra $a0, $a0, 1 -/* DF066C 802417CC 0C00A67F */ jal rand_int -/* DF0670 802417D0 24840001 */ addiu $a0, $a0, 1 -/* DF0674 802417D4 8E230008 */ lw $v1, 8($s1) -/* DF0678 802417D8 240400B4 */ addiu $a0, $zero, 0xb4 -/* DF067C 802417DC 00032FC2 */ srl $a1, $v1, 0x1f -/* DF0680 802417E0 00651821 */ addu $v1, $v1, $a1 -/* DF0684 802417E4 00031843 */ sra $v1, $v1, 1 -/* DF0688 802417E8 00621821 */ addu $v1, $v1, $v0 -/* DF068C 802417EC 0C00A67F */ jal rand_int -/* DF0690 802417F0 A603008E */ sh $v1, 0x8e($s0) -/* DF0694 802417F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DF0698 802417F8 44820000 */ mtc1 $v0, $f0 -/* DF069C 802417FC 00000000 */ nop -/* DF06A0 80241800 46800020 */ cvt.s.w $f0, $f0 -/* DF06A4 80241804 46006300 */ add.s $f12, $f12, $f0 -/* DF06A8 80241808 3C0142B4 */ lui $at, 0x42b4 -/* DF06AC 8024180C 44810000 */ mtc1 $at, $f0 -/* DF06B0 80241810 0C00A6C9 */ jal clamp_angle -/* DF06B4 80241814 46006301 */ sub.s $f12, $f12, $f0 -/* DF06B8 80241818 E600000C */ swc1 $f0, 0xc($s0) -/* DF06BC 8024181C 8E4200CC */ lw $v0, 0xcc($s2) -/* DF06C0 80241820 8C420000 */ lw $v0, ($v0) -/* DF06C4 80241824 AE020028 */ sw $v0, 0x28($s0) -/* DF06C8 80241828 24020003 */ addiu $v0, $zero, 3 -/* DF06CC 8024182C AE620070 */ sw $v0, 0x70($s3) -/* DF06D0 80241830 8FBF0020 */ lw $ra, 0x20($sp) -/* DF06D4 80241834 8FB3001C */ lw $s3, 0x1c($sp) -/* DF06D8 80241838 8FB20018 */ lw $s2, 0x18($sp) -/* DF06DC 8024183C 8FB10014 */ lw $s1, 0x14($sp) -/* DF06E0 80241840 8FB00010 */ lw $s0, 0x10($sp) -/* DF06E4 80241844 03E00008 */ jr $ra -/* DF06E8 80241848 27BD0028 */ addiu $sp, $sp, 0x28 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 32adbed9c2..ddf803df36 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 func_8024178C_DF062C +/* DF129C 802423FC 0C0905E3 */ jal UnkNpcAIFunc1 /* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero /* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero /* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s deleted file mode 100644 index aed6642c59..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241320_D8E570.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320_D8E570 -/* D8E570 80241320 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D8E574 80241324 AFB3001C */ sw $s3, 0x1c($sp) -/* D8E578 80241328 0080982D */ daddu $s3, $a0, $zero -/* D8E57C 8024132C AFBF0020 */ sw $ra, 0x20($sp) -/* D8E580 80241330 AFB20018 */ sw $s2, 0x18($sp) -/* D8E584 80241334 AFB10014 */ sw $s1, 0x14($sp) -/* D8E588 80241338 AFB00010 */ sw $s0, 0x10($sp) -/* D8E58C 8024133C 8E720148 */ lw $s2, 0x148($s3) -/* D8E590 80241340 86440008 */ lh $a0, 8($s2) -/* D8E594 80241344 0C00EABB */ jal get_npc_unsafe -/* D8E598 80241348 00A0882D */ daddu $s1, $a1, $zero -/* D8E59C 8024134C 8E240008 */ lw $a0, 8($s1) -/* D8E5A0 80241350 0040802D */ daddu $s0, $v0, $zero -/* D8E5A4 80241354 00041FC2 */ srl $v1, $a0, 0x1f -/* D8E5A8 80241358 00832021 */ addu $a0, $a0, $v1 -/* D8E5AC 8024135C 00042043 */ sra $a0, $a0, 1 -/* D8E5B0 80241360 0C00A67F */ jal rand_int -/* D8E5B4 80241364 24840001 */ addiu $a0, $a0, 1 -/* D8E5B8 80241368 8E230008 */ lw $v1, 8($s1) -/* D8E5BC 8024136C 240400B4 */ addiu $a0, $zero, 0xb4 -/* D8E5C0 80241370 00032FC2 */ srl $a1, $v1, 0x1f -/* D8E5C4 80241374 00651821 */ addu $v1, $v1, $a1 -/* D8E5C8 80241378 00031843 */ sra $v1, $v1, 1 -/* D8E5CC 8024137C 00621821 */ addu $v1, $v1, $v0 -/* D8E5D0 80241380 0C00A67F */ jal rand_int -/* D8E5D4 80241384 A603008E */ sh $v1, 0x8e($s0) -/* D8E5D8 80241388 C60C000C */ lwc1 $f12, 0xc($s0) -/* D8E5DC 8024138C 44820000 */ mtc1 $v0, $f0 -/* D8E5E0 80241390 00000000 */ nop -/* D8E5E4 80241394 46800020 */ cvt.s.w $f0, $f0 -/* D8E5E8 80241398 46006300 */ add.s $f12, $f12, $f0 -/* D8E5EC 8024139C 3C0142B4 */ lui $at, 0x42b4 -/* D8E5F0 802413A0 44810000 */ mtc1 $at, $f0 -/* D8E5F4 802413A4 0C00A6C9 */ jal clamp_angle -/* D8E5F8 802413A8 46006301 */ sub.s $f12, $f12, $f0 -/* D8E5FC 802413AC E600000C */ swc1 $f0, 0xc($s0) -/* D8E600 802413B0 8E4200CC */ lw $v0, 0xcc($s2) -/* D8E604 802413B4 8C420000 */ lw $v0, ($v0) -/* D8E608 802413B8 AE020028 */ sw $v0, 0x28($s0) -/* D8E60C 802413BC 24020003 */ addiu $v0, $zero, 3 -/* D8E610 802413C0 AE620070 */ sw $v0, 0x70($s3) -/* D8E614 802413C4 8FBF0020 */ lw $ra, 0x20($sp) -/* D8E618 802413C8 8FB3001C */ lw $s3, 0x1c($sp) -/* D8E61C 802413CC 8FB20018 */ lw $s2, 0x18($sp) -/* D8E620 802413D0 8FB10014 */ lw $s1, 0x14($sp) -/* D8E624 802413D4 8FB00010 */ lw $s0, 0x10($sp) -/* D8E628 802413D8 03E00008 */ jr $ra -/* D8E62C 802413DC 27BD0028 */ addiu $sp, $sp, 0x28 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 69e646a70d..cc57cdbf21 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 func_80241320_D8E570 +/* D8EF18 80241CC8 0C0904C8 */ jal UnkNpcAIFunc1 /* D8EF1C 80241CCC 02A0302D */ daddu $a2, $s5, $zero /* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero 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 19f3e139ee..4608a73b58 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 @@ -117,7 +117,7 @@ glabel func_802423CC_D8F61C /* D8F7C4 80242574 00000000 */ nop /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero -/* D8F7D0 80242580 0C0904C8 */ jal func_80241320_D8E570 +/* D8F7D0 80242580 0C0904C8 */ jal UnkNpcAIFunc1 /* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s deleted file mode 100644 index a3d18994b4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D28_D20BB8 -/* D20BB8 80240D28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D20BBC 80240D2C AFB3001C */ sw $s3, 0x1c($sp) -/* D20BC0 80240D30 0080982D */ daddu $s3, $a0, $zero -/* D20BC4 80240D34 AFBF0020 */ sw $ra, 0x20($sp) -/* D20BC8 80240D38 AFB20018 */ sw $s2, 0x18($sp) -/* D20BCC 80240D3C AFB10014 */ sw $s1, 0x14($sp) -/* D20BD0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D20BD4 80240D44 8E720148 */ lw $s2, 0x148($s3) -/* D20BD8 80240D48 86440008 */ lh $a0, 8($s2) -/* D20BDC 80240D4C 0C00EABB */ jal get_npc_unsafe -/* D20BE0 80240D50 00A0882D */ daddu $s1, $a1, $zero -/* D20BE4 80240D54 8E240008 */ lw $a0, 8($s1) -/* D20BE8 80240D58 0040802D */ daddu $s0, $v0, $zero -/* D20BEC 80240D5C 00041FC2 */ srl $v1, $a0, 0x1f -/* D20BF0 80240D60 00832021 */ addu $a0, $a0, $v1 -/* D20BF4 80240D64 00042043 */ sra $a0, $a0, 1 -/* D20BF8 80240D68 0C00A67F */ jal rand_int -/* D20BFC 80240D6C 24840001 */ addiu $a0, $a0, 1 -/* D20C00 80240D70 8E230008 */ lw $v1, 8($s1) -/* D20C04 80240D74 240400B4 */ addiu $a0, $zero, 0xb4 -/* D20C08 80240D78 00032FC2 */ srl $a1, $v1, 0x1f -/* D20C0C 80240D7C 00651821 */ addu $v1, $v1, $a1 -/* D20C10 80240D80 00031843 */ sra $v1, $v1, 1 -/* D20C14 80240D84 00621821 */ addu $v1, $v1, $v0 -/* D20C18 80240D88 0C00A67F */ jal rand_int -/* D20C1C 80240D8C A603008E */ sh $v1, 0x8e($s0) -/* D20C20 80240D90 C60C000C */ lwc1 $f12, 0xc($s0) -/* D20C24 80240D94 44820000 */ mtc1 $v0, $f0 -/* D20C28 80240D98 00000000 */ nop -/* D20C2C 80240D9C 46800020 */ cvt.s.w $f0, $f0 -/* D20C30 80240DA0 46006300 */ add.s $f12, $f12, $f0 -/* D20C34 80240DA4 3C0142B4 */ lui $at, 0x42b4 -/* D20C38 80240DA8 44810000 */ mtc1 $at, $f0 -/* D20C3C 80240DAC 0C00A6C9 */ jal clamp_angle -/* D20C40 80240DB0 46006301 */ sub.s $f12, $f12, $f0 -/* D20C44 80240DB4 E600000C */ swc1 $f0, 0xc($s0) -/* D20C48 80240DB8 8E4200CC */ lw $v0, 0xcc($s2) -/* D20C4C 80240DBC 8C420000 */ lw $v0, ($v0) -/* D20C50 80240DC0 AE020028 */ sw $v0, 0x28($s0) -/* D20C54 80240DC4 24020003 */ addiu $v0, $zero, 3 -/* D20C58 80240DC8 AE620070 */ sw $v0, 0x70($s3) -/* D20C5C 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) -/* D20C60 80240DD0 8FB3001C */ lw $s3, 0x1c($sp) -/* D20C64 80240DD4 8FB20018 */ lw $s2, 0x18($sp) -/* D20C68 80240DD8 8FB10014 */ lw $s1, 0x14($sp) -/* D20C6C 80240DDC 8FB00010 */ lw $s0, 0x10($sp) -/* D20C70 80240DE0 03E00008 */ jr $ra -/* D20C74 80240DE4 27BD0028 */ addiu $sp, $sp, 0x28 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 43f5be683c..77844bca49 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 func_80240D28_D20BB8 +/* D21828 80241998 0C09034A */ jal UnkNpcAIFunc1 /* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero /* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero /* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s deleted file mode 100644 index e1ab7778a5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BC8_87B7A8 -/* 87B7A8 80241BC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87B7AC 80241BCC AFB3001C */ sw $s3, 0x1c($sp) -/* 87B7B0 80241BD0 0080982D */ daddu $s3, $a0, $zero -/* 87B7B4 80241BD4 AFBF0020 */ sw $ra, 0x20($sp) -/* 87B7B8 80241BD8 AFB20018 */ sw $s2, 0x18($sp) -/* 87B7BC 80241BDC AFB10014 */ sw $s1, 0x14($sp) -/* 87B7C0 80241BE0 AFB00010 */ sw $s0, 0x10($sp) -/* 87B7C4 80241BE4 8E720148 */ lw $s2, 0x148($s3) -/* 87B7C8 80241BE8 86440008 */ lh $a0, 8($s2) -/* 87B7CC 80241BEC 0C00EABB */ jal get_npc_unsafe -/* 87B7D0 80241BF0 00A0882D */ daddu $s1, $a1, $zero -/* 87B7D4 80241BF4 8E240008 */ lw $a0, 8($s1) -/* 87B7D8 80241BF8 0040802D */ daddu $s0, $v0, $zero -/* 87B7DC 80241BFC 00041FC2 */ srl $v1, $a0, 0x1f -/* 87B7E0 80241C00 00832021 */ addu $a0, $a0, $v1 -/* 87B7E4 80241C04 00042043 */ sra $a0, $a0, 1 -/* 87B7E8 80241C08 0C00A67F */ jal rand_int -/* 87B7EC 80241C0C 24840001 */ addiu $a0, $a0, 1 -/* 87B7F0 80241C10 8E230008 */ lw $v1, 8($s1) -/* 87B7F4 80241C14 240400B4 */ addiu $a0, $zero, 0xb4 -/* 87B7F8 80241C18 00032FC2 */ srl $a1, $v1, 0x1f -/* 87B7FC 80241C1C 00651821 */ addu $v1, $v1, $a1 -/* 87B800 80241C20 00031843 */ sra $v1, $v1, 1 -/* 87B804 80241C24 00621821 */ addu $v1, $v1, $v0 -/* 87B808 80241C28 0C00A67F */ jal rand_int -/* 87B80C 80241C2C A603008E */ sh $v1, 0x8e($s0) -/* 87B810 80241C30 C60C000C */ lwc1 $f12, 0xc($s0) -/* 87B814 80241C34 44820000 */ mtc1 $v0, $f0 -/* 87B818 80241C38 00000000 */ nop -/* 87B81C 80241C3C 46800020 */ cvt.s.w $f0, $f0 -/* 87B820 80241C40 46006300 */ add.s $f12, $f12, $f0 -/* 87B824 80241C44 3C0142B4 */ lui $at, 0x42b4 -/* 87B828 80241C48 44810000 */ mtc1 $at, $f0 -/* 87B82C 80241C4C 0C00A6C9 */ jal clamp_angle -/* 87B830 80241C50 46006301 */ sub.s $f12, $f12, $f0 -/* 87B834 80241C54 E600000C */ swc1 $f0, 0xc($s0) -/* 87B838 80241C58 8E4200CC */ lw $v0, 0xcc($s2) -/* 87B83C 80241C5C 8C420000 */ lw $v0, ($v0) -/* 87B840 80241C60 AE020028 */ sw $v0, 0x28($s0) -/* 87B844 80241C64 24020003 */ addiu $v0, $zero, 3 -/* 87B848 80241C68 AE620070 */ sw $v0, 0x70($s3) -/* 87B84C 80241C6C 8FBF0020 */ lw $ra, 0x20($sp) -/* 87B850 80241C70 8FB3001C */ lw $s3, 0x1c($sp) -/* 87B854 80241C74 8FB20018 */ lw $s2, 0x18($sp) -/* 87B858 80241C78 8FB10014 */ lw $s1, 0x14($sp) -/* 87B85C 80241C7C 8FB00010 */ lw $s0, 0x10($sp) -/* 87B860 80241C80 03E00008 */ jr $ra -/* 87B864 80241C84 27BD0028 */ addiu $sp, $sp, 0x28 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 49b86e363e..95a22fd1f3 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 func_80241BC8_87B7A8 +/* 87C418 80242838 0C0906F2 */ jal UnkNpcAIFunc1 /* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero /* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero /* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s deleted file mode 100644 index 6294825fa9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB4_9A1C94 -/* 9A1C94 80240CB4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A1C98 80240CB8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A1C9C 80240CBC 0080982D */ daddu $s3, $a0, $zero -/* 9A1CA0 80240CC0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A1CA4 80240CC4 AFB20018 */ sw $s2, 0x18($sp) -/* 9A1CA8 80240CC8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1CAC 80240CCC AFB00010 */ sw $s0, 0x10($sp) -/* 9A1CB0 80240CD0 8E720148 */ lw $s2, 0x148($s3) -/* 9A1CB4 80240CD4 86440008 */ lh $a0, 8($s2) -/* 9A1CB8 80240CD8 0C00EABB */ jal get_npc_unsafe -/* 9A1CBC 80240CDC 00A0882D */ daddu $s1, $a1, $zero -/* 9A1CC0 80240CE0 8E240008 */ lw $a0, 8($s1) -/* 9A1CC4 80240CE4 0040802D */ daddu $s0, $v0, $zero -/* 9A1CC8 80240CE8 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A1CCC 80240CEC 00832021 */ addu $a0, $a0, $v1 -/* 9A1CD0 80240CF0 00042043 */ sra $a0, $a0, 1 -/* 9A1CD4 80240CF4 0C00A67F */ jal rand_int -/* 9A1CD8 80240CF8 24840001 */ addiu $a0, $a0, 1 -/* 9A1CDC 80240CFC 8E230008 */ lw $v1, 8($s1) -/* 9A1CE0 80240D00 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9A1CE4 80240D04 00032FC2 */ srl $a1, $v1, 0x1f -/* 9A1CE8 80240D08 00651821 */ addu $v1, $v1, $a1 -/* 9A1CEC 80240D0C 00031843 */ sra $v1, $v1, 1 -/* 9A1CF0 80240D10 00621821 */ addu $v1, $v1, $v0 -/* 9A1CF4 80240D14 0C00A67F */ jal rand_int -/* 9A1CF8 80240D18 A603008E */ sh $v1, 0x8e($s0) -/* 9A1CFC 80240D1C C60C000C */ lwc1 $f12, 0xc($s0) -/* 9A1D00 80240D20 44820000 */ mtc1 $v0, $f0 -/* 9A1D04 80240D24 00000000 */ nop -/* 9A1D08 80240D28 46800020 */ cvt.s.w $f0, $f0 -/* 9A1D0C 80240D2C 46006300 */ add.s $f12, $f12, $f0 -/* 9A1D10 80240D30 3C0142B4 */ lui $at, 0x42b4 -/* 9A1D14 80240D34 44810000 */ mtc1 $at, $f0 -/* 9A1D18 80240D38 0C00A6C9 */ jal clamp_angle -/* 9A1D1C 80240D3C 46006301 */ sub.s $f12, $f12, $f0 -/* 9A1D20 80240D40 E600000C */ swc1 $f0, 0xc($s0) -/* 9A1D24 80240D44 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A1D28 80240D48 8C420000 */ lw $v0, ($v0) -/* 9A1D2C 80240D4C AE020028 */ sw $v0, 0x28($s0) -/* 9A1D30 80240D50 24020003 */ addiu $v0, $zero, 3 -/* 9A1D34 80240D54 AE620070 */ sw $v0, 0x70($s3) -/* 9A1D38 80240D58 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A1D3C 80240D5C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A1D40 80240D60 8FB20018 */ lw $s2, 0x18($sp) -/* 9A1D44 80240D64 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1D48 80240D68 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1D4C 80240D6C 03E00008 */ jr $ra -/* 9A1D50 80240D70 27BD0028 */ addiu $sp, $sp, 0x28 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 1e193d0c6a..9cb03b0b95 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 @@ -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 func_80240CB4_9A1C94 +/* 9A263C 8024165C 0C09032D */ jal UnkNpcAIFunc1 /* 9A2640 80241660 02A0302D */ daddu $a2, $s5, $zero /* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero /* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero 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 f8aa5cb3da..0b32e7d094 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 @@ -153,7 +153,7 @@ glabel func_80241744_9A2724 /* 9A295C 8024197C 00000000 */ nop /* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero /* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero -/* 9A2968 80241988 0C09032D */ jal func_80240CB4_9A1C94 +/* 9A2968 80241988 0C09032D */ jal UnkNpcAIFunc1 /* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero /* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero /* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s deleted file mode 100644 index 5d3d1ef4e9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241084_9A9474 -/* 9A9474 80241084 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A9478 80241088 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A947C 8024108C 0080982D */ daddu $s3, $a0, $zero -/* 9A9480 80241090 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A9484 80241094 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9488 80241098 AFB10014 */ sw $s1, 0x14($sp) -/* 9A948C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* 9A9490 802410A0 8E720148 */ lw $s2, 0x148($s3) -/* 9A9494 802410A4 86440008 */ lh $a0, 8($s2) -/* 9A9498 802410A8 0C00EABB */ jal get_npc_unsafe -/* 9A949C 802410AC 00A0882D */ daddu $s1, $a1, $zero -/* 9A94A0 802410B0 8E240008 */ lw $a0, 8($s1) -/* 9A94A4 802410B4 0040802D */ daddu $s0, $v0, $zero -/* 9A94A8 802410B8 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A94AC 802410BC 00832021 */ addu $a0, $a0, $v1 -/* 9A94B0 802410C0 00042043 */ sra $a0, $a0, 1 -/* 9A94B4 802410C4 0C00A67F */ jal rand_int -/* 9A94B8 802410C8 24840001 */ addiu $a0, $a0, 1 -/* 9A94BC 802410CC 8E230008 */ lw $v1, 8($s1) -/* 9A94C0 802410D0 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9A94C4 802410D4 00032FC2 */ srl $a1, $v1, 0x1f -/* 9A94C8 802410D8 00651821 */ addu $v1, $v1, $a1 -/* 9A94CC 802410DC 00031843 */ sra $v1, $v1, 1 -/* 9A94D0 802410E0 00621821 */ addu $v1, $v1, $v0 -/* 9A94D4 802410E4 0C00A67F */ jal rand_int -/* 9A94D8 802410E8 A603008E */ sh $v1, 0x8e($s0) -/* 9A94DC 802410EC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9A94E0 802410F0 44820000 */ mtc1 $v0, $f0 -/* 9A94E4 802410F4 00000000 */ nop -/* 9A94E8 802410F8 46800020 */ cvt.s.w $f0, $f0 -/* 9A94EC 802410FC 46006300 */ add.s $f12, $f12, $f0 -/* 9A94F0 80241100 3C0142B4 */ lui $at, 0x42b4 -/* 9A94F4 80241104 44810000 */ mtc1 $at, $f0 -/* 9A94F8 80241108 0C00A6C9 */ jal clamp_angle -/* 9A94FC 8024110C 46006301 */ sub.s $f12, $f12, $f0 -/* 9A9500 80241110 E600000C */ swc1 $f0, 0xc($s0) -/* 9A9504 80241114 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A9508 80241118 8C420000 */ lw $v0, ($v0) -/* 9A950C 8024111C AE020028 */ sw $v0, 0x28($s0) -/* 9A9510 80241120 24020003 */ addiu $v0, $zero, 3 -/* 9A9514 80241124 AE620070 */ sw $v0, 0x70($s3) -/* 9A9518 80241128 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A951C 8024112C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A9520 80241130 8FB20018 */ lw $s2, 0x18($sp) -/* 9A9524 80241134 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9528 80241138 8FB00010 */ lw $s0, 0x10($sp) -/* 9A952C 8024113C 03E00008 */ jr $ra -/* 9A9530 80241140 27BD0028 */ addiu $sp, $sp, 0x28 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 e1f7657cac..7cbec14611 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 func_80241084_9A9474 +/* 9A9E1C 80241A2C 0C090421 */ jal UnkNpcAIFunc1 /* 9A9E20 80241A30 02A0302D */ daddu $a2, $s5, $zero /* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero /* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero 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 97c6b64e48..fdade50ea2 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 @@ -153,7 +153,7 @@ glabel func_80241B14_9A9F04 /* 9AA13C 80241D4C 00000000 */ nop /* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero /* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero -/* 9AA148 80241D58 0C090421 */ jal func_80241084_9A9474 +/* 9AA148 80241D58 0C090421 */ jal UnkNpcAIFunc1 /* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s deleted file mode 100644 index 4fc5c2f0f9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412BC_9B7C3C -/* 9B7C3C 802412BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B7C40 802412C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B7C44 802412C4 0080982D */ daddu $s3, $a0, $zero -/* 9B7C48 802412C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B7C4C 802412CC AFB20018 */ sw $s2, 0x18($sp) -/* 9B7C50 802412D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B7C54 802412D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B7C58 802412D8 8E720148 */ lw $s2, 0x148($s3) -/* 9B7C5C 802412DC 86440008 */ lh $a0, 8($s2) -/* 9B7C60 802412E0 0C00EABB */ jal get_npc_unsafe -/* 9B7C64 802412E4 00A0882D */ daddu $s1, $a1, $zero -/* 9B7C68 802412E8 8E240008 */ lw $a0, 8($s1) -/* 9B7C6C 802412EC 0040802D */ daddu $s0, $v0, $zero -/* 9B7C70 802412F0 00041FC2 */ srl $v1, $a0, 0x1f -/* 9B7C74 802412F4 00832021 */ addu $a0, $a0, $v1 -/* 9B7C78 802412F8 00042043 */ sra $a0, $a0, 1 -/* 9B7C7C 802412FC 0C00A67F */ jal rand_int -/* 9B7C80 80241300 24840001 */ addiu $a0, $a0, 1 -/* 9B7C84 80241304 8E230008 */ lw $v1, 8($s1) -/* 9B7C88 80241308 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9B7C8C 8024130C 00032FC2 */ srl $a1, $v1, 0x1f -/* 9B7C90 80241310 00651821 */ addu $v1, $v1, $a1 -/* 9B7C94 80241314 00031843 */ sra $v1, $v1, 1 -/* 9B7C98 80241318 00621821 */ addu $v1, $v1, $v0 -/* 9B7C9C 8024131C 0C00A67F */ jal rand_int -/* 9B7CA0 80241320 A603008E */ sh $v1, 0x8e($s0) -/* 9B7CA4 80241324 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9B7CA8 80241328 44820000 */ mtc1 $v0, $f0 -/* 9B7CAC 8024132C 00000000 */ nop -/* 9B7CB0 80241330 46800020 */ cvt.s.w $f0, $f0 -/* 9B7CB4 80241334 46006300 */ add.s $f12, $f12, $f0 -/* 9B7CB8 80241338 3C0142B4 */ lui $at, 0x42b4 -/* 9B7CBC 8024133C 44810000 */ mtc1 $at, $f0 -/* 9B7CC0 80241340 0C00A6C9 */ jal clamp_angle -/* 9B7CC4 80241344 46006301 */ sub.s $f12, $f12, $f0 -/* 9B7CC8 80241348 E600000C */ swc1 $f0, 0xc($s0) -/* 9B7CCC 8024134C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9B7CD0 80241350 8C420000 */ lw $v0, ($v0) -/* 9B7CD4 80241354 AE020028 */ sw $v0, 0x28($s0) -/* 9B7CD8 80241358 24020003 */ addiu $v0, $zero, 3 -/* 9B7CDC 8024135C AE620070 */ sw $v0, 0x70($s3) -/* 9B7CE0 80241360 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B7CE4 80241364 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B7CE8 80241368 8FB20018 */ lw $s2, 0x18($sp) -/* 9B7CEC 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* 9B7CF0 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* 9B7CF4 80241374 03E00008 */ jr $ra -/* 9B7CF8 80241378 27BD0028 */ addiu $sp, $sp, 0x28 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 dbb873afa0..0473b1caf0 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 func_802412BC_9B7C3C +/* 9B88AC 80241F2C 0C0904AF */ jal UnkNpcAIFunc1 /* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero /* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $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 58acd4ac5c..f636ffb153 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 func_802412BC_9B7C3C +/* 9B8DEC 8024246C 0C0904AF */ jal UnkNpcAIFunc1 /* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero /* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero /* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero diff --git a/include/map.h b/include/map.h index 8f17fd2fb6..7ab05366cb 100644 --- a/include/map.h +++ b/include/map.h @@ -55,6 +55,7 @@ typedef struct Area { /* 0x08 */ char* id; ///< "area_xxx" /* 0x0C */ char* name; ///< JP debug name. } Area; // size = 0x10 + typedef struct NpcAISettings { /* 0x00 */ f32 moveSpeed; /* 0x04 */ s32 moveTime; diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index 17520d652f..acb39e02ba 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -196,7 +196,16 @@ INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800495A0); INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800496B8); -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049B44); +// Same as UnkNpcAIFunc1 +void func_80049B44(ScriptInstance *script, NpcAISettings *aiSettings) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim = *enemy->animList; + script->functionTemp[0].s = 3; +} INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049C04); diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 69fe2c5441..78ae0b2cad 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240000_BDED90); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240158_BDEEE8); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240400_BDF190); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802404C0_BDF250); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 0f649000d4..f7d2ddbf78 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240000_BE37B0); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240158_BE3908); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240400_BE3BB0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802404C0_BE3C70); @@ -28,6 +28,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80240E90_BE4640); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241040_BE47F0); +// should be #include "world/common/UnkNpcAIFunc1.inc.c", probably missing file split INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241668_BE4E18); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241728_BE4ED8); diff --git a/src/world/area_arn/arn_05/BE7BE0.c b/src/world/area_arn/arn_05/BE7BE0.c index d958b2368d..835aebe819 100644 --- a/src/world/area_arn/arn_05/BE7BE0.c +++ b/src/world/area_arn/arn_05/BE7BE0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240000_BE7BE0); INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240158_BE7D38); -INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_80240400_BE7FE0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_05/BE7BE0", func_802404C0_BE80A0); diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index 621a4338db..cf7f88b82f 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80240950_BED740); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80240B00_BED8F0); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241128_BEDF18); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802411E8_BEDFD8); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index eec46265bb..4d1a166666 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240120_BFD9A0); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802402D0_BFDB50); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802408F8_BFE178); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802409B8_BFE238); @@ -48,6 +48,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024252C_BFFDAC); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242684_BFFF04); +// should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024292C_C001AC); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802429EC_C0026C); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index eadd5f6e3c..8649f19b60 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240B20_C32000); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240C78_C32158); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240F20_C32400); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240FE0_C324C0); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index f1a7127b31..a4f838f62d 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240000_C36530); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802401B0_C366E0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802407D8_C36D08); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80240898_C36DC8); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index fca917271e..3043bb4367 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240000_C3FDB0); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240158_C3FF08); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80240400_C401B0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802404C0_C40270); @@ -42,6 +42,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241760_C41510); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241910_C416C0); +// should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241F38_C41CE8); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8_C41DA8); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 682248d50a..74d05f6d7e 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241424_C48004); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802415D4_C481B4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241BFC_C487DC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241CBC_C4889C); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index b9815b6a64..b8f7f643a3 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802408D0_C4FDE0); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240A28_C4FF38); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240CD0_C501E0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240D90_C502A0); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 90666b9955..ba50d086b6 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240000_C55F40); INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240158_C56098); -INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_80240400_C56340); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dgb/dgb_18/C55F40", func_802404C0_C56400); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index e932d8d5aa..c126ef0b24 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802405E0_95B7E0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240738_95B938); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802409E0_95BBE0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240AA0_95BCA0); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 53d51955b8..90f5b425f1 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240040_C9DF60); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240198_C9E0B8); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240440_C9E360); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240500_C9E420); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index 02d223bc23..8a70afdbc0 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240320_CB5320); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_802404D0_CB54D0); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240AF8_CB5AF8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240BB8_CB5BB8); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index a82e8927f7..656ccc51a1 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802401C4_CC39D4); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374_CC3B84); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024099C_CC41AC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240A5C_CC426C); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 47e757aea0..065b8f48a6 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240B10_CCBE20); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240CC0_CCBFD0); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802412E8_CCC5F8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802413A8_CCC6B8); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 26cdc58465..e5bc36de86 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80240E50_CD2C80); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241000_CD2E30); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241628_CD3458); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_802416E8_CD3518); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index cad50f5ad1..8fa99eec86 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240070_CD7350); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240220_CD7500); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240848_CD7B28); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240908_CD7BE8); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 5bee272fa1..32e4b76ed9 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240040_CF2C10); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802401F0_CF2DC0); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240818_CF33E8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802408D8_CF34A8); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 303fa5c199..1cd982479c 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80240FF0_A17210); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0_A173C0); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802417C8_A179E8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241888_A17AA8); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 3149046f86..6439922b9e 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240CB0_A1BDB0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241488_A1C588); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241548_A1C648); diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index ce7c07e99c..828b210e6c 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240000_97DAD0); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240230_97DD00); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240568_97E038); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240628_97E0F8); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index 173440d41a..b49bb03484 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240000_98F7E0); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240230_98FA10); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240568_98FD48); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80240628_98FE08); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index a477e90799..56065c071a 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240000_992730); INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240230_992960); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240568_992C98); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80240628_992D58); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 76f94da69e..44bb76dce8 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240340_B28370); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240570_B285A0); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_802408A8_B288D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240968_B28998); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 1454a92b7a..0fcc35fbb4 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240430_B2C8A0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240588_B2C9F8); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240830_B2CCA0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802408F0_B2CD60); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 716aa12127..672a2d2d63 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240620_B351F0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240778_B35348); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240A20_B355F0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240AE0_B356B0); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index d86ef7bf48..e0ebe101e8 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802408A4_B4B314); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240AD4_B4B544); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240E0C_B4B87C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240ECC_B4B93C); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index 7a923e4b54..0ad751f985 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240740_B52F70); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240970_B531A0); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240CA8_B534D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", delete_player_actor_B53598); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index 962a99a07c..10690c75b2 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240310_B6C6A0); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240540_B6C8D0); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240878_B6CC08); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240938_B6CCC8); diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index fae08d7e1d..4a73654440 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802404C0_B7A510); INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802406F0_B7A740); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240A28_B7AA78); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240AE8_B7AB38); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 1e9db6c3b3..808eac8e95 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240000_B84180); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240158_B842D8); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240400_B84580); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_802404C0_B84640); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 81da396205..cc676f787e 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802400B0_ABB340); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240208_ABB498); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802404B0_ABB740); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240570_ABB800); diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index 40615358f3..1a72f02cdd 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240000_AC5170); INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240158_AC52C8); -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240400_AC5570); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_802404C0_AC5630); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 00f47238a5..237b557bdc 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240000_8CE070); INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802401B0_8CE220); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802407D8_8CE848); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240898_8CE908); diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index cac0561e67..669d49b006 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240000_8D1510); INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802401B0_8D16C0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802407D8_8D1CE8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240898_8D1DA8); diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 485dac7e92..8882471e2e 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240000_8D5E00); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802401B0_8D5FB0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802407D8_8D65D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240898_8D6698); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 65cb2e7b8f..7b63619924 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240000_A86A50); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240158_A86BA8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240400_A86E50); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802404C0_A86F10); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 7e68509226..7fbd97704a 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802400E0_A8CB60); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240238_A8CCB8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802404E0_A8CF60); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802405A0_A8D020); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 9a8e2dcb24..3e8d0ac22e 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802404E0_C5AC20); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240690_C5ADD0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240CB8_C5B3F8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240D78_C5B4B8); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index c78be36dc6..4f77afb547 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240820_C6EB50); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0_C6ED00); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240FF8_C6F328); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802410B8_C6F3E8); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index d09fdb7b8f..32f8a80c5f 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240A50_C71ED0); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240C00_C72080); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241228_C726A8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802412E8_C72768); diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index 78405aa592..f53fdd04dc 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240460_C80600); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240610_C807B0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240C38_C80DD8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240CF8_C80E98); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 049e466801..f972f7025f 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242570_7ED280); INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802426C8_7ED3D8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242970_7ED680); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242A30_7ED740); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index c3ad2a45a0..50aae096db 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080_801900); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802411D8_801A58); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241480_801D00); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241540_801DC0); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 96396f7a47..b269efe401 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245550_805DD0); INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802456A8_805F28); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245950_8061D0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245A10_806290); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 20595c6eb7..7dddbbe47a 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240930_823BF0); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240A88_823D48); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240D30_823FF0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240DF0_8240B0); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 839bf91196..f09b69412d 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240490_852600); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802405E8_852758); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240890_852A00); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240950_852AC0); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index 4d77538bd3..6b442dd994 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802402E0_E0EA80); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240438_E0EBD8); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802406E0_E0EE80); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802407A0_E0EF40); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index 2a4b84dcb7..4cc3a30e1f 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240070_B97C70); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802402A0_B97EA0); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802405D8_B981D8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240698_B98298); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index dfd088da04..e8e49c8c35 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240200_B9DB60); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240430_B9DD90); -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240768_B9E0C8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240828_B9E188); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index e5c153e991..25fc5a045a 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241F14_BA6694); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242144_BA68C4); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024247C_BA6BFC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024253C_BA6CBC); diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c index 0fdeb90271..9b3db1109d 100644 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ b/src/world/area_mim/mim_07/BAA3B0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240270_BAA3B0); INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_802404A0_BAA5E0); -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_802407D8_BAA918); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA3B0", func_80240898_BAA9D8); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 120782cd18..e3951dd1df 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802400A0_BAD9E0); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240250_BADB90); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240878_BAE1B8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240938_BAE278); diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index 7546c60517..8af9d61707 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802400A0_BB2EA0); INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802402D0_BB30D0); -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240608_BB3408); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802406C8_BB34C8); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 9dc71cf4d2..1ca488166d 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240A80_9D7AA0); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240BD8_9D7BF8); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240E80_9D7EA0); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240F40_9D7F60); diff --git a/src/world/area_nok/nok_03/9EB7F0.c b/src/world/area_nok/nok_03/9EB7F0.c index 8a88bffbd7..c937e6b0d8 100644 --- a/src/world/area_nok/nok_03/9EB7F0.c +++ b/src/world/area_nok/nok_03/9EB7F0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240000_9EB7F0); INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240230_9EBA20); -INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240568_9EBD58); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_03/9EB7F0", func_80240628_9EBE18); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index d886558387..acc684c751 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802407D4_9F5214); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240984_9F53C4); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240FAC_9F59EC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024106C_9F5AAC); diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 2b39ab0f14..bb8910441c 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240D44_9FB534); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240E9C_9FB68C); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241144_9FB934); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241204_9FB9F4); diff --git a/src/world/area_nok/nok_13/A00600.c b/src/world/area_nok/nok_13/A00600.c index 7d6a0bf6cc..52109b8a39 100644 --- a/src/world/area_nok/nok_13/A00600.c +++ b/src/world/area_nok/nok_13/A00600.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240000_A00600); INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240230_A00830); -INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240568_A00B68); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_13/A00600", func_80240628_A00C28); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 7a0c67b23f..1e75c71b77 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240994_A031D4); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44_A03384); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024116C_A039AC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024122C_A03A6C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 037bef92d6..34433fde75 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240AB4_A079B4); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240C64_A07B64); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024128C_A0818C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024134C_A0824C); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 07f629662a..942ff70697 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802403A0_DAD7A0); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240550_DAD950); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240B78_DADF78); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240C38_DAE038); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index 74d1a340a7..b1f617f1b2 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240A54_DB2D14); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04_DB2EC4); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_8024122C_DB34EC); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802412EC_DB35AC); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index e3659b986e..be1f031d51 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024056C_DBD81C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802406C4_DBD974); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024096C_DBDC1C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240A2C_DBDCDC); @@ -48,6 +48,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241978_DBEC28); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241B28_DBEDD8); +// Should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242150_DBF400); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210_DBF4C0); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index e3931a7435..4d35a90e46 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240F4C_DCDC1C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802410A4_DCDD74); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024134C_DCE01C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024140C_DCE0DC); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 766dba621e..5f99a47bd6 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240FB4_DEFE54); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164_DF0004); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024178C_DF062C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024184C_DF06EC); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 89344f132d..3b23663749 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240F20_D8E170); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241078_D8E2C8); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241320_D8E570); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802413E0_D8E630); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 6f1be57830..ee279a4b20 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240550_D203E0); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240700_D20590); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240D28_D20BB8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240DE8_D20C78); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index d691edea9f..92432041bb 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802413F0_87AFD0); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802415A0_87B180); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241BC8_87B7A8); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241C88_87B868); diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 7615b0a9b2..0387dfa434 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802408B4_9A1894); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240A0C_9A19EC); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240CB4_9A1C94); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240D74_9A1D54); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 57f607fbd7..c8cf98688e 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240C84_9A9074); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240DDC_9A91CC); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241084_9A9474); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241144_9A9534); @@ -40,6 +40,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241E18_9AA208); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8_9AA3B8); +// Should be #include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802425F0_9AA9E0); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0_9AAAA0); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index 4e8b919101..9aedc4df98 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240AE4_9B7464); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240C94_9B7614); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802412BC_9B7C3C); +#include "world/common/UnkNpcAIFunc1.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024137C_9B7CFC); diff --git a/src/world/common/UnkNpcAIFunc1.inc.c b/src/world/common/UnkNpcAIFunc1.inc.c new file mode 100644 index 0000000000..8277c09c38 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc1.inc.c @@ -0,0 +1,12 @@ +#include "common.h" +#include "map.h" + +static void UnkNpcAIFunc1(ScriptInstance *script, NpcAISettings *aiSettings) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = (aiSettings->waitTime / 2) + rand_int((aiSettings->waitTime / 2) + 1); + npc->yaw = clamp_angle(npc->yaw + rand_int(180) - 90.0f); + npc->currentAnim = *enemy->animList; + script->functionTemp[0].s = 3; +} diff --git a/tools/assist.py b/tools/assist.py index 7318638f25..74ed5c7d81 100755 --- a/tools/assist.py +++ b/tools/assist.py @@ -3,8 +3,6 @@ import argparse from collections import OrderedDict import os -import re -import pickle import sys script_dir = os.path.dirname(os.path.realpath(__file__)) @@ -34,6 +32,12 @@ def get_all_s_files(): return ret +def get_symbol_length(sym_name): + if "end" in map_offsets[sym_name] and "start" in map_offsets[sym_name]: + return map_offsets[sym_name]["end"] - map_offsets[sym_name]["start"] + return 0 + + def get_symbol_bytes(offsets, func): if func not in offsets or "start" not in offsets[func] or "end" not in offsets[func]: return None @@ -115,6 +119,8 @@ def diff_syms(qb, tb): if abs(len(larger) - len(smaller)) < 16 and is_zeros(larger[len(smaller):]): len_ratio = 1 + elif len_ratio < args.threshold: + return 0 n_bytes = len(smaller) matches = 0 @@ -131,6 +137,14 @@ def diff_syms(qb, tb): return score +def get_pair_score(query_bytes, b): + b_bytes = get_symbol_bytes(map_offsets, b) + + if query_bytes and b_bytes: + return diff_syms(query_bytes, b_bytes) + return 0 + + def get_matches(query): query_bytes = get_symbol_bytes(map_offsets, query) if query_bytes is None: @@ -139,11 +153,9 @@ def get_matches(query): ret = {} for symbol in map_offsets: if symbol is not None and query != symbol: - target_bytes = get_symbol_bytes(map_offsets, symbol) - if target_bytes is not None: - score = diff_syms(query_bytes, target_bytes) - if score >= args.threshold: - ret[symbol] = score + score = get_pair_score(query_bytes, symbol) + if score >= args.threshold: + ret[symbol] = score return OrderedDict(sorted(ret.items(), key=lambda kv: kv[1], reverse=True)) @@ -171,6 +183,37 @@ def do_query(query): i += 1 print() + +def do_cross_query(): + clusters = [] + max_cluster = None + max_cluster_len = 0 + + for sym_name in map_syms: + if not sym_name.startswith("_binary"): + sym = map_syms[sym_name] + if get_symbol_length(sym_name) > 8: + query_bytes = get_symbol_bytes(map_offsets, sym_name) + cluster_match = False + for cluster in clusters: + cluster_score = get_pair_score(query_bytes, cluster[0]) + if cluster_score >= args.threshold: + cluster.append(sym_name) + cluster_match = True + + if len(cluster) > max_cluster_len: + max_cluster_len = len(cluster) + max_cluster = cluster + + if len(cluster) % 10 == 0: + print("Cluster " + cluster[0] + " grew to size " + str(len(cluster))) + break + if not cluster_match: + clusters.append([sym_name]) + # print("Adding cluster for " + sym_name) + print(max_cluster[0]) + + parser = argparse.ArgumentParser(description="Tools to assist with decomp") parser.add_argument("query", help="function or file") parser.add_argument("--threshold", help="score threshold between 0 and 1 (higher is more restrictive)", type=float, default=0.95, required=False) @@ -191,4 +234,8 @@ if query_dir is not None: for f_name in files: do_query(f_name[:-2]) else: - do_query(args.query) + if args.query == "cross": + args.threshold = 1.0 + do_cross_query() + else: + do_query(args.query) diff --git a/tools/substitute.py b/tools/substitute.py index 0f1b79efb3..07bdc0eaea 100755 --- a/tools/substitute.py +++ b/tools/substitute.py @@ -1,11 +1,8 @@ #!/usr/bin/python3 import argparse -from collections import OrderedDict import os import re -import pickle -import sys script_dir = os.path.dirname(os.path.realpath(__file__)) root_dir = script_dir + "/../" @@ -13,7 +10,7 @@ src_dir = root_dir + "src/" parser = argparse.ArgumentParser(description="Replace many functions with one") -parser.add_argument("from_list", help="path to line-separated file of functions to be replaced") +parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") args = parser.parse_args() @@ -31,13 +28,10 @@ for from_line in from_text[1:]: for root, dirs, files in os.walk(src_dir): for f_name in files: if f_name.endswith(".c"): - if f_name == "D8FBA0.c": - dog = 5 - f_path = os.path.join(root, f_name) with open(f_path) as f: f_text_orig = f.read() - + f_text = f_text_orig for func in from_funcs: search_pattern = re.compile("\n.*" + func + "\).*\n") @@ -45,4 +39,4 @@ for root, dirs, files in os.walk(src_dir): if f_text != f_text_orig: with open(f_path, "w", newline="\n") as f: f.write(f_text) - + diff --git a/tools/substitute_asm.py b/tools/substitute_asm.py new file mode 100755 index 0000000000..9f92ce2cb5 --- /dev/null +++ b/tools/substitute_asm.py @@ -0,0 +1,41 @@ +#!/usr/bin/python3 + +import argparse +import os +import re + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +asm_dir = root_dir + "asm/" + + +parser = argparse.ArgumentParser(description="Replace many functions with one") +parser.add_argument("from_list", help="path to line-separated file of functions to be replaced. first line is the string to replace them with") + +args = parser.parse_args() + +from_funcs = [] + +with open(args.from_list) as f: + from_text = f.readlines() + +to_line = from_text[0].strip() + +for from_line in from_text[1:]: + if len(from_line.strip()) > 0: + from_funcs.append(from_line.rstrip().split(" ")[-1]) + +for root, dirs, files in os.walk(asm_dir): + for f_name in files: + if f_name.endswith(".s"): + f_path = os.path.join(root, f_name) + with open(f_path) as f: + f_text_orig = f.read() + + f_text = f_text_orig + for func in from_funcs: + f_text = f_text.replace(func, to_line) + if f_text != f_text_orig: + with open(f_path, "w", newline="\n") as f: + f.write(f_text) +