From 2d26e6dc957f1f51202074b3e8d584aac437bb7e Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Thu, 7 Apr 2022 03:41:39 -0400 Subject: [PATCH] merged texture pan includes (#675) Co-authored-by: HailSanta --- src/EA0900.c | 3 +- src/EA7010.c | 3 +- src/EA8AE0.c | 4 +- src/EB0E60.c | 3 +- src/EB5130.c | 4 +- src/EB7230.c | 3 +- src/EC71B0.c | 4 +- src/ED42A0.c | 3 +- src/EE65B0.c | 4 +- src/EE70C0.c | 4 +- src/EF7A80.c | 4 +- src/EFEB00.c | 4 +- src/battle/area_tik/5EDDF0.c | 3 +- src/battle/area_tik2/60A470.c | 3 +- src/battle/area_tik3/6197E0.c | 3 +- src/world/area_flo/flo_07/CAC1F0.c | 4 +- src/world/area_flo/flo_07/CAC5D0.c | 4 +- src/world/area_flo/flo_07/flo_07.h | 4 +- src/world/area_flo/flo_10/CB9280.c | 7 +- src/world/area_flo/flo_10/flo_10.h | 4 +- src/world/area_flo/flo_14/CCB310.c | 8 +- src/world/area_flo/flo_14/flo_14.h | 4 +- src/world/area_flo/flo_18/CDC6A0.c | 8 +- src/world/area_flo/flo_18/flo_18.h | 4 +- src/world/area_flo/flo_19/CE36F0.c | 8 +- src/world/area_flo/flo_19/flo_19.h | 4 +- src/world/area_flo/flo_21/CE6700.c | 8 +- src/world/area_flo/flo_21/flo_21.h | 4 +- src/world/area_flo/flo_24/CF0980.c | 4 +- src/world/area_flo/flo_24/CF0BC0.c | 3 +- src/world/area_flo/flo_24/flo_24.h | 4 +- src/world/area_gv/gv_01/E1E460.c | 4 +- src/world/area_hos/hos_01/A11020.c | 4 +- src/world/area_hos/hos_02/A16220.c | 4 +- src/world/area_hos/hos_03/A1B130.c | 4 +- src/world/area_hos/hos_04/A26ED0.c | 3 +- src/world/area_hos/hos_05/A2A240.c | 4 +- src/world/area_hos/hos_05/A2EF00.c | 3 +- src/world/area_hos/hos_06/A394E0.c | 3 +- src/world/area_hos/hos_10/A3F760.c | 4 +- src/world/area_hos/hos_10/A3FBA0.c | 3 +- src/world/area_hos/hos_20/A45930.c | 3 +- src/world/area_jan/jan_00/B20540.c | 4 +- src/world/area_jan/jan_01/B28030.c | 4 +- src/world/area_jan/jan_02/B2C4A0.c | 4 +- src/world/area_jan/jan_03/B34BD0.c | 4 +- src/world/area_jan/jan_04/B447B0.c | 3 +- src/world/area_jan/jan_05/B4AAB0.c | 3 +- src/world/area_jan/jan_06/B52830.c | 3 +- src/world/area_jan/jan_08/B5E2B0.c | 3 +- src/world/area_jan/jan_09/B65AB0.c | 3 +- src/world/area_jan/jan_10/B6C390.c | 3 +- src/world/area_kkj/kkj_03/AC9730.c | 3 +- src/world/area_kkj/kkj_13/AD5EF0.c | 3 +- src/world/area_kkj/kkj_14/ADAEF0.c | 4 +- src/world/area_kkj/kkj_15/AE5590.c | 4 +- src/world/area_kkj/kkj_18/AF2CA0.c | 4 +- src/world/area_kkj/kkj_27/B13D70.c | 3 +- src/world/area_kmr/kmr_30/90B6D0.c | 3 +- src/world/area_kpa/kpa_10/A51980.c | 3 +- src/world/area_kpa/kpa_102/A93740.c | 3 +- src/world/area_kpa/kpa_11/A528C0.c | 3 +- src/world/area_kpa/kpa_12/A54990.c | 3 +- src/world/area_kpa/kpa_13/A55F60.c | 3 +- src/world/area_kpa/kpa_133/AA7480.c | 3 +- src/world/area_kpa/kpa_134/AA8FA0.c | 3 +- src/world/area_kpa/kpa_14/A574F0.c | 4 +- src/world/area_kpa/kpa_15/A59390.c | 3 +- src/world/area_kpa/kpa_16/A5A030.c | 3 +- src/world/area_kpa/kpa_32/A5E0C0.c | 3 +- src/world/area_kpa/kpa_33/A5F080.c | 3 +- src/world/area_kpa/kpa_60/A6CBE0.c | 3 +- src/world/area_kpa/kpa_61/A6E3E0.c | 3 +- src/world/area_kpa/kpa_62/A72300.c | 3 +- src/world/area_kpa/kpa_70/A74870.c | 3 +- src/world/area_kzn/kzn_01/C599D0.c | 3 +- src/world/area_kzn/kzn_02/C5A740.c | 3 +- src/world/area_kzn/kzn_03/C60D10.c | 3 +- src/world/area_kzn/kzn_04/C68130.c | 3 +- src/world/area_kzn/kzn_05/C6C0D0.c | 3 +- src/world/area_kzn/kzn_06/C6C920.c | 3 +- src/world/area_kzn/kzn_07/C6E330.c | 3 +- src/world/area_kzn/kzn_08/C71480.c | 4 +- src/world/area_kzn/kzn_10/C7E180.c | 4 +- src/world/area_kzn/kzn_11/C801A0.c | 3 +- src/world/area_kzn/kzn_17/C85AB0.c | 3 +- src/world/area_kzn/kzn_18/C8C0E0.c | 3 +- src/world/area_kzn/kzn_19/C8DBB0.c | 4 +- src/world/area_kzn/kzn_20/C95F30.c | 3 +- src/world/area_kzn/kzn_22/C9A200.c | 4 +- src/world/area_kzn/kzn_23/C9C300.c | 3 +- src/world/area_mac/mac_00/7EAD10.c | 4 +- src/world/area_mac/mac_02/8232C0.c | 3 +- src/world/area_mac/mac_05/852170.c | 4 +- src/world/area_mac/mac_06/864B40.c | 4 +- src/world/area_mim/mim_11/BB7070.c | 4 +- src/world/area_omo/omo_03/DA5260.c | 3 +- src/world/area_omo/omo_06/DB7910.c | 3 +- src/world/area_omo/omo_08/DC43D0.c | 3 +- src/world/area_omo/omo_10/DD79B0.c | 3 +- src/world/area_osr/osr_00/AAC830.c | 4 +- src/world/area_osr/osr_01/AB0040.c | 3 +- src/world/area_sam/sam_01/CF7B70.c | 3 +- src/world/area_sam/sam_02/D05730.c | 4 +- src/world/area_sam/sam_06/D1FE90.c | 4 +- src/world/area_sam/sam_11/D3ADA0.c | 4 +- src/world/area_tik/tik_01/8694B0.c | 4 +- src/world/area_tik/tik_02/86C740.c | 3 +- src/world/area_tik/tik_03/86EB00.c | 3 +- src/world/area_tik/tik_04/871A30.c | 4 +- src/world/area_tik/tik_05/874DC0.c | 3 +- src/world/area_tik/tik_06/876EE0.c | 3 +- src/world/area_tik/tik_08/87EDF0.c | 3 +- src/world/area_tik/tik_09/8821C0.c | 3 +- src/world/area_tik/tik_10/8863C0.c | 3 +- src/world/area_tik/tik_12/888BD0.c | 3 +- src/world/area_tik/tik_14/88D600.c | 3 +- src/world/area_tik/tik_15/88FBA0.c | 3 +- src/world/area_tik/tik_17/893790.c | 3 +- src/world/area_tik/tik_18/8956E0.c | 3 +- src/world/area_tik/tik_19/8975E0.c | 3 +- src/world/area_tik/tik_20/89A350.c | 4 +- src/world/area_tik/tik_21/89D7A0.c | 4 +- src/world/area_tik/tik_22/89FEF0.c | 4 +- src/world/area_tik/tik_23/8A23D0.c | 4 +- src/world/area_tik/tik_24/8A5AD0.c | 3 +- src/world/area_tik/tik_25/8A7F80.c | 4 +- src/world/area_trd/trd_00/999C70.c | 3 +- src/world/area_trd/trd_01/99C990.c | 3 +- src/world/area_trd/trd_04/9A83F0.c | 3 +- src/world/area_trd/trd_06/9B1790.c | 3 +- src/world/area_trd/trd_07/9B6980.c | 3 +- src/world/area_trd/trd_08/9BB2A0.c | 3 +- src/world/common/UnkTexturePanFunc.inc.c | 38 -- ...ePanFunc2.inc.c => UpdateTexturePan.inc.c} | 38 +- ver/us/asm/data/EA3A80.data.s | 2 +- ver/us/asm/data/EA7390.data.s | 2 +- ver/us/asm/data/EAA810.data.s | 2 +- ver/us/asm/data/EB1920.data.s | 2 +- ver/us/asm/data/EB54C0.data.s | 2 +- ver/us/asm/data/EB7850.data.s | 2 +- ver/us/asm/data/EC78F0.data.s | 2 +- ver/us/asm/data/ED5780.data.s | 2 +- ver/us/asm/data/EE8970.data.s | 2 +- ver/us/asm/data/EF8250.data.s | 2 +- ver/us/asm/data/battle/area_tik/5EE550.data.s | 2 +- .../asm/data/battle/area_tik2/60ABD0.data.s | 2 +- .../asm/data/battle/area_tik3/619F40.data.s | 2 +- .../data/world/area_gv/gv_01/E1EC20.data.s | 2 +- .../data/world/area_hos/hos_01/A11760.data.s | 2 +- .../data/world/area_hos/hos_02/A19530.data.s | 2 +- .../data/world/area_hos/hos_03/A1EC30.data.s | 2 +- .../data/world/area_hos/hos_04/A285C0.data.s | 2 +- .../data/world/area_hos/hos_05/A2FCD0.data.s | 2 +- .../data/world/area_hos/hos_05/A37E70.data.s | 2 +- .../data/world/area_hos/hos_06/A3BAE0.data.s | 2 +- .../data/world/area_hos/hos_10/A42DA0.data.s | 2 +- .../data/world/area_hos/hos_10/A43920.data.s | 2 +- .../data/world/area_hos/hos_20/A45C90.data.s | 2 +- .../data/world/area_jan/jan_00/B22190.data.s | 2 +- .../data/world/area_jan/jan_01/B294A0.data.s | 2 +- .../data/world/area_jan/jan_02/B2EEA0.data.s | 2 +- .../data/world/area_jan/jan_03/B37E60.data.s | 2 +- .../data/world/area_jan/jan_04/B45A20.data.s | 2 +- .../data/world/area_jan/jan_05/B4D200.data.s | 2 +- .../data/world/area_jan/jan_06/B54E10.data.s | 2 +- .../data/world/area_jan/jan_08/B60790.data.s | 2 +- .../data/world/area_jan/jan_09/B673D0.data.s | 2 +- .../data/world/area_jan/jan_10/B6DB60.data.s | 2 +- .../data/world/area_kkj/kkj_03/AC9A40.data.s | 2 +- .../data/world/area_kkj/kkj_13/AD6780.data.s | 2 +- .../data/world/area_kkj/kkj_14/ADB360.data.s | 2 +- .../data/world/area_kkj/kkj_15/AE5CE0.data.s | 2 +- .../data/world/area_kkj/kkj_18/AF3560.data.s | 2 +- .../data/world/area_kkj/kkj_27/B14340.data.s | 2 +- .../data/world/area_kmr/kmr_30/90BBB0.data.s | 2 +- .../data/world/area_kpa/kpa_10/A51D90.data.s | 2 +- .../data/world/area_kpa/kpa_102/A96DA0.data.s | 2 +- .../data/world/area_kpa/kpa_11/A534C0.data.s | 2 +- .../data/world/area_kpa/kpa_12/A54DC0.data.s | 2 +- .../data/world/area_kpa/kpa_13/A56390.data.s | 2 +- .../data/world/area_kpa/kpa_133/AA79E0.data.s | 2 +- .../data/world/area_kpa/kpa_134/AA9790.data.s | 2 +- .../data/world/area_kpa/kpa_14/A57E40.data.s | 2 +- .../data/world/area_kpa/kpa_15/A59960.data.s | 2 +- .../data/world/area_kpa/kpa_16/A5A3D0.data.s | 2 +- .../data/world/area_kpa/kpa_32/A5E500.data.s | 2 +- .../data/world/area_kpa/kpa_33/A5F4C0.data.s | 2 +- .../data/world/area_kpa/kpa_60/A6CEF0.data.s | 2 +- .../data/world/area_kpa/kpa_61/A707F0.data.s | 2 +- .../data/world/area_kpa/kpa_62/A72740.data.s | 2 +- .../data/world/area_kpa/kpa_70/A75440.data.s | 2 +- .../data/world/area_kzn/kzn_01/C59CE0.data.s | 2 +- .../data/world/area_kzn/kzn_02/C5CF60.data.s | 2 +- .../data/world/area_kzn/kzn_03/C63DA0.data.s | 2 +- .../data/world/area_kzn/kzn_04/C69890.data.s | 2 +- .../data/world/area_kzn/kzn_05/C6C3E0.data.s | 2 +- .../data/world/area_kzn/kzn_06/C6D390.data.s | 2 +- .../data/world/area_kzn/kzn_07/C70710.data.s | 2 +- .../data/world/area_kzn/kzn_08/C755A0.data.s | 2 +- .../data/world/area_kzn/kzn_10/C7E850.data.s | 2 +- .../data/world/area_kzn/kzn_11/C82800.data.s | 2 +- .../data/world/area_kzn/kzn_17/C88B50.data.s | 2 +- .../data/world/area_kzn/kzn_18/C8C460.data.s | 2 +- .../data/world/area_kzn/kzn_19/C8FA40.data.s | 2 +- .../data/world/area_kzn/kzn_20/C969F0.data.s | 2 +- .../data/world/area_kzn/kzn_22/C9A650.data.s | 2 +- .../data/world/area_kzn/kzn_23/C9C9B0.data.s | 2 +- .../data/world/area_mac/mac_00/7EE870.data.s | 2 +- .../data/world/area_mac/mac_02/8268F0.data.s | 2 +- .../data/world/area_mac/mac_05/856650.data.s | 2 +- .../data/world/area_mac/mac_06/8661D0.data.s | 2 +- .../data/world/area_mim/mim_11/BB7C30.data.s | 2 +- .../data/world/area_omo/omo_03/DA8190.data.s | 2 +- .../data/world/area_omo/omo_06/DB9060.data.s | 2 +- .../data/world/area_omo/omo_08/DC8100.data.s | 2 +- .../data/world/area_omo/omo_10/DD8A60.data.s | 2 +- .../data/world/area_osr/osr_00/AACFC0.data.s | 2 +- .../data/world/area_osr/osr_01/AB0C10.data.s | 2 +- .../data/world/area_sam/sam_01/CF9BC0.data.s | 2 +- .../data/world/area_sam/sam_02/D07440.data.s | 2 +- .../data/world/area_sam/sam_06/D22560.data.s | 2 +- .../data/world/area_sam/sam_11/D46980.data.s | 2 +- .../data/world/area_tik/tik_01/86A030.data.s | 2 +- .../data/world/area_tik/tik_02/86D190.data.s | 2 +- .../data/world/area_tik/tik_03/86F670.data.s | 2 +- .../data/world/area_tik/tik_04/872750.data.s | 2 +- .../data/world/area_tik/tik_05/8758C0.data.s | 2 +- .../data/world/area_tik/tik_06/8778F0.data.s | 2 +- .../data/world/area_tik/tik_08/87F9A0.data.s | 2 +- .../data/world/area_tik/tik_09/883500.data.s | 2 +- .../data/world/area_tik/tik_10/887800.data.s | 2 +- .../data/world/area_tik/tik_12/88AEA0.data.s | 2 +- .../data/world/area_tik/tik_14/88DFF0.data.s | 2 +- .../data/world/area_tik/tik_15/890740.data.s | 2 +- .../data/world/area_tik/tik_17/8944F0.data.s | 2 +- .../data/world/area_tik/tik_18/895E20.data.s | 2 +- .../data/world/area_tik/tik_19/898990.data.s | 2 +- .../data/world/area_tik/tik_20/89B530.data.s | 2 +- .../data/world/area_tik/tik_21/89E1A0.data.s | 2 +- .../data/world/area_tik/tik_22/8A0930.data.s | 2 +- .../data/world/area_tik/tik_23/8A35A0.data.s | 2 +- .../data/world/area_tik/tik_24/8A69C0.data.s | 2 +- .../data/world/area_tik/tik_25/8A8800.data.s | 2 +- .../data/world/area_trd/trd_00/99A410.data.s | 2 +- .../data/world/area_trd/trd_01/99E110.data.s | 2 +- .../data/world/area_trd/trd_04/9ABD70.data.s | 2 +- .../data/world/area_trd/trd_06/9B2610.data.s | 2 +- .../data/world/area_trd/trd_07/9B9310.data.s | 2 +- .../data/world/area_trd/trd_08/9BBD50.data.s | 2 +- ver/us/symbol_addrs.txt | 492 +++++++++--------- 251 files changed, 551 insertions(+), 720 deletions(-) delete mode 100644 src/world/common/UnkTexturePanFunc.inc.c rename src/world/common/{UnkTexturePanFunc2.inc.c => UpdateTexturePan.inc.c} (62%) diff --git a/src/EA0900.c b/src/EA0900.c index 2b24da23f6..eefb88ff61 100644 --- a/src/EA0900.c +++ b/src/EA0900.c @@ -3,6 +3,5 @@ #define NAMESPACE EA0900 -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/EA7010.c b/src/EA7010.c index 4e1d727f3f..8a4adbcabe 100644 --- a/src/EA7010.c +++ b/src/EA7010.c @@ -3,6 +3,5 @@ #define NAMESPACE EA7010 -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/EA8AE0.c b/src/EA8AE0.c index 060cc507c7..5825b24143 100644 --- a/src/EA8AE0.c +++ b/src/EA8AE0.c @@ -9,9 +9,7 @@ extern s32 D_80248388[]; extern s32 D_80248380; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/StarSpiritEffectFunc.inc.c" diff --git a/src/EB0E60.c b/src/EB0E60.c index d1f91f3f0e..debef309dc 100644 --- a/src/EB0E60.c +++ b/src/EB0E60.c @@ -3,6 +3,5 @@ #define NAMESPACE EB0E60 -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/EB5130.c b/src/EB5130.c index a366d83caa..928a997c35 100644 --- a/src/EB5130.c +++ b/src/EB5130.c @@ -3,9 +3,7 @@ #define NAMESPACE EB5130 -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" ApiStatus func_8024030C_EB543C(Evt* script, s32 isInitialCall) { evt_set_variable(script, *script->ptrReadPos, dead_gCollisionStatus.pushingAgainstWall); diff --git a/src/EB7230.c b/src/EB7230.c index f93196053c..f2a125ecb8 100644 --- a/src/EB7230.c +++ b/src/EB7230.c @@ -3,6 +3,5 @@ #define NAMESPACE EB7230 -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/EC71B0.c b/src/EC71B0.c index 9caad8056e..e7ad0a2d33 100644 --- a/src/EC71B0.c +++ b/src/EC71B0.c @@ -5,9 +5,7 @@ #define NAMESPACE EC71B0 -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/SpawnSunEffect.inc.c" diff --git a/src/ED42A0.c b/src/ED42A0.c index 7ca4008490..265b2a07a0 100644 --- a/src/ED42A0.c +++ b/src/ED42A0.c @@ -7,6 +7,5 @@ INCLUDE_ASM(s32, "ED42A0", func_80240080_ED42A0); #include "world/common/GetItemName.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/EE65B0.c b/src/EE65B0.c index 7b04e81039..1c067f54f6 100644 --- a/src/EE65B0.c +++ b/src/EE65B0.c @@ -5,9 +5,7 @@ #define NAMESPACE EE65B0 -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) { dead_fx_sun(0, 0, 0, 0, 0, 0); diff --git a/src/EE70C0.c b/src/EE70C0.c index c4a2df0ccd..1964b71a6f 100644 --- a/src/EE70C0.c +++ b/src/EE70C0.c @@ -57,7 +57,7 @@ ApiStatus func_802422EC_EE889C(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -extern ApiStatus EE65B0_UnkTexturePanFunc; +extern ApiStatus EE65B0_UpdateTexturePanSmooth; // TODO sort out this mess -const s32 D_802453E0_EEB990[] = { 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, &EE65B0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 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, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 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, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000, }; +const s32 D_802453E0_EEB990[] = { 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, &EE65B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 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, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 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, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000, }; diff --git a/src/EF7A80.c b/src/EF7A80.c index 2ed4f2fc3d..ff32046835 100644 --- a/src/EF7A80.c +++ b/src/EF7A80.c @@ -5,9 +5,7 @@ #define NAMESPACE EF7A80 -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/DeadUnkFunc1.inc.c" diff --git a/src/EFEB00.c b/src/EFEB00.c index a750d0ca96..2433e72f41 100644 --- a/src/EFEB00.c +++ b/src/EFEB00.c @@ -5,9 +5,7 @@ #define NAMESPACE EFEB00 -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/DeadUnkFunc1.inc.c" diff --git a/src/battle/area_tik/5EDDF0.c b/src/battle/area_tik/5EDDF0.c index c874066ad4..03172a6a74 100644 --- a/src/battle/area_tik/5EDDF0.c +++ b/src/battle/area_tik/5EDDF0.c @@ -4,6 +4,5 @@ INCLUDE_ASM(s32, "battle/area_tik/5EDDF0", func_80219960_5EDDF0); -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/battle/area_tik2/60A470.c b/src/battle/area_tik2/60A470.c index 37d68daf73..70c904f056 100644 --- a/src/battle/area_tik2/60A470.c +++ b/src/battle/area_tik2/60A470.c @@ -4,6 +4,5 @@ INCLUDE_ASM(s32, "battle/area_tik2/60A470", func_802199C0_60A470); -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/battle/area_tik3/6197E0.c b/src/battle/area_tik3/6197E0.c index af0b8717df..051aaa9f28 100644 --- a/src/battle/area_tik3/6197E0.c +++ b/src/battle/area_tik3/6197E0.c @@ -4,6 +4,5 @@ INCLUDE_ASM(s32, "battle/area_tik3/6197E0", func_802190F0_6197E0); -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_flo/flo_07/CAC1F0.c b/src/world/area_flo/flo_07/CAC1F0.c index 3b8d25347c..3713d6681d 100644 --- a/src/world/area_flo/flo_07/CAC1F0.c +++ b/src/world/area_flo/flo_07/CAC1F0.c @@ -1,9 +1,7 @@ #include "flo_07.h" #include "effects.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index e12b63dc91..5591c3d996 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -60,13 +60,13 @@ EvtScript N(updateTexturePan_802408D0) = { EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) EVT_IF_EQ(EVT_VAR(8), 1) - EVT_CALL(N(UnkTexturePanFunc)) + EVT_CALL(N(UpdateTexturePanSmooth)) EVT_RETURN EVT_END_IF EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(N(UnkTexturePanFunc2)) + EVT_CALL(N(UpdateTexturePanStepped)) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_07/flo_07.h b/src/world/area_flo/flo_07/flo_07.h index 53765a4351..7bdf8e296b 100644 --- a/src/world/area_flo/flo_07/flo_07.h +++ b/src/world/area_flo/flo_07/flo_07.h @@ -8,8 +8,8 @@ ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); ApiStatus N(SpawnSunEffect)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240344_CAC534)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80242B0C); diff --git a/src/world/area_flo/flo_10/CB9280.c b/src/world/area_flo/flo_10/CB9280.c index 9955cf3389..9d0bd46389 100644 --- a/src/world/area_flo/flo_10/CB9280.c +++ b/src/world/area_flo/flo_10/CB9280.c @@ -182,13 +182,13 @@ EvtScript N(updateTexturePan_80241D14) = SCRIPT({ if (EVT_VAR(6) == 1) { if (EVT_VAR(7) == 1) { if (EVT_VAR(8) == 1) { - N(UnkTexturePanFunc)(); + N(UpdateTexturePanSmooth)(); return; } } } } - N(UnkTexturePanFunc2)(); + N(UpdateTexturePanStepped)(); }); EvtScript N(80241DB0) = SCRIPT({ @@ -825,6 +825,5 @@ ApiStatus N(func_80240080_CB9280)(Evt* script, s32 isInitialCall) { #include "world/common/GetItemName.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_flo/flo_10/flo_10.h b/src/world/area_flo/flo_10/flo_10.h index 2bbd538a1a..9bdaa1f649 100644 --- a/src/world/area_flo/flo_10/flo_10.h +++ b/src/world/area_flo/flo_10/flo_10.h @@ -7,8 +7,8 @@ #define NAMESPACE flo_10 ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall); s32 N(func_80240000_CB9200)(void); ApiStatus N(func_80240040_CB9240)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_14/CCB310.c b/src/world/area_flo/flo_14/CCB310.c index 5bdfe9a863..ce6ee8af37 100644 --- a/src/world/area_flo/flo_14/CCB310.c +++ b/src/world/area_flo/flo_14/CCB310.c @@ -31,13 +31,13 @@ EvtScript N(updateTexturePan_80242460) = { EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) EVT_IF_EQ(EVT_VAR(8), 1) - EVT_CALL(N(UnkTexturePanFunc)) + EVT_CALL(N(UpdateTexturePanSmooth)) EVT_RETURN EVT_END_IF EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(N(UnkTexturePanFunc2)) + EVT_CALL(N(UpdateTexturePanStepped)) EVT_RETURN EVT_END }; @@ -572,9 +572,7 @@ EvtScript N(80243E78) = { EVT_END }; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" void fx_sun(); diff --git a/src/world/area_flo/flo_14/flo_14.h b/src/world/area_flo/flo_14/flo_14.h index 963e4e499e..84729d7efd 100644 --- a/src/world/area_flo/flo_14/flo_14.h +++ b/src/world/area_flo/flo_14/flo_14.h @@ -8,8 +8,8 @@ ApiStatus N(func_80242360_CCD670)(Evt *script, s32 isInitialCall); ApiStatus N(AddPlayerHandsOffset)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024030C_CCB61C)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc43)(Evt* script, s32 isInitialCall); ApiStatus N(func_802403D4_CCB6E4)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_18/CDC6A0.c b/src/world/area_flo/flo_18/CDC6A0.c index 76a2691d9b..9498840446 100644 --- a/src/world/area_flo/flo_18/CDC6A0.c +++ b/src/world/area_flo/flo_18/CDC6A0.c @@ -48,13 +48,13 @@ EvtScript N(updateTexturePan_802408C0) = { EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) EVT_IF_EQ(EVT_VAR(8), 1) - EVT_CALL(N(UnkTexturePanFunc)) + EVT_CALL(N(UpdateTexturePanSmooth)) EVT_RETURN EVT_END_IF EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(N(UnkTexturePanFunc2)) + EVT_CALL(N(UpdateTexturePanStepped)) EVT_RETURN EVT_END }; @@ -1732,9 +1732,7 @@ static s32 N(pad_66B4)[] = { 0x00000000, 0x00000000, 0x00000000, }; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" // It seems like fx_sun was not properly defined for this file. Having a proper // declaration makes it not match. diff --git a/src/world/area_flo/flo_18/flo_18.h b/src/world/area_flo/flo_18/flo_18.h index 7b2b17fe96..250343df13 100644 --- a/src/world/area_flo/flo_18/flo_18.h +++ b/src/world/area_flo/flo_18/flo_18.h @@ -7,8 +7,8 @@ #define NAMESPACE flo_18 ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024030C_CDC9AC)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240340_CDC9E0)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_19/CE36F0.c b/src/world/area_flo/flo_19/CE36F0.c index 0ebf0d9aa4..4dfc90c51e 100644 --- a/src/world/area_flo/flo_19/CE36F0.c +++ b/src/world/area_flo/flo_19/CE36F0.c @@ -83,13 +83,13 @@ EvtScript N(updateTexturePan_80240B00) = { EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) EVT_IF_EQ(EVT_VAR(8), 1) - EVT_CALL(N(UnkTexturePanFunc)) + EVT_CALL(N(UpdateTexturePanSmooth)) EVT_RETURN EVT_END_IF EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(N(UnkTexturePanFunc2)) + EVT_CALL(N(UpdateTexturePanStepped)) EVT_RETURN EVT_END }; @@ -691,9 +691,7 @@ EvtScript N(80242FD0) = { EVT_END }; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" // It seems like fx_sun was not properly defined for this file. Having a proper // declaration makes it not match. diff --git a/src/world/area_flo/flo_19/flo_19.h b/src/world/area_flo/flo_19/flo_19.h index a0c6df7300..3aedaccbe4 100644 --- a/src/world/area_flo/flo_19/flo_19.h +++ b/src/world/area_flo/flo_19/flo_19.h @@ -6,8 +6,8 @@ #define NAMESPACE flo_19 -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall); ApiStatus N(func_8024030C_CE39FC)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240340_CE3A30)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index a04ce569af..f3a7f6fbe5 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -54,13 +54,13 @@ EvtScript N(80240DA0) = { EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) EVT_IF_EQ(EVT_VAR(8), 1) - EVT_CALL(N(UnkTexturePanFunc)) + EVT_CALL(N(UpdateTexturePanSmooth)) EVT_RETURN EVT_END_IF EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(N(UnkTexturePanFunc2)) + EVT_CALL(N(UpdateTexturePanStepped)) EVT_RETURN EVT_END }; @@ -1383,9 +1383,7 @@ NpcGroupList N(npcGroupList_80245AEC) = { {}, }; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" EffectInstance* fx_sun(); diff --git a/src/world/area_flo/flo_21/flo_21.h b/src/world/area_flo/flo_21/flo_21.h index ec7ae142af..0ce2b129d3 100644 --- a/src/world/area_flo/flo_21/flo_21.h +++ b/src/world/area_flo/flo_21/flo_21.h @@ -6,8 +6,8 @@ #define NAMESPACE flo_21 -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFloatFunc)(Evt* script, s32 isInitialCall); ApiStatus N(flo_21_StarSpiritEffectFunc1)(Evt* script, s32 isInitialCall); ApiStatus N(flo_21_StarSpiritEffectFunc2)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_24/CF0980.c b/src/world/area_flo/flo_24/CF0980.c index 055362a646..232d98319c 100644 --- a/src/world/area_flo/flo_24/CF0980.c +++ b/src/world/area_flo/flo_24/CF0980.c @@ -187,13 +187,13 @@ EvtScript N(updateTexturePan_802417A0) = { EVT_IF_EQ(EVT_VAR(6), 1) EVT_IF_EQ(EVT_VAR(7), 1) EVT_IF_EQ(EVT_VAR(8), 1) - EVT_CALL(N(UnkTexturePanFunc)) + EVT_CALL(N(UpdateTexturePanSmooth)) EVT_RETURN EVT_END_IF EVT_END_IF EVT_END_IF EVT_END_IF - EVT_CALL(N(UnkTexturePanFunc2)) + EVT_CALL(N(UpdateTexturePanStepped)) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_24/CF0BC0.c b/src/world/area_flo/flo_24/CF0BC0.c index d2f0c36295..2c5e9671cb 100644 --- a/src/world/area_flo/flo_24/CF0BC0.c +++ b/src/world/area_flo/flo_24/CF0BC0.c @@ -1,5 +1,4 @@ #include "flo_24.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_flo/flo_24/flo_24.h b/src/world/area_flo/flo_24/flo_24.h index bfd0a89878..8a3a87982f 100644 --- a/src/world/area_flo/flo_24/flo_24.h +++ b/src/world/area_flo/flo_24/flo_24.h @@ -7,8 +7,8 @@ #define NAMESPACE flo_24 ApiStatus N(TransformFoliage)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall); +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall); ApiStatus N(func_80240000_CF0940)(Evt* script, s32 isInitialCall); extern EvtScript N(80241728); diff --git a/src/world/area_gv/gv_01/E1E460.c b/src/world/area_gv/gv_01/E1E460.c index 67ba5ea1f4..60906273cb 100644 --- a/src/world/area_gv/gv_01/E1E460.c +++ b/src/world/area_gv/gv_01/E1E460.c @@ -14,9 +14,7 @@ #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" ApiStatus func_802405EC_E1EA4C(Evt* script, s32 isInitialCall) { if (isInitialCall) { diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index 0cb368c21c..b7b7576bbb 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -3,9 +3,7 @@ extern u8 D_80241C2F_A124AF; extern u8 D_80241C33_A124B3; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240AAC_A1132C); diff --git a/src/world/area_hos/hos_02/A16220.c b/src/world/area_hos/hos_02/A16220.c index b06d305906..ccd196c218 100644 --- a/src/world/area_hos/hos_02/A16220.c +++ b/src/world/area_hos/hos_02/A16220.c @@ -3,9 +3,7 @@ static char* N(exit_str_0) = "hos_01"; static char* N(exit_str_1) = "hos_03"; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_8024030C_A1652C); diff --git a/src/world/area_hos/hos_03/A1B130.c b/src/world/area_hos/hos_03/A1B130.c index 333265c126..058bc61550 100644 --- a/src/world/area_hos/hos_03/A1B130.c +++ b/src/world/area_hos/hos_03/A1B130.c @@ -1,8 +1,6 @@ #include "hos_03.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024033C_A1B43C); diff --git a/src/world/area_hos/hos_04/A26ED0.c b/src/world/area_hos/hos_04/A26ED0.c index eccb8e2216..60b6695c4c 100644 --- a/src/world/area_hos/hos_04/A26ED0.c +++ b/src/world/area_hos/hos_04/A26ED0.c @@ -7,6 +7,5 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0); INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024); -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c index dcd5e3e701..2bf130efd3 100644 --- a/src/world/area_hos/hos_05/A2A240.c +++ b/src/world/area_hos/hos_05/A2A240.c @@ -7,9 +7,7 @@ static char* N(exit_str_1) = ""; #include "world/common/UnkFunc26.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/AwaitScriptComplete.inc.c" diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c index 69ff6229a0..961f79ff33 100644 --- a/src/world/area_hos/hos_05/A2EF00.c +++ b/src/world/area_hos/hos_05/A2EF00.c @@ -9,9 +9,8 @@ extern u8 D_802D9D73; #include "world/common/UnkFunc26.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" #define NAMESPACE hos_05 INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802452C4_A2F504); diff --git a/src/world/area_hos/hos_06/A394E0.c b/src/world/area_hos/hos_06/A394E0.c index 583a4e881f..5983a01247 100644 --- a/src/world/area_hos/hos_06/A394E0.c +++ b/src/world/area_hos/hos_06/A394E0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "hos_00"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_hos/hos_10/A3F760.c b/src/world/area_hos/hos_10/A3F760.c index 06ac09e2b2..abe45b2b68 100644 --- a/src/world/area_hos/hos_10/A3F760.c +++ b/src/world/area_hos/hos_10/A3F760.c @@ -1,8 +1,6 @@ #include "hos_10.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_8024032C_A3FA6C); diff --git a/src/world/area_hos/hos_10/A3FBA0.c b/src/world/area_hos/hos_10/A3FBA0.c index ba4bf0d0b2..f60ac900e9 100644 --- a/src/world/area_hos/hos_10/A3FBA0.c +++ b/src/world/area_hos/hos_10/A3FBA0.c @@ -1,7 +1,6 @@ #include "hos_10.h" #define NAMESPACE dup_hos_10 -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" #define NAMESPACE hos_10 diff --git a/src/world/area_hos/hos_20/A45930.c b/src/world/area_hos/hos_20/A45930.c index b266ddc3be..08c4eac2ac 100644 --- a/src/world/area_hos/hos_20/A45930.c +++ b/src/world/area_hos/hos_20/A45930.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "hos_00"; static char* N(exit_str_2) = "osr_03"; static char* N(exit_str_3) = "hos_05"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index da8005b2c0..375159d48d 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -1,9 +1,7 @@ #include "jan_00.h" #include "effects.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index b5165a4f18..f6c242994b 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -3,9 +3,7 @@ static char* N(exit_str_0) = "jan_00"; static char* N(exit_str_1) = "jan_02"; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_8024030C_B2833C); diff --git a/src/world/area_jan/jan_02/B2C4A0.c b/src/world/area_jan/jan_02/B2C4A0.c index f905f1a71a..011f828d13 100644 --- a/src/world/area_jan/jan_02/B2C4A0.c +++ b/src/world/area_jan/jan_02/B2C4A0.c @@ -1,8 +1,6 @@ #include "jan_02.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C4A0", func_8024033C_B2C7AC); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 45aa1f2347..b41ae0c9f7 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -19,9 +19,7 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC); diff --git a/src/world/area_jan/jan_04/B447B0.c b/src/world/area_jan/jan_04/B447B0.c index e2ee0fb098..4de3f635e5 100644 --- a/src/world/area_jan/jan_04/B447B0.c +++ b/src/world/area_jan/jan_04/B447B0.c @@ -1,5 +1,4 @@ #include "jan_04.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_05/B4AAB0.c b/src/world/area_jan/jan_05/B4AAB0.c index c3d6862cdf..47be471158 100644 --- a/src/world/area_jan/jan_05/B4AAB0.c +++ b/src/world/area_jan/jan_05/B4AAB0.c @@ -1,5 +1,4 @@ #include "jan_05.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_06/B52830.c b/src/world/area_jan/jan_06/B52830.c index c45efee2cb..469a23c0f6 100644 --- a/src/world/area_jan/jan_06/B52830.c +++ b/src/world/area_jan/jan_06/B52830.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "jan_07"; static char* N(exit_str_2) = "jan_12"; static char* N(exit_str_3) = "jan_09"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_08/B5E2B0.c b/src/world/area_jan/jan_08/B5E2B0.c index 9f4bee943e..7dbc225d39 100644 --- a/src/world/area_jan/jan_08/B5E2B0.c +++ b/src/world/area_jan/jan_08/B5E2B0.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "jan_05"; static char* N(exit_str_2) = "jan_09"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c index a20fdedf09..c90a2f500b 100644 --- a/src/world/area_jan/jan_09/B65AB0.c +++ b/src/world/area_jan/jan_09/B65AB0.c @@ -17,6 +17,5 @@ static char* N(exit_str_3) = "jan_11"; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_jan/jan_10/B6C390.c b/src/world/area_jan/jan_10/B6C390.c index 6c90578c5a..c0ec38cc25 100644 --- a/src/world/area_jan/jan_10/B6C390.c +++ b/src/world/area_jan/jan_10/B6C390.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "jan_09"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kkj/kkj_03/AC9730.c b/src/world/area_kkj/kkj_03/AC9730.c index c79dd7eb5e..add1970639 100644 --- a/src/world/area_kkj/kkj_03/AC9730.c +++ b/src/world/area_kkj/kkj_03/AC9730.c @@ -1,5 +1,4 @@ #include "kkj_03.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kkj/kkj_13/AD5EF0.c b/src/world/area_kkj/kkj_13/AD5EF0.c index e892a9b197..44d0f644f6 100644 --- a/src/world/area_kkj/kkj_13/AD5EF0.c +++ b/src/world/area_kkj/kkj_13/AD5EF0.c @@ -1,5 +1,4 @@ #include "kkj_13.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kkj/kkj_14/ADAEF0.c b/src/world/area_kkj/kkj_14/ADAEF0.c index 565ff7dec6..58bfd88c49 100644 --- a/src/world/area_kkj/kkj_14/ADAEF0.c +++ b/src/world/area_kkj/kkj_14/ADAEF0.c @@ -1,8 +1,6 @@ #include "kkj_14.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_14/ADAEF0", func_8024035C_ADB1FC); diff --git a/src/world/area_kkj/kkj_15/AE5590.c b/src/world/area_kkj/kkj_15/AE5590.c index 6273e9b1dc..95631f7a61 100644 --- a/src/world/area_kkj/kkj_15/AE5590.c +++ b/src/world/area_kkj/kkj_15/AE5590.c @@ -7,8 +7,6 @@ static char* N(exit_str_3) = "kkj_11"; static char* N(exit_str_4) = "kkj_11\0"; static char* N(exit_str_5) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_15/AE5590", func_8024030C_AE589C); diff --git a/src/world/area_kkj/kkj_18/AF2CA0.c b/src/world/area_kkj/kkj_18/AF2CA0.c index d53252a5a5..e9470f301e 100644 --- a/src/world/area_kkj/kkj_18/AF2CA0.c +++ b/src/world/area_kkj/kkj_18/AF2CA0.c @@ -5,8 +5,6 @@ static char* N(exit_str_1) = "kkj_19"; static char* N(exit_str_2) = "kkj_11"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2CA0", func_8024030C_AF2FAC); diff --git a/src/world/area_kkj/kkj_27/B13D70.c b/src/world/area_kkj/kkj_27/B13D70.c index 0a2e6869e7..046bb7b3d3 100644 --- a/src/world/area_kkj/kkj_27/B13D70.c +++ b/src/world/area_kkj/kkj_27/B13D70.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kkj_14"; static char* N(exit_str_1) = "kkj_15"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kmr/kmr_30/90B6D0.c b/src/world/area_kmr/kmr_30/90B6D0.c index 5d6bf0681e..60ae22d835 100644 --- a/src/world/area_kmr/kmr_30/90B6D0.c +++ b/src/world/area_kmr/kmr_30/90B6D0.c @@ -1,5 +1,4 @@ #include "kmr_30.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_10/A51980.c b/src/world/area_kpa/kpa_10/A51980.c index 5efa8e5892..8760425e8d 100644 --- a/src/world/area_kpa/kpa_10/A51980.c +++ b/src/world/area_kpa/kpa_10/A51980.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "kpa_12"; static char* N(exit_str_2) = "kpa_17"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93740.c b/src/world/area_kpa/kpa_102/A93740.c index e453f781f6..41bdf27254 100644 --- a/src/world/area_kpa/kpa_102/A93740.c +++ b/src/world/area_kpa/kpa_102/A93740.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kpa_41"; static char* N(exit_str_1) = "kpa_53"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_11/A528C0.c b/src/world/area_kpa/kpa_11/A528C0.c index ee71e67331..61a6fd04f4 100644 --- a/src/world/area_kpa/kpa_11/A528C0.c +++ b/src/world/area_kpa/kpa_11/A528C0.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "kpa_12"; static char* N(exit_str_2) = "kpa_17"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_12/A54990.c b/src/world/area_kpa/kpa_12/A54990.c index 137f4e1a22..b2fc5d11da 100644 --- a/src/world/area_kpa/kpa_12/A54990.c +++ b/src/world/area_kpa/kpa_12/A54990.c @@ -1,5 +1,4 @@ #include "kpa_12.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_13/A55F60.c b/src/world/area_kpa/kpa_13/A55F60.c index f302e7201e..6c019ec78c 100644 --- a/src/world/area_kpa/kpa_13/A55F60.c +++ b/src/world/area_kpa/kpa_13/A55F60.c @@ -1,5 +1,4 @@ #include "kpa_13.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_133/AA7480.c b/src/world/area_kpa/kpa_133/AA7480.c index c73bacafa5..3dfac43a4f 100644 --- a/src/world/area_kpa/kpa_133/AA7480.c +++ b/src/world/area_kpa/kpa_133/AA7480.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kpa_51"; static char* N(exit_str_1) = "kpa_134"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_134/AA8FA0.c b/src/world/area_kpa/kpa_134/AA8FA0.c index 156b15bcc3..d237cc754b 100644 --- a/src/world/area_kpa/kpa_134/AA8FA0.c +++ b/src/world/area_kpa/kpa_134/AA8FA0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kpa_133"; static char* N(exit_str_1) = "kpa_130"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_14/A574F0.c b/src/world/area_kpa/kpa_14/A574F0.c index 516f704056..2de4683bcf 100644 --- a/src/world/area_kpa/kpa_14/A574F0.c +++ b/src/world/area_kpa/kpa_14/A574F0.c @@ -1,7 +1,5 @@ #include "kpa_14.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_8024034C_A577FC); diff --git a/src/world/area_kpa/kpa_15/A59390.c b/src/world/area_kpa/kpa_15/A59390.c index cc549044d9..98ffdbd293 100644 --- a/src/world/area_kpa/kpa_15/A59390.c +++ b/src/world/area_kpa/kpa_15/A59390.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kpa_13"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_16/A5A030.c b/src/world/area_kpa/kpa_16/A5A030.c index 4267292a63..0d1d8130e5 100644 --- a/src/world/area_kpa/kpa_16/A5A030.c +++ b/src/world/area_kpa/kpa_16/A5A030.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kpa_14"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_32/A5E0C0.c b/src/world/area_kpa/kpa_32/A5E0C0.c index 9b7981ef56..9c378d0e4a 100644 --- a/src/world/area_kpa/kpa_32/A5E0C0.c +++ b/src/world/area_kpa/kpa_32/A5E0C0.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "kpa_90"; static char* N(exit_str_2) = "kpa_51"; static char* N(exit_str_3) = "kpa_96"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_33/A5F080.c b/src/world/area_kpa/kpa_33/A5F080.c index 3e483ad901..e614b397fe 100644 --- a/src/world/area_kpa/kpa_33/A5F080.c +++ b/src/world/area_kpa/kpa_33/A5F080.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "kpa_61"; static char* N(exit_str_2) = "kpa_52"; static char* N(exit_str_3) = "kpa_09"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_60/A6CBE0.c b/src/world/area_kpa/kpa_60/A6CBE0.c index eb2121a422..d301d42d37 100644 --- a/src/world/area_kpa/kpa_60/A6CBE0.c +++ b/src/world/area_kpa/kpa_60/A6CBE0.c @@ -1,5 +1,4 @@ #include "kpa_60.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E3E0.c b/src/world/area_kpa/kpa_61/A6E3E0.c index e5a8f184ad..0c0dd0baf0 100644 --- a/src/world/area_kpa/kpa_61/A6E3E0.c +++ b/src/world/area_kpa/kpa_61/A6E3E0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kpa_82"; static char* N(exit_str_1) = "kpa_33"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_62/A72300.c b/src/world/area_kpa/kpa_62/A72300.c index 4522b1b1cf..438bb595c1 100644 --- a/src/world/area_kpa/kpa_62/A72300.c +++ b/src/world/area_kpa/kpa_62/A72300.c @@ -1,5 +1,4 @@ #include "kpa_62.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kpa/kpa_70/A74870.c b/src/world/area_kpa/kpa_70/A74870.c index 8f8b0e12f2..f20186f677 100644 --- a/src/world/area_kpa/kpa_70/A74870.c +++ b/src/world/area_kpa/kpa_70/A74870.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kpa_62"; static char* N(exit_str_1) = "kpa_50"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_01/C599D0.c b/src/world/area_kzn/kzn_01/C599D0.c index bbf623f956..1299694d89 100644 --- a/src/world/area_kzn/kzn_01/C599D0.c +++ b/src/world/area_kzn/kzn_01/C599D0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "jan_22"; static char* N(exit_str_1) = "kzn_02"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_02/C5A740.c b/src/world/area_kzn/kzn_02/C5A740.c index d37e4eab52..f373f1b79c 100644 --- a/src/world/area_kzn/kzn_02/C5A740.c +++ b/src/world/area_kzn/kzn_02/C5A740.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kzn_01"; static char* N(exit_str_1) = "kzn_03"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_03/C60D10.c b/src/world/area_kzn/kzn_03/C60D10.c index 22b9a36082..b69154479a 100644 --- a/src/world/area_kzn/kzn_03/C60D10.c +++ b/src/world/area_kzn/kzn_03/C60D10.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "kzn_04"; static char* N(exit_str_2) = "kzn_09"; static char* N(exit_str_3) = "kzn_05"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_04/C68130.c b/src/world/area_kzn/kzn_04/C68130.c index a09a37ac5c..84137e8e75 100644 --- a/src/world/area_kzn/kzn_04/C68130.c +++ b/src/world/area_kzn/kzn_04/C68130.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kzn_03"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_05/C6C0D0.c b/src/world/area_kzn/kzn_05/C6C0D0.c index e0b76f5ebb..48329d0a9e 100644 --- a/src/world/area_kzn/kzn_05/C6C0D0.c +++ b/src/world/area_kzn/kzn_05/C6C0D0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kzn_06"; static char* N(exit_str_1) = "kzn_03"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_06/C6C920.c b/src/world/area_kzn/kzn_06/C6C920.c index 10bde0cb80..0bed5fc5c1 100644 --- a/src/world/area_kzn/kzn_06/C6C920.c +++ b/src/world/area_kzn/kzn_06/C6C920.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "kzn_08"; static char* N(exit_str_2) = "kzn_07"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_07/C6E330.c b/src/world/area_kzn/kzn_07/C6E330.c index 8a05a97d8a..8fc4a66e86 100644 --- a/src/world/area_kzn/kzn_07/C6E330.c +++ b/src/world/area_kzn/kzn_07/C6E330.c @@ -4,6 +4,5 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240000_C6E330); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240348_C6E678); -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_08/C71480.c b/src/world/area_kzn/kzn_08/C71480.c index 64e4e0b452..fe722ecdf3 100644 --- a/src/world/area_kzn/kzn_08/C71480.c +++ b/src/world/area_kzn/kzn_08/C71480.c @@ -4,8 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240000_C71480); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240348_C717C8); -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240718_C71B98); diff --git a/src/world/area_kzn/kzn_10/C7E180.c b/src/world/area_kzn/kzn_10/C7E180.c index 469d575bf6..9edbe93f91 100644 --- a/src/world/area_kzn/kzn_10/C7E180.c +++ b/src/world/area_kzn/kzn_10/C7E180.c @@ -3,8 +3,6 @@ static char* N(exit_str_0) = "kzn_09"; static char* N(exit_str_1) = "kzn_11"; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E180", func_8024030C_C7E48C); diff --git a/src/world/area_kzn/kzn_11/C801A0.c b/src/world/area_kzn/kzn_11/C801A0.c index 68ab2c0490..844c1d82c4 100644 --- a/src/world/area_kzn/kzn_11/C801A0.c +++ b/src/world/area_kzn/kzn_11/C801A0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kzn_10"; static char* N(exit_str_1) = "kzn_17"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_17/C85AB0.c b/src/world/area_kzn/kzn_17/C85AB0.c index 4bd03cb342..33d24cf6df 100644 --- a/src/world/area_kzn/kzn_17/C85AB0.c +++ b/src/world/area_kzn/kzn_17/C85AB0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kzn_11"; static char* N(exit_str_1) = "kzn_18"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_18/C8C0E0.c b/src/world/area_kzn/kzn_18/C8C0E0.c index 5480319a8d..ee4044ccc0 100644 --- a/src/world/area_kzn/kzn_18/C8C0E0.c +++ b/src/world/area_kzn/kzn_18/C8C0E0.c @@ -1,5 +1,4 @@ #include "kzn_18.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index e05e73dabd..20e999067a 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -1,8 +1,6 @@ #include "kzn_19.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/StarSpiritEffectFunc.inc.c" diff --git a/src/world/area_kzn/kzn_20/C95F30.c b/src/world/area_kzn/kzn_20/C95F30.c index 6bc2086069..558abadb82 100644 --- a/src/world/area_kzn/kzn_20/C95F30.c +++ b/src/world/area_kzn/kzn_20/C95F30.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "kzn_19"; static char* N(exit_str_1) = "kzn_22"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_kzn/kzn_22/C9A200.c b/src/world/area_kzn/kzn_22/C9A200.c index 32bdd98ec0..afd07d0ef5 100644 --- a/src/world/area_kzn/kzn_22/C9A200.c +++ b/src/world/area_kzn/kzn_22/C9A200.c @@ -3,8 +3,6 @@ static char* N(exit_str_0) = "kzn_20"; static char* N(exit_str_1) = "kzn_23"; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/GetFloorCollider.inc.c" diff --git a/src/world/area_kzn/kzn_23/C9C300.c b/src/world/area_kzn/kzn_23/C9C300.c index d09f8dc2de..0660c4406a 100644 --- a/src/world/area_kzn/kzn_23/C9C300.c +++ b/src/world/area_kzn/kzn_23/C9C300.c @@ -1,5 +1,4 @@ #include "kzn_23.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index 53141a958e..ac1f7eb091 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -19,9 +19,7 @@ static char* N(exit_str_5) = "\0\0\0\0"; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" ApiStatus func_802405EC_7EB2FC(Evt* script, s32 isInitialCall) { f32 x; diff --git a/src/world/area_mac/mac_02/8232C0.c b/src/world/area_mac/mac_02/8232C0.c index 07cabef9fe..1ea3e6fa2d 100644 --- a/src/world/area_mac/mac_02/8232C0.c +++ b/src/world/area_mac/mac_02/8232C0.c @@ -19,6 +19,5 @@ static char* N(exit_str_5) = "tik_15"; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index ec13660809..d35cbab10b 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -5,9 +5,7 @@ static char* N(exit_str_1) = "kgr_01"; #define UNK_ALPHA_FUNC_NPC 6 -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C); diff --git a/src/world/area_mac/mac_06/864B40.c b/src/world/area_mac/mac_06/864B40.c index 2d5730bd7f..fd73b55999 100644 --- a/src/world/area_mac/mac_06/864B40.c +++ b/src/world/area_mac/mac_06/864B40.c @@ -1,8 +1,6 @@ #include "mac_06.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_06/864B40", func_8024030C_864E4C); diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index e888f09729..5a309df61f 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -19,9 +19,7 @@ static char* N(exit_str_5) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802405EC_BB765C); diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index 66d0fcae5e..bb4813ad88 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -18,6 +18,5 @@ #include "common/IsAOrBPressed.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index 2abd576a5c..dfc3358f3e 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -25,6 +25,5 @@ static char* N(exit_str_7) = ""; #include "common/IsAOrBPressed.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index e6addce2c2..6c71476b55 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -23,6 +23,5 @@ static char* N(exit_str_5) = "omo_16"; #include "common/IsAOrBPressed.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index 8c289585d1..7296ae67f7 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -25,6 +25,5 @@ static char* N(exit_str_7) = ""; #include "common/IsAOrBPressed.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_osr/osr_00/AAC830.c b/src/world/area_osr/osr_00/AAC830.c index 2c3e36b01e..58423eea9c 100644 --- a/src/world/area_osr/osr_00/AAC830.c +++ b/src/world/area_osr/osr_00/AAC830.c @@ -5,9 +5,7 @@ static char* N(exit_str_1) = "kkj_00"; static char* N(exit_str_2) = "kmr_20"; static char* N(exit_str_3) = "kkj_00\0"; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_osr/osr_00/AAC830", func_8024030C_AACB3C); diff --git a/src/world/area_osr/osr_01/AB0040.c b/src/world/area_osr/osr_01/AB0040.c index 0d870ff480..1a132b76ee 100644 --- a/src/world/area_osr/osr_01/AB0040.c +++ b/src/world/area_osr/osr_01/AB0040.c @@ -1,5 +1,4 @@ #include "osr_01.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_sam/sam_01/CF7B70.c b/src/world/area_sam/sam_01/CF7B70.c index 743a2bb4d3..69c2d53baa 100644 --- a/src/world/area_sam/sam_01/CF7B70.c +++ b/src/world/area_sam/sam_01/CF7B70.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "sam_02"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_sam/sam_02/D05730.c b/src/world/area_sam/sam_02/D05730.c index 5d520c765f..89ed333a98 100644 --- a/src/world/area_sam/sam_02/D05730.c +++ b/src/world/area_sam/sam_02/D05730.c @@ -17,9 +17,7 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_sam/sam_06/D1FE90.c b/src/world/area_sam/sam_06/D1FE90.c index c2ecad7c2d..9454670d3d 100644 --- a/src/world/area_sam/sam_06/D1FE90.c +++ b/src/world/area_sam/sam_06/D1FE90.c @@ -3,9 +3,7 @@ static char* N(exit_str_0) = "sam_05"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "common/foliage.inc.c" diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index c4f3602884..ce38b2f311 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -52,9 +52,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802418B4_D3BE84); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241A6C_D3C03C); -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241DAC_D3C37C); diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 35d58b4056..41f9507a13 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -7,9 +7,7 @@ static char* N(exit_str_3) = "nok_02"; static char* N(exit_str_4) = "dro_01"; static char* N(exit_str_5) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" diff --git a/src/world/area_tik/tik_02/86C740.c b/src/world/area_tik/tik_02/86C740.c index f6bb1a22a3..d363037782 100644 --- a/src/world/area_tik/tik_02/86C740.c +++ b/src/world/area_tik/tik_02/86C740.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "tik_18"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c index 10f5285a2a..857de7d22c 100644 --- a/src/world/area_tik/tik_03/86EB00.c +++ b/src/world/area_tik/tik_03/86EB00.c @@ -17,6 +17,5 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c index 7f983f930b..e2f0cdd15c 100644 --- a/src/world/area_tik/tik_04/871A30.c +++ b/src/world/area_tik/tik_04/871A30.c @@ -5,9 +5,7 @@ static char* N(exit_str_1) = "tik_07"; static char* N(exit_str_2) = "tik_03"; static char* N(exit_str_3) = "tik_12"; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" diff --git a/src/world/area_tik/tik_05/874DC0.c b/src/world/area_tik/tik_05/874DC0.c index b92d285f1a..00d45abdd3 100644 --- a/src/world/area_tik/tik_05/874DC0.c +++ b/src/world/area_tik/tik_05/874DC0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "tik_04"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_06/876EE0.c b/src/world/area_tik/tik_06/876EE0.c index 22af16a1a2..def4ea637d 100644 --- a/src/world/area_tik/tik_06/876EE0.c +++ b/src/world/area_tik/tik_06/876EE0.c @@ -19,6 +19,5 @@ static char* N(exit_str_5) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c index dc35870448..13902d86af 100644 --- a/src/world/area_tik/tik_08/87EDF0.c +++ b/src/world/area_tik/tik_08/87EDF0.c @@ -17,6 +17,5 @@ static char* N(exit_str_3) = "jan_03"; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c index 6872858d0d..7a7bda29e6 100644 --- a/src/world/area_tik/tik_09/8821C0.c +++ b/src/world/area_tik/tik_09/8821C0.c @@ -17,6 +17,5 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_10/8863C0.c b/src/world/area_tik/tik_10/8863C0.c index 19016fcba6..eb5496b07e 100644 --- a/src/world/area_tik/tik_10/8863C0.c +++ b/src/world/area_tik/tik_10/8863C0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "tik_09"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c index 66fe8f2cff..27765d2218 100644 --- a/src/world/area_tik/tik_12/888BD0.c +++ b/src/world/area_tik/tik_12/888BD0.c @@ -15,6 +15,5 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c index a30d8aeb6d..4079be1269 100644 --- a/src/world/area_tik/tik_14/88D600.c +++ b/src/world/area_tik/tik_14/88D600.c @@ -15,6 +15,5 @@ static char* N(exit_str_1) = "tik_21"; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c index 3b44ec3442..bfe313aa66 100644 --- a/src/world/area_tik/tik_15/88FBA0.c +++ b/src/world/area_tik/tik_15/88FBA0.c @@ -15,6 +15,5 @@ static char* N(exit_str_1) = "mac_02"; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 7d8ac7c889..5f8dd5aa92 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -12,6 +12,5 @@ #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_18/8956E0.c b/src/world/area_tik/tik_18/8956E0.c index 0fb2cb2178..4065a24cd3 100644 --- a/src/world/area_tik/tik_18/8956E0.c +++ b/src/world/area_tik/tik_18/8956E0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "tik_06"; static char* N(exit_str_1) = "tik_02"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c index f817a5edf7..0282d4dd2e 100644 --- a/src/world/area_tik/tik_19/8975E0.c +++ b/src/world/area_tik/tik_19/8975E0.c @@ -15,6 +15,5 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c index bd3bc36bad..1cfe588e03 100644 --- a/src/world/area_tik/tik_20/89A350.c +++ b/src/world/area_tik/tik_20/89A350.c @@ -5,9 +5,7 @@ static char* N(exit_str_1) = "tik_21"; static char* N(exit_str_2) = "tik_23"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c index 7a6119dea5..393ea4821e 100644 --- a/src/world/area_tik/tik_21/89D7A0.c +++ b/src/world/area_tik/tik_21/89D7A0.c @@ -5,9 +5,7 @@ static char* N(exit_str_1) = "tik_22"; static char* N(exit_str_2) = "tik_14"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index d0a7179e96..658c728b0c 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -1,8 +1,6 @@ #include "tik_22.h" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/SetPlayerStatusAnimFlags100000.inc.c" diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c index 59355faa66..fcff1b6fb7 100644 --- a/src/world/area_tik/tik_23/8A23D0.c +++ b/src/world/area_tik/tik_23/8A23D0.c @@ -15,8 +15,6 @@ static char* N(exit_str_1) = "tik_20"; #include "world/common/SomeXYZFunc2.inc.c" -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_tik/tik_24/8A5AD0.c b/src/world/area_tik/tik_24/8A5AD0.c index 7f8108f1f3..6f0f09579c 100644 --- a/src/world/area_tik/tik_24/8A5AD0.c +++ b/src/world/area_tik/tik_24/8A5AD0.c @@ -1,5 +1,4 @@ #include "tik_24.h" -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_tik/tik_25/8A7F80.c b/src/world/area_tik/tik_25/8A7F80.c index a8b3c881b8..520df4da4b 100644 --- a/src/world/area_tik/tik_25/8A7F80.c +++ b/src/world/area_tik/tik_25/8A7F80.c @@ -3,8 +3,6 @@ static char* N(exit_str_0) = "tik_24"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" - -#include "world/common/UnkTexturePanFunc2.inc.c" +#include "world/common/UpdateTexturePan.inc.c" #include "world/common/UnkPosFunc2.inc.c" diff --git a/src/world/area_trd/trd_00/999C70.c b/src/world/area_trd/trd_00/999C70.c index 8a77bec50f..d47744738f 100644 --- a/src/world/area_trd/trd_00/999C70.c +++ b/src/world/area_trd/trd_00/999C70.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "trd_01"; static char* N(exit_str_2) = "trd_05"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_01/99C990.c b/src/world/area_trd/trd_01/99C990.c index 31e3b7e7c7..111be43211 100644 --- a/src/world/area_trd/trd_01/99C990.c +++ b/src/world/area_trd/trd_01/99C990.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "trd_02"; static char* N(exit_str_2) = "trd_09"; static char* N(exit_str_3) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_04/9A83F0.c b/src/world/area_trd/trd_04/9A83F0.c index a57071e305..248b346acb 100644 --- a/src/world/area_trd/trd_04/9A83F0.c +++ b/src/world/area_trd/trd_04/9A83F0.c @@ -5,6 +5,5 @@ static char* N(exit_str_1) = "trd_05"; static char* N(exit_str_2) = "trd_07"; static char* N(exit_str_3) = "trd_06"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_06/9B1790.c b/src/world/area_trd/trd_06/9B1790.c index b130ca6b53..f1936b4fe6 100644 --- a/src/world/area_trd/trd_06/9B1790.c +++ b/src/world/area_trd/trd_06/9B1790.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "trd_04"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_07/9B6980.c b/src/world/area_trd/trd_07/9B6980.c index 622f393323..f077899bde 100644 --- a/src/world/area_trd/trd_07/9B6980.c +++ b/src/world/area_trd/trd_07/9B6980.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "trd_08"; static char* N(exit_str_1) = "trd_04"; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/area_trd/trd_08/9BB2A0.c b/src/world/area_trd/trd_08/9BB2A0.c index 265d18ea24..e46ecabebf 100644 --- a/src/world/area_trd/trd_08/9BB2A0.c +++ b/src/world/area_trd/trd_08/9BB2A0.c @@ -3,6 +3,5 @@ static char* N(exit_str_0) = "trd_07"; static char* N(exit_str_1) = ""; -#include "world/common/UnkTexturePanFunc.inc.c" +#include "world/common/UpdateTexturePan.inc.c" -#include "world/common/UnkTexturePanFunc2.inc.c" diff --git a/src/world/common/UnkTexturePanFunc.inc.c b/src/world/common/UnkTexturePanFunc.inc.c deleted file mode 100644 index 16526ea72c..0000000000 --- a/src/world/common/UnkTexturePanFunc.inc.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkTexturePanFunc)(Evt* script, s32 isInitialCall) { - script->varTable[9] += script->varTable[1]; - if (script->varTable[9] < 0) { - script->varTable[9] += 0x20000; - } else if (script->varTable[9] > 0x20000) { - script->varTable[9] -= 0x20000; - } - - script->varTable[10] += script->varTable[2]; - if (script->varTable[10] < 0) { - script->varTable[10] += 0x20000; - } else if (script->varTable[10] > 0x20000) { - script->varTable[10] -= 0x20000; - } - - script->varTable[11] += script->varTable[3]; - if (script->varTable[11] < 0) { - script->varTable[11] += 0x20000; - } else if (script->varTable[11] > 0x20000) { - script->varTable[11] -= 0x20000; - } - - script->varTable[12] += script->varTable[4]; - if (script->varTable[12] < 0) { - script->varTable[12] += 0x20000; - } else if (script->varTable[12] > 0x20000) { - script->varTable[12] -= 0x20000; - } - - set_main_pan_u(script->varTable[0], script->varTable[9]); - set_main_pan_v(script->varTable[0], script->varTable[10]); - set_aux_pan_u(script->varTable[0], script->varTable[11]); - set_aux_pan_v(script->varTable[0], script->varTable[12]); - return ApiStatus_BLOCK; -} diff --git a/src/world/common/UnkTexturePanFunc2.inc.c b/src/world/common/UpdateTexturePan.inc.c similarity index 62% rename from src/world/common/UnkTexturePanFunc2.inc.c rename to src/world/common/UpdateTexturePan.inc.c index e3819b9880..1da9c65892 100644 --- a/src/world/common/UnkTexturePanFunc2.inc.c +++ b/src/world/common/UpdateTexturePan.inc.c @@ -1,7 +1,43 @@ #include "common.h" #include "npc.h" -ApiStatus N(UnkTexturePanFunc2)(Evt* script, s32 isInitialCall) { +ApiStatus N(UpdateTexturePanSmooth)(Evt* script, s32 isInitialCall) { + script->varTable[9] += script->varTable[1]; + if (script->varTable[9] < 0) { + script->varTable[9] += 0x20000; + } else if (script->varTable[9] > 0x20000) { + script->varTable[9] -= 0x20000; + } + + script->varTable[10] += script->varTable[2]; + if (script->varTable[10] < 0) { + script->varTable[10] += 0x20000; + } else if (script->varTable[10] > 0x20000) { + script->varTable[10] -= 0x20000; + } + + script->varTable[11] += script->varTable[3]; + if (script->varTable[11] < 0) { + script->varTable[11] += 0x20000; + } else if (script->varTable[11] > 0x20000) { + script->varTable[11] -= 0x20000; + } + + script->varTable[12] += script->varTable[4]; + if (script->varTable[12] < 0) { + script->varTable[12] += 0x20000; + } else if (script->varTable[12] > 0x20000) { + script->varTable[12] -= 0x20000; + } + + set_main_pan_u(script->varTable[0], script->varTable[9]); + set_main_pan_v(script->varTable[0], script->varTable[10]); + set_aux_pan_u(script->varTable[0], script->varTable[11]); + set_aux_pan_v(script->varTable[0], script->varTable[12]); + return ApiStatus_BLOCK; +} + +ApiStatus N(UpdateTexturePanStepped)(Evt* script, s32 isInitialCall) { if (isInitialCall) { script->functionTemp[0] = 0; script->functionTemp[1] = 0; diff --git a/ver/us/asm/data/EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s index 0d9850bd10..3585dbe321 100644 --- a/ver/us/asm/data/EA3A80.data.s +++ b/ver/us/asm/data/EA3A80.data.s @@ -6,7 +6,7 @@ dlabel D_80243180_EA3A80 .word 0xC4278000, 0x00000000, 0x43200000, 0x42B40000, 0x441B0000, 0x00000000, 0x41F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802435B4_EA3EB4, D_80243180_EA3A80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019010E dlabel D_802431E0_EA3AE0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA0900_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0900_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA0900_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0900_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024327C_EA3B7C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802431E0_EA3AE0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EA7390.data.s b/ver/us/asm/data/EA7390.data.s index ac39b104e0..4e27b66a62 100644 --- a/ver/us/asm/data/EA7390.data.s +++ b/ver/us/asm/data/EA7390.data.s @@ -6,7 +6,7 @@ dlabel D_802403C0_EA7390 .word 0xC3CA8000, 0x437A0000, 0xC3A50000, 0x42B40000, 0x43D98000, 0x437A0000, 0xC3AF0000, 0x43870000, 0x43F50000, 0x41C80000, 0xC0A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240BCC_EA7B9C, D_802403C0_EA7390, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80240000_EA6FD0 dlabel D_80240430_EA7400 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA7010_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA7010_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA7010_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA7010_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404CC_EA749C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240430_EA7400, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EAA810.data.s b/ver/us/asm/data/EAA810.data.s index cee58e73c2..8073e2ea16 100644 --- a/ver/us/asm/data/EAA810.data.s +++ b/ver/us/asm/data/EAA810.data.s @@ -9,7 +9,7 @@ dlabel D_80241DB0_EAA890 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80241E90_EAA970 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA8AE0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA8AE0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F2C_EAAA0C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241E90_EAA970, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EB1920.data.s b/ver/us/asm/data/EB1920.data.s index a935fa7d6a..f53b6b24f8 100644 --- a/ver/us/asm/data/EB1920.data.s +++ b/ver/us/asm/data/EB1920.data.s @@ -9,7 +9,7 @@ dlabel D_80240B20_EB1980 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BD0_EB1A30 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB0E60_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB0E60_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB0E60_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB0E60_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C6C_EB1ACC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, D_802442C0_EB5120, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EB54C0.data.s b/ver/us/asm/data/EB54C0.data.s index 57ef618edc..0d49712775 100644 --- a/ver/us/asm/data/EB54C0.data.s +++ b/ver/us/asm/data/EB54C0.data.s @@ -9,7 +9,7 @@ dlabel D_802403E0_EB5510 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80240450_EB5580 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB5130_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB5130_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB5130_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB5130_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404EC_EB561C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240450_EB5580, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EB7850.data.s b/ver/us/asm/data/EB7850.data.s index a33baab685..8283d8fb7b 100644 --- a/ver/us/asm/data/EB7850.data.s +++ b/ver/us/asm/data/EB7850.data.s @@ -9,7 +9,7 @@ dlabel D_80240670_EB78A0 .word 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 dlabel D_802406B0_EB78E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB7230_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB7230_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB7230_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB7230_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024074C_EB797C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802406B0_EB78E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EC78F0.data.s b/ver/us/asm/data/EC78F0.data.s index 8e57493d1d..e9629ae34b 100644 --- a/ver/us/asm/data/EC78F0.data.s +++ b/ver/us/asm/data/EC78F0.data.s @@ -15,7 +15,7 @@ dlabel D_80240890_EC7A40 .word 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 dlabel D_802408D0_EC7A80 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EC71B0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC71B0_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EC71B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC71B0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024096C_EC7B1C .word 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/ED5780.data.s b/ver/us/asm/data/ED5780.data.s index 1117f2f9a1..48570dff0e 100644 --- a/ver/us/asm/data/ED5780.data.s +++ b/ver/us/asm/data/ED5780.data.s @@ -36,7 +36,7 @@ dlabel D_80241DA4_ED5FC4 .word 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E04_ED6024 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, ED42A0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ED42A0_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, ED42A0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, ED42A0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241EA0_ED60C0 .word 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFCE, 0x000000AA, 0x00000181, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EE8970.data.s b/ver/us/asm/data/EE8970.data.s index 0ce01c7837..55b9033447 100644 --- a/ver/us/asm/data/EE8970.data.s +++ b/ver/us/asm/data/EE8970.data.s @@ -9,7 +9,7 @@ dlabel D_80242420_EE89D0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242490_EE8A40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EE65B0_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EE65B0_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EE65B0_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EE65B0_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024252C_EE8ADC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, D_80245340_EEB8F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/EF8250.data.s b/ver/us/asm/data/EF8250.data.s index 57e8e56380..b4d638424d 100644 --- a/ver/us/asm/data/EF8250.data.s +++ b/ver/us/asm/data/EF8250.data.s @@ -9,7 +9,7 @@ dlabel D_80240830_EF82B0 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000033, 0x00000000, 0x00000008, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x80000025, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 dlabel D_802408C0_EF8340 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EF7A80_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EF7A80_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EF7A80_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EF7A80_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024095C_EF83DC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, D_80247070_EFEAF0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/area_tik/5EE550.data.s b/ver/us/asm/data/battle/area_tik/5EE550.data.s index 27da485458..b14f3d8634 100644 --- a/ver/us/asm/data/battle/area_tik/5EE550.data.s +++ b/ver/us/asm/data/battle/area_tik/5EE550.data.s @@ -525,7 +525,7 @@ dlabel D_80233518_6079A8 .word D_80234388_608818, D_80234378_608808, D_80234368_6087F8, D_80233384_607814, D_80233508_607998, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80233540_6079D0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, b_area_tik_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, b_area_tik_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, b_area_tik_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, b_area_tik_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802335DC_607A6C .word 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000005, SetCamBGColor, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF574, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFF448, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80233540_6079D0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000010, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80233540_6079D0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/area_tik2/60ABD0.data.s b/ver/us/asm/data/battle/area_tik2/60ABD0.data.s index d32d3ca19f..f9fe9d6788 100644 --- a/ver/us/asm/data/battle/area_tik2/60ABD0.data.s +++ b/ver/us/asm/data/battle/area_tik2/60ABD0.data.s @@ -321,7 +321,7 @@ dlabel D_802276C8_618178 .word D_80227BA8_618658, D_80227B98_618648, D_80227B88_618638, D_80227534_617FE4, D_802276B8_618168, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802276F0_6181A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, b_area_tik2_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, b_area_tik2_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, b_area_tik2_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, b_area_tik2_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8022778C_61823C .word 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000005, SetCamBGColor, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF574, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFF448, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802276F0_6181A0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000010, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802276F0_6181A0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/battle/area_tik3/619F40.data.s b/ver/us/asm/data/battle/area_tik3/619F40.data.s index bf84524e75..e972d6c2c6 100644 --- a/ver/us/asm/data/battle/area_tik3/619F40.data.s +++ b/ver/us/asm/data/battle/area_tik3/619F40.data.s @@ -174,7 +174,7 @@ dlabel D_80222E68_623558 .word D_80223418_623B08, D_80223408_623AF8, D_802233F8_623AE8, D_80222CD4_6233C4, D_80222E58_623548, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_80222E90_623580 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, b_area_tik3_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, b_area_tik3_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, b_area_tik3_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, b_area_tik3_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80222F2C_62361C .word 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000005, SetCamBGColor, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF574, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFF448, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80222E90_623580, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000010, 0x00000002, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80222E90_623580, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s b/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s index 92d799f596..56728cfb50 100644 --- a/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s +++ b/ver/us/asm/data/world/area_gv/gv_01/E1EC20.data.s @@ -6,7 +6,7 @@ dlabel D_802407C0_E1EC20 .word 0x00000000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241748_E1FBA8, D_802407C0_E1EC20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, gv_01_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, gv_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, gv_01_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241030_E1F490, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241030_E1F490 -.word 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, gv_01_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, gv_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, gv_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, gv_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, gv_01_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, gv_01_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, gv_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, gv_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, gv_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, gv_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415DC_E1FA3C .word 0x000000C8, 0x000000AA, 0x0000008C, 0x0000006E, 0x00000050, 0x00000032, 0x00000014, 0x0000000A, 0x0000001A, 0x0000001D, 0x0000001E, 0x0000001D, 0x0000001A, 0x0000000A, 0x00000000, 0x0000000C, 0x0000000F, 0x00000010, 0x0000000F, 0x0000000B, 0x00000006, 0x00000000, 0x00000004, 0x00000003, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s index e2c309f062..4fbc24a354 100644 --- a/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s +++ b/ver/us/asm/data/world/area_hos/hos_01/A11760.data.s @@ -24,7 +24,7 @@ dlabel D_802415B0_A11E30 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE2, 0x000000FA, 0xFFFFFF60, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C82, 0x00000168, 0x00000043, 0x00000005, MakeLerp, 0x000001F4, 0x000000FA, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE2, 0xFE363C80, 0xFFFFFF60, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFE2, 0xFE363C80, 0xFFFFFF56, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000168, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000028, 0x00000003, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C82, 0x0000021C, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B4, 0x00000028, 0x00000002, 0xFE363C80, 0x00000005, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000014, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_80240AAC_A1132C, 0xFD050F8A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000061, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000002, hos_01_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241418_A11C98, 0x00000080, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001B, 0x00000043, 0x00000002, SetSpriteShading, 0x00030000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFF96, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80241384_A11C04, 0x00000057, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80244FC0, 0x00000046, 0x00000001, 0x80244FE0, 0x00000044, 0x00000001, D_80241D48_A125C8, 0x00000044, 0x00000001, D_8024121C_A11A9C, 0x00000044, 0x00000001, 0x80240E80, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241540_A11DC0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_802415B0_A11E30, 0x00000044, 0x00000001, D_80241540_A11DC0, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000059, 0x00000044, 0x00000001, 0x80245050, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B90_A12410 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C2C_A124AC .byte 0x00, 0x00, 0x00 diff --git a/ver/us/asm/data/world/area_hos/hos_02/A19530.data.s b/ver/us/asm/data/world/area_hos/hos_02/A19530.data.s index 95533052b6..12c298976d 100644 --- a/ver/us/asm/data/world/area_hos/hos_02/A19530.data.s +++ b/ver/us/asm/data/world/area_hos/hos_02/A19530.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243310_A19530 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_02_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_02_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802433AC_A195CC .short 0x0000 diff --git a/ver/us/asm/data/world/area_hos/hos_03/A1EC30.data.s b/ver/us/asm/data/world/area_hos/hos_03/A1EC30.data.s index fa58190b53..86042b1329 100644 --- a/ver/us/asm/data/world/area_hos/hos_03/A1EC30.data.s +++ b/ver/us/asm/data/world/area_hos/hos_03/A1EC30.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243B30_A1EC30 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_03_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_03_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243BCC_A1ECCC .short 0x0000 diff --git a/ver/us/asm/data/world/area_hos/hos_04/A285C0.data.s b/ver/us/asm/data/world/area_hos/hos_04/A285C0.data.s index c169e77714..b78ef91d35 100644 --- a/ver/us/asm/data/world/area_hos/hos_04/A285C0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_04/A285C0.data.s @@ -6,4 +6,4 @@ dlabel D_802416F0_A285C0 .word 0x00000000 dlabel D_802416F4_A285C4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_04_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_04_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x00000078, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416F4_A285C4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416F4_A285C4, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x000000A2, 0x00000001, 0x00000043, 0x00000004, SetModelCustomGfx, 0x000000A2, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000009A, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x000000A0, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000098, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_80240000_A26ED0, 0x00000000, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80240154_A27024, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x00000078, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416F4_A285C4, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802416F4_A285C4, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000009A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x000000A2, 0x00000001, 0x00000043, 0x00000004, SetModelCustomGfx, 0x000000A2, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000009A, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x000000A0, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000098, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_80240000_A26ED0, 0x00000000, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80240154_A27024, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_05/A2FCD0.data.s b/ver/us/asm/data/world/area_hos/hos_05/A2FCD0.data.s index fca967ab16..824c48a5f8 100644 --- a/ver/us/asm/data/world/area_hos/hos_05/A2FCD0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_05/A2FCD0.data.s @@ -9,7 +9,7 @@ dlabel D_80245AEC_A2FD2C .word 0x00000047, 0x00000005, D_80245A90_A2FCD0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024E828, 0x00000080, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001D, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802494C0, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802494E4, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80245E0C_A3004C, 0x00000046, 0x00000001, 0x802459B0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000024, 0x00000002, 0xFE363C80, D_80245AEC_A2FD2C, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000046, 0x00000001, 0x8024ED24, 0x00000044, 0x00000001, D_80245AEC_A2FD2C, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000046, 0x00000001, 0x8024ACC0, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x8024DBDC, 0x00000043, 0x00000003, EnableGroup, 0x00000090, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000092, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x8024E00C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245D70_A2FFB0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_05_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_05_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245E0C_A3004C .word 0x00000044, 0x00000001, 0x8024DF28, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C84, 0x00000078, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80245D70_A2FFB0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80245D70_A2FFB0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000000F, 0x0000000C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s b/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s index 353929b4d4..d37658a008 100644 --- a/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s +++ b/ver/us/asm/data/world/area_hos/hos_05/A37E70.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_8024DC30_A37E70 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dup_hos_05_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dup_hos_05_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dup_hos_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dup_hos_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024DCCC_A37F0C .byte 0x00, 0x00, 0x00 diff --git a/ver/us/asm/data/world/area_hos/hos_06/A3BAE0.data.s b/ver/us/asm/data/world/area_hos/hos_06/A3BAE0.data.s index 27decc8899..eb5cc94fac 100644 --- a/ver/us/asm/data/world/area_hos/hos_06/A3BAE0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_06/A3BAE0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242600_A3BAE0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024269C_A3BB7C .word 0x00000043, 0x00000003, EnableTexPanning, 0x0000008C, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00004000, 0x00000043, 0x00000005, SetTexPanOffset, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_10/A42DA0.data.s b/ver/us/asm/data/world/area_hos/hos_10/A42DA0.data.s index 1f2ad5a08e..540c4e5a3d 100644 --- a/ver/us/asm/data/world/area_hos/hos_10/A42DA0.data.s +++ b/ver/us/asm/data/world/area_hos/hos_10/A42DA0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243660_A42DA0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802436FC_A42E3C .word 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000136, 0x00000043, 0x00000005, TranslateModel, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7480, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000001, func_8024032C_A3FA6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_hos/hos_10/A43920.data.s b/ver/us/asm/data/world/area_hos/hos_10/A43920.data.s index 979718581c..026f51906c 100644 --- a/ver/us/asm/data/world/area_hos/hos_10/A43920.data.s +++ b/ver/us/asm/data/world/area_hos/hos_10/A43920.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802441E0_A43920 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dup_hos_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dup_hos_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010017, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000027, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000190, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802441E0_A43920, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000258, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802441E0_A43920, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802441E0_A43920, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000021, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000024, 0x00000001, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFF8F8, 0x00000005, 0x00000001, 0x000001C2, 0x00000043, 0x00000005, TranslateModel, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8080, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFF943, 0x00000005, 0x00000001, 0x000001C2, 0x00000043, 0x00000005, TranslateGroup, 0x00000026, 0x00000000, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8480, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x00000029, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0x00000000, 0xFFFFFF7E, 0x000001E0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000015E, 0xFFFFFF38, 0x00000190, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000029, 0x00000000, 0xFE363C80, 0x000001E0, 0x00000043, 0x00000005, ScaleModel, 0x00000029, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xF24AD480, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802461D0, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, dup_hos_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, dup_hos_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010017, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000027, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000190, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802441E0_A43920, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000258, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802441E0_A43920, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802441E0_A43920, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000021, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000024, 0x00000001, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFF8F8, 0x00000005, 0x00000001, 0x000001C2, 0x00000043, 0x00000005, TranslateModel, 0x00000005, 0x00000000, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8080, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFF943, 0x00000005, 0x00000001, 0x000001C2, 0x00000043, 0x00000005, TranslateGroup, 0x00000026, 0x00000000, 0xFE363C80, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8480, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0x00000029, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFF7E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0x00000000, 0xFFFFFF7E, 0x000001E0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000015E, 0xFFFFFF38, 0x00000190, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000029, 0x00000000, 0xFE363C80, 0x000001E0, 0x00000043, 0x00000005, ScaleModel, 0x00000029, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xF24AD480, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GotoMapSpecial, 0x802461D0, 0x00000000, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244930_A44070 .word 0xC3020000, 0x00000000, 0x44A28000, 0x41A00000, 0xC2C80000, 0x449C4000, 0x432A0000, 0x42480000, 0x447A0000, 0x42F00000, 0x42C80000, 0x43C80000, 0x00000000, 0x00000000, 0xC3E10000 diff --git a/ver/us/asm/data/world/area_hos/hos_20/A45C90.data.s b/ver/us/asm/data/world/area_hos/hos_20/A45C90.data.s index 07322b5c46..c883e12e86 100644 --- a/ver/us/asm/data/world/area_hos/hos_20/A45C90.data.s +++ b/ver/us/asm/data/world/area_hos/hos_20/A45C90.data.s @@ -6,7 +6,7 @@ dlabel D_80240360_A45C90 .word 0xC3C80000, 0x00000000, 0x00000000, 0x43070000, 0x00000000, 0x00000000, 0x00000000, 0x43070000, 0x43C80000, 0x00000000, 0x00000000, 0x43610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240930_A46260, D_80240360_A45C90, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802403D0_A45D00 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_20_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_20_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, hos_20_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, hos_20_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024046C_A45D9C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000006, RotateModel, 0x00000000, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000001, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000003, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000004, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000003, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000004, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFF800, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF800, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802403D0_A45D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFE800, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802403D0_A45D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFEC00, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802403D0_A45D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000400, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF400, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802403D0_A45D00, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B22190.data.s b/ver/us/asm/data/world/area_jan/jan_00/B22190.data.s index 923db54a42..7cab4afe52 100644 --- a/ver/us/asm/data/world/area_jan/jan_00/B22190.data.s +++ b/ver/us/asm/data/world/area_jan/jan_00/B22190.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241C50_B22190 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_00_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_00_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_00_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_00_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241CEC_B2222C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247AA0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_01/B294A0.data.s b/ver/us/asm/data/world/area_jan/jan_01/B294A0.data.s index 626f8a3067..b05b1dfab4 100644 --- a/ver/us/asm/data/world/area_jan/jan_01/B294A0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_01/B294A0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241470_B294A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024150C_B2953C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802443E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_02/B2EEA0.data.s b/ver/us/asm/data/world/area_jan/jan_02/B2EEA0.data.s index fbe7b77c63..3071de4f82 100644 --- a/ver/us/asm/data/world/area_jan/jan_02/B2EEA0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_02/B2EEA0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242A30_B2EEA0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_02_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_02_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242ACC_B2EF3C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, func_8024033C_B2C7AC, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802485B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s index 5827c53dc9..256e25f3d5 100644 --- a/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s +++ b/ver/us/asm/data/world/area_jan/jan_03/B37E60.data.s @@ -15,7 +15,7 @@ dlabel D_80243BE0_B387B0 .word 0x00000043, 0x00000001, jan_03_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_03_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_03_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802440F0_B38CC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_03_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_03_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024418C_B38D5C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024F9D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s index 08b9d67855..a3af50bc05 100644 --- a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s +++ b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802412B0_B45A20 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_04_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_04_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x802462B0, 0x00000000, 0x00000009, 0x00000008, 0x00000001, 0x00000064 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x802462B0, 0x00000000, 0x00000009, 0x00000008, 0x00000001, 0x00000064 dlabel D_80241384_B45AF4 .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802462B8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s index 5d72e000c8..aafb18d4ff 100644 --- a/ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s +++ b/ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242790_B4D200 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_05_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_05_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024282C_B4D29C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247A00, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s b/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s index 4ca88579b3..469b3e4d46 100644 --- a/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s +++ b/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s @@ -6,7 +6,7 @@ dlabel D_802425E0_B54E10 .word 0x00000000, 0x00000000, 0x43EB0000, 0x00000000, 0x43EB0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3EB0000, 0x43340000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242C80_B554B0, D_802425E0_B54E10, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900F8 dlabel D_80242660_B54E90 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_06_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802426FC_B54F2C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246C90, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s b/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s index 281fab5cdf..a770702ec7 100644 --- a/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s +++ b/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802424E0_B60790 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_08_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024257C_B6082C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247490, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s index 2605e0f223..b74e2f96de 100644 --- a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s @@ -15,7 +15,7 @@ dlabel D_802421C0_B67C70 .word 0x00000043, 0x00000001, jan_09_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_09_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_09_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_09_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802426D0_B68180 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_09_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_09_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_09_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_09_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024276C_B6821C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246570, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s b/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s index 9bc514a20c..8dc3e098ba 100644 --- a/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s +++ b/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802417D0_B6DB60 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024186C_B6DBFC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244470, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s b/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s index 3625535e4f..303a40e13d 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_03/AC9A40.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240330_AC9A40 -.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D0, D_80240330_AC9A40, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_03_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_03_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC2BE0000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x441D8000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802406D0, D_80240330_AC9A40, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000005, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000004, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006B, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s b/ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s index f15b4bb87b..f65941cf78 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_13/AD6780.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802408B0_AD6780 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_13_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_13_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_13_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_13_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s b/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s index ff11590764..bfa8497f34 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_14/ADB360.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802404C0_ADB360 -.word 0xC3BB8000, 0x00000000, 0xC1F00000, 0x42B40000, 0x43D98000, 0x41F00000, 0xC2040000, 0x43870000, 0xC2F40000, 0x41200000, 0xC2A40000, 0x43340000, 0xC1A00000, 0x00000000, 0x41F00000, 0x43870000, 0xC30C0000, 0x00000000, 0x00000000, 0x43870000, 0x42200000, 0x00000000, 0x41F00000, 0x43340000, 0xC1A00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x41F00000, 0x43340000, 0xC3020000, 0x00000000, 0x00000000, 0x43340000, 0xC2700000, 0x00000000, 0x00000000, 0x43870000, 0x43BE0000, 0x41F00000, 0x41200000, 0x43870000, 0x43160000, 0x00000000, 0xC1F00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DA4, D_802404C0_ADB360, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019000F, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_14_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_14_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC3BB8000, 0x00000000, 0xC1F00000, 0x42B40000, 0x43D98000, 0x41F00000, 0xC2040000, 0x43870000, 0xC2F40000, 0x41200000, 0xC2A40000, 0x43340000, 0xC1A00000, 0x00000000, 0x41F00000, 0x43870000, 0xC30C0000, 0x00000000, 0x00000000, 0x43870000, 0x42200000, 0x00000000, 0x41F00000, 0x43340000, 0xC1A00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x41F00000, 0x43340000, 0xC3020000, 0x00000000, 0x00000000, 0x43340000, 0xC2700000, 0x00000000, 0x00000000, 0x43870000, 0x43BE0000, 0x41F00000, 0x41200000, 0x43870000, 0x43160000, 0x00000000, 0xC1F00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240DA4, D_802404C0_ADB360, 0x0000000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019000F, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001D, 0x00000001, 0xFFFFFF97, 0x0000001D, 0x00000001, 0xFFFFFFB4, 0x0000001D, 0x00000001, 0xFFFFFFF2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0xFFFFFFCA, 0x0000001D, 0x00000001, 0x00000006, 0x0000001D, 0x00000001, 0x00000026, 0x0000001D, 0x00000001, 0x0000003A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000074, 0x00000000, 0x00000008, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s b/ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s index a47194ca75..c08052838c 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_15/AE5CE0.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_80240750_AE5CE0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_15_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_15_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_15_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_15_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s b/ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s index e6724e8295..1a33729e1b 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_18/AF3560.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802408C0_AF3560 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_18_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_18_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_18_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_18_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s b/ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s index 6532e7bded..d3b80dae86 100644 --- a/ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s +++ b/ver/us/asm/data/world/area_kkj/kkj_27/B14340.data.s @@ -3,4 +3,4 @@ .section .data dlabel D_802405D0_B14340 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_27_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_27_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kkj_27_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kkj_27_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_30/90BBB0.data.s b/ver/us/asm/data/world/area_kmr/kmr_30/90BBB0.data.s index 6ec8cab85c..1663db286e 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_30/90BBB0.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_30/90BBB0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802404E0_90BBB0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405CC_90BC9C, D_802404E0_90BBB0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kmr_30_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_30_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405CC_90BC9C, D_802404E0_90BBB0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kmr_30_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_30_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405CC_90BC9C .word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000002C, 0x00000043, 0x00000002, SetSpriteShading, 0x00010000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802408FC, 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00001388, 0x00000008, 0x00000001, 0x00000186, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000006E, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80240C10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s b/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s index 58a0e9a238..53524eda07 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240410_A51D90 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404AC_A51E2C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F20, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s b/ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s index 0971bc607d..f2cbcfa1eb 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243660_A96DA0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_102_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_102_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_102_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_102_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802436FC_A96E3C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245B10, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s index 72eeb474d7..c6cbdd3e17 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240C00_A534C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_11_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_11_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C9C_A5355C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242010, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s b/ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s index f2d13230d9..d4135efcc2 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s @@ -9,7 +9,7 @@ dlabel D_802404E0_A54E30 .word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802D5FA4, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240570_A54EC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_12_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_12_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_12_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_12_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024060C_A54F5C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802415B8, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802415B0, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s index f17eb043d4..5d8cac8d74 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s @@ -9,7 +9,7 @@ dlabel D_802404E0_A56400 .word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802D5FA4, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240570_A56490 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_13_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_13_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_13_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_13_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024060C_A5652C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241570, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s index 45618b871a..a85dc37548 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240560_AA79E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_133_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_133_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_133_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_133_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802405FC_AA7A7C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241B10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s index 864eab9fee..9b00bb9506 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802407F0_AA9790 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_134_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_134_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_134_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_134_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024088C_AA982C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243880, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000027, 0x00000024, 0x00000002, 0xFE363C82, 0x00000062, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243888, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_14/A57E40.data.s b/ver/us/asm/data/world/area_kpa/kpa_14/A57E40.data.s index 91e2078d65..8416e78f89 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_14/A57E40.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_14/A57E40.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240990_A57E40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_14_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_14_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240A2C_A57EDC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241EC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000058, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000006A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000000CB, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241EC8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_15/A59960.data.s b/ver/us/asm/data/world/area_kpa/kpa_15/A59960.data.s index 5b9c6b247f..42d6f9eb5c 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_15/A59960.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_15/A59960.data.s @@ -9,7 +9,7 @@ dlabel D_80240620_A599B0 .word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802D5FA4, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802406B0_A59A40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_15_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_15_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_15_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_15_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024074C_A59ADC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C90, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s index 7c7800a1e7..8781d2e438 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_16/A5A3D0.data.s @@ -9,7 +9,7 @@ dlabel D_802403F0_A5A420 .word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x0000000B, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_802D5FA4, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240480_A5A4B0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_16_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_16_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_16_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_16_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024051C_A5A54C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802429E0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_32/A5E500.data.s b/ver/us/asm/data/world/area_kpa/kpa_32/A5E500.data.s index 23846e2e37..410f82bd9a 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_32/A5E500.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_32/A5E500.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240440_A5E500 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_32_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_32_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_32_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_32_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404DC_A5E59C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000024, 0x00000002, 0xFE363C82, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C83, 0x00000081, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240FA0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_33/A5F4C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_33/A5F4C0.data.s index 2233a1e10a..32fef9291e 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_33/A5F4C0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_33/A5F4C0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240440_A5F4C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_33_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_33_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_33_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_33_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404DC_A5F55C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240FA0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s b/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s index 23c1030b7a..c4e42f2f50 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_60/A6CEF0.data.s @@ -15,7 +15,7 @@ dlabel D_80240668_A6D168 .word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240518_A6D018, 0x00000100, 0x00004000, D_80240510_A6D010, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A64_A6D564, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240740_A6D240 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_60_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_60_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_60_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_60_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407DC_A6D2DC .word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001B, 0x000001DF, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003E, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x00000019, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0xFFFFFFF6, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A707F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A707F0.data.s index 7dd03ebeb9..ed33a69da5 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A707F0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_61/A707F0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242410_A707F0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_61_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_61_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_61_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_61_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802424AC_A7088C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243CC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s b/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s index 614addad84..0ba0a75e35 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_62/A72740.data.s @@ -12,7 +12,7 @@ dlabel D_80240678_A72898 .word 0x0000000A, 0x00000002, 0xF840619C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, 0x802BCD68, 0xFFFFFF38, 0x0000000A, 0xFFFFFF31, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_80240528_A72748, 0x00000100, 0x00004000, D_80240520_A72740, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240A74_A72C94, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, 0x802EA5AC, 0xFFFFFDEC, 0x00000091, 0xFFFFFFC5, 0x00000000, 0x00000133, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840619D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240750_A72970 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_62_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_62_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_62_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_62_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407EC_A72A0C .word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x000001DF, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000026, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000014, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x00000019, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000028, 0xFFFFFFF6, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_70/A75440.data.s b/ver/us/asm/data/world/area_kpa/kpa_70/A75440.data.s index 108114b447..7ac25ac569 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_70/A75440.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_70/A75440.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240BD0_A75440 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_70_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_70_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_70_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_70_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C6C_A754DC .word 0x00000043, 0x00000003, LoadAnimatedModel, 0x00000000, 0x8024195C, 0x00000043, 0x00000003, PlayModelAnimation, 0x00000000, 0x80241990, 0x00000043, 0x00000005, SetAnimatedModelRootPosition, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetAnimatedModelRenderMode, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_01/C59CE0.data.s b/ver/us/asm/data/world/area_kzn/kzn_01/C59CE0.data.s index 98f52c45f9..13b8fb536e 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_01/C59CE0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_01/C59CE0.data.s @@ -6,7 +6,7 @@ dlabel D_80240310_C59CE0 .word 0xC3DE8000, 0x00000000, 0x00000000, 0x42B40000, 0x43D48000, 0xC37F0000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240744_C5A114, D_80240310_C59CE0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190103 dlabel D_80240370_C59D40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024040C_C59DDC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240370_C59D40, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240370_C59D40, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_02/C5CF60.data.s b/ver/us/asm/data/world/area_kzn/kzn_02/C5CF60.data.s index dffc062398..9637e8de39 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_02/C5CF60.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_02/C5CF60.data.s @@ -6,7 +6,7 @@ dlabel D_80242820_C5CF60 .word 0xC44A8000, 0x41A00000, 0xC1200000, 0x42B40000, 0x444A8000, 0x41A00000, 0xC1200000, 0x43870000, 0xC44A8000, 0x41A00000, 0xC1200000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024300C_C5D74C, D_80242820_C5CF60, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190104 dlabel D_80242890_C5CFD0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_02_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_02_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024292C_C5D06C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242890_C5CFD0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_03/C63DA0.data.s b/ver/us/asm/data/world/area_kzn/kzn_03/C63DA0.data.s index 766b937616..33407e17d3 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_03/C63DA0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_03/C63DA0.data.s @@ -6,7 +6,7 @@ dlabel D_80243090_C63DA0 .word 0xC3CD0000, 0x44598000, 0xC2820000, 0x42B40000, 0x43D98000, 0x44278000, 0xC1200000, 0x43870000, 0x43E10000, 0x43EB0000, 0x435C0000, 0x43870000, 0xC3D48000, 0x42700000, 0x43A28000, 0x42B40000, 0x43DC0000, 0x41A00000, 0x438C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024390C_C6461C, D_80243090_C63DA0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190105 dlabel D_80243120_C63E30 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_03_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_03_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802431BC_C63ECC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243120_C63E30, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_04/C69890.data.s b/ver/us/asm/data/world/area_kzn/kzn_04/C69890.data.s index 43a61fafaf..0642096882 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_04/C69890.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_04/C69890.data.s @@ -6,7 +6,7 @@ dlabel D_80241760_C69890 .word 0xC40C0000, 0x43FA0000, 0x40A00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241B0C_C69C3C, D_80241760_C69890, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190106 dlabel D_802417B0_C698E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_04_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024184C_C6997C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802417B0_C698E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_05/C6C3E0.data.s b/ver/us/asm/data/world/area_kzn/kzn_05/C6C3E0.data.s index 70b64a5e50..f71abf6b3f 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_05/C6C3E0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_05/C6C3E0.data.s @@ -6,7 +6,7 @@ dlabel D_80240310_C6C3E0 .word 0xC3D70000, 0xC3818000, 0x41200000, 0x42B40000, 0x43E10000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240744_C6C814, D_80240310_C6C3E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190107 dlabel D_80240370_C6C440 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_05_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_05_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024040C_C6C4DC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240370_C6C440, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240370_C6C440, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s b/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s index 4c5750a14f..f4ae243807 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_06/C6D390.data.s @@ -6,7 +6,7 @@ dlabel D_80240A70_C6D390 .word 0x43C08000, 0x42E60000, 0x425C0000, 0x43870000, 0xC3C08000, 0x42960000, 0x42880000, 0x42B40000, 0x43C80000, 0x40A00000, 0x432F0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240F98_C6D8B8, D_80240A70_C6D390, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190108 dlabel D_80240AE0_C6D400 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_06_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B7C_C6D49C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802419E0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_07/C70710.data.s b/ver/us/asm/data/world/area_kzn/kzn_07/C70710.data.s index 46703ef7c9..4a9286ce2e 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_07/C70710.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_07/C70710.data.s @@ -6,7 +6,7 @@ dlabel D_802423E0_C70710 .word 0x00000000 dlabel D_802423E4_C70714 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_07_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_07_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_07_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_07_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242480_C707B0 .word 0x00010026 diff --git a/ver/us/asm/data/world/area_kzn/kzn_08/C755A0.data.s b/ver/us/asm/data/world/area_kzn/kzn_08/C755A0.data.s index e2dca3e330..371f050d8e 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_08/C755A0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_08/C755A0.data.s @@ -9,7 +9,7 @@ dlabel D_80244170_C755F0 .word 0x00000000 dlabel D_80244174_C755F4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_08_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_08_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244210_C75690 .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80244174_C755F4, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_10/C7E850.data.s b/ver/us/asm/data/world/area_kzn/kzn_10/C7E850.data.s index c7f5f6a731..0006b72a7c 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_10/C7E850.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_10/C7E850.data.s @@ -6,7 +6,7 @@ dlabel D_802406D0_C7E850 .word 0xC3DE8000, 0x00000000, 0x00000000, 0x42B40000, 0x43D48000, 0xC3818000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240B04_C7EC84, D_802406D0_C7E850, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019010C dlabel D_80240730_C7E8B0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407CC_C7E94C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240730_C7E8B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240730_C7E8B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_11/C82800.data.s b/ver/us/asm/data/world/area_kzn/kzn_11/C82800.data.s index 5ae347f472..69ee3f69e3 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_11/C82800.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_11/C82800.data.s @@ -6,7 +6,7 @@ dlabel D_80242660_C82800 .word 0xC44A8000, 0x41A00000, 0x00000000, 0x42B40000, 0x444A8000, 0x41A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242D80_C82F20, D_80242660_C82800, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019010D dlabel D_802426C0_C82860 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_11_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_11_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024275C_C828FC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802426C0_C82860, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s b/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s index e738119034..9b969b64c2 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_17/C88B50.data.s @@ -6,7 +6,7 @@ dlabel D_802430A0_C88B50 .word 0xC4278000, 0x00000000, 0x43200000, 0x42B40000, 0x441B0000, 0x00000000, 0x41F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802434D4_C88F84, D_802430A0_C88B50, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019010E dlabel D_80243100_C88BB0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_17_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_17_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_17_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_17_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024319C_C88C4C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243100_C88BB0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s index 69f9600568..df1409f22b 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_18/C8C460.data.s @@ -6,7 +6,7 @@ dlabel D_802403C0_C8C460 .word 0xC3CA8000, 0x437A0000, 0xC3A50000, 0x42B40000, 0x43D98000, 0x437A0000, 0xC3AF0000, 0x43870000, 0x43F50000, 0x41C80000, 0xC0A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240BCC_C8CC6C, D_802403C0_C8C460, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80240000_C8C0A0 dlabel D_80240430_C8C4D0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_18_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_18_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_18_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_18_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404CC_C8C56C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240430_C8C4D0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s b/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s index a7cdaf222f..62f07f47f8 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_19/C8FA40.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241E90_C8FA40 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_19_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_19_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_19_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_19_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F2C_C8FADC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241E90_C8FA40, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_20/C969F0.data.s b/ver/us/asm/data/world/area_kzn/kzn_20/C969F0.data.s index 6d2f55d6fe..381156d974 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_20/C969F0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_20/C969F0.data.s @@ -9,7 +9,7 @@ dlabel D_80240B20_C96A50 .word 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, PlaySound, 0x8000006B, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BD0_C96B00 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_20_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_20_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_20_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_20_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C6C_C96B9C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802442C0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s b/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s index 124a2e2387..c253020641 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_22/C9A650.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240450_C9A650 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_22_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_22_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_22_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_22_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802404EC_C9A6EC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240450_C9A650, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kzn/kzn_23/C9C9B0.data.s b/ver/us/asm/data/world/area_kzn/kzn_23/C9C9B0.data.s index 7204a177a5..2abc014760 100644 --- a/ver/us/asm/data/world/area_kzn/kzn_23/C9C9B0.data.s +++ b/ver/us/asm/data/world/area_kzn/kzn_23/C9C9B0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802406B0_C9C9B0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_23_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_23_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kzn_23_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kzn_23_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024074C_C9CA4C .word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802406B0_C9C9B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s index 8e11a9539a..42b6654bee 100644 --- a/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s +++ b/ver/us/asm/data/world/area_mac/mac_00/7EE870.data.s @@ -18,7 +18,7 @@ dlabel D_80244560_7EF270 .word 0x00000043, 0x00000001, mac_00_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_00_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_00_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_00_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_00_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244A70_7EF780 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_00_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_00_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_00_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244B0C_7EF81C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80255990, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s b/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s index dbb3f27208..a64d3574ae 100644 --- a/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_02/8268F0.data.s @@ -12,7 +12,7 @@ dlabel D_80243E50_827110 .word 0x00000043, 0x00000001, mac_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_02_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244360_827620 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_02_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802443FC_8276BC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024E1D0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_05/856650.data.s b/ver/us/asm/data/world/area_mac/mac_05/856650.data.s index 4942088062..b8fa1cbc52 100644 --- a/ver/us/asm/data/world/area_mac/mac_05/856650.data.s +++ b/ver/us/asm/data/world/area_mac/mac_05/856650.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802444E0_856650 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_05_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024457C_8566EC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_8024030C_85247C, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000063, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s b/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s index 6c7bb7aa0a..d5632fe30e 100644 --- a/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s +++ b/ver/us/asm/data/world/area_mac/mac_06/8661D0.data.s @@ -6,7 +6,7 @@ dlabel D_80241690_8661D0 .word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241848_866388, D_80241690_8661D0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000 dlabel D_802416E0_866220 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_06_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mac_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024177C_8662BC .word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C8C, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, func_8024030C_864E4C, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0x00000014, 0x00000001, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s b/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s index e559100d86..4ff00686ce 100644 --- a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s +++ b/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s @@ -12,7 +12,7 @@ dlabel D_80240CE0_BB7D50 .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mim_11_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mim_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mim_11_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241500_BB8570, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241500_BB8570 -.word 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mim_11_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mim_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mim_11_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mim_11_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mim_11_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mim_11_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mim_11_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mim_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mim_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241AAC_BB8B1C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFCE0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFCE0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B1A80, 0xF2497C20, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002D0, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000059, 0x00000054, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000059, 0x00000054, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000004B, 0x00000000, 0x00000135, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_8024066C_BB76DC, 0x00000008, 0x00000001, 0x0000001E, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80240790_BB7800, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD43, 0x00000000, 0xFFFFFFDE, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD43, 0x00000000, 0xFFFFFFDE, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFE69, 0x00000067, 0x00000078, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000005, 0x000E0024, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000005, 0x000E0025, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000005, 0x000E0026, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0x000E0027, 0x00000023, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x802442E0, 0x00000004, 0x0000000B, 0x00000008, 0x00000001, 0x00000064 diff --git a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s b/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s index 5e953e0afa..ad07b86cbe 100644 --- a/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s +++ b/ver/us/asm/data/world/area_omo/omo_03/DA8190.data.s @@ -45,7 +45,7 @@ dlabel D_80245BC4_DAAE04 .word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000098, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003D, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003E, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245DFC_DAB03C -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_03_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_03_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245E98_DAB0D8 .word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_8024556C_DAA7AC, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000037, 0x00000092, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000038, 0x00000093, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003D, 0x00000098, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003E, 0x00000099, 0x00000047, 0x00000005, D_8024598C_DAABCC, 0x00000080, 0x00000037, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024598C_DAABCC, 0x00001000, 0x00000038, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245BC4_DAAE04, 0x00000080, 0x0000003D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245BC4_DAAE04, 0x00001000, 0x0000003E, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80245DFC_DAB03C, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s b/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s index e5e85ac0c2..76f2526f06 100644 --- a/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s +++ b/ver/us/asm/data/world/area_omo/omo_06/DB9060.data.s @@ -39,7 +39,7 @@ dlabel D_80243CA4_DBB5B4 .word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000007E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000040, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EDC_DBB7EC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_06_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F78_DBB888 .word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_8024364C_DBAF5C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x00000077, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003A, 0x00000078, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003F, 0x0000007D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000040, 0x0000007E, 0x00000047, 0x00000005, D_80243A6C_DBB37C, 0x00000080, 0x00000039, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243A6C_DBB37C, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CA4_DBB5B4, 0x00000080, 0x0000003F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CA4_DBB5B4, 0x00001000, 0x00000040, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243EDC_DBB7EC, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s index dd670650d8..cc798f3fc7 100644 --- a/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s +++ b/ver/us/asm/data/world/area_omo/omo_08/DC8100.data.s @@ -39,7 +39,7 @@ dlabel D_80246284_DCA654 .word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000099, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000009A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802464BC_DCA88C -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_08_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_08_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246558_DCA928 .word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_80245C2C_DC9FFC, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000034, 0x00000093, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000035, 0x00000094, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003B, 0x00000099, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003A, 0x0000009A, 0x00000047, 0x00000005, D_8024604C_DCA41C, 0x00000080, 0x00000034, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024604C_DCA41C, 0x00001000, 0x00000035, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246284_DCA654, 0x00000080, 0x0000003B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246284_DCA654, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802464BC_DCA88C, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s b/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s index 4b1fbce951..c357b65ac2 100644 --- a/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s +++ b/ver/us/asm/data/world/area_omo/omo_10/DD8A60.data.s @@ -39,7 +39,7 @@ dlabel D_80243604_DDAFB4 .word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFEE, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEE, 0x00000000, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000008C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000008D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000039, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000003A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024383C_DDB1EC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, omo_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, omo_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802438D8_DDB288 .word 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000044, 0x00000001, D_80242FAC_DDA95C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000033, 0x00000086, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000034, 0x00000087, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000039, 0x0000008C, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000003A, 0x0000008D, 0x00000047, 0x00000005, D_802433CC_DDAD7C, 0x00000080, 0x00000033, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802433CC_DDAD7C, 0x00001000, 0x00000034, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243604_DDAFB4, 0x00000080, 0x00000039, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243604_DDAFB4, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFBB4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_8024383C_DDB1EC, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_osr/osr_00/AACFC0.data.s b/ver/us/asm/data/world/area_osr/osr_00/AACFC0.data.s index 23da831ff6..8100c95289 100644 --- a/ver/us/asm/data/world/area_osr/osr_00/AACFC0.data.s +++ b/ver/us/asm/data/world/area_osr/osr_00/AACFC0.data.s @@ -9,7 +9,7 @@ dlabel D_80240820_AAD050 .word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0x00000060, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802408F0_AAD120 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, osr_00_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, osr_00_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, osr_00_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, osr_00_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024098C_AAD1BC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802437A0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_osr/osr_01/AB0C10.data.s b/ver/us/asm/data/world/area_osr/osr_01/AB0C10.data.s index 6501ee2152..97ce0d5dfe 100644 --- a/ver/us/asm/data/world/area_osr/osr_01/AB0C10.data.s +++ b/ver/us/asm/data/world/area_osr/osr_01/AB0C10.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240C20_AB0C10 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, osr_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, osr_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, osr_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, osr_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CBC_AB0CAC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242168, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s index 6b7e6a39df..7997765f40 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/CF9BC0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242050_CF9BC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420EC_CF9C5C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024DBB0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s b/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s index 36b13c5dd4..ab362c71d1 100644 --- a/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s +++ b/ver/us/asm/data/world/area_sam/sam_02/D07440.data.s @@ -12,7 +12,7 @@ dlabel D_80242530_D07C60 .word 0x00000043, 0x00000001, sam_02_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, sam_02_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, sam_02_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, sam_02_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, sam_02_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A40_D08170 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_02_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_02_UnkTexturePanFunc2, 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, sam_02_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, sam_02_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 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_02_UpdateTexturePanStepped, 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, sam_02_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, sam_02_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 dlabel D_80242E3C_D0856C .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, sam_02_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, sam_02_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, sam_02_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, sam_02_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_sam/sam_06/D22560.data.s b/ver/us/asm/data/world/area_sam/sam_06/D22560.data.s index 81021095fe..674c21b567 100644 --- a/ver/us/asm/data/world/area_sam/sam_06/D22560.data.s +++ b/ver/us/asm/data/world/area_sam/sam_06/D22560.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802426D0_D22560 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_06_UnkTexturePanFunc2, 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, sam_06_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, sam_06_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 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_06_UpdateTexturePanStepped, 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, sam_06_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, sam_06_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 dlabel D_80242ACC_D2295C .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, sam_06_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, sam_06_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, sam_06_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, sam_06_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_sam/sam_11/D46980.data.s b/ver/us/asm/data/world/area_sam/sam_11/D46980.data.s index 494844bc50..1e44c16cd5 100644 --- a/ver/us/asm/data/world/area_sam/sam_11/D46980.data.s +++ b/ver/us/asm/data/world/area_sam/sam_11/D46980.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_8024C3B0_D46980 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_11_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_11_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, sam_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sam_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024C44C_D46A1C .word 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000002, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00008000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s b/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s index a4d620ff7e..4dbea1cd28 100644 --- a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s +++ b/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240B80_86A030 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240C1C_86A0CC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_01_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_01_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_01_UnkFunc25, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024143C_86A8EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D190.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D190.data.s index da64a6314a..57ed807a55 100644 --- a/ver/us/asm/data/world/area_tik/tik_02/86D190.data.s +++ b/ver/us/asm/data/world/area_tik/tik_02/86D190.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240A50_86D190 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_02_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_02_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240AEC_86D22C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802423B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s b/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s index afeb442cfc..60fad12852 100644 --- a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s +++ b/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s @@ -15,7 +15,7 @@ dlabel D_8024156C_87006C .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_03_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_03_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802418A0_8703A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_03_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_03_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024193C_87043C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242F10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s b/ver/us/asm/data/world/area_tik/tik_04/872750.data.s index ea2fe3eb08..0e669ba7c3 100644 --- a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s +++ b/ver/us/asm/data/world/area_tik/tik_04/872750.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240D20_872750 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_04_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_04_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240DBC_8727EC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_04_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_04_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s b/ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s index 4d919ba89c..f7309a45c0 100644 --- a/ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240B00_8758C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_05_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_05_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B9C_87595C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242110, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s b/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s index 71053583e2..7e5e0bfb7a 100644 --- a/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_06/8778F0.data.s @@ -18,7 +18,7 @@ dlabel D_8024140C_8782EC .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_06_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_06_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_06_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241740_878620 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_06_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417DC_8786BC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242CD0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s index 728fb1da20..9411cb7e85 100644 --- a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s @@ -15,7 +15,7 @@ dlabel D_802415AC_88039C .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_08_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_08_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802418E0_8806D0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_08_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_08_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024197C_88076C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s index e22dc579e6..0bb7cfbdf2 100644 --- a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s +++ b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s @@ -9,7 +9,7 @@ dlabel D_80241B60_883D20 .word 0x00000043, 0x00000001, tik_09_SetPlayerStatusAnimFlags100000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_09_GetCurrentCameraYawClamped180, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_09_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_09_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242070_884230 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_09_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_09_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_09_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_09_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024210C_8842CC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x0000026B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x00000019, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x0000026C, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/887800.data.s b/ver/us/asm/data/world/area_tik/tik_10/887800.data.s index fa9524a5a2..f15e1357d3 100644 --- a/ver/us/asm/data/world/area_tik/tik_10/887800.data.s +++ b/ver/us/asm/data/world/area_tik/tik_10/887800.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241440_887800 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_10_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802414DC_88789C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242800, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s b/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s index 15006d8bf9..0a6bf3ec7c 100644 --- a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s @@ -15,7 +15,7 @@ dlabel D_80242CCC_88B89C .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_12_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_12_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243000_88BBD0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_12_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_12_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024309C_88BC6C .word 0x00000043, 0x00000003, GotoMap, 0x802449C0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s b/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s index 0f9f4aa27d..8a082633e0 100644 --- a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s @@ -15,7 +15,7 @@ dlabel D_802413EC_88E9EC .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_14_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_14_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241720_88ED20 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_14_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_14_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802417BC_88EDBC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242590, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s b/ver/us/asm/data/world/area_tik/tik_15/890740.data.s index 5e59458e39..0e6f7dcd89 100644 --- a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s +++ b/ver/us/asm/data/world/area_tik/tik_15/890740.data.s @@ -15,7 +15,7 @@ dlabel D_8024159C_89113C .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_15_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_15_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802418D0_891470 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_15_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_15_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_15_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_15_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024196C_89150C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242E70, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s b/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s index c8f66dd3ec..f7be0adfd4 100644 --- a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s @@ -18,7 +18,7 @@ dlabel D_802424CC_894EEC .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_17_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_17_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242800_895220 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_17_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_17_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024289C_8952BC .word 0x0000000A, 0x00000002, 0xF8405B87, 0x00000000, 0x00000024, 0x00000002, 0xF8405B87, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CA8, 0x00000007, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80242CA0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s b/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s index cef91ace2a..0be2457484 100644 --- a/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s +++ b/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240740_895E20 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_18_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_18_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_18_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_18_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802407DC_895EBC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241EF0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s b/ver/us/asm/data/world/area_tik/tik_19/898990.data.s index 253e1acc49..422458b35b 100644 --- a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s +++ b/ver/us/asm/data/world/area_tik/tik_19/898990.data.s @@ -15,7 +15,7 @@ dlabel D_80241DAC_89938C .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_19_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_19_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420E0_8996C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_19_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_19_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024217C_89975C .word 0x00000043, 0x00000003, GotoMap, 0x80242D60, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s index c240e7c26f..cbf66df31f 100644 --- a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s +++ b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802411E0_89B530 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_20_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_20_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_20_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_20_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024127C_89B5CC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_20_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_20_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_20_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s index 9742aeaf38..7652fa02b8 100644 --- a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240A00_89E1A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_21_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_21_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_21_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_21_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240A9C_89E23C .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_21_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_21_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_21_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s index 7cf35de146..851a0d590f 100644 --- a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s +++ b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240A70_8A0930 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_22_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_22_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_22_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_22_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B0C_8A09CC .word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_22_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_22_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_22_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s index 98660e4008..54d9df7f2e 100644 --- a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s @@ -15,7 +15,7 @@ dlabel D_80241BCC_8A3F9C .word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_23_SetPlayerStatusAnimFlags100000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_23_SomeXYZFunc2, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F00_8A42D0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_23_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_23_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_23_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_23_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241F9C_8A436C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243640, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s index 412fd39fbb..4f494cf8e1 100644 --- a/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s +++ b/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240F40_8A69C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_24_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_24_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_24_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_24_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240FDC_8A6A5C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024248C, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s b/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s index ed7444024f..e38be453d9 100644 --- a/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s +++ b/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240880_8A8800 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_25_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_25_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_25_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_25_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024091C_8A889C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A80, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_00/99A410.data.s b/ver/us/asm/data/world/area_trd/trd_00/99A410.data.s index b64f6c879b..21eca54f1b 100644 --- a/ver/us/asm/data/world/area_trd/trd_00/99A410.data.s +++ b/ver/us/asm/data/world/area_trd/trd_00/99A410.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_802407A0_99A410 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_00_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_00_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_00_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_00_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024083C_99A4AC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D00, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99E110.data.s b/ver/us/asm/data/world/area_trd/trd_01/99E110.data.s index f6fdc54923..f5fc71bd23 100644 --- a/ver/us/asm/data/world/area_trd/trd_01/99E110.data.s +++ b/ver/us/asm/data/world/area_trd/trd_01/99E110.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241780_99E110 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_01_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_01_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024181C_99E1AC .word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000020, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000025, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002E, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s b/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s index 6f07c31e75..0dc7ebcd41 100644 --- a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s +++ b/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243980_9ABD70 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_04_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_04_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243A1C_9ABE0C .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000016, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s b/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s index f11730d36e..afc206b3a6 100644 --- a/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s +++ b/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240E80_9B2610 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_06_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_06_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240F1C_9B26AC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000018, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802451B0, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s b/ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s index 4c7534f481..b0e85a39f2 100644 --- a/ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s +++ b/ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80242990_9B9310 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_07_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_07_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_07_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_07_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242A2C_9B93AC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244810, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s b/ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s index 59c18f6ec9..b1ae55c6df 100644 --- a/ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s +++ b/ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240AB0_9BBD50 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_08_UnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_08_UnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240B4C_9BBDEC .word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802423B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 3831b31b9f..7bc65f678a 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -10430,8 +10430,8 @@ dup_b_area_tik_UnkFunc56 = 0x80218B80; // type:func rom:0x5ED010 b_area_tik_UnkFunc56 = 0x80219020; // type:func rom:0x5ED4B0 dup2_b_area_tik_UnkFunc56 = 0x802194C0; // type:func rom:0x5ED950 func_80219960_5EDDF0 = 0x80219960; // type:func rom:0x5EDDF0 -b_area_tik_UnkTexturePanFunc = 0x80219DB0; // type:func rom:0x5EE240 -b_area_tik_UnkTexturePanFunc2 = 0x80219ED4; // type:func rom:0x5EE364 +b_area_tik_UpdateTexturePanSmooth = 0x80219DB0; // type:func rom:0x5EE240 +b_area_tik_UpdateTexturePanStepped = 0x80219ED4; // type:func rom:0x5EE364 b_area_tik2_StartRumbleWithParams = 0x80218000; // type:func rom:0x608AB0 func_80218058_608B08 = 0x80218058; // type:func rom:0x608B08 dup_b_area_tik2_StartRumbleWithParams = 0x80218200; // type:func rom:0x608CB0 @@ -10452,8 +10452,8 @@ b_area_tik2_UnkFunc56 = 0x80218BE0; // type:func rom:0x609690 dup_b_area_tik2_UnkFunc56 = 0x80219080; // type:func rom:0x609B30 dup2_b_area_tik2_UnkFunc56 = 0x80219520; // type:func rom:0x609FD0 func_802199C0_60A470 = 0x802199C0; // type:func rom:0x60A470 -b_area_tik2_UnkTexturePanFunc = 0x80219E10; // type:func rom:0x60A8C0 -b_area_tik2_UnkTexturePanFunc2 = 0x80219F34; // type:func rom:0x60A9E4 +b_area_tik2_UpdateTexturePanSmooth = 0x80219E10; // type:func rom:0x60A8C0 +b_area_tik2_UpdateTexturePanStepped = 0x80219F34; // type:func rom:0x60A9E4 b_area_tik3_UnkBattleFunc1 = 0x80218000; // type:func rom:0x6186F0 dup_b_area_tik3_UnkBattleFunc1 = 0x802180D0; // type:func rom:0x6187C0 b_area_tik3_UnkBattleFunc2 = 0x8021819C; // type:func rom:0x61888C @@ -10462,8 +10462,8 @@ b_area_tik3_UnkFunc56 = 0x80218310; // type:func rom:0x618A00 dup_b_area_tik3_UnkFunc56 = 0x802187B0; // type:func rom:0x618EA0 dup2_b_area_tik3_UnkFunc56 = 0x80218C50; // type:func rom:0x619340 func_802190F0_6197E0 = 0x802190F0; // type:func rom:0x6197E0 -b_area_tik3_UnkTexturePanFunc = 0x80219540; // type:func rom:0x619C30 -b_area_tik3_UnkTexturePanFunc2 = 0x80219664; // type:func rom:0x619D54 +b_area_tik3_UpdateTexturePanSmooth = 0x80219540; // type:func rom:0x619C30 +b_area_tik3_UpdateTexturePanStepped = 0x80219664; // type:func rom:0x619D54 b_area_sam_UnkFunc62 = 0x80218000; // type:func rom:0x623BA0 b_area_sam_ActorJumpToPos = 0x80218890; // type:func rom:0x624430 b_area_sam_UnkActorSizeFunc = 0x802189E4; // type:func rom:0x624584 @@ -11953,8 +11953,8 @@ mac_00_UnkFunc25 = 0x80240034; // type:func rom:0x7EAD44 mac_00_GetEntryPos = 0x802400F0; // type:func rom:0x7EAE00 mac_00_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x7EAEE0 mac_00_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x7EAF4C -mac_00_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x7EAFF0 -mac_00_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x7EB114 +mac_00_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x7EAFF0 +mac_00_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x7EB114 func_802405EC_7EB2FC = 0x802405EC; // type:func rom:0x7EB2FC func_80240624_7EB334 = 0x80240624; // type:func rom:0x7EB334 func_80240630_7EB340 = 0x80240630; // type:func rom:0x7EB340 @@ -12183,8 +12183,8 @@ mac_02_UnkFunc25 = 0x80240034; // type:func rom:0x8232F4 mac_02_GetEntryPos = 0x802400F0; // type:func rom:0x8233B0 mac_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x823490 mac_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8234FC -mac_02_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8235A0 -mac_02_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8236C4 +mac_02_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8235A0 +mac_02_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8236C4 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 @@ -12391,8 +12391,8 @@ D_80246610_8491E0 = 0x80246610; // type:data rom:0x8491E0 D_80246614_8491E4 = 0x80246614; // type:data rom:0x8491E4 D_8024F550_852120 = 0x8024F550; // type:data rom:0x852120 D_8024F580_852150 = 0x8024F580; // type:data rom:0x852150 -mac_05_UnkTexturePanFunc = 0x80240000; // type:func rom:0x852170 -mac_05_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x852294 +mac_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x852170 +mac_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x852294 func_8024030C_85247C = 0x8024030C; // type:func rom:0x85247C func_8024047C_8525EC = 0x8024047C; // type:func rom:0x8525EC mac_05_UnkNpcAIFunc24 = 0x80240490; // type:func rom:0x852600 @@ -12478,8 +12478,8 @@ D_80252744_8648B4 = 0x80252744; // type:data rom:0x8648B4 D_802527B0_864920 = 0x802527B0; // type:data rom:0x864920 D_802527B8_864928 = 0x802527B8; // type:data rom:0x864928 D_802529C8_864B38 = 0x802529C8; // type:data rom:0x864B38 -mac_06_UnkTexturePanFunc = 0x80240000; // type:func rom:0x864B40 -mac_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x864C64 +mac_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x864B40 +mac_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x864C64 func_8024030C_864E4C = 0x8024030C; // type:func rom:0x864E4C mac_06_SpawnSunEffect = 0x8024047C; // type:func rom:0x864FBC func_802404C0_865000 = 0x802404C0; // type:func rom:0x865000 @@ -12506,8 +12506,8 @@ D_80243438_867F78 = 0x80243438; // type:data rom:0x867F78 D_8024343C_867F7C = 0x8024343C; // type:data rom:0x867F7C D_80243440_867F80 = 0x80243440; // type:data rom:0x867F80 D_80244968_8694A8 = 0x80244968; // type:data rom:0x8694A8 -tik_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8694B0 -tik_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8695D4 +tik_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8694B0 +tik_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x8695D4 tik_01_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x8697BC tik_01_GetCurrentFloor = 0x8024032C; // type:func rom:0x8697DC tik_01_UnkFunc25 = 0x80240340; // type:func rom:0x8697F0 @@ -12518,8 +12518,8 @@ tik_01_UnkPosFunc2 = 0x802405F0; // type:func rom:0x869AA0 tik_01_SetEntityPosition = 0x80240960; // type:func rom:0x869E10 func_80240A30_869EE0 = 0x80240A30; // type:func rom:0x869EE0 D_80242B7E_86C02E = 0x80242B7E; // type:data rom:0x86C02E -tik_02_UnkTexturePanFunc = 0x80240000; // type:func rom:0x86C740 -tik_02_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x86C864 +tik_02_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x86C740 +tik_02_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x86C864 func_80240310_86CA50 = 0x80240310; // type:func rom:0x86CA50 tik_02_GetItemName = 0x802403C4; // type:func rom:0x86CB04 tik_02_SomeItemEntityFunc = 0x80240428; // type:func rom:0x86CB68 @@ -12534,16 +12534,16 @@ tik_03_UnkFunc25 = 0x80240034; // type:func rom:0x86EB34 tik_03_GetEntryPos = 0x802400F0; // type:func rom:0x86EBF0 tik_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x86ECD0 tik_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x86ED3C -tik_03_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x86EDE0 -tik_03_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x86EF04 +tik_03_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x86EDE0 +tik_03_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x86EF04 tik_03_UnkPosFunc2 = 0x802405F0; // type:func rom:0x86F0F0 func_80240960_86F460 = 0x80240960; // type:func rom:0x86F460 func_802409C0_86F4C0 = 0x802409C0; // type:func rom:0x86F4C0 func_802409E0_86F4E0 = 0x802409E0; // type:func rom:0x86F4E0 D_80242930_871430 = 0x80242930; // type:data rom:0x871430 D_80242EBC_8719BC = 0x80242EBC; // type:data rom:0x8719BC -tik_04_UnkTexturePanFunc = 0x80240000; // type:func rom:0x871A30 -tik_04_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x871B54 +tik_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x871A30 +tik_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x871B54 tik_04_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x871D3C tik_04_GetCurrentFloor = 0x8024032C; // type:func rom:0x871D5C tik_04_UnkFunc25 = 0x80240340; // type:func rom:0x871D70 @@ -12555,8 +12555,8 @@ func_80240960_872390 = 0x80240960; // type:func rom:0x872390 func_80240A00_872430 = 0x80240A00; // type:func rom:0x872430 tik_04_GetFloorCollider = 0x80240BF4; // type:func rom:0x872624 func_80240C20_872650 = 0x80240C20; // type:func rom:0x872650 -tik_05_UnkTexturePanFunc = 0x80240000; // type:func rom:0x874DC0 -tik_05_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x874EE4 +tik_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x874DC0 +tik_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x874EE4 tik_05_UnkPosFunc2 = 0x80240310; // type:func rom:0x8750D0 func_80240680_875440 = 0x80240680; // type:func rom:0x875440 tik_05_GetItemName = 0x80240734; // type:func rom:0x8754F4 @@ -12571,8 +12571,8 @@ tik_06_UnkFunc25 = 0x80240034; // type:func rom:0x876F14 tik_06_GetEntryPos = 0x802400F0; // type:func rom:0x876FD0 tik_06_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8770B0 tik_06_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87711C -tik_06_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8771C0 -tik_06_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8772E4 +tik_06_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8771C0 +tik_06_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8772E4 tik_06_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8774D0 tik_07_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x879BE0 tik_07_GetCurrentFloor = 0x80240020; // type:func rom:0x879C00 @@ -12626,8 +12626,8 @@ tik_08_UnkFunc25 = 0x80240034; // type:func rom:0x87EE24 tik_08_GetEntryPos = 0x802400F0; // type:func rom:0x87EEE0 tik_08_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x87EFC0 tik_08_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x87F02C -tik_08_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x87F0D0 -tik_08_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x87F1F4 +tik_08_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x87F0D0 +tik_08_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x87F1F4 tik_08_UnkPosFunc2 = 0x802405F0; // type:func rom:0x87F3E0 tik_08_SetEntityPosition = 0x80240960; // type:func rom:0x87F750 tik_08_GetFloorCollider = 0x80240A30; // type:func rom:0x87F820 @@ -12639,8 +12639,8 @@ tik_09_UnkFunc25 = 0x80240034; // type:func rom:0x8821F4 tik_09_GetEntryPos = 0x802400F0; // type:func rom:0x8822B0 tik_09_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x882390 tik_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8823FC -tik_09_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8824A0 -tik_09_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8825C4 +tik_09_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8824A0 +tik_09_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8825C4 tik_09_UnkPosFunc2 = 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 @@ -12650,8 +12650,8 @@ tik_09_set_script_owner_npc_col_height = 0x80240D44; // type:func rom:0x882F04 tik_09_UnkNpcAIMainFunc5 = 0x80240DC4; // type:func rom:0x882F84 func_80241204_8833C4 = 0x80241204; // type:func rom:0x8833C4 D_802441A0_886360 = 0x802441A0; // type:data rom:0x886360 -tik_10_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8863C0 -tik_10_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8864E4 +tik_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8863C0 +tik_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x8864E4 tik_10_UnkPosFunc2 = 0x80240310; // type:func rom:0x8866D0 tik_10_SetOverrideFlags_40 = 0x80240680; // type:func rom:0x886A40 tik_10_UnkFunc17 = 0x8024069C; // type:func rom:0x886A5C @@ -12681,8 +12681,8 @@ tik_12_UnkFunc25 = 0x80240034; // type:func rom:0x888C04 tik_12_GetEntryPos = 0x802400F0; // type:func rom:0x888CC0 tik_12_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x888DA0 tik_12_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x888E0C -tik_12_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x888EB0 -tik_12_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x888FD4 +tik_12_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x888EB0 +tik_12_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x888FD4 tik_12_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8891C0 func_80240960_889530 = 0x80240960; // type:func rom:0x889530 tik_12_GetItemName = 0x80240A14; // type:func rom:0x8895E4 @@ -12726,8 +12726,8 @@ tik_14_UnkFunc25 = 0x80240034; // type:func rom:0x88D634 tik_14_GetEntryPos = 0x802400F0; // type:func rom:0x88D6F0 tik_14_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88D7D0 tik_14_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88D83C -tik_14_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x88D8E0 -tik_14_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x88DA04 +tik_14_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x88D8E0 +tik_14_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x88DA04 tik_14_UnkPosFunc2 = 0x802405F0; // type:func rom:0x88DBF0 tik_15_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x88FBA0 tik_15_GetCurrentFloor = 0x80240020; // type:func rom:0x88FBC0 @@ -12735,8 +12735,8 @@ tik_15_UnkFunc25 = 0x80240034; // type:func rom:0x88FBD4 tik_15_GetEntryPos = 0x802400F0; // type:func rom:0x88FC90 tik_15_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x88FD70 tik_15_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x88FDDC -tik_15_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x88FE80 -tik_15_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x88FFA4 +tik_15_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x88FE80 +tik_15_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x88FFA4 tik_15_UnkPosFunc2 = 0x802405F0; // type:func rom:0x890190 func_80240960_890500 = 0x80240960; // type:func rom:0x890500 tik_15_GetItemName = 0x80240A14; // type:func rom:0x8905B4 @@ -12770,14 +12770,14 @@ tik_17_UnkFunc25 = 0x80240DA4; // type:func rom:0x8937C4 tik_17_GetEntryPos = 0x80240E60; // type:func rom:0x893880 tik_17_GetCurrentCameraYawClamped180 = 0x80240F40; // type:func rom:0x893960 tik_17_SomeXYZFunc2 = 0x80240FAC; // type:func rom:0x8939CC -tik_17_UnkTexturePanFunc = 0x80241050; // type:func rom:0x893A70 -tik_17_UnkTexturePanFunc2 = 0x80241174; // type:func rom:0x893B94 +tik_17_UpdateTexturePanSmooth = 0x80241050; // type:func rom:0x893A70 +tik_17_UpdateTexturePanStepped = 0x80241174; // type:func rom:0x893B94 D_80241420_893E40 = 0x80241420; // type:data rom:0x893E40 D_80241428_893E48 = 0x80241428; // type:data rom:0x893E48 D_80241438_893E58 = 0x80241438; // type:data rom:0x893E58 tik_17_bigFuncFloats = 0x80241478; // type:data rom:0x893E98 -tik_18_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8956E0 -tik_18_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x895804 +tik_18_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8956E0 +tik_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x895804 tik_18_UnkPosFunc2 = 0x80240310; // type:func rom:0x8959F0 func_80240680_895D60 = 0x80240680; // type:func rom:0x895D60 tik_19_SetPlayerStatusAnimFlags100000 = 0x80240000; // type:func rom:0x8975E0 @@ -12786,8 +12786,8 @@ tik_19_UnkFunc25 = 0x80240034; // type:func rom:0x897614 tik_19_GetEntryPos = 0x802400F0; // type:func rom:0x8976D0 tik_19_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8977B0 tik_19_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x89781C -tik_19_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8978C0 -tik_19_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8979E4 +tik_19_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8978C0 +tik_19_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8979E4 tik_19_SetOverrideFlags_40 = 0x802405F0; // type:func rom:0x897BD0 tik_19_UnkFunc17 = 0x8024060C; // type:func rom:0x897BEC func_8024062C_897C0C = 0x8024062C; // type:func rom:0x897C0C @@ -12810,8 +12810,8 @@ D_802426B0_899C90 = 0x802426B0; // type:data rom:0x899C90 D_802426B8_899C98 = 0x802426B8; // type:data rom:0x899C98 D_802426C8_899CA8 = 0x802426C8; // type:data rom:0x899CA8 tik_19_bigFuncFloats = 0x80242708; // type:data rom:0x899CE8 -tik_20_UnkTexturePanFunc = 0x80240000; // type:func rom:0x89A350 -tik_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x89A474 +tik_20_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x89A350 +tik_20_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x89A474 tik_20_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x89A65C tik_20_GetCurrentFloor = 0x8024032C; // type:func rom:0x89A67C tik_20_UnkFunc25 = 0x80240340; // type:func rom:0x89A690 @@ -12825,8 +12825,8 @@ tik_20_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x89AE60 tik_20_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x89AFC4 tik_20_UnkNpcAIMainFunc5 = 0x80240CF4; // type:func rom:0x89B044 D_802433F0_89D740 = 0x802433F0; // type:data rom:0x89D740 -tik_21_UnkTexturePanFunc = 0x80240000; // type:func rom:0x89D7A0 -tik_21_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x89D8C4 +tik_21_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x89D7A0 +tik_21_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x89D8C4 tik_21_SetPlayerStatusAnimFlags100000 = 0x8024030C; // type:func rom:0x89DAAC tik_21_GetCurrentFloor = 0x8024032C; // type:func rom:0x89DACC tik_21_UnkFunc25 = 0x80240340; // type:func rom:0x89DAE0 @@ -12835,8 +12835,8 @@ tik_21_GetCurrentCameraYawClamped180 = 0x802404DC; // type:func rom:0x89DC7C tik_21_SomeXYZFunc2 = 0x80240548; // type:func rom:0x89DCE8 tik_21_UnkPosFunc2 = 0x802405EC; // type:func rom:0x89DD8C func_80240000_89FEC0 = 0x80240000; // type:func rom:0x89FEC0 -tik_22_UnkTexturePanFunc = 0x80240030; // type:func rom:0x89FEF0 -tik_22_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0x8A0014 +tik_22_UpdateTexturePanSmooth = 0x80240030; // type:func rom:0x89FEF0 +tik_22_UpdateTexturePanStepped = 0x80240154; // type:func rom:0x8A0014 tik_22_SetPlayerStatusAnimFlags100000 = 0x8024033C; // type:func rom:0x8A01FC tik_22_GetCurrentFloor = 0x8024035C; // type:func rom:0x8A021C tik_22_UnkFunc25 = 0x80240370; // type:func rom:0x8A0230 @@ -12851,8 +12851,8 @@ tik_23_UnkFunc25 = 0x80240034; // type:func rom:0x8A2404 tik_23_GetEntryPos = 0x802400F0; // type:func rom:0x8A24C0 tik_23_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x8A25A0 tik_23_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x8A260C -tik_23_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8A26B0 -tik_23_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8A27D4 +tik_23_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x8A26B0 +tik_23_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x8A27D4 tik_23_UnkPosFunc2 = 0x802405EC; // type:func rom:0x8A29BC tik_23_set_script_owner_npc_anim = 0x80240960; // type:func rom:0x8A2D30 tik_23_UnkDistFunc = 0x802409DC; // type:func rom:0x8A2DAC @@ -12861,8 +12861,8 @@ tik_23_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x8A3044 tik_23_UnkNpcAIMainFunc5 = 0x80240CF4; // type:func rom:0x8A30C4 D_80243650_8A5A20 = 0x80243650; // type:data rom:0x8A5A20 func_80240000_8A5A80 = 0x80240000; // type:func rom:0x8A5A80 -tik_24_UnkTexturePanFunc = 0x80240050; // type:func rom:0x8A5AD0 -tik_24_UnkTexturePanFunc2 = 0x80240174; // type:func rom:0x8A5BF4 +tik_24_UpdateTexturePanSmooth = 0x80240050; // type:func rom:0x8A5AD0 +tik_24_UpdateTexturePanStepped = 0x80240174; // type:func rom:0x8A5BF4 tik_24_UnkPosFunc2 = 0x80240360; // type:func rom:0x8A5DE0 tik_24_set_script_owner_npc_anim = 0x802406D0; // type:func rom:0x8A6150 tik_24_UnkDistFunc = 0x8024074C; // type:func rom:0x8A61CC @@ -12872,8 +12872,8 @@ tik_24_UnkNpcAIMainFunc5 = 0x80240A64; // type:func rom:0x8A64E4 D_80242470_8A7EF0 = 0x80242470; // type:data rom:0x8A7EF0 D_80242480_8A7F00 = 0x80242480; // type:data rom:0x8A7F00 D_802424A0_8A7F20 = 0x802424A0; // type:data rom:0x8A7F20 -tik_25_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8A7F80 -tik_25_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8A80A4 +tik_25_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8A7F80 +tik_25_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x8A80A4 tik_25_UnkPosFunc2 = 0x8024030C; // type:func rom:0x8A828C func_80240680_8A8600 = 0x80240680; // type:func rom:0x8A8600 tik_25_SetEntityPosition = 0x802406AC; // type:func rom:0x8A862C @@ -13328,8 +13328,8 @@ func_80240000_90B240 = 0x80240000; // type:func rom:0x90B240 func_80240010_90B250 = 0x80240010; // type:func rom:0x90B250 func_80240074_90B2B4 = 0x80240074; // type:func rom:0x90B2B4 D_80240480_90B6C0 = 0x80240480; // type:data rom:0x90B6C0 -kmr_30_UnkTexturePanFunc = 0x80240000; // type:func rom:0x90B6D0 -kmr_30_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x90B7F4 +kmr_30_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x90B6D0 +kmr_30_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x90B7F4 func_80240310_90B9E0 = 0x80240310; // type:func rom:0x90B9E0 func_8024045C_90BB2C = 0x8024045C; // type:func rom:0x90BB2C func_80240488_90BB58 = 0x80240488; // type:func rom:0x90BB58 @@ -14326,8 +14326,8 @@ isk_18_func_80240814_97BE44 = 0x802407D4; // type:func rom:0x998744 isk_18_AwaitPlayerNearNpc = 0x8024081C; // type:func rom:0x99878C isk_18_func_802408B4_97BEE4 = 0x80240874; // type:func rom:0x9987E4 D_80241770_9996E0 = 0x80241770; // type:data rom:0x9996E0 -trd_00_UnkTexturePanFunc = 0x80240000; // type:func rom:0x999C70 -trd_00_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x999D94 +trd_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x999C70 +trd_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x999D94 func_80240310_999F80 = 0x80240310; // type:func rom:0x999F80 trd_00_GetItemName = 0x802403C4; // type:func rom:0x99A034 trd_00_SomeItemEntityFunc = 0x80240428; // type:func rom:0x99A098 @@ -14335,8 +14335,8 @@ trd_00_CheckItemFlags40 = 0x80240578; // type:func rom:0x99A1E8 PostChapter1StatUpdate = 0x802405D0; // type:func rom:0x99A240 trd_00_SyncStatusMenu = 0x8024060C; // type:func rom:0x99A27C D_80241340_99AFB0 = 0x80241340; // type:data rom:0x99AFB0 -trd_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0x99C990 -trd_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x99CAB4 +trd_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x99C990 +trd_01_UpdateTexturePanStepped = 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 @@ -14391,8 +14391,8 @@ trd_03_set_script_owner_npc_col_height = 0x802403B4; // type:func rom:0x9A4A04 trd_03_UnkNpcAIMainFunc5 = 0x80240434; // type:func rom:0x9A4A84 func_80240880_9A4ED0 = 0x80240880; // type:func rom:0x9A4ED0 D_80243D40_9A8390 = 0x80243D40; // type:data rom:0x9A8390 -trd_04_UnkTexturePanFunc = 0x80240000; // type:func rom:0x9A83F0 -trd_04_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x9A8514 +trd_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9A83F0 +trd_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9A8514 trd_04_SetEntityFlags100000 = 0x80240310; // type:func rom:0x9A8700 trd_04_SetEntityPosition = 0x80240344; // type:func rom:0x9A8734 trd_04_GetEntityPosition = 0x80240408; // type:func rom:0x9A87F8 @@ -14446,8 +14446,8 @@ func_802405FC_9AECFC = 0x802405FC; // type:func rom:0x9AECFC func_80240720_9AEE20 = 0x80240720; // type:func rom:0x9AEE20 D_80243070_9B1770 = 0x80243070; // type:data rom:0x9B1770 D_80243078_9B1778 = 0x80243078; // type:data rom:0x9B1778 -trd_06_UnkTexturePanFunc = 0x80240000; // type:func rom:0x9B1790 -trd_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x9B18B4 +trd_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9B1790 +trd_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9B18B4 func_80240310_9B1AA0 = 0x80240310; // type:func rom:0x9B1AA0 func_80240724_9B1EB4 = 0x80240724; // type:func rom:0x9B1EB4 func_8024081C_9B1FAC = 0x8024081C; // type:func rom:0x9B1FAC @@ -14461,8 +14461,8 @@ func_80240C80_9B2410 = 0x80240C80; // type:func rom:0x9B2410 D_802451C0_9B6950 = 0x802451C0; // type:data rom:0x9B6950 D_802451C8_9B6958 = 0x802451C8; // type:data rom:0x9B6958 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_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9B6980 +trd_07_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9B6AA4 trd_07_set_script_owner_npc_anim = 0x80240310; // type:func rom:0x9B6C90 trd_07_UnkDistFunc = 0x8024038C; // type:func rom:0x9B6D0C trd_07_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0x9B6E40 @@ -14492,8 +14492,8 @@ D_80244820_9BB1A0 = 0x80244820; // type:data rom:0x9BB1A0 D_80244880_9BB200 = 0x80244880; // type:data rom:0x9BB200 D_80244888_9BB208 = 0x80244888; // type:data rom:0x9BB208 D_80244890_9BB210 = 0x80244890; // type:data rom:0x9BB210 -trd_08_UnkTexturePanFunc = 0x80240000; // type:func rom:0x9BB2A0 -trd_08_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x9BB3C4 +trd_08_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9BB2A0 +trd_08_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9BB3C4 func_80240310_9BB5B0 = 0x80240310; // type:func rom:0x9BB5B0 func_80240904_9BBBA4 = 0x80240904; // type:func rom:0x9BBBA4 D_80240F00_9BC1A0 = 0x80240F00; // type:data rom:0x9BC1A0 @@ -14892,8 +14892,8 @@ hos_01_UnkEffect0FFunc = 0x80240120; // type:func rom:0xA109A0 hos_01_UnkEffect0FFunc3 = 0x8024031C; // type:func rom:0xA10B9C hos_01_UnkEffect0FFunc4 = 0x80240534; // type:func rom:0xA10DB4 hos_01_GetFloorCollider = 0x80240768; // type:func rom:0xA10FE8 -hos_01_UnkTexturePanFunc = 0x802407A0; // type:func rom:0xA11020 -hos_01_UnkTexturePanFunc2 = 0x802408C4; // type:func rom:0xA11144 +hos_01_UpdateTexturePanSmooth = 0x802407A0; // type:func rom:0xA11020 +hos_01_UpdateTexturePanStepped = 0x802408C4; // type:func rom:0xA11144 func_80240AAC_A1132C = 0x80240AAC; // type:func rom:0xA1132C func_80240B10_A11390 = 0x80240B10; // type:func rom:0xA11390 func_80240B64_A113E4 = 0x80240B64; // type:func rom:0xA113E4 @@ -14912,8 +14912,8 @@ D_80241C33_A124B3 = 0x80241C33; // type:data rom:0xA124B3 D_80245970_A161F0 = 0x80245970; // type:data rom:0xA161F0 D_80245978_A161F8 = 0x80245978; // type:data rom:0xA161F8 D_80245980_A16200 = 0x80245980; // type:data rom:0xA16200 -hos_02_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA16220 -hos_02_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA16344 +hos_02_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA16220 +hos_02_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA16344 func_8024030C_A1652C = 0x8024030C; // type:func rom:0xA1652C func_80240434_A16654 = 0x80240434; // type:func rom:0xA16654 func_80240610_A16830 = 0x80240610; // type:func rom:0xA16830 @@ -14956,8 +14956,8 @@ D_80244E28_A1B048 = 0x80244E28; // type:data rom:0xA1B048 D_80244E30_A1B050 = 0x80244E30; // type:data rom:0xA1B050 D_80244E78_A1B098 = 0x80244E78; // type:data rom:0xA1B098 hos_03_GetFloorCollider = 0x80240000; // type:func rom:0xA1B100 -hos_03_UnkTexturePanFunc = 0x80240030; // type:func rom:0xA1B130 -hos_03_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0xA1B254 +hos_03_UpdateTexturePanSmooth = 0x80240030; // type:func rom:0xA1B130 +hos_03_UpdateTexturePanStepped = 0x80240154; // type:func rom:0xA1B254 func_8024033C_A1B43C = 0x8024033C; // type:func rom:0xA1B43C func_8024060C_A1B70C = 0x8024060C; // type:func rom:0xA1B70C func_802407E8_A1B8E8 = 0x802407E8; // type:func rom:0xA1B8E8 @@ -15030,8 +15030,8 @@ D_8024BD78_A26E78 = 0x8024BD78; // type:data rom:0xA26E78 D_8024BD80_A26E80 = 0x8024BD80; // type:data rom:0xA26E80 func_80240000_A26ED0 = 0x80240000; // type:func rom:0xA26ED0 func_80240154_A27024 = 0x80240154; // type:func rom:0xA27024 -hos_04_UnkTexturePanFunc = 0x802402A8; // type:func rom:0xA27178 -hos_04_UnkTexturePanFunc2 = 0x802403CC; // type:func rom:0xA2729C +hos_04_UpdateTexturePanSmooth = 0x802402A8; // type:func rom:0xA27178 +hos_04_UpdateTexturePanStepped = 0x802403CC; // type:func rom:0xA2729C func_802405C0_A27490 = 0x802405C0; // type:func rom:0xA27490 hos_04_SetCamVfov = 0x802405E0; // type:func rom:0xA274B0 func_80240654_A27524 = 0x80240654; // type:func rom:0xA27524 @@ -15060,8 +15060,8 @@ D_80243300_A2A1D0 = 0x80243300; // type:data rom:0xA2A1D0 D_80243328_A2A1F8 = 0x80243328; // type:data rom:0xA2A1F8 hos_05_UnkFunc27 = 0x80240000; // type:func rom:0xA2A240 hos_05_UnkFunc26 = 0x80240124; // type:func rom:0xA2A364 -hos_05_UnkTexturePanFunc = 0x802402F8; // type:func rom:0xA2A538 -hos_05_UnkTexturePanFunc2 = 0x8024041C; // type:func rom:0xA2A65C +hos_05_UpdateTexturePanSmooth = 0x802402F8; // type:func rom:0xA2A538 +hos_05_UpdateTexturePanStepped = 0x8024041C; // type:func rom:0xA2A65C hos_05_AwaitScriptComplete = 0x80240604; // type:func rom:0xA2A844 func_80240634_A2A874 = 0x80240634; // type:func rom:0xA2A874 func_80240690_A2A8D0 = 0x80240690; // type:func rom:0xA2A8D0 @@ -15116,8 +15116,8 @@ func_80244C60_A2EEA0 = 0x80244C60; // type:func rom:0xA2EEA0 func_80244C8C_A2EECC = 0x80244C8C; // type:func rom:0xA2EECC dup_hos_05_UnkFunc27 = 0x80244CC0; // type:func rom:0xA2EF00 dup_hos_05_UnkFunc26 = 0x80244DE4; // type:func rom:0xA2F024 -dup_hos_05_UnkTexturePanFunc = 0x80244FB8; // type:func rom:0xA2F1F8 -dup_hos_05_UnkTexturePanFunc2 = 0x802450DC; // type:func rom:0xA2F31C +dup_hos_05_UpdateTexturePanSmooth = 0x80244FB8; // type:func rom:0xA2F1F8 +dup_hos_05_UpdateTexturePanStepped = 0x802450DC; // type:func rom:0xA2F31C func_802452C4_A2F504 = 0x802452C4; // type:func rom:0xA2F504 func_8024564C_A2F88C = 0x8024564C; // type:func rom:0xA2F88C func_8024569C_A2F8DC = 0x8024569C; // type:func rom:0xA2F8DC @@ -15210,8 +15210,8 @@ D_8024F228_A39468 = 0x8024F228; // type:data rom:0xA39468 D_8024F230_A39470 = 0x8024F230; // type:data rom:0xA39470 D_8024F238_A39478 = 0x8024F238; // type:data rom:0xA39478 D_8024F280_A394C0 = 0x8024F280; // type:data rom:0xA394C0 -hos_06_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA394E0 -hos_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA39604 +hos_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA394E0 +hos_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA39604 func_80240310_A397F0 = 0x80240310; // type:func rom:0xA397F0 dup2_hos_06_GetItemName = 0x802403C4; // type:func rom:0xA398A4 dup_hos_06_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xA39908 @@ -15271,21 +15271,21 @@ D_80244C4C_A3E12C = 0x80244C4C; // type:data rom:0xA3E12C D_80245E80_A3F360 = 0x80245E80; // type:data rom:0xA3F360 D_80245EEC_A3F3CC = 0x80245EEC; // type:data rom:0xA3F3CC hos_10_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xA3F740 -hos_10_UnkTexturePanFunc = 0x80240020; // type:func rom:0xA3F760 -hos_10_UnkTexturePanFunc2 = 0x80240144; // type:func rom:0xA3F884 +hos_10_UpdateTexturePanSmooth = 0x80240020; // type:func rom:0xA3F760 +hos_10_UpdateTexturePanStepped = 0x80240144; // type:func rom:0xA3F884 func_8024032C_A3FA6C = 0x8024032C; // type:func rom:0xA3FA6C func_80240364_A3FAA4 = 0x80240364; // type:func rom:0xA3FAA4 func_80240404_A3FB44 = 0x80240404; // type:func rom:0xA3FB44 -dup_hos_10_UnkTexturePanFunc = 0x80240460; // type:func rom:0xA3FBA0 -dup_hos_10_UnkTexturePanFunc2 = 0x80240584; // type:func rom:0xA3FCC4 +dup_hos_10_UpdateTexturePanSmooth = 0x80240460; // type:func rom:0xA3FBA0 +dup_hos_10_UpdateTexturePanStepped = 0x80240584; // type:func rom:0xA3FCC4 func_80240770_A3FEB0 = 0x80240770; // type:func rom:0xA3FEB0 func_80240A84_A401C4 = 0x80240A84; // type:func rom:0xA401C4 func_80240B44_A40284 = 0x80240B44; // type:func rom:0xA40284 func_80240B98_A402D8 = 0x80240B98; // type:func rom:0xA402D8 func_80240BEC_A4032C = 0x80240BEC; // type:func rom:0xA4032C func_80240BFC_A4033C = 0x80240BFC; // type:func rom:0xA4033C -hos_20_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA45930 -hos_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA45A54 +hos_20_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA45930 +hos_20_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA45A54 func_80240310_A45C40 = 0x80240310; // type:func rom:0xA45C40 kpa_01_DarkRoomUpdate = 0x80240000; // type:func rom:0xA46F60 kpa_01_set_script_owner_npc_anim = 0x80240160; // type:func rom:0xA470C0 @@ -15385,10 +15385,10 @@ D_802427C8_A517C8 = 0x802427C8; // type:data rom:0xA517C8 D_802427D0_A517D0 = 0x802427D0; // type:data rom:0xA517D0 D_802427D8_A517D8 = 0x802427D8; // type:data rom:0xA517D8 sbk_34_802427E0 = 0x802427E0; // type:data rom:0xA517E0 -kpa_10_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA51980 -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_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA51980 +kpa_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA51AA4 +kpa_11_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA528C0 +kpa_11_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA529E4 kpa_11_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA52BD0 kpa_11_UnkDistFunc = 0x8024038C; // type:func rom:0xA52C4C kpa_11_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA52D80 @@ -15396,20 +15396,20 @@ kpa_11_set_script_owner_npc_col_height = 0x80240624; // type:func rom:0xA52EE4 kpa_11_UnkNpcAIMainFunc5 = 0x802406A4; // type:func rom:0xA52F64 D_80242030_A548F0 = 0x80242030; // type:data rom:0xA548F0 func_80240000_A54950 = 0x80240000; // type:func rom:0xA54950 -kpa_12_UnkTexturePanFunc = 0x80240040; // type:func rom:0xA54990 -kpa_12_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xA54AB4 +kpa_12_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA54990 +kpa_12_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xA54AB4 kpa_12_func_80240350_A54CA0 = 0x80240350; // type:func rom:0xA54CA0 func_8024037C_A54CCC = 0x8024037C; // type:func rom:0xA54CCC func_80240444_A54D94 = 0x80240444; // type:func rom:0xA54D94 func_80240000_A55F20 = 0x80240000; // type:func rom:0xA55F20 -kpa_13_UnkTexturePanFunc = 0x80240040; // type:func rom:0xA55F60 -kpa_13_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xA56084 +kpa_13_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA55F60 +kpa_13_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xA56084 kpa_13_func_80240350_A56270 = 0x80240350; // type:func rom:0xA56270 func_8024037C_A5629C = 0x8024037C; // type:func rom:0xA5629C func_80240444_A56364 = 0x80240444; // type:func rom:0xA56364 func_80240000_A574B0 = 0x80240000; // type:func rom:0xA574B0 -kpa_14_UnkTexturePanFunc = 0x80240040; // type:func rom:0xA574F0 -kpa_14_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xA57614 +kpa_14_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA574F0 +kpa_14_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xA57614 func_8024034C_A577FC = 0x8024034C; // type:func rom:0xA577FC func_80240380_A57830 = 0x80240380; // type:func rom:0xA57830 kpa_14_GetItemName = 0x80240434; // type:func rom:0xA578E4 @@ -15421,22 +15421,22 @@ kpa_14_func_80240710_A57BC0 = 0x80240710; // type:func rom:0xA57BC0 func_8024073C_A57BEC = 0x8024073C; // type:func rom:0xA57BEC func_80240840_A57CF0 = 0x80240840; // type:func rom:0xA57CF0 D_80241900_A58DB0 = 0x80241900; // type:data rom:0xA58DB0 -kpa_15_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA59390 -kpa_15_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA594B4 +kpa_15_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA59390 +kpa_15_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA594B4 func_80240310_A596A0 = 0x80240310; // type:func rom:0xA596A0 kpa_15_GetItemName = 0x802403C4; // type:func rom:0xA59754 kpa_15_SomeItemEntityFunc = 0x80240428; // type:func rom:0xA597B8 kpa_15_CheckItemFlags40 = 0x80240578; // type:func rom:0xA59908 D_80240AA0_A59E30 = 0x80240AA0; // type:data rom:0xA59E30 -kpa_16_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA5A030 -kpa_16_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA5A154 +kpa_16_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5A030 +kpa_16_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5A154 func_80240310_A5A340 = 0x80240310; // type:func rom:0xA5A340 func_8024034C_A5A37C = 0x8024034C; // type:func rom:0xA5A37C kpa_16_GetFloorCollider = 0x80240370; // type:func rom:0xA5A3A0 -kpa_32_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA5E0C0 -kpa_32_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA5E1E4 -kpa_33_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA5F080 -kpa_33_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA5F1A4 +kpa_32_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5E0C0 +kpa_32_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5E1E4 +kpa_33_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5F080 +kpa_33_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5F1A4 kpa_50_UnkFunc61 = 0x80240000; // type:func rom:0xA609D0 kpa_50_UnkNpcAIFunc48 = 0x802401F0; // type:func rom:0xA60BC0 kpa_50_UnkNpcAIFunc49 = 0x80240334; // type:func rom:0xA60D04 @@ -15519,10 +15519,10 @@ D_80241E30_A6CAD0 = 0x80241E30; // type:data rom:0xA6CAD0 D_80241E50_A6CAF0 = 0x80241E50; // type:data rom:0xA6CAF0 kpa_60_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA6CB00 kpa_60_GetEntityPosition = 0x80240034; // type:func rom:0xA6CB34 -kpa_60_UnkTexturePanFunc = 0x802400E0; // type:func rom:0xA6CBE0 -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_60_UpdateTexturePanSmooth = 0x802400E0; // type:func rom:0xA6CBE0 +kpa_60_UpdateTexturePanStepped = 0x80240204; // type:func rom:0xA6CD04 +kpa_61_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA6E3E0 +kpa_61_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA6E504 kpa_61_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA6E6F0 kpa_61_UnkDistFunc = 0x8024038C; // type:func rom:0xA6E76C kpa_61_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA6E8A0 @@ -15557,11 +15557,11 @@ D_80243D88_A72168 = 0x80243D88; // type:data rom:0xA72168 D_80243D90_A72170 = 0x80243D90; // type:data rom:0xA72170 kpa_62_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA72220 kpa_62_GetEntityPosition = 0x80240034; // type:func rom:0xA72254 -kpa_62_UnkTexturePanFunc = 0x802400E0; // type:func rom:0xA72300 -kpa_62_UnkTexturePanFunc2 = 0x80240204; // type:func rom:0xA72424 +kpa_62_UpdateTexturePanSmooth = 0x802400E0; // type:func rom:0xA72300 +kpa_62_UpdateTexturePanStepped = 0x80240204; // type:func rom:0xA72424 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_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA74870 +kpa_70_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA74994 kpa_70_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xA74B80 kpa_70_UnkDistFunc = 0x8024038C; // type:func rom:0xA74BFC kpa_70_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xA74D30 @@ -15669,8 +15669,8 @@ D_802402C0_A93420 = 0x802402C0; // type:data rom:0xA93420 func_80240000_A93440 = 0x80240000; // type:func rom:0xA93440 D_802402D0_A93710 = 0x802402D0; // type:data rom:0xA93710 D_802402E0_A93720 = 0x802402E0; // type:data rom:0xA93720 -kpa_102_UnkTexturePanFunc = 0x80240000; // type:func rom:0xA93740 -kpa_102_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xA93864 +kpa_102_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA93740 +kpa_102_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA93864 kpa_102_UnkFunc61 = 0x80240310; // type:func rom:0xA93A50 kpa_102_UnkNpcAIFunc48 = 0x80240500; // type:func rom:0xA93C40 kpa_102_UnkNpcAIFunc49 = 0x80240644; // type:func rom:0xA93D84 @@ -15772,12 +15772,12 @@ func_80240048_AA2D68 = 0x80240048; // type:func rom:0xAA2D68 func_802404AC_AA31CC = 0x802404AC; // type:func rom:0xAA31CC D_80244750_AA7470 = 0x80244750; // type:data rom:0xAA7470 D_80244758_AA7478 = 0x80244758; // type:data rom:0xAA7478 -kpa_133_UnkTexturePanFunc = 0x80240000; // type:func rom:0xAA7480 -kpa_133_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xAA75A4 +kpa_133_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xAA7480 +kpa_133_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xAA75A4 func_80240310_AA7790 = 0x80240310; // type:func rom:0xAA7790 func_802403C0_AA7840 = 0x802403C0; // type:func rom:0xAA7840 -kpa_134_UnkTexturePanFunc = 0x80240000; // type:func rom:0xAA8FA0 -kpa_134_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xAA90C4 +kpa_134_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xAA8FA0 +kpa_134_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xAA90C4 func_80240310_AA92B0 = 0x80240310; // type:func rom:0xAA92B0 func_8024033C_AA92DC = 0x8024033C; // type:func rom:0xAA92DC func_80240408_AA93A8 = 0x80240408; // type:func rom:0xAA93A8 @@ -15786,8 +15786,8 @@ func_80240510_AA94B0 = 0x80240510; // type:func rom:0xAA94B0 kpa_134_SetEntityPosition = 0x80240564; // type:func rom:0xAA9504 kpa_134_SetEntityFlags100000 = 0x80240628; // type:func rom:0xAA95C8 kpa_134_GetEntityPosition = 0x8024065C; // type:func rom:0xAA95FC -osr_00_UnkTexturePanFunc = 0x80240000; // type:func rom:0xAAC830 -osr_00_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xAAC954 +osr_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xAAC830 +osr_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xAAC954 func_8024030C_AACB3C = 0x8024030C; // type:func rom:0xAACB3C osr_00_SpawnSunEffect = 0x80240344; // type:func rom:0xAACB74 osr_00_UnkFunc27 = 0x80240380; // type:func rom:0xAACBB0 @@ -15795,8 +15795,8 @@ osr_00_UnkFunc26 = 0x802404A4; // type:func rom:0xAACCD4 func_80240678_AACEA8 = 0x80240678; // type:func rom:0xAACEA8 func_802406E0_AACF10 = 0x802406E0; // type:func rom:0xAACF10 func_80240000_AAFFF0 = 0x80240000; // type:func rom:0xAAFFF0 -osr_01_UnkTexturePanFunc = 0x80240050; // type:func rom:0xAB0040 -osr_01_UnkTexturePanFunc2 = 0x80240174; // type:func rom:0xAB0164 +osr_01_UpdateTexturePanSmooth = 0x80240050; // type:func rom:0xAB0040 +osr_01_UpdateTexturePanStepped = 0x80240174; // type:func rom:0xAB0164 func_80240360_AB0350 = 0x80240360; // type:func rom:0xAB0350 osr_01_GetItemName = 0x80240414; // type:func rom:0xAB0404 osr_01_GetNpcCollisionHeight = 0x80240478; // type:func rom:0xAB0468 @@ -15861,8 +15861,8 @@ kkj_01_UnkNpcAIMainFunc = 0x80240B94; // type:func rom:0xAC5D04 D_80243A10_AC8B80 = 0x80243A10; // type:data rom:0xAC8B80 D_80243A18_AC8B88 = 0x80243A18; // type:data rom:0xAC8B88 kkj_03_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xAC9710 -kkj_03_UnkTexturePanFunc = 0x80240020; // type:func rom:0xAC9730 -kkj_03_UnkTexturePanFunc2 = 0x80240144; // type:func rom:0xAC9854 +kkj_03_UpdateTexturePanSmooth = 0x80240020; // type:func rom:0xAC9730 +kkj_03_UpdateTexturePanStepped = 0x80240144; // type:func rom:0xAC9854 func_80240000_ACAB20 = 0x80240000; // type:func rom:0xACAB20 func_80240034_ACAB54 = 0x80240034; // type:func rom:0xACAB54 kkj_10_SetEntityFlags100000 = 0x80240070; // type:func rom:0xACAB90 @@ -15919,8 +15919,8 @@ D_80241E20_AD5EB0 = 0x80241E20; // type:data rom:0xAD5EB0 D_80241E28_AD5EB8 = 0x80241E28; // type:data rom:0xAD5EB8 D_80241E30_AD5EC0 = 0x80241E30; // type:data rom:0xAD5EC0 kkj_13_SetPlayerSpriteSet2 = 0x80240000; // type:func rom:0xAD5ED0 -kkj_13_UnkTexturePanFunc = 0x80240020; // type:func rom:0xAD5EF0 -kkj_13_UnkTexturePanFunc2 = 0x80240144; // type:func rom:0xAD6014 +kkj_13_UpdateTexturePanSmooth = 0x80240020; // type:func rom:0xAD5EF0 +kkj_13_UpdateTexturePanStepped = 0x80240144; // type:func rom:0xAD6014 func_80240330_AD6200 = 0x80240330; // type:func rom:0xAD6200 func_80240390_AD6260 = 0x80240390; // type:func rom:0xAD6260 func_802403F0_AD62C0 = 0x802403F0; // type:func rom:0xAD62C0 @@ -15932,8 +15932,8 @@ D_80244FA8_ADAE78 = 0x80244FA8; // type:data rom:0xADAE78 D_80244FB0_ADAE80 = 0x80244FB0; // type:data rom:0xADAE80 D_80244FB8_ADAE88 = 0x80244FB8; // type:data rom:0xADAE88 func_80240000_ADAEA0 = 0x80240000; // type:func rom:0xADAEA0 -kkj_14_UnkTexturePanFunc = 0x80240050; // type:func rom:0xADAEF0 -kkj_14_UnkTexturePanFunc2 = 0x80240174; // type:func rom:0xADB014 +kkj_14_UpdateTexturePanSmooth = 0x80240050; // type:func rom:0xADAEF0 +kkj_14_UpdateTexturePanStepped = 0x80240174; // type:func rom:0xADB014 func_8024035C_ADB1FC = 0x8024035C; // type:func rom:0xADB1FC func_80240384_ADB224 = 0x80240384; // type:func rom:0xADB224 func_802403A0_ADB240 = 0x802403A0; // type:func rom:0xADB240 @@ -15944,8 +15944,8 @@ func_8024049C_ADB33C = 0x8024049C; // type:func rom:0xADB33C D_80241D38_ADCBD8 = 0x80241D38; // type:data rom:0xADCBD8 D_80241D3B_ADCBDB = 0x80241D3B; // type:data rom:0xADCBDB D_8024A6B0_AE5550 = 0x8024A6B0; // type:data rom:0xAE5550 -kkj_15_UnkTexturePanFunc = 0x80240000; // type:func rom:0xAE5590 -kkj_15_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xAE56B4 +kkj_15_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xAE5590 +kkj_15_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xAE56B4 func_8024030C_AE589C = 0x8024030C; // type:func rom:0xAE589C func_80240340_AE58D0 = 0x80240340; // type:func rom:0xAE58D0 func_80240500_AE5A90 = 0x80240500; // type:func rom:0xAE5A90 @@ -15980,8 +15980,8 @@ func_80240500_AF2160 = 0x80240500; // type:func rom:0xAF2160 func_80240568_AF21C8 = 0x80240568; // type:func rom:0xAF21C8 D_802408C0_AF2520 = 0x802408C0; // type:data rom:0xAF2520 D_8024092C_AF258C = 0x8024092C; // type:data rom:0xAF258C -kkj_18_UnkTexturePanFunc = 0x80240000; // type:func rom:0xAF2CA0 -kkj_18_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xAF2DC4 +kkj_18_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xAF2CA0 +kkj_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xAF2DC4 func_8024030C_AF2FAC = 0x8024030C; // type:func rom:0xAF2FAC kkj_18_GetNpcCollisionHeight = 0x80240340; // type:func rom:0xAF2FE0 kkj_18_AddPlayerHandsOffset = 0x8024039C; // type:func rom:0xAF303C @@ -16082,8 +16082,8 @@ func_80240E54_B07854 = 0x80240E54; // type:func rom:0xB07854 func_80240EB8_B078B8 = 0x80240EB8; // type:func rom:0xB078B8 func_80240F2C_B0792C = 0x80240F2C; // type:func rom:0xB0792C func_80240000_B13120 = 0x80240000; // type:func rom:0xB13120 -kkj_27_UnkTexturePanFunc = 0x80240000; // type:func rom:0xB13D70 -kkj_27_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xB13E94 +kkj_27_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB13D70 +kkj_27_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB13E94 func_80240310_B14080 = 0x80240310; // type:func rom:0xB14080 func_8024041C_B1418C = 0x8024041C; // type:func rom:0xB1418C func_80240448_B141B8 = 0x80240448; // type:func rom:0xB141B8 @@ -16115,8 +16115,8 @@ func_8024013C_B1D89C = 0x8024013C; // type:func rom:0xB1D89C D_80242860_B1FFC0 = 0x80242860; // type:data rom:0xB1FFC0 D_80242BF8_B20358 = 0x80242BF8; // type:data rom:0xB20358 D_80242D00_B20460 = 0x80242D00; // type:data rom:0xB20460 -jan_00_UnkTexturePanFunc = 0x80240000; // type:func rom:0xB20540 -jan_00_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xB20664 +jan_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB20540 +jan_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB20664 func_8024030C_B2084C = 0x8024030C; // type:func rom:0xB2084C func_80240340_B20880 = 0x80240340; // type:func rom:0xB20880 func_802403F4_B20934 = 0x802403F4; // type:func rom:0xB20934 @@ -16149,8 +16149,8 @@ D_80242430_B22970 = 0x80242430; // type:data rom:0xB22970 D_80245950_B25E90 = 0x80245950; // type:data rom:0xB25E90 D_80245954_B25E94 = 0x80245954; // type:data rom:0xB25E94 D_80245958_B25E98 = 0x80245958; // type:data rom:0xB25E98 -jan_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0xB28030 -jan_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xB28154 +jan_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB28030 +jan_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB28154 func_8024030C_B2833C = 0x8024030C; // type:func rom:0xB2833C jan_01_UnkNpcAIFunc36 = 0x80240340; // type:func rom:0xB28370 jan_01_UnkNpcAIFunc37 = 0x80240570; // type:func rom:0xB285A0 @@ -16166,8 +16166,8 @@ jan_01_foliage_setup_shear_mtx = 0x80241190; // type:func rom:0xB291C0 jan_01_TransformFoliage = 0x80241200; // type:func rom:0xB29230 D_802443F0_B2C420 = 0x802443F0; // type:data rom:0xB2C420 func_80240000_B2C470 = 0x80240000; // type:func rom:0xB2C470 -jan_02_UnkTexturePanFunc = 0x80240030; // type:func rom:0xB2C4A0 -jan_02_UnkTexturePanFunc2 = 0x80240154; // type:func rom:0xB2C5C4 +jan_02_UpdateTexturePanSmooth = 0x80240030; // type:func rom:0xB2C4A0 +jan_02_UpdateTexturePanStepped = 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 @@ -16232,8 +16232,8 @@ jan_03_UnkFunc25 = 0x80240034; // type:func rom:0xB34C04 jan_03_GetEntryPos = 0x802400F0; // type:func rom:0xB34CC0 jan_03_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xB34DA0 jan_03_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xB34E0C -jan_03_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xB34EB0 -jan_03_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xB34FD4 +jan_03_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xB34EB0 +jan_03_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xB34FD4 func_802405EC_B351BC = 0x802405EC; // type:func rom:0xB351BC jan_03_UnkNpcAIFunc24 = 0x80240620; // type:func rom:0xB351F0 jan_03_UnkFunc13 = 0x80240778; // type:func rom:0xB35348 @@ -16309,8 +16309,8 @@ D_8024A5AC_B3F17C = 0x8024A5AC; // type:data rom:0xB3F17C D_8024F9F0_B445C0 = 0x8024F9F0; // type:data rom:0xB445C0 D_8024F9F8_B445C8 = 0x8024F9F8; // type:data rom:0xB445C8 func_80240000_B44770 = 0x80240000; // type:func rom:0xB44770 -jan_04_UnkTexturePanFunc = 0x80240040; // type:func rom:0xB447B0 -jan_04_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xB448D4 +jan_04_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xB447B0 +jan_04_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xB448D4 func_80240350_B44AC0 = 0x80240350; // type:func rom:0xB44AC0 jan_04_GetItemName = 0x80240404; // type:func rom:0xB44B74 jan_04_SomeItemEntityFunc = 0x80240468; // type:func rom:0xB44BD8 @@ -16331,8 +16331,8 @@ D_8024625C_B4A9CC = 0x8024625C; // type:data rom:0xB4A9CC D_802462C0_B4AA30 = 0x802462C0; // type:data rom:0xB4AA30 D_802462E0_B4AA50 = 0x802462E0; // type:data rom:0xB4AA50 func_80240000_B4AA70 = 0x80240000; // type:func rom:0xB4AA70 -jan_05_UnkTexturePanFunc = 0x80240040; // type:func rom:0xB4AAB0 -jan_05_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xB4ABD4 +jan_05_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xB4AAB0 +jan_05_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xB4ABD4 func_80240350_B4ADC0 = 0x80240350; // type:func rom:0xB4ADC0 jan_05_foliage_setup_shear_mtx = 0x802404A0; // type:func rom:0xB4AF10 jan_05_TransformFoliage = 0x80240510; // type:func rom:0xB4AF80 @@ -16363,8 +16363,8 @@ func_8024268C_B4D0FC = 0x8024268C; // type:func rom:0xB4D0FC D_80247A20_B52490 = 0x80247A20; // type:data rom:0xB52490 D_80247A30_B524A0 = 0x80247A30; // type:data rom:0xB524A0 D_80247A90_B52500 = 0x80247A90; // type:data rom:0xB52500 -jan_06_UnkTexturePanFunc = 0x80240000; // type:func rom:0xB52830 -jan_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xB52954 +jan_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB52830 +jan_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB52954 func_80240310_B52B40 = 0x80240310; // type:func rom:0xB52B40 func_802403B0_B52BE0 = 0x802403B0; // type:func rom:0xB52BE0 jan_06_foliage_setup_shear_mtx = 0x80240500; // type:func rom:0xB52D30 @@ -16407,8 +16407,8 @@ jan_07_TransformFoliage = 0x80240E10; // type:func rom:0xB5A680 dup_jan_07_foliage_setup_shear_mtx = 0x80240FE0; // type:func rom:0xB5A850 dup_jan_07_TransformFoliage = 0x80241050; // type:func rom:0xB5A8C0 D_80244718_B5DF88 = 0x80244718; // type:data rom:0xB5DF88 -jan_08_UnkTexturePanFunc = 0x80240000; // type:func rom:0xB5E2B0 -jan_08_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xB5E3D4 +jan_08_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB5E2B0 +jan_08_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB5E3D4 jan_08_foliage_setup_shear_mtx = 0x80240310; // type:func rom:0xB5E5C0 jan_08_TransformFoliage = 0x80240380; // type:func rom:0xB5E630 func_8024054C_B5E7FC = 0x8024054C; // type:func rom:0xB5E7FC @@ -16456,8 +16456,8 @@ jan_09_UnkFunc25 = 0x80240034; // type:func rom:0xB65AE4 jan_09_GetEntryPos = 0x802400F0; // type:func rom:0xB65BA0 jan_09_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xB65C80 jan_09_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xB65CEC -jan_09_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xB65D90 -jan_09_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xB65EB4 +jan_09_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xB65D90 +jan_09_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xB65EB4 jan_09_foliage_setup_shear_mtx = 0x802405F0; // type:func rom:0xB660A0 jan_09_TransformFoliage = 0x80240660; // type:func rom:0xB66110 func_8024082C_B662DC = 0x8024082C; // type:func rom:0xB662DC @@ -16476,8 +16476,8 @@ dup_jan_09_foliage_setup_shear_mtx = 0x802416E0; // type:func rom:0xB67190 dup_jan_09_TransformFoliage = 0x80241750; // type:func rom:0xB67200 D_80246590_B6C040 = 0x80246590; // type:data rom:0xB6C040 D_802465B8_B6C068 = 0x802465B8; // type:data rom:0xB6C068 -jan_10_UnkTexturePanFunc = 0x80240000; // type:func rom:0xB6C390 -jan_10_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xB6C4B4 +jan_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xB6C390 +jan_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB6C4B4 jan_10_UnkNpcAIFunc36 = 0x80240310; // type:func rom:0xB6C6A0 jan_10_UnkNpcAIFunc37 = 0x80240540; // type:func rom:0xB6C8D0 jan_10_UnkNpcAIFunc1 = 0x80240878; // type:func rom:0xB6CC08 @@ -16789,8 +16789,8 @@ mim_11_UnkFunc25 = 0x80240034; // type:func rom:0xBB70A4 mim_11_GetEntryPos = 0x802400F0; // type:func rom:0xBB7160 mim_11_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xBB7240 mim_11_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xBB72AC -mim_11_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xBB7350 -mim_11_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xBB7474 +mim_11_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xBB7350 +mim_11_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xBB7474 func_802405EC_BB765C = 0x802405EC; // type:func rom:0xBB765C func_8024066C_BB76DC = 0x8024066C; // type:func rom:0xBB76DC func_80240790_BB7800 = 0x80240790; // type:func rom:0xBB7800 @@ -18902,10 +18902,10 @@ dgb_18_pad_XXX = 0x802438D8; // type:data rom:0xC59818 D_802438E0_C59820 = 0x802438E0; // type:data rom:0xC59820 D_802438E8_C59828 = 0x802438E8; // type:data rom:0xC59828 dgb_18_dgb_01_name_hack = 0x80243A80; // type:data rom:0xC599C0 -kzn_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC599D0 -kzn_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC59AF4 -kzn_02_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC5A740 -kzn_02_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC5A864 +kzn_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC599D0 +kzn_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC59AF4 +kzn_02_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC5A740 +kzn_02_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC5A864 func_80240310_C5AA50 = 0x80240310; // type:func rom:0xC5AA50 kzn_02_GetFloorCollider = 0x80240384; // type:func rom:0xC5AAC4 func_802403B0_C5AAF0 = 0x802403B0; // type:func rom:0xC5AAF0 @@ -18946,8 +18946,8 @@ D_80246500_C60C40 = 0x80246500; // type:data rom:0xC60C40 D_80246508_C60C48 = 0x80246508; // type:data rom:0xC60C48 D_80246510_C60C50 = 0x80246510; // type:data rom:0xC60C50 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_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC60D10 +kzn_03_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC60E34 kzn_03_set_script_owner_npc_anim = 0x80240310; // type:func rom:0xC61020 kzn_03_UnkDistFunc = 0x8024038C; // type:func rom:0xC6109C kzn_03_UnkNpcAIFunc12 = 0x802404C0; // type:func rom:0xC611D0 @@ -19001,8 +19001,8 @@ D_802473F0_C68100 = 0x802473F0; // type:data rom:0xC68100 D_802473F8_C68108 = 0x802473F8; // type:data rom:0xC68108 D_80247400_C68110 = 0x80247400; // type:data rom:0xC68110 D_80247410_C68120 = 0x80247410; // type:data rom:0xC68120 -kzn_04_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC68130 -kzn_04_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC68254 +kzn_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC68130 +kzn_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC68254 kzn_04_SetOverrideFlags_40 = 0x80240310; // type:func rom:0xC68440 kzn_04_UnkFunc17 = 0x8024032C; // type:func rom:0xC6845C func_8024034C_C6847C = 0x8024034C; // type:func rom:0xC6847C @@ -19029,10 +19029,10 @@ D_80241C58_C69D88 = 0x80241C58; // type:data rom:0xC69D88 kzn_04_bigFuncFloats = 0x80241C98; // type:data rom:0xC69DC8 D_802422F0_C6A420 = 0x802422F0; // type:data rom:0xC6A420 D_8024231C_C6A44C = 0x8024231C; // type:data rom:0xC6A44C -kzn_05_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC6C0D0 -kzn_05_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC6C1F4 -kzn_06_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC6C920 -kzn_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC6CA44 +kzn_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC6C0D0 +kzn_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC6C1F4 +kzn_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC6C920 +kzn_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC6CA44 func_80240310_C6CC30 = 0x80240310; // type:func rom:0xC6CC30 func_802403F0_C6CD10 = 0x802403F0; // type:func rom:0xC6CD10 func_80240738_C6D058 = 0x80240738; // type:func rom:0xC6D058 @@ -19043,8 +19043,8 @@ D_80241370_C6DC90 = 0x80241370; // type:data rom:0xC6DC90 D_80241A00_C6E320 = 0x80241A00; // type:data rom:0xC6E320 func_80240000_C6E330 = 0x80240000; // type:func rom:0xC6E330 func_80240348_C6E678 = 0x80240348; // type:func rom:0xC6E678 -kzn_07_UnkTexturePanFunc = 0x8024040C; // type:func rom:0xC6E73C -kzn_07_UnkTexturePanFunc2 = 0x80240530; // type:func rom:0xC6E860 +kzn_07_UpdateTexturePanSmooth = 0x8024040C; // type:func rom:0xC6E73C +kzn_07_UpdateTexturePanStepped = 0x80240530; // type:func rom:0xC6E860 func_80240720_C6EA50 = 0x80240720; // type:func rom:0xC6EA50 func_802407F4_C6EB24 = 0x802407F4; // type:func rom:0xC6EB24 kzn_07_UnkNpcAIFunc23 = 0x80240820; // type:func rom:0xC6EB50 @@ -19072,8 +19072,8 @@ D_802430A0_C713D0 = 0x802430A0; // type:data rom:0xC713D0 D_802430E8_C71418 = 0x802430E8; // type:data rom:0xC71418 func_80240000_C71480 = 0x80240000; // type:func rom:0xC71480 func_80240348_C717C8 = 0x80240348; // type:func rom:0xC717C8 -kzn_08_UnkTexturePanFunc = 0x8024040C; // type:func rom:0xC7188C -kzn_08_UnkTexturePanFunc2 = 0x80240530; // type:func rom:0xC719B0 +kzn_08_UpdateTexturePanSmooth = 0x8024040C; // type:func rom:0xC7188C +kzn_08_UpdateTexturePanStepped = 0x80240530; // type:func rom:0xC719B0 func_80240718_C71B98 = 0x80240718; // type:func rom:0xC71B98 func_80240790_C71C10 = 0x80240790; // type:func rom:0xC71C10 kzn_08_GetItemName = 0x80240844; // type:func rom:0xC71CC4 @@ -19196,8 +19196,8 @@ D_80247420_C7E100 = 0x80247420; // type:data rom:0xC7E100 D_80247428_C7E108 = 0x80247428; // type:data rom:0xC7E108 D_80247430_C7E110 = 0x80247430; // type:data rom:0xC7E110 D_80247438_C7E118 = 0x80247438; // type:data rom:0xC7E118 -kzn_10_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC7E180 -kzn_10_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC7E2A4 +kzn_10_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC7E180 +kzn_10_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC7E2A4 func_8024030C_C7E48C = 0x8024030C; // type:func rom:0xC7E48C kzn_10_SpinyTrompHit = 0x80240330; // type:func rom:0xC7E4B0 func_80240350_C7E4D0 = 0x80240350; // type:func rom:0xC7E4D0 @@ -19210,8 +19210,8 @@ kzn_10_UnkFunc51 = 0x80240638; // type:func rom:0xC7E7B8 D_80242000_C80180 = 0x80242000; // type:data rom:0xC80180 D_80242008_C80188 = 0x80242008; // type:data rom:0xC80188 D_80242010_C80190 = 0x80242010; // type:data rom:0xC80190 -kzn_11_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC801A0 -kzn_11_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC802C4 +kzn_11_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC801A0 +kzn_11_UpdateTexturePanStepped = 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 @@ -19239,8 +19239,8 @@ D_80245850_C859F0 = 0x80245850; // type:data rom:0xC859F0 D_80245858_C859F8 = 0x80245858; // type:data rom:0xC859F8 D_80245860_C85A00 = 0x80245860; // type:data rom:0xC85A00 D_802458A8_C85A48 = 0x802458A8; // type:data rom:0xC85A48 -kzn_17_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC85AB0 -kzn_17_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC85BD4 +kzn_17_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC85AB0 +kzn_17_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC85BD4 kzn_17_UnkNpcAIFunc6 = 0x80240310; // type:func rom:0xC85DC0 kzn_17_UnkNpcAIFunc7 = 0x8024037C; // type:func rom:0xC85E2C kzn_17_UnkNpcAIFunc8 = 0x802403EC; // type:func rom:0xC85E9C @@ -19299,13 +19299,13 @@ D_802465D8_C8C088 = 0x802465D8; // type:data rom:0xC8C088 D_802465E0_C8C090 = 0x802465E0; // type:data rom:0xC8C090 D_802465E8_C8C098 = 0x802465E8; // type:data rom:0xC8C098 func_80240000_C8C0A0 = 0x80240000; // type:func rom:0xC8C0A0 -kzn_18_UnkTexturePanFunc = 0x80240040; // type:func rom:0xC8C0E0 -kzn_18_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xC8C204 +kzn_18_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xC8C0E0 +kzn_18_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xC8C204 kzn_18_SetCamera0Flag1000 = 0x80240350; // type:func rom:0xC8C3F0 kzn_18_UnsetCamera0Flag1000 = 0x8024036C; // type:func rom:0xC8C40C kzn_18_GetFloorCollider = 0x80240388; // type:func rom:0xC8C428 -kzn_19_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC8DBB0 -kzn_19_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC8DCD4 +kzn_19_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC8DBB0 +kzn_19_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC8DCD4 kzn_19_StarSpiritEffectFunc1 = 0x8024030C; // type:func rom:0xC8DEBC kzn_19_StarSpiritEffectFunc2 = 0x80240358; // type:func rom:0xC8DF08 kzn_19_StarSpiritEffectFunc3 = 0x802404B8; // type:func rom:0xC8E068 @@ -19338,8 +19338,8 @@ D_80243D74_C91924 = 0x80243D74; // type:data rom:0xC91924 D_80243DD8_C91988 = 0x80243DD8; // type:data rom:0xC91988 D_80243DDC_C9198C = 0x80243DDC; // type:data rom:0xC9198C D_80248370_C95F20 = 0x80248370; // type:data rom:0xC95F20 -kzn_20_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC95F30 -kzn_20_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC96054 +kzn_20_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC95F30 +kzn_20_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC96054 func_80240310_C96240 = 0x80240310; // type:func rom:0xC96240 kzn_20_GetItemName = 0x802403C4; // type:func rom:0xC962F4 kzn_20_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xC96358 @@ -19356,13 +19356,13 @@ kzn_20_GetFloorCollider = 0x80240A8C; // type:func rom:0xC969BC D_80241780_C976B0 = 0x80241780; // type:data rom:0xC976B0 D_802417E4_C97714 = 0x802417E4; // type:data rom:0xC97714 D_802417E8_C97718 = 0x802417E8; // type:data rom:0xC97718 -kzn_22_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC9A200 -kzn_22_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC9A324 +kzn_22_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC9A200 +kzn_22_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC9A324 kzn_22_GetFloorCollider = 0x8024030C; // type:func rom:0xC9A50C dup_kzn_22_GetFloorCollider = 0x80240340; // type:func rom:0xC9A540 func_8024036C_C9A56C = 0x8024036C; // type:func rom:0xC9A56C -kzn_23_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC9C300 -kzn_23_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC9C424 +kzn_23_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xC9C300 +kzn_23_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xC9C424 kzn_23_SetEntityPositionF = 0x80240310; // type:func rom:0xC9C610 kzn_23_GetEntityPosition = 0x802403D8; // type:func rom:0xC9C6D8 func_80240478_C9C778 = 0x80240478; // type:func rom:0xC9C778 @@ -19531,8 +19531,8 @@ flo_03_80244E54 = 0x80244E54; // type:data rom:0xCAC0F4 flo_03_80244ED0 = 0x80244ED0; // type:data rom:0xCAC170 flo_03_makeEntities = 0x80244EE0; // type:data rom:0xCAC180 D_80244F48_CAC1E8 = 0x80244F48; // type:data rom:0xCAC1E8 -flo_07_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCAC1F0 -flo_07_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCAC314 +flo_07_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCAC1F0 +flo_07_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCAC314 flo_07_SpawnSunEffect = 0x8024030C; // type:func rom:0xCAC4FC flo_07_func_80240344_CAC534 = 0x80240344; // type:func rom:0xCAC534 flo_07_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xCAC5D0 @@ -19724,8 +19724,8 @@ flo_10_func_80240000_CB9200 = 0x80240000; // type:func rom:0xCB9200 flo_10_func_80240040_CB9240 = 0x80240040; // type:func rom:0xCB9240 flo_10_func_80240080_CB9280 = 0x80240080; // type:func rom:0xCB9280 flo_10_GetItemName = 0x80240134; // type:func rom:0xCB9334 -flo_10_UnkTexturePanFunc = 0x80240198; // type:func rom:0xCB9398 -flo_10_UnkTexturePanFunc2 = 0x802402BC; // type:func rom:0xCB94BC +flo_10_UpdateTexturePanSmooth = 0x80240198; // type:func rom:0xCB9398 +flo_10_UpdateTexturePanStepped = 0x802402BC; // type:func rom:0xCB94BC flo_10_func_802404B0_CB96B0 = 0x802404B0; // type:func rom:0xCB96B0 flo_10_func_80240A98_CB9C98 = 0x80240A98; // type:func rom:0xCB9C98 flo_10_foliage_setup_shear_mtx = 0x80241230; // type:func rom:0xCBA430 @@ -19951,8 +19951,8 @@ D_80247A40_CCB250 = 0x80247A40; // type:data rom:0xCCB250 D_80247A88_CCB298 = 0x80247A88; // type:data rom:0xCCB298 D_80247AE8_CCB2F8 = 0x80247AE8; // type:data rom:0xCCB2F8 D_80247AF0_CCB300 = 0x80247AF0; // type:data rom:0xCCB300 -flo_14_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCCB310 -flo_14_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCCB434 +flo_14_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCCB310 +flo_14_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCCB434 flo_14_func_8024030C_CCB61C = 0x8024030C; // type:func rom:0xCCB61C flo_14_UnkFunc43 = 0x80240340; // type:func rom:0xCCB650 flo_14_func_802403D4_CCB6E4 = 0x802403D4; // type:func rom:0xCCB6E4 @@ -20176,8 +20176,8 @@ D_80245308_CDC5E8 = 0x80245308; // type:data rom:0xCDC5E8 D_80245310_CDC5F0 = 0x80245310; // type:data rom:0xCDC5F0 D_80245358_CDC638 = 0x80245358; // type:data rom:0xCDC638 D_802453B8_CDC698 = 0x802453B8; // type:data rom:0xCDC698 -flo_18_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCDC6A0 -flo_18_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCDC7C4 +flo_18_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCDC6A0 +flo_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCDC7C4 flo_18_func_8024030C_CDC9AC = 0x8024030C; // type:func rom:0xCDC9AC flo_18_func_80240340_CDC9E0 = 0x80240340; // type:func rom:0xCDC9E0 flo_18_UnkFloatFunc = 0x80240394; // type:func rom:0xCDCA34 @@ -20250,8 +20250,8 @@ flo_18_npcGroupList_8024669C = 0x8024669C; // type:data rom:0xCE2D3C flo_18_searchBush = 0x802466C0; // type:data rom:0xCE2D60 flo_18_shakeTree = 0x80246A20; // type:data rom:0xCE30C0 flo_18_80247024 = 0x80247024; // type:data rom:0xCE36C4 -flo_19_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCE36F0 -flo_19_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCE3814 +flo_19_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCE36F0 +flo_19_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCE3814 flo_19_func_8024030C_CE39FC = 0x8024030C; // type:func rom:0xCE39FC flo_19_func_80240340_CE3A30 = 0x80240340; // type:func rom:0xCE3A30 flo_19_func_802404D0_CE3BC0 = 0x802404D0; // type:func rom:0xCE3BC0 @@ -20287,8 +20287,8 @@ flo_21_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0xCE68AC flo_21_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0xCE6CBC flo_21_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0xCE6CFC flo_21_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0xCE6E08 -flo_21_UnkTexturePanFunc = 0x802407F4; // type:func rom:0xCE6EF4 -flo_21_UnkTexturePanFunc2 = 0x80240918; // type:func rom:0xCE7018 +flo_21_UpdateTexturePanSmooth = 0x802407F4; // type:func rom:0xCE6EF4 +flo_21_UpdateTexturePanStepped = 0x80240918; // type:func rom:0xCE7018 flo_21_func_80240B00_CE7200 = 0x80240B00; // type:func rom:0xCE7200 flo_21_UnkFloatFunc = 0x80240B40; // type:func rom:0xCE7240 flo_21_UnsetCamera0MoveFlag1 = 0x80240CD0; // type:func rom:0xCE73D0 @@ -20413,8 +20413,8 @@ D_80242680_CF08E0 = 0x80242680; // type:data rom:0xCF08E0 flo_24_func_80240000_CF0940 = 0x80240000; // type:func rom:0xCF0940 flo_24_foliage_setup_shear_mtx = 0x80240040; // type:func rom:0xCF0980 flo_24_TransformFoliage = 0x802400B0; // type:func rom:0xCF09F0 -flo_24_UnkTexturePanFunc = 0x80240280; // type:func rom:0xCF0BC0 -flo_24_UnkTexturePanFunc2 = 0x802403A4; // type:func rom:0xCF0CE4 +flo_24_UpdateTexturePanSmooth = 0x80240280; // type:func rom:0xCF0BC0 +flo_24_UpdateTexturePanStepped = 0x802403A4; // type:func rom:0xCF0CE4 flo_24_entryList = 0x80240590; // type:data rom:0xCF0ED0 flo_24_config = 0x802405C0; // type:data rom:0xCF0F00 flo_24_80240600 = 0x80240600; // type:data rom:0xCF0F40 @@ -20505,8 +20505,8 @@ D_80244EE0_CF7AB0 = 0x80244EE0; // type:data rom:0xCF7AB0 D_80244EE8_CF7AB8 = 0x80244EE8; // type:data rom:0xCF7AB8 D_80244EF0_CF7AC0 = 0x80244EF0; // type:data rom:0xCF7AC0 D_80244F38_CF7B08 = 0x80244F38; // type:data rom:0xCF7B08 -sam_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0xCF7B70 -sam_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xCF7C94 +sam_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCF7B70 +sam_01_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xCF7C94 sam_01_GetNpcCollisionHeight = 0x80240310; // type:func rom:0xCF7E80 sam_01_AddPlayerHandsOffset = 0x8024036C; // type:func rom:0xCF7EDC func_8024053C_CF80AC = 0x8024053C; // type:func rom:0xCF80AC @@ -20562,8 +20562,8 @@ sam_02_UnkFunc25 = 0x80240034; // type:func rom:0xD05764 sam_02_GetEntryPos = 0x802400F0; // type:func rom:0xD05820 sam_02_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xD05900 sam_02_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xD0596C -sam_02_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xD05A10 -sam_02_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xD05B34 +sam_02_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xD05A10 +sam_02_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xD05B34 sam_02_foliage_setup_shear_mtx = 0x802405EC; // type:func rom:0xD05D1C sam_02_TransformFoliage = 0x8024065C; // type:func rom:0xD05D8C sam_02_Call800E9894 = 0x80240830; // type:func rom:0xD05F60 @@ -20653,8 +20653,8 @@ D_80247688_D1FE68 = 0x80247688; // type:data rom:0xD1FE68 D_80247690_D1FE70 = 0x80247690; // type:data rom:0xD1FE70 D_80247698_D1FE78 = 0x80247698; // type:data rom:0xD1FE78 D_802476A0_D1FE80 = 0x802476A0; // type:data rom:0xD1FE80 -sam_06_UnkTexturePanFunc = 0x80240000; // type:func rom:0xD1FE90 -sam_06_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xD1FFB4 +sam_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xD1FE90 +sam_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xD1FFB4 sam_06_foliage_setup_shear_mtx = 0x8024030C; // type:func rom:0xD2019C sam_06_TransformFoliage = 0x8024037C; // type:func rom:0xD2020C sam_06_UnkNpcAIFunc23 = 0x80240550; // type:func rom:0xD203E0 @@ -20827,8 +20827,8 @@ func_80241834_D3BE04 = 0x80241834; // type:func rom:0xD3BE04 func_80241864_D3BE34 = 0x80241864; // type:func rom:0xD3BE34 func_802418B4_D3BE84 = 0x802418B4; // type:func rom:0xD3BE84 func_80241A6C_D3C03C = 0x80241A6C; // type:func rom:0xD3C03C -sam_11_UnkTexturePanFunc = 0x80241AA0; // type:func rom:0xD3C070 -sam_11_UnkTexturePanFunc2 = 0x80241BC4; // type:func rom:0xD3C194 +sam_11_UpdateTexturePanSmooth = 0x80241AA0; // type:func rom:0xD3C070 +sam_11_UpdateTexturePanStepped = 0x80241BC4; // type:func rom:0xD3C194 func_80241DAC_D3C37C = 0x80241DAC; // type:func rom:0xD3C37C func_80241FB0_D3C580 = 0x80241FB0; // type:func rom:0xD3C580 func_80241FE8_D3C5B8 = 0x80241FE8; // type:func rom:0xD3C5B8 @@ -21476,8 +21476,8 @@ omo_03_SetPlayerStatusPosYaw = 0x8024020C; // type:func rom:0xDA544C omo_03_SetNpcPosYaw = 0x802402B0; // type:func rom:0xDA54F0 omo_03_UnkFloatFunc = 0x802403A8; // type:func rom:0xDA55E8 omo_03_IsAOrBPressed = 0x80240538; // type:func rom:0xDA5778 -omo_03_UnkTexturePanFunc = 0x8024057C; // type:func rom:0xDA57BC -omo_03_UnkTexturePanFunc2 = 0x802406A0; // type:func rom:0xDA58E0 +omo_03_UpdateTexturePanSmooth = 0x8024057C; // type:func rom:0xDA57BC +omo_03_UpdateTexturePanStepped = 0x802406A0; // type:func rom:0xDA58E0 func_80240000_DAD400 = 0x80240000; // type:func rom:0xDAD400 omo_04_GetItemName = 0x802400B4; // type:func rom:0xDAD4B4 omo_04_SomeItemEntityFunc = 0x80240118; // type:func rom:0xDAD518 @@ -21557,8 +21557,8 @@ omo_06_SetPlayerStatusPosYaw = 0x802401EC; // type:func rom:0xDB7AFC omo_06_SetNpcPosYaw = 0x80240290; // type:func rom:0xDB7BA0 omo_06_UnkFloatFunc = 0x80240388; // type:func rom:0xDB7C98 omo_06_IsAOrBPressed = 0x80240518; // type:func rom:0xDB7E28 -omo_06_UnkTexturePanFunc = 0x8024055C; // type:func rom:0xDB7E6C -omo_06_UnkTexturePanFunc2 = 0x80240680; // type:func rom:0xDB7F90 +omo_06_UpdateTexturePanSmooth = 0x8024055C; // type:func rom:0xDB7E6C +omo_06_UpdateTexturePanStepped = 0x80240680; // type:func rom:0xDB7F90 func_80240870_DB8180 = 0x80240870; // type:func rom:0xDB8180 omo_06_GetItemName = 0x80240924; // type:func rom:0xDB8234 omo_06_SomeItemEntityFunc = 0x80240988; // type:func rom:0xDB8298 @@ -21626,8 +21626,8 @@ omo_08_SetPlayerStatusPosYaw = 0x802401EC; // type:func rom:0xDC45BC omo_08_SetNpcPosYaw = 0x80240290; // type:func rom:0xDC4660 omo_08_UnkFloatFunc = 0x80240388; // type:func rom:0xDC4758 omo_08_IsAOrBPressed = 0x80240518; // type:func rom:0xDC48E8 -omo_08_UnkTexturePanFunc = 0x8024055C; // type:func rom:0xDC492C -omo_08_UnkTexturePanFunc2 = 0x80240680; // type:func rom:0xDC4A50 +omo_08_UpdateTexturePanSmooth = 0x8024055C; // type:func rom:0xDC492C +omo_08_UpdateTexturePanStepped = 0x80240680; // type:func rom:0xDC4A50 func_80240870_DC4C40 = 0x80240870; // type:func rom:0xDC4C40 func_802408E0_DC4CB0 = 0x802408E0; // type:func rom:0xDC4CB0 func_802409B0_DC4D80 = 0x802409B0; // type:func rom:0xDC4D80 @@ -21706,8 +21706,8 @@ omo_10_SetPlayerStatusPosYaw = 0x802401EC; // type:func rom:0xDD7B9C omo_10_SetNpcPosYaw = 0x80240290; // type:func rom:0xDD7C40 omo_10_UnkFloatFunc = 0x80240388; // type:func rom:0xDD7D38 omo_10_IsAOrBPressed = 0x80240518; // type:func rom:0xDD7EC8 -omo_10_UnkTexturePanFunc = 0x8024055C; // type:func rom:0xDD7F0C -omo_10_UnkTexturePanFunc2 = 0x80240680; // type:func rom:0xDD8030 +omo_10_UpdateTexturePanSmooth = 0x8024055C; // type:func rom:0xDD7F0C +omo_10_UpdateTexturePanStepped = 0x80240680; // type:func rom:0xDD8030 func_80240000_DDC830 = 0x80240000; // type:func rom:0xDDC830 func_802401A0_DDC9D0 = 0x802401A0; // type:func rom:0xDDC9D0 omo_11_SetOverrideFlags_40 = 0x80240790; // type:func rom:0xDDCFC0 @@ -22028,8 +22028,8 @@ gv_01_UnkFunc25 = 0x80240034; // type:func rom:0xE1E494 gv_01_GetEntryPos = 0x802400F0; // type:func rom:0xE1E550 gv_01_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xE1E630 gv_01_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xE1E69C -gv_01_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xE1E740 -gv_01_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xE1E864 +gv_01_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xE1E740 +gv_01_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xE1E864 func_802405EC_E1EA4C = 0x802405EC; // type:func rom:0xE1EA4C func_80240688_E1EAE8 = 0x80240688; // type:func rom:0xE1EAE8 E20110_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110 @@ -22265,8 +22265,8 @@ D_802BCBC0_E31510 = 0x802BCBC0; // type:data rom:0xE31510 D_802BCBC8_E31518 = 0x802BCBC8; // type:data rom:0xE31518 D_802BCBD0_E31520 = 0x802BCBD0; // type:data rom:0xE31520 D_802BCBD8_E31528 = 0x802BCBD8; // type:data rom:0xE31528 -EA0900_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEA0900 -EA0900_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA0A24 +EA0900_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEA0900 +EA0900_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEA0A24 EA0C10_UnkNpcAIFunc6 = 0x80240310; // type:func rom:0xEA0C10 EA0C10_UnkNpcAIFunc7 = 0x8024037C; // type:func rom:0xEA0C7C EA0C10_UnkNpcAIFunc8 = 0x802403EC; // type:func rom:0xEA0CEC @@ -22327,13 +22327,13 @@ D_802466B8_EA6FB8 = 0x802466B8; // type:data rom:0xEA6FB8 D_802466C0_EA6FC0 = 0x802466C0; // type:data rom:0xEA6FC0 D_802466C8_EA6FC8 = 0x802466C8; // type:data rom:0xEA6FC8 func_80240000_EA6FD0 = 0x80240000; // type:func rom:0xEA6FD0 -EA7010_UnkTexturePanFunc = 0x80240040; // type:func rom:0xEA7010 -EA7010_UnkTexturePanFunc2 = 0x80240164; // type:func rom:0xEA7134 +EA7010_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xEA7010 +EA7010_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xEA7134 EA7320_SetCamera0Flag1000 = 0x80240350; // type:func rom:0xEA7320 EA7320_UnsetCamera0Flag1000 = 0x8024036C; // type:func rom:0xEA733C func_80240388_EA7358 = 0x80240388; // type:func rom:0xEA7358 -EA8AE0_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEA8AE0 -EA8AE0_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA8C04 +EA8AE0_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEA8AE0 +EA8AE0_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEA8C04 EA8AE0_StarSpiritEffectFunc1 = 0x8024030C; // type:func rom:0xEA8DEC EA8AE0_StarSpiritEffectFunc2 = 0x80240358; // type:func rom:0xEA8E38 EA8AE0_StarSpiritEffectFunc3 = 0x802404B8; // type:func rom:0xEA8F98 @@ -22366,8 +22366,8 @@ D_80243D74_EAC854 = 0x80243D74; // type:data rom:0xEAC854 D_80243DD8_EAC8B8 = 0x80243DD8; // type:data rom:0xEAC8B8 D_80243DDC_EAC8BC = 0x80243DDC; // type:data rom:0xEAC8BC D_80248370_EB0E50 = 0x80248370; // type:data rom:0xEB0E50 -EB0E60_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEB0E60 -EB0E60_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB0F84 +EB0E60_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB0E60 +EB0E60_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB0F84 func_80240310_EB1170 = 0x80240310; // type:func rom:0xEB1170 EB1170_GetItemName = 0x802403C4; // type:func rom:0xEB1224 EB1170_GetNpcCollisionHeight = 0x80240428; // type:func rom:0xEB1288 @@ -22384,13 +22384,13 @@ func_80240A8C_EB18EC = 0x80240A8C; // type:func rom:0xEB18EC D_80241780_EB25E0 = 0x80241780; // type:data rom:0xEB25E0 D_802417E4_EB2644 = 0x802417E4; // type:data rom:0xEB2644 D_802417E8_EB2648 = 0x802417E8; // type:data rom:0xEB2648 -EB5130_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEB5130 -EB5130_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB5254 +EB5130_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB5130 +EB5130_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB5254 func_8024030C_EB543C = 0x8024030C; // type:func rom:0xEB543C func_80240340_EB5470 = 0x80240340; // type:func rom:0xEB5470 func_8024036C_EB549C = 0x8024036C; // type:func rom:0xEB549C -EB7230_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEB7230 -EB7230_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB7354 +EB7230_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEB7230 +EB7230_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEB7354 EB7540_SetEntityPositionF = 0x80240310; // type:func rom:0xEB7540 EB7540_GetEntityPosition = 0x802403D8; // type:func rom:0xEB7608 func_80240478_EB76A8 = 0x80240478; // type:func rom:0xEB76A8 @@ -22437,8 +22437,8 @@ D_80240F28_EC3128 = 0x80240F28; // type:data rom:0xEC3128 D_80244F88_EC7188 = 0x80244F88; // type:data rom:0xEC7188 D_80244F90_EC7190 = 0x80244F90; // type:data rom:0xEC7190 D_80244F98_EC7198 = 0x80244F98; // type:data rom:0xEC7198 -EC71B0_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEC71B0 -EC71B0_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEC72D4 +EC71B0_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEC71B0 +EC71B0_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEC72D4 EC71B0_SpawnSunEffect = 0x8024030C; // type:func rom:0xEC74BC func_80240344_EC74F4 = 0x80240344; // type:func rom:0xEC74F4 EC7590_foliage_setup_shear_mtx = 0x802403E0; // type:func rom:0xEC7590 @@ -22509,8 +22509,8 @@ func_80240000_ED4220 = 0x80240000; // type:func rom:0xED4220 ED4260_DeadUnkFunc1 = 0x80240040; // type:func rom:0xED4260 func_80240080_ED42A0 = 0x80240080; // type:func rom:0xED42A0 ED42A0_GetItemName = 0x80240134; // type:func rom:0xED4354 -ED42A0_UnkTexturePanFunc = 0x80240198; // type:func rom:0xED43B8 -ED42A0_UnkTexturePanFunc2 = 0x802402BC; // type:func rom:0xED44DC +ED42A0_UpdateTexturePanSmooth = 0x80240198; // type:func rom:0xED43B8 +ED42A0_UpdateTexturePanStepped = 0x802402BC; // type:func rom:0xED44DC func_802404B0_ED46D0 = 0x802404B0; // type:func rom:0xED46D0 func_80240B10_ED4D30 = 0x80240B10; // type:func rom:0xED4D30 ED5540_foliage_setup_shear_mtx = 0x80241320; // type:func rom:0xED5540 @@ -22575,8 +22575,8 @@ 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 -EE65B0_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEE65B0 -EE65B0_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEE66D4 +EE65B0_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEE65B0 +EE65B0_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEE66D4 func_8024030C_EE68BC = 0x8024030C; // type:func rom:0xEE68BC EE65B0_UnkFunc43 = 0x80240340; // type:func rom:0xEE68F0 func_802403D4_EE6984 = 0x802403D4; // type:func rom:0xEE6984 @@ -22692,16 +22692,16 @@ D_802453B8_EF79C8 = 0x802453B8; // type:data rom:0xEF79C8 D_802453C0_EF79D0 = 0x802453C0; // type:data rom:0xEF79D0 D_80245408_EF7A18 = 0x80245408; // type:data rom:0xEF7A18 D_80245468_EF7A78 = 0x80245468; // type:data rom:0xEF7A78 -EF7A80_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEF7A80 -EF7A80_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEF7BA4 +EF7A80_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEF7A80 +EF7A80_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEF7BA4 EF7A80_DeadUnkFunc1 = 0x8024030C; // type:func rom:0xEF7D8C func_80240340_EF7DC0 = 0x80240340; // type:func rom:0xEF7DC0 EF7A80_UnkFloatFunc = 0x80240394; // type:func rom:0xEF7E14 EF7FB0_UnkFunc42 = 0x80240530; // type:func rom:0xEF7FB0 EF8010_foliage_setup_shear_mtx = 0x80240590; // type:func rom:0xEF8010 EF8010_TransformFoliage = 0x80240600; // type:func rom:0xEF8080 -EFEB00_UnkTexturePanFunc = 0x80240000; // type:func rom:0xEFEB00 -EFEB00_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEFEC24 +EFEB00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xEFEB00 +EFEB00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xEFEC24 EFEB00_DeadUnkFunc1 = 0x8024030C; // type:func rom:0xEFEE0C EFEB00_UnkFloatFuncAbs = 0x80240340; // type:func rom:0xEFEE40 func_802404D0_EFEFD0 = 0x802404D0; // type:func rom:0xEFEFD0