From 425dc5df5674b6b0a22e842fe9edf8e36b08a0ad Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 4 Jul 2021 17:09:40 +0900 Subject: [PATCH] Lots of area func deduplication (#300) * splat disasm update * a little * splat jtbl robustness * git subrepo pull (merge) --force tools/splat subrepo: subdir: "tools/splat" merged: "150dcdebfd" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "150dcdebfd" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * some rodata stuff * git subrepo pull tools/splat subrepo: subdir: "tools/splat" merged: "21bf3a381c" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "21bf3a381c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * progress * All area rodata migrated * UnkDistFunc * SwitchToPartner * UnkNpcAIFunc23 * UnkNpcAIFunc24 * UnkNpcAIFunc25 * cleanup & symbol_addrs * disasm update --- src/world/area_arn/arn_03/events.c | 141 +------- src/world/area_arn/arn_04/events.c | 113 +------ src/world/area_arn/arn_05/arn_05.h | 2 +- src/world/area_arn/arn_05/events.c | 66 +--- src/world/area_arn/arn_07/events.c | 26 +- src/world/area_dgb/dgb_01/BFD9A0.c | 85 +---- src/world/area_dgb/dgb_03/C31730.c | 61 +--- src/world/area_dgb/dgb_04/C36530.c | 37 +-- src/world/area_dgb/dgb_04/dgb_04.h | 4 +- src/world/area_dgb/dgb_08/C3FDB0.c | 85 +---- src/world/area_dgb/dgb_09/C46BE0.c | 28 +- src/world/area_dgb/dgb_15/C4F510.c | 57 +--- src/world/area_dgb/dgb_18/C55F40.c | 57 +--- src/world/area_dro/dro_01/95B7E0.c | 57 +--- src/world/area_flo/flo_00/C9DF60.c | 57 +--- src/world/area_flo/flo_08/CAED40.c | 5 +- src/world/area_flo/flo_08/CAFAC0.c | 2 +- src/world/area_flo/flo_08/flo_08.h | 2 +- src/world/area_flo/flo_09/CB5320.c | 26 +- src/world/area_flo/flo_13/CC3850.c | 54 +--- src/world/area_flo/flo_14/CCBE20.c | 26 +- src/world/area_flo/flo_16/CD1F10.c | 7 +- src/world/area_flo/flo_16/CD2C80.c | 28 +- src/world/area_flo/flo_16/flo_16.h | 4 +- src/world/area_flo/flo_17/CD7350.c | 54 +--- src/world/area_flo/flo_23/CEE2A0.c | 24 +- src/world/area_flo/flo_25/CF2C10.c | 28 +- src/world/area_hos/hos_01/A11020.c | 8 +- src/world/area_hos/hos_02/A17210.c | 29 +- src/world/area_hos/hos_03/A1BDB0.c | 29 +- src/world/area_isk/isk_04/97B670.c | 24 +- src/world/area_isk/isk_04/97BF60.c | 8 +- src/world/area_isk/isk_08/984E30.c | 24 +- src/world/area_isk/isk_10/988B60.c | 8 +- src/world/area_isk/isk_18/997F70.c | 24 +- src/world/area_iwa/iwa_10/91E6D0.c | 8 +- src/world/area_jan/jan_02/B2C8A0.c | 65 +--- src/world/area_jan/jan_03/B34BD0.c | 63 +--- src/world/area_jan/jan_08/B5E910.c | 8 +- src/world/area_jan/jan_22/B84180.c | 63 +--- src/world/area_kkj/kkj_00/ABB340.c | 63 +--- src/world/area_kkj/kkj_01/AC5170.c | 63 +--- src/world/area_kmr/kmr_05/8CE070.c | 27 +- src/world/area_kmr/kmr_06/8D1510.c | 27 +- src/world/area_kmr/kmr_09/8D5E00.c | 29 +- src/world/area_kpa/kpa_01/A470C0.c | 24 +- src/world/area_kpa/kpa_03/A48720.c | 24 +- src/world/area_kpa/kpa_102/A93A50.c | 24 +- src/world/area_kpa/kpa_11/A52BD0.c | 24 +- src/world/area_kpa/kpa_113/A9CC70.c | 24 +- src/world/area_kpa/kpa_50/A609D0.c | 24 +- src/world/area_kpa/kpa_51/A640E0.c | 24 +- src/world/area_kpa/kpa_61/A6E6F0.c | 24 +- src/world/area_kpa/kpa_70/A74B80.c | 24 +- src/world/area_kpa/kpa_91/A86A50.c | 87 +---- src/world/area_kpa/kpa_95/A8CB60.c | 87 +---- src/world/area_kzn/kzn_02/C5AC20.c | 31 +- src/world/area_kzn/kzn_03/C61020.c | 24 +- src/world/area_kzn/kzn_04/C68440.c | 8 +- src/world/area_kzn/kzn_07/C6EA50.c | 29 +- src/world/area_kzn/kzn_08/C71ED0.c | 31 +- src/world/area_kzn/kzn_09/C76CE0.c | 8 +- src/world/area_kzn/kzn_09/C77D00.c | 24 +- src/world/area_kzn/kzn_11/C80600.c | 31 +- src/world/area_kzn/kzn_17/C85DC0.c | 24 +- src/world/area_mac/mac_00/7ED280.c | 63 +--- src/world/area_mac/mac_01/8017D0.c | 67 +--- src/world/area_mac/mac_01/805DD0.c | 63 +--- src/world/area_mac/mac_02/823BF0.c | 63 +--- src/world/area_mac/mac_05/852170.c | 63 +--- src/world/area_mgm/mgm_00/E0E7A0.c | 63 +--- src/world/area_mim/mim_08/BAD940.c | 29 +- src/world/area_nok/nok_02/9D7AA0.c | 71 +--- src/world/area_nok/nok_11/9F4A40.c | 53 +-- src/world/area_nok/nok_12/9FAD60.c | 87 +---- src/world/area_nok/nok_14/A02A00.c | 53 +-- src/world/area_nok/nok_15/A06F00.c | 53 +-- src/world/area_omo/omo_04/DAD400.c | 29 +- src/world/area_omo/omo_05/DB22C0.c | 29 +- src/world/area_omo/omo_07/DBD2B0.c | 92 +----- src/world/area_omo/omo_09/DCD6B0.c | 63 +--- src/world/area_omo/omo_11/DDCFC0.c | 8 +- src/world/area_omo/omo_17/DEF400.c | 29 +- src/world/area_pra/pra_35/D8D270.c | 63 +--- src/world/area_sam/sam_06/D203E0.c | 29 +- src/world/area_sam/sam_08/D2FC80.c | 8 +- src/world/area_sbk/sbk_56/953FC0.c | 8 +- src/world/area_tik/tik_07/879BE0.c | 8 +- src/world/area_tik/tik_07/87AC00.c | 27 +- src/world/area_tik/tik_09/882BF0.c | 24 +- src/world/area_tik/tik_10/8866D0.c | 8 +- src/world/area_tik/tik_12/8891C0.c | 8 +- src/world/area_tik/tik_12/88A530.c | 24 +- src/world/area_tik/tik_17/892A50.c | 8 +- src/world/area_tik/tik_19/897BD0.c | 8 +- src/world/area_tik/tik_20/89ACB0.c | 24 +- src/world/area_tik/tik_23/8A2D30.c | 24 +- src/world/area_tik/tik_24/8A5DE0.c | 24 +- src/world/area_trd/trd_01/99CD80.c | 24 +- src/world/area_trd/trd_02/9A10C0.c | 87 +---- src/world/area_trd/trd_03/9A46F0.c | 24 +- src/world/area_trd/trd_04/9A88A0.c | 116 +------ src/world/area_trd/trd_07/9B6C90.c | 53 +-- src/world/common/SwitchToPartner.inc.c | 6 + src/world/common/UnkDistFunc.inc.c | 24 ++ src/world/common/UnkNpcAIFunc23.inc.c | 26 ++ src/world/common/UnkNpcAIFunc24.inc.c | 36 +++ src/world/common/UnkNpcAIFunc25.inc.c | 19 ++ ver/us/asm/data/52EE0.data.s | 2 +- ver/us/asm/data/EE20E0.data.s | 2 +- .../data/world/area_arn/arn_05/BE9290.data.s | 2 +- .../data/world/area_dgb/dgb_04/C39A90.data.s | 4 +- .../data/world/area_flo/flo_08/CB0C20.data.s | 2 +- .../data/world/area_flo/flo_16/CD5530.data.s | 2 +- .../data/world/area_hos/hos_01/A12E00.data.s | 2 +- .../data/world/area_isk/isk_04/97D2F0.data.s | 2 +- .../data/world/area_isk/isk_10/989910.data.s | 2 +- .../data/world/area_iwa/iwa_10/923FD0.data.s | 2 +- .../data/world/area_jan/jan_02/B2F410.data.s | 2 +- .../data/world/area_jan/jan_08/B620B0.data.s | 2 +- .../data/world/area_kzn/kzn_04/C69D70.data.s | 2 +- .../data/world/area_kzn/kzn_09/C7A9E0.data.s | 2 +- .../data/world/area_mac/mac_05/864450.data.s | 5 +- .../data/world/area_nok/nok_02/9DDE90.data.s | 2 +- .../data/world/area_nok/nok_04/9EEEB0.data.s | 24 +- .../data/world/area_omo/omo_11/DDDD90.data.s | 2 +- .../data/world/area_sam/sam_08/D314C0.data.s | 2 +- .../data/world/area_sbk/sbk_56/9553F0.data.s | 2 +- .../data/world/area_tik/tik_07/87D5D0.data.s | 2 +- .../data/world/area_tik/tik_10/8883F0.data.s | 2 +- .../data/world/area_tik/tik_12/88C810.data.s | 2 +- .../data/world/area_tik/tik_17/893E40.data.s | 2 +- .../data/world/area_tik/tik_19/899C90.data.s | 2 +- .../CC3850/flo_13_func_80241DB8_CC55C8.s | 2 +- .../CD7350/flo_17_func_80241C64_CD8F44.s | 2 +- .../hos_01/A11020/func_80240CB0_A11530.s | 15 - .../hos_02/A17210/func_80240FF0_A17210.s | 123 ------- .../hos_02/A17210/func_802422FC_A1851C.s | 2 +- .../hos_02/A17210/func_802428F4_A18B14.s | 2 +- .../hos_03/A1BDB0/func_80240CB0_A1BDB0.s | 123 ------- .../hos_03/A1BDB0/func_80241FBC_A1D0BC.s | 2 +- .../isk_04/97B670/func_802400BC_97B6EC.s | 93 ------ .../isk_04/97B670/func_802403D4_97BA04.s | 2 +- .../isk_04/97BF60/func_80240930_97BF60.s | 15 - .../isk_08/984E30/func_8024007C_984EAC.s | 93 ------ .../isk_08/984E30/func_80240394_9851C4.s | 2 +- .../isk_10/988B60/func_8024041C_988F7C.s | 15 - .../isk_18/997F70/func_8024007C_997FEC.s | 93 ------ .../isk_18/997F70/func_80240394_998304.s | 2 +- .../iwa_10/91E6D0/func_8024070C_91EC7C.s | 15 - .../jan_02/B2C8A0/func_80240430_B2C8A0.s | 102 ------ .../jan_02/B2C8A0/func_80240AAC_B2CF1C.s | 59 ---- .../jan_02/B2C8A0/func_80240FC4_B2D434.s | 4 +- .../jan_02/B2C8A0/func_802426A8_B2EB18.s | 18 -- .../jan_03/B34BD0/func_80240620_B351F0.s | 102 ------ .../jan_03/B34BD0/func_80240C9C_B3586C.s | 59 ---- .../jan_03/B34BD0/func_802411B4_B35D84.s | 4 +- .../jan_08/B5E910/func_80240A7C_B5ED2C.s | 15 - .../jan_22/B84180/func_80240000_B84180.s | 102 ------ .../jan_22/B84180/func_8024067C_B847FC.s | 59 ---- .../jan_22/B84180/func_80240B94_B84D14.s | 4 +- .../kkj_00/ABB340/func_802400B0_ABB340.s | 102 ------ .../kkj_00/ABB340/func_8024072C_ABB9BC.s | 59 ---- .../kkj_00/ABB340/func_80240C44_ABBED4.s | 4 +- .../kkj_01/AC5170/func_80240000_AC5170.s | 102 ------ .../kkj_01/AC5170/func_8024067C_AC57EC.s | 59 ---- .../kkj_01/AC5170/func_80240B94_AC5D04.s | 4 +- .../kmr_05/8CE070/func_80240000_8CE070.s | 123 ------- .../kmr_05/8CE070/func_8024130C_8CF37C.s | 2 +- .../kmr_06/8D1510/func_80240000_8D1510.s | 123 ------- .../kmr_06/8D1510/func_8024130C_8D281C.s | 2 +- .../kmr_09/8D5E00/func_80240000_8D5E00.s | 123 ------- .../kmr_09/8D5E00/func_8024130C_8D710C.s | 2 +- .../kpa_01/A470C0/func_802401DC_A4713C.s | 93 ------ .../kpa_01/A470C0/func_802404F4_A47454.s | 2 +- .../kpa_03/A48720/func_802401DC_A4879C.s | 93 ------ .../kpa_03/A48720/func_802404F4_A48AB4.s | 2 +- .../kpa_102/A93A50/func_802415D8_A94D18.s | 93 ------ .../kpa_102/A93A50/func_802418F0_A95030.s | 2 +- .../kpa_11/A52BD0/func_8024038C_A52C4C.s | 93 ------ .../kpa_11/A52BD0/func_802406A4_A52F64.s | 2 +- .../kpa_113/A9CC70/func_8024022C_A9CE5C.s | 93 ------ .../kpa_113/A9CC70/func_80240544_A9D174.s | 2 +- .../kpa_50/A609D0/func_802412C8_A61C98.s | 93 ------ .../kpa_50/A609D0/func_802415E0_A61FB0.s | 2 +- .../kpa_51/A640E0/func_802414C8_A65558.s | 93 ------ .../kpa_51/A640E0/func_802417E0_A65870.s | 2 +- .../kpa_61/A6E6F0/func_8024038C_A6E76C.s | 93 ------ .../kpa_61/A6E6F0/func_802406A4_A6EA84.s | 2 +- .../kpa_70/A74B80/func_8024038C_A74BFC.s | 93 ------ .../kpa_70/A74B80/func_802406A4_A74F14.s | 2 +- .../kpa_91/A86A50/func_80240000_A86A50.s | 102 ------ .../kpa_91/A86A50/func_8024067C_A870CC.s | 59 ---- .../kpa_91/A86A50/func_80240B94_A875E4.s | 4 +- .../kpa_91/A86A50/func_80240F0C_A8795C.s | 93 ------ .../kpa_91/A86A50/func_80241224_A87C74.s | 6 +- .../kpa_95/A8CB60/func_802400E0_A8CB60.s | 102 ------ .../kpa_95/A8CB60/func_8024075C_A8D1DC.s | 59 ---- .../kpa_95/A8CB60/func_80240C74_A8D6F4.s | 4 +- .../kpa_95/A8CB60/func_80240FEC_A8DA6C.s | 93 ------ .../kpa_95/A8CB60/func_80241304_A8DD84.s | 6 +- .../kzn_02/C5AC20/func_802404E0_C5AC20.s | 123 ------- .../kzn_02/C5AC20/func_802417EC_C5BF2C.s | 2 +- .../kzn_02/C5AC20/func_80241DE4_C5C524.s | 2 +- .../kzn_03/C61020/func_8024038C_C6109C.s | 93 ------ .../kzn_03/C61020/func_802406A4_C613B4.s | 2 +- .../kzn_04/C68440/func_8024072C_C6885C.s | 15 - .../kzn_07/C6EA50/func_80240820_C6EB50.s | 123 ------- .../kzn_07/C6EA50/func_80241B2C_C6FE5C.s | 2 +- .../kzn_07/C6EA50/func_80242124_C70454.s | 2 +- .../kzn_08/C71ED0/func_80240A50_C71ED0.s | 123 ------- .../kzn_08/C71ED0/func_80241D5C_C731DC.s | 2 +- .../kzn_08/C71ED0/func_80242354_C737D4.s | 2 +- .../kzn_09/C76CE0/func_8024041C_C770FC.s | 15 - .../kzn_09/C77D00/func_80242A40_C79720.s | 93 ------ .../kzn_09/C77D00/func_80242D58_C79A38.s | 2 +- .../kzn_11/C80600/func_80240460_C80600.s | 123 ------- .../kzn_11/C80600/func_8024176C_C8190C.s | 2 +- .../kzn_11/C80600/func_80241D64_C81F04.s | 2 +- .../kzn_17/C85DC0/func_80241D30_C877E0.s | 93 ------ .../kzn_17/C85DC0/func_80242048_C87AF8.s | 2 +- .../mac_00/7ED280/func_80242570_7ED280.s | 102 ------ .../mac_00/7ED280/func_80242BEC_7ED8FC.s | 59 ---- .../mac_00/7ED280/func_80243104_7EDE14.s | 4 +- .../mac_01/8017D0/func_80241080_801900.s | 102 ------ .../mac_01/8017D0/func_802416FC_801F7C.s | 59 ---- .../mac_01/8017D0/func_80241C14_802494.s | 4 +- .../mac_01/805DD0/func_80245550_805DD0.s | 102 ------ .../mac_01/805DD0/func_80245BCC_80644C.s | 59 ---- .../mac_01/805DD0/func_802460E4_806964.s | 4 +- .../mac_02/823BF0/func_80240930_823BF0.s | 102 ------ .../mac_02/823BF0/func_80240FAC_82426C.s | 59 ---- .../mac_02/823BF0/func_802414C4_824784.s | 4 +- .../mac_05/852170/func_80240490_852600.s | 102 ------ .../mac_05/852170/func_80240B0C_852C7C.s | 59 ---- .../mac_05/852170/func_80241024_853194.s | 4 +- .../mgm_00/E0E7A0/func_802402E0_E0EA80.s | 102 ------ .../mgm_00/E0E7A0/func_8024095C_E0F0FC.s | 59 ---- .../mgm_00/E0E7A0/func_80240E74_E0F614.s | 4 +- .../mim_08/BAD940/func_802400A0_BAD9E0.s | 123 ------- .../mim_08/BAD940/func_802413AC_BAECEC.s | 2 +- .../nok_02/9D7AA0/func_80240A80_9D7AA0.s | 102 ------ .../nok_02/9D7AA0/func_802410FC_9D811C.s | 59 ---- .../nok_02/9D7AA0/func_80241614_9D8634.s | 4 +- .../nok_02/9D7AA0/func_80242FE4_9DA004.s | 15 - .../nok_11/9F4A40/func_8024007C_9F4ABC.s | 93 ------ .../nok_11/9F4A40/func_80240394_9F4DD4.s | 2 +- .../nok_11/9F4A40/func_802407D4_9F5214.s | 123 ------- .../nok_11/9F4A40/func_80241AE0_9F6520.s | 2 +- .../nok_12/9FAD60/func_802405EC_9FADDC.s | 93 ------ .../nok_12/9FAD60/func_80240904_9FB0F4.s | 2 +- .../nok_12/9FAD60/func_80240D44_9FB534.s | 102 ------ .../nok_12/9FAD60/func_802413C0_9FBBB0.s | 59 ---- .../nok_12/9FAD60/func_802418D8_9FC0C8.s | 4 +- .../nok_12/9FAD60/func_80241BD4_9FC3C4.s | 6 +- .../nok_14/A02A00/func_8024023C_A02A7C.s | 93 ------ .../nok_14/A02A00/func_80240554_A02D94.s | 2 +- .../nok_14/A02A00/func_80240994_A031D4.s | 123 ------- .../nok_14/A02A00/func_80241CA0_A044E0.s | 2 +- .../nok_14/A02A00/func_802421CC_A04A0C.s | 2 +- .../nok_15/A06F00/func_8024035C_A0725C.s | 93 ------ .../nok_15/A06F00/func_80240674_A07574.s | 2 +- .../nok_15/A06F00/func_80240AB4_A079B4.s | 123 ------- .../nok_15/A06F00/func_80241DC0_A08CC0.s | 2 +- .../nok_15/A06F00/func_802422EC_A091EC.s | 2 +- .../omo_04/DAD400/func_802403A0_DAD7A0.s | 123 ------- .../omo_04/DAD400/func_802416AC_DAEAAC.s | 2 +- .../omo_05/DB22C0/func_80240A54_DB2D14.s | 123 ------- .../omo_05/DB22C0/func_80241D60_DB4020.s | 2 +- .../omo_07/DBD2B0/func_8024056C_DBD81C.s | 102 ------ .../omo_07/DBD2B0/func_80240BE8_DBDE98.s | 59 ---- .../omo_07/DBD2B0/func_80241100_DBE3B0.s | 4 +- .../omo_07/DBD2B0/func_80241634_DBE8E4.s | 4 +- .../omo_07/DBD2B0/func_80241978_DBEC28.s | 123 ------- .../omo_07/DBD2B0/func_80242C84_DBFF34.s | 2 +- .../omo_09/DCD6B0/func_80240F4C_DCDC1C.s | 102 ------ .../omo_09/DCD6B0/func_802415C8_DCE298.s | 59 ---- .../omo_09/DCD6B0/func_80241AE0_DCE7B0.s | 4 +- .../omo_09/DCD6B0/func_80242014_DCECE4.s | 4 +- .../omo_11/DDCFC0/func_80240BAC_DDD3DC.s | 15 - .../omo_17/DEF400/func_80240FB4_DEFE54.s | 123 ------- .../omo_17/DEF400/func_802422C0_DF1160.s | 2 +- .../pra_35/D8D270/func_80240F20_D8E170.s | 102 ------ .../pra_35/D8D270/func_8024159C_D8E7EC.s | 59 ---- .../pra_35/D8D270/func_80241AB4_D8ED04.s | 4 +- .../pra_35/D8D270/func_802423CC_D8F61C.s | 4 +- .../sam_06/D203E0/func_80240550_D203E0.s | 123 ------- .../sam_06/D203E0/func_8024185C_D216EC.s | 2 +- .../sam_08/D2FC80/func_8024041C_D3009C.s | 15 - .../sbk_56/953FC0/func_8024049C_95445C.s | 15 - .../tik_07/879BE0/func_802406FC_87A2DC.s | 15 - .../tik_07/87AC00/func_802413F0_87AFD0.s | 123 ------- .../tik_07/87AC00/func_802426FC_87C2DC.s | 2 +- .../tik_09/882BF0/func_80240AAC_882C6C.s | 93 ------ .../tik_09/882BF0/func_80240DC4_882F84.s | 2 +- .../tik_10/8866D0/func_80240A9C_886E5C.s | 15 - .../tik_12/8891C0/func_80241038_889C08.s | 15 - .../tik_12/88A530/func_802419DC_88A5AC.s | 93 ------ .../tik_12/88A530/func_80241CF4_88A8C4.s | 2 +- .../tik_17/892A50/func_8024044C_892E6C.s | 15 - .../tik_19/897BD0/func_80240A0C_897FEC.s | 15 - .../tik_20/89ACB0/func_802409DC_89AD2C.s | 93 ------ .../tik_20/89ACB0/func_80240CF4_89B044.s | 2 +- .../tik_23/8A2D30/func_802409DC_8A2DAC.s | 93 ------ .../tik_23/8A2D30/func_80240CF4_8A30C4.s | 2 +- .../tik_24/8A5DE0/func_8024074C_8A61CC.s | 93 ------ .../tik_24/8A5DE0/func_80240A64_8A64E4.s | 2 +- .../trd_01/99CD80/func_8024046C_99CDFC.s | 93 ------ .../trd_01/99CD80/func_80240784_99D114.s | 2 +- .../trd_02/9A10C0/func_8024015C_9A113C.s | 93 ------ .../trd_02/9A10C0/func_80240474_9A1454.s | 2 +- .../trd_02/9A10C0/func_802408B4_9A1894.s | 102 ------ .../trd_02/9A10C0/func_80240F30_9A1F10.s | 59 ---- .../trd_02/9A10C0/func_80241448_9A2428.s | 4 +- .../trd_02/9A10C0/func_80241744_9A2724.s | 6 +- .../trd_03/9A46F0/func_8024011C_9A476C.s | 93 ------ .../trd_03/9A46F0/func_80240434_9A4A84.s | 2 +- .../trd_04/9A88A0/func_8024052C_9A891C.s | 93 ------ .../trd_04/9A88A0/func_80240844_9A8C34.s | 2 +- .../trd_04/9A88A0/func_80240C84_9A9074.s | 102 ------ .../trd_04/9A88A0/func_80241300_9A96F0.s | 59 ---- .../trd_04/9A88A0/func_80241818_9A9C08.s | 4 +- .../trd_04/9A88A0/func_80241B14_9A9F04.s | 6 +- .../trd_04/9A88A0/func_80241E18_9AA208.s | 123 ------- .../trd_04/9A88A0/func_80243124_9AB514.s | 2 +- .../trd_04/9A88A0/func_80243650_9ABA40.s | 2 +- .../trd_07/9B6C90/func_8024038C_9B6D0C.s | 93 ------ .../trd_07/9B6C90/func_802406A4_9B7024.s | 2 +- .../trd_07/9B6C90/func_80240AE4_9B7464.s | 123 ------- .../trd_07/9B6C90/func_80241DF0_9B8770.s | 2 +- .../trd_07/9B6C90/func_8024231C_9B8C9C.s | 2 +- ver/us/symbol_addrs.txt | 304 +++++++++--------- ver/us/undefined_syms.txt | 2 + 333 files changed, 711 insertions(+), 12854 deletions(-) create mode 100644 src/world/common/SwitchToPartner.inc.c create mode 100644 src/world/common/UnkDistFunc.inc.c create mode 100644 src/world/common/UnkNpcAIFunc23.inc.c create mode 100644 src/world/common/UnkNpcAIFunc24.inc.c create mode 100644 src/world/common/UnkNpcAIFunc25.inc.c delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CB0_A11530.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s delete mode 100644 ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_80240930_97BF60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C_988F7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C_91EC7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240A7C_B5ED2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024072C_C6885C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024041C_C770FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4_9DA004.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BAC_DDD3DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s delete mode 100644 ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024041C_D3009C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C_95445C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC_87A2DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C_886E5C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038_889C08.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C_892E6C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C_897FEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s diff --git a/src/world/area_arn/arn_03/events.c b/src/world/area_arn/arn_03/events.c index 03e6bca05f..1cdbdda191 100644 --- a/src/world/area_arn/arn_03/events.c +++ b/src/world/area_arn/arn_03/events.c @@ -859,136 +859,15 @@ Script N(makeEntities) = SCRIPT({ MakeEntity(0x802E9A18, 250, 237, 125, 0, MAKE_ENTITY_END); }); -void N(func_80240000_BDED90)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; +#include "world/common/UnkNpcAIFunc24.inc.c" - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; -} - -void N(func_80240158_BDEEE8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->turnAroundYawAdjustment == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = (*(enemy->territory->patrol.points + script->functionTemp[2].s)).x; - z = (*(enemy->territory->patrol.points + script->functionTemp[2].s)).z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} +#include "world/common/UnkFunc13.inc.c" #include "world/common/UnkNpcAIFunc1.inc.c" -void N(func_802404C0_BDF250)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; +#include "world/common/UnkFunc14.inc.c" - if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} - -void N(func_8024067C_BDF40C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -1052,17 +931,17 @@ ApiStatus N(func_80240B94_BDF924)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_BDED90)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: - N(func_80240158_BDEEE8)(script, npcAISettings, territoryPtr); + N(UnkFunc13)(script, npcAISettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, npcAISettings, territoryPtr); case 3: - N(func_802404C0_BDF250)(script, npcAISettings, territoryPtr); + N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024067C_BDF40C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -1164,7 +1043,7 @@ ApiStatus N(func_8024113C_BDFECC)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_BDED90)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(func_80240E90_BDFC20)(script, npcAISettings, territoryPtr); break; @@ -1174,7 +1053,7 @@ ApiStatus N(func_8024113C_BDFECC)(ScriptInstance* script, s32 isInitialCall) { N(func_80241068_BDFDF8)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024067C_BDF40C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; } diff --git a/src/world/area_arn/arn_04/events.c b/src/world/area_arn/arn_04/events.c index 0e38a7a952..3fb2adf8f3 100644 --- a/src/world/area_arn/arn_04/events.c +++ b/src/world/area_arn/arn_04/events.c @@ -275,39 +275,7 @@ Script N(makeEntities) = SCRIPT({ MakeItemEntity(ITEM_STAR_PIECE, 540, 230, 13, 17, SI_SAVE_FLAG(1019)); }); -void N(func_80240000_BE37B0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, (*(enemy->territory->patrol.points + i)).x, enemy->territory->patrol.points[i].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" void N(func_80240158_BE3908)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { Enemy* enemy = script->owner1.enemy; @@ -359,52 +327,9 @@ void N(func_80240158_BE3908)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkNpcAIFunc1.inc.c" -void N(func_802404C0_BE3C70)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; +#include "world/common/UnkFunc14.inc.c" - if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - ai_enemy_play_sound(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->turnAroundYawAdjustment == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} - -void N(func_8024067C_BE3E2C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -468,17 +393,17 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_BE37B0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr); case 1: N(func_80240158_BE3908)(script, aiSettings, territoryPtr); break; case 2: N(UnkNpcAIFunc1)(script, aiSettings, territoryPtr); case 3: - N(func_802404C0_BE3C70)(script, aiSettings, territoryPtr); + N(UnkFunc14)(script, aiSettings, territoryPtr); break; case 4: - N(func_8024067C_BE3E2C)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc25)(script, aiSettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, aiSettings, territoryPtr); @@ -502,29 +427,7 @@ ApiStatus N(func_80240B94_BE4344)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -void N(func_80240E90_BE4640)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -727,7 +630,7 @@ ApiStatus N(func_8024219C_BE594C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240E90_BE4640)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80241040_BE47F0)(script, aiSettings, territoryPtr); return ApiStatus_BLOCK; diff --git a/src/world/area_arn/arn_05/arn_05.h b/src/world/area_arn/arn_05/arn_05.h index 1fa3cf1a56..2d27f80d79 100644 --- a/src/world/area_arn/arn_05/arn_05.h +++ b/src/world/area_arn/arn_05/arn_05.h @@ -6,7 +6,7 @@ ApiStatus func_802D2B50(void); -ApiStatus N(func_802412C8_BE8EA8)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SwitchToPartner)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802412B0_BE8E90)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_8024113C_BE8D1C)(ScriptInstance* script, s32 isInitialCall); diff --git a/src/world/area_arn/arn_05/events.c b/src/world/area_arn/arn_05/events.c index 726b2e0fda..011a9d829e 100644 --- a/src/world/area_arn/arn_05/events.c +++ b/src/world/area_arn/arn_05/events.c @@ -552,7 +552,7 @@ Script N(80242C50) = SCRIPT({ SpeakToPlayer(NPC_BOO2, NPC_ANIM(boo, Palette_01, Anim_6), NPC_ANIM(boo, Palette_01, Anim_6), 0, MESSAGE_ID(0x0E, 0x00A1)); GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) != 9) { - N(func_802412C8_BE8EA8)(9); + N(SwitchToPartner)(9); spawn { SI_MAP_VAR(0) = 0; ShowMessageAtScreenPos(MESSAGE_ID(0x0E, 0x00A2), 160, 40); @@ -1001,39 +1001,7 @@ Script N(makeEntities) = SCRIPT({ MakeEntity(0x802EA7E0, 17, 238, 80, 0, MAKE_ENTITY_END); }); -void N(func_80240000_BE7BE0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -1041,22 +1009,7 @@ void N(func_80240000_BE7BE0)(ScriptInstance* script, NpcAISettings* aiSettings, #include "world/common/UnkFunc14.inc.c" -void N(func_8024067C_BE825C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -1120,7 +1073,7 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_BE7BE0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr); case 1: N(UnkFunc13)(script, aiSettings, territoryPtr); break; @@ -1130,7 +1083,7 @@ ApiStatus N(func_80240B94_BE8774)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, aiSettings, territoryPtr); break; case 4: - N(func_8024067C_BE825C)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc25)(script, aiSettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, aiSettings, territoryPtr); @@ -1233,7 +1186,7 @@ ApiStatus N(func_8024113C_BE8D1C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_BE7BE0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr); case 1: N(func_80240E90_BE8A70)(script, aiSettings, territoryPtr); break; @@ -1243,7 +1196,7 @@ ApiStatus N(func_8024113C_BE8D1C)(ScriptInstance* script, s32 isInitialCall) { N(func_80241068_BE8C48)(script, aiSettings, territoryPtr); break; case 4: - N(func_8024067C_BE825C)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc25)(script, aiSettings, territoryPtr); } enemy->varTable[0] = npc->pos.y; @@ -1254,7 +1207,4 @@ ApiStatus N(func_802412B0_BE8E90)(ScriptInstance* script, s32 isInitialCall) { return (gGameStatusPtr->pressedButtons >> 1) & ApiStatus_DONE2; } -ApiStatus N(func_802412C8_BE8EA8)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} +#include "world/common/SwitchToPartner.inc.c" diff --git a/src/world/area_arn/arn_07/events.c b/src/world/area_arn/arn_07/events.c index 13c5676181..76fd581301 100644 --- a/src/world/area_arn/arn_07/events.c +++ b/src/world/area_arn/arn_07/events.c @@ -1163,29 +1163,7 @@ NpcGroupList N(npcGroupList_802478E8) = { {}, }; -void N(func_80240950_BED740)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING void N(func_80240B00_BED8F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { @@ -1387,7 +1365,7 @@ ApiStatus N(func_80241C5C_BEEA4C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240950_BED740)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80240B00_BED8F0)(script, aiSettings, territoryPtr); return ApiStatus_BLOCK; diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index 69ff8f7171..3b6807563a 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -485,29 +485,7 @@ NpcAISettings N(npcAISettings_80244D24) = { .unk_2C = 1, }; -void N(func_80240120_BFD9A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -710,7 +688,7 @@ ApiStatus N(func_8024142C_BFECAC)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240120_BFD9A0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_802402D0_BFDB50)(script, aiSettings, territoryPtr); break; @@ -1000,7 +978,7 @@ ApiStatus N(func_802422B0_BFFB30)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240120_BFD9A0)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: N(func_802402D0_BFDB50)(script, aiSettings, territoryPtr); @@ -1253,40 +1231,7 @@ Script N(init_80245784) = SCRIPT({ const char N(dgb_00_name_hack)[] = "dgb_00"; -ApiStatus N(func_8024252C_BFFDAC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return 1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -1294,23 +1239,7 @@ ApiStatus N(func_8024252C_BFFDAC)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -ApiStatus N(btl_state_draw_switch_to_player_C00428)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return 1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -1374,7 +1303,7 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_8024252C_BFFDAC)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc24)(script, aiSettings, territoryPtr); case 1: N(UnkFunc13)(script, aiSettings, territoryPtr); break; @@ -1384,7 +1313,7 @@ ApiStatus N(func_802430C0_C00940)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, aiSettings, territoryPtr); break; case 4: - N(btl_state_draw_switch_to_player_C00428)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc25)(script, aiSettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, aiSettings, territoryPtr); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 2cb0020ea3..4b62c9c012 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -870,40 +870,7 @@ ApiStatus N(func_8024086C_C31D4C)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(func_80240B20_C32000)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return 1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -911,23 +878,7 @@ ApiStatus N(func_80240B20_C32000)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -ApiStatus N(func_8024119C_C3267C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return 1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -991,7 +942,7 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240B20_C32000)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(UnkFunc13)(script, npcAISettings, territoryPtr); break; @@ -1001,7 +952,7 @@ ApiStatus N(func_802416B4_C32B94)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024119C_C3267C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -1067,7 +1018,7 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240B20_C32000)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(UnkFunc13)(script, npcAISettings, territoryPtr); break; @@ -1077,7 +1028,7 @@ ApiStatus N(func_802419B0_C32E90)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024119C_C3267C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 8d88f27f69..a717f550bd 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -356,7 +356,7 @@ Script N(80243EF8) = SCRIPT({ EnablePartnerAI(); GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) != SI_VAR(11)) { - N(func_802427EC_C38D1C)(SI_VAR(11)); + N(SwitchToPartner)(SI_VAR(11)); } else { func_802CF56C(2); } @@ -395,29 +395,7 @@ Script N(makeEntities) = SCRIPT({ AssignScript(N(80243EF8)); }); -void N(func_80240000_C36530)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -620,7 +598,7 @@ ApiStatus N(func_8024130C_C3783C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_C36530)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_802401B0_C366E0)(script, aiSettings, territoryPtr); break; @@ -900,7 +878,7 @@ ApiStatus N(func_80242154_C38684)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_C36530)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: N(func_802401B0_C366E0)(script, aiSettings, territoryPtr); @@ -1062,12 +1040,7 @@ INCLUDE_ASM(ApiStatus, "world/area_dgb/dgb_04/C36530", dgb_04_func_8024259C_C38A s32 isInitialCall) #endif -ApiStatus N(func_802427EC_C38D1C)(ScriptInstance* script, s32 isInitialCall) { - s32 partnerID = get_variable(script, *script->ptrReadPos); - switch_to_partner(partnerID); - - return ApiStatus_DONE2; -} +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_dgb/dgb_04/dgb_04.h b/src/world/area_dgb/dgb_04/dgb_04.h index 96ba718973..c0d5114479 100644 --- a/src/world/area_dgb/dgb_04/dgb_04.h +++ b/src/world/area_dgb/dgb_04/dgb_04.h @@ -12,7 +12,7 @@ ApiStatus N(func_8024240C_C3893C)(ScriptInstance *script, s32 isInitialCall); ApiStatus N(UnkFunc18)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc38)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_8024259C_C38ACC)(ScriptInstance* script, s32 isInitialCall); -ApiStatus N(func_802427EC_C38D1C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SwitchToPartner)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc19)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc20)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc39)(ScriptInstance* script, s32 isInitialCall); @@ -24,4 +24,4 @@ ApiStatus N(UnkFunc24)(ScriptInstance* script, s32 isInitialCall); NpcGroupList N(npcGroupList_80243D18); Script N(main); -Script N(makeEntities); \ No newline at end of file +Script N(makeEntities); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 688c407431..1d1027df9b 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -953,40 +953,7 @@ Script N(802469E0) = SCRIPT({ }); -ApiStatus N(func_80240000_C3FDB0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -994,23 +961,7 @@ ApiStatus N(func_80240000_C3FDB0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -ApiStatus N(func_8024067C_C4042C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -1074,7 +1025,7 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_C3FDB0)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(UnkFunc13)(script, npcAISettings, territoryPtr); break; @@ -1084,7 +1035,7 @@ ApiStatus N(func_80240B94_C40944)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024067C_C4042C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -1242,29 +1193,7 @@ ApiStatus N(func_802414AC_C4125C)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -void N(func_80241760_C41510)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -1467,7 +1396,7 @@ ApiStatus N(func_80242A6C_C4281C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80241760_C41510)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80241910_C416C0)(script, aiSettings, territoryPtr); break; @@ -1758,7 +1687,7 @@ ApiStatus N(func_802438F0_C436A0)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80241760_C41510)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: N(func_80241910_C416C0)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 257d0743a3..7463c1f8d8 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -1010,29 +1010,7 @@ ApiStatus N(func_802410D4_C47CB4)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -void N(func_80241424_C48004)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -1235,7 +1213,7 @@ ApiStatus N(func_80242730_C49310)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80241424_C48004)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_802415D4_C481B4)(script, aiSettings, territoryPtr); break; @@ -1518,7 +1496,7 @@ ApiStatus N(func_80243578_C4A158)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80241424_C48004)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); func_802DE894(npc->spriteInstanceID, 0, 0, 0, 0, 0, 0); case 1: N(func_802415D4_C481B4)(script, aiSettings, territoryPtr); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 2e35204f61..b19cfb645b 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -576,40 +576,7 @@ ApiStatus N(func_8024061C_C4FB2C)(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus N(func_802408D0_C4FDE0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -617,23 +584,7 @@ ApiStatus N(func_802408D0_C4FDE0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -ApiStatus N(func_80240F4C_C5045C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -697,7 +648,7 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802408D0_C4FDE0)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(UnkFunc13)(script, npcAISettings, territoryPtr); break; @@ -707,7 +658,7 @@ ApiStatus N(func_80241464_C50974)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240F4C_C5045C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_dgb/dgb_18/C55F40.c b/src/world/area_dgb/dgb_18/C55F40.c index 55411d4a3d..4a090b284f 100644 --- a/src/world/area_dgb/dgb_18/C55F40.c +++ b/src/world/area_dgb/dgb_18/C55F40.c @@ -683,40 +683,7 @@ Script N(makeEntities) = SCRIPT({ AssignScript(N(8024382C)); }); -ApiStatus N(func_80240000_C55F40)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -724,23 +691,7 @@ ApiStatus N(func_80240000_C55F40)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -ApiStatus N(func_8024067C_C565BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -804,7 +755,7 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_C55F40)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(UnkFunc13)(script, npcAISettings, territoryPtr); break; @@ -814,7 +765,7 @@ ApiStatus N(func_80240B94_C56AD4)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024067C_C565BC)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 7d207fb867..244305d6af 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -2869,40 +2869,7 @@ Script N(makeEntities) = SCRIPT({ MakeEntity(0x802EAF80, 430, 0, -120, 0, ITEM_SPIN_JUMP, N(8024D2B0), 1939, MAKE_ENTITY_END); }); -ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -2910,23 +2877,7 @@ ApiStatus N(func_802405E0_95B7E0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -ApiStatus N(func_80240C5C_95BE5C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -2990,7 +2941,7 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802405E0_95B7E0)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(UnkFunc13)(script, npcAISettings, territoryPtr); break; @@ -3000,7 +2951,7 @@ ApiStatus N(func_80241174_95C374)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240C5C_95BE5C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 1a9345a7f9..422c3df99a 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -2085,40 +2085,7 @@ Script N(makeEntities) = SCRIPT({ } }); -ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -2126,23 +2093,7 @@ ApiStatus N(func_80240040_C9DF60)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -ApiStatus N(func_802406BC_C9E5DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim.w = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -2206,7 +2157,7 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240040_C9DF60)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc24)(script, npcAISettings, territoryPtr); case 1: N(UnkFunc13)(script, npcAISettings, territoryPtr); break; @@ -2216,7 +2167,7 @@ ApiStatus N(func_80240BD4_C9EAF4)(ScriptInstance* script, s32 isInitialCall) { N(UnkFunc14)(script, npcAISettings, territoryPtr); break; case 4: - N(func_802406BC_C9E5DC)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_flo/flo_08/CAED40.c b/src/world/area_flo/flo_08/CAED40.c index 98e2760727..fc6fa9e588 100644 --- a/src/world/area_flo/flo_08/CAED40.c +++ b/src/world/area_flo/flo_08/CAED40.c @@ -112,10 +112,7 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_08/CAED40", flo_08_func_802401CC_CAEF s32 isInitialCall); #endif -ApiStatus N(func_8024041C_CAF15C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 5a0fab1083..dfcbb71192 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -145,7 +145,7 @@ Script N(80242178) = SCRIPT({ EnablePartnerAI(); GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) != SI_VAR(11)) { - N(func_8024041C_CAF15C)(SI_VAR(11)); + N(SwitchToPartner)(SI_VAR(11)); } else { func_802CF56C(2); } diff --git a/src/world/area_flo/flo_08/flo_08.h b/src/world/area_flo/flo_08/flo_08.h index 9a271cc214..ba88b6e7cd 100644 --- a/src/world/area_flo/flo_08/flo_08.h +++ b/src/world/area_flo/flo_08/flo_08.h @@ -18,7 +18,7 @@ ApiStatus N(UnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_8024003C_CAED7C)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc38)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802401CC_CAEF0C)(ScriptInstance* script, s32 isInitialCall); -ApiStatus N(func_8024041C_CAF15C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SwitchToPartner)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc39)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80240600_CAF340)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc40)(ScriptInstance* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index 6c12657eea..48e50e2113 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -1,28 +1,6 @@ #include "flo_09.h" -void N(func_80240320_CB5320)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING void N(func_802404D0_CB54D0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { @@ -228,7 +206,7 @@ ApiStatus N(func_8024162C_CB662C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240320_CB5320)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc23)(script, npcAISettings, territoryPtr); case 1: N(func_802404D0_CB54D0)(script, npcAISettings, territoryPtr); break; diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index 479ddc3a00..72fb02abc2 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -1186,29 +1186,7 @@ NpcGroupList N(npcGroupList_80247984) = { #include "world/common/UnkFunc41.inc.c" -void N(func_802401C4_CC39D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING void N(func_802404D0_CB54D0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { @@ -1415,7 +1393,7 @@ ApiStatus N(func_802414D0_CC4CE0)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802401C4_CC39D4)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80240374_CC3B84)(script, aiSettings, territoryPtr); break; @@ -1621,7 +1599,7 @@ ApiStatus N(func_80241DB8_CC55C8)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802401C4_CC39D4)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80241704_CC4F14)(script, aiSettings, territoryPtr); @@ -1722,27 +1700,7 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_13/CC3850", flo_13_func_80241DB8_CC55 #include "world/common/set_script_owner_npc_anim.inc.c" -void N(func_80242314_CC5B24)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim.w = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -1843,7 +1801,7 @@ ApiStatus N(func_8024262C_CC5E3C)(ScriptInstance* script, s32 isInitialCall) { N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); case 13: - N(func_80242314_CC5B24)(script, aiSettings, territoryPtr); + N(UnkDistFunc)(script, aiSettings, territoryPtr); break; case 14: @@ -1975,7 +1933,7 @@ ApiStatus N(func_80242A6C_CC627C)(ScriptInstance* script, s32 isInitialCall) { N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); case 13: - N(func_80242314_CC5B24)(script, aiSettings, territoryPtr); + N(UnkDistFunc)(script, aiSettings, territoryPtr); npc->collisionHeight = enemy->varTable[6]; break; diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 1cf6a614a5..109aa261cd 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -309,29 +309,7 @@ Script N(80245224) = SCRIPT({ spawn N(80244F70); }); -void N(func_80240B10_CCBE20)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -539,7 +517,7 @@ ApiStatus N(func_80241E1C_CCD12C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240B10_CCBE20)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80240CC0_CCBFD0)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index a5a27ac993..68740d52ed 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -330,7 +330,7 @@ Script N(802438C8) = SCRIPT({ EnablePartnerAI(); GetCurrentPartnerID(SI_VAR(0)); if (SI_VAR(0) != SI_VAR(11)) { - N(func_802404FC_CD232C)(SI_VAR(11)); + N(SwitchToPartner)(SI_VAR(11)); } else { func_802CF56C(2); } @@ -519,10 +519,7 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_16/CD1F10", flo_16_func_802402AC_CD20 s32 isInitialCall); #endif -ApiStatus N(func_802404FC_CD232C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 41114f09b6..1ab83a8e55 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -341,29 +341,7 @@ Script N(802451C4) = SCRIPT({ bind N(80244DC8) to TRIGGER_FLOOR_TOUCH 44; }); -void N(func_80240E50_CD2C80)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -566,7 +544,7 @@ ApiStatus N(func_8024215C_CD3F8C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240E50_CD2C80)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80241000_CD2E30)(script, aiSettings, territoryPtr); break; @@ -675,7 +653,7 @@ ApiStatus N(func_80242754_CD4584)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240E50_CD2C80)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80241000_CD2E30)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_flo/flo_16/flo_16.h b/src/world/area_flo/flo_16/flo_16.h index 4429746fb8..9561ae88ce 100644 --- a/src/world/area_flo/flo_16/flo_16.h +++ b/src/world/area_flo/flo_16/flo_16.h @@ -20,7 +20,7 @@ ApiStatus N(UnkPartnerPosFunc2)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80240000_CD1E30)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_8024011C_CD1F4C)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802402AC_CD20DC)(ScriptInstance* script, s32 isInitialCall); -ApiStatus N(func_802404FC_CD232C)(ScriptInstance* script, s32 isInitialCall); +ApiStatus N(SwitchToPartner)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_802406E0_CD2510)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(UnkFunc44)(ScriptInstance* script, s32 isInitialCall); ApiStatus N(func_80242754_CD4584)(ScriptInstance* script, s32 isInitialCall); @@ -31,4 +31,4 @@ extern Script N(8024346C); extern Script N(802451C4); extern Script N(main); extern Script N(makeEntities); -extern Script N(unkFunc23); \ No newline at end of file +extern Script N(unkFunc23); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 4c4c2efa09..c6a2b79d5a 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -609,29 +609,7 @@ Script N(makeEntities) = SCRIPT({ MakeItemEntity(ITEM_LETTER09, -245, 0, 105, 17, SI_SAVE_FLAG(1389)); }); -void N(func_80240070_CD7350)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -834,7 +812,7 @@ ApiStatus N(func_8024137C_CD865C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240070_CD7350)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_80240220_CD7500)(script, aiSettings, territoryPtr); break; @@ -1040,7 +1018,7 @@ ApiStatus N(func_80241C64_CD8F44)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240070_CD7350)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_802415B0_CD8890)(script, aiSettings, territoryPtr); @@ -1141,27 +1119,7 @@ INCLUDE_ASM(ApiStatus, "world/area_flo/flo_17/CD7350", flo_17_func_80241C64_CD8F #include "world/common/set_script_owner_npc_anim.inc.c" -void N(func_802421C0_CD94A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim.w = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -1262,7 +1220,7 @@ ApiStatus N(func_802424D8_CD97B8)(ScriptInstance* script, s32 isInitialCall) { N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); case 13: - N(func_802421C0_CD94A0)(script, aiSettings, territoryPtr); + N(UnkDistFunc)(script, aiSettings, territoryPtr); break; case 14: @@ -1394,7 +1352,7 @@ ApiStatus N(func_80242918_CD9BF8)(ScriptInstance* script, s32 isInitialCall) { N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); case 13: - N(func_802421C0_CD94A0)(script, aiSettings, territoryPtr); + N(UnkDistFunc)(script, aiSettings, territoryPtr); npc->collisionHeight = enemy->varTable[6]; break; diff --git a/src/world/area_flo/flo_23/CEE2A0.c b/src/world/area_flo/flo_23/CEE2A0.c index 3559f84801..10e632b5ae 100644 --- a/src/world/area_flo/flo_23/CEE2A0.c +++ b/src/world/area_flo/flo_23/CEE2A0.c @@ -505,27 +505,7 @@ ApiStatus N(func_802402F8_CEE558)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/set_script_owner_npc_anim.inc.c" -void N(func_80240410_CEE670)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim.w = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, - gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -626,7 +606,7 @@ ApiStatus N(func_80240728_CEE988)(ScriptInstance* script, s32 isInitialCall) { N(set_script_owner_npc_anim)(script, aiSettings, territoryPtr); case 13: - N(func_80240410_CEE670)(script, aiSettings, territoryPtr); + N(UnkDistFunc)(script, aiSettings, territoryPtr); break; case 14: diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index aa3199c859..b37a06cab8 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -504,29 +504,7 @@ static s32 N(pad_3CD8)[] = { 0x00000000, 0x00000000, }; -void N(func_80240040_CF2C10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim.w = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} +#include "world/common/UnkNpcAIFunc23.inc.c" #ifdef NON_MATCHING // second npc_raycast_down_sides call @@ -729,7 +707,7 @@ ApiStatus N(func_8024134C_CF3F1C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240040_CF2C10)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_802401F0_CF2DC0)(script, aiSettings, territoryPtr); break; @@ -839,7 +817,7 @@ ApiStatus N(func_80241944_CF4514)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240040_CF2C10)(script, aiSettings, territoryPtr); + N(UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_802401F0_CF2DC0)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index 1955373718..0cb368c21c 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -29,12 +29,6 @@ void func_80240C34_A114B4(void) { INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C84_A11504); -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CB0_A11530); -/* -ApiStatus N(func_80240CB0_A11530)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CDC_A1155C); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index fcaf85cbc1..c8e39fe968 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -1,31 +1,6 @@ #include "hos_02.h" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80240FF0_A17210); -/* -void N(func_80240FF0_A17210)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0_A173C0); @@ -90,7 +65,7 @@ ApiStatus N(func_802422FC_A1851C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240FF0_A17210)(script, aiSettings, territoryPtr); + N(hos_02_UnkNpcAIFunc23)(script, aiSettings, territoryPtr); case 1: N(func_802411A0_A173C0)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 80eda794e7..d6d9728b26 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -2,32 +2,7 @@ #define UNK_ALPHA_FUNC_NPC 7 -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240CB0_A1BDB0); -/* -void N(func_80240CB0_A1BDB0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); @@ -92,7 +67,7 @@ ApiStatus N(func_80241FBC_A1D0BC)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240CB0_A1BDB0)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(btl_merlee_on_start_turn_A1BF60)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index 8c0b74e371..65a9f3279e 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802400BC_97B6EC); -/* -void N(func_802400BC_97B6EC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_isk/isk_04/97BF60.c b/src/world/area_isk/isk_04/97BF60.c index e1169f5a15..30b300d8c1 100644 --- a/src/world/area_isk/isk_04/97BF60.c +++ b/src/world/area_isk/isk_04/97BF60.c @@ -1,11 +1,5 @@ #include "isk_04.h" -INCLUDE_ASM(s32, "world/area_isk/isk_04/97BF60", func_80240930_97BF60); -/* -ApiStatus N(func_80240930_97BF60)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" INCLUDE_ASM(s32, "world/area_isk/isk_04/97BF60", func_8024095C_97BF8C); diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index ed281fe9a3..49d1d98854 100644 --- a/src/world/area_isk/isk_08/984E30.c +++ b/src/world/area_isk/isk_08/984E30.c @@ -7,29 +7,7 @@ static char* N(exit_str_3) = "isk_11"; #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_8024007C_984EAC); -/* -void N(func_8024007C_984EAC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index 194a698caf..a9dba6f163 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -21,13 +21,7 @@ ApiStatus N(func_8024003C_988B9C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802401CC_988D2C); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024041C_988F7C); -/* -ApiStatus N(func_8024041C_988F7C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_isk/isk_18/997F70.c b/src/world/area_isk/isk_18/997F70.c index 7a70922b04..694bb39730 100644 --- a/src/world/area_isk/isk_18/997F70.c +++ b/src/world/area_isk/isk_18/997F70.c @@ -5,29 +5,7 @@ static char* N(exit_str_1) = "isk_12"; #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_18/997F70", func_8024007C_997FEC); -/* -void N(func_8024007C_997FEC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index 727f8dda56..b30571af78 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -18,13 +18,7 @@ ApiStatus N(func_8024032C_91E89C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802404BC_91EA2C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024070C_91EC7C); -/* -ApiStatus N(func_8024070C_91EC7C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index f196d5f5b0..bb6883d951 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -2,43 +2,7 @@ #define UNK_ALPHA_FUNC_NPC 5 -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240430_B2C8A0); -/* -ApiStatus N(func_80240430_B2C8A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -46,26 +10,7 @@ ApiStatus N(func_80240430_B2C8A0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240AAC_B2CF1C); -/* -ApiStatus N(func_80240AAC_B2CF1C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -131,7 +76,7 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240430_B2C8A0)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240588_B2C9F8)(script, npcAISettings, territoryPtr); break; @@ -141,7 +86,7 @@ ApiStatus N(func_80240FC4_B2D434)(ScriptInstance* script, s32 isInitialCall) { N(func_802408F0_B2CD60)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240AAC_B2CF1C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -484,4 +429,4 @@ ApiStatus N(func_80242678_B2EAE8)(ScriptInstance *script, s32 isInitialCall) { } */ -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802426A8_B2EB18); +#include "world/common/SwitchToPartner.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 67a1d76c02..e84c6a2fbf 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -25,43 +25,7 @@ static char* N(exit_str_3) = ""; INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240620_B351F0); -/* -ApiStatus N(func_80240620_B351F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -69,26 +33,7 @@ ApiStatus N(func_80240620_B351F0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240C9C_B3586C); -/* -ApiStatus N(func_80240C9C_B3586C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -154,7 +99,7 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240620_B351F0)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240778_B35348)(script, npcAISettings, territoryPtr); break; @@ -164,7 +109,7 @@ ApiStatus N(func_802411B4_B35D84)(ScriptInstance* script, s32 isInitialCall) { N(func_80240AE0_B356B0)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240C9C_B3586C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index f1ebc8e880..2bb306291c 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -16,13 +16,7 @@ ApiStatus N(func_8024069C_B5E94C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_8024082C_B5EADC); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240A7C_B5ED2C); -/* -ApiStatus N(func_80240A7C_B5ED2C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 85e8bc6b68..a18d2f1a37 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -5,43 +5,7 @@ static char* N(exit_str_1) = "jan_16"; static char* N(exit_str_2) = "kzn_01"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240000_B84180); -/* -ApiStatus N(func_80240000_B84180)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -49,26 +13,7 @@ ApiStatus N(func_80240000_B84180)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_8024067C_B847FC); -/* -ApiStatus N(func_8024067C_B847FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -134,7 +79,7 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_B84180)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240158_B842D8)(script, npcAISettings, territoryPtr); break; @@ -144,7 +89,7 @@ ApiStatus N(func_80240B94_B84D14)(ScriptInstance* script, s32 isInitialCall) { N(func_802404C0_B84640)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024067C_B847FC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index f3fd7e0af7..ff06ed9382 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -1,42 +1,6 @@ #include "kkj_00.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802400B0_ABB340); -/* -ApiStatus N(func_802400B0_ABB340)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -44,26 +8,7 @@ ApiStatus N(func_802400B0_ABB340)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_8024072C_ABB9BC); -/* -ApiStatus N(func_8024072C_ABB9BC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -129,7 +74,7 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802400B0_ABB340)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240208_ABB498)(script, npcAISettings, territoryPtr); break; @@ -139,7 +84,7 @@ ApiStatus N(func_80240C44_ABBED4)(ScriptInstance* script, s32 isInitialCall) { N(func_80240570_ABB800)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024072C_ABB9BC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_kkj/kkj_01/AC5170.c b/src/world/area_kkj/kkj_01/AC5170.c index f436056dbf..a01b37430c 100644 --- a/src/world/area_kkj/kkj_01/AC5170.c +++ b/src/world/area_kkj/kkj_01/AC5170.c @@ -5,43 +5,7 @@ static char* N(exit_str_1) = "kkj_02"; static char* N(exit_str_2) = "kkj_14"; static char* N(exit_str_3) = ""; -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_80240000_AC5170); -/* -ApiStatus N(func_80240000_AC5170)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -49,26 +13,7 @@ ApiStatus N(func_80240000_AC5170)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_01/AC5170", func_8024067C_AC57EC); -/* -ApiStatus N(func_8024067C_AC57EC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -134,7 +79,7 @@ ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_AC5170)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240158_AC52C8)(script, npcAISettings, territoryPtr); break; @@ -144,7 +89,7 @@ ApiStatus N(func_80240B94_AC5D04)(ScriptInstance* script, s32 isInitialCall) { N(func_802404C0_AC5630)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024067C_AC57EC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 6f1b0f2c74..16184fc71c 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -3,32 +3,7 @@ static char* N(exit_str_0) = "kmr_03"; static char* N(exit_str_1) = "kmr_02"; -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240000_8CE070); -/* -void N(func_80240000_8CE070)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802401B0_8CE220); diff --git a/src/world/area_kmr/kmr_06/8D1510.c b/src/world/area_kmr/kmr_06/8D1510.c index 1a883a0212..798d2ede5b 100644 --- a/src/world/area_kmr/kmr_06/8D1510.c +++ b/src/world/area_kmr/kmr_06/8D1510.c @@ -3,32 +3,7 @@ static char* N(exit_str_0) = "kmr_09"; static char* N(exit_str_1) = "kmr_07"; -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_80240000_8D1510); -/* -void N(func_80240000_8D1510)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D1510", func_802401B0_8D16C0); diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index 75ffcaabd4..73dcd02570 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -3,32 +3,7 @@ static char* N(exit_str_0) = "kmr_02"; static char* N(exit_str_1) = "kmr_06"; -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_80240000_8D5E00); -/* -void N(func_80240000_8D5E00)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802401B0_8D5FB0); @@ -93,7 +68,7 @@ ApiStatus N(func_8024130C_8D710C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_8D5E00)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_802401B0_8D5FB0)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index 3805ae439d..7bcb039284 100644 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ b/src/world/area_kpa/kpa_01/A470C0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802401DC_A4713C); -/* -void N(func_802401DC_A4713C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index b01bdbc2fd..4e26633d13 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802401DC_A4879C); -/* -void N(func_802401DC_A4879C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index ad77762145..9848a873c9 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -22,29 +22,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802415D8_A94D18); -/* -void N(func_802415D8_A94D18)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c index 7a1785c42a..b99ffbb341 100644 --- a/src/world/area_kpa/kpa_11/A52BD0.c +++ b/src/world/area_kpa/kpa_11/A52BD0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_11/A52BD0", func_8024038C_A52C4C); -/* -void N(func_8024038C_A52C4C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index 2ddc503aad..e42ef3376c 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -6,29 +6,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_8024022C_A9CE5C); -/* -void N(func_8024022C_A9CE5C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index 2325d0e0f8..b81d8236f1 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -25,29 +25,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4); #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802412C8_A61C98); -/* -void N(func_802412C8_A61C98)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index 66a858162b..644a03bc74 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -38,29 +38,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494); #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802414C8_A65558); -/* -void N(func_802414C8_A65558)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index 9819d196c4..66b35f1dce 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024038C_A6E76C); -/* -void N(func_8024038C_A6E76C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_70/A74B80.c b/src/world/area_kpa/kpa_70/A74B80.c index e84f46609a..f54f230298 100644 --- a/src/world/area_kpa/kpa_70/A74B80.c +++ b/src/world/area_kpa/kpa_70/A74B80.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_70/A74B80", func_8024038C_A74BFC); -/* -void N(func_8024038C_A74BFC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 0ddff5b56c..e446ab1fb9 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -3,43 +3,7 @@ static char* N(exit_str_0) = "kpa_90"; static char* N(exit_str_1) = ""; -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240000_A86A50); -/* -ApiStatus N(func_80240000_A86A50)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -47,26 +11,7 @@ ApiStatus N(func_80240000_A86A50)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024067C_A870CC); -/* -ApiStatus N(func_8024067C_A870CC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -132,7 +77,7 @@ ApiStatus N(func_80240B94_A875E4)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240000_A86A50)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240158_A86BA8)(script, npcAISettings, territoryPtr); break; @@ -142,7 +87,7 @@ ApiStatus N(func_80240B94_A875E4)(ScriptInstance* script, s32 isInitialCall) { N(func_802404C0_A86F10)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024067C_A870CC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -169,29 +114,7 @@ ApiStatus N(func_80240B94_A875E4)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240F0C_A8795C); -/* -void N(func_80240F0C_A8795C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 6ad4b1b7b7..0087caac3b 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -1,42 +1,6 @@ #include "kpa_95.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802400E0_A8CB60); -/* -ApiStatus N(func_802400E0_A8CB60)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -44,26 +8,7 @@ ApiStatus N(func_802400E0_A8CB60)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024075C_A8D1DC); -/* -ApiStatus N(func_8024075C_A8D1DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -129,7 +74,7 @@ ApiStatus N(func_80240C74_A8D6F4)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802400E0_A8CB60)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240238_A8CCB8)(script, npcAISettings, territoryPtr); break; @@ -139,7 +84,7 @@ ApiStatus N(func_80240C74_A8D6F4)(ScriptInstance* script, s32 isInitialCall) { N(func_802405A0_A8D020)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024075C_A8D1DC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -166,29 +111,7 @@ ApiStatus N(func_80240C74_A8D6F4)(ScriptInstance* script, s32 isInitialCall) { #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240FEC_A8DA6C); -/* -void N(func_80240FEC_A8DA6C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index e03ef9d670..6cdca7780e 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -1,31 +1,6 @@ #include "kzn_02.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802404E0_C5AC20); -/* -void N(func_802404E0_C5AC20)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240690_C5ADD0); @@ -90,7 +65,7 @@ ApiStatus N(func_802417EC_C5BF2C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802404E0_C5AC20)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240690_C5ADD0)(script, aiSettings, territoryPtr); break; @@ -205,7 +180,7 @@ ApiStatus N(func_80241DE4_C5C524)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802404E0_C5AC20)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240690_C5ADD0)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index da8ddd4146..c6c7927fc2 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024038C_C6109C); -/* -void N(func_8024038C_C6109C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index 452be5c1d0..c1302e7696 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -16,13 +16,7 @@ ApiStatus N(func_8024034C_C6847C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802404DC_C6860C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024072C_C6885C); -/* -ApiStatus N(func_8024072C_C6885C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 9a31ad4abd..fc6f4b266f 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -4,32 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240720_C6EA50); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802407F4_C6EB24); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240820_C6EB50); -/* -void N(func_80240820_C6EB50)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0_C6ED00); @@ -94,7 +69,7 @@ ApiStatus N(func_80241B2C_C6FE5C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240820_C6EB50)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_802409D0_C6ED00)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 03a36a92bf..44d4f4b4b8 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -1,31 +1,6 @@ #include "kzn_08.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240A50_C71ED0); -/* -void N(func_80240A50_C71ED0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240C00_C72080); @@ -90,7 +65,7 @@ ApiStatus N(func_80241D5C_C731DC)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240A50_C71ED0)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240C00_C72080)(script, aiSettings, territoryPtr); break; @@ -205,7 +180,7 @@ ApiStatus N(func_80242354_C737D4)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240A50_C71ED0)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240C00_C72080)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_kzn/kzn_09/C76CE0.c b/src/world/area_kzn/kzn_09/C76CE0.c index 4bc78e4d1b..8b4e4c9cf8 100644 --- a/src/world/area_kzn/kzn_09/C76CE0.c +++ b/src/world/area_kzn/kzn_09/C76CE0.c @@ -19,13 +19,7 @@ ApiStatus N(func_8024003C_C76D1C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_802401CC_C76EAC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C76CE0", func_8024041C_C770FC); -/* -ApiStatus N(func_8024041C_C770FC)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index 1e0ebe4a03..389273594f 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -157,29 +157,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454); #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242A40_C79720); -/* -void N(func_80242A40_C79720)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index e49a6ed7f5..8b2c9ea8ad 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -1,31 +1,6 @@ #include "kzn_11.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240460_C80600); -/* -void N(func_80240460_C80600)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240610_C807B0); @@ -90,7 +65,7 @@ ApiStatus N(func_8024176C_C8190C)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240460_C80600)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240610_C807B0)(script, aiSettings, territoryPtr); break; @@ -205,7 +180,7 @@ ApiStatus N(func_80241D64_C81F04)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240460_C80600)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240610_C807B0)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index ad83129d2b..cbda4898fb 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -157,29 +157,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241A64_C87514); #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241D30_C877E0); -/* -void N(func_80241D30_C877E0)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index c20868389b..e87b040e9c 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -1,42 +1,6 @@ #include "mac_00.h" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242570_7ED280); -/* -ApiStatus N(func_80242570_7ED280)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -44,26 +8,7 @@ ApiStatus N(func_80242570_7ED280)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242BEC_7ED8FC); -/* -ApiStatus N(func_80242BEC_7ED8FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -129,7 +74,7 @@ ApiStatus N(func_80243104_7EDE14)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80242570_7ED280)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_802426C8_7ED3D8)(script, npcAISettings, territoryPtr); break; @@ -139,7 +84,7 @@ ApiStatus N(func_80243104_7EDE14)(ScriptInstance* script, s32 isInitialCall) { N(func_80242A30_7ED740)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80242BEC_7ED8FC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 1b984c3d35..bab5a0dfd7 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -6,43 +6,9 @@ extern u8 D_80258407_818C87; #include "world/common/UnkMusicFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080_801900); -/* -ApiStatus N(func_80241080_801900)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#define NAMESPACE dup_mac_01 +#include "world/common/UnkNpcAIFunc24.inc.c" +#define NAMESPACE mac_01 #include "world/common/UnkFunc13.inc.c" @@ -52,26 +18,9 @@ ApiStatus N(func_80241080_801900)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802416FC_801F7C); -/* -ApiStatus N(func_802416FC_801F7C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#define NAMESPACE dup_mac_01 +#include "world/common/UnkNpcAIFunc25.inc.c" +#define NAMESPACE mac_01 #define NAMESPACE dup_mac_01 #include "world/common/NpcJumpFunc2.inc.c" @@ -145,7 +94,7 @@ ApiStatus N(func_80241C14_802494)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80241080_801900)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_802411D8_801A58)(script, npcAISettings, territoryPtr); break; @@ -155,7 +104,7 @@ ApiStatus N(func_80241C14_802494)(ScriptInstance* script, s32 isInitialCall) { N(func_80241540_801DC0)(script, npcAISettings, territoryPtr); break; case 4: - N(func_802416FC_801F7C)(script, npcAISettings, territoryPtr); + N(UnkNpcAIFunc25)(script, npcAISettings, territoryPtr); break; case 10: dup_NpcJumpFunc2(script, npcAISettings, territoryPtr); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 82849d6340..01645b79f6 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -1,42 +1,6 @@ #include "mac_01.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245550_805DD0); -/* -ApiStatus N(func_80245550_805DD0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13_copy.inc.c" @@ -44,26 +8,7 @@ ApiStatus N(func_80245550_805DD0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14_copy.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245BCC_80644C); -/* -ApiStatus N(func_80245BCC_80644C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -129,7 +74,7 @@ ApiStatus N(func_802460E4_806964)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80245550_805DD0)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_802456A8_805F28)(script, npcAISettings, territoryPtr); break; @@ -139,7 +84,7 @@ ApiStatus N(func_802460E4_806964)(ScriptInstance* script, s32 isInitialCall) { N(func_80245A10_806290)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80245BCC_80644C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index d982e78d51..4b4ebbe963 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -2,43 +2,7 @@ #define UNK_ALPHA_FUNC_NPC 12 -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240930_823BF0); -/* -ApiStatus N(func_80240930_823BF0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -46,26 +10,7 @@ ApiStatus N(func_80240930_823BF0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240FAC_82426C); -/* -ApiStatus N(func_80240FAC_82426C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -131,7 +76,7 @@ ApiStatus N(func_802414C4_824784)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240930_823BF0)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240A88_823D48)(script, npcAISettings, territoryPtr); break; @@ -141,7 +86,7 @@ ApiStatus N(func_802414C4_824784)(ScriptInstance* script, s32 isInitialCall) { N(func_80240DF0_8240B0)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240FAC_82426C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 4f4e249c62..ab64873478 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -13,43 +13,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240490_852600); -/* -ApiStatus N(func_80240490_852600)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -57,26 +21,7 @@ ApiStatus N(func_80240490_852600)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240B0C_852C7C); -/* -ApiStatus N(func_80240B0C_852C7C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -142,7 +87,7 @@ ApiStatus N(func_80241024_853194)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240490_852600)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_802405E8_852758)(script, npcAISettings, territoryPtr); break; @@ -152,7 +97,7 @@ ApiStatus N(func_80241024_853194)(ScriptInstance* script, s32 isInitialCall) { N(func_80240950_852AC0)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240B0C_852C7C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index efe32cc595..9519a2f968 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -17,43 +17,7 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_802402E0_E0EA80); -/* -ApiStatus N(func_802402E0_E0EA80)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -61,26 +25,7 @@ ApiStatus N(func_802402E0_E0EA80)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_8024095C_E0F0FC); -/* -ApiStatus N(func_8024095C_E0F0FC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -146,7 +91,7 @@ ApiStatus N(func_80240E74_E0F614)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802402E0_E0EA80)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240438_E0EBD8)(script, npcAISettings, territoryPtr); break; @@ -156,7 +101,7 @@ ApiStatus N(func_80240E74_E0F614)(ScriptInstance* script, s32 isInitialCall) { N(func_802407A0_E0EF40)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024095C_E0F0FC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index 7f268393f7..aba5871f90 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -7,32 +7,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240000_BAD940); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240068_BAD9A8); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802400A0_BAD9E0); -/* -void N(func_802400A0_BAD9E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240250_BADB90); @@ -97,7 +72,7 @@ ApiStatus N(func_802413AC_BAECEC)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802400A0_BAD9E0)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240250_BADB90)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 0d423d2482..92e0153c63 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -2,43 +2,7 @@ #define UNK_ALPHA_FUNC_NPC 19 -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240A80_9D7AA0); -/* -ApiStatus N(func_80240A80_9D7AA0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -46,26 +10,7 @@ ApiStatus N(func_80240A80_9D7AA0)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802410FC_9D811C); -/* -ApiStatus N(func_802410FC_9D811C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -131,7 +76,7 @@ ApiStatus N(func_80241614_9D8634)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240A80_9D7AA0)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240BD8_9D7BF8)(script, npcAISettings, territoryPtr); break; @@ -141,7 +86,7 @@ ApiStatus N(func_80241614_9D8634)(ScriptInstance* script, s32 isInitialCall) { N(func_80240F40_9D7F60)(script, npcAISettings, territoryPtr); break; case 4: - N(func_802410FC_9D811C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -510,13 +455,7 @@ ApiStatus N(func_80242FB8_9D9FD8)(ScriptInstance *script, s32 isInitialCall) { } */ -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FE4_9DA004); -/* -ApiStatus N(func_80242FE4_9DA004)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243010_9DA030); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index 5c8f0d5d0c..aac595dfd1 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -5,29 +5,7 @@ static char* N(exit_str_1) = "nok_12"; #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024007C_9F4ABC); -/* -void N(func_8024007C_9F4ABC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -35,32 +13,7 @@ void N(func_8024007C_9F4ABC)(ScriptInstance *script, NpcAISettings *aiSettings, INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240394_9F4DD4); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802407D4_9F5214); -/* -void N(func_802407D4_9F5214)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240984_9F53C4); @@ -125,7 +78,7 @@ ApiStatus N(func_80241AE0_9F6520)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802407D4_9F5214)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240984_9F53C4)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index ffbaba4415..661ff356b9 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802405EC_9FADDC); -/* -void N(func_802405EC_9FADDC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -32,43 +10,7 @@ void N(func_802405EC_9FADDC)(ScriptInstance *script, NpcAISettings *aiSettings, INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240904_9FB0F4); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240D44_9FB534); -/* -ApiStatus N(func_80240D44_9FB534)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -76,26 +18,7 @@ ApiStatus N(func_80240D44_9FB534)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802413C0_9FBBB0); -/* -ApiStatus N(func_802413C0_9FBBB0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -161,7 +84,7 @@ ApiStatus N(func_802418D8_9FC0C8)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240D44_9FB534)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240E9C_9FB68C)(script, npcAISettings, territoryPtr); break; @@ -171,7 +94,7 @@ ApiStatus N(func_802418D8_9FC0C8)(ScriptInstance* script, s32 isInitialCall) { N(func_80241204_9FB9F4)(script, npcAISettings, territoryPtr); break; case 4: - N(func_802413C0_9FBBB0)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index dc5df7455f..d46fcfe844 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024023C_A02A7C); -/* -void N(func_8024023C_A02A7C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -32,32 +10,7 @@ void N(func_8024023C_A02A7C)(ScriptInstance *script, NpcAISettings *aiSettings, INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240554_A02D94); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240994_A031D4); -/* -void N(func_80240994_A031D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44_A03384); @@ -122,7 +75,7 @@ ApiStatus N(func_80241CA0_A044E0)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240994_A031D4)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240B44_A03384)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 7faf001cb2..8d13ebb680 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -19,29 +19,7 @@ static char* N(exit_str_3) = ""; #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024035C_A0725C); -/* -void N(func_8024035C_A0725C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -49,32 +27,7 @@ void N(func_8024035C_A0725C)(ScriptInstance *script, NpcAISettings *aiSettings, INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240674_A07574); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240AB4_A079B4); -/* -void N(func_80240AB4_A079B4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240C64_A07B64); @@ -139,7 +92,7 @@ ApiStatus N(func_80241DC0_A08CC0)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240AB4_A079B4)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240C64_A07B64)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 0b326aa71e..e3463f1381 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -36,32 +36,7 @@ ApiStatus N(func_80240000_DAD400)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802403A0_DAD7A0); -/* -void N(func_802403A0_DAD7A0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240550_DAD950); @@ -126,7 +101,7 @@ ApiStatus N(func_802416AC_DAEAAC)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802403A0_DAD7A0)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240550_DAD950)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index c4d9b172c9..55b357a73d 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -19,32 +19,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802405BC_DB287C); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240780_DB2A40); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240A54_DB2D14); -/* -void N(func_80240A54_DB2D14)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04_DB2EC4); @@ -109,7 +84,7 @@ ApiStatus N(func_80241D60_DB4020)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240A54_DB2D14)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240C04_DB2EC4)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 61b97d0304..4aa702ef4b 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -13,43 +13,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802401D8_DBD488); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240238_DBD4E8); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024056C_DBD81C); -/* -ApiStatus N(func_8024056C_DBD81C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -57,26 +21,7 @@ ApiStatus N(func_8024056C_DBD81C)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240BE8_DBDE98); -/* -ApiStatus N(func_80240BE8_DBDE98)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -142,7 +87,7 @@ ApiStatus N(func_80241100_DBE3B0)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_8024056C_DBD81C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_802406C4_DBD974)(script, npcAISettings, territoryPtr); break; @@ -152,7 +97,7 @@ ApiStatus N(func_80241100_DBE3B0)(ScriptInstance* script, s32 isInitialCall) { N(func_80240A2C_DBDCDC)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240BE8_DBDE98)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -187,32 +132,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802415D4_DBE884); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241634_DBE8E4); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241978_DBEC28); -/* -void N(func_80241978_DBEC28)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241B28_DBEDD8); @@ -279,7 +199,7 @@ ApiStatus N(func_80242C84_DBFF34)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80241978_DBEC28)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80241B28_DBEDD8)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 9f883369c2..10a70fdcf9 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -10,43 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240BB8_DCD888); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240C18_DCD8E8); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80240F4C_DCDC1C); -/* -ApiStatus N(func_80240F4C_DCDC1C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -54,26 +18,7 @@ ApiStatus N(func_80240F4C_DCDC1C)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802415C8_DCE298); -/* -ApiStatus N(func_802415C8_DCE298)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -139,7 +84,7 @@ ApiStatus N(func_80241AE0_DCE7B0)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240F4C_DCDC1C)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_802410A4_DCDD74)(script, npcAISettings, territoryPtr); break; @@ -149,7 +94,7 @@ ApiStatus N(func_80241AE0_DCE7B0)(ScriptInstance* script, s32 isInitialCall) { N(func_8024140C_DCE0DC)(script, npcAISettings, territoryPtr); break; case 4: - N(func_802415C8_DCE298)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index bdabd8a59b..60817ee38a 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -16,13 +16,7 @@ ApiStatus N(func_802407CC_DDCFFC)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_8024095C_DDD18C); -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240BAC_DDD3DC); -/* -ApiStatus N(func_80240BAC_DDD3DC)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 5e1a2757b6..a8f6b4be16 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -16,32 +16,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240B1C_DEF9BC); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240CE0_DEFB80); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240FB4_DEFE54); -/* -void N(func_80240FB4_DEFE54)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164_DF0004); @@ -106,7 +81,7 @@ ApiStatus N(func_802422C0_DF1160)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240FB4_DEFE54)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80241164_DF0004)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 2c333042ff..516f02ec73 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -2,43 +2,7 @@ #include "world/common/reflection.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240F20_D8E170); -/* -ApiStatus N(func_80240F20_D8E170)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -46,26 +10,7 @@ ApiStatus N(func_80240F20_D8E170)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024159C_D8E7EC); -/* -ApiStatus N(func_8024159C_D8E7EC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -131,7 +76,7 @@ ApiStatus N(func_80241AB4_D8ED04)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240F20_D8E170)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80241078_D8E2C8)(script, npcAISettings, territoryPtr); break; @@ -141,7 +86,7 @@ ApiStatus N(func_80241AB4_D8ED04)(ScriptInstance* script, s32 isInitialCall) { N(func_802413E0_D8E630)(script, npcAISettings, territoryPtr); break; case 4: - N(func_8024159C_D8E7EC)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index ed67079125..34cf1d7502 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -1,31 +1,6 @@ #include "sam_06.h" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240550_D203E0); -/* -void N(func_80240550_D203E0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240700_D20590); @@ -90,7 +65,7 @@ ApiStatus N(func_8024185C_D216EC)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240550_D203E0)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240700_D20590)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_sam/sam_08/D2FC80.c b/src/world/area_sam/sam_08/D2FC80.c index 4ab7767699..38c547f191 100644 --- a/src/world/area_sam/sam_08/D2FC80.c +++ b/src/world/area_sam/sam_08/D2FC80.c @@ -19,13 +19,7 @@ ApiStatus N(func_8024003C_D2FCBC)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_802401CC_D2FE4C); -INCLUDE_ASM(s32, "world/area_sam/sam_08/D2FC80", func_8024041C_D3009C); -/* -ApiStatus N(func_8024041C_D3009C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index 6c4e079700..55643a87a7 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -27,13 +27,7 @@ ApiStatus N(func_802400BC_95407C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024024C_95420C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024049C_95445C); -/* -ApiStatus N(func_8024049C_95445C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 98ca71dc87..3a6a02e05b 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -31,13 +31,7 @@ ApiStatus N(func_8024031C_879EFC)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802404AC_87A08C); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802406FC_87A2DC); -/* -ApiStatus N(func_802406FC_87A2DC)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index fb0e44e7d5..dc155ceb39 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -4,32 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241020_87AC00); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241390_87AF70); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802413F0_87AFD0); -/* -void N(func_802413F0_87AFD0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802415A0_87B180); diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index 24187bd9b8..09c0cd2fc4 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240AAC_882C6C); -/* -void N(func_80240AAC_882C6C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index 6c6121bf2d..4309eb28ac 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -18,13 +18,7 @@ ApiStatus N(func_802406BC_886A7C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024084C_886C0C); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240A9C_886E5C); -/* -ApiStatus N(func_80240A9C_886E5C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index c432db7154..b903b3a187 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -45,13 +45,7 @@ ApiStatus N(func_80240C58_889828)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240DE8_8899B8); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241038_889C08); -/* -ApiStatus N(func_80241038_889C08)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index b8f5699a87..93ab0fc10d 100644 --- a/src/world/area_tik/tik_12/88A530.c +++ b/src/world/area_tik/tik_12/88A530.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802419DC_88A5AC); -/* -void N(func_802419DC_88A5AC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index 3a2acb5a6e..33e2b1f1d4 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -16,13 +16,7 @@ ApiStatus N(func_8024006C_892A8C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802401FC_892C1C); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024044C_892E6C); -/* -ApiStatus N(func_8024044C_892E6C)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index bed2efadf4..99a2c51e17 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -16,13 +16,7 @@ ApiStatus N(func_8024062C_897C0C)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802407BC_897D9C); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A0C_897FEC); -/* -ApiStatus N(func_80240A0C_897FEC)(ScriptInstance* script, s32 isInitialCall) { - switch_to_partner(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} -*/ +#include "world/common/SwitchToPartner.inc.c" #include "world/common/UnkFunc19.inc.c" diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c index 8b19e1c500..fb8a927aa0 100644 --- a/src/world/area_tik/tik_20/89ACB0.c +++ b/src/world/area_tik/tik_20/89ACB0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_802409DC_89AD2C); -/* -void N(func_802409DC_89AD2C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c index 86cf0a1d14..21a19216cc 100644 --- a/src/world/area_tik/tik_23/8A2D30.c +++ b/src/world/area_tik/tik_23/8A2D30.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_23/8A2D30", func_802409DC_8A2DAC); -/* -void N(func_802409DC_8A2DAC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index 5a41b2013c..a01210fa8e 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -4,29 +4,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240360_8A5DE0); #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_8024074C_8A61CC); -/* -void N(func_8024074C_8A61CC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index e8c2e3fb6b..e7d1c22b23 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_8024046C_99CDFC); -/* -void N(func_8024046C_99CDFC)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index 7bdc64de6b..f407d1935f 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_8024015C_9A113C); -/* -void N(func_8024015C_9A113C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -32,43 +10,7 @@ void N(func_8024015C_9A113C)(ScriptInstance *script, NpcAISettings *aiSettings, INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240474_9A1454); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802408B4_9A1894); -/* -ApiStatus N(func_802408B4_9A1894)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -76,26 +18,7 @@ ApiStatus N(func_802408B4_9A1894)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240F30_9A1F10); -/* -ApiStatus N(func_80240F30_9A1F10)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -161,7 +84,7 @@ ApiStatus N(func_80241448_9A2428)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_802408B4_9A1894)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240A0C_9A19EC)(script, npcAISettings, territoryPtr); break; @@ -171,7 +94,7 @@ ApiStatus N(func_80241448_9A2428)(ScriptInstance* script, s32 isInitialCall) { N(func_80240D74_9A1D54)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80240F30_9A1F10)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c index 2d97e03d73..474ab6b420 100644 --- a/src/world/area_trd/trd_03/9A46F0.c +++ b/src/world/area_trd/trd_03/9A46F0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_8024011C_9A476C); -/* -void N(func_8024011C_9A476C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 0925f35897..0fda2e52c4 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024052C_9A891C); -/* -void N(func_8024052C_9A891C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -32,43 +10,7 @@ void N(func_8024052C_9A891C)(ScriptInstance *script, NpcAISettings *aiSettings, INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240844_9A8C34); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240C84_9A9074); -/* -ApiStatus N(func_80240C84_9A9074)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc24.inc.c" #include "world/common/UnkFunc13.inc.c" @@ -76,26 +18,7 @@ ApiStatus N(func_80240C84_9A9074)(ScriptInstance* script, NpcAISettings* aiSetti #include "world/common/UnkFunc14.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241300_9A96F0); -/* -ApiStatus N(func_80241300_9A96F0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ +#include "world/common/UnkNpcAIFunc25.inc.c" #include "world/common/NpcJumpFunc2.inc.c" @@ -161,7 +84,7 @@ ApiStatus N(func_80241818_9A9C08)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240C84_9A9074)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc24.inc.c" case 1: N(func_80240DDC_9A91CC)(script, npcAISettings, territoryPtr); break; @@ -171,7 +94,7 @@ ApiStatus N(func_80241818_9A9C08)(ScriptInstance* script, s32 isInitialCall) { N(func_80241144_9A9534)(script, npcAISettings, territoryPtr); break; case 4: - N(func_80241300_9A96F0)(script, npcAISettings, territoryPtr); +#include "world/common/UnkNpcAIFunc25.inc.c" break; case 10: N(NpcJumpFunc2)(script, npcAISettings, territoryPtr); @@ -198,32 +121,7 @@ ApiStatus N(func_80241818_9A9C08)(ScriptInstance* script, s32 isInitialCall) { INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241B14_9A9F04); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241E18_9AA208); -/* -void N(func_80241E18_9AA208)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8_9AA3B8); @@ -290,7 +188,7 @@ ApiStatus N(func_80243124_9AB514)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80241E18_9AA208)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80241FC8_9AA3B8)(script, aiSettings, territoryPtr); break; diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index bf567ef6e0..28a191e87d 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -2,29 +2,7 @@ #include "world/common/set_script_owner_npc_anim.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024038C_9B6D0C); -/* -void N(func_8024038C_9B6D0C)(ScriptInstance *script, NpcAISettings *aiSettings, EnemyTerritoryThing *territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if ((npc->duration <= 0) || (--npc->duration <= 0)) { - if (npc->turnAroundYawAdjustment == 0) { - npc->currentAnim = enemy->animList[9]; - npc->moveSpeed = aiSettings->chaseSpeed; - if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { - npc->collisionHeight = enemy->varTable[6] / 2; - } - npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; - if (npc->duration < enemy->varTable[3]) { - npc->duration = enemy->varTable[3]; - } - enemy->varTable[4] = npc->duration; - script->functionTemp[0].s = 14; - } - } -} -*/ +#include "world/common/UnkDistFunc.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c" @@ -32,32 +10,7 @@ void N(func_8024038C_9B6D0C)(ScriptInstance *script, NpcAISettings *aiSettings, INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802406A4_9B7024); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240AE4_9B7464); -/* -void N(func_80240AE4_9B7464)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.wanderShape, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ +#include "world/common/UnkNpcAIFunc23.inc.c" INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240C94_9B7614); @@ -122,7 +75,7 @@ ApiStatus N(func_80241DF0_9B8770)(ScriptInstance* script, s32 isInitialCall) { switch (script->functionTemp[0].s) { case 0: - N(func_80240AE4_9B7464)(script, aiSettings, territoryPtr); +#include "world/common/UnkNpcAIFunc23.inc.c" case 1: N(func_80240C94_9B7614)(script, aiSettings, territoryPtr); break; diff --git a/src/world/common/SwitchToPartner.inc.c b/src/world/common/SwitchToPartner.inc.c new file mode 100644 index 0000000000..8454e7c926 --- /dev/null +++ b/src/world/common/SwitchToPartner.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +ApiStatus N(SwitchToPartner)(ScriptInstance* script, s32 isInitialCall) { + switch_to_partner(get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkDistFunc.inc.c b/src/world/common/UnkDistFunc.inc.c new file mode 100644 index 0000000000..c2024bfb7f --- /dev/null +++ b/src/world/common/UnkDistFunc.inc.c @@ -0,0 +1,24 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(UnkDistFunc)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if ((npc->duration <= 0) || (--npc->duration <= 0)) { + if (npc->turnAroundYawAdjustment == 0) { + npc->currentAnim.w = enemy->animList[9]; + npc->moveSpeed = aiSettings->chaseSpeed; + if ((enemy->varTable[7] == 5) || (enemy->varTable[7] == 0) || (enemy->varTable[7] == 1)) { + npc->collisionHeight = enemy->varTable[6] / 2; + } + npc->duration = (dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, + gPlayerStatusPtr->position.z) / npc->moveSpeed) + 0.8; + if (npc->duration < enemy->varTable[3]) { + npc->duration = enemy->varTable[3]; + } + enemy->varTable[4] = npc->duration; + script->functionTemp[0].s = 14; + } + } +} diff --git a/src/world/common/UnkNpcAIFunc23.inc.c b/src/world/common/UnkNpcAIFunc23.inc.c new file mode 100644 index 0000000000..7c4738e693 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc23.inc.c @@ -0,0 +1,26 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcAIFunc23)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); + if (is_point_within_region(enemy->territory->wander.wanderShape, + enemy->territory->wander.point.x, enemy->territory->wander.point.z, + npc->pos.x, npc->pos.z, + enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { + npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); + } else { + npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); + } + npc->currentAnim.w = enemy->animList[1]; + script->functionTemp[1].s = 0; + if (enemy->territory->wander.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; + } + enemy->varTable[4] = npc->pos.y * 100.0; + script->functionTemp[0].s = 1; +} diff --git a/src/world/common/UnkNpcAIFunc24.inc.c b/src/world/common/UnkNpcAIFunc24.inc.c new file mode 100644 index 0000000000..cc5cd8151c --- /dev/null +++ b/src/world/common/UnkNpcAIFunc24.inc.c @@ -0,0 +1,36 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcAIFunc24)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + f32 ret; + f32 max; + f32 posX; + f32 posZ; + s32 i; + s32 j; + + script->functionTemp[1].s = 0; + max = 32767.0f; + posX = npc->pos.x; + posZ = npc->pos.z; + script->functionTemp[2].s = 0; + + for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { + ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); + if (ret < max) { + max = ret; + script->functionTemp[2].s = j; + } + } + + npc->currentAnim.w = enemy->animList[1]; + if (enemy->territory->patrol.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; + } + + script->functionTemp[0].s = 1; +} diff --git a/src/world/common/UnkNpcAIFunc25.inc.c b/src/world/common/UnkNpcAIFunc25.inc.c new file mode 100644 index 0000000000..d9aab1fa54 --- /dev/null +++ b/src/world/common/UnkNpcAIFunc25.inc.c @@ -0,0 +1,19 @@ +#include "common.h" +#include "map.h" + +void N(UnkNpcAIFunc25)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + script->functionTemp[2].s++; + if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { + script->functionTemp[2].s = 0; + } + npc->currentAnim.w = enemy->animList[1]; + if (enemy->territory->patrol.moveSpeedOverride < 0) { + npc->moveSpeed = aiSettings->moveSpeed; + } else { + npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; + } + script->functionTemp[0].s = 1; +} diff --git a/ver/us/asm/data/52EE0.data.s b/ver/us/asm/data/52EE0.data.s index ba344f09db..90550c950d 100644 --- a/ver/us/asm/data/52EE0.data.s +++ b/ver/us/asm/data/52EE0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80077AE0 -.word 0x00000002, 0x00019D00, 0x80098454, 0x00020000, 0x00000000, 0x00000000, 0x00000005, 0x00049D00, 0x8009844C, 0x00000002, 0x00029D00, 0x80098444, 0x00000002, 0x0004B300, 0x8009843C, 0x00000004, 0x00079D00, 0x80098434, 0x00020001, 0x00000000, 0x00000000, 0x00000006, 0x00039D00, 0x8009842C, 0x00000002, 0x00021B00, 0x80098424, 0x00020002, 0x00000000, 0x00000000, 0x00000003, 0x00039D00, 0x8009841C, 0x00000004, 0x00019D00, 0x80098414, 0x00020003, 0x00000000, 0x00000000, 0x00010008, 0x000B2600, 0x8009840C, 0x00000002, 0x0009E800, 0x80098404, 0x00020004, 0x00000000, 0x00000000, 0x00000003, 0x00019D00, 0x80098454, 0x00010003, 0x00009D00, 0x800983FC, 0x00030000, 0x00000000, 0x800983F8, 0x00000000, 0x00000000, 0x00000000, 0x50726720, 0x5665722E, 0x30302F31, 0x322F3035, 0x2031363A, 0x35340000, 0x00000000, 0x00000000 +.word 0x00000002, 0x00019D00, 0x80098454, 0x00020000, 0x00000000, 0x00000000, 0x00000005, 0x00049D00, 0x8009844C, 0x00000002, 0x00029D00, 0x80098444, 0x00000002, 0x0004B300, 0x8009843C, 0x00000004, 0x00079D00, 0x80098434, 0x00020001, 0x00000000, 0x00000000, 0x00000006, 0x00039D00, 0x8009842C, 0x00000002, 0x00021B00, 0x80098424, 0x00020002, 0x00000000, 0x00000000, 0x00000003, 0x00039D00, 0x8009841C, 0x00000004, 0x00019D00, 0x80098414, 0x00020003, 0x00000000, 0x00000000, 0x00010008, 0x000B2600, 0x8009840C, 0x00000002, 0x0009E800, 0x80098404, 0x00020004, 0x00000000, 0x00000000, 0x00000003, 0x00019D00, 0x80098454, 0x00010003, 0x00009D00, 0x800983FC, 0x00030000, 0x00000000, D_800983F8, 0x00000000, 0x00000000, 0x00000000, 0x50726720, 0x5665722E, 0x30302F31, 0x322F3035, 0x2031363A, 0x35340000, 0x00000000, 0x00000000 glabel D_80077BF0 .byte 0x01, 0x02, 0x00, 0x34, 0x01, 0x04, 0x00, 0x36, 0x00, 0x36, 0x01, 0x02, 0x00, 0x1C, 0x01, 0x02, 0x00, 0x06, 0x01, 0x02, 0x00, 0x2C, 0x01, 0x02, 0x00, 0x2C, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/ver/us/asm/data/EE20E0.data.s b/ver/us/asm/data/EE20E0.data.s index a31f28dce8..9129107245 100644 --- a/ver/us/asm/data/EE20E0.data.s +++ b/ver/us/asm/data/EE20E0.data.s @@ -48,7 +48,7 @@ glabel D_802441F4_EE2BB4 .word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42700000, 0x42480000, 0x00000003, 0x40600000, 0x0000003C, 0x0000000A, 0x42A00000, 0x428C0000, 0x00000001 glabel D_80244224_EE2BE4 -.word 0x0000005A, 0x00000001, 0x80247B44, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, func_80241DE4_EE07A4, D_802441F4_EE2BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000005A, 0x00000001, D_80247B44_EE6504, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, func_80241DE4_EE07A4, D_802441F4_EE2BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802442A0_EE2C60 .word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_80244224_EE2BE4, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000 diff --git a/ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s b/ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s index fc5c166145..7a7c8c1fff 100644 --- a/ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s +++ b/ver/us/asm/data/world/area_arn/arn_05/BE9290.data.s @@ -3,4 +3,4 @@ .section .data glabel D_802416B0_BE9290 -.word 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000019, 0x0000001E, 0x42480000, 0x42480000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x42C80000, 0x42A00000, 0x00000001, 0x00000043, 0x00000002, func_8024113C_BE8D1C, 0x802416DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x8024170C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0092, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0093, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0095, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0096, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0097, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0098, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0094, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0099, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009A, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009C, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009D, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009E, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009F, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00A9, 0x0000001B, 0x00000001, 0x00000027, 0x0000000A, 0x00000002, 0xF8405F76, 0x00000001, 0x0000000A, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B0, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950107, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950107, 0x00950101, 0x00000000, 0x000E00AA, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950109, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950109, 0x00950101, 0x00000000, 0x000E00AB, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0095010A, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0095010A, 0x00950101, 0x00000000, 0x000E00AC, 0x00000043, 0x00000002, ShowChoice, 0x001E001E, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950105, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AD, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950101, 0x00000024, 0x00000002, 0xF8405F76, 0x00000001, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950105, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AD, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950101, 0x00000024, 0x00000002, 0xF8405F76, 0x00000001, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B1, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B2, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718888, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B3, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B4, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B6, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B7, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B8, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B9, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B5, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241784, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241794, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241924, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241AB4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDF, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0x00000027, 0x0000001B, 0x00000001, 0x00000027, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241D88, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0x00000027, 0x0000001B, 0x00000001, 0x00000027, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241784, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241E28, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x8024172C, 0x425C0000, 0x43430000, 0x43200000, 0x00000D01, 0x80241FB8, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000037, 0x0000000A, 0x000000A0, 0x0000004B, 0x0000000A, 0x000000A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000037, 0x000000C3, 0x000000A0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AE, 0x00000001, 0x80241758, 0x43200000, 0x433F0000, 0x437A0000, 0x00000D01, 0x80242008, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AF, 0x00000002, 0x80241758, 0x43C30000, 0x433E0000, 0x437F0000, 0x00000D01, 0x8024202C, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B0, 0x00000003, 0x80241758, 0x43FB8000, 0x434E0000, 0x43520000, 0x00000D01, 0x8024212C, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B1, 0x00000004, 0x8024172C, 0x43AF0000, 0x43390000, 0x43450000, 0x00000D01, 0x802421EC, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x0000015E, 0x0000000A, 0x000000C5, 0x0000014A, 0x0000000A, 0x000000C5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x0000015E, 0x000000B9, 0x000000C5, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B2, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x000020F6, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C83, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950104, 0x00950101, 0x00000000, 0x000E00A0, 0x00000043, 0x00000006, PlaySoundAt, 0x000020F6, 0x00000000, 0x000001C2, 0x000000C8, 0x000000A0, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7DB4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000004, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x000000C3, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001A4, 0x0000012C, 0x000000DC, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001CC, 0x000000FA, 0x000000D2, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000C1, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950106, 0x00950106, 0x00000000, 0x000E00A1, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000043, 0x00000002, func_802412C8_BE8EA8, 0x00000009, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E00A2, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x000E00A3, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_802412B0_BE8E90, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000001, func_802D2B50, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001E, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AA, 0x000000BE, 0x000000C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8480, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x000002A3, 0x000000C8, 0x000000B4, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000005, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000110, 0x000000BE, 0x000000D6, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000C3, 0x00000008, 0x00000001, 0x00000014, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000226, 0x000000C4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AA, 0x000000BE, 0x000000C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000172, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000014A, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000024, 0x00000002, 0xFD050F81, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000F0, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950106, 0x00950106, 0x00000000, 0x000E00A4, 0x00000008, 0x00000001, 0x0000000F, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000002, 0x00000005, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950104, 0x00950101, 0x00000005, 0x000E00A5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00950109, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000002, 0x00000109, 0x000000CE, 0x000000D4, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x006A001E, 0x006A001E, 0x00000005, 0x000E00A6, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000012F, 0x000000ED, 0x000000E4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00950106, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A001F, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000118, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x00000315, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0020, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000F0, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x006A0021, 0x006A0006, 0x00000005, 0x000E00A7, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0021, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000172, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000226, 0x000000C4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000037, 0x000000C3, 0x000000A0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000A0, 0x000000BF, 0x000000FA, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000015E, 0x000000B9, 0x000000C5, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x000000C1, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAC80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00950104, 0x00950101, 0x00000005, 0x000E00A8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000014A, 0x000000B8, 0x000000F0, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C82, 0x0000006E, 0x0000000F, 0x00000002, 0xFE363C80, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000046, 0x00000001, 0x80242C50, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, 0x802418F4, 0x00000043, 0x00000003, BindNpcInteract, 0x00000001, 0x80241A84, 0x00000043, 0x00000003, BindNpcInteract, 0x00000004, 0x80241F88, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000044, 0x00000001, 0x80241360, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x006A0006, 0x006A0009, 0x006A001E, 0x006A001F, 0x006A0020, 0x006A0021, 0xFFFFFFFF, 0x00000005, D_802416B0_BE9290, 0x00000000, 0xC47A0000, 0x00000000, 0x00000B01, 0x80244358, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0006, 0x006A0009, 0x006A000C, 0x006A000C, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x00000000, 0x00000000, 0x80244390, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000006, 0x80241758, 0x42100000, 0x438A8000, 0x430C0000, 0x00402705, 0x80244704, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x80241758, 0x43480000, 0x43898000, 0x43360000, 0x00402705, 0x8024473C, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x80241758, 0x43BD8000, 0x43960000, 0x43400000, 0x00402705, 0x80244774, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, 0x80241758, 0x44034000, 0x438F0000, 0x43320000, 0x00402705, 0x802447AC, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802443AC, 0x00000000, 0x00000005, 0x8024223C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802443AC, 0x00000000, 0x00000005, 0x8024223C, 0x00000000, 0x00000004, 0x802447E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, 0x005A0041, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000D0000, 0x3F800000, 0x00000019, 0x0000001E, 0x42480000, 0x42480000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x42C80000, 0x42A00000, 0x00000001, 0x00000043, 0x00000002, func_8024113C_BE8D1C, 0x802416DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x8024170C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0092, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0093, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0095, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0096, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0097, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0098, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0094, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E0099, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009A, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009C, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009D, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009E, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009F, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E009B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00A9, 0x0000001B, 0x00000001, 0x00000027, 0x0000000A, 0x00000002, 0xF8405F76, 0x00000001, 0x0000000A, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B0, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950107, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950107, 0x00950101, 0x00000000, 0x000E00AA, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950109, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950109, 0x00950101, 0x00000000, 0x000E00AB, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0095010A, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0095010A, 0x00950101, 0x00000000, 0x000E00AC, 0x00000043, 0x00000002, ShowChoice, 0x001E001E, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950105, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AD, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950101, 0x00000024, 0x00000002, 0xF8405F76, 0x00000001, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950105, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950105, 0x00950101, 0x00000000, 0x000E00AD, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00950101, 0x00000024, 0x00000002, 0xF8405F76, 0x00000001, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B1, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B2, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x0000000A, 0x00000002, 0xF9718888, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B3, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B4, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B6, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B7, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B8, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B9, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00950104, 0x00950101, 0x00000000, 0x000E00B5, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241784, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241794, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241924, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241AB4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDF, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0x00000027, 0x0000001B, 0x00000001, 0x00000027, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241D88, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFE6, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0x00000027, 0x0000001B, 0x00000001, 0x00000027, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x80241784, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x80241E28, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x8024172C, 0x425C0000, 0x43430000, 0x43200000, 0x00000D01, 0x80241FB8, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000037, 0x0000000A, 0x000000A0, 0x0000004B, 0x0000000A, 0x000000A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000037, 0x000000C3, 0x000000A0, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AE, 0x00000001, 0x80241758, 0x43200000, 0x433F0000, 0x437A0000, 0x00000D01, 0x80242008, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00AF, 0x00000002, 0x80241758, 0x43C30000, 0x433E0000, 0x437F0000, 0x00000D01, 0x8024202C, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B0, 0x00000003, 0x80241758, 0x43FB8000, 0x434E0000, 0x43520000, 0x00000D01, 0x8024212C, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B1, 0x00000004, 0x8024172C, 0x43AF0000, 0x43390000, 0x43450000, 0x00000D01, 0x802421EC, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x0000015E, 0x0000000A, 0x000000C5, 0x0000014A, 0x0000000A, 0x000000C5, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x0000015E, 0x000000B9, 0x000000C5, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x001A00B2, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x000020F6, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C83, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950104, 0x00950101, 0x00000000, 0x000E00A0, 0x00000043, 0x00000006, PlaySoundAt, 0x000020F6, 0x00000000, 0x000001C2, 0x000000C8, 0x000000A0, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7DB4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000004, 0x00000000, 0xFFFFFFD3, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x000000C3, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000001A4, 0x0000012C, 0x000000DC, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000001CC, 0x000000FA, 0x000000D2, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000C1, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950106, 0x00950106, 0x00000000, 0x000E00A1, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000009, 0x00000043, 0x00000002, arn_05_SwitchToPartner, 0x00000009, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E00A2, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x000E00A3, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, func_802412B0_BE8E90, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000001, func_802D2B50, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001E, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AA, 0x000000BE, 0x000000C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8480, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x000002A3, 0x000000C8, 0x000000B4, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000000, 0x00000005, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000110, 0x000000BE, 0x000000D6, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x0000002D, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000C3, 0x00000008, 0x00000001, 0x00000014, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000226, 0x000000C4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001AA, 0x000000BE, 0x000000C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000172, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000014A, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000024, 0x00000002, 0xFD050F81, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000F0, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950106, 0x00950106, 0x00000000, 0x000E00A4, 0x00000008, 0x00000001, 0x0000000F, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000002, 0x00000005, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00950104, 0x00950101, 0x00000005, 0x000E00A5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00950109, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000002, 0x00000109, 0x000000CE, 0x000000D4, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x006A001E, 0x006A001E, 0x00000005, 0x000E00A6, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000012F, 0x000000ED, 0x000000E4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00950106, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A001F, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A3680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000118, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x00000315, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0020, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFD8, 0x000000CE, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000212, 0x000000CE, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000F0, 0x000000A9, 0x000000CE, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x006A0021, 0x006A0006, 0x00000005, 0x000E00A7, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0021, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFCE, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, 0x80242BEC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0009, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000172, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000226, 0x000000C4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x006A0006, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000037, 0x000000C3, 0x000000A0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000A0, 0x000000BF, 0x000000FA, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000015E, 0x000000B9, 0x000000C5, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x000000C1, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAC80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00950104, 0x00950101, 0x00000005, 0x000E00A8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000014A, 0x000000B8, 0x000000F0, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C82, 0x0000006E, 0x0000000F, 0x00000002, 0xFE363C80, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000046, 0x00000001, 0x80242C50, 0x00000043, 0x00000003, BindNpcInteract, 0x00000000, 0x802418F4, 0x00000043, 0x00000003, BindNpcInteract, 0x00000001, 0x80241A84, 0x00000043, 0x00000003, BindNpcInteract, 0x00000004, 0x80241F88, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000044, 0x00000001, 0x80241360, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFDF, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x006A0006, 0x006A0009, 0x006A001E, 0x006A001F, 0x006A0020, 0x006A0021, 0xFFFFFFFF, 0x00000005, D_802416B0_BE9290, 0x00000000, 0xC47A0000, 0x00000000, 0x00000B01, 0x80244358, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x006A0006, 0x006A0009, 0x006A000C, 0x006A000C, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x006A0000, 0x00000000, 0x00000000, 0x80244390, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7AE7, 0x0000002C, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xFE363C86, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, 0x8024459C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000006, 0x80241758, 0x42100000, 0x438A8000, 0x430C0000, 0x00402705, 0x80244704, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x80241758, 0x43480000, 0x43898000, 0x43360000, 0x00402705, 0x8024473C, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x80241758, 0x43BD8000, 0x43960000, 0x43400000, 0x00402705, 0x80244774, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000009, 0x80241758, 0x44034000, 0x438F0000, 0x43320000, 0x00402705, 0x802447AC, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00950101, 0x00950102, 0x00950103, 0x00950103, 0x00950101, 0x00950101, 0x00950100, 0x00950100, 0x0095010A, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00950103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802443AC, 0x00000000, 0x00000005, 0x8024223C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802443AC, 0x00000000, 0x00000005, 0x8024223C, 0x00000000, 0x00000004, 0x802447E4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s b/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s index bf63f4ad99..bab0ccf98f 100644 --- a/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s +++ b/ver/us/asm/data/world/area_dgb/dgb_04/C39A90.data.s @@ -15,7 +15,7 @@ glabel D_80243D48_C3A278 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80243D88_C3A2B8 -.word 0x430C0000, 0x43340000, 0x435C0000, +.word 0x430C0000, 0x43340000, 0x435C0000, -0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, dgb_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024240C_C3893C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, dgb_04_UnkFunc22, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802429D0_C38F00, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F96, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dgb_04_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dgb_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, dgb_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, dgb_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024259C_C38ACC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802427EC_C38D1C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D94, 0x00000043, 0x00000003, dgb_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F96, 0x00000001, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, dgb_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000001F4, 0xFFFFFE98, 0x0000006E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F96, 0x00000043, 0x00000002, AssignScript, 0x80243EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, dgb_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, func_80242F08_C39438, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024240C_C3893C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, dgb_04_UnkFunc22, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, dgb_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802429D0_C38F00, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F96, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dgb_04_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, dgb_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, dgb_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, dgb_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024259C_C38ACC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, dgb_04_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243D94, 0x00000043, 0x00000003, dgb_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F96, 0x00000001, 0x00000043, 0x00000002, dgb_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, dgb_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, dgb_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000001F4, 0xFFFFFE98, 0x0000006E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F96, 0x00000043, 0x00000002, AssignScript, 0x80243EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s b/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s index e48b2be070..c4ded1e924 100644 --- a/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s +++ b/ver/us/asm/data/world/area_flo/flo_08/CB0C20.data.s @@ -24,7 +24,7 @@ glabel D_80242014_CB0D54 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, flo_08_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, flo_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, flo_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_CAED7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, flo_08_UnkFunc22, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_CAF340, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242178_CB0EB8 -.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_CAFA48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_08_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_CAEE60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_CAEF0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_CAF15C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242014_CB0D54, 0x00000043, 0x00000003, flo_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000001, flo_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_CAFA48, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_08_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_CAEE60, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_CAEF0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, flo_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242014_CB0D54, 0x00000043, 0x00000003, flo_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_CAF250, 0xFE363C89, 0x00000043, 0x00000001, flo_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802425F8_CB1338 .word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060FA, 0x00000043, 0x00000002, AssignScript, D_80242178_CB0EB8, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s b/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s index 4e8f9fdcf2..5077d9c89b 100644 --- a/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s +++ b/ver/us/asm/data/world/area_flo/flo_16/CD5530.data.s @@ -18,7 +18,7 @@ glabel D_80243764_CD5594 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, flo_16_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, flo_16_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, flo_16_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_CD1F4C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, flo_16_UnkFunc22, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, flo_16_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_CD2510, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802438C8_CD56F8 -.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_16_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_16_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_16_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_CD2030, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_CD20DC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802404FC_CD232C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243764_CD5594, 0x00000043, 0x00000003, flo_16_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000001, flo_16_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, flo_16_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, flo_16_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, flo_16_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_CD2030, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_CD20DC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, flo_16_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243764_CD5594, 0x00000043, 0x00000003, flo_16_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_CD2420, 0xFE363C89, 0x00000043, 0x00000001, flo_16_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, flo_16_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243D48_CD5B78 .word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_01/A12E00.data.s b/ver/us/asm/data/world/area_hos/hos_01/A12E00.data.s index 758989c16d..0be378aa65 100644 --- a/ver/us/asm/data/world/area_hos/hos_01/A12E00.data.s +++ b/ver/us/asm/data/world/area_hos/hos_01/A12E00.data.s @@ -9,7 +9,7 @@ glabel D_80242604_A12E84 .word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0x000000F5, 0x00000043, 0x00000005, IsPlayerWithin, 0xFFFFFFE2, 0xFFFFFF5B, 0x000000B4, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000008, 0x00000001, 0x0000003C, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000000F5, 0x00000043, 0x00000005, IsPlayerWithin, 0xFFFFFFE2, 0xFFFFFF5B, 0x000000B4, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000061, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000001E, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802427C8_A13048 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFDD, 0x000000FA, 0xFFFFFF6F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDD, 0x000000FA, 0xFFFFFF6F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A6480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000015, 0x00000104, 0xFFFFFEEB, 0x0000001E, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000001, 0x00000026, 0x00000002, 0xFD050F81, 0xF2493A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFD050F81, 0xF24A9280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000006, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A0001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A6080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A0002, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5EE7, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00130002, 0x00120001, 0x00000000, 0x000A0003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5D4D, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00140002, 0x00130001, 0x00000000, 0x000A0004, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5BB4, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00150002, 0x00150001, 0x00000000, 0x000A0005, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5BB4, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00160002, 0x00160001, 0x00000000, 0x000A0006, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5D4D, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00170003, 0x00170001, 0x00000000, 0x000A0007, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5EE7, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00180002, 0x00180001, 0x00000000, 0x000A0008, 0x00000024, 0x00000002, 0xF70F2E86, 0x000000C8, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00180002, 0x00180001, 0x00000000, 0x000A0009, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A000A, 0x00000024, 0x00000002, 0xF70F2E80, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E81, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E82, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E83, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E84, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E85, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E86, 0x000000C8, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A000B, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000006, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000064, 0x00000026, 0x00000002, 0xFD050F80, 0xF24B1A80, 0x00000026, 0x00000002, 0xFD050F81, 0xF24B1A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFD050F80, 0xF24A6280, 0x0000002C, 0x00000002, 0xFD050F81, 0xF24A6280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000002, func_80240CB0_A11530, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000A000C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF96, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8080, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFDD, 0x000000FA, 0xFFFFFF6F, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDD, 0x000000FA, 0xFFFFFF6F, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A6480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000015, 0x00000104, 0xFFFFFEEB, 0x0000001E, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000064, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000F, 0x00000043, 0x00000006, func_80240CDC_A1155C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000001, 0x00000026, 0x00000002, 0xFD050F81, 0xF2493A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFD050F81, 0xF24A9280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000006, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A0001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A6080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A0002, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5EE7, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00130002, 0x00120001, 0x00000000, 0x000A0003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5D4D, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00140002, 0x00130001, 0x00000000, 0x000A0004, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5BB4, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00150002, 0x00150001, 0x00000000, 0x000A0005, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5BB4, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00160002, 0x00160001, 0x00000000, 0x000A0006, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5D4D, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00170003, 0x00170001, 0x00000000, 0x000A0007, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5EE7, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00180002, 0x00180001, 0x00000000, 0x000A0008, 0x00000024, 0x00000002, 0xF70F2E86, 0x000000C8, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00180002, 0x00180001, 0x00000000, 0x000A0009, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A000A, 0x00000024, 0x00000002, 0xF70F2E80, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E81, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E82, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E83, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E84, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E85, 0x000000C8, 0x00000024, 0x00000002, 0xF70F2E86, 0x000000C8, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00120002, 0x00120001, 0x00000000, 0x000A000B, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000006, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000064, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000064, 0x00000026, 0x00000002, 0xFD050F80, 0xF24B1A80, 0x00000026, 0x00000002, 0xFD050F81, 0xF24B1A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFD050F80, 0xF24A6280, 0x0000002C, 0x00000002, 0xFD050F81, 0xF24A6280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E80, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000054, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000055, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000002, hos_01_SwitchToPartner, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000A000C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF96, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8080, 0x00000057, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024373C_A13FBC .word 0x00000044, 0x00000001, D_802427C8_A13048, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_04/97D2F0.data.s b/ver/us/asm/data/world/area_isk/isk_04/97D2F0.data.s index 32c279f5f1..982a5dbadc 100644 --- a/ver/us/asm/data/world/area_isk/isk_04/97D2F0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_04/97D2F0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80241CC0_97D2F0 -.word 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000043, 0x00000002, DemoSetButtons, 0x00000004, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x0000005D, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000000F, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000002D, 0x00000013, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004B, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004C, 0x0000000B, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000045, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFE, 0x00000015, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240930_97BF60, 0x00000003, 0x00000008, 0x00000001, 0x00000039, 0x00000043, 0x00000002, DemoSetButtons, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000022, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE9, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD0, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0x00000007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB2, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFDC, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000001, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000002F, 0xFFFFFFFA, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004A, 0xFFFFFFF4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000003F, 0xFFFFFFF7, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000011, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000026, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004C, 0xFFFFFFFA, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFC, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242490, 0x00000005, 0x00000002, 0x00000008, 0x00000001, 0x00000143, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000043, 0x00000002, DemoSetButtons, 0x00000004, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x0000005D, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000000F, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000002D, 0x00000013, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004B, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004C, 0x0000000B, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000045, 0x0000000B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFE, 0x00000015, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_04_SwitchToPartner, 0x00000003, 0x00000008, 0x00000001, 0x00000039, 0x00000043, 0x00000002, DemoSetButtons, 0x00000004, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000022, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFC, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE9, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD0, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB4, 0x00000007, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFB2, 0x00000007, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFDC, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000001, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000002F, 0xFFFFFFFA, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004A, 0xFFFFFFF4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000003F, 0xFFFFFFF7, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000011, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000026, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004C, 0xFFFFFFFA, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFC, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242490, 0x00000005, 0x00000002, 0x00000008, 0x00000001, 0x00000143, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802421C8_97D7F8 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242490, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000139, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s index 04dbb1aff5..2e23b7381c 100644 --- a/ver/us/asm/data/world/area_isk/isk_10/989910.data.s +++ b/ver/us/asm/data/world/area_isk/isk_10/989910.data.s @@ -36,7 +36,7 @@ glabel D_80241164_989CC4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, isk_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, isk_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_988B9C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, isk_10_UnkFunc22, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, isk_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_989160, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802412C8_989E28 -.word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, isk_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_988F7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, isk_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405F07, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, isk_10_UnkFunc24, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, isk_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, isk_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, isk_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_988D2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, isk_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241164_989CC4, 0x00000043, 0x00000003, isk_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405F07, 0x00000001, 0x00000043, 0x00000002, isk_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, isk_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, isk_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241748_98A2A8 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F89, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDBF, 0xFFFFFCF4, 0xFFFFFFB5, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xFFFFFDF8, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A801A, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFDCF, 0xFFFFFDF8, 0x00000017, 0x0000001E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A85B4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s index 7b510b0ec1..1fd2374711 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/923FD0.data.s @@ -18,7 +18,7 @@ glabel D_80245AC4_924034 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, iwa_10_UnkFunc21, 0xFD050F8B, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, iwa_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024032C_91E89C, 0xFD050F8B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, iwa_10_UnkFunc22, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, iwa_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408F0_91EE60, 0xFD050F8B, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80245C28_924198 -.word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024070C_91EC7C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405E51, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, iwa_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, iwa_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, iwa_10_UnkFunc20, 0xFD050F8B, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, iwa_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404BC_91EA2C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, iwa_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80245AC4_924034, 0x00000043, 0x00000003, iwa_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405E51, 0x00000001, 0x00000043, 0x00000002, iwa_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, iwa_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, iwa_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802460A8_924618 .word 0x00000024, 0x00000002, 0xF8405E50, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E50, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA1E4, 0xFFFFFBF0, 0x000000A0, 0xFFFFFE57, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignScript, D_802460A8_924618, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFABA, 0x000000DC, 0xFFFFFF2E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E51, 0x00000043, 0x00000002, AssignScript, D_80245C28_924198, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFCF4, 0x00000000, 0xFFFFFF1D, 0xFFFFFFF1, 0x0000010E, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFB7B, 0x00000046, 0xFFFFFEE6, 0x00000028, 0x00000078, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802BCD9C, 0xFFFFFC7B, 0x000000B9, 0xFFFFFDD5, 0x00000000, 0x00000078, D_80000000, 0x00000043, 0x00000007, MakeEntity, D_802E9A18, 0xFFFFFDF3, 0x00000050, 0x00000073, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0xFFFFFD26, 0x00000113, 0xFFFFFE02, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s index c43e8595f8..2e0fa19393 100644 --- a/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s +++ b/ver/us/asm/data/world/area_jan/jan_02/B2F410.data.s @@ -99,7 +99,7 @@ glabel D_8024580C_B31C7C .word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024587C_B31CEC -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x0000000A, 0x00000002, 0xF8406047, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100023, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100024, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C20006, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000008, 0xFFFFFF74, 0x00000019, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C20003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000019, 0x0000000F, 0xFFFFFF6A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000019, 0x0000000F, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003A, 0xFFFFFF74, 0x00000019, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C2000E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000E, 0x00C2000E, 0x00000005, 0x00100025, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C20003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100026, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddKeyItem, 0x0000002A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100027, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000011, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000019, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000002, 0x00100028, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802426A8_B2EB18, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x00100029, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0x00000055, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000005, 0x0010002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000005, 0x0010002B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000005, 0x0010002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x0000000A, 0x00000002, 0xF8406047, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100023, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100024, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C20006, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000008, 0xFFFFFF74, 0x00000019, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C20003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000019, 0x0000000F, 0xFFFFFF6A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000019, 0x0000000F, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003A, 0xFFFFFF74, 0x00000019, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C2000E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000E, 0x00C2000E, 0x00000005, 0x00100025, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C20003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100026, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802431E8_B2F658, 0x00000043, 0x00000002, AddKeyItem, 0x0000002A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x00100027, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000011, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0x00000019, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000002, 0x00100028, 0x00000012, 0x00000000, 0x00000043, 0x00000002, jan_02_SwitchToPartner, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x00100029, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0x00000055, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000005, 0x0010002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000005, 0x0010002B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000005, 0x0010002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80245ECC_B3233C .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000000E, 0x0000000A, 0x00000002, 0xF8406047, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x00100021, 0x00000024, 0x00000002, 0xF8406047, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x00100022, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000010, 0x00000018, 0x00000001, 0x00000011, 0x00000046, 0x00000001, D_8024587C_B31CEC, 0x00000018, 0x00000001, 0x00000015, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C20009, 0x00C20003, 0x00000000, 0x0010002D, 0x00000018, 0x00000001, 0x00000018, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x0010002E, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x0010002F, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x00100030, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x00100031, 0x00000018, 0x00000001, 0x0000002A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x00100032, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C2000B, 0x00C20005, 0x00000000, 0x00100033, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s index f3c509b841..d47b74c1d9 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s @@ -18,4 +18,4 @@ glabel D_80243E64_B62114 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_UnkFunc21, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024069C_B5E94C, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_UnkFunc22, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C60_B5EF10, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243FC8_B62278 -.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_UnkFunc20, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A7C_B5ED2C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, jan_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_UnkFunc20, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024082C_B5EADC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, jan_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, jan_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, D_802BCBD8_E31528, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, D_80000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, 0x802BCBFC, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s index 7fd0f802b0..ec14f3bc40 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_04/C69D70.data.s @@ -18,4 +18,4 @@ glabel D_80241CA4_C69DD4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_04_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_04_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024034C_C6847C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_04_UnkFunc22, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_04_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240910_C68A40, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241E08_C69F38 -.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024072C_C6885C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060B0, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_04_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_04_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_04_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404DC_C6860C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_04_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241CA4_C69DD4, 0x00000043, 0x00000003, kzn_04_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B0, 0x00000001, 0x00000043, 0x00000002, kzn_04_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_04_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_04_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000212, 0x00000230, 0x00000019, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B0, 0x00000043, 0x00000002, AssignScript, D_80241E08_C69F38, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s index 709cae81a7..b8a23b74c5 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_09/C7A9E0.data.s @@ -18,4 +18,4 @@ glabel D_80243D64_C7AA44 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, kzn_09_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, kzn_09_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_C76D1C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, kzn_09_UnkFunc22, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, kzn_09_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_C772E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243EC8_C7ABA8 -.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_C770FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, D_80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF84060B1, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_09_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, kzn_09_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, kzn_09_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, kzn_09_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_C76EAC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, kzn_09_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D64_C7AA44, 0x00000043, 0x00000003, kzn_09_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060B1, 0x00000001, 0x00000043, 0x00000002, kzn_09_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, kzn_09_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, kzn_09_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000082, 0x000001E0, 0xFFFFFFB5, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84060B1, 0x00000043, 0x00000002, AssignScript, D_80243EC8_C7ABA8, 0x00000043, 0x00000008, MakeEntity, 0x802EAB04, 0x0000015E, 0x0000015E, 0x00000037, 0x00000000, 0x00000023, D_80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF84060BA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/864450.data.s b/ver/us/asm/data/world/area_mac/mac_05/864450.data.s index 5e77792ebf..eb516bca65 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/864450.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/864450.data.s @@ -18,7 +18,4 @@ glabel D_802526C8_864838 .word 0x00000008, 0x00000007, 0x00000009, 0x0000000A, 0x0000000B, 0xFFFFFFFF, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000002, D_802522E0_864450, D_80252310_864480, D_80252580_8646F0, D_802525B0_864720, 0x00000020, 0x00000025, 0x00000043, D_802526C8_864838, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_802525B0_864720, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 glabel D_80252744_8648B4 -.word 0x00000000 - -glabel D_80252748_8648B8 -.word 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000003, 0x00000036, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000003, func_80243F0C_85607C, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000036, 0x00000003, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000003, 0x00000036, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000003, func_80243F0C_85607C, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000036, 0x00000003, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s index 66596f77d8..46a7f96c48 100644 --- a/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s +++ b/ver/us/asm/data/world/area_nok/nok_02/9DDE90.data.s @@ -153,7 +153,7 @@ glabel D_8024A0AC_9E10CC .word 0x00000043, 0x00000003, GetNpcYaw, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000097, 0x0000000E, 0x00000002, 0xFE363C81, 0x0000014B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE2, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C83, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024A17C_9E119C -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA0, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA0, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00B4, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xF24A6480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000004, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000056, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000001C1, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000F, 0x00000008, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000068, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE7, 0xFFFFFF7E, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80242FE4_9DA004, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC9, 0xFFFFFF7E, 0x0000000F, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x0000000A, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0x00000000, 0xFFFFFF31, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110007, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x00000000, 0xFFFFFF6C, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000068, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001C2, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000056, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x00000019, 0xFFFFFF7E, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000043, 0x00000003, NpcFacePlayer, 0x0000000A, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00000100, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x0011000D, 0x00110003, 0x00000000, 0x000C00B5, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, EndSpeech, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x0011000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0x00000006, 0x0000001E, 0xF24DFE80, 0xF24ABE80, 0xF24A5880, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00B6, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x0011000F, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0x00000004, 0xFFFFFFE2, 0xF24DFE80, 0xF24ABE80, 0xF24A5880, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00B7, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0xF2505680, 0xF24ABE80, 0xF24A6480, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00B8, 0x00000043, 0x00000003, BindNpcInteract, 0x0000000A, D_8024A17C_9E119C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA3, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00BA, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00BB, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8024A17C_9E119C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFA1, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x002B000C, 0x002B0001, 0x00000000, 0x000C00B9, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x002B0002, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8D, 0xFFFFFFFB, 0x00000003, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000B, 0x00000002, 0x00000043, 0x00000006, NpcJump0, 0x0000000B, 0xFE363C8D, 0x00000000, 0xFE363C8C, 0x0000000C, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000C, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00000331, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C8A, 0x00000000, 0xFE363C8C, 0x0000000C, 0x00000043, 0x00000005, IsPlayerWithin, 0x00000000, 0xFFFFFE70, 0x00000082, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0xFFFFFDFE, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000B, 0x00000002, 0x00000043, 0x00000006, NpcJump0, 0x0000000B, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000C, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00000331, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000B, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA0, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA0, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00B4, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000177, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000011, 0xF24A6480, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000004, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000056, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, PlaySoundAt, 0x000001C1, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000F, 0x00000008, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000068, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE7, 0xFFFFFF7E, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, nok_02_SwitchToPartner, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC9, 0xFFFFFF7E, 0x0000000F, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x0000000A, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0x00000000, 0xFFFFFF31, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110007, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x00000000, 0xFFFFFF6C, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000068, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001C2, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000056, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x00000019, 0xFFFFFF7E, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000043, 0x00000003, NpcFacePlayer, 0x0000000A, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00000100, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x0011000D, 0x00110003, 0x00000000, 0x000C00B5, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, EndSpeech, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x0011000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0x00000006, 0x0000001E, 0xF24DFE80, 0xF24ABE80, 0xF24A5880, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00B6, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x0011000F, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0x00000004, 0xFFFFFFE2, 0xF24DFE80, 0xF24ABE80, 0xF24A5880, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00B7, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0xF2505680, 0xF24ABE80, 0xF24A6480, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00B8, 0x00000043, 0x00000003, BindNpcInteract, 0x0000000A, D_8024A17C_9E119C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA3, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00BA, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00110009, 0x00110003, 0x00000000, 0x000C00BB, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, D_8024A17C_9E119C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFA1, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x002B000C, 0x002B0001, 0x00000000, 0x000C00B9, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x002B0002, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8D, 0xFFFFFFFB, 0x00000003, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000B, 0x00000002, 0x00000043, 0x00000006, NpcJump0, 0x0000000B, 0xFE363C8D, 0x00000000, 0xFE363C8C, 0x0000000C, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000C, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00000331, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C8A, 0x00000000, 0xFE363C8C, 0x0000000C, 0x00000043, 0x00000005, IsPlayerWithin, 0x00000000, 0xFFFFFE70, 0x00000082, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0xFFFFFDFE, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000B, 0x00000002, 0x00000043, 0x00000006, NpcJump0, 0x0000000B, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000C, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00000331, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0xFE363C8E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000B, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024AC34_9E1C54 .word 0xFFFFFE2E, 0x00000067, 0xFFFFFE47, 0x000000D5, 0xFFFFFE7F, 0x0000011D, 0xFFFFFED2, 0x00000144, 0xFFFFFF06, 0x000001AC, 0xFFFFFF62, 0x000001C3, 0xFFFFFFD3, 0x000001E5, 0x0000003E, 0x000001AC, 0x000000D6, 0x000001A8, 0x00000144, 0x00000127, 0x000001A0, 0x000000C1, 0x00000125, 0x0000007B, 0x000000B5, 0x0000003F, 0x0000005F, 0x00000039, 0xFFFFFFF2, 0x00000010, 0xFFFFFF5F, 0x00000038, 0xFFFFFEC3, 0x00000051, 0xFFFFFE6F, 0x00000049 diff --git a/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s b/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s index aae6cfdbee..a59872b288 100644 --- a/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s @@ -3,7 +3,16 @@ .section .data glabel D_802412C0_9EEEB0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000043, 0x00000003, GetNpcYaw, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000097, 0x0000000E, 0x00000002, 0xFE363C81, 0x0000014B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE2, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C83, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel D_802412D0_9EEEC0 +.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 + +glabel D_802412FC_9EEEEC +.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 + +glabel D_80241328_9EEF18 +.word 0x00000043, 0x00000003, GetNpcYaw, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000097, 0x0000000E, 0x00000002, 0xFE363C81, 0x0000014B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE2, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000005, SetNpcRotation, 0xFE363C83, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802413F8_9EEFE8 .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 @@ -21,7 +30,10 @@ glabel D_80241470_9EF060 .word 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C84, 0x00000258, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C85, 0x00000029, 0x00000002, 0xFE363C85, 0x00000014, 0x00000028, 0x00000002, 0xFE363C85, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000026, 0x00000002, 0xFE363C88, 0xF24A8E80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C85, 0x00000000, 0xFE363C84, 0x00000008, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7C20, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C88, 0x0000002E, 0x00000002, 0xFE363C89, 0xF24A7680, 0x00000043, 0x00000008, nok_04_UnkFloatFunc, 0xFE363C86, 0xFE363C87, 0xFE363C89, 0xFE363C88, 0x00000003, 0x00000000, 0x00000000, 0x0000002E, 0x00000002, 0xFE363C88, 0xF24A7E20, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFE363C87, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024161C_9EF20C -.word 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C84, 0x00000258, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000029, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFE363C81, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C84, 0x00000258, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000005, 0x00000001, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000029, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFE363C81, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 + +glabel D_80241710_9EF300 +.word 0x00000043, 0x00000007, func_802CB008, 0x00000000, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 glabel D_80241748_9EF338 .word 0xFFFE0000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00010000, 0x00000000, 0x02000000, 0xFFFFFFFF @@ -39,7 +51,7 @@ glabel D_80242500_9F00F0 .word 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, func_802406C4_9EE2B4, 0x00000002, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000043, 0x00000005, func_80240574_9EE164, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcPointer, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, GetNpcPointer, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, func_80240548_9EE138, 0xFE363C80, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C81, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA3, 0x00000024, 0x00000002, 0xFE363C80, 0x000C00BC, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA3, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000C00BD, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0xFE363C80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000085, 0x00000000, 0x00000008, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x0000001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000044, 0x00000001, D_802417F8_9EF3E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_8024274C_9F033C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFA3, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000044, 0x00000001, D_80242500_9F00F0, 0x00000002, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFFA4, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0x00000004, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFED4, 0x00000145, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D50, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7D50, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000E3, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000044, 0x00000001, 0x80241710, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000122, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000014, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000125, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000F5, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000000F, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0x000000F8, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000EB, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000000F, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0x000000EE, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000055, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000D9, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0x000000DC, 0xFE363C8D, 0x00000043, 0x00000005, func_80240574_9EE164, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802406C4_9EE2B4, 0x00000002, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF68, 0x00000000, 0x000000EB, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003A, 0x000000E3, 0x0000003C, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000044, 0x00000001, D_80242500_9F00F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFA3, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000044, 0x00000001, D_80242500_9F00F0, 0x00000002, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFFA4, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0x00000004, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFED4, 0x00000145, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7D50, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7D50, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000E3, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000050, 0x00000044, 0x00000001, D_80241710_9EF300, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000122, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000014, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000125, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000F5, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000000F, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0x000000F8, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000EB, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000000F, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0x000000EE, 0xFE363C8D, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000055, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x000000D9, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0x000000DC, 0xFE363C8D, 0x00000043, 0x00000005, func_80240574_9EE164, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000001E, 0x00000044, 0x00000001, D_802417B0_9EF3A0, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0xFE363C8D, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, func_802406C4_9EE2B4, 0x00000002, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF68, 0x00000000, 0x000000EB, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000003A, 0x000000E3, 0x0000003C, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000044, 0x00000001, D_80242500_9F00F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242C5C_9F084C .word 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000001, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000018F, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000064, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000012C, 0xFE363C85, 0x00000014, 0x00000001, 0xFE363C85, 0x00000018, 0x00000001, 0x00000064, 0x00000028, 0x00000002, 0xFE363C84, 0x00000001, 0x00000018, 0x00000001, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C84, 0x00000003, 0x00000024, 0x00000002, 0xFE363C84, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80240574_9EE164, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, RandInt, 0x0000000A, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -75,7 +87,7 @@ glabel D_8024337C_9F0F6C .word 0x0000004E, 0x00000006, D_80243258_9F0E48, 0x00000010, 0x00000000, D_80243374_9F0F64, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80240E4C_9EEA3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802433B8_9F0FA8 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFFFFFF98, 0x00000028, 0x00000002, 0xFE363C82, 0x000000F1, 0x00000029, 0x00000002, 0xFE363C80, 0xFFFFFF9B, 0x00000029, 0x00000002, 0xFE363C82, 0x00000023, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEA2, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7D50, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF33, 0x0000010B, 0x00000028, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF0A, 0x00000122, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0011000A, 0x00110004, 0x00000000, 0x000C00C3, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000046, 0x00000001, D_8024337C_9F0F6C, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF31, 0x0000010C, 0x00000007, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x000C00C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0011000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000006, 0x00000044, 0x00000001, 0x80241328, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00C9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00CA, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00CC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CD, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, nok_04_UnkFunc41, 0x00000006, 0x00000002, 0x00000043, 0x00000001, func_80240E90_9EEA80, 0x00000044, 0x00000001, 0x80240FE8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018A, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x8024100C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFE70, 0x00000190, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00CF, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFF06, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000014, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D0, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000000, D_8024317C_9F0D6C, 0x00000043, 0x00000003, BindNpcAI, 0x00000000, D_80243110_9F0D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF2C, 0x00000000, 0x000000ED, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000025, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000003, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF01, 0x00000000, 0x0000011F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF3B, 0x00000000, 0x000000E3, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF17, 0x00000000, 0x0000011D, 0x0000000A, 0x00000003, 0x00000001, 0x00000016, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF2E, 0x00000000, 0x000000F4, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000020, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF86, 0x00000000, 0x000000DB, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF4F, 0x00000000, 0x000000F2, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF2B, 0x00000000, 0x0000012C, 0x0000000F, 0x00000003, 0x00000001, 0x00000017, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFF2E, 0x00000000, 0x0000010A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000021, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF9C, 0x00000000, 0x0000010D, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF27, 0x00000000, 0x000000D4, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF03, 0x00000000, 0x0000010E, 0x0000000A, 0x00000003, 0x00000001, 0x00000018, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF49, 0x00000000, 0x00000101, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000022, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000022, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFECF, 0x00000000, 0x00000149, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000032, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEB1, 0x00000000, 0x00000163, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000032, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D1, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFFFFFF98, 0x00000028, 0x00000002, 0xFE363C82, 0x000000F1, 0x00000029, 0x00000002, 0xFE363C80, 0xFFFFFF9B, 0x00000029, 0x00000002, 0xFE363C82, 0x00000023, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEA2, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7D50, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF33, 0x0000010B, 0x00000028, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF0A, 0x00000122, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0011000A, 0x00110004, 0x00000000, 0x000C00C3, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000046, 0x00000001, D_8024337C_9F0F6C, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF31, 0x0000010C, 0x00000007, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x000C00C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0011000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000006, 0x00000044, 0x00000001, D_80241328_9EEF18, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00C9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00CA, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00CC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CD, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, nok_04_UnkFunc41, 0x00000006, 0x00000002, 0x00000043, 0x00000001, func_80240E90_9EEA80, 0x00000044, 0x00000001, 0x80240FE8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018A, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x8024100C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFE70, 0x00000190, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00CF, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFF06, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000014, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D0, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000000, D_8024317C_9F0D6C, 0x00000043, 0x00000003, BindNpcAI, 0x00000000, D_80243110_9F0D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF2C, 0x00000000, 0x000000ED, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000025, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000003, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF01, 0x00000000, 0x0000011F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF3B, 0x00000000, 0x000000E3, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF17, 0x00000000, 0x0000011D, 0x0000000A, 0x00000003, 0x00000001, 0x00000016, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF2E, 0x00000000, 0x000000F4, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000020, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF86, 0x00000000, 0x000000DB, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF4F, 0x00000000, 0x000000F2, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF2B, 0x00000000, 0x0000012C, 0x0000000F, 0x00000003, 0x00000001, 0x00000017, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFF2E, 0x00000000, 0x0000010A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000021, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF9C, 0x00000000, 0x0000010D, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF27, 0x00000000, 0x000000D4, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF03, 0x00000000, 0x0000010E, 0x0000000A, 0x00000003, 0x00000001, 0x00000018, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF49, 0x00000000, 0x00000101, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000022, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000022, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFECF, 0x00000000, 0x00000149, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000032, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEB1, 0x00000000, 0x00000163, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000032, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D1, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80244D0C_9F28FC .word 0x00000056, 0x00000000, 0x00000043, 0x00000005, func_80240574_9EE164, 0xFE363C80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x0000002A, 0x00000002, 0xFE363C8A, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFF5, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, func_80240574_9EE164, 0xFE363C80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcPointer, 0x00000000, 0xFE363C8E, 0x00000043, 0x00000003, GetNpcPointer, 0x00000001, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C84, 0x00000004, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C84, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000044, 0x00000001, D_8024303C_9F0C2C, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C83, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8D, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00BF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C89, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000044, 0x00000001, D_802417F8_9EF3E8, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C84, 0x00000004, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C84, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x00000029, 0x00000002, 0xFE363C83, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000044, 0x00000001, D_80242F9C_9F0B8C, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C83, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8D, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C0, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C89, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000044, 0x00000001, D_802417F8_9EF3E8, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000043, 0x00000002, func_80240548_9EE138, 0xFE363C8E, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C1, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000028, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7CE7, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010024, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x00000032, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF0, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000D2, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0006, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, AddKeyItem, 0x00000019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C2, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000044, 0x00000001, D_802433B8_9F0FA8, 0x00000023, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -102,7 +114,7 @@ glabel D_80245FAC_9F3B9C .word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80245CF8_9F38E8, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000006, 0x000000E1, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEED, 0x00000000, 0x00000131, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00110004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80246050_9F3C40 -.word 0x00000001, 0x802412FC, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F18_9F3B08, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x802412D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B0D, D_80245F50_9F3B40, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x802412D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F88_9F3B78, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x802412D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F88_9F3B78, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x802412D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F88_9F3B78, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x802412FC, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245FAC_9F3B9C, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000001, D_802412FC_9EEEEC, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F18_9F3B08, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802412D0_9EEEC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B0D, D_80245F50_9F3B40, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_802412D0_9EEEC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F88_9F3B78, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_802412D0_9EEEC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F88_9F3B78, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_802412D0_9EEEC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245F88_9F3B78, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_802412FC_9EEEEC, 0x00000000, 0xC47A0000, 0x00000000, 0x00C40B09, D_80245FAC_9F3B9C, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020003, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020004, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel D_80246BF0_9F47E0 -.word 0x00000000, 0x802412D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00400B0D, D_80245D08_9F38F8, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_80246050_9F3C40, 0x05160004, 0x00000001, D_80246BF0_9F47E0, 0x05170004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000000, D_802412D0_9EEEC0, 0x00000000, 0xC47A0000, 0x00000000, 0x00400B0D, D_80245D08_9F38F8, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0002, 0x002B0002, 0x002B0003, 0x002B0003, 0x002B0001, 0x002B0001, 0x002B0008, 0x002B0008, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x002B0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_80246050_9F3C40, 0x05160004, 0x00000001, D_80246BF0_9F47E0, 0x05170004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s index beb0dbb58c..9b7543da99 100644 --- a/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s +++ b/ver/us/asm/data/world/area_omo/omo_11/DDDD90.data.s @@ -60,7 +60,7 @@ glabel D_80241EA4_DDE6D4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, omo_11_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, omo_11_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802407CC_DDCFFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, omo_11_UnkFunc22, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, omo_11_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240D90_DDD5C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242008_DDE838 -.word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240BAC_DDD3DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, omo_11_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF840602A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_11_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, omo_11_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, omo_11_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, omo_11_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024095C_DDD18C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, omo_11_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241EA4_DDE6D4, 0x00000043, 0x00000003, omo_11_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840602A, 0x00000001, 0x00000043, 0x00000002, omo_11_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, omo_11_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, omo_11_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242488_DDECB8 .word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF8D, 0x0000010E, 0xFFFFFF88, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840602A, 0x00000043, 0x00000002, AssignScript, D_80242008_DDE838, 0x00000043, 0x00000007, MakeEntity, 0x802EA0E8, 0x0000013B, 0x0000010E, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406019, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x000002AD, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x0000008B, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601D, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFDA8, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x00000081, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601E, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF9C, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601C, 0x00000043, 0x00000008, MakeEntity, 0x802EA5D0, 0xFFFFFF6A, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000132, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601A, 0x00000043, 0x00000008, MakeEntity, 0x802EA564, 0xFFFFFF38, 0x0000003C, 0xFFFFFFD3, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840601B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s index 3672db9492..1f37bd01a7 100644 --- a/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_08/D314C0.data.s @@ -27,7 +27,7 @@ glabel D_80241B44_D317C4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sam_08_UnkFunc21, 0xFD050F81, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sam_08_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_D2FCBC, 0xFD050F81, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sam_08_UnkFunc22, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sam_08_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_D30280, 0xFD050F81, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241CA8_D31928 -.word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_D3009C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8406131, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_08_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sam_08_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sam_08_UnkFunc20, 0xFD050F81, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sam_08_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_D2FE4C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sam_08_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B44_D317C4, 0x00000043, 0x00000003, sam_08_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8406131, 0x00000001, 0x00000043, 0x00000002, sam_08_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sam_08_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sam_08_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242128_D31DA8 .word 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFCE0, 0x000000D2, 0xFFFFFF7E, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406131, 0x00000043, 0x00000002, AssignScript, D_80241CA8_D31928, 0x00000043, 0x00000007, MakeItemEntity, 0x00000085, 0xFFFFFCFE, 0xFFFFFF10, 0x0000001E, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000004B, 0x00000043, 0x00000007, MakeEntity, D_802E9BD4, 0xFFFFFC40, 0xFFFFFF88, 0xFFFFFFDB, 0x00000000, D_80000000, 0x00000043, 0x00000002, AssignAreaFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s index 50184b654a..c9938c2c72 100644 --- a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s +++ b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s @@ -18,7 +18,7 @@ glabel D_80241494_955454 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802400BC_95407C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_UnkFunc22, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240680_954640, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802415F8_9555B8 -.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024049C_95445C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024024C_95420C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sbk_56_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA7E0, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, D_80000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241E60_955E20 .word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, sbk_56_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s index 7405b8407a..e3ce277cb8 100644 --- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s @@ -18,7 +18,7 @@ glabel D_80243A54_87D634 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024031C_879EFC, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_UnkFunc22, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802408E0_87A4C0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243BB8_87D798 -.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802406FC_87A2DC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_07_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802404AC_87A08C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_07_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_07_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802440C0_87DCA0 .word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s index c2b5910e7d..a0cd1fd99d 100644 --- a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s @@ -18,4 +18,4 @@ glabel D_80242094_888454 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406BC_886A7C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_UnkFunc22, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C80_887040, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802421F8_8885B8 -.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A9C_886E5C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024084C_886C0C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_10_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_10_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, 0x802EA588, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, D_80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s index 3afe47aaea..3903147f44 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s @@ -21,7 +21,7 @@ glabel D_80243D10_88C8E0 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240C58_889828, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_UnkFunc22, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024121C_889DEC, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80243E74_88CA44 -.word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_12_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80241038_889C08, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_12_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_12_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_8899B8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_12_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, tik_12_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_12_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802442F4_88CEC4 .word 0x00000024, 0x00000002, 0xF8405D0B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s index 5f1960cc24..c53358809c 100644 --- a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s +++ b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s @@ -18,4 +18,4 @@ glabel D_80241484_893EA4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024006C_892A8C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_UnkFunc22, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240630_893050, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802415E8_894008 -.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024044C_892E6C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_17_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401FC_892C1C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_17_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_17_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s index 74ff95ae53..8a9d712eb9 100644 --- a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s +++ b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s @@ -18,4 +18,4 @@ glabel D_80242714_899CF4 .word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_UnkFunc21, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_UnkFunc23, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024062C_897C0C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_UnkFunc22, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_UnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240BF0_8981D0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80242878_899E58 -.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_80240A0C_897FEC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_19_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UnkFunc40, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SetOverrideFlags_40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_UnkFunc20, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_UnkFunc38, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802407BC_897D9C, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_19_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_UnkFunc18, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_UnkFunc39, 0xFE363C89, 0x00000043, 0x00000001, tik_19_UnkFunc19, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_UnkFunc17, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802EA910, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s index 9be8706ce0..1538b0da58 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_13/CC3850/flo_13_func_80241DB8_CC55C8.s @@ -85,7 +85,7 @@ glabel flo_13_func_80241DB8_CC55C8 .L80241EEC: /* CC56FC 80241EEC 0280202D */ daddu $a0, $s4, $zero /* CC5700 80241EF0 02C0282D */ daddu $a1, $s6, $zero -/* CC5704 80241EF4 0C090071 */ jal flo_13_func_802401C4_CC39D4 +/* CC5704 80241EF4 0C090071 */ jal flo_13_UnkNpcAIFunc23 /* CC5708 80241EF8 02A0302D */ daddu $a2, $s5, $zero .L80241EFC: /* CC570C 80241EFC 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s index de4fd5958b..62a7478f85 100644 --- a/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s +++ b/ver/us/asm/nonmatchings/world/area_flo/flo_17/CD7350/flo_17_func_80241C64_CD8F44.s @@ -85,7 +85,7 @@ glabel flo_17_func_80241C64_CD8F44 .L80241D98: /* CD9078 80241D98 0280202D */ daddu $a0, $s4, $zero /* CD907C 80241D9C 02C0282D */ daddu $a1, $s6, $zero -/* CD9080 80241DA0 0C09001C */ jal flo_17_func_80240070_CD7350 +/* CD9080 80241DA0 0C09001C */ jal flo_17_UnkNpcAIFunc23 /* CD9084 80241DA4 02A0302D */ daddu $a2, $s5, $zero .L80241DA8: /* CD9088 80241DA8 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CB0_A11530.s b/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CB0_A11530.s deleted file mode 100644 index 9f7e8c60eb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CB0_A11530.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB0_A11530 -/* A11530 80240CB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11534 80240CB4 AFBF0010 */ sw $ra, 0x10($sp) -/* A11538 80240CB8 8C82000C */ lw $v0, 0xc($a0) -/* A1153C 80240CBC 0C0B1EAF */ jal get_variable -/* A11540 80240CC0 8C450000 */ lw $a1, ($v0) -/* A11544 80240CC4 0C03AC5A */ jal switch_to_partner -/* A11548 80240CC8 0040202D */ daddu $a0, $v0, $zero -/* A1154C 80240CCC 8FBF0010 */ lw $ra, 0x10($sp) -/* A11550 80240CD0 24020002 */ addiu $v0, $zero, 2 -/* A11554 80240CD4 03E00008 */ jr $ra -/* A11558 80240CD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s deleted file mode 100644 index fd2c3c5111..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244E20_A1B040 -.double 32767.0 - -.section .text - -glabel func_80240FF0_A17210 -/* A17210 80240FF0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A17214 80240FF4 AFB3002C */ sw $s3, 0x2c($sp) -/* A17218 80240FF8 0080982D */ daddu $s3, $a0, $zero -/* A1721C 80240FFC AFBF0030 */ sw $ra, 0x30($sp) -/* A17220 80241000 AFB20028 */ sw $s2, 0x28($sp) -/* A17224 80241004 AFB10024 */ sw $s1, 0x24($sp) -/* A17228 80241008 AFB00020 */ sw $s0, 0x20($sp) -/* A1722C 8024100C 8E710148 */ lw $s1, 0x148($s3) -/* A17230 80241010 86240008 */ lh $a0, 8($s1) -/* A17234 80241014 0C00EABB */ jal get_npc_unsafe -/* A17238 80241018 00A0902D */ daddu $s2, $a1, $zero -/* A1723C 8024101C 8E440004 */ lw $a0, 4($s2) -/* A17240 80241020 0040802D */ daddu $s0, $v0, $zero -/* A17244 80241024 00041FC2 */ srl $v1, $a0, 0x1f -/* A17248 80241028 00832021 */ addu $a0, $a0, $v1 -/* A1724C 8024102C 00042043 */ sra $a0, $a0, 1 -/* A17250 80241030 0C00A67F */ jal rand_int -/* A17254 80241034 24840001 */ addiu $a0, $a0, 1 -/* A17258 80241038 8E430004 */ lw $v1, 4($s2) -/* A1725C 8024103C 000327C2 */ srl $a0, $v1, 0x1f -/* A17260 80241040 00641821 */ addu $v1, $v1, $a0 -/* A17264 80241044 00031843 */ sra $v1, $v1, 1 -/* A17268 80241048 00621821 */ addu $v1, $v1, $v0 -/* A1726C 8024104C A603008E */ sh $v1, 0x8e($s0) -/* A17270 80241050 8E2300D0 */ lw $v1, 0xd0($s1) -/* A17274 80241054 C6000040 */ lwc1 $f0, 0x40($s0) -/* A17278 80241058 C4640000 */ lwc1 $f4, ($v1) -/* A1727C 8024105C 46802120 */ cvt.s.w $f4, $f4 -/* A17280 80241060 C4620008 */ lwc1 $f2, 8($v1) -/* A17284 80241064 468010A0 */ cvt.s.w $f2, $f2 -/* A17288 80241068 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1728C 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17290 80241070 44061000 */ mfc1 $a2, $f2 -/* A17294 80241074 C440000C */ lwc1 $f0, 0xc($v0) -/* A17298 80241078 46800020 */ cvt.s.w $f0, $f0 -/* A1729C 8024107C E7A00014 */ swc1 $f0, 0x14($sp) -/* A172A0 80241080 8E2200D0 */ lw $v0, 0xd0($s1) -/* A172A4 80241084 44052000 */ mfc1 $a1, $f4 -/* A172A8 80241088 C4400010 */ lwc1 $f0, 0x10($v0) -/* A172AC 8024108C 46800020 */ cvt.s.w $f0, $f0 -/* A172B0 80241090 E7A00018 */ swc1 $f0, 0x18($sp) -/* A172B4 80241094 8C640018 */ lw $a0, 0x18($v1) -/* A172B8 80241098 0C0123F5 */ jal is_point_within_region -/* A172BC 8024109C 8E070038 */ lw $a3, 0x38($s0) -/* A172C0 802410A0 1040000E */ beqz $v0, .L802410DC -/* A172C4 802410A4 00000000 */ nop -/* A172C8 802410A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A172CC 802410AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A172D0 802410B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A172D4 802410B4 C4460000 */ lwc1 $f6, ($v0) -/* A172D8 802410B8 468031A0 */ cvt.s.w $f6, $f6 -/* A172DC 802410BC 44063000 */ mfc1 $a2, $f6 -/* A172E0 802410C0 C4460008 */ lwc1 $f6, 8($v0) -/* A172E4 802410C4 468031A0 */ cvt.s.w $f6, $f6 -/* A172E8 802410C8 44073000 */ mfc1 $a3, $f6 -/* A172EC 802410CC 0C00A720 */ jal atan2 -/* A172F0 802410D0 00000000 */ nop -/* A172F4 802410D4 08090443 */ j .L8024110C -/* A172F8 802410D8 E600000C */ swc1 $f0, 0xc($s0) -.L802410DC: -/* A172FC 802410DC 0C00A67F */ jal rand_int -/* A17300 802410E0 2404003C */ addiu $a0, $zero, 0x3c -/* A17304 802410E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A17308 802410E8 44820000 */ mtc1 $v0, $f0 -/* A1730C 802410EC 00000000 */ nop -/* A17310 802410F0 46800020 */ cvt.s.w $f0, $f0 -/* A17314 802410F4 46006300 */ add.s $f12, $f12, $f0 -/* A17318 802410F8 3C0141F0 */ lui $at, 0x41f0 -/* A1731C 802410FC 44810000 */ mtc1 $at, $f0 -/* A17320 80241100 0C00A6C9 */ jal clamp_angle -/* A17324 80241104 46006301 */ sub.s $f12, $f12, $f0 -/* A17328 80241108 E600000C */ swc1 $f0, 0xc($s0) -.L8024110C: -/* A1732C 8024110C 8E2200CC */ lw $v0, 0xcc($s1) -/* A17330 80241110 8C420004 */ lw $v0, 4($v0) -/* A17334 80241114 AE020028 */ sw $v0, 0x28($s0) -/* A17338 80241118 AE600074 */ sw $zero, 0x74($s3) -/* A1733C 8024111C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17340 80241120 8C420014 */ lw $v0, 0x14($v0) -/* A17344 80241124 04410004 */ bgez $v0, .L80241138 -/* A17348 80241128 00000000 */ nop -/* A1734C 8024112C C6400000 */ lwc1 $f0, ($s2) -/* A17350 80241130 08090456 */ j .L80241158 -/* A17354 80241134 E6000018 */ swc1 $f0, 0x18($s0) -.L80241138: -/* A17358 80241138 3C018024 */ lui $at, %hi(D_80244E20_A1B040) -/* A1735C 8024113C D4224E20 */ ldc1 $f2, %lo(D_80244E20_A1B040)($at) -/* A17360 80241140 44820000 */ mtc1 $v0, $f0 -/* A17364 80241144 00000000 */ nop -/* A17368 80241148 46800021 */ cvt.d.w $f0, $f0 -/* A1736C 8024114C 46220003 */ div.d $f0, $f0, $f2 -/* A17370 80241150 46200020 */ cvt.s.d $f0, $f0 -/* A17374 80241154 E6000018 */ swc1 $f0, 0x18($s0) -.L80241158: -/* A17378 80241158 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1737C 8024115C 3C014059 */ lui $at, 0x4059 -/* A17380 80241160 44811800 */ mtc1 $at, $f3 -/* A17384 80241164 44801000 */ mtc1 $zero, $f2 -/* A17388 80241168 46000021 */ cvt.d.s $f0, $f0 -/* A1738C 8024116C 46220002 */ mul.d $f0, $f0, $f2 -/* A17390 80241170 00000000 */ nop -/* A17394 80241174 24020001 */ addiu $v0, $zero, 1 -/* A17398 80241178 4620018D */ trunc.w.d $f6, $f0 -/* A1739C 8024117C E626007C */ swc1 $f6, 0x7c($s1) -/* A173A0 80241180 AE620070 */ sw $v0, 0x70($s3) -/* A173A4 80241184 8FBF0030 */ lw $ra, 0x30($sp) -/* A173A8 80241188 8FB3002C */ lw $s3, 0x2c($sp) -/* A173AC 8024118C 8FB20028 */ lw $s2, 0x28($sp) -/* A173B0 80241190 8FB10024 */ lw $s1, 0x24($sp) -/* A173B4 80241194 8FB00020 */ lw $s0, 0x20($sp) -/* A173B8 80241198 03E00008 */ jr $ra -/* A173BC 8024119C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 7f44b9306c..e3f9e92c6d 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -81,7 +81,7 @@ glabel func_802422FC_A1851C glabel L80242408_A18628 /* A18628 80242408 0280202D */ daddu $a0, $s4, $zero /* A1862C 8024240C 0200282D */ daddu $a1, $s0, $zero -/* A18630 80242410 0C0903FC */ jal func_80240FF0_A17210 +/* A18630 80242410 0C0903FC */ jal hos_02_UnkNpcAIFunc23 /* A18634 80242414 0260302D */ daddu $a2, $s3, $zero glabel L80242418_A18638 /* A18638 80242418 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s index aee9d27fa5..23dfe2df3e 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -82,7 +82,7 @@ glabel func_802428F4_A18B14 glabel L80242A04_A18C24 /* A18C24 80242A04 0280202D */ daddu $a0, $s4, $zero /* A18C28 80242A08 0200282D */ daddu $a1, $s0, $zero -/* A18C2C 80242A0C 0C0903FC */ jal func_80240FF0_A17210 +/* A18C2C 80242A0C 0C0903FC */ jal hos_02_UnkNpcAIFunc23 /* A18C30 80242A10 0260302D */ daddu $a2, $s3, $zero glabel L80242A14_A18C34 /* A18C34 80242A14 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s deleted file mode 100644 index 5c521ed9d2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80240CB0_A1BDB0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024BD70_A26E70 -.double 32767.0 - -.section .text - -glabel func_80240CB0_A1BDB0 -/* A1BDB0 80240CB0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A1BDB4 80240CB4 AFB3002C */ sw $s3, 0x2c($sp) -/* A1BDB8 80240CB8 0080982D */ daddu $s3, $a0, $zero -/* A1BDBC 80240CBC AFBF0030 */ sw $ra, 0x30($sp) -/* A1BDC0 80240CC0 AFB20028 */ sw $s2, 0x28($sp) -/* A1BDC4 80240CC4 AFB10024 */ sw $s1, 0x24($sp) -/* A1BDC8 80240CC8 AFB00020 */ sw $s0, 0x20($sp) -/* A1BDCC 80240CCC 8E710148 */ lw $s1, 0x148($s3) -/* A1BDD0 80240CD0 86240008 */ lh $a0, 8($s1) -/* A1BDD4 80240CD4 0C00EABB */ jal get_npc_unsafe -/* A1BDD8 80240CD8 00A0902D */ daddu $s2, $a1, $zero -/* A1BDDC 80240CDC 8E440004 */ lw $a0, 4($s2) -/* A1BDE0 80240CE0 0040802D */ daddu $s0, $v0, $zero -/* A1BDE4 80240CE4 00041FC2 */ srl $v1, $a0, 0x1f -/* A1BDE8 80240CE8 00832021 */ addu $a0, $a0, $v1 -/* A1BDEC 80240CEC 00042043 */ sra $a0, $a0, 1 -/* A1BDF0 80240CF0 0C00A67F */ jal rand_int -/* A1BDF4 80240CF4 24840001 */ addiu $a0, $a0, 1 -/* A1BDF8 80240CF8 8E430004 */ lw $v1, 4($s2) -/* A1BDFC 80240CFC 000327C2 */ srl $a0, $v1, 0x1f -/* A1BE00 80240D00 00641821 */ addu $v1, $v1, $a0 -/* A1BE04 80240D04 00031843 */ sra $v1, $v1, 1 -/* A1BE08 80240D08 00621821 */ addu $v1, $v1, $v0 -/* A1BE0C 80240D0C A603008E */ sh $v1, 0x8e($s0) -/* A1BE10 80240D10 8E2300D0 */ lw $v1, 0xd0($s1) -/* A1BE14 80240D14 C6000040 */ lwc1 $f0, 0x40($s0) -/* A1BE18 80240D18 C4640000 */ lwc1 $f4, ($v1) -/* A1BE1C 80240D1C 46802120 */ cvt.s.w $f4, $f4 -/* A1BE20 80240D20 C4620008 */ lwc1 $f2, 8($v1) -/* A1BE24 80240D24 468010A0 */ cvt.s.w $f2, $f2 -/* A1BE28 80240D28 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1BE2C 80240D2C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BE30 80240D30 44061000 */ mfc1 $a2, $f2 -/* A1BE34 80240D34 C440000C */ lwc1 $f0, 0xc($v0) -/* A1BE38 80240D38 46800020 */ cvt.s.w $f0, $f0 -/* A1BE3C 80240D3C E7A00014 */ swc1 $f0, 0x14($sp) -/* A1BE40 80240D40 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BE44 80240D44 44052000 */ mfc1 $a1, $f4 -/* A1BE48 80240D48 C4400010 */ lwc1 $f0, 0x10($v0) -/* A1BE4C 80240D4C 46800020 */ cvt.s.w $f0, $f0 -/* A1BE50 80240D50 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1BE54 80240D54 8C640018 */ lw $a0, 0x18($v1) -/* A1BE58 80240D58 0C0123F5 */ jal is_point_within_region -/* A1BE5C 80240D5C 8E070038 */ lw $a3, 0x38($s0) -/* A1BE60 80240D60 1040000E */ beqz $v0, .L80240D9C -/* A1BE64 80240D64 00000000 */ nop -/* A1BE68 80240D68 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BE6C 80240D6C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1BE70 80240D70 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1BE74 80240D74 C4460000 */ lwc1 $f6, ($v0) -/* A1BE78 80240D78 468031A0 */ cvt.s.w $f6, $f6 -/* A1BE7C 80240D7C 44063000 */ mfc1 $a2, $f6 -/* A1BE80 80240D80 C4460008 */ lwc1 $f6, 8($v0) -/* A1BE84 80240D84 468031A0 */ cvt.s.w $f6, $f6 -/* A1BE88 80240D88 44073000 */ mfc1 $a3, $f6 -/* A1BE8C 80240D8C 0C00A720 */ jal atan2 -/* A1BE90 80240D90 00000000 */ nop -/* A1BE94 80240D94 08090373 */ j .L80240DCC -/* A1BE98 80240D98 E600000C */ swc1 $f0, 0xc($s0) -.L80240D9C: -/* A1BE9C 80240D9C 0C00A67F */ jal rand_int -/* A1BEA0 80240DA0 2404003C */ addiu $a0, $zero, 0x3c -/* A1BEA4 80240DA4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1BEA8 80240DA8 44820000 */ mtc1 $v0, $f0 -/* A1BEAC 80240DAC 00000000 */ nop -/* A1BEB0 80240DB0 46800020 */ cvt.s.w $f0, $f0 -/* A1BEB4 80240DB4 46006300 */ add.s $f12, $f12, $f0 -/* A1BEB8 80240DB8 3C0141F0 */ lui $at, 0x41f0 -/* A1BEBC 80240DBC 44810000 */ mtc1 $at, $f0 -/* A1BEC0 80240DC0 0C00A6C9 */ jal clamp_angle -/* A1BEC4 80240DC4 46006301 */ sub.s $f12, $f12, $f0 -/* A1BEC8 80240DC8 E600000C */ swc1 $f0, 0xc($s0) -.L80240DCC: -/* A1BECC 80240DCC 8E2200CC */ lw $v0, 0xcc($s1) -/* A1BED0 80240DD0 8C420004 */ lw $v0, 4($v0) -/* A1BED4 80240DD4 AE020028 */ sw $v0, 0x28($s0) -/* A1BED8 80240DD8 AE600074 */ sw $zero, 0x74($s3) -/* A1BEDC 80240DDC 8E2200D0 */ lw $v0, 0xd0($s1) -/* A1BEE0 80240DE0 8C420014 */ lw $v0, 0x14($v0) -/* A1BEE4 80240DE4 04410004 */ bgez $v0, .L80240DF8 -/* A1BEE8 80240DE8 00000000 */ nop -/* A1BEEC 80240DEC C6400000 */ lwc1 $f0, ($s2) -/* A1BEF0 80240DF0 08090386 */ j .L80240E18 -/* A1BEF4 80240DF4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240DF8: -/* A1BEF8 80240DF8 3C018025 */ lui $at, %hi(D_8024BD70_A26E70) -/* A1BEFC 80240DFC D422BD70 */ ldc1 $f2, %lo(D_8024BD70_A26E70)($at) -/* A1BF00 80240E00 44820000 */ mtc1 $v0, $f0 -/* A1BF04 80240E04 00000000 */ nop -/* A1BF08 80240E08 46800021 */ cvt.d.w $f0, $f0 -/* A1BF0C 80240E0C 46220003 */ div.d $f0, $f0, $f2 -/* A1BF10 80240E10 46200020 */ cvt.s.d $f0, $f0 -/* A1BF14 80240E14 E6000018 */ swc1 $f0, 0x18($s0) -.L80240E18: -/* A1BF18 80240E18 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1BF1C 80240E1C 3C014059 */ lui $at, 0x4059 -/* A1BF20 80240E20 44811800 */ mtc1 $at, $f3 -/* A1BF24 80240E24 44801000 */ mtc1 $zero, $f2 -/* A1BF28 80240E28 46000021 */ cvt.d.s $f0, $f0 -/* A1BF2C 80240E2C 46220002 */ mul.d $f0, $f0, $f2 -/* A1BF30 80240E30 00000000 */ nop -/* A1BF34 80240E34 24020001 */ addiu $v0, $zero, 1 -/* A1BF38 80240E38 4620018D */ trunc.w.d $f6, $f0 -/* A1BF3C 80240E3C E626007C */ swc1 $f6, 0x7c($s1) -/* A1BF40 80240E40 AE620070 */ sw $v0, 0x70($s3) -/* A1BF44 80240E44 8FBF0030 */ lw $ra, 0x30($sp) -/* A1BF48 80240E48 8FB3002C */ lw $s3, 0x2c($sp) -/* A1BF4C 80240E4C 8FB20028 */ lw $s2, 0x28($sp) -/* A1BF50 80240E50 8FB10024 */ lw $s1, 0x24($sp) -/* A1BF54 80240E54 8FB00020 */ lw $s0, 0x20($sp) -/* A1BF58 80240E58 03E00008 */ jr $ra -/* A1BF5C 80240E5C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s index 23446aa065..2c13cc0bf4 100644 --- a/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s +++ b/ver/us/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -81,7 +81,7 @@ glabel func_80241FBC_A1D0BC glabel L802420C8_A1D1C8 /* A1D1C8 802420C8 0280202D */ daddu $a0, $s4, $zero /* A1D1CC 802420CC 0200282D */ daddu $a1, $s0, $zero -/* A1D1D0 802420D0 0C09032C */ jal func_80240CB0_A1BDB0 +/* A1D1D0 802420D0 0C09032C */ jal hos_03_UnkNpcAIFunc23 /* A1D1D4 802420D4 0260302D */ daddu $a2, $s3, $zero glabel L802420D8_A1D1D8 /* A1D1D8 802420D8 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s deleted file mode 100644 index 45960e9544..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802400BC_97B6EC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80242430_97DA60 -.double 0.8 - -.section .text - -glabel func_802400BC_97B6EC -/* 97B6EC 802400BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 97B6F0 802400C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 97B6F4 802400C4 0080982D */ daddu $s3, $a0, $zero -/* 97B6F8 802400C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 97B6FC 802400CC AFB20018 */ sw $s2, 0x18($sp) -/* 97B700 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* 97B704 802400D4 AFB00010 */ sw $s0, 0x10($sp) -/* 97B708 802400D8 8E710148 */ lw $s1, 0x148($s3) -/* 97B70C 802400DC 86240008 */ lh $a0, 8($s1) -/* 97B710 802400E0 0C00EABB */ jal get_npc_unsafe -/* 97B714 802400E4 00A0902D */ daddu $s2, $a1, $zero -/* 97B718 802400E8 0040802D */ daddu $s0, $v0, $zero -/* 97B71C 802400EC 8602008E */ lh $v0, 0x8e($s0) -/* 97B720 802400F0 9603008E */ lhu $v1, 0x8e($s0) -/* 97B724 802400F4 18400005 */ blez $v0, .L8024010C -/* 97B728 802400F8 2462FFFF */ addiu $v0, $v1, -1 -/* 97B72C 802400FC A602008E */ sh $v0, 0x8e($s0) -/* 97B730 80240100 00021400 */ sll $v0, $v0, 0x10 -/* 97B734 80240104 1C400033 */ bgtz $v0, .L802401D4 -/* 97B738 80240108 00000000 */ nop -.L8024010C: -/* 97B73C 8024010C 8602008C */ lh $v0, 0x8c($s0) -/* 97B740 80240110 14400030 */ bnez $v0, .L802401D4 -/* 97B744 80240114 00000000 */ nop -/* 97B748 80240118 8E2200CC */ lw $v0, 0xcc($s1) -/* 97B74C 8024011C 8C420024 */ lw $v0, 0x24($v0) -/* 97B750 80240120 AE020028 */ sw $v0, 0x28($s0) -/* 97B754 80240124 C6400018 */ lwc1 $f0, 0x18($s2) -/* 97B758 80240128 E6000018 */ swc1 $f0, 0x18($s0) -/* 97B75C 8024012C 8E230088 */ lw $v1, 0x88($s1) -/* 97B760 80240130 24020005 */ addiu $v0, $zero, 5 -/* 97B764 80240134 10620005 */ beq $v1, $v0, .L8024014C -/* 97B768 80240138 00000000 */ nop -/* 97B76C 8024013C 10600003 */ beqz $v1, .L8024014C -/* 97B770 80240140 24020001 */ addiu $v0, $zero, 1 -/* 97B774 80240144 14620006 */ bne $v1, $v0, .L80240160 -/* 97B778 80240148 00000000 */ nop -.L8024014C: -/* 97B77C 8024014C 8E220084 */ lw $v0, 0x84($s1) -/* 97B780 80240150 00021FC2 */ srl $v1, $v0, 0x1f -/* 97B784 80240154 00431021 */ addu $v0, $v0, $v1 -/* 97B788 80240158 00021043 */ sra $v0, $v0, 1 -/* 97B78C 8024015C A60200A8 */ sh $v0, 0xa8($s0) -.L80240160: -/* 97B790 80240160 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 97B794 80240164 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 97B798 80240168 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97B79C 8024016C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97B7A0 80240170 8C460028 */ lw $a2, 0x28($v0) -/* 97B7A4 80240174 0C00A7B5 */ jal dist2D -/* 97B7A8 80240178 8C470030 */ lw $a3, 0x30($v0) -/* 97B7AC 8024017C C6020018 */ lwc1 $f2, 0x18($s0) -/* 97B7B0 80240180 46020003 */ div.s $f0, $f0, $f2 -/* 97B7B4 80240184 3C018024 */ lui $at, %hi(D_80242430_97DA60) -/* 97B7B8 80240188 D4222430 */ ldc1 $f2, %lo(D_80242430_97DA60)($at) -/* 97B7BC 8024018C 46000021 */ cvt.d.s $f0, $f0 -/* 97B7C0 80240190 46220000 */ add.d $f0, $f0, $f2 -/* 97B7C4 80240194 4620010D */ trunc.w.d $f4, $f0 -/* 97B7C8 80240198 44022000 */ mfc1 $v0, $f4 -/* 97B7CC 8024019C 00000000 */ nop -/* 97B7D0 802401A0 A602008E */ sh $v0, 0x8e($s0) -/* 97B7D4 802401A4 00021400 */ sll $v0, $v0, 0x10 -/* 97B7D8 802401A8 8E230078 */ lw $v1, 0x78($s1) -/* 97B7DC 802401AC 00021403 */ sra $v0, $v0, 0x10 -/* 97B7E0 802401B0 0043102A */ slt $v0, $v0, $v1 -/* 97B7E4 802401B4 10400003 */ beqz $v0, .L802401C4 -/* 97B7E8 802401B8 00000000 */ nop -/* 97B7EC 802401BC 9622007A */ lhu $v0, 0x7a($s1) -/* 97B7F0 802401C0 A602008E */ sh $v0, 0x8e($s0) -.L802401C4: -/* 97B7F4 802401C4 8602008E */ lh $v0, 0x8e($s0) -/* 97B7F8 802401C8 AE22007C */ sw $v0, 0x7c($s1) -/* 97B7FC 802401CC 2402000E */ addiu $v0, $zero, 0xe -/* 97B800 802401D0 AE620070 */ sw $v0, 0x70($s3) -.L802401D4: -/* 97B804 802401D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 97B808 802401D8 8FB3001C */ lw $s3, 0x1c($sp) -/* 97B80C 802401DC 8FB20018 */ lw $s2, 0x18($sp) -/* 97B810 802401E0 8FB10014 */ lw $s1, 0x14($sp) -/* 97B814 802401E4 8FB00010 */ lw $s0, 0x10($sp) -/* 97B818 802401E8 03E00008 */ jr $ra -/* 97B81C 802401EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s index bcc0250e39..2833291ade 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -244,7 +244,7 @@ glabel func_802403D4_97BA04 /* 97BD64 80240734 0260202D */ daddu $a0, $s3, $zero .L80240738: /* 97BD68 80240738 0280282D */ daddu $a1, $s4, $zero -/* 97BD6C 8024073C 0C09002F */ jal func_802400BC_97B6EC +/* 97BD6C 8024073C 0C09002F */ jal isk_04_UnkDistFunc /* 97BD70 80240740 02A0302D */ daddu $a2, $s5, $zero /* 97BD74 80240744 080901E0 */ j .L80240780 /* 97BD78 80240748 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_80240930_97BF60.s b/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_80240930_97BF60.s deleted file mode 100644 index 022b8884c5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_04/97BF60/func_80240930_97BF60.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240930_97BF60 -/* 97BF60 80240930 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97BF64 80240934 AFBF0010 */ sw $ra, 0x10($sp) -/* 97BF68 80240938 8C82000C */ lw $v0, 0xc($a0) -/* 97BF6C 8024093C 0C0B1EAF */ jal get_variable -/* 97BF70 80240940 8C450000 */ lw $a1, ($v0) -/* 97BF74 80240944 0C03AC5A */ jal switch_to_partner -/* 97BF78 80240948 0040202D */ daddu $a0, $v0, $zero -/* 97BF7C 8024094C 8FBF0010 */ lw $ra, 0x10($sp) -/* 97BF80 80240950 24020002 */ addiu $v0, $zero, 2 -/* 97BF84 80240954 03E00008 */ jr $ra -/* 97BF88 80240958 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s deleted file mode 100644 index 90d08b8102..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80241650_986480 -.double 0.8 - -.section .text - -glabel func_8024007C_984EAC -/* 984EAC 8024007C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 984EB0 80240080 AFB3001C */ sw $s3, 0x1c($sp) -/* 984EB4 80240084 0080982D */ daddu $s3, $a0, $zero -/* 984EB8 80240088 AFBF0020 */ sw $ra, 0x20($sp) -/* 984EBC 8024008C AFB20018 */ sw $s2, 0x18($sp) -/* 984EC0 80240090 AFB10014 */ sw $s1, 0x14($sp) -/* 984EC4 80240094 AFB00010 */ sw $s0, 0x10($sp) -/* 984EC8 80240098 8E710148 */ lw $s1, 0x148($s3) -/* 984ECC 8024009C 86240008 */ lh $a0, 8($s1) -/* 984ED0 802400A0 0C00EABB */ jal get_npc_unsafe -/* 984ED4 802400A4 00A0902D */ daddu $s2, $a1, $zero -/* 984ED8 802400A8 0040802D */ daddu $s0, $v0, $zero -/* 984EDC 802400AC 8602008E */ lh $v0, 0x8e($s0) -/* 984EE0 802400B0 9603008E */ lhu $v1, 0x8e($s0) -/* 984EE4 802400B4 18400005 */ blez $v0, .L802400CC -/* 984EE8 802400B8 2462FFFF */ addiu $v0, $v1, -1 -/* 984EEC 802400BC A602008E */ sh $v0, 0x8e($s0) -/* 984EF0 802400C0 00021400 */ sll $v0, $v0, 0x10 -/* 984EF4 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 984EF8 802400C8 00000000 */ nop -.L802400CC: -/* 984EFC 802400CC 8602008C */ lh $v0, 0x8c($s0) -/* 984F00 802400D0 14400030 */ bnez $v0, .L80240194 -/* 984F04 802400D4 00000000 */ nop -/* 984F08 802400D8 8E2200CC */ lw $v0, 0xcc($s1) -/* 984F0C 802400DC 8C420024 */ lw $v0, 0x24($v0) -/* 984F10 802400E0 AE020028 */ sw $v0, 0x28($s0) -/* 984F14 802400E4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 984F18 802400E8 E6000018 */ swc1 $f0, 0x18($s0) -/* 984F1C 802400EC 8E230088 */ lw $v1, 0x88($s1) -/* 984F20 802400F0 24020005 */ addiu $v0, $zero, 5 -/* 984F24 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 984F28 802400F8 00000000 */ nop -/* 984F2C 802400FC 10600003 */ beqz $v1, .L8024010C -/* 984F30 80240100 24020001 */ addiu $v0, $zero, 1 -/* 984F34 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 984F38 80240108 00000000 */ nop -.L8024010C: -/* 984F3C 8024010C 8E220084 */ lw $v0, 0x84($s1) -/* 984F40 80240110 00021FC2 */ srl $v1, $v0, 0x1f -/* 984F44 80240114 00431021 */ addu $v0, $v0, $v1 -/* 984F48 80240118 00021043 */ sra $v0, $v0, 1 -/* 984F4C 8024011C A60200A8 */ sh $v0, 0xa8($s0) -.L80240120: -/* 984F50 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 984F54 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 984F58 80240128 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 984F5C 8024012C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 984F60 80240130 8C460028 */ lw $a2, 0x28($v0) -/* 984F64 80240134 0C00A7B5 */ jal dist2D -/* 984F68 80240138 8C470030 */ lw $a3, 0x30($v0) -/* 984F6C 8024013C C6020018 */ lwc1 $f2, 0x18($s0) -/* 984F70 80240140 46020003 */ div.s $f0, $f0, $f2 -/* 984F74 80240144 3C018024 */ lui $at, %hi(D_80241650_986480) -/* 984F78 80240148 D4221650 */ ldc1 $f2, %lo(D_80241650_986480)($at) -/* 984F7C 8024014C 46000021 */ cvt.d.s $f0, $f0 -/* 984F80 80240150 46220000 */ add.d $f0, $f0, $f2 -/* 984F84 80240154 4620010D */ trunc.w.d $f4, $f0 -/* 984F88 80240158 44022000 */ mfc1 $v0, $f4 -/* 984F8C 8024015C 00000000 */ nop -/* 984F90 80240160 A602008E */ sh $v0, 0x8e($s0) -/* 984F94 80240164 00021400 */ sll $v0, $v0, 0x10 -/* 984F98 80240168 8E230078 */ lw $v1, 0x78($s1) -/* 984F9C 8024016C 00021403 */ sra $v0, $v0, 0x10 -/* 984FA0 80240170 0043102A */ slt $v0, $v0, $v1 -/* 984FA4 80240174 10400003 */ beqz $v0, .L80240184 -/* 984FA8 80240178 00000000 */ nop -/* 984FAC 8024017C 9622007A */ lhu $v0, 0x7a($s1) -/* 984FB0 80240180 A602008E */ sh $v0, 0x8e($s0) -.L80240184: -/* 984FB4 80240184 8602008E */ lh $v0, 0x8e($s0) -/* 984FB8 80240188 AE22007C */ sw $v0, 0x7c($s1) -/* 984FBC 8024018C 2402000E */ addiu $v0, $zero, 0xe -/* 984FC0 80240190 AE620070 */ sw $v0, 0x70($s3) -.L80240194: -/* 984FC4 80240194 8FBF0020 */ lw $ra, 0x20($sp) -/* 984FC8 80240198 8FB3001C */ lw $s3, 0x1c($sp) -/* 984FCC 8024019C 8FB20018 */ lw $s2, 0x18($sp) -/* 984FD0 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* 984FD4 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* 984FD8 802401A8 03E00008 */ jr $ra -/* 984FDC 802401AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s index ee52c1cc33..a32ad0e35d 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -244,7 +244,7 @@ glabel func_80240394_9851C4 /* 985524 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: /* 985528 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 98552C 802406FC 0C09001F */ jal func_8024007C_984EAC +/* 98552C 802406FC 0C09001F */ jal isk_08_UnkDistFunc /* 985530 80240700 02A0302D */ daddu $a2, $s5, $zero /* 985534 80240704 080901D0 */ j .L80240740 /* 985538 80240708 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C_988F7C.s b/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C_988F7C.s deleted file mode 100644 index d21c19765c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C_988F7C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_988F7C -/* 988F7C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 988F80 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* 988F84 80240424 8C82000C */ lw $v0, 0xc($a0) -/* 988F88 80240428 0C0B1EAF */ jal get_variable -/* 988F8C 8024042C 8C450000 */ lw $a1, ($v0) -/* 988F90 80240430 0C03AC5A */ jal switch_to_partner -/* 988F94 80240434 0040202D */ daddu $a0, $v0, $zero -/* 988F98 80240438 8FBF0010 */ lw $ra, 0x10($sp) -/* 988F9C 8024043C 24020002 */ addiu $v0, $zero, 2 -/* 988FA0 80240440 03E00008 */ jr $ra -/* 988FA4 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s b/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s deleted file mode 100644 index 1e41b12e83..0000000000 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_8024007C_997FEC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80241770_9996E0 -.double 0.8 - -.section .text - -glabel func_8024007C_997FEC -/* 997FEC 8024007C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 997FF0 80240080 AFB3001C */ sw $s3, 0x1c($sp) -/* 997FF4 80240084 0080982D */ daddu $s3, $a0, $zero -/* 997FF8 80240088 AFBF0020 */ sw $ra, 0x20($sp) -/* 997FFC 8024008C AFB20018 */ sw $s2, 0x18($sp) -/* 998000 80240090 AFB10014 */ sw $s1, 0x14($sp) -/* 998004 80240094 AFB00010 */ sw $s0, 0x10($sp) -/* 998008 80240098 8E710148 */ lw $s1, 0x148($s3) -/* 99800C 8024009C 86240008 */ lh $a0, 8($s1) -/* 998010 802400A0 0C00EABB */ jal get_npc_unsafe -/* 998014 802400A4 00A0902D */ daddu $s2, $a1, $zero -/* 998018 802400A8 0040802D */ daddu $s0, $v0, $zero -/* 99801C 802400AC 8602008E */ lh $v0, 0x8e($s0) -/* 998020 802400B0 9603008E */ lhu $v1, 0x8e($s0) -/* 998024 802400B4 18400005 */ blez $v0, .L802400CC -/* 998028 802400B8 2462FFFF */ addiu $v0, $v1, -1 -/* 99802C 802400BC A602008E */ sh $v0, 0x8e($s0) -/* 998030 802400C0 00021400 */ sll $v0, $v0, 0x10 -/* 998034 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 998038 802400C8 00000000 */ nop -.L802400CC: -/* 99803C 802400CC 8602008C */ lh $v0, 0x8c($s0) -/* 998040 802400D0 14400030 */ bnez $v0, .L80240194 -/* 998044 802400D4 00000000 */ nop -/* 998048 802400D8 8E2200CC */ lw $v0, 0xcc($s1) -/* 99804C 802400DC 8C420024 */ lw $v0, 0x24($v0) -/* 998050 802400E0 AE020028 */ sw $v0, 0x28($s0) -/* 998054 802400E4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 998058 802400E8 E6000018 */ swc1 $f0, 0x18($s0) -/* 99805C 802400EC 8E230088 */ lw $v1, 0x88($s1) -/* 998060 802400F0 24020005 */ addiu $v0, $zero, 5 -/* 998064 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 998068 802400F8 00000000 */ nop -/* 99806C 802400FC 10600003 */ beqz $v1, .L8024010C -/* 998070 80240100 24020001 */ addiu $v0, $zero, 1 -/* 998074 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 998078 80240108 00000000 */ nop -.L8024010C: -/* 99807C 8024010C 8E220084 */ lw $v0, 0x84($s1) -/* 998080 80240110 00021FC2 */ srl $v1, $v0, 0x1f -/* 998084 80240114 00431021 */ addu $v0, $v0, $v1 -/* 998088 80240118 00021043 */ sra $v0, $v0, 1 -/* 99808C 8024011C A60200A8 */ sh $v0, 0xa8($s0) -.L80240120: -/* 998090 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 998094 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 998098 80240128 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99809C 8024012C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9980A0 80240130 8C460028 */ lw $a2, 0x28($v0) -/* 9980A4 80240134 0C00A7B5 */ jal dist2D -/* 9980A8 80240138 8C470030 */ lw $a3, 0x30($v0) -/* 9980AC 8024013C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9980B0 80240140 46020003 */ div.s $f0, $f0, $f2 -/* 9980B4 80240144 3C018024 */ lui $at, %hi(D_80241770_9996E0) -/* 9980B8 80240148 D4221770 */ ldc1 $f2, %lo(D_80241770_9996E0)($at) -/* 9980BC 8024014C 46000021 */ cvt.d.s $f0, $f0 -/* 9980C0 80240150 46220000 */ add.d $f0, $f0, $f2 -/* 9980C4 80240154 4620010D */ trunc.w.d $f4, $f0 -/* 9980C8 80240158 44022000 */ mfc1 $v0, $f4 -/* 9980CC 8024015C 00000000 */ nop -/* 9980D0 80240160 A602008E */ sh $v0, 0x8e($s0) -/* 9980D4 80240164 00021400 */ sll $v0, $v0, 0x10 -/* 9980D8 80240168 8E230078 */ lw $v1, 0x78($s1) -/* 9980DC 8024016C 00021403 */ sra $v0, $v0, 0x10 -/* 9980E0 80240170 0043102A */ slt $v0, $v0, $v1 -/* 9980E4 80240174 10400003 */ beqz $v0, .L80240184 -/* 9980E8 80240178 00000000 */ nop -/* 9980EC 8024017C 9622007A */ lhu $v0, 0x7a($s1) -/* 9980F0 80240180 A602008E */ sh $v0, 0x8e($s0) -.L80240184: -/* 9980F4 80240184 8602008E */ lh $v0, 0x8e($s0) -/* 9980F8 80240188 AE22007C */ sw $v0, 0x7c($s1) -/* 9980FC 8024018C 2402000E */ addiu $v0, $zero, 0xe -/* 998100 80240190 AE620070 */ sw $v0, 0x70($s3) -.L80240194: -/* 998104 80240194 8FBF0020 */ lw $ra, 0x20($sp) -/* 998108 80240198 8FB3001C */ lw $s3, 0x1c($sp) -/* 99810C 8024019C 8FB20018 */ lw $s2, 0x18($sp) -/* 998110 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* 998114 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* 998118 802401A8 03E00008 */ jr $ra -/* 99811C 802401AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index 5f022c0ded..847c228e93 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -244,7 +244,7 @@ glabel func_80240394_998304 /* 998664 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: /* 998668 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 99866C 802406FC 0C09001F */ jal func_8024007C_997FEC +/* 99866C 802406FC 0C09001F */ jal isk_18_UnkDistFunc /* 998670 80240700 02A0302D */ daddu $a2, $s5, $zero /* 998674 80240704 080901D0 */ j .L80240740 /* 998678 80240708 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C_91EC7C.s b/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C_91EC7C.s deleted file mode 100644 index fe01d41078..0000000000 --- a/ver/us/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C_91EC7C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024070C_91EC7C -/* 91EC7C 8024070C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91EC80 80240710 AFBF0010 */ sw $ra, 0x10($sp) -/* 91EC84 80240714 8C82000C */ lw $v0, 0xc($a0) -/* 91EC88 80240718 0C0B1EAF */ jal get_variable -/* 91EC8C 8024071C 8C450000 */ lw $a1, ($v0) -/* 91EC90 80240720 0C03AC5A */ jal switch_to_partner -/* 91EC94 80240724 0040202D */ daddu $a0, $v0, $zero -/* 91EC98 80240728 8FBF0010 */ lw $ra, 0x10($sp) -/* 91EC9C 8024072C 24020002 */ addiu $v0, $zero, 2 -/* 91ECA0 80240730 03E00008 */ jr $ra -/* 91ECA4 80240734 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s deleted file mode 100644 index 0f0763d1e1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802485C0_B34A30 -.double 32767.0 - -.section .text - -glabel func_80240430_B2C8A0 -/* B2C8A0 80240430 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2C8A4 80240434 AFB50024 */ sw $s5, 0x24($sp) -/* B2C8A8 80240438 0080A82D */ daddu $s5, $a0, $zero -/* B2C8AC 8024043C AFBF002C */ sw $ra, 0x2c($sp) -/* B2C8B0 80240440 AFB60028 */ sw $s6, 0x28($sp) -/* B2C8B4 80240444 AFB40020 */ sw $s4, 0x20($sp) -/* B2C8B8 80240448 AFB3001C */ sw $s3, 0x1c($sp) -/* B2C8BC 8024044C AFB20018 */ sw $s2, 0x18($sp) -/* B2C8C0 80240450 AFB10014 */ sw $s1, 0x14($sp) -/* B2C8C4 80240454 AFB00010 */ sw $s0, 0x10($sp) -/* B2C8C8 80240458 F7B80040 */ sdc1 $f24, 0x40($sp) -/* B2C8CC 8024045C F7B60038 */ sdc1 $f22, 0x38($sp) -/* B2C8D0 80240460 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B2C8D4 80240464 8EB30148 */ lw $s3, 0x148($s5) -/* B2C8D8 80240468 86640008 */ lh $a0, 8($s3) -/* B2C8DC 8024046C 0C00EABB */ jal get_npc_unsafe -/* B2C8E0 80240470 00A0B02D */ daddu $s6, $a1, $zero -/* B2C8E4 80240474 0040A02D */ daddu $s4, $v0, $zero -/* B2C8E8 80240478 AEA00074 */ sw $zero, 0x74($s5) -/* B2C8EC 8024047C C6980038 */ lwc1 $f24, 0x38($s4) -/* B2C8F0 80240480 C6960040 */ lwc1 $f22, 0x40($s4) -/* B2C8F4 80240484 0000902D */ daddu $s2, $zero, $zero -/* B2C8F8 80240488 AEA00078 */ sw $zero, 0x78($s5) -/* B2C8FC 8024048C 8E6300D0 */ lw $v1, 0xd0($s3) -/* B2C900 80240490 8C620000 */ lw $v0, ($v1) -/* B2C904 80240494 3C0146FF */ lui $at, 0x46ff -/* B2C908 80240498 3421FE00 */ ori $at, $at, 0xfe00 -/* B2C90C 8024049C 4481A000 */ mtc1 $at, $f20 -/* B2C910 802404A0 18400018 */ blez $v0, .L80240504 -/* B2C914 802404A4 0240802D */ daddu $s0, $s2, $zero -/* B2C918 802404A8 0240882D */ daddu $s1, $s2, $zero -.L802404AC: -/* B2C91C 802404AC 02231021 */ addu $v0, $s1, $v1 -/* B2C920 802404B0 4600C306 */ mov.s $f12, $f24 -/* B2C924 802404B4 C4440004 */ lwc1 $f4, 4($v0) -/* B2C928 802404B8 46802120 */ cvt.s.w $f4, $f4 -/* B2C92C 802404BC 44062000 */ mfc1 $a2, $f4 -/* B2C930 802404C0 C444000C */ lwc1 $f4, 0xc($v0) -/* B2C934 802404C4 46802120 */ cvt.s.w $f4, $f4 -/* B2C938 802404C8 44072000 */ mfc1 $a3, $f4 -/* B2C93C 802404CC 0C00A7B5 */ jal dist2D -/* B2C940 802404D0 4600B386 */ mov.s $f14, $f22 -/* B2C944 802404D4 4614003C */ c.lt.s $f0, $f20 -/* B2C948 802404D8 00000000 */ nop -/* B2C94C 802404DC 45000003 */ bc1f .L802404EC -/* B2C950 802404E0 2631000C */ addiu $s1, $s1, 0xc -/* B2C954 802404E4 46000506 */ mov.s $f20, $f0 -/* B2C958 802404E8 AEB20078 */ sw $s2, 0x78($s5) -.L802404EC: -/* B2C95C 802404EC 8E6300D0 */ lw $v1, 0xd0($s3) -/* B2C960 802404F0 26100001 */ addiu $s0, $s0, 1 -/* B2C964 802404F4 8C620000 */ lw $v0, ($v1) -/* B2C968 802404F8 0202102A */ slt $v0, $s0, $v0 -/* B2C96C 802404FC 1440FFEB */ bnez $v0, .L802404AC -/* B2C970 80240500 26520001 */ addiu $s2, $s2, 1 -.L80240504: -/* B2C974 80240504 8E6200CC */ lw $v0, 0xcc($s3) -/* B2C978 80240508 8C420004 */ lw $v0, 4($v0) -/* B2C97C 8024050C AE820028 */ sw $v0, 0x28($s4) -/* B2C980 80240510 8E6200D0 */ lw $v0, 0xd0($s3) -/* B2C984 80240514 8C42007C */ lw $v0, 0x7c($v0) -/* B2C988 80240518 04410004 */ bgez $v0, .L8024052C -/* B2C98C 8024051C 00000000 */ nop -/* B2C990 80240520 C6C00000 */ lwc1 $f0, ($s6) -/* B2C994 80240524 08090153 */ j .L8024054C -/* B2C998 80240528 E6800018 */ swc1 $f0, 0x18($s4) -.L8024052C: -/* B2C99C 8024052C 3C018025 */ lui $at, %hi(D_802485C0_B34A30) -/* B2C9A0 80240530 D42285C0 */ ldc1 $f2, %lo(D_802485C0_B34A30)($at) -/* B2C9A4 80240534 44820000 */ mtc1 $v0, $f0 -/* B2C9A8 80240538 00000000 */ nop -/* B2C9AC 8024053C 46800021 */ cvt.d.w $f0, $f0 -/* B2C9B0 80240540 46220003 */ div.d $f0, $f0, $f2 -/* B2C9B4 80240544 46200020 */ cvt.s.d $f0, $f0 -/* B2C9B8 80240548 E6800018 */ swc1 $f0, 0x18($s4) -.L8024054C: -/* B2C9BC 8024054C 24020001 */ addiu $v0, $zero, 1 -/* B2C9C0 80240550 AEA20070 */ sw $v0, 0x70($s5) -/* B2C9C4 80240554 8FBF002C */ lw $ra, 0x2c($sp) -/* B2C9C8 80240558 8FB60028 */ lw $s6, 0x28($sp) -/* B2C9CC 8024055C 8FB50024 */ lw $s5, 0x24($sp) -/* B2C9D0 80240560 8FB40020 */ lw $s4, 0x20($sp) -/* B2C9D4 80240564 8FB3001C */ lw $s3, 0x1c($sp) -/* B2C9D8 80240568 8FB20018 */ lw $s2, 0x18($sp) -/* B2C9DC 8024056C 8FB10014 */ lw $s1, 0x14($sp) -/* B2C9E0 80240570 8FB00010 */ lw $s0, 0x10($sp) -/* B2C9E4 80240574 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B2C9E8 80240578 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B2C9EC 8024057C D7B40030 */ ldc1 $f20, 0x30($sp) -/* B2C9F0 80240580 03E00008 */ jr $ra -/* B2C9F4 80240584 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s deleted file mode 100644 index 8a9dbe91ee..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240AAC_B2CF1C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802485C8_B34A38 -.double 32767.0 - -.section .text - -glabel func_80240AAC_B2CF1C -/* B2CF1C 80240AAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2CF20 80240AB0 AFB10014 */ sw $s1, 0x14($sp) -/* B2CF24 80240AB4 0080882D */ daddu $s1, $a0, $zero -/* B2CF28 80240AB8 AFBF001C */ sw $ra, 0x1c($sp) -/* B2CF2C 80240ABC AFB20018 */ sw $s2, 0x18($sp) -/* B2CF30 80240AC0 AFB00010 */ sw $s0, 0x10($sp) -/* B2CF34 80240AC4 8E300148 */ lw $s0, 0x148($s1) -/* B2CF38 80240AC8 86040008 */ lh $a0, 8($s0) -/* B2CF3C 80240ACC 0C00EABB */ jal get_npc_unsafe -/* B2CF40 80240AD0 00A0902D */ daddu $s2, $a1, $zero -/* B2CF44 80240AD4 8E230078 */ lw $v1, 0x78($s1) -/* B2CF48 80240AD8 24630001 */ addiu $v1, $v1, 1 -/* B2CF4C 80240ADC AE230078 */ sw $v1, 0x78($s1) -/* B2CF50 80240AE0 8E0400D0 */ lw $a0, 0xd0($s0) -/* B2CF54 80240AE4 8C840000 */ lw $a0, ($a0) -/* B2CF58 80240AE8 0064182A */ slt $v1, $v1, $a0 -/* B2CF5C 80240AEC 14600002 */ bnez $v1, .L80240AF8 -/* B2CF60 80240AF0 0040282D */ daddu $a1, $v0, $zero -/* B2CF64 80240AF4 AE200078 */ sw $zero, 0x78($s1) -.L80240AF8: -/* B2CF68 80240AF8 8E0200CC */ lw $v0, 0xcc($s0) -/* B2CF6C 80240AFC 8C420004 */ lw $v0, 4($v0) -/* B2CF70 80240B00 ACA20028 */ sw $v0, 0x28($a1) -/* B2CF74 80240B04 8E0200D0 */ lw $v0, 0xd0($s0) -/* B2CF78 80240B08 8C42007C */ lw $v0, 0x7c($v0) -/* B2CF7C 80240B0C 04410004 */ bgez $v0, .L80240B20 -/* B2CF80 80240B10 00000000 */ nop -/* B2CF84 80240B14 C6400000 */ lwc1 $f0, ($s2) -/* B2CF88 80240B18 080902D0 */ j .L80240B40 -/* B2CF8C 80240B1C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240B20: -/* B2CF90 80240B20 3C018025 */ lui $at, %hi(D_802485C8_B34A38) -/* B2CF94 80240B24 D42285C8 */ ldc1 $f2, %lo(D_802485C8_B34A38)($at) -/* B2CF98 80240B28 44820000 */ mtc1 $v0, $f0 -/* B2CF9C 80240B2C 00000000 */ nop -/* B2CFA0 80240B30 46800021 */ cvt.d.w $f0, $f0 -/* B2CFA4 80240B34 46220003 */ div.d $f0, $f0, $f2 -/* B2CFA8 80240B38 46200020 */ cvt.s.d $f0, $f0 -/* B2CFAC 80240B3C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240B40: -/* B2CFB0 80240B40 24020001 */ addiu $v0, $zero, 1 -/* B2CFB4 80240B44 AE220070 */ sw $v0, 0x70($s1) -/* B2CFB8 80240B48 8FBF001C */ lw $ra, 0x1c($sp) -/* B2CFBC 80240B4C 8FB20018 */ lw $s2, 0x18($sp) -/* B2CFC0 80240B50 8FB10014 */ lw $s1, 0x14($sp) -/* B2CFC4 80240B54 8FB00010 */ lw $s0, 0x10($sp) -/* B2CFC8 80240B58 03E00008 */ jr $ra -/* B2CFCC 80240B5C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s index a42d0d6508..b7999265c3 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -139,7 +139,7 @@ glabel func_80240FC4_B2D434 glabel L802411A8_B2D618 /* B2D618 802411A8 0280202D */ daddu $a0, $s4, $zero /* B2D61C 802411AC 0260282D */ daddu $a1, $s3, $zero -/* B2D620 802411B0 0C09010C */ jal func_80240430_B2C8A0 +/* B2D620 802411B0 0C09010C */ jal jan_02_UnkNpcAIFunc24 /* B2D624 802411B4 02A0302D */ daddu $a2, $s5, $zero glabel L802411B8_B2D628 /* B2D628 802411B8 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L802411E0_B2D650 glabel L802411F8_B2D668 /* B2D668 802411F8 0280202D */ daddu $a0, $s4, $zero /* B2D66C 802411FC 0260282D */ daddu $a1, $s3, $zero -/* B2D670 80241200 0C0902AB */ jal func_80240AAC_B2CF1C +/* B2D670 80241200 0C0902AB */ jal jan_02_UnkNpcAIFunc25 /* B2D674 80241204 02A0302D */ daddu $a2, $s5, $zero /* B2D678 80241208 080904A6 */ j L80241298_B2D708 /* B2D67C 8024120C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s b/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s deleted file mode 100644 index 42baeada9a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426A8_B2EB18 -/* B2EB18 802426A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2EB1C 802426AC AFBF0010 */ sw $ra, 0x10($sp) -/* B2EB20 802426B0 8C82000C */ lw $v0, 0xc($a0) -/* B2EB24 802426B4 0C0B1EAF */ jal get_variable -/* B2EB28 802426B8 8C450000 */ lw $a1, ($v0) -/* B2EB2C 802426BC 0C03AC5A */ jal switch_to_partner -/* B2EB30 802426C0 0040202D */ daddu $a0, $v0, $zero -/* B2EB34 802426C4 8FBF0010 */ lw $ra, 0x10($sp) -/* B2EB38 802426C8 24020002 */ addiu $v0, $zero, 2 -/* B2EB3C 802426CC 03E00008 */ jr $ra -/* B2EB40 802426D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2EB44 802426D4 00000000 */ nop -/* B2EB48 802426D8 00000000 */ nop -/* B2EB4C 802426DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s deleted file mode 100644 index b8bf928448..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024F9F0_B445C0 -.double 32767.0 - -.section .text - -glabel func_80240620_B351F0 -/* B351F0 80240620 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B351F4 80240624 AFB50024 */ sw $s5, 0x24($sp) -/* B351F8 80240628 0080A82D */ daddu $s5, $a0, $zero -/* B351FC 8024062C AFBF002C */ sw $ra, 0x2c($sp) -/* B35200 80240630 AFB60028 */ sw $s6, 0x28($sp) -/* B35204 80240634 AFB40020 */ sw $s4, 0x20($sp) -/* B35208 80240638 AFB3001C */ sw $s3, 0x1c($sp) -/* B3520C 8024063C AFB20018 */ sw $s2, 0x18($sp) -/* B35210 80240640 AFB10014 */ sw $s1, 0x14($sp) -/* B35214 80240644 AFB00010 */ sw $s0, 0x10($sp) -/* B35218 80240648 F7B80040 */ sdc1 $f24, 0x40($sp) -/* B3521C 8024064C F7B60038 */ sdc1 $f22, 0x38($sp) -/* B35220 80240650 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B35224 80240654 8EB30148 */ lw $s3, 0x148($s5) -/* B35228 80240658 86640008 */ lh $a0, 8($s3) -/* B3522C 8024065C 0C00EABB */ jal get_npc_unsafe -/* B35230 80240660 00A0B02D */ daddu $s6, $a1, $zero -/* B35234 80240664 0040A02D */ daddu $s4, $v0, $zero -/* B35238 80240668 AEA00074 */ sw $zero, 0x74($s5) -/* B3523C 8024066C C6980038 */ lwc1 $f24, 0x38($s4) -/* B35240 80240670 C6960040 */ lwc1 $f22, 0x40($s4) -/* B35244 80240674 0000902D */ daddu $s2, $zero, $zero -/* B35248 80240678 AEA00078 */ sw $zero, 0x78($s5) -/* B3524C 8024067C 8E6300D0 */ lw $v1, 0xd0($s3) -/* B35250 80240680 8C620000 */ lw $v0, ($v1) -/* B35254 80240684 3C0146FF */ lui $at, 0x46ff -/* B35258 80240688 3421FE00 */ ori $at, $at, 0xfe00 -/* B3525C 8024068C 4481A000 */ mtc1 $at, $f20 -/* B35260 80240690 18400018 */ blez $v0, .L802406F4 -/* B35264 80240694 0240802D */ daddu $s0, $s2, $zero -/* B35268 80240698 0240882D */ daddu $s1, $s2, $zero -.L8024069C: -/* B3526C 8024069C 02231021 */ addu $v0, $s1, $v1 -/* B35270 802406A0 4600C306 */ mov.s $f12, $f24 -/* B35274 802406A4 C4440004 */ lwc1 $f4, 4($v0) -/* B35278 802406A8 46802120 */ cvt.s.w $f4, $f4 -/* B3527C 802406AC 44062000 */ mfc1 $a2, $f4 -/* B35280 802406B0 C444000C */ lwc1 $f4, 0xc($v0) -/* B35284 802406B4 46802120 */ cvt.s.w $f4, $f4 -/* B35288 802406B8 44072000 */ mfc1 $a3, $f4 -/* B3528C 802406BC 0C00A7B5 */ jal dist2D -/* B35290 802406C0 4600B386 */ mov.s $f14, $f22 -/* B35294 802406C4 4614003C */ c.lt.s $f0, $f20 -/* B35298 802406C8 00000000 */ nop -/* B3529C 802406CC 45000003 */ bc1f .L802406DC -/* B352A0 802406D0 2631000C */ addiu $s1, $s1, 0xc -/* B352A4 802406D4 46000506 */ mov.s $f20, $f0 -/* B352A8 802406D8 AEB20078 */ sw $s2, 0x78($s5) -.L802406DC: -/* B352AC 802406DC 8E6300D0 */ lw $v1, 0xd0($s3) -/* B352B0 802406E0 26100001 */ addiu $s0, $s0, 1 -/* B352B4 802406E4 8C620000 */ lw $v0, ($v1) -/* B352B8 802406E8 0202102A */ slt $v0, $s0, $v0 -/* B352BC 802406EC 1440FFEB */ bnez $v0, .L8024069C -/* B352C0 802406F0 26520001 */ addiu $s2, $s2, 1 -.L802406F4: -/* B352C4 802406F4 8E6200CC */ lw $v0, 0xcc($s3) -/* B352C8 802406F8 8C420004 */ lw $v0, 4($v0) -/* B352CC 802406FC AE820028 */ sw $v0, 0x28($s4) -/* B352D0 80240700 8E6200D0 */ lw $v0, 0xd0($s3) -/* B352D4 80240704 8C42007C */ lw $v0, 0x7c($v0) -/* B352D8 80240708 04410004 */ bgez $v0, .L8024071C -/* B352DC 8024070C 00000000 */ nop -/* B352E0 80240710 C6C00000 */ lwc1 $f0, ($s6) -/* B352E4 80240714 080901CF */ j .L8024073C -/* B352E8 80240718 E6800018 */ swc1 $f0, 0x18($s4) -.L8024071C: -/* B352EC 8024071C 3C018025 */ lui $at, %hi(D_8024F9F0_B445C0) -/* B352F0 80240720 D422F9F0 */ ldc1 $f2, %lo(D_8024F9F0_B445C0)($at) -/* B352F4 80240724 44820000 */ mtc1 $v0, $f0 -/* B352F8 80240728 00000000 */ nop -/* B352FC 8024072C 46800021 */ cvt.d.w $f0, $f0 -/* B35300 80240730 46220003 */ div.d $f0, $f0, $f2 -/* B35304 80240734 46200020 */ cvt.s.d $f0, $f0 -/* B35308 80240738 E6800018 */ swc1 $f0, 0x18($s4) -.L8024073C: -/* B3530C 8024073C 24020001 */ addiu $v0, $zero, 1 -/* B35310 80240740 AEA20070 */ sw $v0, 0x70($s5) -/* B35314 80240744 8FBF002C */ lw $ra, 0x2c($sp) -/* B35318 80240748 8FB60028 */ lw $s6, 0x28($sp) -/* B3531C 8024074C 8FB50024 */ lw $s5, 0x24($sp) -/* B35320 80240750 8FB40020 */ lw $s4, 0x20($sp) -/* B35324 80240754 8FB3001C */ lw $s3, 0x1c($sp) -/* B35328 80240758 8FB20018 */ lw $s2, 0x18($sp) -/* B3532C 8024075C 8FB10014 */ lw $s1, 0x14($sp) -/* B35330 80240760 8FB00010 */ lw $s0, 0x10($sp) -/* B35334 80240764 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B35338 80240768 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B3533C 8024076C D7B40030 */ ldc1 $f20, 0x30($sp) -/* B35340 80240770 03E00008 */ jr $ra -/* B35344 80240774 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s deleted file mode 100644 index 0a1f5ce416..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024F9F8_B445C8 -.double 32767.0 - -.section .text - -glabel func_80240C9C_B3586C -/* B3586C 80240C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35870 80240CA0 AFB10014 */ sw $s1, 0x14($sp) -/* B35874 80240CA4 0080882D */ daddu $s1, $a0, $zero -/* B35878 80240CA8 AFBF001C */ sw $ra, 0x1c($sp) -/* B3587C 80240CAC AFB20018 */ sw $s2, 0x18($sp) -/* B35880 80240CB0 AFB00010 */ sw $s0, 0x10($sp) -/* B35884 80240CB4 8E300148 */ lw $s0, 0x148($s1) -/* B35888 80240CB8 86040008 */ lh $a0, 8($s0) -/* B3588C 80240CBC 0C00EABB */ jal get_npc_unsafe -/* B35890 80240CC0 00A0902D */ daddu $s2, $a1, $zero -/* B35894 80240CC4 8E230078 */ lw $v1, 0x78($s1) -/* B35898 80240CC8 24630001 */ addiu $v1, $v1, 1 -/* B3589C 80240CCC AE230078 */ sw $v1, 0x78($s1) -/* B358A0 80240CD0 8E0400D0 */ lw $a0, 0xd0($s0) -/* B358A4 80240CD4 8C840000 */ lw $a0, ($a0) -/* B358A8 80240CD8 0064182A */ slt $v1, $v1, $a0 -/* B358AC 80240CDC 14600002 */ bnez $v1, .L80240CE8 -/* B358B0 80240CE0 0040282D */ daddu $a1, $v0, $zero -/* B358B4 80240CE4 AE200078 */ sw $zero, 0x78($s1) -.L80240CE8: -/* B358B8 80240CE8 8E0200CC */ lw $v0, 0xcc($s0) -/* B358BC 80240CEC 8C420004 */ lw $v0, 4($v0) -/* B358C0 80240CF0 ACA20028 */ sw $v0, 0x28($a1) -/* B358C4 80240CF4 8E0200D0 */ lw $v0, 0xd0($s0) -/* B358C8 80240CF8 8C42007C */ lw $v0, 0x7c($v0) -/* B358CC 80240CFC 04410004 */ bgez $v0, .L80240D10 -/* B358D0 80240D00 00000000 */ nop -/* B358D4 80240D04 C6400000 */ lwc1 $f0, ($s2) -/* B358D8 80240D08 0809034C */ j .L80240D30 -/* B358DC 80240D0C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240D10: -/* B358E0 80240D10 3C018025 */ lui $at, %hi(D_8024F9F8_B445C8) -/* B358E4 80240D14 D422F9F8 */ ldc1 $f2, %lo(D_8024F9F8_B445C8)($at) -/* B358E8 80240D18 44820000 */ mtc1 $v0, $f0 -/* B358EC 80240D1C 00000000 */ nop -/* B358F0 80240D20 46800021 */ cvt.d.w $f0, $f0 -/* B358F4 80240D24 46220003 */ div.d $f0, $f0, $f2 -/* B358F8 80240D28 46200020 */ cvt.s.d $f0, $f0 -/* B358FC 80240D2C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240D30: -/* B35900 80240D30 24020001 */ addiu $v0, $zero, 1 -/* B35904 80240D34 AE220070 */ sw $v0, 0x70($s1) -/* B35908 80240D38 8FBF001C */ lw $ra, 0x1c($sp) -/* B3590C 80240D3C 8FB20018 */ lw $s2, 0x18($sp) -/* B35910 80240D40 8FB10014 */ lw $s1, 0x14($sp) -/* B35914 80240D44 8FB00010 */ lw $s0, 0x10($sp) -/* B35918 80240D48 03E00008 */ jr $ra -/* B3591C 80240D4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index f1af274d5c..e8b6577617 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -139,7 +139,7 @@ glabel func_802411B4_B35D84 glabel L80241398_B35F68 /* B35F68 80241398 0280202D */ daddu $a0, $s4, $zero /* B35F6C 8024139C 0260282D */ daddu $a1, $s3, $zero -/* B35F70 802413A0 0C090188 */ jal func_80240620_B351F0 +/* B35F70 802413A0 0C090188 */ jal jan_03_UnkNpcAIFunc24 /* B35F74 802413A4 02A0302D */ daddu $a2, $s5, $zero glabel L802413A8_B35F78 /* B35F78 802413A8 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L802413D0_B35FA0 glabel L802413E8_B35FB8 /* B35FB8 802413E8 0280202D */ daddu $a0, $s4, $zero /* B35FBC 802413EC 0260282D */ daddu $a1, $s3, $zero -/* B35FC0 802413F0 0C090327 */ jal func_80240C9C_B3586C +/* B35FC0 802413F0 0C090327 */ jal jan_03_UnkNpcAIFunc25 /* B35FC4 802413F4 02A0302D */ daddu $a2, $s5, $zero /* B35FC8 802413F8 08090522 */ j L80241488_B36058 /* B35FCC 802413FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240A7C_B5ED2C.s b/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240A7C_B5ED2C.s deleted file mode 100644 index ee7c3399d0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240A7C_B5ED2C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A7C_B5ED2C -/* B5ED2C 80240A7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5ED30 80240A80 AFBF0010 */ sw $ra, 0x10($sp) -/* B5ED34 80240A84 8C82000C */ lw $v0, 0xc($a0) -/* B5ED38 80240A88 0C0B1EAF */ jal get_variable -/* B5ED3C 80240A8C 8C450000 */ lw $a1, ($v0) -/* B5ED40 80240A90 0C03AC5A */ jal switch_to_partner -/* B5ED44 80240A94 0040202D */ daddu $a0, $v0, $zero -/* B5ED48 80240A98 8FBF0010 */ lw $ra, 0x10($sp) -/* B5ED4C 80240A9C 24020002 */ addiu $v0, $zero, 2 -/* B5ED50 80240AA0 03E00008 */ jr $ra -/* B5ED54 80240AA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s deleted file mode 100644 index c0f3d12a64..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240000_B84180.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024B9A0_B8FB20 -.double 32767.0 - -.section .text - -glabel func_80240000_B84180 -/* B84180 80240000 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B84184 80240004 AFB50024 */ sw $s5, 0x24($sp) -/* B84188 80240008 0080A82D */ daddu $s5, $a0, $zero -/* B8418C 8024000C AFBF002C */ sw $ra, 0x2c($sp) -/* B84190 80240010 AFB60028 */ sw $s6, 0x28($sp) -/* B84194 80240014 AFB40020 */ sw $s4, 0x20($sp) -/* B84198 80240018 AFB3001C */ sw $s3, 0x1c($sp) -/* B8419C 8024001C AFB20018 */ sw $s2, 0x18($sp) -/* B841A0 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* B841A4 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* B841A8 80240028 F7B80040 */ sdc1 $f24, 0x40($sp) -/* B841AC 8024002C F7B60038 */ sdc1 $f22, 0x38($sp) -/* B841B0 80240030 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B841B4 80240034 8EB30148 */ lw $s3, 0x148($s5) -/* B841B8 80240038 86640008 */ lh $a0, 8($s3) -/* B841BC 8024003C 0C00EABB */ jal get_npc_unsafe -/* B841C0 80240040 00A0B02D */ daddu $s6, $a1, $zero -/* B841C4 80240044 0040A02D */ daddu $s4, $v0, $zero -/* B841C8 80240048 AEA00074 */ sw $zero, 0x74($s5) -/* B841CC 8024004C C6980038 */ lwc1 $f24, 0x38($s4) -/* B841D0 80240050 C6960040 */ lwc1 $f22, 0x40($s4) -/* B841D4 80240054 0000902D */ daddu $s2, $zero, $zero -/* B841D8 80240058 AEA00078 */ sw $zero, 0x78($s5) -/* B841DC 8024005C 8E6300D0 */ lw $v1, 0xd0($s3) -/* B841E0 80240060 8C620000 */ lw $v0, ($v1) -/* B841E4 80240064 3C0146FF */ lui $at, 0x46ff -/* B841E8 80240068 3421FE00 */ ori $at, $at, 0xfe00 -/* B841EC 8024006C 4481A000 */ mtc1 $at, $f20 -/* B841F0 80240070 18400018 */ blez $v0, .L802400D4 -/* B841F4 80240074 0240802D */ daddu $s0, $s2, $zero -/* B841F8 80240078 0240882D */ daddu $s1, $s2, $zero -.L8024007C: -/* B841FC 8024007C 02231021 */ addu $v0, $s1, $v1 -/* B84200 80240080 4600C306 */ mov.s $f12, $f24 -/* B84204 80240084 C4440004 */ lwc1 $f4, 4($v0) -/* B84208 80240088 46802120 */ cvt.s.w $f4, $f4 -/* B8420C 8024008C 44062000 */ mfc1 $a2, $f4 -/* B84210 80240090 C444000C */ lwc1 $f4, 0xc($v0) -/* B84214 80240094 46802120 */ cvt.s.w $f4, $f4 -/* B84218 80240098 44072000 */ mfc1 $a3, $f4 -/* B8421C 8024009C 0C00A7B5 */ jal dist2D -/* B84220 802400A0 4600B386 */ mov.s $f14, $f22 -/* B84224 802400A4 4614003C */ c.lt.s $f0, $f20 -/* B84228 802400A8 00000000 */ nop -/* B8422C 802400AC 45000003 */ bc1f .L802400BC -/* B84230 802400B0 2631000C */ addiu $s1, $s1, 0xc -/* B84234 802400B4 46000506 */ mov.s $f20, $f0 -/* B84238 802400B8 AEB20078 */ sw $s2, 0x78($s5) -.L802400BC: -/* B8423C 802400BC 8E6300D0 */ lw $v1, 0xd0($s3) -/* B84240 802400C0 26100001 */ addiu $s0, $s0, 1 -/* B84244 802400C4 8C620000 */ lw $v0, ($v1) -/* B84248 802400C8 0202102A */ slt $v0, $s0, $v0 -/* B8424C 802400CC 1440FFEB */ bnez $v0, .L8024007C -/* B84250 802400D0 26520001 */ addiu $s2, $s2, 1 -.L802400D4: -/* B84254 802400D4 8E6200CC */ lw $v0, 0xcc($s3) -/* B84258 802400D8 8C420004 */ lw $v0, 4($v0) -/* B8425C 802400DC AE820028 */ sw $v0, 0x28($s4) -/* B84260 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) -/* B84264 802400E4 8C42007C */ lw $v0, 0x7c($v0) -/* B84268 802400E8 04410004 */ bgez $v0, .L802400FC -/* B8426C 802400EC 00000000 */ nop -/* B84270 802400F0 C6C00000 */ lwc1 $f0, ($s6) -/* B84274 802400F4 08090047 */ j .L8024011C -/* B84278 802400F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802400FC: -/* B8427C 802400FC 3C018025 */ lui $at, %hi(D_8024B9A0_B8FB20) -/* B84280 80240100 D422B9A0 */ ldc1 $f2, %lo(D_8024B9A0_B8FB20)($at) -/* B84284 80240104 44820000 */ mtc1 $v0, $f0 -/* B84288 80240108 00000000 */ nop -/* B8428C 8024010C 46800021 */ cvt.d.w $f0, $f0 -/* B84290 80240110 46220003 */ div.d $f0, $f0, $f2 -/* B84294 80240114 46200020 */ cvt.s.d $f0, $f0 -/* B84298 80240118 E6800018 */ swc1 $f0, 0x18($s4) -.L8024011C: -/* B8429C 8024011C 24020001 */ addiu $v0, $zero, 1 -/* B842A0 80240120 AEA20070 */ sw $v0, 0x70($s5) -/* B842A4 80240124 8FBF002C */ lw $ra, 0x2c($sp) -/* B842A8 80240128 8FB60028 */ lw $s6, 0x28($sp) -/* B842AC 8024012C 8FB50024 */ lw $s5, 0x24($sp) -/* B842B0 80240130 8FB40020 */ lw $s4, 0x20($sp) -/* B842B4 80240134 8FB3001C */ lw $s3, 0x1c($sp) -/* B842B8 80240138 8FB20018 */ lw $s2, 0x18($sp) -/* B842BC 8024013C 8FB10014 */ lw $s1, 0x14($sp) -/* B842C0 80240140 8FB00010 */ lw $s0, 0x10($sp) -/* B842C4 80240144 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B842C8 80240148 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B842CC 8024014C D7B40030 */ ldc1 $f20, 0x30($sp) -/* B842D0 80240150 03E00008 */ jr $ra -/* B842D4 80240154 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s deleted file mode 100644 index 7a9a61e492..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_8024067C_B847FC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024B9A8_B8FB28 -.double 32767.0 - -.section .text - -glabel func_8024067C_B847FC -/* B847FC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B84800 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* B84804 80240684 0080882D */ daddu $s1, $a0, $zero -/* B84808 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* B8480C 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* B84810 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* B84814 80240694 8E300148 */ lw $s0, 0x148($s1) -/* B84818 80240698 86040008 */ lh $a0, 8($s0) -/* B8481C 8024069C 0C00EABB */ jal get_npc_unsafe -/* B84820 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* B84824 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* B84828 802406A8 24630001 */ addiu $v1, $v1, 1 -/* B8482C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* B84830 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* B84834 802406B4 8C840000 */ lw $a0, ($a0) -/* B84838 802406B8 0064182A */ slt $v1, $v1, $a0 -/* B8483C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* B84840 802406C0 0040282D */ daddu $a1, $v0, $zero -/* B84844 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* B84848 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* B8484C 802406CC 8C420004 */ lw $v0, 4($v0) -/* B84850 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* B84854 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* B84858 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* B8485C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* B84860 802406E0 00000000 */ nop -/* B84864 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* B84868 802406E8 080901C4 */ j .L80240710 -/* B8486C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* B84870 802406F0 3C018025 */ lui $at, %hi(D_8024B9A8_B8FB28) -/* B84874 802406F4 D422B9A8 */ ldc1 $f2, %lo(D_8024B9A8_B8FB28)($at) -/* B84878 802406F8 44820000 */ mtc1 $v0, $f0 -/* B8487C 802406FC 00000000 */ nop -/* B84880 80240700 46800021 */ cvt.d.w $f0, $f0 -/* B84884 80240704 46220003 */ div.d $f0, $f0, $f2 -/* B84888 80240708 46200020 */ cvt.s.d $f0, $f0 -/* B8488C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* B84890 80240710 24020001 */ addiu $v0, $zero, 1 -/* B84894 80240714 AE220070 */ sw $v0, 0x70($s1) -/* B84898 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* B8489C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* B848A0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* B848A4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* B848A8 80240728 03E00008 */ jr $ra -/* B848AC 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index 03d49e9ac8..8ef2f13ec1 100644 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/ver/us/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -139,7 +139,7 @@ glabel func_80240B94_B84D14 glabel L80240D78_B84EF8 /* B84EF8 80240D78 0280202D */ daddu $a0, $s4, $zero /* B84EFC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* B84F00 80240D80 0C090000 */ jal func_80240000_B84180 +/* B84F00 80240D80 0C090000 */ jal jan_22_UnkNpcAIFunc24 /* B84F04 80240D84 02A0302D */ daddu $a2, $s5, $zero glabel L80240D88_B84F08 /* B84F08 80240D88 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80240DB0_B84F30 glabel L80240DC8_B84F48 /* B84F48 80240DC8 0280202D */ daddu $a0, $s4, $zero /* B84F4C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* B84F50 80240DD0 0C09019F */ jal func_8024067C_B847FC +/* B84F50 80240DD0 0C09019F */ jal jan_22_UnkNpcAIFunc25 /* B84F54 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* B84F58 80240DD8 0809039A */ j L80240E68_B84FE8 /* B84F5C 80240DDC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s deleted file mode 100644 index f4092965e7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802400B0_ABB340.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80249D30_AC4FC0 -.double 32767.0 - -.section .text - -glabel func_802400B0_ABB340 -/* ABB340 802400B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* ABB344 802400B4 AFB50024 */ sw $s5, 0x24($sp) -/* ABB348 802400B8 0080A82D */ daddu $s5, $a0, $zero -/* ABB34C 802400BC AFBF002C */ sw $ra, 0x2c($sp) -/* ABB350 802400C0 AFB60028 */ sw $s6, 0x28($sp) -/* ABB354 802400C4 AFB40020 */ sw $s4, 0x20($sp) -/* ABB358 802400C8 AFB3001C */ sw $s3, 0x1c($sp) -/* ABB35C 802400CC AFB20018 */ sw $s2, 0x18($sp) -/* ABB360 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* ABB364 802400D4 AFB00010 */ sw $s0, 0x10($sp) -/* ABB368 802400D8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* ABB36C 802400DC F7B60038 */ sdc1 $f22, 0x38($sp) -/* ABB370 802400E0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* ABB374 802400E4 8EB30148 */ lw $s3, 0x148($s5) -/* ABB378 802400E8 86640008 */ lh $a0, 8($s3) -/* ABB37C 802400EC 0C00EABB */ jal get_npc_unsafe -/* ABB380 802400F0 00A0B02D */ daddu $s6, $a1, $zero -/* ABB384 802400F4 0040A02D */ daddu $s4, $v0, $zero -/* ABB388 802400F8 AEA00074 */ sw $zero, 0x74($s5) -/* ABB38C 802400FC C6980038 */ lwc1 $f24, 0x38($s4) -/* ABB390 80240100 C6960040 */ lwc1 $f22, 0x40($s4) -/* ABB394 80240104 0000902D */ daddu $s2, $zero, $zero -/* ABB398 80240108 AEA00078 */ sw $zero, 0x78($s5) -/* ABB39C 8024010C 8E6300D0 */ lw $v1, 0xd0($s3) -/* ABB3A0 80240110 8C620000 */ lw $v0, ($v1) -/* ABB3A4 80240114 3C0146FF */ lui $at, 0x46ff -/* ABB3A8 80240118 3421FE00 */ ori $at, $at, 0xfe00 -/* ABB3AC 8024011C 4481A000 */ mtc1 $at, $f20 -/* ABB3B0 80240120 18400018 */ blez $v0, .L80240184 -/* ABB3B4 80240124 0240802D */ daddu $s0, $s2, $zero -/* ABB3B8 80240128 0240882D */ daddu $s1, $s2, $zero -.L8024012C: -/* ABB3BC 8024012C 02231021 */ addu $v0, $s1, $v1 -/* ABB3C0 80240130 4600C306 */ mov.s $f12, $f24 -/* ABB3C4 80240134 C4440004 */ lwc1 $f4, 4($v0) -/* ABB3C8 80240138 46802120 */ cvt.s.w $f4, $f4 -/* ABB3CC 8024013C 44062000 */ mfc1 $a2, $f4 -/* ABB3D0 80240140 C444000C */ lwc1 $f4, 0xc($v0) -/* ABB3D4 80240144 46802120 */ cvt.s.w $f4, $f4 -/* ABB3D8 80240148 44072000 */ mfc1 $a3, $f4 -/* ABB3DC 8024014C 0C00A7B5 */ jal dist2D -/* ABB3E0 80240150 4600B386 */ mov.s $f14, $f22 -/* ABB3E4 80240154 4614003C */ c.lt.s $f0, $f20 -/* ABB3E8 80240158 00000000 */ nop -/* ABB3EC 8024015C 45000003 */ bc1f .L8024016C -/* ABB3F0 80240160 2631000C */ addiu $s1, $s1, 0xc -/* ABB3F4 80240164 46000506 */ mov.s $f20, $f0 -/* ABB3F8 80240168 AEB20078 */ sw $s2, 0x78($s5) -.L8024016C: -/* ABB3FC 8024016C 8E6300D0 */ lw $v1, 0xd0($s3) -/* ABB400 80240170 26100001 */ addiu $s0, $s0, 1 -/* ABB404 80240174 8C620000 */ lw $v0, ($v1) -/* ABB408 80240178 0202102A */ slt $v0, $s0, $v0 -/* ABB40C 8024017C 1440FFEB */ bnez $v0, .L8024012C -/* ABB410 80240180 26520001 */ addiu $s2, $s2, 1 -.L80240184: -/* ABB414 80240184 8E6200CC */ lw $v0, 0xcc($s3) -/* ABB418 80240188 8C420004 */ lw $v0, 4($v0) -/* ABB41C 8024018C AE820028 */ sw $v0, 0x28($s4) -/* ABB420 80240190 8E6200D0 */ lw $v0, 0xd0($s3) -/* ABB424 80240194 8C42007C */ lw $v0, 0x7c($v0) -/* ABB428 80240198 04410004 */ bgez $v0, .L802401AC -/* ABB42C 8024019C 00000000 */ nop -/* ABB430 802401A0 C6C00000 */ lwc1 $f0, ($s6) -/* ABB434 802401A4 08090073 */ j .L802401CC -/* ABB438 802401A8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401AC: -/* ABB43C 802401AC 3C018025 */ lui $at, %hi(D_80249D30_AC4FC0) -/* ABB440 802401B0 D4229D30 */ ldc1 $f2, %lo(D_80249D30_AC4FC0)($at) -/* ABB444 802401B4 44820000 */ mtc1 $v0, $f0 -/* ABB448 802401B8 00000000 */ nop -/* ABB44C 802401BC 46800021 */ cvt.d.w $f0, $f0 -/* ABB450 802401C0 46220003 */ div.d $f0, $f0, $f2 -/* ABB454 802401C4 46200020 */ cvt.s.d $f0, $f0 -/* ABB458 802401C8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401CC: -/* ABB45C 802401CC 24020001 */ addiu $v0, $zero, 1 -/* ABB460 802401D0 AEA20070 */ sw $v0, 0x70($s5) -/* ABB464 802401D4 8FBF002C */ lw $ra, 0x2c($sp) -/* ABB468 802401D8 8FB60028 */ lw $s6, 0x28($sp) -/* ABB46C 802401DC 8FB50024 */ lw $s5, 0x24($sp) -/* ABB470 802401E0 8FB40020 */ lw $s4, 0x20($sp) -/* ABB474 802401E4 8FB3001C */ lw $s3, 0x1c($sp) -/* ABB478 802401E8 8FB20018 */ lw $s2, 0x18($sp) -/* ABB47C 802401EC 8FB10014 */ lw $s1, 0x14($sp) -/* ABB480 802401F0 8FB00010 */ lw $s0, 0x10($sp) -/* ABB484 802401F4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* ABB488 802401F8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* ABB48C 802401FC D7B40030 */ ldc1 $f20, 0x30($sp) -/* ABB490 80240200 03E00008 */ jr $ra -/* ABB494 80240204 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s deleted file mode 100644 index c0cb1417f5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_8024072C_ABB9BC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80249D38_AC4FC8 -.double 32767.0 - -.section .text - -glabel func_8024072C_ABB9BC -/* ABB9BC 8024072C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABB9C0 80240730 AFB10014 */ sw $s1, 0x14($sp) -/* ABB9C4 80240734 0080882D */ daddu $s1, $a0, $zero -/* ABB9C8 80240738 AFBF001C */ sw $ra, 0x1c($sp) -/* ABB9CC 8024073C AFB20018 */ sw $s2, 0x18($sp) -/* ABB9D0 80240740 AFB00010 */ sw $s0, 0x10($sp) -/* ABB9D4 80240744 8E300148 */ lw $s0, 0x148($s1) -/* ABB9D8 80240748 86040008 */ lh $a0, 8($s0) -/* ABB9DC 8024074C 0C00EABB */ jal get_npc_unsafe -/* ABB9E0 80240750 00A0902D */ daddu $s2, $a1, $zero -/* ABB9E4 80240754 8E230078 */ lw $v1, 0x78($s1) -/* ABB9E8 80240758 24630001 */ addiu $v1, $v1, 1 -/* ABB9EC 8024075C AE230078 */ sw $v1, 0x78($s1) -/* ABB9F0 80240760 8E0400D0 */ lw $a0, 0xd0($s0) -/* ABB9F4 80240764 8C840000 */ lw $a0, ($a0) -/* ABB9F8 80240768 0064182A */ slt $v1, $v1, $a0 -/* ABB9FC 8024076C 14600002 */ bnez $v1, .L80240778 -/* ABBA00 80240770 0040282D */ daddu $a1, $v0, $zero -/* ABBA04 80240774 AE200078 */ sw $zero, 0x78($s1) -.L80240778: -/* ABBA08 80240778 8E0200CC */ lw $v0, 0xcc($s0) -/* ABBA0C 8024077C 8C420004 */ lw $v0, 4($v0) -/* ABBA10 80240780 ACA20028 */ sw $v0, 0x28($a1) -/* ABBA14 80240784 8E0200D0 */ lw $v0, 0xd0($s0) -/* ABBA18 80240788 8C42007C */ lw $v0, 0x7c($v0) -/* ABBA1C 8024078C 04410004 */ bgez $v0, .L802407A0 -/* ABBA20 80240790 00000000 */ nop -/* ABBA24 80240794 C6400000 */ lwc1 $f0, ($s2) -/* ABBA28 80240798 080901F0 */ j .L802407C0 -/* ABBA2C 8024079C E4A00018 */ swc1 $f0, 0x18($a1) -.L802407A0: -/* ABBA30 802407A0 3C018025 */ lui $at, %hi(D_80249D38_AC4FC8) -/* ABBA34 802407A4 D4229D38 */ ldc1 $f2, %lo(D_80249D38_AC4FC8)($at) -/* ABBA38 802407A8 44820000 */ mtc1 $v0, $f0 -/* ABBA3C 802407AC 00000000 */ nop -/* ABBA40 802407B0 46800021 */ cvt.d.w $f0, $f0 -/* ABBA44 802407B4 46220003 */ div.d $f0, $f0, $f2 -/* ABBA48 802407B8 46200020 */ cvt.s.d $f0, $f0 -/* ABBA4C 802407BC E4A00018 */ swc1 $f0, 0x18($a1) -.L802407C0: -/* ABBA50 802407C0 24020001 */ addiu $v0, $zero, 1 -/* ABBA54 802407C4 AE220070 */ sw $v0, 0x70($s1) -/* ABBA58 802407C8 8FBF001C */ lw $ra, 0x1c($sp) -/* ABBA5C 802407CC 8FB20018 */ lw $s2, 0x18($sp) -/* ABBA60 802407D0 8FB10014 */ lw $s1, 0x14($sp) -/* ABBA64 802407D4 8FB00010 */ lw $s0, 0x10($sp) -/* ABBA68 802407D8 03E00008 */ jr $ra -/* ABBA6C 802407DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s index 52c03acc32..a67d41260b 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -139,7 +139,7 @@ glabel func_80240C44_ABBED4 glabel L80240E28_ABC0B8 /* ABC0B8 80240E28 0280202D */ daddu $a0, $s4, $zero /* ABC0BC 80240E2C 0260282D */ daddu $a1, $s3, $zero -/* ABC0C0 80240E30 0C09002C */ jal func_802400B0_ABB340 +/* ABC0C0 80240E30 0C09002C */ jal kkj_00_UnkNpcAIFunc24 /* ABC0C4 80240E34 02A0302D */ daddu $a2, $s5, $zero glabel L80240E38_ABC0C8 /* ABC0C8 80240E38 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80240E60_ABC0F0 glabel L80240E78_ABC108 /* ABC108 80240E78 0280202D */ daddu $a0, $s4, $zero /* ABC10C 80240E7C 0260282D */ daddu $a1, $s3, $zero -/* ABC110 80240E80 0C0901CB */ jal func_8024072C_ABB9BC +/* ABC110 80240E80 0C0901CB */ jal kkj_00_UnkNpcAIFunc25 /* ABC114 80240E84 02A0302D */ daddu $a2, $s5, $zero /* ABC118 80240E88 080903C6 */ j L80240F18_ABC1A8 /* ABC11C 80240E8C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s deleted file mode 100644 index 15efb18021..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240000_AC5170.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243A10_AC8B80 -.double 32767.0 - -.section .text - -glabel func_80240000_AC5170 -/* AC5170 80240000 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AC5174 80240004 AFB50024 */ sw $s5, 0x24($sp) -/* AC5178 80240008 0080A82D */ daddu $s5, $a0, $zero -/* AC517C 8024000C AFBF002C */ sw $ra, 0x2c($sp) -/* AC5180 80240010 AFB60028 */ sw $s6, 0x28($sp) -/* AC5184 80240014 AFB40020 */ sw $s4, 0x20($sp) -/* AC5188 80240018 AFB3001C */ sw $s3, 0x1c($sp) -/* AC518C 8024001C AFB20018 */ sw $s2, 0x18($sp) -/* AC5190 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* AC5194 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* AC5198 80240028 F7B80040 */ sdc1 $f24, 0x40($sp) -/* AC519C 8024002C F7B60038 */ sdc1 $f22, 0x38($sp) -/* AC51A0 80240030 F7B40030 */ sdc1 $f20, 0x30($sp) -/* AC51A4 80240034 8EB30148 */ lw $s3, 0x148($s5) -/* AC51A8 80240038 86640008 */ lh $a0, 8($s3) -/* AC51AC 8024003C 0C00EABB */ jal get_npc_unsafe -/* AC51B0 80240040 00A0B02D */ daddu $s6, $a1, $zero -/* AC51B4 80240044 0040A02D */ daddu $s4, $v0, $zero -/* AC51B8 80240048 AEA00074 */ sw $zero, 0x74($s5) -/* AC51BC 8024004C C6980038 */ lwc1 $f24, 0x38($s4) -/* AC51C0 80240050 C6960040 */ lwc1 $f22, 0x40($s4) -/* AC51C4 80240054 0000902D */ daddu $s2, $zero, $zero -/* AC51C8 80240058 AEA00078 */ sw $zero, 0x78($s5) -/* AC51CC 8024005C 8E6300D0 */ lw $v1, 0xd0($s3) -/* AC51D0 80240060 8C620000 */ lw $v0, ($v1) -/* AC51D4 80240064 3C0146FF */ lui $at, 0x46ff -/* AC51D8 80240068 3421FE00 */ ori $at, $at, 0xfe00 -/* AC51DC 8024006C 4481A000 */ mtc1 $at, $f20 -/* AC51E0 80240070 18400018 */ blez $v0, .L802400D4 -/* AC51E4 80240074 0240802D */ daddu $s0, $s2, $zero -/* AC51E8 80240078 0240882D */ daddu $s1, $s2, $zero -.L8024007C: -/* AC51EC 8024007C 02231021 */ addu $v0, $s1, $v1 -/* AC51F0 80240080 4600C306 */ mov.s $f12, $f24 -/* AC51F4 80240084 C4440004 */ lwc1 $f4, 4($v0) -/* AC51F8 80240088 46802120 */ cvt.s.w $f4, $f4 -/* AC51FC 8024008C 44062000 */ mfc1 $a2, $f4 -/* AC5200 80240090 C444000C */ lwc1 $f4, 0xc($v0) -/* AC5204 80240094 46802120 */ cvt.s.w $f4, $f4 -/* AC5208 80240098 44072000 */ mfc1 $a3, $f4 -/* AC520C 8024009C 0C00A7B5 */ jal dist2D -/* AC5210 802400A0 4600B386 */ mov.s $f14, $f22 -/* AC5214 802400A4 4614003C */ c.lt.s $f0, $f20 -/* AC5218 802400A8 00000000 */ nop -/* AC521C 802400AC 45000003 */ bc1f .L802400BC -/* AC5220 802400B0 2631000C */ addiu $s1, $s1, 0xc -/* AC5224 802400B4 46000506 */ mov.s $f20, $f0 -/* AC5228 802400B8 AEB20078 */ sw $s2, 0x78($s5) -.L802400BC: -/* AC522C 802400BC 8E6300D0 */ lw $v1, 0xd0($s3) -/* AC5230 802400C0 26100001 */ addiu $s0, $s0, 1 -/* AC5234 802400C4 8C620000 */ lw $v0, ($v1) -/* AC5238 802400C8 0202102A */ slt $v0, $s0, $v0 -/* AC523C 802400CC 1440FFEB */ bnez $v0, .L8024007C -/* AC5240 802400D0 26520001 */ addiu $s2, $s2, 1 -.L802400D4: -/* AC5244 802400D4 8E6200CC */ lw $v0, 0xcc($s3) -/* AC5248 802400D8 8C420004 */ lw $v0, 4($v0) -/* AC524C 802400DC AE820028 */ sw $v0, 0x28($s4) -/* AC5250 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) -/* AC5254 802400E4 8C42007C */ lw $v0, 0x7c($v0) -/* AC5258 802400E8 04410004 */ bgez $v0, .L802400FC -/* AC525C 802400EC 00000000 */ nop -/* AC5260 802400F0 C6C00000 */ lwc1 $f0, ($s6) -/* AC5264 802400F4 08090047 */ j .L8024011C -/* AC5268 802400F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802400FC: -/* AC526C 802400FC 3C018024 */ lui $at, %hi(D_80243A10_AC8B80) -/* AC5270 80240100 D4223A10 */ ldc1 $f2, %lo(D_80243A10_AC8B80)($at) -/* AC5274 80240104 44820000 */ mtc1 $v0, $f0 -/* AC5278 80240108 00000000 */ nop -/* AC527C 8024010C 46800021 */ cvt.d.w $f0, $f0 -/* AC5280 80240110 46220003 */ div.d $f0, $f0, $f2 -/* AC5284 80240114 46200020 */ cvt.s.d $f0, $f0 -/* AC5288 80240118 E6800018 */ swc1 $f0, 0x18($s4) -.L8024011C: -/* AC528C 8024011C 24020001 */ addiu $v0, $zero, 1 -/* AC5290 80240120 AEA20070 */ sw $v0, 0x70($s5) -/* AC5294 80240124 8FBF002C */ lw $ra, 0x2c($sp) -/* AC5298 80240128 8FB60028 */ lw $s6, 0x28($sp) -/* AC529C 8024012C 8FB50024 */ lw $s5, 0x24($sp) -/* AC52A0 80240130 8FB40020 */ lw $s4, 0x20($sp) -/* AC52A4 80240134 8FB3001C */ lw $s3, 0x1c($sp) -/* AC52A8 80240138 8FB20018 */ lw $s2, 0x18($sp) -/* AC52AC 8024013C 8FB10014 */ lw $s1, 0x14($sp) -/* AC52B0 80240140 8FB00010 */ lw $s0, 0x10($sp) -/* AC52B4 80240144 D7B80040 */ ldc1 $f24, 0x40($sp) -/* AC52B8 80240148 D7B60038 */ ldc1 $f22, 0x38($sp) -/* AC52BC 8024014C D7B40030 */ ldc1 $f20, 0x30($sp) -/* AC52C0 80240150 03E00008 */ jr $ra -/* AC52C4 80240154 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s deleted file mode 100644 index b201910527..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_8024067C_AC57EC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243A18_AC8B88 -.double 32767.0 - -.section .text - -glabel func_8024067C_AC57EC -/* AC57EC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AC57F0 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* AC57F4 80240684 0080882D */ daddu $s1, $a0, $zero -/* AC57F8 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* AC57FC 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* AC5800 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* AC5804 80240694 8E300148 */ lw $s0, 0x148($s1) -/* AC5808 80240698 86040008 */ lh $a0, 8($s0) -/* AC580C 8024069C 0C00EABB */ jal get_npc_unsafe -/* AC5810 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* AC5814 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* AC5818 802406A8 24630001 */ addiu $v1, $v1, 1 -/* AC581C 802406AC AE230078 */ sw $v1, 0x78($s1) -/* AC5820 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* AC5824 802406B4 8C840000 */ lw $a0, ($a0) -/* AC5828 802406B8 0064182A */ slt $v1, $v1, $a0 -/* AC582C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* AC5830 802406C0 0040282D */ daddu $a1, $v0, $zero -/* AC5834 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* AC5838 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* AC583C 802406CC 8C420004 */ lw $v0, 4($v0) -/* AC5840 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* AC5844 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* AC5848 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* AC584C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* AC5850 802406E0 00000000 */ nop -/* AC5854 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* AC5858 802406E8 080901C4 */ j .L80240710 -/* AC585C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* AC5860 802406F0 3C018024 */ lui $at, %hi(D_80243A18_AC8B88) -/* AC5864 802406F4 D4223A18 */ ldc1 $f2, %lo(D_80243A18_AC8B88)($at) -/* AC5868 802406F8 44820000 */ mtc1 $v0, $f0 -/* AC586C 802406FC 00000000 */ nop -/* AC5870 80240700 46800021 */ cvt.d.w $f0, $f0 -/* AC5874 80240704 46220003 */ div.d $f0, $f0, $f2 -/* AC5878 80240708 46200020 */ cvt.s.d $f0, $f0 -/* AC587C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* AC5880 80240710 24020001 */ addiu $v0, $zero, 1 -/* AC5884 80240714 AE220070 */ sw $v0, 0x70($s1) -/* AC5888 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* AC588C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* AC5890 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* AC5894 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* AC5898 80240728 03E00008 */ jr $ra -/* AC589C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 4422275ce3..e09fad88be 100644 --- a/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/ver/us/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -139,7 +139,7 @@ glabel func_80240B94_AC5D04 glabel L80240D78_AC5EE8 /* AC5EE8 80240D78 0280202D */ daddu $a0, $s4, $zero /* AC5EEC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* AC5EF0 80240D80 0C090000 */ jal func_80240000_AC5170 +/* AC5EF0 80240D80 0C090000 */ jal kkj_01_UnkNpcAIFunc24 /* AC5EF4 80240D84 02A0302D */ daddu $a2, $s5, $zero glabel L80240D88_AC5EF8 /* AC5EF8 80240D88 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80240DB0_AC5F20 glabel L80240DC8_AC5F38 /* AC5F38 80240DC8 0280202D */ daddu $a0, $s4, $zero /* AC5F3C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* AC5F40 80240DD0 0C09019F */ jal func_8024067C_AC57EC +/* AC5F40 80240DD0 0C09019F */ jal kkj_01_UnkNpcAIFunc25 /* AC5F44 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* AC5F48 80240DD8 0809039A */ j L80240E68_AC5FD8 /* AC5F4C 80240DDC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s deleted file mode 100644 index 4378b948d5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240000_8CE070.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243440_8D14B0 -.double 32767.0 - -.section .text - -glabel func_80240000_8CE070 -/* 8CE070 80240000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8CE074 80240004 AFB3002C */ sw $s3, 0x2c($sp) -/* 8CE078 80240008 0080982D */ daddu $s3, $a0, $zero -/* 8CE07C 8024000C AFBF0030 */ sw $ra, 0x30($sp) -/* 8CE080 80240010 AFB20028 */ sw $s2, 0x28($sp) -/* 8CE084 80240014 AFB10024 */ sw $s1, 0x24($sp) -/* 8CE088 80240018 AFB00020 */ sw $s0, 0x20($sp) -/* 8CE08C 8024001C 8E710148 */ lw $s1, 0x148($s3) -/* 8CE090 80240020 86240008 */ lh $a0, 8($s1) -/* 8CE094 80240024 0C00EABB */ jal get_npc_unsafe -/* 8CE098 80240028 00A0902D */ daddu $s2, $a1, $zero -/* 8CE09C 8024002C 8E440004 */ lw $a0, 4($s2) -/* 8CE0A0 80240030 0040802D */ daddu $s0, $v0, $zero -/* 8CE0A4 80240034 00041FC2 */ srl $v1, $a0, 0x1f -/* 8CE0A8 80240038 00832021 */ addu $a0, $a0, $v1 -/* 8CE0AC 8024003C 00042043 */ sra $a0, $a0, 1 -/* 8CE0B0 80240040 0C00A67F */ jal rand_int -/* 8CE0B4 80240044 24840001 */ addiu $a0, $a0, 1 -/* 8CE0B8 80240048 8E430004 */ lw $v1, 4($s2) -/* 8CE0BC 8024004C 000327C2 */ srl $a0, $v1, 0x1f -/* 8CE0C0 80240050 00641821 */ addu $v1, $v1, $a0 -/* 8CE0C4 80240054 00031843 */ sra $v1, $v1, 1 -/* 8CE0C8 80240058 00621821 */ addu $v1, $v1, $v0 -/* 8CE0CC 8024005C A603008E */ sh $v1, 0x8e($s0) -/* 8CE0D0 80240060 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8CE0D4 80240064 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8CE0D8 80240068 C4640000 */ lwc1 $f4, ($v1) -/* 8CE0DC 8024006C 46802120 */ cvt.s.w $f4, $f4 -/* 8CE0E0 80240070 C4620008 */ lwc1 $f2, 8($v1) -/* 8CE0E4 80240074 468010A0 */ cvt.s.w $f2, $f2 -/* 8CE0E8 80240078 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8CE0EC 8024007C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE0F0 80240080 44061000 */ mfc1 $a2, $f2 -/* 8CE0F4 80240084 C440000C */ lwc1 $f0, 0xc($v0) -/* 8CE0F8 80240088 46800020 */ cvt.s.w $f0, $f0 -/* 8CE0FC 8024008C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8CE100 80240090 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE104 80240094 44052000 */ mfc1 $a1, $f4 -/* 8CE108 80240098 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8CE10C 8024009C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE110 802400A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CE114 802400A4 8C640018 */ lw $a0, 0x18($v1) -/* 8CE118 802400A8 0C0123F5 */ jal is_point_within_region -/* 8CE11C 802400AC 8E070038 */ lw $a3, 0x38($s0) -/* 8CE120 802400B0 1040000E */ beqz $v0, .L802400EC -/* 8CE124 802400B4 00000000 */ nop -/* 8CE128 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE12C 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8CE130 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8CE134 802400C4 C4460000 */ lwc1 $f6, ($v0) -/* 8CE138 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* 8CE13C 802400CC 44063000 */ mfc1 $a2, $f6 -/* 8CE140 802400D0 C4460008 */ lwc1 $f6, 8($v0) -/* 8CE144 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* 8CE148 802400D8 44073000 */ mfc1 $a3, $f6 -/* 8CE14C 802400DC 0C00A720 */ jal atan2 -/* 8CE150 802400E0 00000000 */ nop -/* 8CE154 802400E4 08090047 */ j .L8024011C -/* 8CE158 802400E8 E600000C */ swc1 $f0, 0xc($s0) -.L802400EC: -/* 8CE15C 802400EC 0C00A67F */ jal rand_int -/* 8CE160 802400F0 2404003C */ addiu $a0, $zero, 0x3c -/* 8CE164 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8CE168 802400F8 44820000 */ mtc1 $v0, $f0 -/* 8CE16C 802400FC 00000000 */ nop -/* 8CE170 80240100 46800020 */ cvt.s.w $f0, $f0 -/* 8CE174 80240104 46006300 */ add.s $f12, $f12, $f0 -/* 8CE178 80240108 3C0141F0 */ lui $at, 0x41f0 -/* 8CE17C 8024010C 44810000 */ mtc1 $at, $f0 -/* 8CE180 80240110 0C00A6C9 */ jal clamp_angle -/* 8CE184 80240114 46006301 */ sub.s $f12, $f12, $f0 -/* 8CE188 80240118 E600000C */ swc1 $f0, 0xc($s0) -.L8024011C: -/* 8CE18C 8024011C 8E2200CC */ lw $v0, 0xcc($s1) -/* 8CE190 80240120 8C420004 */ lw $v0, 4($v0) -/* 8CE194 80240124 AE020028 */ sw $v0, 0x28($s0) -/* 8CE198 80240128 AE600074 */ sw $zero, 0x74($s3) -/* 8CE19C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8CE1A0 80240130 8C420014 */ lw $v0, 0x14($v0) -/* 8CE1A4 80240134 04410004 */ bgez $v0, .L80240148 -/* 8CE1A8 80240138 00000000 */ nop -/* 8CE1AC 8024013C C6400000 */ lwc1 $f0, ($s2) -/* 8CE1B0 80240140 0809005A */ j .L80240168 -/* 8CE1B4 80240144 E6000018 */ swc1 $f0, 0x18($s0) -.L80240148: -/* 8CE1B8 80240148 3C018024 */ lui $at, %hi(D_80243440_8D14B0) -/* 8CE1BC 8024014C D4223440 */ ldc1 $f2, %lo(D_80243440_8D14B0)($at) -/* 8CE1C0 80240150 44820000 */ mtc1 $v0, $f0 -/* 8CE1C4 80240154 00000000 */ nop -/* 8CE1C8 80240158 46800021 */ cvt.d.w $f0, $f0 -/* 8CE1CC 8024015C 46220003 */ div.d $f0, $f0, $f2 -/* 8CE1D0 80240160 46200020 */ cvt.s.d $f0, $f0 -/* 8CE1D4 80240164 E6000018 */ swc1 $f0, 0x18($s0) -.L80240168: -/* 8CE1D8 80240168 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CE1DC 8024016C 3C014059 */ lui $at, 0x4059 -/* 8CE1E0 80240170 44811800 */ mtc1 $at, $f3 -/* 8CE1E4 80240174 44801000 */ mtc1 $zero, $f2 -/* 8CE1E8 80240178 46000021 */ cvt.d.s $f0, $f0 -/* 8CE1EC 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* 8CE1F0 80240180 00000000 */ nop -/* 8CE1F4 80240184 24020001 */ addiu $v0, $zero, 1 -/* 8CE1F8 80240188 4620018D */ trunc.w.d $f6, $f0 -/* 8CE1FC 8024018C E626007C */ swc1 $f6, 0x7c($s1) -/* 8CE200 80240190 AE620070 */ sw $v0, 0x70($s3) -/* 8CE204 80240194 8FBF0030 */ lw $ra, 0x30($sp) -/* 8CE208 80240198 8FB3002C */ lw $s3, 0x2c($sp) -/* 8CE20C 8024019C 8FB20028 */ lw $s2, 0x28($sp) -/* 8CE210 802401A0 8FB10024 */ lw $s1, 0x24($sp) -/* 8CE214 802401A4 8FB00020 */ lw $s0, 0x20($sp) -/* 8CE218 802401A8 03E00008 */ jr $ra -/* 8CE21C 802401AC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s index e7b0003620..be5e15dd99 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -81,7 +81,7 @@ glabel func_8024130C_8CF37C glabel L80241418_8CF488 /* 8CF488 80241418 0280202D */ daddu $a0, $s4, $zero /* 8CF48C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8CF490 80241420 0C090000 */ jal func_80240000_8CE070 +/* 8CF490 80241420 0C090000 */ jal kmr_05_UnkNpcAIFunc23 /* 8CF494 80241424 0260302D */ daddu $a2, $s3, $zero glabel L80241428_8CF498 /* 8CF498 80241428 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s deleted file mode 100644 index 66672eba4d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_80240000_8D1510.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80242850_8D3D60 -.double 32767.0 - -.section .text - -glabel func_80240000_8D1510 -/* 8D1510 80240000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D1514 80240004 AFB3002C */ sw $s3, 0x2c($sp) -/* 8D1518 80240008 0080982D */ daddu $s3, $a0, $zero -/* 8D151C 8024000C AFBF0030 */ sw $ra, 0x30($sp) -/* 8D1520 80240010 AFB20028 */ sw $s2, 0x28($sp) -/* 8D1524 80240014 AFB10024 */ sw $s1, 0x24($sp) -/* 8D1528 80240018 AFB00020 */ sw $s0, 0x20($sp) -/* 8D152C 8024001C 8E710148 */ lw $s1, 0x148($s3) -/* 8D1530 80240020 86240008 */ lh $a0, 8($s1) -/* 8D1534 80240024 0C00EABB */ jal get_npc_unsafe -/* 8D1538 80240028 00A0902D */ daddu $s2, $a1, $zero -/* 8D153C 8024002C 8E440004 */ lw $a0, 4($s2) -/* 8D1540 80240030 0040802D */ daddu $s0, $v0, $zero -/* 8D1544 80240034 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D1548 80240038 00832021 */ addu $a0, $a0, $v1 -/* 8D154C 8024003C 00042043 */ sra $a0, $a0, 1 -/* 8D1550 80240040 0C00A67F */ jal rand_int -/* 8D1554 80240044 24840001 */ addiu $a0, $a0, 1 -/* 8D1558 80240048 8E430004 */ lw $v1, 4($s2) -/* 8D155C 8024004C 000327C2 */ srl $a0, $v1, 0x1f -/* 8D1560 80240050 00641821 */ addu $v1, $v1, $a0 -/* 8D1564 80240054 00031843 */ sra $v1, $v1, 1 -/* 8D1568 80240058 00621821 */ addu $v1, $v1, $v0 -/* 8D156C 8024005C A603008E */ sh $v1, 0x8e($s0) -/* 8D1570 80240060 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8D1574 80240064 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8D1578 80240068 C4640000 */ lwc1 $f4, ($v1) -/* 8D157C 8024006C 46802120 */ cvt.s.w $f4, $f4 -/* 8D1580 80240070 C4620008 */ lwc1 $f2, 8($v1) -/* 8D1584 80240074 468010A0 */ cvt.s.w $f2, $f2 -/* 8D1588 80240078 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D158C 8024007C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1590 80240080 44061000 */ mfc1 $a2, $f2 -/* 8D1594 80240084 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D1598 80240088 46800020 */ cvt.s.w $f0, $f0 -/* 8D159C 8024008C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8D15A0 80240090 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D15A4 80240094 44052000 */ mfc1 $a1, $f4 -/* 8D15A8 80240098 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8D15AC 8024009C 46800020 */ cvt.s.w $f0, $f0 -/* 8D15B0 802400A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D15B4 802400A4 8C640018 */ lw $a0, 0x18($v1) -/* 8D15B8 802400A8 0C0123F5 */ jal is_point_within_region -/* 8D15BC 802400AC 8E070038 */ lw $a3, 0x38($s0) -/* 8D15C0 802400B0 1040000E */ beqz $v0, .L802400EC -/* 8D15C4 802400B4 00000000 */ nop -/* 8D15C8 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D15CC 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D15D0 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D15D4 802400C4 C4460000 */ lwc1 $f6, ($v0) -/* 8D15D8 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* 8D15DC 802400CC 44063000 */ mfc1 $a2, $f6 -/* 8D15E0 802400D0 C4460008 */ lwc1 $f6, 8($v0) -/* 8D15E4 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* 8D15E8 802400D8 44073000 */ mfc1 $a3, $f6 -/* 8D15EC 802400DC 0C00A720 */ jal atan2 -/* 8D15F0 802400E0 00000000 */ nop -/* 8D15F4 802400E4 08090047 */ j .L8024011C -/* 8D15F8 802400E8 E600000C */ swc1 $f0, 0xc($s0) -.L802400EC: -/* 8D15FC 802400EC 0C00A67F */ jal rand_int -/* 8D1600 802400F0 2404003C */ addiu $a0, $zero, 0x3c -/* 8D1604 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D1608 802400F8 44820000 */ mtc1 $v0, $f0 -/* 8D160C 802400FC 00000000 */ nop -/* 8D1610 80240100 46800020 */ cvt.s.w $f0, $f0 -/* 8D1614 80240104 46006300 */ add.s $f12, $f12, $f0 -/* 8D1618 80240108 3C0141F0 */ lui $at, 0x41f0 -/* 8D161C 8024010C 44810000 */ mtc1 $at, $f0 -/* 8D1620 80240110 0C00A6C9 */ jal clamp_angle -/* 8D1624 80240114 46006301 */ sub.s $f12, $f12, $f0 -/* 8D1628 80240118 E600000C */ swc1 $f0, 0xc($s0) -.L8024011C: -/* 8D162C 8024011C 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D1630 80240120 8C420004 */ lw $v0, 4($v0) -/* 8D1634 80240124 AE020028 */ sw $v0, 0x28($s0) -/* 8D1638 80240128 AE600074 */ sw $zero, 0x74($s3) -/* 8D163C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D1640 80240130 8C420014 */ lw $v0, 0x14($v0) -/* 8D1644 80240134 04410004 */ bgez $v0, .L80240148 -/* 8D1648 80240138 00000000 */ nop -/* 8D164C 8024013C C6400000 */ lwc1 $f0, ($s2) -/* 8D1650 80240140 0809005A */ j .L80240168 -/* 8D1654 80240144 E6000018 */ swc1 $f0, 0x18($s0) -.L80240148: -/* 8D1658 80240148 3C018024 */ lui $at, %hi(D_80242850_8D3D60) -/* 8D165C 8024014C D4222850 */ ldc1 $f2, %lo(D_80242850_8D3D60)($at) -/* 8D1660 80240150 44820000 */ mtc1 $v0, $f0 -/* 8D1664 80240154 00000000 */ nop -/* 8D1668 80240158 46800021 */ cvt.d.w $f0, $f0 -/* 8D166C 8024015C 46220003 */ div.d $f0, $f0, $f2 -/* 8D1670 80240160 46200020 */ cvt.s.d $f0, $f0 -/* 8D1674 80240164 E6000018 */ swc1 $f0, 0x18($s0) -.L80240168: -/* 8D1678 80240168 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D167C 8024016C 3C014059 */ lui $at, 0x4059 -/* 8D1680 80240170 44811800 */ mtc1 $at, $f3 -/* 8D1684 80240174 44801000 */ mtc1 $zero, $f2 -/* 8D1688 80240178 46000021 */ cvt.d.s $f0, $f0 -/* 8D168C 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* 8D1690 80240180 00000000 */ nop -/* 8D1694 80240184 24020001 */ addiu $v0, $zero, 1 -/* 8D1698 80240188 4620018D */ trunc.w.d $f6, $f0 -/* 8D169C 8024018C E626007C */ swc1 $f6, 0x7c($s1) -/* 8D16A0 80240190 AE620070 */ sw $v0, 0x70($s3) -/* 8D16A4 80240194 8FBF0030 */ lw $ra, 0x30($sp) -/* 8D16A8 80240198 8FB3002C */ lw $s3, 0x2c($sp) -/* 8D16AC 8024019C 8FB20028 */ lw $s2, 0x28($sp) -/* 8D16B0 802401A0 8FB10024 */ lw $s1, 0x24($sp) -/* 8D16B4 802401A4 8FB00020 */ lw $s0, 0x20($sp) -/* 8D16B8 802401A8 03E00008 */ jr $ra -/* 8D16BC 802401AC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index 4726dd2d4f..d201341c31 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -81,7 +81,7 @@ glabel func_8024130C_8D281C glabel L80241418_8D2928 /* 8D2928 80241418 0280202D */ daddu $a0, $s4, $zero /* 8D292C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D2930 80241420 0C090000 */ jal func_80240000_8D1510 +/* 8D2930 80241420 0C090000 */ jal kmr_06_UnkNpcAIFunc23 /* 8D2934 80241424 0260302D */ daddu $a2, $s3, $zero glabel L80241428_8D2938 /* 8D2938 80241428 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s deleted file mode 100644 index 09d3e51338..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_80240000_8D5E00.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80242670_8D8470 -.double 32767.0 - -.section .text - -glabel func_80240000_8D5E00 -/* 8D5E00 80240000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D5E04 80240004 AFB3002C */ sw $s3, 0x2c($sp) -/* 8D5E08 80240008 0080982D */ daddu $s3, $a0, $zero -/* 8D5E0C 8024000C AFBF0030 */ sw $ra, 0x30($sp) -/* 8D5E10 80240010 AFB20028 */ sw $s2, 0x28($sp) -/* 8D5E14 80240014 AFB10024 */ sw $s1, 0x24($sp) -/* 8D5E18 80240018 AFB00020 */ sw $s0, 0x20($sp) -/* 8D5E1C 8024001C 8E710148 */ lw $s1, 0x148($s3) -/* 8D5E20 80240020 86240008 */ lh $a0, 8($s1) -/* 8D5E24 80240024 0C00EABB */ jal get_npc_unsafe -/* 8D5E28 80240028 00A0902D */ daddu $s2, $a1, $zero -/* 8D5E2C 8024002C 8E440004 */ lw $a0, 4($s2) -/* 8D5E30 80240030 0040802D */ daddu $s0, $v0, $zero -/* 8D5E34 80240034 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D5E38 80240038 00832021 */ addu $a0, $a0, $v1 -/* 8D5E3C 8024003C 00042043 */ sra $a0, $a0, 1 -/* 8D5E40 80240040 0C00A67F */ jal rand_int -/* 8D5E44 80240044 24840001 */ addiu $a0, $a0, 1 -/* 8D5E48 80240048 8E430004 */ lw $v1, 4($s2) -/* 8D5E4C 8024004C 000327C2 */ srl $a0, $v1, 0x1f -/* 8D5E50 80240050 00641821 */ addu $v1, $v1, $a0 -/* 8D5E54 80240054 00031843 */ sra $v1, $v1, 1 -/* 8D5E58 80240058 00621821 */ addu $v1, $v1, $v0 -/* 8D5E5C 8024005C A603008E */ sh $v1, 0x8e($s0) -/* 8D5E60 80240060 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8D5E64 80240064 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8D5E68 80240068 C4640000 */ lwc1 $f4, ($v1) -/* 8D5E6C 8024006C 46802120 */ cvt.s.w $f4, $f4 -/* 8D5E70 80240070 C4620008 */ lwc1 $f2, 8($v1) -/* 8D5E74 80240074 468010A0 */ cvt.s.w $f2, $f2 -/* 8D5E78 80240078 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D5E7C 8024007C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D5E80 80240080 44061000 */ mfc1 $a2, $f2 -/* 8D5E84 80240084 C440000C */ lwc1 $f0, 0xc($v0) -/* 8D5E88 80240088 46800020 */ cvt.s.w $f0, $f0 -/* 8D5E8C 8024008C E7A00014 */ swc1 $f0, 0x14($sp) -/* 8D5E90 80240090 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D5E94 80240094 44052000 */ mfc1 $a1, $f4 -/* 8D5E98 80240098 C4400010 */ lwc1 $f0, 0x10($v0) -/* 8D5E9C 8024009C 46800020 */ cvt.s.w $f0, $f0 -/* 8D5EA0 802400A0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8D5EA4 802400A4 8C640018 */ lw $a0, 0x18($v1) -/* 8D5EA8 802400A8 0C0123F5 */ jal is_point_within_region -/* 8D5EAC 802400AC 8E070038 */ lw $a3, 0x38($s0) -/* 8D5EB0 802400B0 1040000E */ beqz $v0, .L802400EC -/* 8D5EB4 802400B4 00000000 */ nop -/* 8D5EB8 802400B8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D5EBC 802400BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8D5EC0 802400C0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8D5EC4 802400C4 C4460000 */ lwc1 $f6, ($v0) -/* 8D5EC8 802400C8 468031A0 */ cvt.s.w $f6, $f6 -/* 8D5ECC 802400CC 44063000 */ mfc1 $a2, $f6 -/* 8D5ED0 802400D0 C4460008 */ lwc1 $f6, 8($v0) -/* 8D5ED4 802400D4 468031A0 */ cvt.s.w $f6, $f6 -/* 8D5ED8 802400D8 44073000 */ mfc1 $a3, $f6 -/* 8D5EDC 802400DC 0C00A720 */ jal atan2 -/* 8D5EE0 802400E0 00000000 */ nop -/* 8D5EE4 802400E4 08090047 */ j .L8024011C -/* 8D5EE8 802400E8 E600000C */ swc1 $f0, 0xc($s0) -.L802400EC: -/* 8D5EEC 802400EC 0C00A67F */ jal rand_int -/* 8D5EF0 802400F0 2404003C */ addiu $a0, $zero, 0x3c -/* 8D5EF4 802400F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8D5EF8 802400F8 44820000 */ mtc1 $v0, $f0 -/* 8D5EFC 802400FC 00000000 */ nop -/* 8D5F00 80240100 46800020 */ cvt.s.w $f0, $f0 -/* 8D5F04 80240104 46006300 */ add.s $f12, $f12, $f0 -/* 8D5F08 80240108 3C0141F0 */ lui $at, 0x41f0 -/* 8D5F0C 8024010C 44810000 */ mtc1 $at, $f0 -/* 8D5F10 80240110 0C00A6C9 */ jal clamp_angle -/* 8D5F14 80240114 46006301 */ sub.s $f12, $f12, $f0 -/* 8D5F18 80240118 E600000C */ swc1 $f0, 0xc($s0) -.L8024011C: -/* 8D5F1C 8024011C 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D5F20 80240120 8C420004 */ lw $v0, 4($v0) -/* 8D5F24 80240124 AE020028 */ sw $v0, 0x28($s0) -/* 8D5F28 80240128 AE600074 */ sw $zero, 0x74($s3) -/* 8D5F2C 8024012C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8D5F30 80240130 8C420014 */ lw $v0, 0x14($v0) -/* 8D5F34 80240134 04410004 */ bgez $v0, .L80240148 -/* 8D5F38 80240138 00000000 */ nop -/* 8D5F3C 8024013C C6400000 */ lwc1 $f0, ($s2) -/* 8D5F40 80240140 0809005A */ j .L80240168 -/* 8D5F44 80240144 E6000018 */ swc1 $f0, 0x18($s0) -.L80240148: -/* 8D5F48 80240148 3C018024 */ lui $at, %hi(D_80242670_8D8470) -/* 8D5F4C 8024014C D4222670 */ ldc1 $f2, %lo(D_80242670_8D8470)($at) -/* 8D5F50 80240150 44820000 */ mtc1 $v0, $f0 -/* 8D5F54 80240154 00000000 */ nop -/* 8D5F58 80240158 46800021 */ cvt.d.w $f0, $f0 -/* 8D5F5C 8024015C 46220003 */ div.d $f0, $f0, $f2 -/* 8D5F60 80240160 46200020 */ cvt.s.d $f0, $f0 -/* 8D5F64 80240164 E6000018 */ swc1 $f0, 0x18($s0) -.L80240168: -/* 8D5F68 80240168 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8D5F6C 8024016C 3C014059 */ lui $at, 0x4059 -/* 8D5F70 80240170 44811800 */ mtc1 $at, $f3 -/* 8D5F74 80240174 44801000 */ mtc1 $zero, $f2 -/* 8D5F78 80240178 46000021 */ cvt.d.s $f0, $f0 -/* 8D5F7C 8024017C 46220002 */ mul.d $f0, $f0, $f2 -/* 8D5F80 80240180 00000000 */ nop -/* 8D5F84 80240184 24020001 */ addiu $v0, $zero, 1 -/* 8D5F88 80240188 4620018D */ trunc.w.d $f6, $f0 -/* 8D5F8C 8024018C E626007C */ swc1 $f6, 0x7c($s1) -/* 8D5F90 80240190 AE620070 */ sw $v0, 0x70($s3) -/* 8D5F94 80240194 8FBF0030 */ lw $ra, 0x30($sp) -/* 8D5F98 80240198 8FB3002C */ lw $s3, 0x2c($sp) -/* 8D5F9C 8024019C 8FB20028 */ lw $s2, 0x28($sp) -/* 8D5FA0 802401A0 8FB10024 */ lw $s1, 0x24($sp) -/* 8D5FA4 802401A4 8FB00020 */ lw $s0, 0x20($sp) -/* 8D5FA8 802401A8 03E00008 */ jr $ra -/* 8D5FAC 802401AC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index 29107c5364..42a30304fc 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -81,7 +81,7 @@ glabel func_8024130C_8D710C glabel L80241418_8D7218 /* 8D7218 80241418 0280202D */ daddu $a0, $s4, $zero /* 8D721C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D7220 80241420 0C090000 */ jal func_80240000_8D5E00 +/* 8D7220 80241420 0C090000 */ jal kmr_09_UnkNpcAIFunc23 /* 8D7224 80241424 0260302D */ daddu $a2, $s3, $zero glabel L80241428_8D7228 /* 8D7228 80241428 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s deleted file mode 100644 index 4cc834cfe5..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80241600_A48560 -.double 0.8 - -.section .text - -glabel func_802401DC_A4713C -/* A4713C 802401DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A47140 802401E0 AFB3001C */ sw $s3, 0x1c($sp) -/* A47144 802401E4 0080982D */ daddu $s3, $a0, $zero -/* A47148 802401E8 AFBF0020 */ sw $ra, 0x20($sp) -/* A4714C 802401EC AFB20018 */ sw $s2, 0x18($sp) -/* A47150 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* A47154 802401F4 AFB00010 */ sw $s0, 0x10($sp) -/* A47158 802401F8 8E710148 */ lw $s1, 0x148($s3) -/* A4715C 802401FC 86240008 */ lh $a0, 8($s1) -/* A47160 80240200 0C00EABB */ jal get_npc_unsafe -/* A47164 80240204 00A0902D */ daddu $s2, $a1, $zero -/* A47168 80240208 0040802D */ daddu $s0, $v0, $zero -/* A4716C 8024020C 8602008E */ lh $v0, 0x8e($s0) -/* A47170 80240210 9603008E */ lhu $v1, 0x8e($s0) -/* A47174 80240214 18400005 */ blez $v0, .L8024022C -/* A47178 80240218 2462FFFF */ addiu $v0, $v1, -1 -/* A4717C 8024021C A602008E */ sh $v0, 0x8e($s0) -/* A47180 80240220 00021400 */ sll $v0, $v0, 0x10 -/* A47184 80240224 1C400033 */ bgtz $v0, .L802402F4 -/* A47188 80240228 00000000 */ nop -.L8024022C: -/* A4718C 8024022C 8602008C */ lh $v0, 0x8c($s0) -/* A47190 80240230 14400030 */ bnez $v0, .L802402F4 -/* A47194 80240234 00000000 */ nop -/* A47198 80240238 8E2200CC */ lw $v0, 0xcc($s1) -/* A4719C 8024023C 8C420024 */ lw $v0, 0x24($v0) -/* A471A0 80240240 AE020028 */ sw $v0, 0x28($s0) -/* A471A4 80240244 C6400018 */ lwc1 $f0, 0x18($s2) -/* A471A8 80240248 E6000018 */ swc1 $f0, 0x18($s0) -/* A471AC 8024024C 8E230088 */ lw $v1, 0x88($s1) -/* A471B0 80240250 24020005 */ addiu $v0, $zero, 5 -/* A471B4 80240254 10620005 */ beq $v1, $v0, .L8024026C -/* A471B8 80240258 00000000 */ nop -/* A471BC 8024025C 10600003 */ beqz $v1, .L8024026C -/* A471C0 80240260 24020001 */ addiu $v0, $zero, 1 -/* A471C4 80240264 14620006 */ bne $v1, $v0, .L80240280 -/* A471C8 80240268 00000000 */ nop -.L8024026C: -/* A471CC 8024026C 8E220084 */ lw $v0, 0x84($s1) -/* A471D0 80240270 00021FC2 */ srl $v1, $v0, 0x1f -/* A471D4 80240274 00431021 */ addu $v0, $v0, $v1 -/* A471D8 80240278 00021043 */ sra $v0, $v0, 1 -/* A471DC 8024027C A60200A8 */ sh $v0, 0xa8($s0) -.L80240280: -/* A471E0 80240280 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A471E4 80240284 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A471E8 80240288 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A471EC 8024028C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A471F0 80240290 8C460028 */ lw $a2, 0x28($v0) -/* A471F4 80240294 0C00A7B5 */ jal dist2D -/* A471F8 80240298 8C470030 */ lw $a3, 0x30($v0) -/* A471FC 8024029C C6020018 */ lwc1 $f2, 0x18($s0) -/* A47200 802402A0 46020003 */ div.s $f0, $f0, $f2 -/* A47204 802402A4 3C018024 */ lui $at, %hi(D_80241600_A48560) -/* A47208 802402A8 D4221600 */ ldc1 $f2, %lo(D_80241600_A48560)($at) -/* A4720C 802402AC 46000021 */ cvt.d.s $f0, $f0 -/* A47210 802402B0 46220000 */ add.d $f0, $f0, $f2 -/* A47214 802402B4 4620010D */ trunc.w.d $f4, $f0 -/* A47218 802402B8 44022000 */ mfc1 $v0, $f4 -/* A4721C 802402BC 00000000 */ nop -/* A47220 802402C0 A602008E */ sh $v0, 0x8e($s0) -/* A47224 802402C4 00021400 */ sll $v0, $v0, 0x10 -/* A47228 802402C8 8E230078 */ lw $v1, 0x78($s1) -/* A4722C 802402CC 00021403 */ sra $v0, $v0, 0x10 -/* A47230 802402D0 0043102A */ slt $v0, $v0, $v1 -/* A47234 802402D4 10400003 */ beqz $v0, .L802402E4 -/* A47238 802402D8 00000000 */ nop -/* A4723C 802402DC 9622007A */ lhu $v0, 0x7a($s1) -/* A47240 802402E0 A602008E */ sh $v0, 0x8e($s0) -.L802402E4: -/* A47244 802402E4 8602008E */ lh $v0, 0x8e($s0) -/* A47248 802402E8 AE22007C */ sw $v0, 0x7c($s1) -/* A4724C 802402EC 2402000E */ addiu $v0, $zero, 0xe -/* A47250 802402F0 AE620070 */ sw $v0, 0x70($s3) -.L802402F4: -/* A47254 802402F4 8FBF0020 */ lw $ra, 0x20($sp) -/* A47258 802402F8 8FB3001C */ lw $s3, 0x1c($sp) -/* A4725C 802402FC 8FB20018 */ lw $s2, 0x18($sp) -/* A47260 80240300 8FB10014 */ lw $s1, 0x14($sp) -/* A47264 80240304 8FB00010 */ lw $s0, 0x10($sp) -/* A47268 80240308 03E00008 */ jr $ra -/* A4726C 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s index 15b156e991..153fc88355 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -244,7 +244,7 @@ glabel func_802404F4_A47454 /* A477B4 80240854 0260202D */ daddu $a0, $s3, $zero .L80240858: /* A477B8 80240858 0280282D */ daddu $a1, $s4, $zero -/* A477BC 8024085C 0C090077 */ jal func_802401DC_A4713C +/* A477BC 8024085C 0C090077 */ jal kpa_01_UnkDistFunc /* A477C0 80240860 02A0302D */ daddu $a2, $s5, $zero /* A477C4 80240864 08090228 */ j .L802408A0 /* A477C8 80240868 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s deleted file mode 100644 index ad63add858..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802401DC_A4879C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243880_A4BE40 -.double 0.8 - -.section .text - -glabel func_802401DC_A4879C -/* A4879C 802401DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A487A0 802401E0 AFB3001C */ sw $s3, 0x1c($sp) -/* A487A4 802401E4 0080982D */ daddu $s3, $a0, $zero -/* A487A8 802401E8 AFBF0020 */ sw $ra, 0x20($sp) -/* A487AC 802401EC AFB20018 */ sw $s2, 0x18($sp) -/* A487B0 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* A487B4 802401F4 AFB00010 */ sw $s0, 0x10($sp) -/* A487B8 802401F8 8E710148 */ lw $s1, 0x148($s3) -/* A487BC 802401FC 86240008 */ lh $a0, 8($s1) -/* A487C0 80240200 0C00EABB */ jal get_npc_unsafe -/* A487C4 80240204 00A0902D */ daddu $s2, $a1, $zero -/* A487C8 80240208 0040802D */ daddu $s0, $v0, $zero -/* A487CC 8024020C 8602008E */ lh $v0, 0x8e($s0) -/* A487D0 80240210 9603008E */ lhu $v1, 0x8e($s0) -/* A487D4 80240214 18400005 */ blez $v0, .L8024022C -/* A487D8 80240218 2462FFFF */ addiu $v0, $v1, -1 -/* A487DC 8024021C A602008E */ sh $v0, 0x8e($s0) -/* A487E0 80240220 00021400 */ sll $v0, $v0, 0x10 -/* A487E4 80240224 1C400033 */ bgtz $v0, .L802402F4 -/* A487E8 80240228 00000000 */ nop -.L8024022C: -/* A487EC 8024022C 8602008C */ lh $v0, 0x8c($s0) -/* A487F0 80240230 14400030 */ bnez $v0, .L802402F4 -/* A487F4 80240234 00000000 */ nop -/* A487F8 80240238 8E2200CC */ lw $v0, 0xcc($s1) -/* A487FC 8024023C 8C420024 */ lw $v0, 0x24($v0) -/* A48800 80240240 AE020028 */ sw $v0, 0x28($s0) -/* A48804 80240244 C6400018 */ lwc1 $f0, 0x18($s2) -/* A48808 80240248 E6000018 */ swc1 $f0, 0x18($s0) -/* A4880C 8024024C 8E230088 */ lw $v1, 0x88($s1) -/* A48810 80240250 24020005 */ addiu $v0, $zero, 5 -/* A48814 80240254 10620005 */ beq $v1, $v0, .L8024026C -/* A48818 80240258 00000000 */ nop -/* A4881C 8024025C 10600003 */ beqz $v1, .L8024026C -/* A48820 80240260 24020001 */ addiu $v0, $zero, 1 -/* A48824 80240264 14620006 */ bne $v1, $v0, .L80240280 -/* A48828 80240268 00000000 */ nop -.L8024026C: -/* A4882C 8024026C 8E220084 */ lw $v0, 0x84($s1) -/* A48830 80240270 00021FC2 */ srl $v1, $v0, 0x1f -/* A48834 80240274 00431021 */ addu $v0, $v0, $v1 -/* A48838 80240278 00021043 */ sra $v0, $v0, 1 -/* A4883C 8024027C A60200A8 */ sh $v0, 0xa8($s0) -.L80240280: -/* A48840 80240280 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A48844 80240284 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A48848 80240288 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A4884C 8024028C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A48850 80240290 8C460028 */ lw $a2, 0x28($v0) -/* A48854 80240294 0C00A7B5 */ jal dist2D -/* A48858 80240298 8C470030 */ lw $a3, 0x30($v0) -/* A4885C 8024029C C6020018 */ lwc1 $f2, 0x18($s0) -/* A48860 802402A0 46020003 */ div.s $f0, $f0, $f2 -/* A48864 802402A4 3C018024 */ lui $at, %hi(D_80243880_A4BE40) -/* A48868 802402A8 D4223880 */ ldc1 $f2, %lo(D_80243880_A4BE40)($at) -/* A4886C 802402AC 46000021 */ cvt.d.s $f0, $f0 -/* A48870 802402B0 46220000 */ add.d $f0, $f0, $f2 -/* A48874 802402B4 4620010D */ trunc.w.d $f4, $f0 -/* A48878 802402B8 44022000 */ mfc1 $v0, $f4 -/* A4887C 802402BC 00000000 */ nop -/* A48880 802402C0 A602008E */ sh $v0, 0x8e($s0) -/* A48884 802402C4 00021400 */ sll $v0, $v0, 0x10 -/* A48888 802402C8 8E230078 */ lw $v1, 0x78($s1) -/* A4888C 802402CC 00021403 */ sra $v0, $v0, 0x10 -/* A48890 802402D0 0043102A */ slt $v0, $v0, $v1 -/* A48894 802402D4 10400003 */ beqz $v0, .L802402E4 -/* A48898 802402D8 00000000 */ nop -/* A4889C 802402DC 9622007A */ lhu $v0, 0x7a($s1) -/* A488A0 802402E0 A602008E */ sh $v0, 0x8e($s0) -.L802402E4: -/* A488A4 802402E4 8602008E */ lh $v0, 0x8e($s0) -/* A488A8 802402E8 AE22007C */ sw $v0, 0x7c($s1) -/* A488AC 802402EC 2402000E */ addiu $v0, $zero, 0xe -/* A488B0 802402F0 AE620070 */ sw $v0, 0x70($s3) -.L802402F4: -/* A488B4 802402F4 8FBF0020 */ lw $ra, 0x20($sp) -/* A488B8 802402F8 8FB3001C */ lw $s3, 0x1c($sp) -/* A488BC 802402FC 8FB20018 */ lw $s2, 0x18($sp) -/* A488C0 80240300 8FB10014 */ lw $s1, 0x14($sp) -/* A488C4 80240304 8FB00010 */ lw $s0, 0x10($sp) -/* A488C8 80240308 03E00008 */ jr $ra -/* A488CC 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index d6ee6ed6a1..ee410d6111 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -244,7 +244,7 @@ glabel func_802404F4_A48AB4 /* A48E14 80240854 0260202D */ daddu $a0, $s3, $zero .L80240858: /* A48E18 80240858 0280282D */ daddu $a1, $s4, $zero -/* A48E1C 8024085C 0C090077 */ jal func_802401DC_A4879C +/* A48E1C 8024085C 0C090077 */ jal kpa_03_UnkDistFunc /* A48E20 80240860 02A0302D */ daddu $a2, $s5, $zero /* A48E24 80240864 08090228 */ j .L802408A0 /* A48E28 80240868 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s deleted file mode 100644 index 84a2d98437..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245CD8_A99418 -.double 0.8 - -.section .text - -glabel func_802415D8_A94D18 -/* A94D18 802415D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A94D1C 802415DC AFB3001C */ sw $s3, 0x1c($sp) -/* A94D20 802415E0 0080982D */ daddu $s3, $a0, $zero -/* A94D24 802415E4 AFBF0020 */ sw $ra, 0x20($sp) -/* A94D28 802415E8 AFB20018 */ sw $s2, 0x18($sp) -/* A94D2C 802415EC AFB10014 */ sw $s1, 0x14($sp) -/* A94D30 802415F0 AFB00010 */ sw $s0, 0x10($sp) -/* A94D34 802415F4 8E710148 */ lw $s1, 0x148($s3) -/* A94D38 802415F8 86240008 */ lh $a0, 8($s1) -/* A94D3C 802415FC 0C00EABB */ jal get_npc_unsafe -/* A94D40 80241600 00A0902D */ daddu $s2, $a1, $zero -/* A94D44 80241604 0040802D */ daddu $s0, $v0, $zero -/* A94D48 80241608 8602008E */ lh $v0, 0x8e($s0) -/* A94D4C 8024160C 9603008E */ lhu $v1, 0x8e($s0) -/* A94D50 80241610 18400005 */ blez $v0, .L80241628 -/* A94D54 80241614 2462FFFF */ addiu $v0, $v1, -1 -/* A94D58 80241618 A602008E */ sh $v0, 0x8e($s0) -/* A94D5C 8024161C 00021400 */ sll $v0, $v0, 0x10 -/* A94D60 80241620 1C400033 */ bgtz $v0, .L802416F0 -/* A94D64 80241624 00000000 */ nop -.L80241628: -/* A94D68 80241628 8602008C */ lh $v0, 0x8c($s0) -/* A94D6C 8024162C 14400030 */ bnez $v0, .L802416F0 -/* A94D70 80241630 00000000 */ nop -/* A94D74 80241634 8E2200CC */ lw $v0, 0xcc($s1) -/* A94D78 80241638 8C420024 */ lw $v0, 0x24($v0) -/* A94D7C 8024163C AE020028 */ sw $v0, 0x28($s0) -/* A94D80 80241640 C6400018 */ lwc1 $f0, 0x18($s2) -/* A94D84 80241644 E6000018 */ swc1 $f0, 0x18($s0) -/* A94D88 80241648 8E230088 */ lw $v1, 0x88($s1) -/* A94D8C 8024164C 24020005 */ addiu $v0, $zero, 5 -/* A94D90 80241650 10620005 */ beq $v1, $v0, .L80241668 -/* A94D94 80241654 00000000 */ nop -/* A94D98 80241658 10600003 */ beqz $v1, .L80241668 -/* A94D9C 8024165C 24020001 */ addiu $v0, $zero, 1 -/* A94DA0 80241660 14620006 */ bne $v1, $v0, .L8024167C -/* A94DA4 80241664 00000000 */ nop -.L80241668: -/* A94DA8 80241668 8E220084 */ lw $v0, 0x84($s1) -/* A94DAC 8024166C 00021FC2 */ srl $v1, $v0, 0x1f -/* A94DB0 80241670 00431021 */ addu $v0, $v0, $v1 -/* A94DB4 80241674 00021043 */ sra $v0, $v0, 1 -/* A94DB8 80241678 A60200A8 */ sh $v0, 0xa8($s0) -.L8024167C: -/* A94DBC 8024167C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A94DC0 80241680 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A94DC4 80241684 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A94DC8 80241688 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A94DCC 8024168C 8C460028 */ lw $a2, 0x28($v0) -/* A94DD0 80241690 0C00A7B5 */ jal dist2D -/* A94DD4 80241694 8C470030 */ lw $a3, 0x30($v0) -/* A94DD8 80241698 C6020018 */ lwc1 $f2, 0x18($s0) -/* A94DDC 8024169C 46020003 */ div.s $f0, $f0, $f2 -/* A94DE0 802416A0 3C018024 */ lui $at, %hi(D_80245CD8_A99418) -/* A94DE4 802416A4 D4225CD8 */ ldc1 $f2, %lo(D_80245CD8_A99418)($at) -/* A94DE8 802416A8 46000021 */ cvt.d.s $f0, $f0 -/* A94DEC 802416AC 46220000 */ add.d $f0, $f0, $f2 -/* A94DF0 802416B0 4620010D */ trunc.w.d $f4, $f0 -/* A94DF4 802416B4 44022000 */ mfc1 $v0, $f4 -/* A94DF8 802416B8 00000000 */ nop -/* A94DFC 802416BC A602008E */ sh $v0, 0x8e($s0) -/* A94E00 802416C0 00021400 */ sll $v0, $v0, 0x10 -/* A94E04 802416C4 8E230078 */ lw $v1, 0x78($s1) -/* A94E08 802416C8 00021403 */ sra $v0, $v0, 0x10 -/* A94E0C 802416CC 0043102A */ slt $v0, $v0, $v1 -/* A94E10 802416D0 10400003 */ beqz $v0, .L802416E0 -/* A94E14 802416D4 00000000 */ nop -/* A94E18 802416D8 9622007A */ lhu $v0, 0x7a($s1) -/* A94E1C 802416DC A602008E */ sh $v0, 0x8e($s0) -.L802416E0: -/* A94E20 802416E0 8602008E */ lh $v0, 0x8e($s0) -/* A94E24 802416E4 AE22007C */ sw $v0, 0x7c($s1) -/* A94E28 802416E8 2402000E */ addiu $v0, $zero, 0xe -/* A94E2C 802416EC AE620070 */ sw $v0, 0x70($s3) -.L802416F0: -/* A94E30 802416F0 8FBF0020 */ lw $ra, 0x20($sp) -/* A94E34 802416F4 8FB3001C */ lw $s3, 0x1c($sp) -/* A94E38 802416F8 8FB20018 */ lw $s2, 0x18($sp) -/* A94E3C 802416FC 8FB10014 */ lw $s1, 0x14($sp) -/* A94E40 80241700 8FB00010 */ lw $s0, 0x10($sp) -/* A94E44 80241704 03E00008 */ jr $ra -/* A94E48 80241708 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index c9290854fb..5d0c07e4ce 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -244,7 +244,7 @@ glabel func_802418F0_A95030 /* A95390 80241C50 0260202D */ daddu $a0, $s3, $zero .L80241C54: /* A95394 80241C54 0280282D */ daddu $a1, $s4, $zero -/* A95398 80241C58 0C090576 */ jal func_802415D8_A94D18 +/* A95398 80241C58 0C090576 */ jal kpa_102_UnkDistFunc /* A9539C 80241C5C 02A0302D */ daddu $a2, $s5, $zero /* A953A0 80241C60 08090727 */ j .L80241C9C /* A953A4 80241C64 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s deleted file mode 100644 index ad3f538ae3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_8024038C_A52C4C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80242030_A548F0 -.double 0.8 - -.section .text - -glabel func_8024038C_A52C4C -/* A52C4C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A52C50 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* A52C54 80240394 0080982D */ daddu $s3, $a0, $zero -/* A52C58 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* A52C5C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* A52C60 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* A52C64 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* A52C68 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* A52C6C 802403AC 86240008 */ lh $a0, 8($s1) -/* A52C70 802403B0 0C00EABB */ jal get_npc_unsafe -/* A52C74 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* A52C78 802403B8 0040802D */ daddu $s0, $v0, $zero -/* A52C7C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* A52C80 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* A52C84 802403C4 18400005 */ blez $v0, .L802403DC -/* A52C88 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* A52C8C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* A52C90 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* A52C94 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A52C98 802403D8 00000000 */ nop -.L802403DC: -/* A52C9C 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* A52CA0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A52CA4 802403E4 00000000 */ nop -/* A52CA8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* A52CAC 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* A52CB0 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* A52CB4 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A52CB8 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* A52CBC 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* A52CC0 80240400 24020005 */ addiu $v0, $zero, 5 -/* A52CC4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A52CC8 80240408 00000000 */ nop -/* A52CCC 8024040C 10600003 */ beqz $v1, .L8024041C -/* A52CD0 80240410 24020001 */ addiu $v0, $zero, 1 -/* A52CD4 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A52CD8 80240418 00000000 */ nop -.L8024041C: -/* A52CDC 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* A52CE0 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* A52CE4 80240424 00431021 */ addu $v0, $v0, $v1 -/* A52CE8 80240428 00021043 */ sra $v0, $v0, 1 -/* A52CEC 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* A52CF0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A52CF4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A52CF8 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A52CFC 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A52D00 80240440 8C460028 */ lw $a2, 0x28($v0) -/* A52D04 80240444 0C00A7B5 */ jal dist2D -/* A52D08 80240448 8C470030 */ lw $a3, 0x30($v0) -/* A52D0C 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* A52D10 80240450 46020003 */ div.s $f0, $f0, $f2 -/* A52D14 80240454 3C018024 */ lui $at, %hi(D_80242030_A548F0) -/* A52D18 80240458 D4222030 */ ldc1 $f2, %lo(D_80242030_A548F0)($at) -/* A52D1C 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* A52D20 80240460 46220000 */ add.d $f0, $f0, $f2 -/* A52D24 80240464 4620010D */ trunc.w.d $f4, $f0 -/* A52D28 80240468 44022000 */ mfc1 $v0, $f4 -/* A52D2C 8024046C 00000000 */ nop -/* A52D30 80240470 A602008E */ sh $v0, 0x8e($s0) -/* A52D34 80240474 00021400 */ sll $v0, $v0, 0x10 -/* A52D38 80240478 8E230078 */ lw $v1, 0x78($s1) -/* A52D3C 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* A52D40 80240480 0043102A */ slt $v0, $v0, $v1 -/* A52D44 80240484 10400003 */ beqz $v0, .L80240494 -/* A52D48 80240488 00000000 */ nop -/* A52D4C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* A52D50 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* A52D54 80240494 8602008E */ lh $v0, 0x8e($s0) -/* A52D58 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* A52D5C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* A52D60 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* A52D64 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A52D68 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A52D6C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A52D70 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A52D74 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A52D78 802404B8 03E00008 */ jr $ra -/* A52D7C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index 12e26a0850..954548ad15 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -244,7 +244,7 @@ glabel func_802406A4_A52F64 /* A532C4 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* A532C8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A532CC 80240A0C 0C0900E3 */ jal func_8024038C_A52C4C +/* A532CC 80240A0C 0C0900E3 */ jal kpa_11_UnkDistFunc /* A532D0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A532D4 80240A14 08090294 */ j .L80240A50 /* A532D8 80240A18 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s deleted file mode 100644 index 96831ce094..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80241CF0_A9E920 -.double 0.8 - -.section .text - -glabel func_8024022C_A9CE5C -/* A9CE5C 8024022C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9CE60 80240230 AFB3001C */ sw $s3, 0x1c($sp) -/* A9CE64 80240234 0080982D */ daddu $s3, $a0, $zero -/* A9CE68 80240238 AFBF0020 */ sw $ra, 0x20($sp) -/* A9CE6C 8024023C AFB20018 */ sw $s2, 0x18($sp) -/* A9CE70 80240240 AFB10014 */ sw $s1, 0x14($sp) -/* A9CE74 80240244 AFB00010 */ sw $s0, 0x10($sp) -/* A9CE78 80240248 8E710148 */ lw $s1, 0x148($s3) -/* A9CE7C 8024024C 86240008 */ lh $a0, 8($s1) -/* A9CE80 80240250 0C00EABB */ jal get_npc_unsafe -/* A9CE84 80240254 00A0902D */ daddu $s2, $a1, $zero -/* A9CE88 80240258 0040802D */ daddu $s0, $v0, $zero -/* A9CE8C 8024025C 8602008E */ lh $v0, 0x8e($s0) -/* A9CE90 80240260 9603008E */ lhu $v1, 0x8e($s0) -/* A9CE94 80240264 18400005 */ blez $v0, .L8024027C -/* A9CE98 80240268 2462FFFF */ addiu $v0, $v1, -1 -/* A9CE9C 8024026C A602008E */ sh $v0, 0x8e($s0) -/* A9CEA0 80240270 00021400 */ sll $v0, $v0, 0x10 -/* A9CEA4 80240274 1C400033 */ bgtz $v0, .L80240344 -/* A9CEA8 80240278 00000000 */ nop -.L8024027C: -/* A9CEAC 8024027C 8602008C */ lh $v0, 0x8c($s0) -/* A9CEB0 80240280 14400030 */ bnez $v0, .L80240344 -/* A9CEB4 80240284 00000000 */ nop -/* A9CEB8 80240288 8E2200CC */ lw $v0, 0xcc($s1) -/* A9CEBC 8024028C 8C420024 */ lw $v0, 0x24($v0) -/* A9CEC0 80240290 AE020028 */ sw $v0, 0x28($s0) -/* A9CEC4 80240294 C6400018 */ lwc1 $f0, 0x18($s2) -/* A9CEC8 80240298 E6000018 */ swc1 $f0, 0x18($s0) -/* A9CECC 8024029C 8E230088 */ lw $v1, 0x88($s1) -/* A9CED0 802402A0 24020005 */ addiu $v0, $zero, 5 -/* A9CED4 802402A4 10620005 */ beq $v1, $v0, .L802402BC -/* A9CED8 802402A8 00000000 */ nop -/* A9CEDC 802402AC 10600003 */ beqz $v1, .L802402BC -/* A9CEE0 802402B0 24020001 */ addiu $v0, $zero, 1 -/* A9CEE4 802402B4 14620006 */ bne $v1, $v0, .L802402D0 -/* A9CEE8 802402B8 00000000 */ nop -.L802402BC: -/* A9CEEC 802402BC 8E220084 */ lw $v0, 0x84($s1) -/* A9CEF0 802402C0 00021FC2 */ srl $v1, $v0, 0x1f -/* A9CEF4 802402C4 00431021 */ addu $v0, $v0, $v1 -/* A9CEF8 802402C8 00021043 */ sra $v0, $v0, 1 -/* A9CEFC 802402CC A60200A8 */ sh $v0, 0xa8($s0) -.L802402D0: -/* A9CF00 802402D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9CF04 802402D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9CF08 802402D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A9CF0C 802402DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A9CF10 802402E0 8C460028 */ lw $a2, 0x28($v0) -/* A9CF14 802402E4 0C00A7B5 */ jal dist2D -/* A9CF18 802402E8 8C470030 */ lw $a3, 0x30($v0) -/* A9CF1C 802402EC C6020018 */ lwc1 $f2, 0x18($s0) -/* A9CF20 802402F0 46020003 */ div.s $f0, $f0, $f2 -/* A9CF24 802402F4 3C018024 */ lui $at, %hi(D_80241CF0_A9E920) -/* A9CF28 802402F8 D4221CF0 */ ldc1 $f2, %lo(D_80241CF0_A9E920)($at) -/* A9CF2C 802402FC 46000021 */ cvt.d.s $f0, $f0 -/* A9CF30 80240300 46220000 */ add.d $f0, $f0, $f2 -/* A9CF34 80240304 4620010D */ trunc.w.d $f4, $f0 -/* A9CF38 80240308 44022000 */ mfc1 $v0, $f4 -/* A9CF3C 8024030C 00000000 */ nop -/* A9CF40 80240310 A602008E */ sh $v0, 0x8e($s0) -/* A9CF44 80240314 00021400 */ sll $v0, $v0, 0x10 -/* A9CF48 80240318 8E230078 */ lw $v1, 0x78($s1) -/* A9CF4C 8024031C 00021403 */ sra $v0, $v0, 0x10 -/* A9CF50 80240320 0043102A */ slt $v0, $v0, $v1 -/* A9CF54 80240324 10400003 */ beqz $v0, .L80240334 -/* A9CF58 80240328 00000000 */ nop -/* A9CF5C 8024032C 9622007A */ lhu $v0, 0x7a($s1) -/* A9CF60 80240330 A602008E */ sh $v0, 0x8e($s0) -.L80240334: -/* A9CF64 80240334 8602008E */ lh $v0, 0x8e($s0) -/* A9CF68 80240338 AE22007C */ sw $v0, 0x7c($s1) -/* A9CF6C 8024033C 2402000E */ addiu $v0, $zero, 0xe -/* A9CF70 80240340 AE620070 */ sw $v0, 0x70($s3) -.L80240344: -/* A9CF74 80240344 8FBF0020 */ lw $ra, 0x20($sp) -/* A9CF78 80240348 8FB3001C */ lw $s3, 0x1c($sp) -/* A9CF7C 8024034C 8FB20018 */ lw $s2, 0x18($sp) -/* A9CF80 80240350 8FB10014 */ lw $s1, 0x14($sp) -/* A9CF84 80240354 8FB00010 */ lw $s0, 0x10($sp) -/* A9CF88 80240358 03E00008 */ jr $ra -/* A9CF8C 8024035C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index 4bc4f46e3f..d52d318f94 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -244,7 +244,7 @@ glabel func_80240544_A9D174 /* A9D4D4 802408A4 0260202D */ daddu $a0, $s3, $zero .L802408A8: /* A9D4D8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* A9D4DC 802408AC 0C09008B */ jal func_8024022C_A9CE5C +/* A9D4DC 802408AC 0C09008B */ jal kpa_113_UnkDistFunc /* A9D4E0 802408B0 02A0302D */ daddu $a2, $s5, $zero /* A9D4E4 802408B4 0809023C */ j .L802408F0 /* A9D4E8 802408B8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s deleted file mode 100644 index 00c08e4e61..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802412C8_A61C98.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243658_A64028 -.double 0.8 - -.section .text - -glabel func_802412C8_A61C98 -/* A61C98 802412C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A61C9C 802412CC AFB3001C */ sw $s3, 0x1c($sp) -/* A61CA0 802412D0 0080982D */ daddu $s3, $a0, $zero -/* A61CA4 802412D4 AFBF0020 */ sw $ra, 0x20($sp) -/* A61CA8 802412D8 AFB20018 */ sw $s2, 0x18($sp) -/* A61CAC 802412DC AFB10014 */ sw $s1, 0x14($sp) -/* A61CB0 802412E0 AFB00010 */ sw $s0, 0x10($sp) -/* A61CB4 802412E4 8E710148 */ lw $s1, 0x148($s3) -/* A61CB8 802412E8 86240008 */ lh $a0, 8($s1) -/* A61CBC 802412EC 0C00EABB */ jal get_npc_unsafe -/* A61CC0 802412F0 00A0902D */ daddu $s2, $a1, $zero -/* A61CC4 802412F4 0040802D */ daddu $s0, $v0, $zero -/* A61CC8 802412F8 8602008E */ lh $v0, 0x8e($s0) -/* A61CCC 802412FC 9603008E */ lhu $v1, 0x8e($s0) -/* A61CD0 80241300 18400005 */ blez $v0, .L80241318 -/* A61CD4 80241304 2462FFFF */ addiu $v0, $v1, -1 -/* A61CD8 80241308 A602008E */ sh $v0, 0x8e($s0) -/* A61CDC 8024130C 00021400 */ sll $v0, $v0, 0x10 -/* A61CE0 80241310 1C400033 */ bgtz $v0, .L802413E0 -/* A61CE4 80241314 00000000 */ nop -.L80241318: -/* A61CE8 80241318 8602008C */ lh $v0, 0x8c($s0) -/* A61CEC 8024131C 14400030 */ bnez $v0, .L802413E0 -/* A61CF0 80241320 00000000 */ nop -/* A61CF4 80241324 8E2200CC */ lw $v0, 0xcc($s1) -/* A61CF8 80241328 8C420024 */ lw $v0, 0x24($v0) -/* A61CFC 8024132C AE020028 */ sw $v0, 0x28($s0) -/* A61D00 80241330 C6400018 */ lwc1 $f0, 0x18($s2) -/* A61D04 80241334 E6000018 */ swc1 $f0, 0x18($s0) -/* A61D08 80241338 8E230088 */ lw $v1, 0x88($s1) -/* A61D0C 8024133C 24020005 */ addiu $v0, $zero, 5 -/* A61D10 80241340 10620005 */ beq $v1, $v0, .L80241358 -/* A61D14 80241344 00000000 */ nop -/* A61D18 80241348 10600003 */ beqz $v1, .L80241358 -/* A61D1C 8024134C 24020001 */ addiu $v0, $zero, 1 -/* A61D20 80241350 14620006 */ bne $v1, $v0, .L8024136C -/* A61D24 80241354 00000000 */ nop -.L80241358: -/* A61D28 80241358 8E220084 */ lw $v0, 0x84($s1) -/* A61D2C 8024135C 00021FC2 */ srl $v1, $v0, 0x1f -/* A61D30 80241360 00431021 */ addu $v0, $v0, $v1 -/* A61D34 80241364 00021043 */ sra $v0, $v0, 1 -/* A61D38 80241368 A60200A8 */ sh $v0, 0xa8($s0) -.L8024136C: -/* A61D3C 8024136C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A61D40 80241370 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A61D44 80241374 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A61D48 80241378 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A61D4C 8024137C 8C460028 */ lw $a2, 0x28($v0) -/* A61D50 80241380 0C00A7B5 */ jal dist2D -/* A61D54 80241384 8C470030 */ lw $a3, 0x30($v0) -/* A61D58 80241388 C6020018 */ lwc1 $f2, 0x18($s0) -/* A61D5C 8024138C 46020003 */ div.s $f0, $f0, $f2 -/* A61D60 80241390 3C018024 */ lui $at, %hi(D_80243658_A64028) -/* A61D64 80241394 D4223658 */ ldc1 $f2, %lo(D_80243658_A64028)($at) -/* A61D68 80241398 46000021 */ cvt.d.s $f0, $f0 -/* A61D6C 8024139C 46220000 */ add.d $f0, $f0, $f2 -/* A61D70 802413A0 4620010D */ trunc.w.d $f4, $f0 -/* A61D74 802413A4 44022000 */ mfc1 $v0, $f4 -/* A61D78 802413A8 00000000 */ nop -/* A61D7C 802413AC A602008E */ sh $v0, 0x8e($s0) -/* A61D80 802413B0 00021400 */ sll $v0, $v0, 0x10 -/* A61D84 802413B4 8E230078 */ lw $v1, 0x78($s1) -/* A61D88 802413B8 00021403 */ sra $v0, $v0, 0x10 -/* A61D8C 802413BC 0043102A */ slt $v0, $v0, $v1 -/* A61D90 802413C0 10400003 */ beqz $v0, .L802413D0 -/* A61D94 802413C4 00000000 */ nop -/* A61D98 802413C8 9622007A */ lhu $v0, 0x7a($s1) -/* A61D9C 802413CC A602008E */ sh $v0, 0x8e($s0) -.L802413D0: -/* A61DA0 802413D0 8602008E */ lh $v0, 0x8e($s0) -/* A61DA4 802413D4 AE22007C */ sw $v0, 0x7c($s1) -/* A61DA8 802413D8 2402000E */ addiu $v0, $zero, 0xe -/* A61DAC 802413DC AE620070 */ sw $v0, 0x70($s3) -.L802413E0: -/* A61DB0 802413E0 8FBF0020 */ lw $ra, 0x20($sp) -/* A61DB4 802413E4 8FB3001C */ lw $s3, 0x1c($sp) -/* A61DB8 802413E8 8FB20018 */ lw $s2, 0x18($sp) -/* A61DBC 802413EC 8FB10014 */ lw $s1, 0x14($sp) -/* A61DC0 802413F0 8FB00010 */ lw $s0, 0x10($sp) -/* A61DC4 802413F4 03E00008 */ jr $ra -/* A61DC8 802413F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index fa935172f6..54a3205f09 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -244,7 +244,7 @@ glabel func_802415E0_A61FB0 /* A62310 80241940 0260202D */ daddu $a0, $s3, $zero .L80241944: /* A62314 80241944 0280282D */ daddu $a1, $s4, $zero -/* A62318 80241948 0C0904B2 */ jal func_802412C8_A61C98 +/* A62318 80241948 0C0904B2 */ jal kpa_50_UnkDistFunc /* A6231C 8024194C 02A0302D */ daddu $a2, $s5, $zero /* A62320 80241950 08090663 */ j .L8024198C /* A62324 80241954 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s deleted file mode 100644 index c7faac972b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243008_A67098 -.double 0.8 - -.section .text - -glabel func_802414C8_A65558 -/* A65558 802414C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A6555C 802414CC AFB3001C */ sw $s3, 0x1c($sp) -/* A65560 802414D0 0080982D */ daddu $s3, $a0, $zero -/* A65564 802414D4 AFBF0020 */ sw $ra, 0x20($sp) -/* A65568 802414D8 AFB20018 */ sw $s2, 0x18($sp) -/* A6556C 802414DC AFB10014 */ sw $s1, 0x14($sp) -/* A65570 802414E0 AFB00010 */ sw $s0, 0x10($sp) -/* A65574 802414E4 8E710148 */ lw $s1, 0x148($s3) -/* A65578 802414E8 86240008 */ lh $a0, 8($s1) -/* A6557C 802414EC 0C00EABB */ jal get_npc_unsafe -/* A65580 802414F0 00A0902D */ daddu $s2, $a1, $zero -/* A65584 802414F4 0040802D */ daddu $s0, $v0, $zero -/* A65588 802414F8 8602008E */ lh $v0, 0x8e($s0) -/* A6558C 802414FC 9603008E */ lhu $v1, 0x8e($s0) -/* A65590 80241500 18400005 */ blez $v0, .L80241518 -/* A65594 80241504 2462FFFF */ addiu $v0, $v1, -1 -/* A65598 80241508 A602008E */ sh $v0, 0x8e($s0) -/* A6559C 8024150C 00021400 */ sll $v0, $v0, 0x10 -/* A655A0 80241510 1C400033 */ bgtz $v0, .L802415E0 -/* A655A4 80241514 00000000 */ nop -.L80241518: -/* A655A8 80241518 8602008C */ lh $v0, 0x8c($s0) -/* A655AC 8024151C 14400030 */ bnez $v0, .L802415E0 -/* A655B0 80241520 00000000 */ nop -/* A655B4 80241524 8E2200CC */ lw $v0, 0xcc($s1) -/* A655B8 80241528 8C420024 */ lw $v0, 0x24($v0) -/* A655BC 8024152C AE020028 */ sw $v0, 0x28($s0) -/* A655C0 80241530 C6400018 */ lwc1 $f0, 0x18($s2) -/* A655C4 80241534 E6000018 */ swc1 $f0, 0x18($s0) -/* A655C8 80241538 8E230088 */ lw $v1, 0x88($s1) -/* A655CC 8024153C 24020005 */ addiu $v0, $zero, 5 -/* A655D0 80241540 10620005 */ beq $v1, $v0, .L80241558 -/* A655D4 80241544 00000000 */ nop -/* A655D8 80241548 10600003 */ beqz $v1, .L80241558 -/* A655DC 8024154C 24020001 */ addiu $v0, $zero, 1 -/* A655E0 80241550 14620006 */ bne $v1, $v0, .L8024156C -/* A655E4 80241554 00000000 */ nop -.L80241558: -/* A655E8 80241558 8E220084 */ lw $v0, 0x84($s1) -/* A655EC 8024155C 00021FC2 */ srl $v1, $v0, 0x1f -/* A655F0 80241560 00431021 */ addu $v0, $v0, $v1 -/* A655F4 80241564 00021043 */ sra $v0, $v0, 1 -/* A655F8 80241568 A60200A8 */ sh $v0, 0xa8($s0) -.L8024156C: -/* A655FC 8024156C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A65600 80241570 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A65604 80241574 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A65608 80241578 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6560C 8024157C 8C460028 */ lw $a2, 0x28($v0) -/* A65610 80241580 0C00A7B5 */ jal dist2D -/* A65614 80241584 8C470030 */ lw $a3, 0x30($v0) -/* A65618 80241588 C6020018 */ lwc1 $f2, 0x18($s0) -/* A6561C 8024158C 46020003 */ div.s $f0, $f0, $f2 -/* A65620 80241590 3C018024 */ lui $at, %hi(D_80243008_A67098) -/* A65624 80241594 D4223008 */ ldc1 $f2, %lo(D_80243008_A67098)($at) -/* A65628 80241598 46000021 */ cvt.d.s $f0, $f0 -/* A6562C 8024159C 46220000 */ add.d $f0, $f0, $f2 -/* A65630 802415A0 4620010D */ trunc.w.d $f4, $f0 -/* A65634 802415A4 44022000 */ mfc1 $v0, $f4 -/* A65638 802415A8 00000000 */ nop -/* A6563C 802415AC A602008E */ sh $v0, 0x8e($s0) -/* A65640 802415B0 00021400 */ sll $v0, $v0, 0x10 -/* A65644 802415B4 8E230078 */ lw $v1, 0x78($s1) -/* A65648 802415B8 00021403 */ sra $v0, $v0, 0x10 -/* A6564C 802415BC 0043102A */ slt $v0, $v0, $v1 -/* A65650 802415C0 10400003 */ beqz $v0, .L802415D0 -/* A65654 802415C4 00000000 */ nop -/* A65658 802415C8 9622007A */ lhu $v0, 0x7a($s1) -/* A6565C 802415CC A602008E */ sh $v0, 0x8e($s0) -.L802415D0: -/* A65660 802415D0 8602008E */ lh $v0, 0x8e($s0) -/* A65664 802415D4 AE22007C */ sw $v0, 0x7c($s1) -/* A65668 802415D8 2402000E */ addiu $v0, $zero, 0xe -/* A6566C 802415DC AE620070 */ sw $v0, 0x70($s3) -.L802415E0: -/* A65670 802415E0 8FBF0020 */ lw $ra, 0x20($sp) -/* A65674 802415E4 8FB3001C */ lw $s3, 0x1c($sp) -/* A65678 802415E8 8FB20018 */ lw $s2, 0x18($sp) -/* A6567C 802415EC 8FB10014 */ lw $s1, 0x14($sp) -/* A65680 802415F0 8FB00010 */ lw $s0, 0x10($sp) -/* A65684 802415F4 03E00008 */ jr $ra -/* A65688 802415F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index 0b501eb6ce..1a900e615c 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -244,7 +244,7 @@ glabel func_802417E0_A65870 /* A65BD0 80241B40 0260202D */ daddu $a0, $s3, $zero .L80241B44: /* A65BD4 80241B44 0280282D */ daddu $a1, $s4, $zero -/* A65BD8 80241B48 0C090532 */ jal func_802414C8_A65558 +/* A65BD8 80241B48 0C090532 */ jal kpa_51_UnkDistFunc /* A65BDC 80241B4C 02A0302D */ daddu $a2, $s5, $zero /* A65BE0 80241B50 080906E3 */ j .L80241B8C /* A65BE4 80241B54 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s deleted file mode 100644 index e43017cafe..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024038C_A6E76C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243CD0_A720B0 -.double 0.8 - -.section .text - -glabel func_8024038C_A6E76C -/* A6E76C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A6E770 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* A6E774 80240394 0080982D */ daddu $s3, $a0, $zero -/* A6E778 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* A6E77C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* A6E780 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* A6E784 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* A6E788 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* A6E78C 802403AC 86240008 */ lh $a0, 8($s1) -/* A6E790 802403B0 0C00EABB */ jal get_npc_unsafe -/* A6E794 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* A6E798 802403B8 0040802D */ daddu $s0, $v0, $zero -/* A6E79C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* A6E7A0 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* A6E7A4 802403C4 18400005 */ blez $v0, .L802403DC -/* A6E7A8 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* A6E7AC 802403CC A602008E */ sh $v0, 0x8e($s0) -/* A6E7B0 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* A6E7B4 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A6E7B8 802403D8 00000000 */ nop -.L802403DC: -/* A6E7BC 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* A6E7C0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A6E7C4 802403E4 00000000 */ nop -/* A6E7C8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* A6E7CC 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* A6E7D0 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* A6E7D4 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A6E7D8 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* A6E7DC 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* A6E7E0 80240400 24020005 */ addiu $v0, $zero, 5 -/* A6E7E4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A6E7E8 80240408 00000000 */ nop -/* A6E7EC 8024040C 10600003 */ beqz $v1, .L8024041C -/* A6E7F0 80240410 24020001 */ addiu $v0, $zero, 1 -/* A6E7F4 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A6E7F8 80240418 00000000 */ nop -.L8024041C: -/* A6E7FC 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* A6E800 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* A6E804 80240424 00431021 */ addu $v0, $v0, $v1 -/* A6E808 80240428 00021043 */ sra $v0, $v0, 1 -/* A6E80C 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* A6E810 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6E814 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A6E818 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6E81C 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6E820 80240440 8C460028 */ lw $a2, 0x28($v0) -/* A6E824 80240444 0C00A7B5 */ jal dist2D -/* A6E828 80240448 8C470030 */ lw $a3, 0x30($v0) -/* A6E82C 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* A6E830 80240450 46020003 */ div.s $f0, $f0, $f2 -/* A6E834 80240454 3C018024 */ lui $at, %hi(D_80243CD0_A720B0) -/* A6E838 80240458 D4223CD0 */ ldc1 $f2, %lo(D_80243CD0_A720B0)($at) -/* A6E83C 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* A6E840 80240460 46220000 */ add.d $f0, $f0, $f2 -/* A6E844 80240464 4620010D */ trunc.w.d $f4, $f0 -/* A6E848 80240468 44022000 */ mfc1 $v0, $f4 -/* A6E84C 8024046C 00000000 */ nop -/* A6E850 80240470 A602008E */ sh $v0, 0x8e($s0) -/* A6E854 80240474 00021400 */ sll $v0, $v0, 0x10 -/* A6E858 80240478 8E230078 */ lw $v1, 0x78($s1) -/* A6E85C 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* A6E860 80240480 0043102A */ slt $v0, $v0, $v1 -/* A6E864 80240484 10400003 */ beqz $v0, .L80240494 -/* A6E868 80240488 00000000 */ nop -/* A6E86C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* A6E870 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* A6E874 80240494 8602008E */ lh $v0, 0x8e($s0) -/* A6E878 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* A6E87C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* A6E880 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* A6E884 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A6E888 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A6E88C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A6E890 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A6E894 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A6E898 802404B8 03E00008 */ jr $ra -/* A6E89C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index cae682df75..b5c7cac07f 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -244,7 +244,7 @@ glabel func_802406A4_A6EA84 /* A6EDE4 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* A6EDE8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A6EDEC 80240A0C 0C0900E3 */ jal func_8024038C_A6E76C +/* A6EDEC 80240A0C 0C0900E3 */ jal kpa_61_UnkDistFunc /* A6EDF0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A6EDF4 80240A14 08090294 */ j .L80240A50 /* A6EDF8 80240A18 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s deleted file mode 100644 index 19b1299cd0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_8024038C_A74BFC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243BF0_A78460 -.double 0.8 - -.section .text - -glabel func_8024038C_A74BFC -/* A74BFC 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A74C00 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* A74C04 80240394 0080982D */ daddu $s3, $a0, $zero -/* A74C08 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* A74C0C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* A74C10 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* A74C14 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* A74C18 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* A74C1C 802403AC 86240008 */ lh $a0, 8($s1) -/* A74C20 802403B0 0C00EABB */ jal get_npc_unsafe -/* A74C24 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* A74C28 802403B8 0040802D */ daddu $s0, $v0, $zero -/* A74C2C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* A74C30 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* A74C34 802403C4 18400005 */ blez $v0, .L802403DC -/* A74C38 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* A74C3C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* A74C40 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* A74C44 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* A74C48 802403D8 00000000 */ nop -.L802403DC: -/* A74C4C 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* A74C50 802403E0 14400030 */ bnez $v0, .L802404A4 -/* A74C54 802403E4 00000000 */ nop -/* A74C58 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* A74C5C 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* A74C60 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* A74C64 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A74C68 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* A74C6C 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* A74C70 80240400 24020005 */ addiu $v0, $zero, 5 -/* A74C74 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* A74C78 80240408 00000000 */ nop -/* A74C7C 8024040C 10600003 */ beqz $v1, .L8024041C -/* A74C80 80240410 24020001 */ addiu $v0, $zero, 1 -/* A74C84 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* A74C88 80240418 00000000 */ nop -.L8024041C: -/* A74C8C 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* A74C90 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* A74C94 80240424 00431021 */ addu $v0, $v0, $v1 -/* A74C98 80240428 00021043 */ sra $v0, $v0, 1 -/* A74C9C 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* A74CA0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A74CA4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A74CA8 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A74CAC 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A74CB0 80240440 8C460028 */ lw $a2, 0x28($v0) -/* A74CB4 80240444 0C00A7B5 */ jal dist2D -/* A74CB8 80240448 8C470030 */ lw $a3, 0x30($v0) -/* A74CBC 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* A74CC0 80240450 46020003 */ div.s $f0, $f0, $f2 -/* A74CC4 80240454 3C018024 */ lui $at, %hi(D_80243BF0_A78460) -/* A74CC8 80240458 D4223BF0 */ ldc1 $f2, %lo(D_80243BF0_A78460)($at) -/* A74CCC 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* A74CD0 80240460 46220000 */ add.d $f0, $f0, $f2 -/* A74CD4 80240464 4620010D */ trunc.w.d $f4, $f0 -/* A74CD8 80240468 44022000 */ mfc1 $v0, $f4 -/* A74CDC 8024046C 00000000 */ nop -/* A74CE0 80240470 A602008E */ sh $v0, 0x8e($s0) -/* A74CE4 80240474 00021400 */ sll $v0, $v0, 0x10 -/* A74CE8 80240478 8E230078 */ lw $v1, 0x78($s1) -/* A74CEC 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* A74CF0 80240480 0043102A */ slt $v0, $v0, $v1 -/* A74CF4 80240484 10400003 */ beqz $v0, .L80240494 -/* A74CF8 80240488 00000000 */ nop -/* A74CFC 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* A74D00 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* A74D04 80240494 8602008E */ lh $v0, 0x8e($s0) -/* A74D08 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* A74D0C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* A74D10 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* A74D14 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* A74D18 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* A74D1C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* A74D20 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* A74D24 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* A74D28 802404B8 03E00008 */ jr $ra -/* A74D2C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 9a10663626..6eff7a666e 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -244,7 +244,7 @@ glabel func_802406A4_A74F14 /* A75274 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* A75278 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A7527C 80240A0C 0C0900E3 */ jal func_8024038C_A74BFC +/* A7527C 80240A0C 0C0900E3 */ jal kpa_70_UnkDistFunc /* A75280 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A75284 80240A14 08090294 */ j .L80240A50 /* A75288 80240A18 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s deleted file mode 100644 index f12dab24a7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240000_A86A50.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245A30_A8C480 -.double 32767.0 - -.section .text - -glabel func_80240000_A86A50 -/* A86A50 80240000 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A86A54 80240004 AFB50024 */ sw $s5, 0x24($sp) -/* A86A58 80240008 0080A82D */ daddu $s5, $a0, $zero -/* A86A5C 8024000C AFBF002C */ sw $ra, 0x2c($sp) -/* A86A60 80240010 AFB60028 */ sw $s6, 0x28($sp) -/* A86A64 80240014 AFB40020 */ sw $s4, 0x20($sp) -/* A86A68 80240018 AFB3001C */ sw $s3, 0x1c($sp) -/* A86A6C 8024001C AFB20018 */ sw $s2, 0x18($sp) -/* A86A70 80240020 AFB10014 */ sw $s1, 0x14($sp) -/* A86A74 80240024 AFB00010 */ sw $s0, 0x10($sp) -/* A86A78 80240028 F7B80040 */ sdc1 $f24, 0x40($sp) -/* A86A7C 8024002C F7B60038 */ sdc1 $f22, 0x38($sp) -/* A86A80 80240030 F7B40030 */ sdc1 $f20, 0x30($sp) -/* A86A84 80240034 8EB30148 */ lw $s3, 0x148($s5) -/* A86A88 80240038 86640008 */ lh $a0, 8($s3) -/* A86A8C 8024003C 0C00EABB */ jal get_npc_unsafe -/* A86A90 80240040 00A0B02D */ daddu $s6, $a1, $zero -/* A86A94 80240044 0040A02D */ daddu $s4, $v0, $zero -/* A86A98 80240048 AEA00074 */ sw $zero, 0x74($s5) -/* A86A9C 8024004C C6980038 */ lwc1 $f24, 0x38($s4) -/* A86AA0 80240050 C6960040 */ lwc1 $f22, 0x40($s4) -/* A86AA4 80240054 0000902D */ daddu $s2, $zero, $zero -/* A86AA8 80240058 AEA00078 */ sw $zero, 0x78($s5) -/* A86AAC 8024005C 8E6300D0 */ lw $v1, 0xd0($s3) -/* A86AB0 80240060 8C620000 */ lw $v0, ($v1) -/* A86AB4 80240064 3C0146FF */ lui $at, 0x46ff -/* A86AB8 80240068 3421FE00 */ ori $at, $at, 0xfe00 -/* A86ABC 8024006C 4481A000 */ mtc1 $at, $f20 -/* A86AC0 80240070 18400018 */ blez $v0, .L802400D4 -/* A86AC4 80240074 0240802D */ daddu $s0, $s2, $zero -/* A86AC8 80240078 0240882D */ daddu $s1, $s2, $zero -.L8024007C: -/* A86ACC 8024007C 02231021 */ addu $v0, $s1, $v1 -/* A86AD0 80240080 4600C306 */ mov.s $f12, $f24 -/* A86AD4 80240084 C4440004 */ lwc1 $f4, 4($v0) -/* A86AD8 80240088 46802120 */ cvt.s.w $f4, $f4 -/* A86ADC 8024008C 44062000 */ mfc1 $a2, $f4 -/* A86AE0 80240090 C444000C */ lwc1 $f4, 0xc($v0) -/* A86AE4 80240094 46802120 */ cvt.s.w $f4, $f4 -/* A86AE8 80240098 44072000 */ mfc1 $a3, $f4 -/* A86AEC 8024009C 0C00A7B5 */ jal dist2D -/* A86AF0 802400A0 4600B386 */ mov.s $f14, $f22 -/* A86AF4 802400A4 4614003C */ c.lt.s $f0, $f20 -/* A86AF8 802400A8 00000000 */ nop -/* A86AFC 802400AC 45000003 */ bc1f .L802400BC -/* A86B00 802400B0 2631000C */ addiu $s1, $s1, 0xc -/* A86B04 802400B4 46000506 */ mov.s $f20, $f0 -/* A86B08 802400B8 AEB20078 */ sw $s2, 0x78($s5) -.L802400BC: -/* A86B0C 802400BC 8E6300D0 */ lw $v1, 0xd0($s3) -/* A86B10 802400C0 26100001 */ addiu $s0, $s0, 1 -/* A86B14 802400C4 8C620000 */ lw $v0, ($v1) -/* A86B18 802400C8 0202102A */ slt $v0, $s0, $v0 -/* A86B1C 802400CC 1440FFEB */ bnez $v0, .L8024007C -/* A86B20 802400D0 26520001 */ addiu $s2, $s2, 1 -.L802400D4: -/* A86B24 802400D4 8E6200CC */ lw $v0, 0xcc($s3) -/* A86B28 802400D8 8C420004 */ lw $v0, 4($v0) -/* A86B2C 802400DC AE820028 */ sw $v0, 0x28($s4) -/* A86B30 802400E0 8E6200D0 */ lw $v0, 0xd0($s3) -/* A86B34 802400E4 8C42007C */ lw $v0, 0x7c($v0) -/* A86B38 802400E8 04410004 */ bgez $v0, .L802400FC -/* A86B3C 802400EC 00000000 */ nop -/* A86B40 802400F0 C6C00000 */ lwc1 $f0, ($s6) -/* A86B44 802400F4 08090047 */ j .L8024011C -/* A86B48 802400F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802400FC: -/* A86B4C 802400FC 3C018024 */ lui $at, %hi(D_80245A30_A8C480) -/* A86B50 80240100 D4225A30 */ ldc1 $f2, %lo(D_80245A30_A8C480)($at) -/* A86B54 80240104 44820000 */ mtc1 $v0, $f0 -/* A86B58 80240108 00000000 */ nop -/* A86B5C 8024010C 46800021 */ cvt.d.w $f0, $f0 -/* A86B60 80240110 46220003 */ div.d $f0, $f0, $f2 -/* A86B64 80240114 46200020 */ cvt.s.d $f0, $f0 -/* A86B68 80240118 E6800018 */ swc1 $f0, 0x18($s4) -.L8024011C: -/* A86B6C 8024011C 24020001 */ addiu $v0, $zero, 1 -/* A86B70 80240120 AEA20070 */ sw $v0, 0x70($s5) -/* A86B74 80240124 8FBF002C */ lw $ra, 0x2c($sp) -/* A86B78 80240128 8FB60028 */ lw $s6, 0x28($sp) -/* A86B7C 8024012C 8FB50024 */ lw $s5, 0x24($sp) -/* A86B80 80240130 8FB40020 */ lw $s4, 0x20($sp) -/* A86B84 80240134 8FB3001C */ lw $s3, 0x1c($sp) -/* A86B88 80240138 8FB20018 */ lw $s2, 0x18($sp) -/* A86B8C 8024013C 8FB10014 */ lw $s1, 0x14($sp) -/* A86B90 80240140 8FB00010 */ lw $s0, 0x10($sp) -/* A86B94 80240144 D7B80040 */ ldc1 $f24, 0x40($sp) -/* A86B98 80240148 D7B60038 */ ldc1 $f22, 0x38($sp) -/* A86B9C 8024014C D7B40030 */ ldc1 $f20, 0x30($sp) -/* A86BA0 80240150 03E00008 */ jr $ra -/* A86BA4 80240154 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s deleted file mode 100644 index c27bbc4eb7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245A38_A8C488 -.double 32767.0 - -.section .text - -glabel func_8024067C_A870CC -/* A870CC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A870D0 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* A870D4 80240684 0080882D */ daddu $s1, $a0, $zero -/* A870D8 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* A870DC 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* A870E0 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* A870E4 80240694 8E300148 */ lw $s0, 0x148($s1) -/* A870E8 80240698 86040008 */ lh $a0, 8($s0) -/* A870EC 8024069C 0C00EABB */ jal get_npc_unsafe -/* A870F0 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* A870F4 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* A870F8 802406A8 24630001 */ addiu $v1, $v1, 1 -/* A870FC 802406AC AE230078 */ sw $v1, 0x78($s1) -/* A87100 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* A87104 802406B4 8C840000 */ lw $a0, ($a0) -/* A87108 802406B8 0064182A */ slt $v1, $v1, $a0 -/* A8710C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* A87110 802406C0 0040282D */ daddu $a1, $v0, $zero -/* A87114 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* A87118 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* A8711C 802406CC 8C420004 */ lw $v0, 4($v0) -/* A87120 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* A87124 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A87128 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* A8712C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* A87130 802406E0 00000000 */ nop -/* A87134 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* A87138 802406E8 080901C4 */ j .L80240710 -/* A8713C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* A87140 802406F0 3C018024 */ lui $at, %hi(D_80245A38_A8C488) -/* A87144 802406F4 D4225A38 */ ldc1 $f2, %lo(D_80245A38_A8C488)($at) -/* A87148 802406F8 44820000 */ mtc1 $v0, $f0 -/* A8714C 802406FC 00000000 */ nop -/* A87150 80240700 46800021 */ cvt.d.w $f0, $f0 -/* A87154 80240704 46220003 */ div.d $f0, $f0, $f2 -/* A87158 80240708 46200020 */ cvt.s.d $f0, $f0 -/* A8715C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* A87160 80240710 24020001 */ addiu $v0, $zero, 1 -/* A87164 80240714 AE220070 */ sw $v0, 0x70($s1) -/* A87168 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* A8716C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* A87170 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* A87174 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* A87178 80240728 03E00008 */ jr $ra -/* A8717C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s index 1e0aea2d5f..a2ec6dcb41 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -139,7 +139,7 @@ glabel func_80240B94_A875E4 glabel L80240D78_A877C8 /* A877C8 80240D78 0280202D */ daddu $a0, $s4, $zero /* A877CC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* A877D0 80240D80 0C090000 */ jal func_80240000_A86A50 +/* A877D0 80240D80 0C090000 */ jal kpa_91_UnkNpcAIFunc24 /* A877D4 80240D84 02A0302D */ daddu $a2, $s5, $zero glabel L80240D88_A877D8 /* A877D8 80240D88 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80240DB0_A87800 glabel L80240DC8_A87818 /* A87818 80240DC8 0280202D */ daddu $a0, $s4, $zero /* A8781C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* A87820 80240DD0 0C09019F */ jal func_8024067C_A870CC +/* A87820 80240DD0 0C09019F */ jal kpa_91_UnkNpcAIFunc25 /* A87824 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* A87828 80240DD8 0809039A */ j L80240E68_A878B8 /* A8782C 80240DDC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s deleted file mode 100644 index 0294ca5afc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245BD0_A8C620 -.double 0.8 - -.section .text - -glabel func_80240F0C_A8795C -/* A8795C 80240F0C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A87960 80240F10 AFB3001C */ sw $s3, 0x1c($sp) -/* A87964 80240F14 0080982D */ daddu $s3, $a0, $zero -/* A87968 80240F18 AFBF0020 */ sw $ra, 0x20($sp) -/* A8796C 80240F1C AFB20018 */ sw $s2, 0x18($sp) -/* A87970 80240F20 AFB10014 */ sw $s1, 0x14($sp) -/* A87974 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* A87978 80240F28 8E710148 */ lw $s1, 0x148($s3) -/* A8797C 80240F2C 86240008 */ lh $a0, 8($s1) -/* A87980 80240F30 0C00EABB */ jal get_npc_unsafe -/* A87984 80240F34 00A0902D */ daddu $s2, $a1, $zero -/* A87988 80240F38 0040802D */ daddu $s0, $v0, $zero -/* A8798C 80240F3C 8602008E */ lh $v0, 0x8e($s0) -/* A87990 80240F40 9603008E */ lhu $v1, 0x8e($s0) -/* A87994 80240F44 18400005 */ blez $v0, .L80240F5C -/* A87998 80240F48 2462FFFF */ addiu $v0, $v1, -1 -/* A8799C 80240F4C A602008E */ sh $v0, 0x8e($s0) -/* A879A0 80240F50 00021400 */ sll $v0, $v0, 0x10 -/* A879A4 80240F54 1C400033 */ bgtz $v0, .L80241024 -/* A879A8 80240F58 00000000 */ nop -.L80240F5C: -/* A879AC 80240F5C 8602008C */ lh $v0, 0x8c($s0) -/* A879B0 80240F60 14400030 */ bnez $v0, .L80241024 -/* A879B4 80240F64 00000000 */ nop -/* A879B8 80240F68 8E2200CC */ lw $v0, 0xcc($s1) -/* A879BC 80240F6C 8C420024 */ lw $v0, 0x24($v0) -/* A879C0 80240F70 AE020028 */ sw $v0, 0x28($s0) -/* A879C4 80240F74 C6400018 */ lwc1 $f0, 0x18($s2) -/* A879C8 80240F78 E6000018 */ swc1 $f0, 0x18($s0) -/* A879CC 80240F7C 8E230088 */ lw $v1, 0x88($s1) -/* A879D0 80240F80 24020005 */ addiu $v0, $zero, 5 -/* A879D4 80240F84 10620005 */ beq $v1, $v0, .L80240F9C -/* A879D8 80240F88 00000000 */ nop -/* A879DC 80240F8C 10600003 */ beqz $v1, .L80240F9C -/* A879E0 80240F90 24020001 */ addiu $v0, $zero, 1 -/* A879E4 80240F94 14620006 */ bne $v1, $v0, .L80240FB0 -/* A879E8 80240F98 00000000 */ nop -.L80240F9C: -/* A879EC 80240F9C 8E220084 */ lw $v0, 0x84($s1) -/* A879F0 80240FA0 00021FC2 */ srl $v1, $v0, 0x1f -/* A879F4 80240FA4 00431021 */ addu $v0, $v0, $v1 -/* A879F8 80240FA8 00021043 */ sra $v0, $v0, 1 -/* A879FC 80240FAC A60200A8 */ sh $v0, 0xa8($s0) -.L80240FB0: -/* A87A00 80240FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A87A04 80240FB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A87A08 80240FB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A87A0C 80240FBC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A87A10 80240FC0 8C460028 */ lw $a2, 0x28($v0) -/* A87A14 80240FC4 0C00A7B5 */ jal dist2D -/* A87A18 80240FC8 8C470030 */ lw $a3, 0x30($v0) -/* A87A1C 80240FCC C6020018 */ lwc1 $f2, 0x18($s0) -/* A87A20 80240FD0 46020003 */ div.s $f0, $f0, $f2 -/* A87A24 80240FD4 3C018024 */ lui $at, %hi(D_80245BD0_A8C620) -/* A87A28 80240FD8 D4225BD0 */ ldc1 $f2, %lo(D_80245BD0_A8C620)($at) -/* A87A2C 80240FDC 46000021 */ cvt.d.s $f0, $f0 -/* A87A30 80240FE0 46220000 */ add.d $f0, $f0, $f2 -/* A87A34 80240FE4 4620010D */ trunc.w.d $f4, $f0 -/* A87A38 80240FE8 44022000 */ mfc1 $v0, $f4 -/* A87A3C 80240FEC 00000000 */ nop -/* A87A40 80240FF0 A602008E */ sh $v0, 0x8e($s0) -/* A87A44 80240FF4 00021400 */ sll $v0, $v0, 0x10 -/* A87A48 80240FF8 8E230078 */ lw $v1, 0x78($s1) -/* A87A4C 80240FFC 00021403 */ sra $v0, $v0, 0x10 -/* A87A50 80241000 0043102A */ slt $v0, $v0, $v1 -/* A87A54 80241004 10400003 */ beqz $v0, .L80241014 -/* A87A58 80241008 00000000 */ nop -/* A87A5C 8024100C 9622007A */ lhu $v0, 0x7a($s1) -/* A87A60 80241010 A602008E */ sh $v0, 0x8e($s0) -.L80241014: -/* A87A64 80241014 8602008E */ lh $v0, 0x8e($s0) -/* A87A68 80241018 AE22007C */ sw $v0, 0x7c($s1) -/* A87A6C 8024101C 2402000E */ addiu $v0, $zero, 0xe -/* A87A70 80241020 AE620070 */ sw $v0, 0x70($s3) -.L80241024: -/* A87A74 80241024 8FBF0020 */ lw $ra, 0x20($sp) -/* A87A78 80241028 8FB3001C */ lw $s3, 0x1c($sp) -/* A87A7C 8024102C 8FB20018 */ lw $s2, 0x18($sp) -/* A87A80 80241030 8FB10014 */ lw $s1, 0x14($sp) -/* A87A84 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* A87A88 80241038 03E00008 */ jr $ra -/* A87A8C 8024103C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 18275efe24..1bc3c3527b 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -149,7 +149,7 @@ glabel func_80241224_A87C74 glabel L80241430_A87E80 /* A87E80 80241430 0260202D */ daddu $a0, $s3, $zero /* A87E84 80241434 0280282D */ daddu $a1, $s4, $zero -/* A87E88 80241438 0C090000 */ jal func_80240000_A86A50 +/* A87E88 80241438 0C090000 */ jal kpa_91_UnkNpcAIFunc24 /* A87E8C 8024143C 02A0302D */ daddu $a2, $s5, $zero /* A87E90 80241440 96220086 */ lhu $v0, 0x86($s1) /* A87E94 80241444 A64200A8 */ sh $v0, 0xa8($s2) @@ -175,7 +175,7 @@ glabel L80241470_A87EC0 glabel L80241488_A87ED8 /* A87ED8 80241488 0260202D */ daddu $a0, $s3, $zero /* A87EDC 8024148C 0280282D */ daddu $a1, $s4, $zero -/* A87EE0 80241490 0C09019F */ jal func_8024067C_A870CC +/* A87EE0 80241490 0C09019F */ jal kpa_91_UnkNpcAIFunc25 /* A87EE4 80241494 02A0302D */ daddu $a2, $s5, $zero /* A87EE8 80241498 08090540 */ j L80241500_A87F50 /* A87EEC 8024149C 00000000 */ nop @@ -187,7 +187,7 @@ glabel L802414A0_A87EF0 glabel L802414B0_A87F00 /* A87F00 802414B0 0260202D */ daddu $a0, $s3, $zero /* A87F04 802414B4 0280282D */ daddu $a1, $s4, $zero -/* A87F08 802414B8 0C0903C3 */ jal func_80240F0C_A8795C +/* A87F08 802414B8 0C0903C3 */ jal kpa_91_UnkDistFunc /* A87F0C 802414BC 02A0302D */ daddu $a2, $s5, $zero /* A87F10 802414C0 08090540 */ j L80241500_A87F50 /* A87F14 802414C4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s deleted file mode 100644 index 020a43d06c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802400E0_A8CB60.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245A00_A92480 -.double 32767.0 - -.section .text - -glabel func_802400E0_A8CB60 -/* A8CB60 802400E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A8CB64 802400E4 AFB50024 */ sw $s5, 0x24($sp) -/* A8CB68 802400E8 0080A82D */ daddu $s5, $a0, $zero -/* A8CB6C 802400EC AFBF002C */ sw $ra, 0x2c($sp) -/* A8CB70 802400F0 AFB60028 */ sw $s6, 0x28($sp) -/* A8CB74 802400F4 AFB40020 */ sw $s4, 0x20($sp) -/* A8CB78 802400F8 AFB3001C */ sw $s3, 0x1c($sp) -/* A8CB7C 802400FC AFB20018 */ sw $s2, 0x18($sp) -/* A8CB80 80240100 AFB10014 */ sw $s1, 0x14($sp) -/* A8CB84 80240104 AFB00010 */ sw $s0, 0x10($sp) -/* A8CB88 80240108 F7B80040 */ sdc1 $f24, 0x40($sp) -/* A8CB8C 8024010C F7B60038 */ sdc1 $f22, 0x38($sp) -/* A8CB90 80240110 F7B40030 */ sdc1 $f20, 0x30($sp) -/* A8CB94 80240114 8EB30148 */ lw $s3, 0x148($s5) -/* A8CB98 80240118 86640008 */ lh $a0, 8($s3) -/* A8CB9C 8024011C 0C00EABB */ jal get_npc_unsafe -/* A8CBA0 80240120 00A0B02D */ daddu $s6, $a1, $zero -/* A8CBA4 80240124 0040A02D */ daddu $s4, $v0, $zero -/* A8CBA8 80240128 AEA00074 */ sw $zero, 0x74($s5) -/* A8CBAC 8024012C C6980038 */ lwc1 $f24, 0x38($s4) -/* A8CBB0 80240130 C6960040 */ lwc1 $f22, 0x40($s4) -/* A8CBB4 80240134 0000902D */ daddu $s2, $zero, $zero -/* A8CBB8 80240138 AEA00078 */ sw $zero, 0x78($s5) -/* A8CBBC 8024013C 8E6300D0 */ lw $v1, 0xd0($s3) -/* A8CBC0 80240140 8C620000 */ lw $v0, ($v1) -/* A8CBC4 80240144 3C0146FF */ lui $at, 0x46ff -/* A8CBC8 80240148 3421FE00 */ ori $at, $at, 0xfe00 -/* A8CBCC 8024014C 4481A000 */ mtc1 $at, $f20 -/* A8CBD0 80240150 18400018 */ blez $v0, .L802401B4 -/* A8CBD4 80240154 0240802D */ daddu $s0, $s2, $zero -/* A8CBD8 80240158 0240882D */ daddu $s1, $s2, $zero -.L8024015C: -/* A8CBDC 8024015C 02231021 */ addu $v0, $s1, $v1 -/* A8CBE0 80240160 4600C306 */ mov.s $f12, $f24 -/* A8CBE4 80240164 C4440004 */ lwc1 $f4, 4($v0) -/* A8CBE8 80240168 46802120 */ cvt.s.w $f4, $f4 -/* A8CBEC 8024016C 44062000 */ mfc1 $a2, $f4 -/* A8CBF0 80240170 C444000C */ lwc1 $f4, 0xc($v0) -/* A8CBF4 80240174 46802120 */ cvt.s.w $f4, $f4 -/* A8CBF8 80240178 44072000 */ mfc1 $a3, $f4 -/* A8CBFC 8024017C 0C00A7B5 */ jal dist2D -/* A8CC00 80240180 4600B386 */ mov.s $f14, $f22 -/* A8CC04 80240184 4614003C */ c.lt.s $f0, $f20 -/* A8CC08 80240188 00000000 */ nop -/* A8CC0C 8024018C 45000003 */ bc1f .L8024019C -/* A8CC10 80240190 2631000C */ addiu $s1, $s1, 0xc -/* A8CC14 80240194 46000506 */ mov.s $f20, $f0 -/* A8CC18 80240198 AEB20078 */ sw $s2, 0x78($s5) -.L8024019C: -/* A8CC1C 8024019C 8E6300D0 */ lw $v1, 0xd0($s3) -/* A8CC20 802401A0 26100001 */ addiu $s0, $s0, 1 -/* A8CC24 802401A4 8C620000 */ lw $v0, ($v1) -/* A8CC28 802401A8 0202102A */ slt $v0, $s0, $v0 -/* A8CC2C 802401AC 1440FFEB */ bnez $v0, .L8024015C -/* A8CC30 802401B0 26520001 */ addiu $s2, $s2, 1 -.L802401B4: -/* A8CC34 802401B4 8E6200CC */ lw $v0, 0xcc($s3) -/* A8CC38 802401B8 8C420004 */ lw $v0, 4($v0) -/* A8CC3C 802401BC AE820028 */ sw $v0, 0x28($s4) -/* A8CC40 802401C0 8E6200D0 */ lw $v0, 0xd0($s3) -/* A8CC44 802401C4 8C42007C */ lw $v0, 0x7c($v0) -/* A8CC48 802401C8 04410004 */ bgez $v0, .L802401DC -/* A8CC4C 802401CC 00000000 */ nop -/* A8CC50 802401D0 C6C00000 */ lwc1 $f0, ($s6) -/* A8CC54 802401D4 0809007F */ j .L802401FC -/* A8CC58 802401D8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401DC: -/* A8CC5C 802401DC 3C018024 */ lui $at, %hi(D_80245A00_A92480) -/* A8CC60 802401E0 D4225A00 */ ldc1 $f2, %lo(D_80245A00_A92480)($at) -/* A8CC64 802401E4 44820000 */ mtc1 $v0, $f0 -/* A8CC68 802401E8 00000000 */ nop -/* A8CC6C 802401EC 46800021 */ cvt.d.w $f0, $f0 -/* A8CC70 802401F0 46220003 */ div.d $f0, $f0, $f2 -/* A8CC74 802401F4 46200020 */ cvt.s.d $f0, $f0 -/* A8CC78 802401F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802401FC: -/* A8CC7C 802401FC 24020001 */ addiu $v0, $zero, 1 -/* A8CC80 80240200 AEA20070 */ sw $v0, 0x70($s5) -/* A8CC84 80240204 8FBF002C */ lw $ra, 0x2c($sp) -/* A8CC88 80240208 8FB60028 */ lw $s6, 0x28($sp) -/* A8CC8C 8024020C 8FB50024 */ lw $s5, 0x24($sp) -/* A8CC90 80240210 8FB40020 */ lw $s4, 0x20($sp) -/* A8CC94 80240214 8FB3001C */ lw $s3, 0x1c($sp) -/* A8CC98 80240218 8FB20018 */ lw $s2, 0x18($sp) -/* A8CC9C 8024021C 8FB10014 */ lw $s1, 0x14($sp) -/* A8CCA0 80240220 8FB00010 */ lw $s0, 0x10($sp) -/* A8CCA4 80240224 D7B80040 */ ldc1 $f24, 0x40($sp) -/* A8CCA8 80240228 D7B60038 */ ldc1 $f22, 0x38($sp) -/* A8CCAC 8024022C D7B40030 */ ldc1 $f20, 0x30($sp) -/* A8CCB0 80240230 03E00008 */ jr $ra -/* A8CCB4 80240234 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s deleted file mode 100644 index 34ff258377..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024075C_A8D1DC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245A08_A92488 -.double 32767.0 - -.section .text - -glabel func_8024075C_A8D1DC -/* A8D1DC 8024075C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8D1E0 80240760 AFB10014 */ sw $s1, 0x14($sp) -/* A8D1E4 80240764 0080882D */ daddu $s1, $a0, $zero -/* A8D1E8 80240768 AFBF001C */ sw $ra, 0x1c($sp) -/* A8D1EC 8024076C AFB20018 */ sw $s2, 0x18($sp) -/* A8D1F0 80240770 AFB00010 */ sw $s0, 0x10($sp) -/* A8D1F4 80240774 8E300148 */ lw $s0, 0x148($s1) -/* A8D1F8 80240778 86040008 */ lh $a0, 8($s0) -/* A8D1FC 8024077C 0C00EABB */ jal get_npc_unsafe -/* A8D200 80240780 00A0902D */ daddu $s2, $a1, $zero -/* A8D204 80240784 8E230078 */ lw $v1, 0x78($s1) -/* A8D208 80240788 24630001 */ addiu $v1, $v1, 1 -/* A8D20C 8024078C AE230078 */ sw $v1, 0x78($s1) -/* A8D210 80240790 8E0400D0 */ lw $a0, 0xd0($s0) -/* A8D214 80240794 8C840000 */ lw $a0, ($a0) -/* A8D218 80240798 0064182A */ slt $v1, $v1, $a0 -/* A8D21C 8024079C 14600002 */ bnez $v1, .L802407A8 -/* A8D220 802407A0 0040282D */ daddu $a1, $v0, $zero -/* A8D224 802407A4 AE200078 */ sw $zero, 0x78($s1) -.L802407A8: -/* A8D228 802407A8 8E0200CC */ lw $v0, 0xcc($s0) -/* A8D22C 802407AC 8C420004 */ lw $v0, 4($v0) -/* A8D230 802407B0 ACA20028 */ sw $v0, 0x28($a1) -/* A8D234 802407B4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A8D238 802407B8 8C42007C */ lw $v0, 0x7c($v0) -/* A8D23C 802407BC 04410004 */ bgez $v0, .L802407D0 -/* A8D240 802407C0 00000000 */ nop -/* A8D244 802407C4 C6400000 */ lwc1 $f0, ($s2) -/* A8D248 802407C8 080901FC */ j .L802407F0 -/* A8D24C 802407CC E4A00018 */ swc1 $f0, 0x18($a1) -.L802407D0: -/* A8D250 802407D0 3C018024 */ lui $at, %hi(D_80245A08_A92488) -/* A8D254 802407D4 D4225A08 */ ldc1 $f2, %lo(D_80245A08_A92488)($at) -/* A8D258 802407D8 44820000 */ mtc1 $v0, $f0 -/* A8D25C 802407DC 00000000 */ nop -/* A8D260 802407E0 46800021 */ cvt.d.w $f0, $f0 -/* A8D264 802407E4 46220003 */ div.d $f0, $f0, $f2 -/* A8D268 802407E8 46200020 */ cvt.s.d $f0, $f0 -/* A8D26C 802407EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802407F0: -/* A8D270 802407F0 24020001 */ addiu $v0, $zero, 1 -/* A8D274 802407F4 AE220070 */ sw $v0, 0x70($s1) -/* A8D278 802407F8 8FBF001C */ lw $ra, 0x1c($sp) -/* A8D27C 802407FC 8FB20018 */ lw $s2, 0x18($sp) -/* A8D280 80240800 8FB10014 */ lw $s1, 0x14($sp) -/* A8D284 80240804 8FB00010 */ lw $s0, 0x10($sp) -/* A8D288 80240808 03E00008 */ jr $ra -/* A8D28C 8024080C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index cc4d5e6a60..82ba545517 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -139,7 +139,7 @@ glabel func_80240C74_A8D6F4 glabel L80240E58_A8D8D8 /* A8D8D8 80240E58 0280202D */ daddu $a0, $s4, $zero /* A8D8DC 80240E5C 0260282D */ daddu $a1, $s3, $zero -/* A8D8E0 80240E60 0C090038 */ jal func_802400E0_A8CB60 +/* A8D8E0 80240E60 0C090038 */ jal kpa_95_UnkNpcAIFunc24 /* A8D8E4 80240E64 02A0302D */ daddu $a2, $s5, $zero glabel L80240E68_A8D8E8 /* A8D8E8 80240E68 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80240E90_A8D910 glabel L80240EA8_A8D928 /* A8D928 80240EA8 0280202D */ daddu $a0, $s4, $zero /* A8D92C 80240EAC 0260282D */ daddu $a1, $s3, $zero -/* A8D930 80240EB0 0C0901D7 */ jal func_8024075C_A8D1DC +/* A8D930 80240EB0 0C0901D7 */ jal kpa_95_UnkNpcAIFunc25 /* A8D934 80240EB4 02A0302D */ daddu $a2, $s5, $zero /* A8D938 80240EB8 080903D2 */ j L80240F48_A8D9C8 /* A8D93C 80240EBC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s deleted file mode 100644 index 12e0f3e359..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240FEC_A8DA6C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245BA0_A92620 -.double 0.8 - -.section .text - -glabel func_80240FEC_A8DA6C -/* A8DA6C 80240FEC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A8DA70 80240FF0 AFB3001C */ sw $s3, 0x1c($sp) -/* A8DA74 80240FF4 0080982D */ daddu $s3, $a0, $zero -/* A8DA78 80240FF8 AFBF0020 */ sw $ra, 0x20($sp) -/* A8DA7C 80240FFC AFB20018 */ sw $s2, 0x18($sp) -/* A8DA80 80241000 AFB10014 */ sw $s1, 0x14($sp) -/* A8DA84 80241004 AFB00010 */ sw $s0, 0x10($sp) -/* A8DA88 80241008 8E710148 */ lw $s1, 0x148($s3) -/* A8DA8C 8024100C 86240008 */ lh $a0, 8($s1) -/* A8DA90 80241010 0C00EABB */ jal get_npc_unsafe -/* A8DA94 80241014 00A0902D */ daddu $s2, $a1, $zero -/* A8DA98 80241018 0040802D */ daddu $s0, $v0, $zero -/* A8DA9C 8024101C 8602008E */ lh $v0, 0x8e($s0) -/* A8DAA0 80241020 9603008E */ lhu $v1, 0x8e($s0) -/* A8DAA4 80241024 18400005 */ blez $v0, .L8024103C -/* A8DAA8 80241028 2462FFFF */ addiu $v0, $v1, -1 -/* A8DAAC 8024102C A602008E */ sh $v0, 0x8e($s0) -/* A8DAB0 80241030 00021400 */ sll $v0, $v0, 0x10 -/* A8DAB4 80241034 1C400033 */ bgtz $v0, .L80241104 -/* A8DAB8 80241038 00000000 */ nop -.L8024103C: -/* A8DABC 8024103C 8602008C */ lh $v0, 0x8c($s0) -/* A8DAC0 80241040 14400030 */ bnez $v0, .L80241104 -/* A8DAC4 80241044 00000000 */ nop -/* A8DAC8 80241048 8E2200CC */ lw $v0, 0xcc($s1) -/* A8DACC 8024104C 8C420024 */ lw $v0, 0x24($v0) -/* A8DAD0 80241050 AE020028 */ sw $v0, 0x28($s0) -/* A8DAD4 80241054 C6400018 */ lwc1 $f0, 0x18($s2) -/* A8DAD8 80241058 E6000018 */ swc1 $f0, 0x18($s0) -/* A8DADC 8024105C 8E230088 */ lw $v1, 0x88($s1) -/* A8DAE0 80241060 24020005 */ addiu $v0, $zero, 5 -/* A8DAE4 80241064 10620005 */ beq $v1, $v0, .L8024107C -/* A8DAE8 80241068 00000000 */ nop -/* A8DAEC 8024106C 10600003 */ beqz $v1, .L8024107C -/* A8DAF0 80241070 24020001 */ addiu $v0, $zero, 1 -/* A8DAF4 80241074 14620006 */ bne $v1, $v0, .L80241090 -/* A8DAF8 80241078 00000000 */ nop -.L8024107C: -/* A8DAFC 8024107C 8E220084 */ lw $v0, 0x84($s1) -/* A8DB00 80241080 00021FC2 */ srl $v1, $v0, 0x1f -/* A8DB04 80241084 00431021 */ addu $v0, $v0, $v1 -/* A8DB08 80241088 00021043 */ sra $v0, $v0, 1 -/* A8DB0C 8024108C A60200A8 */ sh $v0, 0xa8($s0) -.L80241090: -/* A8DB10 80241090 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A8DB14 80241094 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A8DB18 80241098 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8DB1C 8024109C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8DB20 802410A0 8C460028 */ lw $a2, 0x28($v0) -/* A8DB24 802410A4 0C00A7B5 */ jal dist2D -/* A8DB28 802410A8 8C470030 */ lw $a3, 0x30($v0) -/* A8DB2C 802410AC C6020018 */ lwc1 $f2, 0x18($s0) -/* A8DB30 802410B0 46020003 */ div.s $f0, $f0, $f2 -/* A8DB34 802410B4 3C018024 */ lui $at, %hi(D_80245BA0_A92620) -/* A8DB38 802410B8 D4225BA0 */ ldc1 $f2, %lo(D_80245BA0_A92620)($at) -/* A8DB3C 802410BC 46000021 */ cvt.d.s $f0, $f0 -/* A8DB40 802410C0 46220000 */ add.d $f0, $f0, $f2 -/* A8DB44 802410C4 4620010D */ trunc.w.d $f4, $f0 -/* A8DB48 802410C8 44022000 */ mfc1 $v0, $f4 -/* A8DB4C 802410CC 00000000 */ nop -/* A8DB50 802410D0 A602008E */ sh $v0, 0x8e($s0) -/* A8DB54 802410D4 00021400 */ sll $v0, $v0, 0x10 -/* A8DB58 802410D8 8E230078 */ lw $v1, 0x78($s1) -/* A8DB5C 802410DC 00021403 */ sra $v0, $v0, 0x10 -/* A8DB60 802410E0 0043102A */ slt $v0, $v0, $v1 -/* A8DB64 802410E4 10400003 */ beqz $v0, .L802410F4 -/* A8DB68 802410E8 00000000 */ nop -/* A8DB6C 802410EC 9622007A */ lhu $v0, 0x7a($s1) -/* A8DB70 802410F0 A602008E */ sh $v0, 0x8e($s0) -.L802410F4: -/* A8DB74 802410F4 8602008E */ lh $v0, 0x8e($s0) -/* A8DB78 802410F8 AE22007C */ sw $v0, 0x7c($s1) -/* A8DB7C 802410FC 2402000E */ addiu $v0, $zero, 0xe -/* A8DB80 80241100 AE620070 */ sw $v0, 0x70($s3) -.L80241104: -/* A8DB84 80241104 8FBF0020 */ lw $ra, 0x20($sp) -/* A8DB88 80241108 8FB3001C */ lw $s3, 0x1c($sp) -/* A8DB8C 8024110C 8FB20018 */ lw $s2, 0x18($sp) -/* A8DB90 80241110 8FB10014 */ lw $s1, 0x14($sp) -/* A8DB94 80241114 8FB00010 */ lw $s0, 0x10($sp) -/* A8DB98 80241118 03E00008 */ jr $ra -/* A8DB9C 8024111C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s index f3969d3ba0..ee2717a706 100644 --- a/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s +++ b/ver/us/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -149,7 +149,7 @@ glabel func_80241304_A8DD84 glabel L80241510_A8DF90 /* A8DF90 80241510 0260202D */ daddu $a0, $s3, $zero /* A8DF94 80241514 0280282D */ daddu $a1, $s4, $zero -/* A8DF98 80241518 0C090038 */ jal func_802400E0_A8CB60 +/* A8DF98 80241518 0C090038 */ jal kpa_95_UnkNpcAIFunc24 /* A8DF9C 8024151C 02A0302D */ daddu $a2, $s5, $zero /* A8DFA0 80241520 96220086 */ lhu $v0, 0x86($s1) /* A8DFA4 80241524 A64200A8 */ sh $v0, 0xa8($s2) @@ -175,7 +175,7 @@ glabel L80241550_A8DFD0 glabel L80241568_A8DFE8 /* A8DFE8 80241568 0260202D */ daddu $a0, $s3, $zero /* A8DFEC 8024156C 0280282D */ daddu $a1, $s4, $zero -/* A8DFF0 80241570 0C0901D7 */ jal func_8024075C_A8D1DC +/* A8DFF0 80241570 0C0901D7 */ jal kpa_95_UnkNpcAIFunc25 /* A8DFF4 80241574 02A0302D */ daddu $a2, $s5, $zero /* A8DFF8 80241578 08090578 */ j L802415E0_A8E060 /* A8DFFC 8024157C 00000000 */ nop @@ -187,7 +187,7 @@ glabel L80241580_A8E000 glabel L80241590_A8E010 /* A8E010 80241590 0260202D */ daddu $a0, $s3, $zero /* A8E014 80241594 0280282D */ daddu $a1, $s4, $zero -/* A8E018 80241598 0C0903FB */ jal func_80240FEC_A8DA6C +/* A8E018 80241598 0C0903FB */ jal kpa_95_UnkDistFunc /* A8E01C 8024159C 02A0302D */ daddu $a2, $s5, $zero /* A8E020 802415A0 08090578 */ j L802415E0_A8E060 /* A8E024 802415A4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s deleted file mode 100644 index 0eb690337e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802404E0_C5AC20.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80246500_C60C40 -.double 32767.0 - -.section .text - -glabel func_802404E0_C5AC20 -/* C5AC20 802404E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C5AC24 802404E4 AFB3002C */ sw $s3, 0x2c($sp) -/* C5AC28 802404E8 0080982D */ daddu $s3, $a0, $zero -/* C5AC2C 802404EC AFBF0030 */ sw $ra, 0x30($sp) -/* C5AC30 802404F0 AFB20028 */ sw $s2, 0x28($sp) -/* C5AC34 802404F4 AFB10024 */ sw $s1, 0x24($sp) -/* C5AC38 802404F8 AFB00020 */ sw $s0, 0x20($sp) -/* C5AC3C 802404FC 8E710148 */ lw $s1, 0x148($s3) -/* C5AC40 80240500 86240008 */ lh $a0, 8($s1) -/* C5AC44 80240504 0C00EABB */ jal get_npc_unsafe -/* C5AC48 80240508 00A0902D */ daddu $s2, $a1, $zero -/* C5AC4C 8024050C 8E440004 */ lw $a0, 4($s2) -/* C5AC50 80240510 0040802D */ daddu $s0, $v0, $zero -/* C5AC54 80240514 00041FC2 */ srl $v1, $a0, 0x1f -/* C5AC58 80240518 00832021 */ addu $a0, $a0, $v1 -/* C5AC5C 8024051C 00042043 */ sra $a0, $a0, 1 -/* C5AC60 80240520 0C00A67F */ jal rand_int -/* C5AC64 80240524 24840001 */ addiu $a0, $a0, 1 -/* C5AC68 80240528 8E430004 */ lw $v1, 4($s2) -/* C5AC6C 8024052C 000327C2 */ srl $a0, $v1, 0x1f -/* C5AC70 80240530 00641821 */ addu $v1, $v1, $a0 -/* C5AC74 80240534 00031843 */ sra $v1, $v1, 1 -/* C5AC78 80240538 00621821 */ addu $v1, $v1, $v0 -/* C5AC7C 8024053C A603008E */ sh $v1, 0x8e($s0) -/* C5AC80 80240540 8E2300D0 */ lw $v1, 0xd0($s1) -/* C5AC84 80240544 C6000040 */ lwc1 $f0, 0x40($s0) -/* C5AC88 80240548 C4640000 */ lwc1 $f4, ($v1) -/* C5AC8C 8024054C 46802120 */ cvt.s.w $f4, $f4 -/* C5AC90 80240550 C4620008 */ lwc1 $f2, 8($v1) -/* C5AC94 80240554 468010A0 */ cvt.s.w $f2, $f2 -/* C5AC98 80240558 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5AC9C 8024055C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5ACA0 80240560 44061000 */ mfc1 $a2, $f2 -/* C5ACA4 80240564 C440000C */ lwc1 $f0, 0xc($v0) -/* C5ACA8 80240568 46800020 */ cvt.s.w $f0, $f0 -/* C5ACAC 8024056C E7A00014 */ swc1 $f0, 0x14($sp) -/* C5ACB0 80240570 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5ACB4 80240574 44052000 */ mfc1 $a1, $f4 -/* C5ACB8 80240578 C4400010 */ lwc1 $f0, 0x10($v0) -/* C5ACBC 8024057C 46800020 */ cvt.s.w $f0, $f0 -/* C5ACC0 80240580 E7A00018 */ swc1 $f0, 0x18($sp) -/* C5ACC4 80240584 8C640018 */ lw $a0, 0x18($v1) -/* C5ACC8 80240588 0C0123F5 */ jal is_point_within_region -/* C5ACCC 8024058C 8E070038 */ lw $a3, 0x38($s0) -/* C5ACD0 80240590 1040000E */ beqz $v0, .L802405CC -/* C5ACD4 80240594 00000000 */ nop -/* C5ACD8 80240598 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5ACDC 8024059C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C5ACE0 802405A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C5ACE4 802405A4 C4460000 */ lwc1 $f6, ($v0) -/* C5ACE8 802405A8 468031A0 */ cvt.s.w $f6, $f6 -/* C5ACEC 802405AC 44063000 */ mfc1 $a2, $f6 -/* C5ACF0 802405B0 C4460008 */ lwc1 $f6, 8($v0) -/* C5ACF4 802405B4 468031A0 */ cvt.s.w $f6, $f6 -/* C5ACF8 802405B8 44073000 */ mfc1 $a3, $f6 -/* C5ACFC 802405BC 0C00A720 */ jal atan2 -/* C5AD00 802405C0 00000000 */ nop -/* C5AD04 802405C4 0809017F */ j .L802405FC -/* C5AD08 802405C8 E600000C */ swc1 $f0, 0xc($s0) -.L802405CC: -/* C5AD0C 802405CC 0C00A67F */ jal rand_int -/* C5AD10 802405D0 2404003C */ addiu $a0, $zero, 0x3c -/* C5AD14 802405D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5AD18 802405D8 44820000 */ mtc1 $v0, $f0 -/* C5AD1C 802405DC 00000000 */ nop -/* C5AD20 802405E0 46800020 */ cvt.s.w $f0, $f0 -/* C5AD24 802405E4 46006300 */ add.s $f12, $f12, $f0 -/* C5AD28 802405E8 3C0141F0 */ lui $at, 0x41f0 -/* C5AD2C 802405EC 44810000 */ mtc1 $at, $f0 -/* C5AD30 802405F0 0C00A6C9 */ jal clamp_angle -/* C5AD34 802405F4 46006301 */ sub.s $f12, $f12, $f0 -/* C5AD38 802405F8 E600000C */ swc1 $f0, 0xc($s0) -.L802405FC: -/* C5AD3C 802405FC 8E2200CC */ lw $v0, 0xcc($s1) -/* C5AD40 80240600 8C420004 */ lw $v0, 4($v0) -/* C5AD44 80240604 AE020028 */ sw $v0, 0x28($s0) -/* C5AD48 80240608 AE600074 */ sw $zero, 0x74($s3) -/* C5AD4C 8024060C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C5AD50 80240610 8C420014 */ lw $v0, 0x14($v0) -/* C5AD54 80240614 04410004 */ bgez $v0, .L80240628 -/* C5AD58 80240618 00000000 */ nop -/* C5AD5C 8024061C C6400000 */ lwc1 $f0, ($s2) -/* C5AD60 80240620 08090192 */ j .L80240648 -/* C5AD64 80240624 E6000018 */ swc1 $f0, 0x18($s0) -.L80240628: -/* C5AD68 80240628 3C018024 */ lui $at, %hi(D_80246500_C60C40) -/* C5AD6C 8024062C D4226500 */ ldc1 $f2, %lo(D_80246500_C60C40)($at) -/* C5AD70 80240630 44820000 */ mtc1 $v0, $f0 -/* C5AD74 80240634 00000000 */ nop -/* C5AD78 80240638 46800021 */ cvt.d.w $f0, $f0 -/* C5AD7C 8024063C 46220003 */ div.d $f0, $f0, $f2 -/* C5AD80 80240640 46200020 */ cvt.s.d $f0, $f0 -/* C5AD84 80240644 E6000018 */ swc1 $f0, 0x18($s0) -.L80240648: -/* C5AD88 80240648 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5AD8C 8024064C 3C014059 */ lui $at, 0x4059 -/* C5AD90 80240650 44811800 */ mtc1 $at, $f3 -/* C5AD94 80240654 44801000 */ mtc1 $zero, $f2 -/* C5AD98 80240658 46000021 */ cvt.d.s $f0, $f0 -/* C5AD9C 8024065C 46220002 */ mul.d $f0, $f0, $f2 -/* C5ADA0 80240660 00000000 */ nop -/* C5ADA4 80240664 24020001 */ addiu $v0, $zero, 1 -/* C5ADA8 80240668 4620018D */ trunc.w.d $f6, $f0 -/* C5ADAC 8024066C E626007C */ swc1 $f6, 0x7c($s1) -/* C5ADB0 80240670 AE620070 */ sw $v0, 0x70($s3) -/* C5ADB4 80240674 8FBF0030 */ lw $ra, 0x30($sp) -/* C5ADB8 80240678 8FB3002C */ lw $s3, 0x2c($sp) -/* C5ADBC 8024067C 8FB20028 */ lw $s2, 0x28($sp) -/* C5ADC0 80240680 8FB10024 */ lw $s1, 0x24($sp) -/* C5ADC4 80240684 8FB00020 */ lw $s0, 0x20($sp) -/* C5ADC8 80240688 03E00008 */ jr $ra -/* C5ADCC 8024068C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 28a8dae49c..a8ffa1ebb3 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -81,7 +81,7 @@ glabel func_802417EC_C5BF2C glabel L802418F8_C5C038 /* C5C038 802418F8 0280202D */ daddu $a0, $s4, $zero /* C5C03C 802418FC 0200282D */ daddu $a1, $s0, $zero -/* C5C040 80241900 0C090138 */ jal func_802404E0_C5AC20 +/* C5C040 80241900 0C090138 */ jal kzn_02_UnkNpcAIFunc23 /* C5C044 80241904 0260302D */ daddu $a2, $s3, $zero glabel L80241908_C5C048 /* C5C048 80241908 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index 798e251f45..553a82ad0d 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -82,7 +82,7 @@ glabel func_80241DE4_C5C524 glabel L80241EF4_C5C634 /* C5C634 80241EF4 0280202D */ daddu $a0, $s4, $zero /* C5C638 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* C5C63C 80241EFC 0C090138 */ jal func_802404E0_C5AC20 +/* C5C63C 80241EFC 0C090138 */ jal kzn_02_UnkNpcAIFunc23 /* C5C640 80241F00 0260302D */ daddu $a2, $s3, $zero glabel L80241F04_C5C644 /* C5C644 80241F04 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s deleted file mode 100644 index e2f4b35518..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024038C_C6109C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802471E0_C67EF0 -.double 0.8 - -.section .text - -glabel func_8024038C_C6109C -/* C6109C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C610A0 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* C610A4 80240394 0080982D */ daddu $s3, $a0, $zero -/* C610A8 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* C610AC 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* C610B0 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* C610B4 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* C610B8 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* C610BC 802403AC 86240008 */ lh $a0, 8($s1) -/* C610C0 802403B0 0C00EABB */ jal get_npc_unsafe -/* C610C4 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* C610C8 802403B8 0040802D */ daddu $s0, $v0, $zero -/* C610CC 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* C610D0 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* C610D4 802403C4 18400005 */ blez $v0, .L802403DC -/* C610D8 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* C610DC 802403CC A602008E */ sh $v0, 0x8e($s0) -/* C610E0 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* C610E4 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* C610E8 802403D8 00000000 */ nop -.L802403DC: -/* C610EC 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* C610F0 802403E0 14400030 */ bnez $v0, .L802404A4 -/* C610F4 802403E4 00000000 */ nop -/* C610F8 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* C610FC 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* C61100 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* C61104 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* C61108 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* C6110C 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* C61110 80240400 24020005 */ addiu $v0, $zero, 5 -/* C61114 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* C61118 80240408 00000000 */ nop -/* C6111C 8024040C 10600003 */ beqz $v1, .L8024041C -/* C61120 80240410 24020001 */ addiu $v0, $zero, 1 -/* C61124 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* C61128 80240418 00000000 */ nop -.L8024041C: -/* C6112C 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* C61130 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* C61134 80240424 00431021 */ addu $v0, $v0, $v1 -/* C61138 80240428 00021043 */ sra $v0, $v0, 1 -/* C6113C 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* C61140 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C61144 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C61148 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6114C 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C61150 80240440 8C460028 */ lw $a2, 0x28($v0) -/* C61154 80240444 0C00A7B5 */ jal dist2D -/* C61158 80240448 8C470030 */ lw $a3, 0x30($v0) -/* C6115C 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* C61160 80240450 46020003 */ div.s $f0, $f0, $f2 -/* C61164 80240454 3C018024 */ lui $at, %hi(D_802471E0_C67EF0) -/* C61168 80240458 D42271E0 */ ldc1 $f2, %lo(D_802471E0_C67EF0)($at) -/* C6116C 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* C61170 80240460 46220000 */ add.d $f0, $f0, $f2 -/* C61174 80240464 4620010D */ trunc.w.d $f4, $f0 -/* C61178 80240468 44022000 */ mfc1 $v0, $f4 -/* C6117C 8024046C 00000000 */ nop -/* C61180 80240470 A602008E */ sh $v0, 0x8e($s0) -/* C61184 80240474 00021400 */ sll $v0, $v0, 0x10 -/* C61188 80240478 8E230078 */ lw $v1, 0x78($s1) -/* C6118C 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* C61190 80240480 0043102A */ slt $v0, $v0, $v1 -/* C61194 80240484 10400003 */ beqz $v0, .L80240494 -/* C61198 80240488 00000000 */ nop -/* C6119C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* C611A0 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* C611A4 80240494 8602008E */ lh $v0, 0x8e($s0) -/* C611A8 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* C611AC 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* C611B0 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* C611B4 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* C611B8 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* C611BC 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* C611C0 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* C611C4 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* C611C8 802404B8 03E00008 */ jr $ra -/* C611CC 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index b326fb8a44..aba2e0a1a9 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -244,7 +244,7 @@ glabel func_802406A4_C613B4 /* C61714 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* C61718 80240A08 0280282D */ daddu $a1, $s4, $zero -/* C6171C 80240A0C 0C0900E3 */ jal func_8024038C_C6109C +/* C6171C 80240A0C 0C0900E3 */ jal kzn_03_UnkDistFunc /* C61720 80240A10 02A0302D */ daddu $a2, $s5, $zero /* C61724 80240A14 08090294 */ j .L80240A50 /* C61728 80240A18 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024072C_C6885C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024072C_C6885C.s deleted file mode 100644 index 2ffefa6aa8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_8024072C_C6885C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C_C6885C -/* C6885C 8024072C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C68860 80240730 AFBF0010 */ sw $ra, 0x10($sp) -/* C68864 80240734 8C82000C */ lw $v0, 0xc($a0) -/* C68868 80240738 0C0B1EAF */ jal get_variable -/* C6886C 8024073C 8C450000 */ lw $a1, ($v0) -/* C68870 80240740 0C03AC5A */ jal switch_to_partner -/* C68874 80240744 0040202D */ daddu $a0, $v0, $zero -/* C68878 80240748 8FBF0010 */ lw $ra, 0x10($sp) -/* C6887C 8024074C 24020002 */ addiu $v0, $zero, 2 -/* C68880 80240750 03E00008 */ jr $ra -/* C68884 80240754 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s deleted file mode 100644 index d5d92f7b7c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80240820_C6EB50.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243090_C713C0 -.double 32767.0 - -.section .text - -glabel func_80240820_C6EB50 -/* C6EB50 80240820 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C6EB54 80240824 AFB3002C */ sw $s3, 0x2c($sp) -/* C6EB58 80240828 0080982D */ daddu $s3, $a0, $zero -/* C6EB5C 8024082C AFBF0030 */ sw $ra, 0x30($sp) -/* C6EB60 80240830 AFB20028 */ sw $s2, 0x28($sp) -/* C6EB64 80240834 AFB10024 */ sw $s1, 0x24($sp) -/* C6EB68 80240838 AFB00020 */ sw $s0, 0x20($sp) -/* C6EB6C 8024083C 8E710148 */ lw $s1, 0x148($s3) -/* C6EB70 80240840 86240008 */ lh $a0, 8($s1) -/* C6EB74 80240844 0C00EABB */ jal get_npc_unsafe -/* C6EB78 80240848 00A0902D */ daddu $s2, $a1, $zero -/* C6EB7C 8024084C 8E440004 */ lw $a0, 4($s2) -/* C6EB80 80240850 0040802D */ daddu $s0, $v0, $zero -/* C6EB84 80240854 00041FC2 */ srl $v1, $a0, 0x1f -/* C6EB88 80240858 00832021 */ addu $a0, $a0, $v1 -/* C6EB8C 8024085C 00042043 */ sra $a0, $a0, 1 -/* C6EB90 80240860 0C00A67F */ jal rand_int -/* C6EB94 80240864 24840001 */ addiu $a0, $a0, 1 -/* C6EB98 80240868 8E430004 */ lw $v1, 4($s2) -/* C6EB9C 8024086C 000327C2 */ srl $a0, $v1, 0x1f -/* C6EBA0 80240870 00641821 */ addu $v1, $v1, $a0 -/* C6EBA4 80240874 00031843 */ sra $v1, $v1, 1 -/* C6EBA8 80240878 00621821 */ addu $v1, $v1, $v0 -/* C6EBAC 8024087C A603008E */ sh $v1, 0x8e($s0) -/* C6EBB0 80240880 8E2300D0 */ lw $v1, 0xd0($s1) -/* C6EBB4 80240884 C6000040 */ lwc1 $f0, 0x40($s0) -/* C6EBB8 80240888 C4640000 */ lwc1 $f4, ($v1) -/* C6EBBC 8024088C 46802120 */ cvt.s.w $f4, $f4 -/* C6EBC0 80240890 C4620008 */ lwc1 $f2, 8($v1) -/* C6EBC4 80240894 468010A0 */ cvt.s.w $f2, $f2 -/* C6EBC8 80240898 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6EBCC 8024089C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EBD0 802408A0 44061000 */ mfc1 $a2, $f2 -/* C6EBD4 802408A4 C440000C */ lwc1 $f0, 0xc($v0) -/* C6EBD8 802408A8 46800020 */ cvt.s.w $f0, $f0 -/* C6EBDC 802408AC E7A00014 */ swc1 $f0, 0x14($sp) -/* C6EBE0 802408B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EBE4 802408B4 44052000 */ mfc1 $a1, $f4 -/* C6EBE8 802408B8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C6EBEC 802408BC 46800020 */ cvt.s.w $f0, $f0 -/* C6EBF0 802408C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6EBF4 802408C4 8C640018 */ lw $a0, 0x18($v1) -/* C6EBF8 802408C8 0C0123F5 */ jal is_point_within_region -/* C6EBFC 802408CC 8E070038 */ lw $a3, 0x38($s0) -/* C6EC00 802408D0 1040000E */ beqz $v0, .L8024090C -/* C6EC04 802408D4 00000000 */ nop -/* C6EC08 802408D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EC0C 802408DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6EC10 802408E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6EC14 802408E4 C4460000 */ lwc1 $f6, ($v0) -/* C6EC18 802408E8 468031A0 */ cvt.s.w $f6, $f6 -/* C6EC1C 802408EC 44063000 */ mfc1 $a2, $f6 -/* C6EC20 802408F0 C4460008 */ lwc1 $f6, 8($v0) -/* C6EC24 802408F4 468031A0 */ cvt.s.w $f6, $f6 -/* C6EC28 802408F8 44073000 */ mfc1 $a3, $f6 -/* C6EC2C 802408FC 0C00A720 */ jal atan2 -/* C6EC30 80240900 00000000 */ nop -/* C6EC34 80240904 0809024F */ j .L8024093C -/* C6EC38 80240908 E600000C */ swc1 $f0, 0xc($s0) -.L8024090C: -/* C6EC3C 8024090C 0C00A67F */ jal rand_int -/* C6EC40 80240910 2404003C */ addiu $a0, $zero, 0x3c -/* C6EC44 80240914 C60C000C */ lwc1 $f12, 0xc($s0) -/* C6EC48 80240918 44820000 */ mtc1 $v0, $f0 -/* C6EC4C 8024091C 00000000 */ nop -/* C6EC50 80240920 46800020 */ cvt.s.w $f0, $f0 -/* C6EC54 80240924 46006300 */ add.s $f12, $f12, $f0 -/* C6EC58 80240928 3C0141F0 */ lui $at, 0x41f0 -/* C6EC5C 8024092C 44810000 */ mtc1 $at, $f0 -/* C6EC60 80240930 0C00A6C9 */ jal clamp_angle -/* C6EC64 80240934 46006301 */ sub.s $f12, $f12, $f0 -/* C6EC68 80240938 E600000C */ swc1 $f0, 0xc($s0) -.L8024093C: -/* C6EC6C 8024093C 8E2200CC */ lw $v0, 0xcc($s1) -/* C6EC70 80240940 8C420004 */ lw $v0, 4($v0) -/* C6EC74 80240944 AE020028 */ sw $v0, 0x28($s0) -/* C6EC78 80240948 AE600074 */ sw $zero, 0x74($s3) -/* C6EC7C 8024094C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6EC80 80240950 8C420014 */ lw $v0, 0x14($v0) -/* C6EC84 80240954 04410004 */ bgez $v0, .L80240968 -/* C6EC88 80240958 00000000 */ nop -/* C6EC8C 8024095C C6400000 */ lwc1 $f0, ($s2) -/* C6EC90 80240960 08090262 */ j .L80240988 -/* C6EC94 80240964 E6000018 */ swc1 $f0, 0x18($s0) -.L80240968: -/* C6EC98 80240968 3C018024 */ lui $at, %hi(D_80243090_C713C0) -/* C6EC9C 8024096C D4223090 */ ldc1 $f2, %lo(D_80243090_C713C0)($at) -/* C6ECA0 80240970 44820000 */ mtc1 $v0, $f0 -/* C6ECA4 80240974 00000000 */ nop -/* C6ECA8 80240978 46800021 */ cvt.d.w $f0, $f0 -/* C6ECAC 8024097C 46220003 */ div.d $f0, $f0, $f2 -/* C6ECB0 80240980 46200020 */ cvt.s.d $f0, $f0 -/* C6ECB4 80240984 E6000018 */ swc1 $f0, 0x18($s0) -.L80240988: -/* C6ECB8 80240988 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6ECBC 8024098C 3C014059 */ lui $at, 0x4059 -/* C6ECC0 80240990 44811800 */ mtc1 $at, $f3 -/* C6ECC4 80240994 44801000 */ mtc1 $zero, $f2 -/* C6ECC8 80240998 46000021 */ cvt.d.s $f0, $f0 -/* C6ECCC 8024099C 46220002 */ mul.d $f0, $f0, $f2 -/* C6ECD0 802409A0 00000000 */ nop -/* C6ECD4 802409A4 24020001 */ addiu $v0, $zero, 1 -/* C6ECD8 802409A8 4620018D */ trunc.w.d $f6, $f0 -/* C6ECDC 802409AC E626007C */ swc1 $f6, 0x7c($s1) -/* C6ECE0 802409B0 AE620070 */ sw $v0, 0x70($s3) -/* C6ECE4 802409B4 8FBF0030 */ lw $ra, 0x30($sp) -/* C6ECE8 802409B8 8FB3002C */ lw $s3, 0x2c($sp) -/* C6ECEC 802409BC 8FB20028 */ lw $s2, 0x28($sp) -/* C6ECF0 802409C0 8FB10024 */ lw $s1, 0x24($sp) -/* C6ECF4 802409C4 8FB00020 */ lw $s0, 0x20($sp) -/* C6ECF8 802409C8 03E00008 */ jr $ra -/* C6ECFC 802409CC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s index 659ac1eac0..71d3a14932 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -81,7 +81,7 @@ glabel func_80241B2C_C6FE5C glabel L80241C38_C6FF68 /* C6FF68 80241C38 0280202D */ daddu $a0, $s4, $zero /* C6FF6C 80241C3C 0200282D */ daddu $a1, $s0, $zero -/* C6FF70 80241C40 0C090208 */ jal func_80240820_C6EB50 +/* C6FF70 80241C40 0C090208 */ jal kzn_07_UnkNpcAIFunc23 /* C6FF74 80241C44 0260302D */ daddu $a2, $s3, $zero glabel L80241C48_C6FF78 /* C6FF78 80241C48 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s index f8554f1db6..71b87e8b74 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -82,7 +82,7 @@ glabel func_80242124_C70454 glabel L80242234_C70564 /* C70564 80242234 0280202D */ daddu $a0, $s4, $zero /* C70568 80242238 0200282D */ daddu $a1, $s0, $zero -/* C7056C 8024223C 0C090208 */ jal func_80240820_C6EB50 +/* C7056C 8024223C 0C090208 */ jal kzn_07_UnkNpcAIFunc23 /* C70570 80242240 0260302D */ daddu $a2, $s3, $zero glabel L80242244_C70574 /* C70574 80242244 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s deleted file mode 100644 index 7c40b6494c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80240A50_C71ED0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802455E0_C76A60 -.double 32767.0 - -.section .text - -glabel func_80240A50_C71ED0 -/* C71ED0 80240A50 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C71ED4 80240A54 AFB3002C */ sw $s3, 0x2c($sp) -/* C71ED8 80240A58 0080982D */ daddu $s3, $a0, $zero -/* C71EDC 80240A5C AFBF0030 */ sw $ra, 0x30($sp) -/* C71EE0 80240A60 AFB20028 */ sw $s2, 0x28($sp) -/* C71EE4 80240A64 AFB10024 */ sw $s1, 0x24($sp) -/* C71EE8 80240A68 AFB00020 */ sw $s0, 0x20($sp) -/* C71EEC 80240A6C 8E710148 */ lw $s1, 0x148($s3) -/* C71EF0 80240A70 86240008 */ lh $a0, 8($s1) -/* C71EF4 80240A74 0C00EABB */ jal get_npc_unsafe -/* C71EF8 80240A78 00A0902D */ daddu $s2, $a1, $zero -/* C71EFC 80240A7C 8E440004 */ lw $a0, 4($s2) -/* C71F00 80240A80 0040802D */ daddu $s0, $v0, $zero -/* C71F04 80240A84 00041FC2 */ srl $v1, $a0, 0x1f -/* C71F08 80240A88 00832021 */ addu $a0, $a0, $v1 -/* C71F0C 80240A8C 00042043 */ sra $a0, $a0, 1 -/* C71F10 80240A90 0C00A67F */ jal rand_int -/* C71F14 80240A94 24840001 */ addiu $a0, $a0, 1 -/* C71F18 80240A98 8E430004 */ lw $v1, 4($s2) -/* C71F1C 80240A9C 000327C2 */ srl $a0, $v1, 0x1f -/* C71F20 80240AA0 00641821 */ addu $v1, $v1, $a0 -/* C71F24 80240AA4 00031843 */ sra $v1, $v1, 1 -/* C71F28 80240AA8 00621821 */ addu $v1, $v1, $v0 -/* C71F2C 80240AAC A603008E */ sh $v1, 0x8e($s0) -/* C71F30 80240AB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C71F34 80240AB4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C71F38 80240AB8 C4640000 */ lwc1 $f4, ($v1) -/* C71F3C 80240ABC 46802120 */ cvt.s.w $f4, $f4 -/* C71F40 80240AC0 C4620008 */ lwc1 $f2, 8($v1) -/* C71F44 80240AC4 468010A0 */ cvt.s.w $f2, $f2 -/* C71F48 80240AC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C71F4C 80240ACC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C71F50 80240AD0 44061000 */ mfc1 $a2, $f2 -/* C71F54 80240AD4 C440000C */ lwc1 $f0, 0xc($v0) -/* C71F58 80240AD8 46800020 */ cvt.s.w $f0, $f0 -/* C71F5C 80240ADC E7A00014 */ swc1 $f0, 0x14($sp) -/* C71F60 80240AE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C71F64 80240AE4 44052000 */ mfc1 $a1, $f4 -/* C71F68 80240AE8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C71F6C 80240AEC 46800020 */ cvt.s.w $f0, $f0 -/* C71F70 80240AF0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C71F74 80240AF4 8C640018 */ lw $a0, 0x18($v1) -/* C71F78 80240AF8 0C0123F5 */ jal is_point_within_region -/* C71F7C 80240AFC 8E070038 */ lw $a3, 0x38($s0) -/* C71F80 80240B00 1040000E */ beqz $v0, .L80240B3C -/* C71F84 80240B04 00000000 */ nop -/* C71F88 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) -/* C71F8C 80240B0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C71F90 80240B10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C71F94 80240B14 C4460000 */ lwc1 $f6, ($v0) -/* C71F98 80240B18 468031A0 */ cvt.s.w $f6, $f6 -/* C71F9C 80240B1C 44063000 */ mfc1 $a2, $f6 -/* C71FA0 80240B20 C4460008 */ lwc1 $f6, 8($v0) -/* C71FA4 80240B24 468031A0 */ cvt.s.w $f6, $f6 -/* C71FA8 80240B28 44073000 */ mfc1 $a3, $f6 -/* C71FAC 80240B2C 0C00A720 */ jal atan2 -/* C71FB0 80240B30 00000000 */ nop -/* C71FB4 80240B34 080902DB */ j .L80240B6C -/* C71FB8 80240B38 E600000C */ swc1 $f0, 0xc($s0) -.L80240B3C: -/* C71FBC 80240B3C 0C00A67F */ jal rand_int -/* C71FC0 80240B40 2404003C */ addiu $a0, $zero, 0x3c -/* C71FC4 80240B44 C60C000C */ lwc1 $f12, 0xc($s0) -/* C71FC8 80240B48 44820000 */ mtc1 $v0, $f0 -/* C71FCC 80240B4C 00000000 */ nop -/* C71FD0 80240B50 46800020 */ cvt.s.w $f0, $f0 -/* C71FD4 80240B54 46006300 */ add.s $f12, $f12, $f0 -/* C71FD8 80240B58 3C0141F0 */ lui $at, 0x41f0 -/* C71FDC 80240B5C 44810000 */ mtc1 $at, $f0 -/* C71FE0 80240B60 0C00A6C9 */ jal clamp_angle -/* C71FE4 80240B64 46006301 */ sub.s $f12, $f12, $f0 -/* C71FE8 80240B68 E600000C */ swc1 $f0, 0xc($s0) -.L80240B6C: -/* C71FEC 80240B6C 8E2200CC */ lw $v0, 0xcc($s1) -/* C71FF0 80240B70 8C420004 */ lw $v0, 4($v0) -/* C71FF4 80240B74 AE020028 */ sw $v0, 0x28($s0) -/* C71FF8 80240B78 AE600074 */ sw $zero, 0x74($s3) -/* C71FFC 80240B7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C72000 80240B80 8C420014 */ lw $v0, 0x14($v0) -/* C72004 80240B84 04410004 */ bgez $v0, .L80240B98 -/* C72008 80240B88 00000000 */ nop -/* C7200C 80240B8C C6400000 */ lwc1 $f0, ($s2) -/* C72010 80240B90 080902EE */ j .L80240BB8 -/* C72014 80240B94 E6000018 */ swc1 $f0, 0x18($s0) -.L80240B98: -/* C72018 80240B98 3C018024 */ lui $at, %hi(D_802455E0_C76A60) -/* C7201C 80240B9C D42255E0 */ ldc1 $f2, %lo(D_802455E0_C76A60)($at) -/* C72020 80240BA0 44820000 */ mtc1 $v0, $f0 -/* C72024 80240BA4 00000000 */ nop -/* C72028 80240BA8 46800021 */ cvt.d.w $f0, $f0 -/* C7202C 80240BAC 46220003 */ div.d $f0, $f0, $f2 -/* C72030 80240BB0 46200020 */ cvt.s.d $f0, $f0 -/* C72034 80240BB4 E6000018 */ swc1 $f0, 0x18($s0) -.L80240BB8: -/* C72038 80240BB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C7203C 80240BBC 3C014059 */ lui $at, 0x4059 -/* C72040 80240BC0 44811800 */ mtc1 $at, $f3 -/* C72044 80240BC4 44801000 */ mtc1 $zero, $f2 -/* C72048 80240BC8 46000021 */ cvt.d.s $f0, $f0 -/* C7204C 80240BCC 46220002 */ mul.d $f0, $f0, $f2 -/* C72050 80240BD0 00000000 */ nop -/* C72054 80240BD4 24020001 */ addiu $v0, $zero, 1 -/* C72058 80240BD8 4620018D */ trunc.w.d $f6, $f0 -/* C7205C 80240BDC E626007C */ swc1 $f6, 0x7c($s1) -/* C72060 80240BE0 AE620070 */ sw $v0, 0x70($s3) -/* C72064 80240BE4 8FBF0030 */ lw $ra, 0x30($sp) -/* C72068 80240BE8 8FB3002C */ lw $s3, 0x2c($sp) -/* C7206C 80240BEC 8FB20028 */ lw $s2, 0x28($sp) -/* C72070 80240BF0 8FB10024 */ lw $s1, 0x24($sp) -/* C72074 80240BF4 8FB00020 */ lw $s0, 0x20($sp) -/* C72078 80240BF8 03E00008 */ jr $ra -/* C7207C 80240BFC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 243cefa302..9f1ebbbb8a 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -81,7 +81,7 @@ glabel func_80241D5C_C731DC glabel L80241E68_C732E8 /* C732E8 80241E68 0280202D */ daddu $a0, $s4, $zero /* C732EC 80241E6C 0200282D */ daddu $a1, $s0, $zero -/* C732F0 80241E70 0C090294 */ jal func_80240A50_C71ED0 +/* C732F0 80241E70 0C090294 */ jal kzn_08_UnkNpcAIFunc23 /* C732F4 80241E74 0260302D */ daddu $a2, $s3, $zero glabel L80241E78_C732F8 /* C732F8 80241E78 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s index f5e27fc1fa..318910023d 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -82,7 +82,7 @@ glabel func_80242354_C737D4 glabel L80242464_C738E4 /* C738E4 80242464 0280202D */ daddu $a0, $s4, $zero /* C738E8 80242468 0200282D */ daddu $a1, $s0, $zero -/* C738EC 8024246C 0C090294 */ jal func_80240A50_C71ED0 +/* C738EC 8024246C 0C090294 */ jal kzn_08_UnkNpcAIFunc23 /* C738F0 80242470 0260302D */ daddu $a2, $s3, $zero glabel L80242474_C738F4 /* C738F4 80242474 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024041C_C770FC.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024041C_C770FC.s deleted file mode 100644 index d9feeb6d2d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_8024041C_C770FC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_C770FC -/* C770FC 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C77100 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* C77104 80240424 8C82000C */ lw $v0, 0xc($a0) -/* C77108 80240428 0C0B1EAF */ jal get_variable -/* C7710C 8024042C 8C450000 */ lw $a1, ($v0) -/* C77110 80240430 0C03AC5A */ jal switch_to_partner -/* C77114 80240434 0040202D */ daddu $a0, $v0, $zero -/* C77118 80240438 8FBF0010 */ lw $ra, 0x10($sp) -/* C7711C 8024043C 24020002 */ addiu $v0, $zero, 2 -/* C77120 80240440 03E00008 */ jr $ra -/* C77124 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s deleted file mode 100644 index 56d493c558..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80247438_C7E118 -.double 0.8 - -.section .text - -glabel func_80242A40_C79720 -/* C79720 80242A40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C79724 80242A44 AFB3001C */ sw $s3, 0x1c($sp) -/* C79728 80242A48 0080982D */ daddu $s3, $a0, $zero -/* C7972C 80242A4C AFBF0020 */ sw $ra, 0x20($sp) -/* C79730 80242A50 AFB20018 */ sw $s2, 0x18($sp) -/* C79734 80242A54 AFB10014 */ sw $s1, 0x14($sp) -/* C79738 80242A58 AFB00010 */ sw $s0, 0x10($sp) -/* C7973C 80242A5C 8E710148 */ lw $s1, 0x148($s3) -/* C79740 80242A60 86240008 */ lh $a0, 8($s1) -/* C79744 80242A64 0C00EABB */ jal get_npc_unsafe -/* C79748 80242A68 00A0902D */ daddu $s2, $a1, $zero -/* C7974C 80242A6C 0040802D */ daddu $s0, $v0, $zero -/* C79750 80242A70 8602008E */ lh $v0, 0x8e($s0) -/* C79754 80242A74 9603008E */ lhu $v1, 0x8e($s0) -/* C79758 80242A78 18400005 */ blez $v0, .L80242A90 -/* C7975C 80242A7C 2462FFFF */ addiu $v0, $v1, -1 -/* C79760 80242A80 A602008E */ sh $v0, 0x8e($s0) -/* C79764 80242A84 00021400 */ sll $v0, $v0, 0x10 -/* C79768 80242A88 1C400033 */ bgtz $v0, .L80242B58 -/* C7976C 80242A8C 00000000 */ nop -.L80242A90: -/* C79770 80242A90 8602008C */ lh $v0, 0x8c($s0) -/* C79774 80242A94 14400030 */ bnez $v0, .L80242B58 -/* C79778 80242A98 00000000 */ nop -/* C7977C 80242A9C 8E2200CC */ lw $v0, 0xcc($s1) -/* C79780 80242AA0 8C420024 */ lw $v0, 0x24($v0) -/* C79784 80242AA4 AE020028 */ sw $v0, 0x28($s0) -/* C79788 80242AA8 C6400018 */ lwc1 $f0, 0x18($s2) -/* C7978C 80242AAC E6000018 */ swc1 $f0, 0x18($s0) -/* C79790 80242AB0 8E230088 */ lw $v1, 0x88($s1) -/* C79794 80242AB4 24020005 */ addiu $v0, $zero, 5 -/* C79798 80242AB8 10620005 */ beq $v1, $v0, .L80242AD0 -/* C7979C 80242ABC 00000000 */ nop -/* C797A0 80242AC0 10600003 */ beqz $v1, .L80242AD0 -/* C797A4 80242AC4 24020001 */ addiu $v0, $zero, 1 -/* C797A8 80242AC8 14620006 */ bne $v1, $v0, .L80242AE4 -/* C797AC 80242ACC 00000000 */ nop -.L80242AD0: -/* C797B0 80242AD0 8E220084 */ lw $v0, 0x84($s1) -/* C797B4 80242AD4 00021FC2 */ srl $v1, $v0, 0x1f -/* C797B8 80242AD8 00431021 */ addu $v0, $v0, $v1 -/* C797BC 80242ADC 00021043 */ sra $v0, $v0, 1 -/* C797C0 80242AE0 A60200A8 */ sh $v0, 0xa8($s0) -.L80242AE4: -/* C797C4 80242AE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C797C8 80242AE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C797CC 80242AEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C797D0 80242AF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C797D4 80242AF4 8C460028 */ lw $a2, 0x28($v0) -/* C797D8 80242AF8 0C00A7B5 */ jal dist2D -/* C797DC 80242AFC 8C470030 */ lw $a3, 0x30($v0) -/* C797E0 80242B00 C6020018 */ lwc1 $f2, 0x18($s0) -/* C797E4 80242B04 46020003 */ div.s $f0, $f0, $f2 -/* C797E8 80242B08 3C018024 */ lui $at, %hi(D_80247438_C7E118) -/* C797EC 80242B0C D4227438 */ ldc1 $f2, %lo(D_80247438_C7E118)($at) -/* C797F0 80242B10 46000021 */ cvt.d.s $f0, $f0 -/* C797F4 80242B14 46220000 */ add.d $f0, $f0, $f2 -/* C797F8 80242B18 4620010D */ trunc.w.d $f4, $f0 -/* C797FC 80242B1C 44022000 */ mfc1 $v0, $f4 -/* C79800 80242B20 00000000 */ nop -/* C79804 80242B24 A602008E */ sh $v0, 0x8e($s0) -/* C79808 80242B28 00021400 */ sll $v0, $v0, 0x10 -/* C7980C 80242B2C 8E230078 */ lw $v1, 0x78($s1) -/* C79810 80242B30 00021403 */ sra $v0, $v0, 0x10 -/* C79814 80242B34 0043102A */ slt $v0, $v0, $v1 -/* C79818 80242B38 10400003 */ beqz $v0, .L80242B48 -/* C7981C 80242B3C 00000000 */ nop -/* C79820 80242B40 9622007A */ lhu $v0, 0x7a($s1) -/* C79824 80242B44 A602008E */ sh $v0, 0x8e($s0) -.L80242B48: -/* C79828 80242B48 8602008E */ lh $v0, 0x8e($s0) -/* C7982C 80242B4C AE22007C */ sw $v0, 0x7c($s1) -/* C79830 80242B50 2402000E */ addiu $v0, $zero, 0xe -/* C79834 80242B54 AE620070 */ sw $v0, 0x70($s3) -.L80242B58: -/* C79838 80242B58 8FBF0020 */ lw $ra, 0x20($sp) -/* C7983C 80242B5C 8FB3001C */ lw $s3, 0x1c($sp) -/* C79840 80242B60 8FB20018 */ lw $s2, 0x18($sp) -/* C79844 80242B64 8FB10014 */ lw $s1, 0x14($sp) -/* C79848 80242B68 8FB00010 */ lw $s0, 0x10($sp) -/* C7984C 80242B6C 03E00008 */ jr $ra -/* C79850 80242B70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s index 015e99fc31..4b6fa90c0f 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -244,7 +244,7 @@ glabel func_80242D58_C79A38 /* C79D98 802430B8 0260202D */ daddu $a0, $s3, $zero .L802430BC: /* C79D9C 802430BC 0280282D */ daddu $a1, $s4, $zero -/* C79DA0 802430C0 0C090A90 */ jal func_80242A40_C79720 +/* C79DA0 802430C0 0C090A90 */ jal kzn_09_UnkDistFunc /* C79DA4 802430C4 02A0302D */ daddu $a2, $s5, $zero /* C79DA8 802430C8 08090C41 */ j .L80243104 /* C79DAC 802430CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s deleted file mode 100644 index 47cf964f32..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80240460_C80600.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245850_C859F0 -.double 32767.0 - -.section .text - -glabel func_80240460_C80600 -/* C80600 80240460 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C80604 80240464 AFB3002C */ sw $s3, 0x2c($sp) -/* C80608 80240468 0080982D */ daddu $s3, $a0, $zero -/* C8060C 8024046C AFBF0030 */ sw $ra, 0x30($sp) -/* C80610 80240470 AFB20028 */ sw $s2, 0x28($sp) -/* C80614 80240474 AFB10024 */ sw $s1, 0x24($sp) -/* C80618 80240478 AFB00020 */ sw $s0, 0x20($sp) -/* C8061C 8024047C 8E710148 */ lw $s1, 0x148($s3) -/* C80620 80240480 86240008 */ lh $a0, 8($s1) -/* C80624 80240484 0C00EABB */ jal get_npc_unsafe -/* C80628 80240488 00A0902D */ daddu $s2, $a1, $zero -/* C8062C 8024048C 8E440004 */ lw $a0, 4($s2) -/* C80630 80240490 0040802D */ daddu $s0, $v0, $zero -/* C80634 80240494 00041FC2 */ srl $v1, $a0, 0x1f -/* C80638 80240498 00832021 */ addu $a0, $a0, $v1 -/* C8063C 8024049C 00042043 */ sra $a0, $a0, 1 -/* C80640 802404A0 0C00A67F */ jal rand_int -/* C80644 802404A4 24840001 */ addiu $a0, $a0, 1 -/* C80648 802404A8 8E430004 */ lw $v1, 4($s2) -/* C8064C 802404AC 000327C2 */ srl $a0, $v1, 0x1f -/* C80650 802404B0 00641821 */ addu $v1, $v1, $a0 -/* C80654 802404B4 00031843 */ sra $v1, $v1, 1 -/* C80658 802404B8 00621821 */ addu $v1, $v1, $v0 -/* C8065C 802404BC A603008E */ sh $v1, 0x8e($s0) -/* C80660 802404C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C80664 802404C4 C6000040 */ lwc1 $f0, 0x40($s0) -/* C80668 802404C8 C4640000 */ lwc1 $f4, ($v1) -/* C8066C 802404CC 46802120 */ cvt.s.w $f4, $f4 -/* C80670 802404D0 C4620008 */ lwc1 $f2, 8($v1) -/* C80674 802404D4 468010A0 */ cvt.s.w $f2, $f2 -/* C80678 802404D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8067C 802404DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80680 802404E0 44061000 */ mfc1 $a2, $f2 -/* C80684 802404E4 C440000C */ lwc1 $f0, 0xc($v0) -/* C80688 802404E8 46800020 */ cvt.s.w $f0, $f0 -/* C8068C 802404EC E7A00014 */ swc1 $f0, 0x14($sp) -/* C80690 802404F0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80694 802404F4 44052000 */ mfc1 $a1, $f4 -/* C80698 802404F8 C4400010 */ lwc1 $f0, 0x10($v0) -/* C8069C 802404FC 46800020 */ cvt.s.w $f0, $f0 -/* C806A0 80240500 E7A00018 */ swc1 $f0, 0x18($sp) -/* C806A4 80240504 8C640018 */ lw $a0, 0x18($v1) -/* C806A8 80240508 0C0123F5 */ jal is_point_within_region -/* C806AC 8024050C 8E070038 */ lw $a3, 0x38($s0) -/* C806B0 80240510 1040000E */ beqz $v0, .L8024054C -/* C806B4 80240514 00000000 */ nop -/* C806B8 80240518 8E2200D0 */ lw $v0, 0xd0($s1) -/* C806BC 8024051C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C806C0 80240520 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C806C4 80240524 C4460000 */ lwc1 $f6, ($v0) -/* C806C8 80240528 468031A0 */ cvt.s.w $f6, $f6 -/* C806CC 8024052C 44063000 */ mfc1 $a2, $f6 -/* C806D0 80240530 C4460008 */ lwc1 $f6, 8($v0) -/* C806D4 80240534 468031A0 */ cvt.s.w $f6, $f6 -/* C806D8 80240538 44073000 */ mfc1 $a3, $f6 -/* C806DC 8024053C 0C00A720 */ jal atan2 -/* C806E0 80240540 00000000 */ nop -/* C806E4 80240544 0809015F */ j .L8024057C -/* C806E8 80240548 E600000C */ swc1 $f0, 0xc($s0) -.L8024054C: -/* C806EC 8024054C 0C00A67F */ jal rand_int -/* C806F0 80240550 2404003C */ addiu $a0, $zero, 0x3c -/* C806F4 80240554 C60C000C */ lwc1 $f12, 0xc($s0) -/* C806F8 80240558 44820000 */ mtc1 $v0, $f0 -/* C806FC 8024055C 00000000 */ nop -/* C80700 80240560 46800020 */ cvt.s.w $f0, $f0 -/* C80704 80240564 46006300 */ add.s $f12, $f12, $f0 -/* C80708 80240568 3C0141F0 */ lui $at, 0x41f0 -/* C8070C 8024056C 44810000 */ mtc1 $at, $f0 -/* C80710 80240570 0C00A6C9 */ jal clamp_angle -/* C80714 80240574 46006301 */ sub.s $f12, $f12, $f0 -/* C80718 80240578 E600000C */ swc1 $f0, 0xc($s0) -.L8024057C: -/* C8071C 8024057C 8E2200CC */ lw $v0, 0xcc($s1) -/* C80720 80240580 8C420004 */ lw $v0, 4($v0) -/* C80724 80240584 AE020028 */ sw $v0, 0x28($s0) -/* C80728 80240588 AE600074 */ sw $zero, 0x74($s3) -/* C8072C 8024058C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C80730 80240590 8C420014 */ lw $v0, 0x14($v0) -/* C80734 80240594 04410004 */ bgez $v0, .L802405A8 -/* C80738 80240598 00000000 */ nop -/* C8073C 8024059C C6400000 */ lwc1 $f0, ($s2) -/* C80740 802405A0 08090172 */ j .L802405C8 -/* C80744 802405A4 E6000018 */ swc1 $f0, 0x18($s0) -.L802405A8: -/* C80748 802405A8 3C018024 */ lui $at, %hi(D_80245850_C859F0) -/* C8074C 802405AC D4225850 */ ldc1 $f2, %lo(D_80245850_C859F0)($at) -/* C80750 802405B0 44820000 */ mtc1 $v0, $f0 -/* C80754 802405B4 00000000 */ nop -/* C80758 802405B8 46800021 */ cvt.d.w $f0, $f0 -/* C8075C 802405BC 46220003 */ div.d $f0, $f0, $f2 -/* C80760 802405C0 46200020 */ cvt.s.d $f0, $f0 -/* C80764 802405C4 E6000018 */ swc1 $f0, 0x18($s0) -.L802405C8: -/* C80768 802405C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8076C 802405CC 3C014059 */ lui $at, 0x4059 -/* C80770 802405D0 44811800 */ mtc1 $at, $f3 -/* C80774 802405D4 44801000 */ mtc1 $zero, $f2 -/* C80778 802405D8 46000021 */ cvt.d.s $f0, $f0 -/* C8077C 802405DC 46220002 */ mul.d $f0, $f0, $f2 -/* C80780 802405E0 00000000 */ nop -/* C80784 802405E4 24020001 */ addiu $v0, $zero, 1 -/* C80788 802405E8 4620018D */ trunc.w.d $f6, $f0 -/* C8078C 802405EC E626007C */ swc1 $f6, 0x7c($s1) -/* C80790 802405F0 AE620070 */ sw $v0, 0x70($s3) -/* C80794 802405F4 8FBF0030 */ lw $ra, 0x30($sp) -/* C80798 802405F8 8FB3002C */ lw $s3, 0x2c($sp) -/* C8079C 802405FC 8FB20028 */ lw $s2, 0x28($sp) -/* C807A0 80240600 8FB10024 */ lw $s1, 0x24($sp) -/* C807A4 80240604 8FB00020 */ lw $s0, 0x20($sp) -/* C807A8 80240608 03E00008 */ jr $ra -/* C807AC 8024060C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s index 7629fdb19c..f3fafa925b 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -81,7 +81,7 @@ glabel func_8024176C_C8190C glabel L80241878_C81A18 /* C81A18 80241878 0280202D */ daddu $a0, $s4, $zero /* C81A1C 8024187C 0200282D */ daddu $a1, $s0, $zero -/* C81A20 80241880 0C090118 */ jal func_80240460_C80600 +/* C81A20 80241880 0C090118 */ jal kzn_11_UnkNpcAIFunc23 /* C81A24 80241884 0260302D */ daddu $a2, $s3, $zero glabel L80241888_C81A28 /* C81A28 80241888 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s index 55fd6eed4e..96aa8d591e 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -82,7 +82,7 @@ glabel func_80241D64_C81F04 glabel L80241E74_C82014 /* C82014 80241E74 0280202D */ daddu $a0, $s4, $zero /* C82018 80241E78 0200282D */ daddu $a1, $s0, $zero -/* C8201C 80241E7C 0C090118 */ jal func_80240460_C80600 +/* C8201C 80241E7C 0C090118 */ jal kzn_11_UnkNpcAIFunc23 /* C82020 80241E80 0260302D */ daddu $a2, $s3, $zero glabel L80241E84_C82024 /* C82024 80241E84 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s deleted file mode 100644 index fdeb3cbaea..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241D30_C877E0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80246568_C8C018 -.double 0.8 - -.section .text - -glabel func_80241D30_C877E0 -/* C877E0 80241D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C877E4 80241D34 AFB3001C */ sw $s3, 0x1c($sp) -/* C877E8 80241D38 0080982D */ daddu $s3, $a0, $zero -/* C877EC 80241D3C AFBF0020 */ sw $ra, 0x20($sp) -/* C877F0 80241D40 AFB20018 */ sw $s2, 0x18($sp) -/* C877F4 80241D44 AFB10014 */ sw $s1, 0x14($sp) -/* C877F8 80241D48 AFB00010 */ sw $s0, 0x10($sp) -/* C877FC 80241D4C 8E710148 */ lw $s1, 0x148($s3) -/* C87800 80241D50 86240008 */ lh $a0, 8($s1) -/* C87804 80241D54 0C00EABB */ jal get_npc_unsafe -/* C87808 80241D58 00A0902D */ daddu $s2, $a1, $zero -/* C8780C 80241D5C 0040802D */ daddu $s0, $v0, $zero -/* C87810 80241D60 8602008E */ lh $v0, 0x8e($s0) -/* C87814 80241D64 9603008E */ lhu $v1, 0x8e($s0) -/* C87818 80241D68 18400005 */ blez $v0, .L80241D80 -/* C8781C 80241D6C 2462FFFF */ addiu $v0, $v1, -1 -/* C87820 80241D70 A602008E */ sh $v0, 0x8e($s0) -/* C87824 80241D74 00021400 */ sll $v0, $v0, 0x10 -/* C87828 80241D78 1C400033 */ bgtz $v0, .L80241E48 -/* C8782C 80241D7C 00000000 */ nop -.L80241D80: -/* C87830 80241D80 8602008C */ lh $v0, 0x8c($s0) -/* C87834 80241D84 14400030 */ bnez $v0, .L80241E48 -/* C87838 80241D88 00000000 */ nop -/* C8783C 80241D8C 8E2200CC */ lw $v0, 0xcc($s1) -/* C87840 80241D90 8C420024 */ lw $v0, 0x24($v0) -/* C87844 80241D94 AE020028 */ sw $v0, 0x28($s0) -/* C87848 80241D98 C6400018 */ lwc1 $f0, 0x18($s2) -/* C8784C 80241D9C E6000018 */ swc1 $f0, 0x18($s0) -/* C87850 80241DA0 8E230088 */ lw $v1, 0x88($s1) -/* C87854 80241DA4 24020005 */ addiu $v0, $zero, 5 -/* C87858 80241DA8 10620005 */ beq $v1, $v0, .L80241DC0 -/* C8785C 80241DAC 00000000 */ nop -/* C87860 80241DB0 10600003 */ beqz $v1, .L80241DC0 -/* C87864 80241DB4 24020001 */ addiu $v0, $zero, 1 -/* C87868 80241DB8 14620006 */ bne $v1, $v0, .L80241DD4 -/* C8786C 80241DBC 00000000 */ nop -.L80241DC0: -/* C87870 80241DC0 8E220084 */ lw $v0, 0x84($s1) -/* C87874 80241DC4 00021FC2 */ srl $v1, $v0, 0x1f -/* C87878 80241DC8 00431021 */ addu $v0, $v0, $v1 -/* C8787C 80241DCC 00021043 */ sra $v0, $v0, 1 -/* C87880 80241DD0 A60200A8 */ sh $v0, 0xa8($s0) -.L80241DD4: -/* C87884 80241DD4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C87888 80241DD8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8788C 80241DDC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C87890 80241DE0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C87894 80241DE4 8C460028 */ lw $a2, 0x28($v0) -/* C87898 80241DE8 0C00A7B5 */ jal dist2D -/* C8789C 80241DEC 8C470030 */ lw $a3, 0x30($v0) -/* C878A0 80241DF0 C6020018 */ lwc1 $f2, 0x18($s0) -/* C878A4 80241DF4 46020003 */ div.s $f0, $f0, $f2 -/* C878A8 80241DF8 3C018024 */ lui $at, %hi(D_80246568_C8C018) -/* C878AC 80241DFC D4226568 */ ldc1 $f2, %lo(D_80246568_C8C018)($at) -/* C878B0 80241E00 46000021 */ cvt.d.s $f0, $f0 -/* C878B4 80241E04 46220000 */ add.d $f0, $f0, $f2 -/* C878B8 80241E08 4620010D */ trunc.w.d $f4, $f0 -/* C878BC 80241E0C 44022000 */ mfc1 $v0, $f4 -/* C878C0 80241E10 00000000 */ nop -/* C878C4 80241E14 A602008E */ sh $v0, 0x8e($s0) -/* C878C8 80241E18 00021400 */ sll $v0, $v0, 0x10 -/* C878CC 80241E1C 8E230078 */ lw $v1, 0x78($s1) -/* C878D0 80241E20 00021403 */ sra $v0, $v0, 0x10 -/* C878D4 80241E24 0043102A */ slt $v0, $v0, $v1 -/* C878D8 80241E28 10400003 */ beqz $v0, .L80241E38 -/* C878DC 80241E2C 00000000 */ nop -/* C878E0 80241E30 9622007A */ lhu $v0, 0x7a($s1) -/* C878E4 80241E34 A602008E */ sh $v0, 0x8e($s0) -.L80241E38: -/* C878E8 80241E38 8602008E */ lh $v0, 0x8e($s0) -/* C878EC 80241E3C AE22007C */ sw $v0, 0x7c($s1) -/* C878F0 80241E40 2402000E */ addiu $v0, $zero, 0xe -/* C878F4 80241E44 AE620070 */ sw $v0, 0x70($s3) -.L80241E48: -/* C878F8 80241E48 8FBF0020 */ lw $ra, 0x20($sp) -/* C878FC 80241E4C 8FB3001C */ lw $s3, 0x1c($sp) -/* C87900 80241E50 8FB20018 */ lw $s2, 0x18($sp) -/* C87904 80241E54 8FB10014 */ lw $s1, 0x14($sp) -/* C87908 80241E58 8FB00010 */ lw $s0, 0x10($sp) -/* C8790C 80241E5C 03E00008 */ jr $ra -/* C87910 80241E60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s index 7107862c2e..e6905935db 100644 --- a/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s +++ b/ver/us/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -244,7 +244,7 @@ glabel func_80242048_C87AF8 /* C87E58 802423A8 0260202D */ daddu $a0, $s3, $zero .L802423AC: /* C87E5C 802423AC 0280282D */ daddu $a1, $s4, $zero -/* C87E60 802423B0 0C09074C */ jal func_80241D30_C877E0 +/* C87E60 802423B0 0C09074C */ jal kzn_17_UnkDistFunc /* C87E64 802423B4 02A0302D */ daddu $a2, $s5, $zero /* C87E68 802423B8 080908FD */ j .L802423F4 /* C87E6C 802423BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s deleted file mode 100644 index d1e784d2ab..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802559C0_8006D0 -.double 32767.0 - -.section .text - -glabel func_80242570_7ED280 -/* 7ED280 80242570 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7ED284 80242574 AFB50024 */ sw $s5, 0x24($sp) -/* 7ED288 80242578 0080A82D */ daddu $s5, $a0, $zero -/* 7ED28C 8024257C AFBF002C */ sw $ra, 0x2c($sp) -/* 7ED290 80242580 AFB60028 */ sw $s6, 0x28($sp) -/* 7ED294 80242584 AFB40020 */ sw $s4, 0x20($sp) -/* 7ED298 80242588 AFB3001C */ sw $s3, 0x1c($sp) -/* 7ED29C 8024258C AFB20018 */ sw $s2, 0x18($sp) -/* 7ED2A0 80242590 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED2A4 80242594 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED2A8 80242598 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 7ED2AC 8024259C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 7ED2B0 802425A0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 7ED2B4 802425A4 8EB30148 */ lw $s3, 0x148($s5) -/* 7ED2B8 802425A8 86640008 */ lh $a0, 8($s3) -/* 7ED2BC 802425AC 0C00EABB */ jal get_npc_unsafe -/* 7ED2C0 802425B0 00A0B02D */ daddu $s6, $a1, $zero -/* 7ED2C4 802425B4 0040A02D */ daddu $s4, $v0, $zero -/* 7ED2C8 802425B8 AEA00074 */ sw $zero, 0x74($s5) -/* 7ED2CC 802425BC C6980038 */ lwc1 $f24, 0x38($s4) -/* 7ED2D0 802425C0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 7ED2D4 802425C4 0000902D */ daddu $s2, $zero, $zero -/* 7ED2D8 802425C8 AEA00078 */ sw $zero, 0x78($s5) -/* 7ED2DC 802425CC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 7ED2E0 802425D0 8C620000 */ lw $v0, ($v1) -/* 7ED2E4 802425D4 3C0146FF */ lui $at, 0x46ff -/* 7ED2E8 802425D8 3421FE00 */ ori $at, $at, 0xfe00 -/* 7ED2EC 802425DC 4481A000 */ mtc1 $at, $f20 -/* 7ED2F0 802425E0 18400018 */ blez $v0, .L80242644 -/* 7ED2F4 802425E4 0240802D */ daddu $s0, $s2, $zero -/* 7ED2F8 802425E8 0240882D */ daddu $s1, $s2, $zero -.L802425EC: -/* 7ED2FC 802425EC 02231021 */ addu $v0, $s1, $v1 -/* 7ED300 802425F0 4600C306 */ mov.s $f12, $f24 -/* 7ED304 802425F4 C4440004 */ lwc1 $f4, 4($v0) -/* 7ED308 802425F8 46802120 */ cvt.s.w $f4, $f4 -/* 7ED30C 802425FC 44062000 */ mfc1 $a2, $f4 -/* 7ED310 80242600 C444000C */ lwc1 $f4, 0xc($v0) -/* 7ED314 80242604 46802120 */ cvt.s.w $f4, $f4 -/* 7ED318 80242608 44072000 */ mfc1 $a3, $f4 -/* 7ED31C 8024260C 0C00A7B5 */ jal dist2D -/* 7ED320 80242610 4600B386 */ mov.s $f14, $f22 -/* 7ED324 80242614 4614003C */ c.lt.s $f0, $f20 -/* 7ED328 80242618 00000000 */ nop -/* 7ED32C 8024261C 45000003 */ bc1f .L8024262C -/* 7ED330 80242620 2631000C */ addiu $s1, $s1, 0xc -/* 7ED334 80242624 46000506 */ mov.s $f20, $f0 -/* 7ED338 80242628 AEB20078 */ sw $s2, 0x78($s5) -.L8024262C: -/* 7ED33C 8024262C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 7ED340 80242630 26100001 */ addiu $s0, $s0, 1 -/* 7ED344 80242634 8C620000 */ lw $v0, ($v1) -/* 7ED348 80242638 0202102A */ slt $v0, $s0, $v0 -/* 7ED34C 8024263C 1440FFEB */ bnez $v0, .L802425EC -/* 7ED350 80242640 26520001 */ addiu $s2, $s2, 1 -.L80242644: -/* 7ED354 80242644 8E6200CC */ lw $v0, 0xcc($s3) -/* 7ED358 80242648 8C420004 */ lw $v0, 4($v0) -/* 7ED35C 8024264C AE820028 */ sw $v0, 0x28($s4) -/* 7ED360 80242650 8E6200D0 */ lw $v0, 0xd0($s3) -/* 7ED364 80242654 8C42007C */ lw $v0, 0x7c($v0) -/* 7ED368 80242658 04410004 */ bgez $v0, .L8024266C -/* 7ED36C 8024265C 00000000 */ nop -/* 7ED370 80242660 C6C00000 */ lwc1 $f0, ($s6) -/* 7ED374 80242664 080909A3 */ j .L8024268C -/* 7ED378 80242668 E6800018 */ swc1 $f0, 0x18($s4) -.L8024266C: -/* 7ED37C 8024266C 3C018025 */ lui $at, %hi(D_802559C0_8006D0) -/* 7ED380 80242670 D42259C0 */ ldc1 $f2, %lo(D_802559C0_8006D0)($at) -/* 7ED384 80242674 44820000 */ mtc1 $v0, $f0 -/* 7ED388 80242678 00000000 */ nop -/* 7ED38C 8024267C 46800021 */ cvt.d.w $f0, $f0 -/* 7ED390 80242680 46220003 */ div.d $f0, $f0, $f2 -/* 7ED394 80242684 46200020 */ cvt.s.d $f0, $f0 -/* 7ED398 80242688 E6800018 */ swc1 $f0, 0x18($s4) -.L8024268C: -/* 7ED39C 8024268C 24020001 */ addiu $v0, $zero, 1 -/* 7ED3A0 80242690 AEA20070 */ sw $v0, 0x70($s5) -/* 7ED3A4 80242694 8FBF002C */ lw $ra, 0x2c($sp) -/* 7ED3A8 80242698 8FB60028 */ lw $s6, 0x28($sp) -/* 7ED3AC 8024269C 8FB50024 */ lw $s5, 0x24($sp) -/* 7ED3B0 802426A0 8FB40020 */ lw $s4, 0x20($sp) -/* 7ED3B4 802426A4 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ED3B8 802426A8 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED3BC 802426AC 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED3C0 802426B0 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED3C4 802426B4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 7ED3C8 802426B8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 7ED3CC 802426BC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 7ED3D0 802426C0 03E00008 */ jr $ra -/* 7ED3D4 802426C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s deleted file mode 100644 index 3751df3b4e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802559C8_8006D8 -.double 32767.0 - -.section .text - -glabel func_80242BEC_7ED8FC -/* 7ED8FC 80242BEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ED900 80242BF0 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED904 80242BF4 0080882D */ daddu $s1, $a0, $zero -/* 7ED908 80242BF8 AFBF001C */ sw $ra, 0x1c($sp) -/* 7ED90C 80242BFC AFB20018 */ sw $s2, 0x18($sp) -/* 7ED910 80242C00 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED914 80242C04 8E300148 */ lw $s0, 0x148($s1) -/* 7ED918 80242C08 86040008 */ lh $a0, 8($s0) -/* 7ED91C 80242C0C 0C00EABB */ jal get_npc_unsafe -/* 7ED920 80242C10 00A0902D */ daddu $s2, $a1, $zero -/* 7ED924 80242C14 8E230078 */ lw $v1, 0x78($s1) -/* 7ED928 80242C18 24630001 */ addiu $v1, $v1, 1 -/* 7ED92C 80242C1C AE230078 */ sw $v1, 0x78($s1) -/* 7ED930 80242C20 8E0400D0 */ lw $a0, 0xd0($s0) -/* 7ED934 80242C24 8C840000 */ lw $a0, ($a0) -/* 7ED938 80242C28 0064182A */ slt $v1, $v1, $a0 -/* 7ED93C 80242C2C 14600002 */ bnez $v1, .L80242C38 -/* 7ED940 80242C30 0040282D */ daddu $a1, $v0, $zero -/* 7ED944 80242C34 AE200078 */ sw $zero, 0x78($s1) -.L80242C38: -/* 7ED948 80242C38 8E0200CC */ lw $v0, 0xcc($s0) -/* 7ED94C 80242C3C 8C420004 */ lw $v0, 4($v0) -/* 7ED950 80242C40 ACA20028 */ sw $v0, 0x28($a1) -/* 7ED954 80242C44 8E0200D0 */ lw $v0, 0xd0($s0) -/* 7ED958 80242C48 8C42007C */ lw $v0, 0x7c($v0) -/* 7ED95C 80242C4C 04410004 */ bgez $v0, .L80242C60 -/* 7ED960 80242C50 00000000 */ nop -/* 7ED964 80242C54 C6400000 */ lwc1 $f0, ($s2) -/* 7ED968 80242C58 08090B20 */ j .L80242C80 -/* 7ED96C 80242C5C E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C60: -/* 7ED970 80242C60 3C018025 */ lui $at, %hi(D_802559C8_8006D8) -/* 7ED974 80242C64 D42259C8 */ ldc1 $f2, %lo(D_802559C8_8006D8)($at) -/* 7ED978 80242C68 44820000 */ mtc1 $v0, $f0 -/* 7ED97C 80242C6C 00000000 */ nop -/* 7ED980 80242C70 46800021 */ cvt.d.w $f0, $f0 -/* 7ED984 80242C74 46220003 */ div.d $f0, $f0, $f2 -/* 7ED988 80242C78 46200020 */ cvt.s.d $f0, $f0 -/* 7ED98C 80242C7C E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C80: -/* 7ED990 80242C80 24020001 */ addiu $v0, $zero, 1 -/* 7ED994 80242C84 AE220070 */ sw $v0, 0x70($s1) -/* 7ED998 80242C88 8FBF001C */ lw $ra, 0x1c($sp) -/* 7ED99C 80242C8C 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED9A0 80242C90 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED9A4 80242C94 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED9A8 80242C98 03E00008 */ jr $ra -/* 7ED9AC 80242C9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s index 76c4e4b34a..735c47230c 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -139,7 +139,7 @@ glabel func_80243104_7EDE14 glabel L802432E8_7EDFF8 /* 7EDFF8 802432E8 0280202D */ daddu $a0, $s4, $zero /* 7EDFFC 802432EC 0260282D */ daddu $a1, $s3, $zero -/* 7EE000 802432F0 0C09095C */ jal func_80242570_7ED280 +/* 7EE000 802432F0 0C09095C */ jal mac_00_UnkNpcAIFunc24 /* 7EE004 802432F4 02A0302D */ daddu $a2, $s5, $zero glabel L802432F8_7EE008 /* 7EE008 802432F8 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80243320_7EE030 glabel L80243338_7EE048 /* 7EE048 80243338 0280202D */ daddu $a0, $s4, $zero /* 7EE04C 8024333C 0260282D */ daddu $a1, $s3, $zero -/* 7EE050 80243340 0C090AFB */ jal func_80242BEC_7ED8FC +/* 7EE050 80243340 0C090AFB */ jal mac_00_UnkNpcAIFunc25 /* 7EE054 80243344 02A0302D */ daddu $a2, $s5, $zero /* 7EE058 80243348 08090CF6 */ j L802433D8_7EE0E8 /* 7EE05C 8024334C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s deleted file mode 100644 index 12ced67a74..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802626E0_822F60 -.double 32767.0 - -.section .text - -glabel func_80241080_801900 -/* 801900 80241080 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 801904 80241084 AFB50024 */ sw $s5, 0x24($sp) -/* 801908 80241088 0080A82D */ daddu $s5, $a0, $zero -/* 80190C 8024108C AFBF002C */ sw $ra, 0x2c($sp) -/* 801910 80241090 AFB60028 */ sw $s6, 0x28($sp) -/* 801914 80241094 AFB40020 */ sw $s4, 0x20($sp) -/* 801918 80241098 AFB3001C */ sw $s3, 0x1c($sp) -/* 80191C 8024109C AFB20018 */ sw $s2, 0x18($sp) -/* 801920 802410A0 AFB10014 */ sw $s1, 0x14($sp) -/* 801924 802410A4 AFB00010 */ sw $s0, 0x10($sp) -/* 801928 802410A8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 80192C 802410AC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 801930 802410B0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 801934 802410B4 8EB30148 */ lw $s3, 0x148($s5) -/* 801938 802410B8 86640008 */ lh $a0, 8($s3) -/* 80193C 802410BC 0C00EABB */ jal get_npc_unsafe -/* 801940 802410C0 00A0B02D */ daddu $s6, $a1, $zero -/* 801944 802410C4 0040A02D */ daddu $s4, $v0, $zero -/* 801948 802410C8 AEA00074 */ sw $zero, 0x74($s5) -/* 80194C 802410CC C6980038 */ lwc1 $f24, 0x38($s4) -/* 801950 802410D0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 801954 802410D4 0000902D */ daddu $s2, $zero, $zero -/* 801958 802410D8 AEA00078 */ sw $zero, 0x78($s5) -/* 80195C 802410DC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 801960 802410E0 8C620000 */ lw $v0, ($v1) -/* 801964 802410E4 3C0146FF */ lui $at, 0x46ff -/* 801968 802410E8 3421FE00 */ ori $at, $at, 0xfe00 -/* 80196C 802410EC 4481A000 */ mtc1 $at, $f20 -/* 801970 802410F0 18400018 */ blez $v0, .L80241154 -/* 801974 802410F4 0240802D */ daddu $s0, $s2, $zero -/* 801978 802410F8 0240882D */ daddu $s1, $s2, $zero -.L802410FC: -/* 80197C 802410FC 02231021 */ addu $v0, $s1, $v1 -/* 801980 80241100 4600C306 */ mov.s $f12, $f24 -/* 801984 80241104 C4440004 */ lwc1 $f4, 4($v0) -/* 801988 80241108 46802120 */ cvt.s.w $f4, $f4 -/* 80198C 8024110C 44062000 */ mfc1 $a2, $f4 -/* 801990 80241110 C444000C */ lwc1 $f4, 0xc($v0) -/* 801994 80241114 46802120 */ cvt.s.w $f4, $f4 -/* 801998 80241118 44072000 */ mfc1 $a3, $f4 -/* 80199C 8024111C 0C00A7B5 */ jal dist2D -/* 8019A0 80241120 4600B386 */ mov.s $f14, $f22 -/* 8019A4 80241124 4614003C */ c.lt.s $f0, $f20 -/* 8019A8 80241128 00000000 */ nop -/* 8019AC 8024112C 45000003 */ bc1f .L8024113C -/* 8019B0 80241130 2631000C */ addiu $s1, $s1, 0xc -/* 8019B4 80241134 46000506 */ mov.s $f20, $f0 -/* 8019B8 80241138 AEB20078 */ sw $s2, 0x78($s5) -.L8024113C: -/* 8019BC 8024113C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 8019C0 80241140 26100001 */ addiu $s0, $s0, 1 -/* 8019C4 80241144 8C620000 */ lw $v0, ($v1) -/* 8019C8 80241148 0202102A */ slt $v0, $s0, $v0 -/* 8019CC 8024114C 1440FFEB */ bnez $v0, .L802410FC -/* 8019D0 80241150 26520001 */ addiu $s2, $s2, 1 -.L80241154: -/* 8019D4 80241154 8E6200CC */ lw $v0, 0xcc($s3) -/* 8019D8 80241158 8C420004 */ lw $v0, 4($v0) -/* 8019DC 8024115C AE820028 */ sw $v0, 0x28($s4) -/* 8019E0 80241160 8E6200D0 */ lw $v0, 0xd0($s3) -/* 8019E4 80241164 8C42007C */ lw $v0, 0x7c($v0) -/* 8019E8 80241168 04410004 */ bgez $v0, .L8024117C -/* 8019EC 8024116C 00000000 */ nop -/* 8019F0 80241170 C6C00000 */ lwc1 $f0, ($s6) -/* 8019F4 80241174 08090467 */ j .L8024119C -/* 8019F8 80241178 E6800018 */ swc1 $f0, 0x18($s4) -.L8024117C: -/* 8019FC 8024117C 3C018026 */ lui $at, %hi(D_802626E0_822F60) -/* 801A00 80241180 D42226E0 */ ldc1 $f2, %lo(D_802626E0_822F60)($at) -/* 801A04 80241184 44820000 */ mtc1 $v0, $f0 -/* 801A08 80241188 00000000 */ nop -/* 801A0C 8024118C 46800021 */ cvt.d.w $f0, $f0 -/* 801A10 80241190 46220003 */ div.d $f0, $f0, $f2 -/* 801A14 80241194 46200020 */ cvt.s.d $f0, $f0 -/* 801A18 80241198 E6800018 */ swc1 $f0, 0x18($s4) -.L8024119C: -/* 801A1C 8024119C 24020001 */ addiu $v0, $zero, 1 -/* 801A20 802411A0 AEA20070 */ sw $v0, 0x70($s5) -/* 801A24 802411A4 8FBF002C */ lw $ra, 0x2c($sp) -/* 801A28 802411A8 8FB60028 */ lw $s6, 0x28($sp) -/* 801A2C 802411AC 8FB50024 */ lw $s5, 0x24($sp) -/* 801A30 802411B0 8FB40020 */ lw $s4, 0x20($sp) -/* 801A34 802411B4 8FB3001C */ lw $s3, 0x1c($sp) -/* 801A38 802411B8 8FB20018 */ lw $s2, 0x18($sp) -/* 801A3C 802411BC 8FB10014 */ lw $s1, 0x14($sp) -/* 801A40 802411C0 8FB00010 */ lw $s0, 0x10($sp) -/* 801A44 802411C4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 801A48 802411C8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 801A4C 802411CC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 801A50 802411D0 03E00008 */ jr $ra -/* 801A54 802411D4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s deleted file mode 100644 index 9289c569a7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802626E8_822F68 -.double 32767.0 - -.section .text - -glabel func_802416FC_801F7C -/* 801F7C 802416FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 801F80 80241700 AFB10014 */ sw $s1, 0x14($sp) -/* 801F84 80241704 0080882D */ daddu $s1, $a0, $zero -/* 801F88 80241708 AFBF001C */ sw $ra, 0x1c($sp) -/* 801F8C 8024170C AFB20018 */ sw $s2, 0x18($sp) -/* 801F90 80241710 AFB00010 */ sw $s0, 0x10($sp) -/* 801F94 80241714 8E300148 */ lw $s0, 0x148($s1) -/* 801F98 80241718 86040008 */ lh $a0, 8($s0) -/* 801F9C 8024171C 0C00EABB */ jal get_npc_unsafe -/* 801FA0 80241720 00A0902D */ daddu $s2, $a1, $zero -/* 801FA4 80241724 8E230078 */ lw $v1, 0x78($s1) -/* 801FA8 80241728 24630001 */ addiu $v1, $v1, 1 -/* 801FAC 8024172C AE230078 */ sw $v1, 0x78($s1) -/* 801FB0 80241730 8E0400D0 */ lw $a0, 0xd0($s0) -/* 801FB4 80241734 8C840000 */ lw $a0, ($a0) -/* 801FB8 80241738 0064182A */ slt $v1, $v1, $a0 -/* 801FBC 8024173C 14600002 */ bnez $v1, .L80241748 -/* 801FC0 80241740 0040282D */ daddu $a1, $v0, $zero -/* 801FC4 80241744 AE200078 */ sw $zero, 0x78($s1) -.L80241748: -/* 801FC8 80241748 8E0200CC */ lw $v0, 0xcc($s0) -/* 801FCC 8024174C 8C420004 */ lw $v0, 4($v0) -/* 801FD0 80241750 ACA20028 */ sw $v0, 0x28($a1) -/* 801FD4 80241754 8E0200D0 */ lw $v0, 0xd0($s0) -/* 801FD8 80241758 8C42007C */ lw $v0, 0x7c($v0) -/* 801FDC 8024175C 04410004 */ bgez $v0, .L80241770 -/* 801FE0 80241760 00000000 */ nop -/* 801FE4 80241764 C6400000 */ lwc1 $f0, ($s2) -/* 801FE8 80241768 080905E4 */ j .L80241790 -/* 801FEC 8024176C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241770: -/* 801FF0 80241770 3C018026 */ lui $at, %hi(D_802626E8_822F68) -/* 801FF4 80241774 D42226E8 */ ldc1 $f2, %lo(D_802626E8_822F68)($at) -/* 801FF8 80241778 44820000 */ mtc1 $v0, $f0 -/* 801FFC 8024177C 00000000 */ nop -/* 802000 80241780 46800021 */ cvt.d.w $f0, $f0 -/* 802004 80241784 46220003 */ div.d $f0, $f0, $f2 -/* 802008 80241788 46200020 */ cvt.s.d $f0, $f0 -/* 80200C 8024178C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241790: -/* 802010 80241790 24020001 */ addiu $v0, $zero, 1 -/* 802014 80241794 AE220070 */ sw $v0, 0x70($s1) -/* 802018 80241798 8FBF001C */ lw $ra, 0x1c($sp) -/* 80201C 8024179C 8FB20018 */ lw $s2, 0x18($sp) -/* 802020 802417A0 8FB10014 */ lw $s1, 0x14($sp) -/* 802024 802417A4 8FB00010 */ lw $s0, 0x10($sp) -/* 802028 802417A8 03E00008 */ jr $ra -/* 80202C 802417AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s index 5f4f833d85..09c7e5a086 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -139,7 +139,7 @@ glabel func_80241C14_802494 glabel L80241DF8_802678 /* 802678 80241DF8 0280202D */ daddu $a0, $s4, $zero /* 80267C 80241DFC 0260282D */ daddu $a1, $s3, $zero -/* 802680 80241E00 0C090420 */ jal func_80241080_801900 +/* 802680 80241E00 0C090420 */ jal dup_mac_01_UnkNpcAIFunc24 /* 802684 80241E04 02A0302D */ daddu $a2, $s5, $zero glabel L80241E08_802688 /* 802688 80241E08 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241E30_8026B0 glabel L80241E48_8026C8 /* 8026C8 80241E48 0280202D */ daddu $a0, $s4, $zero /* 8026CC 80241E4C 0260282D */ daddu $a1, $s3, $zero -/* 8026D0 80241E50 0C0905BF */ jal func_802416FC_801F7C +/* 8026D0 80241E50 0C0905BF */ jal dup_mac_01_UnkNpcAIFunc25 /* 8026D4 80241E54 02A0302D */ daddu $a2, $s5, $zero /* 8026D8 80241E58 080907BA */ j L80241EE8_802768 /* 8026DC 80241E5C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s deleted file mode 100644 index b841214f7c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80262890_823110 -.double 32767.0 - -.section .text - -glabel func_80245550_805DD0 -/* 805DD0 80245550 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 805DD4 80245554 AFB50024 */ sw $s5, 0x24($sp) -/* 805DD8 80245558 0080A82D */ daddu $s5, $a0, $zero -/* 805DDC 8024555C AFBF002C */ sw $ra, 0x2c($sp) -/* 805DE0 80245560 AFB60028 */ sw $s6, 0x28($sp) -/* 805DE4 80245564 AFB40020 */ sw $s4, 0x20($sp) -/* 805DE8 80245568 AFB3001C */ sw $s3, 0x1c($sp) -/* 805DEC 8024556C AFB20018 */ sw $s2, 0x18($sp) -/* 805DF0 80245570 AFB10014 */ sw $s1, 0x14($sp) -/* 805DF4 80245574 AFB00010 */ sw $s0, 0x10($sp) -/* 805DF8 80245578 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 805DFC 8024557C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 805E00 80245580 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 805E04 80245584 8EB30148 */ lw $s3, 0x148($s5) -/* 805E08 80245588 86640008 */ lh $a0, 8($s3) -/* 805E0C 8024558C 0C00EABB */ jal get_npc_unsafe -/* 805E10 80245590 00A0B02D */ daddu $s6, $a1, $zero -/* 805E14 80245594 0040A02D */ daddu $s4, $v0, $zero -/* 805E18 80245598 AEA00074 */ sw $zero, 0x74($s5) -/* 805E1C 8024559C C6980038 */ lwc1 $f24, 0x38($s4) -/* 805E20 802455A0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 805E24 802455A4 0000902D */ daddu $s2, $zero, $zero -/* 805E28 802455A8 AEA00078 */ sw $zero, 0x78($s5) -/* 805E2C 802455AC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 805E30 802455B0 8C620000 */ lw $v0, ($v1) -/* 805E34 802455B4 3C0146FF */ lui $at, 0x46ff -/* 805E38 802455B8 3421FE00 */ ori $at, $at, 0xfe00 -/* 805E3C 802455BC 4481A000 */ mtc1 $at, $f20 -/* 805E40 802455C0 18400018 */ blez $v0, .L80245624 -/* 805E44 802455C4 0240802D */ daddu $s0, $s2, $zero -/* 805E48 802455C8 0240882D */ daddu $s1, $s2, $zero -.L802455CC: -/* 805E4C 802455CC 02231021 */ addu $v0, $s1, $v1 -/* 805E50 802455D0 4600C306 */ mov.s $f12, $f24 -/* 805E54 802455D4 C4440004 */ lwc1 $f4, 4($v0) -/* 805E58 802455D8 46802120 */ cvt.s.w $f4, $f4 -/* 805E5C 802455DC 44062000 */ mfc1 $a2, $f4 -/* 805E60 802455E0 C444000C */ lwc1 $f4, 0xc($v0) -/* 805E64 802455E4 46802120 */ cvt.s.w $f4, $f4 -/* 805E68 802455E8 44072000 */ mfc1 $a3, $f4 -/* 805E6C 802455EC 0C00A7B5 */ jal dist2D -/* 805E70 802455F0 4600B386 */ mov.s $f14, $f22 -/* 805E74 802455F4 4614003C */ c.lt.s $f0, $f20 -/* 805E78 802455F8 00000000 */ nop -/* 805E7C 802455FC 45000003 */ bc1f .L8024560C -/* 805E80 80245600 2631000C */ addiu $s1, $s1, 0xc -/* 805E84 80245604 46000506 */ mov.s $f20, $f0 -/* 805E88 80245608 AEB20078 */ sw $s2, 0x78($s5) -.L8024560C: -/* 805E8C 8024560C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 805E90 80245610 26100001 */ addiu $s0, $s0, 1 -/* 805E94 80245614 8C620000 */ lw $v0, ($v1) -/* 805E98 80245618 0202102A */ slt $v0, $s0, $v0 -/* 805E9C 8024561C 1440FFEB */ bnez $v0, .L802455CC -/* 805EA0 80245620 26520001 */ addiu $s2, $s2, 1 -.L80245624: -/* 805EA4 80245624 8E6200CC */ lw $v0, 0xcc($s3) -/* 805EA8 80245628 8C420004 */ lw $v0, 4($v0) -/* 805EAC 8024562C AE820028 */ sw $v0, 0x28($s4) -/* 805EB0 80245630 8E6200D0 */ lw $v0, 0xd0($s3) -/* 805EB4 80245634 8C42007C */ lw $v0, 0x7c($v0) -/* 805EB8 80245638 04410004 */ bgez $v0, .L8024564C -/* 805EBC 8024563C 00000000 */ nop -/* 805EC0 80245640 C6C00000 */ lwc1 $f0, ($s6) -/* 805EC4 80245644 0809159B */ j .L8024566C -/* 805EC8 80245648 E6800018 */ swc1 $f0, 0x18($s4) -.L8024564C: -/* 805ECC 8024564C 3C018026 */ lui $at, %hi(D_80262890_823110) -/* 805ED0 80245650 D4222890 */ ldc1 $f2, %lo(D_80262890_823110)($at) -/* 805ED4 80245654 44820000 */ mtc1 $v0, $f0 -/* 805ED8 80245658 00000000 */ nop -/* 805EDC 8024565C 46800021 */ cvt.d.w $f0, $f0 -/* 805EE0 80245660 46220003 */ div.d $f0, $f0, $f2 -/* 805EE4 80245664 46200020 */ cvt.s.d $f0, $f0 -/* 805EE8 80245668 E6800018 */ swc1 $f0, 0x18($s4) -.L8024566C: -/* 805EEC 8024566C 24020001 */ addiu $v0, $zero, 1 -/* 805EF0 80245670 AEA20070 */ sw $v0, 0x70($s5) -/* 805EF4 80245674 8FBF002C */ lw $ra, 0x2c($sp) -/* 805EF8 80245678 8FB60028 */ lw $s6, 0x28($sp) -/* 805EFC 8024567C 8FB50024 */ lw $s5, 0x24($sp) -/* 805F00 80245680 8FB40020 */ lw $s4, 0x20($sp) -/* 805F04 80245684 8FB3001C */ lw $s3, 0x1c($sp) -/* 805F08 80245688 8FB20018 */ lw $s2, 0x18($sp) -/* 805F0C 8024568C 8FB10014 */ lw $s1, 0x14($sp) -/* 805F10 80245690 8FB00010 */ lw $s0, 0x10($sp) -/* 805F14 80245694 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 805F18 80245698 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 805F1C 8024569C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 805F20 802456A0 03E00008 */ jr $ra -/* 805F24 802456A4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s deleted file mode 100644 index 3bcb4a4faa..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80262898_823118 -.double 32767.0 - -.section .text - -glabel func_80245BCC_80644C -/* 80644C 80245BCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 806450 80245BD0 AFB10014 */ sw $s1, 0x14($sp) -/* 806454 80245BD4 0080882D */ daddu $s1, $a0, $zero -/* 806458 80245BD8 AFBF001C */ sw $ra, 0x1c($sp) -/* 80645C 80245BDC AFB20018 */ sw $s2, 0x18($sp) -/* 806460 80245BE0 AFB00010 */ sw $s0, 0x10($sp) -/* 806464 80245BE4 8E300148 */ lw $s0, 0x148($s1) -/* 806468 80245BE8 86040008 */ lh $a0, 8($s0) -/* 80646C 80245BEC 0C00EABB */ jal get_npc_unsafe -/* 806470 80245BF0 00A0902D */ daddu $s2, $a1, $zero -/* 806474 80245BF4 8E230078 */ lw $v1, 0x78($s1) -/* 806478 80245BF8 24630001 */ addiu $v1, $v1, 1 -/* 80647C 80245BFC AE230078 */ sw $v1, 0x78($s1) -/* 806480 80245C00 8E0400D0 */ lw $a0, 0xd0($s0) -/* 806484 80245C04 8C840000 */ lw $a0, ($a0) -/* 806488 80245C08 0064182A */ slt $v1, $v1, $a0 -/* 80648C 80245C0C 14600002 */ bnez $v1, .L80245C18 -/* 806490 80245C10 0040282D */ daddu $a1, $v0, $zero -/* 806494 80245C14 AE200078 */ sw $zero, 0x78($s1) -.L80245C18: -/* 806498 80245C18 8E0200CC */ lw $v0, 0xcc($s0) -/* 80649C 80245C1C 8C420004 */ lw $v0, 4($v0) -/* 8064A0 80245C20 ACA20028 */ sw $v0, 0x28($a1) -/* 8064A4 80245C24 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8064A8 80245C28 8C42007C */ lw $v0, 0x7c($v0) -/* 8064AC 80245C2C 04410004 */ bgez $v0, .L80245C40 -/* 8064B0 80245C30 00000000 */ nop -/* 8064B4 80245C34 C6400000 */ lwc1 $f0, ($s2) -/* 8064B8 80245C38 08091718 */ j .L80245C60 -/* 8064BC 80245C3C E4A00018 */ swc1 $f0, 0x18($a1) -.L80245C40: -/* 8064C0 80245C40 3C018026 */ lui $at, %hi(D_80262898_823118) -/* 8064C4 80245C44 D4222898 */ ldc1 $f2, %lo(D_80262898_823118)($at) -/* 8064C8 80245C48 44820000 */ mtc1 $v0, $f0 -/* 8064CC 80245C4C 00000000 */ nop -/* 8064D0 80245C50 46800021 */ cvt.d.w $f0, $f0 -/* 8064D4 80245C54 46220003 */ div.d $f0, $f0, $f2 -/* 8064D8 80245C58 46200020 */ cvt.s.d $f0, $f0 -/* 8064DC 80245C5C E4A00018 */ swc1 $f0, 0x18($a1) -.L80245C60: -/* 8064E0 80245C60 24020001 */ addiu $v0, $zero, 1 -/* 8064E4 80245C64 AE220070 */ sw $v0, 0x70($s1) -/* 8064E8 80245C68 8FBF001C */ lw $ra, 0x1c($sp) -/* 8064EC 80245C6C 8FB20018 */ lw $s2, 0x18($sp) -/* 8064F0 80245C70 8FB10014 */ lw $s1, 0x14($sp) -/* 8064F4 80245C74 8FB00010 */ lw $s0, 0x10($sp) -/* 8064F8 80245C78 03E00008 */ jr $ra -/* 8064FC 80245C7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s index f8f6e049a9..665422b004 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -139,7 +139,7 @@ glabel func_802460E4_806964 glabel L802462C8_806B48 /* 806B48 802462C8 0280202D */ daddu $a0, $s4, $zero /* 806B4C 802462CC 0260282D */ daddu $a1, $s3, $zero -/* 806B50 802462D0 0C091554 */ jal func_80245550_805DD0 +/* 806B50 802462D0 0C091554 */ jal mac_01_UnkNpcAIFunc24 /* 806B54 802462D4 02A0302D */ daddu $a2, $s5, $zero glabel L802462D8_806B58 /* 806B58 802462D8 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80246300_806B80 glabel L80246318_806B98 /* 806B98 80246318 0280202D */ daddu $a0, $s4, $zero /* 806B9C 8024631C 0260282D */ daddu $a1, $s3, $zero -/* 806BA0 80246320 0C0916F3 */ jal func_80245BCC_80644C +/* 806BA0 80246320 0C0916F3 */ jal mac_01_UnkNpcAIFunc25 /* 806BA4 80246324 02A0302D */ daddu $a2, $s5, $zero /* 806BA8 80246328 080918EE */ j L802463B8_806C38 /* 806BAC 8024632C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s deleted file mode 100644 index 7a774dab58..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024E200_8314C0 -.double 32767.0 - -.section .text - -glabel func_80240930_823BF0 -/* 823BF0 80240930 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 823BF4 80240934 AFB50024 */ sw $s5, 0x24($sp) -/* 823BF8 80240938 0080A82D */ daddu $s5, $a0, $zero -/* 823BFC 8024093C AFBF002C */ sw $ra, 0x2c($sp) -/* 823C00 80240940 AFB60028 */ sw $s6, 0x28($sp) -/* 823C04 80240944 AFB40020 */ sw $s4, 0x20($sp) -/* 823C08 80240948 AFB3001C */ sw $s3, 0x1c($sp) -/* 823C0C 8024094C AFB20018 */ sw $s2, 0x18($sp) -/* 823C10 80240950 AFB10014 */ sw $s1, 0x14($sp) -/* 823C14 80240954 AFB00010 */ sw $s0, 0x10($sp) -/* 823C18 80240958 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 823C1C 8024095C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 823C20 80240960 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 823C24 80240964 8EB30148 */ lw $s3, 0x148($s5) -/* 823C28 80240968 86640008 */ lh $a0, 8($s3) -/* 823C2C 8024096C 0C00EABB */ jal get_npc_unsafe -/* 823C30 80240970 00A0B02D */ daddu $s6, $a1, $zero -/* 823C34 80240974 0040A02D */ daddu $s4, $v0, $zero -/* 823C38 80240978 AEA00074 */ sw $zero, 0x74($s5) -/* 823C3C 8024097C C6980038 */ lwc1 $f24, 0x38($s4) -/* 823C40 80240980 C6960040 */ lwc1 $f22, 0x40($s4) -/* 823C44 80240984 0000902D */ daddu $s2, $zero, $zero -/* 823C48 80240988 AEA00078 */ sw $zero, 0x78($s5) -/* 823C4C 8024098C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 823C50 80240990 8C620000 */ lw $v0, ($v1) -/* 823C54 80240994 3C0146FF */ lui $at, 0x46ff -/* 823C58 80240998 3421FE00 */ ori $at, $at, 0xfe00 -/* 823C5C 8024099C 4481A000 */ mtc1 $at, $f20 -/* 823C60 802409A0 18400018 */ blez $v0, .L80240A04 -/* 823C64 802409A4 0240802D */ daddu $s0, $s2, $zero -/* 823C68 802409A8 0240882D */ daddu $s1, $s2, $zero -.L802409AC: -/* 823C6C 802409AC 02231021 */ addu $v0, $s1, $v1 -/* 823C70 802409B0 4600C306 */ mov.s $f12, $f24 -/* 823C74 802409B4 C4440004 */ lwc1 $f4, 4($v0) -/* 823C78 802409B8 46802120 */ cvt.s.w $f4, $f4 -/* 823C7C 802409BC 44062000 */ mfc1 $a2, $f4 -/* 823C80 802409C0 C444000C */ lwc1 $f4, 0xc($v0) -/* 823C84 802409C4 46802120 */ cvt.s.w $f4, $f4 -/* 823C88 802409C8 44072000 */ mfc1 $a3, $f4 -/* 823C8C 802409CC 0C00A7B5 */ jal dist2D -/* 823C90 802409D0 4600B386 */ mov.s $f14, $f22 -/* 823C94 802409D4 4614003C */ c.lt.s $f0, $f20 -/* 823C98 802409D8 00000000 */ nop -/* 823C9C 802409DC 45000003 */ bc1f .L802409EC -/* 823CA0 802409E0 2631000C */ addiu $s1, $s1, 0xc -/* 823CA4 802409E4 46000506 */ mov.s $f20, $f0 -/* 823CA8 802409E8 AEB20078 */ sw $s2, 0x78($s5) -.L802409EC: -/* 823CAC 802409EC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 823CB0 802409F0 26100001 */ addiu $s0, $s0, 1 -/* 823CB4 802409F4 8C620000 */ lw $v0, ($v1) -/* 823CB8 802409F8 0202102A */ slt $v0, $s0, $v0 -/* 823CBC 802409FC 1440FFEB */ bnez $v0, .L802409AC -/* 823CC0 80240A00 26520001 */ addiu $s2, $s2, 1 -.L80240A04: -/* 823CC4 80240A04 8E6200CC */ lw $v0, 0xcc($s3) -/* 823CC8 80240A08 8C420004 */ lw $v0, 4($v0) -/* 823CCC 80240A0C AE820028 */ sw $v0, 0x28($s4) -/* 823CD0 80240A10 8E6200D0 */ lw $v0, 0xd0($s3) -/* 823CD4 80240A14 8C42007C */ lw $v0, 0x7c($v0) -/* 823CD8 80240A18 04410004 */ bgez $v0, .L80240A2C -/* 823CDC 80240A1C 00000000 */ nop -/* 823CE0 80240A20 C6C00000 */ lwc1 $f0, ($s6) -/* 823CE4 80240A24 08090293 */ j .L80240A4C -/* 823CE8 80240A28 E6800018 */ swc1 $f0, 0x18($s4) -.L80240A2C: -/* 823CEC 80240A2C 3C018025 */ lui $at, %hi(D_8024E200_8314C0) -/* 823CF0 80240A30 D422E200 */ ldc1 $f2, %lo(D_8024E200_8314C0)($at) -/* 823CF4 80240A34 44820000 */ mtc1 $v0, $f0 -/* 823CF8 80240A38 00000000 */ nop -/* 823CFC 80240A3C 46800021 */ cvt.d.w $f0, $f0 -/* 823D00 80240A40 46220003 */ div.d $f0, $f0, $f2 -/* 823D04 80240A44 46200020 */ cvt.s.d $f0, $f0 -/* 823D08 80240A48 E6800018 */ swc1 $f0, 0x18($s4) -.L80240A4C: -/* 823D0C 80240A4C 24020001 */ addiu $v0, $zero, 1 -/* 823D10 80240A50 AEA20070 */ sw $v0, 0x70($s5) -/* 823D14 80240A54 8FBF002C */ lw $ra, 0x2c($sp) -/* 823D18 80240A58 8FB60028 */ lw $s6, 0x28($sp) -/* 823D1C 80240A5C 8FB50024 */ lw $s5, 0x24($sp) -/* 823D20 80240A60 8FB40020 */ lw $s4, 0x20($sp) -/* 823D24 80240A64 8FB3001C */ lw $s3, 0x1c($sp) -/* 823D28 80240A68 8FB20018 */ lw $s2, 0x18($sp) -/* 823D2C 80240A6C 8FB10014 */ lw $s1, 0x14($sp) -/* 823D30 80240A70 8FB00010 */ lw $s0, 0x10($sp) -/* 823D34 80240A74 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 823D38 80240A78 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 823D3C 80240A7C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 823D40 80240A80 03E00008 */ jr $ra -/* 823D44 80240A84 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s deleted file mode 100644 index 596ae2ccd8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024E208_8314C8 -.double 32767.0 - -.section .text - -glabel func_80240FAC_82426C -/* 82426C 80240FAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824270 80240FB0 AFB10014 */ sw $s1, 0x14($sp) -/* 824274 80240FB4 0080882D */ daddu $s1, $a0, $zero -/* 824278 80240FB8 AFBF001C */ sw $ra, 0x1c($sp) -/* 82427C 80240FBC AFB20018 */ sw $s2, 0x18($sp) -/* 824280 80240FC0 AFB00010 */ sw $s0, 0x10($sp) -/* 824284 80240FC4 8E300148 */ lw $s0, 0x148($s1) -/* 824288 80240FC8 86040008 */ lh $a0, 8($s0) -/* 82428C 80240FCC 0C00EABB */ jal get_npc_unsafe -/* 824290 80240FD0 00A0902D */ daddu $s2, $a1, $zero -/* 824294 80240FD4 8E230078 */ lw $v1, 0x78($s1) -/* 824298 80240FD8 24630001 */ addiu $v1, $v1, 1 -/* 82429C 80240FDC AE230078 */ sw $v1, 0x78($s1) -/* 8242A0 80240FE0 8E0400D0 */ lw $a0, 0xd0($s0) -/* 8242A4 80240FE4 8C840000 */ lw $a0, ($a0) -/* 8242A8 80240FE8 0064182A */ slt $v1, $v1, $a0 -/* 8242AC 80240FEC 14600002 */ bnez $v1, .L80240FF8 -/* 8242B0 80240FF0 0040282D */ daddu $a1, $v0, $zero -/* 8242B4 80240FF4 AE200078 */ sw $zero, 0x78($s1) -.L80240FF8: -/* 8242B8 80240FF8 8E0200CC */ lw $v0, 0xcc($s0) -/* 8242BC 80240FFC 8C420004 */ lw $v0, 4($v0) -/* 8242C0 80241000 ACA20028 */ sw $v0, 0x28($a1) -/* 8242C4 80241004 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8242C8 80241008 8C42007C */ lw $v0, 0x7c($v0) -/* 8242CC 8024100C 04410004 */ bgez $v0, .L80241020 -/* 8242D0 80241010 00000000 */ nop -/* 8242D4 80241014 C6400000 */ lwc1 $f0, ($s2) -/* 8242D8 80241018 08090410 */ j .L80241040 -/* 8242DC 8024101C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241020: -/* 8242E0 80241020 3C018025 */ lui $at, %hi(D_8024E208_8314C8) -/* 8242E4 80241024 D422E208 */ ldc1 $f2, %lo(D_8024E208_8314C8)($at) -/* 8242E8 80241028 44820000 */ mtc1 $v0, $f0 -/* 8242EC 8024102C 00000000 */ nop -/* 8242F0 80241030 46800021 */ cvt.d.w $f0, $f0 -/* 8242F4 80241034 46220003 */ div.d $f0, $f0, $f2 -/* 8242F8 80241038 46200020 */ cvt.s.d $f0, $f0 -/* 8242FC 8024103C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241040: -/* 824300 80241040 24020001 */ addiu $v0, $zero, 1 -/* 824304 80241044 AE220070 */ sw $v0, 0x70($s1) -/* 824308 80241048 8FBF001C */ lw $ra, 0x1c($sp) -/* 82430C 8024104C 8FB20018 */ lw $s2, 0x18($sp) -/* 824310 80241050 8FB10014 */ lw $s1, 0x14($sp) -/* 824314 80241054 8FB00010 */ lw $s0, 0x10($sp) -/* 824318 80241058 03E00008 */ jr $ra -/* 82431C 8024105C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s index 45dfdfe94b..436ffa82a0 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -139,7 +139,7 @@ glabel func_802414C4_824784 glabel L802416A8_824968 /* 824968 802416A8 0280202D */ daddu $a0, $s4, $zero /* 82496C 802416AC 0260282D */ daddu $a1, $s3, $zero -/* 824970 802416B0 0C09024C */ jal func_80240930_823BF0 +/* 824970 802416B0 0C09024C */ jal mac_02_UnkNpcAIFunc24 /* 824974 802416B4 02A0302D */ daddu $a2, $s5, $zero glabel L802416B8_824978 /* 824978 802416B8 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L802416E0_8249A0 glabel L802416F8_8249B8 /* 8249B8 802416F8 0280202D */ daddu $a0, $s4, $zero /* 8249BC 802416FC 0260282D */ daddu $a1, $s3, $zero -/* 8249C0 80241700 0C0903EB */ jal func_80240FAC_82426C +/* 8249C0 80241700 0C0903EB */ jal mac_02_UnkNpcAIFunc25 /* 8249C4 80241704 02A0302D */ daddu $a2, $s5, $zero /* 8249C8 80241708 080905E6 */ j L80241798_824A58 /* 8249CC 8024170C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s deleted file mode 100644 index 4ebd3cb8ba..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802527B0_864920 -.double 32767.0 - -.section .text - -glabel func_80240490_852600 -/* 852600 80240490 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852604 80240494 AFB50024 */ sw $s5, 0x24($sp) -/* 852608 80240498 0080A82D */ daddu $s5, $a0, $zero -/* 85260C 8024049C AFBF002C */ sw $ra, 0x2c($sp) -/* 852610 802404A0 AFB60028 */ sw $s6, 0x28($sp) -/* 852614 802404A4 AFB40020 */ sw $s4, 0x20($sp) -/* 852618 802404A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 85261C 802404AC AFB20018 */ sw $s2, 0x18($sp) -/* 852620 802404B0 AFB10014 */ sw $s1, 0x14($sp) -/* 852624 802404B4 AFB00010 */ sw $s0, 0x10($sp) -/* 852628 802404B8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 85262C 802404BC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 852630 802404C0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 852634 802404C4 8EB30148 */ lw $s3, 0x148($s5) -/* 852638 802404C8 86640008 */ lh $a0, 8($s3) -/* 85263C 802404CC 0C00EABB */ jal get_npc_unsafe -/* 852640 802404D0 00A0B02D */ daddu $s6, $a1, $zero -/* 852644 802404D4 0040A02D */ daddu $s4, $v0, $zero -/* 852648 802404D8 AEA00074 */ sw $zero, 0x74($s5) -/* 85264C 802404DC C6980038 */ lwc1 $f24, 0x38($s4) -/* 852650 802404E0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 852654 802404E4 0000902D */ daddu $s2, $zero, $zero -/* 852658 802404E8 AEA00078 */ sw $zero, 0x78($s5) -/* 85265C 802404EC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 852660 802404F0 8C620000 */ lw $v0, ($v1) -/* 852664 802404F4 3C0146FF */ lui $at, 0x46ff -/* 852668 802404F8 3421FE00 */ ori $at, $at, 0xfe00 -/* 85266C 802404FC 4481A000 */ mtc1 $at, $f20 -/* 852670 80240500 18400018 */ blez $v0, .L80240564 -/* 852674 80240504 0240802D */ daddu $s0, $s2, $zero -/* 852678 80240508 0240882D */ daddu $s1, $s2, $zero -.L8024050C: -/* 85267C 8024050C 02231021 */ addu $v0, $s1, $v1 -/* 852680 80240510 4600C306 */ mov.s $f12, $f24 -/* 852684 80240514 C4440004 */ lwc1 $f4, 4($v0) -/* 852688 80240518 46802120 */ cvt.s.w $f4, $f4 -/* 85268C 8024051C 44062000 */ mfc1 $a2, $f4 -/* 852690 80240520 C444000C */ lwc1 $f4, 0xc($v0) -/* 852694 80240524 46802120 */ cvt.s.w $f4, $f4 -/* 852698 80240528 44072000 */ mfc1 $a3, $f4 -/* 85269C 8024052C 0C00A7B5 */ jal dist2D -/* 8526A0 80240530 4600B386 */ mov.s $f14, $f22 -/* 8526A4 80240534 4614003C */ c.lt.s $f0, $f20 -/* 8526A8 80240538 00000000 */ nop -/* 8526AC 8024053C 45000003 */ bc1f .L8024054C -/* 8526B0 80240540 2631000C */ addiu $s1, $s1, 0xc -/* 8526B4 80240544 46000506 */ mov.s $f20, $f0 -/* 8526B8 80240548 AEB20078 */ sw $s2, 0x78($s5) -.L8024054C: -/* 8526BC 8024054C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 8526C0 80240550 26100001 */ addiu $s0, $s0, 1 -/* 8526C4 80240554 8C620000 */ lw $v0, ($v1) -/* 8526C8 80240558 0202102A */ slt $v0, $s0, $v0 -/* 8526CC 8024055C 1440FFEB */ bnez $v0, .L8024050C -/* 8526D0 80240560 26520001 */ addiu $s2, $s2, 1 -.L80240564: -/* 8526D4 80240564 8E6200CC */ lw $v0, 0xcc($s3) -/* 8526D8 80240568 8C420004 */ lw $v0, 4($v0) -/* 8526DC 8024056C AE820028 */ sw $v0, 0x28($s4) -/* 8526E0 80240570 8E6200D0 */ lw $v0, 0xd0($s3) -/* 8526E4 80240574 8C42007C */ lw $v0, 0x7c($v0) -/* 8526E8 80240578 04410004 */ bgez $v0, .L8024058C -/* 8526EC 8024057C 00000000 */ nop -/* 8526F0 80240580 C6C00000 */ lwc1 $f0, ($s6) -/* 8526F4 80240584 0809016B */ j .L802405AC -/* 8526F8 80240588 E6800018 */ swc1 $f0, 0x18($s4) -.L8024058C: -/* 8526FC 8024058C 3C018025 */ lui $at, %hi(D_802527B0_864920) -/* 852700 80240590 D42227B0 */ ldc1 $f2, %lo(D_802527B0_864920)($at) -/* 852704 80240594 44820000 */ mtc1 $v0, $f0 -/* 852708 80240598 00000000 */ nop -/* 85270C 8024059C 46800021 */ cvt.d.w $f0, $f0 -/* 852710 802405A0 46220003 */ div.d $f0, $f0, $f2 -/* 852714 802405A4 46200020 */ cvt.s.d $f0, $f0 -/* 852718 802405A8 E6800018 */ swc1 $f0, 0x18($s4) -.L802405AC: -/* 85271C 802405AC 24020001 */ addiu $v0, $zero, 1 -/* 852720 802405B0 AEA20070 */ sw $v0, 0x70($s5) -/* 852724 802405B4 8FBF002C */ lw $ra, 0x2c($sp) -/* 852728 802405B8 8FB60028 */ lw $s6, 0x28($sp) -/* 85272C 802405BC 8FB50024 */ lw $s5, 0x24($sp) -/* 852730 802405C0 8FB40020 */ lw $s4, 0x20($sp) -/* 852734 802405C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 852738 802405C8 8FB20018 */ lw $s2, 0x18($sp) -/* 85273C 802405CC 8FB10014 */ lw $s1, 0x14($sp) -/* 852740 802405D0 8FB00010 */ lw $s0, 0x10($sp) -/* 852744 802405D4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 852748 802405D8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 85274C 802405DC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 852750 802405E0 03E00008 */ jr $ra -/* 852754 802405E4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s deleted file mode 100644 index 1dfa656ad3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802527B8_864928 -.double 32767.0 - -.section .text - -glabel func_80240B0C_852C7C -/* 852C7C 80240B0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 852C80 80240B10 AFB10014 */ sw $s1, 0x14($sp) -/* 852C84 80240B14 0080882D */ daddu $s1, $a0, $zero -/* 852C88 80240B18 AFBF001C */ sw $ra, 0x1c($sp) -/* 852C8C 80240B1C AFB20018 */ sw $s2, 0x18($sp) -/* 852C90 80240B20 AFB00010 */ sw $s0, 0x10($sp) -/* 852C94 80240B24 8E300148 */ lw $s0, 0x148($s1) -/* 852C98 80240B28 86040008 */ lh $a0, 8($s0) -/* 852C9C 80240B2C 0C00EABB */ jal get_npc_unsafe -/* 852CA0 80240B30 00A0902D */ daddu $s2, $a1, $zero -/* 852CA4 80240B34 8E230078 */ lw $v1, 0x78($s1) -/* 852CA8 80240B38 24630001 */ addiu $v1, $v1, 1 -/* 852CAC 80240B3C AE230078 */ sw $v1, 0x78($s1) -/* 852CB0 80240B40 8E0400D0 */ lw $a0, 0xd0($s0) -/* 852CB4 80240B44 8C840000 */ lw $a0, ($a0) -/* 852CB8 80240B48 0064182A */ slt $v1, $v1, $a0 -/* 852CBC 80240B4C 14600002 */ bnez $v1, .L80240B58 -/* 852CC0 80240B50 0040282D */ daddu $a1, $v0, $zero -/* 852CC4 80240B54 AE200078 */ sw $zero, 0x78($s1) -.L80240B58: -/* 852CC8 80240B58 8E0200CC */ lw $v0, 0xcc($s0) -/* 852CCC 80240B5C 8C420004 */ lw $v0, 4($v0) -/* 852CD0 80240B60 ACA20028 */ sw $v0, 0x28($a1) -/* 852CD4 80240B64 8E0200D0 */ lw $v0, 0xd0($s0) -/* 852CD8 80240B68 8C42007C */ lw $v0, 0x7c($v0) -/* 852CDC 80240B6C 04410004 */ bgez $v0, .L80240B80 -/* 852CE0 80240B70 00000000 */ nop -/* 852CE4 80240B74 C6400000 */ lwc1 $f0, ($s2) -/* 852CE8 80240B78 080902E8 */ j .L80240BA0 -/* 852CEC 80240B7C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240B80: -/* 852CF0 80240B80 3C018025 */ lui $at, %hi(D_802527B8_864928) -/* 852CF4 80240B84 D42227B8 */ ldc1 $f2, %lo(D_802527B8_864928)($at) -/* 852CF8 80240B88 44820000 */ mtc1 $v0, $f0 -/* 852CFC 80240B8C 00000000 */ nop -/* 852D00 80240B90 46800021 */ cvt.d.w $f0, $f0 -/* 852D04 80240B94 46220003 */ div.d $f0, $f0, $f2 -/* 852D08 80240B98 46200020 */ cvt.s.d $f0, $f0 -/* 852D0C 80240B9C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240BA0: -/* 852D10 80240BA0 24020001 */ addiu $v0, $zero, 1 -/* 852D14 80240BA4 AE220070 */ sw $v0, 0x70($s1) -/* 852D18 80240BA8 8FBF001C */ lw $ra, 0x1c($sp) -/* 852D1C 80240BAC 8FB20018 */ lw $s2, 0x18($sp) -/* 852D20 80240BB0 8FB10014 */ lw $s1, 0x14($sp) -/* 852D24 80240BB4 8FB00010 */ lw $s0, 0x10($sp) -/* 852D28 80240BB8 03E00008 */ jr $ra -/* 852D2C 80240BBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s index 38819996a2..90a49e7ff9 100644 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s +++ b/ver/us/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -139,7 +139,7 @@ glabel func_80241024_853194 glabel L80241208_853378 /* 853378 80241208 0280202D */ daddu $a0, $s4, $zero /* 85337C 8024120C 0260282D */ daddu $a1, $s3, $zero -/* 853380 80241210 0C090124 */ jal func_80240490_852600 +/* 853380 80241210 0C090124 */ jal mac_05_UnkNpcAIFunc24 /* 853384 80241214 02A0302D */ daddu $a2, $s5, $zero glabel L80241218_853388 /* 853388 80241218 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241240_8533B0 glabel L80241258_8533C8 /* 8533C8 80241258 0280202D */ daddu $a0, $s4, $zero /* 8533CC 8024125C 0260282D */ daddu $a1, $s3, $zero -/* 8533D0 80241260 0C0902C3 */ jal func_80240B0C_852C7C +/* 8533D0 80241260 0C0902C3 */ jal mac_05_UnkNpcAIFunc25 /* 8533D4 80241264 02A0302D */ daddu $a2, $s5, $zero /* 8533D8 80241268 080904BE */ j L802412F8_853468 /* 8533DC 8024126C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s deleted file mode 100644 index 6145eeea66..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_802402E0_E0EA80.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243DF0_E12590 -.double 32767.0 - -.section .text - -glabel func_802402E0_E0EA80 -/* E0EA80 802402E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* E0EA84 802402E4 AFB50024 */ sw $s5, 0x24($sp) -/* E0EA88 802402E8 0080A82D */ daddu $s5, $a0, $zero -/* E0EA8C 802402EC AFBF002C */ sw $ra, 0x2c($sp) -/* E0EA90 802402F0 AFB60028 */ sw $s6, 0x28($sp) -/* E0EA94 802402F4 AFB40020 */ sw $s4, 0x20($sp) -/* E0EA98 802402F8 AFB3001C */ sw $s3, 0x1c($sp) -/* E0EA9C 802402FC AFB20018 */ sw $s2, 0x18($sp) -/* E0EAA0 80240300 AFB10014 */ sw $s1, 0x14($sp) -/* E0EAA4 80240304 AFB00010 */ sw $s0, 0x10($sp) -/* E0EAA8 80240308 F7B80040 */ sdc1 $f24, 0x40($sp) -/* E0EAAC 8024030C F7B60038 */ sdc1 $f22, 0x38($sp) -/* E0EAB0 80240310 F7B40030 */ sdc1 $f20, 0x30($sp) -/* E0EAB4 80240314 8EB30148 */ lw $s3, 0x148($s5) -/* E0EAB8 80240318 86640008 */ lh $a0, 8($s3) -/* E0EABC 8024031C 0C00EABB */ jal get_npc_unsafe -/* E0EAC0 80240320 00A0B02D */ daddu $s6, $a1, $zero -/* E0EAC4 80240324 0040A02D */ daddu $s4, $v0, $zero -/* E0EAC8 80240328 AEA00074 */ sw $zero, 0x74($s5) -/* E0EACC 8024032C C6980038 */ lwc1 $f24, 0x38($s4) -/* E0EAD0 80240330 C6960040 */ lwc1 $f22, 0x40($s4) -/* E0EAD4 80240334 0000902D */ daddu $s2, $zero, $zero -/* E0EAD8 80240338 AEA00078 */ sw $zero, 0x78($s5) -/* E0EADC 8024033C 8E6300D0 */ lw $v1, 0xd0($s3) -/* E0EAE0 80240340 8C620000 */ lw $v0, ($v1) -/* E0EAE4 80240344 3C0146FF */ lui $at, 0x46ff -/* E0EAE8 80240348 3421FE00 */ ori $at, $at, 0xfe00 -/* E0EAEC 8024034C 4481A000 */ mtc1 $at, $f20 -/* E0EAF0 80240350 18400018 */ blez $v0, .L802403B4 -/* E0EAF4 80240354 0240802D */ daddu $s0, $s2, $zero -/* E0EAF8 80240358 0240882D */ daddu $s1, $s2, $zero -.L8024035C: -/* E0EAFC 8024035C 02231021 */ addu $v0, $s1, $v1 -/* E0EB00 80240360 4600C306 */ mov.s $f12, $f24 -/* E0EB04 80240364 C4440004 */ lwc1 $f4, 4($v0) -/* E0EB08 80240368 46802120 */ cvt.s.w $f4, $f4 -/* E0EB0C 8024036C 44062000 */ mfc1 $a2, $f4 -/* E0EB10 80240370 C444000C */ lwc1 $f4, 0xc($v0) -/* E0EB14 80240374 46802120 */ cvt.s.w $f4, $f4 -/* E0EB18 80240378 44072000 */ mfc1 $a3, $f4 -/* E0EB1C 8024037C 0C00A7B5 */ jal dist2D -/* E0EB20 80240380 4600B386 */ mov.s $f14, $f22 -/* E0EB24 80240384 4614003C */ c.lt.s $f0, $f20 -/* E0EB28 80240388 00000000 */ nop -/* E0EB2C 8024038C 45000003 */ bc1f .L8024039C -/* E0EB30 80240390 2631000C */ addiu $s1, $s1, 0xc -/* E0EB34 80240394 46000506 */ mov.s $f20, $f0 -/* E0EB38 80240398 AEB20078 */ sw $s2, 0x78($s5) -.L8024039C: -/* E0EB3C 8024039C 8E6300D0 */ lw $v1, 0xd0($s3) -/* E0EB40 802403A0 26100001 */ addiu $s0, $s0, 1 -/* E0EB44 802403A4 8C620000 */ lw $v0, ($v1) -/* E0EB48 802403A8 0202102A */ slt $v0, $s0, $v0 -/* E0EB4C 802403AC 1440FFEB */ bnez $v0, .L8024035C -/* E0EB50 802403B0 26520001 */ addiu $s2, $s2, 1 -.L802403B4: -/* E0EB54 802403B4 8E6200CC */ lw $v0, 0xcc($s3) -/* E0EB58 802403B8 8C420004 */ lw $v0, 4($v0) -/* E0EB5C 802403BC AE820028 */ sw $v0, 0x28($s4) -/* E0EB60 802403C0 8E6200D0 */ lw $v0, 0xd0($s3) -/* E0EB64 802403C4 8C42007C */ lw $v0, 0x7c($v0) -/* E0EB68 802403C8 04410004 */ bgez $v0, .L802403DC -/* E0EB6C 802403CC 00000000 */ nop -/* E0EB70 802403D0 C6C00000 */ lwc1 $f0, ($s6) -/* E0EB74 802403D4 080900FF */ j .L802403FC -/* E0EB78 802403D8 E6800018 */ swc1 $f0, 0x18($s4) -.L802403DC: -/* E0EB7C 802403DC 3C018024 */ lui $at, %hi(D_80243DF0_E12590) -/* E0EB80 802403E0 D4223DF0 */ ldc1 $f2, %lo(D_80243DF0_E12590)($at) -/* E0EB84 802403E4 44820000 */ mtc1 $v0, $f0 -/* E0EB88 802403E8 00000000 */ nop -/* E0EB8C 802403EC 46800021 */ cvt.d.w $f0, $f0 -/* E0EB90 802403F0 46220003 */ div.d $f0, $f0, $f2 -/* E0EB94 802403F4 46200020 */ cvt.s.d $f0, $f0 -/* E0EB98 802403F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802403FC: -/* E0EB9C 802403FC 24020001 */ addiu $v0, $zero, 1 -/* E0EBA0 80240400 AEA20070 */ sw $v0, 0x70($s5) -/* E0EBA4 80240404 8FBF002C */ lw $ra, 0x2c($sp) -/* E0EBA8 80240408 8FB60028 */ lw $s6, 0x28($sp) -/* E0EBAC 8024040C 8FB50024 */ lw $s5, 0x24($sp) -/* E0EBB0 80240410 8FB40020 */ lw $s4, 0x20($sp) -/* E0EBB4 80240414 8FB3001C */ lw $s3, 0x1c($sp) -/* E0EBB8 80240418 8FB20018 */ lw $s2, 0x18($sp) -/* E0EBBC 8024041C 8FB10014 */ lw $s1, 0x14($sp) -/* E0EBC0 80240420 8FB00010 */ lw $s0, 0x10($sp) -/* E0EBC4 80240424 D7B80040 */ ldc1 $f24, 0x40($sp) -/* E0EBC8 80240428 D7B60038 */ ldc1 $f22, 0x38($sp) -/* E0EBCC 8024042C D7B40030 */ ldc1 $f20, 0x30($sp) -/* E0EBD0 80240430 03E00008 */ jr $ra -/* E0EBD4 80240434 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s deleted file mode 100644 index dabcc34806..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_8024095C_E0F0FC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243DF8_E12598 -.double 32767.0 - -.section .text - -glabel func_8024095C_E0F0FC -/* E0F0FC 8024095C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F100 80240960 AFB10014 */ sw $s1, 0x14($sp) -/* E0F104 80240964 0080882D */ daddu $s1, $a0, $zero -/* E0F108 80240968 AFBF001C */ sw $ra, 0x1c($sp) -/* E0F10C 8024096C AFB20018 */ sw $s2, 0x18($sp) -/* E0F110 80240970 AFB00010 */ sw $s0, 0x10($sp) -/* E0F114 80240974 8E300148 */ lw $s0, 0x148($s1) -/* E0F118 80240978 86040008 */ lh $a0, 8($s0) -/* E0F11C 8024097C 0C00EABB */ jal get_npc_unsafe -/* E0F120 80240980 00A0902D */ daddu $s2, $a1, $zero -/* E0F124 80240984 8E230078 */ lw $v1, 0x78($s1) -/* E0F128 80240988 24630001 */ addiu $v1, $v1, 1 -/* E0F12C 8024098C AE230078 */ sw $v1, 0x78($s1) -/* E0F130 80240990 8E0400D0 */ lw $a0, 0xd0($s0) -/* E0F134 80240994 8C840000 */ lw $a0, ($a0) -/* E0F138 80240998 0064182A */ slt $v1, $v1, $a0 -/* E0F13C 8024099C 14600002 */ bnez $v1, .L802409A8 -/* E0F140 802409A0 0040282D */ daddu $a1, $v0, $zero -/* E0F144 802409A4 AE200078 */ sw $zero, 0x78($s1) -.L802409A8: -/* E0F148 802409A8 8E0200CC */ lw $v0, 0xcc($s0) -/* E0F14C 802409AC 8C420004 */ lw $v0, 4($v0) -/* E0F150 802409B0 ACA20028 */ sw $v0, 0x28($a1) -/* E0F154 802409B4 8E0200D0 */ lw $v0, 0xd0($s0) -/* E0F158 802409B8 8C42007C */ lw $v0, 0x7c($v0) -/* E0F15C 802409BC 04410004 */ bgez $v0, .L802409D0 -/* E0F160 802409C0 00000000 */ nop -/* E0F164 802409C4 C6400000 */ lwc1 $f0, ($s2) -/* E0F168 802409C8 0809027C */ j .L802409F0 -/* E0F16C 802409CC E4A00018 */ swc1 $f0, 0x18($a1) -.L802409D0: -/* E0F170 802409D0 3C018024 */ lui $at, %hi(D_80243DF8_E12598) -/* E0F174 802409D4 D4223DF8 */ ldc1 $f2, %lo(D_80243DF8_E12598)($at) -/* E0F178 802409D8 44820000 */ mtc1 $v0, $f0 -/* E0F17C 802409DC 00000000 */ nop -/* E0F180 802409E0 46800021 */ cvt.d.w $f0, $f0 -/* E0F184 802409E4 46220003 */ div.d $f0, $f0, $f2 -/* E0F188 802409E8 46200020 */ cvt.s.d $f0, $f0 -/* E0F18C 802409EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802409F0: -/* E0F190 802409F0 24020001 */ addiu $v0, $zero, 1 -/* E0F194 802409F4 AE220070 */ sw $v0, 0x70($s1) -/* E0F198 802409F8 8FBF001C */ lw $ra, 0x1c($sp) -/* E0F19C 802409FC 8FB20018 */ lw $s2, 0x18($sp) -/* E0F1A0 80240A00 8FB10014 */ lw $s1, 0x14($sp) -/* E0F1A4 80240A04 8FB00010 */ lw $s0, 0x10($sp) -/* E0F1A8 80240A08 03E00008 */ jr $ra -/* E0F1AC 80240A0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s index cc20e0c291..d3e2567ae4 100644 --- a/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s +++ b/ver/us/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -139,7 +139,7 @@ glabel func_80240E74_E0F614 glabel L80241058_E0F7F8 /* E0F7F8 80241058 0280202D */ daddu $a0, $s4, $zero /* E0F7FC 8024105C 0260282D */ daddu $a1, $s3, $zero -/* E0F800 80241060 0C0900B8 */ jal func_802402E0_E0EA80 +/* E0F800 80241060 0C0900B8 */ jal mgm_00_UnkNpcAIFunc24 /* E0F804 80241064 02A0302D */ daddu $a2, $s5, $zero glabel L80241068_E0F808 /* E0F808 80241068 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241090_E0F830 glabel L802410A8_E0F848 /* E0F848 802410A8 0280202D */ daddu $a0, $s4, $zero /* E0F84C 802410AC 0260282D */ daddu $a1, $s3, $zero -/* E0F850 802410B0 0C090257 */ jal func_8024095C_E0F0FC +/* E0F850 802410B0 0C090257 */ jal mgm_00_UnkNpcAIFunc25 /* E0F854 802410B4 02A0302D */ daddu $a2, $s5, $zero /* E0F858 802410B8 08090452 */ j L80241148_E0F8E8 /* E0F85C 802410BC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s deleted file mode 100644 index 9b69780ddc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802400A0_BAD9E0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802452A0_BB2BE0 -.double 32767.0 - -.section .text - -glabel func_802400A0_BAD9E0 -/* BAD9E0 802400A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BAD9E4 802400A4 AFB3002C */ sw $s3, 0x2c($sp) -/* BAD9E8 802400A8 0080982D */ daddu $s3, $a0, $zero -/* BAD9EC 802400AC AFBF0030 */ sw $ra, 0x30($sp) -/* BAD9F0 802400B0 AFB20028 */ sw $s2, 0x28($sp) -/* BAD9F4 802400B4 AFB10024 */ sw $s1, 0x24($sp) -/* BAD9F8 802400B8 AFB00020 */ sw $s0, 0x20($sp) -/* BAD9FC 802400BC 8E710148 */ lw $s1, 0x148($s3) -/* BADA00 802400C0 86240008 */ lh $a0, 8($s1) -/* BADA04 802400C4 0C00EABB */ jal get_npc_unsafe -/* BADA08 802400C8 00A0902D */ daddu $s2, $a1, $zero -/* BADA0C 802400CC 8E440004 */ lw $a0, 4($s2) -/* BADA10 802400D0 0040802D */ daddu $s0, $v0, $zero -/* BADA14 802400D4 00041FC2 */ srl $v1, $a0, 0x1f -/* BADA18 802400D8 00832021 */ addu $a0, $a0, $v1 -/* BADA1C 802400DC 00042043 */ sra $a0, $a0, 1 -/* BADA20 802400E0 0C00A67F */ jal rand_int -/* BADA24 802400E4 24840001 */ addiu $a0, $a0, 1 -/* BADA28 802400E8 8E430004 */ lw $v1, 4($s2) -/* BADA2C 802400EC 000327C2 */ srl $a0, $v1, 0x1f -/* BADA30 802400F0 00641821 */ addu $v1, $v1, $a0 -/* BADA34 802400F4 00031843 */ sra $v1, $v1, 1 -/* BADA38 802400F8 00621821 */ addu $v1, $v1, $v0 -/* BADA3C 802400FC A603008E */ sh $v1, 0x8e($s0) -/* BADA40 80240100 8E2300D0 */ lw $v1, 0xd0($s1) -/* BADA44 80240104 C6000040 */ lwc1 $f0, 0x40($s0) -/* BADA48 80240108 C4640000 */ lwc1 $f4, ($v1) -/* BADA4C 8024010C 46802120 */ cvt.s.w $f4, $f4 -/* BADA50 80240110 C4620008 */ lwc1 $f2, 8($v1) -/* BADA54 80240114 468010A0 */ cvt.s.w $f2, $f2 -/* BADA58 80240118 E7A00010 */ swc1 $f0, 0x10($sp) -/* BADA5C 8024011C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADA60 80240120 44061000 */ mfc1 $a2, $f2 -/* BADA64 80240124 C440000C */ lwc1 $f0, 0xc($v0) -/* BADA68 80240128 46800020 */ cvt.s.w $f0, $f0 -/* BADA6C 8024012C E7A00014 */ swc1 $f0, 0x14($sp) -/* BADA70 80240130 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADA74 80240134 44052000 */ mfc1 $a1, $f4 -/* BADA78 80240138 C4400010 */ lwc1 $f0, 0x10($v0) -/* BADA7C 8024013C 46800020 */ cvt.s.w $f0, $f0 -/* BADA80 80240140 E7A00018 */ swc1 $f0, 0x18($sp) -/* BADA84 80240144 8C640018 */ lw $a0, 0x18($v1) -/* BADA88 80240148 0C0123F5 */ jal is_point_within_region -/* BADA8C 8024014C 8E070038 */ lw $a3, 0x38($s0) -/* BADA90 80240150 1040000E */ beqz $v0, .L8024018C -/* BADA94 80240154 00000000 */ nop -/* BADA98 80240158 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADA9C 8024015C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BADAA0 80240160 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BADAA4 80240164 C4460000 */ lwc1 $f6, ($v0) -/* BADAA8 80240168 468031A0 */ cvt.s.w $f6, $f6 -/* BADAAC 8024016C 44063000 */ mfc1 $a2, $f6 -/* BADAB0 80240170 C4460008 */ lwc1 $f6, 8($v0) -/* BADAB4 80240174 468031A0 */ cvt.s.w $f6, $f6 -/* BADAB8 80240178 44073000 */ mfc1 $a3, $f6 -/* BADABC 8024017C 0C00A720 */ jal atan2 -/* BADAC0 80240180 00000000 */ nop -/* BADAC4 80240184 0809006F */ j .L802401BC -/* BADAC8 80240188 E600000C */ swc1 $f0, 0xc($s0) -.L8024018C: -/* BADACC 8024018C 0C00A67F */ jal rand_int -/* BADAD0 80240190 2404003C */ addiu $a0, $zero, 0x3c -/* BADAD4 80240194 C60C000C */ lwc1 $f12, 0xc($s0) -/* BADAD8 80240198 44820000 */ mtc1 $v0, $f0 -/* BADADC 8024019C 00000000 */ nop -/* BADAE0 802401A0 46800020 */ cvt.s.w $f0, $f0 -/* BADAE4 802401A4 46006300 */ add.s $f12, $f12, $f0 -/* BADAE8 802401A8 3C0141F0 */ lui $at, 0x41f0 -/* BADAEC 802401AC 44810000 */ mtc1 $at, $f0 -/* BADAF0 802401B0 0C00A6C9 */ jal clamp_angle -/* BADAF4 802401B4 46006301 */ sub.s $f12, $f12, $f0 -/* BADAF8 802401B8 E600000C */ swc1 $f0, 0xc($s0) -.L802401BC: -/* BADAFC 802401BC 8E2200CC */ lw $v0, 0xcc($s1) -/* BADB00 802401C0 8C420004 */ lw $v0, 4($v0) -/* BADB04 802401C4 AE020028 */ sw $v0, 0x28($s0) -/* BADB08 802401C8 AE600074 */ sw $zero, 0x74($s3) -/* BADB0C 802401CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* BADB10 802401D0 8C420014 */ lw $v0, 0x14($v0) -/* BADB14 802401D4 04410004 */ bgez $v0, .L802401E8 -/* BADB18 802401D8 00000000 */ nop -/* BADB1C 802401DC C6400000 */ lwc1 $f0, ($s2) -/* BADB20 802401E0 08090082 */ j .L80240208 -/* BADB24 802401E4 E6000018 */ swc1 $f0, 0x18($s0) -.L802401E8: -/* BADB28 802401E8 3C018024 */ lui $at, %hi(D_802452A0_BB2BE0) -/* BADB2C 802401EC D42252A0 */ ldc1 $f2, %lo(D_802452A0_BB2BE0)($at) -/* BADB30 802401F0 44820000 */ mtc1 $v0, $f0 -/* BADB34 802401F4 00000000 */ nop -/* BADB38 802401F8 46800021 */ cvt.d.w $f0, $f0 -/* BADB3C 802401FC 46220003 */ div.d $f0, $f0, $f2 -/* BADB40 80240200 46200020 */ cvt.s.d $f0, $f0 -/* BADB44 80240204 E6000018 */ swc1 $f0, 0x18($s0) -.L80240208: -/* BADB48 80240208 C600003C */ lwc1 $f0, 0x3c($s0) -/* BADB4C 8024020C 3C014059 */ lui $at, 0x4059 -/* BADB50 80240210 44811800 */ mtc1 $at, $f3 -/* BADB54 80240214 44801000 */ mtc1 $zero, $f2 -/* BADB58 80240218 46000021 */ cvt.d.s $f0, $f0 -/* BADB5C 8024021C 46220002 */ mul.d $f0, $f0, $f2 -/* BADB60 80240220 00000000 */ nop -/* BADB64 80240224 24020001 */ addiu $v0, $zero, 1 -/* BADB68 80240228 4620018D */ trunc.w.d $f6, $f0 -/* BADB6C 8024022C E626007C */ swc1 $f6, 0x7c($s1) -/* BADB70 80240230 AE620070 */ sw $v0, 0x70($s3) -/* BADB74 80240234 8FBF0030 */ lw $ra, 0x30($sp) -/* BADB78 80240238 8FB3002C */ lw $s3, 0x2c($sp) -/* BADB7C 8024023C 8FB20028 */ lw $s2, 0x28($sp) -/* BADB80 80240240 8FB10024 */ lw $s1, 0x24($sp) -/* BADB84 80240244 8FB00020 */ lw $s0, 0x20($sp) -/* BADB88 80240248 03E00008 */ jr $ra -/* BADB8C 8024024C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s index 251937e7e1..2b7b7156d3 100644 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s +++ b/ver/us/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -81,7 +81,7 @@ glabel func_802413AC_BAECEC glabel L802414B8_BAEDF8 /* BAEDF8 802414B8 0280202D */ daddu $a0, $s4, $zero /* BAEDFC 802414BC 0200282D */ daddu $a1, $s0, $zero -/* BAEE00 802414C0 0C090028 */ jal func_802400A0_BAD9E0 +/* BAEE00 802414C0 0C090028 */ jal mim_08_UnkNpcAIFunc23 /* BAEE04 802414C4 0260302D */ daddu $a2, $s3, $zero glabel L802414C8_BAEE08 /* BAEE08 802414C8 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s deleted file mode 100644 index ef394e0e4b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80254620_9EB640 -.double 32767.0 - -.section .text - -glabel func_80240A80_9D7AA0 -/* 9D7AA0 80240A80 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D7AA4 80240A84 AFB50024 */ sw $s5, 0x24($sp) -/* 9D7AA8 80240A88 0080A82D */ daddu $s5, $a0, $zero -/* 9D7AAC 80240A8C AFBF002C */ sw $ra, 0x2c($sp) -/* 9D7AB0 80240A90 AFB60028 */ sw $s6, 0x28($sp) -/* 9D7AB4 80240A94 AFB40020 */ sw $s4, 0x20($sp) -/* 9D7AB8 80240A98 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D7ABC 80240A9C AFB20018 */ sw $s2, 0x18($sp) -/* 9D7AC0 80240AA0 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7AC4 80240AA4 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7AC8 80240AA8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9D7ACC 80240AAC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9D7AD0 80240AB0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9D7AD4 80240AB4 8EB30148 */ lw $s3, 0x148($s5) -/* 9D7AD8 80240AB8 86640008 */ lh $a0, 8($s3) -/* 9D7ADC 80240ABC 0C00EABB */ jal get_npc_unsafe -/* 9D7AE0 80240AC0 00A0B02D */ daddu $s6, $a1, $zero -/* 9D7AE4 80240AC4 0040A02D */ daddu $s4, $v0, $zero -/* 9D7AE8 80240AC8 AEA00074 */ sw $zero, 0x74($s5) -/* 9D7AEC 80240ACC C6980038 */ lwc1 $f24, 0x38($s4) -/* 9D7AF0 80240AD0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9D7AF4 80240AD4 0000902D */ daddu $s2, $zero, $zero -/* 9D7AF8 80240AD8 AEA00078 */ sw $zero, 0x78($s5) -/* 9D7AFC 80240ADC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9D7B00 80240AE0 8C620000 */ lw $v0, ($v1) -/* 9D7B04 80240AE4 3C0146FF */ lui $at, 0x46ff -/* 9D7B08 80240AE8 3421FE00 */ ori $at, $at, 0xfe00 -/* 9D7B0C 80240AEC 4481A000 */ mtc1 $at, $f20 -/* 9D7B10 80240AF0 18400018 */ blez $v0, .L80240B54 -/* 9D7B14 80240AF4 0240802D */ daddu $s0, $s2, $zero -/* 9D7B18 80240AF8 0240882D */ daddu $s1, $s2, $zero -.L80240AFC: -/* 9D7B1C 80240AFC 02231021 */ addu $v0, $s1, $v1 -/* 9D7B20 80240B00 4600C306 */ mov.s $f12, $f24 -/* 9D7B24 80240B04 C4440004 */ lwc1 $f4, 4($v0) -/* 9D7B28 80240B08 46802120 */ cvt.s.w $f4, $f4 -/* 9D7B2C 80240B0C 44062000 */ mfc1 $a2, $f4 -/* 9D7B30 80240B10 C444000C */ lwc1 $f4, 0xc($v0) -/* 9D7B34 80240B14 46802120 */ cvt.s.w $f4, $f4 -/* 9D7B38 80240B18 44072000 */ mfc1 $a3, $f4 -/* 9D7B3C 80240B1C 0C00A7B5 */ jal dist2D -/* 9D7B40 80240B20 4600B386 */ mov.s $f14, $f22 -/* 9D7B44 80240B24 4614003C */ c.lt.s $f0, $f20 -/* 9D7B48 80240B28 00000000 */ nop -/* 9D7B4C 80240B2C 45000003 */ bc1f .L80240B3C -/* 9D7B50 80240B30 2631000C */ addiu $s1, $s1, 0xc -/* 9D7B54 80240B34 46000506 */ mov.s $f20, $f0 -/* 9D7B58 80240B38 AEB20078 */ sw $s2, 0x78($s5) -.L80240B3C: -/* 9D7B5C 80240B3C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9D7B60 80240B40 26100001 */ addiu $s0, $s0, 1 -/* 9D7B64 80240B44 8C620000 */ lw $v0, ($v1) -/* 9D7B68 80240B48 0202102A */ slt $v0, $s0, $v0 -/* 9D7B6C 80240B4C 1440FFEB */ bnez $v0, .L80240AFC -/* 9D7B70 80240B50 26520001 */ addiu $s2, $s2, 1 -.L80240B54: -/* 9D7B74 80240B54 8E6200CC */ lw $v0, 0xcc($s3) -/* 9D7B78 80240B58 8C420004 */ lw $v0, 4($v0) -/* 9D7B7C 80240B5C AE820028 */ sw $v0, 0x28($s4) -/* 9D7B80 80240B60 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9D7B84 80240B64 8C42007C */ lw $v0, 0x7c($v0) -/* 9D7B88 80240B68 04410004 */ bgez $v0, .L80240B7C -/* 9D7B8C 80240B6C 00000000 */ nop -/* 9D7B90 80240B70 C6C00000 */ lwc1 $f0, ($s6) -/* 9D7B94 80240B74 080902E7 */ j .L80240B9C -/* 9D7B98 80240B78 E6800018 */ swc1 $f0, 0x18($s4) -.L80240B7C: -/* 9D7B9C 80240B7C 3C018025 */ lui $at, %hi(D_80254620_9EB640) -/* 9D7BA0 80240B80 D4224620 */ ldc1 $f2, %lo(D_80254620_9EB640)($at) -/* 9D7BA4 80240B84 44820000 */ mtc1 $v0, $f0 -/* 9D7BA8 80240B88 00000000 */ nop -/* 9D7BAC 80240B8C 46800021 */ cvt.d.w $f0, $f0 -/* 9D7BB0 80240B90 46220003 */ div.d $f0, $f0, $f2 -/* 9D7BB4 80240B94 46200020 */ cvt.s.d $f0, $f0 -/* 9D7BB8 80240B98 E6800018 */ swc1 $f0, 0x18($s4) -.L80240B9C: -/* 9D7BBC 80240B9C 24020001 */ addiu $v0, $zero, 1 -/* 9D7BC0 80240BA0 AEA20070 */ sw $v0, 0x70($s5) -/* 9D7BC4 80240BA4 8FBF002C */ lw $ra, 0x2c($sp) -/* 9D7BC8 80240BA8 8FB60028 */ lw $s6, 0x28($sp) -/* 9D7BCC 80240BAC 8FB50024 */ lw $s5, 0x24($sp) -/* 9D7BD0 80240BB0 8FB40020 */ lw $s4, 0x20($sp) -/* 9D7BD4 80240BB4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D7BD8 80240BB8 8FB20018 */ lw $s2, 0x18($sp) -/* 9D7BDC 80240BBC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7BE0 80240BC0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7BE4 80240BC4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9D7BE8 80240BC8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9D7BEC 80240BCC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9D7BF0 80240BD0 03E00008 */ jr $ra -/* 9D7BF4 80240BD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s deleted file mode 100644 index 4717b8674a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80254628_9EB648 -.double 32767.0 - -.section .text - -glabel func_802410FC_9D811C -/* 9D811C 802410FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8120 80241100 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8124 80241104 0080882D */ daddu $s1, $a0, $zero -/* 9D8128 80241108 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D812C 8024110C AFB20018 */ sw $s2, 0x18($sp) -/* 9D8130 80241110 AFB00010 */ sw $s0, 0x10($sp) -/* 9D8134 80241114 8E300148 */ lw $s0, 0x148($s1) -/* 9D8138 80241118 86040008 */ lh $a0, 8($s0) -/* 9D813C 8024111C 0C00EABB */ jal get_npc_unsafe -/* 9D8140 80241120 00A0902D */ daddu $s2, $a1, $zero -/* 9D8144 80241124 8E230078 */ lw $v1, 0x78($s1) -/* 9D8148 80241128 24630001 */ addiu $v1, $v1, 1 -/* 9D814C 8024112C AE230078 */ sw $v1, 0x78($s1) -/* 9D8150 80241130 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9D8154 80241134 8C840000 */ lw $a0, ($a0) -/* 9D8158 80241138 0064182A */ slt $v1, $v1, $a0 -/* 9D815C 8024113C 14600002 */ bnez $v1, .L80241148 -/* 9D8160 80241140 0040282D */ daddu $a1, $v0, $zero -/* 9D8164 80241144 AE200078 */ sw $zero, 0x78($s1) -.L80241148: -/* 9D8168 80241148 8E0200CC */ lw $v0, 0xcc($s0) -/* 9D816C 8024114C 8C420004 */ lw $v0, 4($v0) -/* 9D8170 80241150 ACA20028 */ sw $v0, 0x28($a1) -/* 9D8174 80241154 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9D8178 80241158 8C42007C */ lw $v0, 0x7c($v0) -/* 9D817C 8024115C 04410004 */ bgez $v0, .L80241170 -/* 9D8180 80241160 00000000 */ nop -/* 9D8184 80241164 C6400000 */ lwc1 $f0, ($s2) -/* 9D8188 80241168 08090464 */ j .L80241190 -/* 9D818C 8024116C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241170: -/* 9D8190 80241170 3C018025 */ lui $at, %hi(D_80254628_9EB648) -/* 9D8194 80241174 D4224628 */ ldc1 $f2, %lo(D_80254628_9EB648)($at) -/* 9D8198 80241178 44820000 */ mtc1 $v0, $f0 -/* 9D819C 8024117C 00000000 */ nop -/* 9D81A0 80241180 46800021 */ cvt.d.w $f0, $f0 -/* 9D81A4 80241184 46220003 */ div.d $f0, $f0, $f2 -/* 9D81A8 80241188 46200020 */ cvt.s.d $f0, $f0 -/* 9D81AC 8024118C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241190: -/* 9D81B0 80241190 24020001 */ addiu $v0, $zero, 1 -/* 9D81B4 80241194 AE220070 */ sw $v0, 0x70($s1) -/* 9D81B8 80241198 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D81BC 8024119C 8FB20018 */ lw $s2, 0x18($sp) -/* 9D81C0 802411A0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D81C4 802411A4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D81C8 802411A8 03E00008 */ jr $ra -/* 9D81CC 802411AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s index 28c7beac9e..632655d311 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -139,7 +139,7 @@ glabel func_80241614_9D8634 glabel L802417F8_9D8818 /* 9D8818 802417F8 0280202D */ daddu $a0, $s4, $zero /* 9D881C 802417FC 0260282D */ daddu $a1, $s3, $zero -/* 9D8820 80241800 0C0902A0 */ jal func_80240A80_9D7AA0 +/* 9D8820 80241800 0C0902A0 */ jal nok_02_UnkNpcAIFunc24 /* 9D8824 80241804 02A0302D */ daddu $a2, $s5, $zero glabel L80241808_9D8828 /* 9D8828 80241808 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241830_9D8850 glabel L80241848_9D8868 /* 9D8868 80241848 0280202D */ daddu $a0, $s4, $zero /* 9D886C 8024184C 0260282D */ daddu $a1, $s3, $zero -/* 9D8870 80241850 0C09043F */ jal func_802410FC_9D811C +/* 9D8870 80241850 0C09043F */ jal nok_02_UnkNpcAIFunc25 /* 9D8874 80241854 02A0302D */ daddu $a2, $s5, $zero /* 9D8878 80241858 0809063A */ j L802418E8_9D8908 /* 9D887C 8024185C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4_9DA004.s b/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4_9DA004.s deleted file mode 100644 index 21059fedd2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4_9DA004.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FE4_9DA004 -/* 9DA004 80242FE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DA008 80242FE8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9DA00C 80242FEC 8C82000C */ lw $v0, 0xc($a0) -/* 9DA010 80242FF0 0C0B1EAF */ jal get_variable -/* 9DA014 80242FF4 8C450000 */ lw $a1, ($v0) -/* 9DA018 80242FF8 0C03AC5A */ jal switch_to_partner -/* 9DA01C 80242FFC 0040202D */ daddu $a0, $v0, $zero -/* 9DA020 80243000 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DA024 80243004 24020002 */ addiu $v0, $zero, 2 -/* 9DA028 80243008 03E00008 */ jr $ra -/* 9DA02C 8024300C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s deleted file mode 100644 index 066ac063eb..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024007C_9F4ABC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245CF0_9FA730 -.double 0.8 - -.section .text - -glabel func_8024007C_9F4ABC -/* 9F4ABC 8024007C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9F4AC0 80240080 AFB3001C */ sw $s3, 0x1c($sp) -/* 9F4AC4 80240084 0080982D */ daddu $s3, $a0, $zero -/* 9F4AC8 80240088 AFBF0020 */ sw $ra, 0x20($sp) -/* 9F4ACC 8024008C AFB20018 */ sw $s2, 0x18($sp) -/* 9F4AD0 80240090 AFB10014 */ sw $s1, 0x14($sp) -/* 9F4AD4 80240094 AFB00010 */ sw $s0, 0x10($sp) -/* 9F4AD8 80240098 8E710148 */ lw $s1, 0x148($s3) -/* 9F4ADC 8024009C 86240008 */ lh $a0, 8($s1) -/* 9F4AE0 802400A0 0C00EABB */ jal get_npc_unsafe -/* 9F4AE4 802400A4 00A0902D */ daddu $s2, $a1, $zero -/* 9F4AE8 802400A8 0040802D */ daddu $s0, $v0, $zero -/* 9F4AEC 802400AC 8602008E */ lh $v0, 0x8e($s0) -/* 9F4AF0 802400B0 9603008E */ lhu $v1, 0x8e($s0) -/* 9F4AF4 802400B4 18400005 */ blez $v0, .L802400CC -/* 9F4AF8 802400B8 2462FFFF */ addiu $v0, $v1, -1 -/* 9F4AFC 802400BC A602008E */ sh $v0, 0x8e($s0) -/* 9F4B00 802400C0 00021400 */ sll $v0, $v0, 0x10 -/* 9F4B04 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 9F4B08 802400C8 00000000 */ nop -.L802400CC: -/* 9F4B0C 802400CC 8602008C */ lh $v0, 0x8c($s0) -/* 9F4B10 802400D0 14400030 */ bnez $v0, .L80240194 -/* 9F4B14 802400D4 00000000 */ nop -/* 9F4B18 802400D8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F4B1C 802400DC 8C420024 */ lw $v0, 0x24($v0) -/* 9F4B20 802400E0 AE020028 */ sw $v0, 0x28($s0) -/* 9F4B24 802400E4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9F4B28 802400E8 E6000018 */ swc1 $f0, 0x18($s0) -/* 9F4B2C 802400EC 8E230088 */ lw $v1, 0x88($s1) -/* 9F4B30 802400F0 24020005 */ addiu $v0, $zero, 5 -/* 9F4B34 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 9F4B38 802400F8 00000000 */ nop -/* 9F4B3C 802400FC 10600003 */ beqz $v1, .L8024010C -/* 9F4B40 80240100 24020001 */ addiu $v0, $zero, 1 -/* 9F4B44 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 9F4B48 80240108 00000000 */ nop -.L8024010C: -/* 9F4B4C 8024010C 8E220084 */ lw $v0, 0x84($s1) -/* 9F4B50 80240110 00021FC2 */ srl $v1, $v0, 0x1f -/* 9F4B54 80240114 00431021 */ addu $v0, $v0, $v1 -/* 9F4B58 80240118 00021043 */ sra $v0, $v0, 1 -/* 9F4B5C 8024011C A60200A8 */ sh $v0, 0xa8($s0) -.L80240120: -/* 9F4B60 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F4B64 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F4B68 80240128 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F4B6C 8024012C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F4B70 80240130 8C460028 */ lw $a2, 0x28($v0) -/* 9F4B74 80240134 0C00A7B5 */ jal dist2D -/* 9F4B78 80240138 8C470030 */ lw $a3, 0x30($v0) -/* 9F4B7C 8024013C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9F4B80 80240140 46020003 */ div.s $f0, $f0, $f2 -/* 9F4B84 80240144 3C018024 */ lui $at, %hi(D_80245CF0_9FA730) -/* 9F4B88 80240148 D4225CF0 */ ldc1 $f2, %lo(D_80245CF0_9FA730)($at) -/* 9F4B8C 8024014C 46000021 */ cvt.d.s $f0, $f0 -/* 9F4B90 80240150 46220000 */ add.d $f0, $f0, $f2 -/* 9F4B94 80240154 4620010D */ trunc.w.d $f4, $f0 -/* 9F4B98 80240158 44022000 */ mfc1 $v0, $f4 -/* 9F4B9C 8024015C 00000000 */ nop -/* 9F4BA0 80240160 A602008E */ sh $v0, 0x8e($s0) -/* 9F4BA4 80240164 00021400 */ sll $v0, $v0, 0x10 -/* 9F4BA8 80240168 8E230078 */ lw $v1, 0x78($s1) -/* 9F4BAC 8024016C 00021403 */ sra $v0, $v0, 0x10 -/* 9F4BB0 80240170 0043102A */ slt $v0, $v0, $v1 -/* 9F4BB4 80240174 10400003 */ beqz $v0, .L80240184 -/* 9F4BB8 80240178 00000000 */ nop -/* 9F4BBC 8024017C 9622007A */ lhu $v0, 0x7a($s1) -/* 9F4BC0 80240180 A602008E */ sh $v0, 0x8e($s0) -.L80240184: -/* 9F4BC4 80240184 8602008E */ lh $v0, 0x8e($s0) -/* 9F4BC8 80240188 AE22007C */ sw $v0, 0x7c($s1) -/* 9F4BCC 8024018C 2402000E */ addiu $v0, $zero, 0xe -/* 9F4BD0 80240190 AE620070 */ sw $v0, 0x70($s3) -.L80240194: -/* 9F4BD4 80240194 8FBF0020 */ lw $ra, 0x20($sp) -/* 9F4BD8 80240198 8FB3001C */ lw $s3, 0x1c($sp) -/* 9F4BDC 8024019C 8FB20018 */ lw $s2, 0x18($sp) -/* 9F4BE0 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* 9F4BE4 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* 9F4BE8 802401A8 03E00008 */ jr $ra -/* 9F4BEC 802401AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index 8338f8b06a..772d12c467 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -244,7 +244,7 @@ glabel func_80240394_9F4DD4 /* 9F5134 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: /* 9F5138 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 9F513C 802406FC 0C09001F */ jal func_8024007C_9F4ABC +/* 9F513C 802406FC 0C09001F */ jal nok_11_UnkDistFunc /* 9F5140 80240700 02A0302D */ daddu $a2, $s5, $zero /* 9F5144 80240704 080901D0 */ j .L80240740 /* 9F5148 80240708 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s deleted file mode 100644 index 4960545e5e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802407D4_9F5214.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245D50_9FA790 -.double 32767.0 - -.section .text - -glabel func_802407D4_9F5214 -/* 9F5214 802407D4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9F5218 802407D8 AFB3002C */ sw $s3, 0x2c($sp) -/* 9F521C 802407DC 0080982D */ daddu $s3, $a0, $zero -/* 9F5220 802407E0 AFBF0030 */ sw $ra, 0x30($sp) -/* 9F5224 802407E4 AFB20028 */ sw $s2, 0x28($sp) -/* 9F5228 802407E8 AFB10024 */ sw $s1, 0x24($sp) -/* 9F522C 802407EC AFB00020 */ sw $s0, 0x20($sp) -/* 9F5230 802407F0 8E710148 */ lw $s1, 0x148($s3) -/* 9F5234 802407F4 86240008 */ lh $a0, 8($s1) -/* 9F5238 802407F8 0C00EABB */ jal get_npc_unsafe -/* 9F523C 802407FC 00A0902D */ daddu $s2, $a1, $zero -/* 9F5240 80240800 8E440004 */ lw $a0, 4($s2) -/* 9F5244 80240804 0040802D */ daddu $s0, $v0, $zero -/* 9F5248 80240808 00041FC2 */ srl $v1, $a0, 0x1f -/* 9F524C 8024080C 00832021 */ addu $a0, $a0, $v1 -/* 9F5250 80240810 00042043 */ sra $a0, $a0, 1 -/* 9F5254 80240814 0C00A67F */ jal rand_int -/* 9F5258 80240818 24840001 */ addiu $a0, $a0, 1 -/* 9F525C 8024081C 8E430004 */ lw $v1, 4($s2) -/* 9F5260 80240820 000327C2 */ srl $a0, $v1, 0x1f -/* 9F5264 80240824 00641821 */ addu $v1, $v1, $a0 -/* 9F5268 80240828 00031843 */ sra $v1, $v1, 1 -/* 9F526C 8024082C 00621821 */ addu $v1, $v1, $v0 -/* 9F5270 80240830 A603008E */ sh $v1, 0x8e($s0) -/* 9F5274 80240834 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9F5278 80240838 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9F527C 8024083C C4640000 */ lwc1 $f4, ($v1) -/* 9F5280 80240840 46802120 */ cvt.s.w $f4, $f4 -/* 9F5284 80240844 C4620008 */ lwc1 $f2, 8($v1) -/* 9F5288 80240848 468010A0 */ cvt.s.w $f2, $f2 -/* 9F528C 8024084C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9F5290 80240850 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5294 80240854 44061000 */ mfc1 $a2, $f2 -/* 9F5298 80240858 C440000C */ lwc1 $f0, 0xc($v0) -/* 9F529C 8024085C 46800020 */ cvt.s.w $f0, $f0 -/* 9F52A0 80240860 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9F52A4 80240864 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F52A8 80240868 44052000 */ mfc1 $a1, $f4 -/* 9F52AC 8024086C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9F52B0 80240870 46800020 */ cvt.s.w $f0, $f0 -/* 9F52B4 80240874 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F52B8 80240878 8C640018 */ lw $a0, 0x18($v1) -/* 9F52BC 8024087C 0C0123F5 */ jal is_point_within_region -/* 9F52C0 80240880 8E070038 */ lw $a3, 0x38($s0) -/* 9F52C4 80240884 1040000E */ beqz $v0, .L802408C0 -/* 9F52C8 80240888 00000000 */ nop -/* 9F52CC 8024088C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F52D0 80240890 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F52D4 80240894 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F52D8 80240898 C4460000 */ lwc1 $f6, ($v0) -/* 9F52DC 8024089C 468031A0 */ cvt.s.w $f6, $f6 -/* 9F52E0 802408A0 44063000 */ mfc1 $a2, $f6 -/* 9F52E4 802408A4 C4460008 */ lwc1 $f6, 8($v0) -/* 9F52E8 802408A8 468031A0 */ cvt.s.w $f6, $f6 -/* 9F52EC 802408AC 44073000 */ mfc1 $a3, $f6 -/* 9F52F0 802408B0 0C00A720 */ jal atan2 -/* 9F52F4 802408B4 00000000 */ nop -/* 9F52F8 802408B8 0809023C */ j .L802408F0 -/* 9F52FC 802408BC E600000C */ swc1 $f0, 0xc($s0) -.L802408C0: -/* 9F5300 802408C0 0C00A67F */ jal rand_int -/* 9F5304 802408C4 2404003C */ addiu $a0, $zero, 0x3c -/* 9F5308 802408C8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9F530C 802408CC 44820000 */ mtc1 $v0, $f0 -/* 9F5310 802408D0 00000000 */ nop -/* 9F5314 802408D4 46800020 */ cvt.s.w $f0, $f0 -/* 9F5318 802408D8 46006300 */ add.s $f12, $f12, $f0 -/* 9F531C 802408DC 3C0141F0 */ lui $at, 0x41f0 -/* 9F5320 802408E0 44810000 */ mtc1 $at, $f0 -/* 9F5324 802408E4 0C00A6C9 */ jal clamp_angle -/* 9F5328 802408E8 46006301 */ sub.s $f12, $f12, $f0 -/* 9F532C 802408EC E600000C */ swc1 $f0, 0xc($s0) -.L802408F0: -/* 9F5330 802408F0 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F5334 802408F4 8C420004 */ lw $v0, 4($v0) -/* 9F5338 802408F8 AE020028 */ sw $v0, 0x28($s0) -/* 9F533C 802408FC AE600074 */ sw $zero, 0x74($s3) -/* 9F5340 80240900 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9F5344 80240904 8C420014 */ lw $v0, 0x14($v0) -/* 9F5348 80240908 04410004 */ bgez $v0, .L8024091C -/* 9F534C 8024090C 00000000 */ nop -/* 9F5350 80240910 C6400000 */ lwc1 $f0, ($s2) -/* 9F5354 80240914 0809024F */ j .L8024093C -/* 9F5358 80240918 E6000018 */ swc1 $f0, 0x18($s0) -.L8024091C: -/* 9F535C 8024091C 3C018024 */ lui $at, %hi(D_80245D50_9FA790) -/* 9F5360 80240920 D4225D50 */ ldc1 $f2, %lo(D_80245D50_9FA790)($at) -/* 9F5364 80240924 44820000 */ mtc1 $v0, $f0 -/* 9F5368 80240928 00000000 */ nop -/* 9F536C 8024092C 46800021 */ cvt.d.w $f0, $f0 -/* 9F5370 80240930 46220003 */ div.d $f0, $f0, $f2 -/* 9F5374 80240934 46200020 */ cvt.s.d $f0, $f0 -/* 9F5378 80240938 E6000018 */ swc1 $f0, 0x18($s0) -.L8024093C: -/* 9F537C 8024093C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F5380 80240940 3C014059 */ lui $at, 0x4059 -/* 9F5384 80240944 44811800 */ mtc1 $at, $f3 -/* 9F5388 80240948 44801000 */ mtc1 $zero, $f2 -/* 9F538C 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 9F5390 80240950 46220002 */ mul.d $f0, $f0, $f2 -/* 9F5394 80240954 00000000 */ nop -/* 9F5398 80240958 24020001 */ addiu $v0, $zero, 1 -/* 9F539C 8024095C 4620018D */ trunc.w.d $f6, $f0 -/* 9F53A0 80240960 E626007C */ swc1 $f6, 0x7c($s1) -/* 9F53A4 80240964 AE620070 */ sw $v0, 0x70($s3) -/* 9F53A8 80240968 8FBF0030 */ lw $ra, 0x30($sp) -/* 9F53AC 8024096C 8FB3002C */ lw $s3, 0x2c($sp) -/* 9F53B0 80240970 8FB20028 */ lw $s2, 0x28($sp) -/* 9F53B4 80240974 8FB10024 */ lw $s1, 0x24($sp) -/* 9F53B8 80240978 8FB00020 */ lw $s0, 0x20($sp) -/* 9F53BC 8024097C 03E00008 */ jr $ra -/* 9F53C0 80240980 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s index 81c5ab42c3..3bc59177f5 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -81,7 +81,7 @@ glabel func_80241AE0_9F6520 glabel L80241BEC_9F662C /* 9F662C 80241BEC 0280202D */ daddu $a0, $s4, $zero /* 9F6630 80241BF0 0200282D */ daddu $a1, $s0, $zero -/* 9F6634 80241BF4 0C0901F5 */ jal func_802407D4_9F5214 +/* 9F6634 80241BF4 0C0901F5 */ jal nok_11_UnkNpcAIFunc23 /* 9F6638 80241BF8 0260302D */ daddu $a2, $s3, $zero glabel L80241BFC_9F663C /* 9F663C 80241BFC 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s deleted file mode 100644 index 9052f71170..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802405EC_9FADDC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245A70_A00260 -.double 0.8 - -.section .text - -glabel func_802405EC_9FADDC -/* 9FADDC 802405EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FADE0 802405F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FADE4 802405F4 0080982D */ daddu $s3, $a0, $zero -/* 9FADE8 802405F8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9FADEC 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 9FADF0 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 9FADF4 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 9FADF8 80240608 8E710148 */ lw $s1, 0x148($s3) -/* 9FADFC 8024060C 86240008 */ lh $a0, 8($s1) -/* 9FAE00 80240610 0C00EABB */ jal get_npc_unsafe -/* 9FAE04 80240614 00A0902D */ daddu $s2, $a1, $zero -/* 9FAE08 80240618 0040802D */ daddu $s0, $v0, $zero -/* 9FAE0C 8024061C 8602008E */ lh $v0, 0x8e($s0) -/* 9FAE10 80240620 9603008E */ lhu $v1, 0x8e($s0) -/* 9FAE14 80240624 18400005 */ blez $v0, .L8024063C -/* 9FAE18 80240628 2462FFFF */ addiu $v0, $v1, -1 -/* 9FAE1C 8024062C A602008E */ sh $v0, 0x8e($s0) -/* 9FAE20 80240630 00021400 */ sll $v0, $v0, 0x10 -/* 9FAE24 80240634 1C400033 */ bgtz $v0, .L80240704 -/* 9FAE28 80240638 00000000 */ nop -.L8024063C: -/* 9FAE2C 8024063C 8602008C */ lh $v0, 0x8c($s0) -/* 9FAE30 80240640 14400030 */ bnez $v0, .L80240704 -/* 9FAE34 80240644 00000000 */ nop -/* 9FAE38 80240648 8E2200CC */ lw $v0, 0xcc($s1) -/* 9FAE3C 8024064C 8C420024 */ lw $v0, 0x24($v0) -/* 9FAE40 80240650 AE020028 */ sw $v0, 0x28($s0) -/* 9FAE44 80240654 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9FAE48 80240658 E6000018 */ swc1 $f0, 0x18($s0) -/* 9FAE4C 8024065C 8E230088 */ lw $v1, 0x88($s1) -/* 9FAE50 80240660 24020005 */ addiu $v0, $zero, 5 -/* 9FAE54 80240664 10620005 */ beq $v1, $v0, .L8024067C -/* 9FAE58 80240668 00000000 */ nop -/* 9FAE5C 8024066C 10600003 */ beqz $v1, .L8024067C -/* 9FAE60 80240670 24020001 */ addiu $v0, $zero, 1 -/* 9FAE64 80240674 14620006 */ bne $v1, $v0, .L80240690 -/* 9FAE68 80240678 00000000 */ nop -.L8024067C: -/* 9FAE6C 8024067C 8E220084 */ lw $v0, 0x84($s1) -/* 9FAE70 80240680 00021FC2 */ srl $v1, $v0, 0x1f -/* 9FAE74 80240684 00431021 */ addu $v0, $v0, $v1 -/* 9FAE78 80240688 00021043 */ sra $v0, $v0, 1 -/* 9FAE7C 8024068C A60200A8 */ sh $v0, 0xa8($s0) -.L80240690: -/* 9FAE80 80240690 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9FAE84 80240694 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9FAE88 80240698 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FAE8C 8024069C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FAE90 802406A0 8C460028 */ lw $a2, 0x28($v0) -/* 9FAE94 802406A4 0C00A7B5 */ jal dist2D -/* 9FAE98 802406A8 8C470030 */ lw $a3, 0x30($v0) -/* 9FAE9C 802406AC C6020018 */ lwc1 $f2, 0x18($s0) -/* 9FAEA0 802406B0 46020003 */ div.s $f0, $f0, $f2 -/* 9FAEA4 802406B4 3C018024 */ lui $at, %hi(D_80245A70_A00260) -/* 9FAEA8 802406B8 D4225A70 */ ldc1 $f2, %lo(D_80245A70_A00260)($at) -/* 9FAEAC 802406BC 46000021 */ cvt.d.s $f0, $f0 -/* 9FAEB0 802406C0 46220000 */ add.d $f0, $f0, $f2 -/* 9FAEB4 802406C4 4620010D */ trunc.w.d $f4, $f0 -/* 9FAEB8 802406C8 44022000 */ mfc1 $v0, $f4 -/* 9FAEBC 802406CC 00000000 */ nop -/* 9FAEC0 802406D0 A602008E */ sh $v0, 0x8e($s0) -/* 9FAEC4 802406D4 00021400 */ sll $v0, $v0, 0x10 -/* 9FAEC8 802406D8 8E230078 */ lw $v1, 0x78($s1) -/* 9FAECC 802406DC 00021403 */ sra $v0, $v0, 0x10 -/* 9FAED0 802406E0 0043102A */ slt $v0, $v0, $v1 -/* 9FAED4 802406E4 10400003 */ beqz $v0, .L802406F4 -/* 9FAED8 802406E8 00000000 */ nop -/* 9FAEDC 802406EC 9622007A */ lhu $v0, 0x7a($s1) -/* 9FAEE0 802406F0 A602008E */ sh $v0, 0x8e($s0) -.L802406F4: -/* 9FAEE4 802406F4 8602008E */ lh $v0, 0x8e($s0) -/* 9FAEE8 802406F8 AE22007C */ sw $v0, 0x7c($s1) -/* 9FAEEC 802406FC 2402000E */ addiu $v0, $zero, 0xe -/* 9FAEF0 80240700 AE620070 */ sw $v0, 0x70($s3) -.L80240704: -/* 9FAEF4 80240704 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FAEF8 80240708 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FAEFC 8024070C 8FB20018 */ lw $s2, 0x18($sp) -/* 9FAF00 80240710 8FB10014 */ lw $s1, 0x14($sp) -/* 9FAF04 80240714 8FB00010 */ lw $s0, 0x10($sp) -/* 9FAF08 80240718 03E00008 */ jr $ra -/* 9FAF0C 8024071C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index 2050c83861..036c421eb5 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -244,7 +244,7 @@ glabel func_80240904_9FB0F4 /* 9FB454 80240C64 0260202D */ daddu $a0, $s3, $zero .L80240C68: /* 9FB458 80240C68 0280282D */ daddu $a1, $s4, $zero -/* 9FB45C 80240C6C 0C09017B */ jal func_802405EC_9FADDC +/* 9FB45C 80240C6C 0C09017B */ jal nok_12_UnkDistFunc /* 9FB460 80240C70 02A0302D */ daddu $a2, $s5, $zero /* 9FB464 80240C74 0809032C */ j .L80240CB0 /* 9FB468 80240C78 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s deleted file mode 100644 index 6d089d7209..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240D44_9FB534.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245AD0_A002C0 -.double 32767.0 - -.section .text - -glabel func_80240D44_9FB534 -/* 9FB534 80240D44 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9FB538 80240D48 AFB50024 */ sw $s5, 0x24($sp) -/* 9FB53C 80240D4C 0080A82D */ daddu $s5, $a0, $zero -/* 9FB540 80240D50 AFBF002C */ sw $ra, 0x2c($sp) -/* 9FB544 80240D54 AFB60028 */ sw $s6, 0x28($sp) -/* 9FB548 80240D58 AFB40020 */ sw $s4, 0x20($sp) -/* 9FB54C 80240D5C AFB3001C */ sw $s3, 0x1c($sp) -/* 9FB550 80240D60 AFB20018 */ sw $s2, 0x18($sp) -/* 9FB554 80240D64 AFB10014 */ sw $s1, 0x14($sp) -/* 9FB558 80240D68 AFB00010 */ sw $s0, 0x10($sp) -/* 9FB55C 80240D6C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9FB560 80240D70 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9FB564 80240D74 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9FB568 80240D78 8EB30148 */ lw $s3, 0x148($s5) -/* 9FB56C 80240D7C 86640008 */ lh $a0, 8($s3) -/* 9FB570 80240D80 0C00EABB */ jal get_npc_unsafe -/* 9FB574 80240D84 00A0B02D */ daddu $s6, $a1, $zero -/* 9FB578 80240D88 0040A02D */ daddu $s4, $v0, $zero -/* 9FB57C 80240D8C AEA00074 */ sw $zero, 0x74($s5) -/* 9FB580 80240D90 C6980038 */ lwc1 $f24, 0x38($s4) -/* 9FB584 80240D94 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9FB588 80240D98 0000902D */ daddu $s2, $zero, $zero -/* 9FB58C 80240D9C AEA00078 */ sw $zero, 0x78($s5) -/* 9FB590 80240DA0 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9FB594 80240DA4 8C620000 */ lw $v0, ($v1) -/* 9FB598 80240DA8 3C0146FF */ lui $at, 0x46ff -/* 9FB59C 80240DAC 3421FE00 */ ori $at, $at, 0xfe00 -/* 9FB5A0 80240DB0 4481A000 */ mtc1 $at, $f20 -/* 9FB5A4 80240DB4 18400018 */ blez $v0, .L80240E18 -/* 9FB5A8 80240DB8 0240802D */ daddu $s0, $s2, $zero -/* 9FB5AC 80240DBC 0240882D */ daddu $s1, $s2, $zero -.L80240DC0: -/* 9FB5B0 80240DC0 02231021 */ addu $v0, $s1, $v1 -/* 9FB5B4 80240DC4 4600C306 */ mov.s $f12, $f24 -/* 9FB5B8 80240DC8 C4440004 */ lwc1 $f4, 4($v0) -/* 9FB5BC 80240DCC 46802120 */ cvt.s.w $f4, $f4 -/* 9FB5C0 80240DD0 44062000 */ mfc1 $a2, $f4 -/* 9FB5C4 80240DD4 C444000C */ lwc1 $f4, 0xc($v0) -/* 9FB5C8 80240DD8 46802120 */ cvt.s.w $f4, $f4 -/* 9FB5CC 80240DDC 44072000 */ mfc1 $a3, $f4 -/* 9FB5D0 80240DE0 0C00A7B5 */ jal dist2D -/* 9FB5D4 80240DE4 4600B386 */ mov.s $f14, $f22 -/* 9FB5D8 80240DE8 4614003C */ c.lt.s $f0, $f20 -/* 9FB5DC 80240DEC 00000000 */ nop -/* 9FB5E0 80240DF0 45000003 */ bc1f .L80240E00 -/* 9FB5E4 80240DF4 2631000C */ addiu $s1, $s1, 0xc -/* 9FB5E8 80240DF8 46000506 */ mov.s $f20, $f0 -/* 9FB5EC 80240DFC AEB20078 */ sw $s2, 0x78($s5) -.L80240E00: -/* 9FB5F0 80240E00 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9FB5F4 80240E04 26100001 */ addiu $s0, $s0, 1 -/* 9FB5F8 80240E08 8C620000 */ lw $v0, ($v1) -/* 9FB5FC 80240E0C 0202102A */ slt $v0, $s0, $v0 -/* 9FB600 80240E10 1440FFEB */ bnez $v0, .L80240DC0 -/* 9FB604 80240E14 26520001 */ addiu $s2, $s2, 1 -.L80240E18: -/* 9FB608 80240E18 8E6200CC */ lw $v0, 0xcc($s3) -/* 9FB60C 80240E1C 8C420004 */ lw $v0, 4($v0) -/* 9FB610 80240E20 AE820028 */ sw $v0, 0x28($s4) -/* 9FB614 80240E24 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9FB618 80240E28 8C42007C */ lw $v0, 0x7c($v0) -/* 9FB61C 80240E2C 04410004 */ bgez $v0, .L80240E40 -/* 9FB620 80240E30 00000000 */ nop -/* 9FB624 80240E34 C6C00000 */ lwc1 $f0, ($s6) -/* 9FB628 80240E38 08090398 */ j .L80240E60 -/* 9FB62C 80240E3C E6800018 */ swc1 $f0, 0x18($s4) -.L80240E40: -/* 9FB630 80240E40 3C018024 */ lui $at, %hi(D_80245AD0_A002C0) -/* 9FB634 80240E44 D4225AD0 */ ldc1 $f2, %lo(D_80245AD0_A002C0)($at) -/* 9FB638 80240E48 44820000 */ mtc1 $v0, $f0 -/* 9FB63C 80240E4C 00000000 */ nop -/* 9FB640 80240E50 46800021 */ cvt.d.w $f0, $f0 -/* 9FB644 80240E54 46220003 */ div.d $f0, $f0, $f2 -/* 9FB648 80240E58 46200020 */ cvt.s.d $f0, $f0 -/* 9FB64C 80240E5C E6800018 */ swc1 $f0, 0x18($s4) -.L80240E60: -/* 9FB650 80240E60 24020001 */ addiu $v0, $zero, 1 -/* 9FB654 80240E64 AEA20070 */ sw $v0, 0x70($s5) -/* 9FB658 80240E68 8FBF002C */ lw $ra, 0x2c($sp) -/* 9FB65C 80240E6C 8FB60028 */ lw $s6, 0x28($sp) -/* 9FB660 80240E70 8FB50024 */ lw $s5, 0x24($sp) -/* 9FB664 80240E74 8FB40020 */ lw $s4, 0x20($sp) -/* 9FB668 80240E78 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FB66C 80240E7C 8FB20018 */ lw $s2, 0x18($sp) -/* 9FB670 80240E80 8FB10014 */ lw $s1, 0x14($sp) -/* 9FB674 80240E84 8FB00010 */ lw $s0, 0x10($sp) -/* 9FB678 80240E88 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9FB67C 80240E8C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9FB680 80240E90 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9FB684 80240E94 03E00008 */ jr $ra -/* 9FB688 80240E98 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s deleted file mode 100644 index 12f0c070d9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802413C0_9FBBB0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245AD8_A002C8 -.double 32767.0 - -.section .text - -glabel func_802413C0_9FBBB0 -/* 9FBBB0 802413C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FBBB4 802413C4 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBBB8 802413C8 0080882D */ daddu $s1, $a0, $zero -/* 9FBBBC 802413CC AFBF001C */ sw $ra, 0x1c($sp) -/* 9FBBC0 802413D0 AFB20018 */ sw $s2, 0x18($sp) -/* 9FBBC4 802413D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBBC8 802413D8 8E300148 */ lw $s0, 0x148($s1) -/* 9FBBCC 802413DC 86040008 */ lh $a0, 8($s0) -/* 9FBBD0 802413E0 0C00EABB */ jal get_npc_unsafe -/* 9FBBD4 802413E4 00A0902D */ daddu $s2, $a1, $zero -/* 9FBBD8 802413E8 8E230078 */ lw $v1, 0x78($s1) -/* 9FBBDC 802413EC 24630001 */ addiu $v1, $v1, 1 -/* 9FBBE0 802413F0 AE230078 */ sw $v1, 0x78($s1) -/* 9FBBE4 802413F4 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9FBBE8 802413F8 8C840000 */ lw $a0, ($a0) -/* 9FBBEC 802413FC 0064182A */ slt $v1, $v1, $a0 -/* 9FBBF0 80241400 14600002 */ bnez $v1, .L8024140C -/* 9FBBF4 80241404 0040282D */ daddu $a1, $v0, $zero -/* 9FBBF8 80241408 AE200078 */ sw $zero, 0x78($s1) -.L8024140C: -/* 9FBBFC 8024140C 8E0200CC */ lw $v0, 0xcc($s0) -/* 9FBC00 80241410 8C420004 */ lw $v0, 4($v0) -/* 9FBC04 80241414 ACA20028 */ sw $v0, 0x28($a1) -/* 9FBC08 80241418 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9FBC0C 8024141C 8C42007C */ lw $v0, 0x7c($v0) -/* 9FBC10 80241420 04410004 */ bgez $v0, .L80241434 -/* 9FBC14 80241424 00000000 */ nop -/* 9FBC18 80241428 C6400000 */ lwc1 $f0, ($s2) -/* 9FBC1C 8024142C 08090515 */ j .L80241454 -/* 9FBC20 80241430 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241434: -/* 9FBC24 80241434 3C018024 */ lui $at, %hi(D_80245AD8_A002C8) -/* 9FBC28 80241438 D4225AD8 */ ldc1 $f2, %lo(D_80245AD8_A002C8)($at) -/* 9FBC2C 8024143C 44820000 */ mtc1 $v0, $f0 -/* 9FBC30 80241440 00000000 */ nop -/* 9FBC34 80241444 46800021 */ cvt.d.w $f0, $f0 -/* 9FBC38 80241448 46220003 */ div.d $f0, $f0, $f2 -/* 9FBC3C 8024144C 46200020 */ cvt.s.d $f0, $f0 -/* 9FBC40 80241450 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241454: -/* 9FBC44 80241454 24020001 */ addiu $v0, $zero, 1 -/* 9FBC48 80241458 AE220070 */ sw $v0, 0x70($s1) -/* 9FBC4C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9FBC50 80241460 8FB20018 */ lw $s2, 0x18($sp) -/* 9FBC54 80241464 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBC58 80241468 8FB00010 */ lw $s0, 0x10($sp) -/* 9FBC5C 8024146C 03E00008 */ jr $ra -/* 9FBC60 80241470 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index f9370312b5..6986504bf6 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -139,7 +139,7 @@ glabel func_802418D8_9FC0C8 glabel L80241ABC_9FC2AC /* 9FC2AC 80241ABC 0280202D */ daddu $a0, $s4, $zero /* 9FC2B0 80241AC0 0260282D */ daddu $a1, $s3, $zero -/* 9FC2B4 80241AC4 0C090351 */ jal func_80240D44_9FB534 +/* 9FC2B4 80241AC4 0C090351 */ jal nok_12_UnkNpcAIFunc24 /* 9FC2B8 80241AC8 02A0302D */ daddu $a2, $s5, $zero glabel L80241ACC_9FC2BC /* 9FC2BC 80241ACC 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241AF4_9FC2E4 glabel L80241B0C_9FC2FC /* 9FC2FC 80241B0C 0280202D */ daddu $a0, $s4, $zero /* 9FC300 80241B10 0260282D */ daddu $a1, $s3, $zero -/* 9FC304 80241B14 0C0904F0 */ jal func_802413C0_9FBBB0 +/* 9FC304 80241B14 0C0904F0 */ jal nok_12_UnkNpcAIFunc25 /* 9FC308 80241B18 02A0302D */ daddu $a2, $s5, $zero /* 9FC30C 80241B1C 080906EB */ j L80241BAC_9FC39C /* 9FC310 80241B20 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s index 3bb72e0b92..b34815c973 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -149,7 +149,7 @@ glabel func_80241BD4_9FC3C4 glabel L80241DE0_9FC5D0 /* 9FC5D0 80241DE0 0260202D */ daddu $a0, $s3, $zero /* 9FC5D4 80241DE4 0280282D */ daddu $a1, $s4, $zero -/* 9FC5D8 80241DE8 0C090351 */ jal func_80240D44_9FB534 +/* 9FC5D8 80241DE8 0C090351 */ jal nok_12_UnkNpcAIFunc24 /* 9FC5DC 80241DEC 02A0302D */ daddu $a2, $s5, $zero /* 9FC5E0 80241DF0 96220086 */ lhu $v0, 0x86($s1) /* 9FC5E4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) @@ -175,7 +175,7 @@ glabel L80241E20_9FC610 glabel L80241E38_9FC628 /* 9FC628 80241E38 0260202D */ daddu $a0, $s3, $zero /* 9FC62C 80241E3C 0280282D */ daddu $a1, $s4, $zero -/* 9FC630 80241E40 0C0904F0 */ jal func_802413C0_9FBBB0 +/* 9FC630 80241E40 0C0904F0 */ jal nok_12_UnkNpcAIFunc25 /* 9FC634 80241E44 02A0302D */ daddu $a2, $s5, $zero /* 9FC638 80241E48 080907AC */ j L80241EB0_9FC6A0 /* 9FC63C 80241E4C 00000000 */ nop @@ -187,7 +187,7 @@ glabel L80241E50_9FC640 glabel L80241E60_9FC650 /* 9FC650 80241E60 0260202D */ daddu $a0, $s3, $zero /* 9FC654 80241E64 0280282D */ daddu $a1, $s4, $zero -/* 9FC658 80241E68 0C09017B */ jal func_802405EC_9FADDC +/* 9FC658 80241E68 0C09017B */ jal nok_12_UnkDistFunc /* 9FC65C 80241E6C 02A0302D */ daddu $a2, $s5, $zero /* 9FC660 80241E70 080907AC */ j L80241EB0_9FC6A0 /* 9FC664 80241E74 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s deleted file mode 100644 index 8276d1af9e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024023C_A02A7C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802445C0_A06E00 -.double 0.8 - -.section .text - -glabel func_8024023C_A02A7C -/* A02A7C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A02A80 80240240 AFB3001C */ sw $s3, 0x1c($sp) -/* A02A84 80240244 0080982D */ daddu $s3, $a0, $zero -/* A02A88 80240248 AFBF0020 */ sw $ra, 0x20($sp) -/* A02A8C 8024024C AFB20018 */ sw $s2, 0x18($sp) -/* A02A90 80240250 AFB10014 */ sw $s1, 0x14($sp) -/* A02A94 80240254 AFB00010 */ sw $s0, 0x10($sp) -/* A02A98 80240258 8E710148 */ lw $s1, 0x148($s3) -/* A02A9C 8024025C 86240008 */ lh $a0, 8($s1) -/* A02AA0 80240260 0C00EABB */ jal get_npc_unsafe -/* A02AA4 80240264 00A0902D */ daddu $s2, $a1, $zero -/* A02AA8 80240268 0040802D */ daddu $s0, $v0, $zero -/* A02AAC 8024026C 8602008E */ lh $v0, 0x8e($s0) -/* A02AB0 80240270 9603008E */ lhu $v1, 0x8e($s0) -/* A02AB4 80240274 18400005 */ blez $v0, .L8024028C -/* A02AB8 80240278 2462FFFF */ addiu $v0, $v1, -1 -/* A02ABC 8024027C A602008E */ sh $v0, 0x8e($s0) -/* A02AC0 80240280 00021400 */ sll $v0, $v0, 0x10 -/* A02AC4 80240284 1C400033 */ bgtz $v0, .L80240354 -/* A02AC8 80240288 00000000 */ nop -.L8024028C: -/* A02ACC 8024028C 8602008C */ lh $v0, 0x8c($s0) -/* A02AD0 80240290 14400030 */ bnez $v0, .L80240354 -/* A02AD4 80240294 00000000 */ nop -/* A02AD8 80240298 8E2200CC */ lw $v0, 0xcc($s1) -/* A02ADC 8024029C 8C420024 */ lw $v0, 0x24($v0) -/* A02AE0 802402A0 AE020028 */ sw $v0, 0x28($s0) -/* A02AE4 802402A4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A02AE8 802402A8 E6000018 */ swc1 $f0, 0x18($s0) -/* A02AEC 802402AC 8E230088 */ lw $v1, 0x88($s1) -/* A02AF0 802402B0 24020005 */ addiu $v0, $zero, 5 -/* A02AF4 802402B4 10620005 */ beq $v1, $v0, .L802402CC -/* A02AF8 802402B8 00000000 */ nop -/* A02AFC 802402BC 10600003 */ beqz $v1, .L802402CC -/* A02B00 802402C0 24020001 */ addiu $v0, $zero, 1 -/* A02B04 802402C4 14620006 */ bne $v1, $v0, .L802402E0 -/* A02B08 802402C8 00000000 */ nop -.L802402CC: -/* A02B0C 802402CC 8E220084 */ lw $v0, 0x84($s1) -/* A02B10 802402D0 00021FC2 */ srl $v1, $v0, 0x1f -/* A02B14 802402D4 00431021 */ addu $v0, $v0, $v1 -/* A02B18 802402D8 00021043 */ sra $v0, $v0, 1 -/* A02B1C 802402DC A60200A8 */ sh $v0, 0xa8($s0) -.L802402E0: -/* A02B20 802402E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A02B24 802402E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A02B28 802402E8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A02B2C 802402EC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A02B30 802402F0 8C460028 */ lw $a2, 0x28($v0) -/* A02B34 802402F4 0C00A7B5 */ jal dist2D -/* A02B38 802402F8 8C470030 */ lw $a3, 0x30($v0) -/* A02B3C 802402FC C6020018 */ lwc1 $f2, 0x18($s0) -/* A02B40 80240300 46020003 */ div.s $f0, $f0, $f2 -/* A02B44 80240304 3C018024 */ lui $at, %hi(D_802445C0_A06E00) -/* A02B48 80240308 D42245C0 */ ldc1 $f2, %lo(D_802445C0_A06E00)($at) -/* A02B4C 8024030C 46000021 */ cvt.d.s $f0, $f0 -/* A02B50 80240310 46220000 */ add.d $f0, $f0, $f2 -/* A02B54 80240314 4620010D */ trunc.w.d $f4, $f0 -/* A02B58 80240318 44022000 */ mfc1 $v0, $f4 -/* A02B5C 8024031C 00000000 */ nop -/* A02B60 80240320 A602008E */ sh $v0, 0x8e($s0) -/* A02B64 80240324 00021400 */ sll $v0, $v0, 0x10 -/* A02B68 80240328 8E230078 */ lw $v1, 0x78($s1) -/* A02B6C 8024032C 00021403 */ sra $v0, $v0, 0x10 -/* A02B70 80240330 0043102A */ slt $v0, $v0, $v1 -/* A02B74 80240334 10400003 */ beqz $v0, .L80240344 -/* A02B78 80240338 00000000 */ nop -/* A02B7C 8024033C 9622007A */ lhu $v0, 0x7a($s1) -/* A02B80 80240340 A602008E */ sh $v0, 0x8e($s0) -.L80240344: -/* A02B84 80240344 8602008E */ lh $v0, 0x8e($s0) -/* A02B88 80240348 AE22007C */ sw $v0, 0x7c($s1) -/* A02B8C 8024034C 2402000E */ addiu $v0, $zero, 0xe -/* A02B90 80240350 AE620070 */ sw $v0, 0x70($s3) -.L80240354: -/* A02B94 80240354 8FBF0020 */ lw $ra, 0x20($sp) -/* A02B98 80240358 8FB3001C */ lw $s3, 0x1c($sp) -/* A02B9C 8024035C 8FB20018 */ lw $s2, 0x18($sp) -/* A02BA0 80240360 8FB10014 */ lw $s1, 0x14($sp) -/* A02BA4 80240364 8FB00010 */ lw $s0, 0x10($sp) -/* A02BA8 80240368 03E00008 */ jr $ra -/* A02BAC 8024036C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s index 2f2715944b..d5ad90c75c 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -244,7 +244,7 @@ glabel func_80240554_A02D94 /* A030F4 802408B4 0260202D */ daddu $a0, $s3, $zero .L802408B8: /* A030F8 802408B8 0280282D */ daddu $a1, $s4, $zero -/* A030FC 802408BC 0C09008F */ jal func_8024023C_A02A7C +/* A030FC 802408BC 0C09008F */ jal nok_14_UnkDistFunc /* A03100 802408C0 02A0302D */ daddu $a2, $s5, $zero /* A03104 802408C4 08090240 */ j .L80240900 /* A03108 802408C8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s deleted file mode 100644 index 1cdb64fbf9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244620_A06E60 -.double 32767.0 - -.section .text - -glabel func_80240994_A031D4 -/* A031D4 80240994 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A031D8 80240998 AFB3002C */ sw $s3, 0x2c($sp) -/* A031DC 8024099C 0080982D */ daddu $s3, $a0, $zero -/* A031E0 802409A0 AFBF0030 */ sw $ra, 0x30($sp) -/* A031E4 802409A4 AFB20028 */ sw $s2, 0x28($sp) -/* A031E8 802409A8 AFB10024 */ sw $s1, 0x24($sp) -/* A031EC 802409AC AFB00020 */ sw $s0, 0x20($sp) -/* A031F0 802409B0 8E710148 */ lw $s1, 0x148($s3) -/* A031F4 802409B4 86240008 */ lh $a0, 8($s1) -/* A031F8 802409B8 0C00EABB */ jal get_npc_unsafe -/* A031FC 802409BC 00A0902D */ daddu $s2, $a1, $zero -/* A03200 802409C0 8E440004 */ lw $a0, 4($s2) -/* A03204 802409C4 0040802D */ daddu $s0, $v0, $zero -/* A03208 802409C8 00041FC2 */ srl $v1, $a0, 0x1f -/* A0320C 802409CC 00832021 */ addu $a0, $a0, $v1 -/* A03210 802409D0 00042043 */ sra $a0, $a0, 1 -/* A03214 802409D4 0C00A67F */ jal rand_int -/* A03218 802409D8 24840001 */ addiu $a0, $a0, 1 -/* A0321C 802409DC 8E430004 */ lw $v1, 4($s2) -/* A03220 802409E0 000327C2 */ srl $a0, $v1, 0x1f -/* A03224 802409E4 00641821 */ addu $v1, $v1, $a0 -/* A03228 802409E8 00031843 */ sra $v1, $v1, 1 -/* A0322C 802409EC 00621821 */ addu $v1, $v1, $v0 -/* A03230 802409F0 A603008E */ sh $v1, 0x8e($s0) -/* A03234 802409F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A03238 802409F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A0323C 802409FC C4640000 */ lwc1 $f4, ($v1) -/* A03240 80240A00 46802120 */ cvt.s.w $f4, $f4 -/* A03244 80240A04 C4620008 */ lwc1 $f2, 8($v1) -/* A03248 80240A08 468010A0 */ cvt.s.w $f2, $f2 -/* A0324C 80240A0C E7A00010 */ swc1 $f0, 0x10($sp) -/* A03250 80240A10 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03254 80240A14 44061000 */ mfc1 $a2, $f2 -/* A03258 80240A18 C440000C */ lwc1 $f0, 0xc($v0) -/* A0325C 80240A1C 46800020 */ cvt.s.w $f0, $f0 -/* A03260 80240A20 E7A00014 */ swc1 $f0, 0x14($sp) -/* A03264 80240A24 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03268 80240A28 44052000 */ mfc1 $a1, $f4 -/* A0326C 80240A2C C4400010 */ lwc1 $f0, 0x10($v0) -/* A03270 80240A30 46800020 */ cvt.s.w $f0, $f0 -/* A03274 80240A34 E7A00018 */ swc1 $f0, 0x18($sp) -/* A03278 80240A38 8C640018 */ lw $a0, 0x18($v1) -/* A0327C 80240A3C 0C0123F5 */ jal is_point_within_region -/* A03280 80240A40 8E070038 */ lw $a3, 0x38($s0) -/* A03284 80240A44 1040000E */ beqz $v0, .L80240A80 -/* A03288 80240A48 00000000 */ nop -/* A0328C 80240A4C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03290 80240A50 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A03294 80240A54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A03298 80240A58 C4460000 */ lwc1 $f6, ($v0) -/* A0329C 80240A5C 468031A0 */ cvt.s.w $f6, $f6 -/* A032A0 80240A60 44063000 */ mfc1 $a2, $f6 -/* A032A4 80240A64 C4460008 */ lwc1 $f6, 8($v0) -/* A032A8 80240A68 468031A0 */ cvt.s.w $f6, $f6 -/* A032AC 80240A6C 44073000 */ mfc1 $a3, $f6 -/* A032B0 80240A70 0C00A720 */ jal atan2 -/* A032B4 80240A74 00000000 */ nop -/* A032B8 80240A78 080902AC */ j .L80240AB0 -/* A032BC 80240A7C E600000C */ swc1 $f0, 0xc($s0) -.L80240A80: -/* A032C0 80240A80 0C00A67F */ jal rand_int -/* A032C4 80240A84 2404003C */ addiu $a0, $zero, 0x3c -/* A032C8 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) -/* A032CC 80240A8C 44820000 */ mtc1 $v0, $f0 -/* A032D0 80240A90 00000000 */ nop -/* A032D4 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* A032D8 80240A98 46006300 */ add.s $f12, $f12, $f0 -/* A032DC 80240A9C 3C0141F0 */ lui $at, 0x41f0 -/* A032E0 80240AA0 44810000 */ mtc1 $at, $f0 -/* A032E4 80240AA4 0C00A6C9 */ jal clamp_angle -/* A032E8 80240AA8 46006301 */ sub.s $f12, $f12, $f0 -/* A032EC 80240AAC E600000C */ swc1 $f0, 0xc($s0) -.L80240AB0: -/* A032F0 80240AB0 8E2200CC */ lw $v0, 0xcc($s1) -/* A032F4 80240AB4 8C420004 */ lw $v0, 4($v0) -/* A032F8 80240AB8 AE020028 */ sw $v0, 0x28($s0) -/* A032FC 80240ABC AE600074 */ sw $zero, 0x74($s3) -/* A03300 80240AC0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03304 80240AC4 8C420014 */ lw $v0, 0x14($v0) -/* A03308 80240AC8 04410004 */ bgez $v0, .L80240ADC -/* A0330C 80240ACC 00000000 */ nop -/* A03310 80240AD0 C6400000 */ lwc1 $f0, ($s2) -/* A03314 80240AD4 080902BF */ j .L80240AFC -/* A03318 80240AD8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240ADC: -/* A0331C 80240ADC 3C018024 */ lui $at, %hi(D_80244620_A06E60) -/* A03320 80240AE0 D4224620 */ ldc1 $f2, %lo(D_80244620_A06E60)($at) -/* A03324 80240AE4 44820000 */ mtc1 $v0, $f0 -/* A03328 80240AE8 00000000 */ nop -/* A0332C 80240AEC 46800021 */ cvt.d.w $f0, $f0 -/* A03330 80240AF0 46220003 */ div.d $f0, $f0, $f2 -/* A03334 80240AF4 46200020 */ cvt.s.d $f0, $f0 -/* A03338 80240AF8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240AFC: -/* A0333C 80240AFC C600003C */ lwc1 $f0, 0x3c($s0) -/* A03340 80240B00 3C014059 */ lui $at, 0x4059 -/* A03344 80240B04 44811800 */ mtc1 $at, $f3 -/* A03348 80240B08 44801000 */ mtc1 $zero, $f2 -/* A0334C 80240B0C 46000021 */ cvt.d.s $f0, $f0 -/* A03350 80240B10 46220002 */ mul.d $f0, $f0, $f2 -/* A03354 80240B14 00000000 */ nop -/* A03358 80240B18 24020001 */ addiu $v0, $zero, 1 -/* A0335C 80240B1C 4620018D */ trunc.w.d $f6, $f0 -/* A03360 80240B20 E626007C */ swc1 $f6, 0x7c($s1) -/* A03364 80240B24 AE620070 */ sw $v0, 0x70($s3) -/* A03368 80240B28 8FBF0030 */ lw $ra, 0x30($sp) -/* A0336C 80240B2C 8FB3002C */ lw $s3, 0x2c($sp) -/* A03370 80240B30 8FB20028 */ lw $s2, 0x28($sp) -/* A03374 80240B34 8FB10024 */ lw $s1, 0x24($sp) -/* A03378 80240B38 8FB00020 */ lw $s0, 0x20($sp) -/* A0337C 80240B3C 03E00008 */ jr $ra -/* A03380 80240B40 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index b951eda379..98240ecb49 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -81,7 +81,7 @@ glabel func_80241CA0_A044E0 glabel L80241DAC_A045EC /* A045EC 80241DAC 0280202D */ daddu $a0, $s4, $zero /* A045F0 80241DB0 0200282D */ daddu $a1, $s0, $zero -/* A045F4 80241DB4 0C090265 */ jal func_80240994_A031D4 +/* A045F4 80241DB4 0C090265 */ jal nok_14_UnkNpcAIFunc23 /* A045F8 80241DB8 0260302D */ daddu $a2, $s3, $zero glabel L80241DBC_A045FC /* A045FC 80241DBC 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s index bfe1cdd9cf..c6f0e40ae4 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -84,7 +84,7 @@ glabel func_802421CC_A04A0C glabel L802422E4_A04B24 /* A04B24 802422E4 0260202D */ daddu $a0, $s3, $zero /* A04B28 802422E8 0200282D */ daddu $a1, $s0, $zero -/* A04B2C 802422EC 0C090265 */ jal func_80240994_A031D4 +/* A04B2C 802422EC 0C090265 */ jal nok_14_UnkNpcAIFunc23 /* A04B30 802422F0 0280302D */ daddu $a2, $s4, $zero glabel L802422F4_A04B34 /* A04B34 802422F4 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s deleted file mode 100644 index bd132fde88..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024035C_A0725C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244CF0_A0BBF0 -.double 0.8 - -.section .text - -glabel func_8024035C_A0725C -/* A0725C 8024035C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A07260 80240360 AFB3001C */ sw $s3, 0x1c($sp) -/* A07264 80240364 0080982D */ daddu $s3, $a0, $zero -/* A07268 80240368 AFBF0020 */ sw $ra, 0x20($sp) -/* A0726C 8024036C AFB20018 */ sw $s2, 0x18($sp) -/* A07270 80240370 AFB10014 */ sw $s1, 0x14($sp) -/* A07274 80240374 AFB00010 */ sw $s0, 0x10($sp) -/* A07278 80240378 8E710148 */ lw $s1, 0x148($s3) -/* A0727C 8024037C 86240008 */ lh $a0, 8($s1) -/* A07280 80240380 0C00EABB */ jal get_npc_unsafe -/* A07284 80240384 00A0902D */ daddu $s2, $a1, $zero -/* A07288 80240388 0040802D */ daddu $s0, $v0, $zero -/* A0728C 8024038C 8602008E */ lh $v0, 0x8e($s0) -/* A07290 80240390 9603008E */ lhu $v1, 0x8e($s0) -/* A07294 80240394 18400005 */ blez $v0, .L802403AC -/* A07298 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* A0729C 8024039C A602008E */ sh $v0, 0x8e($s0) -/* A072A0 802403A0 00021400 */ sll $v0, $v0, 0x10 -/* A072A4 802403A4 1C400033 */ bgtz $v0, .L80240474 -/* A072A8 802403A8 00000000 */ nop -.L802403AC: -/* A072AC 802403AC 8602008C */ lh $v0, 0x8c($s0) -/* A072B0 802403B0 14400030 */ bnez $v0, .L80240474 -/* A072B4 802403B4 00000000 */ nop -/* A072B8 802403B8 8E2200CC */ lw $v0, 0xcc($s1) -/* A072BC 802403BC 8C420024 */ lw $v0, 0x24($v0) -/* A072C0 802403C0 AE020028 */ sw $v0, 0x28($s0) -/* A072C4 802403C4 C6400018 */ lwc1 $f0, 0x18($s2) -/* A072C8 802403C8 E6000018 */ swc1 $f0, 0x18($s0) -/* A072CC 802403CC 8E230088 */ lw $v1, 0x88($s1) -/* A072D0 802403D0 24020005 */ addiu $v0, $zero, 5 -/* A072D4 802403D4 10620005 */ beq $v1, $v0, .L802403EC -/* A072D8 802403D8 00000000 */ nop -/* A072DC 802403DC 10600003 */ beqz $v1, .L802403EC -/* A072E0 802403E0 24020001 */ addiu $v0, $zero, 1 -/* A072E4 802403E4 14620006 */ bne $v1, $v0, .L80240400 -/* A072E8 802403E8 00000000 */ nop -.L802403EC: -/* A072EC 802403EC 8E220084 */ lw $v0, 0x84($s1) -/* A072F0 802403F0 00021FC2 */ srl $v1, $v0, 0x1f -/* A072F4 802403F4 00431021 */ addu $v0, $v0, $v1 -/* A072F8 802403F8 00021043 */ sra $v0, $v0, 1 -/* A072FC 802403FC A60200A8 */ sh $v0, 0xa8($s0) -.L80240400: -/* A07300 80240400 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A07304 80240404 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A07308 80240408 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A0730C 8024040C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A07310 80240410 8C460028 */ lw $a2, 0x28($v0) -/* A07314 80240414 0C00A7B5 */ jal dist2D -/* A07318 80240418 8C470030 */ lw $a3, 0x30($v0) -/* A0731C 8024041C C6020018 */ lwc1 $f2, 0x18($s0) -/* A07320 80240420 46020003 */ div.s $f0, $f0, $f2 -/* A07324 80240424 3C018024 */ lui $at, %hi(D_80244CF0_A0BBF0) -/* A07328 80240428 D4224CF0 */ ldc1 $f2, %lo(D_80244CF0_A0BBF0)($at) -/* A0732C 8024042C 46000021 */ cvt.d.s $f0, $f0 -/* A07330 80240430 46220000 */ add.d $f0, $f0, $f2 -/* A07334 80240434 4620010D */ trunc.w.d $f4, $f0 -/* A07338 80240438 44022000 */ mfc1 $v0, $f4 -/* A0733C 8024043C 00000000 */ nop -/* A07340 80240440 A602008E */ sh $v0, 0x8e($s0) -/* A07344 80240444 00021400 */ sll $v0, $v0, 0x10 -/* A07348 80240448 8E230078 */ lw $v1, 0x78($s1) -/* A0734C 8024044C 00021403 */ sra $v0, $v0, 0x10 -/* A07350 80240450 0043102A */ slt $v0, $v0, $v1 -/* A07354 80240454 10400003 */ beqz $v0, .L80240464 -/* A07358 80240458 00000000 */ nop -/* A0735C 8024045C 9622007A */ lhu $v0, 0x7a($s1) -/* A07360 80240460 A602008E */ sh $v0, 0x8e($s0) -.L80240464: -/* A07364 80240464 8602008E */ lh $v0, 0x8e($s0) -/* A07368 80240468 AE22007C */ sw $v0, 0x7c($s1) -/* A0736C 8024046C 2402000E */ addiu $v0, $zero, 0xe -/* A07370 80240470 AE620070 */ sw $v0, 0x70($s3) -.L80240474: -/* A07374 80240474 8FBF0020 */ lw $ra, 0x20($sp) -/* A07378 80240478 8FB3001C */ lw $s3, 0x1c($sp) -/* A0737C 8024047C 8FB20018 */ lw $s2, 0x18($sp) -/* A07380 80240480 8FB10014 */ lw $s1, 0x14($sp) -/* A07384 80240484 8FB00010 */ lw $s0, 0x10($sp) -/* A07388 80240488 03E00008 */ jr $ra -/* A0738C 8024048C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s index e39b14429d..1f38c27bb4 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -244,7 +244,7 @@ glabel func_80240674_A07574 /* A078D4 802409D4 0260202D */ daddu $a0, $s3, $zero .L802409D8: /* A078D8 802409D8 0280282D */ daddu $a1, $s4, $zero -/* A078DC 802409DC 0C0900D7 */ jal func_8024035C_A0725C +/* A078DC 802409DC 0C0900D7 */ jal nok_15_UnkDistFunc /* A078E0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* A078E4 802409E4 08090288 */ j .L80240A20 /* A078E8 802409E8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s deleted file mode 100644 index 9eb8865569..0000000000 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240AB4_A079B4.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244D50_A0BC50 -.double 32767.0 - -.section .text - -glabel func_80240AB4_A079B4 -/* A079B4 80240AB4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A079B8 80240AB8 AFB3002C */ sw $s3, 0x2c($sp) -/* A079BC 80240ABC 0080982D */ daddu $s3, $a0, $zero -/* A079C0 80240AC0 AFBF0030 */ sw $ra, 0x30($sp) -/* A079C4 80240AC4 AFB20028 */ sw $s2, 0x28($sp) -/* A079C8 80240AC8 AFB10024 */ sw $s1, 0x24($sp) -/* A079CC 80240ACC AFB00020 */ sw $s0, 0x20($sp) -/* A079D0 80240AD0 8E710148 */ lw $s1, 0x148($s3) -/* A079D4 80240AD4 86240008 */ lh $a0, 8($s1) -/* A079D8 80240AD8 0C00EABB */ jal get_npc_unsafe -/* A079DC 80240ADC 00A0902D */ daddu $s2, $a1, $zero -/* A079E0 80240AE0 8E440004 */ lw $a0, 4($s2) -/* A079E4 80240AE4 0040802D */ daddu $s0, $v0, $zero -/* A079E8 80240AE8 00041FC2 */ srl $v1, $a0, 0x1f -/* A079EC 80240AEC 00832021 */ addu $a0, $a0, $v1 -/* A079F0 80240AF0 00042043 */ sra $a0, $a0, 1 -/* A079F4 80240AF4 0C00A67F */ jal rand_int -/* A079F8 80240AF8 24840001 */ addiu $a0, $a0, 1 -/* A079FC 80240AFC 8E430004 */ lw $v1, 4($s2) -/* A07A00 80240B00 000327C2 */ srl $a0, $v1, 0x1f -/* A07A04 80240B04 00641821 */ addu $v1, $v1, $a0 -/* A07A08 80240B08 00031843 */ sra $v1, $v1, 1 -/* A07A0C 80240B0C 00621821 */ addu $v1, $v1, $v0 -/* A07A10 80240B10 A603008E */ sh $v1, 0x8e($s0) -/* A07A14 80240B14 8E2300D0 */ lw $v1, 0xd0($s1) -/* A07A18 80240B18 C6000040 */ lwc1 $f0, 0x40($s0) -/* A07A1C 80240B1C C4640000 */ lwc1 $f4, ($v1) -/* A07A20 80240B20 46802120 */ cvt.s.w $f4, $f4 -/* A07A24 80240B24 C4620008 */ lwc1 $f2, 8($v1) -/* A07A28 80240B28 468010A0 */ cvt.s.w $f2, $f2 -/* A07A2C 80240B2C E7A00010 */ swc1 $f0, 0x10($sp) -/* A07A30 80240B30 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07A34 80240B34 44061000 */ mfc1 $a2, $f2 -/* A07A38 80240B38 C440000C */ lwc1 $f0, 0xc($v0) -/* A07A3C 80240B3C 46800020 */ cvt.s.w $f0, $f0 -/* A07A40 80240B40 E7A00014 */ swc1 $f0, 0x14($sp) -/* A07A44 80240B44 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07A48 80240B48 44052000 */ mfc1 $a1, $f4 -/* A07A4C 80240B4C C4400010 */ lwc1 $f0, 0x10($v0) -/* A07A50 80240B50 46800020 */ cvt.s.w $f0, $f0 -/* A07A54 80240B54 E7A00018 */ swc1 $f0, 0x18($sp) -/* A07A58 80240B58 8C640018 */ lw $a0, 0x18($v1) -/* A07A5C 80240B5C 0C0123F5 */ jal is_point_within_region -/* A07A60 80240B60 8E070038 */ lw $a3, 0x38($s0) -/* A07A64 80240B64 1040000E */ beqz $v0, .L80240BA0 -/* A07A68 80240B68 00000000 */ nop -/* A07A6C 80240B6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07A70 80240B70 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A07A74 80240B74 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A07A78 80240B78 C4460000 */ lwc1 $f6, ($v0) -/* A07A7C 80240B7C 468031A0 */ cvt.s.w $f6, $f6 -/* A07A80 80240B80 44063000 */ mfc1 $a2, $f6 -/* A07A84 80240B84 C4460008 */ lwc1 $f6, 8($v0) -/* A07A88 80240B88 468031A0 */ cvt.s.w $f6, $f6 -/* A07A8C 80240B8C 44073000 */ mfc1 $a3, $f6 -/* A07A90 80240B90 0C00A720 */ jal atan2 -/* A07A94 80240B94 00000000 */ nop -/* A07A98 80240B98 080902F4 */ j .L80240BD0 -/* A07A9C 80240B9C E600000C */ swc1 $f0, 0xc($s0) -.L80240BA0: -/* A07AA0 80240BA0 0C00A67F */ jal rand_int -/* A07AA4 80240BA4 2404003C */ addiu $a0, $zero, 0x3c -/* A07AA8 80240BA8 C60C000C */ lwc1 $f12, 0xc($s0) -/* A07AAC 80240BAC 44820000 */ mtc1 $v0, $f0 -/* A07AB0 80240BB0 00000000 */ nop -/* A07AB4 80240BB4 46800020 */ cvt.s.w $f0, $f0 -/* A07AB8 80240BB8 46006300 */ add.s $f12, $f12, $f0 -/* A07ABC 80240BBC 3C0141F0 */ lui $at, 0x41f0 -/* A07AC0 80240BC0 44810000 */ mtc1 $at, $f0 -/* A07AC4 80240BC4 0C00A6C9 */ jal clamp_angle -/* A07AC8 80240BC8 46006301 */ sub.s $f12, $f12, $f0 -/* A07ACC 80240BCC E600000C */ swc1 $f0, 0xc($s0) -.L80240BD0: -/* A07AD0 80240BD0 8E2200CC */ lw $v0, 0xcc($s1) -/* A07AD4 80240BD4 8C420004 */ lw $v0, 4($v0) -/* A07AD8 80240BD8 AE020028 */ sw $v0, 0x28($s0) -/* A07ADC 80240BDC AE600074 */ sw $zero, 0x74($s3) -/* A07AE0 80240BE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A07AE4 80240BE4 8C420014 */ lw $v0, 0x14($v0) -/* A07AE8 80240BE8 04410004 */ bgez $v0, .L80240BFC -/* A07AEC 80240BEC 00000000 */ nop -/* A07AF0 80240BF0 C6400000 */ lwc1 $f0, ($s2) -/* A07AF4 80240BF4 08090307 */ j .L80240C1C -/* A07AF8 80240BF8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240BFC: -/* A07AFC 80240BFC 3C018024 */ lui $at, %hi(D_80244D50_A0BC50) -/* A07B00 80240C00 D4224D50 */ ldc1 $f2, %lo(D_80244D50_A0BC50)($at) -/* A07B04 80240C04 44820000 */ mtc1 $v0, $f0 -/* A07B08 80240C08 00000000 */ nop -/* A07B0C 80240C0C 46800021 */ cvt.d.w $f0, $f0 -/* A07B10 80240C10 46220003 */ div.d $f0, $f0, $f2 -/* A07B14 80240C14 46200020 */ cvt.s.d $f0, $f0 -/* A07B18 80240C18 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C1C: -/* A07B1C 80240C1C C600003C */ lwc1 $f0, 0x3c($s0) -/* A07B20 80240C20 3C014059 */ lui $at, 0x4059 -/* A07B24 80240C24 44811800 */ mtc1 $at, $f3 -/* A07B28 80240C28 44801000 */ mtc1 $zero, $f2 -/* A07B2C 80240C2C 46000021 */ cvt.d.s $f0, $f0 -/* A07B30 80240C30 46220002 */ mul.d $f0, $f0, $f2 -/* A07B34 80240C34 00000000 */ nop -/* A07B38 80240C38 24020001 */ addiu $v0, $zero, 1 -/* A07B3C 80240C3C 4620018D */ trunc.w.d $f6, $f0 -/* A07B40 80240C40 E626007C */ swc1 $f6, 0x7c($s1) -/* A07B44 80240C44 AE620070 */ sw $v0, 0x70($s3) -/* A07B48 80240C48 8FBF0030 */ lw $ra, 0x30($sp) -/* A07B4C 80240C4C 8FB3002C */ lw $s3, 0x2c($sp) -/* A07B50 80240C50 8FB20028 */ lw $s2, 0x28($sp) -/* A07B54 80240C54 8FB10024 */ lw $s1, 0x24($sp) -/* A07B58 80240C58 8FB00020 */ lw $s0, 0x20($sp) -/* A07B5C 80240C5C 03E00008 */ jr $ra -/* A07B60 80240C60 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s index d07b5edd05..13af92cb85 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -81,7 +81,7 @@ glabel func_80241DC0_A08CC0 glabel L80241ECC_A08DCC /* A08DCC 80241ECC 0280202D */ daddu $a0, $s4, $zero /* A08DD0 80241ED0 0200282D */ daddu $a1, $s0, $zero -/* A08DD4 80241ED4 0C0902AD */ jal func_80240AB4_A079B4 +/* A08DD4 80241ED4 0C0902AD */ jal nok_15_UnkNpcAIFunc23 /* A08DD8 80241ED8 0260302D */ daddu $a2, $s3, $zero glabel L80241EDC_A08DDC /* A08DDC 80241EDC 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s index 598e81922d..0111034e3e 100644 --- a/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s +++ b/ver/us/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -84,7 +84,7 @@ glabel func_802422EC_A091EC glabel L80242404_A09304 /* A09304 80242404 0260202D */ daddu $a0, $s3, $zero /* A09308 80242408 0200282D */ daddu $a1, $s0, $zero -/* A0930C 8024240C 0C0902AD */ jal func_80240AB4_A079B4 +/* A0930C 8024240C 0C0902AD */ jal nok_15_UnkNpcAIFunc23 /* A09310 80242410 0280302D */ daddu $a2, $s4, $zero glabel L80242414_A09314 /* A09314 80242414 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s deleted file mode 100644 index f3627063b8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802403A0_DAD7A0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244CB0_DB20B0 -.double 32767.0 - -.section .text - -glabel func_802403A0_DAD7A0 -/* DAD7A0 802403A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DAD7A4 802403A4 AFB3002C */ sw $s3, 0x2c($sp) -/* DAD7A8 802403A8 0080982D */ daddu $s3, $a0, $zero -/* DAD7AC 802403AC AFBF0030 */ sw $ra, 0x30($sp) -/* DAD7B0 802403B0 AFB20028 */ sw $s2, 0x28($sp) -/* DAD7B4 802403B4 AFB10024 */ sw $s1, 0x24($sp) -/* DAD7B8 802403B8 AFB00020 */ sw $s0, 0x20($sp) -/* DAD7BC 802403BC 8E710148 */ lw $s1, 0x148($s3) -/* DAD7C0 802403C0 86240008 */ lh $a0, 8($s1) -/* DAD7C4 802403C4 0C00EABB */ jal get_npc_unsafe -/* DAD7C8 802403C8 00A0902D */ daddu $s2, $a1, $zero -/* DAD7CC 802403CC 8E440004 */ lw $a0, 4($s2) -/* DAD7D0 802403D0 0040802D */ daddu $s0, $v0, $zero -/* DAD7D4 802403D4 00041FC2 */ srl $v1, $a0, 0x1f -/* DAD7D8 802403D8 00832021 */ addu $a0, $a0, $v1 -/* DAD7DC 802403DC 00042043 */ sra $a0, $a0, 1 -/* DAD7E0 802403E0 0C00A67F */ jal rand_int -/* DAD7E4 802403E4 24840001 */ addiu $a0, $a0, 1 -/* DAD7E8 802403E8 8E430004 */ lw $v1, 4($s2) -/* DAD7EC 802403EC 000327C2 */ srl $a0, $v1, 0x1f -/* DAD7F0 802403F0 00641821 */ addu $v1, $v1, $a0 -/* DAD7F4 802403F4 00031843 */ sra $v1, $v1, 1 -/* DAD7F8 802403F8 00621821 */ addu $v1, $v1, $v0 -/* DAD7FC 802403FC A603008E */ sh $v1, 0x8e($s0) -/* DAD800 80240400 8E2300D0 */ lw $v1, 0xd0($s1) -/* DAD804 80240404 C6000040 */ lwc1 $f0, 0x40($s0) -/* DAD808 80240408 C4640000 */ lwc1 $f4, ($v1) -/* DAD80C 8024040C 46802120 */ cvt.s.w $f4, $f4 -/* DAD810 80240410 C4620008 */ lwc1 $f2, 8($v1) -/* DAD814 80240414 468010A0 */ cvt.s.w $f2, $f2 -/* DAD818 80240418 E7A00010 */ swc1 $f0, 0x10($sp) -/* DAD81C 8024041C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD820 80240420 44061000 */ mfc1 $a2, $f2 -/* DAD824 80240424 C440000C */ lwc1 $f0, 0xc($v0) -/* DAD828 80240428 46800020 */ cvt.s.w $f0, $f0 -/* DAD82C 8024042C E7A00014 */ swc1 $f0, 0x14($sp) -/* DAD830 80240430 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD834 80240434 44052000 */ mfc1 $a1, $f4 -/* DAD838 80240438 C4400010 */ lwc1 $f0, 0x10($v0) -/* DAD83C 8024043C 46800020 */ cvt.s.w $f0, $f0 -/* DAD840 80240440 E7A00018 */ swc1 $f0, 0x18($sp) -/* DAD844 80240444 8C640018 */ lw $a0, 0x18($v1) -/* DAD848 80240448 0C0123F5 */ jal is_point_within_region -/* DAD84C 8024044C 8E070038 */ lw $a3, 0x38($s0) -/* DAD850 80240450 1040000E */ beqz $v0, .L8024048C -/* DAD854 80240454 00000000 */ nop -/* DAD858 80240458 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD85C 8024045C C60C0038 */ lwc1 $f12, 0x38($s0) -/* DAD860 80240460 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DAD864 80240464 C4460000 */ lwc1 $f6, ($v0) -/* DAD868 80240468 468031A0 */ cvt.s.w $f6, $f6 -/* DAD86C 8024046C 44063000 */ mfc1 $a2, $f6 -/* DAD870 80240470 C4460008 */ lwc1 $f6, 8($v0) -/* DAD874 80240474 468031A0 */ cvt.s.w $f6, $f6 -/* DAD878 80240478 44073000 */ mfc1 $a3, $f6 -/* DAD87C 8024047C 0C00A720 */ jal atan2 -/* DAD880 80240480 00000000 */ nop -/* DAD884 80240484 0809012F */ j .L802404BC -/* DAD888 80240488 E600000C */ swc1 $f0, 0xc($s0) -.L8024048C: -/* DAD88C 8024048C 0C00A67F */ jal rand_int -/* DAD890 80240490 2404003C */ addiu $a0, $zero, 0x3c -/* DAD894 80240494 C60C000C */ lwc1 $f12, 0xc($s0) -/* DAD898 80240498 44820000 */ mtc1 $v0, $f0 -/* DAD89C 8024049C 00000000 */ nop -/* DAD8A0 802404A0 46800020 */ cvt.s.w $f0, $f0 -/* DAD8A4 802404A4 46006300 */ add.s $f12, $f12, $f0 -/* DAD8A8 802404A8 3C0141F0 */ lui $at, 0x41f0 -/* DAD8AC 802404AC 44810000 */ mtc1 $at, $f0 -/* DAD8B0 802404B0 0C00A6C9 */ jal clamp_angle -/* DAD8B4 802404B4 46006301 */ sub.s $f12, $f12, $f0 -/* DAD8B8 802404B8 E600000C */ swc1 $f0, 0xc($s0) -.L802404BC: -/* DAD8BC 802404BC 8E2200CC */ lw $v0, 0xcc($s1) -/* DAD8C0 802404C0 8C420004 */ lw $v0, 4($v0) -/* DAD8C4 802404C4 AE020028 */ sw $v0, 0x28($s0) -/* DAD8C8 802404C8 AE600074 */ sw $zero, 0x74($s3) -/* DAD8CC 802404CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* DAD8D0 802404D0 8C420014 */ lw $v0, 0x14($v0) -/* DAD8D4 802404D4 04410004 */ bgez $v0, .L802404E8 -/* DAD8D8 802404D8 00000000 */ nop -/* DAD8DC 802404DC C6400000 */ lwc1 $f0, ($s2) -/* DAD8E0 802404E0 08090142 */ j .L80240508 -/* DAD8E4 802404E4 E6000018 */ swc1 $f0, 0x18($s0) -.L802404E8: -/* DAD8E8 802404E8 3C018024 */ lui $at, %hi(D_80244CB0_DB20B0) -/* DAD8EC 802404EC D4224CB0 */ ldc1 $f2, %lo(D_80244CB0_DB20B0)($at) -/* DAD8F0 802404F0 44820000 */ mtc1 $v0, $f0 -/* DAD8F4 802404F4 00000000 */ nop -/* DAD8F8 802404F8 46800021 */ cvt.d.w $f0, $f0 -/* DAD8FC 802404FC 46220003 */ div.d $f0, $f0, $f2 -/* DAD900 80240500 46200020 */ cvt.s.d $f0, $f0 -/* DAD904 80240504 E6000018 */ swc1 $f0, 0x18($s0) -.L80240508: -/* DAD908 80240508 C600003C */ lwc1 $f0, 0x3c($s0) -/* DAD90C 8024050C 3C014059 */ lui $at, 0x4059 -/* DAD910 80240510 44811800 */ mtc1 $at, $f3 -/* DAD914 80240514 44801000 */ mtc1 $zero, $f2 -/* DAD918 80240518 46000021 */ cvt.d.s $f0, $f0 -/* DAD91C 8024051C 46220002 */ mul.d $f0, $f0, $f2 -/* DAD920 80240520 00000000 */ nop -/* DAD924 80240524 24020001 */ addiu $v0, $zero, 1 -/* DAD928 80240528 4620018D */ trunc.w.d $f6, $f0 -/* DAD92C 8024052C E626007C */ swc1 $f6, 0x7c($s1) -/* DAD930 80240530 AE620070 */ sw $v0, 0x70($s3) -/* DAD934 80240534 8FBF0030 */ lw $ra, 0x30($sp) -/* DAD938 80240538 8FB3002C */ lw $s3, 0x2c($sp) -/* DAD93C 8024053C 8FB20028 */ lw $s2, 0x28($sp) -/* DAD940 80240540 8FB10024 */ lw $s1, 0x24($sp) -/* DAD944 80240544 8FB00020 */ lw $s0, 0x20($sp) -/* DAD948 80240548 03E00008 */ jr $ra -/* DAD94C 8024054C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s index b046f3a633..9721e4870d 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -81,7 +81,7 @@ glabel func_802416AC_DAEAAC glabel L802417B8_DAEBB8 /* DAEBB8 802417B8 0280202D */ daddu $a0, $s4, $zero /* DAEBBC 802417BC 0200282D */ daddu $a1, $s0, $zero -/* DAEBC0 802417C0 0C0900E8 */ jal func_802403A0_DAD7A0 +/* DAEBC0 802417C0 0C0900E8 */ jal omo_04_UnkNpcAIFunc23 /* DAEBC4 802417C4 0260302D */ daddu $a2, $s3, $zero glabel L802417C8_DAEBC8 /* DAEBC8 802417C8 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s deleted file mode 100644 index 22401f3151..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240A54_DB2D14.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802455F0_DB78B0 -.double 32767.0 - -.section .text - -glabel func_80240A54_DB2D14 -/* DB2D14 80240A54 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DB2D18 80240A58 AFB3002C */ sw $s3, 0x2c($sp) -/* DB2D1C 80240A5C 0080982D */ daddu $s3, $a0, $zero -/* DB2D20 80240A60 AFBF0030 */ sw $ra, 0x30($sp) -/* DB2D24 80240A64 AFB20028 */ sw $s2, 0x28($sp) -/* DB2D28 80240A68 AFB10024 */ sw $s1, 0x24($sp) -/* DB2D2C 80240A6C AFB00020 */ sw $s0, 0x20($sp) -/* DB2D30 80240A70 8E710148 */ lw $s1, 0x148($s3) -/* DB2D34 80240A74 86240008 */ lh $a0, 8($s1) -/* DB2D38 80240A78 0C00EABB */ jal get_npc_unsafe -/* DB2D3C 80240A7C 00A0902D */ daddu $s2, $a1, $zero -/* DB2D40 80240A80 8E440004 */ lw $a0, 4($s2) -/* DB2D44 80240A84 0040802D */ daddu $s0, $v0, $zero -/* DB2D48 80240A88 00041FC2 */ srl $v1, $a0, 0x1f -/* DB2D4C 80240A8C 00832021 */ addu $a0, $a0, $v1 -/* DB2D50 80240A90 00042043 */ sra $a0, $a0, 1 -/* DB2D54 80240A94 0C00A67F */ jal rand_int -/* DB2D58 80240A98 24840001 */ addiu $a0, $a0, 1 -/* DB2D5C 80240A9C 8E430004 */ lw $v1, 4($s2) -/* DB2D60 80240AA0 000327C2 */ srl $a0, $v1, 0x1f -/* DB2D64 80240AA4 00641821 */ addu $v1, $v1, $a0 -/* DB2D68 80240AA8 00031843 */ sra $v1, $v1, 1 -/* DB2D6C 80240AAC 00621821 */ addu $v1, $v1, $v0 -/* DB2D70 80240AB0 A603008E */ sh $v1, 0x8e($s0) -/* DB2D74 80240AB4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB2D78 80240AB8 C6000040 */ lwc1 $f0, 0x40($s0) -/* DB2D7C 80240ABC C4640000 */ lwc1 $f4, ($v1) -/* DB2D80 80240AC0 46802120 */ cvt.s.w $f4, $f4 -/* DB2D84 80240AC4 C4620008 */ lwc1 $f2, 8($v1) -/* DB2D88 80240AC8 468010A0 */ cvt.s.w $f2, $f2 -/* DB2D8C 80240ACC E7A00010 */ swc1 $f0, 0x10($sp) -/* DB2D90 80240AD0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2D94 80240AD4 44061000 */ mfc1 $a2, $f2 -/* DB2D98 80240AD8 C440000C */ lwc1 $f0, 0xc($v0) -/* DB2D9C 80240ADC 46800020 */ cvt.s.w $f0, $f0 -/* DB2DA0 80240AE0 E7A00014 */ swc1 $f0, 0x14($sp) -/* DB2DA4 80240AE4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2DA8 80240AE8 44052000 */ mfc1 $a1, $f4 -/* DB2DAC 80240AEC C4400010 */ lwc1 $f0, 0x10($v0) -/* DB2DB0 80240AF0 46800020 */ cvt.s.w $f0, $f0 -/* DB2DB4 80240AF4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB2DB8 80240AF8 8C640018 */ lw $a0, 0x18($v1) -/* DB2DBC 80240AFC 0C0123F5 */ jal is_point_within_region -/* DB2DC0 80240B00 8E070038 */ lw $a3, 0x38($s0) -/* DB2DC4 80240B04 1040000E */ beqz $v0, .L80240B40 -/* DB2DC8 80240B08 00000000 */ nop -/* DB2DCC 80240B0C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2DD0 80240B10 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB2DD4 80240B14 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB2DD8 80240B18 C4460000 */ lwc1 $f6, ($v0) -/* DB2DDC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 -/* DB2DE0 80240B20 44063000 */ mfc1 $a2, $f6 -/* DB2DE4 80240B24 C4460008 */ lwc1 $f6, 8($v0) -/* DB2DE8 80240B28 468031A0 */ cvt.s.w $f6, $f6 -/* DB2DEC 80240B2C 44073000 */ mfc1 $a3, $f6 -/* DB2DF0 80240B30 0C00A720 */ jal atan2 -/* DB2DF4 80240B34 00000000 */ nop -/* DB2DF8 80240B38 080902DC */ j .L80240B70 -/* DB2DFC 80240B3C E600000C */ swc1 $f0, 0xc($s0) -.L80240B40: -/* DB2E00 80240B40 0C00A67F */ jal rand_int -/* DB2E04 80240B44 2404003C */ addiu $a0, $zero, 0x3c -/* DB2E08 80240B48 C60C000C */ lwc1 $f12, 0xc($s0) -/* DB2E0C 80240B4C 44820000 */ mtc1 $v0, $f0 -/* DB2E10 80240B50 00000000 */ nop -/* DB2E14 80240B54 46800020 */ cvt.s.w $f0, $f0 -/* DB2E18 80240B58 46006300 */ add.s $f12, $f12, $f0 -/* DB2E1C 80240B5C 3C0141F0 */ lui $at, 0x41f0 -/* DB2E20 80240B60 44810000 */ mtc1 $at, $f0 -/* DB2E24 80240B64 0C00A6C9 */ jal clamp_angle -/* DB2E28 80240B68 46006301 */ sub.s $f12, $f12, $f0 -/* DB2E2C 80240B6C E600000C */ swc1 $f0, 0xc($s0) -.L80240B70: -/* DB2E30 80240B70 8E2200CC */ lw $v0, 0xcc($s1) -/* DB2E34 80240B74 8C420004 */ lw $v0, 4($v0) -/* DB2E38 80240B78 AE020028 */ sw $v0, 0x28($s0) -/* DB2E3C 80240B7C AE600074 */ sw $zero, 0x74($s3) -/* DB2E40 80240B80 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB2E44 80240B84 8C420014 */ lw $v0, 0x14($v0) -/* DB2E48 80240B88 04410004 */ bgez $v0, .L80240B9C -/* DB2E4C 80240B8C 00000000 */ nop -/* DB2E50 80240B90 C6400000 */ lwc1 $f0, ($s2) -/* DB2E54 80240B94 080902EF */ j .L80240BBC -/* DB2E58 80240B98 E6000018 */ swc1 $f0, 0x18($s0) -.L80240B9C: -/* DB2E5C 80240B9C 3C018024 */ lui $at, %hi(D_802455F0_DB78B0) -/* DB2E60 80240BA0 D42255F0 */ ldc1 $f2, %lo(D_802455F0_DB78B0)($at) -/* DB2E64 80240BA4 44820000 */ mtc1 $v0, $f0 -/* DB2E68 80240BA8 00000000 */ nop -/* DB2E6C 80240BAC 46800021 */ cvt.d.w $f0, $f0 -/* DB2E70 80240BB0 46220003 */ div.d $f0, $f0, $f2 -/* DB2E74 80240BB4 46200020 */ cvt.s.d $f0, $f0 -/* DB2E78 80240BB8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240BBC: -/* DB2E7C 80240BBC C600003C */ lwc1 $f0, 0x3c($s0) -/* DB2E80 80240BC0 3C014059 */ lui $at, 0x4059 -/* DB2E84 80240BC4 44811800 */ mtc1 $at, $f3 -/* DB2E88 80240BC8 44801000 */ mtc1 $zero, $f2 -/* DB2E8C 80240BCC 46000021 */ cvt.d.s $f0, $f0 -/* DB2E90 80240BD0 46220002 */ mul.d $f0, $f0, $f2 -/* DB2E94 80240BD4 00000000 */ nop -/* DB2E98 80240BD8 24020001 */ addiu $v0, $zero, 1 -/* DB2E9C 80240BDC 4620018D */ trunc.w.d $f6, $f0 -/* DB2EA0 80240BE0 E626007C */ swc1 $f6, 0x7c($s1) -/* DB2EA4 80240BE4 AE620070 */ sw $v0, 0x70($s3) -/* DB2EA8 80240BE8 8FBF0030 */ lw $ra, 0x30($sp) -/* DB2EAC 80240BEC 8FB3002C */ lw $s3, 0x2c($sp) -/* DB2EB0 80240BF0 8FB20028 */ lw $s2, 0x28($sp) -/* DB2EB4 80240BF4 8FB10024 */ lw $s1, 0x24($sp) -/* DB2EB8 80240BF8 8FB00020 */ lw $s0, 0x20($sp) -/* DB2EBC 80240BFC 03E00008 */ jr $ra -/* DB2EC0 80240C00 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index f8e5837e87..be01809103 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -81,7 +81,7 @@ glabel func_80241D60_DB4020 glabel L80241E6C_DB412C /* DB412C 80241E6C 0280202D */ daddu $a0, $s4, $zero /* DB4130 80241E70 0200282D */ daddu $a1, $s0, $zero -/* DB4134 80241E74 0C090295 */ jal func_80240A54_DB2D14 +/* DB4134 80241E74 0C090295 */ jal omo_05_UnkNpcAIFunc23 /* DB4138 80241E78 0260302D */ daddu $a2, $s3, $zero glabel L80241E7C_DB413C /* DB413C 80241E7C 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s deleted file mode 100644 index 6fe7ec86f9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024056C_DBD81C.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80246D70_DC4020 -.double 32767.0 - -.section .text - -glabel func_8024056C_DBD81C -/* DBD81C 8024056C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DBD820 80240570 AFB50024 */ sw $s5, 0x24($sp) -/* DBD824 80240574 0080A82D */ daddu $s5, $a0, $zero -/* DBD828 80240578 AFBF002C */ sw $ra, 0x2c($sp) -/* DBD82C 8024057C AFB60028 */ sw $s6, 0x28($sp) -/* DBD830 80240580 AFB40020 */ sw $s4, 0x20($sp) -/* DBD834 80240584 AFB3001C */ sw $s3, 0x1c($sp) -/* DBD838 80240588 AFB20018 */ sw $s2, 0x18($sp) -/* DBD83C 8024058C AFB10014 */ sw $s1, 0x14($sp) -/* DBD840 80240590 AFB00010 */ sw $s0, 0x10($sp) -/* DBD844 80240594 F7B80040 */ sdc1 $f24, 0x40($sp) -/* DBD848 80240598 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DBD84C 8024059C F7B40030 */ sdc1 $f20, 0x30($sp) -/* DBD850 802405A0 8EB30148 */ lw $s3, 0x148($s5) -/* DBD854 802405A4 86640008 */ lh $a0, 8($s3) -/* DBD858 802405A8 0C00EABB */ jal get_npc_unsafe -/* DBD85C 802405AC 00A0B02D */ daddu $s6, $a1, $zero -/* DBD860 802405B0 0040A02D */ daddu $s4, $v0, $zero -/* DBD864 802405B4 AEA00074 */ sw $zero, 0x74($s5) -/* DBD868 802405B8 C6980038 */ lwc1 $f24, 0x38($s4) -/* DBD86C 802405BC C6960040 */ lwc1 $f22, 0x40($s4) -/* DBD870 802405C0 0000902D */ daddu $s2, $zero, $zero -/* DBD874 802405C4 AEA00078 */ sw $zero, 0x78($s5) -/* DBD878 802405C8 8E6300D0 */ lw $v1, 0xd0($s3) -/* DBD87C 802405CC 8C620000 */ lw $v0, ($v1) -/* DBD880 802405D0 3C0146FF */ lui $at, 0x46ff -/* DBD884 802405D4 3421FE00 */ ori $at, $at, 0xfe00 -/* DBD888 802405D8 4481A000 */ mtc1 $at, $f20 -/* DBD88C 802405DC 18400018 */ blez $v0, .L80240640 -/* DBD890 802405E0 0240802D */ daddu $s0, $s2, $zero -/* DBD894 802405E4 0240882D */ daddu $s1, $s2, $zero -.L802405E8: -/* DBD898 802405E8 02231021 */ addu $v0, $s1, $v1 -/* DBD89C 802405EC 4600C306 */ mov.s $f12, $f24 -/* DBD8A0 802405F0 C4440004 */ lwc1 $f4, 4($v0) -/* DBD8A4 802405F4 46802120 */ cvt.s.w $f4, $f4 -/* DBD8A8 802405F8 44062000 */ mfc1 $a2, $f4 -/* DBD8AC 802405FC C444000C */ lwc1 $f4, 0xc($v0) -/* DBD8B0 80240600 46802120 */ cvt.s.w $f4, $f4 -/* DBD8B4 80240604 44072000 */ mfc1 $a3, $f4 -/* DBD8B8 80240608 0C00A7B5 */ jal dist2D -/* DBD8BC 8024060C 4600B386 */ mov.s $f14, $f22 -/* DBD8C0 80240610 4614003C */ c.lt.s $f0, $f20 -/* DBD8C4 80240614 00000000 */ nop -/* DBD8C8 80240618 45000003 */ bc1f .L80240628 -/* DBD8CC 8024061C 2631000C */ addiu $s1, $s1, 0xc -/* DBD8D0 80240620 46000506 */ mov.s $f20, $f0 -/* DBD8D4 80240624 AEB20078 */ sw $s2, 0x78($s5) -.L80240628: -/* DBD8D8 80240628 8E6300D0 */ lw $v1, 0xd0($s3) -/* DBD8DC 8024062C 26100001 */ addiu $s0, $s0, 1 -/* DBD8E0 80240630 8C620000 */ lw $v0, ($v1) -/* DBD8E4 80240634 0202102A */ slt $v0, $s0, $v0 -/* DBD8E8 80240638 1440FFEB */ bnez $v0, .L802405E8 -/* DBD8EC 8024063C 26520001 */ addiu $s2, $s2, 1 -.L80240640: -/* DBD8F0 80240640 8E6200CC */ lw $v0, 0xcc($s3) -/* DBD8F4 80240644 8C420004 */ lw $v0, 4($v0) -/* DBD8F8 80240648 AE820028 */ sw $v0, 0x28($s4) -/* DBD8FC 8024064C 8E6200D0 */ lw $v0, 0xd0($s3) -/* DBD900 80240650 8C42007C */ lw $v0, 0x7c($v0) -/* DBD904 80240654 04410004 */ bgez $v0, .L80240668 -/* DBD908 80240658 00000000 */ nop -/* DBD90C 8024065C C6C00000 */ lwc1 $f0, ($s6) -/* DBD910 80240660 080901A2 */ j .L80240688 -/* DBD914 80240664 E6800018 */ swc1 $f0, 0x18($s4) -.L80240668: -/* DBD918 80240668 3C018024 */ lui $at, %hi(D_80246D70_DC4020) -/* DBD91C 8024066C D4226D70 */ ldc1 $f2, %lo(D_80246D70_DC4020)($at) -/* DBD920 80240670 44820000 */ mtc1 $v0, $f0 -/* DBD924 80240674 00000000 */ nop -/* DBD928 80240678 46800021 */ cvt.d.w $f0, $f0 -/* DBD92C 8024067C 46220003 */ div.d $f0, $f0, $f2 -/* DBD930 80240680 46200020 */ cvt.s.d $f0, $f0 -/* DBD934 80240684 E6800018 */ swc1 $f0, 0x18($s4) -.L80240688: -/* DBD938 80240688 24020001 */ addiu $v0, $zero, 1 -/* DBD93C 8024068C AEA20070 */ sw $v0, 0x70($s5) -/* DBD940 80240690 8FBF002C */ lw $ra, 0x2c($sp) -/* DBD944 80240694 8FB60028 */ lw $s6, 0x28($sp) -/* DBD948 80240698 8FB50024 */ lw $s5, 0x24($sp) -/* DBD94C 8024069C 8FB40020 */ lw $s4, 0x20($sp) -/* DBD950 802406A0 8FB3001C */ lw $s3, 0x1c($sp) -/* DBD954 802406A4 8FB20018 */ lw $s2, 0x18($sp) -/* DBD958 802406A8 8FB10014 */ lw $s1, 0x14($sp) -/* DBD95C 802406AC 8FB00010 */ lw $s0, 0x10($sp) -/* DBD960 802406B0 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DBD964 802406B4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DBD968 802406B8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DBD96C 802406BC 03E00008 */ jr $ra -/* DBD970 802406C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s deleted file mode 100644 index f7359f5d8d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240BE8_DBDE98.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80246D78_DC4028 -.double 32767.0 - -.section .text - -glabel func_80240BE8_DBDE98 -/* DBDE98 80240BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DBDE9C 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* DBDEA0 80240BF0 0080882D */ daddu $s1, $a0, $zero -/* DBDEA4 80240BF4 AFBF001C */ sw $ra, 0x1c($sp) -/* DBDEA8 80240BF8 AFB20018 */ sw $s2, 0x18($sp) -/* DBDEAC 80240BFC AFB00010 */ sw $s0, 0x10($sp) -/* DBDEB0 80240C00 8E300148 */ lw $s0, 0x148($s1) -/* DBDEB4 80240C04 86040008 */ lh $a0, 8($s0) -/* DBDEB8 80240C08 0C00EABB */ jal get_npc_unsafe -/* DBDEBC 80240C0C 00A0902D */ daddu $s2, $a1, $zero -/* DBDEC0 80240C10 8E230078 */ lw $v1, 0x78($s1) -/* DBDEC4 80240C14 24630001 */ addiu $v1, $v1, 1 -/* DBDEC8 80240C18 AE230078 */ sw $v1, 0x78($s1) -/* DBDECC 80240C1C 8E0400D0 */ lw $a0, 0xd0($s0) -/* DBDED0 80240C20 8C840000 */ lw $a0, ($a0) -/* DBDED4 80240C24 0064182A */ slt $v1, $v1, $a0 -/* DBDED8 80240C28 14600002 */ bnez $v1, .L80240C34 -/* DBDEDC 80240C2C 0040282D */ daddu $a1, $v0, $zero -/* DBDEE0 80240C30 AE200078 */ sw $zero, 0x78($s1) -.L80240C34: -/* DBDEE4 80240C34 8E0200CC */ lw $v0, 0xcc($s0) -/* DBDEE8 80240C38 8C420004 */ lw $v0, 4($v0) -/* DBDEEC 80240C3C ACA20028 */ sw $v0, 0x28($a1) -/* DBDEF0 80240C40 8E0200D0 */ lw $v0, 0xd0($s0) -/* DBDEF4 80240C44 8C42007C */ lw $v0, 0x7c($v0) -/* DBDEF8 80240C48 04410004 */ bgez $v0, .L80240C5C -/* DBDEFC 80240C4C 00000000 */ nop -/* DBDF00 80240C50 C6400000 */ lwc1 $f0, ($s2) -/* DBDF04 80240C54 0809031F */ j .L80240C7C -/* DBDF08 80240C58 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240C5C: -/* DBDF0C 80240C5C 3C018024 */ lui $at, %hi(D_80246D78_DC4028) -/* DBDF10 80240C60 D4226D78 */ ldc1 $f2, %lo(D_80246D78_DC4028)($at) -/* DBDF14 80240C64 44820000 */ mtc1 $v0, $f0 -/* DBDF18 80240C68 00000000 */ nop -/* DBDF1C 80240C6C 46800021 */ cvt.d.w $f0, $f0 -/* DBDF20 80240C70 46220003 */ div.d $f0, $f0, $f2 -/* DBDF24 80240C74 46200020 */ cvt.s.d $f0, $f0 -/* DBDF28 80240C78 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240C7C: -/* DBDF2C 80240C7C 24020001 */ addiu $v0, $zero, 1 -/* DBDF30 80240C80 AE220070 */ sw $v0, 0x70($s1) -/* DBDF34 80240C84 8FBF001C */ lw $ra, 0x1c($sp) -/* DBDF38 80240C88 8FB20018 */ lw $s2, 0x18($sp) -/* DBDF3C 80240C8C 8FB10014 */ lw $s1, 0x14($sp) -/* DBDF40 80240C90 8FB00010 */ lw $s0, 0x10($sp) -/* DBDF44 80240C94 03E00008 */ jr $ra -/* DBDF48 80240C98 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s index cc9c0f7cae..882e1f47a7 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -139,7 +139,7 @@ glabel func_80241100_DBE3B0 glabel L802412E4_DBE594 /* DBE594 802412E4 0280202D */ daddu $a0, $s4, $zero /* DBE598 802412E8 0260282D */ daddu $a1, $s3, $zero -/* DBE59C 802412EC 0C09015B */ jal func_8024056C_DBD81C +/* DBE59C 802412EC 0C09015B */ jal omo_07_UnkNpcAIFunc24 /* DBE5A0 802412F0 02A0302D */ daddu $a2, $s5, $zero glabel L802412F4_DBE5A4 /* DBE5A4 802412F4 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L8024131C_DBE5CC glabel L80241334_DBE5E4 /* DBE5E4 80241334 0280202D */ daddu $a0, $s4, $zero /* DBE5E8 80241338 0260282D */ daddu $a1, $s3, $zero -/* DBE5EC 8024133C 0C0902FA */ jal func_80240BE8_DBDE98 +/* DBE5EC 8024133C 0C0902FA */ jal omo_07_UnkNpcAIFunc25 /* DBE5F0 80241340 02A0302D */ daddu $a2, $s5, $zero /* DBE5F4 80241344 080904F5 */ j L802413D4_DBE684 /* DBE5F8 80241348 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index d86c70c336..b6e4e177b5 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -139,7 +139,7 @@ glabel func_80241634_DBE8E4 glabel L80241818_DBEAC8 /* DBEAC8 80241818 0260202D */ daddu $a0, $s3, $zero /* DBEACC 8024181C 0280282D */ daddu $a1, $s4, $zero -/* DBEAD0 80241820 0C09015B */ jal func_8024056C_DBD81C +/* DBEAD0 80241820 0C09015B */ jal omo_07_UnkNpcAIFunc24 /* DBEAD4 80241824 02A0302D */ daddu $a2, $s5, $zero glabel L80241828_DBEAD8 /* DBEAD8 80241828 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80241850_DBEB00 glabel L80241868_DBEB18 /* DBEB18 80241868 0260202D */ daddu $a0, $s3, $zero /* DBEB1C 8024186C 0280282D */ daddu $a1, $s4, $zero -/* DBEB20 80241870 0C0902FA */ jal func_80240BE8_DBDE98 +/* DBEB20 80241870 0C0902FA */ jal omo_07_UnkNpcAIFunc25 /* DBEB24 80241874 02A0302D */ daddu $a2, $s5, $zero /* DBEB28 80241878 08090654 */ j L80241950_DBEC00 /* DBEB2C 8024187C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s deleted file mode 100644 index b3a0636908..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241978_DBEC28.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802470B0_DC4360 -.double 32767.0 - -.section .text - -glabel func_80241978_DBEC28 -/* DBEC28 80241978 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DBEC2C 8024197C AFB3002C */ sw $s3, 0x2c($sp) -/* DBEC30 80241980 0080982D */ daddu $s3, $a0, $zero -/* DBEC34 80241984 AFBF0030 */ sw $ra, 0x30($sp) -/* DBEC38 80241988 AFB20028 */ sw $s2, 0x28($sp) -/* DBEC3C 8024198C AFB10024 */ sw $s1, 0x24($sp) -/* DBEC40 80241990 AFB00020 */ sw $s0, 0x20($sp) -/* DBEC44 80241994 8E710148 */ lw $s1, 0x148($s3) -/* DBEC48 80241998 86240008 */ lh $a0, 8($s1) -/* DBEC4C 8024199C 0C00EABB */ jal get_npc_unsafe -/* DBEC50 802419A0 00A0902D */ daddu $s2, $a1, $zero -/* DBEC54 802419A4 8E440004 */ lw $a0, 4($s2) -/* DBEC58 802419A8 0040802D */ daddu $s0, $v0, $zero -/* DBEC5C 802419AC 00041FC2 */ srl $v1, $a0, 0x1f -/* DBEC60 802419B0 00832021 */ addu $a0, $a0, $v1 -/* DBEC64 802419B4 00042043 */ sra $a0, $a0, 1 -/* DBEC68 802419B8 0C00A67F */ jal rand_int -/* DBEC6C 802419BC 24840001 */ addiu $a0, $a0, 1 -/* DBEC70 802419C0 8E430004 */ lw $v1, 4($s2) -/* DBEC74 802419C4 000327C2 */ srl $a0, $v1, 0x1f -/* DBEC78 802419C8 00641821 */ addu $v1, $v1, $a0 -/* DBEC7C 802419CC 00031843 */ sra $v1, $v1, 1 -/* DBEC80 802419D0 00621821 */ addu $v1, $v1, $v0 -/* DBEC84 802419D4 A603008E */ sh $v1, 0x8e($s0) -/* DBEC88 802419D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBEC8C 802419DC C6000040 */ lwc1 $f0, 0x40($s0) -/* DBEC90 802419E0 C4640000 */ lwc1 $f4, ($v1) -/* DBEC94 802419E4 46802120 */ cvt.s.w $f4, $f4 -/* DBEC98 802419E8 C4620008 */ lwc1 $f2, 8($v1) -/* DBEC9C 802419EC 468010A0 */ cvt.s.w $f2, $f2 -/* DBECA0 802419F0 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBECA4 802419F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBECA8 802419F8 44061000 */ mfc1 $a2, $f2 -/* DBECAC 802419FC C440000C */ lwc1 $f0, 0xc($v0) -/* DBECB0 80241A00 46800020 */ cvt.s.w $f0, $f0 -/* DBECB4 80241A04 E7A00014 */ swc1 $f0, 0x14($sp) -/* DBECB8 80241A08 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBECBC 80241A0C 44052000 */ mfc1 $a1, $f4 -/* DBECC0 80241A10 C4400010 */ lwc1 $f0, 0x10($v0) -/* DBECC4 80241A14 46800020 */ cvt.s.w $f0, $f0 -/* DBECC8 80241A18 E7A00018 */ swc1 $f0, 0x18($sp) -/* DBECCC 80241A1C 8C640018 */ lw $a0, 0x18($v1) -/* DBECD0 80241A20 0C0123F5 */ jal is_point_within_region -/* DBECD4 80241A24 8E070038 */ lw $a3, 0x38($s0) -/* DBECD8 80241A28 1040000E */ beqz $v0, .L80241A64 -/* DBECDC 80241A2C 00000000 */ nop -/* DBECE0 80241A30 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBECE4 80241A34 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DBECE8 80241A38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DBECEC 80241A3C C4460000 */ lwc1 $f6, ($v0) -/* DBECF0 80241A40 468031A0 */ cvt.s.w $f6, $f6 -/* DBECF4 80241A44 44063000 */ mfc1 $a2, $f6 -/* DBECF8 80241A48 C4460008 */ lwc1 $f6, 8($v0) -/* DBECFC 80241A4C 468031A0 */ cvt.s.w $f6, $f6 -/* DBED00 80241A50 44073000 */ mfc1 $a3, $f6 -/* DBED04 80241A54 0C00A720 */ jal atan2 -/* DBED08 80241A58 00000000 */ nop -/* DBED0C 80241A5C 080906A5 */ j .L80241A94 -/* DBED10 80241A60 E600000C */ swc1 $f0, 0xc($s0) -.L80241A64: -/* DBED14 80241A64 0C00A67F */ jal rand_int -/* DBED18 80241A68 2404003C */ addiu $a0, $zero, 0x3c -/* DBED1C 80241A6C C60C000C */ lwc1 $f12, 0xc($s0) -/* DBED20 80241A70 44820000 */ mtc1 $v0, $f0 -/* DBED24 80241A74 00000000 */ nop -/* DBED28 80241A78 46800020 */ cvt.s.w $f0, $f0 -/* DBED2C 80241A7C 46006300 */ add.s $f12, $f12, $f0 -/* DBED30 80241A80 3C0141F0 */ lui $at, 0x41f0 -/* DBED34 80241A84 44810000 */ mtc1 $at, $f0 -/* DBED38 80241A88 0C00A6C9 */ jal clamp_angle -/* DBED3C 80241A8C 46006301 */ sub.s $f12, $f12, $f0 -/* DBED40 80241A90 E600000C */ swc1 $f0, 0xc($s0) -.L80241A94: -/* DBED44 80241A94 8E2200CC */ lw $v0, 0xcc($s1) -/* DBED48 80241A98 8C420004 */ lw $v0, 4($v0) -/* DBED4C 80241A9C AE020028 */ sw $v0, 0x28($s0) -/* DBED50 80241AA0 AE600074 */ sw $zero, 0x74($s3) -/* DBED54 80241AA4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBED58 80241AA8 8C420014 */ lw $v0, 0x14($v0) -/* DBED5C 80241AAC 04410004 */ bgez $v0, .L80241AC0 -/* DBED60 80241AB0 00000000 */ nop -/* DBED64 80241AB4 C6400000 */ lwc1 $f0, ($s2) -/* DBED68 80241AB8 080906B8 */ j .L80241AE0 -/* DBED6C 80241ABC E6000018 */ swc1 $f0, 0x18($s0) -.L80241AC0: -/* DBED70 80241AC0 3C018024 */ lui $at, %hi(D_802470B0_DC4360) -/* DBED74 80241AC4 D42270B0 */ ldc1 $f2, %lo(D_802470B0_DC4360)($at) -/* DBED78 80241AC8 44820000 */ mtc1 $v0, $f0 -/* DBED7C 80241ACC 00000000 */ nop -/* DBED80 80241AD0 46800021 */ cvt.d.w $f0, $f0 -/* DBED84 80241AD4 46220003 */ div.d $f0, $f0, $f2 -/* DBED88 80241AD8 46200020 */ cvt.s.d $f0, $f0 -/* DBED8C 80241ADC E6000018 */ swc1 $f0, 0x18($s0) -.L80241AE0: -/* DBED90 80241AE0 C600003C */ lwc1 $f0, 0x3c($s0) -/* DBED94 80241AE4 3C014059 */ lui $at, 0x4059 -/* DBED98 80241AE8 44811800 */ mtc1 $at, $f3 -/* DBED9C 80241AEC 44801000 */ mtc1 $zero, $f2 -/* DBEDA0 80241AF0 46000021 */ cvt.d.s $f0, $f0 -/* DBEDA4 80241AF4 46220002 */ mul.d $f0, $f0, $f2 -/* DBEDA8 80241AF8 00000000 */ nop -/* DBEDAC 80241AFC 24020001 */ addiu $v0, $zero, 1 -/* DBEDB0 80241B00 4620018D */ trunc.w.d $f6, $f0 -/* DBEDB4 80241B04 E626007C */ swc1 $f6, 0x7c($s1) -/* DBEDB8 80241B08 AE620070 */ sw $v0, 0x70($s3) -/* DBEDBC 80241B0C 8FBF0030 */ lw $ra, 0x30($sp) -/* DBEDC0 80241B10 8FB3002C */ lw $s3, 0x2c($sp) -/* DBEDC4 80241B14 8FB20028 */ lw $s2, 0x28($sp) -/* DBEDC8 80241B18 8FB10024 */ lw $s1, 0x24($sp) -/* DBEDCC 80241B1C 8FB00020 */ lw $s0, 0x20($sp) -/* DBEDD0 80241B20 03E00008 */ jr $ra -/* DBEDD4 80241B24 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index d9dd8b2f31..7b520f155b 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -81,7 +81,7 @@ glabel func_80242C84_DBFF34 glabel L80242D90_DC0040 /* DC0040 80242D90 0280202D */ daddu $a0, $s4, $zero /* DC0044 80242D94 0200282D */ daddu $a1, $s0, $zero -/* DC0048 80242D98 0C09065E */ jal func_80241978_DBEC28 +/* DC0048 80242D98 0C09065E */ jal omo_07_UnkNpcAIFunc23 /* DC004C 80242D9C 0260302D */ daddu $a2, $s3, $zero glabel L80242DA0_DC0050 /* DC0050 80242DA0 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s deleted file mode 100644 index 964e2a8896..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240F4C_DCDC1C.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024A7D0_DD74A0 -.double 32767.0 - -.section .text - -glabel func_80240F4C_DCDC1C -/* DCDC1C 80240F4C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* DCDC20 80240F50 AFB50024 */ sw $s5, 0x24($sp) -/* DCDC24 80240F54 0080A82D */ daddu $s5, $a0, $zero -/* DCDC28 80240F58 AFBF002C */ sw $ra, 0x2c($sp) -/* DCDC2C 80240F5C AFB60028 */ sw $s6, 0x28($sp) -/* DCDC30 80240F60 AFB40020 */ sw $s4, 0x20($sp) -/* DCDC34 80240F64 AFB3001C */ sw $s3, 0x1c($sp) -/* DCDC38 80240F68 AFB20018 */ sw $s2, 0x18($sp) -/* DCDC3C 80240F6C AFB10014 */ sw $s1, 0x14($sp) -/* DCDC40 80240F70 AFB00010 */ sw $s0, 0x10($sp) -/* DCDC44 80240F74 F7B80040 */ sdc1 $f24, 0x40($sp) -/* DCDC48 80240F78 F7B60038 */ sdc1 $f22, 0x38($sp) -/* DCDC4C 80240F7C F7B40030 */ sdc1 $f20, 0x30($sp) -/* DCDC50 80240F80 8EB30148 */ lw $s3, 0x148($s5) -/* DCDC54 80240F84 86640008 */ lh $a0, 8($s3) -/* DCDC58 80240F88 0C00EABB */ jal get_npc_unsafe -/* DCDC5C 80240F8C 00A0B02D */ daddu $s6, $a1, $zero -/* DCDC60 80240F90 0040A02D */ daddu $s4, $v0, $zero -/* DCDC64 80240F94 AEA00074 */ sw $zero, 0x74($s5) -/* DCDC68 80240F98 C6980038 */ lwc1 $f24, 0x38($s4) -/* DCDC6C 80240F9C C6960040 */ lwc1 $f22, 0x40($s4) -/* DCDC70 80240FA0 0000902D */ daddu $s2, $zero, $zero -/* DCDC74 80240FA4 AEA00078 */ sw $zero, 0x78($s5) -/* DCDC78 80240FA8 8E6300D0 */ lw $v1, 0xd0($s3) -/* DCDC7C 80240FAC 8C620000 */ lw $v0, ($v1) -/* DCDC80 80240FB0 3C0146FF */ lui $at, 0x46ff -/* DCDC84 80240FB4 3421FE00 */ ori $at, $at, 0xfe00 -/* DCDC88 80240FB8 4481A000 */ mtc1 $at, $f20 -/* DCDC8C 80240FBC 18400018 */ blez $v0, .L80241020 -/* DCDC90 80240FC0 0240802D */ daddu $s0, $s2, $zero -/* DCDC94 80240FC4 0240882D */ daddu $s1, $s2, $zero -.L80240FC8: -/* DCDC98 80240FC8 02231021 */ addu $v0, $s1, $v1 -/* DCDC9C 80240FCC 4600C306 */ mov.s $f12, $f24 -/* DCDCA0 80240FD0 C4440004 */ lwc1 $f4, 4($v0) -/* DCDCA4 80240FD4 46802120 */ cvt.s.w $f4, $f4 -/* DCDCA8 80240FD8 44062000 */ mfc1 $a2, $f4 -/* DCDCAC 80240FDC C444000C */ lwc1 $f4, 0xc($v0) -/* DCDCB0 80240FE0 46802120 */ cvt.s.w $f4, $f4 -/* DCDCB4 80240FE4 44072000 */ mfc1 $a3, $f4 -/* DCDCB8 80240FE8 0C00A7B5 */ jal dist2D -/* DCDCBC 80240FEC 4600B386 */ mov.s $f14, $f22 -/* DCDCC0 80240FF0 4614003C */ c.lt.s $f0, $f20 -/* DCDCC4 80240FF4 00000000 */ nop -/* DCDCC8 80240FF8 45000003 */ bc1f .L80241008 -/* DCDCCC 80240FFC 2631000C */ addiu $s1, $s1, 0xc -/* DCDCD0 80241000 46000506 */ mov.s $f20, $f0 -/* DCDCD4 80241004 AEB20078 */ sw $s2, 0x78($s5) -.L80241008: -/* DCDCD8 80241008 8E6300D0 */ lw $v1, 0xd0($s3) -/* DCDCDC 8024100C 26100001 */ addiu $s0, $s0, 1 -/* DCDCE0 80241010 8C620000 */ lw $v0, ($v1) -/* DCDCE4 80241014 0202102A */ slt $v0, $s0, $v0 -/* DCDCE8 80241018 1440FFEB */ bnez $v0, .L80240FC8 -/* DCDCEC 8024101C 26520001 */ addiu $s2, $s2, 1 -.L80241020: -/* DCDCF0 80241020 8E6200CC */ lw $v0, 0xcc($s3) -/* DCDCF4 80241024 8C420004 */ lw $v0, 4($v0) -/* DCDCF8 80241028 AE820028 */ sw $v0, 0x28($s4) -/* DCDCFC 8024102C 8E6200D0 */ lw $v0, 0xd0($s3) -/* DCDD00 80241030 8C42007C */ lw $v0, 0x7c($v0) -/* DCDD04 80241034 04410004 */ bgez $v0, .L80241048 -/* DCDD08 80241038 00000000 */ nop -/* DCDD0C 8024103C C6C00000 */ lwc1 $f0, ($s6) -/* DCDD10 80241040 0809041A */ j .L80241068 -/* DCDD14 80241044 E6800018 */ swc1 $f0, 0x18($s4) -.L80241048: -/* DCDD18 80241048 3C018025 */ lui $at, %hi(D_8024A7D0_DD74A0) -/* DCDD1C 8024104C D422A7D0 */ ldc1 $f2, %lo(D_8024A7D0_DD74A0)($at) -/* DCDD20 80241050 44820000 */ mtc1 $v0, $f0 -/* DCDD24 80241054 00000000 */ nop -/* DCDD28 80241058 46800021 */ cvt.d.w $f0, $f0 -/* DCDD2C 8024105C 46220003 */ div.d $f0, $f0, $f2 -/* DCDD30 80241060 46200020 */ cvt.s.d $f0, $f0 -/* DCDD34 80241064 E6800018 */ swc1 $f0, 0x18($s4) -.L80241068: -/* DCDD38 80241068 24020001 */ addiu $v0, $zero, 1 -/* DCDD3C 8024106C AEA20070 */ sw $v0, 0x70($s5) -/* DCDD40 80241070 8FBF002C */ lw $ra, 0x2c($sp) -/* DCDD44 80241074 8FB60028 */ lw $s6, 0x28($sp) -/* DCDD48 80241078 8FB50024 */ lw $s5, 0x24($sp) -/* DCDD4C 8024107C 8FB40020 */ lw $s4, 0x20($sp) -/* DCDD50 80241080 8FB3001C */ lw $s3, 0x1c($sp) -/* DCDD54 80241084 8FB20018 */ lw $s2, 0x18($sp) -/* DCDD58 80241088 8FB10014 */ lw $s1, 0x14($sp) -/* DCDD5C 8024108C 8FB00010 */ lw $s0, 0x10($sp) -/* DCDD60 80241090 D7B80040 */ ldc1 $f24, 0x40($sp) -/* DCDD64 80241094 D7B60038 */ ldc1 $f22, 0x38($sp) -/* DCDD68 80241098 D7B40030 */ ldc1 $f20, 0x30($sp) -/* DCDD6C 8024109C 03E00008 */ jr $ra -/* DCDD70 802410A0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s deleted file mode 100644 index acef4942e8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802415C8_DCE298.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024A7D8_DD74A8 -.double 32767.0 - -.section .text - -glabel func_802415C8_DCE298 -/* DCE298 802415C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE29C 802415CC AFB10014 */ sw $s1, 0x14($sp) -/* DCE2A0 802415D0 0080882D */ daddu $s1, $a0, $zero -/* DCE2A4 802415D4 AFBF001C */ sw $ra, 0x1c($sp) -/* DCE2A8 802415D8 AFB20018 */ sw $s2, 0x18($sp) -/* DCE2AC 802415DC AFB00010 */ sw $s0, 0x10($sp) -/* DCE2B0 802415E0 8E300148 */ lw $s0, 0x148($s1) -/* DCE2B4 802415E4 86040008 */ lh $a0, 8($s0) -/* DCE2B8 802415E8 0C00EABB */ jal get_npc_unsafe -/* DCE2BC 802415EC 00A0902D */ daddu $s2, $a1, $zero -/* DCE2C0 802415F0 8E230078 */ lw $v1, 0x78($s1) -/* DCE2C4 802415F4 24630001 */ addiu $v1, $v1, 1 -/* DCE2C8 802415F8 AE230078 */ sw $v1, 0x78($s1) -/* DCE2CC 802415FC 8E0400D0 */ lw $a0, 0xd0($s0) -/* DCE2D0 80241600 8C840000 */ lw $a0, ($a0) -/* DCE2D4 80241604 0064182A */ slt $v1, $v1, $a0 -/* DCE2D8 80241608 14600002 */ bnez $v1, .L80241614 -/* DCE2DC 8024160C 0040282D */ daddu $a1, $v0, $zero -/* DCE2E0 80241610 AE200078 */ sw $zero, 0x78($s1) -.L80241614: -/* DCE2E4 80241614 8E0200CC */ lw $v0, 0xcc($s0) -/* DCE2E8 80241618 8C420004 */ lw $v0, 4($v0) -/* DCE2EC 8024161C ACA20028 */ sw $v0, 0x28($a1) -/* DCE2F0 80241620 8E0200D0 */ lw $v0, 0xd0($s0) -/* DCE2F4 80241624 8C42007C */ lw $v0, 0x7c($v0) -/* DCE2F8 80241628 04410004 */ bgez $v0, .L8024163C -/* DCE2FC 8024162C 00000000 */ nop -/* DCE300 80241630 C6400000 */ lwc1 $f0, ($s2) -/* DCE304 80241634 08090597 */ j .L8024165C -/* DCE308 80241638 E4A00018 */ swc1 $f0, 0x18($a1) -.L8024163C: -/* DCE30C 8024163C 3C018025 */ lui $at, %hi(D_8024A7D8_DD74A8) -/* DCE310 80241640 D422A7D8 */ ldc1 $f2, %lo(D_8024A7D8_DD74A8)($at) -/* DCE314 80241644 44820000 */ mtc1 $v0, $f0 -/* DCE318 80241648 00000000 */ nop -/* DCE31C 8024164C 46800021 */ cvt.d.w $f0, $f0 -/* DCE320 80241650 46220003 */ div.d $f0, $f0, $f2 -/* DCE324 80241654 46200020 */ cvt.s.d $f0, $f0 -/* DCE328 80241658 E4A00018 */ swc1 $f0, 0x18($a1) -.L8024165C: -/* DCE32C 8024165C 24020001 */ addiu $v0, $zero, 1 -/* DCE330 80241660 AE220070 */ sw $v0, 0x70($s1) -/* DCE334 80241664 8FBF001C */ lw $ra, 0x1c($sp) -/* DCE338 80241668 8FB20018 */ lw $s2, 0x18($sp) -/* DCE33C 8024166C 8FB10014 */ lw $s1, 0x14($sp) -/* DCE340 80241670 8FB00010 */ lw $s0, 0x10($sp) -/* DCE344 80241674 03E00008 */ jr $ra -/* DCE348 80241678 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 8596e9fe31..00098fb6ba 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -139,7 +139,7 @@ glabel func_80241AE0_DCE7B0 glabel L80241CC4_DCE994 /* DCE994 80241CC4 0280202D */ daddu $a0, $s4, $zero /* DCE998 80241CC8 0260282D */ daddu $a1, $s3, $zero -/* DCE99C 80241CCC 0C0903D3 */ jal func_80240F4C_DCDC1C +/* DCE99C 80241CCC 0C0903D3 */ jal omo_09_UnkNpcAIFunc24 /* DCE9A0 80241CD0 02A0302D */ daddu $a2, $s5, $zero glabel L80241CD4_DCE9A4 /* DCE9A4 80241CD4 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241CFC_DCE9CC glabel L80241D14_DCE9E4 /* DCE9E4 80241D14 0280202D */ daddu $a0, $s4, $zero /* DCE9E8 80241D18 0260282D */ daddu $a1, $s3, $zero -/* DCE9EC 80241D1C 0C090572 */ jal func_802415C8_DCE298 +/* DCE9EC 80241D1C 0C090572 */ jal omo_09_UnkNpcAIFunc25 /* DCE9F0 80241D20 02A0302D */ daddu $a2, $s5, $zero /* DCE9F4 80241D24 0809076D */ j L80241DB4_DCEA84 /* DCE9F8 80241D28 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 2ef990b0a6..4d91149696 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -139,7 +139,7 @@ glabel func_80242014_DCECE4 glabel L802421F8_DCEEC8 /* DCEEC8 802421F8 0260202D */ daddu $a0, $s3, $zero /* DCEECC 802421FC 0280282D */ daddu $a1, $s4, $zero -/* DCEED0 80242200 0C0903D3 */ jal func_80240F4C_DCDC1C +/* DCEED0 80242200 0C0903D3 */ jal omo_09_UnkNpcAIFunc24 /* DCEED4 80242204 02A0302D */ daddu $a2, $s5, $zero glabel L80242208_DCEED8 /* DCEED8 80242208 0260202D */ daddu $a0, $s3, $zero @@ -163,7 +163,7 @@ glabel L80242230_DCEF00 glabel L80242248_DCEF18 /* DCEF18 80242248 0260202D */ daddu $a0, $s3, $zero /* DCEF1C 8024224C 0280282D */ daddu $a1, $s4, $zero -/* DCEF20 80242250 0C090572 */ jal func_802415C8_DCE298 +/* DCEF20 80242250 0C090572 */ jal omo_09_UnkNpcAIFunc25 /* DCEF24 80242254 02A0302D */ daddu $a2, $s5, $zero /* DCEF28 80242258 080908CC */ j L80242330_DCF000 /* DCEF2C 8024225C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BAC_DDD3DC.s b/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BAC_DDD3DC.s deleted file mode 100644 index c6b63eb1a9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BAC_DDD3DC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC_DDD3DC -/* DDD3DC 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DDD3E0 80240BB0 AFBF0010 */ sw $ra, 0x10($sp) -/* DDD3E4 80240BB4 8C82000C */ lw $v0, 0xc($a0) -/* DDD3E8 80240BB8 0C0B1EAF */ jal get_variable -/* DDD3EC 80240BBC 8C450000 */ lw $a1, ($v0) -/* DDD3F0 80240BC0 0C03AC5A */ jal switch_to_partner -/* DDD3F4 80240BC4 0040202D */ daddu $a0, $v0, $zero -/* DDD3F8 80240BC8 8FBF0010 */ lw $ra, 0x10($sp) -/* DDD3FC 80240BCC 24020002 */ addiu $v0, $zero, 2 -/* DDD400 80240BD0 03E00008 */ jr $ra -/* DDD404 80240BD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s deleted file mode 100644 index 941c73696f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240FB4_DEFE54.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80247950_DF67F0 -.double 32767.0 - -.section .text - -glabel func_80240FB4_DEFE54 -/* DEFE54 80240FB4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DEFE58 80240FB8 AFB3002C */ sw $s3, 0x2c($sp) -/* DEFE5C 80240FBC 0080982D */ daddu $s3, $a0, $zero -/* DEFE60 80240FC0 AFBF0030 */ sw $ra, 0x30($sp) -/* DEFE64 80240FC4 AFB20028 */ sw $s2, 0x28($sp) -/* DEFE68 80240FC8 AFB10024 */ sw $s1, 0x24($sp) -/* DEFE6C 80240FCC AFB00020 */ sw $s0, 0x20($sp) -/* DEFE70 80240FD0 8E710148 */ lw $s1, 0x148($s3) -/* DEFE74 80240FD4 86240008 */ lh $a0, 8($s1) -/* DEFE78 80240FD8 0C00EABB */ jal get_npc_unsafe -/* DEFE7C 80240FDC 00A0902D */ daddu $s2, $a1, $zero -/* DEFE80 80240FE0 8E440004 */ lw $a0, 4($s2) -/* DEFE84 80240FE4 0040802D */ daddu $s0, $v0, $zero -/* DEFE88 80240FE8 00041FC2 */ srl $v1, $a0, 0x1f -/* DEFE8C 80240FEC 00832021 */ addu $a0, $a0, $v1 -/* DEFE90 80240FF0 00042043 */ sra $a0, $a0, 1 -/* DEFE94 80240FF4 0C00A67F */ jal rand_int -/* DEFE98 80240FF8 24840001 */ addiu $a0, $a0, 1 -/* DEFE9C 80240FFC 8E430004 */ lw $v1, 4($s2) -/* DEFEA0 80241000 000327C2 */ srl $a0, $v1, 0x1f -/* DEFEA4 80241004 00641821 */ addu $v1, $v1, $a0 -/* DEFEA8 80241008 00031843 */ sra $v1, $v1, 1 -/* DEFEAC 8024100C 00621821 */ addu $v1, $v1, $v0 -/* DEFEB0 80241010 A603008E */ sh $v1, 0x8e($s0) -/* DEFEB4 80241014 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFEB8 80241018 C6000040 */ lwc1 $f0, 0x40($s0) -/* DEFEBC 8024101C C4640000 */ lwc1 $f4, ($v1) -/* DEFEC0 80241020 46802120 */ cvt.s.w $f4, $f4 -/* DEFEC4 80241024 C4620008 */ lwc1 $f2, 8($v1) -/* DEFEC8 80241028 468010A0 */ cvt.s.w $f2, $f2 -/* DEFECC 8024102C E7A00010 */ swc1 $f0, 0x10($sp) -/* DEFED0 80241030 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFED4 80241034 44061000 */ mfc1 $a2, $f2 -/* DEFED8 80241038 C440000C */ lwc1 $f0, 0xc($v0) -/* DEFEDC 8024103C 46800020 */ cvt.s.w $f0, $f0 -/* DEFEE0 80241040 E7A00014 */ swc1 $f0, 0x14($sp) -/* DEFEE4 80241044 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFEE8 80241048 44052000 */ mfc1 $a1, $f4 -/* DEFEEC 8024104C C4400010 */ lwc1 $f0, 0x10($v0) -/* DEFEF0 80241050 46800020 */ cvt.s.w $f0, $f0 -/* DEFEF4 80241054 E7A00018 */ swc1 $f0, 0x18($sp) -/* DEFEF8 80241058 8C640018 */ lw $a0, 0x18($v1) -/* DEFEFC 8024105C 0C0123F5 */ jal is_point_within_region -/* DEFF00 80241060 8E070038 */ lw $a3, 0x38($s0) -/* DEFF04 80241064 1040000E */ beqz $v0, .L802410A0 -/* DEFF08 80241068 00000000 */ nop -/* DEFF0C 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFF10 80241070 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DEFF14 80241074 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DEFF18 80241078 C4460000 */ lwc1 $f6, ($v0) -/* DEFF1C 8024107C 468031A0 */ cvt.s.w $f6, $f6 -/* DEFF20 80241080 44063000 */ mfc1 $a2, $f6 -/* DEFF24 80241084 C4460008 */ lwc1 $f6, 8($v0) -/* DEFF28 80241088 468031A0 */ cvt.s.w $f6, $f6 -/* DEFF2C 8024108C 44073000 */ mfc1 $a3, $f6 -/* DEFF30 80241090 0C00A720 */ jal atan2 -/* DEFF34 80241094 00000000 */ nop -/* DEFF38 80241098 08090434 */ j .L802410D0 -/* DEFF3C 8024109C E600000C */ swc1 $f0, 0xc($s0) -.L802410A0: -/* DEFF40 802410A0 0C00A67F */ jal rand_int -/* DEFF44 802410A4 2404003C */ addiu $a0, $zero, 0x3c -/* DEFF48 802410A8 C60C000C */ lwc1 $f12, 0xc($s0) -/* DEFF4C 802410AC 44820000 */ mtc1 $v0, $f0 -/* DEFF50 802410B0 00000000 */ nop -/* DEFF54 802410B4 46800020 */ cvt.s.w $f0, $f0 -/* DEFF58 802410B8 46006300 */ add.s $f12, $f12, $f0 -/* DEFF5C 802410BC 3C0141F0 */ lui $at, 0x41f0 -/* DEFF60 802410C0 44810000 */ mtc1 $at, $f0 -/* DEFF64 802410C4 0C00A6C9 */ jal clamp_angle -/* DEFF68 802410C8 46006301 */ sub.s $f12, $f12, $f0 -/* DEFF6C 802410CC E600000C */ swc1 $f0, 0xc($s0) -.L802410D0: -/* DEFF70 802410D0 8E2200CC */ lw $v0, 0xcc($s1) -/* DEFF74 802410D4 8C420004 */ lw $v0, 4($v0) -/* DEFF78 802410D8 AE020028 */ sw $v0, 0x28($s0) -/* DEFF7C 802410DC AE600074 */ sw $zero, 0x74($s3) -/* DEFF80 802410E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFF84 802410E4 8C420014 */ lw $v0, 0x14($v0) -/* DEFF88 802410E8 04410004 */ bgez $v0, .L802410FC -/* DEFF8C 802410EC 00000000 */ nop -/* DEFF90 802410F0 C6400000 */ lwc1 $f0, ($s2) -/* DEFF94 802410F4 08090447 */ j .L8024111C -/* DEFF98 802410F8 E6000018 */ swc1 $f0, 0x18($s0) -.L802410FC: -/* DEFF9C 802410FC 3C018024 */ lui $at, %hi(D_80247950_DF67F0) -/* DEFFA0 80241100 D4227950 */ ldc1 $f2, %lo(D_80247950_DF67F0)($at) -/* DEFFA4 80241104 44820000 */ mtc1 $v0, $f0 -/* DEFFA8 80241108 00000000 */ nop -/* DEFFAC 8024110C 46800021 */ cvt.d.w $f0, $f0 -/* DEFFB0 80241110 46220003 */ div.d $f0, $f0, $f2 -/* DEFFB4 80241114 46200020 */ cvt.s.d $f0, $f0 -/* DEFFB8 80241118 E6000018 */ swc1 $f0, 0x18($s0) -.L8024111C: -/* DEFFBC 8024111C C600003C */ lwc1 $f0, 0x3c($s0) -/* DEFFC0 80241120 3C014059 */ lui $at, 0x4059 -/* DEFFC4 80241124 44811800 */ mtc1 $at, $f3 -/* DEFFC8 80241128 44801000 */ mtc1 $zero, $f2 -/* DEFFCC 8024112C 46000021 */ cvt.d.s $f0, $f0 -/* DEFFD0 80241130 46220002 */ mul.d $f0, $f0, $f2 -/* DEFFD4 80241134 00000000 */ nop -/* DEFFD8 80241138 24020001 */ addiu $v0, $zero, 1 -/* DEFFDC 8024113C 4620018D */ trunc.w.d $f6, $f0 -/* DEFFE0 80241140 E626007C */ swc1 $f6, 0x7c($s1) -/* DEFFE4 80241144 AE620070 */ sw $v0, 0x70($s3) -/* DEFFE8 80241148 8FBF0030 */ lw $ra, 0x30($sp) -/* DEFFEC 8024114C 8FB3002C */ lw $s3, 0x2c($sp) -/* DEFFF0 80241150 8FB20028 */ lw $s2, 0x28($sp) -/* DEFFF4 80241154 8FB10024 */ lw $s1, 0x24($sp) -/* DEFFF8 80241158 8FB00020 */ lw $s0, 0x20($sp) -/* DEFFFC 8024115C 03E00008 */ jr $ra -/* DF0000 80241160 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 3adc63cdd8..da4fc4fb07 100644 --- a/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/ver/us/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -81,7 +81,7 @@ glabel func_802422C0_DF1160 glabel L802423CC_DF126C /* DF126C 802423CC 0280202D */ daddu $a0, $s4, $zero /* DF1270 802423D0 0200282D */ daddu $a1, $s0, $zero -/* DF1274 802423D4 0C0903ED */ jal func_80240FB4_DEFE54 +/* DF1274 802423D4 0C0903ED */ jal omo_17_UnkNpcAIFunc23 /* DF1278 802423D8 0260302D */ daddu $a2, $s3, $zero glabel L802423DC_DF127C /* DF127C 802423DC 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s deleted file mode 100644 index d7974a36b0..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240F20_D8E170.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243FE0_D91230 -.double 32767.0 - -.section .text - -glabel func_80240F20_D8E170 -/* D8E170 80240F20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D8E174 80240F24 AFB50024 */ sw $s5, 0x24($sp) -/* D8E178 80240F28 0080A82D */ daddu $s5, $a0, $zero -/* D8E17C 80240F2C AFBF002C */ sw $ra, 0x2c($sp) -/* D8E180 80240F30 AFB60028 */ sw $s6, 0x28($sp) -/* D8E184 80240F34 AFB40020 */ sw $s4, 0x20($sp) -/* D8E188 80240F38 AFB3001C */ sw $s3, 0x1c($sp) -/* D8E18C 80240F3C AFB20018 */ sw $s2, 0x18($sp) -/* D8E190 80240F40 AFB10014 */ sw $s1, 0x14($sp) -/* D8E194 80240F44 AFB00010 */ sw $s0, 0x10($sp) -/* D8E198 80240F48 F7B80040 */ sdc1 $f24, 0x40($sp) -/* D8E19C 80240F4C F7B60038 */ sdc1 $f22, 0x38($sp) -/* D8E1A0 80240F50 F7B40030 */ sdc1 $f20, 0x30($sp) -/* D8E1A4 80240F54 8EB30148 */ lw $s3, 0x148($s5) -/* D8E1A8 80240F58 86640008 */ lh $a0, 8($s3) -/* D8E1AC 80240F5C 0C00EABB */ jal get_npc_unsafe -/* D8E1B0 80240F60 00A0B02D */ daddu $s6, $a1, $zero -/* D8E1B4 80240F64 0040A02D */ daddu $s4, $v0, $zero -/* D8E1B8 80240F68 AEA00074 */ sw $zero, 0x74($s5) -/* D8E1BC 80240F6C C6980038 */ lwc1 $f24, 0x38($s4) -/* D8E1C0 80240F70 C6960040 */ lwc1 $f22, 0x40($s4) -/* D8E1C4 80240F74 0000902D */ daddu $s2, $zero, $zero -/* D8E1C8 80240F78 AEA00078 */ sw $zero, 0x78($s5) -/* D8E1CC 80240F7C 8E6300D0 */ lw $v1, 0xd0($s3) -/* D8E1D0 80240F80 8C620000 */ lw $v0, ($v1) -/* D8E1D4 80240F84 3C0146FF */ lui $at, 0x46ff -/* D8E1D8 80240F88 3421FE00 */ ori $at, $at, 0xfe00 -/* D8E1DC 80240F8C 4481A000 */ mtc1 $at, $f20 -/* D8E1E0 80240F90 18400018 */ blez $v0, .L80240FF4 -/* D8E1E4 80240F94 0240802D */ daddu $s0, $s2, $zero -/* D8E1E8 80240F98 0240882D */ daddu $s1, $s2, $zero -.L80240F9C: -/* D8E1EC 80240F9C 02231021 */ addu $v0, $s1, $v1 -/* D8E1F0 80240FA0 4600C306 */ mov.s $f12, $f24 -/* D8E1F4 80240FA4 C4440004 */ lwc1 $f4, 4($v0) -/* D8E1F8 80240FA8 46802120 */ cvt.s.w $f4, $f4 -/* D8E1FC 80240FAC 44062000 */ mfc1 $a2, $f4 -/* D8E200 80240FB0 C444000C */ lwc1 $f4, 0xc($v0) -/* D8E204 80240FB4 46802120 */ cvt.s.w $f4, $f4 -/* D8E208 80240FB8 44072000 */ mfc1 $a3, $f4 -/* D8E20C 80240FBC 0C00A7B5 */ jal dist2D -/* D8E210 80240FC0 4600B386 */ mov.s $f14, $f22 -/* D8E214 80240FC4 4614003C */ c.lt.s $f0, $f20 -/* D8E218 80240FC8 00000000 */ nop -/* D8E21C 80240FCC 45000003 */ bc1f .L80240FDC -/* D8E220 80240FD0 2631000C */ addiu $s1, $s1, 0xc -/* D8E224 80240FD4 46000506 */ mov.s $f20, $f0 -/* D8E228 80240FD8 AEB20078 */ sw $s2, 0x78($s5) -.L80240FDC: -/* D8E22C 80240FDC 8E6300D0 */ lw $v1, 0xd0($s3) -/* D8E230 80240FE0 26100001 */ addiu $s0, $s0, 1 -/* D8E234 80240FE4 8C620000 */ lw $v0, ($v1) -/* D8E238 80240FE8 0202102A */ slt $v0, $s0, $v0 -/* D8E23C 80240FEC 1440FFEB */ bnez $v0, .L80240F9C -/* D8E240 80240FF0 26520001 */ addiu $s2, $s2, 1 -.L80240FF4: -/* D8E244 80240FF4 8E6200CC */ lw $v0, 0xcc($s3) -/* D8E248 80240FF8 8C420004 */ lw $v0, 4($v0) -/* D8E24C 80240FFC AE820028 */ sw $v0, 0x28($s4) -/* D8E250 80241000 8E6200D0 */ lw $v0, 0xd0($s3) -/* D8E254 80241004 8C42007C */ lw $v0, 0x7c($v0) -/* D8E258 80241008 04410004 */ bgez $v0, .L8024101C -/* D8E25C 8024100C 00000000 */ nop -/* D8E260 80241010 C6C00000 */ lwc1 $f0, ($s6) -/* D8E264 80241014 0809040F */ j .L8024103C -/* D8E268 80241018 E6800018 */ swc1 $f0, 0x18($s4) -.L8024101C: -/* D8E26C 8024101C 3C018024 */ lui $at, %hi(D_80243FE0_D91230) -/* D8E270 80241020 D4223FE0 */ ldc1 $f2, %lo(D_80243FE0_D91230)($at) -/* D8E274 80241024 44820000 */ mtc1 $v0, $f0 -/* D8E278 80241028 00000000 */ nop -/* D8E27C 8024102C 46800021 */ cvt.d.w $f0, $f0 -/* D8E280 80241030 46220003 */ div.d $f0, $f0, $f2 -/* D8E284 80241034 46200020 */ cvt.s.d $f0, $f0 -/* D8E288 80241038 E6800018 */ swc1 $f0, 0x18($s4) -.L8024103C: -/* D8E28C 8024103C 24020001 */ addiu $v0, $zero, 1 -/* D8E290 80241040 AEA20070 */ sw $v0, 0x70($s5) -/* D8E294 80241044 8FBF002C */ lw $ra, 0x2c($sp) -/* D8E298 80241048 8FB60028 */ lw $s6, 0x28($sp) -/* D8E29C 8024104C 8FB50024 */ lw $s5, 0x24($sp) -/* D8E2A0 80241050 8FB40020 */ lw $s4, 0x20($sp) -/* D8E2A4 80241054 8FB3001C */ lw $s3, 0x1c($sp) -/* D8E2A8 80241058 8FB20018 */ lw $s2, 0x18($sp) -/* D8E2AC 8024105C 8FB10014 */ lw $s1, 0x14($sp) -/* D8E2B0 80241060 8FB00010 */ lw $s0, 0x10($sp) -/* D8E2B4 80241064 D7B80040 */ ldc1 $f24, 0x40($sp) -/* D8E2B8 80241068 D7B60038 */ ldc1 $f22, 0x38($sp) -/* D8E2BC 8024106C D7B40030 */ ldc1 $f20, 0x30($sp) -/* D8E2C0 80241070 03E00008 */ jr $ra -/* D8E2C4 80241074 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s deleted file mode 100644 index c95e4ee8f4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024159C_D8E7EC.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243FE8_D91238 -.double 32767.0 - -.section .text - -glabel func_8024159C_D8E7EC -/* D8E7EC 8024159C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8E7F0 802415A0 AFB10014 */ sw $s1, 0x14($sp) -/* D8E7F4 802415A4 0080882D */ daddu $s1, $a0, $zero -/* D8E7F8 802415A8 AFBF001C */ sw $ra, 0x1c($sp) -/* D8E7FC 802415AC AFB20018 */ sw $s2, 0x18($sp) -/* D8E800 802415B0 AFB00010 */ sw $s0, 0x10($sp) -/* D8E804 802415B4 8E300148 */ lw $s0, 0x148($s1) -/* D8E808 802415B8 86040008 */ lh $a0, 8($s0) -/* D8E80C 802415BC 0C00EABB */ jal get_npc_unsafe -/* D8E810 802415C0 00A0902D */ daddu $s2, $a1, $zero -/* D8E814 802415C4 8E230078 */ lw $v1, 0x78($s1) -/* D8E818 802415C8 24630001 */ addiu $v1, $v1, 1 -/* D8E81C 802415CC AE230078 */ sw $v1, 0x78($s1) -/* D8E820 802415D0 8E0400D0 */ lw $a0, 0xd0($s0) -/* D8E824 802415D4 8C840000 */ lw $a0, ($a0) -/* D8E828 802415D8 0064182A */ slt $v1, $v1, $a0 -/* D8E82C 802415DC 14600002 */ bnez $v1, .L802415E8 -/* D8E830 802415E0 0040282D */ daddu $a1, $v0, $zero -/* D8E834 802415E4 AE200078 */ sw $zero, 0x78($s1) -.L802415E8: -/* D8E838 802415E8 8E0200CC */ lw $v0, 0xcc($s0) -/* D8E83C 802415EC 8C420004 */ lw $v0, 4($v0) -/* D8E840 802415F0 ACA20028 */ sw $v0, 0x28($a1) -/* D8E844 802415F4 8E0200D0 */ lw $v0, 0xd0($s0) -/* D8E848 802415F8 8C42007C */ lw $v0, 0x7c($v0) -/* D8E84C 802415FC 04410004 */ bgez $v0, .L80241610 -/* D8E850 80241600 00000000 */ nop -/* D8E854 80241604 C6400000 */ lwc1 $f0, ($s2) -/* D8E858 80241608 0809058C */ j .L80241630 -/* D8E85C 8024160C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241610: -/* D8E860 80241610 3C018024 */ lui $at, %hi(D_80243FE8_D91238) -/* D8E864 80241614 D4223FE8 */ ldc1 $f2, %lo(D_80243FE8_D91238)($at) -/* D8E868 80241618 44820000 */ mtc1 $v0, $f0 -/* D8E86C 8024161C 00000000 */ nop -/* D8E870 80241620 46800021 */ cvt.d.w $f0, $f0 -/* D8E874 80241624 46220003 */ div.d $f0, $f0, $f2 -/* D8E878 80241628 46200020 */ cvt.s.d $f0, $f0 -/* D8E87C 8024162C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241630: -/* D8E880 80241630 24020001 */ addiu $v0, $zero, 1 -/* D8E884 80241634 AE220070 */ sw $v0, 0x70($s1) -/* D8E888 80241638 8FBF001C */ lw $ra, 0x1c($sp) -/* D8E88C 8024163C 8FB20018 */ lw $s2, 0x18($sp) -/* D8E890 80241640 8FB10014 */ lw $s1, 0x14($sp) -/* D8E894 80241644 8FB00010 */ lw $s0, 0x10($sp) -/* D8E898 80241648 03E00008 */ jr $ra -/* D8E89C 8024164C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index 2d6eb787a3..bf07cfeb5e 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -139,7 +139,7 @@ glabel func_80241AB4_D8ED04 glabel L80241C98_D8EEE8 /* D8EEE8 80241C98 0280202D */ daddu $a0, $s4, $zero /* D8EEEC 80241C9C 0260282D */ daddu $a1, $s3, $zero -/* D8EEF0 80241CA0 0C0903C8 */ jal func_80240F20_D8E170 +/* D8EEF0 80241CA0 0C0903C8 */ jal pra_35_UnkNpcAIFunc24 /* D8EEF4 80241CA4 02A0302D */ daddu $a2, $s5, $zero glabel L80241CA8_D8EEF8 /* D8EEF8 80241CA8 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241CD0_D8EF20 glabel L80241CE8_D8EF38 /* D8EF38 80241CE8 0280202D */ daddu $a0, $s4, $zero /* D8EF3C 80241CEC 0260282D */ daddu $a1, $s3, $zero -/* D8EF40 80241CF0 0C090567 */ jal func_8024159C_D8E7EC +/* D8EF40 80241CF0 0C090567 */ jal pra_35_UnkNpcAIFunc25 /* D8EF44 80241CF4 02A0302D */ daddu $a2, $s5, $zero /* D8EF48 80241CF8 08090762 */ j L80241D88_D8EFD8 /* D8EF4C 80241CFC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index 9c5290dd71..ab09bde53f 100644 --- a/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/ver/us/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -115,7 +115,7 @@ glabel func_802423CC_D8F61C glabel L80242550_D8F7A0 /* D8F7A0 80242550 0240202D */ daddu $a0, $s2, $zero /* D8F7A4 80242554 0260282D */ daddu $a1, $s3, $zero -/* D8F7A8 80242558 0C0903C8 */ jal func_80240F20_D8E170 +/* D8F7A8 80242558 0C0903C8 */ jal pra_35_UnkNpcAIFunc24 /* D8F7AC 8024255C 0280302D */ daddu $a2, $s4, $zero glabel L80242560_D8F7B0 /* D8F7B0 80242560 0240202D */ daddu $a0, $s2, $zero @@ -139,7 +139,7 @@ glabel L80242588_D8F7D8 glabel L802425A0_D8F7F0 /* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero /* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero -/* D8F7F8 802425A8 0C090567 */ jal func_8024159C_D8E7EC +/* D8F7F8 802425A8 0C090567 */ jal pra_35_UnkNpcAIFunc25 /* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero /* D8F800 802425B0 0809099C */ j L80242670_D8F8C0 /* D8F804 802425B4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s deleted file mode 100644 index 85b93802b1..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240550_D203E0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_8024BE40_D2BCD0 -.double 32767.0 - -.section .text - -glabel func_80240550_D203E0 -/* D203E0 80240550 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D203E4 80240554 AFB3002C */ sw $s3, 0x2c($sp) -/* D203E8 80240558 0080982D */ daddu $s3, $a0, $zero -/* D203EC 8024055C AFBF0030 */ sw $ra, 0x30($sp) -/* D203F0 80240560 AFB20028 */ sw $s2, 0x28($sp) -/* D203F4 80240564 AFB10024 */ sw $s1, 0x24($sp) -/* D203F8 80240568 AFB00020 */ sw $s0, 0x20($sp) -/* D203FC 8024056C 8E710148 */ lw $s1, 0x148($s3) -/* D20400 80240570 86240008 */ lh $a0, 8($s1) -/* D20404 80240574 0C00EABB */ jal get_npc_unsafe -/* D20408 80240578 00A0902D */ daddu $s2, $a1, $zero -/* D2040C 8024057C 8E440004 */ lw $a0, 4($s2) -/* D20410 80240580 0040802D */ daddu $s0, $v0, $zero -/* D20414 80240584 00041FC2 */ srl $v1, $a0, 0x1f -/* D20418 80240588 00832021 */ addu $a0, $a0, $v1 -/* D2041C 8024058C 00042043 */ sra $a0, $a0, 1 -/* D20420 80240590 0C00A67F */ jal rand_int -/* D20424 80240594 24840001 */ addiu $a0, $a0, 1 -/* D20428 80240598 8E430004 */ lw $v1, 4($s2) -/* D2042C 8024059C 000327C2 */ srl $a0, $v1, 0x1f -/* D20430 802405A0 00641821 */ addu $v1, $v1, $a0 -/* D20434 802405A4 00031843 */ sra $v1, $v1, 1 -/* D20438 802405A8 00621821 */ addu $v1, $v1, $v0 -/* D2043C 802405AC A603008E */ sh $v1, 0x8e($s0) -/* D20440 802405B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D20444 802405B4 C6000040 */ lwc1 $f0, 0x40($s0) -/* D20448 802405B8 C4640000 */ lwc1 $f4, ($v1) -/* D2044C 802405BC 46802120 */ cvt.s.w $f4, $f4 -/* D20450 802405C0 C4620008 */ lwc1 $f2, 8($v1) -/* D20454 802405C4 468010A0 */ cvt.s.w $f2, $f2 -/* D20458 802405C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* D2045C 802405CC 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20460 802405D0 44061000 */ mfc1 $a2, $f2 -/* D20464 802405D4 C440000C */ lwc1 $f0, 0xc($v0) -/* D20468 802405D8 46800020 */ cvt.s.w $f0, $f0 -/* D2046C 802405DC E7A00014 */ swc1 $f0, 0x14($sp) -/* D20470 802405E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20474 802405E4 44052000 */ mfc1 $a1, $f4 -/* D20478 802405E8 C4400010 */ lwc1 $f0, 0x10($v0) -/* D2047C 802405EC 46800020 */ cvt.s.w $f0, $f0 -/* D20480 802405F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D20484 802405F4 8C640018 */ lw $a0, 0x18($v1) -/* D20488 802405F8 0C0123F5 */ jal is_point_within_region -/* D2048C 802405FC 8E070038 */ lw $a3, 0x38($s0) -/* D20490 80240600 1040000E */ beqz $v0, .L8024063C -/* D20494 80240604 00000000 */ nop -/* D20498 80240608 8E2200D0 */ lw $v0, 0xd0($s1) -/* D2049C 8024060C C60C0038 */ lwc1 $f12, 0x38($s0) -/* D204A0 80240610 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D204A4 80240614 C4460000 */ lwc1 $f6, ($v0) -/* D204A8 80240618 468031A0 */ cvt.s.w $f6, $f6 -/* D204AC 8024061C 44063000 */ mfc1 $a2, $f6 -/* D204B0 80240620 C4460008 */ lwc1 $f6, 8($v0) -/* D204B4 80240624 468031A0 */ cvt.s.w $f6, $f6 -/* D204B8 80240628 44073000 */ mfc1 $a3, $f6 -/* D204BC 8024062C 0C00A720 */ jal atan2 -/* D204C0 80240630 00000000 */ nop -/* D204C4 80240634 0809019B */ j .L8024066C -/* D204C8 80240638 E600000C */ swc1 $f0, 0xc($s0) -.L8024063C: -/* D204CC 8024063C 0C00A67F */ jal rand_int -/* D204D0 80240640 2404003C */ addiu $a0, $zero, 0x3c -/* D204D4 80240644 C60C000C */ lwc1 $f12, 0xc($s0) -/* D204D8 80240648 44820000 */ mtc1 $v0, $f0 -/* D204DC 8024064C 00000000 */ nop -/* D204E0 80240650 46800020 */ cvt.s.w $f0, $f0 -/* D204E4 80240654 46006300 */ add.s $f12, $f12, $f0 -/* D204E8 80240658 3C0141F0 */ lui $at, 0x41f0 -/* D204EC 8024065C 44810000 */ mtc1 $at, $f0 -/* D204F0 80240660 0C00A6C9 */ jal clamp_angle -/* D204F4 80240664 46006301 */ sub.s $f12, $f12, $f0 -/* D204F8 80240668 E600000C */ swc1 $f0, 0xc($s0) -.L8024066C: -/* D204FC 8024066C 8E2200CC */ lw $v0, 0xcc($s1) -/* D20500 80240670 8C420004 */ lw $v0, 4($v0) -/* D20504 80240674 AE020028 */ sw $v0, 0x28($s0) -/* D20508 80240678 AE600074 */ sw $zero, 0x74($s3) -/* D2050C 8024067C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D20510 80240680 8C420014 */ lw $v0, 0x14($v0) -/* D20514 80240684 04410004 */ bgez $v0, .L80240698 -/* D20518 80240688 00000000 */ nop -/* D2051C 8024068C C6400000 */ lwc1 $f0, ($s2) -/* D20520 80240690 080901AE */ j .L802406B8 -/* D20524 80240694 E6000018 */ swc1 $f0, 0x18($s0) -.L80240698: -/* D20528 80240698 3C018025 */ lui $at, %hi(D_8024BE40_D2BCD0) -/* D2052C 8024069C D422BE40 */ ldc1 $f2, %lo(D_8024BE40_D2BCD0)($at) -/* D20530 802406A0 44820000 */ mtc1 $v0, $f0 -/* D20534 802406A4 00000000 */ nop -/* D20538 802406A8 46800021 */ cvt.d.w $f0, $f0 -/* D2053C 802406AC 46220003 */ div.d $f0, $f0, $f2 -/* D20540 802406B0 46200020 */ cvt.s.d $f0, $f0 -/* D20544 802406B4 E6000018 */ swc1 $f0, 0x18($s0) -.L802406B8: -/* D20548 802406B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* D2054C 802406BC 3C014059 */ lui $at, 0x4059 -/* D20550 802406C0 44811800 */ mtc1 $at, $f3 -/* D20554 802406C4 44801000 */ mtc1 $zero, $f2 -/* D20558 802406C8 46000021 */ cvt.d.s $f0, $f0 -/* D2055C 802406CC 46220002 */ mul.d $f0, $f0, $f2 -/* D20560 802406D0 00000000 */ nop -/* D20564 802406D4 24020001 */ addiu $v0, $zero, 1 -/* D20568 802406D8 4620018D */ trunc.w.d $f6, $f0 -/* D2056C 802406DC E626007C */ swc1 $f6, 0x7c($s1) -/* D20570 802406E0 AE620070 */ sw $v0, 0x70($s3) -/* D20574 802406E4 8FBF0030 */ lw $ra, 0x30($sp) -/* D20578 802406E8 8FB3002C */ lw $s3, 0x2c($sp) -/* D2057C 802406EC 8FB20028 */ lw $s2, 0x28($sp) -/* D20580 802406F0 8FB10024 */ lw $s1, 0x24($sp) -/* D20584 802406F4 8FB00020 */ lw $s0, 0x20($sp) -/* D20588 802406F8 03E00008 */ jr $ra -/* D2058C 802406FC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s index def380f45a..6494ea06e2 100644 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s +++ b/ver/us/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -81,7 +81,7 @@ glabel func_8024185C_D216EC glabel L80241968_D217F8 /* D217F8 80241968 0280202D */ daddu $a0, $s4, $zero /* D217FC 8024196C 0200282D */ daddu $a1, $s0, $zero -/* D21800 80241970 0C090154 */ jal func_80240550_D203E0 +/* D21800 80241970 0C090154 */ jal sam_06_UnkNpcAIFunc23 /* D21804 80241974 0260302D */ daddu $a2, $s3, $zero glabel L80241978_D21808 /* D21808 80241978 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024041C_D3009C.s b/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024041C_D3009C.s deleted file mode 100644 index f7aa2f6fb4..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_8024041C_D3009C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C_D3009C -/* D3009C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D300A0 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* D300A4 80240424 8C82000C */ lw $v0, 0xc($a0) -/* D300A8 80240428 0C0B1EAF */ jal get_variable -/* D300AC 8024042C 8C450000 */ lw $a1, ($v0) -/* D300B0 80240430 0C03AC5A */ jal switch_to_partner -/* D300B4 80240434 0040202D */ daddu $a0, $v0, $zero -/* D300B8 80240438 8FBF0010 */ lw $ra, 0x10($sp) -/* D300BC 8024043C 24020002 */ addiu $v0, $zero, 2 -/* D300C0 80240440 03E00008 */ jr $ra -/* D300C4 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C_95445C.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C_95445C.s deleted file mode 100644 index 54f6329b7d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C_95445C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C_95445C -/* 95445C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954460 802404A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 954464 802404A4 8C82000C */ lw $v0, 0xc($a0) -/* 954468 802404A8 0C0B1EAF */ jal get_variable -/* 95446C 802404AC 8C450000 */ lw $a1, ($v0) -/* 954470 802404B0 0C03AC5A */ jal switch_to_partner -/* 954474 802404B4 0040202D */ daddu $a0, $v0, $zero -/* 954478 802404B8 8FBF0010 */ lw $ra, 0x10($sp) -/* 95447C 802404BC 24020002 */ addiu $v0, $zero, 2 -/* 954480 802404C0 03E00008 */ jr $ra -/* 954484 802404C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC_87A2DC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC_87A2DC.s deleted file mode 100644 index 78c2812391..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC_87A2DC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406FC_87A2DC -/* 87A2DC 802406FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87A2E0 80240700 AFBF0010 */ sw $ra, 0x10($sp) -/* 87A2E4 80240704 8C82000C */ lw $v0, 0xc($a0) -/* 87A2E8 80240708 0C0B1EAF */ jal get_variable -/* 87A2EC 8024070C 8C450000 */ lw $a1, ($v0) -/* 87A2F0 80240710 0C03AC5A */ jal switch_to_partner -/* 87A2F4 80240714 0040202D */ daddu $a0, $v0, $zero -/* 87A2F8 80240718 8FBF0010 */ lw $ra, 0x10($sp) -/* 87A2FC 8024071C 24020002 */ addiu $v0, $zero, 2 -/* 87A300 80240720 03E00008 */ jr $ra -/* 87A304 80240724 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s deleted file mode 100644 index d4e3429d2f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802451B0_87ED90 -.double 32767.0 - -.section .text - -glabel func_802413F0_87AFD0 -/* 87AFD0 802413F0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 87AFD4 802413F4 AFB3002C */ sw $s3, 0x2c($sp) -/* 87AFD8 802413F8 0080982D */ daddu $s3, $a0, $zero -/* 87AFDC 802413FC AFBF0030 */ sw $ra, 0x30($sp) -/* 87AFE0 80241400 AFB20028 */ sw $s2, 0x28($sp) -/* 87AFE4 80241404 AFB10024 */ sw $s1, 0x24($sp) -/* 87AFE8 80241408 AFB00020 */ sw $s0, 0x20($sp) -/* 87AFEC 8024140C 8E710148 */ lw $s1, 0x148($s3) -/* 87AFF0 80241410 86240008 */ lh $a0, 8($s1) -/* 87AFF4 80241414 0C00EABB */ jal get_npc_unsafe -/* 87AFF8 80241418 00A0902D */ daddu $s2, $a1, $zero -/* 87AFFC 8024141C 8E440004 */ lw $a0, 4($s2) -/* 87B000 80241420 0040802D */ daddu $s0, $v0, $zero -/* 87B004 80241424 00041FC2 */ srl $v1, $a0, 0x1f -/* 87B008 80241428 00832021 */ addu $a0, $a0, $v1 -/* 87B00C 8024142C 00042043 */ sra $a0, $a0, 1 -/* 87B010 80241430 0C00A67F */ jal rand_int -/* 87B014 80241434 24840001 */ addiu $a0, $a0, 1 -/* 87B018 80241438 8E430004 */ lw $v1, 4($s2) -/* 87B01C 8024143C 000327C2 */ srl $a0, $v1, 0x1f -/* 87B020 80241440 00641821 */ addu $v1, $v1, $a0 -/* 87B024 80241444 00031843 */ sra $v1, $v1, 1 -/* 87B028 80241448 00621821 */ addu $v1, $v1, $v0 -/* 87B02C 8024144C A603008E */ sh $v1, 0x8e($s0) -/* 87B030 80241450 8E2300D0 */ lw $v1, 0xd0($s1) -/* 87B034 80241454 C6000040 */ lwc1 $f0, 0x40($s0) -/* 87B038 80241458 C4640000 */ lwc1 $f4, ($v1) -/* 87B03C 8024145C 46802120 */ cvt.s.w $f4, $f4 -/* 87B040 80241460 C4620008 */ lwc1 $f2, 8($v1) -/* 87B044 80241464 468010A0 */ cvt.s.w $f2, $f2 -/* 87B048 80241468 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87B04C 8024146C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B050 80241470 44061000 */ mfc1 $a2, $f2 -/* 87B054 80241474 C440000C */ lwc1 $f0, 0xc($v0) -/* 87B058 80241478 46800020 */ cvt.s.w $f0, $f0 -/* 87B05C 8024147C E7A00014 */ swc1 $f0, 0x14($sp) -/* 87B060 80241480 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B064 80241484 44052000 */ mfc1 $a1, $f4 -/* 87B068 80241488 C4400010 */ lwc1 $f0, 0x10($v0) -/* 87B06C 8024148C 46800020 */ cvt.s.w $f0, $f0 -/* 87B070 80241490 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87B074 80241494 8C640018 */ lw $a0, 0x18($v1) -/* 87B078 80241498 0C0123F5 */ jal is_point_within_region -/* 87B07C 8024149C 8E070038 */ lw $a3, 0x38($s0) -/* 87B080 802414A0 1040000E */ beqz $v0, .L802414DC -/* 87B084 802414A4 00000000 */ nop -/* 87B088 802414A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B08C 802414AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87B090 802414B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87B094 802414B4 C4460000 */ lwc1 $f6, ($v0) -/* 87B098 802414B8 468031A0 */ cvt.s.w $f6, $f6 -/* 87B09C 802414BC 44063000 */ mfc1 $a2, $f6 -/* 87B0A0 802414C0 C4460008 */ lwc1 $f6, 8($v0) -/* 87B0A4 802414C4 468031A0 */ cvt.s.w $f6, $f6 -/* 87B0A8 802414C8 44073000 */ mfc1 $a3, $f6 -/* 87B0AC 802414CC 0C00A720 */ jal atan2 -/* 87B0B0 802414D0 00000000 */ nop -/* 87B0B4 802414D4 08090543 */ j .L8024150C -/* 87B0B8 802414D8 E600000C */ swc1 $f0, 0xc($s0) -.L802414DC: -/* 87B0BC 802414DC 0C00A67F */ jal rand_int -/* 87B0C0 802414E0 2404003C */ addiu $a0, $zero, 0x3c -/* 87B0C4 802414E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 87B0C8 802414E8 44820000 */ mtc1 $v0, $f0 -/* 87B0CC 802414EC 00000000 */ nop -/* 87B0D0 802414F0 46800020 */ cvt.s.w $f0, $f0 -/* 87B0D4 802414F4 46006300 */ add.s $f12, $f12, $f0 -/* 87B0D8 802414F8 3C0141F0 */ lui $at, 0x41f0 -/* 87B0DC 802414FC 44810000 */ mtc1 $at, $f0 -/* 87B0E0 80241500 0C00A6C9 */ jal clamp_angle -/* 87B0E4 80241504 46006301 */ sub.s $f12, $f12, $f0 -/* 87B0E8 80241508 E600000C */ swc1 $f0, 0xc($s0) -.L8024150C: -/* 87B0EC 8024150C 8E2200CC */ lw $v0, 0xcc($s1) -/* 87B0F0 80241510 8C420004 */ lw $v0, 4($v0) -/* 87B0F4 80241514 AE020028 */ sw $v0, 0x28($s0) -/* 87B0F8 80241518 AE600074 */ sw $zero, 0x74($s3) -/* 87B0FC 8024151C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B100 80241520 8C420014 */ lw $v0, 0x14($v0) -/* 87B104 80241524 04410004 */ bgez $v0, .L80241538 -/* 87B108 80241528 00000000 */ nop -/* 87B10C 8024152C C6400000 */ lwc1 $f0, ($s2) -/* 87B110 80241530 08090556 */ j .L80241558 -/* 87B114 80241534 E6000018 */ swc1 $f0, 0x18($s0) -.L80241538: -/* 87B118 80241538 3C018024 */ lui $at, %hi(D_802451B0_87ED90) -/* 87B11C 8024153C D42251B0 */ ldc1 $f2, %lo(D_802451B0_87ED90)($at) -/* 87B120 80241540 44820000 */ mtc1 $v0, $f0 -/* 87B124 80241544 00000000 */ nop -/* 87B128 80241548 46800021 */ cvt.d.w $f0, $f0 -/* 87B12C 8024154C 46220003 */ div.d $f0, $f0, $f2 -/* 87B130 80241550 46200020 */ cvt.s.d $f0, $f0 -/* 87B134 80241554 E6000018 */ swc1 $f0, 0x18($s0) -.L80241558: -/* 87B138 80241558 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B13C 8024155C 3C014059 */ lui $at, 0x4059 -/* 87B140 80241560 44811800 */ mtc1 $at, $f3 -/* 87B144 80241564 44801000 */ mtc1 $zero, $f2 -/* 87B148 80241568 46000021 */ cvt.d.s $f0, $f0 -/* 87B14C 8024156C 46220002 */ mul.d $f0, $f0, $f2 -/* 87B150 80241570 00000000 */ nop -/* 87B154 80241574 24020001 */ addiu $v0, $zero, 1 -/* 87B158 80241578 4620018D */ trunc.w.d $f6, $f0 -/* 87B15C 8024157C E626007C */ swc1 $f6, 0x7c($s1) -/* 87B160 80241580 AE620070 */ sw $v0, 0x70($s3) -/* 87B164 80241584 8FBF0030 */ lw $ra, 0x30($sp) -/* 87B168 80241588 8FB3002C */ lw $s3, 0x2c($sp) -/* 87B16C 8024158C 8FB20028 */ lw $s2, 0x28($sp) -/* 87B170 80241590 8FB10024 */ lw $s1, 0x24($sp) -/* 87B174 80241594 8FB00020 */ lw $s0, 0x20($sp) -/* 87B178 80241598 03E00008 */ jr $ra -/* 87B17C 8024159C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s index 941fec0bf7..d6aadd3b9d 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -81,7 +81,7 @@ glabel func_802426FC_87C2DC glabel L80242808_87C3E8 /* 87C3E8 80242808 0280202D */ daddu $a0, $s4, $zero /* 87C3EC 8024280C 0200282D */ daddu $a1, $s0, $zero -/* 87C3F0 80242810 0C0904FC */ jal func_802413F0_87AFD0 +/* 87C3F0 80242810 0C0904FC */ jal tik_07_UnkNpcAIFunc23 /* 87C3F4 80242814 0260302D */ daddu $a2, $s3, $zero glabel L80242818_87C3F8 /* 87C3F8 80242818 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s deleted file mode 100644 index d4a10a6077..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802441A0_886360 -.double 0.8 - -.section .text - -glabel func_80240AAC_882C6C -/* 882C6C 80240AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 882C70 80240AB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 882C74 80240AB4 0080982D */ daddu $s3, $a0, $zero -/* 882C78 80240AB8 AFBF0020 */ sw $ra, 0x20($sp) -/* 882C7C 80240ABC AFB20018 */ sw $s2, 0x18($sp) -/* 882C80 80240AC0 AFB10014 */ sw $s1, 0x14($sp) -/* 882C84 80240AC4 AFB00010 */ sw $s0, 0x10($sp) -/* 882C88 80240AC8 8E710148 */ lw $s1, 0x148($s3) -/* 882C8C 80240ACC 86240008 */ lh $a0, 8($s1) -/* 882C90 80240AD0 0C00EABB */ jal get_npc_unsafe -/* 882C94 80240AD4 00A0902D */ daddu $s2, $a1, $zero -/* 882C98 80240AD8 0040802D */ daddu $s0, $v0, $zero -/* 882C9C 80240ADC 8602008E */ lh $v0, 0x8e($s0) -/* 882CA0 80240AE0 9603008E */ lhu $v1, 0x8e($s0) -/* 882CA4 80240AE4 18400005 */ blez $v0, .L80240AFC -/* 882CA8 80240AE8 2462FFFF */ addiu $v0, $v1, -1 -/* 882CAC 80240AEC A602008E */ sh $v0, 0x8e($s0) -/* 882CB0 80240AF0 00021400 */ sll $v0, $v0, 0x10 -/* 882CB4 80240AF4 1C400033 */ bgtz $v0, .L80240BC4 -/* 882CB8 80240AF8 00000000 */ nop -.L80240AFC: -/* 882CBC 80240AFC 8602008C */ lh $v0, 0x8c($s0) -/* 882CC0 80240B00 14400030 */ bnez $v0, .L80240BC4 -/* 882CC4 80240B04 00000000 */ nop -/* 882CC8 80240B08 8E2200CC */ lw $v0, 0xcc($s1) -/* 882CCC 80240B0C 8C420024 */ lw $v0, 0x24($v0) -/* 882CD0 80240B10 AE020028 */ sw $v0, 0x28($s0) -/* 882CD4 80240B14 C6400018 */ lwc1 $f0, 0x18($s2) -/* 882CD8 80240B18 E6000018 */ swc1 $f0, 0x18($s0) -/* 882CDC 80240B1C 8E230088 */ lw $v1, 0x88($s1) -/* 882CE0 80240B20 24020005 */ addiu $v0, $zero, 5 -/* 882CE4 80240B24 10620005 */ beq $v1, $v0, .L80240B3C -/* 882CE8 80240B28 00000000 */ nop -/* 882CEC 80240B2C 10600003 */ beqz $v1, .L80240B3C -/* 882CF0 80240B30 24020001 */ addiu $v0, $zero, 1 -/* 882CF4 80240B34 14620006 */ bne $v1, $v0, .L80240B50 -/* 882CF8 80240B38 00000000 */ nop -.L80240B3C: -/* 882CFC 80240B3C 8E220084 */ lw $v0, 0x84($s1) -/* 882D00 80240B40 00021FC2 */ srl $v1, $v0, 0x1f -/* 882D04 80240B44 00431021 */ addu $v0, $v0, $v1 -/* 882D08 80240B48 00021043 */ sra $v0, $v0, 1 -/* 882D0C 80240B4C A60200A8 */ sh $v0, 0xa8($s0) -.L80240B50: -/* 882D10 80240B50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 882D14 80240B54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 882D18 80240B58 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 882D1C 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 882D20 80240B60 8C460028 */ lw $a2, 0x28($v0) -/* 882D24 80240B64 0C00A7B5 */ jal dist2D -/* 882D28 80240B68 8C470030 */ lw $a3, 0x30($v0) -/* 882D2C 80240B6C C6020018 */ lwc1 $f2, 0x18($s0) -/* 882D30 80240B70 46020003 */ div.s $f0, $f0, $f2 -/* 882D34 80240B74 3C018024 */ lui $at, %hi(D_802441A0_886360) -/* 882D38 80240B78 D42241A0 */ ldc1 $f2, %lo(D_802441A0_886360)($at) -/* 882D3C 80240B7C 46000021 */ cvt.d.s $f0, $f0 -/* 882D40 80240B80 46220000 */ add.d $f0, $f0, $f2 -/* 882D44 80240B84 4620010D */ trunc.w.d $f4, $f0 -/* 882D48 80240B88 44022000 */ mfc1 $v0, $f4 -/* 882D4C 80240B8C 00000000 */ nop -/* 882D50 80240B90 A602008E */ sh $v0, 0x8e($s0) -/* 882D54 80240B94 00021400 */ sll $v0, $v0, 0x10 -/* 882D58 80240B98 8E230078 */ lw $v1, 0x78($s1) -/* 882D5C 80240B9C 00021403 */ sra $v0, $v0, 0x10 -/* 882D60 80240BA0 0043102A */ slt $v0, $v0, $v1 -/* 882D64 80240BA4 10400003 */ beqz $v0, .L80240BB4 -/* 882D68 80240BA8 00000000 */ nop -/* 882D6C 80240BAC 9622007A */ lhu $v0, 0x7a($s1) -/* 882D70 80240BB0 A602008E */ sh $v0, 0x8e($s0) -.L80240BB4: -/* 882D74 80240BB4 8602008E */ lh $v0, 0x8e($s0) -/* 882D78 80240BB8 AE22007C */ sw $v0, 0x7c($s1) -/* 882D7C 80240BBC 2402000E */ addiu $v0, $zero, 0xe -/* 882D80 80240BC0 AE620070 */ sw $v0, 0x70($s3) -.L80240BC4: -/* 882D84 80240BC4 8FBF0020 */ lw $ra, 0x20($sp) -/* 882D88 80240BC8 8FB3001C */ lw $s3, 0x1c($sp) -/* 882D8C 80240BCC 8FB20018 */ lw $s2, 0x18($sp) -/* 882D90 80240BD0 8FB10014 */ lw $s1, 0x14($sp) -/* 882D94 80240BD4 8FB00010 */ lw $s0, 0x10($sp) -/* 882D98 80240BD8 03E00008 */ jr $ra -/* 882D9C 80240BDC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s index a8b94f7209..51ce74c1b2 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -244,7 +244,7 @@ glabel func_80240DC4_882F84 /* 8832E4 80241124 0260202D */ daddu $a0, $s3, $zero .L80241128: /* 8832E8 80241128 0280282D */ daddu $a1, $s4, $zero -/* 8832EC 8024112C 0C0902AB */ jal func_80240AAC_882C6C +/* 8832EC 8024112C 0C0902AB */ jal tik_09_UnkDistFunc /* 8832F0 80241130 02A0302D */ daddu $a2, $s5, $zero /* 8832F4 80241134 0809045C */ j .L80241170 /* 8832F8 80241138 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C_886E5C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C_886E5C.s deleted file mode 100644 index 73117fbd88..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C_886E5C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A9C_886E5C -/* 886E5C 80240A9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 886E60 80240AA0 AFBF0010 */ sw $ra, 0x10($sp) -/* 886E64 80240AA4 8C82000C */ lw $v0, 0xc($a0) -/* 886E68 80240AA8 0C0B1EAF */ jal get_variable -/* 886E6C 80240AAC 8C450000 */ lw $a1, ($v0) -/* 886E70 80240AB0 0C03AC5A */ jal switch_to_partner -/* 886E74 80240AB4 0040202D */ daddu $a0, $v0, $zero -/* 886E78 80240AB8 8FBF0010 */ lw $ra, 0x10($sp) -/* 886E7C 80240ABC 24020002 */ addiu $v0, $zero, 2 -/* 886E80 80240AC0 03E00008 */ jr $ra -/* 886E84 80240AC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038_889C08.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038_889C08.s deleted file mode 100644 index 53611e008e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038_889C08.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038_889C08 -/* 889C08 80241038 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 889C0C 8024103C AFBF0010 */ sw $ra, 0x10($sp) -/* 889C10 80241040 8C82000C */ lw $v0, 0xc($a0) -/* 889C14 80241044 0C0B1EAF */ jal get_variable -/* 889C18 80241048 8C450000 */ lw $a1, ($v0) -/* 889C1C 8024104C 0C03AC5A */ jal switch_to_partner -/* 889C20 80241050 0040202D */ daddu $a0, $v0, $zero -/* 889C24 80241054 8FBF0010 */ lw $ra, 0x10($sp) -/* 889C28 80241058 24020002 */ addiu $v0, $zero, 2 -/* 889C2C 8024105C 03E00008 */ jr $ra -/* 889C30 80241060 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s deleted file mode 100644 index f67f556a19..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802449D0_88D5A0 -.double 0.8 - -.section .text - -glabel func_802419DC_88A5AC -/* 88A5AC 802419DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 88A5B0 802419E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 88A5B4 802419E4 0080982D */ daddu $s3, $a0, $zero -/* 88A5B8 802419E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 88A5BC 802419EC AFB20018 */ sw $s2, 0x18($sp) -/* 88A5C0 802419F0 AFB10014 */ sw $s1, 0x14($sp) -/* 88A5C4 802419F4 AFB00010 */ sw $s0, 0x10($sp) -/* 88A5C8 802419F8 8E710148 */ lw $s1, 0x148($s3) -/* 88A5CC 802419FC 86240008 */ lh $a0, 8($s1) -/* 88A5D0 80241A00 0C00EABB */ jal get_npc_unsafe -/* 88A5D4 80241A04 00A0902D */ daddu $s2, $a1, $zero -/* 88A5D8 80241A08 0040802D */ daddu $s0, $v0, $zero -/* 88A5DC 80241A0C 8602008E */ lh $v0, 0x8e($s0) -/* 88A5E0 80241A10 9603008E */ lhu $v1, 0x8e($s0) -/* 88A5E4 80241A14 18400005 */ blez $v0, .L80241A2C -/* 88A5E8 80241A18 2462FFFF */ addiu $v0, $v1, -1 -/* 88A5EC 80241A1C A602008E */ sh $v0, 0x8e($s0) -/* 88A5F0 80241A20 00021400 */ sll $v0, $v0, 0x10 -/* 88A5F4 80241A24 1C400033 */ bgtz $v0, .L80241AF4 -/* 88A5F8 80241A28 00000000 */ nop -.L80241A2C: -/* 88A5FC 80241A2C 8602008C */ lh $v0, 0x8c($s0) -/* 88A600 80241A30 14400030 */ bnez $v0, .L80241AF4 -/* 88A604 80241A34 00000000 */ nop -/* 88A608 80241A38 8E2200CC */ lw $v0, 0xcc($s1) -/* 88A60C 80241A3C 8C420024 */ lw $v0, 0x24($v0) -/* 88A610 80241A40 AE020028 */ sw $v0, 0x28($s0) -/* 88A614 80241A44 C6400018 */ lwc1 $f0, 0x18($s2) -/* 88A618 80241A48 E6000018 */ swc1 $f0, 0x18($s0) -/* 88A61C 80241A4C 8E230088 */ lw $v1, 0x88($s1) -/* 88A620 80241A50 24020005 */ addiu $v0, $zero, 5 -/* 88A624 80241A54 10620005 */ beq $v1, $v0, .L80241A6C -/* 88A628 80241A58 00000000 */ nop -/* 88A62C 80241A5C 10600003 */ beqz $v1, .L80241A6C -/* 88A630 80241A60 24020001 */ addiu $v0, $zero, 1 -/* 88A634 80241A64 14620006 */ bne $v1, $v0, .L80241A80 -/* 88A638 80241A68 00000000 */ nop -.L80241A6C: -/* 88A63C 80241A6C 8E220084 */ lw $v0, 0x84($s1) -/* 88A640 80241A70 00021FC2 */ srl $v1, $v0, 0x1f -/* 88A644 80241A74 00431021 */ addu $v0, $v0, $v1 -/* 88A648 80241A78 00021043 */ sra $v0, $v0, 1 -/* 88A64C 80241A7C A60200A8 */ sh $v0, 0xa8($s0) -.L80241A80: -/* 88A650 80241A80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 88A654 80241A84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 88A658 80241A88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 88A65C 80241A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 88A660 80241A90 8C460028 */ lw $a2, 0x28($v0) -/* 88A664 80241A94 0C00A7B5 */ jal dist2D -/* 88A668 80241A98 8C470030 */ lw $a3, 0x30($v0) -/* 88A66C 80241A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* 88A670 80241AA0 46020003 */ div.s $f0, $f0, $f2 -/* 88A674 80241AA4 3C018024 */ lui $at, %hi(D_802449D0_88D5A0) -/* 88A678 80241AA8 D42249D0 */ ldc1 $f2, %lo(D_802449D0_88D5A0)($at) -/* 88A67C 80241AAC 46000021 */ cvt.d.s $f0, $f0 -/* 88A680 80241AB0 46220000 */ add.d $f0, $f0, $f2 -/* 88A684 80241AB4 4620010D */ trunc.w.d $f4, $f0 -/* 88A688 80241AB8 44022000 */ mfc1 $v0, $f4 -/* 88A68C 80241ABC 00000000 */ nop -/* 88A690 80241AC0 A602008E */ sh $v0, 0x8e($s0) -/* 88A694 80241AC4 00021400 */ sll $v0, $v0, 0x10 -/* 88A698 80241AC8 8E230078 */ lw $v1, 0x78($s1) -/* 88A69C 80241ACC 00021403 */ sra $v0, $v0, 0x10 -/* 88A6A0 80241AD0 0043102A */ slt $v0, $v0, $v1 -/* 88A6A4 80241AD4 10400003 */ beqz $v0, .L80241AE4 -/* 88A6A8 80241AD8 00000000 */ nop -/* 88A6AC 80241ADC 9622007A */ lhu $v0, 0x7a($s1) -/* 88A6B0 80241AE0 A602008E */ sh $v0, 0x8e($s0) -.L80241AE4: -/* 88A6B4 80241AE4 8602008E */ lh $v0, 0x8e($s0) -/* 88A6B8 80241AE8 AE22007C */ sw $v0, 0x7c($s1) -/* 88A6BC 80241AEC 2402000E */ addiu $v0, $zero, 0xe -/* 88A6C0 80241AF0 AE620070 */ sw $v0, 0x70($s3) -.L80241AF4: -/* 88A6C4 80241AF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 88A6C8 80241AF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 88A6CC 80241AFC 8FB20018 */ lw $s2, 0x18($sp) -/* 88A6D0 80241B00 8FB10014 */ lw $s1, 0x14($sp) -/* 88A6D4 80241B04 8FB00010 */ lw $s0, 0x10($sp) -/* 88A6D8 80241B08 03E00008 */ jr $ra -/* 88A6DC 80241B0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s index bf0e2dcc25..9fabbd1d3c 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -244,7 +244,7 @@ glabel func_80241CF4_88A8C4 /* 88AC24 80242054 0260202D */ daddu $a0, $s3, $zero .L80242058: /* 88AC28 80242058 0280282D */ daddu $a1, $s4, $zero -/* 88AC2C 8024205C 0C090677 */ jal func_802419DC_88A5AC +/* 88AC2C 8024205C 0C090677 */ jal tik_12_UnkDistFunc /* 88AC30 80242060 02A0302D */ daddu $a2, $s5, $zero /* 88AC34 80242064 08090828 */ j .L802420A0 /* 88AC38 80242068 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C_892E6C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C_892E6C.s deleted file mode 100644 index 5bb5e13686..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C_892E6C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024044C_892E6C -/* 892E6C 8024044C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 892E70 80240450 AFBF0010 */ sw $ra, 0x10($sp) -/* 892E74 80240454 8C82000C */ lw $v0, 0xc($a0) -/* 892E78 80240458 0C0B1EAF */ jal get_variable -/* 892E7C 8024045C 8C450000 */ lw $a1, ($v0) -/* 892E80 80240460 0C03AC5A */ jal switch_to_partner -/* 892E84 80240464 0040202D */ daddu $a0, $v0, $zero -/* 892E88 80240468 8FBF0010 */ lw $ra, 0x10($sp) -/* 892E8C 8024046C 24020002 */ addiu $v0, $zero, 2 -/* 892E90 80240470 03E00008 */ jr $ra -/* 892E94 80240474 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C_897FEC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C_897FEC.s deleted file mode 100644 index 64bcfeca01..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C_897FEC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A0C_897FEC -/* 897FEC 80240A0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 897FF0 80240A10 AFBF0010 */ sw $ra, 0x10($sp) -/* 897FF4 80240A14 8C82000C */ lw $v0, 0xc($a0) -/* 897FF8 80240A18 0C0B1EAF */ jal get_variable -/* 897FFC 80240A1C 8C450000 */ lw $a1, ($v0) -/* 898000 80240A20 0C03AC5A */ jal switch_to_partner -/* 898004 80240A24 0040202D */ daddu $a0, $v0, $zero -/* 898008 80240A28 8FBF0010 */ lw $ra, 0x10($sp) -/* 89800C 80240A2C 24020002 */ addiu $v0, $zero, 2 -/* 898010 80240A30 03E00008 */ jr $ra -/* 898014 80240A34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s deleted file mode 100644 index d2cf2b8e54..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_802409DC_89AD2C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802433F0_89D740 -.double 0.8 - -.section .text - -glabel func_802409DC_89AD2C -/* 89AD2C 802409DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 89AD30 802409E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 89AD34 802409E4 0080982D */ daddu $s3, $a0, $zero -/* 89AD38 802409E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 89AD3C 802409EC AFB20018 */ sw $s2, 0x18($sp) -/* 89AD40 802409F0 AFB10014 */ sw $s1, 0x14($sp) -/* 89AD44 802409F4 AFB00010 */ sw $s0, 0x10($sp) -/* 89AD48 802409F8 8E710148 */ lw $s1, 0x148($s3) -/* 89AD4C 802409FC 86240008 */ lh $a0, 8($s1) -/* 89AD50 80240A00 0C00EABB */ jal get_npc_unsafe -/* 89AD54 80240A04 00A0902D */ daddu $s2, $a1, $zero -/* 89AD58 80240A08 0040802D */ daddu $s0, $v0, $zero -/* 89AD5C 80240A0C 8602008E */ lh $v0, 0x8e($s0) -/* 89AD60 80240A10 9603008E */ lhu $v1, 0x8e($s0) -/* 89AD64 80240A14 18400005 */ blez $v0, .L80240A2C -/* 89AD68 80240A18 2462FFFF */ addiu $v0, $v1, -1 -/* 89AD6C 80240A1C A602008E */ sh $v0, 0x8e($s0) -/* 89AD70 80240A20 00021400 */ sll $v0, $v0, 0x10 -/* 89AD74 80240A24 1C400033 */ bgtz $v0, .L80240AF4 -/* 89AD78 80240A28 00000000 */ nop -.L80240A2C: -/* 89AD7C 80240A2C 8602008C */ lh $v0, 0x8c($s0) -/* 89AD80 80240A30 14400030 */ bnez $v0, .L80240AF4 -/* 89AD84 80240A34 00000000 */ nop -/* 89AD88 80240A38 8E2200CC */ lw $v0, 0xcc($s1) -/* 89AD8C 80240A3C 8C420024 */ lw $v0, 0x24($v0) -/* 89AD90 80240A40 AE020028 */ sw $v0, 0x28($s0) -/* 89AD94 80240A44 C6400018 */ lwc1 $f0, 0x18($s2) -/* 89AD98 80240A48 E6000018 */ swc1 $f0, 0x18($s0) -/* 89AD9C 80240A4C 8E230088 */ lw $v1, 0x88($s1) -/* 89ADA0 80240A50 24020005 */ addiu $v0, $zero, 5 -/* 89ADA4 80240A54 10620005 */ beq $v1, $v0, .L80240A6C -/* 89ADA8 80240A58 00000000 */ nop -/* 89ADAC 80240A5C 10600003 */ beqz $v1, .L80240A6C -/* 89ADB0 80240A60 24020001 */ addiu $v0, $zero, 1 -/* 89ADB4 80240A64 14620006 */ bne $v1, $v0, .L80240A80 -/* 89ADB8 80240A68 00000000 */ nop -.L80240A6C: -/* 89ADBC 80240A6C 8E220084 */ lw $v0, 0x84($s1) -/* 89ADC0 80240A70 00021FC2 */ srl $v1, $v0, 0x1f -/* 89ADC4 80240A74 00431021 */ addu $v0, $v0, $v1 -/* 89ADC8 80240A78 00021043 */ sra $v0, $v0, 1 -/* 89ADCC 80240A7C A60200A8 */ sh $v0, 0xa8($s0) -.L80240A80: -/* 89ADD0 80240A80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 89ADD4 80240A84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 89ADD8 80240A88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 89ADDC 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 89ADE0 80240A90 8C460028 */ lw $a2, 0x28($v0) -/* 89ADE4 80240A94 0C00A7B5 */ jal dist2D -/* 89ADE8 80240A98 8C470030 */ lw $a3, 0x30($v0) -/* 89ADEC 80240A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* 89ADF0 80240AA0 46020003 */ div.s $f0, $f0, $f2 -/* 89ADF4 80240AA4 3C018024 */ lui $at, %hi(D_802433F0_89D740) -/* 89ADF8 80240AA8 D42233F0 */ ldc1 $f2, %lo(D_802433F0_89D740)($at) -/* 89ADFC 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* 89AE00 80240AB0 46220000 */ add.d $f0, $f0, $f2 -/* 89AE04 80240AB4 4620010D */ trunc.w.d $f4, $f0 -/* 89AE08 80240AB8 44022000 */ mfc1 $v0, $f4 -/* 89AE0C 80240ABC 00000000 */ nop -/* 89AE10 80240AC0 A602008E */ sh $v0, 0x8e($s0) -/* 89AE14 80240AC4 00021400 */ sll $v0, $v0, 0x10 -/* 89AE18 80240AC8 8E230078 */ lw $v1, 0x78($s1) -/* 89AE1C 80240ACC 00021403 */ sra $v0, $v0, 0x10 -/* 89AE20 80240AD0 0043102A */ slt $v0, $v0, $v1 -/* 89AE24 80240AD4 10400003 */ beqz $v0, .L80240AE4 -/* 89AE28 80240AD8 00000000 */ nop -/* 89AE2C 80240ADC 9622007A */ lhu $v0, 0x7a($s1) -/* 89AE30 80240AE0 A602008E */ sh $v0, 0x8e($s0) -.L80240AE4: -/* 89AE34 80240AE4 8602008E */ lh $v0, 0x8e($s0) -/* 89AE38 80240AE8 AE22007C */ sw $v0, 0x7c($s1) -/* 89AE3C 80240AEC 2402000E */ addiu $v0, $zero, 0xe -/* 89AE40 80240AF0 AE620070 */ sw $v0, 0x70($s3) -.L80240AF4: -/* 89AE44 80240AF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 89AE48 80240AF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 89AE4C 80240AFC 8FB20018 */ lw $s2, 0x18($sp) -/* 89AE50 80240B00 8FB10014 */ lw $s1, 0x14($sp) -/* 89AE54 80240B04 8FB00010 */ lw $s0, 0x10($sp) -/* 89AE58 80240B08 03E00008 */ jr $ra -/* 89AE5C 80240B0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s index 9f1499f78e..39c8f6c0b5 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -244,7 +244,7 @@ glabel func_80240CF4_89B044 /* 89B3A4 80241054 0260202D */ daddu $a0, $s3, $zero .L80241058: /* 89B3A8 80241058 0280282D */ daddu $a1, $s4, $zero -/* 89B3AC 8024105C 0C090277 */ jal func_802409DC_89AD2C +/* 89B3AC 8024105C 0C090277 */ jal tik_20_UnkDistFunc /* 89B3B0 80241060 02A0302D */ daddu $a2, $s5, $zero /* 89B3B4 80241064 08090428 */ j .L802410A0 /* 89B3B8 80241068 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s deleted file mode 100644 index da8afa9178..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_802409DC_8A2DAC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243650_8A5A20 -.double 0.8 - -.section .text - -glabel func_802409DC_8A2DAC -/* 8A2DAC 802409DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A2DB0 802409E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A2DB4 802409E4 0080982D */ daddu $s3, $a0, $zero -/* 8A2DB8 802409E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A2DBC 802409EC AFB20018 */ sw $s2, 0x18($sp) -/* 8A2DC0 802409F0 AFB10014 */ sw $s1, 0x14($sp) -/* 8A2DC4 802409F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A2DC8 802409F8 8E710148 */ lw $s1, 0x148($s3) -/* 8A2DCC 802409FC 86240008 */ lh $a0, 8($s1) -/* 8A2DD0 80240A00 0C00EABB */ jal get_npc_unsafe -/* 8A2DD4 80240A04 00A0902D */ daddu $s2, $a1, $zero -/* 8A2DD8 80240A08 0040802D */ daddu $s0, $v0, $zero -/* 8A2DDC 80240A0C 8602008E */ lh $v0, 0x8e($s0) -/* 8A2DE0 80240A10 9603008E */ lhu $v1, 0x8e($s0) -/* 8A2DE4 80240A14 18400005 */ blez $v0, .L80240A2C -/* 8A2DE8 80240A18 2462FFFF */ addiu $v0, $v1, -1 -/* 8A2DEC 80240A1C A602008E */ sh $v0, 0x8e($s0) -/* 8A2DF0 80240A20 00021400 */ sll $v0, $v0, 0x10 -/* 8A2DF4 80240A24 1C400033 */ bgtz $v0, .L80240AF4 -/* 8A2DF8 80240A28 00000000 */ nop -.L80240A2C: -/* 8A2DFC 80240A2C 8602008C */ lh $v0, 0x8c($s0) -/* 8A2E00 80240A30 14400030 */ bnez $v0, .L80240AF4 -/* 8A2E04 80240A34 00000000 */ nop -/* 8A2E08 80240A38 8E2200CC */ lw $v0, 0xcc($s1) -/* 8A2E0C 80240A3C 8C420024 */ lw $v0, 0x24($v0) -/* 8A2E10 80240A40 AE020028 */ sw $v0, 0x28($s0) -/* 8A2E14 80240A44 C6400018 */ lwc1 $f0, 0x18($s2) -/* 8A2E18 80240A48 E6000018 */ swc1 $f0, 0x18($s0) -/* 8A2E1C 80240A4C 8E230088 */ lw $v1, 0x88($s1) -/* 8A2E20 80240A50 24020005 */ addiu $v0, $zero, 5 -/* 8A2E24 80240A54 10620005 */ beq $v1, $v0, .L80240A6C -/* 8A2E28 80240A58 00000000 */ nop -/* 8A2E2C 80240A5C 10600003 */ beqz $v1, .L80240A6C -/* 8A2E30 80240A60 24020001 */ addiu $v0, $zero, 1 -/* 8A2E34 80240A64 14620006 */ bne $v1, $v0, .L80240A80 -/* 8A2E38 80240A68 00000000 */ nop -.L80240A6C: -/* 8A2E3C 80240A6C 8E220084 */ lw $v0, 0x84($s1) -/* 8A2E40 80240A70 00021FC2 */ srl $v1, $v0, 0x1f -/* 8A2E44 80240A74 00431021 */ addu $v0, $v0, $v1 -/* 8A2E48 80240A78 00021043 */ sra $v0, $v0, 1 -/* 8A2E4C 80240A7C A60200A8 */ sh $v0, 0xa8($s0) -.L80240A80: -/* 8A2E50 80240A80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A2E54 80240A84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A2E58 80240A88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8A2E5C 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8A2E60 80240A90 8C460028 */ lw $a2, 0x28($v0) -/* 8A2E64 80240A94 0C00A7B5 */ jal dist2D -/* 8A2E68 80240A98 8C470030 */ lw $a3, 0x30($v0) -/* 8A2E6C 80240A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* 8A2E70 80240AA0 46020003 */ div.s $f0, $f0, $f2 -/* 8A2E74 80240AA4 3C018024 */ lui $at, %hi(D_80243650_8A5A20) -/* 8A2E78 80240AA8 D4223650 */ ldc1 $f2, %lo(D_80243650_8A5A20)($at) -/* 8A2E7C 80240AAC 46000021 */ cvt.d.s $f0, $f0 -/* 8A2E80 80240AB0 46220000 */ add.d $f0, $f0, $f2 -/* 8A2E84 80240AB4 4620010D */ trunc.w.d $f4, $f0 -/* 8A2E88 80240AB8 44022000 */ mfc1 $v0, $f4 -/* 8A2E8C 80240ABC 00000000 */ nop -/* 8A2E90 80240AC0 A602008E */ sh $v0, 0x8e($s0) -/* 8A2E94 80240AC4 00021400 */ sll $v0, $v0, 0x10 -/* 8A2E98 80240AC8 8E230078 */ lw $v1, 0x78($s1) -/* 8A2E9C 80240ACC 00021403 */ sra $v0, $v0, 0x10 -/* 8A2EA0 80240AD0 0043102A */ slt $v0, $v0, $v1 -/* 8A2EA4 80240AD4 10400003 */ beqz $v0, .L80240AE4 -/* 8A2EA8 80240AD8 00000000 */ nop -/* 8A2EAC 80240ADC 9622007A */ lhu $v0, 0x7a($s1) -/* 8A2EB0 80240AE0 A602008E */ sh $v0, 0x8e($s0) -.L80240AE4: -/* 8A2EB4 80240AE4 8602008E */ lh $v0, 0x8e($s0) -/* 8A2EB8 80240AE8 AE22007C */ sw $v0, 0x7c($s1) -/* 8A2EBC 80240AEC 2402000E */ addiu $v0, $zero, 0xe -/* 8A2EC0 80240AF0 AE620070 */ sw $v0, 0x70($s3) -.L80240AF4: -/* 8A2EC4 80240AF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A2EC8 80240AF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A2ECC 80240AFC 8FB20018 */ lw $s2, 0x18($sp) -/* 8A2ED0 80240B00 8FB10014 */ lw $s1, 0x14($sp) -/* 8A2ED4 80240B04 8FB00010 */ lw $s0, 0x10($sp) -/* 8A2ED8 80240B08 03E00008 */ jr $ra -/* 8A2EDC 80240B0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index 24c0255359..4141f921dc 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -244,7 +244,7 @@ glabel func_80240CF4_8A30C4 /* 8A3424 80241054 0260202D */ daddu $a0, $s3, $zero .L80241058: /* 8A3428 80241058 0280282D */ daddu $a1, $s4, $zero -/* 8A342C 8024105C 0C090277 */ jal func_802409DC_8A2DAC +/* 8A342C 8024105C 0C090277 */ jal tik_23_UnkDistFunc /* 8A3430 80241060 02A0302D */ daddu $a2, $s5, $zero /* 8A3434 80241064 08090428 */ j .L802410A0 /* 8A3438 80241068 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s deleted file mode 100644 index 1706201236..0000000000 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802424A0_8A7F20 -.double 0.8 - -.section .text - -glabel func_8024074C_8A61CC -/* 8A61CC 8024074C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A61D0 80240750 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A61D4 80240754 0080982D */ daddu $s3, $a0, $zero -/* 8A61D8 80240758 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A61DC 8024075C AFB20018 */ sw $s2, 0x18($sp) -/* 8A61E0 80240760 AFB10014 */ sw $s1, 0x14($sp) -/* 8A61E4 80240764 AFB00010 */ sw $s0, 0x10($sp) -/* 8A61E8 80240768 8E710148 */ lw $s1, 0x148($s3) -/* 8A61EC 8024076C 86240008 */ lh $a0, 8($s1) -/* 8A61F0 80240770 0C00EABB */ jal get_npc_unsafe -/* 8A61F4 80240774 00A0902D */ daddu $s2, $a1, $zero -/* 8A61F8 80240778 0040802D */ daddu $s0, $v0, $zero -/* 8A61FC 8024077C 8602008E */ lh $v0, 0x8e($s0) -/* 8A6200 80240780 9603008E */ lhu $v1, 0x8e($s0) -/* 8A6204 80240784 18400005 */ blez $v0, .L8024079C -/* 8A6208 80240788 2462FFFF */ addiu $v0, $v1, -1 -/* 8A620C 8024078C A602008E */ sh $v0, 0x8e($s0) -/* 8A6210 80240790 00021400 */ sll $v0, $v0, 0x10 -/* 8A6214 80240794 1C400033 */ bgtz $v0, .L80240864 -/* 8A6218 80240798 00000000 */ nop -.L8024079C: -/* 8A621C 8024079C 8602008C */ lh $v0, 0x8c($s0) -/* 8A6220 802407A0 14400030 */ bnez $v0, .L80240864 -/* 8A6224 802407A4 00000000 */ nop -/* 8A6228 802407A8 8E2200CC */ lw $v0, 0xcc($s1) -/* 8A622C 802407AC 8C420024 */ lw $v0, 0x24($v0) -/* 8A6230 802407B0 AE020028 */ sw $v0, 0x28($s0) -/* 8A6234 802407B4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 8A6238 802407B8 E6000018 */ swc1 $f0, 0x18($s0) -/* 8A623C 802407BC 8E230088 */ lw $v1, 0x88($s1) -/* 8A6240 802407C0 24020005 */ addiu $v0, $zero, 5 -/* 8A6244 802407C4 10620005 */ beq $v1, $v0, .L802407DC -/* 8A6248 802407C8 00000000 */ nop -/* 8A624C 802407CC 10600003 */ beqz $v1, .L802407DC -/* 8A6250 802407D0 24020001 */ addiu $v0, $zero, 1 -/* 8A6254 802407D4 14620006 */ bne $v1, $v0, .L802407F0 -/* 8A6258 802407D8 00000000 */ nop -.L802407DC: -/* 8A625C 802407DC 8E220084 */ lw $v0, 0x84($s1) -/* 8A6260 802407E0 00021FC2 */ srl $v1, $v0, 0x1f -/* 8A6264 802407E4 00431021 */ addu $v0, $v0, $v1 -/* 8A6268 802407E8 00021043 */ sra $v0, $v0, 1 -/* 8A626C 802407EC A60200A8 */ sh $v0, 0xa8($s0) -.L802407F0: -/* 8A6270 802407F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A6274 802407F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A6278 802407F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8A627C 802407FC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8A6280 80240800 8C460028 */ lw $a2, 0x28($v0) -/* 8A6284 80240804 0C00A7B5 */ jal dist2D -/* 8A6288 80240808 8C470030 */ lw $a3, 0x30($v0) -/* 8A628C 8024080C C6020018 */ lwc1 $f2, 0x18($s0) -/* 8A6290 80240810 46020003 */ div.s $f0, $f0, $f2 -/* 8A6294 80240814 3C018024 */ lui $at, %hi(D_802424A0_8A7F20) -/* 8A6298 80240818 D42224A0 */ ldc1 $f2, %lo(D_802424A0_8A7F20)($at) -/* 8A629C 8024081C 46000021 */ cvt.d.s $f0, $f0 -/* 8A62A0 80240820 46220000 */ add.d $f0, $f0, $f2 -/* 8A62A4 80240824 4620010D */ trunc.w.d $f4, $f0 -/* 8A62A8 80240828 44022000 */ mfc1 $v0, $f4 -/* 8A62AC 8024082C 00000000 */ nop -/* 8A62B0 80240830 A602008E */ sh $v0, 0x8e($s0) -/* 8A62B4 80240834 00021400 */ sll $v0, $v0, 0x10 -/* 8A62B8 80240838 8E230078 */ lw $v1, 0x78($s1) -/* 8A62BC 8024083C 00021403 */ sra $v0, $v0, 0x10 -/* 8A62C0 80240840 0043102A */ slt $v0, $v0, $v1 -/* 8A62C4 80240844 10400003 */ beqz $v0, .L80240854 -/* 8A62C8 80240848 00000000 */ nop -/* 8A62CC 8024084C 9622007A */ lhu $v0, 0x7a($s1) -/* 8A62D0 80240850 A602008E */ sh $v0, 0x8e($s0) -.L80240854: -/* 8A62D4 80240854 8602008E */ lh $v0, 0x8e($s0) -/* 8A62D8 80240858 AE22007C */ sw $v0, 0x7c($s1) -/* 8A62DC 8024085C 2402000E */ addiu $v0, $zero, 0xe -/* 8A62E0 80240860 AE620070 */ sw $v0, 0x70($s3) -.L80240864: -/* 8A62E4 80240864 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A62E8 80240868 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A62EC 8024086C 8FB20018 */ lw $s2, 0x18($sp) -/* 8A62F0 80240870 8FB10014 */ lw $s1, 0x14($sp) -/* 8A62F4 80240874 8FB00010 */ lw $s0, 0x10($sp) -/* 8A62F8 80240878 03E00008 */ jr $ra -/* 8A62FC 8024087C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s index 8d56b749da..d611b7892b 100644 --- a/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s +++ b/ver/us/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -244,7 +244,7 @@ glabel func_80240A64_8A64E4 /* 8A6844 80240DC4 0260202D */ daddu $a0, $s3, $zero .L80240DC8: /* 8A6848 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 8A684C 80240DCC 0C0901D3 */ jal func_8024074C_8A61CC +/* 8A684C 80240DCC 0C0901D3 */ jal tik_24_UnkDistFunc /* 8A6850 80240DD0 02A0302D */ daddu $a2, $s5, $zero /* 8A6854 80240DD4 08090384 */ j .L80240E10 /* 8A6858 80240DD8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s deleted file mode 100644 index 99ca29b1db..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244440_9A0DD0 -.double 0.8 - -.section .text - -glabel func_8024046C_99CDFC -/* 99CDFC 8024046C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 99CE00 80240470 AFB3001C */ sw $s3, 0x1c($sp) -/* 99CE04 80240474 0080982D */ daddu $s3, $a0, $zero -/* 99CE08 80240478 AFBF0020 */ sw $ra, 0x20($sp) -/* 99CE0C 8024047C AFB20018 */ sw $s2, 0x18($sp) -/* 99CE10 80240480 AFB10014 */ sw $s1, 0x14($sp) -/* 99CE14 80240484 AFB00010 */ sw $s0, 0x10($sp) -/* 99CE18 80240488 8E710148 */ lw $s1, 0x148($s3) -/* 99CE1C 8024048C 86240008 */ lh $a0, 8($s1) -/* 99CE20 80240490 0C00EABB */ jal get_npc_unsafe -/* 99CE24 80240494 00A0902D */ daddu $s2, $a1, $zero -/* 99CE28 80240498 0040802D */ daddu $s0, $v0, $zero -/* 99CE2C 8024049C 8602008E */ lh $v0, 0x8e($s0) -/* 99CE30 802404A0 9603008E */ lhu $v1, 0x8e($s0) -/* 99CE34 802404A4 18400005 */ blez $v0, .L802404BC -/* 99CE38 802404A8 2462FFFF */ addiu $v0, $v1, -1 -/* 99CE3C 802404AC A602008E */ sh $v0, 0x8e($s0) -/* 99CE40 802404B0 00021400 */ sll $v0, $v0, 0x10 -/* 99CE44 802404B4 1C400033 */ bgtz $v0, .L80240584 -/* 99CE48 802404B8 00000000 */ nop -.L802404BC: -/* 99CE4C 802404BC 8602008C */ lh $v0, 0x8c($s0) -/* 99CE50 802404C0 14400030 */ bnez $v0, .L80240584 -/* 99CE54 802404C4 00000000 */ nop -/* 99CE58 802404C8 8E2200CC */ lw $v0, 0xcc($s1) -/* 99CE5C 802404CC 8C420024 */ lw $v0, 0x24($v0) -/* 99CE60 802404D0 AE020028 */ sw $v0, 0x28($s0) -/* 99CE64 802404D4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 99CE68 802404D8 E6000018 */ swc1 $f0, 0x18($s0) -/* 99CE6C 802404DC 8E230088 */ lw $v1, 0x88($s1) -/* 99CE70 802404E0 24020005 */ addiu $v0, $zero, 5 -/* 99CE74 802404E4 10620005 */ beq $v1, $v0, .L802404FC -/* 99CE78 802404E8 00000000 */ nop -/* 99CE7C 802404EC 10600003 */ beqz $v1, .L802404FC -/* 99CE80 802404F0 24020001 */ addiu $v0, $zero, 1 -/* 99CE84 802404F4 14620006 */ bne $v1, $v0, .L80240510 -/* 99CE88 802404F8 00000000 */ nop -.L802404FC: -/* 99CE8C 802404FC 8E220084 */ lw $v0, 0x84($s1) -/* 99CE90 80240500 00021FC2 */ srl $v1, $v0, 0x1f -/* 99CE94 80240504 00431021 */ addu $v0, $v0, $v1 -/* 99CE98 80240508 00021043 */ sra $v0, $v0, 1 -/* 99CE9C 8024050C A60200A8 */ sh $v0, 0xa8($s0) -.L80240510: -/* 99CEA0 80240510 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99CEA4 80240514 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99CEA8 80240518 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99CEAC 8024051C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99CEB0 80240520 8C460028 */ lw $a2, 0x28($v0) -/* 99CEB4 80240524 0C00A7B5 */ jal dist2D -/* 99CEB8 80240528 8C470030 */ lw $a3, 0x30($v0) -/* 99CEBC 8024052C C6020018 */ lwc1 $f2, 0x18($s0) -/* 99CEC0 80240530 46020003 */ div.s $f0, $f0, $f2 -/* 99CEC4 80240534 3C018024 */ lui $at, %hi(D_80244440_9A0DD0) -/* 99CEC8 80240538 D4224440 */ ldc1 $f2, %lo(D_80244440_9A0DD0)($at) -/* 99CECC 8024053C 46000021 */ cvt.d.s $f0, $f0 -/* 99CED0 80240540 46220000 */ add.d $f0, $f0, $f2 -/* 99CED4 80240544 4620010D */ trunc.w.d $f4, $f0 -/* 99CED8 80240548 44022000 */ mfc1 $v0, $f4 -/* 99CEDC 8024054C 00000000 */ nop -/* 99CEE0 80240550 A602008E */ sh $v0, 0x8e($s0) -/* 99CEE4 80240554 00021400 */ sll $v0, $v0, 0x10 -/* 99CEE8 80240558 8E230078 */ lw $v1, 0x78($s1) -/* 99CEEC 8024055C 00021403 */ sra $v0, $v0, 0x10 -/* 99CEF0 80240560 0043102A */ slt $v0, $v0, $v1 -/* 99CEF4 80240564 10400003 */ beqz $v0, .L80240574 -/* 99CEF8 80240568 00000000 */ nop -/* 99CEFC 8024056C 9622007A */ lhu $v0, 0x7a($s1) -/* 99CF00 80240570 A602008E */ sh $v0, 0x8e($s0) -.L80240574: -/* 99CF04 80240574 8602008E */ lh $v0, 0x8e($s0) -/* 99CF08 80240578 AE22007C */ sw $v0, 0x7c($s1) -/* 99CF0C 8024057C 2402000E */ addiu $v0, $zero, 0xe -/* 99CF10 80240580 AE620070 */ sw $v0, 0x70($s3) -.L80240584: -/* 99CF14 80240584 8FBF0020 */ lw $ra, 0x20($sp) -/* 99CF18 80240588 8FB3001C */ lw $s3, 0x1c($sp) -/* 99CF1C 8024058C 8FB20018 */ lw $s2, 0x18($sp) -/* 99CF20 80240590 8FB10014 */ lw $s1, 0x14($sp) -/* 99CF24 80240594 8FB00010 */ lw $s0, 0x10($sp) -/* 99CF28 80240598 03E00008 */ jr $ra -/* 99CF2C 8024059C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s index e5fce51f40..cef44af191 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -244,7 +244,7 @@ glabel func_80240784_99D114 /* 99D474 80240AE4 0260202D */ daddu $a0, $s3, $zero .L80240AE8: /* 99D478 80240AE8 0280282D */ daddu $a1, $s4, $zero -/* 99D47C 80240AEC 0C09011B */ jal func_8024046C_99CDFC +/* 99D47C 80240AEC 0C09011B */ jal trd_01_UnkDistFunc /* 99D480 80240AF0 02A0302D */ daddu $a2, $s5, $zero /* 99D484 80240AF4 080902CC */ j .L80240B30 /* 99D488 80240AF8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s deleted file mode 100644 index ff4965c986..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_802432E0_9A42C0 -.double 0.8 - -.section .text - -glabel func_8024015C_9A113C -/* 9A113C 8024015C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A1140 80240160 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A1144 80240164 0080982D */ daddu $s3, $a0, $zero -/* 9A1148 80240168 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A114C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* 9A1150 80240170 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1154 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* 9A1158 80240178 8E710148 */ lw $s1, 0x148($s3) -/* 9A115C 8024017C 86240008 */ lh $a0, 8($s1) -/* 9A1160 80240180 0C00EABB */ jal get_npc_unsafe -/* 9A1164 80240184 00A0902D */ daddu $s2, $a1, $zero -/* 9A1168 80240188 0040802D */ daddu $s0, $v0, $zero -/* 9A116C 8024018C 8602008E */ lh $v0, 0x8e($s0) -/* 9A1170 80240190 9603008E */ lhu $v1, 0x8e($s0) -/* 9A1174 80240194 18400005 */ blez $v0, .L802401AC -/* 9A1178 80240198 2462FFFF */ addiu $v0, $v1, -1 -/* 9A117C 8024019C A602008E */ sh $v0, 0x8e($s0) -/* 9A1180 802401A0 00021400 */ sll $v0, $v0, 0x10 -/* 9A1184 802401A4 1C400033 */ bgtz $v0, .L80240274 -/* 9A1188 802401A8 00000000 */ nop -.L802401AC: -/* 9A118C 802401AC 8602008C */ lh $v0, 0x8c($s0) -/* 9A1190 802401B0 14400030 */ bnez $v0, .L80240274 -/* 9A1194 802401B4 00000000 */ nop -/* 9A1198 802401B8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A119C 802401BC 8C420024 */ lw $v0, 0x24($v0) -/* 9A11A0 802401C0 AE020028 */ sw $v0, 0x28($s0) -/* 9A11A4 802401C4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9A11A8 802401C8 E6000018 */ swc1 $f0, 0x18($s0) -/* 9A11AC 802401CC 8E230088 */ lw $v1, 0x88($s1) -/* 9A11B0 802401D0 24020005 */ addiu $v0, $zero, 5 -/* 9A11B4 802401D4 10620005 */ beq $v1, $v0, .L802401EC -/* 9A11B8 802401D8 00000000 */ nop -/* 9A11BC 802401DC 10600003 */ beqz $v1, .L802401EC -/* 9A11C0 802401E0 24020001 */ addiu $v0, $zero, 1 -/* 9A11C4 802401E4 14620006 */ bne $v1, $v0, .L80240200 -/* 9A11C8 802401E8 00000000 */ nop -.L802401EC: -/* 9A11CC 802401EC 8E220084 */ lw $v0, 0x84($s1) -/* 9A11D0 802401F0 00021FC2 */ srl $v1, $v0, 0x1f -/* 9A11D4 802401F4 00431021 */ addu $v0, $v0, $v1 -/* 9A11D8 802401F8 00021043 */ sra $v0, $v0, 1 -/* 9A11DC 802401FC A60200A8 */ sh $v0, 0xa8($s0) -.L80240200: -/* 9A11E0 80240200 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A11E4 80240204 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A11E8 80240208 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A11EC 8024020C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A11F0 80240210 8C460028 */ lw $a2, 0x28($v0) -/* 9A11F4 80240214 0C00A7B5 */ jal dist2D -/* 9A11F8 80240218 8C470030 */ lw $a3, 0x30($v0) -/* 9A11FC 8024021C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A1200 80240220 46020003 */ div.s $f0, $f0, $f2 -/* 9A1204 80240224 3C018024 */ lui $at, %hi(D_802432E0_9A42C0) -/* 9A1208 80240228 D42232E0 */ ldc1 $f2, %lo(D_802432E0_9A42C0)($at) -/* 9A120C 8024022C 46000021 */ cvt.d.s $f0, $f0 -/* 9A1210 80240230 46220000 */ add.d $f0, $f0, $f2 -/* 9A1214 80240234 4620010D */ trunc.w.d $f4, $f0 -/* 9A1218 80240238 44022000 */ mfc1 $v0, $f4 -/* 9A121C 8024023C 00000000 */ nop -/* 9A1220 80240240 A602008E */ sh $v0, 0x8e($s0) -/* 9A1224 80240244 00021400 */ sll $v0, $v0, 0x10 -/* 9A1228 80240248 8E230078 */ lw $v1, 0x78($s1) -/* 9A122C 8024024C 00021403 */ sra $v0, $v0, 0x10 -/* 9A1230 80240250 0043102A */ slt $v0, $v0, $v1 -/* 9A1234 80240254 10400003 */ beqz $v0, .L80240264 -/* 9A1238 80240258 00000000 */ nop -/* 9A123C 8024025C 9622007A */ lhu $v0, 0x7a($s1) -/* 9A1240 80240260 A602008E */ sh $v0, 0x8e($s0) -.L80240264: -/* 9A1244 80240264 8602008E */ lh $v0, 0x8e($s0) -/* 9A1248 80240268 AE22007C */ sw $v0, 0x7c($s1) -/* 9A124C 8024026C 2402000E */ addiu $v0, $zero, 0xe -/* 9A1250 80240270 AE620070 */ sw $v0, 0x70($s3) -.L80240274: -/* 9A1254 80240274 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A1258 80240278 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A125C 8024027C 8FB20018 */ lw $s2, 0x18($sp) -/* 9A1260 80240280 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1264 80240284 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1268 80240288 03E00008 */ jr $ra -/* 9A126C 8024028C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s index dc82293fe2..9198f8a716 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -244,7 +244,7 @@ glabel func_80240474_9A1454 /* 9A17B4 802407D4 0260202D */ daddu $a0, $s3, $zero .L802407D8: /* 9A17B8 802407D8 0280282D */ daddu $a1, $s4, $zero -/* 9A17BC 802407DC 0C090057 */ jal func_8024015C_9A113C +/* 9A17BC 802407DC 0C090057 */ jal trd_02_UnkDistFunc /* 9A17C0 802407E0 02A0302D */ daddu $a2, $s5, $zero /* 9A17C4 802407E4 08090208 */ j .L80240820 /* 9A17C8 802407E8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s deleted file mode 100644 index 4fd27f5bce..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802408B4_9A1894.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243340_9A4320 -.double 32767.0 - -.section .text - -glabel func_802408B4_9A1894 -/* 9A1894 802408B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A1898 802408B8 AFB50024 */ sw $s5, 0x24($sp) -/* 9A189C 802408BC 0080A82D */ daddu $s5, $a0, $zero -/* 9A18A0 802408C0 AFBF002C */ sw $ra, 0x2c($sp) -/* 9A18A4 802408C4 AFB60028 */ sw $s6, 0x28($sp) -/* 9A18A8 802408C8 AFB40020 */ sw $s4, 0x20($sp) -/* 9A18AC 802408CC AFB3001C */ sw $s3, 0x1c($sp) -/* 9A18B0 802408D0 AFB20018 */ sw $s2, 0x18($sp) -/* 9A18B4 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A18B8 802408D8 AFB00010 */ sw $s0, 0x10($sp) -/* 9A18BC 802408DC F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9A18C0 802408E0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9A18C4 802408E4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9A18C8 802408E8 8EB30148 */ lw $s3, 0x148($s5) -/* 9A18CC 802408EC 86640008 */ lh $a0, 8($s3) -/* 9A18D0 802408F0 0C00EABB */ jal get_npc_unsafe -/* 9A18D4 802408F4 00A0B02D */ daddu $s6, $a1, $zero -/* 9A18D8 802408F8 0040A02D */ daddu $s4, $v0, $zero -/* 9A18DC 802408FC AEA00074 */ sw $zero, 0x74($s5) -/* 9A18E0 80240900 C6980038 */ lwc1 $f24, 0x38($s4) -/* 9A18E4 80240904 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9A18E8 80240908 0000902D */ daddu $s2, $zero, $zero -/* 9A18EC 8024090C AEA00078 */ sw $zero, 0x78($s5) -/* 9A18F0 80240910 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A18F4 80240914 8C620000 */ lw $v0, ($v1) -/* 9A18F8 80240918 3C0146FF */ lui $at, 0x46ff -/* 9A18FC 8024091C 3421FE00 */ ori $at, $at, 0xfe00 -/* 9A1900 80240920 4481A000 */ mtc1 $at, $f20 -/* 9A1904 80240924 18400018 */ blez $v0, .L80240988 -/* 9A1908 80240928 0240802D */ daddu $s0, $s2, $zero -/* 9A190C 8024092C 0240882D */ daddu $s1, $s2, $zero -.L80240930: -/* 9A1910 80240930 02231021 */ addu $v0, $s1, $v1 -/* 9A1914 80240934 4600C306 */ mov.s $f12, $f24 -/* 9A1918 80240938 C4440004 */ lwc1 $f4, 4($v0) -/* 9A191C 8024093C 46802120 */ cvt.s.w $f4, $f4 -/* 9A1920 80240940 44062000 */ mfc1 $a2, $f4 -/* 9A1924 80240944 C444000C */ lwc1 $f4, 0xc($v0) -/* 9A1928 80240948 46802120 */ cvt.s.w $f4, $f4 -/* 9A192C 8024094C 44072000 */ mfc1 $a3, $f4 -/* 9A1930 80240950 0C00A7B5 */ jal dist2D -/* 9A1934 80240954 4600B386 */ mov.s $f14, $f22 -/* 9A1938 80240958 4614003C */ c.lt.s $f0, $f20 -/* 9A193C 8024095C 00000000 */ nop -/* 9A1940 80240960 45000003 */ bc1f .L80240970 -/* 9A1944 80240964 2631000C */ addiu $s1, $s1, 0xc -/* 9A1948 80240968 46000506 */ mov.s $f20, $f0 -/* 9A194C 8024096C AEB20078 */ sw $s2, 0x78($s5) -.L80240970: -/* 9A1950 80240970 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A1954 80240974 26100001 */ addiu $s0, $s0, 1 -/* 9A1958 80240978 8C620000 */ lw $v0, ($v1) -/* 9A195C 8024097C 0202102A */ slt $v0, $s0, $v0 -/* 9A1960 80240980 1440FFEB */ bnez $v0, .L80240930 -/* 9A1964 80240984 26520001 */ addiu $s2, $s2, 1 -.L80240988: -/* 9A1968 80240988 8E6200CC */ lw $v0, 0xcc($s3) -/* 9A196C 8024098C 8C420004 */ lw $v0, 4($v0) -/* 9A1970 80240990 AE820028 */ sw $v0, 0x28($s4) -/* 9A1974 80240994 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9A1978 80240998 8C42007C */ lw $v0, 0x7c($v0) -/* 9A197C 8024099C 04410004 */ bgez $v0, .L802409B0 -/* 9A1980 802409A0 00000000 */ nop -/* 9A1984 802409A4 C6C00000 */ lwc1 $f0, ($s6) -/* 9A1988 802409A8 08090274 */ j .L802409D0 -/* 9A198C 802409AC E6800018 */ swc1 $f0, 0x18($s4) -.L802409B0: -/* 9A1990 802409B0 3C018024 */ lui $at, %hi(D_80243340_9A4320) -/* 9A1994 802409B4 D4223340 */ ldc1 $f2, %lo(D_80243340_9A4320)($at) -/* 9A1998 802409B8 44820000 */ mtc1 $v0, $f0 -/* 9A199C 802409BC 00000000 */ nop -/* 9A19A0 802409C0 46800021 */ cvt.d.w $f0, $f0 -/* 9A19A4 802409C4 46220003 */ div.d $f0, $f0, $f2 -/* 9A19A8 802409C8 46200020 */ cvt.s.d $f0, $f0 -/* 9A19AC 802409CC E6800018 */ swc1 $f0, 0x18($s4) -.L802409D0: -/* 9A19B0 802409D0 24020001 */ addiu $v0, $zero, 1 -/* 9A19B4 802409D4 AEA20070 */ sw $v0, 0x70($s5) -/* 9A19B8 802409D8 8FBF002C */ lw $ra, 0x2c($sp) -/* 9A19BC 802409DC 8FB60028 */ lw $s6, 0x28($sp) -/* 9A19C0 802409E0 8FB50024 */ lw $s5, 0x24($sp) -/* 9A19C4 802409E4 8FB40020 */ lw $s4, 0x20($sp) -/* 9A19C8 802409E8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A19CC 802409EC 8FB20018 */ lw $s2, 0x18($sp) -/* 9A19D0 802409F0 8FB10014 */ lw $s1, 0x14($sp) -/* 9A19D4 802409F4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A19D8 802409F8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9A19DC 802409FC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9A19E0 80240A00 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9A19E4 80240A04 03E00008 */ jr $ra -/* 9A19E8 80240A08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s deleted file mode 100644 index 9b437d79ce..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243348_9A4328 -.double 32767.0 - -.section .text - -glabel func_80240F30_9A1F10 -/* 9A1F10 80240F30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A1F14 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1F18 80240F38 0080882D */ daddu $s1, $a0, $zero -/* 9A1F1C 80240F3C AFBF001C */ sw $ra, 0x1c($sp) -/* 9A1F20 80240F40 AFB20018 */ sw $s2, 0x18($sp) -/* 9A1F24 80240F44 AFB00010 */ sw $s0, 0x10($sp) -/* 9A1F28 80240F48 8E300148 */ lw $s0, 0x148($s1) -/* 9A1F2C 80240F4C 86040008 */ lh $a0, 8($s0) -/* 9A1F30 80240F50 0C00EABB */ jal get_npc_unsafe -/* 9A1F34 80240F54 00A0902D */ daddu $s2, $a1, $zero -/* 9A1F38 80240F58 8E230078 */ lw $v1, 0x78($s1) -/* 9A1F3C 80240F5C 24630001 */ addiu $v1, $v1, 1 -/* 9A1F40 80240F60 AE230078 */ sw $v1, 0x78($s1) -/* 9A1F44 80240F64 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9A1F48 80240F68 8C840000 */ lw $a0, ($a0) -/* 9A1F4C 80240F6C 0064182A */ slt $v1, $v1, $a0 -/* 9A1F50 80240F70 14600002 */ bnez $v1, .L80240F7C -/* 9A1F54 80240F74 0040282D */ daddu $a1, $v0, $zero -/* 9A1F58 80240F78 AE200078 */ sw $zero, 0x78($s1) -.L80240F7C: -/* 9A1F5C 80240F7C 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A1F60 80240F80 8C420004 */ lw $v0, 4($v0) -/* 9A1F64 80240F84 ACA20028 */ sw $v0, 0x28($a1) -/* 9A1F68 80240F88 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9A1F6C 80240F8C 8C42007C */ lw $v0, 0x7c($v0) -/* 9A1F70 80240F90 04410004 */ bgez $v0, .L80240FA4 -/* 9A1F74 80240F94 00000000 */ nop -/* 9A1F78 80240F98 C6400000 */ lwc1 $f0, ($s2) -/* 9A1F7C 80240F9C 080903F1 */ j .L80240FC4 -/* 9A1F80 80240FA0 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FA4: -/* 9A1F84 80240FA4 3C018024 */ lui $at, %hi(D_80243348_9A4328) -/* 9A1F88 80240FA8 D4223348 */ ldc1 $f2, %lo(D_80243348_9A4328)($at) -/* 9A1F8C 80240FAC 44820000 */ mtc1 $v0, $f0 -/* 9A1F90 80240FB0 00000000 */ nop -/* 9A1F94 80240FB4 46800021 */ cvt.d.w $f0, $f0 -/* 9A1F98 80240FB8 46220003 */ div.d $f0, $f0, $f2 -/* 9A1F9C 80240FBC 46200020 */ cvt.s.d $f0, $f0 -/* 9A1FA0 80240FC0 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FC4: -/* 9A1FA4 80240FC4 24020001 */ addiu $v0, $zero, 1 -/* 9A1FA8 80240FC8 AE220070 */ sw $v0, 0x70($s1) -/* 9A1FAC 80240FCC 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A1FB0 80240FD0 8FB20018 */ lw $s2, 0x18($sp) -/* 9A1FB4 80240FD4 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1FB8 80240FD8 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1FBC 80240FDC 03E00008 */ jr $ra -/* 9A1FC0 80240FE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s index 7e4b2258b2..0685499c70 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -139,7 +139,7 @@ glabel func_80241448_9A2428 glabel L8024162C_9A260C /* 9A260C 8024162C 0280202D */ daddu $a0, $s4, $zero /* 9A2610 80241630 0260282D */ daddu $a1, $s3, $zero -/* 9A2614 80241634 0C09022D */ jal func_802408B4_9A1894 +/* 9A2614 80241634 0C09022D */ jal trd_02_UnkNpcAIFunc24 /* 9A2618 80241638 02A0302D */ daddu $a2, $s5, $zero glabel L8024163C_9A261C /* 9A261C 8024163C 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241664_9A2644 glabel L8024167C_9A265C /* 9A265C 8024167C 0280202D */ daddu $a0, $s4, $zero /* 9A2660 80241680 0260282D */ daddu $a1, $s3, $zero -/* 9A2664 80241684 0C0903CC */ jal func_80240F30_9A1F10 +/* 9A2664 80241684 0C0903CC */ jal trd_02_UnkNpcAIFunc25 /* 9A2668 80241688 02A0302D */ daddu $a2, $s5, $zero /* 9A266C 8024168C 080905C7 */ j L8024171C_9A26FC /* 9A2670 80241690 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s index 615af3bbe7..390668c070 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -149,7 +149,7 @@ glabel func_80241744_9A2724 glabel L80241950_9A2930 /* 9A2930 80241950 0260202D */ daddu $a0, $s3, $zero /* 9A2934 80241954 0280282D */ daddu $a1, $s4, $zero -/* 9A2938 80241958 0C09022D */ jal func_802408B4_9A1894 +/* 9A2938 80241958 0C09022D */ jal trd_02_UnkNpcAIFunc24 /* 9A293C 8024195C 02A0302D */ daddu $a2, $s5, $zero /* 9A2940 80241960 96220086 */ lhu $v0, 0x86($s1) /* 9A2944 80241964 A64200A8 */ sh $v0, 0xa8($s2) @@ -175,7 +175,7 @@ glabel L80241990_9A2970 glabel L802419A8_9A2988 /* 9A2988 802419A8 0260202D */ daddu $a0, $s3, $zero /* 9A298C 802419AC 0280282D */ daddu $a1, $s4, $zero -/* 9A2990 802419B0 0C0903CC */ jal func_80240F30_9A1F10 +/* 9A2990 802419B0 0C0903CC */ jal trd_02_UnkNpcAIFunc25 /* 9A2994 802419B4 02A0302D */ daddu $a2, $s5, $zero /* 9A2998 802419B8 08090688 */ j L80241A20_9A2A00 /* 9A299C 802419BC 00000000 */ nop @@ -187,7 +187,7 @@ glabel L802419C0_9A29A0 glabel L802419D0_9A29B0 /* 9A29B0 802419D0 0260202D */ daddu $a0, $s3, $zero /* 9A29B4 802419D4 0280282D */ daddu $a1, $s4, $zero -/* 9A29B8 802419D8 0C090057 */ jal func_8024015C_9A113C +/* 9A29B8 802419D8 0C090057 */ jal trd_02_UnkDistFunc /* 9A29BC 802419DC 02A0302D */ daddu $a2, $s5, $zero /* 9A29C0 802419E0 08090688 */ j L80241A20_9A2A00 /* 9A29C4 802419E4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s deleted file mode 100644 index 730fdc83d3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80243D40_9A8390 -.double 0.8 - -.section .text - -glabel func_8024011C_9A476C -/* 9A476C 8024011C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A4770 80240120 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A4774 80240124 0080982D */ daddu $s3, $a0, $zero -/* 9A4778 80240128 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A477C 8024012C AFB20018 */ sw $s2, 0x18($sp) -/* 9A4780 80240130 AFB10014 */ sw $s1, 0x14($sp) -/* 9A4784 80240134 AFB00010 */ sw $s0, 0x10($sp) -/* 9A4788 80240138 8E710148 */ lw $s1, 0x148($s3) -/* 9A478C 8024013C 86240008 */ lh $a0, 8($s1) -/* 9A4790 80240140 0C00EABB */ jal get_npc_unsafe -/* 9A4794 80240144 00A0902D */ daddu $s2, $a1, $zero -/* 9A4798 80240148 0040802D */ daddu $s0, $v0, $zero -/* 9A479C 8024014C 8602008E */ lh $v0, 0x8e($s0) -/* 9A47A0 80240150 9603008E */ lhu $v1, 0x8e($s0) -/* 9A47A4 80240154 18400005 */ blez $v0, .L8024016C -/* 9A47A8 80240158 2462FFFF */ addiu $v0, $v1, -1 -/* 9A47AC 8024015C A602008E */ sh $v0, 0x8e($s0) -/* 9A47B0 80240160 00021400 */ sll $v0, $v0, 0x10 -/* 9A47B4 80240164 1C400033 */ bgtz $v0, .L80240234 -/* 9A47B8 80240168 00000000 */ nop -.L8024016C: -/* 9A47BC 8024016C 8602008C */ lh $v0, 0x8c($s0) -/* 9A47C0 80240170 14400030 */ bnez $v0, .L80240234 -/* 9A47C4 80240174 00000000 */ nop -/* 9A47C8 80240178 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A47CC 8024017C 8C420024 */ lw $v0, 0x24($v0) -/* 9A47D0 80240180 AE020028 */ sw $v0, 0x28($s0) -/* 9A47D4 80240184 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9A47D8 80240188 E6000018 */ swc1 $f0, 0x18($s0) -/* 9A47DC 8024018C 8E230088 */ lw $v1, 0x88($s1) -/* 9A47E0 80240190 24020005 */ addiu $v0, $zero, 5 -/* 9A47E4 80240194 10620005 */ beq $v1, $v0, .L802401AC -/* 9A47E8 80240198 00000000 */ nop -/* 9A47EC 8024019C 10600003 */ beqz $v1, .L802401AC -/* 9A47F0 802401A0 24020001 */ addiu $v0, $zero, 1 -/* 9A47F4 802401A4 14620006 */ bne $v1, $v0, .L802401C0 -/* 9A47F8 802401A8 00000000 */ nop -.L802401AC: -/* 9A47FC 802401AC 8E220084 */ lw $v0, 0x84($s1) -/* 9A4800 802401B0 00021FC2 */ srl $v1, $v0, 0x1f -/* 9A4804 802401B4 00431021 */ addu $v0, $v0, $v1 -/* 9A4808 802401B8 00021043 */ sra $v0, $v0, 1 -/* 9A480C 802401BC A60200A8 */ sh $v0, 0xa8($s0) -.L802401C0: -/* 9A4810 802401C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A4814 802401C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A4818 802401C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A481C 802401CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A4820 802401D0 8C460028 */ lw $a2, 0x28($v0) -/* 9A4824 802401D4 0C00A7B5 */ jal dist2D -/* 9A4828 802401D8 8C470030 */ lw $a3, 0x30($v0) -/* 9A482C 802401DC C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A4830 802401E0 46020003 */ div.s $f0, $f0, $f2 -/* 9A4834 802401E4 3C018024 */ lui $at, %hi(D_80243D40_9A8390) -/* 9A4838 802401E8 D4223D40 */ ldc1 $f2, %lo(D_80243D40_9A8390)($at) -/* 9A483C 802401EC 46000021 */ cvt.d.s $f0, $f0 -/* 9A4840 802401F0 46220000 */ add.d $f0, $f0, $f2 -/* 9A4844 802401F4 4620010D */ trunc.w.d $f4, $f0 -/* 9A4848 802401F8 44022000 */ mfc1 $v0, $f4 -/* 9A484C 802401FC 00000000 */ nop -/* 9A4850 80240200 A602008E */ sh $v0, 0x8e($s0) -/* 9A4854 80240204 00021400 */ sll $v0, $v0, 0x10 -/* 9A4858 80240208 8E230078 */ lw $v1, 0x78($s1) -/* 9A485C 8024020C 00021403 */ sra $v0, $v0, 0x10 -/* 9A4860 80240210 0043102A */ slt $v0, $v0, $v1 -/* 9A4864 80240214 10400003 */ beqz $v0, .L80240224 -/* 9A4868 80240218 00000000 */ nop -/* 9A486C 8024021C 9622007A */ lhu $v0, 0x7a($s1) -/* 9A4870 80240220 A602008E */ sh $v0, 0x8e($s0) -.L80240224: -/* 9A4874 80240224 8602008E */ lh $v0, 0x8e($s0) -/* 9A4878 80240228 AE22007C */ sw $v0, 0x7c($s1) -/* 9A487C 8024022C 2402000E */ addiu $v0, $zero, 0xe -/* 9A4880 80240230 AE620070 */ sw $v0, 0x70($s3) -.L80240234: -/* 9A4884 80240234 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A4888 80240238 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A488C 8024023C 8FB20018 */ lw $s2, 0x18($sp) -/* 9A4890 80240240 8FB10014 */ lw $s1, 0x14($sp) -/* 9A4894 80240244 8FB00010 */ lw $s0, 0x10($sp) -/* 9A4898 80240248 03E00008 */ jr $ra -/* 9A489C 8024024C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index 90c37f0279..811a519fa5 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -244,7 +244,7 @@ glabel func_80240434_9A4A84 /* 9A4DE4 80240794 0260202D */ daddu $a0, $s3, $zero .L80240798: /* 9A4DE8 80240798 0280282D */ daddu $a1, $s4, $zero -/* 9A4DEC 8024079C 0C090047 */ jal func_8024011C_9A476C +/* 9A4DEC 8024079C 0C090047 */ jal trd_03_UnkDistFunc /* 9A4DF0 802407A0 02A0302D */ daddu $a2, $s5, $zero /* 9A4DF4 802407A4 080901F8 */ j .L802407E0 /* 9A4DF8 802407A8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s deleted file mode 100644 index d1da77af2c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245EE0_9AE2D0 -.double 0.8 - -.section .text - -glabel func_8024052C_9A891C -/* 9A891C 8024052C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A8920 80240530 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A8924 80240534 0080982D */ daddu $s3, $a0, $zero -/* 9A8928 80240538 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A892C 8024053C AFB20018 */ sw $s2, 0x18($sp) -/* 9A8930 80240540 AFB10014 */ sw $s1, 0x14($sp) -/* 9A8934 80240544 AFB00010 */ sw $s0, 0x10($sp) -/* 9A8938 80240548 8E710148 */ lw $s1, 0x148($s3) -/* 9A893C 8024054C 86240008 */ lh $a0, 8($s1) -/* 9A8940 80240550 0C00EABB */ jal get_npc_unsafe -/* 9A8944 80240554 00A0902D */ daddu $s2, $a1, $zero -/* 9A8948 80240558 0040802D */ daddu $s0, $v0, $zero -/* 9A894C 8024055C 8602008E */ lh $v0, 0x8e($s0) -/* 9A8950 80240560 9603008E */ lhu $v1, 0x8e($s0) -/* 9A8954 80240564 18400005 */ blez $v0, .L8024057C -/* 9A8958 80240568 2462FFFF */ addiu $v0, $v1, -1 -/* 9A895C 8024056C A602008E */ sh $v0, 0x8e($s0) -/* 9A8960 80240570 00021400 */ sll $v0, $v0, 0x10 -/* 9A8964 80240574 1C400033 */ bgtz $v0, .L80240644 -/* 9A8968 80240578 00000000 */ nop -.L8024057C: -/* 9A896C 8024057C 8602008C */ lh $v0, 0x8c($s0) -/* 9A8970 80240580 14400030 */ bnez $v0, .L80240644 -/* 9A8974 80240584 00000000 */ nop -/* 9A8978 80240588 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A897C 8024058C 8C420024 */ lw $v0, 0x24($v0) -/* 9A8980 80240590 AE020028 */ sw $v0, 0x28($s0) -/* 9A8984 80240594 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9A8988 80240598 E6000018 */ swc1 $f0, 0x18($s0) -/* 9A898C 8024059C 8E230088 */ lw $v1, 0x88($s1) -/* 9A8990 802405A0 24020005 */ addiu $v0, $zero, 5 -/* 9A8994 802405A4 10620005 */ beq $v1, $v0, .L802405BC -/* 9A8998 802405A8 00000000 */ nop -/* 9A899C 802405AC 10600003 */ beqz $v1, .L802405BC -/* 9A89A0 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 9A89A4 802405B4 14620006 */ bne $v1, $v0, .L802405D0 -/* 9A89A8 802405B8 00000000 */ nop -.L802405BC: -/* 9A89AC 802405BC 8E220084 */ lw $v0, 0x84($s1) -/* 9A89B0 802405C0 00021FC2 */ srl $v1, $v0, 0x1f -/* 9A89B4 802405C4 00431021 */ addu $v0, $v0, $v1 -/* 9A89B8 802405C8 00021043 */ sra $v0, $v0, 1 -/* 9A89BC 802405CC A60200A8 */ sh $v0, 0xa8($s0) -.L802405D0: -/* 9A89C0 802405D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A89C4 802405D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A89C8 802405D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A89CC 802405DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A89D0 802405E0 8C460028 */ lw $a2, 0x28($v0) -/* 9A89D4 802405E4 0C00A7B5 */ jal dist2D -/* 9A89D8 802405E8 8C470030 */ lw $a3, 0x30($v0) -/* 9A89DC 802405EC C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A89E0 802405F0 46020003 */ div.s $f0, $f0, $f2 -/* 9A89E4 802405F4 3C018024 */ lui $at, %hi(D_80245EE0_9AE2D0) -/* 9A89E8 802405F8 D4225EE0 */ ldc1 $f2, %lo(D_80245EE0_9AE2D0)($at) -/* 9A89EC 802405FC 46000021 */ cvt.d.s $f0, $f0 -/* 9A89F0 80240600 46220000 */ add.d $f0, $f0, $f2 -/* 9A89F4 80240604 4620010D */ trunc.w.d $f4, $f0 -/* 9A89F8 80240608 44022000 */ mfc1 $v0, $f4 -/* 9A89FC 8024060C 00000000 */ nop -/* 9A8A00 80240610 A602008E */ sh $v0, 0x8e($s0) -/* 9A8A04 80240614 00021400 */ sll $v0, $v0, 0x10 -/* 9A8A08 80240618 8E230078 */ lw $v1, 0x78($s1) -/* 9A8A0C 8024061C 00021403 */ sra $v0, $v0, 0x10 -/* 9A8A10 80240620 0043102A */ slt $v0, $v0, $v1 -/* 9A8A14 80240624 10400003 */ beqz $v0, .L80240634 -/* 9A8A18 80240628 00000000 */ nop -/* 9A8A1C 8024062C 9622007A */ lhu $v0, 0x7a($s1) -/* 9A8A20 80240630 A602008E */ sh $v0, 0x8e($s0) -.L80240634: -/* 9A8A24 80240634 8602008E */ lh $v0, 0x8e($s0) -/* 9A8A28 80240638 AE22007C */ sw $v0, 0x7c($s1) -/* 9A8A2C 8024063C 2402000E */ addiu $v0, $zero, 0xe -/* 9A8A30 80240640 AE620070 */ sw $v0, 0x70($s3) -.L80240644: -/* 9A8A34 80240644 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A8A38 80240648 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A8A3C 8024064C 8FB20018 */ lw $s2, 0x18($sp) -/* 9A8A40 80240650 8FB10014 */ lw $s1, 0x14($sp) -/* 9A8A44 80240654 8FB00010 */ lw $s0, 0x10($sp) -/* 9A8A48 80240658 03E00008 */ jr $ra -/* 9A8A4C 8024065C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s index 09c4aa9753..e465c382a0 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -244,7 +244,7 @@ glabel func_80240844_9A8C34 /* 9A8F94 80240BA4 0260202D */ daddu $a0, $s3, $zero .L80240BA8: /* 9A8F98 80240BA8 0280282D */ daddu $a1, $s4, $zero -/* 9A8F9C 80240BAC 0C09014B */ jal func_8024052C_9A891C +/* 9A8F9C 80240BAC 0C09014B */ jal trd_04_UnkDistFunc /* 9A8FA0 80240BB0 02A0302D */ daddu $a2, $s5, $zero /* 9A8FA4 80240BB4 080902FC */ j .L80240BF0 /* 9A8FA8 80240BB8 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s deleted file mode 100644 index 22f15f621a..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240C84_9A9074.s +++ /dev/null @@ -1,102 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245F40_9AE330 -.double 32767.0 - -.section .text - -glabel func_80240C84_9A9074 -/* 9A9074 80240C84 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A9078 80240C88 AFB50024 */ sw $s5, 0x24($sp) -/* 9A907C 80240C8C 0080A82D */ daddu $s5, $a0, $zero -/* 9A9080 80240C90 AFBF002C */ sw $ra, 0x2c($sp) -/* 9A9084 80240C94 AFB60028 */ sw $s6, 0x28($sp) -/* 9A9088 80240C98 AFB40020 */ sw $s4, 0x20($sp) -/* 9A908C 80240C9C AFB3001C */ sw $s3, 0x1c($sp) -/* 9A9090 80240CA0 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9094 80240CA4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A9098 80240CA8 AFB00010 */ sw $s0, 0x10($sp) -/* 9A909C 80240CAC F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9A90A0 80240CB0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9A90A4 80240CB4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9A90A8 80240CB8 8EB30148 */ lw $s3, 0x148($s5) -/* 9A90AC 80240CBC 86640008 */ lh $a0, 8($s3) -/* 9A90B0 80240CC0 0C00EABB */ jal get_npc_unsafe -/* 9A90B4 80240CC4 00A0B02D */ daddu $s6, $a1, $zero -/* 9A90B8 80240CC8 0040A02D */ daddu $s4, $v0, $zero -/* 9A90BC 80240CCC AEA00074 */ sw $zero, 0x74($s5) -/* 9A90C0 80240CD0 C6980038 */ lwc1 $f24, 0x38($s4) -/* 9A90C4 80240CD4 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9A90C8 80240CD8 0000902D */ daddu $s2, $zero, $zero -/* 9A90CC 80240CDC AEA00078 */ sw $zero, 0x78($s5) -/* 9A90D0 80240CE0 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A90D4 80240CE4 8C620000 */ lw $v0, ($v1) -/* 9A90D8 80240CE8 3C0146FF */ lui $at, 0x46ff -/* 9A90DC 80240CEC 3421FE00 */ ori $at, $at, 0xfe00 -/* 9A90E0 80240CF0 4481A000 */ mtc1 $at, $f20 -/* 9A90E4 80240CF4 18400018 */ blez $v0, .L80240D58 -/* 9A90E8 80240CF8 0240802D */ daddu $s0, $s2, $zero -/* 9A90EC 80240CFC 0240882D */ daddu $s1, $s2, $zero -.L80240D00: -/* 9A90F0 80240D00 02231021 */ addu $v0, $s1, $v1 -/* 9A90F4 80240D04 4600C306 */ mov.s $f12, $f24 -/* 9A90F8 80240D08 C4440004 */ lwc1 $f4, 4($v0) -/* 9A90FC 80240D0C 46802120 */ cvt.s.w $f4, $f4 -/* 9A9100 80240D10 44062000 */ mfc1 $a2, $f4 -/* 9A9104 80240D14 C444000C */ lwc1 $f4, 0xc($v0) -/* 9A9108 80240D18 46802120 */ cvt.s.w $f4, $f4 -/* 9A910C 80240D1C 44072000 */ mfc1 $a3, $f4 -/* 9A9110 80240D20 0C00A7B5 */ jal dist2D -/* 9A9114 80240D24 4600B386 */ mov.s $f14, $f22 -/* 9A9118 80240D28 4614003C */ c.lt.s $f0, $f20 -/* 9A911C 80240D2C 00000000 */ nop -/* 9A9120 80240D30 45000003 */ bc1f .L80240D40 -/* 9A9124 80240D34 2631000C */ addiu $s1, $s1, 0xc -/* 9A9128 80240D38 46000506 */ mov.s $f20, $f0 -/* 9A912C 80240D3C AEB20078 */ sw $s2, 0x78($s5) -.L80240D40: -/* 9A9130 80240D40 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9A9134 80240D44 26100001 */ addiu $s0, $s0, 1 -/* 9A9138 80240D48 8C620000 */ lw $v0, ($v1) -/* 9A913C 80240D4C 0202102A */ slt $v0, $s0, $v0 -/* 9A9140 80240D50 1440FFEB */ bnez $v0, .L80240D00 -/* 9A9144 80240D54 26520001 */ addiu $s2, $s2, 1 -.L80240D58: -/* 9A9148 80240D58 8E6200CC */ lw $v0, 0xcc($s3) -/* 9A914C 80240D5C 8C420004 */ lw $v0, 4($v0) -/* 9A9150 80240D60 AE820028 */ sw $v0, 0x28($s4) -/* 9A9154 80240D64 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9A9158 80240D68 8C42007C */ lw $v0, 0x7c($v0) -/* 9A915C 80240D6C 04410004 */ bgez $v0, .L80240D80 -/* 9A9160 80240D70 00000000 */ nop -/* 9A9164 80240D74 C6C00000 */ lwc1 $f0, ($s6) -/* 9A9168 80240D78 08090368 */ j .L80240DA0 -/* 9A916C 80240D7C E6800018 */ swc1 $f0, 0x18($s4) -.L80240D80: -/* 9A9170 80240D80 3C018024 */ lui $at, %hi(D_80245F40_9AE330) -/* 9A9174 80240D84 D4225F40 */ ldc1 $f2, %lo(D_80245F40_9AE330)($at) -/* 9A9178 80240D88 44820000 */ mtc1 $v0, $f0 -/* 9A917C 80240D8C 00000000 */ nop -/* 9A9180 80240D90 46800021 */ cvt.d.w $f0, $f0 -/* 9A9184 80240D94 46220003 */ div.d $f0, $f0, $f2 -/* 9A9188 80240D98 46200020 */ cvt.s.d $f0, $f0 -/* 9A918C 80240D9C E6800018 */ swc1 $f0, 0x18($s4) -.L80240DA0: -/* 9A9190 80240DA0 24020001 */ addiu $v0, $zero, 1 -/* 9A9194 80240DA4 AEA20070 */ sw $v0, 0x70($s5) -/* 9A9198 80240DA8 8FBF002C */ lw $ra, 0x2c($sp) -/* 9A919C 80240DAC 8FB60028 */ lw $s6, 0x28($sp) -/* 9A91A0 80240DB0 8FB50024 */ lw $s5, 0x24($sp) -/* 9A91A4 80240DB4 8FB40020 */ lw $s4, 0x20($sp) -/* 9A91A8 80240DB8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A91AC 80240DBC 8FB20018 */ lw $s2, 0x18($sp) -/* 9A91B0 80240DC0 8FB10014 */ lw $s1, 0x14($sp) -/* 9A91B4 80240DC4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A91B8 80240DC8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9A91BC 80240DCC D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9A91C0 80240DD0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9A91C4 80240DD4 03E00008 */ jr $ra -/* 9A91C8 80240DD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s deleted file mode 100644 index 64b01779c2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80245F48_9AE338 -.double 32767.0 - -.section .text - -glabel func_80241300_9A96F0 -/* 9A96F0 80241300 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A96F4 80241304 AFB10014 */ sw $s1, 0x14($sp) -/* 9A96F8 80241308 0080882D */ daddu $s1, $a0, $zero -/* 9A96FC 8024130C AFBF001C */ sw $ra, 0x1c($sp) -/* 9A9700 80241310 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9704 80241314 AFB00010 */ sw $s0, 0x10($sp) -/* 9A9708 80241318 8E300148 */ lw $s0, 0x148($s1) -/* 9A970C 8024131C 86040008 */ lh $a0, 8($s0) -/* 9A9710 80241320 0C00EABB */ jal get_npc_unsafe -/* 9A9714 80241324 00A0902D */ daddu $s2, $a1, $zero -/* 9A9718 80241328 8E230078 */ lw $v1, 0x78($s1) -/* 9A971C 8024132C 24630001 */ addiu $v1, $v1, 1 -/* 9A9720 80241330 AE230078 */ sw $v1, 0x78($s1) -/* 9A9724 80241334 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9A9728 80241338 8C840000 */ lw $a0, ($a0) -/* 9A972C 8024133C 0064182A */ slt $v1, $v1, $a0 -/* 9A9730 80241340 14600002 */ bnez $v1, .L8024134C -/* 9A9734 80241344 0040282D */ daddu $a1, $v0, $zero -/* 9A9738 80241348 AE200078 */ sw $zero, 0x78($s1) -.L8024134C: -/* 9A973C 8024134C 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A9740 80241350 8C420004 */ lw $v0, 4($v0) -/* 9A9744 80241354 ACA20028 */ sw $v0, 0x28($a1) -/* 9A9748 80241358 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9A974C 8024135C 8C42007C */ lw $v0, 0x7c($v0) -/* 9A9750 80241360 04410004 */ bgez $v0, .L80241374 -/* 9A9754 80241364 00000000 */ nop -/* 9A9758 80241368 C6400000 */ lwc1 $f0, ($s2) -/* 9A975C 8024136C 080904E5 */ j .L80241394 -/* 9A9760 80241370 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241374: -/* 9A9764 80241374 3C018024 */ lui $at, %hi(D_80245F48_9AE338) -/* 9A9768 80241378 D4225F48 */ ldc1 $f2, %lo(D_80245F48_9AE338)($at) -/* 9A976C 8024137C 44820000 */ mtc1 $v0, $f0 -/* 9A9770 80241380 00000000 */ nop -/* 9A9774 80241384 46800021 */ cvt.d.w $f0, $f0 -/* 9A9778 80241388 46220003 */ div.d $f0, $f0, $f2 -/* 9A977C 8024138C 46200020 */ cvt.s.d $f0, $f0 -/* 9A9780 80241390 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241394: -/* 9A9784 80241394 24020001 */ addiu $v0, $zero, 1 -/* 9A9788 80241398 AE220070 */ sw $v0, 0x70($s1) -/* 9A978C 8024139C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A9790 802413A0 8FB20018 */ lw $s2, 0x18($sp) -/* 9A9794 802413A4 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9798 802413A8 8FB00010 */ lw $s0, 0x10($sp) -/* 9A979C 802413AC 03E00008 */ jr $ra -/* 9A97A0 802413B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s index 07af2f623c..1490ef6ba7 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -139,7 +139,7 @@ glabel func_80241818_9A9C08 glabel L802419FC_9A9DEC /* 9A9DEC 802419FC 0280202D */ daddu $a0, $s4, $zero /* 9A9DF0 80241A00 0260282D */ daddu $a1, $s3, $zero -/* 9A9DF4 80241A04 0C090321 */ jal func_80240C84_9A9074 +/* 9A9DF4 80241A04 0C090321 */ jal trd_04_UnkNpcAIFunc24 /* 9A9DF8 80241A08 02A0302D */ daddu $a2, $s5, $zero glabel L80241A0C_9A9DFC /* 9A9DFC 80241A0C 0280202D */ daddu $a0, $s4, $zero @@ -163,7 +163,7 @@ glabel L80241A34_9A9E24 glabel L80241A4C_9A9E3C /* 9A9E3C 80241A4C 0280202D */ daddu $a0, $s4, $zero /* 9A9E40 80241A50 0260282D */ daddu $a1, $s3, $zero -/* 9A9E44 80241A54 0C0904C0 */ jal func_80241300_9A96F0 +/* 9A9E44 80241A54 0C0904C0 */ jal trd_04_UnkNpcAIFunc25 /* 9A9E48 80241A58 02A0302D */ daddu $a2, $s5, $zero /* 9A9E4C 80241A5C 080906BB */ j L80241AEC_9A9EDC /* 9A9E50 80241A60 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index ab4d46fd30..d196751d80 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -149,7 +149,7 @@ glabel func_80241B14_9A9F04 glabel L80241D20_9AA110 /* 9AA110 80241D20 0260202D */ daddu $a0, $s3, $zero /* 9AA114 80241D24 0280282D */ daddu $a1, $s4, $zero -/* 9AA118 80241D28 0C090321 */ jal func_80240C84_9A9074 +/* 9AA118 80241D28 0C090321 */ jal trd_04_UnkNpcAIFunc24 /* 9AA11C 80241D2C 02A0302D */ daddu $a2, $s5, $zero /* 9AA120 80241D30 96220086 */ lhu $v0, 0x86($s1) /* 9AA124 80241D34 A64200A8 */ sh $v0, 0xa8($s2) @@ -175,7 +175,7 @@ glabel L80241D60_9AA150 glabel L80241D78_9AA168 /* 9AA168 80241D78 0260202D */ daddu $a0, $s3, $zero /* 9AA16C 80241D7C 0280282D */ daddu $a1, $s4, $zero -/* 9AA170 80241D80 0C0904C0 */ jal func_80241300_9A96F0 +/* 9AA170 80241D80 0C0904C0 */ jal trd_04_UnkNpcAIFunc25 /* 9AA174 80241D84 02A0302D */ daddu $a2, $s5, $zero /* 9AA178 80241D88 0809077C */ j L80241DF0_9AA1E0 /* 9AA17C 80241D8C 00000000 */ nop @@ -187,7 +187,7 @@ glabel L80241D90_9AA180 glabel L80241DA0_9AA190 /* 9AA190 80241DA0 0260202D */ daddu $a0, $s3, $zero /* 9AA194 80241DA4 0280282D */ daddu $a1, $s4, $zero -/* 9AA198 80241DA8 0C09014B */ jal func_8024052C_9A891C +/* 9AA198 80241DA8 0C09014B */ jal trd_04_UnkDistFunc /* 9AA19C 80241DAC 02A0302D */ daddu $a2, $s5, $zero /* 9AA1A0 80241DB0 0809077C */ j L80241DF0_9AA1E0 /* 9AA1A4 80241DB4 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s deleted file mode 100644 index 0ba8f55367..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80246270_9AE660 -.double 32767.0 - -.section .text - -glabel func_80241E18_9AA208 -/* 9AA208 80241E18 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9AA20C 80241E1C AFB3002C */ sw $s3, 0x2c($sp) -/* 9AA210 80241E20 0080982D */ daddu $s3, $a0, $zero -/* 9AA214 80241E24 AFBF0030 */ sw $ra, 0x30($sp) -/* 9AA218 80241E28 AFB20028 */ sw $s2, 0x28($sp) -/* 9AA21C 80241E2C AFB10024 */ sw $s1, 0x24($sp) -/* 9AA220 80241E30 AFB00020 */ sw $s0, 0x20($sp) -/* 9AA224 80241E34 8E710148 */ lw $s1, 0x148($s3) -/* 9AA228 80241E38 86240008 */ lh $a0, 8($s1) -/* 9AA22C 80241E3C 0C00EABB */ jal get_npc_unsafe -/* 9AA230 80241E40 00A0902D */ daddu $s2, $a1, $zero -/* 9AA234 80241E44 8E440004 */ lw $a0, 4($s2) -/* 9AA238 80241E48 0040802D */ daddu $s0, $v0, $zero -/* 9AA23C 80241E4C 00041FC2 */ srl $v1, $a0, 0x1f -/* 9AA240 80241E50 00832021 */ addu $a0, $a0, $v1 -/* 9AA244 80241E54 00042043 */ sra $a0, $a0, 1 -/* 9AA248 80241E58 0C00A67F */ jal rand_int -/* 9AA24C 80241E5C 24840001 */ addiu $a0, $a0, 1 -/* 9AA250 80241E60 8E430004 */ lw $v1, 4($s2) -/* 9AA254 80241E64 000327C2 */ srl $a0, $v1, 0x1f -/* 9AA258 80241E68 00641821 */ addu $v1, $v1, $a0 -/* 9AA25C 80241E6C 00031843 */ sra $v1, $v1, 1 -/* 9AA260 80241E70 00621821 */ addu $v1, $v1, $v0 -/* 9AA264 80241E74 A603008E */ sh $v1, 0x8e($s0) -/* 9AA268 80241E78 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9AA26C 80241E7C C6000040 */ lwc1 $f0, 0x40($s0) -/* 9AA270 80241E80 C4640000 */ lwc1 $f4, ($v1) -/* 9AA274 80241E84 46802120 */ cvt.s.w $f4, $f4 -/* 9AA278 80241E88 C4620008 */ lwc1 $f2, 8($v1) -/* 9AA27C 80241E8C 468010A0 */ cvt.s.w $f2, $f2 -/* 9AA280 80241E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA284 80241E94 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA288 80241E98 44061000 */ mfc1 $a2, $f2 -/* 9AA28C 80241E9C C440000C */ lwc1 $f0, 0xc($v0) -/* 9AA290 80241EA0 46800020 */ cvt.s.w $f0, $f0 -/* 9AA294 80241EA4 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9AA298 80241EA8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA29C 80241EAC 44052000 */ mfc1 $a1, $f4 -/* 9AA2A0 80241EB0 C4400010 */ lwc1 $f0, 0x10($v0) -/* 9AA2A4 80241EB4 46800020 */ cvt.s.w $f0, $f0 -/* 9AA2A8 80241EB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AA2AC 80241EBC 8C640018 */ lw $a0, 0x18($v1) -/* 9AA2B0 80241EC0 0C0123F5 */ jal is_point_within_region -/* 9AA2B4 80241EC4 8E070038 */ lw $a3, 0x38($s0) -/* 9AA2B8 80241EC8 1040000E */ beqz $v0, .L80241F04 -/* 9AA2BC 80241ECC 00000000 */ nop -/* 9AA2C0 80241ED0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA2C4 80241ED4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AA2C8 80241ED8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AA2CC 80241EDC C4460000 */ lwc1 $f6, ($v0) -/* 9AA2D0 80241EE0 468031A0 */ cvt.s.w $f6, $f6 -/* 9AA2D4 80241EE4 44063000 */ mfc1 $a2, $f6 -/* 9AA2D8 80241EE8 C4460008 */ lwc1 $f6, 8($v0) -/* 9AA2DC 80241EEC 468031A0 */ cvt.s.w $f6, $f6 -/* 9AA2E0 80241EF0 44073000 */ mfc1 $a3, $f6 -/* 9AA2E4 80241EF4 0C00A720 */ jal atan2 -/* 9AA2E8 80241EF8 00000000 */ nop -/* 9AA2EC 80241EFC 080907CD */ j .L80241F34 -/* 9AA2F0 80241F00 E600000C */ swc1 $f0, 0xc($s0) -.L80241F04: -/* 9AA2F4 80241F04 0C00A67F */ jal rand_int -/* 9AA2F8 80241F08 2404003C */ addiu $a0, $zero, 0x3c -/* 9AA2FC 80241F0C C60C000C */ lwc1 $f12, 0xc($s0) -/* 9AA300 80241F10 44820000 */ mtc1 $v0, $f0 -/* 9AA304 80241F14 00000000 */ nop -/* 9AA308 80241F18 46800020 */ cvt.s.w $f0, $f0 -/* 9AA30C 80241F1C 46006300 */ add.s $f12, $f12, $f0 -/* 9AA310 80241F20 3C0141F0 */ lui $at, 0x41f0 -/* 9AA314 80241F24 44810000 */ mtc1 $at, $f0 -/* 9AA318 80241F28 0C00A6C9 */ jal clamp_angle -/* 9AA31C 80241F2C 46006301 */ sub.s $f12, $f12, $f0 -/* 9AA320 80241F30 E600000C */ swc1 $f0, 0xc($s0) -.L80241F34: -/* 9AA324 80241F34 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AA328 80241F38 8C420004 */ lw $v0, 4($v0) -/* 9AA32C 80241F3C AE020028 */ sw $v0, 0x28($s0) -/* 9AA330 80241F40 AE600074 */ sw $zero, 0x74($s3) -/* 9AA334 80241F44 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA338 80241F48 8C420014 */ lw $v0, 0x14($v0) -/* 9AA33C 80241F4C 04410004 */ bgez $v0, .L80241F60 -/* 9AA340 80241F50 00000000 */ nop -/* 9AA344 80241F54 C6400000 */ lwc1 $f0, ($s2) -/* 9AA348 80241F58 080907E0 */ j .L80241F80 -/* 9AA34C 80241F5C E6000018 */ swc1 $f0, 0x18($s0) -.L80241F60: -/* 9AA350 80241F60 3C018024 */ lui $at, %hi(D_80246270_9AE660) -/* 9AA354 80241F64 D4226270 */ ldc1 $f2, %lo(D_80246270_9AE660)($at) -/* 9AA358 80241F68 44820000 */ mtc1 $v0, $f0 -/* 9AA35C 80241F6C 00000000 */ nop -/* 9AA360 80241F70 46800021 */ cvt.d.w $f0, $f0 -/* 9AA364 80241F74 46220003 */ div.d $f0, $f0, $f2 -/* 9AA368 80241F78 46200020 */ cvt.s.d $f0, $f0 -/* 9AA36C 80241F7C E6000018 */ swc1 $f0, 0x18($s0) -.L80241F80: -/* 9AA370 80241F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA374 80241F84 3C014059 */ lui $at, 0x4059 -/* 9AA378 80241F88 44811800 */ mtc1 $at, $f3 -/* 9AA37C 80241F8C 44801000 */ mtc1 $zero, $f2 -/* 9AA380 80241F90 46000021 */ cvt.d.s $f0, $f0 -/* 9AA384 80241F94 46220002 */ mul.d $f0, $f0, $f2 -/* 9AA388 80241F98 00000000 */ nop -/* 9AA38C 80241F9C 24020001 */ addiu $v0, $zero, 1 -/* 9AA390 80241FA0 4620018D */ trunc.w.d $f6, $f0 -/* 9AA394 80241FA4 E626007C */ swc1 $f6, 0x7c($s1) -/* 9AA398 80241FA8 AE620070 */ sw $v0, 0x70($s3) -/* 9AA39C 80241FAC 8FBF0030 */ lw $ra, 0x30($sp) -/* 9AA3A0 80241FB0 8FB3002C */ lw $s3, 0x2c($sp) -/* 9AA3A4 80241FB4 8FB20028 */ lw $s2, 0x28($sp) -/* 9AA3A8 80241FB8 8FB10024 */ lw $s1, 0x24($sp) -/* 9AA3AC 80241FBC 8FB00020 */ lw $s0, 0x20($sp) -/* 9AA3B0 80241FC0 03E00008 */ jr $ra -/* 9AA3B4 80241FC4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s index c194947539..b9cf50fd05 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -81,7 +81,7 @@ glabel func_80243124_9AB514 glabel L80243230_9AB620 /* 9AB620 80243230 0280202D */ daddu $a0, $s4, $zero /* 9AB624 80243234 0200282D */ daddu $a1, $s0, $zero -/* 9AB628 80243238 0C090786 */ jal func_80241E18_9AA208 +/* 9AB628 80243238 0C090786 */ jal trd_04_UnkNpcAIFunc23 /* 9AB62C 8024323C 0260302D */ daddu $a2, $s3, $zero glabel L80243240_9AB630 /* 9AB630 80243240 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s index d277317e74..972c0504cc 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -84,7 +84,7 @@ glabel func_80243650_9ABA40 glabel L80243768_9ABB58 /* 9ABB58 80243768 0260202D */ daddu $a0, $s3, $zero /* 9ABB5C 8024376C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB60 80243770 0C090786 */ jal func_80241E18_9AA208 +/* 9ABB60 80243770 0C090786 */ jal trd_04_UnkNpcAIFunc23 /* 9ABB64 80243774 0280302D */ daddu $a2, $s4, $zero glabel L80243778_9ABB68 /* 9ABB68 80243778 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s deleted file mode 100644 index 3dd865d99c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244820_9BB1A0 -.double 0.8 - -.section .text - -glabel func_8024038C_9B6D0C -/* 9B6D0C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B6D10 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B6D14 80240394 0080982D */ daddu $s3, $a0, $zero -/* 9B6D18 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B6D1C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* 9B6D20 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B6D24 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B6D28 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* 9B6D2C 802403AC 86240008 */ lh $a0, 8($s1) -/* 9B6D30 802403B0 0C00EABB */ jal get_npc_unsafe -/* 9B6D34 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* 9B6D38 802403B8 0040802D */ daddu $s0, $v0, $zero -/* 9B6D3C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* 9B6D40 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* 9B6D44 802403C4 18400005 */ blez $v0, .L802403DC -/* 9B6D48 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* 9B6D4C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* 9B6D50 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* 9B6D54 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* 9B6D58 802403D8 00000000 */ nop -.L802403DC: -/* 9B6D5C 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* 9B6D60 802403E0 14400030 */ bnez $v0, .L802404A4 -/* 9B6D64 802403E4 00000000 */ nop -/* 9B6D68 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B6D6C 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* 9B6D70 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* 9B6D74 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9B6D78 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* 9B6D7C 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* 9B6D80 80240400 24020005 */ addiu $v0, $zero, 5 -/* 9B6D84 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* 9B6D88 80240408 00000000 */ nop -/* 9B6D8C 8024040C 10600003 */ beqz $v1, .L8024041C -/* 9B6D90 80240410 24020001 */ addiu $v0, $zero, 1 -/* 9B6D94 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* 9B6D98 80240418 00000000 */ nop -.L8024041C: -/* 9B6D9C 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* 9B6DA0 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* 9B6DA4 80240424 00431021 */ addu $v0, $v0, $v1 -/* 9B6DA8 80240428 00021043 */ sra $v0, $v0, 1 -/* 9B6DAC 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* 9B6DB0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B6DB4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B6DB8 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B6DBC 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B6DC0 80240440 8C460028 */ lw $a2, 0x28($v0) -/* 9B6DC4 80240444 0C00A7B5 */ jal dist2D -/* 9B6DC8 80240448 8C470030 */ lw $a3, 0x30($v0) -/* 9B6DCC 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9B6DD0 80240450 46020003 */ div.s $f0, $f0, $f2 -/* 9B6DD4 80240454 3C018024 */ lui $at, %hi(D_80244820_9BB1A0) -/* 9B6DD8 80240458 D4224820 */ ldc1 $f2, %lo(D_80244820_9BB1A0)($at) -/* 9B6DDC 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* 9B6DE0 80240460 46220000 */ add.d $f0, $f0, $f2 -/* 9B6DE4 80240464 4620010D */ trunc.w.d $f4, $f0 -/* 9B6DE8 80240468 44022000 */ mfc1 $v0, $f4 -/* 9B6DEC 8024046C 00000000 */ nop -/* 9B6DF0 80240470 A602008E */ sh $v0, 0x8e($s0) -/* 9B6DF4 80240474 00021400 */ sll $v0, $v0, 0x10 -/* 9B6DF8 80240478 8E230078 */ lw $v1, 0x78($s1) -/* 9B6DFC 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* 9B6E00 80240480 0043102A */ slt $v0, $v0, $v1 -/* 9B6E04 80240484 10400003 */ beqz $v0, .L80240494 -/* 9B6E08 80240488 00000000 */ nop -/* 9B6E0C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* 9B6E10 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* 9B6E14 80240494 8602008E */ lh $v0, 0x8e($s0) -/* 9B6E18 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* 9B6E1C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* 9B6E20 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* 9B6E24 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B6E28 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B6E2C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* 9B6E30 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9B6E34 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9B6E38 802404B8 03E00008 */ jr $ra -/* 9B6E3C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s index e8741aca07..8672c5d5f7 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -244,7 +244,7 @@ glabel func_802406A4_9B7024 /* 9B7384 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* 9B7388 80240A08 0280282D */ daddu $a1, $s4, $zero -/* 9B738C 80240A0C 0C0900E3 */ jal func_8024038C_9B6D0C +/* 9B738C 80240A0C 0C0900E3 */ jal trd_07_UnkDistFunc /* 9B7390 80240A10 02A0302D */ daddu $a2, $s5, $zero /* 9B7394 80240A14 08090294 */ j .L80240A50 /* 9B7398 80240A18 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s deleted file mode 100644 index 38edee9c41..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -glabel D_80244880_9BB200 -.double 32767.0 - -.section .text - -glabel func_80240AE4_9B7464 -/* 9B7464 80240AE4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9B7468 80240AE8 AFB3002C */ sw $s3, 0x2c($sp) -/* 9B746C 80240AEC 0080982D */ daddu $s3, $a0, $zero -/* 9B7470 80240AF0 AFBF0030 */ sw $ra, 0x30($sp) -/* 9B7474 80240AF4 AFB20028 */ sw $s2, 0x28($sp) -/* 9B7478 80240AF8 AFB10024 */ sw $s1, 0x24($sp) -/* 9B747C 80240AFC AFB00020 */ sw $s0, 0x20($sp) -/* 9B7480 80240B00 8E710148 */ lw $s1, 0x148($s3) -/* 9B7484 80240B04 86240008 */ lh $a0, 8($s1) -/* 9B7488 80240B08 0C00EABB */ jal get_npc_unsafe -/* 9B748C 80240B0C 00A0902D */ daddu $s2, $a1, $zero -/* 9B7490 80240B10 8E440004 */ lw $a0, 4($s2) -/* 9B7494 80240B14 0040802D */ daddu $s0, $v0, $zero -/* 9B7498 80240B18 00041FC2 */ srl $v1, $a0, 0x1f -/* 9B749C 80240B1C 00832021 */ addu $a0, $a0, $v1 -/* 9B74A0 80240B20 00042043 */ sra $a0, $a0, 1 -/* 9B74A4 80240B24 0C00A67F */ jal rand_int -/* 9B74A8 80240B28 24840001 */ addiu $a0, $a0, 1 -/* 9B74AC 80240B2C 8E430004 */ lw $v1, 4($s2) -/* 9B74B0 80240B30 000327C2 */ srl $a0, $v1, 0x1f -/* 9B74B4 80240B34 00641821 */ addu $v1, $v1, $a0 -/* 9B74B8 80240B38 00031843 */ sra $v1, $v1, 1 -/* 9B74BC 80240B3C 00621821 */ addu $v1, $v1, $v0 -/* 9B74C0 80240B40 A603008E */ sh $v1, 0x8e($s0) -/* 9B74C4 80240B44 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B74C8 80240B48 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9B74CC 80240B4C C4640000 */ lwc1 $f4, ($v1) -/* 9B74D0 80240B50 46802120 */ cvt.s.w $f4, $f4 -/* 9B74D4 80240B54 C4620008 */ lwc1 $f2, 8($v1) -/* 9B74D8 80240B58 468010A0 */ cvt.s.w $f2, $f2 -/* 9B74DC 80240B5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B74E0 80240B60 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B74E4 80240B64 44061000 */ mfc1 $a2, $f2 -/* 9B74E8 80240B68 C440000C */ lwc1 $f0, 0xc($v0) -/* 9B74EC 80240B6C 46800020 */ cvt.s.w $f0, $f0 -/* 9B74F0 80240B70 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9B74F4 80240B74 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B74F8 80240B78 44052000 */ mfc1 $a1, $f4 -/* 9B74FC 80240B7C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9B7500 80240B80 46800020 */ cvt.s.w $f0, $f0 -/* 9B7504 80240B84 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B7508 80240B88 8C640018 */ lw $a0, 0x18($v1) -/* 9B750C 80240B8C 0C0123F5 */ jal is_point_within_region -/* 9B7510 80240B90 8E070038 */ lw $a3, 0x38($s0) -/* 9B7514 80240B94 1040000E */ beqz $v0, .L80240BD0 -/* 9B7518 80240B98 00000000 */ nop -/* 9B751C 80240B9C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7520 80240BA0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B7524 80240BA4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B7528 80240BA8 C4460000 */ lwc1 $f6, ($v0) -/* 9B752C 80240BAC 468031A0 */ cvt.s.w $f6, $f6 -/* 9B7530 80240BB0 44063000 */ mfc1 $a2, $f6 -/* 9B7534 80240BB4 C4460008 */ lwc1 $f6, 8($v0) -/* 9B7538 80240BB8 468031A0 */ cvt.s.w $f6, $f6 -/* 9B753C 80240BBC 44073000 */ mfc1 $a3, $f6 -/* 9B7540 80240BC0 0C00A720 */ jal atan2 -/* 9B7544 80240BC4 00000000 */ nop -/* 9B7548 80240BC8 08090300 */ j .L80240C00 -/* 9B754C 80240BCC E600000C */ swc1 $f0, 0xc($s0) -.L80240BD0: -/* 9B7550 80240BD0 0C00A67F */ jal rand_int -/* 9B7554 80240BD4 2404003C */ addiu $a0, $zero, 0x3c -/* 9B7558 80240BD8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9B755C 80240BDC 44820000 */ mtc1 $v0, $f0 -/* 9B7560 80240BE0 00000000 */ nop -/* 9B7564 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* 9B7568 80240BE8 46006300 */ add.s $f12, $f12, $f0 -/* 9B756C 80240BEC 3C0141F0 */ lui $at, 0x41f0 -/* 9B7570 80240BF0 44810000 */ mtc1 $at, $f0 -/* 9B7574 80240BF4 0C00A6C9 */ jal clamp_angle -/* 9B7578 80240BF8 46006301 */ sub.s $f12, $f12, $f0 -/* 9B757C 80240BFC E600000C */ swc1 $f0, 0xc($s0) -.L80240C00: -/* 9B7580 80240C00 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B7584 80240C04 8C420004 */ lw $v0, 4($v0) -/* 9B7588 80240C08 AE020028 */ sw $v0, 0x28($s0) -/* 9B758C 80240C0C AE600074 */ sw $zero, 0x74($s3) -/* 9B7590 80240C10 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7594 80240C14 8C420014 */ lw $v0, 0x14($v0) -/* 9B7598 80240C18 04410004 */ bgez $v0, .L80240C2C -/* 9B759C 80240C1C 00000000 */ nop -/* 9B75A0 80240C20 C6400000 */ lwc1 $f0, ($s2) -/* 9B75A4 80240C24 08090313 */ j .L80240C4C -/* 9B75A8 80240C28 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C2C: -/* 9B75AC 80240C2C 3C018024 */ lui $at, %hi(D_80244880_9BB200) -/* 9B75B0 80240C30 D4224880 */ ldc1 $f2, %lo(D_80244880_9BB200)($at) -/* 9B75B4 80240C34 44820000 */ mtc1 $v0, $f0 -/* 9B75B8 80240C38 00000000 */ nop -/* 9B75BC 80240C3C 46800021 */ cvt.d.w $f0, $f0 -/* 9B75C0 80240C40 46220003 */ div.d $f0, $f0, $f2 -/* 9B75C4 80240C44 46200020 */ cvt.s.d $f0, $f0 -/* 9B75C8 80240C48 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C4C: -/* 9B75CC 80240C4C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B75D0 80240C50 3C014059 */ lui $at, 0x4059 -/* 9B75D4 80240C54 44811800 */ mtc1 $at, $f3 -/* 9B75D8 80240C58 44801000 */ mtc1 $zero, $f2 -/* 9B75DC 80240C5C 46000021 */ cvt.d.s $f0, $f0 -/* 9B75E0 80240C60 46220002 */ mul.d $f0, $f0, $f2 -/* 9B75E4 80240C64 00000000 */ nop -/* 9B75E8 80240C68 24020001 */ addiu $v0, $zero, 1 -/* 9B75EC 80240C6C 4620018D */ trunc.w.d $f6, $f0 -/* 9B75F0 80240C70 E626007C */ swc1 $f6, 0x7c($s1) -/* 9B75F4 80240C74 AE620070 */ sw $v0, 0x70($s3) -/* 9B75F8 80240C78 8FBF0030 */ lw $ra, 0x30($sp) -/* 9B75FC 80240C7C 8FB3002C */ lw $s3, 0x2c($sp) -/* 9B7600 80240C80 8FB20028 */ lw $s2, 0x28($sp) -/* 9B7604 80240C84 8FB10024 */ lw $s1, 0x24($sp) -/* 9B7608 80240C88 8FB00020 */ lw $s0, 0x20($sp) -/* 9B760C 80240C8C 03E00008 */ jr $ra -/* 9B7610 80240C90 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s index dd0a2d89c4..70f6f9f4ca 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -81,7 +81,7 @@ glabel func_80241DF0_9B8770 glabel L80241EFC_9B887C /* 9B887C 80241EFC 0280202D */ daddu $a0, $s4, $zero /* 9B8880 80241F00 0200282D */ daddu $a1, $s0, $zero -/* 9B8884 80241F04 0C0902B9 */ jal func_80240AE4_9B7464 +/* 9B8884 80241F04 0C0902B9 */ jal trd_07_UnkNpcAIFunc23 /* 9B8888 80241F08 0260302D */ daddu $a2, $s3, $zero glabel L80241F0C_9B888C /* 9B888C 80241F0C 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s index 98064adfff..00bb082a25 100644 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s +++ b/ver/us/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -84,7 +84,7 @@ glabel func_8024231C_9B8C9C glabel L80242434_9B8DB4 /* 9B8DB4 80242434 0260202D */ daddu $a0, $s3, $zero /* 9B8DB8 80242438 0200282D */ daddu $a1, $s0, $zero -/* 9B8DBC 8024243C 0C0902B9 */ jal func_80240AE4_9B7464 +/* 9B8DBC 8024243C 0C0902B9 */ jal trd_07_UnkNpcAIFunc23 /* 9B8DC0 80242440 0280302D */ daddu $a2, $s4, $zero glabel L80242444_9B8DC4 /* 9B8DC4 80242444 0260202D */ daddu $a0, $s3, $zero diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 67fc94def9..05bdebd31b 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1463,6 +1463,7 @@ D_80098280 = 0x80098280; // type:data rom:0x73680 D_80098288 = 0x80098288; // type:data rom:0x73688 D_80098390 = 0x80098390; // type:data rom:0x73790 D_8009839C = 0x8009839C; // type:data rom:0x7379C +D_800983F8 = 0x800983F8; // type:data rom:0x737F8 D_80098480 = 0x80098480; // type:data rom:0x73880 D_80098488 = 0x80098488; // type:data rom:0x73888 D_80098490 = 0x80098490; // type:data rom:0x73890 @@ -7476,11 +7477,11 @@ func_80242250_7ECF60 = 0x80242250; // type:func rom:0x7ECF60 func_8024228C_7ECF9C = 0x8024228C; // type:func rom:0x7ECF9C mac_00_UnkMusicFunc = 0x802422C0; // type:func rom:0x7ECFD0 func_802423F0_7ED100 = 0x802423F0; // type:func rom:0x7ED100 -func_80242570_7ED280 = 0x80242570; // type:func rom:0x7ED280 +mac_00_UnkNpcAIFunc24 = 0x80242570; // type:func rom:0x7ED280 mac_00_UnkFunc13 = 0x802426C8; // type:func rom:0x7ED3D8 mac_00_UnkNpcAIFunc1 = 0x80242970; // type:func rom:0x7ED680 mac_00_UnkFunc14 = 0x80242A30; // type:func rom:0x7ED740 -func_80242BEC_7ED8FC = 0x80242BEC; // type:func rom:0x7ED8FC +mac_00_UnkNpcAIFunc25 = 0x80242BEC; // type:func rom:0x7ED8FC mac_00_NpcJumpFunc2 = 0x80242CA0; // type:func rom:0x7ED9B0 mac_00_NpcJumpFunc = 0x80242D14; // type:func rom:0x7EDA24 mac_00_UnkNpcAIFunc13 = 0x80242D8C; // type:func rom:0x7EDA9C @@ -7522,11 +7523,11 @@ func_80240628_800EA8 = 0x80240628; // type:func rom:0x800EA8 func_80240E80_801700 = 0x80240E80; // type:func rom:0x801700 func_80240ED8_801758 = 0x80240ED8; // type:func rom:0x801758 mac_01_UnkMusicFunc = 0x80240F50; // type:func rom:0x8017D0 -func_80241080_801900 = 0x80241080; // type:func rom:0x801900 +dup_mac_01_UnkNpcAIFunc24 = 0x80241080; // type:func rom:0x801900 mac_01_UnkFunc13 = 0x802411D8; // type:func rom:0x801A58 dup_mac_01_UnkNpcAIFunc1 = 0x80241480; // type:func rom:0x801D00 mac_01_UnkFunc14 = 0x80241540; // type:func rom:0x801DC0 -func_802416FC_801F7C = 0x802416FC; // type:func rom:0x801F7C +dup_mac_01_UnkNpcAIFunc25 = 0x802416FC; // type:func rom:0x801F7C dup_mac_01_NpcJumpFunc2 = 0x802417B0; // type:func rom:0x802030 dup_mac_01_NpcJumpFunc = 0x80241824; // type:func rom:0x8020A4 dup_mac_01_UnkNpcAIFunc13 = 0x8024189C; // type:func rom:0x80211C @@ -7615,11 +7616,11 @@ func_80245488_805D08 = 0x80245488; // type:func rom:0x805D08 func_802454B4_805D34 = 0x802454B4; // type:func rom:0x805D34 func_80245504_805D84 = 0x80245504; // type:func rom:0x805D84 func_8024552C_805DAC = 0x8024552C; // type:func rom:0x805DAC -func_80245550_805DD0 = 0x80245550; // type:func rom:0x805DD0 +mac_01_UnkNpcAIFunc24 = 0x80245550; // type:func rom:0x805DD0 mac_01_UnkFunc13_copy = 0x802456A8; // type:func rom:0x805F28 mac_01_UnkNpcAIFunc1 = 0x80245950; // type:func rom:0x8061D0 mac_01_UnkFunc14_copy = 0x80245A10; // type:func rom:0x806290 -func_80245BCC_80644C = 0x80245BCC; // type:func rom:0x80644C +mac_01_UnkNpcAIFunc25 = 0x80245BCC; // type:func rom:0x80644C mac_01_NpcJumpFunc2 = 0x80245C80; // type:func rom:0x806500 mac_01_NpcJumpFunc = 0x80245CF4; // type:func rom:0x806574 mac_01_UnkNpcAIFunc13 = 0x80245D6C; // type:func rom:0x8065EC @@ -7659,11 +7660,11 @@ func_802405F0_8238B0 = 0x802405F0; // type:func rom:0x8238B0 mac_02_foliage_setup_shear_mtx = 0x802406B0; // type:func rom:0x823970 mac_02_TransformFoliage = 0x80240720; // type:func rom:0x8239E0 mac_02_SetEntityFlags100000 = 0x802408F0; // type:func rom:0x823BB0 -func_80240930_823BF0 = 0x80240930; // type:func rom:0x823BF0 +mac_02_UnkNpcAIFunc24 = 0x80240930; // type:func rom:0x823BF0 mac_02_UnkFunc13 = 0x80240A88; // type:func rom:0x823D48 mac_02_UnkNpcAIFunc1 = 0x80240D30; // type:func rom:0x823FF0 mac_02_UnkFunc14 = 0x80240DF0; // type:func rom:0x8240B0 -func_80240FAC_82426C = 0x80240FAC; // type:func rom:0x82426C +mac_02_UnkNpcAIFunc25 = 0x80240FAC; // type:func rom:0x82426C mac_02_NpcJumpFunc2 = 0x80241060; // type:func rom:0x824320 mac_02_NpcJumpFunc = 0x802410D4; // type:func rom:0x824394 mac_02_UnkNpcAIFunc13 = 0x8024114C; // type:func rom:0x82440C @@ -7865,11 +7866,11 @@ mac_05_UnkTexturePanFunc = 0x80240000; // type:func rom:0x852170 mac_05_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x852294 func_8024030C_85247C = 0x8024030C; // type:func rom:0x85247C func_8024047C_8525EC = 0x8024047C; // type:func rom:0x8525EC -func_80240490_852600 = 0x80240490; // type:func rom:0x852600 +mac_05_UnkNpcAIFunc24 = 0x80240490; // type:func rom:0x852600 mac_05_UnkFunc13 = 0x802405E8; // type:func rom:0x852758 mac_05_UnkNpcAIFunc1 = 0x80240890; // type:func rom:0x852A00 mac_05_UnkFunc14 = 0x80240950; // type:func rom:0x852AC0 -func_80240B0C_852C7C = 0x80240B0C; // type:func rom:0x852C7C +mac_05_UnkNpcAIFunc25 = 0x80240B0C; // type:func rom:0x852C7C mac_05_NpcJumpFunc2 = 0x80240BC0; // type:func rom:0x852D30 mac_05_NpcJumpFunc = 0x80240C34; // type:func rom:0x852DA4 mac_05_UnkNpcAIFunc13 = 0x80240CAC; // type:func rom:0x852E1C @@ -8057,7 +8058,7 @@ tik_07_UnkFunc18 = 0x80240348; // type:func rom:0x879F28 tik_07_UnkFunc37 = 0x802403B4; // type:func rom:0x879F94 tik_07_UnkFunc38 = 0x80240400; // type:func rom:0x879FE0 func_802404AC_87A08C = 0x802404AC; // type:func rom:0x87A08C -func_802406FC_87A2DC = 0x802406FC; // type:func rom:0x87A2DC +tik_07_SwitchToPartner = 0x802406FC; // type:func rom:0x87A2DC tik_07_UnkFunc19 = 0x80240728; // type:func rom:0x87A308 tik_07_UnkFunc20 = 0x80240760; // type:func rom:0x87A340 tik_07_UnkFunc39 = 0x802407F0; // type:func rom:0x87A3D0 @@ -8070,7 +8071,7 @@ tik_07_UnkPartnerPosFunc2 = 0x80240FA0; // type:func rom:0x87AB80 tik_07_UnkFunc40 = 0x80240FE8; // type:func rom:0x87ABC8 func_80241020_87AC00 = 0x80241020; // type:func rom:0x87AC00 func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70 -func_802413F0_87AFD0 = 0x802413F0; // type:func rom:0x87AFD0 +tik_07_UnkNpcAIFunc23 = 0x802413F0; // type:func rom:0x87AFD0 func_802415A0_87B180 = 0x802415A0; // type:func rom:0x87B180 tik_07_UnkNpcAIFunc1 = 0x80241BC8; // type:func rom:0x87B7A8 tik_07_UnkFunc4 = 0x80241C88; // type:func rom:0x87B868 @@ -8114,7 +8115,7 @@ tik_09_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8825C4 func_802405F0_8827B0 = 0x802405F0; // type:func rom:0x8827B0 tik_09_SetEntityPosition = 0x80240960; // type:func rom:0x882B20 tik_09_set_script_owner_npc_anim = 0x80240A30; // type:func rom:0x882BF0 -func_80240AAC_882C6C = 0x80240AAC; // type:func rom:0x882C6C +tik_09_UnkDistFunc = 0x80240AAC; // type:func rom:0x882C6C tik_09_UnkNpcAIFunc12 = 0x80240BE0; // type:func rom:0x882DA0 tik_09_set_script_owner_npc_col_height = 0x80240D44; // type:func rom:0x882F04 func_80240DC4_882F84 = 0x80240DC4; // type:func rom:0x882F84 @@ -8130,7 +8131,7 @@ tik_10_UnkFunc18 = 0x802406E8; // type:func rom:0x886AA8 tik_10_UnkFunc37 = 0x80240754; // type:func rom:0x886B14 tik_10_UnkFunc38 = 0x802407A0; // type:func rom:0x886B60 func_8024084C_886C0C = 0x8024084C; // type:func rom:0x886C0C -func_80240A9C_886E5C = 0x80240A9C; // type:func rom:0x886E5C +tik_10_SwitchToPartner = 0x80240A9C; // type:func rom:0x886E5C tik_10_UnkFunc19 = 0x80240AC8; // type:func rom:0x886E88 tik_10_UnkFunc20 = 0x80240B00; // type:func rom:0x886EC0 tik_10_UnkFunc39 = 0x80240B90; // type:func rom:0x886F50 @@ -8165,7 +8166,7 @@ tik_12_UnkFunc18 = 0x80240C84; // type:func rom:0x889854 tik_12_UnkFunc37 = 0x80240CF0; // type:func rom:0x8898C0 tik_12_UnkFunc38 = 0x80240D3C; // type:func rom:0x88990C func_80240DE8_8899B8 = 0x80240DE8; // type:func rom:0x8899B8 -func_80241038_889C08 = 0x80241038; // type:func rom:0x889C08 +tik_12_SwitchToPartner = 0x80241038; // type:func rom:0x889C08 tik_12_UnkFunc19 = 0x80241064; // type:func rom:0x889C34 tik_12_UnkFunc20 = 0x8024109C; // type:func rom:0x889C6C tik_12_UnkFunc39 = 0x8024112C; // type:func rom:0x889CFC @@ -8177,7 +8178,7 @@ tik_12_UnkPartnerPosFunc = 0x80241894; // type:func rom:0x88A464 tik_12_UnkPartnerPosFunc2 = 0x802418DC; // type:func rom:0x88A4AC tik_12_UnkFunc40 = 0x80241924; // type:func rom:0x88A4F4 tik_12_set_script_owner_npc_anim = 0x80241960; // type:func rom:0x88A530 -func_802419DC_88A5AC = 0x802419DC; // type:func rom:0x88A5AC +tik_12_UnkDistFunc = 0x802419DC; // type:func rom:0x88A5AC tik_12_UnkNpcAIFunc12 = 0x80241B10; // type:func rom:0x88A6E0 tik_12_set_script_owner_npc_col_height = 0x80241C74; // type:func rom:0x88A844 func_80241CF4_88A8C4 = 0x80241CF4; // type:func rom:0x88A8C4 @@ -8223,7 +8224,7 @@ tik_17_UnkFunc18 = 0x80240098; // type:func rom:0x892AB8 tik_17_UnkFunc37 = 0x80240104; // type:func rom:0x892B24 tik_17_UnkFunc38 = 0x80240150; // type:func rom:0x892B70 func_802401FC_892C1C = 0x802401FC; // type:func rom:0x892C1C -func_8024044C_892E6C = 0x8024044C; // type:func rom:0x892E6C +tik_17_SwitchToPartner = 0x8024044C; // type:func rom:0x892E6C tik_17_UnkFunc19 = 0x80240478; // type:func rom:0x892E98 tik_17_UnkFunc20 = 0x802404B0; // type:func rom:0x892ED0 tik_17_UnkFunc39 = 0x80240540; // type:func rom:0x892F60 @@ -8265,7 +8266,7 @@ tik_19_UnkFunc18 = 0x80240658; // type:func rom:0x897C38 tik_19_UnkFunc37 = 0x802406C4; // type:func rom:0x897CA4 tik_19_UnkFunc38 = 0x80240710; // type:func rom:0x897CF0 func_802407BC_897D9C = 0x802407BC; // type:func rom:0x897D9C -func_80240A0C_897FEC = 0x80240A0C; // type:func rom:0x897FEC +tik_19_SwitchToPartner = 0x80240A0C; // type:func rom:0x897FEC tik_19_UnkFunc19 = 0x80240A38; // type:func rom:0x898018 tik_19_UnkFunc20 = 0x80240A70; // type:func rom:0x898050 tik_19_UnkFunc39 = 0x80240B00; // type:func rom:0x8980E0 @@ -8290,7 +8291,7 @@ tik_20_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89A82C tik_20_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89A898 func_802405EC_89A93C = 0x802405EC; // type:func rom:0x89A93C tik_20_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x89ACB0 -func_802409DC_89AD2C = 0x802409DC; // type:func rom:0x89AD2C +tik_20_UnkDistFunc = 0x802409DC; // type:func rom:0x89AD2C tik_20_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x89AE60 tik_20_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x89AFC4 func_80240CF4_89B044 = 0x80240CF4; // type:func rom:0x89B044 @@ -8325,7 +8326,7 @@ tik_23_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8A26B0 tik_23_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8A27D4 func_802405EC_8A29BC = 0x802405EC; // type:func rom:0x8A29BC tik_23_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x8A2D30 -func_802409DC_8A2DAC = 0x802409DC; // type:func rom:0x8A2DAC +tik_23_UnkDistFunc = 0x802409DC; // type:func rom:0x8A2DAC tik_23_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x8A2EE0 tik_23_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x8A3044 func_80240CF4_8A30C4 = 0x80240CF4; // type:func rom:0x8A30C4 @@ -8335,7 +8336,7 @@ tik_24_UnkTexturePanFunc = 0x80240050; // type:func rom:0x8A5AD0 tik_24_UnkTexturePanFunc2 = 0x80240174; // type:func rom:0x8A5BF4 func_80240360_8A5DE0 = 0x80240360; // type:func rom:0x8A5DE0 tik_24_set_script_owner_npc_anim = 0x802406D0; // type:func rom:0x8A6150 -func_8024074C_8A61CC = 0x8024074C; // type:func rom:0x8A61CC +tik_24_UnkDistFunc = 0x8024074C; // type:func rom:0x8A61CC tik_24_UnkNpcAIFunc12 = 0x80240880; // type:func rom:0x8A6300 tik_24_set_script_owner_npc_col_height = 0x802409E4; // type:func rom:0x8A6464 func_80240A64_8A64E4 = 0x80240A64; // type:func rom:0x8A64E4 @@ -8541,7 +8542,7 @@ kmr_04_func_80240444_8CAD44 = 0x80240444; // type:func rom:0x8CAD44 D_80241BF0_8CC4F0 = 0x80241BF0; // type:data rom:0x8CC4F0 D_80242070_8CC970 = 0x80242070; // type:data rom:0x8CC970 D_802429F4_8CD2F4 = 0x802429F4; // type:data rom:0x8CD2F4 -func_80240000_8CE070 = 0x80240000; // type:func rom:0x8CE070 +kmr_05_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8CE070 func_802401B0_8CE220 = 0x802401B0; // type:func rom:0x8CE220 kmr_05_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8CE848 kmr_05_UnkFunc4 = 0x80240898; // type:func rom:0x8CE908 @@ -8559,7 +8560,7 @@ D_80241B2C_8CFB9C = 0x80241B2C; // type:data rom:0x8CFB9C D_80243440_8D14B0 = 0x80243440; // type:data rom:0x8D14B0 D_80243448_8D14B8 = 0x80243448; // type:data rom:0x8D14B8 D_80243450_8D14C0 = 0x80243450; // type:data rom:0x8D14C0 -func_80240000_8D1510 = 0x80240000; // type:func rom:0x8D1510 +kmr_06_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8D1510 func_802401B0_8D16C0 = 0x802401B0; // type:func rom:0x8D16C0 kmr_06_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D1CE8 kmr_06_UnkFunc4 = 0x80240898; // type:func rom:0x8D1DA8 @@ -8596,7 +8597,7 @@ func_80240A6C_8D482C = 0x80240A6C; // type:func rom:0x8D482C D_80241E90_8D5C50 = 0x80241E90; // type:data rom:0x8D5C50 D_80241E98_8D5C58 = 0x80241E98; // type:data rom:0x8D5C58 D_80241EA0_8D5C60 = 0x80241EA0; // type:data rom:0x8D5C60 -func_80240000_8D5E00 = 0x80240000; // type:func rom:0x8D5E00 +kmr_09_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0x8D5E00 func_802401B0_8D5FB0 = 0x802401B0; // type:func rom:0x8D5FB0 kmr_09_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D65D8 kmr_09_UnkFunc4 = 0x80240898; // type:func rom:0x8D6698 @@ -8954,7 +8955,7 @@ iwa_10_UnkFunc18 = 0x80240358; // type:func rom:0x91E8C8 iwa_10_UnkFunc37 = 0x802403C4; // type:func rom:0x91E934 iwa_10_UnkFunc38 = 0x80240410; // type:func rom:0x91E980 func_802404BC_91EA2C = 0x802404BC; // type:func rom:0x91EA2C -func_8024070C_91EC7C = 0x8024070C; // type:func rom:0x91EC7C +iwa_10_SwitchToPartner = 0x8024070C; // type:func rom:0x91EC7C iwa_10_UnkFunc19 = 0x80240738; // type:func rom:0x91ECA8 iwa_10_UnkFunc20 = 0x80240770; // type:func rom:0x91ECE0 iwa_10_UnkFunc39 = 0x80240800; // type:func rom:0x91ED70 @@ -9182,7 +9183,7 @@ sbk_56_UnkFunc18 = 0x802400E8; // type:func rom:0x9540A8 sbk_56_UnkFunc37 = 0x80240154; // type:func rom:0x954114 sbk_56_UnkFunc38 = 0x802401A0; // type:func rom:0x954160 func_8024024C_95420C = 0x8024024C; // type:func rom:0x95420C -func_8024049C_95445C = 0x8024049C; // type:func rom:0x95445C +sbk_56_SwitchToPartner = 0x8024049C; // type:func rom:0x95445C sbk_56_UnkFunc19 = 0x802404C8; // type:func rom:0x954488 sbk_56_UnkFunc20 = 0x80240500; // type:func rom:0x9544C0 sbk_56_UnkFunc39 = 0x80240590; // type:func rom:0x954550 @@ -9220,11 +9221,11 @@ dro_01_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x95B3D0 dro_01_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x95B43C dro_01_UnkFunc27 = 0x802402E0; // type:func rom:0x95B4E0 dro_01_UnkFunc26 = 0x80240404; // type:func rom:0x95B604 -dro_01_func_802405E0_95B7E0 = 0x802405E0; // type:func rom:0x95B7E0 +dro_01_UnkNpcAIFunc24 = 0x802405E0; // type:func rom:0x95B7E0 dro_01_UnkFunc13 = 0x80240738; // type:func rom:0x95B938 dro_01_UnkNpcAIFunc1 = 0x802409E0; // type:func rom:0x95BBE0 dro_01_UnkFunc14 = 0x80240AA0; // type:func rom:0x95BCA0 -dro_01_func_80240C5C_95BE5C = 0x80240C5C; // type:func rom:0x95BE5C +dro_01_UnkNpcAIFunc25 = 0x80240C5C; // type:func rom:0x95BE5C dro_01_NpcJumpFunc2 = 0x80240D10; // type:func rom:0x95BF10 dro_01_NpcJumpFunc = 0x80240D84; // type:func rom:0x95BF84 dro_01_UnkNpcAIFunc13 = 0x80240DFC; // type:func rom:0x95BFFC @@ -9648,14 +9649,14 @@ func_80240040_978750 = 0x80240040; // type:func rom:0x978750 isk_02_SetNpcB5_3 = 0x802400F0; // type:func rom:0x978800 isk_04_SetEntityFlags100000 = 0x80240000; // type:func rom:0x97B630 isk_04_set_script_owner_npc_anim = 0x80240040; // type:func rom:0x97B670 -func_802400BC_97B6EC = 0x802400BC; // type:func rom:0x97B6EC +isk_04_UnkDistFunc = 0x802400BC; // type:func rom:0x97B6EC isk_04_UnkNpcAIFunc12 = 0x802401F0; // type:func rom:0x97B820 isk_04_set_script_owner_npc_col_height = 0x80240354; // type:func rom:0x97B984 func_802403D4_97BA04 = 0x802403D4; // type:func rom:0x97BA04 isk_04_func_80240814_97BE44 = 0x80240814; // type:func rom:0x97BE44 isk_04_AwaitPlayerNearNpc = 0x8024085C; // type:func rom:0x97BE8C isk_04_func_802408B4_97BEE4 = 0x802408B4; // type:func rom:0x97BEE4 -func_80240930_97BF60 = 0x80240930; // type:func rom:0x97BF60 +isk_04_SwitchToPartner = 0x80240930; // type:func rom:0x97BF60 func_8024095C_97BF8C = 0x8024095C; // type:func rom:0x97BF8C D_80242288_97D8B8 = 0x80242288; // type:data rom:0x97D8B8 D_80242430_97DA60 = 0x80242430; // type:data rom:0x97DA60 @@ -9691,7 +9692,7 @@ func_80240014_982454 = 0x80240014; // type:func rom:0x982454 isk_07_SetEntityFlags100000 = 0x802400B0; // type:func rom:0x9824F0 func_802400F0_982530 = 0x802400F0; // type:func rom:0x982530 isk_08_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x984E30 -func_8024007C_984EAC = 0x8024007C; // type:func rom:0x984EAC +isk_08_UnkDistFunc = 0x8024007C; // type:func rom:0x984EAC isk_08_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x984FE0 isk_08_set_script_owner_npc_col_height = 0x80240314; // type:func rom:0x985144 func_80240394_9851C4 = 0x80240394; // type:func rom:0x9851C4 @@ -9713,7 +9714,7 @@ isk_10_UnkFunc18 = 0x80240068; // type:func rom:0x988BC8 isk_10_UnkFunc37 = 0x802400D4; // type:func rom:0x988C34 isk_10_UnkFunc38 = 0x80240120; // type:func rom:0x988C80 func_802401CC_988D2C = 0x802401CC; // type:func rom:0x988D2C -func_8024041C_988F7C = 0x8024041C; // type:func rom:0x988F7C +isk_10_SwitchToPartner = 0x8024041C; // type:func rom:0x988F7C isk_10_UnkFunc19 = 0x80240448; // type:func rom:0x988FA8 isk_10_UnkFunc20 = 0x80240480; // type:func rom:0x988FE0 isk_10_UnkFunc39 = 0x80240510; // type:func rom:0x989070 @@ -9787,7 +9788,7 @@ func_80240708_9958F8 = 0x80240708; // type:func rom:0x9958F8 isk_16_UnkFunc27 = 0x80240800; // type:func rom:0x9959F0 isk_16_UnkFunc26 = 0x80240924; // type:func rom:0x995B14 isk_18_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x997F70 -func_8024007C_997FEC = 0x8024007C; // type:func rom:0x997FEC +isk_18_UnkDistFunc = 0x8024007C; // type:func rom:0x997FEC isk_18_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x998120 isk_18_set_script_owner_npc_col_height = 0x80240314; // type:func rom:0x998284 func_80240394_998304 = 0x80240394; // type:func rom:0x998304 @@ -9809,7 +9810,7 @@ trd_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x99CAB4 trd_01_SetEntityFlags100000 = 0x80240310; // type:func rom:0x99CCA0 trd_01_GetEntityPosition = 0x80240344; // type:func rom:0x99CCD4 trd_01_set_script_owner_npc_anim = 0x802403F0; // type:func rom:0x99CD80 -func_8024046C_99CDFC = 0x8024046C; // type:func rom:0x99CDFC +trd_01_UnkDistFunc = 0x8024046C; // type:func rom:0x99CDFC trd_01_UnkNpcAIFunc12 = 0x802405A0; // type:func rom:0x99CF30 trd_01_set_script_owner_npc_col_height = 0x80240704; // type:func rom:0x99D094 func_80240784_99D114 = 0x80240784; // type:func rom:0x99D114 @@ -9831,15 +9832,15 @@ D_802444B0_9A0E40 = 0x802444B0; // type:data rom:0x9A0E40 trd_02_SetEntityFlags100000 = 0x80240000; // type:func rom:0x9A0FE0 trd_02_GetEntityPosition = 0x80240034; // type:func rom:0x9A1014 trd_02_set_script_owner_npc_anim = 0x802400E0; // type:func rom:0x9A10C0 -func_8024015C_9A113C = 0x8024015C; // type:func rom:0x9A113C +trd_02_UnkDistFunc = 0x8024015C; // type:func rom:0x9A113C trd_02_UnkNpcAIFunc12 = 0x80240290; // type:func rom:0x9A1270 trd_02_set_script_owner_npc_col_height = 0x802403F4; // type:func rom:0x9A13D4 func_80240474_9A1454 = 0x80240474; // type:func rom:0x9A1454 -func_802408B4_9A1894 = 0x802408B4; // type:func rom:0x9A1894 +trd_02_UnkNpcAIFunc24 = 0x802408B4; // type:func rom:0x9A1894 trd_02_UnkFunc13 = 0x80240A0C; // type:func rom:0x9A19EC trd_02_UnkNpcAIFunc1 = 0x80240CB4; // type:func rom:0x9A1C94 trd_02_UnkFunc14 = 0x80240D74; // type:func rom:0x9A1D54 -func_80240F30_9A1F10 = 0x80240F30; // type:func rom:0x9A1F10 +trd_02_UnkNpcAIFunc25 = 0x80240F30; // type:func rom:0x9A1F10 trd_02_NpcJumpFunc2 = 0x80240FE4; // type:func rom:0x9A1FC4 trd_02_NpcJumpFunc = 0x80241058; // type:func rom:0x9A2038 trd_02_UnkNpcAIFunc13 = 0x802410D0; // type:func rom:0x9A20B0 @@ -9854,7 +9855,7 @@ D_80243348_9A4328 = 0x80243348; // type:data rom:0x9A4328 func_80240000_9A4650 = 0x80240000; // type:func rom:0x9A4650 GetFrameCounter = 0x8024006C; // type:func rom:0x9A46BC trd_03_set_script_owner_npc_anim = 0x802400A0; // type:func rom:0x9A46F0 -func_8024011C_9A476C = 0x8024011C; // type:func rom:0x9A476C +trd_03_UnkDistFunc = 0x8024011C; // type:func rom:0x9A476C trd_03_UnkNpcAIFunc12 = 0x80240250; // type:func rom:0x9A48A0 trd_03_set_script_owner_npc_col_height = 0x802403B4; // type:func rom:0x9A4A04 func_80240434_9A4A84 = 0x80240434; // type:func rom:0x9A4A84 @@ -9866,15 +9867,15 @@ trd_04_SetEntityFlags100000 = 0x80240310; // type:func rom:0x9A8700 trd_04_SetEntityPosition = 0x80240344; // type:func rom:0x9A8734 trd_04_GetEntityPosition = 0x80240408; // type:func rom:0x9A87F8 trd_04_set_script_owner_npc_anim = 0x802404B0; // type:func rom:0x9A88A0 -func_8024052C_9A891C = 0x8024052C; // type:func rom:0x9A891C +trd_04_UnkDistFunc = 0x8024052C; // type:func rom:0x9A891C trd_04_UnkNpcAIFunc12 = 0x80240660; // type:func rom:0x9A8A50 trd_04_set_script_owner_npc_col_height = 0x802407C4; // type:func rom:0x9A8BB4 func_80240844_9A8C34 = 0x80240844; // type:func rom:0x9A8C34 -func_80240C84_9A9074 = 0x80240C84; // type:func rom:0x9A9074 +trd_04_UnkNpcAIFunc24 = 0x80240C84; // type:func rom:0x9A9074 trd_04_UnkFunc13 = 0x80240DDC; // type:func rom:0x9A91CC trd_04_UnkNpcAIFunc1 = 0x80241084; // type:func rom:0x9A9474 trd_04_UnkFunc14 = 0x80241144; // type:func rom:0x9A9534 -func_80241300_9A96F0 = 0x80241300; // type:func rom:0x9A96F0 +trd_04_UnkNpcAIFunc25 = 0x80241300; // type:func rom:0x9A96F0 trd_04_NpcJumpFunc2 = 0x802413B4; // type:func rom:0x9A97A4 trd_04_NpcJumpFunc = 0x80241428; // type:func rom:0x9A9818 trd_04_UnkNpcAIFunc13 = 0x802414A0; // type:func rom:0x9A9890 @@ -9883,7 +9884,7 @@ trd_04_UnkNpcDurationFlagFunc = 0x802416F0; // type:func rom:0x9A9AE0 trd_04_UnkFunc16 = 0x80241758; // type:func rom:0x9A9B48 func_80241818_9A9C08 = 0x80241818; // type:func rom:0x9A9C08 func_80241B14_9A9F04 = 0x80241B14; // type:func rom:0x9A9F04 -func_80241E18_9AA208 = 0x80241E18; // type:func rom:0x9AA208 +trd_04_UnkNpcAIFunc23 = 0x80241E18; // type:func rom:0x9AA208 func_80241FC8_9AA3B8 = 0x80241FC8; // type:func rom:0x9AA3B8 dup_trd_04_UnkNpcAIFunc1 = 0x802425F0; // type:func rom:0x9AA9E0 trd_04_UnkFunc4 = 0x802426B0; // type:func rom:0x9AAAA0 @@ -9933,11 +9934,11 @@ D_802451D8_9B6968 = 0x802451D8; // type:data rom:0x9B6968 trd_07_UnkTexturePanFunc = 0x80240000; // type:func rom:0x9B6980 trd_07_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x9B6AA4 trd_07_set_script_owner_npc_anim = 0x80240310; // type:func rom:0x9B6C90 -func_8024038C_9B6D0C = 0x8024038C; // type:func rom:0x9B6D0C +trd_07_UnkDistFunc = 0x8024038C; // type:func rom:0x9B6D0C trd_07_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0x9B6E40 trd_07_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0x9B6FA4 func_802406A4_9B7024 = 0x802406A4; // type:func rom:0x9B7024 -func_80240AE4_9B7464 = 0x80240AE4; // type:func rom:0x9B7464 +trd_07_UnkNpcAIFunc23 = 0x80240AE4; // type:func rom:0x9B7464 func_80240C94_9B7614 = 0x80240C94; // type:func rom:0x9B7614 trd_07_UnkNpcAIFunc1 = 0x802412BC; // type:func rom:0x9B7C3C trd_07_UnkFunc4 = 0x8024137C; // type:func rom:0x9B7CFC @@ -10074,11 +10075,11 @@ func_80240678_9D7698 = 0x80240678; // type:func rom:0x9D7698 func_802406B0_9D76D0 = 0x802406B0; // type:func rom:0x9D76D0 func_80240750_9D7770 = 0x80240750; // type:func rom:0x9D7770 func_80240970_9D7990 = 0x80240970; // type:func rom:0x9D7990 -func_80240A80_9D7AA0 = 0x80240A80; // type:func rom:0x9D7AA0 +nok_02_UnkNpcAIFunc24 = 0x80240A80; // type:func rom:0x9D7AA0 nok_02_UnkFunc13 = 0x80240BD8; // type:func rom:0x9D7BF8 nok_02_UnkNpcAIFunc1 = 0x80240E80; // type:func rom:0x9D7EA0 nok_02_UnkFunc14 = 0x80240F40; // type:func rom:0x9D7F60 -func_802410FC_9D811C = 0x802410FC; // type:func rom:0x9D811C +nok_02_UnkNpcAIFunc25 = 0x802410FC; // type:func rom:0x9D811C nok_02_NpcJumpFunc2 = 0x802411B0; // type:func rom:0x9D81D0 nok_02_NpcJumpFunc = 0x80241224; // type:func rom:0x9D8244 nok_02_UnkNpcAIFunc13 = 0x8024129C; // type:func rom:0x9D82BC @@ -10122,7 +10123,7 @@ nok_02_SetManyVars = 0x80242CF8; // type:func rom:0x9D9D18 nok_02_UnkYawFunc = 0x80242DE8; // type:func rom:0x9D9E08 func_80242F74_9D9F94 = 0x80242F74; // type:func rom:0x9D9F94 func_80242FB8_9D9FD8 = 0x80242FB8; // type:func rom:0x9D9FD8 -func_80242FE4_9DA004 = 0x80242FE4; // type:func rom:0x9DA004 +nok_02_SwitchToPartner = 0x80242FE4; // type:func rom:0x9DA004 func_80243010_9DA030 = 0x80243010; // type:func rom:0x9DA030 func_802430CC_9DA0EC = 0x802430CC; // type:func rom:0x9DA0EC func_80243214_9DA234 = 0x80243214; // type:func rom:0x9DA234 @@ -10202,11 +10203,11 @@ D_80246E28_9F4A18 = 0x80246E28; // type:data rom:0x9F4A18 D_80246E30_9F4A20 = 0x80246E30; // type:data rom:0x9F4A20 D_80246E40_9F4A30 = 0x80246E40; // type:data rom:0x9F4A30 nok_11_set_script_owner_npc_anim = 0x80240000; // type:func rom:0x9F4A40 -func_8024007C_9F4ABC = 0x8024007C; // type:func rom:0x9F4ABC +nok_11_UnkDistFunc = 0x8024007C; // type:func rom:0x9F4ABC nok_11_UnkNpcAIFunc12 = 0x802401B0; // type:func rom:0x9F4BF0 nok_11_set_script_owner_npc_col_height = 0x80240314; // type:func rom:0x9F4D54 func_80240394_9F4DD4 = 0x80240394; // type:func rom:0x9F4DD4 -func_802407D4_9F5214 = 0x802407D4; // type:func rom:0x9F5214 +nok_11_UnkNpcAIFunc23 = 0x802407D4; // type:func rom:0x9F5214 func_80240984_9F53C4 = 0x80240984; // type:func rom:0x9F53C4 nok_11_UnkNpcAIFunc1 = 0x80240FAC; // type:func rom:0x9F59EC nok_11_UnkFunc4 = 0x8024106C; // type:func rom:0x9F5AAC @@ -10234,15 +10235,15 @@ nok_12_UnsetCamera0Flag1000 = 0x8024030C; // type:func rom:0x9FAAFC nok_12_foliage_setup_shear_mtx = 0x80240330; // type:func rom:0x9FAB20 nok_12_TransformFoliage = 0x802403A0; // type:func rom:0x9FAB90 nok_12_set_script_owner_npc_anim = 0x80240570; // type:func rom:0x9FAD60 -func_802405EC_9FADDC = 0x802405EC; // type:func rom:0x9FADDC +nok_12_UnkDistFunc = 0x802405EC; // type:func rom:0x9FADDC nok_12_UnkNpcAIFunc12 = 0x80240720; // type:func rom:0x9FAF10 nok_12_set_script_owner_npc_col_height = 0x80240884; // type:func rom:0x9FB074 func_80240904_9FB0F4 = 0x80240904; // type:func rom:0x9FB0F4 -func_80240D44_9FB534 = 0x80240D44; // type:func rom:0x9FB534 +nok_12_UnkNpcAIFunc24 = 0x80240D44; // type:func rom:0x9FB534 nok_12_UnkFunc13 = 0x80240E9C; // type:func rom:0x9FB68C nok_12_UnkNpcAIFunc1 = 0x80241144; // type:func rom:0x9FB934 nok_12_UnkFunc14 = 0x80241204; // type:func rom:0x9FB9F4 -func_802413C0_9FBBB0 = 0x802413C0; // type:func rom:0x9FBBB0 +nok_12_UnkNpcAIFunc25 = 0x802413C0; // type:func rom:0x9FBBB0 nok_12_NpcJumpFunc2 = 0x80241474; // type:func rom:0x9FBC64 nok_12_NpcJumpFunc = 0x802414E8; // type:func rom:0x9FBCD8 nok_12_UnkNpcAIFunc13 = 0x80241560; // type:func rom:0x9FBD50 @@ -10275,11 +10276,11 @@ func_80240000_A02840 = 0x80240000; // type:func rom:0xA02840 func_80240180_A029C0 = 0x80240180; // type:func rom:0xA029C0 nok_14_UnsetCamera0Flag1000 = 0x8024019C; // type:func rom:0xA029DC nok_14_set_script_owner_npc_anim = 0x802401C0; // type:func rom:0xA02A00 -func_8024023C_A02A7C = 0x8024023C; // type:func rom:0xA02A7C +nok_14_UnkDistFunc = 0x8024023C; // type:func rom:0xA02A7C nok_14_UnkNpcAIFunc12 = 0x80240370; // type:func rom:0xA02BB0 nok_14_set_script_owner_npc_col_height = 0x802404D4; // type:func rom:0xA02D14 func_80240554_A02D94 = 0x80240554; // type:func rom:0xA02D94 -func_80240994_A031D4 = 0x80240994; // type:func rom:0xA031D4 +nok_14_UnkNpcAIFunc23 = 0x80240994; // type:func rom:0xA031D4 func_80240B44_A03384 = 0x80240B44; // type:func rom:0xA03384 nok_14_UnkNpcAIFunc1 = 0x8024116C; // type:func rom:0xA039AC nok_14_UnkFunc4 = 0x8024122C; // type:func rom:0xA03A6C @@ -10307,11 +10308,11 @@ nok_15_GetEntryPos = 0x802400F0; // type:func rom:0xA06FF0 nok_15_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xA070D0 nok_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xA0713C nok_15_set_script_owner_npc_anim = 0x802402E0; // type:func rom:0xA071E0 -func_8024035C_A0725C = 0x8024035C; // type:func rom:0xA0725C +nok_15_UnkDistFunc = 0x8024035C; // type:func rom:0xA0725C nok_15_UnkNpcAIFunc12 = 0x80240490; // type:func rom:0xA07390 nok_15_set_script_owner_npc_col_height = 0x802405F4; // type:func rom:0xA074F4 func_80240674_A07574 = 0x80240674; // type:func rom:0xA07574 -func_80240AB4_A079B4 = 0x80240AB4; // type:func rom:0xA079B4 +nok_15_UnkNpcAIFunc23 = 0x80240AB4; // type:func rom:0xA079B4 func_80240C64_A07B64 = 0x80240C64; // type:func rom:0xA07B64 nok_15_UnkNpcAIFunc1 = 0x8024128C; // type:func rom:0xA0818C nok_15_UnkFunc4 = 0x8024134C; // type:func rom:0xA0824C @@ -10370,7 +10371,7 @@ func_80240BB8_A11438 = 0x80240BB8; // type:func rom:0xA11438 func_80240C08_A11488 = 0x80240C08; // type:func rom:0xA11488 func_80240C34_A114B4 = 0x80240C34; // type:func rom:0xA114B4 func_80240C84_A11504 = 0x80240C84; // type:func rom:0xA11504 -func_80240CB0_A11530 = 0x80240CB0; // type:func rom:0xA11530 +hos_01_SwitchToPartner = 0x80240CB0; // type:func rom:0xA11530 func_80240CDC_A1155C = 0x80240CDC; // type:func rom:0xA1155C hos_01_UnsetCamera0MoveFlag1 = 0x80240DD0; // type:func rom:0xA11650 hos_01_dup_GetFloorCollider = 0x80240DEC; // type:func rom:0xA1166C @@ -10391,7 +10392,7 @@ func_80240BFC_A16E1C = 0x80240BFC; // type:func rom:0xA16E1C func_80240EF4_A17114 = 0x80240EF4; // type:func rom:0xA17114 func_80240F68_A17188 = 0x80240F68; // type:func rom:0xA17188 func_80240FD0_A171F0 = 0x80240FD0; // type:func rom:0xA171F0 -func_80240FF0_A17210 = 0x80240FF0; // type:func rom:0xA17210 +hos_02_UnkNpcAIFunc23 = 0x80240FF0; // type:func rom:0xA17210 func_802411A0_A173C0 = 0x802411A0; // type:func rom:0xA173C0 hos_02_UnkNpcAIFunc1 = 0x802417C8; // type:func rom:0xA179E8 hos_02_UnkFunc4 = 0x80241888; // type:func rom:0xA17AA8 @@ -10434,7 +10435,7 @@ func_80240928_A1BA28 = 0x80240928; // type:func rom:0xA1BA28 func_80240A50_A1BB50 = 0x80240A50; // type:func rom:0xA1BB50 hos_03_foliage_setup_shear_mtx = 0x80240A70; // type:func rom:0xA1BB70 hos_03_TransformFoliage = 0x80240AE0; // type:func rom:0xA1BBE0 -func_80240CB0_A1BDB0 = 0x80240CB0; // type:func rom:0xA1BDB0 +hos_03_UnkNpcAIFunc23 = 0x80240CB0; // type:func rom:0xA1BDB0 func_80240E60_A1BF60 = 0x80240E60; // type:func rom:0xA1BF60 hos_03_UnkNpcAIFunc1 = 0x80241488; // type:func rom:0xA1C588 hos_03_UnkFunc4 = 0x80241548; // type:func rom:0xA1C648 @@ -10758,7 +10759,7 @@ hos_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA45A54 func_80240310_A45C40 = 0x80240310; // type:func rom:0xA45C40 func_80240000_A46F60 = 0x80240000; // type:func rom:0xA46F60 kpa_01_set_script_owner_npc_anim = 0x80240160; // type:func rom:0xA470C0 -func_802401DC_A4713C = 0x802401DC; // type:func rom:0xA4713C +kpa_01_UnkDistFunc = 0x802401DC; // type:func rom:0xA4713C kpa_01_UnkNpcAIFunc12 = 0x80240310; // type:func rom:0xA47270 kpa_01_set_script_owner_npc_col_height = 0x80240474; // type:func rom:0xA473D4 func_802404F4_A47454 = 0x802404F4; // type:func rom:0xA47454 @@ -10768,7 +10769,7 @@ kpa_01_func_802408B4_97BEE4 = 0x802409D4; // type:func rom:0xA47934 D_80241600_A48560 = 0x80241600; // type:data rom:0xA48560 func_80240000_A485C0 = 0x80240000; // type:func rom:0xA485C0 kpa_03_set_script_owner_npc_anim = 0x80240160; // type:func rom:0xA48720 -func_802401DC_A4879C = 0x802401DC; // type:func rom:0xA4879C +kpa_03_UnkDistFunc = 0x802401DC; // type:func rom:0xA4879C kpa_03_UnkNpcAIFunc12 = 0x80240310; // type:func rom:0xA488D0 kpa_03_set_script_owner_npc_col_height = 0x80240474; // type:func rom:0xA48A34 func_802404F4_A48AB4 = 0x802404F4; // type:func rom:0xA48AB4 @@ -10859,7 +10860,7 @@ kpa_10_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA51AA4 kpa_11_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA528C0 kpa_11_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA529E4 kpa_11_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA52BD0 -func_8024038C_A52C4C = 0x8024038C; // type:func rom:0xA52C4C +kpa_11_UnkDistFunc = 0x8024038C; // type:func rom:0xA52C4C kpa_11_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA52D80 kpa_11_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xA52EE4 func_802406A4_A52F64 = 0x802406A4; // type:func rom:0xA52F64 @@ -10917,7 +10918,7 @@ func_80240A98_A61468 = 0x80240A98; // type:func rom:0xA61468 func_80240EF4_A618C4 = 0x80240EF4; // type:func rom:0xA618C4 kpa_50_GetEncounterEnemyIsOwner = 0x80241214; // type:func rom:0xA61BE4 kpa_50_set_script_owner_npc_anim = 0x8024124C; // type:func rom:0xA61C1C -func_802412C8_A61C98 = 0x802412C8; // type:func rom:0xA61C98 +kpa_50_UnkDistFunc = 0x802412C8; // type:func rom:0xA61C98 kpa_50_UnkNpcAIFunc12 = 0x802413FC; // type:func rom:0xA61DCC kpa_50_set_script_owner_npc_col_height = 0x80241560; // type:func rom:0xA61F30 func_802415E0_A61FB0 = 0x802415E0; // type:func rom:0xA61FB0 @@ -10947,7 +10948,7 @@ func_80241374_A65404 = 0x80241374; // type:func rom:0xA65404 kpa_51_GetEncounterEnemyIsOwner = 0x802413CC; // type:func rom:0xA6545C func_80241404_A65494 = 0x80241404; // type:func rom:0xA65494 kpa_51_set_script_owner_npc_anim = 0x8024144C; // type:func rom:0xA654DC -func_802414C8_A65558 = 0x802414C8; // type:func rom:0xA65558 +kpa_51_UnkDistFunc = 0x802414C8; // type:func rom:0xA65558 kpa_51_UnkNpcAIFunc12 = 0x802415FC; // type:func rom:0xA6568C kpa_51_set_script_owner_npc_col_height = 0x80241760; // type:func rom:0xA657F0 func_802417E0_A65870 = 0x802417E0; // type:func rom:0xA65870 @@ -10993,7 +10994,7 @@ kpa_60_UnkTexturePanFunc2 = 0x80240204; // type:func rom:0xA6CD04 kpa_61_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA6E3E0 kpa_61_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA6E504 kpa_61_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA6E6F0 -func_8024038C_A6E76C = 0x8024038C; // type:func rom:0xA6E76C +kpa_61_UnkDistFunc = 0x8024038C; // type:func rom:0xA6E76C kpa_61_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA6E8A0 kpa_61_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xA6EA04 func_802406A4_A6EA84 = 0x802406A4; // type:func rom:0xA6EA84 @@ -11032,7 +11033,7 @@ func_80240000_A735B0 = 0x80240000; // type:func rom:0xA735B0 kpa_70_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA74870 kpa_70_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA74994 kpa_70_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA74B80 -func_8024038C_A74BFC = 0x8024038C; // type:func rom:0xA74BFC +kpa_70_UnkDistFunc = 0x8024038C; // type:func rom:0xA74BFC kpa_70_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA74D30 kpa_70_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xA74E94 func_802406A4_A74F14 = 0x802406A4; // type:func rom:0xA74F14 @@ -11063,11 +11064,11 @@ func_80240000_A83490 = 0x80240000; // type:func rom:0xA83490 func_80240050_A834E0 = 0x80240050; // type:func rom:0xA834E0 D_802432F0_A86780 = 0x802432F0; // type:data rom:0xA86780 D_80243300_A86790 = 0x80243300; // type:data rom:0xA86790 -func_80240000_A86A50 = 0x80240000; // type:func rom:0xA86A50 +kpa_91_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xA86A50 kpa_91_UnkFunc13 = 0x80240158; // type:func rom:0xA86BA8 kpa_91_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xA86E50 kpa_91_UnkFunc14 = 0x802404C0; // type:func rom:0xA86F10 -func_8024067C_A870CC = 0x8024067C; // type:func rom:0xA870CC +kpa_91_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xA870CC kpa_91_NpcJumpFunc2 = 0x80240730; // type:func rom:0xA87180 kpa_91_NpcJumpFunc = 0x802407A4; // type:func rom:0xA871F4 kpa_91_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xA8726C @@ -11076,7 +11077,7 @@ kpa_91_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xA874BC kpa_91_UnkFunc16 = 0x80240AD4; // type:func rom:0xA87524 func_80240B94_A875E4 = 0x80240B94; // type:func rom:0xA875E4 kpa_91_set_script_owner_npc_anim = 0x80240E90; // type:func rom:0xA878E0 -func_80240F0C_A8795C = 0x80240F0C; // type:func rom:0xA8795C +kpa_91_UnkDistFunc = 0x80240F0C; // type:func rom:0xA8795C kpa_91_UnkNpcAIFunc12 = 0x80241040; // type:func rom:0xA87A90 kpa_91_set_script_owner_npc_col_height = 0x802411A4; // type:func rom:0xA87BF4 func_80241224_A87C74 = 0x80241224; // type:func rom:0xA87C74 @@ -11099,11 +11100,11 @@ D_80245A38_A8C488 = 0x80245A38; // type:data rom:0xA8C488 D_80245BD0_A8C620 = 0x80245BD0; // type:data rom:0xA8C620 kpa_95_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA8CA80 kpa_95_GetEntityPosition = 0x80240034; // type:func rom:0xA8CAB4 -func_802400E0_A8CB60 = 0x802400E0; // type:func rom:0xA8CB60 +kpa_95_UnkNpcAIFunc24 = 0x802400E0; // type:func rom:0xA8CB60 kpa_95_UnkFunc13 = 0x80240238; // type:func rom:0xA8CCB8 kpa_95_UnkNpcAIFunc1 = 0x802404E0; // type:func rom:0xA8CF60 kpa_95_UnkFunc14 = 0x802405A0; // type:func rom:0xA8D020 -func_8024075C_A8D1DC = 0x8024075C; // type:func rom:0xA8D1DC +kpa_95_UnkNpcAIFunc25 = 0x8024075C; // type:func rom:0xA8D1DC kpa_95_NpcJumpFunc2 = 0x80240810; // type:func rom:0xA8D290 kpa_95_NpcJumpFunc = 0x80240884; // type:func rom:0xA8D304 kpa_95_UnkNpcAIFunc13 = 0x802408FC; // type:func rom:0xA8D37C @@ -11112,7 +11113,7 @@ kpa_95_UnkNpcDurationFlagFunc = 0x80240B4C; // type:func rom:0xA8D5CC kpa_95_UnkFunc16 = 0x80240BB4; // type:func rom:0xA8D634 func_80240C74_A8D6F4 = 0x80240C74; // type:func rom:0xA8D6F4 kpa_95_set_script_owner_npc_anim = 0x80240F70; // type:func rom:0xA8D9F0 -func_80240FEC_A8DA6C = 0x80240FEC; // type:func rom:0xA8DA6C +kpa_95_UnkDistFunc = 0x80240FEC; // type:func rom:0xA8DA6C kpa_95_UnkNpcAIFunc12 = 0x80241120; // type:func rom:0xA8DBA0 kpa_95_set_script_owner_npc_col_height = 0x80241284; // type:func rom:0xA8DD04 func_80241304_A8DD84 = 0x80241304; // type:func rom:0xA8DD84 @@ -11151,7 +11152,7 @@ func_80240DA8_A944E8 = 0x80240DA8; // type:func rom:0xA944E8 func_80241204_A94944 = 0x80241204; // type:func rom:0xA94944 kpa_102_GetEncounterEnemyIsOwner = 0x80241524; // type:func rom:0xA94C64 kpa_102_set_script_owner_npc_anim = 0x8024155C; // type:func rom:0xA94C9C -func_802415D8_A94D18 = 0x802415D8; // type:func rom:0xA94D18 +kpa_102_UnkDistFunc = 0x802415D8; // type:func rom:0xA94D18 kpa_102_UnkNpcAIFunc12 = 0x8024170C; // type:func rom:0xA94E4C kpa_102_set_script_owner_npc_col_height = 0x80241870; // type:func rom:0xA94FB0 func_802418F0_A95030 = 0x802418F0; // type:func rom:0xA95030 @@ -11208,7 +11209,7 @@ kpa_113_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA9CC30 kpa_113_UnkFunc11 = 0x80240040; // type:func rom:0xA9CC70 kpa_113_UnkFunc12 = 0x802400FC; // type:func rom:0xA9CD2C kpa_113_set_script_owner_npc_anim = 0x802401B0; // type:func rom:0xA9CDE0 -func_8024022C_A9CE5C = 0x8024022C; // type:func rom:0xA9CE5C +kpa_113_UnkDistFunc = 0x8024022C; // type:func rom:0xA9CE5C kpa_113_UnkNpcAIFunc12 = 0x80240360; // type:func rom:0xA9CF90 kpa_113_set_script_owner_npc_col_height = 0x802404C4; // type:func rom:0xA9D0F4 func_80240544_A9D174 = 0x80240544; // type:func rom:0xA9D174 @@ -11298,11 +11299,11 @@ D_80241FB0_ABB260 = 0x80241FB0; // type:data rom:0xABB260 D_80241FC0_ABB270 = 0x80241FC0; // type:data rom:0xABB270 func_80240000_ABB290 = 0x80240000; // type:func rom:0xABB290 func_80240040_ABB2D0 = 0x80240040; // type:func rom:0xABB2D0 -func_802400B0_ABB340 = 0x802400B0; // type:func rom:0xABB340 +kkj_00_UnkNpcAIFunc24 = 0x802400B0; // type:func rom:0xABB340 kkj_00_UnkFunc13 = 0x80240208; // type:func rom:0xABB498 kkj_00_UnkNpcAIFunc1 = 0x802404B0; // type:func rom:0xABB740 kkj_00_UnkFunc14 = 0x80240570; // type:func rom:0xABB800 -func_8024072C_ABB9BC = 0x8024072C; // type:func rom:0xABB9BC +kkj_00_UnkNpcAIFunc25 = 0x8024072C; // type:func rom:0xABB9BC kkj_00_NpcJumpFunc2 = 0x802407E0; // type:func rom:0xABBA70 kkj_00_NpcJumpFunc = 0x80240854; // type:func rom:0xABBAE4 kkj_00_UnkNpcAIFunc13 = 0x802408CC; // type:func rom:0xABBB5C @@ -11315,11 +11316,11 @@ D_8024160C_ABC89C = 0x8024160C; // type:data rom:0xABC89C D_8024162C_ABC8BC = 0x8024162C; // type:data rom:0xABC8BC D_80249D30_AC4FC0 = 0x80249D30; // type:data rom:0xAC4FC0 D_80249D38_AC4FC8 = 0x80249D38; // type:data rom:0xAC4FC8 -func_80240000_AC5170 = 0x80240000; // type:func rom:0xAC5170 +kkj_01_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xAC5170 kkj_01_UnkFunc13 = 0x80240158; // type:func rom:0xAC52C8 kkj_01_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xAC5570 kkj_01_UnkFunc14 = 0x802404C0; // type:func rom:0xAC5630 -func_8024067C_AC57EC = 0x8024067C; // type:func rom:0xAC57EC +kkj_01_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xAC57EC kkj_01_NpcJumpFunc2 = 0x80240730; // type:func rom:0xAC58A0 kkj_01_NpcJumpFunc = 0x802407A4; // type:func rom:0xAC5914 kkj_01_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xAC598C @@ -11640,11 +11641,11 @@ jan_02_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0xB2C5C4 func_8024033C_B2C7AC = 0x8024033C; // type:func rom:0xB2C7AC func_80240360_B2C7D0 = 0x80240360; // type:func rom:0xB2C7D0 func_802403F8_B2C868 = 0x802403F8; // type:func rom:0xB2C868 -func_80240430_B2C8A0 = 0x80240430; // type:func rom:0xB2C8A0 +jan_02_UnkNpcAIFunc24 = 0x80240430; // type:func rom:0xB2C8A0 jan_02_UnkFunc13 = 0x80240588; // type:func rom:0xB2C9F8 jan_02_UnkNpcAIFunc1 = 0x80240830; // type:func rom:0xB2CCA0 jan_02_UnkFunc14 = 0x802408F0; // type:func rom:0xB2CD60 -func_80240AAC_B2CF1C = 0x80240AAC; // type:func rom:0xB2CF1C +jan_02_UnkNpcAIFunc25 = 0x80240AAC; // type:func rom:0xB2CF1C jan_02_NpcJumpFunc2 = 0x80240B60; // type:func rom:0xB2CFD0 jan_02_NpcJumpFunc = 0x80240BD4; // type:func rom:0xB2D044 jan_02_UnkNpcAIFunc13 = 0x80240C4C; // type:func rom:0xB2D0BC @@ -11684,7 +11685,7 @@ jan_02_UnkRotatePartner = 0x80242494; // type:func rom:0xB2E904 jan_02_UnkMovePartner = 0x80242524; // type:func rom:0xB2E994 func_8024260C_B2EA7C = 0x8024260C; // type:func rom:0xB2EA7C func_80242678_B2EAE8 = 0x80242678; // type:func rom:0xB2EAE8 -func_802426A8_B2EB18 = 0x802426A8; // type:func rom:0xB2EB18 +jan_02_SwitchToPartner = 0x802426A8; // type:func rom:0xB2EB18 jan_02_foliage_setup_shear_mtx = 0x802426E0; // type:func rom:0xB2EB50 jan_02_TransformFoliage = 0x80242750; // type:func rom:0xB2EBC0 D_80242BD8_B2F048 = 0x80242BD8; // type:data rom:0xB2F048 @@ -11704,11 +11705,11 @@ jan_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xB34E0C jan_03_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xB34EB0 jan_03_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xB34FD4 func_802405EC_B351BC = 0x802405EC; // type:func rom:0xB351BC -func_80240620_B351F0 = 0x80240620; // type:func rom:0xB351F0 +jan_03_UnkNpcAIFunc24 = 0x80240620; // type:func rom:0xB351F0 jan_03_UnkFunc13 = 0x80240778; // type:func rom:0xB35348 jan_03_UnkNpcAIFunc1 = 0x80240A20; // type:func rom:0xB355F0 jan_03_UnkFunc14 = 0x80240AE0; // type:func rom:0xB356B0 -func_80240C9C_B3586C = 0x80240C9C; // type:func rom:0xB3586C +jan_03_UnkNpcAIFunc25 = 0x80240C9C; // type:func rom:0xB3586C jan_03_NpcJumpFunc2 = 0x80240D50; // type:func rom:0xB35920 jan_03_NpcJumpFunc = 0x80240DC4; // type:func rom:0xB35994 jan_03_UnkNpcAIFunc13 = 0x80240E3C; // type:func rom:0xB35A0C @@ -11889,7 +11890,7 @@ jan_08_UnkFunc18 = 0x802406C8; // type:func rom:0xB5E978 jan_08_UnkFunc37 = 0x80240734; // type:func rom:0xB5E9E4 jan_08_UnkFunc38 = 0x80240780; // type:func rom:0xB5EA30 func_8024082C_B5EADC = 0x8024082C; // type:func rom:0xB5EADC -func_80240A7C_B5ED2C = 0x80240A7C; // type:func rom:0xB5ED2C +jan_08_SwitchToPartner = 0x80240A7C; // type:func rom:0xB5ED2C jan_08_UnkFunc19 = 0x80240AA8; // type:func rom:0xB5ED58 jan_08_UnkFunc20 = 0x80240AE0; // type:func rom:0xB5ED90 jan_08_UnkFunc39 = 0x80240B70; // type:func rom:0xB5EE20 @@ -12026,11 +12027,11 @@ jan_16_foliage_setup_shear_mtx = 0x80240300; // type:func rom:0xB80300 jan_16_TransformFoliage = 0x80240370; // type:func rom:0xB80370 func_80240000_B837C0 = 0x80240000; // type:func rom:0xB837C0 func_80240000_B83E60 = 0x80240000; // type:func rom:0xB83E60 -func_80240000_B84180 = 0x80240000; // type:func rom:0xB84180 +jan_22_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xB84180 jan_22_UnkFunc13 = 0x80240158; // type:func rom:0xB842D8 jan_22_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xB84580 jan_22_UnkFunc14 = 0x802404C0; // type:func rom:0xB84640 -func_8024067C_B847FC = 0x8024067C; // type:func rom:0xB847FC +jan_22_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xB847FC jan_22_NpcJumpFunc2 = 0x80240730; // type:func rom:0xB848B0 jan_22_NpcJumpFunc = 0x802407A4; // type:func rom:0xB84924 jan_22_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xB8499C @@ -12199,7 +12200,7 @@ D_8024168B_BAB7CB = 0x8024168B; // type:data rom:0xBAB7CB D_802437B0_BAD8F0 = 0x802437B0; // type:data rom:0xBAD8F0 func_80240000_BAD940 = 0x80240000; // type:func rom:0xBAD940 func_80240068_BAD9A8 = 0x80240068; // type:func rom:0xBAD9A8 -func_802400A0_BAD9E0 = 0x802400A0; // type:func rom:0xBAD9E0 +mim_08_UnkNpcAIFunc23 = 0x802400A0; // type:func rom:0xBAD9E0 func_80240250_BADB90 = 0x80240250; // type:func rom:0xBADB90 mim_08_UnkNpcAIFunc1 = 0x80240878; // type:func rom:0xBAE1B8 mim_08_UnkFunc4 = 0x80240938; // type:func rom:0xBAE278 @@ -12463,11 +12464,11 @@ D_80241AE8_BDEC98 = 0x80241AE8; // type:data rom:0xBDEC98 D_80241AF0_BDECA0 = 0x80241AF0; // type:data rom:0xBDECA0 D_80241AF8_BDECA8 = 0x80241AF8; // type:data rom:0xBDECA8 D_80241B00_BDECB0 = 0x80241B00; // type:data rom:0xBDECB0 -arn_03_func_80240000_BDED90 = 0x80240000; // type:func rom:0xBDED90 -arn_03_func_80240158_BDEEE8 = 0x80240158; // type:func rom:0xBDEEE8 +arn_03_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xBDED90 +arn_03_UnkFunc13 = 0x80240158; // type:func rom:0xBDEEE8 arn_03_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBDF190 -arn_03_func_802404C0_BDF250 = 0x802404C0; // type:func rom:0xBDF250 -arn_03_func_8024067C_BDF40C = 0x8024067C; // type:func rom:0xBDF40C +arn_03_UnkFunc14 = 0x802404C0; // type:func rom:0xBDF250 +arn_03_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xBDF40C arn_03_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBDF4C0 arn_03_NpcJumpFunc = 0x802407A4; // type:func rom:0xBDF534 arn_03_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBDF5AC @@ -12537,11 +12538,11 @@ arn_03_padding3 = 0x802447DC; // type:data rom:0xBE356C arn_03_makeEntities = 0x802447E0; // type:data rom:0xBE3570 D_80244860_BE35F0 = 0x80244860; // type:data rom:0xBE35F0 D_80244868_BE35F8 = 0x80244868; // type:data rom:0xBE35F8 -arn_04_func_80240000_BE37B0 = 0x80240000; // type:func rom:0xBE37B0 +arn_04_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xBE37B0 arn_04_func_80240158_BE3908 = 0x80240158; // type:func rom:0xBE3908 arn_04_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBE3BB0 -arn_04_func_802404C0_BE3C70 = 0x802404C0; // type:func rom:0xBE3C70 -arn_04_func_8024067C_BE3E2C = 0x8024067C; // type:func rom:0xBE3E2C +arn_04_UnkFunc14 = 0x802404C0; // type:func rom:0xBE3C70 +arn_04_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xBE3E2C arn_04_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBE3EE0 arn_04_NpcJumpFunc = 0x802407A4; // type:func rom:0xBE3F54 arn_04_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE3FCC @@ -12549,7 +12550,7 @@ arn_04_UnkFunc15 = 0x8024094C; // type:func rom:0xBE40FC arn_04_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE421C arn_04_UnkFunc16 = 0x80240AD4; // type:func rom:0xBE4284 arn_04_func_80240B94_BE4344 = 0x80240B94; // type:func rom:0xBE4344 -arn_04_func_80240E90_BE4640 = 0x80240E90; // type:func rom:0xBE4640 +arn_04_UnkNpcAIFunc23 = 0x80240E90; // type:func rom:0xBE4640 arn_04_func_80241040_BE47F0 = 0x80241040; // type:func rom:0xBE47F0 arn_04_UnkNpcAIFunc1_copy = 0x80241668; // type:func rom:0xBE4E18 arn_04_UnkFunc4 = 0x80241728; // type:func rom:0xBE4ED8 @@ -12610,11 +12611,11 @@ D_80244330_BE7AE0 = 0x80244330; // type:data rom:0xBE7AE0 D_80244338_BE7AE8 = 0x80244338; // type:data rom:0xBE7AE8 D_80244340_BE7AF0 = 0x80244340; // type:data rom:0xBE7AF0 D_80244348_BE7AF8 = 0x80244348; // type:data rom:0xBE7AF8 -arn_05_func_80240000_BE7BE0 = 0x80240000; // type:func rom:0xBE7BE0 +arn_05_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xBE7BE0 arn_05_UnkFunc13 = 0x80240158; // type:func rom:0xBE7D38 arn_05_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBE7FE0 arn_05_UnkFunc14 = 0x802404C0; // type:func rom:0xBE80A0 -arn_05_func_8024067C_BE825C = 0x8024067C; // type:func rom:0xBE825C +arn_05_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xBE825C arn_05_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBE8310 arn_05_NpcJumpFunc = 0x802407A4; // type:func rom:0xBE8384 arn_05_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE83FC @@ -12626,7 +12627,7 @@ arn_05_func_80240E90_BE8A70 = 0x80240E90; // type:func rom:0xBE8A70 arn_05_func_80241068_BE8C48 = 0x80241068; // type:func rom:0xBE8C48 arn_05_func_8024113C_BE8D1C = 0x8024113C; // type:func rom:0xBE8D1C arn_05_func_802412B0_BE8E90 = 0x802412B0; // type:func rom:0xBE8E90 -arn_05_func_802412C8_BE8EA8 = 0x802412C8; // type:func rom:0xBE8EA8 +arn_05_SwitchToPartner = 0x802412C8; // type:func rom:0xBE8EA8 arn_05_entryList = 0x80241300; // type:data rom:0xBE8EE0 arn_05_config = 0x80241320; // type:data rom:0xBE8F00 arn_05_80241360 = 0x80241360; // type:data rom:0xBE8F40 @@ -12681,7 +12682,7 @@ arn_07_func_80240708_BED4F8 = 0x80240708; // type:func rom:0xBED4F8 arn_07_func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0 arn_07_SetEntityFlags100000 = 0x80240870; // type:func rom:0xBED660 arn_07_GetEntityPosition = 0x802408A4; // type:func rom:0xBED694 -arn_07_func_80240950_BED740 = 0x80240950; // type:func rom:0xBED740 +arn_07_UnkNpcAIFunc23 = 0x80240950; // type:func rom:0xBED740 arn_07_func_80240B00_BED8F0 = 0x80240B00; // type:func rom:0xBED8F0 arn_07_UnkNpcAIFunc1 = 0x80241128; // type:func rom:0xBEDF18 arn_07_UnkFunc4 = 0x802411E8; // type:func rom:0xBEDFD8 @@ -12955,7 +12956,7 @@ D_802437BC_BFD85C = 0x802437BC; // type:data rom:0xBFD85C dgb_01_func_80240000_BFD880 = 0x80240000; // type:func rom:0xBFD880 dgb_01_SetEntityFlags100000 = 0x80240040; // type:func rom:0xBFD8C0 dgb_01_GetEntityPosition = 0x80240074; // type:func rom:0xBFD8F4 -dgb_01_func_80240120_BFD9A0 = 0x80240120; // type:func rom:0xBFD9A0 +dgb_01_UnkNpcAIFunc23 = 0x80240120; // type:func rom:0xBFD9A0 func_802402D0_BFDB50 = 0x802402D0; // type:func rom:0xBFDB50 dgb_01_UnkNpcAIFunc1 = 0x802408F8; // type:func rom:0xBFE178 dgb_01_UnkFunc4 = 0x802409B8; // type:func rom:0xBFE238 @@ -12977,11 +12978,11 @@ dgb_01_func_80241E70_BFF6F0 = 0x80241E70; // type:func rom:0xBFF6F0 dgb_01_func_80241EF0_BFF770 = 0x80241EF0; // type:func rom:0xBFF770 dgb_01_func_80241F98_BFF818 = 0x80241F98; // type:func rom:0xBFF818 dgb_01_func_802422B0_BFFB30 = 0x802422B0; // type:func rom:0xBFFB30 -dgb_01_func_8024252C_BFFDAC = 0x8024252C; // type:func rom:0xBFFDAC +dgb_01_UnkNpcAIFunc24 = 0x8024252C; // type:func rom:0xBFFDAC dgb_01_UnkFunc13 = 0x80242684; // type:func rom:0xBFFF04 dgb_01_UnkNpcAIFunc1_copy = 0x8024292C; // type:func rom:0xC001AC dgb_01_UnkFunc14 = 0x802429EC; // type:func rom:0xC0026C -dgb_01_btl_state_draw_switch_to_player_C00428 = 0x80242BA8; // type:func rom:0xC00428 +dgb_01_UnkNpcAIFunc25 = 0x80242BA8; // type:func rom:0xC00428 dgb_01_NpcJumpFunc2 = 0x80242C5C; // type:func rom:0xC004DC dgb_01_NpcJumpFunc = 0x80242CD0; // type:func rom:0xC00550 dgb_01_UnkNpcAIFunc13 = 0x80242D48; // type:func rom:0xC005C8 @@ -13437,11 +13438,11 @@ dgb_03_UnkNpcAIFunc5 = 0x80240404; // type:func rom:0xC318E4 dgb_03_func_80240458_C31938 = 0x80240458; // type:func rom:0xC31938 dgb_03_UnkFunc7 = 0x8024060C; // type:func rom:0xC31AEC dgb_03_func_8024086C_C31D4C = 0x8024086C; // type:func rom:0xC31D4C -dgb_03_func_80240B20_C32000 = 0x80240B20; // type:func rom:0xC32000 +dgb_03_UnkNpcAIFunc24 = 0x80240B20; // type:func rom:0xC32000 dgb_03_UnkFunc13 = 0x80240C78; // type:func rom:0xC32158 dgb_03_UnkNpcAIFunc1 = 0x80240F20; // type:func rom:0xC32400 dgb_03_UnkFunc14 = 0x80240FE0; // type:func rom:0xC324C0 -dgb_03_func_8024119C_C3267C = 0x8024119C; // type:func rom:0xC3267C +dgb_03_UnkNpcAIFunc25 = 0x8024119C; // type:func rom:0xC3267C dgb_03_NpcJumpFunc2 = 0x80241250; // type:func rom:0xC32730 dgb_03_NpcJumpFunc = 0x802412C4; // type:func rom:0xC327A4 dgb_03_UnkNpcAIFunc13 = 0x8024133C; // type:func rom:0xC3281C @@ -13502,7 +13503,7 @@ D_802449F0_C35ED0 = 0x802449F0; // type:data rom:0xC35ED0 D_80244B88_C36068 = 0x80244B88; // type:data rom:0xC36068 D_80244B90_C36070 = 0x80244B90; // type:data rom:0xC36070 D_80244EB8_C36398 = 0x80244EB8; // type:data rom:0xC36398 -dgb_04_func_80240000_C36530 = 0x80240000; // type:func rom:0xC36530 +dgb_04_UnkNpcAIFunc23 = 0x80240000; // type:func rom:0xC36530 dgb_04_func_802401B0_C366E0 = 0x802401B0; // type:func rom:0xC366E0 dgb_04_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0xC36D08 dgb_04_UnkFunc4 = 0x80240898; // type:func rom:0xC36DC8 @@ -13531,7 +13532,7 @@ dgb_04_UnkFunc18 = 0x80242438; // type:func rom:0xC38968 dgb_04_UnkFunc37 = 0x802424A4; // type:func rom:0xC389D4 dgb_04_UnkFunc38 = 0x802424F0; // type:func rom:0xC38A20 dgb_04_func_8024259C_C38ACC = 0x8024259C; // type:func rom:0xC38ACC -dgb_04_func_802427EC_C38D1C = 0x802427EC; // type:func rom:0xC38D1C +dgb_04_SwitchToPartner = 0x802427EC; // type:func rom:0xC38D1C dgb_04_UnkFunc19 = 0x80242818; // type:func rom:0xC38D48 dgb_04_UnkFunc20 = 0x80242850; // type:func rom:0xC38D80 dgb_04_UnkFunc39 = 0x802428E0; // type:func rom:0xC38E10 @@ -13665,11 +13666,11 @@ dgb_07_npcGroup_80241A7C = 0x80241A7C; // type:data rom:0xC3F66C dgb_07_npcGroupList_80241E5C = 0x80241E5C; // type:data rom:0xC3FA4C D_80241E90_C3FA80 = 0x80241E90; // type:data rom:0xC3FA80 D_80241E98_C3FA88 = 0x80241E98; // type:data rom:0xC3FA88 -dgb_08_func_80240000_C3FDB0 = 0x80240000; // type:func rom:0xC3FDB0 +dgb_08_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xC3FDB0 dgb_08_UnkFunc13 = 0x80240158; // type:func rom:0xC3FF08 dgb_08_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC401B0 dgb_08_UnkFunc14 = 0x802404C0; // type:func rom:0xC40270 -dgb_08_func_8024067C_C4042C = 0x8024067C; // type:func rom:0xC4042C +dgb_08_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xC4042C dgb_08_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC404E0 dgb_08_NpcJumpFunc = 0x802407A4; // type:func rom:0xC40554 dgb_08_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC405CC @@ -13684,7 +13685,7 @@ dgb_08_UnkNpcAIFunc5 = 0x80241044; // type:func rom:0xC40DF4 dgb_08_func_80241098_C40E48 = 0x80241098; // type:func rom:0xC40E48 dgb_08_UnkFunc7 = 0x8024124C; // type:func rom:0xC40FFC dgb_08_func_802414AC_C4125C = 0x802414AC; // type:func rom:0xC4125C -dgb_08_func_80241760_C41510 = 0x80241760; // type:func rom:0xC41510 +dgb_08_UnkNpcAIFunc23 = 0x80241760; // type:func rom:0xC41510 dgb_08_func_80241910_C416C0 = 0x80241910; // type:func rom:0xC416C0 dgb_08_UnkNpcAIFunc1_copy = 0x80241F38; // type:func rom:0xC41CE8 dgb_08_UnkFunc4 = 0x80241FF8; // type:func rom:0xC41DA8 @@ -13787,7 +13788,7 @@ dgb_09_func_80240E54_C47A34 = 0x80240E54; // type:func rom:0xC47A34 dgb_09_func_80240F00_C47AE0 = 0x80240F00; // type:func rom:0xC47AE0 dgb_09_func_80241078_C47C58 = 0x80241078; // type:func rom:0xC47C58 dgb_09_func_802410D4_C47CB4 = 0x802410D4; // type:func rom:0xC47CB4 -dgb_09_func_80241424_C48004 = 0x80241424; // type:func rom:0xC48004 +dgb_09_UnkNpcAIFunc23 = 0x80241424; // type:func rom:0xC48004 dgb_09_func_802415D4_C481B4 = 0x802415D4; // type:func rom:0xC481B4 dgb_09_UnkNpcAIFunc1 = 0x80241BFC; // type:func rom:0xC487DC dgb_09_UnkFunc4 = 0x80241CBC; // type:func rom:0xC4889C @@ -13930,11 +13931,11 @@ dgb_15_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC4F6C4 dgb_15_func_80240208_C4F718 = 0x80240208; // type:func rom:0xC4F718 dgb_15_UnkFunc7 = 0x802403BC; // type:func rom:0xC4F8CC dgb_15_func_8024061C_C4FB2C = 0x8024061C; // type:func rom:0xC4FB2C -dgb_15_func_802408D0_C4FDE0 = 0x802408D0; // type:func rom:0xC4FDE0 +dgb_15_UnkNpcAIFunc24 = 0x802408D0; // type:func rom:0xC4FDE0 dgb_15_UnkFunc13 = 0x80240A28; // type:func rom:0xC4FF38 dgb_15_UnkNpcAIFunc1 = 0x80240CD0; // type:func rom:0xC501E0 dgb_15_UnkFunc14 = 0x80240D90; // type:func rom:0xC502A0 -dgb_15_func_80240F4C_C5045C = 0x80240F4C; // type:func rom:0xC5045C +dgb_15_UnkNpcAIFunc25 = 0x80240F4C; // type:func rom:0xC5045C dgb_15_NpcJumpFunc2 = 0x80241000; // type:func rom:0xC50510 dgb_15_NpcJumpFunc = 0x80241074; // type:func rom:0xC50584 dgb_15_UnkNpcAIFunc13 = 0x802410EC; // type:func rom:0xC505FC @@ -14031,11 +14032,11 @@ dgb_17_80240268 = 0x80240268; // type:data rom:0xC55CC8 dgb_17_enterDoubleDoor_802402B0 = 0x802402B0; // type:data rom:0xC55D10 dgb_17_main = 0x802403B8; // type:data rom:0xC55E18 dgb_17_makeEntities = 0x80240470; // type:data rom:0xC55ED0 -dgb_18_func_80240000_C55F40 = 0x80240000; // type:func rom:0xC55F40 +dgb_18_UnkNpcAIFunc24 = 0x80240000; // type:func rom:0xC55F40 dgb_18_UnkFunc13 = 0x80240158; // type:func rom:0xC56098 dgb_18_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC56340 dgb_18_UnkFunc14 = 0x802404C0; // type:func rom:0xC56400 -dgb_18_func_8024067C_C565BC = 0x8024067C; // type:func rom:0xC565BC +dgb_18_UnkNpcAIFunc25 = 0x8024067C; // type:func rom:0xC565BC dgb_18_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC56670 dgb_18_NpcJumpFunc = 0x802407A4; // type:func rom:0xC566E4 dgb_18_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC5675C @@ -14088,7 +14089,7 @@ func_80240310_C5AA50 = 0x80240310; // type:func rom:0xC5AA50 kzn_02_GetFloorCollider = 0x80240384; // type:func rom:0xC5AAC4 func_802403B0_C5AAF0 = 0x802403B0; // type:func rom:0xC5AAF0 func_802403DC_C5AB1C = 0x802403DC; // type:func rom:0xC5AB1C -func_802404E0_C5AC20 = 0x802404E0; // type:func rom:0xC5AC20 +kzn_02_UnkNpcAIFunc23 = 0x802404E0; // type:func rom:0xC5AC20 func_80240690_C5ADD0 = 0x80240690; // type:func rom:0xC5ADD0 kzn_02_UnkNpcAIFunc1 = 0x80240CB8; // type:func rom:0xC5B3F8 kzn_02_UnkFunc4 = 0x80240D78; // type:func rom:0xC5B4B8 @@ -14127,7 +14128,7 @@ D_80246558_C60C98 = 0x80246558; // type:data rom:0xC60C98 kzn_03_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC60D10 kzn_03_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC60E34 kzn_03_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xC61020 -func_8024038C_C6109C = 0x8024038C; // type:func rom:0xC6109C +kzn_03_UnkDistFunc = 0x8024038C; // type:func rom:0xC6109C kzn_03_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xC611D0 kzn_03_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xC61334 func_802406A4_C613B4 = 0x802406A4; // type:func rom:0xC613B4 @@ -14188,7 +14189,7 @@ kzn_04_UnkFunc18 = 0x80240378; // type:func rom:0xC684A8 kzn_04_UnkFunc37 = 0x802403E4; // type:func rom:0xC68514 kzn_04_UnkFunc38 = 0x80240430; // type:func rom:0xC68560 func_802404DC_C6860C = 0x802404DC; // type:func rom:0xC6860C -func_8024072C_C6885C = 0x8024072C; // type:func rom:0xC6885C +kzn_04_SwitchToPartner = 0x8024072C; // type:func rom:0xC6885C kzn_04_UnkFunc19 = 0x80240758; // type:func rom:0xC68888 kzn_04_UnkFunc20 = 0x80240790; // type:func rom:0xC688C0 kzn_04_UnkFunc39 = 0x80240820; // type:func rom:0xC68950 @@ -14225,7 +14226,7 @@ kzn_07_UnkTexturePanFunc = 0x8024040C; // type:func rom:0xC6E73C kzn_07_UnkTexturePanFunc2 = 0x80240530; // type:func rom:0xC6E860 func_80240720_C6EA50 = 0x80240720; // type:func rom:0xC6EA50 func_802407F4_C6EB24 = 0x802407F4; // type:func rom:0xC6EB24 -func_80240820_C6EB50 = 0x80240820; // type:func rom:0xC6EB50 +kzn_07_UnkNpcAIFunc23 = 0x80240820; // type:func rom:0xC6EB50 func_802409D0_C6ED00 = 0x802409D0; // type:func rom:0xC6ED00 kzn_07_UnkNpcAIFunc1 = 0x80240FF8; // type:func rom:0xC6F328 kzn_07_UnkFunc4 = 0x802410B8; // type:func rom:0xC6F3E8 @@ -14257,7 +14258,7 @@ func_80240790_C71C10 = 0x80240790; // type:func rom:0xC71C10 kzn_08_GetItemName = 0x80240844; // type:func rom:0xC71CC4 kzn_08_SomeItemEntityFunc = 0x802408A8; // type:func rom:0xC71D28 kzn_08_CheckItemFlags40 = 0x802409F8; // type:func rom:0xC71E78 -func_80240A50_C71ED0 = 0x80240A50; // type:func rom:0xC71ED0 +kzn_08_UnkNpcAIFunc23 = 0x80240A50; // type:func rom:0xC71ED0 func_80240C00_C72080 = 0x80240C00; // type:func rom:0xC72080 kzn_08_UnkNpcAIFunc1 = 0x80241228; // type:func rom:0xC726A8 kzn_08_UnkFunc4 = 0x802412E8; // type:func rom:0xC72768 @@ -14310,7 +14311,7 @@ kzn_09_UnkFunc18 = 0x80240068; // type:func rom:0xC76D48 kzn_09_UnkFunc37 = 0x802400D4; // type:func rom:0xC76DB4 kzn_09_UnkFunc38 = 0x80240120; // type:func rom:0xC76E00 func_802401CC_C76EAC = 0x802401CC; // type:func rom:0xC76EAC -func_8024041C_C770FC = 0x8024041C; // type:func rom:0xC770FC +kzn_09_SwitchToPartner = 0x8024041C; // type:func rom:0xC770FC kzn_09_UnkFunc19 = 0x80240448; // type:func rom:0xC77128 kzn_09_UnkFunc20 = 0x80240480; // type:func rom:0xC77160 kzn_09_UnkFunc39 = 0x80240510; // type:func rom:0xC771F0 @@ -14341,7 +14342,7 @@ func_80242628_C79308 = 0x80242628; // type:func rom:0xC79308 func_80242688_C79368 = 0x80242688; // type:func rom:0xC79368 func_80242774_C79454 = 0x80242774; // type:func rom:0xC79454 kzn_09_set_script_owner_npc_anim = 0x802429C4; // type:func rom:0xC796A4 -func_80242A40_C79720 = 0x80242A40; // type:func rom:0xC79720 +kzn_09_UnkDistFunc = 0x80242A40; // type:func rom:0xC79720 kzn_09_UnkNpcAIFunc12 = 0x80242B74; // type:func rom:0xC79854 kzn_09_set_script_owner_npc_col_height = 0x80242CD8; // type:func rom:0xC799B8 func_80242D58_C79A38 = 0x80242D58; // type:func rom:0xC79A38 @@ -14393,7 +14394,7 @@ kzn_11_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC802C4 func_80240310_C804B0 = 0x80240310; // type:func rom:0xC804B0 kzn_11_GetFloorCollider = 0x80240408; // type:func rom:0xC805A8 func_80240434_C805D4 = 0x80240434; // type:func rom:0xC805D4 -func_80240460_C80600 = 0x80240460; // type:func rom:0xC80600 +kzn_11_UnkNpcAIFunc23 = 0x80240460; // type:func rom:0xC80600 func_80240610_C807B0 = 0x80240610; // type:func rom:0xC807B0 kzn_11_UnkNpcAIFunc1 = 0x80240C38; // type:func rom:0xC80DD8 kzn_11_UnkFunc4 = 0x80240CF8; // type:func rom:0xC80E98 @@ -14435,7 +14436,7 @@ func_80241918_C873C8 = 0x80241918; // type:func rom:0xC873C8 func_80241978_C87428 = 0x80241978; // type:func rom:0xC87428 func_80241A64_C87514 = 0x80241A64; // type:func rom:0xC87514 kzn_17_set_script_owner_npc_anim = 0x80241CB4; // type:func rom:0xC87764 -func_80241D30_C877E0 = 0x80241D30; // type:func rom:0xC877E0 +kzn_17_UnkDistFunc = 0x80241D30; // type:func rom:0xC877E0 kzn_17_UnkNpcAIFunc12 = 0x80241E64; // type:func rom:0xC87914 kzn_17_set_script_owner_npc_col_height = 0x80241FC8; // type:func rom:0xC87A78 func_80242048_C87AF8 = 0x80242048; // type:func rom:0xC87AF8 @@ -14548,11 +14549,11 @@ kzn_23_UnsetCamera0MoveFlag1 = 0x80240504; // type:func rom:0xC9C804 func_80240520_C9C820 = 0x80240520; // type:func rom:0xC9C820 D_80241C10_C9DF10 = 0x80241C10; // type:data rom:0xC9DF10 flo_00_func_80240000_C9DF20 = 0x80240000; // type:func rom:0xC9DF20 -flo_00_func_80240040_C9DF60 = 0x80240040; // type:func rom:0xC9DF60 +flo_00_UnkNpcAIFunc24 = 0x80240040; // type:func rom:0xC9DF60 flo_00_UnkFunc13 = 0x80240198; // type:func rom:0xC9E0B8 flo_00_UnkNpcAIFunc1 = 0x80240440; // type:func rom:0xC9E360 flo_00_UnkFunc14 = 0x80240500; // type:func rom:0xC9E420 -flo_00_func_802406BC_C9E5DC = 0x802406BC; // type:func rom:0xC9E5DC +flo_00_UnkNpcAIFunc25 = 0x802406BC; // type:func rom:0xC9E5DC flo_00_NpcJumpFunc2 = 0x80240770; // type:func rom:0xC9E690 flo_00_NpcJumpFunc = 0x802407E4; // type:func rom:0xC9E704 flo_00_UnkNpcAIFunc13 = 0x8024085C; // type:func rom:0xC9E77C @@ -14755,7 +14756,7 @@ flo_08_UnkFunc18 = 0x80240068; // type:func rom:0xCAEDA8 flo_08_UnkFunc37 = 0x802400D4; // type:func rom:0xCAEE14 flo_08_UnkFunc38 = 0x80240120; // type:func rom:0xCAEE60 flo_08_func_802401CC_CAEF0C = 0x802401CC; // type:func rom:0xCAEF0C -flo_08_func_8024041C_CAF15C = 0x8024041C; // type:func rom:0xCAF15C +flo_08_SwitchToPartner = 0x8024041C; // type:func rom:0xCAF15C flo_08_UnkFunc19 = 0x80240448; // type:func rom:0xCAF188 flo_08_UnkFunc20 = 0x80240480; // type:func rom:0xCAF1C0 flo_08_UnkFunc39 = 0x80240510; // type:func rom:0xCAF250 @@ -14838,7 +14839,7 @@ flo_09_func_80240000_CB5000 = 0x80240000; // type:func rom:0xCB5000 flo_09_UnkFunc43 = 0x80240040; // type:func rom:0xCB5040 flo_09_foliage_setup_shear_mtx = 0x802400E0; // type:func rom:0xCB50E0 flo_09_TransformFoliage = 0x80240150; // type:func rom:0xCB5150 -flo_09_func_80240320_CB5320 = 0x80240320; // type:func rom:0xCB5320 +flo_09_UnkNpcAIFunc23 = 0x80240320; // type:func rom:0xCB5320 flo_09_func_802404D0_CB54D0 = 0x802404D0; // type:func rom:0xCB54D0 flo_09_UnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xCB5AF8 flo_09_UnkFunc4 = 0x80240BB8; // type:func rom:0xCB5BB8 @@ -15047,7 +15048,7 @@ flo_12_npcGroup_802425D8 = 0x802425D8; // type:data rom:0xCC3408 flo_12_npcGroupList_802429B8 = 0x802429B8; // type:data rom:0xCC37E8 flo_13_func_80240000_CC3810 = 0x80240000; // type:func rom:0xCC3810 flo_13_UnkFunc41 = 0x80240040; // type:func rom:0xCC3850 -flo_13_func_802401C4_CC39D4 = 0x802401C4; // type:func rom:0xCC39D4 +flo_13_UnkNpcAIFunc23 = 0x802401C4; // type:func rom:0xCC39D4 flo_13_func_80240374_CC3B84 = 0x80240374; // type:func rom:0xCC3B84 flo_13_UnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xCC41AC flo_13_UnkFunc4 = 0x80240A5C; // type:func rom:0xCC426C @@ -15063,7 +15064,7 @@ flo_13_func_80241704_CC4F14 = 0x80241704; // type:func rom:0xCC4F14 flo_13_func_80241B68_CC5378 = 0x80241B68; // type:func rom:0xCC5378 flo_13_func_80241DB8_CC55C8 = 0x80241DB8; // type:func rom:0xCC55C8 flo_13_set_script_owner_npc_anim = 0x80242298; // type:func rom:0xCC5AA8 -flo_13_func_80242314_CC5B24 = 0x80242314; // type:func rom:0xCC5B24 +flo_13_UnkDistFunc = 0x80242314; // type:func rom:0xCC5B24 flo_13_UnkNpcAIFunc12 = 0x80242448; // type:func rom:0xCC5C58 flo_13_set_script_owner_npc_col_height = 0x802425AC; // type:func rom:0xCC5DBC flo_13_func_8024262C_CC5E3C = 0x8024262C; // type:func rom:0xCC5E3C @@ -15138,7 +15139,7 @@ flo_14_func_8024042C_CCB73C = 0x8024042C; // type:func rom:0xCCB73C flo_14_func_8024046C_CCB77C = 0x8024046C; // type:func rom:0xCCB77C func_80240504_CCB814 = 0x80240504; // type:func rom:0xCCB814 flo_14_func_802407D4_CCBAE4 = 0x802407D4; // type:func rom:0xCCBAE4 -flo_14_func_80240B10_CCBE20 = 0x80240B10; // type:func rom:0xCCBE20 +flo_14_UnkNpcAIFunc23 = 0x80240B10; // type:func rom:0xCCBE20 flo_14_func_80240CC0_CCBFD0 = 0x80240CC0; // type:func rom:0xCCBFD0 flo_14_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xCCC5F8 flo_14_UnkFunc4 = 0x802413A8; // type:func rom:0xCCC6B8 @@ -15234,7 +15235,7 @@ flo_16_UnkFunc18 = 0x80240148; // type:func rom:0xCD1F78 flo_16_UnkFunc37 = 0x802401B4; // type:func rom:0xCD1FE4 flo_16_UnkFunc38 = 0x80240200; // type:func rom:0xCD2030 func_802402AC_CD20DC = 0x802402AC; // type:func rom:0xCD20DC -flo_16_func_802404FC_CD232C = 0x802404FC; // type:func rom:0xCD232C +flo_16_SwitchToPartner = 0x802404FC; // type:func rom:0xCD232C flo_16_UnkFunc19 = 0x80240528; // type:func rom:0xCD2358 flo_16_UnkFunc20 = 0x80240560; // type:func rom:0xCD2390 flo_16_UnkFunc39 = 0x802405F0; // type:func rom:0xCD2420 @@ -15246,7 +15247,7 @@ flo_16_UnkPartnerPosFunc = 0x80240D58; // type:func rom:0xCD2B88 flo_16_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xCD2BD0 flo_16_UnkFunc24 = 0x80240DE8; // type:func rom:0xCD2C18 flo_16_UnkFunc44 = 0x80240E18; // type:func rom:0xCD2C48 -flo_16_func_80240E50_CD2C80 = 0x80240E50; // type:func rom:0xCD2C80 +flo_16_UnkNpcAIFunc23 = 0x80240E50; // type:func rom:0xCD2C80 flo_16_func_80241000_CD2E30 = 0x80241000; // type:func rom:0xCD2E30 flo_16_UnkNpcAIFunc1 = 0x80241628; // type:func rom:0xCD3458 flo_16_UnkFunc4 = 0x802416E8; // type:func rom:0xCD3518 @@ -15300,7 +15301,7 @@ D_80245400_CD7230 = 0x80245400; // type:data rom:0xCD7230 D_80245448_CD7278 = 0x80245448; // type:data rom:0xCD7278 flo_17_func_80240000_CD72E0 = 0x80240000; // type:func rom:0xCD72E0 flo_17_func_80240040_CD7320 = 0x80240040; // type:func rom:0xCD7320 -flo_17_func_80240070_CD7350 = 0x80240070; // type:func rom:0xCD7350 +flo_17_UnkNpcAIFunc23 = 0x80240070; // type:func rom:0xCD7350 flo_17_func_80240220_CD7500 = 0x80240220; // type:func rom:0xCD7500 flo_17_UnkNpcAIFunc1 = 0x80240848; // type:func rom:0xCD7B28 flo_17_UnkFunc4 = 0x80240908; // type:func rom:0xCD7BE8 @@ -15316,7 +15317,7 @@ flo_17_func_802415B0_CD8890 = 0x802415B0; // type:func rom:0xCD8890 flo_17_func_80241A14_CD8CF4 = 0x80241A14; // type:func rom:0xCD8CF4 flo_17_func_80241C64_CD8F44 = 0x80241C64; // type:func rom:0xCD8F44 flo_17_set_script_owner_npc_anim = 0x80242144; // type:func rom:0xCD9424 -flo_17_func_802421C0_CD94A0 = 0x802421C0; // type:func rom:0xCD94A0 +flo_17_UnkDistFunc = 0x802421C0; // type:func rom:0xCD94A0 flo_17_UnkNpcAIFunc12 = 0x802422F4; // type:func rom:0xCD95D4 flo_17_set_script_owner_npc_col_height = 0x80242458; // type:func rom:0xCD9738 flo_17_func_802424D8_CD97B8 = 0x802424D8; // type:func rom:0xCD97B8 @@ -15557,7 +15558,7 @@ flo_23_func_8024026C_CEE4CC = 0x8024026C; // type:func rom:0xCEE4CC flo_23_func_802402C0_CEE520 = 0x802402C0; // type:func rom:0xCEE520 flo_23_func_802402F8_CEE558 = 0x802402F8; // type:func rom:0xCEE558 flo_23_set_script_owner_npc_anim = 0x80240394; // type:func rom:0xCEE5F4 -flo_23_func_80240410_CEE670 = 0x80240410; // type:func rom:0xCEE670 +flo_23_UnkDistFunc = 0x80240410; // type:func rom:0xCEE670 flo_23_UnkNpcAIFunc12 = 0x80240544; // type:func rom:0xCEE7A4 flo_23_set_script_owner_npc_col_height = 0x802406A8; // type:func rom:0xCEE908 flo_23_func_80240728_CEE988 = 0x80240728; // type:func rom:0xCEE988 @@ -15615,7 +15616,7 @@ flo_24_80241ABC = 0x80241ABC; // type:data rom:0xCF23FC flo_24_makeEntities = 0x802421B0; // type:data rom:0xCF2AF0 flo_24_flo_10_name_hack = 0x80242280; // type:data rom:0xCF2BC0 flo_25_func_80240000_CF2BD0 = 0x80240000; // type:func rom:0xCF2BD0 -flo_25_func_80240040_CF2C10 = 0x80240040; // type:func rom:0xCF2C10 +flo_25_UnkNpcAIFunc23 = 0x80240040; // type:func rom:0xCF2C10 flo_25_func_802401F0_CF2DC0 = 0x802401F0; // type:func rom:0xCF2DC0 flo_25_UnkNpcAIFunc1 = 0x80240818; // type:func rom:0xCF33E8 flo_25_UnkFunc4 = 0x802408D8; // type:func rom:0xCF34A8 @@ -15835,7 +15836,7 @@ sam_06_UnkTexturePanFunc = 0x80240000; // type:func rom:0xD1FE90 sam_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xD1FFB4 sam_06_foliage_setup_shear_mtx = 0x8024030C; // type:func rom:0xD2019C sam_06_TransformFoliage = 0x8024037C; // type:func rom:0xD2020C -func_80240550_D203E0 = 0x80240550; // type:func rom:0xD203E0 +sam_06_UnkNpcAIFunc23 = 0x80240550; // type:func rom:0xD203E0 func_80240700_D20590 = 0x80240700; // type:func rom:0xD20590 sam_06_UnkNpcAIFunc1 = 0x80240D28; // type:func rom:0xD20BB8 sam_06_UnkFunc4 = 0x80240DE8; // type:func rom:0xD20C78 @@ -15913,7 +15914,7 @@ sam_08_UnkFunc18 = 0x80240068; // type:func rom:0xD2FCE8 sam_08_UnkFunc37 = 0x802400D4; // type:func rom:0xD2FD54 sam_08_UnkFunc38 = 0x80240120; // type:func rom:0xD2FDA0 func_802401CC_D2FE4C = 0x802401CC; // type:func rom:0xD2FE4C -func_8024041C_D3009C = 0x8024041C; // type:func rom:0xD3009C +sam_08_SwitchToPartner = 0x8024041C; // type:func rom:0xD3009C sam_08_UnkFunc19 = 0x80240448; // type:func rom:0xD300C8 sam_08_UnkFunc20 = 0x80240480; // type:func rom:0xD30100 sam_08_UnkFunc39 = 0x80240510; // type:func rom:0xD30190 @@ -16475,11 +16476,11 @@ pra_35_ReflectPartner = 0x80240D3C; // type:func rom:0xD8DF8C pra_35_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD8E0D4 pra_35_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD8E108 pra_35_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD8E13C -func_80240F20_D8E170 = 0x80240F20; // type:func rom:0xD8E170 +pra_35_UnkNpcAIFunc24 = 0x80240F20; // type:func rom:0xD8E170 pra_35_UnkFunc13 = 0x80241078; // type:func rom:0xD8E2C8 pra_35_UnkNpcAIFunc1 = 0x80241320; // type:func rom:0xD8E570 pra_35_UnkFunc14 = 0x802413E0; // type:func rom:0xD8E630 -func_8024159C_D8E7EC = 0x8024159C; // type:func rom:0xD8E7EC +pra_35_UnkNpcAIFunc25 = 0x8024159C; // type:func rom:0xD8E7EC pra_35_NpcJumpFunc2 = 0x80241650; // type:func rom:0xD8E8A0 pra_35_NpcJumpFunc = 0x802416C4; // type:func rom:0xD8E914 pra_35_UnkNpcAIFunc13 = 0x8024173C; // type:func rom:0xD8E98C @@ -16663,7 +16664,7 @@ omo_04_CheckItemFlags40 = 0x80240268; // type:func rom:0xDAD668 omo_04_UnsetCamera0MoveFlag1 = 0x802402BC; // type:func rom:0xDAD6BC omo_04_SetCamera0MoveFlag1 = 0x802402D8; // type:func rom:0xDAD6D8 func_802402F4_DAD6F4 = 0x802402F4; // type:func rom:0xDAD6F4 -func_802403A0_DAD7A0 = 0x802403A0; // type:func rom:0xDAD7A0 +omo_04_UnkNpcAIFunc23 = 0x802403A0; // type:func rom:0xDAD7A0 func_80240550_DAD950 = 0x80240550; // type:func rom:0xDAD950 omo_04_UnkNpcAIFunc1 = 0x80240B78; // type:func rom:0xDADF78 omo_04_UnkFunc4 = 0x80240C38; // type:func rom:0xDAE038 @@ -16697,7 +16698,7 @@ func_80240238_DB24F8 = 0x80240238; // type:func rom:0xDB24F8 omo_05_UnkNpcAIFunc4 = 0x8024056C; // type:func rom:0xDB282C func_802405BC_DB287C = 0x802405BC; // type:func rom:0xDB287C func_80240780_DB2A40 = 0x80240780; // type:func rom:0xDB2A40 -func_80240A54_DB2D14 = 0x80240A54; // type:func rom:0xDB2D14 +omo_05_UnkNpcAIFunc23 = 0x80240A54; // type:func rom:0xDB2D14 func_80240C04_DB2EC4 = 0x80240C04; // type:func rom:0xDB2EC4 omo_05_UnkNpcAIFunc1 = 0x8024122C; // type:func rom:0xDB34EC omo_05_UnkFunc4 = 0x802412EC; // type:func rom:0xDB35AC @@ -16747,11 +16748,11 @@ func_80240070_DBD320 = 0x80240070; // type:func rom:0xDBD320 func_80240140_DBD3F0 = 0x80240140; // type:func rom:0xDBD3F0 func_802401D8_DBD488 = 0x802401D8; // type:func rom:0xDBD488 func_80240238_DBD4E8 = 0x80240238; // type:func rom:0xDBD4E8 -func_8024056C_DBD81C = 0x8024056C; // type:func rom:0xDBD81C +omo_07_UnkNpcAIFunc24 = 0x8024056C; // type:func rom:0xDBD81C omo_07_UnkFunc13 = 0x802406C4; // type:func rom:0xDBD974 omo_07_UnkNpcAIFunc1 = 0x8024096C; // type:func rom:0xDBDC1C omo_07_UnkFunc14 = 0x80240A2C; // type:func rom:0xDBDCDC -func_80240BE8_DBDE98 = 0x80240BE8; // type:func rom:0xDBDE98 +omo_07_UnkNpcAIFunc25 = 0x80240BE8; // type:func rom:0xDBDE98 omo_07_NpcJumpFunc2 = 0x80240C9C; // type:func rom:0xDBDF4C omo_07_NpcJumpFunc = 0x80240D10; // type:func rom:0xDBDFC0 omo_07_UnkNpcAIFunc13 = 0x80240D88; // type:func rom:0xDBE038 @@ -16764,7 +16765,7 @@ func_8024146C_DBE71C = 0x8024146C; // type:func rom:0xDBE71C func_8024153C_DBE7EC = 0x8024153C; // type:func rom:0xDBE7EC func_802415D4_DBE884 = 0x802415D4; // type:func rom:0xDBE884 func_80241634_DBE8E4 = 0x80241634; // type:func rom:0xDBE8E4 -func_80241978_DBEC28 = 0x80241978; // type:func rom:0xDBEC28 +omo_07_UnkNpcAIFunc23 = 0x80241978; // type:func rom:0xDBEC28 func_80241B28_DBEDD8 = 0x80241B28; // type:func rom:0xDBEDD8 dup_omo_07_UnkNpcAIFunc1 = 0x80242150; // type:func rom:0xDBF400 omo_07_UnkFunc4 = 0x80242210; // type:func rom:0xDBF4C0 @@ -16828,11 +16829,11 @@ func_80240A50_DCD720 = 0x80240A50; // type:func rom:0xDCD720 func_80240B20_DCD7F0 = 0x80240B20; // type:func rom:0xDCD7F0 func_80240BB8_DCD888 = 0x80240BB8; // type:func rom:0xDCD888 func_80240C18_DCD8E8 = 0x80240C18; // type:func rom:0xDCD8E8 -func_80240F4C_DCDC1C = 0x80240F4C; // type:func rom:0xDCDC1C +omo_09_UnkNpcAIFunc24 = 0x80240F4C; // type:func rom:0xDCDC1C omo_09_UnkFunc13 = 0x802410A4; // type:func rom:0xDCDD74 omo_09_UnkNpcAIFunc1 = 0x8024134C; // type:func rom:0xDCE01C omo_09_UnkFunc14 = 0x8024140C; // type:func rom:0xDCE0DC -func_802415C8_DCE298 = 0x802415C8; // type:func rom:0xDCE298 +omo_09_UnkNpcAIFunc25 = 0x802415C8; // type:func rom:0xDCE298 omo_09_NpcJumpFunc2 = 0x8024167C; // type:func rom:0xDCE34C omo_09_NpcJumpFunc = 0x802416F0; // type:func rom:0xDCE3C0 omo_09_UnkNpcAIFunc13 = 0x80241768; // type:func rom:0xDCE438 @@ -16895,7 +16896,7 @@ omo_11_UnkFunc18 = 0x802407F8; // type:func rom:0xDDD028 omo_11_UnkFunc37 = 0x80240864; // type:func rom:0xDDD094 omo_11_UnkFunc38 = 0x802408B0; // type:func rom:0xDDD0E0 func_8024095C_DDD18C = 0x8024095C; // type:func rom:0xDDD18C -func_80240BAC_DDD3DC = 0x80240BAC; // type:func rom:0xDDD3DC +omo_11_SwitchToPartner = 0x80240BAC; // type:func rom:0xDDD3DC omo_11_UnkFunc19 = 0x80240BD8; // type:func rom:0xDDD408 omo_11_UnkFunc20 = 0x80240C10; // type:func rom:0xDDD440 omo_11_UnkFunc39 = 0x80240CA0; // type:func rom:0xDDD4D0 @@ -16984,7 +16985,7 @@ func_80240798_DEF638 = 0x80240798; // type:func rom:0xDEF638 omo_17_UnkNpcAIFunc4 = 0x80240ACC; // type:func rom:0xDEF96C func_80240B1C_DEF9BC = 0x80240B1C; // type:func rom:0xDEF9BC func_80240CE0_DEFB80 = 0x80240CE0; // type:func rom:0xDEFB80 -func_80240FB4_DEFE54 = 0x80240FB4; // type:func rom:0xDEFE54 +omo_17_UnkNpcAIFunc23 = 0x80240FB4; // type:func rom:0xDEFE54 func_80241164_DF0004 = 0x80241164; // type:func rom:0xDF0004 omo_17_UnkNpcAIFunc1 = 0x8024178C; // type:func rom:0xDF062C omo_17_UnkFunc4 = 0x8024184C; // type:func rom:0xDF06EC @@ -17103,11 +17104,11 @@ mgm_00_UnkFunc25 = 0x80240034; // type:func rom:0xE0E7D4 mgm_00_GetEntryPos = 0x802400F0; // type:func rom:0xE0E890 mgm_00_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xE0E970 mgm_00_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xE0E9DC -func_802402E0_E0EA80 = 0x802402E0; // type:func rom:0xE0EA80 +mgm_00_UnkNpcAIFunc24 = 0x802402E0; // type:func rom:0xE0EA80 mgm_00_UnkFunc13 = 0x80240438; // type:func rom:0xE0EBD8 mgm_00_UnkNpcAIFunc1 = 0x802406E0; // type:func rom:0xE0EE80 mgm_00_UnkFunc14 = 0x802407A0; // type:func rom:0xE0EF40 -func_8024095C_E0F0FC = 0x8024095C; // type:func rom:0xE0F0FC +mgm_00_UnkNpcAIFunc25 = 0x8024095C; // type:func rom:0xE0F0FC mgm_00_NpcJumpFunc2 = 0x80240A10; // type:func rom:0xE0F1B0 mgm_00_NpcJumpFunc = 0x80240A84; // type:func rom:0xE0F224 mgm_00_UnkNpcAIFunc13 = 0x80240AFC; // type:func rom:0xE0F29C @@ -17749,6 +17750,7 @@ D_802441DC_EE2B9C = 0x802441DC; // type:data rom:0xEE2B9C D_80247AF0_EE64B0 = 0x80247AF0; // type:data rom:0xEE64B0 D_80247AF8_EE64B8 = 0x80247AF8; // type:data rom:0xEE64B8 D_80247B00_EE64C0 = 0x80247B00; // type:data rom:0xEE64C0 +D_80247B44_EE6504 = 0x80247B44; // type:data rom:0xEE6504 D_80247B50_EE6510 = 0x80247B50; // type:data rom:0xEE6510 D_80247BB0_EE6570 = 0x80247BB0; // type:data rom:0xEE6570 D_80247BE0_EE65A0 = 0x80247BE0; // type:data rom:0xEE65A0 diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 38bfc9a31d..c10e7ab145 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -71,3 +71,5 @@ obk_01_bss_sym = 0x802458F0; _163400_BSS_START = 0x8024C080; _163400_BSS_END = 0x8024C120; D_80244F98_EC7198 = 0x80244F98; +D_80246568_C8C018 = 0x80246568; +D_8024B9A8_B8FB28 = 0x8024B9A8;