From 7498c2dc1c2ff8d0cab31a0c5910e164bd7428b7 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Mon, 17 Aug 2020 18:44:41 +0100 Subject: [PATCH 01/37] require directory as string in INCLUDE_ASM macro --- include/macros.h | 2 +- src/code_1000_len_60.c | 2 +- src/code_101b90_len_8f0.c | 14 +- src/code_102610_len_2330.c | 14 +- src/code_10400_len_d30.c | 24 +- src/code_104940_len_dc0.c | 10 +- src/code_105700_len_2130.c | 26 +- src/code_1060_len_310.c | 10 +- src/code_107830_len_e70.c | 4 +- src/code_1086a0_len_fc0.c | 6 +- src/code_109660_len_1270.c | 8 +- src/code_111f0_len_860.c | 12 +- src/code_11a50_len_7a0.c | 2 +- src/code_121f0_len_1290.c | 12 +- src/code_13480_len_3f0.c | 4 +- src/code_135EE0.c | 508 ++++++++-------- src/code_1370_len_7d0.c | 8 +- src/code_13870_len_6980.c | 182 +++--- src/code_163400.c | 22 +- src/code_167570.c | 2 +- src/code_168590.c | 2 +- src/code_169BE0.c | 8 +- src/code_16c8e0.c | 1100 +++++++++++++++++----------------- src/code_1a1f0_len_5390.c | 38 +- src/code_1b40_len_20b0.c | 26 +- src/code_1f580_len_1940.c | 58 +- src/code_20ec0_len_5040.c | 118 ++-- src/code_25f00_len_940.c | 12 +- src/code_26840_len_20d0.c | 52 +- src/code_28910_len_5090.c | 126 ++-- src/code_2d9a0_len_890.c | 14 +- src/code_2e230_len_2190.c | 80 +-- src/code_303c0_len_3e10.c | 148 ++--- src/code_3169f0.c | 2 +- src/code_316a70.c | 2 +- src/code_316d90.c | 2 +- src/code_341d0_len_20d0.c | 44 +- src/code_362a0_len_2f70.c | 42 +- src/code_39210_len_aa0.c | 2 +- src/code_3bf0_len_6f0.c | 6 +- src/code_415D90.c | 110 ++-- src/code_42e0_len_1f60.c | 86 +-- src/code_6000.c | 6 +- src/code_6240_len_c00.c | 34 +- src/code_6e40_len_500.c | 16 +- src/code_7340_len_b00.c | 22 +- src/code_759b0_len_61b0.c | 138 ++--- src/code_7E2AA0.c | 4 +- src/code_7E3700.c | 14 +- src/code_7bb60_len_41b0.c | 94 +-- src/code_7e0e80.c | 56 +- src/code_7fd10_len_b40.c | 16 +- src/code_80850_len_3060.c | 10 +- src/code_8230_len_1ae0.c | 28 +- src/code_838b0_len_5900.c | 78 +-- src/code_891b0_len_fb0.c | 18 +- src/code_8a160_len_700.c | 6 +- src/code_8a860_len_3f30.c | 16 +- src/code_8e790_len_2850.c | 2 +- src/code_9d10_len_1080.c | 8 +- src/code_a5dd0_len_114e0.c | 314 +++++----- src/code_ad90_len_2880.c | 18 +- src/code_b72b0_len_15ed0.c | 218 +++---- src/code_cd180_len_38f0.c | 38 +- src/code_d0a70_len_4fe0.c | 52 +- src/code_d5a50_len_5fd0.c | 82 +-- src/code_d610_len_1330.c | 18 +- src/code_dba20_len_350.c | 24 +- src/code_dbd70_len_700.c | 14 +- src/code_dc470_len_14c0.c | 2 +- src/code_ddaf0_len_c50.c | 20 +- src/code_de740_len_23f0.c | 52 +- src/code_e0b30_len_b80.c | 38 +- src/code_e20eb0.c | 8 +- src/code_e79b0_len_1920.c | 36 +- src/code_e92d0_len_5da0.c | 196 +++--- src/code_e940_len_290.c | 2 +- src/code_ebd0_len_6a0.c | 10 +- src/code_ef070_len_3400.c | 86 +-- src/code_f2470_len_27f0.c | 66 +- src/code_f270_len_1190.c | 16 +- src/code_f4c60_len_4300.c | 104 ++-- src/code_f8f60_len_1560.c | 14 +- src/code_fa4c0_len_3bf0.c | 32 +- src/code_fe0b0_len_5a0.c | 2 +- src/code_fee30_len_2d60.c | 72 +-- src/guOrtho.c | 4 +- src/os/code_39cb0_len_100.c | 4 +- src/os/code_39db0_len_8a0.c | 26 +- src/os/code_3a650_len_40.c | 2 +- src/os/code_3a690_len_40.c | 2 +- src/os/code_3a6d0_len_20.c | 2 +- src/os/code_3a6f0_len_110.c | 2 +- src/os/code_3a800_len_30.c | 2 +- src/os/code_3a830_len_20.c | 2 +- src/os/code_3a850_le_a40.c | 42 +- src/os/code_3b290_len_100.c | 4 +- src/os/code_3b390_len_110.c | 2 +- src/os/code_3b4a0_len_270.c | 10 +- src/os/code_3b710_len_40.c | 2 +- src/os/code_3b770_len_80.c | 2 +- src/os/code_3b7f0_len_120.c | 4 +- src/os/code_3b910_len_410.c | 20 +- src/os/code_3bd20_len_c0.c | 4 +- src/os/code_3bde0_len_3e0.c | 6 +- src/os/code_3c1c0_len_60.c | 2 +- src/os/code_3c220_len_a0.c | 2 +- src/os/code_3c2c0_len_50.c | 2 +- src/os/code_3c310_len_180.c | 2 +- src/os/code_3c490_len_3c0.c | 2 +- src/os/code_3c850_len_f0.c | 6 +- src/os/code_3c940_len_140.c | 6 +- src/os/code_3ca80_len_a0.c | 2 +- src/os/code_3cb20_len_130.c | 4 +- src/os/code_3cc50_len_80.c | 2 +- src/os/code_3ccd0_len_30.c | 2 +- src/os/code_3cd00_len_5f0.c | 18 +- src/os/code_3d2f0_len_10.c | 2 +- src/os/code_3d300_len_30.c | 2 +- src/os/code_3d330_len_990.c | 8 +- src/os/code_3dcc0_len_a60.c | 4 +- src/os/code_3e720_len_5f0.c | 4 +- src/os/code_3ef90_len_600.c | 4 +- src/os/code_3f310_len_3c0.c | 4 +- src/os/code_3f6d0_len_320.c | 4 +- src/os/code_3f9f0_len_60.c | 2 +- src/os/code_3fa50_len_f60.c | 20 +- src/os/code_409b0_len_140.c | 2 +- src/os/code_40af0_len_130.c | 2 +- src/os/code_40c20_len_1f0.c | 6 +- src/os/code_40e10_len_240.c | 4 +- src/os/code_41050_len_120.c | 6 +- src/os/code_41170_len_f0.c | 6 +- src/os/code_41350_len_d0.c | 2 +- src/os/code_41420_len_120.c | 2 +- src/os/code_41540_len_c0.c | 2 +- src/os/code_41600_len_40.c | 2 +- src/os/code_41640_len_50.c | 2 +- src/os/code_41690_len_10.c | 2 +- src/os/code_416a0_len_90.c | 2 +- src/os/code_41730_len_20.c | 2 +- src/os/code_41750_len_450.c | 10 +- src/os/code_41ba0_len_c0.c | 2 +- src/os/code_41c60_len_c0.c | 2 +- src/os/code_41d20_len_40.c | 2 +- src/os/code_41d60_len_50.c | 2 +- src/os/code_41db0_len_40.c | 2 +- src/os/code_41df0_len_40.c | 2 +- src/os/code_41e30_len_40.c | 2 +- src/os/code_41e70_len_340.c | 4 +- src/os/code_421b0_len_60.c | 2 +- src/os/code_42210_len_50.c | 2 +- src/os/code_42260_len_170.c | 2 +- src/os/code_423d0_len_50.c | 2 +- src/os/code_42420_len_50.c | 2 +- src/os/code_42470_len_310.c | 2 +- src/os/code_42780_len_120.c | 6 +- src/os/code_42900_len_80.c | 2 +- src/os/code_42980_len_80.c | 2 +- src/os/code_42a00_len_100.c | 2 +- src/os/code_42b00_len_c0.c | 2 +- src/os/code_42bc0_len_60.c | 2 +- src/os/code_42c20_len_e0.c | 2 +- src/os/code_42d00_len_60.c | 2 +- src/os/code_42d60_len_80.c | 2 +- src/os/code_42de0_len_90.c | 2 +- src/os/code_42e70_len_390.c | 6 +- src/os/code_43200_len_7c0.c | 8 +- src/os/code_439c0_len_220.c | 4 +- src/os/code_43be0_len_5e0.c | 4 +- src/os/code_441c0_len_1c0.c | 2 +- src/os/code_44380_len_4e0.c | 8 +- src/os/code_44860_len_60.c | 2 +- src/os/code_448c0_len_210.c | 6 +- src/os/code_44ad0_len_70.c | 2 +- src/os/code_44b40_len_a90.c | 14 +- src/os/code_455d0_len_1f0.c | 2 +- src/os/code_457c0_len_270.c | 2 +- src/os/code_45a30_len_20.c | 2 +- src/os/code_45a50_len_3a0.c | 4 +- src/os/code_45df0_len_970.c | 76 +-- src/os/code_46760_len_90.c | 4 +- src/os/code_467f0_len_90.c | 4 +- src/os/code_46880_len_260.c | 6 +- src/os/code_46ae0_len_170.c | 2 +- src/os/code_46c50_len_20.c | 2 +- src/os/code_46c70_len_e00.c | 12 +- src/os/code_47a70_len_10.c | 2 +- src/os/code_47a80_len_10.c | 2 +- src/os/code_47a90_len_50.c | 8 +- src/os/code_47ae0_len_e0.c | 8 +- src/os/code_47bc0_len_50.c | 2 +- src/os/code_47c10_len_50.c | 2 +- src/os/code_47c60_len_f0.c | 4 +- src/os/code_47d50_len_e0.c | 2 +- src/os/code_47e30_len_60.c | 2 +- src/os/code_47e90_len_110.c | 2 +- src/os/code_47fa0_len_20.c | 2 +- src/os/code_47fc0_len_60.c | 2 +- src/os/code_48020_len_a00.c | 12 +- src/os/code_48a20_len_1c0.c | 4 +- src/os/code_48be0_len_20.c | 2 +- src/os/code_48c00_len_5c0.c | 2 +- src/os/code_491c0_len_f80.c | 4 +- src/os/code_49C70.c | 2 +- src/os/code_4a140_len_70.c | 4 +- src/os/code_4a1b0_len_40.c | 2 +- src/os/code_4a1f0_len_170.c | 2 +- src/os/code_4a360_len_930.c | 20 +- src/os/code_4ac90_len_3910.c | 270 ++++----- src/os/code_7e40_len_3f0.c | 6 +- src/os/guMtxIdentF.c | 2 +- src/os/osCreateThread.c | 2 +- src/os/osGetThreadPri.c | 2 +- 214 files changed, 2974 insertions(+), 2974 deletions(-) diff --git a/include/macros.h b/include/macros.h index d1d69c4e34..6f472dadd9 100644 --- a/include/macros.h +++ b/include/macros.h @@ -2,7 +2,7 @@ #define _MACROS_H_ #define INCLUDE_ASM(FOLDER, NAME, ARGS...) \ - __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"include/macro.inc\"\n.include \"asm/nonmatchings/"#FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); } + __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"include/macro.inc\"\n.include \"asm/nonmatchings/"FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); } #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) #define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0])) diff --git a/src/code_1000_len_60.c b/src/code_1000_len_60.c index bce819842f..aac67b0561 100644 --- a/src/code_1000_len_60.c +++ b/src/code_1000_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_1000_len_60, entry_point); +INCLUDE_ASM("code_1000_len_60", entry_point); diff --git a/src/code_101b90_len_8f0.c b/src/code_101b90_len_8f0.c index e1341c7b9a..dfef87ce54 100644 --- a/src/code_101b90_len_8f0.c +++ b/src/code_101b90_len_8f0.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(code_101b90_len_8f0, func_802DEAA0); +INCLUDE_ASM("code_101b90_len_8f0", func_802DEAA0); -INCLUDE_ASM(code_101b90_len_8f0, load_sprite); +INCLUDE_ASM("code_101b90_len_8f0", load_sprite); -INCLUDE_ASM(code_101b90_len_8f0, func_802DED60); +INCLUDE_ASM("code_101b90_len_8f0", func_802DED60); -INCLUDE_ASM(code_101b90_len_8f0, func_802DEEA0); +INCLUDE_ASM("code_101b90_len_8f0", func_802DEEA0); -INCLUDE_ASM(code_101b90_len_8f0, func_802DEFB4); +INCLUDE_ASM("code_101b90_len_8f0", func_802DEFB4); -INCLUDE_ASM(code_101b90_len_8f0, func_802DF00C); +INCLUDE_ASM("code_101b90_len_8f0", func_802DF00C); -INCLUDE_ASM(code_101b90_len_8f0, func_802DF2D8); +INCLUDE_ASM("code_101b90_len_8f0", func_802DF2D8); diff --git a/src/code_102610_len_2330.c b/src/code_102610_len_2330.c index 5cae00c83d..10b14e4db6 100644 --- a/src/code_102610_len_2330.c +++ b/src/code_102610_len_2330.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(code_102610_len_2330, func_802E0D90); +INCLUDE_ASM("code_102610_len_2330", func_802E0D90); -INCLUDE_ASM(code_102610_len_2330, func_802E0DB0); +INCLUDE_ASM("code_102610_len_2330", func_802E0DB0); -INCLUDE_ASM(code_102610_len_2330, func_802E0DE0); +INCLUDE_ASM("code_102610_len_2330", func_802E0DE0); -INCLUDE_ASM(code_102610_len_2330, save_game_at_player_position); +INCLUDE_ASM("code_102610_len_2330", save_game_at_player_position); -INCLUDE_ASM(code_102610_len_2330, func_802E153C); +INCLUDE_ASM("code_102610_len_2330", func_802E153C); -INCLUDE_ASM(code_102610_len_2330, func_802E234C); +INCLUDE_ASM("code_102610_len_2330", func_802E234C); -INCLUDE_ASM(code_102610_len_2330, func_802E246C); +INCLUDE_ASM("code_102610_len_2330", func_802E246C); diff --git a/src/code_10400_len_d30.c b/src/code_10400_len_d30.c index 00c6663278..356cce6165 100644 --- a/src/code_10400_len_d30.c +++ b/src/code_10400_len_d30.c @@ -1,25 +1,25 @@ #include "common.h" -INCLUDE_ASM(code_10400_len_d30, func_80035000_2); +INCLUDE_ASM("code_10400_len_d30", func_80035000_2); -INCLUDE_ASM(code_10400_len_d30, func_80035058_2); +INCLUDE_ASM("code_10400_len_d30", func_80035058_2); -INCLUDE_ASM(code_10400_len_d30, func_800351C8_2); +INCLUDE_ASM("code_10400_len_d30", func_800351C8_2); -INCLUDE_ASM(code_10400_len_d30, func_800354EC_2); +INCLUDE_ASM("code_10400_len_d30", func_800354EC_2); -INCLUDE_ASM(code_10400_len_d30, func_800355C4_2); +INCLUDE_ASM("code_10400_len_d30", func_800355C4_2); -INCLUDE_ASM(code_10400_len_d30, func_800355CC_2); +INCLUDE_ASM("code_10400_len_d30", func_800355CC_2); -INCLUDE_ASM(code_10400_len_d30, func_800355D4_2); +INCLUDE_ASM("code_10400_len_d30", func_800355D4_2); -INCLUDE_ASM(code_10400_len_d30, func_80035660_2); +INCLUDE_ASM("code_10400_len_d30", func_80035660_2); -INCLUDE_ASM(code_10400_len_d30, func_80035704); +INCLUDE_ASM("code_10400_len_d30", func_80035704); -INCLUDE_ASM(code_10400_len_d30, func_80035B40_2); +INCLUDE_ASM("code_10400_len_d30", func_80035B40_2); -INCLUDE_ASM(code_10400_len_d30, func_80035D18_2); +INCLUDE_ASM("code_10400_len_d30", func_80035D18_2); -INCLUDE_ASM(code_10400_len_d30, func_80035D20_2); +INCLUDE_ASM("code_10400_len_d30", func_80035D20_2); diff --git a/src/code_104940_len_dc0.c b/src/code_104940_len_dc0.c index 4d639cbf6d..30e43d0b4c 100644 --- a/src/code_104940_len_dc0.c +++ b/src/code_104940_len_dc0.c @@ -1,11 +1,11 @@ #include "common.h" -INCLUDE_ASM(code_104940_len_dc0, func_802E30C0); +INCLUDE_ASM("code_104940_len_dc0", func_802E30C0); -INCLUDE_ASM(code_104940_len_dc0, func_802E3370); +INCLUDE_ASM("code_104940_len_dc0", func_802E3370); -INCLUDE_ASM(code_104940_len_dc0, func_802E3650); +INCLUDE_ASM("code_104940_len_dc0", func_802E3650); -INCLUDE_ASM(code_104940_len_dc0, func_802E36E4); +INCLUDE_ASM("code_104940_len_dc0", func_802E36E4); -INCLUDE_ASM(code_104940_len_dc0, func_802E3A00); +INCLUDE_ASM("code_104940_len_dc0", func_802E3A00); diff --git a/src/code_105700_len_2130.c b/src/code_105700_len_2130.c index a6c7a5cfe0..192b166ceb 100644 --- a/src/code_105700_len_2130.c +++ b/src/code_105700_len_2130.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_ASM(code_105700_len_2130, func_802E3E80); +INCLUDE_ASM("code_105700_len_2130", func_802E3E80); -INCLUDE_ASM(code_105700_len_2130, func_802E464C); +INCLUDE_ASM("code_105700_len_2130", func_802E464C); -INCLUDE_ASM(code_105700_len_2130, func_802E4710); +INCLUDE_ASM("code_105700_len_2130", func_802E4710); -INCLUDE_ASM(code_105700_len_2130, func_802E4730); +INCLUDE_ASM("code_105700_len_2130", func_802E4730); -INCLUDE_ASM(code_105700_len_2130, func_802E4B10); +INCLUDE_ASM("code_105700_len_2130", func_802E4B10); -INCLUDE_ASM(code_105700_len_2130, func_802E4B60); +INCLUDE_ASM("code_105700_len_2130", func_802E4B60); -INCLUDE_ASM(code_105700_len_2130, func_802E4C10); +INCLUDE_ASM("code_105700_len_2130", func_802E4C10); -INCLUDE_ASM(code_105700_len_2130, func_802E4E04); +INCLUDE_ASM("code_105700_len_2130", func_802E4E04); -INCLUDE_ASM(code_105700_len_2130, func_802E5324); +INCLUDE_ASM("code_105700_len_2130", func_802E5324); -INCLUDE_ASM(code_105700_len_2130, func_802E55A8); +INCLUDE_ASM("code_105700_len_2130", func_802E55A8); -INCLUDE_ASM(code_105700_len_2130, func_802E5670); +INCLUDE_ASM("code_105700_len_2130", func_802E5670); -INCLUDE_ASM(code_105700_len_2130, func_802E578C); +INCLUDE_ASM("code_105700_len_2130", func_802E578C); -INCLUDE_ASM(code_105700_len_2130, func_802E581C); +INCLUDE_ASM("code_105700_len_2130", func_802E581C); diff --git a/src/code_1060_len_310.c b/src/code_1060_len_310.c index 6f29f3e9fb..4271a8cb44 100644 --- a/src/code_1060_len_310.c +++ b/src/code_1060_len_310.c @@ -1,11 +1,11 @@ #include "common.h" -INCLUDE_ASM(code_1060_len_310, func_80025C60); +INCLUDE_ASM("code_1060_len_310", func_80025C60); -INCLUDE_ASM(code_1060_len_310, func_80025CFC); +INCLUDE_ASM("code_1060_len_310", func_80025CFC); -INCLUDE_ASM(code_1060_len_310, func_80025D38); +INCLUDE_ASM("code_1060_len_310", func_80025D38); -INCLUDE_ASM(code_1060_len_310, func_80025D74); +INCLUDE_ASM("code_1060_len_310", func_80025D74); -INCLUDE_ASM(code_1060_len_310, func_80025F44); +INCLUDE_ASM("code_1060_len_310", func_80025F44); diff --git a/src/code_107830_len_e70.c b/src/code_107830_len_e70.c index 9f41da62d5..612e666527 100644 --- a/src/code_107830_len_e70.c +++ b/src/code_107830_len_e70.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(code_107830_len_e70, func_802E5FB0); +INCLUDE_ASM("code_107830_len_e70", func_802E5FB0); -INCLUDE_ASM(code_107830_len_e70, func_802E6B6C); +INCLUDE_ASM("code_107830_len_e70", func_802E6B6C); diff --git a/src/code_1086a0_len_fc0.c b/src/code_1086a0_len_fc0.c index d141495a29..6359c53ebe 100644 --- a/src/code_1086a0_len_fc0.c +++ b/src/code_1086a0_len_fc0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(code_1086a0_len_fc0, func_802E6E20); +INCLUDE_ASM("code_1086a0_len_fc0", func_802E6E20); -INCLUDE_ASM(code_1086a0_len_fc0, func_802E7230); +INCLUDE_ASM("code_1086a0_len_fc0", func_802E7230); -INCLUDE_ASM(code_1086a0_len_fc0, func_802E7D38); +INCLUDE_ASM("code_1086a0_len_fc0", func_802E7D38); diff --git a/src/code_109660_len_1270.c b/src/code_109660_len_1270.c index 3e6247e21e..97f2495c27 100644 --- a/src/code_109660_len_1270.c +++ b/src/code_109660_len_1270.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(code_109660_len_1270, func_802E7DE0); +INCLUDE_ASM("code_109660_len_1270", func_802E7DE0); -INCLUDE_ASM(code_109660_len_1270, func_802E7F6C); +INCLUDE_ASM("code_109660_len_1270", func_802E7F6C); -INCLUDE_ASM(code_109660_len_1270, player_enter_blue_pipe); +INCLUDE_ASM("code_109660_len_1270", player_enter_blue_pipe); -INCLUDE_ASM(code_109660_len_1270, push_entity_matrix); +INCLUDE_ASM("code_109660_len_1270", push_entity_matrix); diff --git a/src/code_111f0_len_860.c b/src/code_111f0_len_860.c index 83a6597846..5d98d38bbd 100644 --- a/src/code_111f0_len_860.c +++ b/src/code_111f0_len_860.c @@ -5,13 +5,13 @@ void func_80035DF0(s16 arg0) { *tempPtr = arg0; } -INCLUDE_ASM(code_111f0_len_860, func_80035E00); +INCLUDE_ASM("code_111f0_len_860", func_80035E00); -INCLUDE_ASM(code_111f0_len_860, func_80035E24); +INCLUDE_ASM("code_111f0_len_860", func_80035E24); -INCLUDE_ASM(code_111f0_len_860, func_80035E54); +INCLUDE_ASM("code_111f0_len_860", func_80035E54); -INCLUDE_ASM(code_111f0_len_860, func_80035EEC); +INCLUDE_ASM("code_111f0_len_860", func_80035EEC); void func_800360FC(void) { GameStatus* gameStatus = *gGameStatusPtr; @@ -36,7 +36,7 @@ void func_80036130(void) { } } -INCLUDE_ASM(code_111f0_len_860, func_8003617C); +INCLUDE_ASM("code_111f0_len_860", func_8003617C); s32 func_800363FC(void) { s32 phi_return; @@ -59,7 +59,7 @@ s32 func_80036430(void) { return pPlayerStatus->flags; } -INCLUDE_ASM(code_111f0_len_860, func_8003646C); +INCLUDE_ASM("code_111f0_len_860", func_8003646C); void func_80036640(void) { } diff --git a/src/code_11a50_len_7a0.c b/src/code_11a50_len_7a0.c index cc1ab3a014..8eda54b890 100644 --- a/src/code_11a50_len_7a0.c +++ b/src/code_11a50_len_7a0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_11a50_len_7a0, func_80036650); +INCLUDE_ASM("code_11a50_len_7a0", func_80036650); diff --git a/src/code_121f0_len_1290.c b/src/code_121f0_len_1290.c index f93210740e..0829ef0dc0 100644 --- a/src/code_121f0_len_1290.c +++ b/src/code_121f0_len_1290.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM(code_121f0_len_1290, func_80036DF0); +INCLUDE_ASM("code_121f0_len_1290", func_80036DF0); -INCLUDE_ASM(code_121f0_len_1290, func_80037960); +INCLUDE_ASM("code_121f0_len_1290", func_80037960); -INCLUDE_ASM(code_121f0_len_1290, func_80037968); +INCLUDE_ASM("code_121f0_len_1290", func_80037968); -INCLUDE_ASM(code_121f0_len_1290, func_80037994); +INCLUDE_ASM("code_121f0_len_1290", func_80037994); -INCLUDE_ASM(code_121f0_len_1290, func_80037BC8); +INCLUDE_ASM("code_121f0_len_1290", func_80037BC8); -INCLUDE_ASM(code_121f0_len_1290, func_80037E14); +INCLUDE_ASM("code_121f0_len_1290", func_80037E14); diff --git a/src/code_13480_len_3f0.c b/src/code_13480_len_3f0.c index 1bf1f29f2c..5c85f27416 100644 --- a/src/code_13480_len_3f0.c +++ b/src/code_13480_len_3f0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(code_13480_len_3f0, init_demo_data); +INCLUDE_ASM("code_13480_len_3f0", init_demo_data); -INCLUDE_ASM(code_13480_len_3f0, next_demo_scene); +INCLUDE_ASM("code_13480_len_3f0", next_demo_scene); diff --git a/src/code_135EE0.c b/src/code_135EE0.c index 5b4135299c..5df736cca4 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -1,509 +1,509 @@ #include "common.h" -INCLUDE_ASM(code_135EE0, func_80242BA0_2); +INCLUDE_ASM("code_135EE0", func_80242BA0_2); -INCLUDE_ASM(code_135EE0, func_80242BAC); +INCLUDE_ASM("code_135EE0", func_80242BAC); -INCLUDE_ASM(code_135EE0, func_80242C2C); +INCLUDE_ASM("code_135EE0", func_80242C2C); -INCLUDE_ASM(code_135EE0, func_80242C34); +INCLUDE_ASM("code_135EE0", func_80242C34); -INCLUDE_ASM(code_135EE0, func_80242CE8); +INCLUDE_ASM("code_135EE0", func_80242CE8); -INCLUDE_ASM(code_135EE0, func_80242CF8); +INCLUDE_ASM("code_135EE0", func_80242CF8); -INCLUDE_ASM(code_135EE0, func_80242D04); +INCLUDE_ASM("code_135EE0", func_80242D04); -INCLUDE_ASM(code_135EE0, func_80242D20); +INCLUDE_ASM("code_135EE0", func_80242D20); -INCLUDE_ASM(code_135EE0, func_80242D54); +INCLUDE_ASM("code_135EE0", func_80242D54); -INCLUDE_ASM(code_135EE0, func_80242E6C); +INCLUDE_ASM("code_135EE0", func_80242E6C); -INCLUDE_ASM(code_135EE0, func_80242F48); +INCLUDE_ASM("code_135EE0", func_80242F48); -INCLUDE_ASM(code_135EE0, func_80243418); +INCLUDE_ASM("code_135EE0", func_80243418); -INCLUDE_ASM(code_135EE0, func_8024346C); +INCLUDE_ASM("code_135EE0", func_8024346C); -INCLUDE_ASM(code_135EE0, func_802434DC); +INCLUDE_ASM("code_135EE0", func_802434DC); -INCLUDE_ASM(code_135EE0, func_80243B00); +INCLUDE_ASM("code_135EE0", func_80243B00); -INCLUDE_ASM(code_135EE0, func_80243B14); +INCLUDE_ASM("code_135EE0", func_80243B14); -INCLUDE_ASM(code_135EE0, func_80243BA4); +INCLUDE_ASM("code_135EE0", func_80243BA4); -INCLUDE_ASM(code_135EE0, func_80243D8C); +INCLUDE_ASM("code_135EE0", func_80243D8C); -INCLUDE_ASM(code_135EE0, func_80243D9C); +INCLUDE_ASM("code_135EE0", func_80243D9C); -INCLUDE_ASM(code_135EE0, func_80243E60); +INCLUDE_ASM("code_135EE0", func_80243E60); -INCLUDE_ASM(code_135EE0, func_80244060); +INCLUDE_ASM("code_135EE0", func_80244060); -INCLUDE_ASM(code_135EE0, func_80244118); +INCLUDE_ASM("code_135EE0", func_80244118); -INCLUDE_ASM(code_135EE0, func_8024411C); +INCLUDE_ASM("code_135EE0", func_8024411C); -INCLUDE_ASM(code_135EE0, func_8024412C); +INCLUDE_ASM("code_135EE0", func_8024412C); -INCLUDE_ASM(code_135EE0, func_802441BC); +INCLUDE_ASM("code_135EE0", func_802441BC); -INCLUDE_ASM(code_135EE0, func_802441C4); +INCLUDE_ASM("code_135EE0", func_802441C4); -INCLUDE_ASM(code_135EE0, func_802441CC); +INCLUDE_ASM("code_135EE0", func_802441CC); -INCLUDE_ASM(code_135EE0, func_802441D8); +INCLUDE_ASM("code_135EE0", func_802441D8); -INCLUDE_ASM(code_135EE0, func_80244250); +INCLUDE_ASM("code_135EE0", func_80244250); -INCLUDE_ASM(code_135EE0, func_80244258); +INCLUDE_ASM("code_135EE0", func_80244258); -INCLUDE_ASM(code_135EE0, func_80244264); +INCLUDE_ASM("code_135EE0", func_80244264); -INCLUDE_ASM(code_135EE0, func_8024428C); +INCLUDE_ASM("code_135EE0", func_8024428C); -INCLUDE_ASM(code_135EE0, func_802442A0); +INCLUDE_ASM("code_135EE0", func_802442A0); -INCLUDE_ASM(code_135EE0, func_802442FC); +INCLUDE_ASM("code_135EE0", func_802442FC); -INCLUDE_ASM(code_135EE0, func_802443FC); +INCLUDE_ASM("code_135EE0", func_802443FC); -INCLUDE_ASM(code_135EE0, func_80244400); +INCLUDE_ASM("code_135EE0", func_80244400); -INCLUDE_ASM(code_135EE0, func_80244424); +INCLUDE_ASM("code_135EE0", func_80244424); -INCLUDE_ASM(code_135EE0, func_802444C4); +INCLUDE_ASM("code_135EE0", func_802444C4); -INCLUDE_ASM(code_135EE0, func_802447F4); +INCLUDE_ASM("code_135EE0", func_802447F4); -INCLUDE_ASM(code_135EE0, func_80244858); +INCLUDE_ASM("code_135EE0", func_80244858); -INCLUDE_ASM(code_135EE0, func_80244A4C); +INCLUDE_ASM("code_135EE0", func_80244A4C); -INCLUDE_ASM(code_135EE0, func_80245070); +INCLUDE_ASM("code_135EE0", func_80245070); -INCLUDE_ASM(code_135EE0, func_802450D8); +INCLUDE_ASM("code_135EE0", func_802450D8); -INCLUDE_ASM(code_135EE0, func_802451B4); +INCLUDE_ASM("code_135EE0", func_802451B4); -INCLUDE_ASM(code_135EE0, func_80245200); +INCLUDE_ASM("code_135EE0", func_80245200); -INCLUDE_ASM(code_135EE0, func_802452C4); +INCLUDE_ASM("code_135EE0", func_802452C4); -INCLUDE_ASM(code_135EE0, func_80245568); +INCLUDE_ASM("code_135EE0", func_80245568); -INCLUDE_ASM(code_135EE0, func_8024563C); +INCLUDE_ASM("code_135EE0", func_8024563C); -INCLUDE_ASM(code_135EE0, func_80245748); +INCLUDE_ASM("code_135EE0", func_80245748); -INCLUDE_ASM(code_135EE0, func_802457B8); +INCLUDE_ASM("code_135EE0", func_802457B8); -INCLUDE_ASM(code_135EE0, func_80245910); +INCLUDE_ASM("code_135EE0", func_80245910); -INCLUDE_ASM(code_135EE0, func_80245984); +INCLUDE_ASM("code_135EE0", func_80245984); -INCLUDE_ASM(code_135EE0, func_802459E0); +INCLUDE_ASM("code_135EE0", func_802459E0); -INCLUDE_ASM(code_135EE0, func_80245B70); +INCLUDE_ASM("code_135EE0", func_80245B70); -INCLUDE_ASM(code_135EE0, func_80245C6C); +INCLUDE_ASM("code_135EE0", func_80245C6C); -INCLUDE_ASM(code_135EE0, func_80245CAC); +INCLUDE_ASM("code_135EE0", func_80245CAC); -INCLUDE_ASM(code_135EE0, func_80245D5C); +INCLUDE_ASM("code_135EE0", func_80245D5C); -INCLUDE_ASM(code_135EE0, func_80245D78); +INCLUDE_ASM("code_135EE0", func_80245D78); -INCLUDE_ASM(code_135EE0, func_80245FE4); +INCLUDE_ASM("code_135EE0", func_80245FE4); -INCLUDE_ASM(code_135EE0, func_80246060); +INCLUDE_ASM("code_135EE0", func_80246060); -INCLUDE_ASM(code_135EE0, func_80246168); +INCLUDE_ASM("code_135EE0", func_80246168); -INCLUDE_ASM(code_135EE0, func_802461C0); +INCLUDE_ASM("code_135EE0", func_802461C0); -INCLUDE_ASM(code_135EE0, func_802461E4); +INCLUDE_ASM("code_135EE0", func_802461E4); -INCLUDE_ASM(code_135EE0, func_80246284); +INCLUDE_ASM("code_135EE0", func_80246284); -INCLUDE_ASM(code_135EE0, func_80246288); +INCLUDE_ASM("code_135EE0", func_80246288); -INCLUDE_ASM(code_135EE0, func_80246298); +INCLUDE_ASM("code_135EE0", func_80246298); -INCLUDE_ASM(code_135EE0, func_802462F0); +INCLUDE_ASM("code_135EE0", func_802462F0); -INCLUDE_ASM(code_135EE0, func_80246348); +INCLUDE_ASM("code_135EE0", func_80246348); -INCLUDE_ASM(code_135EE0, func_80246358); +INCLUDE_ASM("code_135EE0", func_80246358); -INCLUDE_ASM(code_135EE0, func_80246490); +INCLUDE_ASM("code_135EE0", func_80246490); -INCLUDE_ASM(code_135EE0, func_80246504); +INCLUDE_ASM("code_135EE0", func_80246504); -INCLUDE_ASM(code_135EE0, func_8024651C); +INCLUDE_ASM("code_135EE0", func_8024651C); -INCLUDE_ASM(code_135EE0, func_80246578); +INCLUDE_ASM("code_135EE0", func_80246578); -INCLUDE_ASM(code_135EE0, func_802465EC); +INCLUDE_ASM("code_135EE0", func_802465EC); -INCLUDE_ASM(code_135EE0, func_80246BE4); +INCLUDE_ASM("code_135EE0", func_80246BE4); -INCLUDE_ASM(code_135EE0, func_80246C9C); +INCLUDE_ASM("code_135EE0", func_80246C9C); -INCLUDE_ASM(code_135EE0, func_80246DB8); +INCLUDE_ASM("code_135EE0", func_80246DB8); -INCLUDE_ASM(code_135EE0, func_80246DEC); +INCLUDE_ASM("code_135EE0", func_80246DEC); -INCLUDE_ASM(code_135EE0, func_80246F28); +INCLUDE_ASM("code_135EE0", func_80246F28); -INCLUDE_ASM(code_135EE0, func_80246FF4); +INCLUDE_ASM("code_135EE0", func_80246FF4); -INCLUDE_ASM(code_135EE0, func_80246FFC); +INCLUDE_ASM("code_135EE0", func_80246FFC); -INCLUDE_ASM(code_135EE0, func_80247000); +INCLUDE_ASM("code_135EE0", func_80247000); -INCLUDE_ASM(code_135EE0, func_80247020); +INCLUDE_ASM("code_135EE0", func_80247020); -INCLUDE_ASM(code_135EE0, func_80247054); +INCLUDE_ASM("code_135EE0", func_80247054); -INCLUDE_ASM(code_135EE0, func_802470B0); +INCLUDE_ASM("code_135EE0", func_802470B0); -INCLUDE_ASM(code_135EE0, func_8024710C); +INCLUDE_ASM("code_135EE0", func_8024710C); -INCLUDE_ASM(code_135EE0, func_80247164); +INCLUDE_ASM("code_135EE0", func_80247164); -INCLUDE_ASM(code_135EE0, func_80247168); +INCLUDE_ASM("code_135EE0", func_80247168); -INCLUDE_ASM(code_135EE0, func_802471D8); +INCLUDE_ASM("code_135EE0", func_802471D8); -INCLUDE_ASM(code_135EE0, func_80247220); +INCLUDE_ASM("code_135EE0", func_80247220); -INCLUDE_ASM(code_135EE0, func_80247270); +INCLUDE_ASM("code_135EE0", func_80247270); -INCLUDE_ASM(code_135EE0, func_80247298); +INCLUDE_ASM("code_135EE0", func_80247298); -INCLUDE_ASM(code_135EE0, func_802472A8); +INCLUDE_ASM("code_135EE0", func_802472A8); -INCLUDE_ASM(code_135EE0, func_802472B0); +INCLUDE_ASM("code_135EE0", func_802472B0); -INCLUDE_ASM(code_135EE0, func_80247314); +INCLUDE_ASM("code_135EE0", func_80247314); -INCLUDE_ASM(code_135EE0, func_80247318); +INCLUDE_ASM("code_135EE0", func_80247318); -INCLUDE_ASM(code_135EE0, func_80247338); +INCLUDE_ASM("code_135EE0", func_80247338); -INCLUDE_ASM(code_135EE0, func_802473E4); +INCLUDE_ASM("code_135EE0", func_802473E4); -INCLUDE_ASM(code_135EE0, func_80247440); +INCLUDE_ASM("code_135EE0", func_80247440); -INCLUDE_ASM(code_135EE0, func_80247444); +INCLUDE_ASM("code_135EE0", func_80247444); -INCLUDE_ASM(code_135EE0, func_80247458); +INCLUDE_ASM("code_135EE0", func_80247458); -INCLUDE_ASM(code_135EE0, func_80247BB0); +INCLUDE_ASM("code_135EE0", func_80247BB0); -INCLUDE_ASM(code_135EE0, func_80247BB8); +INCLUDE_ASM("code_135EE0", func_80247BB8); -INCLUDE_ASM(code_135EE0, func_80247C24); +INCLUDE_ASM("code_135EE0", func_80247C24); -INCLUDE_ASM(code_135EE0, func_80247CD4); +INCLUDE_ASM("code_135EE0", func_80247CD4); -INCLUDE_ASM(code_135EE0, func_80247CE0); +INCLUDE_ASM("code_135EE0", func_80247CE0); -INCLUDE_ASM(code_135EE0, func_80247CF4); +INCLUDE_ASM("code_135EE0", func_80247CF4); -INCLUDE_ASM(code_135EE0, func_80247D2C); +INCLUDE_ASM("code_135EE0", func_80247D2C); -INCLUDE_ASM(code_135EE0, func_80247D44); +INCLUDE_ASM("code_135EE0", func_80247D44); -INCLUDE_ASM(code_135EE0, func_80247DA4); +INCLUDE_ASM("code_135EE0", func_80247DA4); -INCLUDE_ASM(code_135EE0, func_80247E30); +INCLUDE_ASM("code_135EE0", func_80247E30); -INCLUDE_ASM(code_135EE0, func_80247F80); +INCLUDE_ASM("code_135EE0", func_80247F80); -INCLUDE_ASM(code_135EE0, func_80247F94); +INCLUDE_ASM("code_135EE0", func_80247F94); -INCLUDE_ASM(code_135EE0, func_80247F98); +INCLUDE_ASM("code_135EE0", func_80247F98); -INCLUDE_ASM(code_135EE0, func_80247FA4); +INCLUDE_ASM("code_135EE0", func_80247FA4); -INCLUDE_ASM(code_135EE0, func_8024824C); +INCLUDE_ASM("code_135EE0", func_8024824C); -INCLUDE_ASM(code_135EE0, func_80248274); +INCLUDE_ASM("code_135EE0", func_80248274); -INCLUDE_ASM(code_135EE0, func_80248284); +INCLUDE_ASM("code_135EE0", func_80248284); -INCLUDE_ASM(code_135EE0, func_802483B8); +INCLUDE_ASM("code_135EE0", func_802483B8); -INCLUDE_ASM(code_135EE0, func_80248B70); +INCLUDE_ASM("code_135EE0", func_80248B70); -INCLUDE_ASM(code_135EE0, func_80248BA0); +INCLUDE_ASM("code_135EE0", func_80248BA0); -INCLUDE_ASM(code_135EE0, func_80248BCC); +INCLUDE_ASM("code_135EE0", func_80248BCC); -INCLUDE_ASM(code_135EE0, func_80248BE4); +INCLUDE_ASM("code_135EE0", func_80248BE4); -INCLUDE_ASM(code_135EE0, func_80248BF4); +INCLUDE_ASM("code_135EE0", func_80248BF4); -INCLUDE_ASM(code_135EE0, func_80248BFC); +INCLUDE_ASM("code_135EE0", func_80248BFC); -INCLUDE_ASM(code_135EE0, func_80248C4C); +INCLUDE_ASM("code_135EE0", func_80248C4C); -INCLUDE_ASM(code_135EE0, func_80248CCC); +INCLUDE_ASM("code_135EE0", func_80248CCC); -INCLUDE_ASM(code_135EE0, func_80248CD0); +INCLUDE_ASM("code_135EE0", func_80248CD0); -INCLUDE_ASM(code_135EE0, func_80248D40); +INCLUDE_ASM("code_135EE0", func_80248D40); -INCLUDE_ASM(code_135EE0, func_80248D54); +INCLUDE_ASM("code_135EE0", func_80248D54); -INCLUDE_ASM(code_135EE0, func_80248D8C); +INCLUDE_ASM("code_135EE0", func_80248D8C); -INCLUDE_ASM(code_135EE0, func_80248E40); +INCLUDE_ASM("code_135EE0", func_80248E40); -INCLUDE_ASM(code_135EE0, func_80248EB4); +INCLUDE_ASM("code_135EE0", func_80248EB4); -INCLUDE_ASM(code_135EE0, func_80248EDC); +INCLUDE_ASM("code_135EE0", func_80248EDC); -INCLUDE_ASM(code_135EE0, func_80248F80); +INCLUDE_ASM("code_135EE0", func_80248F80); -INCLUDE_ASM(code_135EE0, func_80248F9C); +INCLUDE_ASM("code_135EE0", func_80248F9C); -INCLUDE_ASM(code_135EE0, func_80249008); +INCLUDE_ASM("code_135EE0", func_80249008); -INCLUDE_ASM(code_135EE0, func_80249034); +INCLUDE_ASM("code_135EE0", func_80249034); -INCLUDE_ASM(code_135EE0, func_8024908C); +INCLUDE_ASM("code_135EE0", func_8024908C); -INCLUDE_ASM(code_135EE0, func_80249110); +INCLUDE_ASM("code_135EE0", func_80249110); -INCLUDE_ASM(code_135EE0, func_80249274); +INCLUDE_ASM("code_135EE0", func_80249274); -INCLUDE_ASM(code_135EE0, func_8024928C); +INCLUDE_ASM("code_135EE0", func_8024928C); -INCLUDE_ASM(code_135EE0, func_80249290); +INCLUDE_ASM("code_135EE0", func_80249290); -INCLUDE_ASM(code_135EE0, func_802492B4); +INCLUDE_ASM("code_135EE0", func_802492B4); -INCLUDE_ASM(code_135EE0, func_802492E4); +INCLUDE_ASM("code_135EE0", func_802492E4); -INCLUDE_ASM(code_135EE0, func_80249310); +INCLUDE_ASM("code_135EE0", func_80249310); -INCLUDE_ASM(code_135EE0, func_80249420); +INCLUDE_ASM("code_135EE0", func_80249420); -INCLUDE_ASM(code_135EE0, func_802494AC); +INCLUDE_ASM("code_135EE0", func_802494AC); -INCLUDE_ASM(code_135EE0, func_8024950C); +INCLUDE_ASM("code_135EE0", func_8024950C); -INCLUDE_ASM(code_135EE0, func_80249590); +INCLUDE_ASM("code_135EE0", func_80249590); -INCLUDE_ASM(code_135EE0, func_80249594); +INCLUDE_ASM("code_135EE0", func_80249594); -INCLUDE_ASM(code_135EE0, func_80249598); +INCLUDE_ASM("code_135EE0", func_80249598); -INCLUDE_ASM(code_135EE0, func_80249604); +INCLUDE_ASM("code_135EE0", func_80249604); -INCLUDE_ASM(code_135EE0, func_8024961C); +INCLUDE_ASM("code_135EE0", func_8024961C); -INCLUDE_ASM(code_135EE0, func_802496FC); +INCLUDE_ASM("code_135EE0", func_802496FC); -INCLUDE_ASM(code_135EE0, func_802497AC); +INCLUDE_ASM("code_135EE0", func_802497AC); -INCLUDE_ASM(code_135EE0, func_802497D0); +INCLUDE_ASM("code_135EE0", func_802497D0); -INCLUDE_ASM(code_135EE0, func_802497D8); +INCLUDE_ASM("code_135EE0", func_802497D8); -INCLUDE_ASM(code_135EE0, func_80249828); +INCLUDE_ASM("code_135EE0", func_80249828); -INCLUDE_ASM(code_135EE0, func_80249898); +INCLUDE_ASM("code_135EE0", func_80249898); -INCLUDE_ASM(code_135EE0, func_802498E0); +INCLUDE_ASM("code_135EE0", func_802498E0); -INCLUDE_ASM(code_135EE0, func_80249930); +INCLUDE_ASM("code_135EE0", func_80249930); -INCLUDE_ASM(code_135EE0, func_8024994C); +INCLUDE_ASM("code_135EE0", func_8024994C); -INCLUDE_ASM(code_135EE0, func_80249950); +INCLUDE_ASM("code_135EE0", func_80249950); -INCLUDE_ASM(code_135EE0, func_80249954); +INCLUDE_ASM("code_135EE0", func_80249954); -INCLUDE_ASM(code_135EE0, func_80249958); +INCLUDE_ASM("code_135EE0", func_80249958); -INCLUDE_ASM(code_135EE0, func_80249968); +INCLUDE_ASM("code_135EE0", func_80249968); -INCLUDE_ASM(code_135EE0, func_80249B30); +INCLUDE_ASM("code_135EE0", func_80249B30); -INCLUDE_ASM(code_135EE0, func_80249C94); +INCLUDE_ASM("code_135EE0", func_80249C94); -INCLUDE_ASM(code_135EE0, func_80249CB0); +INCLUDE_ASM("code_135EE0", func_80249CB0); -INCLUDE_ASM(code_135EE0, func_80249CD4); +INCLUDE_ASM("code_135EE0", func_80249CD4); -INCLUDE_ASM(code_135EE0, func_80249E0C); +INCLUDE_ASM("code_135EE0", func_80249E0C); -INCLUDE_ASM(code_135EE0, func_80249EE4); +INCLUDE_ASM("code_135EE0", func_80249EE4); -INCLUDE_ASM(code_135EE0, func_80249F48); +INCLUDE_ASM("code_135EE0", func_80249F48); -INCLUDE_ASM(code_135EE0, func_80249FB4); +INCLUDE_ASM("code_135EE0", func_80249FB4); -INCLUDE_ASM(code_135EE0, func_8024A1E8); +INCLUDE_ASM("code_135EE0", func_8024A1E8); -INCLUDE_ASM(code_135EE0, func_8024A1FC); +INCLUDE_ASM("code_135EE0", func_8024A1FC); -INCLUDE_ASM(code_135EE0, func_8024A29C); +INCLUDE_ASM("code_135EE0", func_8024A29C); -INCLUDE_ASM(code_135EE0, func_8024A2D4); +INCLUDE_ASM("code_135EE0", func_8024A2D4); -INCLUDE_ASM(code_135EE0, func_8024A454); +INCLUDE_ASM("code_135EE0", func_8024A454); -INCLUDE_ASM(code_135EE0, func_8024A4A4); +INCLUDE_ASM("code_135EE0", func_8024A4A4); -INCLUDE_ASM(code_135EE0, func_8024A4AC); +INCLUDE_ASM("code_135EE0", func_8024A4AC); -INCLUDE_ASM(code_135EE0, func_8024A4DC); +INCLUDE_ASM("code_135EE0", func_8024A4DC); -INCLUDE_ASM(code_135EE0, func_8024A57C); +INCLUDE_ASM("code_135EE0", func_8024A57C); -INCLUDE_ASM(code_135EE0, func_8024A5AC); +INCLUDE_ASM("code_135EE0", func_8024A5AC); -INCLUDE_ASM(code_135EE0, func_8024A634); +INCLUDE_ASM("code_135EE0", func_8024A634); -INCLUDE_ASM(code_135EE0, func_8024A6D8); +INCLUDE_ASM("code_135EE0", func_8024A6D8); -INCLUDE_ASM(code_135EE0, func_8024A7A0); +INCLUDE_ASM("code_135EE0", func_8024A7A0); -INCLUDE_ASM(code_135EE0, func_8024A960); +INCLUDE_ASM("code_135EE0", func_8024A960); -INCLUDE_ASM(code_135EE0, func_8024A9A8); +INCLUDE_ASM("code_135EE0", func_8024A9A8); -INCLUDE_ASM(code_135EE0, func_8024AA80); +INCLUDE_ASM("code_135EE0", func_8024AA80); -INCLUDE_ASM(code_135EE0, func_8024AAA0); +INCLUDE_ASM("code_135EE0", func_8024AAA0); -INCLUDE_ASM(code_135EE0, func_8024AAEC); +INCLUDE_ASM("code_135EE0", func_8024AAEC); -INCLUDE_ASM(code_135EE0, func_8024AB0C); +INCLUDE_ASM("code_135EE0", func_8024AB0C); -INCLUDE_ASM(code_135EE0, func_8024AB6C); +INCLUDE_ASM("code_135EE0", func_8024AB6C); -INCLUDE_ASM(code_135EE0, func_8024ABF0); +INCLUDE_ASM("code_135EE0", func_8024ABF0); -INCLUDE_ASM(code_135EE0, func_8024ABF8); +INCLUDE_ASM("code_135EE0", func_8024ABF8); -INCLUDE_ASM(code_135EE0, func_8024AC44); +INCLUDE_ASM("code_135EE0", func_8024AC44); -INCLUDE_ASM(code_135EE0, func_8024AD34); +INCLUDE_ASM("code_135EE0", func_8024AD34); -INCLUDE_ASM(code_135EE0, func_8024AD94); +INCLUDE_ASM("code_135EE0", func_8024AD94); -INCLUDE_ASM(code_135EE0, func_8024ADE0); +INCLUDE_ASM("code_135EE0", func_8024ADE0); -INCLUDE_ASM(code_135EE0, func_8024AFBC); +INCLUDE_ASM("code_135EE0", func_8024AFBC); -INCLUDE_ASM(code_135EE0, func_8024B0E0); +INCLUDE_ASM("code_135EE0", func_8024B0E0); -INCLUDE_ASM(code_135EE0, func_8024B128); +INCLUDE_ASM("code_135EE0", func_8024B128); -INCLUDE_ASM(code_135EE0, func_8024B3FC); +INCLUDE_ASM("code_135EE0", func_8024B3FC); -INCLUDE_ASM(code_135EE0, func_8024B5D4); +INCLUDE_ASM("code_135EE0", func_8024B5D4); -INCLUDE_ASM(code_135EE0, func_8024B7BC); +INCLUDE_ASM("code_135EE0", func_8024B7BC); -INCLUDE_ASM(code_135EE0, func_8024B974); +INCLUDE_ASM("code_135EE0", func_8024B974); -INCLUDE_ASM(code_135EE0, func_8024BBC0); +INCLUDE_ASM("code_135EE0", func_8024BBC0); -INCLUDE_ASM(code_135EE0, func_8024BD10); +INCLUDE_ASM("code_135EE0", func_8024BD10); -INCLUDE_ASM(code_135EE0, func_8024BD78); +INCLUDE_ASM("code_135EE0", func_8024BD78); -INCLUDE_ASM(code_135EE0, func_8024BDD0); +INCLUDE_ASM("code_135EE0", func_8024BDD0); -INCLUDE_ASM(code_135EE0, func_8024BE84); +INCLUDE_ASM("code_135EE0", func_8024BE84); -INCLUDE_ASM(code_135EE0, func_8024BEF4); +INCLUDE_ASM("code_135EE0", func_8024BEF4); -INCLUDE_ASM(code_135EE0, func_8024BF9C); +INCLUDE_ASM("code_135EE0", func_8024BF9C); -INCLUDE_ASM(code_135EE0, func_8024C154); +INCLUDE_ASM("code_135EE0", func_8024C154); -INCLUDE_ASM(code_135EE0, func_8024C298); +INCLUDE_ASM("code_135EE0", func_8024C298); -INCLUDE_ASM(code_135EE0, func_8024C318); +INCLUDE_ASM("code_135EE0", func_8024C318); -INCLUDE_ASM(code_135EE0, func_8024C38C); +INCLUDE_ASM("code_135EE0", func_8024C38C); -INCLUDE_ASM(code_135EE0, func_8024C470); +INCLUDE_ASM("code_135EE0", func_8024C470); -INCLUDE_ASM(code_135EE0, func_8024C4E0); +INCLUDE_ASM("code_135EE0", func_8024C4E0); -INCLUDE_ASM(code_135EE0, func_8024C544); +INCLUDE_ASM("code_135EE0", func_8024C544); -INCLUDE_ASM(code_135EE0, func_8024C580); +INCLUDE_ASM("code_135EE0", func_8024C580); -INCLUDE_ASM(code_135EE0, func_8024C600); +INCLUDE_ASM("code_135EE0", func_8024C600); -INCLUDE_ASM(code_135EE0, func_8024C760); +INCLUDE_ASM("code_135EE0", func_8024C760); -INCLUDE_ASM(code_135EE0, func_8024C774); +INCLUDE_ASM("code_135EE0", func_8024C774); -INCLUDE_ASM(code_135EE0, func_8024C788); +INCLUDE_ASM("code_135EE0", func_8024C788); -INCLUDE_ASM(code_135EE0, func_8024C790); +INCLUDE_ASM("code_135EE0", func_8024C790); -INCLUDE_ASM(code_135EE0, func_8024C8B4); +INCLUDE_ASM("code_135EE0", func_8024C8B4); -INCLUDE_ASM(code_135EE0, func_8024C918); +INCLUDE_ASM("code_135EE0", func_8024C918); -INCLUDE_ASM(code_135EE0, func_8024C944); +INCLUDE_ASM("code_135EE0", func_8024C944); -INCLUDE_ASM(code_135EE0, func_8024D314); +INCLUDE_ASM("code_135EE0", func_8024D314); -INCLUDE_ASM(code_135EE0, func_8024D330); +INCLUDE_ASM("code_135EE0", func_8024D330); -INCLUDE_ASM(code_135EE0, func_8024D570); +INCLUDE_ASM("code_135EE0", func_8024D570); -INCLUDE_ASM(code_135EE0, func_8024D5AC); +INCLUDE_ASM("code_135EE0", func_8024D5AC); -INCLUDE_ASM(code_135EE0, func_8024D628); +INCLUDE_ASM("code_135EE0", func_8024D628); -INCLUDE_ASM(code_135EE0, func_8024D6F8); +INCLUDE_ASM("code_135EE0", func_8024D6F8); -INCLUDE_ASM(code_135EE0, func_8024D718); +INCLUDE_ASM("code_135EE0", func_8024D718); -INCLUDE_ASM(code_135EE0, func_8024D7E8); +INCLUDE_ASM("code_135EE0", func_8024D7E8); -INCLUDE_ASM(code_135EE0, func_8024D7F0); +INCLUDE_ASM("code_135EE0", func_8024D7F0); -INCLUDE_ASM(code_135EE0, func_8024D890); +INCLUDE_ASM("code_135EE0", func_8024D890); -INCLUDE_ASM(code_135EE0, func_8024D940); +INCLUDE_ASM("code_135EE0", func_8024D940); -INCLUDE_ASM(code_135EE0, func_8024D964); +INCLUDE_ASM("code_135EE0", func_8024D964); -INCLUDE_ASM(code_135EE0, func_8024DA28); +INCLUDE_ASM("code_135EE0", func_8024DA28); -INCLUDE_ASM(code_135EE0, func_8024DA68); +INCLUDE_ASM("code_135EE0", func_8024DA68); -INCLUDE_ASM(code_135EE0, func_8024DAE0); +INCLUDE_ASM("code_135EE0", func_8024DAE0); -INCLUDE_ASM(code_135EE0, func_8024DAF4); +INCLUDE_ASM("code_135EE0", func_8024DAF4); -INCLUDE_ASM(code_135EE0, func_8024DB04); +INCLUDE_ASM("code_135EE0", func_8024DB04); -INCLUDE_ASM(code_135EE0, func_8024E72C); +INCLUDE_ASM("code_135EE0", func_8024E72C); -INCLUDE_ASM(code_135EE0, func_8024E734); +INCLUDE_ASM("code_135EE0", func_8024E734); -INCLUDE_ASM(code_135EE0, func_8024E738); +INCLUDE_ASM("code_135EE0", func_8024E738); -INCLUDE_ASM(code_135EE0, func_8024E804); +INCLUDE_ASM("code_135EE0", func_8024E804); -INCLUDE_ASM(code_135EE0, func_8024EE80); +INCLUDE_ASM("code_135EE0", func_8024EE80); -INCLUDE_ASM(code_135EE0, func_8024EE94); +INCLUDE_ASM("code_135EE0", func_8024EE94); diff --git a/src/code_1370_len_7d0.c b/src/code_1370_len_7d0.c index 9b02f1f333..639f06cc8c 100644 --- a/src/code_1370_len_7d0.c +++ b/src/code_1370_len_7d0.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(code_1370_len_7d0, boot_main); +INCLUDE_ASM("code_1370_len_7d0", boot_main); -INCLUDE_ASM(code_1370_len_7d0, gfxRetrace_Callback); +INCLUDE_ASM("code_1370_len_7d0", gfxRetrace_Callback); -INCLUDE_ASM(code_1370_len_7d0, func_80026164); +INCLUDE_ASM("code_1370_len_7d0", func_80026164); -INCLUDE_ASM(code_1370_len_7d0, gfxPreNMI_Callback); +INCLUDE_ASM("code_1370_len_7d0", gfxPreNMI_Callback); diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index 12cc0c59b8..27090c0101 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -1,183 +1,183 @@ #include "common.h" -INCLUDE_ASM(code_13870_len_6980, func_80038470); +INCLUDE_ASM("code_13870_len_6980", func_80038470); -INCLUDE_ASM(code_13870_len_6980, mtx_ident_mirror_y); +INCLUDE_ASM("code_13870_len_6980", mtx_ident_mirror_y); -INCLUDE_ASM(code_13870_len_6980, func_800384BC); +INCLUDE_ASM("code_13870_len_6980", func_800384BC); -INCLUDE_ASM(code_13870_len_6980, init_npc_list); +INCLUDE_ASM("code_13870_len_6980", init_npc_list); -INCLUDE_ASM(code_13870_len_6980, func_8003857C); +INCLUDE_ASM("code_13870_len_6980", func_8003857C); -INCLUDE_ASM(code_13870_len_6980, func_80038598); +INCLUDE_ASM("code_13870_len_6980", func_80038598); -INCLUDE_ASM(code_13870_len_6980, func_80038844); +INCLUDE_ASM("code_13870_len_6980", func_80038844); -INCLUDE_ASM(code_13870_len_6980, func_80038864); +INCLUDE_ASM("code_13870_len_6980", func_80038864); -INCLUDE_ASM(code_13870_len_6980, func_80038880); +INCLUDE_ASM("code_13870_len_6980", func_80038880); -INCLUDE_ASM(code_13870_len_6980, func_800388A0); +INCLUDE_ASM("code_13870_len_6980", func_800388A0); -INCLUDE_ASM(code_13870_len_6980, free_npc); +INCLUDE_ASM("code_13870_len_6980", free_npc); -INCLUDE_ASM(code_13870_len_6980, get_npc_by_index); +INCLUDE_ASM("code_13870_len_6980", get_npc_by_index); -INCLUDE_ASM(code_13870_len_6980, func_80038AFC); +INCLUDE_ASM("code_13870_len_6980", func_80038AFC); -INCLUDE_ASM(code_13870_len_6980, func_8003900C); +INCLUDE_ASM("code_13870_len_6980", func_8003900C); -INCLUDE_ASM(code_13870_len_6980, func_800392D8); +INCLUDE_ASM("code_13870_len_6980", func_800392D8); -INCLUDE_ASM(code_13870_len_6980, func_80039688); +INCLUDE_ASM("code_13870_len_6980", func_80039688); -INCLUDE_ASM(code_13870_len_6980, func_800397E8); +INCLUDE_ASM("code_13870_len_6980", func_800397E8); -INCLUDE_ASM(code_13870_len_6980, func_80039930); +INCLUDE_ASM("code_13870_len_6980", func_80039930); -INCLUDE_ASM(code_13870_len_6980, func_80039DA4); +INCLUDE_ASM("code_13870_len_6980", func_80039DA4); -INCLUDE_ASM(code_13870_len_6980, render_npcs); +INCLUDE_ASM("code_13870_len_6980", render_npcs); -INCLUDE_ASM(code_13870_len_6980, npc_move_heading); +INCLUDE_ASM("code_13870_len_6980", npc_move_heading); -Npc* INCLUDE_ASM(code_13870_len_6980, get_npc_unsafe, NpcId npcId); +Npc* INCLUDE_ASM("code_13870_len_6980", get_npc_unsafe, NpcId npcId); -Npc* INCLUDE_ASM(code_13870_len_6980, get_npc_safe, NpcId npcId); +Npc* INCLUDE_ASM("code_13870_len_6980", get_npc_safe, NpcId npcId); -INCLUDE_ASM(code_13870_len_6980, enable_npc_shadow); +INCLUDE_ASM("code_13870_len_6980", enable_npc_shadow); -INCLUDE_ASM(code_13870_len_6980, disable_npc_shadow); +INCLUDE_ASM("code_13870_len_6980", disable_npc_shadow); -INCLUDE_ASM(code_13870_len_6980, func_8003AC5C); +INCLUDE_ASM("code_13870_len_6980", func_8003AC5C); -INCLUDE_ASM(code_13870_len_6980, enable_npc_blur); +INCLUDE_ASM("code_13870_len_6980", enable_npc_blur); -INCLUDE_ASM(code_13870_len_6980, disable_npc_blur); +INCLUDE_ASM("code_13870_len_6980", disable_npc_blur); -INCLUDE_ASM(code_13870_len_6980, update_npc_blur); +INCLUDE_ASM("code_13870_len_6980", update_npc_blur); -INCLUDE_ASM(code_13870_len_6980, render_npc_blur); +INCLUDE_ASM("code_13870_len_6980", render_npc_blur); -INCLUDE_ASM(code_13870_len_6980, func_8003B1A8); +INCLUDE_ASM("code_13870_len_6980", func_8003B1A8); -INCLUDE_ASM(code_13870_len_6980, func_8003B1B0); +INCLUDE_ASM("code_13870_len_6980", func_8003B1B0); -INCLUDE_ASM(code_13870_len_6980, set_npc_yaw); +INCLUDE_ASM("code_13870_len_6980", set_npc_yaw); -INCLUDE_ASM(code_13870_len_6980, func_8003B3D0); +INCLUDE_ASM("code_13870_len_6980", func_8003B3D0); -INCLUDE_ASM(code_13870_len_6980, func_8003B44C); +INCLUDE_ASM("code_13870_len_6980", func_8003B44C); -INCLUDE_ASM(code_13870_len_6980, func_8003B464); +INCLUDE_ASM("code_13870_len_6980", func_8003B464); -INCLUDE_ASM(code_13870_len_6980, func_8003B47C); +INCLUDE_ASM("code_13870_len_6980", func_8003B47C); -INCLUDE_ASM(code_13870_len_6980, func_8003B500); +INCLUDE_ASM("code_13870_len_6980", func_8003B500); -INCLUDE_ASM(code_13870_len_6980, func_8003B5B4); +INCLUDE_ASM("code_13870_len_6980", func_8003B5B4); -INCLUDE_ASM(code_13870_len_6980, func_8003B96C); +INCLUDE_ASM("code_13870_len_6980", func_8003B96C); -INCLUDE_ASM(code_13870_len_6980, func_8003BA60); +INCLUDE_ASM("code_13870_len_6980", func_8003BA60); -INCLUDE_ASM(code_13870_len_6980, func_8003BED8); +INCLUDE_ASM("code_13870_len_6980", func_8003BED8); -INCLUDE_ASM(code_13870_len_6980, func_8003C3D8); +INCLUDE_ASM("code_13870_len_6980", func_8003C3D8); -INCLUDE_ASM(code_13870_len_6980, func_8003C428); +INCLUDE_ASM("code_13870_len_6980", func_8003C428); -INCLUDE_ASM(code_13870_len_6980, func_8003C444); +INCLUDE_ASM("code_13870_len_6980", func_8003C444); -INCLUDE_ASM(code_13870_len_6980, func_8003C53C); +INCLUDE_ASM("code_13870_len_6980", func_8003C53C); -INCLUDE_ASM(code_13870_len_6980, func_8003C61C); +INCLUDE_ASM("code_13870_len_6980", func_8003C61C); -INCLUDE_ASM(code_13870_len_6980, func_8003C658); +INCLUDE_ASM("code_13870_len_6980", func_8003C658); -INCLUDE_ASM(code_13870_len_6980, func_8003C660); +INCLUDE_ASM("code_13870_len_6980", func_8003C660); -INCLUDE_ASM(code_13870_len_6980, func_8003C668); +INCLUDE_ASM("code_13870_len_6980", func_8003C668); -INCLUDE_ASM(code_13870_len_6980, func_8003C78C); +INCLUDE_ASM("code_13870_len_6980", func_8003C78C); -INCLUDE_ASM(code_13870_len_6980, func_8003C7A8); +INCLUDE_ASM("code_13870_len_6980", func_8003C7A8); -INCLUDE_ASM(code_13870_len_6980, func_8003C8AC); +INCLUDE_ASM("code_13870_len_6980", func_8003C8AC); -INCLUDE_ASM(code_13870_len_6980, func_8003C8B4); +INCLUDE_ASM("code_13870_len_6980", func_8003C8B4); -INCLUDE_ASM(code_13870_len_6980, func_8003C984); +INCLUDE_ASM("code_13870_len_6980", func_8003C984); -INCLUDE_ASM(code_13870_len_6980, func_8003C9A8); +INCLUDE_ASM("code_13870_len_6980", func_8003C9A8); -INCLUDE_ASM(code_13870_len_6980, func_8003CB20); +INCLUDE_ASM("code_13870_len_6980", func_8003CB20); -INCLUDE_ASM(code_13870_len_6980, func_8003CB44); +INCLUDE_ASM("code_13870_len_6980", func_8003CB44); -INCLUDE_ASM(code_13870_len_6980, func_8003CC8C); +INCLUDE_ASM("code_13870_len_6980", func_8003CC8C); -INCLUDE_ASM(code_13870_len_6980, func_8003CCB0); +INCLUDE_ASM("code_13870_len_6980", func_8003CCB0); -INCLUDE_ASM(code_13870_len_6980, func_8003CFA0); +INCLUDE_ASM("code_13870_len_6980", func_8003CFA0); -INCLUDE_ASM(code_13870_len_6980, func_8003CFA8); +INCLUDE_ASM("code_13870_len_6980", func_8003CFA8); -INCLUDE_ASM(code_13870_len_6980, func_8003D1D4); +INCLUDE_ASM("code_13870_len_6980", func_8003D1D4); -INCLUDE_ASM(code_13870_len_6980, func_8003D2F8); +INCLUDE_ASM("code_13870_len_6980", func_8003D2F8); -INCLUDE_ASM(code_13870_len_6980, func_8003D3BC); +INCLUDE_ASM("code_13870_len_6980", func_8003D3BC); -INCLUDE_ASM(code_13870_len_6980, func_8003D624); +INCLUDE_ASM("code_13870_len_6980", func_8003D624); -INCLUDE_ASM(code_13870_len_6980, func_8003D660); +INCLUDE_ASM("code_13870_len_6980", func_8003D660); -INCLUDE_ASM(code_13870_len_6980, func_8003D788); +INCLUDE_ASM("code_13870_len_6980", func_8003D788); -INCLUDE_ASM(code_13870_len_6980, func_8003DA38); +INCLUDE_ASM("code_13870_len_6980", func_8003DA38); -INCLUDE_ASM(code_13870_len_6980, func_8003DC38); +INCLUDE_ASM("code_13870_len_6980", func_8003DC38); -INCLUDE_ASM(code_13870_len_6980, func_8003DFA0); +INCLUDE_ASM("code_13870_len_6980", func_8003DFA0); -INCLUDE_ASM(code_13870_len_6980, func_8003E0D4); +INCLUDE_ASM("code_13870_len_6980", func_8003E0D4); -INCLUDE_ASM(code_13870_len_6980, func_8003E1D0); +INCLUDE_ASM("code_13870_len_6980", func_8003E1D0); -INCLUDE_ASM(code_13870_len_6980, COPY_set_defeated); +INCLUDE_ASM("code_13870_len_6980", COPY_set_defeated); -INCLUDE_ASM(code_13870_len_6980, func_8003E338); +INCLUDE_ASM("code_13870_len_6980", func_8003E338); -INCLUDE_ASM(code_13870_len_6980, clear_encounter_status); +INCLUDE_ASM("code_13870_len_6980", clear_encounter_status); -INCLUDE_ASM(code_13870_len_6980, func_8003E514); +INCLUDE_ASM("code_13870_len_6980", func_8003E514); -INCLUDE_ASM(code_13870_len_6980, func_8003E524); +INCLUDE_ASM("code_13870_len_6980", func_8003E524); -INCLUDE_ASM(code_13870_len_6980, func_8003E5B0); +INCLUDE_ASM("code_13870_len_6980", func_8003E5B0); -INCLUDE_ASM(code_13870_len_6980, func_8003E63C); +INCLUDE_ASM("code_13870_len_6980", func_8003E63C); -INCLUDE_ASM(code_13870_len_6980, make_npcs); +INCLUDE_ASM("code_13870_len_6980", make_npcs); -INCLUDE_ASM(code_13870_len_6980, kill_encounter); +INCLUDE_ASM("code_13870_len_6980", kill_encounter); -INCLUDE_ASM(code_13870_len_6980, kill_enemy); +INCLUDE_ASM("code_13870_len_6980", kill_enemy); -INCLUDE_ASM(code_13870_len_6980, bind_enemy_ai); +INCLUDE_ASM("code_13870_len_6980", bind_enemy_ai); -INCLUDE_ASM(code_13870_len_6980, bind_enemy_aux); +INCLUDE_ASM("code_13870_len_6980", bind_enemy_aux); -INCLUDE_ASM(code_13870_len_6980, bind_enemy_interact); +INCLUDE_ASM("code_13870_len_6980", bind_enemy_interact); -INCLUDE_ASM(code_13870_len_6980, bind_npc_ai); +INCLUDE_ASM("code_13870_len_6980", bind_npc_ai); -INCLUDE_ASM(code_13870_len_6980, bind_npc_aux); +INCLUDE_ASM("code_13870_len_6980", bind_npc_aux); -INCLUDE_ASM(code_13870_len_6980, bind_npc_interact); +INCLUDE_ASM("code_13870_len_6980", bind_npc_interact); -INCLUDE_ASM(code_13870_len_6980, get_enemy); +INCLUDE_ASM("code_13870_len_6980", get_enemy); -INCLUDE_ASM(code_13870_len_6980, get_enemy_safe); +INCLUDE_ASM("code_13870_len_6980", get_enemy_safe); diff --git a/src/code_163400.c b/src/code_163400.c index b10240e597..7ebe3f4604 100644 --- a/src/code_163400.c +++ b/src/code_163400.c @@ -1,23 +1,23 @@ #include "common.h" -INCLUDE_ASM(code_163400, func_80242BA0); +INCLUDE_ASM("code_163400", func_80242BA0); -INCLUDE_ASM(code_163400, func_80242D94); +INCLUDE_ASM("code_163400", func_80242D94); -INCLUDE_ASM(code_163400, func_80242DEC); +INCLUDE_ASM("code_163400", func_80242DEC); -INCLUDE_ASM(code_163400, func_80242E00); +INCLUDE_ASM("code_163400", func_80242E00); -INCLUDE_ASM(code_163400, func_80242F68); +INCLUDE_ASM("code_163400", func_80242F68); -INCLUDE_ASM(code_163400, func_802431A0); +INCLUDE_ASM("code_163400", func_802431A0); -INCLUDE_ASM(code_163400, func_802448E0); +INCLUDE_ASM("code_163400", func_802448E0); -INCLUDE_ASM(code_163400, func_80244B00); +INCLUDE_ASM("code_163400", func_80244B00); -INCLUDE_ASM(code_163400, func_80244BC4); +INCLUDE_ASM("code_163400", func_80244BC4); -INCLUDE_ASM(code_163400, func_80244FD4); +INCLUDE_ASM("code_163400", func_80244FD4); -INCLUDE_ASM(code_163400, func_8024544C); +INCLUDE_ASM("code_163400", func_8024544C); diff --git a/src/code_167570.c b/src/code_167570.c index 98c90f23f9..0b39ad335d 100644 --- a/src/code_167570.c +++ b/src/code_167570.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_167570, func_80246D10); +INCLUDE_ASM("code_167570", func_80246D10); diff --git a/src/code_168590.c b/src/code_168590.c index a242afcae6..10a8b90798 100644 --- a/src/code_168590.c +++ b/src/code_168590.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_168590, func_80247D30); +INCLUDE_ASM("code_168590", func_80247D30); diff --git a/src/code_169BE0.c b/src/code_169BE0.c index 4ce14ac464..c56d8b8d61 100644 --- a/src/code_169BE0.c +++ b/src/code_169BE0.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(code_169BE0, func_80249380); +INCLUDE_ASM("code_169BE0", func_80249380); -INCLUDE_ASM(code_169BE0, func_8024997C); +INCLUDE_ASM("code_169BE0", func_8024997C); -INCLUDE_ASM(code_169BE0, func_80249AA4); +INCLUDE_ASM("code_169BE0", func_80249AA4); -INCLUDE_ASM(code_169BE0, func_80249AB8); +INCLUDE_ASM("code_169BE0", func_80249AB8); diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index 8f95594ddc..3398e48135 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -1,1101 +1,1101 @@ #include "common.h" -INCLUDE_ASM(code_16c8e0, get_dpad_input_radial); +INCLUDE_ASM("code_16c8e0", get_dpad_input_radial); -INCLUDE_ASM(code_16c8e0, func_8023E104); +INCLUDE_ASM("code_16c8e0", func_8023E104); -INCLUDE_ASM(code_16c8e0, func_8023E11C); +INCLUDE_ASM("code_16c8e0", func_8023E11C); -INCLUDE_ASM(code_16c8e0, initialize_battle); +INCLUDE_ASM("code_16c8e0", initialize_battle); -INCLUDE_ASM(code_16c8e0, func_8023E404); +INCLUDE_ASM("code_16c8e0", func_8023E404); -INCLUDE_ASM(code_16c8e0, update_battle_state); +INCLUDE_ASM("code_16c8e0", update_battle_state); -INCLUDE_ASM(code_16c8e0, draw_main_battle_ui); +INCLUDE_ASM("code_16c8e0", draw_main_battle_ui); -INCLUDE_ASM(code_16c8e0, func_8023F060); +INCLUDE_ASM("code_16c8e0", func_8023F060); -INCLUDE_ASM(code_16c8e0, func_8023FFA0); +INCLUDE_ASM("code_16c8e0", func_8023FFA0); -INCLUDE_ASM(code_16c8e0, update_starpoints_display); +INCLUDE_ASM("code_16c8e0", update_starpoints_display); -INCLUDE_ASM(code_16c8e0, func_802409F4); +INCLUDE_ASM("code_16c8e0", func_802409F4); -INCLUDE_ASM(code_16c8e0, func_80240AA8); +INCLUDE_ASM("code_16c8e0", func_80240AA8); -INCLUDE_ASM(code_16c8e0, delete_actor); +INCLUDE_ASM("code_16c8e0", delete_actor); -INCLUDE_ASM(code_16c8e0, delete_player_actor); +INCLUDE_ASM("code_16c8e0", delete_player_actor); -INCLUDE_ASM(code_16c8e0, func_80240E60); +INCLUDE_ASM("code_16c8e0", func_80240E60); -INCLUDE_ASM(code_16c8e0, func_80240FDC); +INCLUDE_ASM("code_16c8e0", func_80240FDC); -INCLUDE_ASM(code_16c8e0, func_80241190); +INCLUDE_ASM("code_16c8e0", func_80241190); -INCLUDE_ASM(code_16c8e0, begin_battle); +INCLUDE_ASM("code_16c8e0", begin_battle); -INCLUDE_ASM(code_16c8e0, func_80241AB8); +INCLUDE_ASM("code_16c8e0", func_80241AB8); -INCLUDE_ASM(code_16c8e0, func_80241B14); +INCLUDE_ASM("code_16c8e0", func_80241B14); -INCLUDE_ASM(code_16c8e0, func_8024201C); +INCLUDE_ASM("code_16c8e0", func_8024201C); -INCLUDE_ASM(code_16c8e0, update_heroes_end_turn); +INCLUDE_ASM("code_16c8e0", update_heroes_end_turn); -INCLUDE_ASM(code_16c8e0, func_80242AC0); +INCLUDE_ASM("code_16c8e0", func_80242AC0); -INCLUDE_ASM(code_16c8e0, switch_to_player); +INCLUDE_ASM("code_16c8e0", switch_to_player); -INCLUDE_ASM(code_16c8e0, func_80242BA8); +INCLUDE_ASM("code_16c8e0", func_80242BA8); -INCLUDE_ASM(code_16c8e0, update_partner_change_turn); +INCLUDE_ASM("code_16c8e0", update_partner_change_turn); -INCLUDE_ASM(code_16c8e0, func_80242EF8); +INCLUDE_ASM("code_16c8e0", func_80242EF8); -INCLUDE_ASM(code_16c8e0, switch_to_partner); +INCLUDE_ASM("code_16c8e0", switch_to_partner); -INCLUDE_ASM(code_16c8e0, func_80242FD8); +INCLUDE_ASM("code_16c8e0", func_80242FD8); -INCLUDE_ASM(code_16c8e0, func_80242FE0); +INCLUDE_ASM("code_16c8e0", func_80242FE0); -INCLUDE_ASM(code_16c8e0, func_80243910); +INCLUDE_ASM("code_16c8e0", func_80243910); -INCLUDE_ASM(code_16c8e0, switch_order); +INCLUDE_ASM("code_16c8e0", switch_order); -INCLUDE_ASM(code_16c8e0, func_802439D0); +INCLUDE_ASM("code_16c8e0", func_802439D0); -INCLUDE_ASM(code_16c8e0, func_802439D8); +INCLUDE_ASM("code_16c8e0", func_802439D8); -INCLUDE_ASM(code_16c8e0, func_80243FD4); +INCLUDE_ASM("code_16c8e0", func_80243FD4); -INCLUDE_ASM(code_16c8e0, func_80243FDC); +INCLUDE_ASM("code_16c8e0", func_80243FDC); -INCLUDE_ASM(code_16c8e0, func_80244000); +INCLUDE_ASM("code_16c8e0", func_80244000); -INCLUDE_ASM(code_16c8e0, func_80244008); +INCLUDE_ASM("code_16c8e0", func_80244008); -INCLUDE_ASM(code_16c8e0, func_80244708); +INCLUDE_ASM("code_16c8e0", func_80244708); -INCLUDE_ASM(code_16c8e0, func_80244710); +INCLUDE_ASM("code_16c8e0", func_80244710); -INCLUDE_ASM(code_16c8e0, func_80244A48); +INCLUDE_ASM("code_16c8e0", func_80244A48); -INCLUDE_ASM(code_16c8e0, end_battle); +INCLUDE_ASM("code_16c8e0", end_battle); -INCLUDE_ASM(code_16c8e0, func_80244D90); +INCLUDE_ASM("code_16c8e0", func_80244D90); -INCLUDE_ASM(code_16c8e0, func_80244E38); +INCLUDE_ASM("code_16c8e0", func_80244E38); -INCLUDE_ASM(code_16c8e0, func_80244EF8); +INCLUDE_ASM("code_16c8e0", func_80244EF8); -INCLUDE_ASM(code_16c8e0, update_run_away); +INCLUDE_ASM("code_16c8e0", update_run_away); -INCLUDE_ASM(code_16c8e0, func_80245438); +INCLUDE_ASM("code_16c8e0", func_80245438); -INCLUDE_ASM(code_16c8e0, func_80245440); +INCLUDE_ASM("code_16c8e0", func_80245440); -INCLUDE_ASM(code_16c8e0, func_802456B0); +INCLUDE_ASM("code_16c8e0", func_802456B0); -INCLUDE_API_ASM(code_16c8e0, EnablePartnerBlur); +INCLUDE_API_ASM("code_16c8e0", EnablePartnerBlur); -INCLUDE_API_ASM(code_16c8e0, DisablePartnerBlur); +INCLUDE_API_ASM("code_16c8e0", DisablePartnerBlur); -INCLUDE_ASM(code_16c8e0, update_swap_partner); +INCLUDE_ASM("code_16c8e0", update_swap_partner); -INCLUDE_ASM(code_16c8e0, func_80245AC8); +INCLUDE_ASM("code_16c8e0", func_80245AC8); -INCLUDE_ASM(code_16c8e0, update_player_action); +INCLUDE_ASM("code_16c8e0", update_player_action); -INCLUDE_ASM(code_16c8e0, func_80246448); +INCLUDE_ASM("code_16c8e0", func_80246448); -INCLUDE_ASM(code_16c8e0, update_player_change_turn); +INCLUDE_ASM("code_16c8e0", update_player_change_turn); -INCLUDE_ASM(code_16c8e0, func_80246B2C); +INCLUDE_ASM("code_16c8e0", func_80246B2C); -INCLUDE_ASM(code_16c8e0, update_partner_action); +INCLUDE_ASM("code_16c8e0", update_partner_action); -INCLUDE_ASM(code_16c8e0, func_80247214); +INCLUDE_ASM("code_16c8e0", func_80247214); -INCLUDE_ASM(code_16c8e0, func_8024721C); +INCLUDE_ASM("code_16c8e0", func_8024721C); -INCLUDE_ASM(code_16c8e0, func_802472A4); +INCLUDE_ASM("code_16c8e0", func_802472A4); -INCLUDE_ASM(code_16c8e0, update_enemy_change_turn); +INCLUDE_ASM("code_16c8e0", update_enemy_change_turn); -INCLUDE_ASM(code_16c8e0, func_80247568); +INCLUDE_ASM("code_16c8e0", func_80247568); -INCLUDE_ASM(code_16c8e0, update_enemy_action); +INCLUDE_ASM("code_16c8e0", update_enemy_action); -INCLUDE_ASM(code_16c8e0, func_80247AFC); +INCLUDE_ASM("code_16c8e0", func_80247AFC); -INCLUDE_ASM(code_16c8e0, func_80247B04); +INCLUDE_ASM("code_16c8e0", func_80247B04); -INCLUDE_ASM(code_16c8e0, func_802480F0); +INCLUDE_ASM("code_16c8e0", func_802480F0); -INCLUDE_ASM(code_16c8e0, func_80248190); +INCLUDE_ASM("code_16c8e0", func_80248190); -INCLUDE_ASM(code_16c8e0, func_802485FC); +INCLUDE_ASM("code_16c8e0", func_802485FC); -INCLUDE_ASM(code_16c8e0, func_80248660); +INCLUDE_ASM("code_16c8e0", func_80248660); -INCLUDE_ASM(code_16c8e0, func_80248AA4); +INCLUDE_ASM("code_16c8e0", func_80248AA4); -INCLUDE_ASM(code_16c8e0, func_80248B08); +INCLUDE_ASM("code_16c8e0", func_80248B08); -INCLUDE_ASM(code_16c8e0, func_80248D78); +INCLUDE_ASM("code_16c8e0", func_80248D78); -INCLUDE_ASM(code_16c8e0, use_cam_preset); +INCLUDE_ASM("code_16c8e0", use_cam_preset); -INCLUDE_ASM(code_16c8e0, func_8024E3D8); +INCLUDE_ASM("code_16c8e0", func_8024E3D8); -INCLUDE_ASM(code_16c8e0, func_8024E40C); +INCLUDE_ASM("code_16c8e0", func_8024E40C); -INCLUDE_ASM(code_16c8e0, cam_target_actor); +INCLUDE_ASM("code_16c8e0", cam_target_actor); -INCLUDE_ASM(code_16c8e0, func_8024E45C); +INCLUDE_ASM("code_16c8e0", func_8024E45C); -INCLUDE_ASM(code_16c8e0, func_8024E484); +INCLUDE_ASM("code_16c8e0", func_8024E484); -INCLUDE_ASM(code_16c8e0, move_cam_over); +INCLUDE_ASM("code_16c8e0", move_cam_over); -INCLUDE_ASM(code_16c8e0, set_cam_target_pos); +INCLUDE_ASM("code_16c8e0", set_cam_target_pos); -INCLUDE_ASM(code_16c8e0, func_8024E584); +INCLUDE_ASM("code_16c8e0", func_8024E584); -INCLUDE_ASM(code_16c8e0, set_cam_zoom); +INCLUDE_ASM("code_16c8e0", set_cam_zoom); -INCLUDE_ASM(code_16c8e0, add_cam_zoom); +INCLUDE_ASM("code_16c8e0", add_cam_zoom); -INCLUDE_ASM(code_16c8e0, set_cam_zoffset); +INCLUDE_ASM("code_16c8e0", set_cam_zoffset); -INCLUDE_ASM(code_16c8e0, unfreeze_cam); +INCLUDE_ASM("code_16c8e0", unfreeze_cam); -INCLUDE_ASM(code_16c8e0, func_8024E60C); +INCLUDE_ASM("code_16c8e0", func_8024E60C); -INCLUDE_API_ASM(code_16c8e0, UseCamPreset); +INCLUDE_API_ASM("code_16c8e0", UseCamPreset); -INCLUDE_API_ASM(code_16c8e0, SetBattleCamTarget); +INCLUDE_API_ASM("code_16c8e0", SetBattleCamTarget); -INCLUDE_API_ASM(code_16c8e0, SetBattleCamOffsetZ); +INCLUDE_API_ASM("code_16c8e0", SetBattleCamOffsetZ); -INCLUDE_API_ASM(code_16c8e0, AddBattleCamOffsetZ); +INCLUDE_API_ASM("code_16c8e0", AddBattleCamOffsetZ); -INCLUDE_API_ASM(code_16c8e0, SetBattleCamYaw); +INCLUDE_API_ASM("code_16c8e0", SetBattleCamYaw); -INCLUDE_API_ASM(code_16c8e0, BattleCamTargetActor); +INCLUDE_API_ASM("code_16c8e0", BattleCamTargetActor); -INCLUDE_API_ASM(code_16c8e0, MoveBattleCamOver); +INCLUDE_API_ASM("code_16c8e0", MoveBattleCamOver); -INCLUDE_API_ASM(code_16c8e0, SetBattleCamZoom); +INCLUDE_API_ASM("code_16c8e0", SetBattleCamZoom); -INCLUDE_API_ASM(code_16c8e0, AddBattleCamZoom); +INCLUDE_API_ASM("code_16c8e0", AddBattleCamZoom); -INCLUDE_API_ASM(code_16c8e0, FreezeBattleCam); +INCLUDE_API_ASM("code_16c8e0", FreezeBattleCam); -INCLUDE_ASM(code_16c8e0, func_8024EDC0); +INCLUDE_ASM("code_16c8e0", func_8024EDC0); -INCLUDE_ASM(code_16c8e0, func_8024EE48); +INCLUDE_ASM("code_16c8e0", func_8024EE48); -INCLUDE_ASM(code_16c8e0, func_8024EEA8); +INCLUDE_ASM("code_16c8e0", func_8024EEA8); -INCLUDE_ASM(code_16c8e0, func_8024EF08); +INCLUDE_ASM("code_16c8e0", func_8024EF08); -INCLUDE_ASM(code_16c8e0, create_popup); +INCLUDE_ASM("code_16c8e0", create_popup); -INCLUDE_ASM(code_16c8e0, func_8024EFA4); +INCLUDE_ASM("code_16c8e0", func_8024EFA4); -INCLUDE_ASM(code_16c8e0, func_8024EFE0); +INCLUDE_ASM("code_16c8e0", func_8024EFE0); -INCLUDE_ASM(code_16c8e0, func_8024F7C8); +INCLUDE_ASM("code_16c8e0", func_8024F7C8); -INCLUDE_ASM(code_16c8e0, show_battle_message); +INCLUDE_ASM("code_16c8e0", show_battle_message); -INCLUDE_ASM(code_16c8e0, show_variable_battle_message); +INCLUDE_ASM("code_16c8e0", show_variable_battle_message); -INCLUDE_ASM(code_16c8e0, is_popup_displayed); +INCLUDE_ASM("code_16c8e0", is_popup_displayed); -INCLUDE_ASM(code_16c8e0, set_popup_duration); +INCLUDE_ASM("code_16c8e0", set_popup_duration); -INCLUDE_ASM(code_16c8e0, func_8024FAE8); +INCLUDE_ASM("code_16c8e0", func_8024FAE8); -INCLUDE_ASM(code_16c8e0, func_8024FAFC); +INCLUDE_ASM("code_16c8e0", func_8024FAFC); -INCLUDE_ASM(code_16c8e0, close_action_command_instruction_popup); +INCLUDE_ASM("code_16c8e0", close_action_command_instruction_popup); -INCLUDE_ASM(code_16c8e0, show_message_popup); +INCLUDE_ASM("code_16c8e0", show_message_popup); -INCLUDE_API_ASM(code_16c8e0, ShowMessageBox); +INCLUDE_API_ASM("code_16c8e0", ShowMessageBox); -INCLUDE_API_ASM(code_16c8e0, ShowVariableMessageBox); +INCLUDE_API_ASM("code_16c8e0", ShowVariableMessageBox); -INCLUDE_API_ASM(code_16c8e0, IsMessageBoxDisplayed); +INCLUDE_API_ASM("code_16c8e0", IsMessageBoxDisplayed); -INCLUDE_API_ASM(code_16c8e0, WaitForMessageBoxDone); +INCLUDE_API_ASM("code_16c8e0", WaitForMessageBoxDone); -INCLUDE_API_ASM(code_16c8e0, ForceCloseMessageBox); +INCLUDE_API_ASM("code_16c8e0", ForceCloseMessageBox); -INCLUDE_API_ASM(code_16c8e0, SetMessageBoxDuration); +INCLUDE_API_ASM("code_16c8e0", SetMessageBoxDuration); -INCLUDE_ASM(code_16c8e0, func_80251474); +INCLUDE_ASM("code_16c8e0", func_80251474); -INCLUDE_ASM(code_16c8e0, calc_item_check_hit); +INCLUDE_ASM("code_16c8e0", calc_item_check_hit); -INCLUDE_ASM(code_16c8e0, calc_item_damage_enemy); +INCLUDE_ASM("code_16c8e0", calc_item_damage_enemy); -INCLUDE_API_ASM(code_16c8e0, ItemDamageEnemy); +INCLUDE_API_ASM("code_16c8e0", ItemDamageEnemy); -INCLUDE_API_ASM(code_16c8e0, ItemAfflictEnemy); +INCLUDE_API_ASM("code_16c8e0", ItemAfflictEnemy); -INCLUDE_API_ASM(code_16c8e0, ItemCheckHit); +INCLUDE_API_ASM("code_16c8e0", ItemCheckHit); -INCLUDE_API_ASM(code_16c8e0, ActorSpeak); +INCLUDE_API_ASM("code_16c8e0", ActorSpeak); -INCLUDE_API_ASM(code_16c8e0, EndActorSpeech); +INCLUDE_API_ASM("code_16c8e0", EndActorSpeech); -INCLUDE_API_ASM(code_16c8e0, ShowBattleChoice); +INCLUDE_API_ASM("code_16c8e0", ShowBattleChoice); -INCLUDE_API_ASM(code_16c8e0, OverrideBattleDmaDest); +INCLUDE_API_ASM("code_16c8e0", OverrideBattleDmaDest); -INCLUDE_API_ASM(code_16c8e0, LoadBattleDmaData); +INCLUDE_API_ASM("code_16c8e0", LoadBattleDmaData); -INCLUDE_API_ASM(code_16c8e0, PlaySoundAtActor); +INCLUDE_API_ASM("code_16c8e0", PlaySoundAtActor); -INCLUDE_API_ASM(code_16c8e0, PlaySoundAtPart); +INCLUDE_API_ASM("code_16c8e0", PlaySoundAtPart); -INCLUDE_API_ASM(code_16c8e0, SetForegroundModelsVisibleUnchecked); +INCLUDE_API_ASM("code_16c8e0", SetForegroundModelsVisibleUnchecked); -INCLUDE_API_ASM(code_16c8e0, SetForegroundModelsVisible); +INCLUDE_API_ASM("code_16c8e0", SetForegroundModelsVisible); -INCLUDE_API_ASM(code_16c8e0, MakeStatusField); +INCLUDE_API_ASM("code_16c8e0", MakeStatusField); -INCLUDE_ASM(code_16c8e0, is_actor_hp_bar_visible); +INCLUDE_ASM("code_16c8e0", is_actor_hp_bar_visible); -INCLUDE_ASM(code_16c8e0, is_actortype_hpbar_visible); +INCLUDE_ASM("code_16c8e0", is_actortype_hpbar_visible); -INCLUDE_ASM(code_16c8e0, save_tattle_flags); +INCLUDE_ASM("code_16c8e0", save_tattle_flags); -INCLUDE_ASM(code_16c8e0, load_tattle_flags); +INCLUDE_ASM("code_16c8e0", load_tattle_flags); -INCLUDE_API_ASM(code_16c8e0, MultiplyByActorScale); +INCLUDE_API_ASM("code_16c8e0", MultiplyByActorScale); -INCLUDE_API_ASM(code_16c8e0, MultiplyVec2ByActorScale); +INCLUDE_API_ASM("code_16c8e0", MultiplyVec2ByActorScale); -INCLUDE_API_ASM(code_16c8e0, MultiplyVec3ByActorScale); +INCLUDE_API_ASM("code_16c8e0", MultiplyVec3ByActorScale); -INCLUDE_API_ASM(code_16c8e0, ApplyShrinkFromOwner); +INCLUDE_API_ASM("code_16c8e0", ApplyShrinkFromOwner); -INCLUDE_API_ASM(code_16c8e0, StartRumble); +INCLUDE_API_ASM("code_16c8e0", StartRumble); -INCLUDE_ASM(code_16c8e0, func_80254250); +INCLUDE_ASM("code_16c8e0", func_80254250); -INCLUDE_ASM(code_16c8e0, mtx_mirror_y); +INCLUDE_ASM("code_16c8e0", mtx_mirror_y); -INCLUDE_ASM(code_16c8e0, enable_actor_blur); +INCLUDE_ASM("code_16c8e0", enable_actor_blur); -INCLUDE_ASM(code_16c8e0, disable_actor_blur); +INCLUDE_ASM("code_16c8e0", disable_actor_blur); -INCLUDE_ASM(code_16c8e0, func_802545AC); +INCLUDE_ASM("code_16c8e0", func_802545AC); -INCLUDE_ASM(code_16c8e0, func_80254610); +INCLUDE_ASM("code_16c8e0", func_80254610); -INCLUDE_ASM(code_16c8e0, enable_partner_blur); +INCLUDE_ASM("code_16c8e0", enable_partner_blur); -INCLUDE_ASM(code_16c8e0, disable_partner_blur); +INCLUDE_ASM("code_16c8e0", disable_partner_blur); -INCLUDE_ASM(code_16c8e0, enable_player_blur); +INCLUDE_ASM("code_16c8e0", enable_player_blur); -INCLUDE_ASM(code_16c8e0, disable_player_blur); +INCLUDE_ASM("code_16c8e0", disable_player_blur); -INCLUDE_ASM(code_16c8e0, func_80254950); +INCLUDE_ASM("code_16c8e0", func_80254950); -INCLUDE_ASM(code_16c8e0, func_802549A0); +INCLUDE_ASM("code_16c8e0", func_802549A0); -INCLUDE_ASM(code_16c8e0, func_802549C0); +INCLUDE_ASM("code_16c8e0", func_802549C0); -INCLUDE_ASM(code_16c8e0, func_802549F4); +INCLUDE_ASM("code_16c8e0", func_802549F4); -INCLUDE_ASM(code_16c8e0, func_802550BC); +INCLUDE_ASM("code_16c8e0", func_802550BC); -INCLUDE_ASM(code_16c8e0, func_802552EC); +INCLUDE_ASM("code_16c8e0", func_802552EC); -INCLUDE_ASM(code_16c8e0, func_8025593C); +INCLUDE_ASM("code_16c8e0", func_8025593C); -INCLUDE_ASM(code_16c8e0, func_8025597C); +INCLUDE_ASM("code_16c8e0", func_8025597C); -INCLUDE_ASM(code_16c8e0, func_802559BC); +INCLUDE_ASM("code_16c8e0", func_802559BC); -INCLUDE_ASM(code_16c8e0, func_80255F5C); +INCLUDE_ASM("code_16c8e0", func_80255F5C); -INCLUDE_ASM(code_16c8e0, func_80255FAC); +INCLUDE_ASM("code_16c8e0", func_80255FAC); -INCLUDE_ASM(code_16c8e0, func_80255FD8); +INCLUDE_ASM("code_16c8e0", func_80255FD8); -INCLUDE_ASM(code_16c8e0, func_80255FE0); +INCLUDE_ASM("code_16c8e0", func_80255FE0); -INCLUDE_ASM(code_16c8e0, func_802571F0); +INCLUDE_ASM("code_16c8e0", func_802571F0); -INCLUDE_ASM(code_16c8e0, func_80257BAC); +INCLUDE_ASM("code_16c8e0", func_80257BAC); -INCLUDE_ASM(code_16c8e0, func_802591EC); +INCLUDE_ASM("code_16c8e0", func_802591EC); -INCLUDE_ASM(code_16c8e0, func_80259494); +INCLUDE_ASM("code_16c8e0", func_80259494); -INCLUDE_ASM(code_16c8e0, func_8025950C); +INCLUDE_ASM("code_16c8e0", func_8025950C); -INCLUDE_ASM(code_16c8e0, func_802596C0); +INCLUDE_ASM("code_16c8e0", func_802596C0); -INCLUDE_ASM(code_16c8e0, func_802597B0); +INCLUDE_ASM("code_16c8e0", func_802597B0); -INCLUDE_ASM(code_16c8e0, func_8025995C); +INCLUDE_ASM("code_16c8e0", func_8025995C); -INCLUDE_ASM(code_16c8e0, func_80259A48); +INCLUDE_ASM("code_16c8e0", func_80259A48); -INCLUDE_ASM(code_16c8e0, func_80259AAC); +INCLUDE_ASM("code_16c8e0", func_80259AAC); -INCLUDE_ASM(code_16c8e0, func_80259D9C); +INCLUDE_ASM("code_16c8e0", func_80259D9C); -INCLUDE_ASM(code_16c8e0, func_8025A2C4); +INCLUDE_ASM("code_16c8e0", func_8025A2C4); -INCLUDE_ASM(code_16c8e0, func_8025A50C); +INCLUDE_ASM("code_16c8e0", func_8025A50C); -INCLUDE_ASM(code_16c8e0, func_8025A74C); +INCLUDE_ASM("code_16c8e0", func_8025A74C); -INCLUDE_ASM(code_16c8e0, func_8025AA80); +INCLUDE_ASM("code_16c8e0", func_8025AA80); -INCLUDE_ASM(code_16c8e0, func_8025AD90); +INCLUDE_ASM("code_16c8e0", func_8025AD90); -INCLUDE_ASM(code_16c8e0, func_8025B1A8); +INCLUDE_ASM("code_16c8e0", func_8025B1A8); -INCLUDE_ASM(code_16c8e0, func_8025B5C0); +INCLUDE_ASM("code_16c8e0", func_8025B5C0); -INCLUDE_ASM(code_16c8e0, func_8025BAA0); +INCLUDE_ASM("code_16c8e0", func_8025BAA0); -INCLUDE_ASM(code_16c8e0, func_8025C120); +INCLUDE_ASM("code_16c8e0", func_8025C120); -INCLUDE_ASM(code_16c8e0, func_8025C840); +INCLUDE_ASM("code_16c8e0", func_8025C840); -INCLUDE_ASM(code_16c8e0, func_8025C8A0); +INCLUDE_ASM("code_16c8e0", func_8025C8A0); -INCLUDE_ASM(code_16c8e0, func_8025C918); +INCLUDE_ASM("code_16c8e0", func_8025C918); -INCLUDE_ASM(code_16c8e0, func_8025CCC8); +INCLUDE_ASM("code_16c8e0", func_8025CCC8); -INCLUDE_ASM(code_16c8e0, func_8025CD28); +INCLUDE_ASM("code_16c8e0", func_8025CD28); -INCLUDE_ASM(code_16c8e0, func_8025CD40); +INCLUDE_ASM("code_16c8e0", func_8025CD40); -INCLUDE_ASM(code_16c8e0, func_8025CEC8); +INCLUDE_ASM("code_16c8e0", func_8025CEC8); -INCLUDE_ASM(code_16c8e0, _remove_part_decoration); +INCLUDE_ASM("code_16c8e0", _remove_part_decoration); -INCLUDE_ASM(code_16c8e0, func_8025D150); +INCLUDE_ASM("code_16c8e0", func_8025D150); -INCLUDE_ASM(code_16c8e0, func_8025D158); +INCLUDE_ASM("code_16c8e0", func_8025D158); -INCLUDE_ASM(code_16c8e0, func_8025D160); +INCLUDE_ASM("code_16c8e0", func_8025D160); -INCLUDE_ASM(code_16c8e0, func_8025D290); +INCLUDE_ASM("code_16c8e0", func_8025D290); -INCLUDE_ASM(code_16c8e0, func_8025D2B0); +INCLUDE_ASM("code_16c8e0", func_8025D2B0); -INCLUDE_ASM(code_16c8e0, func_8025D3C4); +INCLUDE_ASM("code_16c8e0", func_8025D3C4); -INCLUDE_ASM(code_16c8e0, func_8025D3CC); +INCLUDE_ASM("code_16c8e0", func_8025D3CC); -INCLUDE_ASM(code_16c8e0, func_8025D4A0); +INCLUDE_ASM("code_16c8e0", func_8025D4A0); -INCLUDE_ASM(code_16c8e0, func_8025D4C8); +INCLUDE_ASM("code_16c8e0", func_8025D4C8); -INCLUDE_ASM(code_16c8e0, func_8025D620); +INCLUDE_ASM("code_16c8e0", func_8025D620); -INCLUDE_ASM(code_16c8e0, func_8025D640); +INCLUDE_ASM("code_16c8e0", func_8025D640); -INCLUDE_ASM(code_16c8e0, func_8025D6FC); +INCLUDE_ASM("code_16c8e0", func_8025D6FC); -INCLUDE_ASM(code_16c8e0, func_8025D71C); +INCLUDE_ASM("code_16c8e0", func_8025D71C); -INCLUDE_ASM(code_16c8e0, func_8025D810); +INCLUDE_ASM("code_16c8e0", func_8025D810); -INCLUDE_ASM(code_16c8e0, func_8025D830); +INCLUDE_ASM("code_16c8e0", func_8025D830); -INCLUDE_ASM(code_16c8e0, func_8025D8EC); +INCLUDE_ASM("code_16c8e0", func_8025D8EC); -INCLUDE_ASM(code_16c8e0, func_8025D90C); +INCLUDE_ASM("code_16c8e0", func_8025D90C); -INCLUDE_ASM(code_16c8e0, func_8025DA60); +INCLUDE_ASM("code_16c8e0", func_8025DA60); -INCLUDE_ASM(code_16c8e0, func_8025DA68); +INCLUDE_ASM("code_16c8e0", func_8025DA68); -INCLUDE_ASM(code_16c8e0, func_8025DBC8); +INCLUDE_ASM("code_16c8e0", func_8025DBC8); -INCLUDE_ASM(code_16c8e0, func_8025DBD0); +INCLUDE_ASM("code_16c8e0", func_8025DBD0); -INCLUDE_ASM(code_16c8e0, func_8025DD40); +INCLUDE_ASM("code_16c8e0", func_8025DD40); -INCLUDE_ASM(code_16c8e0, func_8025DD60); +INCLUDE_ASM("code_16c8e0", func_8025DD60); -INCLUDE_ASM(code_16c8e0, func_8025DE88); +INCLUDE_ASM("code_16c8e0", func_8025DE88); -INCLUDE_ASM(code_16c8e0, func_8025E190); +INCLUDE_ASM("code_16c8e0", func_8025E190); -INCLUDE_ASM(code_16c8e0, func_8025FF8C); +INCLUDE_ASM("code_16c8e0", func_8025FF8C); -INCLUDE_ASM(code_16c8e0, func_802601BC); +INCLUDE_ASM("code_16c8e0", func_802601BC); -INCLUDE_ASM(code_16c8e0, func_80260A60); +INCLUDE_ASM("code_16c8e0", func_80260A60); -INCLUDE_ASM(code_16c8e0, activate_defend_command); +INCLUDE_ASM("code_16c8e0", activate_defend_command); -INCLUDE_API_ASM(code_16c8e0, HasMerleeCastsLeft); +INCLUDE_API_ASM("code_16c8e0", HasMerleeCastsLeft); -INCLUDE_API_ASM(code_16c8e0, FXRecoverHP); +INCLUDE_API_ASM("code_16c8e0", FXRecoverHP); -INCLUDE_API_ASM(code_16c8e0, FXRecoverFP); +INCLUDE_API_ASM("code_16c8e0", FXRecoverFP); -INCLUDE_API_ASM(code_16c8e0, IncrementPlayerHP); +INCLUDE_API_ASM("code_16c8e0", IncrementPlayerHP); -INCLUDE_API_ASM(code_16c8e0, IncrementPlayerFP); +INCLUDE_API_ASM("code_16c8e0", IncrementPlayerFP); -INCLUDE_ASM(code_16c8e0, create_target_list); +INCLUDE_ASM("code_16c8e0", create_target_list); -INCLUDE_ASM(code_16c8e0, player_create_target_list); +INCLUDE_ASM("code_16c8e0", player_create_target_list); -INCLUDE_ASM(code_16c8e0, enemy_create_target_list); +INCLUDE_ASM("code_16c8e0", enemy_create_target_list); -INCLUDE_ASM(code_16c8e0, func_80263064); +INCLUDE_ASM("code_16c8e0", func_80263064); -INCLUDE_ASM(code_16c8e0, func_80263230); +INCLUDE_ASM("code_16c8e0", func_80263230); -INCLUDE_ASM(code_16c8e0, func_80263268); +INCLUDE_ASM("code_16c8e0", func_80263268); -INCLUDE_ASM(code_16c8e0, func_80263300); +INCLUDE_ASM("code_16c8e0", func_80263300); -INCLUDE_ASM(code_16c8e0, func_802633E8); +INCLUDE_ASM("code_16c8e0", func_802633E8); -INCLUDE_ASM(code_16c8e0, func_80263434); +INCLUDE_ASM("code_16c8e0", func_80263434); -INCLUDE_ASM(code_16c8e0, func_80263464); +INCLUDE_ASM("code_16c8e0", func_80263464); -INCLUDE_ASM(code_16c8e0, func_802634B8); +INCLUDE_ASM("code_16c8e0", func_802634B8); -INCLUDE_ASM(code_16c8e0, func_802636E4); +INCLUDE_ASM("code_16c8e0", func_802636E4); -INCLUDE_ASM(code_16c8e0, func_80263914); +INCLUDE_ASM("code_16c8e0", func_80263914); -INCLUDE_ASM(code_16c8e0, count_power_plus); +INCLUDE_ASM("code_16c8e0", count_power_plus); -INCLUDE_ASM(code_16c8e0, deduct_current_move_fp); +INCLUDE_ASM("code_16c8e0", deduct_current_move_fp); -INCLUDE_ASM(code_16c8e0, func_80263C60); +INCLUDE_ASM("code_16c8e0", func_80263C60); -INCLUDE_ASM(code_16c8e0, set_animation); +INCLUDE_ASM("code_16c8e0", set_animation); -INCLUDE_ASM(code_16c8e0, func_80263E08); +INCLUDE_ASM("code_16c8e0", func_80263E08); -INCLUDE_ASM(code_16c8e0, set_animation_rate); +INCLUDE_ASM("code_16c8e0", set_animation_rate); -INCLUDE_ASM(code_16c8e0, set_actor_yaw); +INCLUDE_ASM("code_16c8e0", set_actor_yaw); -INCLUDE_ASM(code_16c8e0, set_part_yaw); +INCLUDE_ASM("code_16c8e0", set_part_yaw); -INCLUDE_ASM(code_16c8e0, add_xz_vec3f); +INCLUDE_ASM("code_16c8e0", add_xz_vec3f); -INCLUDE_ASM(code_16c8e0, add_xz_vec3f_copy1); +INCLUDE_ASM("code_16c8e0", add_xz_vec3f_copy1); -INCLUDE_ASM(code_16c8e0, add_xz_vec3f_copy2); +INCLUDE_ASM("code_16c8e0", add_xz_vec3f_copy2); -INCLUDE_ASM(code_16c8e0, play_movement_dust_effects); +INCLUDE_ASM("code_16c8e0", play_movement_dust_effects); -INCLUDE_ASM(code_16c8e0, get_actor_part); +INCLUDE_ASM("code_16c8e0", get_actor_part); -INCLUDE_ASM(code_16c8e0, load_player_actor); +INCLUDE_ASM("code_16c8e0", load_player_actor); -INCLUDE_ASM(code_16c8e0, load_partner_actor); +INCLUDE_ASM("code_16c8e0", load_partner_actor); -INCLUDE_ASM(code_16c8e0, create_actor); +INCLUDE_ASM("code_16c8e0", create_actor); -INCLUDE_ASM(code_16c8e0, func_80265CE8); +INCLUDE_ASM("code_16c8e0", func_80265CE8); -INCLUDE_ASM(code_16c8e0, func_80265D44); +INCLUDE_ASM("code_16c8e0", func_80265D44); -INCLUDE_ASM(code_16c8e0, lookup_defense); +INCLUDE_ASM("code_16c8e0", lookup_defense); -INCLUDE_ASM(code_16c8e0, lookup_status_chance); +INCLUDE_ASM("code_16c8e0", lookup_status_chance); -INCLUDE_ASM(code_16c8e0, lookup_status_duration_mod); +INCLUDE_ASM("code_16c8e0", lookup_status_duration_mod); -INCLUDE_ASM(code_16c8e0, inflict_status); +INCLUDE_ASM("code_16c8e0", inflict_status); -INCLUDE_ASM(code_16c8e0, inflict_partner_ko); +INCLUDE_ASM("code_16c8e0", inflict_partner_ko); -INCLUDE_ASM(code_16c8e0, get_defense); +INCLUDE_ASM("code_16c8e0", get_defense); -INCLUDE_ASM(code_16c8e0, func_802664DC); +INCLUDE_ASM("code_16c8e0", func_802664DC); -INCLUDE_ASM(code_16c8e0, show_damage_popup); +INCLUDE_ASM("code_16c8e0", show_damage_popup); -INCLUDE_ASM(code_16c8e0, func_80266684); +INCLUDE_ASM("code_16c8e0", func_80266684); -INCLUDE_ASM(code_16c8e0, func_802666E4); +INCLUDE_ASM("code_16c8e0", func_802666E4); -INCLUDE_ASM(code_16c8e0, func_802667F0); +INCLUDE_ASM("code_16c8e0", func_802667F0); -INCLUDE_ASM(code_16c8e0, func_80266970); +INCLUDE_ASM("code_16c8e0", func_80266970); -INCLUDE_ASM(code_16c8e0, func_80266978); +INCLUDE_ASM("code_16c8e0", func_80266978); -INCLUDE_ASM(code_16c8e0, func_80266ADC); +INCLUDE_ASM("code_16c8e0", func_80266ADC); -INCLUDE_ASM(code_16c8e0, func_80266AF8); +INCLUDE_ASM("code_16c8e0", func_80266AF8); -INCLUDE_ASM(code_16c8e0, func_80266B14); +INCLUDE_ASM("code_16c8e0", func_80266B14); -INCLUDE_ASM(code_16c8e0, try_inflict_status); +INCLUDE_ASM("code_16c8e0", try_inflict_status); -INCLUDE_ASM(code_16c8e0, inflict_status_set_duration); +INCLUDE_ASM("code_16c8e0", inflict_status_set_duration); -INCLUDE_ASM(code_16c8e0, func_80266D6C); +INCLUDE_ASM("code_16c8e0", func_80266D6C); -INCLUDE_ASM(code_16c8e0, func_80266DAC); +INCLUDE_ASM("code_16c8e0", func_80266DAC); -INCLUDE_ASM(code_16c8e0, func_80266E14); +INCLUDE_ASM("code_16c8e0", func_80266E14); -INCLUDE_ASM(code_16c8e0, func_80266E40); +INCLUDE_ASM("code_16c8e0", func_80266E40); -INCLUDE_ASM(code_16c8e0, func_80266EA8); +INCLUDE_ASM("code_16c8e0", func_80266EA8); -INCLUDE_ASM(code_16c8e0, func_80266EE8); +INCLUDE_ASM("code_16c8e0", func_80266EE8); -INCLUDE_ASM(code_16c8e0, func_80266FD8); +INCLUDE_ASM("code_16c8e0", func_80266FD8); -INCLUDE_ASM(code_16c8e0, func_80267018); +INCLUDE_ASM("code_16c8e0", func_80267018); -INCLUDE_ASM(code_16c8e0, func_8026709C); +INCLUDE_ASM("code_16c8e0", func_8026709C); -INCLUDE_ASM(code_16c8e0, add_part_decoration); +INCLUDE_ASM("code_16c8e0", add_part_decoration); -INCLUDE_ASM(code_16c8e0, add_actor_decoration); +INCLUDE_ASM("code_16c8e0", add_actor_decoration); -INCLUDE_ASM(code_16c8e0, remove_part_decoration); +INCLUDE_ASM("code_16c8e0", remove_part_decoration); -INCLUDE_ASM(code_16c8e0, remove_actor_decoration); +INCLUDE_ASM("code_16c8e0", remove_actor_decoration); -INCLUDE_ASM(code_16c8e0, heroes_is_ability_active); +INCLUDE_ASM("code_16c8e0", heroes_is_ability_active); -INCLUDE_ASM(code_16c8e0, create_part_shadow); +INCLUDE_ASM("code_16c8e0", create_part_shadow); -INCLUDE_ASM(code_16c8e0, remove_part_shadow); +INCLUDE_ASM("code_16c8e0", remove_part_shadow); -INCLUDE_ASM(code_16c8e0, remove_player_buffs); +INCLUDE_ASM("code_16c8e0", remove_player_buffs); -INCLUDE_ASM(code_16c8e0, func_8026777C); +INCLUDE_ASM("code_16c8e0", func_8026777C); -INCLUDE_ASM(code_16c8e0, func_8026787C); +INCLUDE_ASM("code_16c8e0", func_8026787C); -INCLUDE_ASM(code_16c8e0, func_80267A3C); +INCLUDE_ASM("code_16c8e0", func_80267A3C); -INCLUDE_ASM(code_16c8e0, reset_all_actor_sounds); +INCLUDE_ASM("code_16c8e0", reset_all_actor_sounds); -INCLUDE_ASM(code_16c8e0, hide_foreground_models_unchecked); +INCLUDE_ASM("code_16c8e0", hide_foreground_models_unchecked); -INCLUDE_ASM(code_16c8e0, show_foreground_models_unchecked); +INCLUDE_ASM("code_16c8e0", show_foreground_models_unchecked); -INCLUDE_ASM(code_16c8e0, hide_foreground_models); +INCLUDE_ASM("code_16c8e0", hide_foreground_models); -INCLUDE_ASM(code_16c8e0, show_foreground_models); +INCLUDE_ASM("code_16c8e0", show_foreground_models); -INCLUDE_API_ASM(code_16c8e0, StartRumbleWithParams); +INCLUDE_API_ASM("code_16c8e0", StartRumbleWithParams); -INCLUDE_ASM(code_16c8e0, start_rumble_type); +INCLUDE_ASM("code_16c8e0", start_rumble_type); -INCLUDE_API_ASM(code_16c8e0, LoadItemScript); +INCLUDE_API_ASM("code_16c8e0", LoadItemScript); -INCLUDE_API_ASM(code_16c8e0, LoadFreeItemScript); +INCLUDE_API_ASM("code_16c8e0", LoadFreeItemScript); -INCLUDE_API_ASM(code_16c8e0, LoadMoveScript); +INCLUDE_API_ASM("code_16c8e0", LoadMoveScript); -INCLUDE_API_ASM(code_16c8e0, LoadActionCommand); +INCLUDE_API_ASM("code_16c8e0", LoadActionCommand); -INCLUDE_ASM(code_16c8e0, func_80268284); +INCLUDE_ASM("code_16c8e0", func_80268284); -INCLUDE_ASM(code_16c8e0, func_80268C9C); +INCLUDE_ASM("code_16c8e0", func_80268C9C); -INCLUDE_ASM(code_16c8e0, func_80268E88); +INCLUDE_ASM("code_16c8e0", func_80268E88); -INCLUDE_ASM(code_16c8e0, check_block_input); +INCLUDE_ASM("code_16c8e0", check_block_input); -INCLUDE_API_ASM(code_16c8e0, GetActionSuccess); +INCLUDE_API_ASM("code_16c8e0", GetActionSuccess); -INCLUDE_API_ASM(code_16c8e0, SetActionSuccess); +INCLUDE_API_ASM("code_16c8e0", SetActionSuccess); -INCLUDE_API_ASM(code_16c8e0, CloseActionCommandInfo); +INCLUDE_API_ASM("code_16c8e0", CloseActionCommandInfo); -INCLUDE_API_ASM(code_16c8e0, GetActionSuccessCopy); +INCLUDE_API_ASM("code_16c8e0", GetActionSuccessCopy); -INCLUDE_API_ASM(code_16c8e0, GetBlockResult); +INCLUDE_API_ASM("code_16c8e0", GetBlockResult); -INCLUDE_ASM(code_16c8e0, count_targets); +INCLUDE_ASM("code_16c8e0", count_targets); -INCLUDE_ASM(code_16c8e0, get_nearest_home_index); +INCLUDE_ASM("code_16c8e0", get_nearest_home_index); -INCLUDE_ASM(code_16c8e0, set_goal_pos_to_part); +INCLUDE_ASM("code_16c8e0", set_goal_pos_to_part); -INCLUDE_ASM(code_16c8e0, set_part_goal_to_actor_part); +INCLUDE_ASM("code_16c8e0", set_part_goal_to_actor_part); -INCLUDE_ASM(code_16c8e0, set_actor_current_position); +INCLUDE_ASM("code_16c8e0", set_actor_current_position); -INCLUDE_ASM(code_16c8e0, set_part_absolute_position); +INCLUDE_ASM("code_16c8e0", set_part_absolute_position); -INCLUDE_ASM(code_16c8e0, set_actor_home_position); +INCLUDE_ASM("code_16c8e0", set_actor_home_position); -INCLUDE_ASM(code_16c8e0, get_actor); +INCLUDE_ASM("code_16c8e0", get_actor); -INCLUDE_API_ASM(code_16c8e0, LoadBattleSection); +INCLUDE_API_ASM("code_16c8e0", LoadBattleSection); -INCLUDE_API_ASM(code_16c8e0, GetBattlePhase); +INCLUDE_API_ASM("code_16c8e0", GetBattlePhase); -INCLUDE_API_ASM(code_16c8e0, GetLastElement); +INCLUDE_API_ASM("code_16c8e0", GetLastElement); -INCLUDE_API_ASM(code_16c8e0, SetGoalToHome); +INCLUDE_API_ASM("code_16c8e0", SetGoalToHome); -INCLUDE_API_ASM(code_16c8e0, SetIdleGoalToHome); +INCLUDE_API_ASM("code_16c8e0", SetIdleGoalToHome); -INCLUDE_API_ASM(code_16c8e0, SetGoalToIndex); +INCLUDE_API_ASM("code_16c8e0", SetGoalToIndex); -INCLUDE_API_ASM(code_16c8e0, GetIndexFromPos); +INCLUDE_API_ASM("code_16c8e0", GetIndexFromPos); -INCLUDE_API_ASM(code_16c8e0, GetIndexFromHome); +INCLUDE_API_ASM("code_16c8e0", GetIndexFromHome); -INCLUDE_API_ASM(code_16c8e0, CountPlayerTargets); +INCLUDE_API_ASM("code_16c8e0", CountPlayerTargets); -INCLUDE_API_ASM(code_16c8e0, ForceHomePos); +INCLUDE_API_ASM("code_16c8e0", ForceHomePos); -INCLUDE_API_ASM(code_16c8e0, SetHomePos); +INCLUDE_API_ASM("code_16c8e0", SetHomePos); -INCLUDE_API_ASM(code_16c8e0, SetGoalToTarget); +INCLUDE_API_ASM("code_16c8e0", SetGoalToTarget); -INCLUDE_API_ASM(code_16c8e0, SetPartGoalToTarget); +INCLUDE_API_ASM("code_16c8e0", SetPartGoalToTarget); -INCLUDE_API_ASM(code_16c8e0, SetGoalToFirstTarget); +INCLUDE_API_ASM("code_16c8e0", SetGoalToFirstTarget); -INCLUDE_API_ASM(code_16c8e0, SetGoalPos); +INCLUDE_API_ASM("code_16c8e0", SetGoalPos); -INCLUDE_API_ASM(code_16c8e0, SetIdleGoal); +INCLUDE_API_ASM("code_16c8e0", SetIdleGoal); -INCLUDE_API_ASM(code_16c8e0, AddGoalPos); +INCLUDE_API_ASM("code_16c8e0", AddGoalPos); -INCLUDE_API_ASM(code_16c8e0, GetGoalPos); +INCLUDE_API_ASM("code_16c8e0", GetGoalPos); -INCLUDE_API_ASM(code_16c8e0, GetIdleGoal); +INCLUDE_API_ASM("code_16c8e0", GetIdleGoal); -INCLUDE_API_ASM(code_16c8e0, GetPartTarget); +INCLUDE_API_ASM("code_16c8e0", GetPartTarget); -INCLUDE_API_ASM(code_16c8e0, GetActorPos); +INCLUDE_API_ASM("code_16c8e0", GetActorPos); -INCLUDE_API_ASM(code_16c8e0, GetPartOffset); +INCLUDE_API_ASM("code_16c8e0", GetPartOffset); -INCLUDE_API_ASM(code_16c8e0, GetPartPos); +INCLUDE_API_ASM("code_16c8e0", GetPartPos); -INCLUDE_API_ASM(code_16c8e0, GetHomePos); +INCLUDE_API_ASM("code_16c8e0", GetHomePos); -INCLUDE_API_ASM(code_16c8e0, SetActorPos); +INCLUDE_API_ASM("code_16c8e0", SetActorPos); -INCLUDE_API_ASM(code_16c8e0, SetPartPos); +INCLUDE_API_ASM("code_16c8e0", SetPartPos); -INCLUDE_API_ASM(code_16c8e0, SetEnemyTargetOffset); +INCLUDE_API_ASM("code_16c8e0", SetEnemyTargetOffset); -INCLUDE_API_ASM(code_16c8e0, SetAnimation); +INCLUDE_API_ASM("code_16c8e0", SetAnimation); -INCLUDE_API_ASM(code_16c8e0, GetAnimation); +INCLUDE_API_ASM("code_16c8e0", GetAnimation); -INCLUDE_API_ASM(code_16c8e0, SetAnimationRate); +INCLUDE_API_ASM("code_16c8e0", SetAnimationRate); -INCLUDE_API_ASM(code_16c8e0, SetActorYaw); +INCLUDE_API_ASM("code_16c8e0", SetActorYaw); -INCLUDE_API_ASM(code_16c8e0, GetActorYaw); +INCLUDE_API_ASM("code_16c8e0", GetActorYaw); -INCLUDE_API_ASM(code_16c8e0, SetPartYaw); +INCLUDE_API_ASM("code_16c8e0", SetPartYaw); -INCLUDE_API_ASM(code_16c8e0, GetPartYaw); +INCLUDE_API_ASM("code_16c8e0", GetPartYaw); -INCLUDE_API_ASM(code_16c8e0, SetActorJumpGravity); +INCLUDE_API_ASM("code_16c8e0", SetActorJumpGravity); -INCLUDE_API_ASM(code_16c8e0, SetActorIdleJumpGravity); +INCLUDE_API_ASM("code_16c8e0", SetActorIdleJumpGravity); -INCLUDE_API_ASM(code_16c8e0, SetActorSpeed); +INCLUDE_API_ASM("code_16c8e0", SetActorSpeed); -INCLUDE_API_ASM(code_16c8e0, SetActorIdleSpeed); +INCLUDE_API_ASM("code_16c8e0", SetActorIdleSpeed); -INCLUDE_API_ASM(code_16c8e0, SetPartJumpGravity); +INCLUDE_API_ASM("code_16c8e0", SetPartJumpGravity); -INCLUDE_API_ASM(code_16c8e0, SetPartMoveSpeed); +INCLUDE_API_ASM("code_16c8e0", SetPartMoveSpeed); -INCLUDE_API_ASM(code_16c8e0, SetJumpAnimations); +INCLUDE_API_ASM("code_16c8e0", SetJumpAnimations); -INCLUDE_API_ASM(code_16c8e0, AddActorPos); +INCLUDE_API_ASM("code_16c8e0", AddActorPos); -INCLUDE_API_ASM(code_16c8e0, SetActorDispOffset); +INCLUDE_API_ASM("code_16c8e0", SetActorDispOffset); -INCLUDE_API_ASM(code_16c8e0, GetPartDispOffset); +INCLUDE_API_ASM("code_16c8e0", GetPartDispOffset); -INCLUDE_API_ASM(code_16c8e0, SetPartDispOffset); +INCLUDE_API_ASM("code_16c8e0", SetPartDispOffset); -INCLUDE_API_ASM(code_16c8e0, AddPartDispOffset); +INCLUDE_API_ASM("code_16c8e0", AddPartDispOffset); -INCLUDE_API_ASM(code_16c8e0, GetActorVar); +INCLUDE_API_ASM("code_16c8e0", GetActorVar); -INCLUDE_API_ASM(code_16c8e0, SetActorVar); +INCLUDE_API_ASM("code_16c8e0", SetActorVar); -INCLUDE_API_ASM(code_16c8e0, AddActorVar); +INCLUDE_API_ASM("code_16c8e0", AddActorVar); -INCLUDE_API_ASM(code_16c8e0, GetPartMovementVar); +INCLUDE_API_ASM("code_16c8e0", GetPartMovementVar); -INCLUDE_API_ASM(code_16c8e0, SetPartMovementVar); +INCLUDE_API_ASM("code_16c8e0", SetPartMovementVar); -INCLUDE_API_ASM(code_16c8e0, AddPartMovementVar); +INCLUDE_API_ASM("code_16c8e0", AddPartMovementVar); -INCLUDE_API_ASM(code_16c8e0, SetActorRotation); +INCLUDE_API_ASM("code_16c8e0", SetActorRotation); -INCLUDE_API_ASM(code_16c8e0, SetActorRotationOffset); +INCLUDE_API_ASM("code_16c8e0", SetActorRotationOffset); -INCLUDE_API_ASM(code_16c8e0, GetActorRotation); +INCLUDE_API_ASM("code_16c8e0", GetActorRotation); -INCLUDE_API_ASM(code_16c8e0, SetPartRotation); +INCLUDE_API_ASM("code_16c8e0", SetPartRotation); -INCLUDE_API_ASM(code_16c8e0, SetPartRotationOffset); +INCLUDE_API_ASM("code_16c8e0", SetPartRotationOffset); -INCLUDE_API_ASM(code_16c8e0, GetPartRotation); +INCLUDE_API_ASM("code_16c8e0", GetPartRotation); -INCLUDE_API_ASM(code_16c8e0, SetActorScale); +INCLUDE_API_ASM("code_16c8e0", SetActorScale); -INCLUDE_API_ASM(code_16c8e0, SetActorScaleModifier); +INCLUDE_API_ASM("code_16c8e0", SetActorScaleModifier); -INCLUDE_API_ASM(code_16c8e0, GetActorScale); +INCLUDE_API_ASM("code_16c8e0", GetActorScale); -INCLUDE_API_ASM(code_16c8e0, SetPartScale); +INCLUDE_API_ASM("code_16c8e0", SetPartScale); -INCLUDE_API_ASM(code_16c8e0, GetPartScale); +INCLUDE_API_ASM("code_16c8e0", GetPartScale); -INCLUDE_API_ASM(code_16c8e0, GetBattleFlags); +INCLUDE_API_ASM("code_16c8e0", GetBattleFlags); -INCLUDE_API_ASM(code_16c8e0, SetBattleFlagBits); +INCLUDE_API_ASM("code_16c8e0", SetBattleFlagBits); -INCLUDE_API_ASM(code_16c8e0, GetBattleFlags2); +INCLUDE_API_ASM("code_16c8e0", GetBattleFlags2); -INCLUDE_API_ASM(code_16c8e0, SetBattleFlagBits2); +INCLUDE_API_ASM("code_16c8e0", SetBattleFlagBits2); -INCLUDE_API_ASM(code_16c8e0, SetActorFlags); +INCLUDE_API_ASM("code_16c8e0", SetActorFlags); -INCLUDE_API_ASM(code_16c8e0, SetActorFlagBits); +INCLUDE_API_ASM("code_16c8e0", SetActorFlagBits); -INCLUDE_API_ASM(code_16c8e0, GetActorFlags); +INCLUDE_API_ASM("code_16c8e0", GetActorFlags); -INCLUDE_API_ASM(code_16c8e0, SetPartFlags); +INCLUDE_API_ASM("code_16c8e0", SetPartFlags); -INCLUDE_API_ASM(code_16c8e0, SetPartFlagBits); +INCLUDE_API_ASM("code_16c8e0", SetPartFlagBits); -INCLUDE_API_ASM(code_16c8e0, SetPartTargetFlags); +INCLUDE_API_ASM("code_16c8e0", SetPartTargetFlags); -INCLUDE_API_ASM(code_16c8e0, SetPartTargetFlagBits); +INCLUDE_API_ASM("code_16c8e0", SetPartTargetFlagBits); -INCLUDE_API_ASM(code_16c8e0, GetPartFlags); +INCLUDE_API_ASM("code_16c8e0", GetPartFlags); -INCLUDE_API_ASM(code_16c8e0, GetPartTargetFlags); +INCLUDE_API_ASM("code_16c8e0", GetPartTargetFlags); -INCLUDE_API_ASM(code_16c8e0, SetPartEventFlags); +INCLUDE_API_ASM("code_16c8e0", SetPartEventFlags); -INCLUDE_API_ASM(code_16c8e0, SetPartEventBits); +INCLUDE_API_ASM("code_16c8e0", SetPartEventBits); -INCLUDE_API_ASM(code_16c8e0, GetPartEventFlags); +INCLUDE_API_ASM("code_16c8e0", GetPartEventFlags); -INCLUDE_API_ASM(code_16c8e0, HPBarToHome); +INCLUDE_API_ASM("code_16c8e0", HPBarToHome); -INCLUDE_API_ASM(code_16c8e0, HPBarToCurrent); +INCLUDE_API_ASM("code_16c8e0", HPBarToCurrent); -INCLUDE_API_ASM(code_16c8e0, SummonEnemy); +INCLUDE_API_ASM("code_16c8e0", SummonEnemy); -INCLUDE_API_ASM(code_16c8e0, GetOwnerID); +INCLUDE_API_ASM("code_16c8e0", GetOwnerID); -INCLUDE_API_ASM(code_16c8e0, SetOwnerID); +INCLUDE_API_ASM("code_16c8e0", SetOwnerID); -INCLUDE_API_ASM(code_16c8e0, ActorExists); +INCLUDE_API_ASM("code_16c8e0", ActorExists); -INCLUDE_API_ASM(code_16c8e0, SetBattleInputMask); +INCLUDE_API_ASM("code_16c8e0", SetBattleInputMask); -INCLUDE_API_ASM(code_16c8e0, SetBattleInputButtons); +INCLUDE_API_ASM("code_16c8e0", SetBattleInputButtons); -INCLUDE_API_ASM(code_16c8e0, CheckButtonPress); +INCLUDE_API_ASM("code_16c8e0", CheckButtonPress); -INCLUDE_API_ASM(code_16c8e0, CheckButtonHeld); +INCLUDE_API_ASM("code_16c8e0", CheckButtonHeld); -INCLUDE_API_ASM(code_16c8e0, CheckButtonDown); +INCLUDE_API_ASM("code_16c8e0", CheckButtonDown); -INCLUDE_API_ASM(code_16c8e0, GetBattleState); +INCLUDE_API_ASM("code_16c8e0", GetBattleState); -INCLUDE_API_ASM(code_16c8e0, PlayerCreateTargetList); +INCLUDE_API_ASM("code_16c8e0", PlayerCreateTargetList); -INCLUDE_API_ASM(code_16c8e0, EnemyCreateTargetList); +INCLUDE_API_ASM("code_16c8e0", EnemyCreateTargetList); -INCLUDE_API_ASM(code_16c8e0, InitTargetIterator); +INCLUDE_API_ASM("code_16c8e0", InitTargetIterator); -INCLUDE_API_ASM(code_16c8e0, SetOwnerTarget); +INCLUDE_API_ASM("code_16c8e0", SetOwnerTarget); -INCLUDE_API_ASM(code_16c8e0, ChooseNextTarget); +INCLUDE_API_ASM("code_16c8e0", ChooseNextTarget); -INCLUDE_API_ASM(code_16c8e0, GetTargetListLength); +INCLUDE_API_ASM("code_16c8e0", GetTargetListLength); -INCLUDE_API_ASM(code_16c8e0, GetOwnerTarget); +INCLUDE_API_ASM("code_16c8e0", GetOwnerTarget); -INCLUDE_API_ASM(code_16c8e0, GetPlayerActorID); +INCLUDE_API_ASM("code_16c8e0", GetPlayerActorID); -INCLUDE_API_ASM(code_16c8e0, GetDistanceToGoal); +INCLUDE_API_ASM("code_16c8e0", GetDistanceToGoal); -INCLUDE_API_ASM(code_16c8e0, AddActorDecoration); +INCLUDE_API_ASM("code_16c8e0", AddActorDecoration); -INCLUDE_API_ASM(code_16c8e0, RemoveActorDecoration); +INCLUDE_API_ASM("code_16c8e0", RemoveActorDecoration); -INCLUDE_API_ASM(code_16c8e0, ModifyActorDecoration); +INCLUDE_API_ASM("code_16c8e0", ModifyActorDecoration); -INCLUDE_API_ASM(code_16c8e0, UseIdleAnimation); +INCLUDE_API_ASM("code_16c8e0", UseIdleAnimation); -INCLUDE_API_ASM(code_16c8e0, GetStatusFlags); +INCLUDE_API_ASM("code_16c8e0", GetStatusFlags); -INCLUDE_API_ASM(code_16c8e0, RemovePlayerBuffs); +INCLUDE_API_ASM("code_16c8e0", RemovePlayerBuffs); -INCLUDE_API_ASM(code_16c8e0, SetPartAlpha); +INCLUDE_API_ASM("code_16c8e0", SetPartAlpha); -INCLUDE_API_ASM(code_16c8e0, CreatePartShadow); +INCLUDE_API_ASM("code_16c8e0", CreatePartShadow); -INCLUDE_API_ASM(code_16c8e0, RemovePartShadow); +INCLUDE_API_ASM("code_16c8e0", RemovePartShadow); -INCLUDE_API_ASM(code_16c8e0, SetBattleVar); +INCLUDE_API_ASM("code_16c8e0", SetBattleVar); -INCLUDE_API_ASM(code_16c8e0, GetBattleVar); +INCLUDE_API_ASM("code_16c8e0", GetBattleVar); -INCLUDE_API_ASM(code_16c8e0, ResetAllActorSounds); +INCLUDE_API_ASM("code_16c8e0", ResetAllActorSounds); -INCLUDE_API_ASM(code_16c8e0, SetActorSounds); +INCLUDE_API_ASM("code_16c8e0", SetActorSounds); -INCLUDE_API_ASM(code_16c8e0, ResetActorSounds); +INCLUDE_API_ASM("code_16c8e0", ResetActorSounds); -INCLUDE_API_ASM(code_16c8e0, SetPartSounds); +INCLUDE_API_ASM("code_16c8e0", SetPartSounds); -INCLUDE_API_ASM(code_16c8e0, SetActorType); +INCLUDE_API_ASM("code_16c8e0", SetActorType); -INCLUDE_API_ASM(code_16c8e0, ShowShockEffect); +INCLUDE_API_ASM("code_16c8e0", ShowShockEffect); -INCLUDE_API_ASM(code_16c8e0, GetActorAttackBoost); +INCLUDE_API_ASM("code_16c8e0", GetActorAttackBoost); -INCLUDE_API_ASM(code_16c8e0, GetActorDefenseBoost); +INCLUDE_API_ASM("code_16c8e0", GetActorDefenseBoost); -INCLUDE_API_ASM(code_16c8e0, BoostAttack); +INCLUDE_API_ASM("code_16c8e0", BoostAttack); -INCLUDE_API_ASM(code_16c8e0, BoostDefense); +INCLUDE_API_ASM("code_16c8e0", BoostDefense); -INCLUDE_API_ASM(code_16c8e0, VanishActor); +INCLUDE_API_ASM("code_16c8e0", VanishActor); -INCLUDE_API_ASM(code_16c8e0, ElectrifyActor); +INCLUDE_API_ASM("code_16c8e0", ElectrifyActor); -INCLUDE_API_ASM(code_16c8e0, HealActor); +INCLUDE_API_ASM("code_16c8e0", HealActor); -INCLUDE_API_ASM(code_16c8e0, WaitForBuffDone); +INCLUDE_API_ASM("code_16c8e0", WaitForBuffDone); -INCLUDE_API_ASM(code_16c8e0, CopyBuffs); +INCLUDE_API_ASM("code_16c8e0", CopyBuffs); -INCLUDE_ASM(code_16c8e0, dispatch_event_player); +INCLUDE_ASM("code_16c8e0", dispatch_event_player); -INCLUDE_ASM(code_16c8e0, dispatch_event_player_continue_turn); +INCLUDE_ASM("code_16c8e0", dispatch_event_player_continue_turn); -INCLUDE_ASM(code_16c8e0, calc_player_test_enemy); +INCLUDE_ASM("code_16c8e0", calc_player_test_enemy); -INCLUDE_ASM(code_16c8e0, calc_player_damage_enemy); +INCLUDE_ASM("code_16c8e0", calc_player_damage_enemy); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_player); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_player); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_player_0); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_player_0); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_player_1); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_player_1); -INCLUDE_API_ASM(code_16c8e0, GetMenuSelection); +INCLUDE_API_ASM("code_16c8e0", GetMenuSelection); -INCLUDE_API_ASM(code_16c8e0, PlayerFallToGoal); +INCLUDE_API_ASM("code_16c8e0", PlayerFallToGoal); -INCLUDE_API_ASM(code_16c8e0, PlayerLandJump); +INCLUDE_API_ASM("code_16c8e0", PlayerLandJump); -INCLUDE_API_ASM(code_16c8e0, PlayerRunToGoal); +INCLUDE_API_ASM("code_16c8e0", PlayerRunToGoal); -INCLUDE_API_ASM(code_16c8e0, CancelablePlayerRunToGoal); +INCLUDE_API_ASM("code_16c8e0", CancelablePlayerRunToGoal); -INCLUDE_API_ASM(code_16c8e0, GetPlayerHP); +INCLUDE_API_ASM("code_16c8e0", GetPlayerHP); -INCLUDE_API_ASM(code_16c8e0, PlayerDamageEnemy); +INCLUDE_API_ASM("code_16c8e0", PlayerDamageEnemy); -INCLUDE_API_ASM(code_16c8e0, PlayerPowerBounceEnemy); +INCLUDE_API_ASM("code_16c8e0", PlayerPowerBounceEnemy); -INCLUDE_API_ASM(code_16c8e0, PlayerTestEnemy); +INCLUDE_API_ASM("code_16c8e0", PlayerTestEnemy); -INCLUDE_API_ASM(code_16c8e0, DispatchDamagePlayerEvent); +INCLUDE_API_ASM("code_16c8e0", DispatchDamagePlayerEvent); -INCLUDE_API_ASM(code_16c8e0, EnablePlayerBlur); +INCLUDE_API_ASM("code_16c8e0", EnablePlayerBlur); -INCLUDE_API_ASM(code_16c8e0, DidActionSucceed); +INCLUDE_API_ASM("code_16c8e0", DidActionSucceed); -INCLUDE_ASM(code_16c8e0, func_80276F50); +INCLUDE_ASM("code_16c8e0", func_80276F50); -INCLUDE_ASM(code_16c8e0, dispatch_event_general); +INCLUDE_ASM("code_16c8e0", dispatch_event_general); -INCLUDE_ASM(code_16c8e0, play_hit_sound); +INCLUDE_ASM("code_16c8e0", play_hit_sound); -INCLUDE_ASM(code_16c8e0, dispatch_event_actor); +INCLUDE_ASM("code_16c8e0", dispatch_event_actor); -INCLUDE_ASM(code_16c8e0, calc_enemy_test_target); +INCLUDE_ASM("code_16c8e0", calc_enemy_test_target); -INCLUDE_ASM(code_16c8e0, calc_enemy_damage_target); +INCLUDE_ASM("code_16c8e0", calc_enemy_damage_target); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_actor); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_actor); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_actor_0); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_actor_0); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_actor_1); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_actor_1); -INCLUDE_API_ASM(code_16c8e0, BindTakeTurn); +INCLUDE_API_ASM("code_16c8e0", BindTakeTurn); -INCLUDE_API_ASM(code_16c8e0, PauseTakeTurn); +INCLUDE_API_ASM("code_16c8e0", PauseTakeTurn); -INCLUDE_API_ASM(code_16c8e0, ResumeTakeTurn); +INCLUDE_API_ASM("code_16c8e0", ResumeTakeTurn); -INCLUDE_API_ASM(code_16c8e0, BindIdle); +INCLUDE_API_ASM("code_16c8e0", BindIdle); -INCLUDE_API_ASM(code_16c8e0, EnableIdleScript); +INCLUDE_API_ASM("code_16c8e0", EnableIdleScript); -INCLUDE_API_ASM(code_16c8e0, BindHandleEvent); +INCLUDE_API_ASM("code_16c8e0", BindHandleEvent); -INCLUDE_API_ASM(code_16c8e0, BindNextTurn); +INCLUDE_API_ASM("code_16c8e0", BindNextTurn); -INCLUDE_API_ASM(code_16c8e0, JumpToGoal); +INCLUDE_API_ASM("code_16c8e0", JumpToGoal); -INCLUDE_API_ASM(code_16c8e0, IdleJumpToGoal); +INCLUDE_API_ASM("code_16c8e0", IdleJumpToGoal); -INCLUDE_API_ASM(code_16c8e0, JumpToGoalSimple2); +INCLUDE_API_ASM("code_16c8e0", JumpToGoalSimple2); -INCLUDE_API_ASM(code_16c8e0, JumpWithBounce); +INCLUDE_API_ASM("code_16c8e0", JumpWithBounce); -INCLUDE_API_ASM(code_16c8e0, LandJump); +INCLUDE_API_ASM("code_16c8e0", LandJump); -INCLUDE_API_ASM(code_16c8e0, FallToGoal); +INCLUDE_API_ASM("code_16c8e0", FallToGoal); -INCLUDE_API_ASM(code_16c8e0, RunToGoal); +INCLUDE_API_ASM("code_16c8e0", RunToGoal); -INCLUDE_API_ASM(code_16c8e0, IdleRunToGoal); +INCLUDE_API_ASM("code_16c8e0", IdleRunToGoal); -INCLUDE_API_ASM(code_16c8e0, JumpPartTo); +INCLUDE_API_ASM("code_16c8e0", JumpPartTo); -INCLUDE_API_ASM(code_16c8e0, FallPartTo); +INCLUDE_API_ASM("code_16c8e0", FallPartTo); -INCLUDE_API_ASM(code_16c8e0, LandJumpPart); +INCLUDE_API_ASM("code_16c8e0", LandJumpPart); -INCLUDE_API_ASM(code_16c8e0, RunPartTo); +INCLUDE_API_ASM("code_16c8e0", RunPartTo); -INCLUDE_ASM(code_16c8e0, update_lerp_battle); +INCLUDE_ASM("code_16c8e0", update_lerp_battle); -INCLUDE_API_ASM(code_16c8e0, FlyToGoal); +INCLUDE_API_ASM("code_16c8e0", FlyToGoal); -INCLUDE_API_ASM(code_16c8e0, IdleFlyToGoal); +INCLUDE_API_ASM("code_16c8e0", IdleFlyToGoal); -INCLUDE_API_ASM(code_16c8e0, FlyPartTo); +INCLUDE_API_ASM("code_16c8e0", FlyPartTo); -INCLUDE_API_ASM(code_16c8e0, GetLastEvent); +INCLUDE_API_ASM("code_16c8e0", GetLastEvent); -INCLUDE_API_ASM(code_16c8e0, SetTargetActor); +INCLUDE_API_ASM("code_16c8e0", SetTargetActor); -INCLUDE_API_ASM(code_16c8e0, SetEnemyHP); +INCLUDE_API_ASM("code_16c8e0", SetEnemyHP); -INCLUDE_API_ASM(code_16c8e0, GetActorHP); +INCLUDE_API_ASM("code_16c8e0", GetActorHP); -INCLUDE_API_ASM(code_16c8e0, GetEnemyMaxHP); +INCLUDE_API_ASM("code_16c8e0", GetEnemyMaxHP); -INCLUDE_API_ASM(code_16c8e0, RemoveActor); +INCLUDE_API_ASM("code_16c8e0", RemoveActor); -INCLUDE_API_ASM(code_16c8e0, DropStarPoints); +INCLUDE_API_ASM("code_16c8e0", DropStarPoints); -INCLUDE_API_ASM(code_16c8e0, SetDefenseTable); +INCLUDE_API_ASM("code_16c8e0", SetDefenseTable); -INCLUDE_API_ASM(code_16c8e0, SetStatusTable); +INCLUDE_API_ASM("code_16c8e0", SetStatusTable); -INCLUDE_API_ASM(code_16c8e0, SetIdleAnimations); +INCLUDE_API_ASM("code_16c8e0", SetIdleAnimations); -INCLUDE_API_ASM(code_16c8e0, EnemyDamageTarget); +INCLUDE_API_ASM("code_16c8e0", EnemyDamageTarget); -INCLUDE_API_ASM(code_16c8e0, EnemyFollowupAfflictTarget); +INCLUDE_API_ASM("code_16c8e0", EnemyFollowupAfflictTarget); -INCLUDE_API_ASM(code_16c8e0, EnemyTestTarget); +INCLUDE_API_ASM("code_16c8e0", EnemyTestTarget); -INCLUDE_API_ASM(code_16c8e0, DispatchDamageEvent); +INCLUDE_API_ASM("code_16c8e0", DispatchDamageEvent); -INCLUDE_API_ASM(code_16c8e0, DispatchEvent); +INCLUDE_API_ASM("code_16c8e0", DispatchEvent); -INCLUDE_API_ASM(code_16c8e0, SetTargetOffset); +INCLUDE_API_ASM("code_16c8e0", SetTargetOffset); -INCLUDE_API_ASM(code_16c8e0, EnableActorBlur); +INCLUDE_API_ASM("code_16c8e0", EnableActorBlur); -INCLUDE_API_ASM(code_16c8e0, AfflictActor); +INCLUDE_API_ASM("code_16c8e0", AfflictActor); -INCLUDE_API_ASM(code_16c8e0, GetEncounterState); +INCLUDE_API_ASM("code_16c8e0", GetEncounterState); -INCLUDE_API_ASM(code_16c8e0, YieldTurn); +INCLUDE_API_ASM("code_16c8e0", YieldTurn); -INCLUDE_API_ASM(code_16c8e0, SetActorSize); +INCLUDE_API_ASM("code_16c8e0", SetActorSize); -INCLUDE_API_ASM(code_16c8e0, GetActorSize); +INCLUDE_API_ASM("code_16c8e0", GetActorSize); -INCLUDE_API_ASM(code_16c8e0, SetPartSize); +INCLUDE_API_ASM("code_16c8e0", SetPartSize); -INCLUDE_API_ASM(code_16c8e0, GetOriginalActorType); +INCLUDE_API_ASM("code_16c8e0", GetOriginalActorType); -INCLUDE_API_ASM(code_16c8e0, GetCurrentActorType); +INCLUDE_API_ASM("code_16c8e0", GetCurrentActorType); -INCLUDE_API_ASM(code_16c8e0, GetLastDamage); +INCLUDE_API_ASM("code_16c8e0", GetLastDamage); -INCLUDE_API_ASM(code_16c8e0, EnableActorGlow); +INCLUDE_API_ASM("code_16c8e0", EnableActorGlow); -INCLUDE_API_ASM(code_16c8e0, WasStatusInflicted); +INCLUDE_API_ASM("code_16c8e0", WasStatusInflicted); -INCLUDE_API_ASM(code_16c8e0, CopyStatusEffects); +INCLUDE_API_ASM("code_16c8e0", CopyStatusEffects); -INCLUDE_API_ASM(code_16c8e0, ClearStatusEffects); +INCLUDE_API_ASM("code_16c8e0", ClearStatusEffects); -INCLUDE_ASM(code_16c8e0, dispatch_event_partner); +INCLUDE_ASM("code_16c8e0", dispatch_event_partner); -INCLUDE_ASM(code_16c8e0, dispatch_event_partner_continue_turn); +INCLUDE_ASM("code_16c8e0", dispatch_event_partner_continue_turn); -INCLUDE_ASM(code_16c8e0, calc_partner_test_enemy); +INCLUDE_ASM("code_16c8e0", calc_partner_test_enemy); -INCLUDE_ASM(code_16c8e0, calc_partner_damage_enemy); +INCLUDE_ASM("code_16c8e0", calc_partner_damage_enemy); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_partner); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_partner); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_partner_0); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_partner_0); -INCLUDE_ASM(code_16c8e0, dispatch_damage_event_partner_1); +INCLUDE_ASM("code_16c8e0", dispatch_damage_event_partner_1); -INCLUDE_API_ASM(code_16c8e0, MakeOwnerTargetIndex); +INCLUDE_API_ASM("code_16c8e0", MakeOwnerTargetIndex); -INCLUDE_API_ASM(code_16c8e0, GetActorLevel); +INCLUDE_API_ASM("code_16c8e0", GetActorLevel); -INCLUDE_API_ASM(code_16c8e0, PartnerDamageEnemy); +INCLUDE_API_ASM("code_16c8e0", PartnerDamageEnemy); -INCLUDE_API_ASM(code_16c8e0, PartnerAfflictEnemy); +INCLUDE_API_ASM("code_16c8e0", PartnerAfflictEnemy); -INCLUDE_API_ASM(code_16c8e0, PartnerPowerBounceEnemy); +INCLUDE_API_ASM("code_16c8e0", PartnerPowerBounceEnemy); -INCLUDE_API_ASM(code_16c8e0, PartnerTestEnemy); +INCLUDE_API_ASM("code_16c8e0", PartnerTestEnemy); -INCLUDE_API_ASM(code_16c8e0, DeletePartner); +INCLUDE_API_ASM("code_16c8e0", DeletePartner); -INCLUDE_API_ASM(code_16c8e0, GetDamageIntensity); +INCLUDE_API_ASM("code_16c8e0", GetDamageIntensity); -INCLUDE_API_ASM(code_16c8e0, ActorAddMovePos); +INCLUDE_API_ASM("code_16c8e0", ActorAddMovePos); -INCLUDE_API_ASM(code_16c8e0, LoadStarPowerScript); +INCLUDE_API_ASM("code_16c8e0", LoadStarPowerScript); diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c index 9de2d35aba..16ee9ece6c 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/code_1a1f0_len_5390.c @@ -1,39 +1,39 @@ #include "common.h" -INCLUDE_ASM(code_1a1f0_len_5390, get_defeated); +INCLUDE_ASM("code_1a1f0_len_5390", get_defeated); -INCLUDE_ASM(code_1a1f0_len_5390, set_defeated); +INCLUDE_ASM("code_1a1f0_len_5390", set_defeated); -INCLUDE_API_ASM(code_1a1f0_len_5390, GetCamLookAtObjVector); +INCLUDE_API_ASM("code_1a1f0_len_5390", GetCamLookAtObjVector); -INCLUDE_API_ASM(code_1a1f0_len_5390, HasMerleeCasts); +INCLUDE_API_ASM("code_1a1f0_len_5390", HasMerleeCasts); -INCLUDE_API_ASM(code_1a1f0_len_5390, OnDefeatEnemy); +INCLUDE_API_ASM("code_1a1f0_len_5390", OnDefeatEnemy); -INCLUDE_API_ASM(code_1a1f0_len_5390, OnFleeBattleDrops); +INCLUDE_API_ASM("code_1a1f0_len_5390", OnFleeBattleDrops); -INCLUDE_ASM(code_1a1f0_len_5390, func_8003F7CC); +INCLUDE_ASM("code_1a1f0_len_5390", func_8003F7CC); -INCLUDE_ASM(code_1a1f0_len_5390, func_8004135C); +INCLUDE_ASM("code_1a1f0_len_5390", func_8004135C); -INCLUDE_ASM(code_1a1f0_len_5390, func_80041364); +INCLUDE_ASM("code_1a1f0_len_5390", func_80041364); -INCLUDE_ASM(code_1a1f0_len_5390, func_80041964); +INCLUDE_ASM("code_1a1f0_len_5390", func_80041964); -INCLUDE_ASM(code_1a1f0_len_5390, show_first_strike_message); +INCLUDE_ASM("code_1a1f0_len_5390", show_first_strike_message); -INCLUDE_ASM(code_1a1f0_len_5390, func_80041F10); +INCLUDE_ASM("code_1a1f0_len_5390", func_80041F10); -INCLUDE_ASM(code_1a1f0_len_5390, func_8004304C); +INCLUDE_ASM("code_1a1f0_len_5390", func_8004304C); -INCLUDE_ASM(code_1a1f0_len_5390, func_8004309C); +INCLUDE_ASM("code_1a1f0_len_5390", func_8004309C); -INCLUDE_ASM(code_1a1f0_len_5390, func_800431D4); +INCLUDE_ASM("code_1a1f0_len_5390", func_800431D4); -INCLUDE_ASM(code_1a1f0_len_5390, func_800431DC); +INCLUDE_ASM("code_1a1f0_len_5390", func_800431DC); -INCLUDE_ASM(code_1a1f0_len_5390, create_npcs); +INCLUDE_ASM("code_1a1f0_len_5390", create_npcs); -INCLUDE_ASM(code_1a1f0_len_5390, func_80044140); +INCLUDE_ASM("code_1a1f0_len_5390", func_80044140); -INCLUDE_ASM(code_1a1f0_len_5390, func_80044148); +INCLUDE_ASM("code_1a1f0_len_5390", func_80044148); diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index 678e160f31..5a6d7a6b17 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -34,13 +34,13 @@ extern s32 D_8009A5D8; void dma_copy(void*, void*, void*); -INCLUDE_ASM(code_1b40_len_20b0, step_game_loop); +INCLUDE_ASM("code_1b40_len_20b0", step_game_loop); -INCLUDE_ASM(code_1b40_len_20b0, func_800269EC); +INCLUDE_ASM("code_1b40_len_20b0", func_800269EC); -INCLUDE_ASM(code_1b40_len_20b0, gfx_draw_frame); +INCLUDE_ASM("code_1b40_len_20b0", gfx_draw_frame); -INCLUDE_ASM(code_1b40_len_20b0, load_engine_data); +INCLUDE_ASM("code_1b40_len_20b0", load_engine_data); /*void load_engine_data(void) { game_status *phi_s0; s32 i; @@ -111,13 +111,13 @@ INCLUDE_ASM(code_1b40_len_20b0, load_engine_data); set_game_mode(0); }*/ -INCLUDE_ASM(code_1b40_len_20b0, func_80027088); +INCLUDE_ASM("code_1b40_len_20b0", func_80027088); s32 func_80027190(void) { return D_8009A5D8; } -INCLUDE_ASM(code_1b40_len_20b0, func_800271A0); +INCLUDE_ASM("code_1b40_len_20b0", func_800271A0); /*void func_800271A0(void) { Gfx *temp = D_8009A66C[0] + 1; @@ -128,16 +128,16 @@ INCLUDE_ASM(code_1b40_len_20b0, func_800271A0); gSPDisplayList(D_8009A66C[0]++, &D_00074210); }*/ -INCLUDE_ASM(code_1b40_len_20b0, func_800271FC); +INCLUDE_ASM("code_1b40_len_20b0", func_800271FC); -INCLUDE_ASM(code_1b40_len_20b0, func_8002725C); +INCLUDE_ASM("code_1b40_len_20b0", func_8002725C); -INCLUDE_ASM(code_1b40_len_20b0, func_80027600); +INCLUDE_ASM("code_1b40_len_20b0", func_80027600); -INCLUDE_ASM(code_1b40_len_20b0, func_80027774); +INCLUDE_ASM("code_1b40_len_20b0", func_80027774); -INCLUDE_ASM(code_1b40_len_20b0, func_800279B4); +INCLUDE_ASM("code_1b40_len_20b0", func_800279B4); -INCLUDE_ASM(code_1b40_len_20b0, func_80027BAC); +INCLUDE_ASM("code_1b40_len_20b0", func_80027BAC); -INCLUDE_ASM(code_1b40_len_20b0, func_80027E10); +INCLUDE_ASM("code_1b40_len_20b0", func_80027E10); diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c index 1bb34f5475..73de497e4b 100644 --- a/src/code_1f580_len_1940.c +++ b/src/code_1f580_len_1940.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_API_ASM(code_1f580_len_1940, SetEncounterStatusFlags); +INCLUDE_API_ASM("code_1f580_len_1940", SetEncounterStatusFlags); ApiStatus LoadDemoBattle(ScriptInstance* script, s32 isInitialCall) { load_demo_battle(get_variable(script, *script->ptrReadPos)); @@ -12,22 +12,22 @@ ApiStatus func_80044290(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_1f580_len_1940, MakeNpcs); +INCLUDE_API_ASM("code_1f580_len_1940", MakeNpcs); -INCLUDE_API_ASM(code_1f580_len_1940, RemoveNpc); +INCLUDE_API_ASM("code_1f580_len_1940", RemoveNpc); -INCLUDE_API_ASM(code_1f580_len_1940, RemoveEncounter); +INCLUDE_API_ASM("code_1f580_len_1940", RemoveEncounter); -INCLUDE_API_ASM(code_1f580_len_1940, GetBattleOutcome); +INCLUDE_API_ASM("code_1f580_len_1940", GetBattleOutcome); ApiStatus GetOwnerEncountered(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, script->ownerActorID->encountered); return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_1f580_len_1940, DoNpcDefeat); +INCLUDE_API_ASM("code_1f580_len_1940", DoNpcDefeat); -INCLUDE_ASM(code_1f580_len_1940, start_battle); +INCLUDE_ASM("code_1f580_len_1940", start_battle); ApiStatus StartBattle(ScriptInstance* script, s32 isInitialCall) { start_battle(script, -1); @@ -39,56 +39,56 @@ ApiStatus StartBattleWith(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE1; } -INCLUDE_API_ASM(code_1f580_len_1940, StartBossBattle); +INCLUDE_API_ASM("code_1f580_len_1940", StartBossBattle); -INCLUDE_API_ASM(code_1f580_len_1940, SetBattleMusic); +INCLUDE_API_ASM("code_1f580_len_1940", SetBattleMusic); -INCLUDE_API_ASM(code_1f580_len_1940, BindNpcAI); +INCLUDE_API_ASM("code_1f580_len_1940", BindNpcAI); -INCLUDE_API_ASM(code_1f580_len_1940, BindNpcIdle); +INCLUDE_API_ASM("code_1f580_len_1940", BindNpcIdle); -INCLUDE_API_ASM(code_1f580_len_1940, RestartNpcAI); +INCLUDE_API_ASM("code_1f580_len_1940", RestartNpcAI); -INCLUDE_API_ASM(code_1f580_len_1940, EnableNpcAI); +INCLUDE_API_ASM("code_1f580_len_1940", EnableNpcAI); -INCLUDE_API_ASM(code_1f580_len_1940, SetNpcAux); +INCLUDE_API_ASM("code_1f580_len_1940", SetNpcAux); -INCLUDE_API_ASM(code_1f580_len_1940, BindNpcAux); +INCLUDE_API_ASM("code_1f580_len_1940", BindNpcAux); -INCLUDE_API_ASM(code_1f580_len_1940, RestartNpcAux); +INCLUDE_API_ASM("code_1f580_len_1940", RestartNpcAux); -INCLUDE_API_ASM(code_1f580_len_1940, EnableNpcAux); +INCLUDE_API_ASM("code_1f580_len_1940", EnableNpcAux); -INCLUDE_API_ASM(code_1f580_len_1940, BindNpcInteract); +INCLUDE_API_ASM("code_1f580_len_1940", BindNpcInteract); -INCLUDE_API_ASM(code_1f580_len_1940, BindNpcHit); +INCLUDE_API_ASM("code_1f580_len_1940", BindNpcHit); -INCLUDE_API_ASM(code_1f580_len_1940, BindNpcDefeat); +INCLUDE_API_ASM("code_1f580_len_1940", BindNpcDefeat); -INCLUDE_API_ASM(code_1f580_len_1940, SetSelfVar); +INCLUDE_API_ASM("code_1f580_len_1940", SetSelfVar); -INCLUDE_API_ASM(code_1f580_len_1940, GetSelfVar); +INCLUDE_API_ASM("code_1f580_len_1940", GetSelfVar); -INCLUDE_API_ASM(code_1f580_len_1940, SetNpcVar); +INCLUDE_API_ASM("code_1f580_len_1940", SetNpcVar); -INCLUDE_API_ASM(code_1f580_len_1940, GetNpcVar); +INCLUDE_API_ASM("code_1f580_len_1940", GetNpcVar); -INCLUDE_API_ASM(code_1f580_len_1940, SetSelfRotation); +INCLUDE_API_ASM("code_1f580_len_1940", SetSelfRotation); ApiStatus SetSelfEnemyFlags(ScriptInstance* script, s32 isInitialCall) { script->ownerActorID->flags = *script->ptrReadPos; return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_1f580_len_1940, SetSelfEnemyFlagBits); +INCLUDE_API_ASM("code_1f580_len_1940", SetSelfEnemyFlagBits); ApiStatus GetSelfNpcID(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, script->ownerActorID->npcID); return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_1f580_len_1940, ClearDefeatedEnemies); +INCLUDE_API_ASM("code_1f580_len_1940", ClearDefeatedEnemies); -INCLUDE_API_ASM(code_1f580_len_1940, SetEnemyFlagBits); +INCLUDE_API_ASM("code_1f580_len_1940", SetEnemyFlagBits); -INCLUDE_API_ASM(code_1f580_len_1940, GetSelfAnimationFromTable); +INCLUDE_API_ASM("code_1f580_len_1940", GetSelfAnimationFromTable); diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index f51d193efe..992dc2055b 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -1,119 +1,119 @@ #include "common.h" -INCLUDE_ASM(code_20ec0_len_5040, func_80045AC0); +INCLUDE_ASM("code_20ec0_len_5040", func_80045AC0); -INCLUDE_ASM(code_20ec0_len_5040, func_80045B68); +INCLUDE_ASM("code_20ec0_len_5040", func_80045B68); -INCLUDE_ASM(code_20ec0_len_5040, func_80045C28); +INCLUDE_ASM("code_20ec0_len_5040", func_80045C28); -INCLUDE_ASM(code_20ec0_len_5040, func_80045C88); +INCLUDE_ASM("code_20ec0_len_5040", func_80045C88); -INCLUDE_ASM(code_20ec0_len_5040, func_80045CC4); +INCLUDE_ASM("code_20ec0_len_5040", func_80045CC4); -INCLUDE_ASM(code_20ec0_len_5040, func_80045D00); +INCLUDE_ASM("code_20ec0_len_5040", func_80045D00); -INCLUDE_ASM(code_20ec0_len_5040, func_80045FA4); +INCLUDE_ASM("code_20ec0_len_5040", func_80045FA4); -INCLUDE_ASM(code_20ec0_len_5040, func_80045FB4); +INCLUDE_ASM("code_20ec0_len_5040", func_80045FB4); -INCLUDE_ASM(code_20ec0_len_5040, func_80047608); +INCLUDE_ASM("code_20ec0_len_5040", func_80047608); -INCLUDE_ASM(code_20ec0_len_5040, func_800476F4); +INCLUDE_ASM("code_20ec0_len_5040", func_800476F4); -INCLUDE_ASM(code_20ec0_len_5040, func_8004778C); +INCLUDE_ASM("code_20ec0_len_5040", func_8004778C); -INCLUDE_ASM(code_20ec0_len_5040, func_800477F4); +INCLUDE_ASM("code_20ec0_len_5040", func_800477F4); -INCLUDE_ASM(code_20ec0_len_5040, func_80047820); +INCLUDE_ASM("code_20ec0_len_5040", func_80047820); -INCLUDE_ASM(code_20ec0_len_5040, func_80047898); +INCLUDE_ASM("code_20ec0_len_5040", func_80047898); -INCLUDE_ASM(code_20ec0_len_5040, func_800478F8); +INCLUDE_ASM("code_20ec0_len_5040", func_800478F8); -INCLUDE_ASM(code_20ec0_len_5040, func_80047928); +INCLUDE_ASM("code_20ec0_len_5040", func_80047928); -INCLUDE_ASM(code_20ec0_len_5040, func_800479A0); +INCLUDE_ASM("code_20ec0_len_5040", func_800479A0); -INCLUDE_ASM(code_20ec0_len_5040, func_80047A00); +INCLUDE_ASM("code_20ec0_len_5040", func_80047A00); -INCLUDE_ASM(code_20ec0_len_5040, func_80047A30); +INCLUDE_ASM("code_20ec0_len_5040", func_80047A30); -INCLUDE_ASM(code_20ec0_len_5040, func_80047AA8); +INCLUDE_ASM("code_20ec0_len_5040", func_80047AA8); -INCLUDE_ASM(code_20ec0_len_5040, func_80047B08); +INCLUDE_ASM("code_20ec0_len_5040", func_80047B08); -INCLUDE_ASM(code_20ec0_len_5040, func_80047B38); +INCLUDE_ASM("code_20ec0_len_5040", func_80047B38); -INCLUDE_ASM(code_20ec0_len_5040, func_80047B84); +INCLUDE_ASM("code_20ec0_len_5040", func_80047B84); -INCLUDE_ASM(code_20ec0_len_5040, func_80047BE4); +INCLUDE_ASM("code_20ec0_len_5040", func_80047BE4); -INCLUDE_ASM(code_20ec0_len_5040, func_80047C14); +INCLUDE_ASM("code_20ec0_len_5040", func_80047C14); -INCLUDE_ASM(code_20ec0_len_5040, func_80047CA4); +INCLUDE_ASM("code_20ec0_len_5040", func_80047CA4); -INCLUDE_ASM(code_20ec0_len_5040, func_80047D00); +INCLUDE_ASM("code_20ec0_len_5040", func_80047D00); -INCLUDE_ASM(code_20ec0_len_5040, func_80047D30); +INCLUDE_ASM("code_20ec0_len_5040", func_80047D30); -INCLUDE_ASM(code_20ec0_len_5040, func_80047DC0); +INCLUDE_ASM("code_20ec0_len_5040", func_80047DC0); -INCLUDE_ASM(code_20ec0_len_5040, func_80047E1C); +INCLUDE_ASM("code_20ec0_len_5040", func_80047E1C); -INCLUDE_ASM(code_20ec0_len_5040, func_80047E4C); +INCLUDE_ASM("code_20ec0_len_5040", func_80047E4C); -INCLUDE_ASM(code_20ec0_len_5040, func_80047EDC); +INCLUDE_ASM("code_20ec0_len_5040", func_80047EDC); -INCLUDE_ASM(code_20ec0_len_5040, func_80047F28); +INCLUDE_ASM("code_20ec0_len_5040", func_80047F28); -INCLUDE_ASM(code_20ec0_len_5040, func_80047F58); +INCLUDE_ASM("code_20ec0_len_5040", func_80047F58); -INCLUDE_ASM(code_20ec0_len_5040, func_80047FE8); +INCLUDE_ASM("code_20ec0_len_5040", func_80047FE8); -INCLUDE_ASM(code_20ec0_len_5040, func_80048034); +INCLUDE_ASM("code_20ec0_len_5040", func_80048034); -INCLUDE_ASM(code_20ec0_len_5040, func_80048064); +INCLUDE_ASM("code_20ec0_len_5040", func_80048064); -INCLUDE_ASM(code_20ec0_len_5040, func_800480F4); +INCLUDE_ASM("code_20ec0_len_5040", func_800480F4); -INCLUDE_ASM(code_20ec0_len_5040, func_80048140); +INCLUDE_ASM("code_20ec0_len_5040", func_80048140); -INCLUDE_ASM(code_20ec0_len_5040, func_80048170); +INCLUDE_ASM("code_20ec0_len_5040", func_80048170); -INCLUDE_ASM(code_20ec0_len_5040, func_80048200); +INCLUDE_ASM("code_20ec0_len_5040", func_80048200); -INCLUDE_ASM(code_20ec0_len_5040, func_8004824C); +INCLUDE_ASM("code_20ec0_len_5040", func_8004824C); -INCLUDE_ASM(code_20ec0_len_5040, spawn_drops); +INCLUDE_ASM("code_20ec0_len_5040", spawn_drops); -INCLUDE_ASM(code_20ec0_len_5040, get_coin_drop_amount); +INCLUDE_ASM("code_20ec0_len_5040", get_coin_drop_amount); -INCLUDE_ASM(code_20ec0_len_5040, is_point_within_region); +INCLUDE_ASM("code_20ec0_len_5040", is_point_within_region); -INCLUDE_ASM(code_20ec0_len_5040, func_800490B4); +INCLUDE_ASM("code_20ec0_len_5040", func_800490B4); -INCLUDE_ASM(code_20ec0_len_5040, func_800494C0); +INCLUDE_ASM("code_20ec0_len_5040", func_800494C0); -INCLUDE_ASM(code_20ec0_len_5040, func_800495A0); +INCLUDE_ASM("code_20ec0_len_5040", func_800495A0); -INCLUDE_ASM(code_20ec0_len_5040, func_800496B8); +INCLUDE_ASM("code_20ec0_len_5040", func_800496B8); -INCLUDE_ASM(code_20ec0_len_5040, func_80049B44); +INCLUDE_ASM("code_20ec0_len_5040", func_80049B44); -INCLUDE_ASM(code_20ec0_len_5040, func_80049C04); +INCLUDE_ASM("code_20ec0_len_5040", func_80049C04); -INCLUDE_ASM(code_20ec0_len_5040, func_80049E3C); +INCLUDE_ASM("code_20ec0_len_5040", func_80049E3C); -INCLUDE_ASM(code_20ec0_len_5040, func_80049ECC); +INCLUDE_ASM("code_20ec0_len_5040", func_80049ECC); -INCLUDE_ASM(code_20ec0_len_5040, func_80049F7C); +INCLUDE_ASM("code_20ec0_len_5040", func_80049F7C); -INCLUDE_ASM(code_20ec0_len_5040, func_8004A124); +INCLUDE_ASM("code_20ec0_len_5040", func_8004A124); -INCLUDE_ASM(code_20ec0_len_5040, func_8004A3E8); +INCLUDE_ASM("code_20ec0_len_5040", func_8004A3E8); -INCLUDE_API_ASM(code_20ec0_len_5040, DoBasicAI); +INCLUDE_API_ASM("code_20ec0_len_5040", DoBasicAI); -INCLUDE_ASM(code_20ec0_len_5040, func_8004A73C); +INCLUDE_ASM("code_20ec0_len_5040", func_8004A73C); -INCLUDE_ASM(code_20ec0_len_5040, func_8004A784); +INCLUDE_ASM("code_20ec0_len_5040", func_8004A784); diff --git a/src/code_25f00_len_940.c b/src/code_25f00_len_940.c index f4b62916e1..9345172ae6 100644 --- a/src/code_25f00_len_940.c +++ b/src/code_25f00_len_940.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM(code_25f00_len_940, func_8004AB00); +INCLUDE_ASM("code_25f00_len_940", func_8004AB00); -INCLUDE_API_ASM(code_25f00_len_940, nuAuDmaCallBack); +INCLUDE_API_ASM("code_25f00_len_940", nuAuDmaCallBack); -INCLUDE_API_ASM(code_25f00_len_940, nuAuDmaNew); +INCLUDE_API_ASM("code_25f00_len_940", nuAuDmaNew); -INCLUDE_API_ASM(code_25f00_len_940, nuAuCleanDMABuffers); +INCLUDE_API_ASM("code_25f00_len_940", nuAuCleanDMABuffers); -INCLUDE_API_ASM(code_25f00_len_940, alRename1); +INCLUDE_API_ASM("code_25f00_len_940", alRename1); -INCLUDE_API_ASM(code_25f00_len_940, alRename2); +INCLUDE_API_ASM("code_25f00_len_940", alRename2); diff --git a/src/code_26840_len_20d0.c b/src/code_26840_len_20d0.c index ecb40bb09a..41b168cf30 100644 --- a/src/code_26840_len_20d0.c +++ b/src/code_26840_len_20d0.c @@ -1,53 +1,53 @@ #include "common.h" -INCLUDE_ASM(code_26840_len_20d0, func_8004B440); +INCLUDE_ASM("code_26840_len_20d0", func_8004B440); -INCLUDE_ASM(code_26840_len_20d0, func_8004B62C); +INCLUDE_ASM("code_26840_len_20d0", func_8004B62C); -INCLUDE_ASM(code_26840_len_20d0, func_8004B698); +INCLUDE_ASM("code_26840_len_20d0", func_8004B698); -INCLUDE_ASM(code_26840_len_20d0, func_8004B6D8); +INCLUDE_ASM("code_26840_len_20d0", func_8004B6D8); -INCLUDE_ASM(code_26840_len_20d0, func_8004B748); +INCLUDE_ASM("code_26840_len_20d0", func_8004B748); -INCLUDE_ASM(code_26840_len_20d0, func_8004B9E4); +INCLUDE_ASM("code_26840_len_20d0", func_8004B9E4); -INCLUDE_ASM(code_26840_len_20d0, func_8004BA54); +INCLUDE_ASM("code_26840_len_20d0", func_8004BA54); -INCLUDE_ASM(code_26840_len_20d0, func_8004BA74); +INCLUDE_ASM("code_26840_len_20d0", func_8004BA74); -INCLUDE_ASM(code_26840_len_20d0, func_8004C0E4); +INCLUDE_ASM("code_26840_len_20d0", func_8004C0E4); -INCLUDE_ASM(code_26840_len_20d0, func_8004C268); +INCLUDE_ASM("code_26840_len_20d0", func_8004C268); -INCLUDE_ASM(code_26840_len_20d0, func_8004C2A4); +INCLUDE_ASM("code_26840_len_20d0", func_8004C2A4); -INCLUDE_ASM(code_26840_len_20d0, func_8004C300); +INCLUDE_ASM("code_26840_len_20d0", func_8004C300); -INCLUDE_ASM(code_26840_len_20d0, func_8004C358); +INCLUDE_ASM("code_26840_len_20d0", func_8004C358); -INCLUDE_ASM(code_26840_len_20d0, func_8004C3D4); +INCLUDE_ASM("code_26840_len_20d0", func_8004C3D4); -INCLUDE_ASM(code_26840_len_20d0, func_8004C444); +INCLUDE_ASM("code_26840_len_20d0", func_8004C444); -INCLUDE_ASM(code_26840_len_20d0, func_8004C578); +INCLUDE_ASM("code_26840_len_20d0", func_8004C578); -INCLUDE_ASM(code_26840_len_20d0, func_8004C844); +INCLUDE_ASM("code_26840_len_20d0", func_8004C844); -INCLUDE_ASM(code_26840_len_20d0, func_8004C884); +INCLUDE_ASM("code_26840_len_20d0", func_8004C884); -INCLUDE_ASM(code_26840_len_20d0, func_8004CD94); +INCLUDE_ASM("code_26840_len_20d0", func_8004CD94); -INCLUDE_ASM(code_26840_len_20d0, func_8004CE70); +INCLUDE_ASM("code_26840_len_20d0", func_8004CE70); -INCLUDE_ASM(code_26840_len_20d0, func_8004CEA4); +INCLUDE_ASM("code_26840_len_20d0", func_8004CEA4); -INCLUDE_ASM(code_26840_len_20d0, func_8004CEC4); +INCLUDE_ASM("code_26840_len_20d0", func_8004CEC4); -INCLUDE_ASM(code_26840_len_20d0, func_8004CF0C); +INCLUDE_ASM("code_26840_len_20d0", func_8004CF0C); -INCLUDE_ASM(code_26840_len_20d0, func_8004D428); +INCLUDE_ASM("code_26840_len_20d0", func_8004D428); -INCLUDE_ASM(code_26840_len_20d0, func_8004D484); +INCLUDE_ASM("code_26840_len_20d0", func_8004D484); -INCLUDE_ASM(code_26840_len_20d0, func_8004D4BC); +INCLUDE_ASM("code_26840_len_20d0", func_8004D4BC); diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c index db39d21574..03e9bb8ad2 100644 --- a/src/code_28910_len_5090.c +++ b/src/code_28910_len_5090.c @@ -1,127 +1,127 @@ #include "common.h" -INCLUDE_ASM(code_28910_len_5090, func_8004D510); +INCLUDE_ASM("code_28910_len_5090", func_8004D510); -INCLUDE_ASM(code_28910_len_5090, func_8004D794); +INCLUDE_ASM("code_28910_len_5090", func_8004D794); -INCLUDE_ASM(code_28910_len_5090, func_8004D7E0); +INCLUDE_ASM("code_28910_len_5090", func_8004D7E0); -INCLUDE_ASM(code_28910_len_5090, func_8004DA0C); +INCLUDE_ASM("code_28910_len_5090", func_8004DA0C); -INCLUDE_ASM(code_28910_len_5090, func_8004DA74); +INCLUDE_ASM("code_28910_len_5090", func_8004DA74); -INCLUDE_ASM(code_28910_len_5090, func_8004DAA8); +INCLUDE_ASM("code_28910_len_5090", func_8004DAA8); -INCLUDE_ASM(code_28910_len_5090, func_8004DAE0); +INCLUDE_ASM("code_28910_len_5090", func_8004DAE0); -INCLUDE_ASM(code_28910_len_5090, func_8004DB28); +INCLUDE_ASM("code_28910_len_5090", func_8004DB28); -INCLUDE_ASM(code_28910_len_5090, func_8004DB4C); +INCLUDE_ASM("code_28910_len_5090", func_8004DB4C); -INCLUDE_ASM(code_28910_len_5090, func_8004DC80); +INCLUDE_ASM("code_28910_len_5090", func_8004DC80); -INCLUDE_ASM(code_28910_len_5090, func_8004DCB8); +INCLUDE_ASM("code_28910_len_5090", func_8004DCB8); -INCLUDE_ASM(code_28910_len_5090, func_8004DE2C); +INCLUDE_ASM("code_28910_len_5090", func_8004DE2C); -INCLUDE_ASM(code_28910_len_5090, func_8004DFD4); +INCLUDE_ASM("code_28910_len_5090", func_8004DFD4); -INCLUDE_ASM(code_28910_len_5090, func_8004E0F4); +INCLUDE_ASM("code_28910_len_5090", func_8004E0F4); -INCLUDE_ASM(code_28910_len_5090, func_8004E158); +INCLUDE_ASM("code_28910_len_5090", func_8004E158); -INCLUDE_ASM(code_28910_len_5090, func_8004E344); +INCLUDE_ASM("code_28910_len_5090", func_8004E344); -INCLUDE_ASM(code_28910_len_5090, func_8004E3A4); +INCLUDE_ASM("code_28910_len_5090", func_8004E3A4); -INCLUDE_ASM(code_28910_len_5090, func_8004E444); +INCLUDE_ASM("code_28910_len_5090", func_8004E444); -INCLUDE_ASM(code_28910_len_5090, func_8004E4B8); +INCLUDE_ASM("code_28910_len_5090", func_8004E4B8); -INCLUDE_ASM(code_28910_len_5090, func_8004E5D8); +INCLUDE_ASM("code_28910_len_5090", func_8004E5D8); -INCLUDE_ASM(code_28910_len_5090, func_8004E844); +INCLUDE_ASM("code_28910_len_5090", func_8004E844); -INCLUDE_ASM(code_28910_len_5090, func_8004E880); +INCLUDE_ASM("code_28910_len_5090", func_8004E880); -INCLUDE_ASM(code_28910_len_5090, func_8004E904); +INCLUDE_ASM("code_28910_len_5090", func_8004E904); -INCLUDE_ASM(code_28910_len_5090, func_8004EA34); +INCLUDE_ASM("code_28910_len_5090", func_8004EA34); -INCLUDE_ASM(code_28910_len_5090, func_8004EAD4); +INCLUDE_ASM("code_28910_len_5090", func_8004EAD4); -INCLUDE_ASM(code_28910_len_5090, func_8004EC04); +INCLUDE_ASM("code_28910_len_5090", func_8004EC04); -INCLUDE_ASM(code_28910_len_5090, func_8004EC68); +INCLUDE_ASM("code_28910_len_5090", func_8004EC68); -INCLUDE_ASM(code_28910_len_5090, func_8004FC08); +INCLUDE_ASM("code_28910_len_5090", func_8004FC08); -INCLUDE_ASM(code_28910_len_5090, func_8004FD38); +INCLUDE_ASM("code_28910_len_5090", func_8004FD38); -INCLUDE_ASM(code_28910_len_5090, func_8004FEB0); +INCLUDE_ASM("code_28910_len_5090", func_8004FEB0); -INCLUDE_ASM(code_28910_len_5090, func_8004FED0); +INCLUDE_ASM("code_28910_len_5090", func_8004FED0); -INCLUDE_ASM(code_28910_len_5090, func_80050568); +INCLUDE_ASM("code_28910_len_5090", func_80050568); -INCLUDE_ASM(code_28910_len_5090, func_800505E4); +INCLUDE_ASM("code_28910_len_5090", func_800505E4); -INCLUDE_ASM(code_28910_len_5090, func_80050654); +INCLUDE_ASM("code_28910_len_5090", func_80050654); -INCLUDE_ASM(code_28910_len_5090, func_8005068C); +INCLUDE_ASM("code_28910_len_5090", func_8005068C); -INCLUDE_ASM(code_28910_len_5090, func_800506C8); +INCLUDE_ASM("code_28910_len_5090", func_800506C8); -INCLUDE_ASM(code_28910_len_5090, func_80050770); +INCLUDE_ASM("code_28910_len_5090", func_80050770); -INCLUDE_ASM(code_28910_len_5090, func_80050818); +INCLUDE_ASM("code_28910_len_5090", func_80050818); -INCLUDE_ASM(code_28910_len_5090, func_8005083C); +INCLUDE_ASM("code_28910_len_5090", func_8005083C); -INCLUDE_ASM(code_28910_len_5090, func_8005087C); +INCLUDE_ASM("code_28910_len_5090", func_8005087C); -INCLUDE_ASM(code_28910_len_5090, func_80050888); +INCLUDE_ASM("code_28910_len_5090", func_80050888); -INCLUDE_ASM(code_28910_len_5090, func_80050900); +INCLUDE_ASM("code_28910_len_5090", func_80050900); -INCLUDE_ASM(code_28910_len_5090, func_80050970); +INCLUDE_ASM("code_28910_len_5090", func_80050970); -INCLUDE_ASM(code_28910_len_5090, func_80050B90); +INCLUDE_ASM("code_28910_len_5090", func_80050B90); -INCLUDE_ASM(code_28910_len_5090, func_80050C30); +INCLUDE_ASM("code_28910_len_5090", func_80050C30); -INCLUDE_ASM(code_28910_len_5090, func_80050C54); +INCLUDE_ASM("code_28910_len_5090", func_80050C54); -INCLUDE_ASM(code_28910_len_5090, func_80050C64); +INCLUDE_ASM("code_28910_len_5090", func_80050C64); -INCLUDE_ASM(code_28910_len_5090, func_80050CA0); +INCLUDE_ASM("code_28910_len_5090", func_80050CA0); -INCLUDE_ASM(code_28910_len_5090, func_80050D50); +INCLUDE_ASM("code_28910_len_5090", func_80050D50); -INCLUDE_ASM(code_28910_len_5090, func_80050E18); +INCLUDE_ASM("code_28910_len_5090", func_80050E18); -INCLUDE_ASM(code_28910_len_5090, func_80050E84); +INCLUDE_ASM("code_28910_len_5090", func_80050E84); -INCLUDE_ASM(code_28910_len_5090, func_80050EF0); +INCLUDE_ASM("code_28910_len_5090", func_80050EF0); -INCLUDE_ASM(code_28910_len_5090, func_80050F64); +INCLUDE_ASM("code_28910_len_5090", func_80050F64); -INCLUDE_ASM(code_28910_len_5090, func_80050FD0); +INCLUDE_ASM("code_28910_len_5090", func_80050FD0); -INCLUDE_ASM(code_28910_len_5090, func_80051050); +INCLUDE_ASM("code_28910_len_5090", func_80051050); -INCLUDE_ASM(code_28910_len_5090, func_800510A4); +INCLUDE_ASM("code_28910_len_5090", func_800510A4); -INCLUDE_ASM(code_28910_len_5090, func_800511BC); +INCLUDE_ASM("code_28910_len_5090", func_800511BC); -INCLUDE_ASM(code_28910_len_5090, func_80051334); +INCLUDE_ASM("code_28910_len_5090", func_80051334); -INCLUDE_ASM(code_28910_len_5090, func_80051434); +INCLUDE_ASM("code_28910_len_5090", func_80051434); -INCLUDE_ASM(code_28910_len_5090, func_800521D0); +INCLUDE_ASM("code_28910_len_5090", func_800521D0); -INCLUDE_ASM(code_28910_len_5090, func_800521E8); +INCLUDE_ASM("code_28910_len_5090", func_800521E8); -INCLUDE_ASM(code_28910_len_5090, func_800522A8); +INCLUDE_ASM("code_28910_len_5090", func_800522A8); -INCLUDE_ASM(code_28910_len_5090, func_8005232C); +INCLUDE_ASM("code_28910_len_5090", func_8005232C); diff --git a/src/code_2d9a0_len_890.c b/src/code_2d9a0_len_890.c index ee89c3a745..1114606d93 100644 --- a/src/code_2d9a0_len_890.c +++ b/src/code_2d9a0_len_890.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(code_2d9a0_len_890, func_800525A0); +INCLUDE_ASM("code_2d9a0_len_890", func_800525A0); -INCLUDE_ASM(code_2d9a0_len_890, func_80052614); +INCLUDE_ASM("code_2d9a0_len_890", func_80052614); -INCLUDE_ASM(code_2d9a0_len_890, func_80052660); +INCLUDE_ASM("code_2d9a0_len_890", func_80052660); -INCLUDE_ASM(code_2d9a0_len_890, func_80052B44); +INCLUDE_ASM("code_2d9a0_len_890", func_80052B44); -INCLUDE_ASM(code_2d9a0_len_890, func_80052BC0); +INCLUDE_ASM("code_2d9a0_len_890", func_80052BC0); -INCLUDE_ASM(code_2d9a0_len_890, func_80052BF8); +INCLUDE_ASM("code_2d9a0_len_890", func_80052BF8); -INCLUDE_ASM(code_2d9a0_len_890, func_80052CFC); +INCLUDE_ASM("code_2d9a0_len_890", func_80052CFC); diff --git a/src/code_2e230_len_2190.c b/src/code_2e230_len_2190.c index 0f412d9bc4..95436c4b9a 100644 --- a/src/code_2e230_len_2190.c +++ b/src/code_2e230_len_2190.c @@ -1,81 +1,81 @@ #include "common.h" -INCLUDE_ASM(code_2e230_len_2190, func_80052E30); +INCLUDE_ASM("code_2e230_len_2190", func_80052E30); -INCLUDE_ASM(code_2e230_len_2190, func_80052E5C); +INCLUDE_ASM("code_2e230_len_2190", func_80052E5C); -INCLUDE_ASM(code_2e230_len_2190, func_800532F4); +INCLUDE_ASM("code_2e230_len_2190", func_800532F4); -INCLUDE_ASM(code_2e230_len_2190, func_80053370); +INCLUDE_ASM("code_2e230_len_2190", func_80053370); -INCLUDE_ASM(code_2e230_len_2190, func_800533A8); +INCLUDE_ASM("code_2e230_len_2190", func_800533A8); -INCLUDE_ASM(code_2e230_len_2190, func_800533D0); +INCLUDE_ASM("code_2e230_len_2190", func_800533D0); -INCLUDE_ASM(code_2e230_len_2190, func_800535C0); +INCLUDE_ASM("code_2e230_len_2190", func_800535C0); -INCLUDE_ASM(code_2e230_len_2190, func_80053654); +INCLUDE_ASM("code_2e230_len_2190", func_80053654); -INCLUDE_ASM(code_2e230_len_2190, func_80053888); +INCLUDE_ASM("code_2e230_len_2190", func_80053888); -INCLUDE_ASM(code_2e230_len_2190, func_800538C4); +INCLUDE_ASM("code_2e230_len_2190", func_800538C4); -INCLUDE_ASM(code_2e230_len_2190, func_800538F8); +INCLUDE_ASM("code_2e230_len_2190", func_800538F8); -INCLUDE_ASM(code_2e230_len_2190, func_80053974); +INCLUDE_ASM("code_2e230_len_2190", func_80053974); -INCLUDE_ASM(code_2e230_len_2190, func_80053A18); +INCLUDE_ASM("code_2e230_len_2190", func_80053A18); -INCLUDE_ASM(code_2e230_len_2190, func_80053A28); +INCLUDE_ASM("code_2e230_len_2190", func_80053A28); -INCLUDE_ASM(code_2e230_len_2190, func_80053A98); +INCLUDE_ASM("code_2e230_len_2190", func_80053A98); -INCLUDE_ASM(code_2e230_len_2190, func_80053AC8); +INCLUDE_ASM("code_2e230_len_2190", func_80053AC8); -INCLUDE_ASM(code_2e230_len_2190, func_80053AEC); +INCLUDE_ASM("code_2e230_len_2190", func_80053AEC); -INCLUDE_ASM(code_2e230_len_2190, func_80053B04); +INCLUDE_ASM("code_2e230_len_2190", func_80053B04); -INCLUDE_ASM(code_2e230_len_2190, func_80053BA8); +INCLUDE_ASM("code_2e230_len_2190", func_80053BA8); -INCLUDE_ASM(code_2e230_len_2190, func_80053BE8); +INCLUDE_ASM("code_2e230_len_2190", func_80053BE8); -INCLUDE_ASM(code_2e230_len_2190, func_80053C58); +INCLUDE_ASM("code_2e230_len_2190", func_80053C58); -INCLUDE_ASM(code_2e230_len_2190, func_80053CF8); +INCLUDE_ASM("code_2e230_len_2190", func_80053CF8); -INCLUDE_ASM(code_2e230_len_2190, func_80053E58); +INCLUDE_ASM("code_2e230_len_2190", func_80053E58); -INCLUDE_ASM(code_2e230_len_2190, func_80053F64); +INCLUDE_ASM("code_2e230_len_2190", func_80053F64); -INCLUDE_ASM(code_2e230_len_2190, func_80053F80); +INCLUDE_ASM("code_2e230_len_2190", func_80053F80); -INCLUDE_ASM(code_2e230_len_2190, func_80054248); +INCLUDE_ASM("code_2e230_len_2190", func_80054248); -INCLUDE_ASM(code_2e230_len_2190, al_LoadINIT); +INCLUDE_ASM("code_2e230_len_2190", al_LoadINIT); -INCLUDE_ASM(code_2e230_len_2190, al_CopyFileTableEntry); +INCLUDE_ASM("code_2e230_len_2190", al_CopyFileTableEntry); -INCLUDE_ASM(code_2e230_len_2190, al_LoadPER); +INCLUDE_ASM("code_2e230_len_2190", al_LoadPER); -INCLUDE_ASM(code_2e230_len_2190, al_LoadPRG); +INCLUDE_ASM("code_2e230_len_2190", al_LoadPRG); -INCLUDE_ASM(code_2e230_len_2190, func_80054744); +INCLUDE_ASM("code_2e230_len_2190", func_80054744); -INCLUDE_ASM(code_2e230_len_2190, al_LoadBank); +INCLUDE_ASM("code_2e230_len_2190", al_LoadBank); -INCLUDE_ASM(code_2e230_len_2190, func_800549F8); +INCLUDE_ASM("code_2e230_len_2190", func_800549F8); -INCLUDE_ASM(code_2e230_len_2190, func_80054C4C); +INCLUDE_ASM("code_2e230_len_2190", func_80054C4C); -INCLUDE_ASM(code_2e230_len_2190, func_80054CE0); +INCLUDE_ASM("code_2e230_len_2190", func_80054CE0); -INCLUDE_ASM(code_2e230_len_2190, func_80054D74); +INCLUDE_ASM("code_2e230_len_2190", func_80054D74); -INCLUDE_ASM(code_2e230_len_2190, func_80054DA8); +INCLUDE_ASM("code_2e230_len_2190", func_80054DA8); -INCLUDE_ASM(code_2e230_len_2190, al_DmaCopy); +INCLUDE_ASM("code_2e230_len_2190", al_DmaCopy); -INCLUDE_ASM(code_2e230_len_2190, func_80054E90); +INCLUDE_ASM("code_2e230_len_2190", func_80054E90); -INCLUDE_ASM(code_2e230_len_2190, al_CopyWords); +INCLUDE_ASM("code_2e230_len_2190", al_CopyWords); diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c index fef6b92f19..b9691131de 100644 --- a/src/code_303c0_len_3e10.c +++ b/src/code_303c0_len_3e10.c @@ -1,149 +1,149 @@ #include "common.h" -INCLUDE_ASM(code_303c0_len_3e10, al_LoadBKHeaders); +INCLUDE_ASM("code_303c0_len_3e10", al_LoadBKHeaders); -INCLUDE_ASM(code_303c0_len_3e10, func_80055050); +INCLUDE_ASM("code_303c0_len_3e10", func_80055050); -INCLUDE_ASM(code_303c0_len_3e10, func_80055110); +INCLUDE_ASM("code_303c0_len_3e10", func_80055110); -INCLUDE_ASM(code_303c0_len_3e10, func_80055240); +INCLUDE_ASM("code_303c0_len_3e10", func_80055240); -INCLUDE_ASM(code_303c0_len_3e10, func_80055330); +INCLUDE_ASM("code_303c0_len_3e10", func_80055330); -INCLUDE_ASM(code_303c0_len_3e10, func_800553C0); +INCLUDE_ASM("code_303c0_len_3e10", func_800553C0); -s32 INCLUDE_ASM(code_303c0_len_3e10, func_80055448, s32 arg0); +s32 INCLUDE_ASM("code_303c0_len_3e10", func_80055448, s32 arg0); -s32 INCLUDE_ASM(code_303c0_len_3e10, func_80055464, s32 arg0, s32 arg1); +s32 INCLUDE_ASM("code_303c0_len_3e10", func_80055464, s32 arg0, s32 arg1); -s32 INCLUDE_ASM(code_303c0_len_3e10, func_800554A4, s32 arg0, s32 arg1); +s32 INCLUDE_ASM("code_303c0_len_3e10", func_800554A4, s32 arg0, s32 arg1); -s32 INCLUDE_ASM(code_303c0_len_3e10, func_800554E8, s32 arg0, s32 arg1); +s32 INCLUDE_ASM("code_303c0_len_3e10", func_800554E8, s32 arg0, s32 arg1); -INCLUDE_ASM(code_303c0_len_3e10, func_8005553C); +INCLUDE_ASM("code_303c0_len_3e10", func_8005553C); -INCLUDE_ASM(code_303c0_len_3e10, func_80055590); +INCLUDE_ASM("code_303c0_len_3e10", func_80055590); -s32 INCLUDE_ASM(code_303c0_len_3e10, func_800555E4, s32 arg0); +s32 INCLUDE_ASM("code_303c0_len_3e10", func_800555E4, s32 arg0); -INCLUDE_ASM(code_303c0_len_3e10, func_800556D0); +INCLUDE_ASM("code_303c0_len_3e10", func_800556D0); -INCLUDE_ASM(code_303c0_len_3e10, func_80055718); +INCLUDE_ASM("code_303c0_len_3e10", func_80055718); -INCLUDE_ASM(code_303c0_len_3e10, func_80055848); +INCLUDE_ASM("code_303c0_len_3e10", func_80055848); -INCLUDE_ASM(code_303c0_len_3e10, func_800558D4); +INCLUDE_ASM("code_303c0_len_3e10", func_800558D4); -INCLUDE_ASM(code_303c0_len_3e10, func_80055970); +INCLUDE_ASM("code_303c0_len_3e10", func_80055970); -INCLUDE_ASM(code_303c0_len_3e10, func_800559C4); +INCLUDE_ASM("code_303c0_len_3e10", func_800559C4); -INCLUDE_ASM(code_303c0_len_3e10, func_800559FC); +INCLUDE_ASM("code_303c0_len_3e10", func_800559FC); -INCLUDE_ASM(code_303c0_len_3e10, func_80055A18); +INCLUDE_ASM("code_303c0_len_3e10", func_80055A18); -INCLUDE_ASM(code_303c0_len_3e10, func_80055ABC); +INCLUDE_ASM("code_303c0_len_3e10", func_80055ABC); -INCLUDE_ASM(code_303c0_len_3e10, func_80055AF0); +INCLUDE_ASM("code_303c0_len_3e10", func_80055AF0); -INCLUDE_ASM(code_303c0_len_3e10, func_80055B28); +INCLUDE_ASM("code_303c0_len_3e10", func_80055B28); -INCLUDE_ASM(code_303c0_len_3e10, func_80055B80); +INCLUDE_ASM("code_303c0_len_3e10", func_80055B80); -INCLUDE_ASM(code_303c0_len_3e10, func_80055BB8); +INCLUDE_ASM("code_303c0_len_3e10", func_80055BB8); -INCLUDE_ASM(code_303c0_len_3e10, func_80055CC4); +INCLUDE_ASM("code_303c0_len_3e10", func_80055CC4); -INCLUDE_ASM(code_303c0_len_3e10, func_80055CE8); +INCLUDE_ASM("code_303c0_len_3e10", func_80055CE8); -INCLUDE_ASM(code_303c0_len_3e10, func_80055DDC); +INCLUDE_ASM("code_303c0_len_3e10", func_80055DDC); -INCLUDE_ASM(code_303c0_len_3e10, func_80055E48); +INCLUDE_ASM("code_303c0_len_3e10", func_80055E48); -INCLUDE_ASM(code_303c0_len_3e10, func_80055EB4); +INCLUDE_ASM("code_303c0_len_3e10", func_80055EB4); -INCLUDE_ASM(code_303c0_len_3e10, func_80055F58); +INCLUDE_ASM("code_303c0_len_3e10", func_80055F58); -INCLUDE_ASM(code_303c0_len_3e10, func_80056028); +INCLUDE_ASM("code_303c0_len_3e10", func_80056028); -INCLUDE_ASM(code_303c0_len_3e10, func_80056044); +INCLUDE_ASM("code_303c0_len_3e10", func_80056044); -INCLUDE_ASM(code_303c0_len_3e10, func_80056068); +INCLUDE_ASM("code_303c0_len_3e10", func_80056068); -INCLUDE_ASM(code_303c0_len_3e10, func_8005608C); +INCLUDE_ASM("code_303c0_len_3e10", func_8005608C); -INCLUDE_ASM(code_303c0_len_3e10, func_800560A8); +INCLUDE_ASM("code_303c0_len_3e10", func_800560A8); -INCLUDE_ASM(code_303c0_len_3e10, func_800560BC); +INCLUDE_ASM("code_303c0_len_3e10", func_800560BC); -INCLUDE_ASM(code_303c0_len_3e10, func_8005610C); +INCLUDE_ASM("code_303c0_len_3e10", func_8005610C); -INCLUDE_ASM(code_303c0_len_3e10, func_8005615C); +INCLUDE_ASM("code_303c0_len_3e10", func_8005615C); -INCLUDE_ASM(code_303c0_len_3e10, func_80056180); +INCLUDE_ASM("code_303c0_len_3e10", func_80056180); -INCLUDE_ASM(code_303c0_len_3e10, func_800561A4); +INCLUDE_ASM("code_303c0_len_3e10", func_800561A4); -INCLUDE_ASM(code_303c0_len_3e10, func_800561E4); +INCLUDE_ASM("code_303c0_len_3e10", func_800561E4); -INCLUDE_ASM(code_303c0_len_3e10, func_80056204); +INCLUDE_ASM("code_303c0_len_3e10", func_80056204); -INCLUDE_ASM(code_303c0_len_3e10, func_80056228); +INCLUDE_ASM("code_303c0_len_3e10", func_80056228); -INCLUDE_ASM(code_303c0_len_3e10, func_80056250); +INCLUDE_ASM("code_303c0_len_3e10", func_80056250); -INCLUDE_API_ASM(code_303c0_len_3e10, alRename4); +INCLUDE_API_ASM("code_303c0_len_3e10", alRename4); -INCLUDE_ASM(code_303c0_len_3e10, func_80056D34); +INCLUDE_ASM("code_303c0_len_3e10", func_80056D34); -INCLUDE_ASM(code_303c0_len_3e10, func_80056D44); +INCLUDE_ASM("code_303c0_len_3e10", func_80056D44); -INCLUDE_ASM(code_303c0_len_3e10, func_80056D50); +INCLUDE_ASM("code_303c0_len_3e10", func_80056D50); -INCLUDE_ASM(code_303c0_len_3e10, func_80056D5C); +INCLUDE_ASM("code_303c0_len_3e10", func_80056D5C); -INCLUDE_ASM(code_303c0_len_3e10, func_80056D78); +INCLUDE_ASM("code_303c0_len_3e10", func_80056D78); -INCLUDE_ASM(code_303c0_len_3e10, func_80056DCC); +INCLUDE_ASM("code_303c0_len_3e10", func_80056DCC); -INCLUDE_ASM(code_303c0_len_3e10, func_80056EC0); +INCLUDE_ASM("code_303c0_len_3e10", func_80056EC0); -INCLUDE_ASM(code_303c0_len_3e10, func_80056EE8); +INCLUDE_ASM("code_303c0_len_3e10", func_80056EE8); -INCLUDE_ASM(code_303c0_len_3e10, func_80056FA4); +INCLUDE_ASM("code_303c0_len_3e10", func_80056FA4); -INCLUDE_ASM(code_303c0_len_3e10, func_80057224); +INCLUDE_ASM("code_303c0_len_3e10", func_80057224); -INCLUDE_ASM(code_303c0_len_3e10, func_80057344); +INCLUDE_ASM("code_303c0_len_3e10", func_80057344); -INCLUDE_ASM(code_303c0_len_3e10, func_8005736C); +INCLUDE_ASM("code_303c0_len_3e10", func_8005736C); -INCLUDE_ASM(code_303c0_len_3e10, func_80057548); +INCLUDE_ASM("code_303c0_len_3e10", func_80057548); -INCLUDE_ASM(code_303c0_len_3e10, func_800576EC); +INCLUDE_ASM("code_303c0_len_3e10", func_800576EC); -INCLUDE_ASM(code_303c0_len_3e10, func_80057874); +INCLUDE_ASM("code_303c0_len_3e10", func_80057874); -INCLUDE_ASM(code_303c0_len_3e10, func_80057DC8); +INCLUDE_ASM("code_303c0_len_3e10", func_80057DC8); -INCLUDE_ASM(code_303c0_len_3e10, func_80057E08); +INCLUDE_ASM("code_303c0_len_3e10", func_80057E08); -INCLUDE_ASM(code_303c0_len_3e10, func_80057E5C); +INCLUDE_ASM("code_303c0_len_3e10", func_80057E5C); -INCLUDE_ASM(code_303c0_len_3e10, func_80057EB0); +INCLUDE_ASM("code_303c0_len_3e10", func_80057EB0); -INCLUDE_ASM(code_303c0_len_3e10, func_80057ED0); +INCLUDE_ASM("code_303c0_len_3e10", func_80057ED0); -INCLUDE_ASM(code_303c0_len_3e10, func_80057F20); +INCLUDE_ASM("code_303c0_len_3e10", func_80057F20); -INCLUDE_API_ASM(code_303c0_len_3e10, alRename3); +INCLUDE_API_ASM("code_303c0_len_3e10", alRename3); -INCLUDE_ASM(code_303c0_len_3e10, func_80057FD8); +INCLUDE_ASM("code_303c0_len_3e10", func_80057FD8); -INCLUDE_ASM(code_303c0_len_3e10, func_80058004); +INCLUDE_ASM("code_303c0_len_3e10", func_80058004); -INCLUDE_ASM(code_303c0_len_3e10, func_80058050); +INCLUDE_ASM("code_303c0_len_3e10", func_80058050); -INCLUDE_ASM(code_303c0_len_3e10, func_80058B20); +INCLUDE_ASM("code_303c0_len_3e10", func_80058B20); -INCLUDE_ASM(code_303c0_len_3e10, func_80058C6C); +INCLUDE_ASM("code_303c0_len_3e10", func_80058C6C); diff --git a/src/code_3169f0.c b/src/code_3169f0.c index 7784b9053f..b05cee9a3c 100644 --- a/src/code_3169f0.c +++ b/src/code_3169f0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_3169f0, func_80200000); +INCLUDE_ASM("code_3169f0", func_80200000); diff --git a/src/code_316a70.c b/src/code_316a70.c index 2cdbf5d4d8..f107acf3da 100644 --- a/src/code_316a70.c +++ b/src/code_316a70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_316a70, func_80200080); +INCLUDE_ASM("code_316a70", func_80200080); diff --git a/src/code_316d90.c b/src/code_316d90.c index 0c82587c0f..eb1ab6a230 100644 --- a/src/code_316d90.c +++ b/src/code_316d90.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_316d90, func_802AE000); +INCLUDE_ASM("code_316d90", func_802AE000); diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c index accc086652..3f7e624218 100644 --- a/src/code_341d0_len_20d0.c +++ b/src/code_341d0_len_20d0.c @@ -1,45 +1,45 @@ #include "common.h" -INCLUDE_ASM(code_341d0_len_20d0, func_80058DD0); +INCLUDE_ASM("code_341d0_len_20d0", func_80058DD0); -INCLUDE_ASM(code_341d0_len_20d0, func_80058E84); +INCLUDE_ASM("code_341d0_len_20d0", func_80058E84); -INCLUDE_ASM(code_341d0_len_20d0, func_80059008); +INCLUDE_ASM("code_341d0_len_20d0", func_80059008); -INCLUDE_ASM(code_341d0_len_20d0, func_8005904C); +INCLUDE_ASM("code_341d0_len_20d0", func_8005904C); -INCLUDE_ASM(code_341d0_len_20d0, func_80059310); +INCLUDE_ASM("code_341d0_len_20d0", func_80059310); -INCLUDE_ASM(code_341d0_len_20d0, func_800598A0); +INCLUDE_ASM("code_341d0_len_20d0", func_800598A0); -INCLUDE_ASM(code_341d0_len_20d0, func_80059AB8); +INCLUDE_ASM("code_341d0_len_20d0", func_80059AB8); -INCLUDE_ASM(code_341d0_len_20d0, func_80059BD4); +INCLUDE_ASM("code_341d0_len_20d0", func_80059BD4); -INCLUDE_ASM(code_341d0_len_20d0, func_80059C9C); +INCLUDE_ASM("code_341d0_len_20d0", func_80059C9C); -INCLUDE_ASM(code_341d0_len_20d0, func_80059D50); +INCLUDE_ASM("code_341d0_len_20d0", func_80059D50); -INCLUDE_ASM(code_341d0_len_20d0, render_effects); +INCLUDE_ASM("code_341d0_len_20d0", render_effects); -INCLUDE_ASM(code_341d0_len_20d0, func_80059F94); +INCLUDE_ASM("code_341d0_len_20d0", func_80059F94); -INCLUDE_ASM(code_341d0_len_20d0, remove_effect); +INCLUDE_ASM("code_341d0_len_20d0", remove_effect); -INCLUDE_ASM(code_341d0_len_20d0, remove_all_effects); +INCLUDE_ASM("code_341d0_len_20d0", remove_all_effects); -INCLUDE_ASM(code_341d0_len_20d0, play_effect); +INCLUDE_ASM("code_341d0_len_20d0", play_effect); -INCLUDE_ASM(code_341d0_len_20d0, load_map_script_lib); +INCLUDE_ASM("code_341d0_len_20d0", load_map_script_lib); -INCLUDE_ASM(code_341d0_len_20d0, load_map_by_IDs); +INCLUDE_ASM("code_341d0_len_20d0", load_map_by_IDs); -INCLUDE_ASM(code_341d0_len_20d0, get_current_map_config); +INCLUDE_ASM("code_341d0_len_20d0", get_current_map_config); -INCLUDE_ASM(code_341d0_len_20d0, get_current_map_header); +INCLUDE_ASM("code_341d0_len_20d0", get_current_map_header); -INCLUDE_ASM(code_341d0_len_20d0, get_map_IDs_by_name); +INCLUDE_ASM("code_341d0_len_20d0", get_map_IDs_by_name); -INCLUDE_ASM(code_341d0_len_20d0, load_asset_by_name); +INCLUDE_ASM("code_341d0_len_20d0", load_asset_by_name); -INCLUDE_ASM(code_341d0_len_20d0, get_asset_offset); +INCLUDE_ASM("code_341d0_len_20d0", get_asset_offset); diff --git a/src/code_362a0_len_2f70.c b/src/code_362a0_len_2f70.c index 899cbe2b6f..f77477b417 100644 --- a/src/code_362a0_len_2f70.c +++ b/src/code_362a0_len_2f70.c @@ -1,43 +1,43 @@ #include "common.h" -INCLUDE_ASM(code_362a0_len_2f70, allocate_hit_tables); +INCLUDE_ASM("code_362a0_len_2f70", allocate_hit_tables); -INCLUDE_ASM(code_362a0_len_2f70, func_8005AF84); +INCLUDE_ASM("code_362a0_len_2f70", func_8005AF84); -INCLUDE_ASM(code_362a0_len_2f70, initialize_collision); +INCLUDE_ASM("code_362a0_len_2f70", initialize_collision); -INCLUDE_ASM(code_362a0_len_2f70, load_hit_asset); +INCLUDE_ASM("code_362a0_len_2f70", load_hit_asset); -INCLUDE_ASM(code_362a0_len_2f70, load_collision); +INCLUDE_ASM("code_362a0_len_2f70", load_collision); -INCLUDE_ASM(code_362a0_len_2f70, load_stage_collision); +INCLUDE_ASM("code_362a0_len_2f70", load_stage_collision); -INCLUDE_ASM(code_362a0_len_2f70, load_hit_data); +INCLUDE_ASM("code_362a0_len_2f70", load_hit_data); -INCLUDE_ASM(code_362a0_len_2f70, parent_collider_to_model); +INCLUDE_ASM("code_362a0_len_2f70", parent_collider_to_model); -INCLUDE_ASM(code_362a0_len_2f70, _add_hit_vert_to_buffer); +INCLUDE_ASM("code_362a0_len_2f70", _add_hit_vert_to_buffer); -INCLUDE_ASM(code_362a0_len_2f70, _get_hit_vert_index_from_buffer); +INCLUDE_ASM("code_362a0_len_2f70", _get_hit_vert_index_from_buffer); -void INCLUDE_ASM(code_362a0_len_2f70, update_collider_transform, s16 colliderID); +void INCLUDE_ASM("code_362a0_len_2f70", update_collider_transform, s16 colliderID); -INCLUDE_ASM(code_362a0_len_2f70, get_collider_type_by_id); +INCLUDE_ASM("code_362a0_len_2f70", get_collider_type_by_id); -INCLUDE_ASM(code_362a0_len_2f70, func_8005BDD8); +INCLUDE_ASM("code_362a0_len_2f70", func_8005BDD8); -INCLUDE_ASM(code_362a0_len_2f70, get_collider_center); +INCLUDE_ASM("code_362a0_len_2f70", get_collider_center); -INCLUDE_ASM(code_362a0_len_2f70, test_ray_triangle_general); +INCLUDE_ASM("code_362a0_len_2f70", test_ray_triangle_general); -INCLUDE_ASM(code_362a0_len_2f70, test_down_ray_triangle); +INCLUDE_ASM("code_362a0_len_2f70", test_down_ray_triangle); -INCLUDE_ASM(code_362a0_len_2f70, test_up_ray_triangle); +INCLUDE_ASM("code_362a0_len_2f70", test_up_ray_triangle); -INCLUDE_ASM(code_362a0_len_2f70, test_ray_colliders); +INCLUDE_ASM("code_362a0_len_2f70", test_ray_colliders); -INCLUDE_ASM(code_362a0_len_2f70, test_ray_zones); +INCLUDE_ASM("code_362a0_len_2f70", test_ray_zones); -INCLUDE_ASM(code_362a0_len_2f70, test_up_ray_collider); +INCLUDE_ASM("code_362a0_len_2f70", test_up_ray_collider); -INCLUDE_ASM(code_362a0_len_2f70, test_ray_entities); +INCLUDE_ASM("code_362a0_len_2f70", test_ray_entities); diff --git a/src/code_39210_len_aa0.c b/src/code_39210_len_aa0.c index 2fc2f36b9f..69aeee38df 100644 --- a/src/code_39210_len_aa0.c +++ b/src/code_39210_len_aa0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_39210_len_aa0, get_npc_pos); +INCLUDE_ASM("code_39210_len_aa0", get_npc_pos); diff --git a/src/code_3bf0_len_6f0.c b/src/code_3bf0_len_6f0.c index 98e599ab5d..d6fbd4b8e2 100644 --- a/src/code_3bf0_len_6f0.c +++ b/src/code_3bf0_len_6f0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(code_3bf0_len_6f0, func_800287F0); +INCLUDE_ASM("code_3bf0_len_6f0", func_800287F0); -INCLUDE_ASM(code_3bf0_len_6f0, func_80028838); +INCLUDE_ASM("code_3bf0_len_6f0", func_80028838); -INCLUDE_ASM(code_3bf0_len_6f0, update_input); +INCLUDE_ASM("code_3bf0_len_6f0", update_input); diff --git a/src/code_415D90.c b/src/code_415D90.c index 8ae6101240..4f6b4abd20 100644 --- a/src/code_415D90.c +++ b/src/code_415D90.c @@ -1,111 +1,111 @@ #include "common.h" -INCLUDE_ASM(code_415D90, func_802A1000); +INCLUDE_ASM("code_415D90", func_802A1000); -INCLUDE_ASM(code_415D90, func_802A1030); +INCLUDE_ASM("code_415D90", func_802A1030); -INCLUDE_ASM(code_415D90, func_802A1050); +INCLUDE_ASM("code_415D90", func_802A1050); -INCLUDE_ASM(code_415D90, func_802A1078); +INCLUDE_ASM("code_415D90", func_802A1078); -INCLUDE_ASM(code_415D90, func_802A1098); +INCLUDE_ASM("code_415D90", func_802A1098); -INCLUDE_ASM(code_415D90, func_802A10B8); +INCLUDE_ASM("code_415D90", func_802A10B8); -INCLUDE_ASM(code_415D90, func_802A11B0); +INCLUDE_ASM("code_415D90", func_802A11B0); -INCLUDE_ASM(code_415D90, func_802A1C54); +INCLUDE_ASM("code_415D90", func_802A1C54); -INCLUDE_ASM(code_415D90, func_802A2684); +INCLUDE_ASM("code_415D90", func_802A2684); -INCLUDE_ASM(code_415D90, func_802A27D0); +INCLUDE_ASM("code_415D90", func_802A27D0); -INCLUDE_ASM(code_415D90, func_802A27E4); +INCLUDE_ASM("code_415D90", func_802A27E4); -INCLUDE_ASM(code_415D90, func_802A2910); +INCLUDE_ASM("code_415D90", func_802A2910); -INCLUDE_ASM(code_415D90, func_802A2AB8); +INCLUDE_ASM("code_415D90", func_802A2AB8); -INCLUDE_ASM(code_415D90, func_802A2C58); +INCLUDE_ASM("code_415D90", func_802A2C58); -INCLUDE_ASM(code_415D90, func_802A2C84); +INCLUDE_ASM("code_415D90", func_802A2C84); -INCLUDE_ASM(code_415D90, func_802A45D8); +INCLUDE_ASM("code_415D90", func_802A45D8); -INCLUDE_ASM(code_415D90, func_802A4718); +INCLUDE_ASM("code_415D90", func_802A4718); -INCLUDE_ASM(code_415D90, func_802A472C); +INCLUDE_ASM("code_415D90", func_802A472C); -INCLUDE_ASM(code_415D90, func_802A47E0); +INCLUDE_ASM("code_415D90", func_802A47E0); -INCLUDE_ASM(code_415D90, func_802A48FC); +INCLUDE_ASM("code_415D90", func_802A48FC); -INCLUDE_ASM(code_415D90, func_802A4A10); +INCLUDE_ASM("code_415D90", func_802A4A10); -INCLUDE_ASM(code_415D90, func_802A4A54); +INCLUDE_ASM("code_415D90", func_802A4A54); -INCLUDE_ASM(code_415D90, can_switch_to_player); +INCLUDE_ASM("code_415D90", can_switch_to_player); -INCLUDE_ASM(code_415D90, func_802A58D0); +INCLUDE_ASM("code_415D90", func_802A58D0); -INCLUDE_ASM(code_415D90, update_player_menu); +INCLUDE_ASM("code_415D90", update_player_menu); -INCLUDE_ASM(code_415D90, func_802A8180); +INCLUDE_ASM("code_415D90", func_802A8180); -INCLUDE_ASM(code_415D90, update_partner_menu); +INCLUDE_ASM("code_415D90", update_partner_menu); -INCLUDE_ASM(code_415D90, func_802A97AC); +INCLUDE_ASM("code_415D90", func_802A97AC); -INCLUDE_ASM(code_415D90, func_802A97BC); +INCLUDE_ASM("code_415D90", func_802A97BC); -INCLUDE_ASM(code_415D90, func_802A97CC); +INCLUDE_ASM("code_415D90", func_802A97CC); -INCLUDE_ASM(code_415D90, func_802A97F8); +INCLUDE_ASM("code_415D90", func_802A97F8); -INCLUDE_ASM(code_415D90, func_802A97FC); +INCLUDE_ASM("code_415D90", func_802A97FC); -INCLUDE_ASM(code_415D90, func_802A9810); +INCLUDE_ASM("code_415D90", func_802A9810); -INCLUDE_ASM(code_415D90, func_802A981C); +INCLUDE_ASM("code_415D90", func_802A981C); -INCLUDE_ASM(code_415D90, func_802A9834); +INCLUDE_ASM("code_415D90", func_802A9834); -INCLUDE_ASM(code_415D90, func_802A984C); +INCLUDE_ASM("code_415D90", func_802A984C); -INCLUDE_ASM(code_415D90, func_802A9894); +INCLUDE_ASM("code_415D90", func_802A9894); -INCLUDE_ASM(code_415D90, func_802A9898); +INCLUDE_ASM("code_415D90", func_802A9898); -INCLUDE_ASM(code_415D90, func_802A98B0); +INCLUDE_ASM("code_415D90", func_802A98B0); -INCLUDE_ASM(code_415D90, func_802A98D0); +INCLUDE_ASM("code_415D90", func_802A98D0); -INCLUDE_ASM(code_415D90, func_802A98DC); +INCLUDE_ASM("code_415D90", func_802A98DC); -INCLUDE_ASM(code_415D90, func_802A98E0); +INCLUDE_ASM("code_415D90", func_802A98E0); -INCLUDE_ASM(code_415D90, func_802A9914); +INCLUDE_ASM("code_415D90", func_802A9914); -INCLUDE_ASM(code_415D90, func_802A992C); +INCLUDE_ASM("code_415D90", func_802A992C); -INCLUDE_ASM(code_415D90, func_802A9AE8); +INCLUDE_ASM("code_415D90", func_802A9AE8); -INCLUDE_ASM(code_415D90, func_802A9B30); +INCLUDE_ASM("code_415D90", func_802A9B30); -INCLUDE_ASM(code_415D90, func_802A9B44); +INCLUDE_ASM("code_415D90", func_802A9B44); -INCLUDE_ASM(code_415D90, func_802AA014); +INCLUDE_ASM("code_415D90", func_802AA014); -INCLUDE_ASM(code_415D90, func_802AA05C); +INCLUDE_ASM("code_415D90", func_802AA05C); -INCLUDE_ASM(code_415D90, func_802AA0A4); +INCLUDE_ASM("code_415D90", func_802AA0A4); -INCLUDE_ASM(code_415D90, func_802AA0B8); +INCLUDE_ASM("code_415D90", func_802AA0B8); -INCLUDE_ASM(code_415D90, func_802AA0D8); +INCLUDE_ASM("code_415D90", func_802AA0D8); -INCLUDE_ASM(code_415D90, func_802AA640); +INCLUDE_ASM("code_415D90", func_802AA640); -INCLUDE_ASM(code_415D90, update_targeting_enemies); +INCLUDE_ASM("code_415D90", update_targeting_enemies); -INCLUDE_ASM(code_415D90, func_802AACD8); +INCLUDE_ASM("code_415D90", func_802AACD8); diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index 1d3d63806d..dbc3b124de 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -1,87 +1,87 @@ #include "common.h" -INCLUDE_ASM(code_42e0_len_1f60, poll_rumble); +INCLUDE_ASM("code_42e0_len_1f60", poll_rumble); -INCLUDE_ASM(code_42e0_len_1f60, start_rumble); +INCLUDE_ASM("code_42e0_len_1f60", start_rumble); -INCLUDE_ASM(code_42e0_len_1f60, func_80028F8C); +INCLUDE_ASM("code_42e0_len_1f60", func_80028F8C); -INCLUDE_ASM(code_42e0_len_1f60, func_80028FE0); +INCLUDE_ASM("code_42e0_len_1f60", func_80028FE0); -INCLUDE_API_ASM(code_42e0_len_1f60, length2D); +INCLUDE_API_ASM("code_42e0_len_1f60", length2D); -INCLUDE_ASM(code_42e0_len_1f60, _heap_create); +INCLUDE_ASM("code_42e0_len_1f60", _heap_create); -INCLUDE_ASM(code_42e0_len_1f60, _heap_malloc); +INCLUDE_ASM("code_42e0_len_1f60", _heap_malloc); -INCLUDE_ASM(code_42e0_len_1f60, _heap_malloc_tail); +INCLUDE_ASM("code_42e0_len_1f60", _heap_malloc_tail); -INCLUDE_ASM(code_42e0_len_1f60, _heap_free); +INCLUDE_ASM("code_42e0_len_1f60", _heap_free); -INCLUDE_ASM(code_42e0_len_1f60, _heap_realloc); +INCLUDE_ASM("code_42e0_len_1f60", _heap_realloc); -INCLUDE_API_ASM(code_42e0_len_1f60, cosine); +INCLUDE_API_ASM("code_42e0_len_1f60", cosine); -INCLUDE_API_ASM(code_42e0_len_1f60, sign); +INCLUDE_API_ASM("code_42e0_len_1f60", sign); -INCLUDE_ASM(code_42e0_len_1f60, int_to_string); +INCLUDE_ASM("code_42e0_len_1f60", int_to_string); -INCLUDE_ASM(code_42e0_len_1f60, mem_clear); +INCLUDE_ASM("code_42e0_len_1f60", mem_clear); -INCLUDE_ASM(code_42e0_len_1f60, transform_point); +INCLUDE_ASM("code_42e0_len_1f60", transform_point); -INCLUDE_ASM(code_42e0_len_1f60, copy_matrix); +INCLUDE_ASM("code_42e0_len_1f60", copy_matrix); -INCLUDE_ASM(code_42e0_len_1f60, dma_copy); +INCLUDE_ASM("code_42e0_len_1f60", dma_copy); -INCLUDE_ASM(code_42e0_len_1f60, func_80029860); +INCLUDE_ASM("code_42e0_len_1f60", func_80029860); -INCLUDE_ASM(code_42e0_len_1f60, _advance_rng); +INCLUDE_ASM("code_42e0_len_1f60", _advance_rng); -INCLUDE_ASM(code_42e0_len_1f60, func_80029934); +INCLUDE_ASM("code_42e0_len_1f60", func_80029934); -INCLUDE_ASM(code_42e0_len_1f60, func_80029994); +INCLUDE_ASM("code_42e0_len_1f60", func_80029994); -s32 INCLUDE_ASM(code_42e0_len_1f60, rand_int, s32 arg0); +s32 INCLUDE_ASM("code_42e0_len_1f60", rand_int, s32 arg0); -INCLUDE_API_ASM(code_42e0_len_1f60, signF); +INCLUDE_API_ASM("code_42e0_len_1f60", signF); -INCLUDE_API_ASM(code_42e0_len_1f60, round); +INCLUDE_API_ASM("code_42e0_len_1f60", round); -f32 INCLUDE_ASM(code_42e0_len_1f60, clamp_angle, f32 theta); +f32 INCLUDE_ASM("code_42e0_len_1f60", clamp_angle, f32 theta); -INCLUDE_ASM(code_42e0_len_1f60, get_clamped_angle_diff); +INCLUDE_ASM("code_42e0_len_1f60", get_clamped_angle_diff); -f32 INCLUDE_ASM(code_42e0_len_1f60, atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); +f32 INCLUDE_ASM("code_42e0_len_1f60", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); -INCLUDE_ASM(code_42e0_len_1f60, get_player_normal_yaw); +INCLUDE_ASM("code_42e0_len_1f60", get_player_normal_yaw); -INCLUDE_ASM(code_42e0_len_1f60, get_player_normal_pitch); +INCLUDE_ASM("code_42e0_len_1f60", get_player_normal_pitch); -f32 INCLUDE_ASM(code_42e0_len_1f60, dist2D, f32 ax, f32 ay, f32 bx, f32 by); +f32 INCLUDE_ASM("code_42e0_len_1f60", dist2D, f32 ax, f32 ay, f32 bx, f32 by); -f32 INCLUDE_ASM(code_42e0_len_1f60, dist3D, f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz); +f32 INCLUDE_ASM("code_42e0_len_1f60", dist3D, f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz); -void INCLUDE_ASM(code_42e0_len_1f60, add_vec2D_polar, f32* x, f32* y, f32 r, f32 theta); +void INCLUDE_ASM("code_42e0_len_1f60", add_vec2D_polar, f32* x, f32* y, f32 r, f32 theta); -INCLUDE_ASM(code_42e0_len_1f60, _wrap_trig_lookup_value); +INCLUDE_ASM("code_42e0_len_1f60", _wrap_trig_lookup_value); -INCLUDE_ASM(code_42e0_len_1f60, sin_cos_rad); +INCLUDE_ASM("code_42e0_len_1f60", sin_cos_rad); -INCLUDE_ASM(code_42e0_len_1f60, sin_rad); +INCLUDE_ASM("code_42e0_len_1f60", sin_rad); -INCLUDE_ASM(code_42e0_len_1f60, cos_rad); +INCLUDE_ASM("code_42e0_len_1f60", cos_rad); -INCLUDE_ASM(code_42e0_len_1f60, sin_cos_deg); +INCLUDE_ASM("code_42e0_len_1f60", sin_cos_deg); -f32 INCLUDE_ASM(code_42e0_len_1f60, sin_deg, f32 x); +f32 INCLUDE_ASM("code_42e0_len_1f60", sin_deg, f32 x); -f32 INCLUDE_ASM(code_42e0_len_1f60, cos_deg, f32 x); +f32 INCLUDE_ASM("code_42e0_len_1f60", cos_deg, f32 x); -f32 INCLUDE_ASM(code_42e0_len_1f60, update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); +f32 INCLUDE_ASM("code_42e0_len_1f60", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); -INCLUDE_ASM(code_42e0_len_1f60, func_8002A904); +INCLUDE_ASM("code_42e0_len_1f60", func_8002A904); -INCLUDE_ASM(code_42e0_len_1f60, func_8002AAC4); +INCLUDE_ASM("code_42e0_len_1f60", func_8002AAC4); -INCLUDE_ASM(code_42e0_len_1f60, func_8002AB5C); +INCLUDE_ASM("code_42e0_len_1f60", func_8002AB5C); diff --git a/src/code_6000.c b/src/code_6000.c index 2c9e2d3851..69c6348446 100644 --- a/src/code_6000.c +++ b/src/code_6000.c @@ -50,11 +50,11 @@ s32 heap_free(s32 size) { } } -INCLUDE_ASM(code_6000, collision_heap_create); +INCLUDE_ASM("code_6000", collision_heap_create); -INCLUDE_ASM(code_6000, collision_heap_malloc); +INCLUDE_ASM("code_6000", collision_heap_malloc); -INCLUDE_ASM(code_6000, collision_heap_free); +INCLUDE_ASM("code_6000", collision_heap_free); /*s32 collision_heap_free(s32 size) { s32 isBattle = (*gGameStatusPtr)->isBattle; diff --git a/src/code_6240_len_c00.c b/src/code_6240_len_c00.c index 1539ea4f10..b3afcfc4a0 100644 --- a/src/code_6240_len_c00.c +++ b/src/code_6240_len_c00.c @@ -1,35 +1,35 @@ #include "common.h" -INCLUDE_ASM(code_6240_len_c00, get_spirits_rescued); +INCLUDE_ASM("code_6240_len_c00", get_spirits_rescued); -INCLUDE_ASM(code_6240_len_c00, fio_calc_header_checksum); +INCLUDE_ASM("code_6240_len_c00", fio_calc_header_checksum); -INCLUDE_ASM(code_6240_len_c00, fio_validate_header_checksums); +INCLUDE_ASM("code_6240_len_c00", fio_validate_header_checksums); -INCLUDE_ASM(code_6240_len_c00, fio_has_valid_backup); +INCLUDE_ASM("code_6240_len_c00", fio_has_valid_backup); -INCLUDE_ASM(code_6240_len_c00, fio_flush_backups); +INCLUDE_ASM("code_6240_len_c00", fio_flush_backups); -INCLUDE_ASM(code_6240_len_c00, fio_calc_file_checksum); +INCLUDE_ASM("code_6240_len_c00", fio_calc_file_checksum); -INCLUDE_ASM(code_6240_len_c00, fio_validate_file_checksum); +INCLUDE_ASM("code_6240_len_c00", fio_validate_file_checksum); -INCLUDE_ASM(code_6240_len_c00, fio_fetch_saved_file_info); +INCLUDE_ASM("code_6240_len_c00", fio_fetch_saved_file_info); -INCLUDE_ASM(code_6240_len_c00, fio_load_game); +INCLUDE_ASM("code_6240_len_c00", fio_load_game); -INCLUDE_ASM(code_6240_len_c00, fio_save_game); +INCLUDE_ASM("code_6240_len_c00", fio_save_game); -INCLUDE_ASM(code_6240_len_c00, fio_erase_game); +INCLUDE_ASM("code_6240_len_c00", fio_erase_game); -INCLUDE_ASM(code_6240_len_c00, fio_deserialize_state); +INCLUDE_ASM("code_6240_len_c00", fio_deserialize_state); -INCLUDE_ASM(code_6240_len_c00, fio_serialize_state); +INCLUDE_ASM("code_6240_len_c00", fio_serialize_state); -INCLUDE_ASM(code_6240_len_c00, fio_init_flash); +INCLUDE_ASM("code_6240_len_c00", fio_init_flash); -INCLUDE_ASM(code_6240_len_c00, fio_read_flash); +INCLUDE_ASM("code_6240_len_c00", fio_read_flash); -INCLUDE_ASM(code_6240_len_c00, fio_write_flash); +INCLUDE_ASM("code_6240_len_c00", fio_write_flash); -INCLUDE_ASM(code_6240_len_c00, fio_erase_flash); +INCLUDE_ASM("code_6240_len_c00", fio_erase_flash); diff --git a/src/code_6e40_len_500.c b/src/code_6e40_len_500.c index c90ac0cde2..82e812708a 100644 --- a/src/code_6e40_len_500.c +++ b/src/code_6e40_len_500.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(code_6e40_len_500, func_8002BA40); +INCLUDE_ASM("code_6e40_len_500", func_8002BA40); -INCLUDE_ASM(code_6e40_len_500, func_8002BA78); +INCLUDE_ASM("code_6e40_len_500", func_8002BA78); -INCLUDE_ASM(code_6e40_len_500, func_8002BA80); +INCLUDE_ASM("code_6e40_len_500", func_8002BA80); -INCLUDE_ASM(code_6e40_len_500, func_8002BEDC); +INCLUDE_ASM("code_6e40_len_500", func_8002BEDC); -INCLUDE_ASM(code_6e40_len_500, func_8002BEEC); +INCLUDE_ASM("code_6e40_len_500", func_8002BEEC); -INCLUDE_ASM(code_6e40_len_500, func_8002BF04); +INCLUDE_ASM("code_6e40_len_500", func_8002BF04); -INCLUDE_ASM(code_6e40_len_500, func_8002BF14); +INCLUDE_ASM("code_6e40_len_500", func_8002BF14); -INCLUDE_ASM(code_6e40_len_500, func_8002BF24); +INCLUDE_ASM("code_6e40_len_500", func_8002BF24); diff --git a/src/code_7340_len_b00.c b/src/code_7340_len_b00.c index d6ec8790bf..5c9e133d76 100644 --- a/src/code_7340_len_b00.c +++ b/src/code_7340_len_b00.c @@ -1,23 +1,23 @@ #include "common.h" -INCLUDE_ASM(code_7340_len_b00, crash_delay_msec); +INCLUDE_ASM("code_7340_len_b00", crash_delay_msec); -INCLUDE_ASM(code_7340_len_b00, func_8002BFB0); +INCLUDE_ASM("code_7340_len_b00", func_8002BFB0); -INCLUDE_ASM(code_7340_len_b00, func_8002C054); +INCLUDE_ASM("code_7340_len_b00", func_8002C054); -INCLUDE_ASM(code_7340_len_b00, crash_printf_string); +INCLUDE_ASM("code_7340_len_b00", crash_printf_string); -INCLUDE_ASM(code_7340_len_b00, crash_print_fpr); +INCLUDE_ASM("code_7340_len_b00", crash_print_fpr); -INCLUDE_ASM(code_7340_len_b00, func_8002C324); +INCLUDE_ASM("code_7340_len_b00", func_8002C324); -INCLUDE_ASM(code_7340_len_b00, crash_show_handler); +INCLUDE_ASM("code_7340_len_b00", crash_show_handler); -INCLUDE_ASM(code_7340_len_b00, func_8002C7B0); +INCLUDE_ASM("code_7340_len_b00", func_8002C7B0); -INCLUDE_ASM(code_7340_len_b00, crash_monitor_thread); +INCLUDE_ASM("code_7340_len_b00", crash_monitor_thread); -INCLUDE_ASM(code_7340_len_b00, func_8002C890); +INCLUDE_ASM("code_7340_len_b00", func_8002C890); -INCLUDE_ASM(code_7340_len_b00, crash_create_monitor); +INCLUDE_ASM("code_7340_len_b00", crash_create_monitor); diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c index c0b8e01a6b..d86b99aff6 100644 --- a/src/code_759b0_len_61b0.c +++ b/src/code_759b0_len_61b0.c @@ -1,139 +1,139 @@ #include "common.h" -INCLUDE_ASM(code_759b0_len_61b0, func_800DC500); +INCLUDE_ASM("code_759b0_len_61b0", func_800DC500); -INCLUDE_ASM(code_759b0_len_61b0, func_800DC778); +INCLUDE_ASM("code_759b0_len_61b0", func_800DC778); -INCLUDE_ASM(code_759b0_len_61b0, func_800DCB7C); +INCLUDE_ASM("code_759b0_len_61b0", func_800DCB7C); -INCLUDE_ASM(code_759b0_len_61b0, func_800DCE70); +INCLUDE_ASM("code_759b0_len_61b0", func_800DCE70); -INCLUDE_ASM(code_759b0_len_61b0, func_800DD04C); +INCLUDE_ASM("code_759b0_len_61b0", func_800DD04C); -INCLUDE_ASM(code_759b0_len_61b0, func_800DD44C); +INCLUDE_ASM("code_759b0_len_61b0", func_800DD44C); -INCLUDE_ASM(code_759b0_len_61b0, func_800DD5B4); +INCLUDE_ASM("code_759b0_len_61b0", func_800DD5B4); -INCLUDE_ASM(code_759b0_len_61b0, func_800DD618); +INCLUDE_ASM("code_759b0_len_61b0", func_800DD618); -INCLUDE_ASM(code_759b0_len_61b0, func_800DD8FC); +INCLUDE_ASM("code_759b0_len_61b0", func_800DD8FC); -INCLUDE_ASM(code_759b0_len_61b0, func_800DDAE4); +INCLUDE_ASM("code_759b0_len_61b0", func_800DDAE4); -INCLUDE_ASM(code_759b0_len_61b0, func_800DDC44); +INCLUDE_ASM("code_759b0_len_61b0", func_800DDC44); -INCLUDE_ASM(code_759b0_len_61b0, func_800DDD94); +INCLUDE_ASM("code_759b0_len_61b0", func_800DDD94); -INCLUDE_ASM(code_759b0_len_61b0, test_below_player); +INCLUDE_ASM("code_759b0_len_61b0", test_below_player); -INCLUDE_ASM(code_759b0_len_61b0, func_800DE46C); +INCLUDE_ASM("code_759b0_len_61b0", func_800DE46C); -INCLUDE_ASM(code_759b0_len_61b0, trace_below_player); +INCLUDE_ASM("code_759b0_len_61b0", trace_below_player); -INCLUDE_ASM(code_759b0_len_61b0, func_800DE7E4); +INCLUDE_ASM("code_759b0_len_61b0", func_800DE7E4); -INCLUDE_ASM(code_759b0_len_61b0, trace_above_player); +INCLUDE_ASM("code_759b0_len_61b0", trace_above_player); -INCLUDE_ASM(code_759b0_len_61b0, func_800DEC04); +INCLUDE_ASM("code_759b0_len_61b0", func_800DEC04); -INCLUDE_ASM(code_759b0_len_61b0, func_800DEE5C); +INCLUDE_ASM("code_759b0_len_61b0", func_800DEE5C); -INCLUDE_ASM(code_759b0_len_61b0, func_800DF15C); +INCLUDE_ASM("code_759b0_len_61b0", func_800DF15C); -INCLUDE_ASM(code_759b0_len_61b0, func_800DF3FC); +INCLUDE_ASM("code_759b0_len_61b0", func_800DF3FC); -INCLUDE_ASM(code_759b0_len_61b0, test_player_lateral); +INCLUDE_ASM("code_759b0_len_61b0", test_player_lateral); -INCLUDE_ASM(code_759b0_len_61b0, func_800DF740); +INCLUDE_ASM("code_759b0_len_61b0", func_800DF740); -INCLUDE_ASM(code_759b0_len_61b0, check_input_use_partner); +INCLUDE_ASM("code_759b0_len_61b0", check_input_use_partner); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFAAC); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFAAC); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFBE8); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFBE8); -INCLUDE_ASM(code_759b0_len_61b0, clear_player_status); +INCLUDE_ASM("code_759b0_len_61b0", clear_player_status); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFC74); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFC74); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFCF4); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFCF4); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFD48); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFD48); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFEFC); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFEFC); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFF78); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFF78); -INCLUDE_ASM(code_759b0_len_61b0, func_800DFFCC); +INCLUDE_ASM("code_759b0_len_61b0", func_800DFFCC); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0088); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0088); -INCLUDE_ASM(code_759b0_len_61b0, enable_player_shadow); +INCLUDE_ASM("code_759b0_len_61b0", enable_player_shadow); -INCLUDE_ASM(code_759b0_len_61b0, disable_player_shadow); +INCLUDE_ASM("code_759b0_len_61b0", disable_player_shadow); -INCLUDE_ASM(code_759b0_len_61b0, enable_player_physics); +INCLUDE_ASM("code_759b0_len_61b0", enable_player_physics); -INCLUDE_ASM(code_759b0_len_61b0, disable_player_physics); +INCLUDE_ASM("code_759b0_len_61b0", disable_player_physics); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0178); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0178); -INCLUDE_ASM(code_759b0_len_61b0, func_800E01A4); +INCLUDE_ASM("code_759b0_len_61b0", func_800E01A4); -INCLUDE_ASM(code_759b0_len_61b0, func_800E01DC); +INCLUDE_ASM("code_759b0_len_61b0", func_800E01DC); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0208); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0208); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0260); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0260); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0294); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0294); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0330); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0330); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0374); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0374); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0398); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0398); -INCLUDE_ASM(code_759b0_len_61b0, func_800E04D0); +INCLUDE_ASM("code_759b0_len_61b0", func_800E04D0); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0514); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0514); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0538); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0538); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0580); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0580); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0658); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0658); -INCLUDE_ASM(code_759b0_len_61b0, func_800E069C); +INCLUDE_ASM("code_759b0_len_61b0", func_800E069C); -INCLUDE_ASM(code_759b0_len_61b0, func_800E06C0); +INCLUDE_ASM("code_759b0_len_61b0", func_800E06C0); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0818); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0818); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0AD0); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0AD0); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0B14); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0B14); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0B38); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0B38); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0B90); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0B90); -INCLUDE_ASM(code_759b0_len_61b0, func_800E0FEC); +INCLUDE_ASM("code_759b0_len_61b0", func_800E0FEC); -INCLUDE_ASM(code_759b0_len_61b0, render_player); +INCLUDE_ASM("code_759b0_len_61b0", render_player); -INCLUDE_ASM(code_759b0_len_61b0, render_player_model); +INCLUDE_ASM("code_759b0_len_61b0", render_player_model); -INCLUDE_ASM(code_759b0_len_61b0, make_player_display_list); +INCLUDE_ASM("code_759b0_len_61b0", make_player_display_list); -INCLUDE_ASM(code_759b0_len_61b0, make_spinning_player_display_list); +INCLUDE_ASM("code_759b0_len_61b0", make_spinning_player_display_list); -INCLUDE_ASM(code_759b0_len_61b0, update_below_player); +INCLUDE_ASM("code_759b0_len_61b0", update_below_player); -INCLUDE_ASM(code_759b0_len_61b0, func_800E1F90); +INCLUDE_ASM("code_759b0_len_61b0", func_800E1F90); -INCLUDE_ASM(code_759b0_len_61b0, func_800E205C); +INCLUDE_ASM("code_759b0_len_61b0", func_800E205C); -INCLUDE_ASM(code_759b0_len_61b0, func_800E2304); +INCLUDE_ASM("code_759b0_len_61b0", func_800E2304); -INCLUDE_ASM(code_759b0_len_61b0, func_800E24F8); +INCLUDE_ASM("code_759b0_len_61b0", func_800E24F8); diff --git a/src/code_7E2AA0.c b/src/code_7E2AA0.c index e30495be0a..71b3c72611 100644 --- a/src/code_7E2AA0.c +++ b/src/code_7E2AA0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(code_7E2AA0, func_80281C20); +INCLUDE_ASM("code_7E2AA0", func_80281C20); -INCLUDE_API_ASM(code_7E2AA0, MakeDoorAdvanced); +INCLUDE_API_ASM("code_7E2AA0", MakeDoorAdvanced); diff --git a/src/code_7E3700.c b/src/code_7E3700.c index ab17eaabed..4ad9feac3c 100644 --- a/src/code_7E3700.c +++ b/src/code_7E3700.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(code_7E3700, func_80282880); +INCLUDE_ASM("code_7E3700", func_80282880); -INCLUDE_API_ASM(code_7E3700, CheckActionState); +INCLUDE_API_ASM("code_7E3700", CheckActionState); -INCLUDE_API_ASM(code_7E3700, CreatePushBlockGrid); +INCLUDE_API_ASM("code_7E3700", CreatePushBlockGrid); -INCLUDE_API_ASM(code_7E3700, SetPushBlock); +INCLUDE_API_ASM("code_7E3700", SetPushBlock); -INCLUDE_API_ASM(code_7E3700, GetPushBlock); +INCLUDE_API_ASM("code_7E3700", GetPushBlock); -INCLUDE_API_ASM(code_7E3700, GetGridIndexFromPos); +INCLUDE_API_ASM("code_7E3700", GetGridIndexFromPos); -INCLUDE_API_ASM(code_7E3700, SetPushBlockFallEffect); +INCLUDE_API_ASM("code_7E3700", SetPushBlockFallEffect); diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c index afd6fc326b..3b1f4bd7d9 100644 --- a/src/code_7bb60_len_41b0.c +++ b/src/code_7bb60_len_41b0.c @@ -1,95 +1,95 @@ #include "common.h" -INCLUDE_ASM(code_7bb60_len_41b0, func_800E26B0); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E26B0); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E26C4); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E26C4); -INCLUDE_ASM(code_7bb60_len_41b0, move_player); +INCLUDE_ASM("code_7bb60_len_41b0", move_player); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E27E0); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E27E0); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E29C8); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E29C8); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E2BB0); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E2BB0); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E2D18); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E2D18); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E306C); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E306C); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E3100); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E3100); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E315C); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E315C); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E3278); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E3278); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E3448); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E3448); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E34D8); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E34D8); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E3514); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E3514); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E363C); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E363C); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E4308); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E4308); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E4404); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E4404); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E4508); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E4508); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E45E0); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E45E0); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E4744); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E4744); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E4BB8); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E4BB8); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E4F10); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E4F10); -INCLUDE_ASM(code_7bb60_len_41b0, check_input_midair_jump); +INCLUDE_ASM("code_7bb60_len_41b0", check_input_midair_jump); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5088); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5088); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5174); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5174); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E52F8); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E52F8); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5348); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5348); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E546C); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E546C); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E54E0); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E54E0); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5520); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5520); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5530); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5530); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5938); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5938); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E59A0); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E59A0); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5A2C); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5A2C); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E5C78); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E5C78); -INCLUDE_ASM(code_7bb60_len_41b0, set_action_state); +INCLUDE_ASM("code_7bb60_len_41b0", set_action_state); -INCLUDE_ASM(code_7bb60_len_41b0, update_locomotion_state); +INCLUDE_ASM("code_7bb60_len_41b0", update_locomotion_state); -INCLUDE_ASM(code_7bb60_len_41b0, start_falling); +INCLUDE_ASM("code_7bb60_len_41b0", start_falling); -INCLUDE_ASM(code_7bb60_len_41b0, start_bounce_a); +INCLUDE_ASM("code_7bb60_len_41b0", start_bounce_a); -INCLUDE_ASM(code_7bb60_len_41b0, start_bounce_b); +INCLUDE_ASM("code_7bb60_len_41b0", start_bounce_b); -INCLUDE_ASM(code_7bb60_len_41b0, check_input_hammer); +INCLUDE_ASM("code_7bb60_len_41b0", check_input_hammer); -INCLUDE_ASM(code_7bb60_len_41b0, check_input_jump); +INCLUDE_ASM("code_7bb60_len_41b0", check_input_jump); -INCLUDE_ASM(code_7bb60_len_41b0, check_input_spin); +INCLUDE_ASM("code_7bb60_len_41b0", check_input_spin); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E636C); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E636C); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E6428); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E6428); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E6500); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E6500); -INCLUDE_ASM(code_7bb60_len_41b0, func_800E657C); +INCLUDE_ASM("code_7bb60_len_41b0", func_800E657C); diff --git a/src/code_7e0e80.c b/src/code_7e0e80.c index d3b83070e9..4c1dee43d8 100644 --- a/src/code_7e0e80.c +++ b/src/code_7e0e80.c @@ -1,57 +1,57 @@ #include "common.h" -INCLUDE_ASM(code_7e0e80, func_80280000); +INCLUDE_ASM("code_7e0e80", func_80280000); -INCLUDE_ASM(code_7e0e80, func_80280088); +INCLUDE_ASM("code_7e0e80", func_80280088); -INCLUDE_ASM(code_7e0e80, func_8028017C); +INCLUDE_ASM("code_7e0e80", func_8028017C); -INCLUDE_ASM(code_7e0e80, func_80280208); +INCLUDE_ASM("code_7e0e80", func_80280208); -INCLUDE_ASM(code_7e0e80, func_802802D0); +INCLUDE_ASM("code_7e0e80", func_802802D0); -INCLUDE_ASM(code_7e0e80, func_8028035C); +INCLUDE_ASM("code_7e0e80", func_8028035C); -INCLUDE_ASM(code_7e0e80, func_80280954); +INCLUDE_ASM("code_7e0e80", func_80280954); -INCLUDE_ASM(code_7e0e80, func_80280AC4); +INCLUDE_ASM("code_7e0e80", func_80280AC4); -INCLUDE_ASM(code_7e0e80, func_80280B44); +INCLUDE_ASM("code_7e0e80", func_80280B44); -INCLUDE_API_ASM(code_7e0e80, BtlBringPartnerOut); +INCLUDE_API_ASM("code_7e0e80", BtlBringPartnerOut); -INCLUDE_ASM(code_7e0e80, func_80280B78); +INCLUDE_ASM("code_7e0e80", func_80280B78); -INCLUDE_API_ASM(code_7e0e80, CamPreset_B); +INCLUDE_API_ASM("code_7e0e80", CamPreset_B); -INCLUDE_API_ASM(code_7e0e80, CamPreset_F); +INCLUDE_API_ASM("code_7e0e80", CamPreset_F); -INCLUDE_API_ASM(code_7e0e80, CamPreset_M); +INCLUDE_API_ASM("code_7e0e80", CamPreset_M); -INCLUDE_API_ASM(code_7e0e80, CamPreset_G); +INCLUDE_API_ASM("code_7e0e80", CamPreset_G); -INCLUDE_API_ASM(code_7e0e80, CamPreset_I); +INCLUDE_API_ASM("code_7e0e80", CamPreset_I); -INCLUDE_API_ASM(code_7e0e80, CamPreset_H); +INCLUDE_API_ASM("code_7e0e80", CamPreset_H); -INCLUDE_API_ASM(code_7e0e80, CamPreset_N); +INCLUDE_API_ASM("code_7e0e80", CamPreset_N); -INCLUDE_API_ASM(code_7e0e80, CamPreset_C); +INCLUDE_API_ASM("code_7e0e80", CamPreset_C); -INCLUDE_API_ASM(code_7e0e80, CamPreset_D); +INCLUDE_API_ASM("code_7e0e80", CamPreset_D); -INCLUDE_API_ASM(code_7e0e80, CamPreset_E); +INCLUDE_API_ASM("code_7e0e80", CamPreset_E); -INCLUDE_API_ASM(code_7e0e80, CamPreset_J); +INCLUDE_API_ASM("code_7e0e80", CamPreset_J); -INCLUDE_API_ASM(code_7e0e80, CamPreset_K); +INCLUDE_API_ASM("code_7e0e80", CamPreset_K); -INCLUDE_API_ASM(code_7e0e80, CamPreset_L); +INCLUDE_API_ASM("code_7e0e80", CamPreset_L); -INCLUDE_API_ASM(code_7e0e80, CamPreset_A); +INCLUDE_API_ASM("code_7e0e80", CamPreset_A); -INCLUDE_ASM(code_7e0e80, draw_shop_items); +INCLUDE_ASM("code_7e0e80", draw_shop_items); -INCLUDE_API_ASM(code_7e0e80, MakeShop); +INCLUDE_API_ASM("code_7e0e80", MakeShop); -INCLUDE_API_ASM(code_7e0e80, MakeShopOwner); +INCLUDE_API_ASM("code_7e0e80", MakeShopOwner); diff --git a/src/code_7fd10_len_b40.c b/src/code_7fd10_len_b40.c index eb6bb1a5aa..b7727fcfec 100644 --- a/src/code_7fd10_len_b40.c +++ b/src/code_7fd10_len_b40.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(code_7fd10_len_b40, func_800E6860); +INCLUDE_ASM("code_7fd10_len_b40", func_800E6860); -INCLUDE_ASM(code_7fd10_len_b40, func_800E6904); +INCLUDE_ASM("code_7fd10_len_b40", func_800E6904); -INCLUDE_ASM(code_7fd10_len_b40, func_800E69DC); +INCLUDE_ASM("code_7fd10_len_b40", func_800E69DC); -INCLUDE_ASM(code_7fd10_len_b40, func_800E6B68); +INCLUDE_ASM("code_7fd10_len_b40", func_800E6B68); -INCLUDE_ASM(code_7fd10_len_b40, func_800E6B78); +INCLUDE_ASM("code_7fd10_len_b40", func_800E6B78); -INCLUDE_ASM(code_7fd10_len_b40, func_800E6C44); +INCLUDE_ASM("code_7fd10_len_b40", func_800E6C44); -INCLUDE_ASM(code_7fd10_len_b40, func_800E6CE4); +INCLUDE_ASM("code_7fd10_len_b40", func_800E6CE4); -INCLUDE_ASM(code_7fd10_len_b40, check_input_status_menu); +INCLUDE_ASM("code_7fd10_len_b40", check_input_status_menu); diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index 3c2461b09d..7911de645e 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -269,13 +269,13 @@ void enforce_hpfp_limits(void) { } } -INCLUDE_ASM(code_80850_len_3060, initialize_status_menu); +INCLUDE_ASM("code_80850_len_3060", initialize_status_menu); -INCLUDE_ASM(code_80850_len_3060, status_menu_draw_number); +INCLUDE_ASM("code_80850_len_3060", status_menu_draw_number); -INCLUDE_ASM(code_80850_len_3060, status_menu_draw_stat); +INCLUDE_ASM("code_80850_len_3060", status_menu_draw_stat); -INCLUDE_ASM(code_80850_len_3060, update_status_menu); +INCLUDE_ASM("code_80850_len_3060", update_status_menu); void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { UiStatus* uiStatus = &gUIStatus; @@ -717,7 +717,7 @@ void reset_status_menu(void) { } // uses a jumptable, which we need .rodata support for. -s32 INCLUDE_ASM(code_80850_len_3060, is_ability_active, s32 arg0); +s32 INCLUDE_ASM("code_80850_len_3060", is_ability_active, s32 arg0); // Somewhat close. Needs work. /*s32 is_ability_active(s32 arg0) { s32 iVar2; diff --git a/src/code_8230_len_1ae0.c b/src/code_8230_len_1ae0.c index 9c87e65a98..0302de68b9 100644 --- a/src/code_8230_len_1ae0.c +++ b/src/code_8230_len_1ae0.c @@ -1,29 +1,29 @@ #include "common.h" -INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrInit); +INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrInit); -INCLUDE_API_ASM(code_8230_len_1ae0, nuSiSendMesg); +INCLUDE_API_ASM("code_8230_len_1ae0", nuSiSendMesg); -INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrStop); +INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrStop); -INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrRestart); +INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrRestart); -INCLUDE_API_ASM(code_8230_len_1ae0, nuSiMgrThread); +INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrThread); -INCLUDE_ASM(code_8230_len_1ae0, func_8002D160); +INCLUDE_ASM("code_8230_len_1ae0", func_8002D160); -INCLUDE_ASM(code_8230_len_1ae0, update_cameras); +INCLUDE_ASM("code_8230_len_1ae0", update_cameras); -INCLUDE_ASM(code_8230_len_1ae0, render_frame); +INCLUDE_ASM("code_8230_len_1ae0", render_frame); -INCLUDE_ASM(code_8230_len_1ae0, create_cameras_a); +INCLUDE_ASM("code_8230_len_1ae0", create_cameras_a); -INCLUDE_ASM(code_8230_len_1ae0, create_cameras_b); +INCLUDE_ASM("code_8230_len_1ae0", create_cameras_b); -INCLUDE_ASM(code_8230_len_1ae0, initialize_next_camera); +INCLUDE_ASM("code_8230_len_1ae0", initialize_next_camera); -INCLUDE_ASM(code_8230_len_1ae0, set_cam_viewport); +INCLUDE_ASM("code_8230_len_1ae0", set_cam_viewport); -INCLUDE_ASM(code_8230_len_1ae0, get_cam_viewport); +INCLUDE_ASM("code_8230_len_1ae0", get_cam_viewport); -INCLUDE_ASM(code_8230_len_1ae0, get_screen_coords); +INCLUDE_ASM("code_8230_len_1ae0", get_screen_coords); diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c index d8d435a7ca..af41c90a46 100644 --- a/src/code_838b0_len_5900.c +++ b/src/code_838b0_len_5900.c @@ -1,79 +1,79 @@ #include "common.h" -INCLUDE_ASM(code_838b0_len_5900, use_consumable); +INCLUDE_ASM("code_838b0_len_5900", use_consumable); -INCLUDE_ASM(code_838b0_len_5900, remove_consumable); +INCLUDE_ASM("code_838b0_len_5900", remove_consumable); -INCLUDE_ASM(code_838b0_len_5900, func_800EA4B0); +INCLUDE_ASM("code_838b0_len_5900", func_800EA4B0); -INCLUDE_ASM(code_838b0_len_5900, func_800EA5A4); +INCLUDE_ASM("code_838b0_len_5900", func_800EA5A4); -INCLUDE_ASM(code_838b0_len_5900, func_800EA5B8); +INCLUDE_ASM("code_838b0_len_5900", func_800EA5B8); -INCLUDE_ASM(code_838b0_len_5900, func_800EA5D0); +INCLUDE_ASM("code_838b0_len_5900", func_800EA5D0); -INCLUDE_ASM(code_838b0_len_5900, func_800EA6A8); +INCLUDE_ASM("code_838b0_len_5900", func_800EA6A8); -INCLUDE_ASM(code_838b0_len_5900, func_800EA6CC); +INCLUDE_ASM("code_838b0_len_5900", func_800EA6CC); -INCLUDE_ASM(code_838b0_len_5900, func_800EB168); +INCLUDE_ASM("code_838b0_len_5900", func_800EB168); -INCLUDE_ASM(code_838b0_len_5900, func_800EB200); +INCLUDE_ASM("code_838b0_len_5900", func_800EB200); -INCLUDE_ASM(code_838b0_len_5900, use_partner_ability); +INCLUDE_ASM("code_838b0_len_5900", use_partner_ability); -INCLUDE_ASM(code_838b0_len_5900, func_800EB3E0); +INCLUDE_ASM("code_838b0_len_5900", func_800EB3E0); -INCLUDE_ASM(code_838b0_len_5900, func_800EB42C); +INCLUDE_ASM("code_838b0_len_5900", func_800EB42C); -INCLUDE_ASM(code_838b0_len_5900, func_800EB474); +INCLUDE_ASM("code_838b0_len_5900", func_800EB474); -INCLUDE_ASM(code_838b0_len_5900, func_800EB580); +INCLUDE_ASM("code_838b0_len_5900", func_800EB580); -INCLUDE_ASM(code_838b0_len_5900, func_800EB5E4); +INCLUDE_ASM("code_838b0_len_5900", func_800EB5E4); -INCLUDE_ASM(code_838b0_len_5900, func_800EB638); +INCLUDE_ASM("code_838b0_len_5900", func_800EB638); -INCLUDE_ASM(code_838b0_len_5900, func_800EB658); +INCLUDE_ASM("code_838b0_len_5900", func_800EB658); -INCLUDE_ASM(code_838b0_len_5900, func_800EB6C4); +INCLUDE_ASM("code_838b0_len_5900", func_800EB6C4); -INCLUDE_ASM(code_838b0_len_5900, enable_partner_walking); +INCLUDE_ASM("code_838b0_len_5900", enable_partner_walking); -INCLUDE_ASM(code_838b0_len_5900, func_800EBC74); +INCLUDE_ASM("code_838b0_len_5900", func_800EBC74); -INCLUDE_ASM(code_838b0_len_5900, enable_partner_flying); +INCLUDE_ASM("code_838b0_len_5900", enable_partner_flying); -INCLUDE_ASM(code_838b0_len_5900, update_player_move_history); +INCLUDE_ASM("code_838b0_len_5900", update_player_move_history); -INCLUDE_ASM(code_838b0_len_5900, func_800ED9F8); +INCLUDE_ASM("code_838b0_len_5900", func_800ED9F8); -INCLUDE_ASM(code_838b0_len_5900, func_800EF300); +INCLUDE_ASM("code_838b0_len_5900", func_800EF300); -INCLUDE_ASM(code_838b0_len_5900, func_800EF314); +INCLUDE_ASM("code_838b0_len_5900", func_800EF314); -INCLUDE_ASM(code_838b0_len_5900, enable_partner_ai); +INCLUDE_ASM("code_838b0_len_5900", enable_partner_ai); -INCLUDE_ASM(code_838b0_len_5900, func_800EF394); +INCLUDE_ASM("code_838b0_len_5900", func_800EF394); -INCLUDE_ASM(code_838b0_len_5900, func_800EF3A4); +INCLUDE_ASM("code_838b0_len_5900", func_800EF3A4); -INCLUDE_ASM(code_838b0_len_5900, func_800EF3C0); +INCLUDE_ASM("code_838b0_len_5900", func_800EF3C0); -INCLUDE_ASM(code_838b0_len_5900, func_800EF3D4); +INCLUDE_ASM("code_838b0_len_5900", func_800EF3D4); -INCLUDE_ASM(code_838b0_len_5900, func_800EF3E4); +INCLUDE_ASM("code_838b0_len_5900", func_800EF3E4); -INCLUDE_ASM(code_838b0_len_5900, func_800EF414); +INCLUDE_ASM("code_838b0_len_5900", func_800EF414); -INCLUDE_ASM(code_838b0_len_5900, func_800EF43C); +INCLUDE_ASM("code_838b0_len_5900", func_800EF43C); -INCLUDE_ASM(code_838b0_len_5900, clear_partner_move_history); +INCLUDE_ASM("code_838b0_len_5900", clear_partner_move_history); -INCLUDE_ASM(code_838b0_len_5900, func_800EF600); +INCLUDE_ASM("code_838b0_len_5900", func_800EF600); -INCLUDE_ASM(code_838b0_len_5900, func_800EF628); +INCLUDE_ASM("code_838b0_len_5900", func_800EF628); -INCLUDE_ASM(code_838b0_len_5900, func_800EF640); +INCLUDE_ASM("code_838b0_len_5900", func_800EF640); -INCLUDE_ASM(code_838b0_len_5900, func_800EF82C); +INCLUDE_ASM("code_838b0_len_5900", func_800EF82C); diff --git a/src/code_891b0_len_fb0.c b/src/code_891b0_len_fb0.c index 574957c6b7..a7c676a2da 100644 --- a/src/code_891b0_len_fb0.c +++ b/src/code_891b0_len_fb0.c @@ -1,19 +1,19 @@ #include "common.h" -INCLUDE_ASM(code_891b0_len_fb0, func_800EFD00); +INCLUDE_ASM("code_891b0_len_fb0", func_800EFD00); -INCLUDE_ASM(code_891b0_len_fb0, func_800EFD08); +INCLUDE_ASM("code_891b0_len_fb0", func_800EFD08); -INCLUDE_ASM(code_891b0_len_fb0, func_800EFE2C); +INCLUDE_ASM("code_891b0_len_fb0", func_800EFE2C); -INCLUDE_ASM(code_891b0_len_fb0, func_800F0248); +INCLUDE_ASM("code_891b0_len_fb0", func_800F0248); -INCLUDE_ASM(code_891b0_len_fb0, func_800F0490); +INCLUDE_ASM("code_891b0_len_fb0", func_800F0490); -INCLUDE_ASM(code_891b0_len_fb0, func_800F0864); +INCLUDE_ASM("code_891b0_len_fb0", func_800F0864); -INCLUDE_ASM(code_891b0_len_fb0, func_800F09EC); +INCLUDE_ASM("code_891b0_len_fb0", func_800F09EC); -INCLUDE_ASM(code_891b0_len_fb0, func_800F0B3C); +INCLUDE_ASM("code_891b0_len_fb0", func_800F0B3C); -INCLUDE_ASM(code_891b0_len_fb0, func_800F0C9C); +INCLUDE_ASM("code_891b0_len_fb0", func_800F0C9C); diff --git a/src/code_8a160_len_700.c b/src/code_8a160_len_700.c index 97cce52fc5..ad4cda7bcf 100644 --- a/src/code_8a160_len_700.c +++ b/src/code_8a160_len_700.c @@ -18,7 +18,7 @@ typedef struct { extern struct_func_800F0CB0 D_8010D000[]; -INCLUDE_ASM(code_8a160_len_700, func_800F0CB0); +INCLUDE_ASM("code_8a160_len_700", func_800F0CB0); // void func_800F0CB0(s32 arg0, f32 arg1, f32 arg2, f32 arg3) //{ // sub_struct_func_800F0CB0 *temp_a1 = &D_8010D000[arg0].unk00[0]; @@ -49,7 +49,7 @@ void func_800F0D5C(void) { } } -INCLUDE_ASM(code_8a160_len_700, func_800F0D80); +INCLUDE_ASM("code_8a160_len_700", func_800F0D80); /*extern u16 D_800741F0; extern Gfx *D_8009A66C; @@ -58,7 +58,7 @@ extern void *D_801096B0; extern Gfx D_80109710[]; extern Gfx D_801097D8[];*/ -INCLUDE_ASM(code_8a160_len_700, func_800F102C); +INCLUDE_ASM("code_8a160_len_700", func_800F102C); /*void func_800F102C(void) { s32 temp_s2; s32 temp_s7; diff --git a/src/code_8a860_len_3f30.c b/src/code_8a860_len_3f30.c index 51cace14ad..21554e5523 100644 --- a/src/code_8a860_len_3f30.c +++ b/src/code_8a860_len_3f30.c @@ -1,20 +1,20 @@ #include "common.h" -INCLUDE_ASM(code_8a860_len_3f30, func_800F13B0); +INCLUDE_ASM("code_8a860_len_3f30", func_800F13B0); -INCLUDE_ASM(code_8a860_len_3f30, func_800F1538); +INCLUDE_ASM("code_8a860_len_3f30", func_800F1538); -INCLUDE_ASM(code_8a860_len_3f30, func_800F16CC); +INCLUDE_ASM("code_8a860_len_3f30", func_800F16CC); -INCLUDE_ASM(code_8a860_len_3f30, func_800F1A10); +INCLUDE_ASM("code_8a860_len_3f30", func_800F1A10); -INCLUDE_ASM(code_8a860_len_3f30, draw_submenu_title); +INCLUDE_ASM("code_8a860_len_3f30", draw_submenu_title); -INCLUDE_ASM(code_8a860_len_3f30, func_800F4E40); +INCLUDE_ASM("code_8a860_len_3f30", func_800F4E40); -INCLUDE_ASM(code_8a860_len_3f30, func_800F4FC4); +INCLUDE_ASM("code_8a860_len_3f30", func_800F4FC4); -INCLUDE_ASM(code_8a860_len_3f30, func_800F513C); +INCLUDE_ASM("code_8a860_len_3f30", func_800F513C); void func_800F52BC(void) { func_800F1A10(); diff --git a/src/code_8e790_len_2850.c b/src/code_8e790_len_2850.c index 199aa8430b..b47268edb2 100644 --- a/src/code_8e790_len_2850.c +++ b/src/code_8e790_len_2850.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(code_8e790_len_2850, draw_box); +INCLUDE_ASM("code_8e790_len_2850", draw_box); diff --git a/src/code_9d10_len_1080.c b/src/code_9d10_len_1080.c index 5d253a08c4..305b3cf00b 100644 --- a/src/code_9d10_len_1080.c +++ b/src/code_9d10_len_1080.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(code_9d10_len_1080, do_camera_type_4); +INCLUDE_ASM("code_9d10_len_1080", do_camera_type_4); -INCLUDE_ASM(code_9d10_len_1080, do_camera_type_2); +INCLUDE_ASM("code_9d10_len_1080", do_camera_type_2); -INCLUDE_ASM(code_9d10_len_1080, do_camera_type_1); +INCLUDE_ASM("code_9d10_len_1080", do_camera_type_1); -INCLUDE_ASM(code_9d10_len_1080, do_camera_type_0); +INCLUDE_ASM("code_9d10_len_1080", do_camera_type_0); diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index 519450b452..8312a57767 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -1,315 +1,315 @@ #include "common.h" -INCLUDE_ASM(code_a5dd0_len_114e0, update_entities); +INCLUDE_ASM("code_a5dd0_len_114e0", update_entities); -INCLUDE_ASM(code_a5dd0_len_114e0, update_shadows); +INCLUDE_ASM("code_a5dd0_len_114e0", update_shadows); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8010FBC0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FBC0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8010FBD8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FBD8); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8010FD68); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FD68); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8010FD98); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FD98); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8010FEB4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FEB4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801100CC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801100CC); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011022C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011022C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80110374); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80110374); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801104A4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801104A4); -INCLUDE_ASM(code_a5dd0_len_114e0, get_entity_by_index); +INCLUDE_ASM("code_a5dd0_len_114e0", get_entity_by_index); -INCLUDE_ASM(code_a5dd0_len_114e0, get_shadow_by_index); +INCLUDE_ASM("code_a5dd0_len_114e0", get_shadow_by_index); -INCLUDE_ASM(code_a5dd0_len_114e0, get_entity_list); +INCLUDE_ASM("code_a5dd0_len_114e0", get_entity_list); -INCLUDE_ASM(code_a5dd0_len_114e0, get_shadow_list); +INCLUDE_ASM("code_a5dd0_len_114e0", get_shadow_list); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80110678); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80110678); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801106A4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801106A4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801106D0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801106D0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80110790); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80110790); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011085C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011085C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801108B8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801108B8); -INCLUDE_ASM(code_a5dd0_len_114e0, test_player_entity_aabb); +INCLUDE_ASM("code_a5dd0_len_114e0", test_player_entity_aabb); -INCLUDE_ASM(code_a5dd0_len_114e0, is_player_action_state); +INCLUDE_ASM("code_a5dd0_len_114e0", is_player_action_state); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80110BCC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80110BCC); -INCLUDE_ASM(code_a5dd0_len_114e0, load_entity_data); +INCLUDE_ASM("code_a5dd0_len_114e0", load_entity_data); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80110CB8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80110CB8); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80110E58); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80110E58); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80110F10); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80110F10); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801110B4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801110B4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011115C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011115C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801112A4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801112A4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80111408); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80111408); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80111790); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80111790); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801117DC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801117DC); -INCLUDE_ASM(code_a5dd0_len_114e0, create_entity); +INCLUDE_ASM("code_a5dd0_len_114e0", create_entity); -INCLUDE_ASM(code_a5dd0_len_114e0, create_shadow_from_data); +INCLUDE_ASM("code_a5dd0_len_114e0", create_shadow_from_data); -INCLUDE_API_ASM(code_a5dd0_len_114e0, MakeEntity); +INCLUDE_API_ASM("code_a5dd0_len_114e0", MakeEntity); -INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignScript); +INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignScript); -INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignAreaFlag); +INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignAreaFlag); -INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignBlockFlag); +INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignBlockFlag); -INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignFlag); +INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignFlag); -INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignPanelFlag); +INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignPanelFlag); -INCLUDE_API_ASM(code_a5dd0_len_114e0, AssignCrateFlag); +INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignCrateFlag); -INCLUDE_ASM(code_a5dd0_len_114e0, create_entity_shadow); +INCLUDE_ASM("code_a5dd0_len_114e0", create_entity_shadow); -INCLUDE_ASM(code_a5dd0_len_114e0, create_shadow_type); +INCLUDE_ASM("code_a5dd0_len_114e0", create_shadow_type); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112328); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112328); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112344); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112344); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801125E8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801125E8); -INCLUDE_ASM(code_a5dd0_len_114e0, set_standard_shadow_scale); +INCLUDE_ASM("code_a5dd0_len_114e0", set_standard_shadow_scale); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112900); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112900); -INCLUDE_ASM(code_a5dd0_len_114e0, set_shadow_scale_peach); +INCLUDE_ASM("code_a5dd0_len_114e0", set_shadow_scale_peach); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112B20); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112B20); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112B98); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112B98); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112CA8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112CA8); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112D84); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112D84); -INCLUDE_ASM(code_a5dd0_len_114e0, step_current_game_mode); +INCLUDE_ASM("code_a5dd0_len_114e0", step_current_game_mode); -INCLUDE_ASM(code_a5dd0_len_114e0, render_ui); +INCLUDE_ASM("code_a5dd0_len_114e0", render_ui); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80112FC4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80112FC4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80113090); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80113090); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80114B58); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80114B58); -INCLUDE_ASM(code_a5dd0_len_114e0, load_tile_header); +INCLUDE_ASM("code_a5dd0_len_114e0", load_tile_header); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80115498); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80115498); -INCLUDE_ASM(code_a5dd0_len_114e0, get_model_property); +INCLUDE_ASM("code_a5dd0_len_114e0", get_model_property); -INCLUDE_ASM(code_a5dd0_len_114e0, _load_model_textures); +INCLUDE_ASM("code_a5dd0_len_114e0", _load_model_textures); -INCLUDE_ASM(code_a5dd0_len_114e0, load_model_textures); +INCLUDE_ASM("code_a5dd0_len_114e0", load_model_textures); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80115CA8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80115CA8); -INCLUDE_ASM(code_a5dd0_len_114e0, clear_model_data); +INCLUDE_ASM("code_a5dd0_len_114e0", clear_model_data); -INCLUDE_ASM(code_a5dd0_len_114e0, init_model_data); +INCLUDE_ASM("code_a5dd0_len_114e0", init_model_data); -INCLUDE_ASM(code_a5dd0_len_114e0, calculate_model_sizes); +INCLUDE_ASM("code_a5dd0_len_114e0", calculate_model_sizes); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011620C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011620C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80116674); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80116674); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80116698); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80116698); -INCLUDE_ASM(code_a5dd0_len_114e0, render_models); +INCLUDE_ASM("code_a5dd0_len_114e0", render_models); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80117C94); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80117C94); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80117D00); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80117D00); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80117E74); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80117E74); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801180E8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801180E8); -INCLUDE_ASM(code_a5dd0_len_114e0, get_model_from_list_index); +INCLUDE_ASM("code_a5dd0_len_114e0", get_model_from_list_index); -INCLUDE_ASM(code_a5dd0_len_114e0, load_data_for_models); +INCLUDE_ASM("code_a5dd0_len_114e0", load_data_for_models); -INCLUDE_ASM(code_a5dd0_len_114e0, load_model_transforms); +INCLUDE_ASM("code_a5dd0_len_114e0", load_model_transforms); -INCLUDE_ASM(code_a5dd0_len_114e0, get_model_list_index_from_tree_index); +INCLUDE_ASM("code_a5dd0_len_114e0", get_model_list_index_from_tree_index); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B090); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B090); -INCLUDE_ASM(code_a5dd0_len_114e0, get_model_center_and_size); +INCLUDE_ASM("code_a5dd0_len_114e0", get_model_center_and_size); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B1C0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B1C0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B1D8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B1D8); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B37C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B37C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B5D0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B5D0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B660); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B660); -void INCLUDE_ASM(code_a5dd0_len_114e0, clone_model, u16 srcModelID, u16 newModelID); +void INCLUDE_ASM("code_a5dd0_len_114e0", clone_model, u16 srcModelID, u16 newModelID); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B7C0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B7C0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011B950); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B950); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BAE8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BAE8); -INCLUDE_ASM(code_a5dd0_len_114e0, set_fog_color); +INCLUDE_ASM("code_a5dd0_len_114e0", set_fog_color); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BBA4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BBA4); -INCLUDE_ASM(code_a5dd0_len_114e0, get_fog_color); +INCLUDE_ASM("code_a5dd0_len_114e0", get_fog_color); -INCLUDE_ASM(code_a5dd0_len_114e0, set_tex_panner); +INCLUDE_ASM("code_a5dd0_len_114e0", set_tex_panner); -INCLUDE_ASM(code_a5dd0_len_114e0, set_main_pan_u); +INCLUDE_ASM("code_a5dd0_len_114e0", set_main_pan_u); -INCLUDE_ASM(code_a5dd0_len_114e0, set_main_pan_v); +INCLUDE_ASM("code_a5dd0_len_114e0", set_main_pan_v); -INCLUDE_ASM(code_a5dd0_len_114e0, set_aux_pan_u); +INCLUDE_ASM("code_a5dd0_len_114e0", set_aux_pan_u); -INCLUDE_ASM(code_a5dd0_len_114e0, set_aux_pan_v); +INCLUDE_ASM("code_a5dd0_len_114e0", set_aux_pan_v); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BC7C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BC7C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BCB4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BCB4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BCD0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BCD0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BCEC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BCEC); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BE14); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BE14); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BE5C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BE5C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BE80); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BE80); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011BFD4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BFD4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011C028); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C028); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011C0DC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C0DC); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011C130); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C130); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011C164); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C164); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011C32C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C32C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011D72C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D72C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011D7E4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D7E4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011D82C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D82C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011D890); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D890); -INCLUDE_ASM(code_a5dd0_len_114e0, queue_render_task); +INCLUDE_ASM("code_a5dd0_len_114e0", queue_render_task); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011D9B8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D9B8); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011DE80); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011DE80); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011DFD0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011DFD0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E014); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E014); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E058); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E058); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E09C); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E09C); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E0DC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E0DC); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E150); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E150); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E1C4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E1C4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E224); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E224); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E310); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E310); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E398); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E398); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E400); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E400); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E438); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E438); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E4B8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E4B8); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E5E0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E5E0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E718); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E718); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011E8BC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E8BC); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011EA54); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011EA54); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011EBF0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011EBF0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011F058); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F058); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011F118); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F118); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011F304); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F304); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011F3E8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F3E8); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011FA54); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FA54); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011FF74); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FF74); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011FF98); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FF98); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011FFB4); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FFB4); -INCLUDE_ASM(code_a5dd0_len_114e0, func_8011FFE0); +INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FFE0); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80120000); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80120000); -INCLUDE_ASM(code_a5dd0_len_114e0, play_model_animation); +INCLUDE_ASM("code_a5dd0_len_114e0", play_model_animation); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80120198); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80120198); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80120234); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80120234); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801203AC); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801203AC); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80120420); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80120420); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80120474); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80120474); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80120530); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80120530); -INCLUDE_ASM(code_a5dd0_len_114e0, func_80120678); +INCLUDE_ASM("code_a5dd0_len_114e0", func_80120678); -INCLUDE_ASM(code_a5dd0_len_114e0, func_801206F8); +INCLUDE_ASM("code_a5dd0_len_114e0", func_801206F8); diff --git a/src/code_ad90_len_2880.c b/src/code_ad90_len_2880.c index 07bdb834f3..b5cf37f581 100644 --- a/src/code_ad90_len_2880.c +++ b/src/code_ad90_len_2880.c @@ -1,19 +1,19 @@ #include "common.h" -INCLUDE_ASM(code_ad90_len_2880, do_camera_type_6); +INCLUDE_ASM("code_ad90_len_2880", do_camera_type_6); -INCLUDE_ASM(code_ad90_len_2880, do_camera_type_unused); +INCLUDE_ASM("code_ad90_len_2880", do_camera_type_unused); -INCLUDE_ASM(code_ad90_len_2880, do_camera_type_5); +INCLUDE_ASM("code_ad90_len_2880", do_camera_type_5); -INCLUDE_ASM(code_ad90_len_2880, func_80030210); +INCLUDE_ASM("code_ad90_len_2880", func_80030210); -INCLUDE_ASM(code_ad90_len_2880, func_8003034C); +INCLUDE_ASM("code_ad90_len_2880", func_8003034C); -INCLUDE_ASM(code_ad90_len_2880, func_80030450); +INCLUDE_ASM("code_ad90_len_2880", func_80030450); -INCLUDE_ASM(code_ad90_len_2880, test_ray_zone_aabb); +INCLUDE_ASM("code_ad90_len_2880", test_ray_zone_aabb); -INCLUDE_ASM(code_ad90_len_2880, func_800304FC); +INCLUDE_ASM("code_ad90_len_2880", func_800304FC); -INCLUDE_ASM(code_ad90_len_2880, do_camera_type_3); +INCLUDE_ASM("code_ad90_len_2880", do_camera_type_3); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index dbf56776bf..3e0a32de22 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -1,219 +1,219 @@ #include "common.h" -INCLUDE_ASM(code_b72b0_len_15ed0, func_80120BB0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80120BB0); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80120C58); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80120C58); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80120CE0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80120CE0); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80120DE4); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80120DE4); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80120F04); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80120F04); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80120FB8); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80120FB8); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80121140); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80121140); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80121CE8); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80121CE8); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80121EB8); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80121EB8); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122288); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122288); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122D7C); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122D7C); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122DDC); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122DDC); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122DFC); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122DFC); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122E94); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122E94); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122EE8); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122EE8); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122F24); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122F24); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80122F64); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80122F64); -INCLUDE_ASM(code_b72b0_len_15ed0, stub_item_entity_nodraw); +INCLUDE_ASM("code_b72b0_len_15ed0", stub_item_entity_nodraw); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801230B8); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801230B8); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80123114); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80123114); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80123158); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80123158); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012323C); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012323C); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80123320); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80123320); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80123404); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80123404); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80123470); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80123470); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801234E0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801234E0); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80123550); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80123550); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801235C0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801235C0); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012363C); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012363C); -INCLUDE_ASM(code_b72b0_len_15ed0, clear_character_set); +INCLUDE_ASM("code_b72b0_len_15ed0", clear_character_set); -INCLUDE_ASM(code_b72b0_len_15ed0, clear_printers); +INCLUDE_ASM("code_b72b0_len_15ed0", clear_printers); -INCLUDE_ASM(code_b72b0_len_15ed0, load_font_data); +INCLUDE_ASM("code_b72b0_len_15ed0", load_font_data); -INCLUDE_ASM(code_b72b0_len_15ed0, load_font); +INCLUDE_ASM("code_b72b0_len_15ed0", load_font); -INCLUDE_ASM(code_b72b0_len_15ed0, update_messages); +INCLUDE_ASM("code_b72b0_len_15ed0", update_messages); -INCLUDE_ASM(code_b72b0_len_15ed0, _update_message); +INCLUDE_ASM("code_b72b0_len_15ed0", _update_message); -INCLUDE_ASM(code_b72b0_len_15ed0, render_messages); +INCLUDE_ASM("code_b72b0_len_15ed0", render_messages); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80124434); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80124434); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80124570); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80124570); -INCLUDE_ASM(code_b72b0_len_15ed0, initialize_printer); +INCLUDE_ASM("code_b72b0_len_15ed0", initialize_printer); -INCLUDE_ASM(code_b72b0_len_15ed0, dma_load_string); +INCLUDE_ASM("code_b72b0_len_15ed0", dma_load_string); -INCLUDE_ASM(code_b72b0_len_15ed0, load_message_to_buffer); +INCLUDE_ASM("code_b72b0_len_15ed0", load_message_to_buffer); -INCLUDE_ASM(code_b72b0_len_15ed0, load_string); +INCLUDE_ASM("code_b72b0_len_15ed0", load_string); -INCLUDE_ASM(code_b72b0_len_15ed0, _load_string); +INCLUDE_ASM("code_b72b0_len_15ed0", _load_string); -INCLUDE_ASM(code_b72b0_len_15ed0, load_message_to_printer); +INCLUDE_ASM("code_b72b0_len_15ed0", load_message_to_printer); -INCLUDE_ASM(code_b72b0_len_15ed0, clamp_printer_coords); +INCLUDE_ASM("code_b72b0_len_15ed0", clamp_printer_coords); -INCLUDE_ASM(code_b72b0_len_15ed0, cancel_message); +INCLUDE_ASM("code_b72b0_len_15ed0", cancel_message); -INCLUDE_ASM(code_b72b0_len_15ed0, set_message_images); +INCLUDE_ASM("code_b72b0_len_15ed0", set_message_images); -INCLUDE_ASM(code_b72b0_len_15ed0, set_message_string); +INCLUDE_ASM("code_b72b0_len_15ed0", set_message_string); -INCLUDE_ASM(code_b72b0_len_15ed0, set_message_value); +INCLUDE_ASM("code_b72b0_len_15ed0", set_message_value); -INCLUDE_ASM(code_b72b0_len_15ed0, close_message); +INCLUDE_ASM("code_b72b0_len_15ed0", close_message); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80125C84); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80125C84); -INCLUDE_ASM(code_b72b0_len_15ed0, get_char_width); +INCLUDE_ASM("code_b72b0_len_15ed0", get_char_width); -INCLUDE_ASM(code_b72b0_len_15ed0, get_string_properties); +INCLUDE_ASM("code_b72b0_len_15ed0", get_string_properties); -INCLUDE_ASM(code_b72b0_len_15ed0, get_string_width); +INCLUDE_ASM("code_b72b0_len_15ed0", get_string_width); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801264B0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801264B0); -INCLUDE_ASM(code_b72b0_len_15ed0, draw_string); +INCLUDE_ASM("code_b72b0_len_15ed0", draw_string); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80126790); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80126790); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80126EAC); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80126EAC); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80126F78); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80126F78); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801274C0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801274C0); -INCLUDE_ASM(code_b72b0_len_15ed0, draw_number); +INCLUDE_ASM("code_b72b0_len_15ed0", draw_number); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80127BA4); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80127BA4); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80127D90); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80127D90); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012C2E0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012C2E0); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012C324); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012C324); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012C9A8); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012C9A8); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012CA08); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012CA08); -INCLUDE_ASM(code_b72b0_len_15ed0, _draw_message_box); +INCLUDE_ASM("code_b72b0_len_15ed0", _draw_message_box); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012D3DC); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012D3DC); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012DB58); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012DB58); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012E9A0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012E9A0); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012EC94); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012EC94); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8012FE10); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8012FE10); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801309F0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801309F0); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80130A04); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80130A04); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80130ACC); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80130ACC); -INCLUDE_ASM(code_b72b0_len_15ed0, draw_coin_sparkles); +INCLUDE_ASM("code_b72b0_len_15ed0", draw_coin_sparkles); -INCLUDE_ASM(code_b72b0_len_15ed0, get_item_entity); +INCLUDE_ASM("code_b72b0_len_15ed0", get_item_entity); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80130F70); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80130F70); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80130FAC); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80130FAC); -INCLUDE_ASM(code_b72b0_len_15ed0, clear_item_entity_data); +INCLUDE_ASM("code_b72b0_len_15ed0", clear_item_entity_data); -INCLUDE_ASM(code_b72b0_len_15ed0, init_item_entity_list); +INCLUDE_ASM("code_b72b0_len_15ed0", init_item_entity_list); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80131128); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80131128); -INCLUDE_ASM(code_b72b0_len_15ed0, make_item_entity); +INCLUDE_ASM("code_b72b0_len_15ed0", make_item_entity); -INCLUDE_ASM(code_b72b0_len_15ed0, make_item_entity_nodelay); +INCLUDE_ASM("code_b72b0_len_15ed0", make_item_entity_nodelay); -INCLUDE_ASM(code_b72b0_len_15ed0, make_item_entity_delayed); +INCLUDE_ASM("code_b72b0_len_15ed0", make_item_entity_delayed); -INCLUDE_ASM(code_b72b0_len_15ed0, init_got_item); +INCLUDE_ASM("code_b72b0_len_15ed0", init_got_item); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80131DD4); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80131DD4); -INCLUDE_ASM(code_b72b0_len_15ed0, update_item_entities); +INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entities); -INCLUDE_ASM(code_b72b0_len_15ed0, draw_item_entity); +INCLUDE_ASM("code_b72b0_len_15ed0", draw_item_entity); -INCLUDE_ASM(code_b72b0_len_15ed0, draw_item_entities); +INCLUDE_ASM("code_b72b0_len_15ed0", draw_item_entities); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80132E54); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80132E54); -INCLUDE_ASM(code_b72b0_len_15ed0, remove_item_entity_by_reference); +INCLUDE_ASM("code_b72b0_len_15ed0", remove_item_entity_by_reference); -INCLUDE_ASM(code_b72b0_len_15ed0, remove_item_entity_by_index); +INCLUDE_ASM("code_b72b0_len_15ed0", remove_item_entity_by_index); -INCLUDE_ASM(code_b72b0_len_15ed0, test_item_player_collision); +INCLUDE_ASM("code_b72b0_len_15ed0", test_item_player_collision); -INCLUDE_ASM(code_b72b0_len_15ed0, set_item_entity_flags); +INCLUDE_ASM("code_b72b0_len_15ed0", set_item_entity_flags); -INCLUDE_ASM(code_b72b0_len_15ed0, clear_item_entity_flags); +INCLUDE_ASM("code_b72b0_len_15ed0", clear_item_entity_flags); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801341E8); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801341E8); -INCLUDE_ASM(code_b72b0_len_15ed0, set_item_entity_position); +INCLUDE_ASM("code_b72b0_len_15ed0", set_item_entity_position); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80134230); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80134230); -INCLUDE_ASM(code_b72b0_len_15ed0, func_80134240); +INCLUDE_ASM("code_b72b0_len_15ed0", func_80134240); -INCLUDE_ASM(code_b72b0_len_15ed0, update_item_entity_collectable); +INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entity_collectable); -INCLUDE_ASM(code_b72b0_len_15ed0, func_8013559C); +INCLUDE_ASM("code_b72b0_len_15ed0", func_8013559C); -INCLUDE_ASM(code_b72b0_len_15ed0, update_item_entity_static); +INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entity_static); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801356C4); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801356C4); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801356CC); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801356CC); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801356D4); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801356D4); -INCLUDE_ASM(code_b72b0_len_15ed0, update_item_entity_temp); +INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entity_temp); -INCLUDE_ASM(code_b72b0_len_15ed0, func_801363A0); +INCLUDE_ASM("code_b72b0_len_15ed0", func_801363A0); diff --git a/src/code_cd180_len_38f0.c b/src/code_cd180_len_38f0.c index 41bcecd255..88bf1f22f2 100644 --- a/src/code_cd180_len_38f0.c +++ b/src/code_cd180_len_38f0.c @@ -1,39 +1,39 @@ #include "common.h" -INCLUDE_ASM(code_cd180_len_38f0, func_80136A80); +INCLUDE_ASM("code_cd180_len_38f0", func_80136A80); -void INCLUDE_ASM(code_cd180_len_38f0, func_80137D88, s32 arg0, f32 arg1); +void INCLUDE_ASM("code_cd180_len_38f0", func_80137D88, s32 arg0, f32 arg1); -void INCLUDE_ASM(code_cd180_len_38f0, func_80137DA4, s32 arg0, f32 arg1); +void INCLUDE_ASM("code_cd180_len_38f0", func_80137DA4, s32 arg0, f32 arg1); -INCLUDE_ASM(code_cd180_len_38f0, func_80137DC0); +INCLUDE_ASM("code_cd180_len_38f0", func_80137DC0); -void INCLUDE_ASM(code_cd180_len_38f0, func_80137E10, s32 arg0, u8 arg1, u8 arg2, u8 arg3); +void INCLUDE_ASM("code_cd180_len_38f0", func_80137E10, s32 arg0, u8 arg1, u8 arg2, u8 arg3); -void INCLUDE_ASM(code_cd180_len_38f0, func_80137E4C, s32 arg0, s32 arg1, s32 arg2, s32 arg3); +void INCLUDE_ASM("code_cd180_len_38f0", func_80137E4C, s32 arg0, s32 arg1, s32 arg2, s32 arg3); -INCLUDE_ASM(code_cd180_len_38f0, func_801380D4); +INCLUDE_ASM("code_cd180_len_38f0", func_801380D4); -INCLUDE_ASM(code_cd180_len_38f0, func_80138108); +INCLUDE_ASM("code_cd180_len_38f0", func_80138108); -INCLUDE_ASM(code_cd180_len_38f0, func_80138188); +INCLUDE_ASM("code_cd180_len_38f0", func_80138188); -INCLUDE_ASM(code_cd180_len_38f0, func_80138198); +INCLUDE_ASM("code_cd180_len_38f0", func_80138198); -INCLUDE_ASM(code_cd180_len_38f0, func_801381A0); +INCLUDE_ASM("code_cd180_len_38f0", func_801381A0); -INCLUDE_ASM(code_cd180_len_38f0, func_80138220); +INCLUDE_ASM("code_cd180_len_38f0", func_80138220); -INCLUDE_ASM(code_cd180_len_38f0, set_map_transition_effect); +INCLUDE_ASM("code_cd180_len_38f0", set_map_transition_effect); -INCLUDE_ASM(code_cd180_len_38f0, func_801382AC); +INCLUDE_ASM("code_cd180_len_38f0", func_801382AC); -INCLUDE_ASM(code_cd180_len_38f0, func_801385D4); +INCLUDE_ASM("code_cd180_len_38f0", func_801385D4); -INCLUDE_ASM(code_cd180_len_38f0, func_80138740); +INCLUDE_ASM("code_cd180_len_38f0", func_80138740); -INCLUDE_ASM(code_cd180_len_38f0, func_80138D88); +INCLUDE_ASM("code_cd180_len_38f0", func_80138D88); -INCLUDE_ASM(code_cd180_len_38f0, func_80138E54); +INCLUDE_ASM("code_cd180_len_38f0", func_80138E54); -INCLUDE_ASM(code_cd180_len_38f0, func_80139F10); +INCLUDE_ASM("code_cd180_len_38f0", func_80139F10); diff --git a/src/code_d0a70_len_4fe0.c b/src/code_d0a70_len_4fe0.c index d540af4546..371806c854 100644 --- a/src/code_d0a70_len_4fe0.c +++ b/src/code_d0a70_len_4fe0.c @@ -1,53 +1,53 @@ #include "common.h" -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A370); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A370); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A37C); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A37C); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A4D0); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A4D0); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A610); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A610); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A650); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A650); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A6E8); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A6E8); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A704); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A704); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A854); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A854); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A93C); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A93C); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A9C8); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A9C8); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013A9E8); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A9E8); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013AA9C); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013AA9C); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013AF70); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013AF70); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013B0EC); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013B0EC); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013B1B0); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013B1B0); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013BC88); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013BC88); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013C048); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013C048); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013C220); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013C220); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013C3F0); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013C3F0); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013CFA8); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013CFA8); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013DAB4); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013DAB4); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013E2F0); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013E2F0); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013E904); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013E904); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013EE48); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013EE48); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013EE68); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013EE68); -INCLUDE_ASM(code_d0a70_len_4fe0, func_8013F1F8); +INCLUDE_ASM("code_d0a70_len_4fe0", func_8013F1F8); diff --git a/src/code_d5a50_len_5fd0.c b/src/code_d5a50_len_5fd0.c index 8b83948ba8..7447f34f7f 100644 --- a/src/code_d5a50_len_5fd0.c +++ b/src/code_d5a50_len_5fd0.c @@ -1,83 +1,83 @@ #include "common.h" -INCLUDE_ASM(code_d5a50_len_5fd0, func_8013F350); +INCLUDE_ASM("code_d5a50_len_5fd0", func_8013F350); -INCLUDE_ASM(code_d5a50_len_5fd0, func_8013F704); +INCLUDE_ASM("code_d5a50_len_5fd0", func_8013F704); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80141100); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80141100); -INCLUDE_ASM(code_d5a50_len_5fd0, init_menu_icon_list); +INCLUDE_ASM("code_d5a50_len_5fd0", init_menu_icon_list); -INCLUDE_ASM(code_d5a50_len_5fd0, func_801413F8); +INCLUDE_ASM("code_d5a50_len_5fd0", func_801413F8); -INCLUDE_ASM(code_d5a50_len_5fd0, create_icon); +INCLUDE_ASM("code_d5a50_len_5fd0", create_icon); -INCLUDE_ASM(code_d5a50_len_5fd0, update_menu_icons); +INCLUDE_ASM("code_d5a50_len_5fd0", update_menu_icons); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80141704); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80141704); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80142210); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80142210); -INCLUDE_ASM(code_d5a50_len_5fd0, func_8014271C); +INCLUDE_ASM("code_d5a50_len_5fd0", func_8014271C); -INCLUDE_ASM(code_d5a50_len_5fd0, render_menu_icon); +INCLUDE_ASM("code_d5a50_len_5fd0", render_menu_icon); -INCLUDE_ASM(code_d5a50_len_5fd0, render_menu_icons); +INCLUDE_ASM("code_d5a50_len_5fd0", render_menu_icons); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80143C48); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80143C48); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144218); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144218); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144238); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144238); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144258); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144258); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144278); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144278); -INCLUDE_ASM(code_d5a50_len_5fd0, draw_menu_icon); +INCLUDE_ASM("code_d5a50_len_5fd0", draw_menu_icon); -INCLUDE_ASM(code_d5a50_len_5fd0, draw_icon_0); +INCLUDE_ASM("code_d5a50_len_5fd0", draw_icon_0); -INCLUDE_ASM(code_d5a50_len_5fd0, draw_icon_1); +INCLUDE_ASM("code_d5a50_len_5fd0", draw_icon_1); -INCLUDE_ASM(code_d5a50_len_5fd0, func_801447E0); +INCLUDE_ASM("code_d5a50_len_5fd0", func_801447E0); -INCLUDE_ASM(code_d5a50_len_5fd0, set_menu_icon_script); +INCLUDE_ASM("code_d5a50_len_5fd0", set_menu_icon_script); -INCLUDE_ASM(code_d5a50_len_5fd0, get_menu_icon_script); +INCLUDE_ASM("code_d5a50_len_5fd0", get_menu_icon_script); -INCLUDE_ASM(code_d5a50_len_5fd0, get_menu_icon); +INCLUDE_ASM("code_d5a50_len_5fd0", get_menu_icon); -INCLUDE_ASM(code_d5a50_len_5fd0, free_icon); +INCLUDE_ASM("code_d5a50_len_5fd0", free_icon); -INCLUDE_ASM(code_d5a50_len_5fd0, set_icon_render_pos); +INCLUDE_ASM("code_d5a50_len_5fd0", set_icon_render_pos); -INCLUDE_ASM(code_d5a50_len_5fd0, get_icon_render_pos); +INCLUDE_ASM("code_d5a50_len_5fd0", get_icon_render_pos); -INCLUDE_ASM(code_d5a50_len_5fd0, func_801449DC); +INCLUDE_ASM("code_d5a50_len_5fd0", func_801449DC); -INCLUDE_ASM(code_d5a50_len_5fd0, set_icon_flags); +INCLUDE_ASM("code_d5a50_len_5fd0", set_icon_flags); -INCLUDE_ASM(code_d5a50_len_5fd0, clear_icon_flags); +INCLUDE_ASM("code_d5a50_len_5fd0", clear_icon_flags); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144C20); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144C20); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144EB0); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144EB0); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144EFC); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144EFC); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80144FD8); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80144FD8); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80145108); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80145108); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80145184); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80145184); -INCLUDE_ASM(code_d5a50_len_5fd0, func_801451D4); +INCLUDE_ASM("code_d5a50_len_5fd0", func_801451D4); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80145224); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80145224); -INCLUDE_ASM(code_d5a50_len_5fd0, func_80145274); +INCLUDE_ASM("code_d5a50_len_5fd0", func_80145274); -INCLUDE_ASM(code_d5a50_len_5fd0, func_801452B4); +INCLUDE_ASM("code_d5a50_len_5fd0", func_801452B4); -INCLUDE_ASM(code_d5a50_len_5fd0, func_801452E8); +INCLUDE_ASM("code_d5a50_len_5fd0", func_801452E8); diff --git a/src/code_d610_len_1330.c b/src/code_d610_len_1330.c index db2344b1b3..5c9c21242a 100644 --- a/src/code_d610_len_1330.c +++ b/src/code_d610_len_1330.c @@ -1,19 +1,19 @@ #include "common.h" -INCLUDE_ASM(code_d610_len_1330, func_80032210); +INCLUDE_ASM("code_d610_len_1330", func_80032210); -INCLUDE_ASM(code_d610_len_1330, func_800322DC); +INCLUDE_ASM("code_d610_len_1330", func_800322DC); -INCLUDE_ASM(code_d610_len_1330, func_800325E4); +INCLUDE_ASM("code_d610_len_1330", func_800325E4); -INCLUDE_ASM(code_d610_len_1330, func_800328A4); +INCLUDE_ASM("code_d610_len_1330", func_800328A4); -INCLUDE_ASM(code_d610_len_1330, func_80032970); +INCLUDE_ASM("code_d610_len_1330", func_80032970); -INCLUDE_ASM(code_d610_len_1330, func_80032C64); +INCLUDE_ASM("code_d610_len_1330", func_80032C64); -INCLUDE_ASM(code_d610_len_1330, func_80033394); +INCLUDE_ASM("code_d610_len_1330", func_80033394); -INCLUDE_ASM(code_d610_len_1330, set_game_mode); +INCLUDE_ASM("code_d610_len_1330", set_game_mode); -INCLUDE_ASM(code_d610_len_1330, get_game_mode); +INCLUDE_ASM("code_d610_len_1330", get_game_mode); diff --git a/src/code_dba20_len_350.c b/src/code_dba20_len_350.c index 789650f40e..068ec82156 100644 --- a/src/code_dba20_len_350.c +++ b/src/code_dba20_len_350.c @@ -1,25 +1,25 @@ #include "common.h" -INCLUDE_ASM(code_dba20_len_350, clear_saved_variables); +INCLUDE_ASM("code_dba20_len_350", clear_saved_variables); -INCLUDE_ASM(code_dba20_len_350, clear_area_flags); +INCLUDE_ASM("code_dba20_len_350", clear_area_flags); -INCLUDE_ASM(code_dba20_len_350, clear_global_flag); +INCLUDE_ASM("code_dba20_len_350", clear_global_flag); -INCLUDE_ASM(code_dba20_len_350, set_global_flag); +INCLUDE_ASM("code_dba20_len_350", set_global_flag); -INCLUDE_ASM(code_dba20_len_350, get_global_flag); +INCLUDE_ASM("code_dba20_len_350", get_global_flag); -INCLUDE_ASM(code_dba20_len_350, set_global_byte); +INCLUDE_ASM("code_dba20_len_350", set_global_byte); -INCLUDE_ASM(code_dba20_len_350, get_global_byte); +INCLUDE_ASM("code_dba20_len_350", get_global_byte); -INCLUDE_ASM(code_dba20_len_350, clear_area_flag); +INCLUDE_ASM("code_dba20_len_350", clear_area_flag); -INCLUDE_ASM(code_dba20_len_350, set_area_flag); +INCLUDE_ASM("code_dba20_len_350", set_area_flag); -INCLUDE_ASM(code_dba20_len_350, get_area_flag); +INCLUDE_ASM("code_dba20_len_350", get_area_flag); -INCLUDE_ASM(code_dba20_len_350, set_area_byte); +INCLUDE_ASM("code_dba20_len_350", set_area_byte); -INCLUDE_ASM(code_dba20_len_350, get_area_byte); +INCLUDE_ASM("code_dba20_len_350", get_area_byte); diff --git a/src/code_dbd70_len_700.c b/src/code_dbd70_len_700.c index 611869fbc6..b03cb1c4f2 100644 --- a/src/code_dbd70_len_700.c +++ b/src/code_dbd70_len_700.c @@ -5,9 +5,9 @@ void default_trigger_function_handler(s32* arg0) { arg0[0] |= 2; } -INCLUDE_ASM(code_dbd70_len_700, clear_trigger_data); +INCLUDE_ASM("code_dbd70_len_700", clear_trigger_data); -//INCLUDE_ASM(code_dbd70_len_700, init_trigger_list); +//INCLUDE_ASM("code_dbd70_len_700", init_trigger_list); void init_trigger_list(void) { if ((*gGameStatusPtr)->isBattle == 0) { *gCurrentTriggerListPtr = gTriggerList1; @@ -18,9 +18,9 @@ void init_trigger_list(void) { gTriggerCount = 0; } -INCLUDE_ASM(code_dbd70_len_700, create_trigger); +INCLUDE_ASM("code_dbd70_len_700", create_trigger); -INCLUDE_ASM(code_dbd70_len_700, update_triggers); +INCLUDE_ASM("code_dbd70_len_700", update_triggers); void delete_trigger(Trigger* toDelete) { @@ -38,14 +38,14 @@ void delete_trigger(Trigger* toDelete) { } } -INCLUDE_ASM(code_dbd70_len_700, is_trigger_bound); +INCLUDE_ASM("code_dbd70_len_700", is_trigger_bound); -//INCLUDE_ASM(code_dbd70_len_700, get_trigger_by_id); +//INCLUDE_ASM("code_dbd70_len_700", get_trigger_by_id); Trigger* get_trigger_by_id(s32 triggerID) { return (*gCurrentTriggerListPtr)[triggerID]; } -INCLUDE_ASM(code_dbd70_len_700, func_80145CE8); +INCLUDE_ASM("code_dbd70_len_700", func_80145CE8); /*s32 func_80145CE8(s32 arg0) { s32 i; s32 ret; diff --git a/src/code_dc470_len_14c0.c b/src/code_dc470_len_14c0.c index e5aa5608d6..47c3e3ccfd 100644 --- a/src/code_dc470_len_14c0.c +++ b/src/code_dc470_len_14c0.c @@ -64,4 +64,4 @@ u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) { return temp_lo; } -INCLUDE_ASM(code_dc470_len_14c0, func_80145EC0); +INCLUDE_ASM("code_dc470_len_14c0", func_80145EC0); diff --git a/src/code_ddaf0_len_c50.c b/src/code_ddaf0_len_c50.c index e33844a551..f18b912e7c 100644 --- a/src/code_ddaf0_len_c50.c +++ b/src/code_ddaf0_len_c50.c @@ -1,21 +1,21 @@ #include "common.h" -INCLUDE_ASM(code_ddaf0_len_c50, func_801473F0); +INCLUDE_ASM("code_ddaf0_len_c50", func_801473F0); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147414); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147414); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147698); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147698); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147AC4); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147AC4); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147CC8); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147CC8); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147D70); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147D70); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147E48); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147E48); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147E7C); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147E7C); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147EC4); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147EC4); -INCLUDE_ASM(code_ddaf0_len_c50, func_80147F30); +INCLUDE_ASM("code_ddaf0_len_c50", func_80147F30); diff --git a/src/code_de740_len_23f0.c b/src/code_de740_len_23f0.c index 06754d4ebf..f25f1ecd26 100644 --- a/src/code_de740_len_23f0.c +++ b/src/code_de740_len_23f0.c @@ -1,53 +1,53 @@ #include "common.h" -INCLUDE_ASM(code_de740_len_23f0, func_80148040); +INCLUDE_ASM("code_de740_len_23f0", func_80148040); -INCLUDE_ASM(code_de740_len_23f0, func_801480F0); +INCLUDE_ASM("code_de740_len_23f0", func_801480F0); -INCLUDE_ASM(code_de740_len_23f0, func_801481C4); +INCLUDE_ASM("code_de740_len_23f0", func_801481C4); -INCLUDE_ASM(code_de740_len_23f0, func_801489B8); +INCLUDE_ASM("code_de740_len_23f0", func_801489B8); -INCLUDE_ASM(code_de740_len_23f0, func_801491E4); +INCLUDE_ASM("code_de740_len_23f0", func_801491E4); -INCLUDE_ASM(code_de740_len_23f0, func_80149250); +INCLUDE_ASM("code_de740_len_23f0", func_80149250); -INCLUDE_ASM(code_de740_len_23f0, func_80149600); +INCLUDE_ASM("code_de740_len_23f0", func_80149600); -INCLUDE_ASM(code_de740_len_23f0, func_80149618); +INCLUDE_ASM("code_de740_len_23f0", func_80149618); -INCLUDE_ASM(code_de740_len_23f0, func_80149670); +INCLUDE_ASM("code_de740_len_23f0", func_80149670); -INCLUDE_ASM(code_de740_len_23f0, func_80149734); +INCLUDE_ASM("code_de740_len_23f0", func_80149734); -INCLUDE_ASM(code_de740_len_23f0, func_801497FC); +INCLUDE_ASM("code_de740_len_23f0", func_801497FC); -INCLUDE_ASM(code_de740_len_23f0, func_80149828); +INCLUDE_ASM("code_de740_len_23f0", func_80149828); -INCLUDE_ASM(code_de740_len_23f0, func_80149838); +INCLUDE_ASM("code_de740_len_23f0", func_80149838); -INCLUDE_ASM(code_de740_len_23f0, func_801498C4); +INCLUDE_ASM("code_de740_len_23f0", func_801498C4); -INCLUDE_ASM(code_de740_len_23f0, func_80149908); +INCLUDE_ASM("code_de740_len_23f0", func_80149908); -INCLUDE_ASM(code_de740_len_23f0, func_80149974); +INCLUDE_ASM("code_de740_len_23f0", func_80149974); -INCLUDE_ASM(code_de740_len_23f0, func_80149A6C); +INCLUDE_ASM("code_de740_len_23f0", func_80149A6C); -INCLUDE_ASM(code_de740_len_23f0, _play_sound); +INCLUDE_ASM("code_de740_len_23f0", _play_sound); -INCLUDE_ASM(code_de740_len_23f0, stop_sound); +INCLUDE_ASM("code_de740_len_23f0", stop_sound); -INCLUDE_ASM(code_de740_len_23f0, play_sound); +INCLUDE_ASM("code_de740_len_23f0", play_sound); -INCLUDE_ASM(code_de740_len_23f0, play_sound_at_player); +INCLUDE_ASM("code_de740_len_23f0", play_sound_at_player); -INCLUDE_ASM(code_de740_len_23f0, play_sound_at_npc); +INCLUDE_ASM("code_de740_len_23f0", play_sound_at_npc); -s32 INCLUDE_ASM(code_de740_len_23f0, play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); +s32 INCLUDE_ASM("code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); -INCLUDE_ASM(code_de740_len_23f0, func_80149E04); +INCLUDE_ASM("code_de740_len_23f0", func_80149E04); -INCLUDE_ASM(code_de740_len_23f0, func_80149F58); +INCLUDE_ASM("code_de740_len_23f0", func_80149F58); -INCLUDE_ASM(code_de740_len_23f0, func_8014A1B4); +INCLUDE_ASM("code_de740_len_23f0", func_8014A1B4); diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c index f6a3f48857..74cc183fb6 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/code_e0b30_len_b80.c @@ -1,39 +1,39 @@ #include "common.h" -INCLUDE_ASM(code_e0b30_len_b80, get_default_variation_for_song); +INCLUDE_ASM("code_e0b30_len_b80", get_default_variation_for_song); -INCLUDE_ASM(code_e0b30_len_b80, func_8014A498); +INCLUDE_ASM("code_e0b30_len_b80", func_8014A498); -INCLUDE_ASM(code_e0b30_len_b80, func_8014A52C); +INCLUDE_ASM("code_e0b30_len_b80", func_8014A52C); -INCLUDE_ASM(code_e0b30_len_b80, func_8014A548); +INCLUDE_ASM("code_e0b30_len_b80", func_8014A548); -INCLUDE_ASM(code_e0b30_len_b80, _set_music_track); +INCLUDE_ASM("code_e0b30_len_b80", _set_music_track); -s32 INCLUDE_ASM(code_e0b30_len_b80, set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); +s32 INCLUDE_ASM("code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); -INCLUDE_ASM(code_e0b30_len_b80, func_8014A964); +INCLUDE_ASM("code_e0b30_len_b80", func_8014A964); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AA54); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AA54); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AB0C); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AB0C); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AC08); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AC08); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AC5C); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AC5C); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AC70); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AC70); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AC84); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AC84); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AC94); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AC94); -INCLUDE_ASM(code_e0b30_len_b80, func_8014ADA4); +INCLUDE_ASM("code_e0b30_len_b80", func_8014ADA4); -INCLUDE_ASM(code_e0b30_len_b80, func_8014ADF8); +INCLUDE_ASM("code_e0b30_len_b80", func_8014ADF8); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AE6C); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AE6C); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AEF8); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AEF8); -INCLUDE_ASM(code_e0b30_len_b80, func_8014AF8C); +INCLUDE_ASM("code_e0b30_len_b80", func_8014AF8C); diff --git a/src/code_e20eb0.c b/src/code_e20eb0.c index 45215c1890..ecbd1ea695 100644 --- a/src/code_e20eb0.c +++ b/src/code_e20eb0.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(code_e20eb0, func_802B7000); +INCLUDE_ASM("code_e20eb0", func_802B7000); -INCLUDE_ASM(code_e20eb0, func_802B70B4); +INCLUDE_ASM("code_e20eb0", func_802B70B4); -INCLUDE_ASM(code_e20eb0, func_802B71C8); +INCLUDE_ASM("code_e20eb0", func_802B71C8); -INCLUDE_ASM(code_e20eb0, func_802B742C); +INCLUDE_ASM("code_e20eb0", func_802B742C); diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index a0574c6b70..2e8bac103f 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -1,24 +1,24 @@ #include "common.h" -INCLUDE_ASM(code_e79b0_len_1920, sort_scripts); +INCLUDE_ASM("code_e79b0_len_1920", sort_scripts); -INCLUDE_ASM(code_e79b0_len_1920, find_script_labels); +INCLUDE_ASM("code_e79b0_len_1920", find_script_labels); -INCLUDE_ASM(code_e79b0_len_1920, clear_script_list); +INCLUDE_ASM("code_e79b0_len_1920", clear_script_list); -INCLUDE_ASM(code_e79b0_len_1920, init_script_list); +INCLUDE_ASM("code_e79b0_len_1920", init_script_list); -INCLUDE_ASM(code_e79b0_len_1920, func_802C3390); +INCLUDE_ASM("code_e79b0_len_1920", func_802C3390); -INCLUDE_ASM(code_e79b0_len_1920, start_script); +INCLUDE_ASM("code_e79b0_len_1920", start_script); -INCLUDE_ASM(code_e79b0_len_1920, start_script_in_group); +INCLUDE_ASM("code_e79b0_len_1920", start_script_in_group); -INCLUDE_ASM(code_e79b0_len_1920, start_child_script); +INCLUDE_ASM("code_e79b0_len_1920", start_child_script); -INCLUDE_ASM(code_e79b0_len_1920, func_802C39F8); +INCLUDE_ASM("code_e79b0_len_1920", func_802C39F8); -INCLUDE_ASM(code_e79b0_len_1920, restart_script); +INCLUDE_ASM("code_e79b0_len_1920", restart_script); // TODO: Find out why things break when script->timeScale = 1 goes after the previous lines /* ScriptInstance* restart_script(ScriptInstance* script) { @@ -42,11 +42,11 @@ ScriptInstance* restart_script(ScriptInstance* script) { } */ -INCLUDE_ASM(code_e79b0_len_1920, update_scripts); +INCLUDE_ASM("code_e79b0_len_1920", update_scripts); -INCLUDE_ASM(code_e79b0_len_1920, func_802C3EE4); +INCLUDE_ASM("code_e79b0_len_1920", func_802C3EE4); -INCLUDE_ASM(code_e79b0_len_1920, kill_script); +INCLUDE_ASM("code_e79b0_len_1920", kill_script); void* kill_script_by_ID(s32 id) { s32 i; @@ -105,7 +105,7 @@ void set_script_timescale(ScriptInstance* script, f32 timeScale) { script->timeScale = timeScale * gGlobalTimeSpace; } -INCLUDE_ASM(code_e79b0_len_1920, set_global_timespace); +INCLUDE_ASM("code_e79b0_len_1920", set_global_timespace); /* // TODO: figure out why compiler/assembler isn't putting SWC1 in delay slot void set_global_timespace(f32 timeScale) { @@ -114,7 +114,7 @@ void set_global_timespace(f32 timeScale) { */ -INCLUDE_ASM(code_e79b0_len_1920, get_global_timespace); +INCLUDE_ASM("code_e79b0_len_1920", get_global_timespace); /* // TODO: figure out why compiler/assembler isn't putting LWC1 in delay slot f32 get_global_timespace(void) { @@ -126,9 +126,9 @@ void set_script_group(ScriptInstance* script, s8 groupFlags) { script->groupFlags = groupFlags; } -INCLUDE_ASM(code_e79b0_len_1920, bind_trigger); +INCLUDE_ASM("code_e79b0_len_1920", bind_trigger); -INCLUDE_ASM(code_e79b0_len_1920, bind_trigger_1); +INCLUDE_ASM("code_e79b0_len_1920", bind_trigger_1); void suspend_group_script(ScriptInstance* script, s32 groupFlags) { int i; @@ -306,7 +306,7 @@ void set_script_flags(ScriptInstance* script, s32 flags) { } } -INCLUDE_ASM(code_e79b0_len_1920, clear_script_flags); +INCLUDE_ASM("code_e79b0_len_1920", clear_script_flags); /* // TODO: Really close but some weirdness is going on void clear_script_flags(ScriptInstance* script, s32 flags) { diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c index 3749327d60..f22c70c14d 100644 --- a/src/code_e92d0_len_5da0.c +++ b/src/code_e92d0_len_5da0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(code_e92d0_len_5da0, fixed_var_to_float); +INCLUDE_ASM("code_e92d0_len_5da0", fixed_var_to_float); /*f32 fixed_var_to_float(s32 scriptVar) { if (scriptVar <= -220000000) { return (scriptVar + 230000000) * (1 / 1024.f); @@ -8,7 +8,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, fixed_var_to_float); return scriptVar; }*/ -INCLUDE_ASM(code_e92d0_len_5da0, float_to_fixed_var); +INCLUDE_ASM("code_e92d0_len_5da0", float_to_fixed_var); /*s32 float_to_fixed_var(f32 arg0) { return (s32)(arg0 * (f32)1024.0f) + -230000000; }*/ @@ -27,9 +27,9 @@ ApiStatus si_handle_goto(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_Loop); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_Loop); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_loop); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_end_loop); ApiStatus si_handle_break_loop(ScriptInstance* script) { ASSERT(script->loopDepth >= 0); @@ -38,21 +38,21 @@ ApiStatus si_handle_break_loop(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_wait); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_wait); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_wait_seconds); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_wait_seconds); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_equal); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_not_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_not_equal); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_less); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_less); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_greater); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_greater); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_less_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_less_equal); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_greater_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_greater_equal); ApiStatus si_handle_if_AND(ScriptInstance* script) { s32 var1; @@ -68,7 +68,7 @@ ApiStatus si_handle_if_AND(ScriptInstance* script) { return ApiStatus_DONE2; } -//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_not_AND); +//INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_not_AND); ApiStatus si_handle_if_not_AND(ScriptInstance* script) { s32 var1; s32 *ptrReadPos = script->ptrReadPos; @@ -116,29 +116,29 @@ ApiStatus si_handle_switch_const(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_equal); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_not_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_not_equal); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_less); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_less); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_less_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_less_equal); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_greater); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_greater); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_greater_equal); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_greater_equal); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_range); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_range); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_default); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_default); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_AND); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_AND); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_equal_OR); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_equal_OR); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_equal_AND); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_equal_AND); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_case_group); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_end_case_group); ApiStatus si_handle_break_case(ScriptInstance* script) { ASSERT(script->switchDepth >= 0); @@ -178,23 +178,23 @@ ApiStatus si_handle_set_float(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_add); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_add); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_subtract); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_subtract); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_multiply); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_multiply); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_divide); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_divide); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_mod); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_mod); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_addF); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_addF); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_subtractF); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_subtractF); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_multiplyF); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_multiplyF); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_divideF); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_divideF); ApiStatus si_handle_set_int_buffer_ptr(ScriptInstance* script) { script->buffer = get_variable(script, *script->ptrReadPos); @@ -214,11 +214,11 @@ ApiStatus si_handle_get_1_word(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_2_word); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_2_word); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_3_word); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_3_word); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_word); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_4_word); ApiStatus si_handle_get_Nth_word(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -228,15 +228,15 @@ ApiStatus si_handle_get_Nth_word(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_1_float); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_1_float); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_2_float); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_2_float); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_3_float); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_3_float); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_float); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_4_float); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_Nth_float); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_Nth_float); ApiStatus si_handle_set_array(ScriptInstance* script) { script->array = get_variable(script, *script->ptrReadPos); @@ -248,11 +248,11 @@ ApiStatus si_handle_set_flag_array(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_allocate_array); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_allocate_array); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_AND); -//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND_const); +//INCLUDE_ASM("code_e92d0_len_5da0", si_handle_AND_const); ApiStatus si_handle_AND_const(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; // todo ??? @@ -265,9 +265,9 @@ ApiStatus si_handle_AND_const(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_OR); -//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR_const); +//INCLUDE_ASM("code_e92d0_len_5da0", si_handle_OR_const); ApiStatus si_handle_OR_const(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; // todo ??? @@ -280,11 +280,11 @@ ApiStatus si_handle_OR_const(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_call); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_call); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_exec1); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_exec1); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_exec2); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_exec2); ApiStatus si_handle_exec_wait(ScriptInstance* script) { start_child_script(script, get_variable(script, *script->ptrReadPos), 0); @@ -298,9 +298,9 @@ ApiStatus si_handle_jump(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, _bound_script_trigger_handler); +INCLUDE_ASM("code_e92d0_len_5da0", _bound_script_trigger_handler); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_bind); ApiStatus DeleteTrigger(ScriptInstance* script, s32 isInitialCall) { delete_trigger(get_variable(script, *script->ptrReadPos)); @@ -362,18 +362,18 @@ ApiStatus si_handle_resume(ScriptInstance* script) { return ApiStatus_DONE2; } -ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_does_script_exist); +ApiStatus INCLUDE_ASM("code_e92d0_len_5da0", si_handle_does_script_exist); -ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind_lock); +ApiStatus INCLUDE_ASM("code_e92d0_len_5da0", si_handle_bind_lock); -ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_thread); +ApiStatus INCLUDE_ASM("code_e92d0_len_5da0", si_handle_thread); ApiStatus si_handle_end_thread(ScriptInstance* script) { kill_script(script); return ApiStatus_FINISH; } -ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_child_thread); +ApiStatus INCLUDE_ASM("code_e92d0_len_5da0", si_handle_child_thread); ApiStatus si_handle_end_child_thread(ScriptInstance* script) { kill_script(script); @@ -384,7 +384,7 @@ ApiStatus func_802C6E14(ScriptInstance* script) { return ApiStatus_DONE2; } -ApiStatus INCLUDE_ASM(code_e92d0_len_5da0, si_handle_print_debug_var); +ApiStatus INCLUDE_ASM("code_e92d0_len_5da0", si_handle_print_debug_var); ApiStatus func_802C739C(ScriptInstance* script) { script->ptrSavedPosition = *script->ptrReadPos; @@ -406,41 +406,41 @@ s32 func_802C73B8(ScriptInstance* script) { return 1; } -INCLUDE_ASM(code_e92d0_len_5da0, si_execute_next_command); +INCLUDE_ASM("code_e92d0_len_5da0", si_execute_next_command); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end); +INCLUDE_ASM("code_e92d0_len_5da0", si_handle_end); -s32 INCLUDE_ASM(code_e92d0_len_5da0, get_variable, ScriptInstance* script, Bytecode var); +s32 INCLUDE_ASM("code_e92d0_len_5da0", get_variable, ScriptInstance* script, Bytecode var); -INCLUDE_ASM(code_e92d0_len_5da0, get_variable_index); +INCLUDE_ASM("code_e92d0_len_5da0", get_variable_index); -INCLUDE_ASM(code_e92d0_len_5da0, get_variable_index_alt); +INCLUDE_ASM("code_e92d0_len_5da0", get_variable_index_alt); -s32 INCLUDE_ASM(code_e92d0_len_5da0, set_variable, ScriptInstance* script, Bytecode var, s32 value); +s32 INCLUDE_ASM("code_e92d0_len_5da0", set_variable, ScriptInstance* script, Bytecode var, s32 value); -f32 INCLUDE_ASM(code_e92d0_len_5da0, get_float_variable, ScriptInstance* script, Bytecode var); +f32 INCLUDE_ASM("code_e92d0_len_5da0", get_float_variable, ScriptInstance* script, Bytecode var); -f32 INCLUDE_ASM(code_e92d0_len_5da0, set_float_variable, ScriptInstance* script, Bytecode var, f32 value); +f32 INCLUDE_ASM("code_e92d0_len_5da0", set_float_variable, ScriptInstance* script, Bytecode var, f32 value); -INCLUDE_ASM(code_e92d0_len_5da0, si_goto_label); +INCLUDE_ASM("code_e92d0_len_5da0", si_goto_label); -INCLUDE_ASM(code_e92d0_len_5da0, si_skip_if); +INCLUDE_ASM("code_e92d0_len_5da0", si_skip_if); -INCLUDE_ASM(code_e92d0_len_5da0, si_skip_else); +INCLUDE_ASM("code_e92d0_len_5da0", si_skip_else); -INCLUDE_ASM(code_e92d0_len_5da0, si_goto_end_case); +INCLUDE_ASM("code_e92d0_len_5da0", si_goto_end_case); -INCLUDE_ASM(code_e92d0_len_5da0, si_goto_next_case); +INCLUDE_ASM("code_e92d0_len_5da0", si_goto_next_case); -INCLUDE_ASM(code_e92d0_len_5da0, si_goto_end_loop); +INCLUDE_ASM("code_e92d0_len_5da0", si_goto_end_loop); -INCLUDE_API_ASM(code_e92d0_len_5da0, TranslateModel); +INCLUDE_API_ASM("code_e92d0_len_5da0", TranslateModel); -INCLUDE_API_ASM(code_e92d0_len_5da0, RotateModel); +INCLUDE_API_ASM("code_e92d0_len_5da0", RotateModel); -INCLUDE_API_ASM(code_e92d0_len_5da0, ScaleModel); +INCLUDE_API_ASM("code_e92d0_len_5da0", ScaleModel); -INCLUDE_API_ASM(code_e92d0_len_5da0, GetModelIndex); +INCLUDE_API_ASM("code_e92d0_len_5da0", GetModelIndex); ApiStatus CloneModel(ScriptInstance* script, s32 isInitialCall) { Bytecode* thisPos = script->ptrReadPos; @@ -451,50 +451,50 @@ ApiStatus CloneModel(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_e92d0_len_5da0, GetModelCenter); +INCLUDE_API_ASM("code_e92d0_len_5da0", GetModelCenter); -INCLUDE_API_ASM(code_e92d0_len_5da0, SetTexPanner); +INCLUDE_API_ASM("code_e92d0_len_5da0", SetTexPanner); -INCLUDE_API_ASM(code_e92d0_len_5da0, SetModelFlag10); +INCLUDE_API_ASM("code_e92d0_len_5da0", SetModelFlag10); -INCLUDE_API_ASM(code_e92d0_len_5da0, EnableTexPanning); +INCLUDE_API_ASM("code_e92d0_len_5da0", EnableTexPanning); -INCLUDE_API_ASM(code_e92d0_len_5da0, EnableModel); +INCLUDE_API_ASM("code_e92d0_len_5da0", EnableModel); -INCLUDE_API_ASM(code_e92d0_len_5da0, SetGroupEnabled); +INCLUDE_API_ASM("code_e92d0_len_5da0", SetGroupEnabled); -INCLUDE_API_ASM(code_e92d0_len_5da0, SetTexPanOffset); +INCLUDE_API_ASM("code_e92d0_len_5da0", SetTexPanOffset); -INCLUDE_API_ASM(code_e92d0_len_5da0, SetModelFlags); +INCLUDE_API_ASM("code_e92d0_len_5da0", SetModelFlags); -INCLUDE_ASM(code_e92d0_len_5da0, func_802C95A0); +INCLUDE_ASM("code_e92d0_len_5da0", func_802C95A0); -INCLUDE_API_ASM(code_e92d0_len_5da0, TranslateGroup); +INCLUDE_API_ASM("code_e92d0_len_5da0", TranslateGroup); -INCLUDE_API_ASM(code_e92d0_len_5da0, RotateGroup); +INCLUDE_API_ASM("code_e92d0_len_5da0", RotateGroup); -INCLUDE_API_ASM(code_e92d0_len_5da0, ScaleGroup); +INCLUDE_API_ASM("code_e92d0_len_5da0", ScaleGroup); -INCLUDE_API_ASM(code_e92d0_len_5da0, EnableGroup); +INCLUDE_API_ASM("code_e92d0_len_5da0", EnableGroup); -INCLUDE_ASM(code_e92d0_len_5da0, modify_collider_family_flags); +INCLUDE_ASM("code_e92d0_len_5da0", modify_collider_family_flags); -INCLUDE_API_ASM(code_e92d0_len_5da0, ModifyColliderFlags); +INCLUDE_API_ASM("code_e92d0_len_5da0", ModifyColliderFlags); -INCLUDE_API_ASM(code_e92d0_len_5da0, ResetFromLava); +INCLUDE_API_ASM("code_e92d0_len_5da0", ResetFromLava); -INCLUDE_API_ASM(code_e92d0_len_5da0, GetColliderCenter); +INCLUDE_API_ASM("code_e92d0_len_5da0", GetColliderCenter); -INCLUDE_API_ASM(code_e92d0_len_5da0, ParentColliderToModel); +INCLUDE_API_ASM("code_e92d0_len_5da0", ParentColliderToModel); ApiStatus UpdateColliderTransform(ScriptInstance* script, s32 isInitialCall) { update_collider_transform(get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, func_802CA1B8); +INCLUDE_ASM("code_e92d0_len_5da0", func_802CA1B8); -INCLUDE_ASM(code_e92d0_len_5da0, goto_map); +INCLUDE_ASM("code_e92d0_len_5da0", goto_map); ApiStatus GotoMap(ScriptInstance* script, s32 isInitialCall) { goto_map(script, 0); @@ -526,8 +526,8 @@ ApiStatus GetLoadType(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_e92d0_len_5da0, SetRenderMode); +INCLUDE_API_ASM("code_e92d0_len_5da0", SetRenderMode); -INCLUDE_API_ASM(code_e92d0_len_5da0, PlaySoundAtModel); +INCLUDE_API_ASM("code_e92d0_len_5da0", PlaySoundAtModel); -INCLUDE_API_ASM(code_e92d0_len_5da0, PlaySoundAtCollider); +INCLUDE_API_ASM("code_e92d0_len_5da0", PlaySoundAtCollider); diff --git a/src/code_e940_len_290.c b/src/code_e940_len_290.c index 49a725861d..6d95ed8450 100644 --- a/src/code_e940_len_290.c +++ b/src/code_e940_len_290.c @@ -5,7 +5,7 @@ void func_80033540(void) { (*gGameStatusPtr)->loadMenuState = 3; } -INCLUDE_ASM(code_e940_len_290, func_80033568); +INCLUDE_ASM("code_e940_len_290", func_80033568); void func_80033788(void) { func_8002AB5C(0, 0, 0x13F, 0xEF, 0, 0, 0, 0xFF); diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c index 36b348f471..18c50cb084 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/code_ebd0_len_6a0.c @@ -52,8 +52,8 @@ void start_battle_countdown(void) { D_800A0900 = 5; } -INCLUDE_ASM(code_ebd0_len_6a0, step_battle); -INCLUDE_ASM(code_ebd0_len_6a0, func_80033B54); -INCLUDE_ASM(code_ebd0_len_6a0, func_80033B88); -INCLUDE_ASM(code_ebd0_len_6a0, func_80033BC0); -INCLUDE_ASM(code_ebd0_len_6a0, func_80033E64); +INCLUDE_ASM("code_ebd0_len_6a0", step_battle); +INCLUDE_ASM("code_ebd0_len_6a0", func_80033B54); +INCLUDE_ASM("code_ebd0_len_6a0", func_80033B88); +INCLUDE_ASM("code_ebd0_len_6a0", func_80033BC0); +INCLUDE_ASM("code_ebd0_len_6a0", func_80033E64); diff --git a/src/code_ef070_len_3400.c b/src/code_ef070_len_3400.c index 40b6184d64..400adc48f8 100644 --- a/src/code_ef070_len_3400.c +++ b/src/code_ef070_len_3400.c @@ -1,87 +1,87 @@ #include "common.h" -INCLUDE_API_ASM(code_ef070_len_3400, SetCamEnabled); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamEnabled); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamFlag80); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamFlag80); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamPerspective); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamPerspective); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamViewport); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamViewport); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamBGColor); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamBGColor); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamTarget); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamTarget); -INCLUDE_API_ASM(code_ef070_len_3400, ShakeCam); +INCLUDE_API_ASM("code_ef070_len_3400", ShakeCam); -INCLUDE_ASM(code_ef070_len_3400, exec_ShakeCam1); +INCLUDE_ASM("code_ef070_len_3400", exec_ShakeCam1); -INCLUDE_ASM(code_ef070_len_3400, exec_ShakeCamX); +INCLUDE_ASM("code_ef070_len_3400", exec_ShakeCamX); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamLeadPlayer); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamLeadPlayer); -INCLUDE_API_ASM(code_ef070_len_3400, PanToTarget); +INCLUDE_API_ASM("code_ef070_len_3400", PanToTarget); -INCLUDE_API_ASM(code_ef070_len_3400, UseSettingsFrom); +INCLUDE_API_ASM("code_ef070_len_3400", UseSettingsFrom); -INCLUDE_API_ASM(code_ef070_len_3400, LoadSettings); +INCLUDE_API_ASM("code_ef070_len_3400", LoadSettings); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamType); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamType); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamPitch); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamPitch); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamDistance); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamDistance); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamPosA); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamPosA); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamPosB); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamPosB); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamPosC); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamPosC); -INCLUDE_API_ASM(code_ef070_len_3400, SetPanTarget); +INCLUDE_API_ASM("code_ef070_len_3400", SetPanTarget); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamSpeed); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamSpeed); -INCLUDE_API_ASM(code_ef070_len_3400, GetCamType); +INCLUDE_API_ASM("code_ef070_len_3400", GetCamType); -INCLUDE_API_ASM(code_ef070_len_3400, GetCamPitch); +INCLUDE_API_ASM("code_ef070_len_3400", GetCamPitch); -INCLUDE_API_ASM(code_ef070_len_3400, GetCamDistance); +INCLUDE_API_ASM("code_ef070_len_3400", GetCamDistance); -INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosA); +INCLUDE_API_ASM("code_ef070_len_3400", GetCamPosA); -INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosB); +INCLUDE_API_ASM("code_ef070_len_3400", GetCamPosB); -INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosC); +INCLUDE_API_ASM("code_ef070_len_3400", GetCamPosC); -INCLUDE_API_ASM(code_ef070_len_3400, GetCamPosition); +INCLUDE_API_ASM("code_ef070_len_3400", GetCamPosition); -INCLUDE_API_ASM(code_ef070_len_3400, WaitForCam); +INCLUDE_API_ASM("code_ef070_len_3400", WaitForCam); -INCLUDE_API_ASM(code_ef070_len_3400, SetCamProperties); +INCLUDE_API_ASM("code_ef070_len_3400", SetCamProperties); -INCLUDE_API_ASM(code_ef070_len_3400, AdjustCam); +INCLUDE_API_ASM("code_ef070_len_3400", AdjustCam); -INCLUDE_API_ASM(code_ef070_len_3400, ResetCam); +INCLUDE_API_ASM("code_ef070_len_3400", ResetCam); -INCLUDE_ASM(code_ef070_len_3400, draw_anim_models); +INCLUDE_ASM("code_ef070_len_3400", draw_anim_models); -INCLUDE_API_ASM(code_ef070_len_3400, LoadModelAnimation); +INCLUDE_API_ASM("code_ef070_len_3400", LoadModelAnimation); -INCLUDE_API_ASM(code_ef070_len_3400, PlayModelAnimation); +INCLUDE_API_ASM("code_ef070_len_3400", PlayModelAnimation); -INCLUDE_API_ASM(code_ef070_len_3400, ChangeModelAnimation); +INCLUDE_API_ASM("code_ef070_len_3400", ChangeModelAnimation); -INCLUDE_API_ASM(code_ef070_len_3400, SetAnimModelPosition); +INCLUDE_API_ASM("code_ef070_len_3400", SetAnimModelPosition); -INCLUDE_API_ASM(code_ef070_len_3400, GetAnimModelPosition); +INCLUDE_API_ASM("code_ef070_len_3400", GetAnimModelPosition); -INCLUDE_API_ASM(code_ef070_len_3400, AddAnimModelPosition); +INCLUDE_API_ASM("code_ef070_len_3400", AddAnimModelPosition); -INCLUDE_API_ASM(code_ef070_len_3400, SetAnimModelRotation); +INCLUDE_API_ASM("code_ef070_len_3400", SetAnimModelRotation); -INCLUDE_API_ASM(code_ef070_len_3400, SetAnimModelScale); +INCLUDE_API_ASM("code_ef070_len_3400", SetAnimModelScale); -INCLUDE_ASM(code_ef070_len_3400, func_802CD4B4); +INCLUDE_ASM("code_ef070_len_3400", func_802CD4B4); -INCLUDE_ASM(code_ef070_len_3400, func_802CD57C); +INCLUDE_ASM("code_ef070_len_3400", func_802CD57C); diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index df130c56d2..0f6e402e7b 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -10,7 +10,7 @@ Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr) { } } -INCLUDE_ASM(code_f2470_len_27f0, set_npc_animation); +INCLUDE_ASM("code_f2470_len_27f0", set_npc_animation); ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -32,15 +32,15 @@ ApiStatus GetNpcPointer(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcPos); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcPos); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcRotation); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcRotation); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcScale); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcScale); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcCollisionSize); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcCollisionSize); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcSpeed); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcSpeed); // TODO: Fix issue with BNEZL vs BNEZ /* ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { @@ -56,56 +56,56 @@ ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { } */ -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcJumpscale); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcJumpscale); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcAnimation); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcAnimation); -INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcAnimation); +INCLUDE_API_ASM("code_f2470_len_27f0", GetNpcAnimation); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcMoveTo); +INCLUDE_API_ASM("code_f2470_len_27f0", NpcMoveTo); -INCLUDE_ASM(code_f2470_len_27f0, _npc_jump_to); +INCLUDE_ASM("code_f2470_len_27f0", _npc_jump_to); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcJump0); +INCLUDE_API_ASM("code_f2470_len_27f0", NpcJump0); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcJump1); +INCLUDE_API_ASM("code_f2470_len_27f0", NpcJump1); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcFlyTo); +INCLUDE_API_ASM("code_f2470_len_27f0", NpcFlyTo); -INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcYaw); +INCLUDE_API_ASM("code_f2470_len_27f0", GetNpcYaw); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcYaw); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcYaw); -INCLUDE_API_ASM(code_f2470_len_27f0, InterpNpcYaw); +INCLUDE_API_ASM("code_f2470_len_27f0", InterpNpcYaw); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcFacePlayer); +INCLUDE_API_ASM("code_f2470_len_27f0", NpcFacePlayer); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcFaceNpc); +INCLUDE_API_ASM("code_f2470_len_27f0", NpcFaceNpc); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcFlagBits); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcFlagBits); -INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcPos); +INCLUDE_API_ASM("code_f2470_len_27f0", GetNpcPos); -INCLUDE_API_ASM(code_f2470_len_27f0, EnableNpcShadow); +INCLUDE_API_ASM("code_f2470_len_27f0", EnableNpcShadow); -INCLUDE_API_ASM(code_f2470_len_27f0, EnableNpcBlur); +INCLUDE_API_ASM("code_f2470_len_27f0", EnableNpcBlur); -INCLUDE_API_ASM(code_f2470_len_27f0, ClearPartnerMoveHistory); +INCLUDE_API_ASM("code_f2470_len_27f0", ClearPartnerMoveHistory); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcSetHomePosToCurrent); +INCLUDE_API_ASM("code_f2470_len_27f0", NpcSetHomePosToCurrent); -INCLUDE_API_ASM(code_f2470_len_27f0, GetPartnerPos); +INCLUDE_API_ASM("code_f2470_len_27f0", GetPartnerPos); -INCLUDE_API_ASM(code_f2470_len_27f0, DisablePartnerAI); +INCLUDE_API_ASM("code_f2470_len_27f0", DisablePartnerAI); -INCLUDE_API_ASM(code_f2470_len_27f0, EnablePartnerAI); +INCLUDE_API_ASM("code_f2470_len_27f0", EnablePartnerAI); -INCLUDE_API_ASM(code_f2470_len_27f0, BringPartnerOut); +INCLUDE_API_ASM("code_f2470_len_27f0", BringPartnerOut); -INCLUDE_API_ASM(code_f2470_len_27f0, PutPartnerAway); +INCLUDE_API_ASM("code_f2470_len_27f0", PutPartnerAway); -INCLUDE_API_ASM(code_f2470_len_27f0, GetCurrentPartnerID); +INCLUDE_API_ASM("code_f2470_len_27f0", GetCurrentPartnerID); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcEffect); +INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcEffect); -INCLUDE_API_ASM(code_f2470_len_27f0, PlaySoundAtNpc); +INCLUDE_API_ASM("code_f2470_len_27f0", PlaySoundAtNpc); diff --git a/src/code_f270_len_1190.c b/src/code_f270_len_1190.c index 31925e15bb..d8eedaee13 100644 --- a/src/code_f270_len_1190.c +++ b/src/code_f270_len_1190.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(code_f270_len_1190, func_80033E70); +INCLUDE_ASM("code_f270_len_1190", func_80033E70); -INCLUDE_ASM(code_f270_len_1190, func_800340A4); +INCLUDE_ASM("code_f270_len_1190", func_800340A4); -INCLUDE_ASM(code_f270_len_1190, func_800343A4); +INCLUDE_ASM("code_f270_len_1190", func_800343A4); -INCLUDE_ASM(code_f270_len_1190, func_80034940); +INCLUDE_ASM("code_f270_len_1190", func_80034940); -INCLUDE_ASM(code_f270_len_1190, step_pause_menu); +INCLUDE_ASM("code_f270_len_1190", step_pause_menu); -INCLUDE_ASM(code_f270_len_1190, func_80034BFC); +INCLUDE_ASM("code_f270_len_1190", func_80034BFC); -INCLUDE_ASM(code_f270_len_1190, func_80034C3C); +INCLUDE_ASM("code_f270_len_1190", func_80034C3C); -INCLUDE_ASM(code_f270_len_1190, func_80034FF0); +INCLUDE_ASM("code_f270_len_1190", func_80034FF0); diff --git a/src/code_f4c60_len_4300.c b/src/code_f4c60_len_4300.c index 2c6e22fdde..5e107ed768 100644 --- a/src/code_f4c60_len_4300.c +++ b/src/code_f4c60_len_4300.c @@ -16,17 +16,17 @@ ApiStatus SpeakToNpc(ScriptInstance* script, s32 isInitialCall) { return _show_message(script, isInitialCall, 3); } -INCLUDE_ASM(code_f4c60_len_4300, _show_message); +INCLUDE_ASM("code_f4c60_len_4300", _show_message); -INCLUDE_API_ASM(code_f4c60_len_4300, ShowMessageAtScreenPos); +INCLUDE_API_ASM("code_f4c60_len_4300", ShowMessageAtScreenPos); -INCLUDE_API_ASM(code_f4c60_len_4300, ShowMessageAtWorldPos); +INCLUDE_API_ASM("code_f4c60_len_4300", ShowMessageAtWorldPos); -INCLUDE_API_ASM(code_f4c60_len_4300, CloseMessage); +INCLUDE_API_ASM("code_f4c60_len_4300", CloseMessage); -INCLUDE_API_ASM(code_f4c60_len_4300, SwitchMessage); +INCLUDE_API_ASM("code_f4c60_len_4300", SwitchMessage); -INCLUDE_API_ASM(code_f4c60_len_4300, ShowChoice); +INCLUDE_API_ASM("code_f4c60_len_4300", ShowChoice); ApiStatus CloseChoice(ScriptInstance* script, s32 isInitialCall) { close_message(D_802DB268); @@ -66,7 +66,7 @@ ApiStatus SetMessageString(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_f4c60_len_4300, SetMessageValue); +INCLUDE_API_ASM("code_f4c60_len_4300", SetMessageValue); // TODO: Figure out why there's an extra NOP after this function // It's probably because of a file split issue /* @@ -80,92 +80,92 @@ ApiStatus SetMessageValue(ScriptInstance* script, s32 initialCall) { } */ -INCLUDE_API_ASM(code_f4c60_len_4300, HidePlayerShadow); +INCLUDE_API_ASM("code_f4c60_len_4300", HidePlayerShadow); -INCLUDE_API_ASM(code_f4c60_len_4300, DisablePlayerPhysics); +INCLUDE_API_ASM("code_f4c60_len_4300", DisablePlayerPhysics); -INCLUDE_API_ASM(code_f4c60_len_4300, DisablePlayerInput); +INCLUDE_API_ASM("code_f4c60_len_4300", DisablePlayerInput); -INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerPos); +INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerPos); -INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerCollisionSize); +INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerCollisionSize); -INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerSpeed); +INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerSpeed); -INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerJumpscale); +INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerJumpscale); -INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerAnimation); +INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerAnimation); -INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerActionState); +INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerActionState); -INCLUDE_API_ASM(code_f4c60_len_4300, MovePlayerTo); +INCLUDE_API_ASM("code_f4c60_len_4300", MovePlayerTo); -INCLUDE_ASM(code_f4c60_len_4300, player_jump); +INCLUDE_ASM("code_f4c60_len_4300", player_jump); -INCLUDE_API_ASM(code_f4c60_len_4300, PlayerJump); +INCLUDE_API_ASM("code_f4c60_len_4300", PlayerJump); -INCLUDE_API_ASM(code_f4c60_len_4300, PlayerJump1); +INCLUDE_API_ASM("code_f4c60_len_4300", PlayerJump1); -INCLUDE_API_ASM(code_f4c60_len_4300, PlayerJump2); +INCLUDE_API_ASM("code_f4c60_len_4300", PlayerJump2); -INCLUDE_API_ASM(code_f4c60_len_4300, InterpPlayerYaw); +INCLUDE_API_ASM("code_f4c60_len_4300", InterpPlayerYaw); -INCLUDE_API_ASM(code_f4c60_len_4300, PlayerFaceNpc); +INCLUDE_API_ASM("code_f4c60_len_4300", PlayerFaceNpc); -INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerTargetYaw); +INCLUDE_API_ASM("code_f4c60_len_4300", GetPlayerTargetYaw); -INCLUDE_API_ASM(code_f4c60_len_4300, SetPlayerFlagBits); +INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerFlagBits); -INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerActionState); +INCLUDE_API_ASM("code_f4c60_len_4300", GetPlayerActionState); -INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerPos); +INCLUDE_API_ASM("code_f4c60_len_4300", GetPlayerPos); -INCLUDE_API_ASM(code_f4c60_len_4300, GetPlayerAnimation); +INCLUDE_API_ASM("code_f4c60_len_4300", GetPlayerAnimation); -INCLUDE_API_ASM(code_f4c60_len_4300, FullyRestoreHPandFP); +INCLUDE_API_ASM("code_f4c60_len_4300", FullyRestoreHPandFP); -INCLUDE_API_ASM(code_f4c60_len_4300, FullyRestoreSP); +INCLUDE_API_ASM("code_f4c60_len_4300", FullyRestoreSP); -INCLUDE_API_ASM(code_f4c60_len_4300, EnablePartner); +INCLUDE_API_ASM("code_f4c60_len_4300", EnablePartner); -INCLUDE_API_ASM(code_f4c60_len_4300, DisablePartner); +INCLUDE_API_ASM("code_f4c60_len_4300", DisablePartner); -INCLUDE_API_ASM(code_f4c60_len_4300, ForceExitHeading); +INCLUDE_API_ASM("code_f4c60_len_4300", ForceExitHeading); -INCLUDE_API_ASM(code_f4c60_len_4300, UseExitHeading); +INCLUDE_API_ASM("code_f4c60_len_4300", UseExitHeading); -INCLUDE_ASM(code_f4c60_len_4300, func_802D23F8); +INCLUDE_ASM("code_f4c60_len_4300", func_802D23F8); -INCLUDE_API_ASM(code_f4c60_len_4300, DisablePulseStone); +INCLUDE_API_ASM("code_f4c60_len_4300", DisablePulseStone); -INCLUDE_API_ASM(code_f4c60_len_4300, GetCurrentPartner); +INCLUDE_API_ASM("code_f4c60_len_4300", GetCurrentPartner); -INCLUDE_API_ASM(code_f4c60_len_4300, Disable8bitMario); +INCLUDE_API_ASM("code_f4c60_len_4300", Disable8bitMario); -INCLUDE_API_ASM(code_f4c60_len_4300, PlaySoundAtPlayer); +INCLUDE_API_ASM("code_f4c60_len_4300", PlaySoundAtPlayer); -INCLUDE_ASM(code_f4c60_len_4300, func_802D2D30); +INCLUDE_ASM("code_f4c60_len_4300", func_802D2D30); -INCLUDE_ASM(code_f4c60_len_4300, func_802D2F34); +INCLUDE_ASM("code_f4c60_len_4300", func_802D2F34); -INCLUDE_API_ASM(code_f4c60_len_4300, CreateImageObj); +INCLUDE_API_ASM("code_f4c60_len_4300", CreateImageObj); -INCLUDE_API_ASM(code_f4c60_len_4300, RemoveImageObj); +INCLUDE_API_ASM("code_f4c60_len_4300", RemoveImageObj); -INCLUDE_API_ASM(code_f4c60_len_4300, SetObjPosition); +INCLUDE_API_ASM("code_f4c60_len_4300", SetObjPosition); -INCLUDE_API_ASM(code_f4c60_len_4300, SetObjRotation); +INCLUDE_API_ASM("code_f4c60_len_4300", SetObjRotation); -INCLUDE_API_ASM(code_f4c60_len_4300, SetObjScale); +INCLUDE_API_ASM("code_f4c60_len_4300", SetObjScale); -INCLUDE_API_ASM(code_f4c60_len_4300, SetObjJumpScale); +INCLUDE_API_ASM("code_f4c60_len_4300", SetObjJumpScale); -INCLUDE_API_ASM(code_f4c60_len_4300, JumpObj); +INCLUDE_API_ASM("code_f4c60_len_4300", JumpObj); -INCLUDE_ASM(code_f4c60_len_4300, func_802D4164); +INCLUDE_ASM("code_f4c60_len_4300", func_802D4164); -INCLUDE_ASM(code_f4c60_len_4300, func_802D43F4); +INCLUDE_ASM("code_f4c60_len_4300", func_802D43F4); -INCLUDE_ASM(code_f4c60_len_4300, func_802D4488); +INCLUDE_ASM("code_f4c60_len_4300", func_802D4488); -INCLUDE_ASM(code_f4c60_len_4300, func_802D4560); +INCLUDE_ASM("code_f4c60_len_4300", func_802D4560); diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index 441ba1d873..4c98d268ba 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -188,7 +188,7 @@ ApiStatus AddVectorPolar(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_f8f60_len_1560, func_802D4BDC); +INCLUDE_API_ASM("code_f8f60_len_1560", func_802D4BDC); /* ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { s32* t0 = &script->functionTemp[0]; @@ -220,9 +220,9 @@ ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { */ // Very similar to func_802D4BDC -INCLUDE_API_ASM(code_f8f60_len_1560, func_802D4C4C); +INCLUDE_API_ASM("code_f8f60_len_1560", func_802D4C4C); -INCLUDE_API_ASM(code_f8f60_len_1560, func_802D4CC4); +INCLUDE_API_ASM("code_f8f60_len_1560", func_802D4CC4); /* ApiStatus func_802D4CC4(ScriptInstance* script, s32 initialCall) { s32 value = get_variable(script, *script->ptrReadPos); @@ -251,13 +251,13 @@ ApiStatus func_802D4D88(ScriptInstance* script, s32 initialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_f8f60_len_1560, setup_path_data); +INCLUDE_ASM("code_f8f60_len_1560", setup_path_data); -INCLUDE_ASM(code_f8f60_len_1560, func_802D5270); +INCLUDE_ASM("code_f8f60_len_1560", func_802D5270); -INCLUDE_API_ASM(code_f8f60_len_1560, LoadPath); +INCLUDE_API_ASM("code_f8f60_len_1560", LoadPath); -INCLUDE_API_ASM(code_f8f60_len_1560, GetNextPathPos); +INCLUDE_API_ASM("code_f8f60_len_1560", GetNextPathPos); ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c index fe1eb96348..af41f01103 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/code_fa4c0_len_3bf0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D5B10); +INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5B10); ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -20,7 +20,7 @@ ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) { return (set_music_track(musicPlayer, songID, variation, 0x1F4, volume) != 0) * 2; } -INCLUDE_API_ASM(code_fa4c0_len_3bf0, FadeInMusic); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", FadeInMusic); ApiStatus PlayAmbientSounds(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -86,7 +86,7 @@ ApiStatus func_802D6340(ScriptInstance* script, s32 initialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_fa4c0_len_3bf0, PlaySoundAtF); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", PlaySoundAtF); ApiStatus RemoveKeyItemAt(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -259,11 +259,11 @@ ApiStatus RemoveFortressKeys(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_fa4c0_len_3bf0, MakeItemEntity); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", MakeItemEntity); -INCLUDE_API_ASM(code_fa4c0_len_3bf0, DropItemEntity); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", DropItemEntity); -INCLUDE_API_ASM(code_fa4c0_len_3bf0, DropItemEntityB); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", DropItemEntityB); /* // Close to working ApiStatus DropItemEntityB(ScriptInstance* script, s32 isInitialCall) { @@ -298,7 +298,7 @@ ApiStatus AddBadge(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_fa4c0_len_3bf0, RemoveBadge); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", RemoveBadge); ApiStatus SetItemPos(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -318,7 +318,7 @@ ApiStatus SetItemPos(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_fa4c0_len_3bf0, SetItemFlags); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", SetItemFlags); ApiStatus AddCoin(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = add_coins(get_variable(script, *script->ptrReadPos)); @@ -335,7 +335,7 @@ ApiStatus AddStarPieces(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_fa4c0_len_3bf0, GetItemPower); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", GetItemPower); /* // Close to working ApiStatus GetItemPower(ScriptInstance* script, s32 isInitialCall) { @@ -351,15 +351,15 @@ ApiStatus GetItemPower(ScriptInstance* script, s32 isInitialCall) { } */ -INCLUDE_API_ASM(code_fa4c0_len_3bf0, ShowGotItem); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", ShowGotItem); -INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D7460); +INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7460); -INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D74C0); +INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D74C0); -INCLUDE_API_ASM(code_fa4c0_len_3bf0, ShowEmote); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", ShowEmote); -INCLUDE_API_ASM(code_fa4c0_len_3bf0, RemoveEffect); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", RemoveEffect); /* // Works ApiStatus RemoveEffect(ScriptInstance* script, s32 isInitialCall) { @@ -401,6 +401,6 @@ ApiStatus func_802D7B74(ScriptInstance* script, s32 isInitialCall) { // More functions still in RemoveEffect.s but the ones above are matching properly */ -INCLUDE_API_ASM(code_fa4c0_len_3bf0, ShowSleepBubble); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", ShowSleepBubble); -INCLUDE_API_ASM(code_fa4c0_len_3bf0, PlayEffect); +INCLUDE_API_ASM("code_fa4c0_len_3bf0", PlayEffect); diff --git a/src/code_fe0b0_len_5a0.c b/src/code_fe0b0_len_5a0.c index 68d6b3b02d..1927f02339 100644 --- a/src/code_fe0b0_len_5a0.c +++ b/src/code_fe0b0_len_5a0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_API_ASM(code_fe0b0_len_5a0, SetSpriteShading); +INCLUDE_API_ASM("code_fe0b0_len_5a0", SetSpriteShading); ApiStatus EnableSpriteShading(ScriptInstance* script, s32 isInitialCall) { if (get_variable(script, *script->ptrReadPos) != 0) { diff --git a/src/code_fee30_len_2d60.c b/src/code_fee30_len_2d60.c index 2492dce0ce..1ecf28c3a9 100644 --- a/src/code_fee30_len_2d60.c +++ b/src/code_fee30_len_2d60.c @@ -1,73 +1,73 @@ #include "common.h" -INCLUDE_ASM(code_fee30_len_2d60, func_802DBD40); +INCLUDE_ASM("code_fee30_len_2d60", func_802DBD40); -INCLUDE_ASM(code_fee30_len_2d60, func_802DBD8C); +INCLUDE_ASM("code_fee30_len_2d60", func_802DBD8C); -INCLUDE_ASM(code_fee30_len_2d60, func_802DBDBC); +INCLUDE_ASM("code_fee30_len_2d60", func_802DBDBC); -INCLUDE_ASM(code_fee30_len_2d60, func_802DBE78); +INCLUDE_ASM("code_fee30_len_2d60", func_802DBE78); -INCLUDE_ASM(code_fee30_len_2d60, func_802DBFC0); +INCLUDE_ASM("code_fee30_len_2d60", func_802DBFC0); -INCLUDE_ASM(code_fee30_len_2d60, func_802DC008); +INCLUDE_ASM("code_fee30_len_2d60", func_802DC008); -INCLUDE_ASM(code_fee30_len_2d60, spr_appendMDL_component); +INCLUDE_ASM("code_fee30_len_2d60", spr_appendMDL_component); -INCLUDE_ASM(code_fee30_len_2d60, spr_transform_point); +INCLUDE_ASM("code_fee30_len_2d60", spr_transform_point); -INCLUDE_ASM(code_fee30_len_2d60, spr_draw_component); +INCLUDE_ASM("code_fee30_len_2d60", spr_draw_component); -INCLUDE_ASM(code_fee30_len_2d60, _spr_sign_extend_12bit); +INCLUDE_ASM("code_fee30_len_2d60", _spr_sign_extend_12bit); -INCLUDE_ASM(code_fee30_len_2d60, _spr_sign_extend_16bit); +INCLUDE_ASM("code_fee30_len_2d60", _spr_sign_extend_16bit); -INCLUDE_ASM(code_fee30_len_2d60, update_component); +INCLUDE_ASM("code_fee30_len_2d60", update_component); -INCLUDE_ASM(code_fee30_len_2d60, func_802DD634); +INCLUDE_ASM("code_fee30_len_2d60", func_802DD634); -INCLUDE_ASM(code_fee30_len_2d60, func_802DD6DC); +INCLUDE_ASM("code_fee30_len_2d60", func_802DD6DC); -INCLUDE_ASM(code_fee30_len_2d60, func_802DD7B0); +INCLUDE_ASM("code_fee30_len_2d60", func_802DD7B0); -INCLUDE_ASM(code_fee30_len_2d60, func_802DD820); +INCLUDE_ASM("code_fee30_len_2d60", func_802DD820); -INCLUDE_ASM(code_fee30_len_2d60, func_802DD88C); +INCLUDE_ASM("code_fee30_len_2d60", func_802DD88C); -INCLUDE_ASM(code_fee30_len_2d60, func_802DD89C); +INCLUDE_ASM("code_fee30_len_2d60", func_802DD89C); -INCLUDE_ASM(code_fee30_len_2d60, func_802DD8F8); +INCLUDE_ASM("code_fee30_len_2d60", func_802DD8F8); -INCLUDE_ASM(code_fee30_len_2d60, func_802DDA60); +INCLUDE_ASM("code_fee30_len_2d60", func_802DDA60); -INCLUDE_ASM(code_fee30_len_2d60, func_802DDA8C); +INCLUDE_ASM("code_fee30_len_2d60", func_802DDA8C); -INCLUDE_ASM(code_fee30_len_2d60, render_sprite); +INCLUDE_ASM("code_fee30_len_2d60", render_sprite); -INCLUDE_ASM(code_fee30_len_2d60, func_802DDEC4); +INCLUDE_ASM("code_fee30_len_2d60", func_802DDEC4); -INCLUDE_ASM(code_fee30_len_2d60, func_802DDEE4); +INCLUDE_ASM("code_fee30_len_2d60", func_802DDEE4); -INCLUDE_ASM(code_fee30_len_2d60, func_802DDFF8); +INCLUDE_ASM("code_fee30_len_2d60", func_802DDFF8); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE0C0); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE0C0); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE0EC); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE0EC); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE2AC); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE2AC); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE3D8); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE3D8); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE5C8); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE5C8); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE5E8); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE5E8); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE780); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE780); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE894); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE894); -INCLUDE_ASM(code_fee30_len_2d60, func_802DE9D8); +INCLUDE_ASM("code_fee30_len_2d60", func_802DE9D8); -INCLUDE_ASM(code_fee30_len_2d60, func_802DEA40); +INCLUDE_ASM("code_fee30_len_2d60", func_802DEA40); -INCLUDE_ASM(code_fee30_len_2d60, func_802DEA6C); +INCLUDE_ASM("code_fee30_len_2d60", func_802DEA6C); diff --git a/src/guOrtho.c b/src/guOrtho.c index 557c46c685..bdeea086ce 100644 --- a/src/guOrtho.c +++ b/src/guOrtho.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(guOrtho, guOrthoF); +INCLUDE_ASM("guOrtho", guOrthoF); /*void guOrthoF(f32 mf[4][4], f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) { s32 i, j; @@ -21,7 +21,7 @@ INCLUDE_ASM(guOrtho, guOrthoF); } }*/ -INCLUDE_ASM(guOrtho, guOrtho); +INCLUDE_ASM("guOrtho", guOrtho); /*void guOrtho(Mtx* mtx, f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) { float mf[4][4]; diff --git a/src/os/code_39cb0_len_100.c b/src/os/code_39cb0_len_100.c index b4c67f5809..3c823bb98b 100644 --- a/src/os/code_39cb0_len_100.c +++ b/src/os/code_39cb0_len_100.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_39cb0_len_100, nuBoot); +INCLUDE_API_ASM("os/code_39cb0_len_100", nuBoot); -INCLUDE_ASM(os/code_39cb0_len_100, boot_idle); +INCLUDE_ASM("os/code_39cb0_len_100", boot_idle); diff --git a/src/os/code_39db0_len_8a0.c b/src/os/code_39db0_len_8a0.c index d0d1b418fc..164a12c699 100644 --- a/src/os/code_39db0_len_8a0.c +++ b/src/os/code_39db0_len_8a0.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScCreateScheduler); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScCreateScheduler); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScExecuteAudio); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScExecuteAudio); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScExecuteGraphics); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScExecuteGraphics); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScAddClient); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScAddClient); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScRemoveClient); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScRemoveClient); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScResetClientMesgType); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScResetClientMesgType); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScGetGfxMQ); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScGetGfxMQ); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScGetAudioMQ); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScGetAudioMQ); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScSetFrameBufferNum); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScSetFrameBufferNum); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScGetFrameRate); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScGetFrameRate); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScEventHandler); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScEventHandler); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScEventBroadcast); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScEventBroadcast); -INCLUDE_API_ASM(os/code_39db0_len_8a0, nuScWaitTaskReady); +INCLUDE_API_ASM("os/code_39db0_len_8a0", nuScWaitTaskReady); diff --git a/src/os/code_3a650_len_40.c b/src/os/code_3a650_len_40.c index df1cec978e..2486ea1587 100644 --- a/src/os/code_3a650_len_40.c +++ b/src/os/code_3a650_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3a650_len_40, nuGfxFuncSet); +INCLUDE_API_ASM("os/code_3a650_len_40", nuGfxFuncSet); diff --git a/src/os/code_3a690_len_40.c b/src/os/code_3a690_len_40.c index d9fe4c46c1..0e1bc88c23 100644 --- a/src/os/code_3a690_len_40.c +++ b/src/os/code_3a690_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3a690_len_40, nuGfxPreNMIFuncSet); +INCLUDE_API_ASM("os/code_3a690_len_40", nuGfxPreNMIFuncSet); diff --git a/src/os/code_3a6d0_len_20.c b/src/os/code_3a6d0_len_20.c index e24acad2a2..2e14a9b684 100644 --- a/src/os/code_3a6d0_len_20.c +++ b/src/os/code_3a6d0_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3a6d0_len_20, nuGfxTaskAllEndWait); +INCLUDE_API_ASM("os/code_3a6d0_len_20", nuGfxTaskAllEndWait); diff --git a/src/os/code_3a6f0_len_110.c b/src/os/code_3a6f0_len_110.c index 2613284fee..3a9d726716 100644 --- a/src/os/code_3a6f0_len_110.c +++ b/src/os/code_3a6f0_len_110.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3a6f0_len_110, nuGfxSetCfb); +INCLUDE_API_ASM("os/code_3a6f0_len_110", nuGfxSetCfb); diff --git a/src/os/code_3a800_len_30.c b/src/os/code_3a800_len_30.c index 1d16bac94f..ff23e22bd8 100644 --- a/src/os/code_3a800_len_30.c +++ b/src/os/code_3a800_len_30.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3a800_len_30, nuGfxDisplayOff); +INCLUDE_API_ASM("os/code_3a800_len_30", nuGfxDisplayOff); diff --git a/src/os/code_3a830_len_20.c b/src/os/code_3a830_len_20.c index f04aee5175..05a0ba4e21 100644 --- a/src/os/code_3a830_len_20.c +++ b/src/os/code_3a830_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3a830_len_20, nuGfxDisplayOn); +INCLUDE_API_ASM("os/code_3a830_len_20", nuGfxDisplayOn); diff --git a/src/os/code_3a850_le_a40.c b/src/os/code_3a850_le_a40.c index 32c50bd429..2714a98eab 100644 --- a/src/os/code_3a850_le_a40.c +++ b/src/os/code_3a850_le_a40.c @@ -1,44 +1,44 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3a850_le_a40, nuPiInit); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuPiInit); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuPiReadRom); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuPiReadRom); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuGfxInit); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuGfxInit); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuContInit); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuContInit); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuContDataGet); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuContDataGet); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuContPakMgrInit); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuContPakMgrInit); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuContPakMgrRemove); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuContPakMgrRemove); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakOpen); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakOpen); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFree); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakFree); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileReadWrite); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakFileReadWrite); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileOpen); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakFileOpen); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileDelete); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakFileDelete); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileState); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakFileState); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakFileNum); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakFileNum); -INCLUDE_API_ASM(os/code_3a850_le_a40, contPakRepairId); +INCLUDE_API_ASM("os/code_3a850_le_a40", contPakRepairId); #undef osMotorStop -s32 INCLUDE_ASM(os/code_3a850_le_a40, osMotorStop, OSPfs* unk); +s32 INCLUDE_ASM("os/code_3a850_le_a40", osMotorStop, OSPfs* unk); -INCLUDE_API_ASM(os/code_3a850_le_a40, contRmbControl); +INCLUDE_API_ASM("os/code_3a850_le_a40", contRmbControl); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuContRmbMgrInit); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuContRmbMgrInit); -INCLUDE_API_ASM(os/code_3a850_le_a40, nuContRmbMgrRemove); +INCLUDE_API_ASM("os/code_3a850_le_a40", nuContRmbMgrRemove); -INCLUDE_API_ASM(os/code_3a850_le_a40, contRmbCheckMesg); +INCLUDE_API_ASM("os/code_3a850_le_a40", contRmbCheckMesg); -INCLUDE_API_ASM(os/code_3a850_le_a40, contRmbStartMesg); +INCLUDE_API_ASM("os/code_3a850_le_a40", contRmbStartMesg); diff --git a/src/os/code_3b290_len_100.c b/src/os/code_3b290_len_100.c index 02fc1c387a..91b051486d 100644 --- a/src/os/code_3b290_len_100.c +++ b/src/os/code_3b290_len_100.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3b290_len_100, nuContRmbStart); +INCLUDE_API_ASM("os/code_3b290_len_100", nuContRmbStart); -INCLUDE_API_ASM(os/code_3b290_len_100, nuContRmbCheck); +INCLUDE_API_ASM("os/code_3b290_len_100", nuContRmbCheck); diff --git a/src/os/code_3b390_len_110.c b/src/os/code_3b390_len_110.c index ca6b62b7b5..2a660c5530 100644 --- a/src/os/code_3b390_len_110.c +++ b/src/os/code_3b390_len_110.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3b390_len_110, nuContRmbModeSet); +INCLUDE_API_ASM("os/code_3b390_len_110", nuContRmbModeSet); diff --git a/src/os/code_3b4a0_len_270.c b/src/os/code_3b4a0_len_270.c index e62eb1c45a..73987c99ca 100644 --- a/src/os/code_3b4a0_len_270.c +++ b/src/os/code_3b4a0_len_270.c @@ -1,11 +1,11 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3b4a0_len_270, nuContRmbForceStop); +INCLUDE_API_ASM("os/code_3b4a0_len_270", nuContRmbForceStop); -INCLUDE_API_ASM(os/code_3b4a0_len_270, nuContRmbForceStopEnd); +INCLUDE_API_ASM("os/code_3b4a0_len_270", nuContRmbForceStopEnd); -INCLUDE_API_ASM(os/code_3b4a0_len_270, nuPiReadRomOverlay); +INCLUDE_API_ASM("os/code_3b4a0_len_270", nuPiReadRomOverlay); -INCLUDE_API_ASM(os/code_3b4a0_len_270, nuGfxThreadStart); +INCLUDE_API_ASM("os/code_3b4a0_len_270", nuGfxThreadStart); -INCLUDE_API_ASM(os/code_3b4a0_len_270, nuGfxThread); +INCLUDE_API_ASM("os/code_3b4a0_len_270", nuGfxThread); diff --git a/src/os/code_3b710_len_40.c b/src/os/code_3b710_len_40.c index a7cee58c6b..4be09fb91a 100644 --- a/src/os/code_3b710_len_40.c +++ b/src/os/code_3b710_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3b710_len_40, nuGfxSwapCfbFuncSet); +INCLUDE_API_ASM("os/code_3b710_len_40", nuGfxSwapCfbFuncSet); diff --git a/src/os/code_3b770_len_80.c b/src/os/code_3b770_len_80.c index 72d297d3ba..54832add06 100644 --- a/src/os/code_3b770_len_80.c +++ b/src/os/code_3b770_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3b770_len_80, nuGfxRetraceWait); +INCLUDE_API_ASM("os/code_3b770_len_80", nuGfxRetraceWait); diff --git a/src/os/code_3b7f0_len_120.c b/src/os/code_3b7f0_len_120.c index e7555b64c6..dba2a42cb7 100644 --- a/src/os/code_3b7f0_len_120.c +++ b/src/os/code_3b7f0_len_120.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3b7f0_len_120, nuSiCallBackAdd); +INCLUDE_API_ASM("os/code_3b7f0_len_120", nuSiCallBackAdd); -INCLUDE_API_ASM(os/code_3b7f0_len_120, nuSiCallBackRemove); +INCLUDE_API_ASM("os/code_3b7f0_len_120", nuSiCallBackRemove); diff --git a/src/os/code_3b910_len_410.c b/src/os/code_3b910_len_410.c index 7cd3095407..2bb1b53d58 100644 --- a/src/os/code_3b910_len_410.c +++ b/src/os/code_3b910_len_410.c @@ -1,21 +1,21 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3b910_len_410, nuContMgrInit); +INCLUDE_API_ASM("os/code_3b910_len_410", nuContMgrInit); -INCLUDE_API_ASM(os/code_3b910_len_410, nuContMgrRemove); +INCLUDE_API_ASM("os/code_3b910_len_410", nuContMgrRemove); -INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataClose); +INCLUDE_API_ASM("os/code_3b910_len_410", nuContDataClose); -INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataOpen); +INCLUDE_API_ASM("os/code_3b910_len_410", nuContDataOpen); -INCLUDE_API_ASM(os/code_3b910_len_410, contRetrace); +INCLUDE_API_ASM("os/code_3b910_len_410", contRetrace); -INCLUDE_API_ASM(os/code_3b910_len_410, contReadData); +INCLUDE_API_ASM("os/code_3b910_len_410", contReadData); -INCLUDE_API_ASM(os/code_3b910_len_410, contReadNW); +INCLUDE_API_ASM("os/code_3b910_len_410", contReadNW); -INCLUDE_API_ASM(os/code_3b910_len_410, contQuery); +INCLUDE_API_ASM("os/code_3b910_len_410", contQuery); -INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataLock); +INCLUDE_API_ASM("os/code_3b910_len_410", nuContDataLock); -INCLUDE_API_ASM(os/code_3b910_len_410, nuContDataUnLock); +INCLUDE_API_ASM("os/code_3b910_len_410", nuContDataUnLock); diff --git a/src/os/code_3bd20_len_c0.c b/src/os/code_3bd20_len_c0.c index a744a47af2..b957ff38ff 100644 --- a/src/os/code_3bd20_len_c0.c +++ b/src/os/code_3bd20_len_c0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3bd20_len_c0, nuContQueryRead); +INCLUDE_API_ASM("os/code_3bd20_len_c0", nuContQueryRead); -OSIntMask INCLUDE_ASM(os/code_3bd20_len_c0, osSetIntMask, OSIntMask mask); +OSIntMask INCLUDE_ASM("os/code_3bd20_len_c0", osSetIntMask, OSIntMask mask); diff --git a/src/os/code_3bde0_len_3e0.c b/src/os/code_3bde0_len_3e0.c index b2782b535c..f27eee2ab9 100644 --- a/src/os/code_3bde0_len_3e0.c +++ b/src/os/code_3bde0_len_3e0.c @@ -1,7 +1,7 @@ #include "common.h" -void INCLUDE_ASM(os/code_3bde0_len_3e0, osCreatePiManager, OSPri prio, OSMesgQueue* queue, OSMesg* mesg, s32 unk); +void INCLUDE_ASM("os/code_3bde0_len_3e0", osCreatePiManager, OSPri prio, OSMesgQueue* queue, OSMesg* mesg, s32 unk); -INCLUDE_API_ASM(os/code_3bde0_len_3e0, osEPiRawStartDma); +INCLUDE_API_ASM("os/code_3bde0_len_3e0", osEPiRawStartDma); -s32 INCLUDE_ASM(os/code_3bde0_len_3e0, osEPiWriteIo, OSPiHandle* handle, u32 unk1, u32 unk2); +s32 INCLUDE_ASM("os/code_3bde0_len_3e0", osEPiWriteIo, OSPiHandle* handle, u32 unk1, u32 unk2); diff --git a/src/os/code_3c1c0_len_60.c b/src/os/code_3c1c0_len_60.c index ed4fa03b99..f422bf88be 100644 --- a/src/os/code_3c1c0_len_60.c +++ b/src/os/code_3c1c0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_3c1c0_len_60, osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); +s32 INCLUDE_ASM("os/code_3c1c0_len_60", osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); diff --git a/src/os/code_3c220_len_a0.c b/src/os/code_3c220_len_a0.c index 5a25c831f2..aa682400c0 100644 --- a/src/os/code_3c220_len_a0.c +++ b/src/os/code_3c220_len_a0.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_3c220_len_a0, osEPiStartDma, OSPiHandle* handle, OSIoMesg* mesg, s32 unk); +s32 INCLUDE_ASM("os/code_3c220_len_a0", osEPiStartDma, OSPiHandle* handle, OSIoMesg* mesg, s32 unk); diff --git a/src/os/code_3c2c0_len_50.c b/src/os/code_3c2c0_len_50.c index ef13646776..08f02d0a5c 100644 --- a/src/os/code_3c2c0_len_50.c +++ b/src/os/code_3c2c0_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_3c2c0_len_50, osEPiLinkHandle, OSPiHandle* handle); +s32 INCLUDE_ASM("os/code_3c2c0_len_50", osEPiLinkHandle, OSPiHandle* handle); diff --git a/src/os/code_3c310_len_180.c b/src/os/code_3c310_len_180.c index aa94b77b74..9c1b3cc4ec 100644 --- a/src/os/code_3c310_len_180.c +++ b/src/os/code_3c310_len_180.c @@ -1,3 +1,3 @@ #include "common.h" -OSPiHandle* INCLUDE_ASM(os/code_3c310_len_180, osCartRomInit, void); +OSPiHandle* INCLUDE_ASM("os/code_3c310_len_180", osCartRomInit, void); diff --git a/src/os/code_3c490_len_3c0.c b/src/os/code_3c490_len_3c0.c index 5c7a6b4074..b096989966 100644 --- a/src/os/code_3c490_len_3c0.c +++ b/src/os/code_3c490_len_3c0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3c490_len_3c0, osDevMgrMain); +INCLUDE_API_ASM("os/code_3c490_len_3c0", osDevMgrMain); diff --git a/src/os/code_3c850_len_f0.c b/src/os/code_3c850_len_f0.c index 4254253ce3..849ffe4866 100644 --- a/src/os/code_3c850_len_f0.c +++ b/src/os/code_3c850_len_f0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3c850_len_f0, osPiCreateAccessQueue); +INCLUDE_API_ASM("os/code_3c850_len_f0", osPiCreateAccessQueue); -INCLUDE_API_ASM(os/code_3c850_len_f0, osPiGetAccess); +INCLUDE_API_ASM("os/code_3c850_len_f0", osPiGetAccess); -INCLUDE_API_ASM(os/code_3c850_len_f0, osPiRelAccess); +INCLUDE_API_ASM("os/code_3c850_len_f0", osPiRelAccess); diff --git a/src/os/code_3c940_len_140.c b/src/os/code_3c940_len_140.c index 2502ddafbf..35194fb660 100644 --- a/src/os/code_3c940_len_140.c +++ b/src/os/code_3c940_len_140.c @@ -1,7 +1,7 @@ #include "common.h" -u32 INCLUDE_ASM(os/code_3c940_len_140, osAiGetLength, void); +u32 INCLUDE_ASM("os/code_3c940_len_140", osAiGetLength, void); -u32 INCLUDE_ASM(os/code_3c940_len_140, osAiGetStatus, void); +u32 INCLUDE_ASM("os/code_3c940_len_140", osAiGetStatus, void); -s32 INCLUDE_ASM(os/code_3c940_len_140, osAiSetFrequency, u32 freq); +s32 INCLUDE_ASM("os/code_3c940_len_140", osAiSetFrequency, u32 freq); diff --git a/src/os/code_3ca80_len_a0.c b/src/os/code_3ca80_len_a0.c index df3ffaf71f..097ed11a35 100644 --- a/src/os/code_3ca80_len_a0.c +++ b/src/os/code_3ca80_len_a0.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_3ca80_len_a0, osAiSetNextBuffer, void* buf, u32 unk); +s32 INCLUDE_ASM("os/code_3ca80_len_a0", osAiSetNextBuffer, void* buf, u32 unk); diff --git a/src/os/code_3cb20_len_130.c b/src/os/code_3cb20_len_130.c index 27d7cc885e..08019643be 100644 --- a/src/os/code_3cb20_len_130.c +++ b/src/os/code_3cb20_len_130.c @@ -1,5 +1,5 @@ #include "common.h" -void INCLUDE_ASM(os/code_3cb20_len_130, osInvalDCache, void* buf, s32 size); +void INCLUDE_ASM("os/code_3cb20_len_130", osInvalDCache, void* buf, s32 size); -void INCLUDE_ASM(os/code_3cb20_len_130, osInvalICache, void* buf, s32 size); +void INCLUDE_ASM("os/code_3cb20_len_130", osInvalICache, void* buf, s32 size); diff --git a/src/os/code_3cc50_len_80.c b/src/os/code_3cc50_len_80.c index bfbbe37ff4..2e81afd8c4 100644 --- a/src/os/code_3cc50_len_80.c +++ b/src/os/code_3cc50_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_3cc50_len_80, osWritebackDCache, void* buf, s32 size); +void INCLUDE_ASM("os/code_3cc50_len_80", osWritebackDCache, void* buf, s32 size); diff --git a/src/os/code_3ccd0_len_30.c b/src/os/code_3ccd0_len_30.c index e92c8b93ff..6bc8b5ee75 100644 --- a/src/os/code_3ccd0_len_30.c +++ b/src/os/code_3ccd0_len_30.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_3ccd0_len_30, osWritebackDCacheAll, void); +void INCLUDE_ASM("os/code_3ccd0_len_30", osWritebackDCacheAll, void); diff --git a/src/os/code_3cd00_len_5f0.c b/src/os/code_3cd00_len_5f0.c index e06ec63a20..bbcea91cc3 100644 --- a/src/os/code_3cd00_len_5f0.c +++ b/src/os/code_3cd00_len_5f0.c @@ -1,19 +1,19 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_3cd00_len_5f0, osContStartQuery, OSMesgQueue* queue); +s32 INCLUDE_ASM("os/code_3cd00_len_5f0", osContStartQuery, OSMesgQueue* queue); -void INCLUDE_ASM(os/code_3cd00_len_5f0, osContGetQuery, OSContStatus* status); +void INCLUDE_ASM("os/code_3cd00_len_5f0", osContGetQuery, OSContStatus* status); -s32 INCLUDE_ASM(os/code_3cd00_len_5f0, osContStartReadData, OSMesgQueue* queue); +s32 INCLUDE_ASM("os/code_3cd00_len_5f0", osContStartReadData, OSMesgQueue* queue); -void INCLUDE_ASM(os/code_3cd00_len_5f0, osContGetReadData, OSContPad* pad); +void INCLUDE_ASM("os/code_3cd00_len_5f0", osContGetReadData, OSContPad* pad); -INCLUDE_API_ASM(os/code_3cd00_len_5f0, osPackReadData); +INCLUDE_API_ASM("os/code_3cd00_len_5f0", osPackReadData); -s32 INCLUDE_ASM(os/code_3cd00_len_5f0, osContInit, OSMesgQueue* queue, u8* unk, OSContStatus* status); +s32 INCLUDE_ASM("os/code_3cd00_len_5f0", osContInit, OSMesgQueue* queue, u8* unk, OSContStatus* status); -INCLUDE_API_ASM(os/code_3cd00_len_5f0, osContGetInitData); +INCLUDE_API_ASM("os/code_3cd00_len_5f0", osContGetInitData); -INCLUDE_API_ASM(os/code_3cd00_len_5f0, osPackRequestData); +INCLUDE_API_ASM("os/code_3cd00_len_5f0", osPackRequestData); -u32 INCLUDE_ASM(os/code_3cd00_len_5f0, osVirtualToPhysical, void* virt); +u32 INCLUDE_ASM("os/code_3cd00_len_5f0", osVirtualToPhysical, void* virt); diff --git a/src/os/code_3d2f0_len_10.c b/src/os/code_3d2f0_len_10.c index 885087402c..74e91100d8 100644 --- a/src/os/code_3d2f0_len_10.c +++ b/src/os/code_3d2f0_len_10.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3d2f0_len_10, sqrtf); +INCLUDE_API_ASM("os/code_3d2f0_len_10", sqrtf); diff --git a/src/os/code_3d300_len_30.c b/src/os/code_3d300_len_30.c index cadb00d37f..27a73f652d 100644 --- a/src/os/code_3d300_len_30.c +++ b/src/os/code_3d300_len_30.c @@ -1,3 +1,3 @@ #include "common.h" -signed short INCLUDE_ASM(os/code_3d300_len_30, coss, unsigned short angle); +signed short INCLUDE_ASM("os/code_3d300_len_30", coss, unsigned short angle); diff --git a/src/os/code_3d330_len_990.c b/src/os/code_3d330_len_990.c index c85fec522c..92efefbe94 100644 --- a/src/os/code_3d330_len_990.c +++ b/src/os/code_3d330_len_990.c @@ -1,13 +1,13 @@ #include "common.h" -void INCLUDE_ASM(os/code_3d330_len_990, guFrustumF, float mf[4][4], float l, float r, float b, float t, float n, +void INCLUDE_ASM("os/code_3d330_len_990", guFrustumF, float mf[4][4], float l, float r, float b, float t, float n, float f, float scale); -void INCLUDE_ASM(os/code_3d330_len_990, guFrustum, Mtx* m, float l, float r, float b, float t, float n, float f, +void INCLUDE_ASM("os/code_3d330_len_990", guFrustum, Mtx* m, float l, float r, float b, float t, float n, float f, float scale); -void INCLUDE_ASM(os/code_3d330_len_990, guLookAtF, float mf[4][4], float xEye, float yEye, float zEye, float xAt, +void INCLUDE_ASM("os/code_3d330_len_990", guLookAtF, float mf[4][4], float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); -void INCLUDE_ASM(os/code_3d330_len_990, guLookAt, Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt, +void INCLUDE_ASM("os/code_3d330_len_990", guLookAt, Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/code_3dcc0_len_a60.c b/src/os/code_3dcc0_len_a60.c index 5831e49e99..dffb3aa5b1 100644 --- a/src/os/code_3dcc0_len_a60.c +++ b/src/os/code_3dcc0_len_a60.c @@ -1,9 +1,9 @@ #include "common.h" -void INCLUDE_ASM(os/code_3dcc0_len_a60, guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, float yEye, +void INCLUDE_ASM("os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, float zl1, float xl2, float yl2, float zl2, int twidth, int theight); -void INCLUDE_ASM(os/code_3dcc0_len_a60, guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye, +void INCLUDE_ASM("os/code_3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, float zl1, float xl2, float yl2, float zl2, int twidth, int theight); diff --git a/src/os/code_3e720_len_5f0.c b/src/os/code_3e720_len_5f0.c index acbaa5fda7..f8210b463c 100644 --- a/src/os/code_3e720_len_5f0.c +++ b/src/os/code_3e720_len_5f0.c @@ -1,7 +1,7 @@ #include "common.h" -void INCLUDE_ASM(os/code_3e720_len_5f0, guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye, +void INCLUDE_ASM("os/code_3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); -void INCLUDE_ASM(os/code_3e720_len_5f0, guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye, +void INCLUDE_ASM("os/code_3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/code_3ef90_len_600.c b/src/os/code_3ef90_len_600.c index eaf40c4da0..43f20a66ca 100644 --- a/src/os/code_3ef90_len_600.c +++ b/src/os/code_3ef90_len_600.c @@ -1,7 +1,7 @@ #include "common.h" -void INCLUDE_ASM(os/code_3ef90_len_600, guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect, +void INCLUDE_ASM("os/code_3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect, float near, float far, float scale); -void INCLUDE_ASM(os/code_3ef90_len_600, guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, float near, +void INCLUDE_ASM("os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, float near, float far, float scale); diff --git a/src/os/code_3f310_len_3c0.c b/src/os/code_3f310_len_3c0.c index 1e2f442d57..facc30ae24 100644 --- a/src/os/code_3f310_len_3c0.c +++ b/src/os/code_3f310_len_3c0.c @@ -1,7 +1,7 @@ #include "common.h" -void INCLUDE_ASM(os/code_3f310_len_3c0, guPositionF, float mf[4][4], float r, float p, float h, float s, float x, +void INCLUDE_ASM("os/code_3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x, float y, float z); -void INCLUDE_ASM(os/code_3f310_len_3c0, guPosition, Mtx* m, float r, float p, float h, float s, float x, float y, +void INCLUDE_ASM("os/code_3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y, float z); diff --git a/src/os/code_3f6d0_len_320.c b/src/os/code_3f6d0_len_320.c index 3b8e9f872f..9758ab39bf 100644 --- a/src/os/code_3f6d0_len_320.c +++ b/src/os/code_3f6d0_len_320.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_3f6d0_len_320, guRotateAnglesF); +INCLUDE_API_ASM("os/code_3f6d0_len_320", guRotateAnglesF); -INCLUDE_API_ASM(os/code_3f6d0_len_320, guRotateAngles); +INCLUDE_API_ASM("os/code_3f6d0_len_320", guRotateAngles); diff --git a/src/os/code_3f9f0_len_60.c b/src/os/code_3f9f0_len_60.c index 44cc32b9ae..4e44a23c20 100644 --- a/src/os/code_3f9f0_len_60.c +++ b/src/os/code_3f9f0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -signed short INCLUDE_ASM(os/code_3f9f0_len_60, sins, unsigned short angle); +signed short INCLUDE_ASM("os/code_3f9f0_len_60", sins, unsigned short angle); diff --git a/src/os/code_3fa50_len_f60.c b/src/os/code_3fa50_len_f60.c index 972028197e..6a3d1e9ed7 100644 --- a/src/os/code_3fa50_len_f60.c +++ b/src/os/code_3fa50_len_f60.c @@ -1,21 +1,21 @@ #include "common.h" -void INCLUDE_ASM(os/code_3fa50_len_f60, bcopy, const void* src, void* dst, int size); +void INCLUDE_ASM("os/code_3fa50_len_f60", bcopy, const void* src, void* dst, int size); -void INCLUDE_ASM(os/code_3fa50_len_f60, bzero, void* buf, int size); +void INCLUDE_ASM("os/code_3fa50_len_f60", bzero, void* buf, int size); -INCLUDE_API_ASM(os/code_3fa50_len_f60, strchr); +INCLUDE_API_ASM("os/code_3fa50_len_f60", strchr); -INCLUDE_API_ASM(os/code_3fa50_len_f60, strlen); +INCLUDE_API_ASM("os/code_3fa50_len_f60", strlen); -INCLUDE_API_ASM(os/code_3fa50_len_f60, memcpy); +INCLUDE_API_ASM("os/code_3fa50_len_f60", memcpy); -INCLUDE_ASM(os/code_3fa50_len_f60, _Printf); +INCLUDE_ASM("os/code_3fa50_len_f60", _Printf); -INCLUDE_ASM(os/code_3fa50_len_f60, _Putfld); +INCLUDE_ASM("os/code_3fa50_len_f60", _Putfld); -int INCLUDE_ASM(os/code_3fa50_len_f60, sprintf, char* s, const char* fmt, ...); +int INCLUDE_ASM("os/code_3fa50_len_f60", sprintf, char* s, const char* fmt, ...); -INCLUDE_API_ASM(os/code_3fa50_len_f60, proutSprintf); +INCLUDE_API_ASM("os/code_3fa50_len_f60", proutSprintf); -void INCLUDE_ASM(os/code_3fa50_len_f60, osCreateMesgQueue, OSMesgQueue* queue, OSMesg* mesg, s32 unk); +void INCLUDE_ASM("os/code_3fa50_len_f60", osCreateMesgQueue, OSMesgQueue* queue, OSMesg* mesg, s32 unk); diff --git a/src/os/code_409b0_len_140.c b/src/os/code_409b0_len_140.c index 314b3bfcc9..5a87bb82d9 100644 --- a/src/os/code_409b0_len_140.c +++ b/src/os/code_409b0_len_140.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_409b0_len_140, osJamMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); +s32 INCLUDE_ASM("os/code_409b0_len_140", osJamMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); diff --git a/src/os/code_40af0_len_130.c b/src/os/code_40af0_len_130.c index ce27f28fea..dee8929168 100644 --- a/src/os/code_40af0_len_130.c +++ b/src/os/code_40af0_len_130.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_40af0_len_130, osRecvMesg, OSMesgQueue* queue, OSMesg* mesg, s32 unk); +s32 INCLUDE_ASM("os/code_40af0_len_130", osRecvMesg, OSMesgQueue* queue, OSMesg* mesg, s32 unk); diff --git a/src/os/code_40c20_len_1f0.c b/src/os/code_40c20_len_1f0.c index 6b43fff9d6..5bbb03aaaf 100644 --- a/src/os/code_40c20_len_1f0.c +++ b/src/os/code_40c20_len_1f0.c @@ -1,7 +1,7 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_40c20_len_1f0, osSendMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); +s32 INCLUDE_ASM("os/code_40c20_len_1f0", osSendMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); -void INCLUDE_ASM(os/code_40c20_len_1f0, osSetEventMesg, OSEvent event, OSMesgQueue* queue, OSMesg mesg); +void INCLUDE_ASM("os/code_40c20_len_1f0", osSetEventMesg, OSEvent event, OSMesgQueue* queue, OSMesg mesg); -u32 INCLUDE_ASM(os/code_40c20_len_1f0, osGetCount, void); +u32 INCLUDE_ASM("os/code_40c20_len_1f0", osGetCount, void); diff --git a/src/os/code_40e10_len_240.c b/src/os/code_40e10_len_240.c index b614f41ba0..f4d36d5bde 100644 --- a/src/os/code_40e10_len_240.c +++ b/src/os/code_40e10_len_240.c @@ -1,5 +1,5 @@ #include "common.h" -void INCLUDE_ASM(os/code_40e10_len_240, osSpTaskLoad, OSTask* tp); +void INCLUDE_ASM("os/code_40e10_len_240", osSpTaskLoad, OSTask* tp); -void INCLUDE_ASM(os/code_40e10_len_240, osSpTaskStartGo, OSTask* tp); +void INCLUDE_ASM("os/code_40e10_len_240", osSpTaskStartGo, OSTask* tp); diff --git a/src/os/code_41050_len_120.c b/src/os/code_41050_len_120.c index 2944a41143..5287ebded5 100644 --- a/src/os/code_41050_len_120.c +++ b/src/os/code_41050_len_120.c @@ -1,7 +1,7 @@ #include "common.h" -void INCLUDE_ASM(os/code_41050_len_120, osSpTaskYield, void); +void INCLUDE_ASM("os/code_41050_len_120", osSpTaskYield, void); -OSYieldResult INCLUDE_ASM(os/code_41050_len_120, osSpTaskYielded, OSTask* tp); +OSYieldResult INCLUDE_ASM("os/code_41050_len_120", osSpTaskYielded, OSTask* tp); -INCLUDE_API_ASM(os/code_41050_len_120, osSiRawStartDma); +INCLUDE_API_ASM("os/code_41050_len_120", osSiRawStartDma); diff --git a/src/os/code_41170_len_f0.c b/src/os/code_41170_len_f0.c index d8df96c026..9eab96b0fa 100644 --- a/src/os/code_41170_len_f0.c +++ b/src/os/code_41170_len_f0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_API_ASM(os/code_41170_len_f0, osSiCreateAccessQueue); +INCLUDE_API_ASM("os/code_41170_len_f0", osSiCreateAccessQueue); -INCLUDE_API_ASM(os/code_41170_len_f0, osSiGetAccess); +INCLUDE_API_ASM("os/code_41170_len_f0", osSiGetAccess); -INCLUDE_API_ASM(os/code_41170_len_f0, osSiRelAccess); +INCLUDE_API_ASM("os/code_41170_len_f0", osSiRelAccess); diff --git a/src/os/code_41350_len_d0.c b/src/os/code_41350_len_d0.c index 85eecdf2c4..3db4ad67e0 100644 --- a/src/os/code_41350_len_d0.c +++ b/src/os/code_41350_len_d0.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_41350_len_d0, osSetThreadPri, OSThread* thread, OSPri pri); +void INCLUDE_ASM("os/code_41350_len_d0", osSetThreadPri, OSThread* thread, OSPri pri); diff --git a/src/os/code_41420_len_120.c b/src/os/code_41420_len_120.c index 9e0db46515..b292c39305 100644 --- a/src/os/code_41420_len_120.c +++ b/src/os/code_41420_len_120.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_41420_len_120, osStartThread, OSThread* thread); +void INCLUDE_ASM("os/code_41420_len_120", osStartThread, OSThread* thread); diff --git a/src/os/code_41540_len_c0.c b/src/os/code_41540_len_c0.c index 2a3a8bfbcb..a517b81e07 100644 --- a/src/os/code_41540_len_c0.c +++ b/src/os/code_41540_len_c0.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_41540_len_c0, osStopThread, OSThread* thread); +void INCLUDE_ASM("os/code_41540_len_c0", osStopThread, OSThread* thread); diff --git a/src/os/code_41600_len_40.c b/src/os/code_41600_len_40.c index 89ade6bbae..ca9c03825c 100644 --- a/src/os/code_41600_len_40.c +++ b/src/os/code_41600_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_41600_len_40, osDequeueThread); +INCLUDE_API_ASM("os/code_41600_len_40", osDequeueThread); diff --git a/src/os/code_41640_len_50.c b/src/os/code_41640_len_50.c index ffd94116e7..dfadd68dcf 100644 --- a/src/os/code_41640_len_50.c +++ b/src/os/code_41640_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_41640_len_50, osYieldThread, void); +void INCLUDE_ASM("os/code_41640_len_50", osYieldThread, void); diff --git a/src/os/code_41690_len_10.c b/src/os/code_41690_len_10.c index 89de7cabe6..c49f599ecb 100644 --- a/src/os/code_41690_len_10.c +++ b/src/os/code_41690_len_10.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_41690_len_10, osGetActiveQueue); +INCLUDE_API_ASM("os/code_41690_len_10", osGetActiveQueue); diff --git a/src/os/code_416a0_len_90.c b/src/os/code_416a0_len_90.c index 49b393936e..d928c4bf8c 100644 --- a/src/os/code_416a0_len_90.c +++ b/src/os/code_416a0_len_90.c @@ -1,3 +1,3 @@ #include "common.h" -OSTime INCLUDE_ASM(os/code_416a0_len_90, osGetTime, void); +OSTime INCLUDE_ASM("os/code_416a0_len_90", osGetTime, void); diff --git a/src/os/code_41730_len_20.c b/src/os/code_41730_len_20.c index e40ce19dfd..5616d882e7 100644 --- a/src/os/code_41730_len_20.c +++ b/src/os/code_41730_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_41730_len_20, osSetTime, OSTime time); +void INCLUDE_ASM("os/code_41730_len_20", osSetTime, OSTime time); diff --git a/src/os/code_41750_len_450.c b/src/os/code_41750_len_450.c index ae7f165ad0..6a7489c50f 100644 --- a/src/os/code_41750_len_450.c +++ b/src/os/code_41750_len_450.c @@ -1,12 +1,12 @@ #include "common.h" -int INCLUDE_ASM(os/code_41750_len_450, osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, +int INCLUDE_ASM("os/code_41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, OSMesg mesg); -INCLUDE_API_ASM(os/code_41750_len_450, osTimerServicesInit); +INCLUDE_API_ASM("os/code_41750_len_450", osTimerServicesInit); -INCLUDE_API_ASM(os/code_41750_len_450, osTimerInterrupt); +INCLUDE_API_ASM("os/code_41750_len_450", osTimerInterrupt); -INCLUDE_API_ASM(os/code_41750_len_450, osSetTimerIntr); +INCLUDE_API_ASM("os/code_41750_len_450", osSetTimerIntr); -INCLUDE_API_ASM(os/code_41750_len_450, osInsertTimer); +INCLUDE_API_ASM("os/code_41750_len_450", osInsertTimer); diff --git a/src/os/code_41ba0_len_c0.c b/src/os/code_41ba0_len_c0.c index 63c092c4fe..47673efee4 100644 --- a/src/os/code_41ba0_len_c0.c +++ b/src/os/code_41ba0_len_c0.c @@ -1,4 +1,4 @@ #include "common.h" -void INCLUDE_ASM(os/code_41ba0_len_c0, osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2, +void INCLUDE_ASM("os/code_41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2, s32 unk3); diff --git a/src/os/code_41c60_len_c0.c b/src/os/code_41c60_len_c0.c index 5c45e1546c..c77fb7ba7e 100644 --- a/src/os/code_41c60_len_c0.c +++ b/src/os/code_41c60_len_c0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_41c60_len_c0, osProbeTLB); +INCLUDE_API_ASM("os/code_41c60_len_c0", osProbeTLB); diff --git a/src/os/code_41d20_len_40.c b/src/os/code_41d20_len_40.c index 3e25d2b96b..b5cb03beae 100644 --- a/src/os/code_41d20_len_40.c +++ b/src/os/code_41d20_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_41d20_len_40, osUnmapTLB, s32 unk); +void INCLUDE_ASM("os/code_41d20_len_40", osUnmapTLB, s32 unk); diff --git a/src/os/code_41d60_len_50.c b/src/os/code_41d60_len_50.c index 67962b3059..fb54453c1b 100644 --- a/src/os/code_41d60_len_50.c +++ b/src/os/code_41d60_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_41d60_len_50, osUnmapTLBAll, void); +void INCLUDE_ASM("os/code_41d60_len_50", osUnmapTLBAll, void); diff --git a/src/os/code_41db0_len_40.c b/src/os/code_41db0_len_40.c index e16c1fde32..3ed8c74b84 100644 --- a/src/os/code_41db0_len_40.c +++ b/src/os/code_41db0_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -void* INCLUDE_ASM(os/code_41db0_len_40, osViGetCurrentFramebuffer, void); +void* INCLUDE_ASM("os/code_41db0_len_40", osViGetCurrentFramebuffer, void); diff --git a/src/os/code_41df0_len_40.c b/src/os/code_41df0_len_40.c index 5c34cb7c27..d73d552a8c 100644 --- a/src/os/code_41df0_len_40.c +++ b/src/os/code_41df0_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -void* INCLUDE_ASM(os/code_41df0_len_40, osViGetNextFramebuffer, void); +void* INCLUDE_ASM("os/code_41df0_len_40", osViGetNextFramebuffer, void); diff --git a/src/os/code_41e30_len_40.c b/src/os/code_41e30_len_40.c index 8ced70229c..b39c11d255 100644 --- a/src/os/code_41e30_len_40.c +++ b/src/os/code_41e30_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -u32 INCLUDE_ASM(os/code_41e30_len_40, osViGetCurrentMode, void); +u32 INCLUDE_ASM("os/code_41e30_len_40", osViGetCurrentMode, void); diff --git a/src/os/code_41e70_len_340.c b/src/os/code_41e70_len_340.c index c944c42df3..4cb11bcb2d 100644 --- a/src/os/code_41e70_len_340.c +++ b/src/os/code_41e70_len_340.c @@ -1,5 +1,5 @@ #include "common.h" -void INCLUDE_ASM(os/code_41e70_len_340, osCreateViManager, OSPri pri); +void INCLUDE_ASM("os/code_41e70_len_340", osCreateViManager, OSPri pri); -INCLUDE_API_ASM(os/code_41e70_len_340, viMgrMain); +INCLUDE_API_ASM("os/code_41e70_len_340", viMgrMain); diff --git a/src/os/code_421b0_len_60.c b/src/os/code_421b0_len_60.c index 6a55e45463..89517b6f4c 100644 --- a/src/os/code_421b0_len_60.c +++ b/src/os/code_421b0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_421b0_len_60, osViSetEvent, OSMesgQueue* queue, OSMesg mesg, u32 unk); +void INCLUDE_ASM("os/code_421b0_len_60", osViSetEvent, OSMesgQueue* queue, OSMesg mesg, u32 unk); diff --git a/src/os/code_42210_len_50.c b/src/os/code_42210_len_50.c index 902ecc78a2..8581f0caf2 100644 --- a/src/os/code_42210_len_50.c +++ b/src/os/code_42210_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42210_len_50, osViSetMode, OSViMode* mode); +void INCLUDE_ASM("os/code_42210_len_50", osViSetMode, OSViMode* mode); diff --git a/src/os/code_42260_len_170.c b/src/os/code_42260_len_170.c index 6853a5e778..0bb0f67b2d 100644 --- a/src/os/code_42260_len_170.c +++ b/src/os/code_42260_len_170.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42260_len_170, osViSetSpecialFeatures, u32 feat); +void INCLUDE_ASM("os/code_42260_len_170", osViSetSpecialFeatures, u32 feat); diff --git a/src/os/code_423d0_len_50.c b/src/os/code_423d0_len_50.c index 16c4a3c628..0cdd19c4e9 100644 --- a/src/os/code_423d0_len_50.c +++ b/src/os/code_423d0_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_423d0_len_50, osViSetYScale, f32 scale); +void INCLUDE_ASM("os/code_423d0_len_50", osViSetYScale, f32 scale); diff --git a/src/os/code_42420_len_50.c b/src/os/code_42420_len_50.c index bc1964ae42..552657d0e0 100644 --- a/src/os/code_42420_len_50.c +++ b/src/os/code_42420_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42420_len_50, osViSwapBuffer, void* buf); +void INCLUDE_ASM("os/code_42420_len_50", osViSwapBuffer, void* buf); diff --git a/src/os/code_42470_len_310.c b/src/os/code_42470_len_310.c index d427db89c3..0cf982dc2b 100644 --- a/src/os/code_42470_len_310.c +++ b/src/os/code_42470_len_310.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_42470_len_310, osViSwapContext); +INCLUDE_API_ASM("os/code_42470_len_310", osViSwapContext); diff --git a/src/os/code_42780_len_120.c b/src/os/code_42780_len_120.c index f77167ddfb..08ee3b106b 100644 --- a/src/os/code_42780_len_120.c +++ b/src/os/code_42780_len_120.c @@ -1,7 +1,7 @@ #include "common.h" -void INCLUDE_ASM(os/code_42780_len_120, osViBlack, u8 unk); +void INCLUDE_ASM("os/code_42780_len_120", osViBlack, u8 unk); -void INCLUDE_ASM(os/code_42780_len_120, osViRepeatLine, u8 unk); +void INCLUDE_ASM("os/code_42780_len_120", osViRepeatLine, u8 unk); -void INCLUDE_ASM(os/code_42780_len_120, guMtxIdent, Mtx* m); +void INCLUDE_ASM("os/code_42780_len_120", guMtxIdent, Mtx* m); diff --git a/src/os/code_42900_len_80.c b/src/os/code_42900_len_80.c index 0fd8ce48a0..2305cafd62 100644 --- a/src/os/code_42900_len_80.c +++ b/src/os/code_42900_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42900_len_80, guMtxF2L, float mf[4][4], Mtx* m); +void INCLUDE_ASM("os/code_42900_len_80", guMtxF2L, float mf[4][4], Mtx* m); diff --git a/src/os/code_42980_len_80.c b/src/os/code_42980_len_80.c index 54de25f8d8..0cac38a519 100644 --- a/src/os/code_42980_len_80.c +++ b/src/os/code_42980_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42980_len_80, guMtxL2F, float mf[4][4], Mtx* m); +void INCLUDE_ASM("os/code_42980_len_80", guMtxL2F, float mf[4][4], Mtx* m); diff --git a/src/os/code_42a00_len_100.c b/src/os/code_42a00_len_100.c index d0b0493ec4..87e34ab7af 100644 --- a/src/os/code_42a00_len_100.c +++ b/src/os/code_42a00_len_100.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42a00_len_100, guMtxCatF, float m[4][4], float n[4][4], float r[4][4]); +void INCLUDE_ASM("os/code_42a00_len_100", guMtxCatF, float m[4][4], float n[4][4], float r[4][4]); diff --git a/src/os/code_42b00_len_c0.c b/src/os/code_42b00_len_c0.c index f1fe02d778..ac8166dc4b 100644 --- a/src/os/code_42b00_len_c0.c +++ b/src/os/code_42b00_len_c0.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42b00_len_c0, guScale, Mtx* m, float x, float y, float z); +void INCLUDE_ASM("os/code_42b00_len_c0", guScale, Mtx* m, float x, float y, float z); diff --git a/src/os/code_42bc0_len_60.c b/src/os/code_42bc0_len_60.c index a13650dcdc..2c363ce4da 100644 --- a/src/os/code_42bc0_len_60.c +++ b/src/os/code_42bc0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42bc0_len_60, guScaleF, float mf[4][4], float x, float y, float z); +void INCLUDE_ASM("os/code_42bc0_len_60", guScaleF, float mf[4][4], float x, float y, float z); diff --git a/src/os/code_42c20_len_e0.c b/src/os/code_42c20_len_e0.c index de53276763..1ceea92424 100644 --- a/src/os/code_42c20_len_e0.c +++ b/src/os/code_42c20_len_e0.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42c20_len_e0, guTranslate, Mtx* m, float x, float y, float z); +void INCLUDE_ASM("os/code_42c20_len_e0", guTranslate, Mtx* m, float x, float y, float z); diff --git a/src/os/code_42d00_len_60.c b/src/os/code_42d00_len_60.c index d2e4055c58..a0e641a642 100644 --- a/src/os/code_42d00_len_60.c +++ b/src/os/code_42d00_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42d00_len_60, guTranslateF, float mf[4][4], float x, float y, float z); +void INCLUDE_ASM("os/code_42d00_len_60", guTranslateF, float mf[4][4], float x, float y, float z); diff --git a/src/os/code_42d60_len_80.c b/src/os/code_42d60_len_80.c index 6f1e90d8b5..bd5924c1be 100644 --- a/src/os/code_42d60_len_80.c +++ b/src/os/code_42d60_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_42d60_len_80, guMtxCat); +INCLUDE_API_ASM("os/code_42d60_len_80", guMtxCat); diff --git a/src/os/code_42de0_len_90.c b/src/os/code_42de0_len_90.c index f5b1062dc0..9717a5297c 100644 --- a/src/os/code_42de0_len_90.c +++ b/src/os/code_42de0_len_90.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_42de0_len_90, guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, float* oz); +void INCLUDE_ASM("os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, float* oz); diff --git a/src/os/code_42e70_len_390.c b/src/os/code_42e70_len_390.c index ea9923bc4e..37d5697b56 100644 --- a/src/os/code_42e70_len_390.c +++ b/src/os/code_42e70_len_390.c @@ -1,8 +1,8 @@ #include "common.h" -void INCLUDE_ASM(os/code_42e70_len_390, guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy, +void INCLUDE_ASM("os/code_42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy, float* oz); -void INCLUDE_ASM(os/code_42e70_len_390, guRotateF, float mf[4][4], float a, float x, float y, float z); +void INCLUDE_ASM("os/code_42e70_len_390", guRotateF, float mf[4][4], float a, float x, float y, float z); -void INCLUDE_ASM(os/code_42e70_len_390, guRotate, Mtx* m, float a, float x, float y, float z); +void INCLUDE_ASM("os/code_42e70_len_390", guRotate, Mtx* m, float a, float x, float y, float z); diff --git a/src/os/code_43200_len_7c0.c b/src/os/code_43200_len_7c0.c index 79a9d96bac..2737584967 100644 --- a/src/os/code_43200_len_7c0.c +++ b/src/os/code_43200_len_7c0.c @@ -1,10 +1,10 @@ #include "common.h" -INCLUDE_API_ASM(os/code_43200_len_7c0, osMotorAccess); +INCLUDE_API_ASM("os/code_43200_len_7c0", osMotorAccess); -s32 INCLUDE_ASM(os/code_43200_len_7c0, osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); +s32 INCLUDE_ASM("os/code_43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); -s32 INCLUDE_ASM(os/code_43200_len_7c0, osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, +s32 INCLUDE_ASM("os/code_43200_len_7c0", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, int unk5, s32* unk6); -INCLUDE_API_ASM(os/code_43200_len_7c0, osPfsDeclearPage); +INCLUDE_API_ASM("os/code_43200_len_7c0", osPfsDeclearPage); diff --git a/src/os/code_439c0_len_220.c b/src/os/code_439c0_len_220.c index adce66a78b..5c72cc71b8 100644 --- a/src/os/code_439c0_len_220.c +++ b/src/os/code_439c0_len_220.c @@ -1,5 +1,5 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_439c0_len_220, osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4); +s32 INCLUDE_ASM("os/code_439c0_len_220", osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4); -INCLUDE_API_ASM(os/code_439c0_len_220, osPfsReleasePages); +INCLUDE_API_ASM("os/code_439c0_len_220", osPfsReleasePages); diff --git a/src/os/code_43be0_len_5e0.c b/src/os/code_43be0_len_5e0.c index 92ceba9922..c04470a208 100644 --- a/src/os/code_43be0_len_5e0.c +++ b/src/os/code_43be0_len_5e0.c @@ -1,6 +1,6 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_43be0_len_5e0, osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4, +s32 INCLUDE_ASM("os/code_43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4, u8* unk5); -s32 INCLUDE_ASM(os/code_43be0_len_5e0, osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state); +s32 INCLUDE_ASM("os/code_43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state); diff --git a/src/os/code_441c0_len_1c0.c b/src/os/code_441c0_len_1c0.c index 6b9ef95ac0..db0cb4d73e 100644 --- a/src/os/code_441c0_len_1c0.c +++ b/src/os/code_441c0_len_1c0.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_441c0_len_1c0, osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, s32* unk5); +s32 INCLUDE_ASM("os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, s32* unk5); diff --git a/src/os/code_44380_len_4e0.c b/src/os/code_44380_len_4e0.c index d92a427a0f..1d35277164 100644 --- a/src/os/code_44380_len_4e0.c +++ b/src/os/code_44380_len_4e0.c @@ -1,9 +1,9 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_44380_len_4e0, osPfsFreeBlocks, OSPfs* pfs, s32* unk1); +s32 INCLUDE_ASM("os/code_44380_len_4e0", osPfsFreeBlocks, OSPfs* pfs, s32* unk1); -s32 INCLUDE_ASM(os/code_44380_len_4e0, osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); +s32 INCLUDE_ASM("os/code_44380_len_4e0", osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); -s32 INCLUDE_ASM(os/code_44380_len_4e0, osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); +s32 INCLUDE_ASM("os/code_44380_len_4e0", osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); -INCLUDE_API_ASM(os/code_44380_len_4e0, osPfsCheckRamArea); +INCLUDE_API_ASM("os/code_44380_len_4e0", osPfsCheckRamArea); diff --git a/src/os/code_44860_len_60.c b/src/os/code_44860_len_60.c index a51abcdeba..c0fc6da119 100644 --- a/src/os/code_44860_len_60.c +++ b/src/os/code_44860_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_44860_len_60, osPfsRepairId, OSPfs* pfs); +s32 INCLUDE_ASM("os/code_44860_len_60", osPfsRepairId, OSPfs* pfs); diff --git a/src/os/code_448c0_len_210.c b/src/os/code_448c0_len_210.c index cc34fbcd75..0c550ec43f 100644 --- a/src/os/code_448c0_len_210.c +++ b/src/os/code_448c0_len_210.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_API_ASM(os/code_448c0_len_210, osPfsGetStatus); +INCLUDE_API_ASM("os/code_448c0_len_210", osPfsGetStatus); -INCLUDE_API_ASM(os/code_448c0_len_210, osPfsRequestOneChannel); +INCLUDE_API_ASM("os/code_448c0_len_210", osPfsRequestOneChannel); -INCLUDE_API_ASM(os/code_448c0_len_210, osPfsGetOneChannelData); +INCLUDE_API_ASM("os/code_448c0_len_210", osPfsGetOneChannelData); diff --git a/src/os/code_44ad0_len_70.c b/src/os/code_44ad0_len_70.c index afb42d92b7..2743b18604 100644 --- a/src/os/code_44ad0_len_70.c +++ b/src/os/code_44ad0_len_70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_44ad0_len_70, osPfsSelectBank); +INCLUDE_API_ASM("os/code_44ad0_len_70", osPfsSelectBank); diff --git a/src/os/code_44b40_len_a90.c b/src/os/code_44b40_len_a90.c index 5d39b83ba9..58464b7e95 100644 --- a/src/os/code_44b40_len_a90.c +++ b/src/os/code_44b40_len_a90.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_API_ASM(os/code_44b40_len_a90, osSumcalc); +INCLUDE_API_ASM("os/code_44b40_len_a90", osSumcalc); -INCLUDE_API_ASM(os/code_44b40_len_a90, osIdCheckSum); +INCLUDE_API_ASM("os/code_44b40_len_a90", osIdCheckSum); -INCLUDE_API_ASM(os/code_44b40_len_a90, osRepairPackId); +INCLUDE_API_ASM("os/code_44b40_len_a90", osRepairPackId); -INCLUDE_API_ASM(os/code_44b40_len_a90, osCheckPackId); +INCLUDE_API_ASM("os/code_44b40_len_a90", osCheckPackId); -INCLUDE_API_ASM(os/code_44b40_len_a90, osGetId); +INCLUDE_API_ASM("os/code_44b40_len_a90", osGetId); -INCLUDE_API_ASM(os/code_44b40_len_a90, osCheckId); +INCLUDE_API_ASM("os/code_44b40_len_a90", osCheckId); -INCLUDE_API_ASM(os/code_44b40_len_a90, osPfsRWInode); +INCLUDE_API_ASM("os/code_44b40_len_a90", osPfsRWInode); diff --git a/src/os/code_455d0_len_1f0.c b/src/os/code_455d0_len_1f0.c index 3124e76f05..c47811af4e 100644 --- a/src/os/code_455d0_len_1f0.c +++ b/src/os/code_455d0_len_1f0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_455d0_len_1f0, osContRamRead); +INCLUDE_API_ASM("os/code_455d0_len_1f0", osContRamRead); diff --git a/src/os/code_457c0_len_270.c b/src/os/code_457c0_len_270.c index a94fd29dfd..a751304406 100644 --- a/src/os/code_457c0_len_270.c +++ b/src/os/code_457c0_len_270.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_457c0_len_270, osContRamWrite); +INCLUDE_API_ASM("os/code_457c0_len_270", osContRamWrite); diff --git a/src/os/code_45a30_len_20.c b/src/os/code_45a30_len_20.c index 8fb8856e4d..7252bfca7c 100644 --- a/src/os/code_45a30_len_20.c +++ b/src/os/code_45a30_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_45a30_len_20, osAfterPreNMI, void); +s32 INCLUDE_ASM("os/code_45a30_len_20", osAfterPreNMI, void); diff --git a/src/os/code_45a50_len_3a0.c b/src/os/code_45a50_len_3a0.c index b6dad7b2a2..a19464aaa4 100644 --- a/src/os/code_45a50_len_3a0.c +++ b/src/os/code_45a50_len_3a0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(os/code_45a50_len_3a0, func_8006A650) +INCLUDE_ASM("os/code_45a50_len_3a0", func_8006A650) #undef osInitialize -void INCLUDE_ASM(os/code_45a50_len_3a0, osInitialize, void); +void INCLUDE_ASM("os/code_45a50_len_3a0", osInitialize, void); diff --git a/src/os/code_45df0_len_970.c b/src/os/code_45df0_len_970.c index 0a677e7eb5..2c49df3fa7 100644 --- a/src/os/code_45df0_len_970.c +++ b/src/os/code_45df0_len_970.c @@ -1,77 +1,77 @@ #include "common.h" -INCLUDE_ASM(os/code_45df0_len_970, func_8006A9F0); +INCLUDE_ASM("os/code_45df0_len_970", func_8006A9F0); -INCLUDE_API_ASM(os/code_45df0_len_970, osExceptionPreamble); +INCLUDE_API_ASM("os/code_45df0_len_970", osExceptionPreamble); -INCLUDE_API_ASM(os/code_45df0_len_970, savecontext); +INCLUDE_API_ASM("os/code_45df0_len_970", savecontext); -INCLUDE_API_ASM(os/code_45df0_len_970, savercp); +INCLUDE_API_ASM("os/code_45df0_len_970", savercp); -INCLUDE_API_ASM(os/code_45df0_len_970, endrcp); +INCLUDE_API_ASM("os/code_45df0_len_970", endrcp); -INCLUDE_ASM(os/code_45df0_len_970, handle_interrupt); +INCLUDE_ASM("os/code_45df0_len_970", handle_interrupt); -INCLUDE_ASM(os/code_45df0_len_970, next_interrupt); +INCLUDE_ASM("os/code_45df0_len_970", next_interrupt); -INCLUDE_ASM(os/code_45df0_len_970, IP6_Hdlr); +INCLUDE_ASM("os/code_45df0_len_970", IP6_Hdlr); -INCLUDE_ASM(os/code_45df0_len_970, IP7_Hdlr); +INCLUDE_ASM("os/code_45df0_len_970", IP7_Hdlr); -INCLUDE_API_ASM(os/code_45df0_len_970, counter); +INCLUDE_API_ASM("os/code_45df0_len_970", counter); -INCLUDE_API_ASM(os/code_45df0_len_970, cart); +INCLUDE_API_ASM("os/code_45df0_len_970", cart); -INCLUDE_API_ASM(os/code_45df0_len_970, rcp); +INCLUDE_API_ASM("os/code_45df0_len_970", rcp); -INCLUDE_ASM(os/code_45df0_len_970, sp_other_break); +INCLUDE_ASM("os/code_45df0_len_970", sp_other_break); -INCLUDE_API_ASM(os/code_45df0_len_970, vi); +INCLUDE_API_ASM("os/code_45df0_len_970", vi); -INCLUDE_API_ASM(os/code_45df0_len_970, ai); +INCLUDE_API_ASM("os/code_45df0_len_970", ai); -INCLUDE_API_ASM(os/code_45df0_len_970, si); +INCLUDE_API_ASM("os/code_45df0_len_970", si); -INCLUDE_API_ASM(os/code_45df0_len_970, pi); +INCLUDE_API_ASM("os/code_45df0_len_970", pi); -INCLUDE_API_ASM(os/code_45df0_len_970, dp); +INCLUDE_API_ASM("os/code_45df0_len_970", dp); -INCLUDE_API_ASM(os/code_45df0_len_970, NoMoreRcpInts); +INCLUDE_API_ASM("os/code_45df0_len_970", NoMoreRcpInts); -INCLUDE_API_ASM(os/code_45df0_len_970, prenmi); +INCLUDE_API_ASM("os/code_45df0_len_970", prenmi); -INCLUDE_API_ASM(os/code_45df0_len_970, firstnmi); +INCLUDE_API_ASM("os/code_45df0_len_970", firstnmi); -INCLUDE_API_ASM(os/code_45df0_len_970, sw2); +INCLUDE_API_ASM("os/code_45df0_len_970", sw2); -INCLUDE_API_ASM(os/code_45df0_len_970, sw1); +INCLUDE_API_ASM("os/code_45df0_len_970", sw1); -INCLUDE_ASM(os/code_45df0_len_970, handle_break); +INCLUDE_ASM("os/code_45df0_len_970", handle_break); -INCLUDE_API_ASM(os/code_45df0_len_970, redispatch); +INCLUDE_API_ASM("os/code_45df0_len_970", redispatch); -INCLUDE_API_ASM(os/code_45df0_len_970, enqueueRunning); +INCLUDE_API_ASM("os/code_45df0_len_970", enqueueRunning); -INCLUDE_API_ASM(os/code_45df0_len_970, panic); +INCLUDE_API_ASM("os/code_45df0_len_970", panic); -INCLUDE_ASM(os/code_45df0_len_970, send_mesg); +INCLUDE_ASM("os/code_45df0_len_970", send_mesg); -INCLUDE_ASM(os/code_45df0_len_970, send_done); +INCLUDE_ASM("os/code_45df0_len_970", send_done); -INCLUDE_ASM(os/code_45df0_len_970, handle_CPU); +INCLUDE_ASM("os/code_45df0_len_970", handle_CPU); -INCLUDE_API_ASM(os/code_45df0_len_970, osEnqueueAndYield); +INCLUDE_API_ASM("os/code_45df0_len_970", osEnqueueAndYield); -INCLUDE_API_ASM(os/code_45df0_len_970, noEnqueue); +INCLUDE_API_ASM("os/code_45df0_len_970", noEnqueue); -INCLUDE_API_ASM(os/code_45df0_len_970, osEnqueueThread); +INCLUDE_API_ASM("os/code_45df0_len_970", osEnqueueThread); -INCLUDE_API_ASM(os/code_45df0_len_970, osPopThread); +INCLUDE_API_ASM("os/code_45df0_len_970", osPopThread); -INCLUDE_API_ASM(os/code_45df0_len_970, osNop); +INCLUDE_API_ASM("os/code_45df0_len_970", osNop); -INCLUDE_API_ASM(os/code_45df0_len_970, osDispatchThread); +INCLUDE_API_ASM("os/code_45df0_len_970", osDispatchThread); -INCLUDE_API_ASM(os/code_45df0_len_970, osDispatchThreadSave); +INCLUDE_API_ASM("os/code_45df0_len_970", osDispatchThreadSave); -void INCLUDE_ASM(os/code_45df0_len_970, osCleanupThread, void); +void INCLUDE_ASM("os/code_45df0_len_970", osCleanupThread, void); diff --git a/src/os/code_46760_len_90.c b/src/os/code_46760_len_90.c index 8576622994..83e28966fd 100644 --- a/src/os/code_46760_len_90.c +++ b/src/os/code_46760_len_90.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(os/code_46760_len_90, __osDisableInt); +INCLUDE_ASM("os/code_46760_len_90", __osDisableInt); -INCLUDE_ASM(os/code_46760_len_90, __osRestoreInt); +INCLUDE_ASM("os/code_46760_len_90", __osRestoreInt); diff --git a/src/os/code_467f0_len_90.c b/src/os/code_467f0_len_90.c index b8c2370fa7..a912dcd27a 100644 --- a/src/os/code_467f0_len_90.c +++ b/src/os/code_467f0_len_90.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_467f0_len_90, osSetGlobalIntMask); +INCLUDE_API_ASM("os/code_467f0_len_90", osSetGlobalIntMask); -INCLUDE_API_ASM(os/code_467f0_len_90, osResetGlobalIntMask); +INCLUDE_API_ASM("os/code_467f0_len_90", osResetGlobalIntMask); diff --git a/src/os/code_46880_len_260.c b/src/os/code_46880_len_260.c index 19fcdf50c5..0df68af824 100644 --- a/src/os/code_46880_len_260.c +++ b/src/os/code_46880_len_260.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_API_ASM(os/code_46880_len_260, osPiRawStartDma); +INCLUDE_API_ASM("os/code_46880_len_260", osPiRawStartDma); -INCLUDE_API_ASM(os/code_46880_len_260, osPiGetCmdQueue); +INCLUDE_API_ASM("os/code_46880_len_260", osPiGetCmdQueue); -INCLUDE_API_ASM(os/code_46880_len_260, osEPiRawReadIo); +INCLUDE_API_ASM("os/code_46880_len_260", osEPiRawReadIo); diff --git a/src/os/code_46ae0_len_170.c b/src/os/code_46ae0_len_170.c index 7f6db51168..05b5613564 100644 --- a/src/os/code_46ae0_len_170.c +++ b/src/os/code_46ae0_len_170.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_46ae0_len_170, osEPiRawWriteIo); +INCLUDE_API_ASM("os/code_46ae0_len_170", osEPiRawWriteIo); diff --git a/src/os/code_46c50_len_20.c b/src/os/code_46c50_len_20.c index d5325c233a..ab54bc36bb 100644 --- a/src/os/code_46c50_len_20.c +++ b/src/os/code_46c50_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_46c50_len_20, osAiDeviceBusy); +INCLUDE_API_ASM("os/code_46c50_len_20", osAiDeviceBusy); diff --git a/src/os/code_46c70_len_e00.c b/src/os/code_46c70_len_e00.c index 5f713fd4e1..430b2b5ecb 100644 --- a/src/os/code_46c70_len_e00.c +++ b/src/os/code_46c70_len_e00.c @@ -1,13 +1,13 @@ #include "common.h" -int INCLUDE_ASM(os/code_46c70_len_e00, bcmp, const void* src, const void* dst, int size); +int INCLUDE_ASM("os/code_46c70_len_e00", bcmp, const void* src, const void* dst, int size); -INCLUDE_ASM(os/code_46c70_len_e00, _Litob); +INCLUDE_ASM("os/code_46c70_len_e00", _Litob); -INCLUDE_ASM(os/code_46c70_len_e00, _Ldtob); +INCLUDE_ASM("os/code_46c70_len_e00", _Ldtob); -INCLUDE_ASM(os/code_46c70_len_e00, _Ldunscale); +INCLUDE_ASM("os/code_46c70_len_e00", _Ldunscale); -INCLUDE_ASM(os/code_46c70_len_e00, _Genld); +INCLUDE_ASM("os/code_46c70_len_e00", _Genld); -INCLUDE_API_ASM(os/code_46c70_len_e00, osGetCause); +INCLUDE_API_ASM("os/code_46c70_len_e00", osGetCause); diff --git a/src/os/code_47a70_len_10.c b/src/os/code_47a70_len_10.c index f25bc9e811..8b14905482 100644 --- a/src/os/code_47a70_len_10.c +++ b/src/os/code_47a70_len_10.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47a70_len_10, osGetSR); +INCLUDE_API_ASM("os/code_47a70_len_10", osGetSR); diff --git a/src/os/code_47a80_len_10.c b/src/os/code_47a80_len_10.c index c40077b8f6..115e39a29e 100644 --- a/src/os/code_47a80_len_10.c +++ b/src/os/code_47a80_len_10.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47a80_len_10, osSetCompare); +INCLUDE_API_ASM("os/code_47a80_len_10", osSetCompare); diff --git a/src/os/code_47a90_len_50.c b/src/os/code_47a90_len_50.c index f5637110e5..67dfc7f3c5 100644 --- a/src/os/code_47a90_len_50.c +++ b/src/os/code_47a90_len_50.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47a90_len_50, osSetFpcCsr); +INCLUDE_API_ASM("os/code_47a90_len_50", osSetFpcCsr); -INCLUDE_API_ASM(os/code_47a90_len_50, osSetSR); +INCLUDE_API_ASM("os/code_47a90_len_50", osSetSR); -INCLUDE_API_ASM(os/code_47a90_len_50, osSetWatchLo); +INCLUDE_API_ASM("os/code_47a90_len_50", osSetWatchLo); -INCLUDE_API_ASM(os/code_47a90_len_50, osSpDeviceBusy); +INCLUDE_API_ASM("os/code_47a90_len_50", osSpDeviceBusy); diff --git a/src/os/code_47ae0_len_e0.c b/src/os/code_47ae0_len_e0.c index 98ea7f17a0..959dafefab 100644 --- a/src/os/code_47ae0_len_e0.c +++ b/src/os/code_47ae0_len_e0.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpGetStatus); +INCLUDE_API_ASM("os/code_47ae0_len_e0", osSpGetStatus); -INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpSetStatus); +INCLUDE_API_ASM("os/code_47ae0_len_e0", osSpSetStatus); -INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpSetPc); +INCLUDE_API_ASM("os/code_47ae0_len_e0", osSpSetPc); -INCLUDE_API_ASM(os/code_47ae0_len_e0, osSpRawStartDma); +INCLUDE_API_ASM("os/code_47ae0_len_e0", osSpRawStartDma); diff --git a/src/os/code_47bc0_len_50.c b/src/os/code_47bc0_len_50.c index b5b4606dd2..05c00bc98c 100644 --- a/src/os/code_47bc0_len_50.c +++ b/src/os/code_47bc0_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47bc0_len_50, osSiRawReadIo); +INCLUDE_API_ASM("os/code_47bc0_len_50", osSiRawReadIo); diff --git a/src/os/code_47c10_len_50.c b/src/os/code_47c10_len_50.c index 86ecc1bcf1..259cadb52f 100644 --- a/src/os/code_47c10_len_50.c +++ b/src/os/code_47c10_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47c10_len_50, osSiRawWriteIo); +INCLUDE_API_ASM("os/code_47c10_len_50", osSiRawWriteIo); diff --git a/src/os/code_47c60_len_f0.c b/src/os/code_47c60_len_f0.c index 57b9a1091d..2666fbca89 100644 --- a/src/os/code_47c60_len_f0.c +++ b/src/os/code_47c60_len_f0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47c60_len_f0, osContAddressCrc); +INCLUDE_API_ASM("os/code_47c60_len_f0", osContAddressCrc); -INCLUDE_API_ASM(os/code_47c60_len_f0, osContDataCrc); +INCLUDE_API_ASM("os/code_47c60_len_f0", osContDataCrc); diff --git a/src/os/code_47d50_len_e0.c b/src/os/code_47d50_len_e0.c index 724a5ad6b2..c806666a1d 100644 --- a/src/os/code_47d50_len_e0.c +++ b/src/os/code_47d50_len_e0.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_47d50_len_e0, osDestroyThread, OSThread* thread); +void INCLUDE_ASM("os/code_47d50_len_e0", osDestroyThread, OSThread* thread); diff --git a/src/os/code_47e30_len_60.c b/src/os/code_47e30_len_60.c index a9c156b7ad..c39445fd13 100644 --- a/src/os/code_47e30_len_60.c +++ b/src/os/code_47e30_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_47e30_len_60, osMapTLBRdb, void); +void INCLUDE_ASM("os/code_47e30_len_60", osMapTLBRdb, void); diff --git a/src/os/code_47e90_len_110.c b/src/os/code_47e90_len_110.c index ae79fba834..266cf5bec1 100644 --- a/src/os/code_47e90_len_110.c +++ b/src/os/code_47e90_len_110.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47e90_len_110, osViInit); +INCLUDE_API_ASM("os/code_47e90_len_110", osViInit); diff --git a/src/os/code_47fa0_len_20.c b/src/os/code_47fa0_len_20.c index f692dc9887..3b346f6388 100644 --- a/src/os/code_47fa0_len_20.c +++ b/src/os/code_47fa0_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_47fa0_len_20, osViGetCurrentContext); +INCLUDE_API_ASM("os/code_47fa0_len_20", osViGetCurrentContext); diff --git a/src/os/code_47fc0_len_60.c b/src/os/code_47fc0_len_60.c index 7954f90bce..71e25a4fb1 100644 --- a/src/os/code_47fc0_len_60.c +++ b/src/os/code_47fc0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/code_47fc0_len_60, guNormalize, float* x, float* y, float* z); +void INCLUDE_ASM("os/code_47fc0_len_60", guNormalize, float* x, float* y, float* z); diff --git a/src/os/code_48020_len_a00.c b/src/os/code_48020_len_a00.c index d48a324b24..0f6aaf3da3 100644 --- a/src/os/code_48020_len_a00.c +++ b/src/os/code_48020_len_a00.c @@ -1,13 +1,13 @@ #include "common.h" -s32 INCLUDE_ASM(os/code_48020_len_a00, osPfsChecker, OSPfs* pfs); +s32 INCLUDE_ASM("os/code_48020_len_a00", osPfsChecker, OSPfs* pfs); -INCLUDE_ASM(os/code_48020_len_a00, corrupted_init); +INCLUDE_ASM("os/code_48020_len_a00", corrupted_init); -INCLUDE_API_ASM(os/code_48020_len_a00, corrupted); +INCLUDE_API_ASM("os/code_48020_len_a00", corrupted); -s32 INCLUDE_ASM(os/code_48020_len_a00, osPfsIsPlug, OSMesgQueue* queue, u8* unk); +s32 INCLUDE_ASM("os/code_48020_len_a00", osPfsIsPlug, OSMesgQueue* queue, u8* unk); -INCLUDE_API_ASM(os/code_48020_len_a00, osPfsRequestData); +INCLUDE_API_ASM("os/code_48020_len_a00", osPfsRequestData); -INCLUDE_API_ASM(os/code_48020_len_a00, osPfsGetInitData); +INCLUDE_API_ASM("os/code_48020_len_a00", osPfsGetInitData); diff --git a/src/os/code_48a20_len_1c0.c b/src/os/code_48a20_len_1c0.c index eccd0f1dfd..c4876996e4 100644 --- a/src/os/code_48a20_len_1c0.c +++ b/src/os/code_48a20_len_1c0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_48a20_len_1c0, ldiv); +INCLUDE_API_ASM("os/code_48a20_len_1c0", ldiv); -INCLUDE_API_ASM(os/code_48a20_len_1c0, lldiv); +INCLUDE_API_ASM("os/code_48a20_len_1c0", lldiv); diff --git a/src/os/code_48be0_len_20.c b/src/os/code_48be0_len_20.c index 2d6474861c..50263cfa4b 100644 --- a/src/os/code_48be0_len_20.c +++ b/src/os/code_48be0_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_48be0_len_20, osSiDeviceBusy); +INCLUDE_API_ASM("os/code_48be0_len_20", osSiDeviceBusy); diff --git a/src/os/code_48c00_len_5c0.c b/src/os/code_48c00_len_5c0.c index d6bfde2ca1..414f52d302 100644 --- a/src/os/code_48c00_len_5c0.c +++ b/src/os/code_48c00_len_5c0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(os/code_48c00_len_5c0, func_8006D800); +INCLUDE_ASM("os/code_48c00_len_5c0", func_8006D800); diff --git a/src/os/code_491c0_len_f80.c b/src/os/code_491c0_len_f80.c index 5587c6fd60..dd66c4b9ac 100644 --- a/src/os/code_491c0_len_f80.c +++ b/src/os/code_491c0_len_f80.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(os/code_491c0_len_f80, func_8006DDC0); +INCLUDE_ASM("os/code_491c0_len_f80", func_8006DDC0); -INCLUDE_ASM(os/code_491c0_len_f80, func_8006E310); +INCLUDE_ASM("os/code_491c0_len_f80", func_8006E310); diff --git a/src/os/code_49C70.c b/src/os/code_49C70.c index 2c0a842b19..a0dbffe12a 100644 --- a/src/os/code_49C70.c +++ b/src/os/code_49C70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(os/code_49C70, func_8006E870); +INCLUDE_ASM("os/code_49C70", func_8006E870); diff --git a/src/os/code_4a140_len_70.c b/src/os/code_4a140_len_70.c index 8a8535ee17..1609535112 100644 --- a/src/os/code_4a140_len_70.c +++ b/src/os/code_4a140_len_70.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM(os/code_4a140_len_70, strcpy); +INCLUDE_API_ASM("os/code_4a140_len_70", strcpy); -INCLUDE_API_ASM(os/code_4a140_len_70, strcmp); +INCLUDE_API_ASM("os/code_4a140_len_70", strcmp); diff --git a/src/os/code_4a1b0_len_40.c b/src/os/code_4a1b0_len_40.c index e27e071134..a3b8b5bb1a 100644 --- a/src/os/code_4a1b0_len_40.c +++ b/src/os/code_4a1b0_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM(os/code_4a1b0_len_40, memset); +INCLUDE_API_ASM("os/code_4a1b0_len_40", memset); diff --git a/src/os/code_4a1f0_len_170.c b/src/os/code_4a1f0_len_170.c index 0eed4680b7..2420933dc0 100644 --- a/src/os/code_4a1f0_len_170.c +++ b/src/os/code_4a1f0_len_170.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(os/code_4a1f0_len_170, decode_yay0); +INCLUDE_ASM("os/code_4a1f0_len_170", decode_yay0); diff --git a/src/os/code_4a360_len_930.c b/src/os/code_4a360_len_930.c index 3610e0fe64..f2c1cb8546 100644 --- a/src/os/code_4a360_len_930.c +++ b/src/os/code_4a360_len_930.c @@ -1,21 +1,21 @@ #include "common.h" -INCLUDE_ASM(os/code_4a360_len_930, func_8008EF60); +INCLUDE_ASM("os/code_4a360_len_930", func_8008EF60); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashInit); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashInit); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashReadStatus); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashReadStatus); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashReadId); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashReadId); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashClearStatus); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashClearStatus); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashAllErase); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashAllErase); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashSectorErase); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashSectorErase); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashWriteBuffer); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashWriteBuffer); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashWriteArray); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashWriteArray); -INCLUDE_API_ASM(os/code_4a360_len_930, osFlashReadArray); +INCLUDE_API_ASM("os/code_4a360_len_930", osFlashReadArray); diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index fed0b20907..e069953f04 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -1,271 +1,271 @@ #include "common.h" -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006F890); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006F890); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006F8F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006F8F0); -INCLUDE_ASM(os/code_4ac90_len_3910, fx_walk_large); +INCLUDE_ASM("os/code_4ac90_len_3910", fx_walk_large); -INCLUDE_ASM(os/code_4ac90_len_3910, fx_walk_normal); +INCLUDE_ASM("os/code_4ac90_len_3910", fx_walk_normal); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FB90); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FB90); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FBF0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FBF0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FC50); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FC50); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FCB0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FCB0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FD10); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FD10); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FD70); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FD70); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FDD0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FDD0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FE30); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FE30); -INCLUDE_ASM(os/code_4ac90_len_3910, fx_emote); +INCLUDE_ASM("os/code_4ac90_len_3910", fx_emote); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FEF0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FEF0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FF50); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FF50); -INCLUDE_ASM(os/code_4ac90_len_3910, func_8006FFB0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FFB0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070010); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070010); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070070); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070070); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800700D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800700D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070130); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070130); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070190); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070190); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800701F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800701F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070250); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070250); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800702B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800702B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070310); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070310); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070370); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070370); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800703D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800703D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070430); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070430); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070490); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070490); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800704F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800704F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070550); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070550); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800705B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800705B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070610); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070610); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070670); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070670); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800706D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800706D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070730); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070730); -INCLUDE_ASM(os/code_4ac90_len_3910, fx_sweat); +INCLUDE_ASM("os/code_4ac90_len_3910", fx_sweat); -INCLUDE_ASM(os/code_4ac90_len_3910, fx_sleep_bubble); +INCLUDE_ASM("os/code_4ac90_len_3910", fx_sleep_bubble); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800708B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800708B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070910); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070910); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070970); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070970); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800709D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800709D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070A30); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070A30); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070A90); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070A90); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070AF0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070AF0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070B50); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070B50); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070BB0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070BB0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070C10); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070C10); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070C70); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070C70); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070CD0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070CD0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070D30); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070D30); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070D90); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070D90); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070DF0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070DF0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070E50); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070E50); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070EB0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070EB0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070F10); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070F10); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070F70); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070F70); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80070FD0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80070FD0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071030); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071030); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071090); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071090); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800710F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800710F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071150); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071150); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800711B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800711B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071210); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071210); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071270); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071270); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800712D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800712D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071330); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071330); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071390); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071390); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800713F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800713F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071450); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071450); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800714B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800714B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071510); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071510); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071570); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071570); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800715D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800715D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071630); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071630); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800716F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800716F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071750); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071750); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800717B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800717B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071870); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071870); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800718D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800718D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071930); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071930); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071990); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071990); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800719F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800719F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071A50); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071A50); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071AB0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071AB0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071B10); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071B10); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071B70); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071B70); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071BD0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071BD0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071C30); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071C30); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071C90); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071C90); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071CF0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071CF0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071D50); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071D50); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071DB0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071DB0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071E10); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071E10); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071E70); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071E70); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071ED0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071ED0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071F30); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071F30); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071F90); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071F90); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80071FF0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80071FF0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800720B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800720B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072110); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072110); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072170); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072170); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800721D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800721D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072230); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072230); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072290); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072290); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800722F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800722F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072350); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072350); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800723B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800723B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072410); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072410); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072470); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072470); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072530); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072530); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072590); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072590); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800725F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800725F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072650); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072650); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800726B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800726B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072710); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072710); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072770); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072770); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800727D0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800727D0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072830); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072830); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072890); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072890); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800728F0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800728F0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072950); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072950); -INCLUDE_ASM(os/code_4ac90_len_3910, func_800729B0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_800729B0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072A10); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072A10); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072A70); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072A70); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072AD0); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072AD0); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072B30); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072B30); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072BCC); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072BCC); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072BDC); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072BDC); -INCLUDE_ASM(os/code_4ac90_len_3910, load_battle); +INCLUDE_ASM("os/code_4ac90_len_3910", load_battle); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072CCC); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072CCC); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072CDC); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072CDC); -INCLUDE_ASM(os/code_4ac90_len_3910, func_80072CEC); +INCLUDE_ASM("os/code_4ac90_len_3910", func_80072CEC); -INCLUDE_ASM(os/code_4ac90_len_3910, setup_demo_player); +INCLUDE_ASM("os/code_4ac90_len_3910", setup_demo_player); -INCLUDE_ASM(os/code_4ac90_len_3910, load_demo_battle); +INCLUDE_ASM("os/code_4ac90_len_3910", load_demo_battle); diff --git a/src/os/code_7e40_len_3f0.c b/src/os/code_7e40_len_3f0.c index bd652db064..7d971f60a0 100644 --- a/src/os/code_7e40_len_3f0.c +++ b/src/os/code_7e40_len_3f0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_API_ASM(os/code_7e40_len_3f0, nuGfxTaskMgr); +INCLUDE_API_ASM("os/code_7e40_len_3f0", nuGfxTaskMgr); -INCLUDE_API_ASM(os/code_7e40_len_3f0, nuGfxTaskMgrInit); +INCLUDE_API_ASM("os/code_7e40_len_3f0", nuGfxTaskMgrInit); -INCLUDE_API_ASM(os/code_7e40_len_3f0, nuGfxTaskStart); +INCLUDE_API_ASM("os/code_7e40_len_3f0", nuGfxTaskStart); diff --git a/src/os/guMtxIdentF.c b/src/os/guMtxIdentF.c index 7d4e6898ef..a6f475b0b6 100644 --- a/src/os/guMtxIdentF.c +++ b/src/os/guMtxIdentF.c @@ -1,3 +1,3 @@ #include "common.h" -void INCLUDE_ASM(os/guMtxIdentF, guMtxIdentF, float mf[4][4]); +void INCLUDE_ASM("os/guMtxIdentF", guMtxIdentF, float mf[4][4]); diff --git a/src/os/osCreateThread.c b/src/os/osCreateThread.c index e64b72a9bd..1e864d6b65 100644 --- a/src/os/osCreateThread.c +++ b/src/os/osCreateThread.c @@ -1,4 +1,4 @@ #include "common.h" -void INCLUDE_ASM(os/osCreateThread, osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*), void* unk1, +void INCLUDE_ASM("os/osCreateThread", osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*), void* unk1, void* unk2, OSPri pri); diff --git a/src/os/osGetThreadPri.c b/src/os/osGetThreadPri.c index ba71404905..1bf83e1aaf 100644 --- a/src/os/osGetThreadPri.c +++ b/src/os/osGetThreadPri.c @@ -1,3 +1,3 @@ #include "common.h" -OSPri INCLUDE_ASM(os/osGetThreadPri, osGetThreadPri, OSThread* thread); +OSPri INCLUDE_ASM("os/osGetThreadPri", osGetThreadPri, OSThread* thread); From 3a410419a8edad92cdaed5c2eb0a0cbc0a23d955 Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 12:38:25 -0700 Subject: [PATCH 02/37] Match SetNpcSpeed --- .../code_f2470_len_27f0/SetNpcSpeed.s | 34 ------------------- src/code_f2470_len_27f0.c | 9 ++--- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s deleted file mode 100644 index 3d9bd78dce..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel SetNpcSpeed -/* 0F29CC 802CE01C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F29D0 802CE020 AFB10014 */ sw $s1, 0x14($sp) -/* 0F29D4 802CE024 0080882D */ daddu $s1, $a0, $zero -/* 0F29D8 802CE028 AFBF0018 */ sw $ra, 0x18($sp) -/* 0F29DC 802CE02C AFB00010 */ sw $s0, 0x10($sp) -/* 0F29E0 802CE030 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 0F29E4 802CE034 8E30000C */ lw $s0, 0xc($s1) -/* 0F29E8 802CE038 8E050000 */ lw $a1, ($s0) -/* 0F29EC 802CE03C 0C0B1EAF */ jal get_variable -/* 0F29F0 802CE040 26100004 */ addiu $s0, $s0, 4 -/* 0F29F4 802CE044 0220202D */ daddu $a0, $s1, $zero -/* 0F29F8 802CE048 8E050000 */ lw $a1, ($s0) -/* 0F29FC 802CE04C 0C0B210B */ jal get_float_variable -/* 0F2A00 802CE050 0040802D */ daddu $s0, $v0, $zero -/* 0F2A04 802CE054 0220202D */ daddu $a0, $s1, $zero -/* 0F2A08 802CE058 0200282D */ daddu $a1, $s0, $zero -/* 0F2A0C 802CE05C 0C0B36B0 */ jal resolve_npc -/* 0F2A10 802CE060 46000506 */ mov.s $f20, $f0 -/* 0F2A14 802CE064 54400001 */ bnel $v0, $zero, .L802CE06C -/* 0F2A18 802CE068 E4540018 */ swc1 $f20, 0x18($v0) -.L802CE06C: -/* 0F2A1C 802CE06C 24020002 */ addiu $v0, $zero, 2 -/* 0F2A20 802CE070 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F2A24 802CE074 8FB10014 */ lw $s1, 0x14($sp) -/* 0F2A28 802CE078 8FB00010 */ lw $s0, 0x10($sp) -/* 0F2A2C 802CE07C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 0F2A30 802CE080 03E00008 */ jr $ra -/* 0F2A34 802CE084 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index df130c56d2..33ea802e81 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -40,21 +40,18 @@ INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcScale); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcCollisionSize); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcSpeed); -// TODO: Fix issue with BNEZL vs BNEZ -/* ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { - Vytecode* ptrReadPos = script->ptrReadPos; + Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); f32 speed = get_float_variable(script, *ptrReadPos); Npc* npcPtr = resolve_npc(script, npcID); - npcPtr->moveSpeed = speed; if(npcPtr != NULL) { + npcPtr->moveSpeed = speed; return ApiStatus_DONE2; } + return ApiStatus_DONE2; } -*/ INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcJumpscale); From d5438113de1941e5f5c55b92efd7b922316e1fdb Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 13:44:19 -0700 Subject: [PATCH 03/37] Match SetNpcCollisionSize (Note: includes TODO) --- .../code_f2470_len_27f0/SetNpcCollisionSize.s | 43 ------------------- src/code_f2470_len_27f0.c | 18 +++++++- 2 files changed, 17 insertions(+), 44 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s deleted file mode 100644 index e3286cfde6..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel SetNpcCollisionSize -/* 0F293C 802CDF8C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F2940 802CDF90 AFB10014 */ sw $s1, 0x14($sp) -/* 0F2944 802CDF94 0080882D */ daddu $s1, $a0, $zero -/* 0F2948 802CDF98 AFBF0020 */ sw $ra, 0x20($sp) -/* 0F294C 802CDF9C AFB3001C */ sw $s3, 0x1c($sp) -/* 0F2950 802CDFA0 AFB20018 */ sw $s2, 0x18($sp) -/* 0F2954 802CDFA4 AFB00010 */ sw $s0, 0x10($sp) -/* 0F2958 802CDFA8 8E30000C */ lw $s0, 0xc($s1) -/* 0F295C 802CDFAC 8E050000 */ lw $a1, ($s0) -/* 0F2960 802CDFB0 0C0B1EAF */ jal get_variable -/* 0F2964 802CDFB4 26100004 */ addiu $s0, $s0, 4 -/* 0F2968 802CDFB8 8E050000 */ lw $a1, ($s0) -/* 0F296C 802CDFBC 26100004 */ addiu $s0, $s0, 4 -/* 0F2970 802CDFC0 0220202D */ daddu $a0, $s1, $zero -/* 0F2974 802CDFC4 0C0B1EAF */ jal get_variable -/* 0F2978 802CDFC8 0040902D */ daddu $s2, $v0, $zero -/* 0F297C 802CDFCC 0220202D */ daddu $a0, $s1, $zero -/* 0F2980 802CDFD0 8E050000 */ lw $a1, ($s0) -/* 0F2984 802CDFD4 0C0B1EAF */ jal get_variable -/* 0F2988 802CDFD8 0040982D */ daddu $s3, $v0, $zero -/* 0F298C 802CDFDC 0220202D */ daddu $a0, $s1, $zero -/* 0F2990 802CDFE0 0240282D */ daddu $a1, $s2, $zero -/* 0F2994 802CDFE4 0C0B36B0 */ jal resolve_npc -/* 0F2998 802CDFE8 0040802D */ daddu $s0, $v0, $zero -/* 0F299C 802CDFEC 0040182D */ daddu $v1, $v0, $zero -/* 0F29A0 802CDFF0 10600003 */ beqz $v1, .L802CE000 -/* 0F29A4 802CDFF4 24020002 */ addiu $v0, $zero, 2 -/* 0F29A8 802CDFF8 A47300A8 */ sh $s3, 0xa8($v1) -/* 0F29AC 802CDFFC A47000A6 */ sh $s0, 0xa6($v1) -.L802CE000: -/* 0F29B0 802CE000 8FBF0020 */ lw $ra, 0x20($sp) -/* 0F29B4 802CE004 8FB3001C */ lw $s3, 0x1c($sp) -/* 0F29B8 802CE008 8FB20018 */ lw $s2, 0x18($sp) -/* 0F29BC 802CE00C 8FB10014 */ lw $s1, 0x14($sp) -/* 0F29C0 802CE010 8FB00010 */ lw $s0, 0x10($sp) -/* 0F29C4 802CE014 03E00008 */ jr $ra -/* 0F29C8 802CE018 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 33ea802e81..6cc2eaae16 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -38,7 +38,23 @@ INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcRotation); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcScale); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcCollisionSize); +ApiStatus SetNpcCollisionSize(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + s32 height = get_variable(script, *ptrReadPos++); + s32 radius = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching + + if (npcPtr != NULL) { + if (todo) { + npcPtr->collisionHeight = height; + npcPtr->collisionRadius = radius; + } + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; From d5bc60ffc970a8a94c1c3a79d86298370d21637b Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 13:46:15 -0700 Subject: [PATCH 04/37] Move todo variable declaration into if block for SetNpcCollisionSize --- src/code_f2470_len_27f0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 6cc2eaae16..04557a7f37 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -44,9 +44,9 @@ ApiStatus SetNpcCollisionSize(ScriptInstance* script, s32 isInitialCall) { s32 height = get_variable(script, *ptrReadPos++); s32 radius = get_variable(script, *ptrReadPos++); Npc* npcPtr = resolve_npc(script, npcID); - s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching if (npcPtr != NULL) { + s32 todo = 1; if (todo) { npcPtr->collisionHeight = height; npcPtr->collisionRadius = radius; From e8d377eda00ab097cc41aefa663e64c55c556a64 Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 13:47:06 -0700 Subject: [PATCH 05/37] ...And include comment --- src/code_f2470_len_27f0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 04557a7f37..0a00d1d447 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -46,7 +46,7 @@ ApiStatus SetNpcCollisionSize(ScriptInstance* script, s32 isInitialCall) { Npc* npcPtr = resolve_npc(script, npcID); if (npcPtr != NULL) { - s32 todo = 1; + s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching if (todo) { npcPtr->collisionHeight = height; npcPtr->collisionRadius = radius; From b88d8f7afc3bf858de5f61214d25962db60e374d Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 14:12:26 -0700 Subject: [PATCH 06/37] Match SetNpcScale, SetNpcJumpScale --- .../code_f2470_len_27f0/SetNpcJumpscale.s | 34 ------------ .../code_f2470_len_27f0/SetNpcScale.s | 53 ------------------- src/code_f2470_len_27f0.c | 35 ++++++++++-- 3 files changed, 32 insertions(+), 90 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s deleted file mode 100644 index 6e3fc9f082..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel SetNpcJumpscale -/* 0F2A38 802CE088 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F2A3C 802CE08C AFB10014 */ sw $s1, 0x14($sp) -/* 0F2A40 802CE090 0080882D */ daddu $s1, $a0, $zero -/* 0F2A44 802CE094 AFBF0018 */ sw $ra, 0x18($sp) -/* 0F2A48 802CE098 AFB00010 */ sw $s0, 0x10($sp) -/* 0F2A4C 802CE09C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 0F2A50 802CE0A0 8E30000C */ lw $s0, 0xc($s1) -/* 0F2A54 802CE0A4 8E050000 */ lw $a1, ($s0) -/* 0F2A58 802CE0A8 0C0B1EAF */ jal get_variable -/* 0F2A5C 802CE0AC 26100004 */ addiu $s0, $s0, 4 -/* 0F2A60 802CE0B0 0220202D */ daddu $a0, $s1, $zero -/* 0F2A64 802CE0B4 8E050000 */ lw $a1, ($s0) -/* 0F2A68 802CE0B8 0C0B210B */ jal get_float_variable -/* 0F2A6C 802CE0BC 0040802D */ daddu $s0, $v0, $zero -/* 0F2A70 802CE0C0 0220202D */ daddu $a0, $s1, $zero -/* 0F2A74 802CE0C4 0200282D */ daddu $a1, $s0, $zero -/* 0F2A78 802CE0C8 0C0B36B0 */ jal resolve_npc -/* 0F2A7C 802CE0CC 46000506 */ mov.s $f20, $f0 -/* 0F2A80 802CE0D0 54400001 */ bnel $v0, $zero, .L802CE0D8 -/* 0F2A84 802CE0D4 E4540014 */ swc1 $f20, 0x14($v0) -.L802CE0D8: -/* 0F2A88 802CE0D8 24020002 */ addiu $v0, $zero, 2 -/* 0F2A8C 802CE0DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F2A90 802CE0E0 8FB10014 */ lw $s1, 0x14($sp) -/* 0F2A94 802CE0E4 8FB00010 */ lw $s0, 0x10($sp) -/* 0F2A98 802CE0E8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 0F2A9C 802CE0EC 03E00008 */ jr $ra -/* 0F2AA0 802CE0F0 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s deleted file mode 100644 index 6c7965f07a..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel SetNpcScale -/* 0F2884 802CDED4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0F2888 802CDED8 AFB10014 */ sw $s1, 0x14($sp) -/* 0F288C 802CDEDC 0080882D */ daddu $s1, $a0, $zero -/* 0F2890 802CDEE0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0F2894 802CDEE4 AFB20018 */ sw $s2, 0x18($sp) -/* 0F2898 802CDEE8 AFB00010 */ sw $s0, 0x10($sp) -/* 0F289C 802CDEEC F7B80030 */ sdc1 $f24, 0x30($sp) -/* 0F28A0 802CDEF0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 0F28A4 802CDEF4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 0F28A8 802CDEF8 8E30000C */ lw $s0, 0xc($s1) -/* 0F28AC 802CDEFC 8E050000 */ lw $a1, ($s0) -/* 0F28B0 802CDF00 0C0B1EAF */ jal get_variable -/* 0F28B4 802CDF04 26100004 */ addiu $s0, $s0, 4 -/* 0F28B8 802CDF08 8E050000 */ lw $a1, ($s0) -/* 0F28BC 802CDF0C 26100004 */ addiu $s0, $s0, 4 -/* 0F28C0 802CDF10 0220202D */ daddu $a0, $s1, $zero -/* 0F28C4 802CDF14 0C0B210B */ jal get_float_variable -/* 0F28C8 802CDF18 0040902D */ daddu $s2, $v0, $zero -/* 0F28CC 802CDF1C 8E050000 */ lw $a1, ($s0) -/* 0F28D0 802CDF20 26100004 */ addiu $s0, $s0, 4 -/* 0F28D4 802CDF24 0220202D */ daddu $a0, $s1, $zero -/* 0F28D8 802CDF28 0C0B210B */ jal get_float_variable -/* 0F28DC 802CDF2C 46000606 */ mov.s $f24, $f0 -/* 0F28E0 802CDF30 0220202D */ daddu $a0, $s1, $zero -/* 0F28E4 802CDF34 8E050000 */ lw $a1, ($s0) -/* 0F28E8 802CDF38 0C0B210B */ jal get_float_variable -/* 0F28EC 802CDF3C 46000586 */ mov.s $f22, $f0 -/* 0F28F0 802CDF40 0220202D */ daddu $a0, $s1, $zero -/* 0F28F4 802CDF44 0240282D */ daddu $a1, $s2, $zero -/* 0F28F8 802CDF48 0C0B36B0 */ jal resolve_npc -/* 0F28FC 802CDF4C 46000506 */ mov.s $f20, $f0 -/* 0F2900 802CDF50 0040182D */ daddu $v1, $v0, $zero -/* 0F2904 802CDF54 10600004 */ beqz $v1, .L802CDF68 -/* 0F2908 802CDF58 24020002 */ addiu $v0, $zero, 2 -/* 0F290C 802CDF5C E4780054 */ swc1 $f24, 0x54($v1) -/* 0F2910 802CDF60 E4760058 */ swc1 $f22, 0x58($v1) -/* 0F2914 802CDF64 E474005C */ swc1 $f20, 0x5c($v1) -.L802CDF68: -/* 0F2918 802CDF68 8FBF001C */ lw $ra, 0x1c($sp) -/* 0F291C 802CDF6C 8FB20018 */ lw $s2, 0x18($sp) -/* 0F2920 802CDF70 8FB10014 */ lw $s1, 0x14($sp) -/* 0F2924 802CDF74 8FB00010 */ lw $s0, 0x10($sp) -/* 0F2928 802CDF78 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 0F292C 802CDF7C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 0F2930 802CDF80 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 0F2934 802CDF84 03E00008 */ jr $ra -/* 0F2938 802CDF88 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 0a00d1d447..46fbbeb616 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -36,7 +36,25 @@ INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcPos); INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcRotation); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcScale); +ApiStatus SetNpcScale(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + f32 sizeX = get_float_variable(script, *ptrReadPos++); + f32 sizeY = get_float_variable(script, *ptrReadPos++); + f32 sizeZ = get_float_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching + if (todo) { + npcPtr->scale.x = sizeX; + npcPtr->scale.y = sizeY; + npcPtr->scale.z = sizeZ; + } + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} ApiStatus SetNpcCollisionSize(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -64,12 +82,23 @@ ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { if(npcPtr != NULL) { npcPtr->moveSpeed = speed; - return ApiStatus_DONE2; + return ApiStatus_DONE2; // Doesn't match if omitted } return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcJumpscale); +ApiStatus SetNpcJumpscale(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + f32 jumpScale = get_float_variable(script, *ptrReadPos); + Npc* npcPtr = resolve_npc(script, npcID); + + if(npcPtr != NULL) { + npcPtr->jumpScale = jumpScale; + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcAnimation); From cd11b621c32d7f46d66b43f334dd4c6e0bb64460 Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 14:29:25 -0700 Subject: [PATCH 07/37] Modifed Npc struct w/ new float value. Match SetNpcAnimation, GetNpcAnimation, func_802CE1C (sets a float value in Npc struct) --- .../code_f2470_len_27f0/GetNpcAnimation.s | 60 ------------------- .../code_f2470_len_27f0/SetNpcAnimation.s | 34 ----------- include/common_structs.h | 4 +- src/code_f2470_len_27f0.c | 40 ++++++++++++- 4 files changed, 41 insertions(+), 97 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s b/asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s deleted file mode 100644 index 903a0fc206..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel GetNpcAnimation -/* 0F2B10 802CE160 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0F2B14 802CE164 AFB10014 */ sw $s1, 0x14($sp) -/* 0F2B18 802CE168 0080882D */ daddu $s1, $a0, $zero -/* 0F2B1C 802CE16C AFBF0018 */ sw $ra, 0x18($sp) -/* 0F2B20 802CE170 AFB00010 */ sw $s0, 0x10($sp) -/* 0F2B24 802CE174 8E30000C */ lw $s0, 0xc($s1) -/* 0F2B28 802CE178 8E050000 */ lw $a1, ($s0) -/* 0F2B2C 802CE17C 0C0B1EAF */ jal get_variable -/* 0F2B30 802CE180 26100004 */ addiu $s0, $s0, 4 -/* 0F2B34 802CE184 0220202D */ daddu $a0, $s1, $zero -/* 0F2B38 802CE188 8E100000 */ lw $s0, ($s0) -/* 0F2B3C 802CE18C 0C0B36B0 */ jal resolve_npc -/* 0F2B40 802CE190 0040282D */ daddu $a1, $v0, $zero -/* 0F2B44 802CE194 10400004 */ beqz $v0, .L802CE1A8 -/* 0F2B48 802CE198 0220202D */ daddu $a0, $s1, $zero -/* 0F2B4C 802CE19C 8C460028 */ lw $a2, 0x28($v0) -/* 0F2B50 802CE1A0 0C0B2026 */ jal set_variable -/* 0F2B54 802CE1A4 0200282D */ daddu $a1, $s0, $zero -.L802CE1A8: -/* 0F2B58 802CE1A8 24020002 */ addiu $v0, $zero, 2 -/* 0F2B5C 802CE1AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F2B60 802CE1B0 8FB10014 */ lw $s1, 0x14($sp) -/* 0F2B64 802CE1B4 8FB00010 */ lw $s0, 0x10($sp) -/* 0F2B68 802CE1B8 03E00008 */ jr $ra -/* 0F2B6C 802CE1BC 27BD0020 */ addiu $sp, $sp, 0x20 - -/* 0F2B70 802CE1C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F2B74 802CE1C4 AFB10014 */ sw $s1, 0x14($sp) -/* 0F2B78 802CE1C8 0080882D */ daddu $s1, $a0, $zero -/* 0F2B7C 802CE1CC AFBF0018 */ sw $ra, 0x18($sp) -/* 0F2B80 802CE1D0 AFB00010 */ sw $s0, 0x10($sp) -/* 0F2B84 802CE1D4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 0F2B88 802CE1D8 8E30000C */ lw $s0, 0xc($s1) -/* 0F2B8C 802CE1DC 8E050000 */ lw $a1, ($s0) -/* 0F2B90 802CE1E0 0C0B1EAF */ jal get_variable -/* 0F2B94 802CE1E4 26100004 */ addiu $s0, $s0, 4 -/* 0F2B98 802CE1E8 0220202D */ daddu $a0, $s1, $zero -/* 0F2B9C 802CE1EC 8E050000 */ lw $a1, ($s0) -/* 0F2BA0 802CE1F0 0C0B210B */ jal get_float_variable -/* 0F2BA4 802CE1F4 0040802D */ daddu $s0, $v0, $zero -/* 0F2BA8 802CE1F8 0220202D */ daddu $a0, $s1, $zero -/* 0F2BAC 802CE1FC 0200282D */ daddu $a1, $s0, $zero -/* 0F2BB0 802CE200 0C0B36B0 */ jal resolve_npc -/* 0F2BB4 802CE204 46000506 */ mov.s $f20, $f0 -/* 0F2BB8 802CE208 54400001 */ bnel $v0, $zero, .L802CE210 -/* 0F2BBC 802CE20C E4540030 */ swc1 $f20, 0x30($v0) -.L802CE210: -/* 0F2BC0 802CE210 24020002 */ addiu $v0, $zero, 2 -/* 0F2BC4 802CE214 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F2BC8 802CE218 8FB10014 */ lw $s1, 0x14($sp) -/* 0F2BCC 802CE21C 8FB00010 */ lw $s0, 0x10($sp) -/* 0F2BD0 802CE220 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 0F2BD4 802CE224 03E00008 */ jr $ra -/* 0F2BD8 802CE228 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s deleted file mode 100644 index d431726f57..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel SetNpcAnimation -/* 0F2AA4 802CE0F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0F2AA8 802CE0F8 AFB10014 */ sw $s1, 0x14($sp) -/* 0F2AAC 802CE0FC 0080882D */ daddu $s1, $a0, $zero -/* 0F2AB0 802CE100 AFBF0018 */ sw $ra, 0x18($sp) -/* 0F2AB4 802CE104 AFB00010 */ sw $s0, 0x10($sp) -/* 0F2AB8 802CE108 8E30000C */ lw $s0, 0xc($s1) -/* 0F2ABC 802CE10C 8E050000 */ lw $a1, ($s0) -/* 0F2AC0 802CE110 0C0B1EAF */ jal get_variable -/* 0F2AC4 802CE114 26100004 */ addiu $s0, $s0, 4 -/* 0F2AC8 802CE118 0220202D */ daddu $a0, $s1, $zero -/* 0F2ACC 802CE11C 8E050000 */ lw $a1, ($s0) -/* 0F2AD0 802CE120 0C0B1EAF */ jal get_variable -/* 0F2AD4 802CE124 0040802D */ daddu $s0, $v0, $zero -/* 0F2AD8 802CE128 0220202D */ daddu $a0, $s1, $zero -/* 0F2ADC 802CE12C 0200282D */ daddu $a1, $s0, $zero -/* 0F2AE0 802CE130 0C0B36B0 */ jal resolve_npc -/* 0F2AE4 802CE134 0040802D */ daddu $s0, $v0, $zero -/* 0F2AE8 802CE138 10400003 */ beqz $v0, .L802CE148 -/* 0F2AEC 802CE13C 0040202D */ daddu $a0, $v0, $zero -/* 0F2AF0 802CE140 0C0B36C3 */ jal set_npc_animation -/* 0F2AF4 802CE144 0200282D */ daddu $a1, $s0, $zero -.L802CE148: -/* 0F2AF8 802CE148 24020002 */ addiu $v0, $zero, 2 -/* 0F2AFC 802CE14C 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F2B00 802CE150 8FB10014 */ lw $s1, 0x14($sp) -/* 0F2B04 802CE154 8FB00010 */ lw $s0, 0x10($sp) -/* 0F2B08 802CE158 03E00008 */ jr $ra -/* 0F2B0C 802CE15C 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/include/common_structs.h b/include/common_structs.h index 4594c1bd46..42eb93da85 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -61,7 +61,9 @@ typedef struct Npc { /* 0x020 */ struct NpcBlurData* blurData; /* related to movement somehow... */ /* 0x024 */ char unk_24[4]; /* 0x028 */ u32 currentAnim; - /* 0x02C */ char unk_2C[12]; + /* 0x02C */ char unk_2C[4]; + /* 0x030 */ f32 unk_30; + /* 0x034 */ char unk_34[4]; /* 0x038 */ struct Vec3f pos; /* 0x044 */ struct Vec3f rotation; /* 0x050 */ char unk_50[4]; diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 46fbbeb616..fe95dd047c 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -100,9 +100,45 @@ ApiStatus SetNpcJumpscale(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcAnimation); +ApiStatus SetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + s32 animation = get_variable(script, *ptrReadPos); + Npc* npcPtr = resolve_npc(script, npcID); -INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcAnimation); + if (npcPtr != NULL) { + set_npc_animation(npcPtr, animation); + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} + +ApiStatus GetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + Bytecode outVar = *ptrReadPos++; + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + set_variable(script, outVar, npcPtr->currentAnim); + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} + +// TODO: Figure out meaning of float value in Npc struct that this function is setting +ApiStatus func_802CE1C0(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + f32 value1 = get_float_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + npcPtr->unk_30 = value1; + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} INCLUDE_API_ASM(code_f2470_len_27f0, NpcMoveTo); From d844156076d805d48f9c74318d6a675d901529ee Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 15:51:58 -0700 Subject: [PATCH 08/37] Rename func_802CE1C0 to SetNpcAnimationSpeed --- include/common_structs.h | 2 +- src/code_f2470_len_27f0.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/common_structs.h b/include/common_structs.h index 42eb93da85..a56d5e37ca 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -62,7 +62,7 @@ typedef struct Npc { /* 0x024 */ char unk_24[4]; /* 0x028 */ u32 currentAnim; /* 0x02C */ char unk_2C[4]; - /* 0x030 */ f32 unk_30; + /* 0x030 */ f32 animationSpeed; /* 0x034 */ char unk_34[4]; /* 0x038 */ struct Vec3f pos; /* 0x044 */ struct Vec3f rotation; diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index fe95dd047c..68c1fa7b40 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -127,14 +127,14 @@ ApiStatus GetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { } // TODO: Figure out meaning of float value in Npc struct that this function is setting -ApiStatus func_802CE1C0(ScriptInstance* script, s32 isInitialCall) { +ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); - f32 value1 = get_float_variable(script, *ptrReadPos++); + f32 animationSpeed = get_float_variable(script, *ptrReadPos++); Npc* npcPtr = resolve_npc(script, npcID); if (npcPtr != NULL) { - npcPtr->unk_30 = value1; + npcPtr->animationSpeed = animationSpeed; return ApiStatus_DONE2; // Doesn't match if omitted } return ApiStatus_DONE2; From 63f82542274abc8bfb3dbd1749d3b0dcacf4b0cd Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 15:53:04 -0700 Subject: [PATCH 09/37] And remove TODO --- src/code_f2470_len_27f0.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 68c1fa7b40..28e3c0c15d 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -126,7 +126,6 @@ ApiStatus GetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// TODO: Figure out meaning of float value in Npc struct that this function is setting ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); From b5256e31eec115a38b9dde70449d05002349583d Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Mon, 17 Aug 2020 23:07:13 +0100 Subject: [PATCH 10/37] add astyle, update clang-tidy config --- .clang-format | 23 ------------------- .clang-tidy | 7 ++---- .github/workflows/lint.yaml | 39 +++++++++++++++++++++++++++++++ .vscode/settings.json | 1 + format.sh | 46 ++++++++++++++++++++++--------------- include/variables.h | 2 +- install.sh | 6 ++--- 7 files changed, 73 insertions(+), 51 deletions(-) delete mode 100644 .clang-format create mode 100644 .github/workflows/lint.yaml diff --git a/.clang-format b/.clang-format deleted file mode 100644 index c7b900f060..0000000000 --- a/.clang-format +++ /dev/null @@ -1,23 +0,0 @@ -IndentWidth: 4 -Language: Cpp -UseTab: Never -ColumnLimit: 120 -PointerAlignment: Left -BreakBeforeBraces: Attach -SpaceAfterCStyleCast: false -Cpp11BracedListStyle: false -IndentCaseLabels: true -BinPackArguments: true -BinPackParameters: true -AlignAfterOpenBracket: Align -AlignOperands: true -BreakBeforeTernaryOperators: true -BreakBeforeBinaryOperators: None -AllowShortBlocksOnASingleLine: true -AllowShortIfStatementsOnASingleLine: false -AllowShortLoopsOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: false -AlignEscapedNewlines: Left -AlignTrailingComments: true -SortIncludes: false diff --git a/.clang-tidy b/.clang-tidy index 4022a3f68a..d1f01520b0 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,5 +1,2 @@ -Checks: '-*,readability-braces-around-statements' -WarningsAsErrors: '' -HeaderFilterRegex: '(src|include)\/.*\.h$' -FormatStyle: 'file' -CheckOptions: +Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-clang-diagnostic-error' +HeaderFilterRegex: '(src|include)\/.*\.h' diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 0000000000..17f1c8b168 --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,39 @@ +name: Lint +on: + push: + paths: + - 'src/*' + - 'include/*' + pull_request: + paths: + - 'src/*' + - 'include/*' + +jobs: + build: + name: Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - run: ./install.sh + + # lint files changed by the push/pr + - id: files + uses: trilom/file-changes-action@v1.2.4 + with: + output: ' ' + continue-on-error: true # see jitterbit/get-changed-files#7 + - run: ./format.sh ${{ steps.files.outputs.files}} + + # fail if any files were changed by ./format.sh + - id: files_formatted + uses: jackton1/find-changed-files@v1.1 + with: + files: src, include + + - name: Fail if any files reformatted + if: steps.files_formatted.outputs.files_changed == 'true' + run: | + git diff + exit 1 diff --git a/.vscode/settings.json b/.vscode/settings.json index c5dfc84c80..571f956be5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,4 +3,5 @@ "editor.insertSpaces": true, "files.eol": "\n", "files.insertFinalNewline": true, + "editor.rulers": [120], } diff --git a/format.sh b/format.sh index 90de3119e4..5f631f128b 100755 --- a/format.sh +++ b/format.sh @@ -1,26 +1,34 @@ -FORMAT_OPTS="-i -style=file" -TIDY_OPTS="-p . --fix --fix-errors" -COMPILER_OPTS="-fno-builtin -std=gnu90 -Iinclude -Isrc -D_LANGUAGE_C -DNON_MATCHING" +COMPILER_OPTS="-fno-builtin -std=gnu89 -Iinclude -Isrc -D_LANGUAGE_C" shopt -s globstar +FILES="src/**/*.c include/*.h" if (( $# > 0 )); then - echo "Formatting file(s) $*" - echo "Running clang-format..." - clang-format ${FORMAT_OPTS} "$@" - echo "Running clang-tidy..." - clang-tidy ${TIDY_OPTS} "$@" -- ${COMPILER_OPTS} &> /dev/null - echo "Adding missing final new lines..." - sed -i -e '$a\' "$@" - echo "Done formatting file(s) $*" + # only process .c and .h files + FILES=$(echo "$@" | sed 's/ /\n/g' | grep '.[ch]$') +fi + +if [[ -z $FILES ]]; then + echo "no .c or .h files specified" exit fi -echo "Formatting C files. This will take a bit" -echo "Running clang-format..." -clang-format ${FORMAT_OPTS} src/**/*.c -echo "Running clang-tidy..." -clang-tidy ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null -echo "Adding missing final new lines..." -find src/ -type f -name "*.c" -exec sed -i -e '$a\' {} \; -echo "Done formatting all files." +# format +astyle ${FILES} \ + --formatted --suffix=none \ + --lineend=linux \ + --convert-tabs \ + --max-code-length=120 \ + --min-conditional-indent=1 \ + --style=attach \ + --align-pointer=type --align-reference=name \ + --indent-switches \ + --indent-labels \ + --pad-oper --pad-comma --pad-header --unpad-paren \ + --attach-return-type \ + +# add newline at eof +find ${FILES} -exec sed -i -e '$a\' {} \; + +# lint +clang-tidy -p . ${FILES} -- ${COMPILER_OPTS} diff --git a/include/variables.h b/include/variables.h index 2051fff0a7..d3602c9944 100644 --- a/include/variables.h +++ b/include/variables.h @@ -48,7 +48,7 @@ extern s16 D_8010CD10; extern s16 D_8010CD12; extern s32 D_801595A0; extern char gCloudyFlowerFieldsBg[]; // "fla_bg" -extern char gSunnyFlowerFieldsBg[]; // "flb_bg" +extern char gSunnyFlowerFieldsBg[]; // "flb_bg" extern BackgroundHeader gBackgroundImage; extern s8 D_8014F12F; diff --git a/install.sh b/install.sh index 96f300b767..89d0498d3c 100755 --- a/install.sh +++ b/install.sh @@ -8,8 +8,8 @@ if command -v apt-install &> /dev/null; then if [[ $1 == "--extra" ]]; then echo "Installing extra" - sudo apt install -y python3 python3-pip clang-tidy clang-format - python3 -m pip install stringcase + sudo apt install -y python3 python3-pip clang-tidy astyle || exit 1 + python3 -m pip install stringcase || exit 1 fi echo "Done" @@ -48,7 +48,7 @@ if command -v pacman &> /dev/null; then if [[ $1 == "--extra" ]]; then echo "Installing extra" - sudo pacman -S --noconfirm --needed python python-pip clang || exit 1 + sudo pacman -S --noconfirm --needed python python-pip clang astyle || exit 1 python3 -m pip install stringcase || exit 1 fi From 0c318f87ab4887c09995ecd8143e7556aef4f538 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Tue, 18 Aug 2020 00:35:18 +0100 Subject: [PATCH 11/37] add github action to lint on push/pr --- .github/workflows/lint.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 17f1c8b168..7071a2a2de 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -23,7 +23,6 @@ jobs: uses: trilom/file-changes-action@v1.2.4 with: output: ' ' - continue-on-error: true # see jitterbit/get-changed-files#7 - run: ./format.sh ${{ steps.files.outputs.files}} # fail if any files were changed by ./format.sh @@ -34,6 +33,4 @@ jobs: - name: Fail if any files reformatted if: steps.files_formatted.outputs.files_changed == 'true' - run: | - git diff - exit 1 + run: exit 1 From 1012d8de776441520d281c1aedba005cd30371d7 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Tue, 18 Aug 2020 00:28:37 +0100 Subject: [PATCH 12/37] add clang-tidy vscode extension --- .vscode/extensions.json | 6 +++++- .vscode/settings.json | 8 ++++++++ .vscode/tasks.json | 8 ++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 0c8509af8c..47f7416c04 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,5 +2,9 @@ "recommendations": [ "ms-vscode.cpptools", "nanaian.vscode-star-rod", - ], + "notskm.clang-tidy", + ], + "unwantedRecommendations": [ + "llvm-vs-code-extensions.vscode-clangd", + ], } diff --git a/.vscode/settings.json b/.vscode/settings.json index 571f956be5..33ac05f0f5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,4 +4,12 @@ "files.eol": "\n", "files.insertFinalNewline": true, "editor.rulers": [120], + "clang-tidy.compilerArgs": [ + "-fno-builtin", + "-std=gnu89", + "-Iinclude", + "-Iinclude/PR", + "-Isrc", + "-D_LANGUAGE_C", + ], } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7ea26fe0e7..1b8575b6cd 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ { "fileLocation": ["relative", "${workspaceFolder}"], "pattern": { - "regexp": "^(src\\/.*):(\\d+):\\s+(warning|error):\\s+(.*)$", + "regexp": "^(src\\/.*|include\\/.*):(\\d+):\\s+(warning|error):\\s+(.*)$", "file": 1, "line": 2, "severity": 3, @@ -20,7 +20,7 @@ "fileLocation": ["relative", "${workspaceFolder}"], "severity": "error", "pattern": { - "regexp": "^(src\\/.*):(\\d+):\\s+(?!warning|\\()(.*)$", + "regexp": "^(src\\/.*|include\\/.*):(\\d+):\\s+(?!warning|\\()(.*)$", "file": 1, "line": 2, "message": 3, @@ -44,7 +44,7 @@ "activeOnStart": true, }, "pattern": { - "regexp": "^(src\\/.*):(\\d+):\\s+(warning|error):\\s+(.*)$", + "regexp": "^(src\\/.*|include\\/.*):(\\d+):\\s+(warning|error):\\s+(.*)$", "file": 1, "line": 2, "severity": 3, @@ -58,7 +58,7 @@ }, "severity": "error", "pattern": { - "regexp": "^(src\\/.*):(\\d+):\\s+(?!warning|\\()(.*)$", + "regexp": "^(src\\/.*|include\\/.*):(\\d+):\\s+(?!warning|\\()(.*)$", "file": 1, "line": 2, "message": 3, From f19e2edbd3e9b413d1f9c86e52b79fd8802e442d Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 19 Aug 2020 01:16:12 +0100 Subject: [PATCH 13/37] format files --- include/common_structs.h | 2 +- include/ultra64.h | 80 +++++++++++++++++++-------------------- src/code_80850_len_3060.c | 10 ++--- src/code_dc470_len_14c0.c | 2 +- src/code_e79b0_len_1920.c | 14 +++---- src/code_e92d0_len_5da0.c | 4 +- src/code_f8f60_len_1560.c | 40 ++++++++++---------- src/code_fa4c0_len_3bf0.c | 30 +++++++-------- 8 files changed, 91 insertions(+), 91 deletions(-) diff --git a/include/common_structs.h b/include/common_structs.h index 4594c1bd46..d12f2d7414 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -522,7 +522,7 @@ typedef struct BattleStatus { /* 0x0B1 */ char unk_B1[3]; /* 0x0B4 */ UNK_FUN_PTR(preUpdateCallback); /* 0x0B8 */ char unk_B8[4]; - /* 0x0BC */ struct ScriptInstance* controlScript; /* control handed over to this when changing partners, maybe general? */ + /* 0x0BC */ struct ScriptInstance* controlScript; /* control handed over to this when changing partners */ /* 0x0C0 */ s32 controlScriptID; /* 0x0C4 */ struct ScriptInstance* camMovementScript; /* 0x0C8 */ s32 camMovementScriptID; diff --git a/include/ultra64.h b/include/ultra64.h index e35e9bcb66..357287204d 100755 --- a/include/ultra64.h +++ b/include/ultra64.h @@ -1,40 +1,40 @@ - -/************************************************************************** - * * - * Copyright (C) 1994, Silicon Graphics, Inc. * - * * - * These coded instructions, statements, and computer programs contain * - * unpublished proprietary information of Silicon Graphics, Inc., and * - * are protected by Federal copyright law. They may not be disclosed * - * to third parties or copied or duplicated in any form, in whole or * - * in part, without the prior written consent of Silicon Graphics, Inc. * - * * - *************************************************************************/ - -/************************************************************************** - * - * $Revision: 1.10 $ - * $Date: 1997/02/11 08:37:33 $ - * $Source: /hosts/gate3/exdisk2/cvs/N64OS/Master/cvsmdev2/PR/include/ultra64.h,v $ - * - **************************************************************************/ - -#ifndef _ULTRA64_H_ -#define _ULTRA64_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif + +/************************************************************************** + * * + * Copyright (C) 1994, Silicon Graphics, Inc. * + * * + * These coded instructions, statements, and computer programs contain * + * unpublished proprietary information of Silicon Graphics, Inc., and * + * are protected by Federal copyright law. They may not be disclosed * + * to third parties or copied or duplicated in any form, in whole or * + * in part, without the prior written consent of Silicon Graphics, Inc. * + * * + *************************************************************************/ + +/************************************************************************** + * + * $Revision: 1.10 $ + * $Date: 1997/02/11 08:37:33 $ + * $Source: /hosts/gate3/exdisk2/cvs/N64OS/Master/cvsmdev2/PR/include/ultra64.h,v $ + * + **************************************************************************/ + +#ifndef _ULTRA64_H_ +#define _ULTRA64_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index 7911de645e..3abfbead0a 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -300,7 +300,7 @@ void update_coin_counter(void) { UiStatus* uiStatus = &gUIStatus; PlayerData* playerData = &gPlayerData; - do {} while(0); // Needed to match + do {} while (0); // Needed to match if (uiStatus->unk_6C[1] != 0) { uiStatus->unk_6C[1] -= 1; @@ -354,7 +354,7 @@ void show_coin_counter(void) { D_8010CD12 = 0; } - if (uiStatus->unk_6C[0]== 0) { + if (uiStatus->unk_6C[0] == 0) { func_80147CC8(0x14, 0x20, 0xa4, 0x40, 0x14, 0x15, &D_800E92D8, 0, -1); func_80147E7C(0x14, &D_80147474); index = create_icon(&D_80109270); @@ -380,7 +380,7 @@ void show_coin_counter(void) { void hide_coin_counter(void) { UiStatus* uiStatus = &gUIStatus; - if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0]== 0)) { + if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0] == 0)) { uiStatus->unk_6C[0] = 60; } } @@ -388,8 +388,8 @@ void hide_coin_counter(void) { void func_800E96C8(void) { UiStatus* uiStatus = &gUIStatus; - if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0]== 0)) { - uiStatus->unk_6C[0]= 1; + if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0] == 0)) { + uiStatus->unk_6C[0] = 1; } } diff --git a/src/code_dc470_len_14c0.c b/src/code_dc470_len_14c0.c index 47c3e3ccfd..fd520fcead 100644 --- a/src/code_dc470_len_14c0.c +++ b/src/code_dc470_len_14c0.c @@ -31,7 +31,7 @@ void func_80145DF8(void) { gameStatus->enableBackground &= 0xF0; } -void read_background_size(BackgroundHeader *bg) { +void read_background_size(BackgroundHeader* bg) { GameStatus* gameStatus = *gGameStatusPtr; gameStatus->backgroundMaxW = bg->width; diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index 2e8bac103f..21b4a312eb 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -64,7 +64,7 @@ s32 kill_all_scripts(void) { s32 i; ScriptInstance* scriptContextPtr; - for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { + for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL) { kill_script(scriptContextPtr); @@ -77,7 +77,7 @@ s32 does_script_exist(s32 id) { s32 i; ScriptInstance* scriptContextPtr; - for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { + for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->uniqueID == id) { return 1; @@ -89,8 +89,8 @@ s32 does_script_exist(s32 id) { s32 does_script_exist_by_ref(ScriptInstance* script) { s32 i; - for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { - if(script == (*gCurrentScriptListPtr)[i]) { + for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { + if (script == (*gCurrentScriptListPtr)[i]) { return 1; } } @@ -139,7 +139,7 @@ void suspend_group_script(ScriptInstance* script, s32 groupFlags) { suspend_group_script(childScript, groupFlags); } - for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { + for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) { suspend_group_script(scriptContextPtr, groupFlags); @@ -160,7 +160,7 @@ void resume_group_script(ScriptInstance* script, s32 groupFlags) { resume_group_script(childScript, groupFlags); } - for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { + for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) { suspend_group_script(scriptContextPtr, groupFlags); @@ -298,7 +298,7 @@ void set_script_flags(ScriptInstance* script, s32 flags) { set_script_flags(childScript, flags); } - for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { + for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) { scriptContextPtr = (*gCurrentScriptListPtr)[i]; if (scriptContextPtr != NULL && scriptContextPtr->parentScript == script) { set_script_flags(script->parentScript, flags); diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c index f22c70c14d..8bf0a5361f 100644 --- a/src/code_e92d0_len_5da0.c +++ b/src/code_e92d0_len_5da0.c @@ -56,7 +56,7 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_greater_equal); ApiStatus si_handle_if_AND(ScriptInstance* script) { s32 var1; - s32 *ptrReadPos = script->ptrReadPos; + s32* ptrReadPos = script->ptrReadPos; var1 = ptrReadPos[0]; ptrReadPos++; @@ -71,7 +71,7 @@ ApiStatus si_handle_if_AND(ScriptInstance* script) { //INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_not_AND); ApiStatus si_handle_if_not_AND(ScriptInstance* script) { s32 var1; - s32 *ptrReadPos = script->ptrReadPos; + s32* ptrReadPos = script->ptrReadPos; var1 = ptrReadPos[0]; ptrReadPos++; diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index 4c98d268ba..7ef00146b2 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -14,12 +14,12 @@ ApiStatus MakeLerp(ScriptInstance* script, s32 isInitialCall) { ApiStatus UpdateLerp(ScriptInstance* script, s32 isInitialCall) { script->varTable[0x0] = (s32) update_lerp( - script->varTable[0xB], - script->varTable[0xC], - script->varTable[0xD], - script->varTable[0xE], - script->varTable[0xF] - ); + script->varTable[0xB], + script->varTable[0xC], + script->varTable[0xD], + script->varTable[0xE], + script->varTable[0xF] + ); if (script->varTable[0xE] >= script->varTable[0xF]) { script->varTable[0x1] = 0; // finished @@ -99,9 +99,9 @@ ApiStatus AwaitPlayerApproach(ScriptInstance* script, s32 isInitialCall) { } distance = dist2D( - playerStatus->position.x, playerStatus->position.z, - *targetX, *targetZ - ); + playerStatus->position.x, playerStatus->position.z, + *targetX, *targetZ + ); if (distance < *distanceRequired) { return ApiStatus_DONE2; @@ -129,9 +129,9 @@ ApiStatus IsPlayerWithin(ScriptInstance* script, s32 isInitialCall) { } distance = dist2D( - playerStatus->position.x, playerStatus->position.z, - *targetX, *targetZ - ); + playerStatus->position.x, playerStatus->position.z, + *targetX, *targetZ + ); set_variable(script, outVar, 0); if (distance < *distanceRequired) { @@ -158,9 +158,9 @@ ApiStatus AwaitPlayerLeave(ScriptInstance* script, s32 isInitialCall) { } distance = dist2D( - playerStatus->position.x, playerStatus->position.z, - *targetX, *targetZ - ); + playerStatus->position.x, playerStatus->position.z, + *targetX, *targetZ + ); if (distance > *distanceRequired) { return ApiStatus_DONE2; @@ -264,11 +264,11 @@ ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) { Bytecode outVar = *ptrReadPos++; set_float_variable(script, outVar, dist2D( - get_float_variable(script, *ptrReadPos++), - get_float_variable(script, *ptrReadPos++), - get_float_variable(script, *ptrReadPos++), - get_float_variable(script, *ptrReadPos++) - )); + get_float_variable(script, *ptrReadPos++), + get_float_variable(script, *ptrReadPos++), + get_float_variable(script, *ptrReadPos++), + get_float_variable(script, *ptrReadPos++) + )); return ApiStatus_DONE2; } diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c index af41f01103..2995494b67 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/code_fa4c0_len_3bf0.c @@ -91,7 +91,7 @@ INCLUDE_API_ASM("code_fa4c0_len_3bf0", PlaySoundAtF); ApiStatus RemoveKeyItemAt(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 index = get_variable(script, *ptrReadPos++); - s16* ptrKeyItems = (s16 *) &gPlayerData.keyItems; + s16* ptrKeyItems = (s16*) &gPlayerData.keyItems; ptrKeyItems[index] = 0; return ApiStatus_DONE2; @@ -100,7 +100,7 @@ ApiStatus RemoveKeyItemAt(ScriptInstance* script, s32 isInitialCall) { ApiStatus RemoveItemAt(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 index = get_variable(script, *ptrReadPos++); - s16* ptrInvItems = (s16 *) &gPlayerData.invItems; + s16* ptrInvItems = (s16*) &gPlayerData.invItems; ptrInvItems[index] = 0; sort_items(); @@ -146,7 +146,7 @@ ApiStatus HasKeyItem(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; s32 i; - for(i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) { + for (i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) { if (playerData->keyItems[i] == itemID) { break; } @@ -163,7 +163,7 @@ ApiStatus FindKeyItem(ScriptInstance* script, s32 isInitialCall) { s32 i; s32 itemIndex; - for(i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) { + for (i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) { if (playerData->keyItems[i] == itemID) { break; } @@ -181,7 +181,7 @@ ApiStatus FindKeyItem(ScriptInstance* script, s32 isInitialCall) { ApiStatus AddItem(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 itemID = get_variable(script, *ptrReadPos++); - s32* ptrNextPos = (s32 *) *ptrReadPos++; + s32* ptrNextPos = (s32*) *ptrReadPos++; set_variable(script, ptrNextPos, add_item(itemID)); return ApiStatus_DONE2; @@ -282,20 +282,20 @@ ApiStatus DropItemEntityB(ScriptInstance* script, s32 isInitialCall) { */ ApiStatus RemoveItemEntity(ScriptInstance* script, s32 isInitialCall) { - Bytecode* ptrReadPos = script->ptrReadPos; - s32 itemEntityIndex = get_variable(script, *ptrReadPos++); + Bytecode* ptrReadPos = script->ptrReadPos; + s32 itemEntityIndex = get_variable(script, *ptrReadPos++); - remove_item_entity_by_index(itemEntityIndex); - return ApiStatus_DONE2; + remove_item_entity_by_index(itemEntityIndex); + return ApiStatus_DONE2; } ApiStatus AddBadge(ScriptInstance* script, s32 isInitialCall) { - Bytecode* ptrReadPos = script->ptrReadPos; - s32 itemID = get_variable(script, *ptrReadPos++); - s32* ptrNextPos = (s32 *) *ptrReadPos++; + Bytecode* ptrReadPos = script->ptrReadPos; + s32 itemID = get_variable(script, *ptrReadPos++); + s32* ptrNextPos = (s32*) *ptrReadPos++; - set_variable(script, ptrNextPos, add_badge(itemID)); - return ApiStatus_DONE2; + set_variable(script, ptrNextPos, add_badge(itemID)); + return ApiStatus_DONE2; } INCLUDE_API_ASM("code_fa4c0_len_3bf0", RemoveBadge); @@ -311,7 +311,7 @@ ApiStatus SetItemPos(ScriptInstance* script, s32 isInitialCall) { y = get_variable(script, *ptrReadPos++); z = get_variable(script, *ptrReadPos++); - ptrItemEntity = (ItemEntity *) get_item_entity(itemEntityIndex); + ptrItemEntity = (ItemEntity*) get_item_entity(itemEntityIndex); ptrItemEntity->position.x = x; ptrItemEntity->position.y = y; ptrItemEntity->position.z = z; From 852ab4a25dd44d672bd932e38e6160c2a8990b4d Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 19 Aug 2020 01:21:04 +0100 Subject: [PATCH 14/37] fix some lint issues --- include/si.h | 3 +++ include/types.h | 2 ++ src/code_80850_len_3060.c | 1 - src/code_e79b0_len_1920.c | 5 ++--- src/code_e92d0_len_5da0.c | 24 ++++++++++++------------ src/code_ebd0_len_6a0.c | 1 - 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/include/si.h b/include/si.h index a05e7ff245..525c6280cb 100644 --- a/include/si.h +++ b/include/si.h @@ -1,6 +1,9 @@ #ifndef _SI_H_ #define _SI_H_ +#include "ultra64.h" +#include "types.h" + #define SI_VAR_0 0xFE363C80 /* Return type of si_execute_next_command */ diff --git a/include/types.h b/include/types.h index 0d07cc05ed..97f33239fb 100644 --- a/include/types.h +++ b/include/types.h @@ -1,6 +1,8 @@ #ifndef _TYPES_H_ #define _TYPES_H_ +#include "ultra64.h" + #define UNK_TYPE s32 #define UNK_PTR void* #define UNK_RET void diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index 3abfbead0a..caa5d64198 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -185,7 +185,6 @@ void sort_items(void) { } } } - return; } s32 add_badge(s32 itemID) { diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index 21b4a312eb..8df4e5ca69 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -48,7 +48,7 @@ INCLUDE_ASM("code_e79b0_len_1920", func_802C3EE4); INCLUDE_ASM("code_e79b0_len_1920", kill_script); -void* kill_script_by_ID(s32 id) { +void kill_script_by_ID(s32 id) { s32 i; ScriptInstance* scriptContextPtr; @@ -60,7 +60,7 @@ void* kill_script_by_ID(s32 id) { } } -s32 kill_all_scripts(void) { +void kill_all_scripts(void) { s32 i; ScriptInstance* scriptContextPtr; @@ -70,7 +70,6 @@ s32 kill_all_scripts(void) { kill_script(scriptContextPtr); } } - return; } s32 does_script_exist(s32 id) { diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c index 8bf0a5361f..543723ce04 100644 --- a/src/code_e92d0_len_5da0.c +++ b/src/code_e92d0_len_5da0.c @@ -255,13 +255,13 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_AND); //INCLUDE_ASM("code_e92d0_len_5da0", si_handle_AND_const); ApiStatus si_handle_AND_const(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; - // todo ??? - s32 temp_s0 = ptrReadPos[0]; - s32 temp_s2 = ptrReadPos[0]; - temp_s0 = ptrReadPos[1]; - // end todo - set_variable(script, temp_s2, temp_s0 & get_variable(script, temp_s2)); + s32 constant = ptrReadPos[0]; // NOLINT + s32 var = ptrReadPos[0]; + + constant = ptrReadPos[1]; + + set_variable(script, var, constant & get_variable(script, var)); return ApiStatus_DONE2; } @@ -270,13 +270,13 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_OR); //INCLUDE_ASM("code_e92d0_len_5da0", si_handle_OR_const); ApiStatus si_handle_OR_const(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; - // todo ??? - s32 temp_s0 = ptrReadPos[0]; - s32 temp_s2 = ptrReadPos[0]; - temp_s0 = ptrReadPos[1]; - // end todo - set_variable(script, temp_s2, temp_s0 | get_variable(script, temp_s2)); + s32 constant = ptrReadPos[0]; // NOLINT + s32 var = ptrReadPos[0]; + + constant = ptrReadPos[1]; + + set_variable(script, var, constant | get_variable(script, var)); return ApiStatus_DONE2; } diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c index 18c50cb084..dacad268cd 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/code_ebd0_len_6a0.c @@ -42,7 +42,6 @@ s16 func_80033830(add_val) { return 0; } - void func_80033874(void) { func_80137D88(0, (*gGameStatusPtr)->bootAlpha); func_80137E10(0, (*gGameStatusPtr)->bootBlue, (*gGameStatusPtr)->bootGreen, (*gGameStatusPtr)->bootRed); From 19c9a82b2a0856e9590528f9da683d6ed570b7db Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Tue, 18 Aug 2020 01:04:39 +0100 Subject: [PATCH 15/37] add format.sh info to readme --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index f5f7ac701e..fbca285324 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,16 @@ You're on your own now. Get your C code compiling to match the original assembly If you use Visual Studio Code, you can use _Run Test Task_ to run `diff.py` and show you errors and warnings from the compiler inline. You might want to attach _Run Test Task_ to a keybinding, as you'll be using it often. +#### Formatting and linting + +Once your function is matching, you'll want to make a pull request. Before you do that, run the following script to reformat your code. (You can also format specific files with `./format.sh path/to/file.c`.) + +```sh +$ ./format.sh +``` + +If `format.sh` displays any errors, go and fix them. If you can't fix them without breaking the function from matching, append `// NOLINT` to the offending line. + ## FAQ * If you received the following error when running `make`: From 42747be7aeb1de7dff2fcb881b9503a5823311dd Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Tue, 18 Aug 2020 01:54:13 +0100 Subject: [PATCH 16/37] fix signatures for builtins mistakenly marked as api functions --- src/os/code_4a140_len_70.c | 4 ++-- src/os/code_4a1b0_len_40.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/os/code_4a140_len_70.c b/src/os/code_4a140_len_70.c index 1609535112..983b0111fc 100644 --- a/src/os/code_4a140_len_70.c +++ b/src/os/code_4a140_len_70.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_API_ASM("os/code_4a140_len_70", strcpy); +char* INCLUDE_ASM("os/code_4a140_len_70", strcpy, char* destination, const char* source); -INCLUDE_API_ASM("os/code_4a140_len_70", strcmp); +s32 INCLUDE_ASM("os/code_4a140_len_70", strcmp, const char* str1, const char* str2); diff --git a/src/os/code_4a1b0_len_40.c b/src/os/code_4a1b0_len_40.c index a3b8b5bb1a..762986f66d 100644 --- a/src/os/code_4a1b0_len_40.c +++ b/src/os/code_4a1b0_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM("os/code_4a1b0_len_40", memset); +void* INCLUDE_ASM("os/code_4a1b0_len_40", memset, void* ptr, s32 value, s32 num); From 17d513eeba24fd2a87b172740441f5c707c06820 Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 17:31:39 -0700 Subject: [PATCH 17/37] Added function prototype for set_npc_yaw. Match NpcJump0, NpcJump1, GetNpcYaw, SetNpcYaw --- .../code_f2470_len_27f0/GetNpcYaw.s | 36 ----------------- .../code_f2470_len_27f0/NpcJump0.s | 13 ------- .../code_f2470_len_27f0/NpcJump1.s | 13 ------- .../code_f2470_len_27f0/SetNpcYaw.s | 39 ------------------- include/functions.h | 1 + src/code_13870_len_6980.c | 2 +- src/code_f2470_len_27f0.c | 36 +++++++++++++++-- 7 files changed, 34 insertions(+), 106 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s b/asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s deleted file mode 100644 index 87129f245b..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel GetNpcYaw -/* 0F33C0 802CEA10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0F33C4 802CEA14 AFB10014 */ sw $s1, 0x14($sp) -/* 0F33C8 802CEA18 0080882D */ daddu $s1, $a0, $zero -/* 0F33CC 802CEA1C AFBF0018 */ sw $ra, 0x18($sp) -/* 0F33D0 802CEA20 AFB00010 */ sw $s0, 0x10($sp) -/* 0F33D4 802CEA24 8E30000C */ lw $s0, 0xc($s1) -/* 0F33D8 802CEA28 8E050000 */ lw $a1, ($s0) -/* 0F33DC 802CEA2C 0C0B1EAF */ jal get_variable -/* 0F33E0 802CEA30 26100004 */ addiu $s0, $s0, 4 -/* 0F33E4 802CEA34 0220202D */ daddu $a0, $s1, $zero -/* 0F33E8 802CEA38 8E100000 */ lw $s0, ($s0) -/* 0F33EC 802CEA3C 0C0B36B0 */ jal resolve_npc -/* 0F33F0 802CEA40 0040282D */ daddu $a1, $v0, $zero -/* 0F33F4 802CEA44 5040000A */ beql $v0, $zero, .L802CEA70 -/* 0F33F8 802CEA48 24020002 */ addiu $v0, $zero, 2 -/* 0F33FC 802CEA4C C44C000C */ lwc1 $f12, 0xc($v0) -/* 0F3400 802CEA50 0C00A6C9 */ jal clamp_angle -/* 0F3404 802CEA54 00000000 */ nop -/* 0F3408 802CEA58 0220202D */ daddu $a0, $s1, $zero -/* 0F340C 802CEA5C 4600008D */ trunc.w.s $f2, $f0 -/* 0F3410 802CEA60 44061000 */ mfc1 $a2, $f2 -/* 0F3414 802CEA64 0C0B2026 */ jal set_variable -/* 0F3418 802CEA68 0200282D */ daddu $a1, $s0, $zero -/* 0F341C 802CEA6C 24020002 */ addiu $v0, $zero, 2 -.L802CEA70: -/* 0F3420 802CEA70 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F3424 802CEA74 8FB10014 */ lw $s1, 0x14($sp) -/* 0F3428 802CEA78 8FB00010 */ lw $s0, 0x10($sp) -/* 0F342C 802CEA7C 03E00008 */ jr $ra -/* 0F3430 802CEA80 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s b/asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s deleted file mode 100644 index 4562c6e55d..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel NpcJump0 -/* 0F3074 802CE6C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F3078 802CE6C8 AFBF0010 */ sw $ra, 0x10($sp) -/* 0F307C 802CE6CC 0C0B390D */ jal _npc_jump_to -/* 0F3080 802CE6D0 0000302D */ daddu $a2, $zero, $zero -/* 0F3084 802CE6D4 8FBF0010 */ lw $ra, 0x10($sp) -/* 0F3088 802CE6D8 03E00008 */ jr $ra -/* 0F308C 802CE6DC 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s b/asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s deleted file mode 100644 index 990cfe08e0..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel NpcJump1 -/* 0F3090 802CE6E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F3094 802CE6E4 AFBF0010 */ sw $ra, 0x10($sp) -/* 0F3098 802CE6E8 0C0B390D */ jal _npc_jump_to -/* 0F309C 802CE6EC 24060001 */ addiu $a2, $zero, 1 -/* 0F30A0 802CE6F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 0F30A4 802CE6F4 03E00008 */ jr $ra -/* 0F30A8 802CE6F8 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s deleted file mode 100644 index 293c1c3504..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel SetNpcYaw -/* 0F3434 802CEA84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0F3438 802CEA88 AFB20018 */ sw $s2, 0x18($sp) -/* 0F343C 802CEA8C 0080902D */ daddu $s2, $a0, $zero -/* 0F3440 802CEA90 AFBF001C */ sw $ra, 0x1c($sp) -/* 0F3444 802CEA94 AFB10014 */ sw $s1, 0x14($sp) -/* 0F3448 802CEA98 AFB00010 */ sw $s0, 0x10($sp) -/* 0F344C 802CEA9C 8E50000C */ lw $s0, 0xc($s2) -/* 0F3450 802CEAA0 8E050000 */ lw $a1, ($s0) -/* 0F3454 802CEAA4 0C0B1EAF */ jal get_variable -/* 0F3458 802CEAA8 26100004 */ addiu $s0, $s0, 4 -/* 0F345C 802CEAAC 0240202D */ daddu $a0, $s2, $zero -/* 0F3460 802CEAB0 0C0B36B0 */ jal resolve_npc -/* 0F3464 802CEAB4 0040282D */ daddu $a1, $v0, $zero -/* 0F3468 802CEAB8 0040882D */ daddu $s1, $v0, $zero -/* 0F346C 802CEABC 1220000B */ beqz $s1, .L802CEAEC -/* 0F3470 802CEAC0 24020002 */ addiu $v0, $zero, 2 -/* 0F3474 802CEAC4 8E050000 */ lw $a1, ($s0) -/* 0F3478 802CEAC8 0C0B1EAF */ jal get_variable -/* 0F347C 802CEACC 0240202D */ daddu $a0, $s2, $zero -/* 0F3480 802CEAD0 44820000 */ mtc1 $v0, $f0 -/* 0F3484 802CEAD4 00000000 */ nop -/* 0F3488 802CEAD8 46800020 */ cvt.s.w $f0, $f0 -/* 0F348C 802CEADC 44050000 */ mfc1 $a1, $f0 -/* 0F3490 802CEAE0 0C00ECD0 */ jal set_npc_yaw -/* 0F3494 802CEAE4 0220202D */ daddu $a0, $s1, $zero -/* 0F3498 802CEAE8 24020002 */ addiu $v0, $zero, 2 -.L802CEAEC: -/* 0F349C 802CEAEC 8FBF001C */ lw $ra, 0x1c($sp) -/* 0F34A0 802CEAF0 8FB20018 */ lw $s2, 0x18($sp) -/* 0F34A4 802CEAF4 8FB10014 */ lw $s1, 0x14($sp) -/* 0F34A8 802CEAF8 8FB00010 */ lw $s0, 0x10($sp) -/* 0F34AC 802CEAFC 03E00008 */ jr $ra -/* 0F34B0 802CEB00 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/include/functions.h b/include/functions.h index e61f021837..69350a9b51 100644 --- a/include/functions.h +++ b/include/functions.h @@ -35,6 +35,7 @@ f32 update_lerp(Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); Npc* get_npc_safe(NpcId npcId); Npc* get_npc_unsafe(NpcId npcId); Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr); +void set_npc_yaw(Npc* npcPtr, f32 angle); f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by); f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz); diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index 12cc0c59b8..b28c9c5755 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -64,7 +64,7 @@ INCLUDE_ASM(code_13870_len_6980, func_8003B1A8); INCLUDE_ASM(code_13870_len_6980, func_8003B1B0); -INCLUDE_ASM(code_13870_len_6980, set_npc_yaw); +void INCLUDE_ASM(code_13870_len_6980, set_npc_yaw, Npc* npcPtr, f32 angle); INCLUDE_ASM(code_13870_len_6980, func_8003B3D0); diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 28e3c0c15d..20d8b64b5b 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -143,15 +143,43 @@ INCLUDE_API_ASM(code_f2470_len_27f0, NpcMoveTo); INCLUDE_ASM(code_f2470_len_27f0, _npc_jump_to); -INCLUDE_API_ASM(code_f2470_len_27f0, NpcJump0); +void NpcJump0(ScriptInstance* script, s32 isInitialCall) { + _npc_jump_to(script, isInitialCall, 0); +} -INCLUDE_API_ASM(code_f2470_len_27f0, NpcJump1); +void NpcJump1(ScriptInstance* script, s32 isInitialCall) { + _npc_jump_to(script, isInitialCall, 1); +} INCLUDE_API_ASM(code_f2470_len_27f0, NpcFlyTo); -INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcYaw); +ApiStatus GetNpcYaw(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + Bytecode outVar = *ptrReadPos++; + Npc* npcPtr = resolve_npc(script, npcID); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcYaw); + if (npcPtr != NULL) { + s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching + if (todo) { + set_variable(script, outVar, clamp_angle(npcPtr->yaw)); + } + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} + +ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + set_npc_yaw(npcPtr, get_variable(script, *ptrReadPos++)); + return ApiStatus_DONE2; // Doesn't match if omitted + } + return ApiStatus_DONE2; +} INCLUDE_API_ASM(code_f2470_len_27f0, InterpNpcYaw); From 728c879b9fa12647c96932857db29d8d7e99c7db Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 19 Aug 2020 01:23:52 +0100 Subject: [PATCH 18/37] resolve clang-tidy errors --- .clang-tidy | 2 +- Makefile | 8 ++++---- include/common_structs.h | 15 ++++++++++----- include/variables.h | 11 ++++------- src/code_341d0_len_20d0.c | 2 +- src/code_80850_len_3060.c | 1 - src/code_dbd70_len_700.c | 2 -- src/code_e79b0_len_1920.c | 5 ++--- src/code_e92d0_len_5da0.c | 23 +++++++++++------------ src/code_f2470_len_27f0.c | 2 +- src/code_fa4c0_len_3bf0.c | 10 +++++----- src/os/code_3d2f0_len_10.c | 2 +- src/os/code_4a1f0_len_170.c | 2 +- 13 files changed, 41 insertions(+), 44 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index d1f01520b0..8a77d190b1 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,2 +1,2 @@ -Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-clang-diagnostic-error' +Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-clang-diagnostic-error' HeaderFilterRegex: '(src|include)\/.*\.h' diff --git a/Makefile b/Makefile index 95b28a0690..f3ff32cd8e 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,8 @@ ifdef PM_HEADER_REBUILD H_FILES := $(foreach dir,$(INCLUDE_DIRS),$(wildcard $(dir)/*.h)) endif DATA_FILES := $(foreach dir,$(DATA_DIRS),$(wildcard $(dir)/*.bin)) -COMPRESSED_FILES := $(foreach dir,$(COMPRESSED_DIRS),$(wildcard $(dir)/*.yay0)) -MAP_FILES := $(foreach dir,$(MAP_DIRS),$(wildcard $(dir)/*.FS)) +COMPRESSED_FILES := $(foreach dir,$(COMPRESSED_DIRS),$(wildcard $(dir)/*.yay0)) +MAP_FILES := $(foreach dir,$(MAP_DIRS),$(wildcard $(dir)/*.FS)) BGM_FILES := $(foreach dir,$(BGM_DIRS),$(wildcard $(dir)/*.bgm)) # Object files @@ -54,10 +54,10 @@ OBJCOPY = $(CROSS)objcopy TARGET = papermario -CPPFLAGS = -Iinclude -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 +CPPFLAGS = -fno-builtin -Iinclude -D _LANGUAGE_C -ffreestanding -DF3DEX_GBI_2 ASFLAGS = -EB -march=vr4300 -mtune=vr4300 -Iinclude OLDASFLAGS= -EB -Iinclude -CFLAGS = -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 +CFLAGS = -fno-builtin -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections ######################## Targets ############################# diff --git a/include/common_structs.h b/include/common_structs.h index d12f2d7414..7900ed00fe 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -222,6 +222,11 @@ typedef struct StaticNpcSettings { /* 0x2A */ s16 unkFlags; } StaticNpcSettings; // size = 0x2C +typedef union ScriptBufferValue { + f32 f; + s32 s; +} ScriptBufferValue; + typedef struct ScriptInstance { /* 0x000 */ u8 state; /* 0x001 */ u8 currentArgc; @@ -247,9 +252,9 @@ typedef struct ScriptInstance { /* 0x0F0 */ s32 loopCounterTable[8]; /* 0x110 */ u8 switchBlockState[8]; /* 0x118 */ s32 switchBlockValue[8]; - /* 0x138 */ s32* buffer; - /* 0x13C */ UNK_PTR array; - /* 0x140 */ UNK_PTR flagArray; + /* 0x138 */ ScriptBufferValue* buffer; + /* 0x13C */ s32* array; + /* 0x140 */ s32* flagArray; /* 0x144 */ s32 uniqueID; /* 0x148 */ struct Enemy* ownerActorID; /* controller*, battle ID, trigger* */ /* 0x14C */ u32 ownerID; /* can be an npcID, a triggerID, a trigger ptr */ @@ -1268,8 +1273,8 @@ typedef struct TileDescriptor { } TileDescriptor; // size = 0x30 typedef struct BackgroundHeader { - /* 0x00 */ u32 raster; - /* 0x04 */ u32 palette; + /* 0x00 */ UNK_PTR raster; + /* 0x04 */ UNK_PTR palette; /* 0x08 */ u16 startX; /* 0x0A */ u16 startY; /* 0x0C */ u16 width; diff --git a/include/variables.h b/include/variables.h index d3602c9944..893888fe81 100644 --- a/include/variables.h +++ b/include/variables.h @@ -56,10 +56,10 @@ extern PrintContext* gCurrentPrintContext; extern PrintContext* D_802DB268; // Triggers -/* 0x80151334 */ extern s16 gTriggerCount; -/* 0x80159190 */ extern Trigger gTriggerList1[64]; -/* 0x80159290 */ extern Trigger gTriggerList2[64]; -/* 0x80159390 */ extern Trigger** gCurrentTriggerListPtr[64]; +extern s16 gTriggerCount; +extern Trigger* gTriggerList1[64]; +extern Trigger* gTriggerList2[64]; +extern Trigger** gCurrentTriggerListPtr[64]; extern u16 gMapTransitionAlpha; extern u16 D_800A0942; @@ -76,8 +76,5 @@ extern UNK_TYPE D_80147474; extern UNK_TYPE D_80147574; extern UNK_TYPE D_80109270; extern UNK_TYPE D_80108558; -extern u16 D_800A0940; -extern u16 D_800A0942; -extern s16 D_800A0944; #endif diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c index 3f7e624218..87e02a201a 100644 --- a/src/code_341d0_len_20d0.c +++ b/src/code_341d0_len_20d0.c @@ -40,6 +40,6 @@ INCLUDE_ASM("code_341d0_len_20d0", get_current_map_header); INCLUDE_ASM("code_341d0_len_20d0", get_map_IDs_by_name); -INCLUDE_ASM("code_341d0_len_20d0", load_asset_by_name); +void* INCLUDE_ASM("code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize); INCLUDE_ASM("code_341d0_len_20d0", get_asset_offset); diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index caa5d64198..75d76ba0e6 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -373,7 +373,6 @@ void show_coin_counter(void) { uiStatus->ignoreChanges = 1; D_8010CD10 = 1; } - return; } void hide_coin_counter(void) { diff --git a/src/code_dbd70_len_700.c b/src/code_dbd70_len_700.c index b03cb1c4f2..5ca62082c6 100644 --- a/src/code_dbd70_len_700.c +++ b/src/code_dbd70_len_700.c @@ -7,7 +7,6 @@ void default_trigger_function_handler(s32* arg0) { INCLUDE_ASM("code_dbd70_len_700", clear_trigger_data); -//INCLUDE_ASM("code_dbd70_len_700", init_trigger_list); void init_trigger_list(void) { if ((*gGameStatusPtr)->isBattle == 0) { *gCurrentTriggerListPtr = gTriggerList1; @@ -40,7 +39,6 @@ void delete_trigger(Trigger* toDelete) { INCLUDE_ASM("code_dbd70_len_700", is_trigger_bound); -//INCLUDE_ASM("code_dbd70_len_700", get_trigger_by_id); Trigger* get_trigger_by_id(s32 triggerID) { return (*gCurrentTriggerListPtr)[triggerID]; } diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index 8df4e5ca69..c412d6f728 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -243,8 +243,7 @@ s32 resume_all_group(s32 groupFlags) { } } - -void suspend_group_others(s32 script, s32 groupFlags) { +void suspend_group_others(ScriptInstance* script, s32 groupFlags) { s32 i; ScriptInstance* scriptContextPtr; @@ -256,7 +255,7 @@ void suspend_group_others(s32 script, s32 groupFlags) { } } -void resume_group_others(s32 script, s32 groupFlags) { +void resume_group_others(ScriptInstance* script, s32 groupFlags) { s32 i; ScriptInstance* scriptContextPtr; diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c index 543723ce04..cc57a3e6ed 100644 --- a/src/code_e92d0_len_5da0.c +++ b/src/code_e92d0_len_5da0.c @@ -68,7 +68,6 @@ ApiStatus si_handle_if_AND(ScriptInstance* script) { return ApiStatus_DONE2; } -//INCLUDE_ASM("code_e92d0_len_5da0", si_handle_if_not_AND); ApiStatus si_handle_if_not_AND(ScriptInstance* script) { s32 var1; s32* ptrReadPos = script->ptrReadPos; @@ -197,20 +196,19 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_multiplyF); INCLUDE_ASM("code_e92d0_len_5da0", si_handle_divideF); ApiStatus si_handle_set_int_buffer_ptr(ScriptInstance* script) { - script->buffer = get_variable(script, *script->ptrReadPos); + script->buffer = (ScriptBufferValue*)get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus si_handle_set_float_buffer_ptr(ScriptInstance* script) { - script->buffer = get_variable(script, *script->ptrReadPos); + script->buffer = (ScriptBufferValue*)get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus si_handle_get_1_word(ScriptInstance* script) { - s32 ptrReadPos = *script->ptrReadPos; - s32 buffer = *script->buffer++; + s32 out = *script->ptrReadPos; - set_variable(script, ptrReadPos, buffer); + set_variable(script, out, (*script->buffer++).s); return ApiStatus_DONE2; } @@ -222,9 +220,10 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_4_word); ApiStatus si_handle_get_Nth_word(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 curPtrReadPos = ptrReadPos[0]; + s32 out = ptrReadPos[0]; + s32 n = get_variable(script, ptrReadPos[1]); - set_variable(script, curPtrReadPos, script->buffer[get_variable(script, ptrReadPos[1])]); + set_variable(script, out, script->buffer[n].s); return ApiStatus_DONE2; } @@ -239,12 +238,12 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_4_float); INCLUDE_ASM("code_e92d0_len_5da0", si_handle_get_Nth_float); ApiStatus si_handle_set_array(ScriptInstance* script) { - script->array = get_variable(script, *script->ptrReadPos); + script->array = (s32*)get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } ApiStatus si_handle_set_flag_array(ScriptInstance* script) { - script->flagArray = get_variable(script, *script->ptrReadPos); + script->flagArray = (s32*)get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } @@ -293,7 +292,7 @@ ApiStatus si_handle_exec_wait(ScriptInstance* script) { } ApiStatus si_handle_jump(ScriptInstance* script) { - script->ptrFirstLine = get_variable(script, *script->ptrReadPos); + script->ptrFirstLine = (Bytecode*)get_variable(script, *script->ptrReadPos); restart_script(script); return ApiStatus_DONE2; } @@ -387,7 +386,7 @@ ApiStatus func_802C6E14(ScriptInstance* script) { ApiStatus INCLUDE_ASM("code_e92d0_len_5da0", si_handle_print_debug_var); ApiStatus func_802C739C(ScriptInstance* script) { - script->ptrSavedPosition = *script->ptrReadPos; + script->ptrSavedPosition = (Bytecode*)*script->ptrReadPos; return ApiStatus_DONE2; } diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 0f6e402e7b..24858f9194 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -28,7 +28,7 @@ ApiStatus GetNpcPointer(ScriptInstance* script, s32 isInitialCall) { NpcId npcID = get_variable(script, *ptrReadPos++); Bytecode varNPC = *ptrReadPos++; - set_variable(script, varNPC, get_npc_safe(npcID)); + set_variable(script, varNPC, (s32)get_npc_safe(npcID)); return ApiStatus_DONE2; } diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c index 2995494b67..ca4c190c57 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/code_fa4c0_len_3bf0.c @@ -181,9 +181,9 @@ ApiStatus FindKeyItem(ScriptInstance* script, s32 isInitialCall) { ApiStatus AddItem(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 itemID = get_variable(script, *ptrReadPos++); - s32* ptrNextPos = (s32*) *ptrReadPos++; + Bytecode outItemIdx = *ptrReadPos++; - set_variable(script, ptrNextPos, add_item(itemID)); + set_variable(script, outItemIdx, add_item(itemID)); return ApiStatus_DONE2; } @@ -291,10 +291,10 @@ ApiStatus RemoveItemEntity(ScriptInstance* script, s32 isInitialCall) { ApiStatus AddBadge(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 itemID = get_variable(script, *ptrReadPos++); - s32* ptrNextPos = (s32*) *ptrReadPos++; + s32 badgeID = get_variable(script, *ptrReadPos++); + Bytecode outBadgeIdx = *ptrReadPos++; - set_variable(script, ptrNextPos, add_badge(itemID)); + set_variable(script, outBadgeIdx, add_badge(badgeID)); return ApiStatus_DONE2; } diff --git a/src/os/code_3d2f0_len_10.c b/src/os/code_3d2f0_len_10.c index 74e91100d8..b2ae29f1e4 100644 --- a/src/os/code_3d2f0_len_10.c +++ b/src/os/code_3d2f0_len_10.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_API_ASM("os/code_3d2f0_len_10", sqrtf); +f32 INCLUDE_ASM("os/code_3d2f0_len_10", sqrtf, f32 value); diff --git a/src/os/code_4a1f0_len_170.c b/src/os/code_4a1f0_len_170.c index 2420933dc0..e7509593d6 100644 --- a/src/os/code_4a1f0_len_170.c +++ b/src/os/code_4a1f0_len_170.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("os/code_4a1f0_len_170", decode_yay0); +void INCLUDE_ASM("os/code_4a1f0_len_170", decode_yay0, void* src, void* dest); From 7ea15f8f8a03242c1eec6f3c541536f2a695860f Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 19 Aug 2020 01:43:40 +0100 Subject: [PATCH 19/37] use bash rather than sh in scripts --- format.sh | 2 ++ install.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/format.sh b/format.sh index 5f631f128b..f12a7a3f54 100755 --- a/format.sh +++ b/format.sh @@ -1,3 +1,5 @@ +#!/bin/bash + COMPILER_OPTS="-fno-builtin -std=gnu89 -Iinclude -Isrc -D_LANGUAGE_C" shopt -s globstar diff --git a/install.sh b/install.sh index 78facc3311..a916afcd4b 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Ubuntu if command -v apt-install &> /dev/null; then From 2864ba6476d419720e4da7c0fbbcaca6bc6e272b Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 18:24:56 -0700 Subject: [PATCH 20/37] Remove comments about omitting return statements --- src/code_f2470_len_27f0.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 20d8b64b5b..470df683ca 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -51,7 +51,7 @@ ApiStatus SetNpcScale(ScriptInstance* script, s32 isInitialCall) { npcPtr->scale.y = sizeY; npcPtr->scale.z = sizeZ; } - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -69,7 +69,7 @@ ApiStatus SetNpcCollisionSize(ScriptInstance* script, s32 isInitialCall) { npcPtr->collisionHeight = height; npcPtr->collisionRadius = radius; } - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -82,7 +82,7 @@ ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { if(npcPtr != NULL) { npcPtr->moveSpeed = speed; - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -95,7 +95,7 @@ ApiStatus SetNpcJumpscale(ScriptInstance* script, s32 isInitialCall) { if(npcPtr != NULL) { npcPtr->jumpScale = jumpScale; - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -108,7 +108,7 @@ ApiStatus SetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { if (npcPtr != NULL) { set_npc_animation(npcPtr, animation); - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -121,7 +121,7 @@ ApiStatus GetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { if (npcPtr != NULL) { set_variable(script, outVar, npcPtr->currentAnim); - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -134,7 +134,7 @@ ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { if (npcPtr != NULL) { npcPtr->animationSpeed = animationSpeed; - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -164,7 +164,7 @@ ApiStatus GetNpcYaw(ScriptInstance* script, s32 isInitialCall) { if (todo) { set_variable(script, outVar, clamp_angle(npcPtr->yaw)); } - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } @@ -176,7 +176,7 @@ ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) { if (npcPtr != NULL) { set_npc_yaw(npcPtr, get_variable(script, *ptrReadPos++)); - return ApiStatus_DONE2; // Doesn't match if omitted + return ApiStatus_DONE2; } return ApiStatus_DONE2; } From 09e8b625cf00cd2773e89b16bfdf80b244382ce4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Tue, 18 Aug 2020 22:36:21 -0400 Subject: [PATCH 21/37] More SI functions --- .../code_e92d0_len_5da0/si_handle_Loop.s | 27 --- .../si_handle_end_switch.s | 20 -- .../si_handle_get_1_float.s | 28 --- .../si_handle_get_2_float.s | 42 ---- .../si_handle_get_2_word.s | 32 --- .../si_handle_get_3_float.s | 54 ----- .../si_handle_get_3_word.s | 40 ---- .../si_handle_get_4_float.s | 66 ------ .../si_handle_get_4_word.s | 48 ----- .../si_handle_get_Nth_float.s | 30 --- .../si_handle_if_not_AND.s | 29 --- src/code_e92d0_len_5da0.c | 193 ++++++++++++++---- 12 files changed, 157 insertions(+), 452 deletions(-) delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s delete mode 100644 asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s deleted file mode 100644 index de2382833d..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_Loop -/* 0E93B0 802C4A00 8C83000C */ lw $v1, 0xc($a0) -/* 0E93B4 802C4A04 90820006 */ lbu $v0, 6($a0) -/* 0E93B8 802C4A08 8C660000 */ lw $a2, ($v1) -/* 0E93BC 802C4A0C 24420001 */ addiu $v0, $v0, 1 -/* 0E93C0 802C4A10 A0820006 */ sb $v0, 6($a0) -/* 0E93C4 802C4A14 00021600 */ sll $v0, $v0, 0x18 -/* 0E93C8 802C4A18 00022E03 */ sra $a1, $v0, 0x18 -/* 0E93CC 802C4A1C 28A20008 */ slti $v0, $a1, 8 -/* 0E93D0 802C4A20 14400003 */ bnez $v0, .L802C4A30 -/* 0E93D4 802C4A24 24630004 */ addiu $v1, $v1, 4 -.L802C4A28: -/* 0E93D8 802C4A28 080B128A */ j .L802C4A28 -/* 0E93DC 802C4A2C 00000000 */ nop - -.L802C4A30: -/* 0E93E0 802C4A30 00051080 */ sll $v0, $a1, 2 -/* 0E93E4 802C4A34 00821021 */ addu $v0, $a0, $v0 -/* 0E93E8 802C4A38 AC4300D0 */ sw $v1, 0xd0($v0) -/* 0E93EC 802C4A3C AC4600F0 */ sw $a2, 0xf0($v0) -/* 0E93F0 802C4A40 03E00008 */ jr $ra -/* 0E93F4 802C4A44 24020002 */ addiu $v0, $zero, 2 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s deleted file mode 100644 index fae1fd0e38..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_end_switch -/* 0EA0C8 802C5718 80820007 */ lb $v0, 7($a0) -/* 0EA0CC 802C571C 04430003 */ bgezl $v0, .L802C572C -/* 0EA0D0 802C5720 00821021 */ addu $v0, $a0, $v0 -.L802C5724: -/* 0EA0D4 802C5724 080B15C9 */ j .L802C5724 -/* 0EA0D8 802C5728 00000000 */ nop - -.L802C572C: -/* 0EA0DC 802C572C A0400110 */ sb $zero, 0x110($v0) -/* 0EA0E0 802C5730 90820007 */ lbu $v0, 7($a0) -/* 0EA0E4 802C5734 2442FFFF */ addiu $v0, $v0, -1 -/* 0EA0E8 802C5738 A0820007 */ sb $v0, 7($a0) -/* 0EA0EC 802C573C 03E00008 */ jr $ra -/* 0EA0F0 802C5740 24020002 */ addiu $v0, $zero, 2 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s deleted file mode 100644 index 0408e44e97..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_1_float -/* 0EA864 802C5EB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EA868 802C5EB8 AFB00010 */ sw $s0, 0x10($sp) -/* 0EA86C 802C5EBC 0080802D */ daddu $s0, $a0, $zero -/* 0EA870 802C5EC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 0EA874 802C5EC4 AFB10014 */ sw $s1, 0x14($sp) -/* 0EA878 802C5EC8 8E03000C */ lw $v1, 0xc($s0) -/* 0EA87C 802C5ECC 8E020138 */ lw $v0, 0x138($s0) -/* 0EA880 802C5ED0 8C710000 */ lw $s1, ($v1) -/* 0EA884 802C5ED4 8C450000 */ lw $a1, ($v0) -/* 0EA888 802C5ED8 24420004 */ addiu $v0, $v0, 4 -/* 0EA88C 802C5EDC 0C0B210B */ jal get_float_variable -/* 0EA890 802C5EE0 AE020138 */ sw $v0, 0x138($s0) -/* 0EA894 802C5EE4 0200202D */ daddu $a0, $s0, $zero -/* 0EA898 802C5EE8 44060000 */ mfc1 $a2, $f0 -/* 0EA89C 802C5EEC 0C0B2190 */ jal set_float_variable -/* 0EA8A0 802C5EF0 0220282D */ daddu $a1, $s1, $zero -/* 0EA8A4 802C5EF4 8FBF0018 */ lw $ra, 0x18($sp) -/* 0EA8A8 802C5EF8 8FB10014 */ lw $s1, 0x14($sp) -/* 0EA8AC 802C5EFC 8FB00010 */ lw $s0, 0x10($sp) -/* 0EA8B0 802C5F00 24020002 */ addiu $v0, $zero, 2 -/* 0EA8B4 802C5F04 03E00008 */ jr $ra -/* 0EA8B8 802C5F08 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s deleted file mode 100644 index 1515734e85..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_2_float -/* 0EA8BC 802C5F0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EA8C0 802C5F10 AFB00010 */ sw $s0, 0x10($sp) -/* 0EA8C4 802C5F14 0080802D */ daddu $s0, $a0, $zero -/* 0EA8C8 802C5F18 AFBF001C */ sw $ra, 0x1c($sp) -/* 0EA8CC 802C5F1C AFB20018 */ sw $s2, 0x18($sp) -/* 0EA8D0 802C5F20 AFB10014 */ sw $s1, 0x14($sp) -/* 0EA8D4 802C5F24 8E11000C */ lw $s1, 0xc($s0) -/* 0EA8D8 802C5F28 8E020138 */ lw $v0, 0x138($s0) -/* 0EA8DC 802C5F2C 8E320000 */ lw $s2, ($s1) -/* 0EA8E0 802C5F30 26310004 */ addiu $s1, $s1, 4 -/* 0EA8E4 802C5F34 8C450000 */ lw $a1, ($v0) -/* 0EA8E8 802C5F38 24420004 */ addiu $v0, $v0, 4 -/* 0EA8EC 802C5F3C 0C0B210B */ jal get_float_variable -/* 0EA8F0 802C5F40 AE020138 */ sw $v0, 0x138($s0) -/* 0EA8F4 802C5F44 0200202D */ daddu $a0, $s0, $zero -/* 0EA8F8 802C5F48 44060000 */ mfc1 $a2, $f0 -/* 0EA8FC 802C5F4C 0C0B2190 */ jal set_float_variable -/* 0EA900 802C5F50 0240282D */ daddu $a1, $s2, $zero -/* 0EA904 802C5F54 0200202D */ daddu $a0, $s0, $zero -/* 0EA908 802C5F58 8E020138 */ lw $v0, 0x138($s0) -/* 0EA90C 802C5F5C 8E310000 */ lw $s1, ($s1) -/* 0EA910 802C5F60 8C450000 */ lw $a1, ($v0) -/* 0EA914 802C5F64 24420004 */ addiu $v0, $v0, 4 -/* 0EA918 802C5F68 0C0B210B */ jal get_float_variable -/* 0EA91C 802C5F6C AE020138 */ sw $v0, 0x138($s0) -/* 0EA920 802C5F70 0200202D */ daddu $a0, $s0, $zero -/* 0EA924 802C5F74 44060000 */ mfc1 $a2, $f0 -/* 0EA928 802C5F78 0C0B2190 */ jal set_float_variable -/* 0EA92C 802C5F7C 0220282D */ daddu $a1, $s1, $zero -/* 0EA930 802C5F80 8FBF001C */ lw $ra, 0x1c($sp) -/* 0EA934 802C5F84 8FB20018 */ lw $s2, 0x18($sp) -/* 0EA938 802C5F88 8FB10014 */ lw $s1, 0x14($sp) -/* 0EA93C 802C5F8C 8FB00010 */ lw $s0, 0x10($sp) -/* 0EA940 802C5F90 24020002 */ addiu $v0, $zero, 2 -/* 0EA944 802C5F94 03E00008 */ jr $ra -/* 0EA948 802C5F98 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s deleted file mode 100644 index d3fad7af84..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_2_word -/* 0EA674 802C5CC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EA678 802C5CC8 AFB00010 */ sw $s0, 0x10($sp) -/* 0EA67C 802C5CCC 0080802D */ daddu $s0, $a0, $zero -/* 0EA680 802C5CD0 AFBF0018 */ sw $ra, 0x18($sp) -/* 0EA684 802C5CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 0EA688 802C5CD8 8E11000C */ lw $s1, 0xc($s0) -/* 0EA68C 802C5CDC 8E020138 */ lw $v0, 0x138($s0) -/* 0EA690 802C5CE0 8E250000 */ lw $a1, ($s1) -/* 0EA694 802C5CE4 26310004 */ addiu $s1, $s1, 4 -/* 0EA698 802C5CE8 8C460000 */ lw $a2, ($v0) -/* 0EA69C 802C5CEC 24420004 */ addiu $v0, $v0, 4 -/* 0EA6A0 802C5CF0 0C0B2026 */ jal set_variable -/* 0EA6A4 802C5CF4 AE020138 */ sw $v0, 0x138($s0) -/* 0EA6A8 802C5CF8 0200202D */ daddu $a0, $s0, $zero -/* 0EA6AC 802C5CFC 8C820138 */ lw $v0, 0x138($a0) -/* 0EA6B0 802C5D00 8E250000 */ lw $a1, ($s1) -/* 0EA6B4 802C5D04 8C460000 */ lw $a2, ($v0) -/* 0EA6B8 802C5D08 24420004 */ addiu $v0, $v0, 4 -/* 0EA6BC 802C5D0C 0C0B2026 */ jal set_variable -/* 0EA6C0 802C5D10 AC820138 */ sw $v0, 0x138($a0) -/* 0EA6C4 802C5D14 8FBF0018 */ lw $ra, 0x18($sp) -/* 0EA6C8 802C5D18 8FB10014 */ lw $s1, 0x14($sp) -/* 0EA6CC 802C5D1C 8FB00010 */ lw $s0, 0x10($sp) -/* 0EA6D0 802C5D20 24020002 */ addiu $v0, $zero, 2 -/* 0EA6D4 802C5D24 03E00008 */ jr $ra -/* 0EA6D8 802C5D28 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s deleted file mode 100644 index 19101f0014..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_3_float -/* 0EA94C 802C5F9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EA950 802C5FA0 AFB00010 */ sw $s0, 0x10($sp) -/* 0EA954 802C5FA4 0080802D */ daddu $s0, $a0, $zero -/* 0EA958 802C5FA8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0EA95C 802C5FAC AFB20018 */ sw $s2, 0x18($sp) -/* 0EA960 802C5FB0 AFB10014 */ sw $s1, 0x14($sp) -/* 0EA964 802C5FB4 8E11000C */ lw $s1, 0xc($s0) -/* 0EA968 802C5FB8 8E020138 */ lw $v0, 0x138($s0) -/* 0EA96C 802C5FBC 8E320000 */ lw $s2, ($s1) -/* 0EA970 802C5FC0 26310004 */ addiu $s1, $s1, 4 -/* 0EA974 802C5FC4 8C450000 */ lw $a1, ($v0) -/* 0EA978 802C5FC8 24420004 */ addiu $v0, $v0, 4 -/* 0EA97C 802C5FCC 0C0B210B */ jal get_float_variable -/* 0EA980 802C5FD0 AE020138 */ sw $v0, 0x138($s0) -/* 0EA984 802C5FD4 0200202D */ daddu $a0, $s0, $zero -/* 0EA988 802C5FD8 44060000 */ mfc1 $a2, $f0 -/* 0EA98C 802C5FDC 0C0B2190 */ jal set_float_variable -/* 0EA990 802C5FE0 0240282D */ daddu $a1, $s2, $zero -/* 0EA994 802C5FE4 8E320000 */ lw $s2, ($s1) -/* 0EA998 802C5FE8 26310004 */ addiu $s1, $s1, 4 -/* 0EA99C 802C5FEC 8E020138 */ lw $v0, 0x138($s0) -/* 0EA9A0 802C5FF0 0200202D */ daddu $a0, $s0, $zero -/* 0EA9A4 802C5FF4 8C450000 */ lw $a1, ($v0) -/* 0EA9A8 802C5FF8 24420004 */ addiu $v0, $v0, 4 -/* 0EA9AC 802C5FFC 0C0B210B */ jal get_float_variable -/* 0EA9B0 802C6000 AE020138 */ sw $v0, 0x138($s0) -/* 0EA9B4 802C6004 0200202D */ daddu $a0, $s0, $zero -/* 0EA9B8 802C6008 44060000 */ mfc1 $a2, $f0 -/* 0EA9BC 802C600C 0C0B2190 */ jal set_float_variable -/* 0EA9C0 802C6010 0240282D */ daddu $a1, $s2, $zero -/* 0EA9C4 802C6014 0200202D */ daddu $a0, $s0, $zero -/* 0EA9C8 802C6018 8E020138 */ lw $v0, 0x138($s0) -/* 0EA9CC 802C601C 8E310000 */ lw $s1, ($s1) -/* 0EA9D0 802C6020 8C450000 */ lw $a1, ($v0) -/* 0EA9D4 802C6024 24420004 */ addiu $v0, $v0, 4 -/* 0EA9D8 802C6028 0C0B210B */ jal get_float_variable -/* 0EA9DC 802C602C AE020138 */ sw $v0, 0x138($s0) -/* 0EA9E0 802C6030 0200202D */ daddu $a0, $s0, $zero -/* 0EA9E4 802C6034 44060000 */ mfc1 $a2, $f0 -/* 0EA9E8 802C6038 0C0B2190 */ jal set_float_variable -/* 0EA9EC 802C603C 0220282D */ daddu $a1, $s1, $zero -/* 0EA9F0 802C6040 8FBF001C */ lw $ra, 0x1c($sp) -/* 0EA9F4 802C6044 8FB20018 */ lw $s2, 0x18($sp) -/* 0EA9F8 802C6048 8FB10014 */ lw $s1, 0x14($sp) -/* 0EA9FC 802C604C 8FB00010 */ lw $s0, 0x10($sp) -/* 0EAA00 802C6050 24020002 */ addiu $v0, $zero, 2 -/* 0EAA04 802C6054 03E00008 */ jr $ra -/* 0EAA08 802C6058 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s deleted file mode 100644 index 882286e7b5..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_3_word -/* 0EA6DC 802C5D2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EA6E0 802C5D30 AFB00010 */ sw $s0, 0x10($sp) -/* 0EA6E4 802C5D34 0080802D */ daddu $s0, $a0, $zero -/* 0EA6E8 802C5D38 AFBF0018 */ sw $ra, 0x18($sp) -/* 0EA6EC 802C5D3C AFB10014 */ sw $s1, 0x14($sp) -/* 0EA6F0 802C5D40 8E11000C */ lw $s1, 0xc($s0) -/* 0EA6F4 802C5D44 8E020138 */ lw $v0, 0x138($s0) -/* 0EA6F8 802C5D48 8E250000 */ lw $a1, ($s1) -/* 0EA6FC 802C5D4C 26310004 */ addiu $s1, $s1, 4 -/* 0EA700 802C5D50 8C460000 */ lw $a2, ($v0) -/* 0EA704 802C5D54 24420004 */ addiu $v0, $v0, 4 -/* 0EA708 802C5D58 0C0B2026 */ jal set_variable -/* 0EA70C 802C5D5C AE020138 */ sw $v0, 0x138($s0) -/* 0EA710 802C5D60 8E250000 */ lw $a1, ($s1) -/* 0EA714 802C5D64 26310004 */ addiu $s1, $s1, 4 -/* 0EA718 802C5D68 8E020138 */ lw $v0, 0x138($s0) -/* 0EA71C 802C5D6C 0200202D */ daddu $a0, $s0, $zero -/* 0EA720 802C5D70 8C460000 */ lw $a2, ($v0) -/* 0EA724 802C5D74 24420004 */ addiu $v0, $v0, 4 -/* 0EA728 802C5D78 0C0B2026 */ jal set_variable -/* 0EA72C 802C5D7C AE020138 */ sw $v0, 0x138($s0) -/* 0EA730 802C5D80 0200202D */ daddu $a0, $s0, $zero -/* 0EA734 802C5D84 8C820138 */ lw $v0, 0x138($a0) -/* 0EA738 802C5D88 8E250000 */ lw $a1, ($s1) -/* 0EA73C 802C5D8C 8C460000 */ lw $a2, ($v0) -/* 0EA740 802C5D90 24420004 */ addiu $v0, $v0, 4 -/* 0EA744 802C5D94 0C0B2026 */ jal set_variable -/* 0EA748 802C5D98 AC820138 */ sw $v0, 0x138($a0) -/* 0EA74C 802C5D9C 8FBF0018 */ lw $ra, 0x18($sp) -/* 0EA750 802C5DA0 8FB10014 */ lw $s1, 0x14($sp) -/* 0EA754 802C5DA4 8FB00010 */ lw $s0, 0x10($sp) -/* 0EA758 802C5DA8 24020002 */ addiu $v0, $zero, 2 -/* 0EA75C 802C5DAC 03E00008 */ jr $ra -/* 0EA760 802C5DB0 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s deleted file mode 100644 index 39b9ae9d30..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_4_float -/* 0EAA0C 802C605C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EAA10 802C6060 AFB00010 */ sw $s0, 0x10($sp) -/* 0EAA14 802C6064 0080802D */ daddu $s0, $a0, $zero -/* 0EAA18 802C6068 AFBF001C */ sw $ra, 0x1c($sp) -/* 0EAA1C 802C606C AFB20018 */ sw $s2, 0x18($sp) -/* 0EAA20 802C6070 AFB10014 */ sw $s1, 0x14($sp) -/* 0EAA24 802C6074 8E11000C */ lw $s1, 0xc($s0) -/* 0EAA28 802C6078 8E020138 */ lw $v0, 0x138($s0) -/* 0EAA2C 802C607C 8E320000 */ lw $s2, ($s1) -/* 0EAA30 802C6080 26310004 */ addiu $s1, $s1, 4 -/* 0EAA34 802C6084 8C450000 */ lw $a1, ($v0) -/* 0EAA38 802C6088 24420004 */ addiu $v0, $v0, 4 -/* 0EAA3C 802C608C 0C0B210B */ jal get_float_variable -/* 0EAA40 802C6090 AE020138 */ sw $v0, 0x138($s0) -/* 0EAA44 802C6094 0200202D */ daddu $a0, $s0, $zero -/* 0EAA48 802C6098 44060000 */ mfc1 $a2, $f0 -/* 0EAA4C 802C609C 0C0B2190 */ jal set_float_variable -/* 0EAA50 802C60A0 0240282D */ daddu $a1, $s2, $zero -/* 0EAA54 802C60A4 8E320000 */ lw $s2, ($s1) -/* 0EAA58 802C60A8 26310004 */ addiu $s1, $s1, 4 -/* 0EAA5C 802C60AC 8E020138 */ lw $v0, 0x138($s0) -/* 0EAA60 802C60B0 0200202D */ daddu $a0, $s0, $zero -/* 0EAA64 802C60B4 8C450000 */ lw $a1, ($v0) -/* 0EAA68 802C60B8 24420004 */ addiu $v0, $v0, 4 -/* 0EAA6C 802C60BC 0C0B210B */ jal get_float_variable -/* 0EAA70 802C60C0 AE020138 */ sw $v0, 0x138($s0) -/* 0EAA74 802C60C4 0200202D */ daddu $a0, $s0, $zero -/* 0EAA78 802C60C8 44060000 */ mfc1 $a2, $f0 -/* 0EAA7C 802C60CC 0C0B2190 */ jal set_float_variable -/* 0EAA80 802C60D0 0240282D */ daddu $a1, $s2, $zero -/* 0EAA84 802C60D4 8E320000 */ lw $s2, ($s1) -/* 0EAA88 802C60D8 26310004 */ addiu $s1, $s1, 4 -/* 0EAA8C 802C60DC 8E020138 */ lw $v0, 0x138($s0) -/* 0EAA90 802C60E0 0200202D */ daddu $a0, $s0, $zero -/* 0EAA94 802C60E4 8C450000 */ lw $a1, ($v0) -/* 0EAA98 802C60E8 24420004 */ addiu $v0, $v0, 4 -/* 0EAA9C 802C60EC 0C0B210B */ jal get_float_variable -/* 0EAAA0 802C60F0 AE020138 */ sw $v0, 0x138($s0) -/* 0EAAA4 802C60F4 0200202D */ daddu $a0, $s0, $zero -/* 0EAAA8 802C60F8 44060000 */ mfc1 $a2, $f0 -/* 0EAAAC 802C60FC 0C0B2190 */ jal set_float_variable -/* 0EAAB0 802C6100 0240282D */ daddu $a1, $s2, $zero -/* 0EAAB4 802C6104 0200202D */ daddu $a0, $s0, $zero -/* 0EAAB8 802C6108 8E020138 */ lw $v0, 0x138($s0) -/* 0EAABC 802C610C 8E310000 */ lw $s1, ($s1) -/* 0EAAC0 802C6110 8C450000 */ lw $a1, ($v0) -/* 0EAAC4 802C6114 24420004 */ addiu $v0, $v0, 4 -/* 0EAAC8 802C6118 0C0B210B */ jal get_float_variable -/* 0EAACC 802C611C AE020138 */ sw $v0, 0x138($s0) -/* 0EAAD0 802C6120 0200202D */ daddu $a0, $s0, $zero -/* 0EAAD4 802C6124 44060000 */ mfc1 $a2, $f0 -/* 0EAAD8 802C6128 0C0B2190 */ jal set_float_variable -/* 0EAADC 802C612C 0220282D */ daddu $a1, $s1, $zero -/* 0EAAE0 802C6130 8FBF001C */ lw $ra, 0x1c($sp) -/* 0EAAE4 802C6134 8FB20018 */ lw $s2, 0x18($sp) -/* 0EAAE8 802C6138 8FB10014 */ lw $s1, 0x14($sp) -/* 0EAAEC 802C613C 8FB00010 */ lw $s0, 0x10($sp) -/* 0EAAF0 802C6140 24020002 */ addiu $v0, $zero, 2 -/* 0EAAF4 802C6144 03E00008 */ jr $ra -/* 0EAAF8 802C6148 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s deleted file mode 100644 index cfd27ed5ca..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_4_word -/* 0EA764 802C5DB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EA768 802C5DB8 AFB00010 */ sw $s0, 0x10($sp) -/* 0EA76C 802C5DBC 0080802D */ daddu $s0, $a0, $zero -/* 0EA770 802C5DC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 0EA774 802C5DC4 AFB10014 */ sw $s1, 0x14($sp) -/* 0EA778 802C5DC8 8E11000C */ lw $s1, 0xc($s0) -/* 0EA77C 802C5DCC 8E020138 */ lw $v0, 0x138($s0) -/* 0EA780 802C5DD0 8E250000 */ lw $a1, ($s1) -/* 0EA784 802C5DD4 26310004 */ addiu $s1, $s1, 4 -/* 0EA788 802C5DD8 8C460000 */ lw $a2, ($v0) -/* 0EA78C 802C5DDC 24420004 */ addiu $v0, $v0, 4 -/* 0EA790 802C5DE0 0C0B2026 */ jal set_variable -/* 0EA794 802C5DE4 AE020138 */ sw $v0, 0x138($s0) -/* 0EA798 802C5DE8 8E250000 */ lw $a1, ($s1) -/* 0EA79C 802C5DEC 26310004 */ addiu $s1, $s1, 4 -/* 0EA7A0 802C5DF0 8E020138 */ lw $v0, 0x138($s0) -/* 0EA7A4 802C5DF4 0200202D */ daddu $a0, $s0, $zero -/* 0EA7A8 802C5DF8 8C460000 */ lw $a2, ($v0) -/* 0EA7AC 802C5DFC 24420004 */ addiu $v0, $v0, 4 -/* 0EA7B0 802C5E00 0C0B2026 */ jal set_variable -/* 0EA7B4 802C5E04 AE020138 */ sw $v0, 0x138($s0) -/* 0EA7B8 802C5E08 8E250000 */ lw $a1, ($s1) -/* 0EA7BC 802C5E0C 26310004 */ addiu $s1, $s1, 4 -/* 0EA7C0 802C5E10 8E020138 */ lw $v0, 0x138($s0) -/* 0EA7C4 802C5E14 0200202D */ daddu $a0, $s0, $zero -/* 0EA7C8 802C5E18 8C460000 */ lw $a2, ($v0) -/* 0EA7CC 802C5E1C 24420004 */ addiu $v0, $v0, 4 -/* 0EA7D0 802C5E20 0C0B2026 */ jal set_variable -/* 0EA7D4 802C5E24 AE020138 */ sw $v0, 0x138($s0) -/* 0EA7D8 802C5E28 0200202D */ daddu $a0, $s0, $zero -/* 0EA7DC 802C5E2C 8C820138 */ lw $v0, 0x138($a0) -/* 0EA7E0 802C5E30 8E250000 */ lw $a1, ($s1) -/* 0EA7E4 802C5E34 8C460000 */ lw $a2, ($v0) -/* 0EA7E8 802C5E38 24420004 */ addiu $v0, $v0, 4 -/* 0EA7EC 802C5E3C 0C0B2026 */ jal set_variable -/* 0EA7F0 802C5E40 AC820138 */ sw $v0, 0x138($a0) -/* 0EA7F4 802C5E44 8FBF0018 */ lw $ra, 0x18($sp) -/* 0EA7F8 802C5E48 8FB10014 */ lw $s1, 0x14($sp) -/* 0EA7FC 802C5E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 0EA800 802C5E50 24020002 */ addiu $v0, $zero, 2 -/* 0EA804 802C5E54 03E00008 */ jr $ra -/* 0EA808 802C5E58 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s deleted file mode 100644 index 01b0054588..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_get_Nth_float -/* 0EAAFC 802C614C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0EAB00 802C6150 AFB00010 */ sw $s0, 0x10($sp) -/* 0EAB04 802C6154 0080802D */ daddu $s0, $a0, $zero -/* 0EAB08 802C6158 AFBF0018 */ sw $ra, 0x18($sp) -/* 0EAB0C 802C615C AFB10014 */ sw $s1, 0x14($sp) -/* 0EAB10 802C6160 8E02000C */ lw $v0, 0xc($s0) -/* 0EAB14 802C6164 8C450004 */ lw $a1, 4($v0) -/* 0EAB18 802C6168 0C0B1EAF */ jal get_variable -/* 0EAB1C 802C616C 8C510000 */ lw $s1, ($v0) -/* 0EAB20 802C6170 0200202D */ daddu $a0, $s0, $zero -/* 0EAB24 802C6174 8C830138 */ lw $v1, 0x138($a0) -/* 0EAB28 802C6178 00021080 */ sll $v0, $v0, 2 -/* 0EAB2C 802C617C 00431021 */ addu $v0, $v0, $v1 -/* 0EAB30 802C6180 C4420000 */ lwc1 $f2, ($v0) -/* 0EAB34 802C6184 468010A0 */ cvt.s.w $f2, $f2 -/* 0EAB38 802C6188 44061000 */ mfc1 $a2, $f2 -/* 0EAB3C 802C618C 0C0B2190 */ jal set_float_variable -/* 0EAB40 802C6190 0220282D */ daddu $a1, $s1, $zero -/* 0EAB44 802C6194 8FBF0018 */ lw $ra, 0x18($sp) -/* 0EAB48 802C6198 8FB10014 */ lw $s1, 0x14($sp) -/* 0EAB4C 802C619C 8FB00010 */ lw $s0, 0x10($sp) -/* 0EAB50 802C61A0 24020002 */ addiu $v0, $zero, 2 -/* 0EAB54 802C61A4 03E00008 */ jr $ra -/* 0EAB58 802C61A8 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s deleted file mode 100644 index 35c3d92c0c..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel si_handle_if_not_AND -/* 0E9898 802C4EE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0E989C 802C4EEC AFB10014 */ sw $s1, 0x14($sp) -/* 0E98A0 802C4EF0 0080882D */ daddu $s1, $a0, $zero -/* 0E98A4 802C4EF4 AFBF0018 */ sw $ra, 0x18($sp) -/* 0E98A8 802C4EF8 AFB00010 */ sw $s0, 0x10($sp) -/* 0E98AC 802C4EFC 8E30000C */ lw $s0, 0xc($s1) -/* 0E98B0 802C4F00 8E050000 */ lw $a1, ($s0) -/* 0E98B4 802C4F04 0C0B1EAF */ jal get_variable -/* 0E98B8 802C4F08 26100004 */ addiu $s0, $s0, 4 -/* 0E98BC 802C4F0C 8E030000 */ lw $v1, ($s0) -/* 0E98C0 802C4F10 00431024 */ and $v0, $v0, $v1 -/* 0E98C4 802C4F14 10400005 */ beqz $v0, .L802C4F2C -/* 0E98C8 802C4F18 24020002 */ addiu $v0, $zero, 2 -/* 0E98CC 802C4F1C 0C0B223F */ jal si_skip_if -/* 0E98D0 802C4F20 0220202D */ daddu $a0, $s1, $zero -/* 0E98D4 802C4F24 AE220008 */ sw $v0, 8($s1) -/* 0E98D8 802C4F28 24020002 */ addiu $v0, $zero, 2 -.L802C4F2C: -/* 0E98DC 802C4F2C 8FBF0018 */ lw $ra, 0x18($sp) -/* 0E98E0 802C4F30 8FB10014 */ lw $s1, 0x14($sp) -/* 0E98E4 802C4F34 8FB00010 */ lw $s0, 0x10($sp) -/* 0E98E8 802C4F38 03E00008 */ jr $ra -/* 0E98EC 802C4F3C 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c index f4d35b47bb..761dc02461 100644 --- a/src/code_e92d0_len_5da0.c +++ b/src/code_e92d0_len_5da0.c @@ -25,7 +25,18 @@ ApiStatus si_handle_goto(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_Loop); +ApiStatus si_handle_Loop(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var = *thisPos++; + s32 loopDepth = ++script->loopDepth; + + ASSERT(loopDepth < 8); + + script->loopStartTable[loopDepth] = thisPos; + script->loopCounterTable[loopDepth] = var; + + return ApiStatus_DONE2; +} INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_loop); @@ -53,28 +64,21 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_less_equal); INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_greater_equal); ApiStatus si_handle_if_AND(ScriptInstance* script) { - s32 var1; - s32 *ptrReadPos = script->ptrReadPos; + Bytecode* thisPos = script->ptrReadPos; + Bytecode var = *thisPos++; - var1 = ptrReadPos[0]; - ptrReadPos++; - - if ((get_variable(script, var1) & *ptrReadPos) == 0) { + if ((get_variable(script, var) & *thisPos) == 0) { script->ptrNextLine = si_skip_if(script); return ApiStatus_DONE2; } return ApiStatus_DONE2; } -//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_not_AND); ApiStatus si_handle_if_not_AND(ScriptInstance* script) { - s32 var1; - s32 *ptrReadPos = script->ptrReadPos; + Bytecode* thisPos = script->ptrReadPos; + Bytecode var = *thisPos++; - var1 = ptrReadPos[0]; - ptrReadPos++; - - if ((get_variable(script, var1) & *ptrReadPos) != 0) { + if ((get_variable(script, var) & *thisPos) != 0) { script->ptrNextLine = si_skip_if(script); return ApiStatus_DONE2; } @@ -103,12 +107,12 @@ ApiStatus si_handle_switch(ScriptInstance* script) { } ApiStatus si_handle_switch_const(ScriptInstance* script) { - s32 value = *script->ptrReadPos; + Bytecode* thisPos = *script->ptrReadPos; s32 switchDepth = ++script->switchDepth; ASSERT(switchDepth < 8); - script->switchBlockValue[switchDepth] = value; + script->switchBlockValue[switchDepth] = thisPos; script->switchBlockState[switchDepth] = 1; return ApiStatus_DONE2; @@ -156,10 +160,10 @@ ApiStatus si_handle_end_switch(ScriptInstance* script) { } ApiStatus si_handle_set_var(ScriptInstance* script) { - Bytecode* ptrReadPos = script->ptrReadPos; - s32 curPtrReadPos = ptrReadPos[0]; + Bytecode* thisPos = script->ptrReadPos; + s32 curPtrReadPos = thisPos[0]; - set_variable(script, curPtrReadPos, get_variable(script, ptrReadPos[1])); + set_variable(script, curPtrReadPos, get_variable(script, thisPos[1])); return ApiStatus_DONE2; } @@ -169,10 +173,10 @@ ApiStatus si_handle_set_const(ScriptInstance* script) { } ApiStatus si_handle_set_float(ScriptInstance* script) { - Bytecode* ptrReadPos = script->ptrReadPos; - s32 curPtrReadPos = ptrReadPos[0]; + Bytecode* thisPos = script->ptrReadPos; + Bytecode var = *thisPos++; - set_float_variable(script, curPtrReadPos, get_float_variable(script, ptrReadPos[1])); + set_float_variable(script, var, get_float_variable(script, *thisPos)); return ApiStatus_DONE2; } @@ -205,36 +209,152 @@ ApiStatus si_handle_set_float_buffer_ptr(ScriptInstance* script) { } ApiStatus si_handle_get_1_word(ScriptInstance* script) { - s32 ptrReadPos = *script->ptrReadPos; - s32 buffer = *script->buffer++; + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + + var = *thisPos++; + set_variable(script, var, *script->buffer++); - set_variable(script, ptrReadPos, buffer); return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_2_word); +ApiStatus si_handle_get_2_word(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + Bytecode var2; -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_3_word); + var = *thisPos++; + set_variable(script, var, *script->buffer++); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_word); + var2 = *thisPos++; + set_variable(script, var2, *script->buffer++); + + return ApiStatus_DONE2; +} + +ApiStatus si_handle_get_3_word(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + Bytecode var2; + Bytecode var3; + + var = *thisPos++; + set_variable(script, var, *script->buffer++); + + var2 = *thisPos++; + set_variable(script, var2, *script->buffer++); + + var3 = *thisPos++; + set_variable(script, var3, *script->buffer++); + + return ApiStatus_DONE2; +} + +ApiStatus si_handle_get_4_word(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + Bytecode var2; + Bytecode var3; + Bytecode var4; + + var = *thisPos++; + set_variable(script, var, *script->buffer++); + + var2 = *thisPos++; + set_variable(script, var2, *script->buffer++); + + var3 = *thisPos++; + set_variable(script, var3, *script->buffer++); + + var4 = *thisPos++; + set_variable(script, var4, *script->buffer++); + + return ApiStatus_DONE2; +} ApiStatus si_handle_get_Nth_word(ScriptInstance* script) { - Bytecode* ptrReadPos = script->ptrReadPos; - s32 curPtrReadPos = ptrReadPos[0]; + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; - set_variable(script, curPtrReadPos, script->buffer[get_variable(script, ptrReadPos[1])]); + var = *thisPos++; + set_variable(script, var, script->buffer[get_variable(script, *thisPos)]); + return ApiStatus_DONE2; } -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_1_float); +ApiStatus si_handle_get_1_float(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_2_float); + var = *thisPos++; + set_float_variable(script, var, get_float_variable(script, *script->buffer++)); -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_3_float); + return ApiStatus_DONE2; +} -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_float); +ApiStatus si_handle_get_2_float(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + Bytecode var2; -INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_Nth_float); + var = *thisPos++; + set_float_variable(script, var, get_float_variable(script, *script->buffer++)); + + var2 = *thisPos++; + set_float_variable(script, var2, get_float_variable(script, *script->buffer++)); + + return ApiStatus_DONE2; +} + +ApiStatus si_handle_get_3_float(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + Bytecode var2; + Bytecode var3; + + var = *thisPos++; + set_float_variable(script, var, get_float_variable(script, *script->buffer++)); + + var2 = *thisPos++; + set_float_variable(script, var2, get_float_variable(script, *script->buffer++)); + + var3 = *thisPos++; + set_float_variable(script, var3, get_float_variable(script, *script->buffer++)); + + return ApiStatus_DONE2; +} + +ApiStatus si_handle_get_4_float(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + Bytecode var2; + Bytecode var3; + Bytecode var4; + + var = *thisPos++; + set_float_variable(script, var, get_float_variable(script, *script->buffer++)); + + var2 = *thisPos++; + set_float_variable(script, var2, get_float_variable(script, *script->buffer++)); + + var3 = *thisPos++; + set_float_variable(script, var3, get_float_variable(script, *script->buffer++)); + + var4 = *thisPos++; + set_float_variable(script, var4, get_float_variable(script, *script->buffer++)); + + return ApiStatus_DONE2; +} + +ApiStatus si_handle_get_Nth_float(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode var; + + var = *thisPos++; + set_float_variable(script, var, script->buffer[get_variable(script, *thisPos)]); + + return ApiStatus_DONE2; +} ApiStatus si_handle_set_array(ScriptInstance* script) { script->array = get_variable(script, *script->ptrReadPos); @@ -401,6 +521,7 @@ s32 func_802C73B8(ScriptInstance* script) { break; } } + return 1; } From e3575d3b5819add0442acc5fb2270fd41a599c0d Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 21:54:42 -0700 Subject: [PATCH 22/37] Match EnableNpcShadow, EnableNpcBlur, ClearPartnerMoveHistory, GetPartnerPos, DisablePartnerAI, EnablePartnerAI, func_802CF54C, func_802CF56C --- .../ClearPartnerMoveHistory.s | 26 ----- .../code_f2470_len_27f0/DisablePartnerAI.s | 26 ----- .../code_f2470_len_27f0/EnableNpcBlur.s | 42 -------- .../code_f2470_len_27f0/EnableNpcShadow.s | 42 -------- .../code_f2470_len_27f0/EnablePartnerAI.s | 2 + .../code_f2470_len_27f0/GetPartnerPos.s | 51 --------- src/code_f2470_len_27f0.c | 100 ++++++++++++++++-- 7 files changed, 96 insertions(+), 193 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s b/asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s deleted file mode 100644 index 0df55d3a6f..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel ClearPartnerMoveHistory -/* 0F3D20 802CF370 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F3D24 802CF374 AFB00010 */ sw $s0, 0x10($sp) -/* 0F3D28 802CF378 0080802D */ daddu $s0, $a0, $zero -/* 0F3D2C 802CF37C AFBF0014 */ sw $ra, 0x14($sp) -/* 0F3D30 802CF380 8E02000C */ lw $v0, 0xc($s0) -/* 0F3D34 802CF384 0C0B1EAF */ jal get_variable -/* 0F3D38 802CF388 8C450000 */ lw $a1, ($v0) -/* 0F3D3C 802CF38C 0200202D */ daddu $a0, $s0, $zero -/* 0F3D40 802CF390 0C0B36B0 */ jal resolve_npc -/* 0F3D44 802CF394 0040282D */ daddu $a1, $v0, $zero -/* 0F3D48 802CF398 50400004 */ beql $v0, $zero, .L802CF3AC -/* 0F3D4C 802CF39C 24020002 */ addiu $v0, $zero, 2 -/* 0F3D50 802CF3A0 0C03BD17 */ jal clear_partner_move_history -/* 0F3D54 802CF3A4 0040202D */ daddu $a0, $v0, $zero -/* 0F3D58 802CF3A8 24020002 */ addiu $v0, $zero, 2 -.L802CF3AC: -/* 0F3D5C 802CF3AC 8FBF0014 */ lw $ra, 0x14($sp) -/* 0F3D60 802CF3B0 8FB00010 */ lw $s0, 0x10($sp) -/* 0F3D64 802CF3B4 03E00008 */ jr $ra -/* 0F3D68 802CF3B8 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s b/asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s deleted file mode 100644 index 5f5fb43f4d..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel DisablePartnerAI -/* 0F3E98 802CF4E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F3E9C 802CF4EC AFBF0010 */ sw $ra, 0x10($sp) -/* 0F3EA0 802CF4F0 8C82000C */ lw $v0, 0xc($a0) -/* 0F3EA4 802CF4F4 0C0B1EAF */ jal get_variable -/* 0F3EA8 802CF4F8 8C450000 */ lw $a1, ($v0) -/* 0F3EAC 802CF4FC 14400005 */ bnez $v0, .L802CF514 -/* 0F3EB0 802CF500 00000000 */ nop -/* 0F3EB4 802CF504 0C03BCC5 */ jal func_800EF314 -/* 0F3EB8 802CF508 00000000 */ nop -/* 0F3EBC 802CF50C 080B3D47 */ j .L802CF51C -/* 0F3EC0 802CF510 00000000 */ nop - -.L802CF514: -/* 0F3EC4 802CF514 0C03BCC0 */ jal func_800EF300 -/* 0F3EC8 802CF518 00000000 */ nop -.L802CF51C: -/* 0F3ECC 802CF51C 8FBF0010 */ lw $ra, 0x10($sp) -/* 0F3ED0 802CF520 24020002 */ addiu $v0, $zero, 2 -/* 0F3ED4 802CF524 03E00008 */ jr $ra -/* 0F3ED8 802CF528 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s b/asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s deleted file mode 100644 index f9afaf4111..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel EnableNpcBlur -/* 0F3C9C 802CF2EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0F3CA0 802CF2F0 AFB10014 */ sw $s1, 0x14($sp) -/* 0F3CA4 802CF2F4 0080882D */ daddu $s1, $a0, $zero -/* 0F3CA8 802CF2F8 AFBF0018 */ sw $ra, 0x18($sp) -/* 0F3CAC 802CF2FC AFB00010 */ sw $s0, 0x10($sp) -/* 0F3CB0 802CF300 8E30000C */ lw $s0, 0xc($s1) -/* 0F3CB4 802CF304 8E050000 */ lw $a1, ($s0) -/* 0F3CB8 802CF308 0C0B1EAF */ jal get_variable -/* 0F3CBC 802CF30C 26100004 */ addiu $s0, $s0, 4 -/* 0F3CC0 802CF310 0220202D */ daddu $a0, $s1, $zero -/* 0F3CC4 802CF314 8E050000 */ lw $a1, ($s0) -/* 0F3CC8 802CF318 0C0B1EAF */ jal get_variable -/* 0F3CCC 802CF31C 0040802D */ daddu $s0, $v0, $zero -/* 0F3CD0 802CF320 0220202D */ daddu $a0, $s1, $zero -/* 0F3CD4 802CF324 0200282D */ daddu $a1, $s0, $zero -/* 0F3CD8 802CF328 0C0B36B0 */ jal resolve_npc -/* 0F3CDC 802CF32C 0040802D */ daddu $s0, $v0, $zero -/* 0F3CE0 802CF330 5040000A */ beql $v0, $zero, .L802CF35C -/* 0F3CE4 802CF334 24020002 */ addiu $v0, $zero, 2 -/* 0F3CE8 802CF338 12000005 */ beqz $s0, .L802CF350 -/* 0F3CEC 802CF33C 00000000 */ nop -/* 0F3CF0 802CF340 0C00EB49 */ jal enable_npc_blur -/* 0F3CF4 802CF344 0040202D */ daddu $a0, $v0, $zero -/* 0F3CF8 802CF348 080B3CD7 */ j .L802CF35C -/* 0F3CFC 802CF34C 24020002 */ addiu $v0, $zero, 2 - -.L802CF350: -/* 0F3D00 802CF350 0C00EB6B */ jal disable_npc_blur -/* 0F3D04 802CF354 0040202D */ daddu $a0, $v0, $zero -/* 0F3D08 802CF358 24020002 */ addiu $v0, $zero, 2 -.L802CF35C: -/* 0F3D0C 802CF35C 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F3D10 802CF360 8FB10014 */ lw $s1, 0x14($sp) -/* 0F3D14 802CF364 8FB00010 */ lw $s0, 0x10($sp) -/* 0F3D18 802CF368 03E00008 */ jr $ra -/* 0F3D1C 802CF36C 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s b/asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s deleted file mode 100644 index 6fd53b6e0a..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel EnableNpcShadow -/* 0F3C18 802CF268 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0F3C1C 802CF26C AFB10014 */ sw $s1, 0x14($sp) -/* 0F3C20 802CF270 0080882D */ daddu $s1, $a0, $zero -/* 0F3C24 802CF274 AFBF0018 */ sw $ra, 0x18($sp) -/* 0F3C28 802CF278 AFB00010 */ sw $s0, 0x10($sp) -/* 0F3C2C 802CF27C 8E30000C */ lw $s0, 0xc($s1) -/* 0F3C30 802CF280 8E050000 */ lw $a1, ($s0) -/* 0F3C34 802CF284 0C0B1EAF */ jal get_variable -/* 0F3C38 802CF288 26100004 */ addiu $s0, $s0, 4 -/* 0F3C3C 802CF28C 0220202D */ daddu $a0, $s1, $zero -/* 0F3C40 802CF290 8E050000 */ lw $a1, ($s0) -/* 0F3C44 802CF294 0C0B1EAF */ jal get_variable -/* 0F3C48 802CF298 0040802D */ daddu $s0, $v0, $zero -/* 0F3C4C 802CF29C 0220202D */ daddu $a0, $s1, $zero -/* 0F3C50 802CF2A0 0200282D */ daddu $a1, $s0, $zero -/* 0F3C54 802CF2A4 0C0B36B0 */ jal resolve_npc -/* 0F3C58 802CF2A8 0040802D */ daddu $s0, $v0, $zero -/* 0F3C5C 802CF2AC 5040000A */ beql $v0, $zero, .L802CF2D8 -/* 0F3C60 802CF2B0 24020002 */ addiu $v0, $zero, 2 -/* 0F3C64 802CF2B4 12000005 */ beqz $s0, .L802CF2CC -/* 0F3C68 802CF2B8 00000000 */ nop -/* 0F3C6C 802CF2BC 0C00EAE8 */ jal enable_npc_shadow -/* 0F3C70 802CF2C0 0040202D */ daddu $a0, $v0, $zero -/* 0F3C74 802CF2C4 080B3CB6 */ j .L802CF2D8 -/* 0F3C78 802CF2C8 24020002 */ addiu $v0, $zero, 2 - -.L802CF2CC: -/* 0F3C7C 802CF2CC 0C00EAFF */ jal disable_npc_shadow -/* 0F3C80 802CF2D0 0040202D */ daddu $a0, $v0, $zero -/* 0F3C84 802CF2D4 24020002 */ addiu $v0, $zero, 2 -.L802CF2D8: -/* 0F3C88 802CF2D8 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F3C8C 802CF2DC 8FB10014 */ lw $s1, 0x14($sp) -/* 0F3C90 802CF2E0 8FB00010 */ lw $s0, 0x10($sp) -/* 0F3C94 802CF2E4 03E00008 */ jr $ra -/* 0F3C98 802CF2E8 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s b/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s index 18711a8d6f..8b681d06f3 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s +++ b/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s @@ -12,6 +12,7 @@ glabel EnablePartnerAI /* 0F3EF4 802CF544 03E00008 */ jr $ra /* 0F3EF8 802CF548 27BD0018 */ addiu $sp, $sp, 0x18 +glabel func_802CF54C /* 0F3EFC 802CF54C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0F3F00 802CF550 AFBF0010 */ sw $ra, 0x10($sp) /* 0F3F04 802CF554 0C03BD0F */ jal func_800EF43C @@ -21,6 +22,7 @@ glabel EnablePartnerAI /* 0F3F14 802CF564 03E00008 */ jr $ra /* 0F3F18 802CF568 27BD0018 */ addiu $sp, $sp, 0x18 +glabel func_802CF56C /* 0F3F1C 802CF56C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0F3F20 802CF570 AFBF0010 */ sw $ra, 0x10($sp) /* 0F3F24 802CF574 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s b/asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s deleted file mode 100644 index 08befc6ef9..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel GetPartnerPos -/* 0F3DE8 802CF438 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F3DEC 802CF43C AFB10014 */ sw $s1, 0x14($sp) -/* 0F3DF0 802CF440 0080882D */ daddu $s1, $a0, $zero -/* 0F3DF4 802CF444 AFBF0024 */ sw $ra, 0x24($sp) -/* 0F3DF8 802CF448 AFB40020 */ sw $s4, 0x20($sp) -/* 0F3DFC 802CF44C AFB3001C */ sw $s3, 0x1c($sp) -/* 0F3E00 802CF450 AFB20018 */ sw $s2, 0x18($sp) -/* 0F3E04 802CF454 AFB00010 */ sw $s0, 0x10($sp) -/* 0F3E08 802CF458 8E22000C */ lw $v0, 0xc($s1) -/* 0F3E0C 802CF45C 8C520000 */ lw $s2, ($v0) -/* 0F3E10 802CF460 24420004 */ addiu $v0, $v0, 4 -/* 0F3E14 802CF464 8C530000 */ lw $s3, ($v0) -/* 0F3E18 802CF468 8C540004 */ lw $s4, 4($v0) -/* 0F3E1C 802CF46C 0C00EABB */ jal get_npc_unsafe -/* 0F3E20 802CF470 2404FFFC */ addiu $a0, $zero, -4 -/* 0F3E24 802CF474 0040802D */ daddu $s0, $v0, $zero -/* 0F3E28 802CF478 12000012 */ beqz $s0, .L802CF4C4 -/* 0F3E2C 802CF47C 0220202D */ daddu $a0, $s1, $zero -/* 0F3E30 802CF480 C6000038 */ lwc1 $f0, 0x38($s0) -/* 0F3E34 802CF484 4600008D */ trunc.w.s $f2, $f0 -/* 0F3E38 802CF488 44061000 */ mfc1 $a2, $f2 -/* 0F3E3C 802CF48C 0C0B2026 */ jal set_variable -/* 0F3E40 802CF490 0240282D */ daddu $a1, $s2, $zero -/* 0F3E44 802CF494 0220202D */ daddu $a0, $s1, $zero -/* 0F3E48 802CF498 C600003C */ lwc1 $f0, 0x3c($s0) -/* 0F3E4C 802CF49C 4600008D */ trunc.w.s $f2, $f0 -/* 0F3E50 802CF4A0 44061000 */ mfc1 $a2, $f2 -/* 0F3E54 802CF4A4 0C0B2026 */ jal set_variable -/* 0F3E58 802CF4A8 0260282D */ daddu $a1, $s3, $zero -/* 0F3E5C 802CF4AC 0220202D */ daddu $a0, $s1, $zero -/* 0F3E60 802CF4B0 C6000040 */ lwc1 $f0, 0x40($s0) -/* 0F3E64 802CF4B4 4600008D */ trunc.w.s $f2, $f0 -/* 0F3E68 802CF4B8 44061000 */ mfc1 $a2, $f2 -/* 0F3E6C 802CF4BC 0C0B2026 */ jal set_variable -/* 0F3E70 802CF4C0 0280282D */ daddu $a1, $s4, $zero -.L802CF4C4: -/* 0F3E74 802CF4C4 24020002 */ addiu $v0, $zero, 2 -/* 0F3E78 802CF4C8 8FBF0024 */ lw $ra, 0x24($sp) -/* 0F3E7C 802CF4CC 8FB40020 */ lw $s4, 0x20($sp) -/* 0F3E80 802CF4D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 0F3E84 802CF4D4 8FB20018 */ lw $s2, 0x18($sp) -/* 0F3E88 802CF4D8 8FB10014 */ lw $s1, 0x14($sp) -/* 0F3E8C 802CF4DC 8FB00010 */ lw $s0, 0x10($sp) -/* 0F3E90 802CF4E0 03E00008 */ jr $ra -/* 0F3E94 802CF4E4 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 470df683ca..5cba91bd98 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -191,19 +191,107 @@ INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcFlagBits); INCLUDE_API_ASM(code_f2470_len_27f0, GetNpcPos); -INCLUDE_API_ASM(code_f2470_len_27f0, EnableNpcShadow); +ApiStatus EnableNpcShadow(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + s32 enableShadow = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); -INCLUDE_API_ASM(code_f2470_len_27f0, EnableNpcBlur); + if (npcPtr != NULL) { + if (enableShadow) { + enable_npc_shadow(npcPtr); + return ApiStatus_DONE2; + } + else { + disable_npc_shadow(npcPtr); + } + } + return ApiStatus_DONE2; +} + +ApiStatus EnableNpcBlur(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + s32 enableBlur = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + if (enableBlur) { + enable_npc_blur(npcPtr); + return ApiStatus_DONE2; + } + else { + disable_npc_blur(npcPtr); + } + } + return ApiStatus_DONE2; +} + +ApiStatus ClearPartnerMoveHistory(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + clear_partner_move_history(npcPtr); + return ApiStatus_DONE2; + } + return ApiStatus_DONE2; +} -INCLUDE_API_ASM(code_f2470_len_27f0, ClearPartnerMoveHistory); INCLUDE_API_ASM(code_f2470_len_27f0, NpcSetHomePosToCurrent); -INCLUDE_API_ASM(code_f2470_len_27f0, GetPartnerPos); +ApiStatus GetPartnerPos(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + Bytecode posX = *ptrReadPos++; + Bytecode posY = *ptrReadPos++; + Bytecode posZ = *ptrReadPos++; + Npc* npcPtr = get_npc_unsafe(-4); -INCLUDE_API_ASM(code_f2470_len_27f0, DisablePartnerAI); + if (npcPtr != NULL) { + set_variable(script, posX, npcPtr->pos.x); + set_variable(script, posY, npcPtr->pos.y); + set_variable(script, posZ, npcPtr->pos.z); + return ApiStatus_DONE2; + } + return ApiStatus_DONE2; +} -INCLUDE_API_ASM(code_f2470_len_27f0, EnablePartnerAI); +ApiStatus DisablePartnerAI(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + + if (get_variable(script, *ptrReadPos++) == 0) { + func_800EF314(); + } else { + func_800EF300(); + } + return ApiStatus_DONE2; +} + +ApiStatus EnablePartnerAI(ScriptInstance* script, s32 isInitialCall) { + enable_partner_ai(); + return ApiStatus_DONE2; +} + +// TODO: Figure out what this function does +ApiStatus func_802CF54C(ScriptInstance* script, s32 isInitialCall) { + func_800EF43C(); + return ApiStatus_DONE2; +} + +// TODO: Figure out what this function does +ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + s32 value = get_variable(script, *ptrReadPos++); + + if(value == 2) { + func_800EF3E4(); + } else { + func_800EF3D4(value); + } + return ApiStatus_DONE2; +} INCLUDE_API_ASM(code_f2470_len_27f0, BringPartnerOut); From 057c73be8ece20dd111b39242c35d723bb816d1c Mon Sep 17 00:00:00 2001 From: Jdog Date: Tue, 18 Aug 2020 21:58:26 -0700 Subject: [PATCH 23/37] Remove EnablePartnerAI.s --- .../code_f2470_len_27f0/EnablePartnerAI.s | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s b/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s deleted file mode 100644 index 8b681d06f3..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel EnablePartnerAI -/* 0F3EDC 802CF52C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F3EE0 802CF530 AFBF0010 */ sw $ra, 0x10($sp) -/* 0F3EE4 802CF534 0C03BCCA */ jal enable_partner_ai -/* 0F3EE8 802CF538 00000000 */ nop -/* 0F3EEC 802CF53C 8FBF0010 */ lw $ra, 0x10($sp) -/* 0F3EF0 802CF540 24020002 */ addiu $v0, $zero, 2 -/* 0F3EF4 802CF544 03E00008 */ jr $ra -/* 0F3EF8 802CF548 27BD0018 */ addiu $sp, $sp, 0x18 - -glabel func_802CF54C -/* 0F3EFC 802CF54C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F3F00 802CF550 AFBF0010 */ sw $ra, 0x10($sp) -/* 0F3F04 802CF554 0C03BD0F */ jal func_800EF43C -/* 0F3F08 802CF558 00000000 */ nop -/* 0F3F0C 802CF55C 8FBF0010 */ lw $ra, 0x10($sp) -/* 0F3F10 802CF560 24020002 */ addiu $v0, $zero, 2 -/* 0F3F14 802CF564 03E00008 */ jr $ra -/* 0F3F18 802CF568 27BD0018 */ addiu $sp, $sp, 0x18 - -glabel func_802CF56C -/* 0F3F1C 802CF56C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0F3F20 802CF570 AFBF0010 */ sw $ra, 0x10($sp) -/* 0F3F24 802CF574 8C82000C */ lw $v0, 0xc($a0) -/* 0F3F28 802CF578 0C0B1EAF */ jal get_variable -/* 0F3F2C 802CF57C 8C450000 */ lw $a1, ($v0) -/* 0F3F30 802CF580 0040202D */ daddu $a0, $v0, $zero -/* 0F3F34 802CF584 24020002 */ addiu $v0, $zero, 2 -/* 0F3F38 802CF588 14820005 */ bne $a0, $v0, .L802CF5A0 -/* 0F3F3C 802CF58C 00000000 */ nop -/* 0F3F40 802CF590 0C03BCF9 */ jal func_800EF3E4 -/* 0F3F44 802CF594 00000000 */ nop -/* 0F3F48 802CF598 080B3D6A */ j .L802CF5A8 -/* 0F3F4C 802CF59C 00000000 */ nop - -.L802CF5A0: -/* 0F3F50 802CF5A0 0C03BCF5 */ jal func_800EF3D4 -/* 0F3F54 802CF5A4 00000000 */ nop -.L802CF5A8: -/* 0F3F58 802CF5A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 0F3F5C 802CF5AC 24020002 */ addiu $v0, $zero, 2 -/* 0F3F60 802CF5B0 03E00008 */ jr $ra -/* 0F3F64 802CF5B4 27BD0018 */ addiu $sp, $sp, 0x18 - From 8d2d3be8c7521ef2f2165ec7bb42255b500a6f22 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 19 Aug 2020 12:57:18 +0100 Subject: [PATCH 24/37] update readme wording --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbca285324..2ca9a1700a 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ Once your function is matching, you'll want to make a pull request. Before you d $ ./format.sh ``` -If `format.sh` displays any errors, go and fix them. If you can't fix them without breaking the function from matching, append `// NOLINT` to the offending line. +If `format.sh` has any problems with your code, go and fix the issues. If you can't fix a warning without making the function not match anymore, append `// NOLINT` to the offending line. ## FAQ From ada5f9dcfe1ac9683f0c0e07c9c3bf21480e2c43 Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 07:34:52 -0700 Subject: [PATCH 25/37] Match SetNpcEffect, PlaySoundAtNpc, SetNpcRenderMode (previously un-named func defined by me) --- .../code_f2470_len_27f0/PlaySoundAtNpc.s | 75 ------------------- src/code_f2470_len_27f0.c | 40 +++++++++- 2 files changed, 38 insertions(+), 77 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s b/asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s deleted file mode 100644 index a2e2e23dd7..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel PlaySoundAtNpc -/* 0F4B5C 802D01AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F4B60 802D01B0 AFB1001C */ sw $s1, 0x1c($sp) -/* 0F4B64 802D01B4 0080882D */ daddu $s1, $a0, $zero -/* 0F4B68 802D01B8 AFBF0024 */ sw $ra, 0x24($sp) -/* 0F4B6C 802D01BC AFB20020 */ sw $s2, 0x20($sp) -/* 0F4B70 802D01C0 AFB00018 */ sw $s0, 0x18($sp) -/* 0F4B74 802D01C4 8E30000C */ lw $s0, 0xc($s1) -/* 0F4B78 802D01C8 8E050000 */ lw $a1, ($s0) -/* 0F4B7C 802D01CC 0C0B1EAF */ jal get_variable -/* 0F4B80 802D01D0 26100004 */ addiu $s0, $s0, 4 -/* 0F4B84 802D01D4 8E050000 */ lw $a1, ($s0) -/* 0F4B88 802D01D8 26100004 */ addiu $s0, $s0, 4 -/* 0F4B8C 802D01DC 0220202D */ daddu $a0, $s1, $zero -/* 0F4B90 802D01E0 0C0B1EAF */ jal get_variable -/* 0F4B94 802D01E4 0040902D */ daddu $s2, $v0, $zero -/* 0F4B98 802D01E8 0220202D */ daddu $a0, $s1, $zero -/* 0F4B9C 802D01EC 8E050000 */ lw $a1, ($s0) -/* 0F4BA0 802D01F0 0C0B1EAF */ jal get_variable -/* 0F4BA4 802D01F4 0040802D */ daddu $s0, $v0, $zero -/* 0F4BA8 802D01F8 0220202D */ daddu $a0, $s1, $zero -/* 0F4BAC 802D01FC 0240282D */ daddu $a1, $s2, $zero -/* 0F4BB0 802D0200 0C0B36B0 */ jal resolve_npc -/* 0F4BB4 802D0204 0040882D */ daddu $s1, $v0, $zero -/* 0F4BB8 802D0208 10400007 */ beqz $v0, .L802D0228 -/* 0F4BBC 802D020C 0200202D */ daddu $a0, $s0, $zero -/* 0F4BC0 802D0210 C4400040 */ lwc1 $f0, 0x40($v0) -/* 0F4BC4 802D0214 E7A00010 */ swc1 $f0, 0x10($sp) -/* 0F4BC8 802D0218 8C460038 */ lw $a2, 0x38($v0) -/* 0F4BCC 802D021C 8C47003C */ lw $a3, 0x3c($v0) -/* 0F4BD0 802D0220 0C052757 */ jal play_sound_at_position -/* 0F4BD4 802D0224 0220282D */ daddu $a1, $s1, $zero -.L802D0228: -/* 0F4BD8 802D0228 24020002 */ addiu $v0, $zero, 2 -/* 0F4BDC 802D022C 8FBF0024 */ lw $ra, 0x24($sp) -/* 0F4BE0 802D0230 8FB20020 */ lw $s2, 0x20($sp) -/* 0F4BE4 802D0234 8FB1001C */ lw $s1, 0x1c($sp) -/* 0F4BE8 802D0238 8FB00018 */ lw $s0, 0x18($sp) -/* 0F4BEC 802D023C 03E00008 */ jr $ra -/* 0F4BF0 802D0240 27BD0028 */ addiu $sp, $sp, 0x28 - -/* 0F4BF4 802D0244 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0F4BF8 802D0248 AFB10014 */ sw $s1, 0x14($sp) -/* 0F4BFC 802D024C 0080882D */ daddu $s1, $a0, $zero -/* 0F4C00 802D0250 AFBF0018 */ sw $ra, 0x18($sp) -/* 0F4C04 802D0254 AFB00010 */ sw $s0, 0x10($sp) -/* 0F4C08 802D0258 8E30000C */ lw $s0, 0xc($s1) -/* 0F4C0C 802D025C 8E050000 */ lw $a1, ($s0) -/* 0F4C10 802D0260 0C0B1EAF */ jal get_variable -/* 0F4C14 802D0264 26100004 */ addiu $s0, $s0, 4 -/* 0F4C18 802D0268 0220202D */ daddu $a0, $s1, $zero -/* 0F4C1C 802D026C 8E050000 */ lw $a1, ($s0) -/* 0F4C20 802D0270 0C0B1EAF */ jal get_variable -/* 0F4C24 802D0274 0040802D */ daddu $s0, $v0, $zero -/* 0F4C28 802D0278 0220202D */ daddu $a0, $s1, $zero -/* 0F4C2C 802D027C 0200282D */ daddu $a1, $s0, $zero -/* 0F4C30 802D0280 0C0B36B0 */ jal resolve_npc -/* 0F4C34 802D0284 0040802D */ daddu $s0, $v0, $zero -/* 0F4C38 802D0288 A05000AA */ sb $s0, 0xaa($v0) -/* 0F4C3C 802D028C 8FBF0018 */ lw $ra, 0x18($sp) -/* 0F4C40 802D0290 8FB10014 */ lw $s1, 0x14($sp) -/* 0F4C44 802D0294 8FB00010 */ lw $s0, 0x10($sp) -/* 0F4C48 802D0298 24020002 */ addiu $v0, $zero, 2 -/* 0F4C4C 802D029C 03E00008 */ jr $ra -/* 0F4C50 802D02A0 27BD0020 */ addiu $sp, $sp, 0x20 - -/* 0F4C54 802D02A4 00000000 */ nop -/* 0F4C58 802D02A8 00000000 */ nop -/* 0F4C5C 802D02AC 00000000 */ nop - - diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 5cba91bd98..c96bda5768 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -299,6 +299,42 @@ INCLUDE_API_ASM(code_f2470_len_27f0, PutPartnerAway); INCLUDE_API_ASM(code_f2470_len_27f0, GetCurrentPartnerID); -INCLUDE_API_ASM(code_f2470_len_27f0, SetNpcEffect); +// TODO: Figure out what this function does +ApiStatus SetNpcEffect(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + s32 value1 = get_variable(script, *ptrReadPos++); + s32 value2 = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + func_8003C3D8(npcPtr, value1, value2); + return ApiStatus_DONE2; + } + return ApiStatus_DONE2; +} + +ApiStatus PlaySoundAtNpc(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + SoundId soundID = get_variable(script, *ptrReadPos++); + s32 value2 = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + if (npcPtr != NULL) { + play_sound_at_position(soundID, value2, npcPtr->pos.x, npcPtr->pos.y, npcPtr->pos.z); + return ApiStatus_DONE2; + } + return ApiStatus_DONE2; +} + +ApiStatus SetNpcRenderMode(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + NpcId npcID = get_variable(script, *ptrReadPos++); + u8 renderMode = get_variable(script, *ptrReadPos++); + Npc* npcPtr = resolve_npc(script, npcID); + + npcPtr->renderMode = renderMode; + return ApiStatus_DONE2; +} -INCLUDE_API_ASM(code_f2470_len_27f0, PlaySoundAtNpc); From 51ff61c4795114eb65b07513b229d5fa4d3abe9b Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 07:35:56 -0700 Subject: [PATCH 26/37] Remove SetNpcEffect.s --- .../code_f2470_len_27f0/SetNpcEffect.s | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s deleted file mode 100644 index bb0ea8d8aa..0000000000 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel SetNpcEffect -/* 0F4AC8 802D0118 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0F4ACC 802D011C AFB10014 */ sw $s1, 0x14($sp) -/* 0F4AD0 802D0120 0080882D */ daddu $s1, $a0, $zero -/* 0F4AD4 802D0124 AFBF0020 */ sw $ra, 0x20($sp) -/* 0F4AD8 802D0128 AFB3001C */ sw $s3, 0x1c($sp) -/* 0F4ADC 802D012C AFB20018 */ sw $s2, 0x18($sp) -/* 0F4AE0 802D0130 AFB00010 */ sw $s0, 0x10($sp) -/* 0F4AE4 802D0134 8E30000C */ lw $s0, 0xc($s1) -/* 0F4AE8 802D0138 8E050000 */ lw $a1, ($s0) -/* 0F4AEC 802D013C 0C0B1EAF */ jal get_variable -/* 0F4AF0 802D0140 26100004 */ addiu $s0, $s0, 4 -/* 0F4AF4 802D0144 8E050000 */ lw $a1, ($s0) -/* 0F4AF8 802D0148 26100004 */ addiu $s0, $s0, 4 -/* 0F4AFC 802D014C 0220202D */ daddu $a0, $s1, $zero -/* 0F4B00 802D0150 0C0B1EAF */ jal get_variable -/* 0F4B04 802D0154 0040902D */ daddu $s2, $v0, $zero -/* 0F4B08 802D0158 0220202D */ daddu $a0, $s1, $zero -/* 0F4B0C 802D015C 8E050000 */ lw $a1, ($s0) -/* 0F4B10 802D0160 0C0B1EAF */ jal get_variable -/* 0F4B14 802D0164 0040982D */ daddu $s3, $v0, $zero -/* 0F4B18 802D0168 0220202D */ daddu $a0, $s1, $zero -/* 0F4B1C 802D016C 0240282D */ daddu $a1, $s2, $zero -/* 0F4B20 802D0170 0C0B36B0 */ jal resolve_npc -/* 0F4B24 802D0174 0040802D */ daddu $s0, $v0, $zero -/* 0F4B28 802D0178 10400004 */ beqz $v0, .L802D018C -/* 0F4B2C 802D017C 0040202D */ daddu $a0, $v0, $zero -/* 0F4B30 802D0180 0260282D */ daddu $a1, $s3, $zero -/* 0F4B34 802D0184 0C00F0F6 */ jal func_8003C3D8 -/* 0F4B38 802D0188 0200302D */ daddu $a2, $s0, $zero -.L802D018C: -/* 0F4B3C 802D018C 24020002 */ addiu $v0, $zero, 2 -/* 0F4B40 802D0190 8FBF0020 */ lw $ra, 0x20($sp) -/* 0F4B44 802D0194 8FB3001C */ lw $s3, 0x1c($sp) -/* 0F4B48 802D0198 8FB20018 */ lw $s2, 0x18($sp) -/* 0F4B4C 802D019C 8FB10014 */ lw $s1, 0x14($sp) -/* 0F4B50 802D01A0 8FB00010 */ lw $s0, 0x10($sp) -/* 0F4B54 802D01A4 03E00008 */ jr $ra -/* 0F4B58 802D01A8 27BD0028 */ addiu $sp, $sp, 0x28 - From 65f1db2e87b4f94a1a2ef649ffcdc9fe6b4176a8 Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 09:55:52 -0700 Subject: [PATCH 27/37] Match func_802B7000 --- asm/nonmatchings/code_e20eb0/func_802B7000.s | 55 -------------------- src/code_e20eb0.c | 16 +++++- 2 files changed, 15 insertions(+), 56 deletions(-) delete mode 100644 asm/nonmatchings/code_e20eb0/func_802B7000.s diff --git a/asm/nonmatchings/code_e20eb0/func_802B7000.s b/asm/nonmatchings/code_e20eb0/func_802B7000.s deleted file mode 100644 index 60a38959e2..0000000000 --- a/asm/nonmatchings/code_e20eb0/func_802B7000.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - - -glabel func_802B7000 -/* E20EB0 802B7000 3C014387 */ lui $at, 0x4387 -/* E20EB4 802B7004 44810000 */ mtc1 $at, $f0 -/* E20EB8 802B7008 00000000 */ nop -/* E20EBC 802B700C 460C003E */ c.le.s $f0, $f12 -/* E20EC0 802B7010 00000000 */ nop -/* E20EC4 802B7014 45000009 */ bc1f .L802B703C -/* E20EC8 802B7018 240200FF */ addiu $v0, $zero, 0xff -/* E20ECC 802B701C 3C0143B4 */ lui $at, 0x43b4 -/* E20ED0 802B7020 44810000 */ mtc1 $at, $f0 -/* E20ED4 802B7024 00000000 */ nop -/* E20ED8 802B7028 460C0001 */ sub.s $f0, $f0, $f12 -/* E20EDC 802B702C 4600010D */ trunc.w.s $f4, $f0 -/* E20EE0 802B7030 44032000 */ mfc1 $v1, $f4 -/* E20EE4 802B7034 080ADC2B */ j .L802B70AC -/* E20EE8 802B7038 00431023 */ subu $v0, $v0, $v1 -.L802B703C: -/* E20EEC 802B703C 3C014334 */ lui $at, 0x4334 -/* E20EF0 802B7040 44811000 */ mtc1 $at, $f2 -/* E20EF4 802B7044 00000000 */ nop -/* E20EF8 802B7048 460C103E */ c.le.s $f2, $f12 -/* E20EFC 802B704C 00000000 */ nop -/* E20F00 802B7050 45000006 */ bc1f .L802B706C -/* E20F04 802B7054 00000000 */ nop -/* E20F08 802B7058 46026001 */ sub.s $f0, $f12, $f2 -/* E20F0C 802B705C 4600010D */ trunc.w.s $f4, $f0 -/* E20F10 802B7060 44032000 */ mfc1 $v1, $f4 -/* E20F14 802B7064 080ADC2B */ j .L802B70AC -/* E20F18 802B7068 00431023 */ subu $v0, $v0, $v1 -.L802B706C: -/* E20F1C 802B706C 3C0142B4 */ lui $at, 0x42b4 -/* E20F20 802B7070 44810000 */ mtc1 $at, $f0 -/* E20F24 802B7074 00000000 */ nop -/* E20F28 802B7078 460C003E */ c.le.s $f0, $f12 -/* E20F2C 802B707C 00000000 */ nop -/* E20F30 802B7080 45000006 */ bc1f .L802B709C -/* E20F34 802B7084 240200FF */ addiu $v0, $zero, 0xff -/* E20F38 802B7088 460C1001 */ sub.s $f0, $f2, $f12 -/* E20F3C 802B708C 4600010D */ trunc.w.s $f4, $f0 -/* E20F40 802B7090 44032000 */ mfc1 $v1, $f4 -/* E20F44 802B7094 080ADC2B */ j .L802B70AC -/* E20F48 802B7098 00431023 */ subu $v0, $v0, $v1 -.L802B709C: -/* E20F4C 802B709C 4600610D */ trunc.w.s $f4, $f12 -/* E20F50 802B70A0 44032000 */ mfc1 $v1, $f4 -/* E20F54 802B70A4 00000000 */ nop -/* E20F58 802B70A8 00431023 */ subu $v0, $v0, $v1 -.L802B70AC: -/* E20F5C 802B70AC 03E00008 */ jr $ra -/* E20F60 802B70B0 00431023 */ subu $v0, $v0, $v1 - diff --git a/src/code_e20eb0.c b/src/code_e20eb0.c index 45215c1890..110f8d19cf 100644 --- a/src/code_e20eb0.c +++ b/src/code_e20eb0.c @@ -1,6 +1,20 @@ #include "common.h" -INCLUDE_ASM(code_e20eb0, func_802B7000); +// TODO: Figure out what this function is doing +s32 func_802B7000(f32 angle) { + s32 angleDiff; + + if (270.0f <= angle) { + angleDiff = 360.0f - angle; + } else if (180.0f <= angle) { + angleDiff = angle - 180.0f; + } else if (90.0f <= angle) { + angleDiff = 180.0f - angle; + } else { + angleDiff = angle; + } + return 0xFF - angleDiff - angleDiff; +} INCLUDE_ASM(code_e20eb0, func_802B70B4); From ea32764c7780bd4e526489a744bf06eaeff14313 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 19 Aug 2020 23:09:09 +0100 Subject: [PATCH 28/37] disable questionable clang-tidy checks --- .clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index 8a77d190b1..861332a8f2 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,2 +1,2 @@ -Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-clang-diagnostic-error' +Checks: '-*,clang-analyzer-core.*,clang-analyzer-deadcode.*,readability-*,-readability-magic-numbers,-readability-else-after-return,-readability-named-parameter,-readability-braces-around-statements,-readability-isolate-declaration,-readability-uppercase-literal-suffix,-readability-function-size,-readability-non-const-parameter,-clang-diagnostic-error' HeaderFilterRegex: '(src|include)\/.*\.h' From 54fc47a0eb96eebe31ecd5d9910ca9c93fb4e731 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 19 Aug 2020 23:29:41 +0100 Subject: [PATCH 29/37] fix lint workflow --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 7071a2a2de..57055f3d70 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v2 - - run: ./install.sh + - run: sudo apt-get install -y astyle clang-tidy # lint files changed by the push/pr - id: files From bc8080788accf26973badecc2f3370c23422b844 Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 15:48:15 -0700 Subject: [PATCH 30/37] Fixing changes for PR: npcPtr to npc, spacing on if, removed else block in EnableNpcShadow that wasn't needed --- include/variables.h | 2 + src/code_ef070_len_3400.c | 38 ++++++++++++ src/code_f2470_len_27f0.c | 118 +++++++++++++++++++------------------- undefined_syms.txt | 1 + 4 files changed, 99 insertions(+), 60 deletions(-) diff --git a/include/variables.h b/include/variables.h index 2051fff0a7..56805685e3 100644 --- a/include/variables.h +++ b/include/variables.h @@ -40,6 +40,8 @@ extern Shadow* gWorldShadowList[60]; extern Shadow* gBattleShadowList[60]; extern Shadow** gCurrentShadowListPtr[60]; +extern Camera gCameras[4]; + extern f32 gGlobalTimeSpace; extern s8 D_800A0900; diff --git a/src/code_ef070_len_3400.c b/src/code_ef070_len_3400.c index 40b6184d64..cdffc014e3 100644 --- a/src/code_ef070_len_3400.c +++ b/src/code_ef070_len_3400.c @@ -1,6 +1,44 @@ #include "common.h" INCLUDE_API_ASM(code_ef070_len_3400, SetCamEnabled); +/* +ApiStatus SetCamEnabled(ScriptInstance* script, s32 isInitialCall) { + Bytecode* ptrReadPos = script->ptrReadPos; + Bytecode cameraID = get_variable(script, *ptrReadPos++); + Bytecode cameraEnable = get_variable(script, *ptrReadPos++); + Camera* cameraPtr = &gCameras[cameraID]; + + if (cameraEnable == 0) { + cameraPtr->flags |= 0x2; + } else { + cameraPtr->flags &= ~0x2; + } + return ApiStatus_DONE2; + /* + s32 temp_a1; + s32 temp_s0; + s32 temp_v0; + void *temp_s1; + u16 phi_v1; + void *phi_v0; + + temp_s1 = arg0->unkC; + temp_a1 = *temp_s1; + temp_s1 = temp_s1 + 4; + temp_s0 = get_variable(temp_a1); + if (get_variable(arg0, *temp_s1) == 0) { + temp_v0 = (temp_s0 * 0x558) + 0x800B1D80; + phi_v1 = *temp_v0 | 2; + phi_v0 = (void *) temp_v0; + } else { + temp_v0 = (temp_s0 * 0x558) + 0x800B1D80; + phi_v1 = *temp_v0 & 0xFFFD; + phi_v0 = (void *) temp_v0; + } + *phi_v0 = phi_v1; + return 2; +} +*/ INCLUDE_API_ASM(code_ef070_len_3400, SetCamFlag80); diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index c96bda5768..ea1b1bec5f 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -14,10 +14,10 @@ INCLUDE_ASM(code_f2470_len_27f0, set_npc_animation); ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - Npc* npcPtr = get_npc_unsafe(get_variable(script, *ptrReadPos++)); + Npc* npc = get_npc_unsafe(get_variable(script, *ptrReadPos++)); - if (npcPtr) { - free_npc(npcPtr); + if (npc) { + free_npc(npc); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -42,14 +42,14 @@ ApiStatus SetNpcScale(ScriptInstance* script, s32 isInitialCall) { f32 sizeX = get_float_variable(script, *ptrReadPos++); f32 sizeY = get_float_variable(script, *ptrReadPos++); f32 sizeZ = get_float_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { + if (npc != NULL) { s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching if (todo) { - npcPtr->scale.x = sizeX; - npcPtr->scale.y = sizeY; - npcPtr->scale.z = sizeZ; + npc->scale.x = sizeX; + npc->scale.y = sizeY; + npc->scale.z = sizeZ; } return ApiStatus_DONE2; } @@ -61,13 +61,13 @@ ApiStatus SetNpcCollisionSize(ScriptInstance* script, s32 isInitialCall) { NpcId npcID = get_variable(script, *ptrReadPos++); s32 height = get_variable(script, *ptrReadPos++); s32 radius = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { + if (npc != NULL) { s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching if (todo) { - npcPtr->collisionHeight = height; - npcPtr->collisionRadius = radius; + npc->collisionHeight = height; + npc->collisionRadius = radius; } return ApiStatus_DONE2; } @@ -78,10 +78,10 @@ ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); f32 speed = get_float_variable(script, *ptrReadPos); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if(npcPtr != NULL) { - npcPtr->moveSpeed = speed; + if(npc != NULL) { + npc->moveSpeed = speed; return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -91,10 +91,10 @@ ApiStatus SetNpcJumpscale(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); f32 jumpScale = get_float_variable(script, *ptrReadPos); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if(npcPtr != NULL) { - npcPtr->jumpScale = jumpScale; + if(npc != NULL) { + npc->jumpScale = jumpScale; return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -104,10 +104,10 @@ ApiStatus SetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); s32 animation = get_variable(script, *ptrReadPos); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { - set_npc_animation(npcPtr, animation); + if (npc != NULL) { + set_npc_animation(npc, animation); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -117,10 +117,10 @@ ApiStatus GetNpcAnimation(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { - set_variable(script, outVar, npcPtr->currentAnim); + if (npc != NULL) { + set_variable(script, outVar, npc->currentAnim); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -130,10 +130,10 @@ ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); f32 animationSpeed = get_float_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { - npcPtr->animationSpeed = animationSpeed; + if (npc != NULL) { + npc->animationSpeed = animationSpeed; return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -157,12 +157,12 @@ ApiStatus GetNpcYaw(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); Bytecode outVar = *ptrReadPos++; - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { + if (npc != NULL) { s32 todo = 1; // TODO: Figure out why this variable and subsequent if block is required for matching if (todo) { - set_variable(script, outVar, clamp_angle(npcPtr->yaw)); + set_variable(script, outVar, clamp_angle(npc->yaw)); } return ApiStatus_DONE2; } @@ -172,10 +172,10 @@ ApiStatus GetNpcYaw(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { - set_npc_yaw(npcPtr, get_variable(script, *ptrReadPos++)); + if (npc != NULL) { + set_npc_yaw(npc, get_variable(script, *ptrReadPos++)); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -195,15 +195,15 @@ ApiStatus EnableNpcShadow(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); s32 enableShadow = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { + if (npc != NULL) { if (enableShadow) { - enable_npc_shadow(npcPtr); + enable_npc_shadow(npc); return ApiStatus_DONE2; } else { - disable_npc_shadow(npcPtr); + disable_npc_shadow(npc); } } return ApiStatus_DONE2; @@ -213,16 +213,14 @@ ApiStatus EnableNpcBlur(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); s32 enableBlur = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { + if (npc != NULL) { if (enableBlur) { - enable_npc_blur(npcPtr); + enable_npc_blur(npc); return ApiStatus_DONE2; } - else { - disable_npc_blur(npcPtr); - } + disable_npc_blur(npc); } return ApiStatus_DONE2; } @@ -230,10 +228,10 @@ ApiStatus EnableNpcBlur(ScriptInstance* script, s32 isInitialCall) { ApiStatus ClearPartnerMoveHistory(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { - clear_partner_move_history(npcPtr); + if (npc != NULL) { + clear_partner_move_history(npc); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -247,12 +245,12 @@ ApiStatus GetPartnerPos(ScriptInstance* script, s32 isInitialCall) { Bytecode posX = *ptrReadPos++; Bytecode posY = *ptrReadPos++; Bytecode posZ = *ptrReadPos++; - Npc* npcPtr = get_npc_unsafe(-4); + Npc* npc = get_npc_unsafe(-4); - if (npcPtr != NULL) { - set_variable(script, posX, npcPtr->pos.x); - set_variable(script, posY, npcPtr->pos.y); - set_variable(script, posZ, npcPtr->pos.z); + if (npc != NULL) { + set_variable(script, posX, npc->pos.x); + set_variable(script, posY, npc->pos.y); + set_variable(script, posZ, npc->pos.z); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -285,7 +283,7 @@ ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 value = get_variable(script, *ptrReadPos++); - if(value == 2) { + if( value == 2) { func_800EF3E4(); } else { func_800EF3D4(value); @@ -305,10 +303,10 @@ ApiStatus SetNpcEffect(ScriptInstance* script, s32 isInitialCall) { NpcId npcID = get_variable(script, *ptrReadPos++); s32 value1 = get_variable(script, *ptrReadPos++); s32 value2 = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { - func_8003C3D8(npcPtr, value1, value2); + if (npc != NULL) { + func_8003C3D8(npc, value1, value2); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -319,10 +317,10 @@ ApiStatus PlaySoundAtNpc(ScriptInstance* script, s32 isInitialCall) { NpcId npcID = get_variable(script, *ptrReadPos++); SoundId soundID = get_variable(script, *ptrReadPos++); s32 value2 = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - if (npcPtr != NULL) { - play_sound_at_position(soundID, value2, npcPtr->pos.x, npcPtr->pos.y, npcPtr->pos.z); + if (npc != NULL) { + play_sound_at_position(soundID, value2, npc->pos.x, npc->pos.y, npc->pos.z); return ApiStatus_DONE2; } return ApiStatus_DONE2; @@ -332,9 +330,9 @@ ApiStatus SetNpcRenderMode(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); u8 renderMode = get_variable(script, *ptrReadPos++); - Npc* npcPtr = resolve_npc(script, npcID); + Npc* npc = resolve_npc(script, npcID); - npcPtr->renderMode = renderMode; + npc->renderMode = renderMode; return ApiStatus_DONE2; } diff --git a/undefined_syms.txt b/undefined_syms.txt index 149ddab11e..0d342669f7 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -38,6 +38,7 @@ D_800959D4 = 0x800959D4; D_8009A5D8 = 0x8009A5D8; D_8009A650 = 0x8009A650; D_800A0900 = 0x800A0900; +gCameras = 0x800B1D80; D_800DC500 = 0x800DC500; D_8010F6D0 = 0x8010F6D0; gBackgroundImage = 0x80200000; From dd98f7c034c7764d2b954bc12d8e384dc3ed2d6c Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 16:00:45 -0700 Subject: [PATCH 31/37] Remove documentation --- src/code_f2470_len_27f0.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index ea1b1bec5f..c8a2f4a83d 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -272,13 +272,11 @@ ApiStatus EnablePartnerAI(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -// TODO: Figure out what this function does ApiStatus func_802CF54C(ScriptInstance* script, s32 isInitialCall) { func_800EF43C(); return ApiStatus_DONE2; } -// TODO: Figure out what this function does ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 value = get_variable(script, *ptrReadPos++); @@ -297,7 +295,6 @@ INCLUDE_API_ASM(code_f2470_len_27f0, PutPartnerAway); INCLUDE_API_ASM(code_f2470_len_27f0, GetCurrentPartnerID); -// TODO: Figure out what this function does ApiStatus SetNpcEffect(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); From eabeb3d4aa03ce7cb1794910f3adf1ae248e62db Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 19:22:02 -0700 Subject: [PATCH 32/37] Revise func_802B7000 using angle as left value --- src/code_e20eb0.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/code_e20eb0.c b/src/code_e20eb0.c index 110f8d19cf..7789386266 100644 --- a/src/code_e20eb0.c +++ b/src/code_e20eb0.c @@ -4,11 +4,11 @@ s32 func_802B7000(f32 angle) { s32 angleDiff; - if (270.0f <= angle) { + if (angle >= 270.0f) { angleDiff = 360.0f - angle; - } else if (180.0f <= angle) { + } else if (angle >= 180.0f) { angleDiff = angle - 180.0f; - } else if (90.0f <= angle) { + } else if (angle >= 90.0f) { angleDiff = 180.0f - angle; } else { angleDiff = angle; From 53264c467ac7d008e48ba9bd33da3c84d07587c2 Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 19:32:54 -0700 Subject: [PATCH 33/37] Remove uneccessary else block --- src/code_f2470_len_27f0.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index c8a2f4a83d..3d6df15a43 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -202,9 +202,7 @@ ApiStatus EnableNpcShadow(ScriptInstance* script, s32 isInitialCall) { enable_npc_shadow(npc); return ApiStatus_DONE2; } - else { - disable_npc_shadow(npc); - } + disable_npc_shadow(npc); } return ApiStatus_DONE2; } @@ -237,7 +235,6 @@ ApiStatus ClearPartnerMoveHistory(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } - INCLUDE_API_ASM(code_f2470_len_27f0, NpcSetHomePosToCurrent); ApiStatus GetPartnerPos(ScriptInstance* script, s32 isInitialCall) { From 256394d8c4c60e2dcfecb9f3178e2b67c34d4b39 Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 19:45:43 -0700 Subject: [PATCH 34/37] Formatting issue with set_script_timescale --- src/code_e79b0_len_1920.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index 3725a0538e..4a781fc42f 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -99,8 +99,8 @@ void set_script_priority(ScriptInstance* script, s8 priority) { script->priority = priority; } -void set_script_timescale(ScriptInstance* script, f32 timeScale) { - script->timeScale = timeScale * gGlobalTimeSpace; +void set_script_timescale(ScriptInstance* script, f32 timescale) { + script->timeScale = timescale * gGlobalTimeSpace; } INCLUDE_ASM("code_e79b0_len_1920", set_global_timespace); From 556e2cd658d3ee2e730d2002fe06db517ba6c579 Mon Sep 17 00:00:00 2001 From: Jdog Date: Wed, 19 Aug 2020 19:51:36 -0700 Subject: [PATCH 35/37] More formatting issues --- src/code_f2470_len_27f0.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 0c34d7efd1..b35b305e73 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -80,7 +80,7 @@ ApiStatus SetNpcSpeed(ScriptInstance* script, s32 isInitialCall) { f32 speed = get_float_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); - if(npc != NULL) { + if (npc != NULL) { npc->moveSpeed = speed; return ApiStatus_DONE2; } @@ -93,7 +93,7 @@ ApiStatus SetNpcJumpscale(ScriptInstance* script, s32 isInitialCall) { f32 jumpScale = get_float_variable(script, *ptrReadPos); Npc* npc = resolve_npc(script, npcID); - if(npc != NULL) { + if (npc != NULL) { npc->jumpScale = jumpScale; return ApiStatus_DONE2; } @@ -173,7 +173,7 @@ ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; NpcId npcID = get_variable(script, *ptrReadPos++); Npc* npc = resolve_npc(script, npcID); - + if (npc != NULL) { set_npc_yaw(npc, get_variable(script, *ptrReadPos++)); return ApiStatus_DONE2; @@ -276,9 +276,9 @@ ApiStatus func_802CF54C(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; - s32 value = get_variable(script, *ptrReadPos++); + s32 value = get_variable(script, *ptrReadPos++); - if( value == 2) { + if (value == 2) { func_800EF3E4(); } else { func_800EF3D4(value); From a7d8f6dd968c2f1e04660edae41e9a2a3b6dbbea Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 20 Aug 2020 01:42:31 -0400 Subject: [PATCH 36/37] N64Splat added ;) --- .gitmodules | 6 +- Makefile | 7 +- asm/boot.s | 2 +- asm/header.s | 2 +- papermario.ld | 6302 +++++++++++++++++++++---------------------- tools/n64splat | 1 + tools/n64split.yaml | 2861 -------------------- tools/n64splitter | 1 - tools/splat.yaml | 736 +++++ 9 files changed, 3890 insertions(+), 6028 deletions(-) create mode 160000 tools/n64splat delete mode 100644 tools/n64split.yaml delete mode 160000 tools/n64splitter create mode 100644 tools/splat.yaml diff --git a/.gitmodules b/.gitmodules index 5475a55a4c..e1773eb6f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "n64splitter"] - path = tools/n64splitter - url = https://github.com/ethteck/sm64tools.git [submodule "tools/star-rod"] path = tools/star-rod url = https://github.com/nanaian/star-rod.git +[submodule "tools/n64splat"] + path = tools/n64splat + url = https://github.com/ethteck/n64splat.git diff --git a/Makefile b/Makefile index f3ff32cd8e..c3af3d9437 100644 --- a/Makefile +++ b/Makefile @@ -76,13 +76,10 @@ clean: submodules: git submodule update --init --recursive -n64split: - make -C tools/n64splitter - split: - rm -rf $(DATA_DIRS) $(BGM_DIRS) && ./tools/n64splitter/bin/n64split -b -v -o . -c tools/n64split.yaml baserom.z64 + rm -rf $(DATA_DIRS) $(BGM_DIRS) && ./tools/n64splat/split.py baserom.z64 tools/splat.yaml . -setup: clean submodules n64split split +setup: clean submodules split print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true diff --git a/asm/boot.s b/asm/boot.s index 4c4c672cb2..66ec44d6cd 100644 --- a/asm/boot.s +++ b/asm/boot.s @@ -9,7 +9,7 @@ .include "macro.inc" -.section .textA4000040, "ax" +.section .text40_boot, "ax" /* 000040 A4000040 40806800 */ mtc0 $zero, $13 /* 000044 A4000044 40804800 */ mtc0 $zero, $9 diff --git a/asm/header.s b/asm/header.s index 53557ca634..3aa0413873 100644 --- a/asm/header.s +++ b/asm/header.s @@ -1,4 +1,4 @@ -.section .header, "a" +.section .text0_header, "a" .byte 0x80, 0x37, 0x12, 0x40 # PI BSD Domain 1 register .word 0x0000000F # clock rate setting .word 0x80125C00 # entry point diff --git a/papermario.ld b/papermario.ld index 93ef96b66f..11bd68f229 100644 --- a/papermario.ld +++ b/papermario.ld @@ -1,3158 +1,3148 @@ -/* Paper Mario (U) [!] linker script - * generated by n64split v0.4a - N64 ROM splitter */ SECTIONS { - /* header and boot */ - .header 0x0 : AT(0x0) { - * (.header); - } - - /* 0xA4000040 000040-000B70 [B30] */ - .textA4000040 0xA4000040 : AT(0x000040) { - build/asm/boot.o(.textA4000040); - } - - /* 0x00000000 000B70-001000 [490] */ - .data00000B70 0x00000B70 : AT(0x000B70) { - build/bin/papermario.000B70.bootcode_font.o(.data); - } - - /* 0x80025C00 001000-001060 [60] */ - .text80025C00 0x80025C00 : AT(0x001000) { - build/src/code_1000_len_60.o(.text); - } - - /* 0x80025C60 001060-001370 [310] */ - .text80025C60 0x80025C60 : AT(0x001060) { - build/src/code_1060_len_310.o(.text); - } - - /* 0x80025F70 001370-001B40 [7D0] */ - .text80025F70 0x80025F70 : AT(0x001370) { - build/src/code_1370_len_7d0.o(.text); - } - - /* 0x80026740 001B40-003BF0 [20B0] */ - .text80026740 0x80026740 : AT(0x001B40) { - build/src/code_1b40_len_20b0.o(.text); - } - - /* 0x800287F0 003BF0-0042E0 [6F0] */ - .text800287F0 0x800287F0 : AT(0x003BF0) { - build/src/code_3bf0_len_6f0.o(.text); - } - - /* 0x80028EE0 0042E0-006000 [1D20] */ - .text80028EE0 0x80028EE0 : AT(0x0042E0) { - build/src/code_42e0_len_1f60.o(.text); - } - - /* 0x8002AC00 006000-006240 [240] */ - .text8002AC00 0x8002AC00 : AT(0x006000) { - build/src/code_6000.o(.text); - } - - /* 0x8002AE40 006240-006E40 [C00] */ - .text8002AE40 0x8002AE40 : AT(0x006240) { - build/src/code_6240_len_c00.o(.text); - } - - /* 0x8002BA40 006E40-007340 [500] */ - .text8002BA40 0x8002BA40 : AT(0x006E40) { - build/src/code_6e40_len_500.o(.text); - } - - /* 0x8002BF40 007340-007E40 [B00] */ - .text8002BF40 0x8002BF40 : AT(0x007340) { - build/src/code_7340_len_b00.o(.text); - } - - /* 0x8002CA40 007E40-008230 [3F0] */ - .text8002CA40 0x8002CA40 : AT(0x007E40) { - build/src/os/code_7e40_len_3f0.o(.text); - } - - /* 0x8002CE30 008230-009D10 [1AE0] */ - .text8002CE30 0x8002CE30 : AT(0x008230) { - build/src/code_8230_len_1ae0.o(.text); - } - - /* 0x8002E910 009D10-00AD90 [1080] */ - .text8002E910 0x8002E910 : AT(0x009D10) { - build/src/code_9d10_len_1080.o(.text); - } - - /* 0x8002F990 00AD90-00D610 [2880] */ - .text8002F990 0x8002F990 : AT(0x00AD90) { - build/src/code_ad90_len_2880.o(.text); - } - - /* 0x80032210 00D610-00E940 [1330] */ - .text80032210 0x80032210 : AT(0x00D610) { - build/src/code_d610_len_1330.o(.text); - } - - /* 0x80033540 00E940-00EBD0 [290] */ - .text80033540 0x80033540 : AT(0x00E940) { - build/src/code_e940_len_290.o(.text); - } - - /* 0x800337D0 00EBD0-00F270 [6A0] */ - .text800337D0 0x800337D0 : AT(0x00EBD0) { - build/src/code_ebd0_len_6a0.o(.text); - } - - /* 0x80033E70 00F270-010400 [1190] */ - .text80033E70 0x80033E70 : AT(0x00F270) { - build/src/code_f270_len_1190.o(.text); - } - - /* 0x80035000 010400-011130 [D30] */ - .text80035000 0x80035000 : AT(0x010400) { - build/src/code_10400_len_d30.o(.text); - } - - /* 0x80035D30 011130-0111F0 [C0] */ - .text80035D30 0x80035D30 : AT(0x011130) { - build/src/code_11130_len_c0.o(.text); - } - - /* 0x80035DF0 0111F0-011A50 [860] */ - .text80035DF0 0x80035DF0 : AT(0x0111F0) { - build/src/code_111f0_len_860.o(.text); - } - - /* 0x80036650 011A50-0121F0 [7A0] */ - .text80036650 0x80036650 : AT(0x011A50) { - build/src/code_11a50_len_7a0.o(.text); - } - - /* 0x80036DF0 0121F0-013480 [1290] */ - .text80036DF0 0x80036DF0 : AT(0x0121F0) { - build/src/code_121f0_len_1290.o(.text); - } - - /* 0x80038080 013480-013870 [3F0] */ - .text80038080 0x80038080 : AT(0x013480) { - build/src/code_13480_len_3f0.o(.text); - } - - /* 0x80038470 013870-01A1F0 [6980] */ - .text80038470 0x80038470 : AT(0x013870) { - build/src/code_13870_len_6980.o(.text); - } - - /* 0x8003EDF0 01A1F0-01F580 [5390] */ - .text8003EDF0 0x8003EDF0 : AT(0x01A1F0) { - build/src/code_1a1f0_len_5390.o(.text); - } - - /* 0x80044180 01F580-020EC0 [1940] */ - .text80044180 0x80044180 : AT(0x01F580) { - build/src/code_1f580_len_1940.o(.text); - } - - /* 0x80045AC0 020EC0-025F00 [5040] */ - .text80045AC0 0x80045AC0 : AT(0x020EC0) { - build/src/code_20ec0_len_5040.o(.text); - } - - /* 0x8004AB00 025F00-026840 [940] */ - .text8004AB00 0x8004AB00 : AT(0x025F00) { - build/src/code_25f00_len_940.o(.text); - } - - /* 0x8004B440 026840-028910 [20D0] */ - .text8004B440 0x8004B440 : AT(0x026840) { - build/src/code_26840_len_20d0.o(.text); - } - - /* 0x8004D510 028910-02D9A0 [5090] */ - .text8004D510 0x8004D510 : AT(0x028910) { - build/src/code_28910_len_5090.o(.text); - } - - /* 0x800525A0 02D9A0-02E230 [890] */ - .text800525A0 0x800525A0 : AT(0x02D9A0) { - build/src/code_2d9a0_len_890.o(.text); - } - - /* 0x80052E30 02E230-0303C0 [2190] */ - .text80052E30 0x80052E30 : AT(0x02E230) { - build/src/code_2e230_len_2190.o(.text); - } - - /* 0x80054FC0 0303C0-0341D0 [3E10] */ - .text80054FC0 0x80054FC0 : AT(0x0303C0) { - build/src/code_303c0_len_3e10.o(.text); - } - - /* 0x80058DD0 0341D0-0362A0 [20D0] */ - .text80058DD0 0x80058DD0 : AT(0x0341D0) { - build/src/code_341d0_len_20d0.o(.text); - } - - /* 0x8005AEA0 0362A0-039210 [2F70] */ - .text8005AEA0 0x8005AEA0 : AT(0x0362A0) { - build/src/code_362a0_len_2f70.o(.text); - } - - /* 0x8005DE10 039210-039CB0 [AA0] */ - .text8005DE10 0x8005DE10 : AT(0x039210) { - build/src/code_39210_len_aa0.o(.text); - } - - /* 0x8005E8B0 039CB0-039DB0 [100] */ - .text8005E8B0 0x8005E8B0 : AT(0x039CB0) { - build/src/os/code_39cb0_len_100.o(.text); - } - - /* 0x8005E9B0 039DB0-03A650 [8A0] */ - .text8005E9B0 0x8005E9B0 : AT(0x039DB0) { - build/src/os/code_39db0_len_8a0.o(.text); - } - - /* 0x8005F250 03A650-03A690 [40] */ - .text8005F250 0x8005F250 : AT(0x03A650) { - build/src/os/code_3a650_len_40.o(.text); - } - - /* 0x8005F290 03A690-03A6D0 [40] */ - .text8005F290 0x8005F290 : AT(0x03A690) { - build/src/os/code_3a690_len_40.o(.text); - } - - /* 0x8005F2D0 03A6D0-03A6F0 [20] */ - .text8005F2D0 0x8005F2D0 : AT(0x03A6D0) { - build/src/os/code_3a6d0_len_20.o(.text); - } - - /* 0x8005F2F0 03A6F0-03A800 [110] */ - .text8005F2F0 0x8005F2F0 : AT(0x03A6F0) { - build/src/os/code_3a6f0_len_110.o(.text); - } - - /* 0x8005F400 03A800-03A830 [30] */ - .text8005F400 0x8005F400 : AT(0x03A800) { - build/src/os/code_3a800_len_30.o(.text); - } - - /* 0x8005F430 03A830-03A850 [20] */ - .text8005F430 0x8005F430 : AT(0x03A830) { - build/src/os/code_3a830_len_20.o(.text); - } - - /* 0x8005F450 03A850-03B290 [A40] */ - .text8005F450 0x8005F450 : AT(0x03A850) { - build/src/os/code_3a850_le_a40.o(.text); - } - - /* 0x8005FE90 03B290-03B390 [100] */ - .text8005FE90 0x8005FE90 : AT(0x03B290) { - build/src/os/code_3b290_len_100.o(.text); - } - - /* 0x8005FF90 03B390-03B4A0 [110] */ - .text8005FF90 0x8005FF90 : AT(0x03B390) { - build/src/os/code_3b390_len_110.o(.text); - } - - /* 0x800600A0 03B4A0-03B710 [270] */ - .text800600A0 0x800600A0 : AT(0x03B4A0) { - build/src/os/code_3b4a0_len_270.o(.text); - } - - /* 0x80060310 03B710-03B750 [40] */ - .text80060310 0x80060310 : AT(0x03B710) { - build/src/os/code_3b710_len_40.o(.text); - } - - /* 0x80060350 03B750-03B770 [20] */ - .text80060350 0x80060350 : AT(0x03B750) { - build/src/code_3b750_len_20.o(.text); - } - - /* 0x80060370 03B770-03B7F0 [80] */ - .text80060370 0x80060370 : AT(0x03B770) { - build/src/os/code_3b770_len_80.o(.text); - } - - /* 0x800603F0 03B7F0-03B910 [120] */ - .text800603F0 0x800603F0 : AT(0x03B7F0) { - build/src/os/code_3b7f0_len_120.o(.text); - } - - /* 0x80060510 03B910-03BD20 [410] */ - .text80060510 0x80060510 : AT(0x03B910) { - build/src/os/code_3b910_len_410.o(.text); - } - - /* 0x80060920 03BD20-03BDE0 [C0] */ - .text80060920 0x80060920 : AT(0x03BD20) { - build/src/os/code_3bd20_len_c0.o(.text); - } - - /* 0x800609E0 03BDE0-03C1C0 [3E0] */ - .text800609E0 0x800609E0 : AT(0x03BDE0) { - build/src/os/code_3bde0_len_3e0.o(.text); - } - - /* 0x80060DC0 03C1C0-03C220 [60] */ - .text80060DC0 0x80060DC0 : AT(0x03C1C0) { - build/src/os/code_3c1c0_len_60.o(.text); - } - - /* 0x80060E20 03C220-03C2C0 [A0] */ - .text80060E20 0x80060E20 : AT(0x03C220) { - build/src/os/code_3c220_len_a0.o(.text); - } - - /* 0x80060EC0 03C2C0-03C310 [50] */ - .text80060EC0 0x80060EC0 : AT(0x03C2C0) { - build/src/os/code_3c2c0_len_50.o(.text); - } - - /* 0x80060F10 03C310-03C490 [180] */ - .text80060F10 0x80060F10 : AT(0x03C310) { - build/src/os/code_3c310_len_180.o(.text); - } - - /* 0x80061090 03C490-03C850 [3C0] */ - .text80061090 0x80061090 : AT(0x03C490) { - build/src/os/code_3c490_len_3c0.o(.text); - } - - /* 0x80061450 03C850-03C940 [F0] */ - .text80061450 0x80061450 : AT(0x03C850) { - build/src/os/code_3c850_len_f0.o(.text); - } - - /* 0x80061540 03C940-03CA80 [140] */ - .text80061540 0x80061540 : AT(0x03C940) { - build/src/os/code_3c940_len_140.o(.text); - } - - /* 0x80061680 03CA80-03CB20 [A0] */ - .text80061680 0x80061680 : AT(0x03CA80) { - build/src/os/code_3ca80_len_a0.o(.text); - } - - /* 0x80061720 03CB20-03CC50 [130] */ - .text80061720 0x80061720 : AT(0x03CB20) { - build/src/os/code_3cb20_len_130.o(.text); - } - - /* 0x80061850 03CC50-03CCD0 [80] */ - .text80061850 0x80061850 : AT(0x03CC50) { - build/src/os/code_3cc50_len_80.o(.text); - } - - /* 0x800618D0 03CCD0-03CD00 [30] */ - .text800618D0 0x800618D0 : AT(0x03CCD0) { - build/src/os/code_3ccd0_len_30.o(.text); - } - - /* 0x80061900 03CD00-03D2F0 [5F0] */ - .text80061900 0x80061900 : AT(0x03CD00) { - build/src/os/code_3cd00_len_5f0.o(.text); - } - - /* 0x80061EF0 03D2F0-03D300 [10] */ - .text80061EF0 0x80061EF0 : AT(0x03D2F0) { - build/src/os/code_3d2f0_len_10.o(.text); - } - - /* 0x80061F00 03D300-03D330 [30] */ - .text80061F00 0x80061F00 : AT(0x03D300) { - build/src/os/code_3d300_len_30.o(.text); - } - - /* 0x80061F30 03D330-03DCC0 [990] */ - .text80061F30 0x80061F30 : AT(0x03D330) { - build/src/os/code_3d330_len_990.o(.text); - } - - /* 0x800628C0 03DCC0-03E720 [A60] */ - .text800628C0 0x800628C0 : AT(0x03DCC0) { - build/src/os/code_3dcc0_len_a60.o(.text); - } - - /* 0x80063320 03E720-03ED10 [5F0] */ - .text80063320 0x80063320 : AT(0x03E720) { - build/src/os/code_3e720_len_5f0.o(.text); - } - - /* 0x80063910 03ED10-03EF90 [600] */ - .text80063910 0x80063910 : AT(0x03ED10) { - build/src/guOrtho.o(.text); - } - - /* 0x80063B90 03EF90-03F310 [600] */ - .text80063B90 0x80063B90 : AT(0x03EF90) { - build/src/os/code_3ef90_len_600.o(.text); - } - - /* 0x80063F10 03F310-03F6D0 [3C0] */ - .text80063F10 0x80063F10 : AT(0x03F310) { - build/src/os/code_3f310_len_3c0.o(.text); - } - - /* 0x800642D0 03F6D0-03F9F0 [320] */ - .text800642D0 0x800642D0 : AT(0x03F6D0) { - build/src/os/code_3f6d0_len_320.o(.text); - } - - /* 0x800645F0 03F9F0-03FA50 [60] */ - .text800645F0 0x800645F0 : AT(0x03F9F0) { - build/src/os/code_3f9f0_len_60.o(.text); - } - - /* 0x80064650 03FA50-0409B0 [F60] */ - .text80064650 0x80064650 : AT(0x03FA50) { - build/src/os/code_3fa50_len_f60.o(.text); - } - - /* 0x800655B0 0409B0-040AF0 [140] */ - .text800655B0 0x800655B0 : AT(0x0409B0) { - build/src/os/code_409b0_len_140.o(.text); - } - - /* 0x800656F0 040AF0-040C20 [130] */ - .text800656F0 0x800656F0 : AT(0x040AF0) { - build/src/os/code_40af0_len_130.o(.text); - } - - /* 0x80065820 040C20-040E10 [1F0] */ - .text80065820 0x80065820 : AT(0x040C20) { - build/src/os/code_40c20_len_1f0.o(.text); - } - - /* 0x80065A10 040E10-041050 [240] */ - .text80065A10 0x80065A10 : AT(0x040E10) { - build/src/os/code_40e10_len_240.o(.text); - } - - /* 0x80065C50 041050-041170 [120] */ - .text80065C50 0x80065C50 : AT(0x041050) { - build/src/os/code_41050_len_120.o(.text); - } - - /* 0x80065D70 041170-041260 [F0] */ - .text80065D70 0x80065D70 : AT(0x041170) { - build/src/os/code_41170_len_f0.o(.text); - } - - /* 0x80065E60 041260-041350 [F0] */ - .text80065E60 0x80065E60 : AT(0x041260) { - build/src/os/osCreateThread.o(.text); - } - - /* 0x80065F30 041330-041350 [F0] */ - .text80065F30 0x80065F30 : AT(0x041330) { - build/src/os/osGetThreadPri.o(.text); - } - - /* 0x80065F50 041350-041420 [D0] */ - .text80065F50 0x80065F50 : AT(0x041350) { - build/src/os/code_41350_len_d0.o(.text); - } - - /* 0x80066020 041420-041540 [120] */ - .text80066020 0x80066020 : AT(0x041420) { - build/src/os/code_41420_len_120.o(.text); - } - - /* 0x80066140 041540-041600 [C0] */ - .text80066140 0x80066140 : AT(0x041540) { - build/src/os/code_41540_len_c0.o(.text); - } - - /* 0x80066200 041600-041640 [40] */ - .text80066200 0x80066200 : AT(0x041600) { - build/src/os/code_41600_len_40.o(.text); - } - - /* 0x80066240 041640-041690 [50] */ - .text80066240 0x80066240 : AT(0x041640) { - build/src/os/code_41640_len_50.o(.text); - } - - /* 0x80066290 041690-0416A0 [10] */ - .text80066290 0x80066290 : AT(0x041690) { - build/src/os/code_41690_len_10.o(.text); - } - - /* 0x800662A0 0416A0-041730 [90] */ - .text800662A0 0x800662A0 : AT(0x0416A0) { - build/src/os/code_416a0_len_90.o(.text); - } - - /* 0x80066330 041730-041750 [20] */ - .text80066330 0x80066330 : AT(0x041730) { - build/src/os/code_41730_len_20.o(.text); - } - - /* 0x80066350 041750-041BA0 [450] */ - .text80066350 0x80066350 : AT(0x041750) { - build/src/os/code_41750_len_450.o(.text); - } - - /* 0x800667A0 041BA0-041C60 [C0] */ - .text800667A0 0x800667A0 : AT(0x041BA0) { - build/src/os/code_41ba0_len_c0.o(.text); - } - - /* 0x80066860 041C60-041D20 [C0] */ - .text80066860 0x80066860 : AT(0x041C60) { - build/src/os/code_41c60_len_c0.o(.text); - } - - /* 0x80066920 041D20-041D60 [40] */ - .text80066920 0x80066920 : AT(0x041D20) { - build/src/os/code_41d20_len_40.o(.text); - } - - /* 0x80066960 041D60-041DB0 [50] */ - .text80066960 0x80066960 : AT(0x041D60) { - build/src/os/code_41d60_len_50.o(.text); - } - - /* 0x800669B0 041DB0-041DF0 [40] */ - .text800669B0 0x800669B0 : AT(0x041DB0) { - build/src/os/code_41db0_len_40.o(.text); - } - - /* 0x800669F0 041DF0-041E30 [40] */ - .text800669F0 0x800669F0 : AT(0x041DF0) { - build/src/os/code_41df0_len_40.o(.text); - } - - /* 0x80066A30 041E30-041E70 [40] */ - .text80066A30 0x80066A30 : AT(0x041E30) { - build/src/os/code_41e30_len_40.o(.text); - } - - /* 0x80066A70 041E70-0421B0 [340] */ - .text80066A70 0x80066A70 : AT(0x041E70) { - build/src/os/code_41e70_len_340.o(.text); - } - - /* 0x80066DB0 0421B0-042210 [60] */ - .text80066DB0 0x80066DB0 : AT(0x0421B0) { - build/src/os/code_421b0_len_60.o(.text); - } - - /* 0x80066E10 042210-042260 [50] */ - .text80066E10 0x80066E10 : AT(0x042210) { - build/src/os/code_42210_len_50.o(.text); - } - - /* 0x80066E60 042260-0423D0 [170] */ - .text80066E60 0x80066E60 : AT(0x042260) { - build/src/os/code_42260_len_170.o(.text); - } - - /* 0x80066FD0 0423D0-042420 [50] */ - .text80066FD0 0x80066FD0 : AT(0x0423D0) { - build/src/os/code_423d0_len_50.o(.text); - } - - /* 0x80067020 042420-042470 [50] */ - .text80067020 0x80067020 : AT(0x042420) { - build/src/os/code_42420_len_50.o(.text); - } - - /* 0x80067070 042470-042780 [310] */ - .text80067070 0x80067070 : AT(0x042470) { - build/src/os/code_42470_len_310.o(.text); - } - - /* 0x80067380 042780-0428A0 [120] */ - .text80067380 0x80067380 : AT(0x042780) { - build/src/os/code_42780_len_120.o(.text); - } - - /* 0x800674A0 0428A0-042900 [60] */ - .text800674A0 0x800674A0 : AT(0x0428A0) { - build/src/os/guMtxIdentF.o(.text); - } - - /* 0x80067500 042900-042980 [80] */ - .text80067500 0x80067500 : AT(0x042900) { - build/src/os/code_42900_len_80.o(.text); - } - - /* 0x80067580 042980-042A00 [80] */ - .text80067580 0x80067580 : AT(0x042980) { - build/src/os/code_42980_len_80.o(.text); - } - - /* 0x80067600 042A00-042B00 [100] */ - .text80067600 0x80067600 : AT(0x042A00) { - build/src/os/code_42a00_len_100.o(.text); - } - - /* 0x80067700 042B00-042BC0 [C0] */ - .text80067700 0x80067700 : AT(0x042B00) { - build/src/os/code_42b00_len_c0.o(.text); - } - - /* 0x800677C0 042BC0-042C20 [60] */ - .text800677C0 0x800677C0 : AT(0x042BC0) { - build/src/os/code_42bc0_len_60.o(.text); - } - - /* 0x80067820 042C20-042D00 [E0] */ - .text80067820 0x80067820 : AT(0x042C20) { - build/src/os/code_42c20_len_e0.o(.text); - } - - /* 0x80067900 042D00-042D60 [60] */ - .text80067900 0x80067900 : AT(0x042D00) { - build/src/os/code_42d00_len_60.o(.text); - } - - /* 0x80067960 042D60-042DE0 [80] */ - .text80067960 0x80067960 : AT(0x042D60) { - build/src/os/code_42d60_len_80.o(.text); - } - - /* 0x800679E0 042DE0-042E70 [90] */ - .text800679E0 0x800679E0 : AT(0x042DE0) { - build/src/os/code_42de0_len_90.o(.text); - } - - /* 0x80067A70 042E70-043200 [390] */ - .text80067A70 0x80067A70 : AT(0x042E70) { - build/src/os/code_42e70_len_390.o(.text); - } - - /* 0x80067E00 043200-0439C0 [7C0] */ - .text80067E00 0x80067E00 : AT(0x043200) { - build/src/os/code_43200_len_7c0.o(.text); - } - - /* 0x800685C0 0439C0-043BE0 [220] */ - .text800685C0 0x800685C0 : AT(0x0439C0) { - build/src/os/code_439c0_len_220.o(.text); - } - - /* 0x800687E0 043BE0-0441C0 [5E0] */ - .text800687E0 0x800687E0 : AT(0x043BE0) { - build/src/os/code_43be0_len_5e0.o(.text); - } - - /* 0x80068DC0 0441C0-044380 [1C0] */ - .text80068DC0 0x80068DC0 : AT(0x0441C0) { - build/src/os/code_441c0_len_1c0.o(.text); - } - - /* 0x80068F80 044380-044860 [4E0] */ - .text80068F80 0x80068F80 : AT(0x044380) { - build/src/os/code_44380_len_4e0.o(.text); - } - - /* 0x80069460 044860-0448C0 [60] */ - .text80069460 0x80069460 : AT(0x044860) { - build/src/os/code_44860_len_60.o(.text); - } - - /* 0x800694C0 0448C0-044AD0 [210] */ - .text800694C0 0x800694C0 : AT(0x0448C0) { - build/src/os/code_448c0_len_210.o(.text); - } - - /* 0x800696D0 044AD0-044B40 [70] */ - .text800696D0 0x800696D0 : AT(0x044AD0) { - build/src/os/code_44ad0_len_70.o(.text); - } - - /* 0x80069740 044B40-0455D0 [A90] */ - .text80069740 0x80069740 : AT(0x044B40) { - build/src/os/code_44b40_len_a90.o(.text); - } - - /* 0x8006A1D0 0455D0-0457C0 [1F0] */ - .text8006A1D0 0x8006A1D0 : AT(0x0455D0) { - build/src/os/code_455d0_len_1f0.o(.text); - } - - /* 0x8006A3C0 0457C0-045A30 [270] */ - .text8006A3C0 0x8006A3C0 : AT(0x0457C0) { - build/src/os/code_457c0_len_270.o(.text); - } - - /* 0x8006A630 045A30-045A50 [20] */ - .text8006A630 0x8006A630 : AT(0x045A30) { - build/src/os/code_45a30_len_20.o(.text); - } - - /* 0x8006A650 045A50-045DF0 [3A0] */ - .text8006A650 0x8006A650 : AT(0x045A50) { - build/src/os/code_45a50_len_3a0.o(.text); - } - - /* 0x8006A9F0 045DF0-046760 [970] */ - .text8006A9F0 0x8006A9F0 : AT(0x045DF0) { - build/src/os/code_45df0_len_970.o(.text); - } - - /* 0x8006B360 046760-0467F0 [90] */ - .text8006B360 0x8006B360 : AT(0x046760) { - build/src/os/code_46760_len_90.o(.text); - } - - /* 0x8006B3F0 0467F0-046880 [90] */ - .text8006B3F0 0x8006B3F0 : AT(0x0467F0) { - build/src/os/code_467f0_len_90.o(.text); - } - - /* 0x8006B480 046880-046AE0 [260] */ - .text8006B480 0x8006B480 : AT(0x046880) { - build/src/os/code_46880_len_260.o(.text); - } - - /* 0x8006B6E0 046AE0-046C50 [170] */ - .text8006B6E0 0x8006B6E0 : AT(0x046AE0) { - build/src/os/code_46ae0_len_170.o(.text); - } - - /* 0x8006B850 046C50-046C70 [20] */ - .text8006B850 0x8006B850 : AT(0x046C50) { - build/src/os/code_46c50_len_20.o(.text); - } - - /* 0x8006B870 046C70-047A70 [E00] */ - .text8006B870 0x8006B870 : AT(0x046C70) { - build/src/os/code_46c70_len_e00.o(.text); - } - - /* 0x8006C670 047A70-047A80 [10] */ - .text8006C670 0x8006C670 : AT(0x047A70) { - build/src/os/code_47a70_len_10.o(.text); - } - - /* 0x8006C680 047A80-047A90 [10] */ - .text8006C680 0x8006C680 : AT(0x047A80) { - build/src/os/code_47a80_len_10.o(.text); - } - - /* 0x8006C690 047A90-047AE0 [50] */ - .text8006C690 0x8006C690 : AT(0x047A90) { - build/src/os/code_47a90_len_50.o(.text); - } - - /* 0x8006C6E0 047AE0-047BC0 [E0] */ - .text8006C6E0 0x8006C6E0 : AT(0x047AE0) { - build/src/os/code_47ae0_len_e0.o(.text); - } - - /* 0x8006C7C0 047BC0-047C10 [50] */ - .text8006C7C0 0x8006C7C0 : AT(0x047BC0) { - build/src/os/code_47bc0_len_50.o(.text); - } - - /* 0x8006C810 047C10-047C60 [50] */ - .text8006C810 0x8006C810 : AT(0x047C10) { - build/src/os/code_47c10_len_50.o(.text); - } - - /* 0x8006C860 047C60-047D50 [F0] */ - .text8006C860 0x8006C860 : AT(0x047C60) { - build/src/os/code_47c60_len_f0.o(.text); - } - - /* 0x8006C950 047D50-047E30 [E0] */ - .text8006C950 0x8006C950 : AT(0x047D50) { - build/src/os/code_47d50_len_e0.o(.text); - } - - /* 0x8006CA30 047E30-047E90 [60] */ - .text8006CA30 0x8006CA30 : AT(0x047E30) { - build/src/os/code_47e30_len_60.o(.text); - } - - /* 0x8006CA90 047E90-047FA0 [110] */ - .text8006CA90 0x8006CA90 : AT(0x047E90) { - build/src/os/code_47e90_len_110.o(.text); - } - - /* 0x8006CBA0 047FA0-047FC0 [20] */ - .text8006CBA0 0x8006CBA0 : AT(0x047FA0) { - build/src/os/code_47fa0_len_20.o(.text); - } - - /* 0x8006CBC0 047FC0-048020 [60] */ - .text8006CBC0 0x8006CBC0 : AT(0x047FC0) { - build/src/os/code_47fc0_len_60.o(.text); - } - - /* 0x8006CC20 048020-048A20 [A00] */ - .text8006CC20 0x8006CC20 : AT(0x048020) { - build/src/os/code_48020_len_a00.o(.text); - } - - /* 0x8006D620 048A20-048BE0 [1C0] */ - .text8006D620 0x8006D620 : AT(0x048A20) { - build/src/os/code_48a20_len_1c0.o(.text); - } - - /* 0x8006D7E0 048BE0-048C00 [20] */ - .text8006D7E0 0x8006D7E0 : AT(0x048BE0) { - build/src/os/code_48be0_len_20.o(.text); - } - - /* 0x8006D800 048C00-0491C0 [5C0] */ - .text8006D800 0x8006D800 : AT(0x048C00) { - build/src/os/code_48c00_len_5c0.o(.text); - } - - /* 0x8006DDC0 0491C0-049C70 [AB0] */ - .text8006DDC0 0x8006DDC0 : AT(0x0491C0) { - build/src/os/code_491c0_len_f80.o(.text); - } - - /* 0x8006E870 049C70-04A140 [4D0] */ - .text8006E870 0x8006E870 : AT(0x049C70) { - build/src/os/code_49C70.o(.text); - } - - /* 0x8006ED40 04A140-04A1B0 [70] */ - .text8006ED40 0x8006ED40 : AT(0x04A140) { - build/src/os/code_4a140_len_70.o(.text); - } - - /* 0x8006EDB0 04A1B0-04A1F0 [40] */ - .text8006EDB0 0x8006EDB0 : AT(0x04A1B0) { - build/src/os/code_4a1b0_len_40.o(.text); - } - - /* 0x8006EDF0 04A1F0-04A360 [170] */ - .text8006EDF0 0x8006EDF0 : AT(0x04A1F0) { - build/src/os/code_4a1f0_len_170.o(.text); - } - - /* 0x8006EF60 04A360-04AC90 [930] */ - .text8006EF60 0x8006EF60 : AT(0x04A360) { - build/src/os/code_4a360_len_930.o(.text); - } - - /* 0x8006F890 04AC90-04E5A0 [3910] */ - .text8006F890 0x8006F890 : AT(0x04AC90) { - build/src/os/code_4ac90_len_3910.o(.text); - } - - /* 0x00000000 04E5A0-0759B0 [27410] */ - .data0004E5A0 0x800731A0 : AT(0x04E5A0) { - build/bin/papermario.04E5A0.bin_4e5a0_len_27410.o(.data); - } - - /* 0x800DC500 0759B0-07BB60 [61B0] */ - .text800DC500 0x800DC500 : AT(0x0759B0) { - build/src/code_759b0_len_61b0.o(.text); - } - - /* 0x800E26B0 07BB60-07FD10 [41B0] */ - .text800E26B0 0x800E26B0 : AT(0x07BB60) { - build/src/code_7bb60_len_41b0.o(.text); - } - - /* 0x800E6860 07FD10-080850 [B40] */ - .text800E6860 0x800E6860 : AT(0x07FD10) { - build/src/code_7fd10_len_b40.o(.text); - } - - /* 0x800E73A0 080850-0838B0 [3060] */ - .text800E73A0 0x800E73A0 : AT(0x080850) { - build/src/code_80850_len_3060.o(.text); - } - - /* 0x800EA400 0838B0-0891B0 [5900] */ - .text800EA400 0x800EA400 : AT(0x0838B0) { - build/src/code_838b0_len_5900.o(.text); - } - - /* 0x800EFD00 0891B0-08A160 [FB0] */ - .text800EFD00 0x800EFD00 : AT(0x0891B0) { - build/src/code_891b0_len_fb0.o(.text); - } - - /* 0x800F0CB0 08A160-08A860 [700] */ - .text800F0CB0 0x800F0CB0 : AT(0x08A160) { - build/src/code_8a160_len_700.o(.text); - } - - /* 0x800F13B0 08A860-08E790 [3F30] */ - .text800F13B0 0x800F13B0 : AT(0x08A860) { - build/src/code_8a860_len_3f30.o(.text); - } - - /* 0x800F52E0 08E790-090FE0 [2850] */ - .text800F52E0 0x800F52E0 : AT(0x08E790) { - build/src/code_8e790_len_2850.o(.text); - } - - /* 0x00000000 090FE0-0A5DD0 [14DF0] */ - .data00090FE0 0x800F7B30 : AT(0x090FE0) { - build/bin/papermario.090FE0.bin_90fe0_len_14df0.o(.data); - } - - /* uncomment once rodata for is_ability_active is needed. */ - /*.rodata8010BF60 0x8010BF60 : AT(0xA5410) { - build/src/code_80850_len_3060.o(.rodata) - } - - .data000A54F0 0x8010C040 : AT(0xA54F0) { - build/bin/papermario.0A54F0.bin_0a54f0_len_8e0.o(.data); - }*/ - - /* 0x8010F6D0 0A5DD0-0B72B0 [114E0] */ - .text8010F6D0 0x8010F6D0 : AT(0x0A5DD0) { - build/src/code_a5dd0_len_114e0.o(.text); - } - - /* 0x80120BB0 0B72B0-0CD180 [15ED0] */ - .text80120BB0 0x80120BB0 : AT(0x0B72B0) { - build/src/code_b72b0_len_15ed0.o(.text); - } - - /* 0x80136A80 0CD180-0D0A70 [38F0] */ - .text80136A80 0x80136A80 : AT(0x0CD180) { - build/src/code_cd180_len_38f0.o(.text); - } - - /* 0x8013A370 0D0A70-0D5A50 [4FE0] */ - .text8013A370 0x8013A370 : AT(0x0D0A70) { - build/src/code_d0a70_len_4fe0.o(.text); - } - - /* 0x8013F350 0D5A50-0DBA20 [5FD0] */ - .text8013F350 0x8013F350 : AT(0x0D5A50) { - build/src/code_d5a50_len_5fd0.o(.text); - } - - /* 0x80145320 0DBA20-0DBD70 [350] */ - .text80145320 0x80145320 : AT(0x0DBA20) { - build/src/code_dba20_len_350.o(.text); - } - - /* 0x80145670 0DBD70-0DC470 [700] */ - .text80145670 0x80145670 : AT(0x0DBD70) { - build/src/code_dbd70_len_700.o(.text); - } - - /* 0x80145D70 0DC470-0DD930 [14C0] */ - .text80145D70 0x80145D70 : AT(0x0DC470) { - build/src/code_dc470_len_14c0.o(.text); - } - - /* 0x80147230 0DD930-0DDAF0 [1C0] */ - .text80147230 0x80147230 : AT(0x0DD930) { - build/src/code_dd930_len_1c0.o(.text); - } - - /* 0x801473F0 0DDAF0-0DE740 [C50] */ - .text801473F0 0x801473F0 : AT(0x0DDAF0) { - build/src/code_ddaf0_len_c50.o(.text); - } - - /* 0x80148040 0DE740-0E0B30 [23F0] */ - .text80148040 0x80148040 : AT(0x0DE740) { - build/src/code_de740_len_23f0.o(.text); - } - - /* 0x8014A430 0E0B30-0E16B0 [B80] */ - .text8014A430 0x8014A430 : AT(0x0E0B30) { - build/src/code_e0b30_len_b80.o(.text); - } - - /* 0x00000000 0E16B0-0E79B0 [6300] */ - .data000E16B0 0x8014AFB0 : AT(0x0E16B0) { - build/bin/papermario.0E16B0.bin_e5dd0_len_6300.o(.data); - } - - /* 0x802C3000 0E79B0-0E92D0 [1920] */ - .text802C3000 0x802C3000 : AT(0x0E79B0) { - build/src/code_e79b0_len_1920.o(.text); - } - - /* 0x802C4920 0E92D0-0EF070 [5DA0] */ - .text802C4920 0x802C4920 : AT(0x0E92D0) { - build/src/code_e92d0_len_5da0.o(.text); - } - - /* 0x802CA6C0 0EF070-0F2470 [3400] */ - .text802CA6C0 0x802CA6C0 : AT(0x0EF070) { - build/src/code_ef070_len_3400.o(.text); - } - - /* 0x802CDAC0 0F2470-0F4C60 [27F0] */ - .text802CDAC0 0x802CDAC0 : AT(0x0F2470) { - build/src/code_f2470_len_27f0.o(.text); - } - - /* 0x802D02B0 0F4C60-0F8F60 [4300] */ - .text802D02B0 0x802D02B0 : AT(0x0F4C60) { - build/src/code_f4c60_len_4300.o(.text); - } - - /* 0x802D45B0 0F8F60-0FA4C0 [1560] */ - .text802D45B0 0x802D45B0 : AT(0x0F8F60) { - build/src/code_f8f60_len_1560.o(.text); - } - - /* 0x802D5B10 0FA4C0-0FE0B0 [3BF0] */ - .text802D5B10 0x802D5B10 : AT(0x0FA4C0) { - build/src/code_fa4c0_len_3bf0.o(.text); - } - - /* 0x802D9700 0FE0B0-0FE650 [5A0] */ - .text802D9700 0x802D9700 : AT(0x0FE0B0) { - build/src/code_fe0b0_len_5a0.o(.text); - } - - /* 0x00000000 0FE650-0FEE30 [7E0] */ - .data000FE650 0x802D9CA0 : AT(0x0FE650) { - build/bin/papermario.0FE650.bin_fee30_len_7e0.o(.data); - } - - /* 0x802DBD40 0FEE30-101B90 [2D60] */ - .text802DBD40 0x802DBD40 : AT(0x0FEE30) { - build/src/code_fee30_len_2d60.o(.text); - } - - /* 0x802DEAA0 101B90-102480 [8F0] */ - .text802DEAA0 0x802DEAA0 : AT(0x101B90) { - build/src/code_101b90_len_8f0.o(.text); - } - - /* 0x00000000 102480-102610 [190] */ - .data00102480 0x802DF390 : AT(0x102480) { - build/bin/papermario.102480.bin_102610_len_190.o(.data); - } - - /* 0x802E0D90 102610-104940 [2330] */ - .text802E0D90 0x802E0D90 : AT(0x102610) { - build/src/code_102610_len_2330.o(.text); - } - - /* 0x802E30C0 104940-105700 [DC0] */ - .text802E30C0 0x802E30C0 : AT(0x104940) { - build/src/code_104940_len_dc0.o(.text); - } - - /* 0x802E3E80 105700-107830 [2130] */ - .text802E3E80 0x802E3E80 : AT(0x105700) { - build/src/code_105700_len_2130.o(.text); - } - - /* 0x802E5FB0 107830-1086A0 [E70] */ - .text802E5FB0 0x802E5FB0 : AT(0x107830) { - build/src/code_107830_len_e70.o(.text); - } - - /* 0x802E6E20 1086A0-109660 [FC0] */ - .text802E6E20 0x802E6E20 : AT(0x1086A0) { - build/src/code_1086a0_len_fc0.o(.text); - } - - /* 0x802E7DE0 109660-10A9F0 [1390] */ - .text802E7DE0 0x802E7DE0 : AT(0x109660) { - build/src/code_109660_len_1270.o(.text); - } - - /* 0x00000000 10A9F0-131340 [???] */ - .data0010A9F0 0x0010A9F0 : AT(0x10A9F0) { - build/bin/papermario.10A9F0.bin_10A9F0.o(.data); - } - - /* 0x00000000 131340-135EE0 [???] */ - .data00131340 0x00131340 : AT(0x131340) { - build/bin/papermario.131340.bin_131340.o(.data); - } - - /* 0x80242BA0 135EE0-1422A0 [???] */ - .tex280242BA0 0x80242BA0 : AT(0x135EE0) { - build/src/code_135EE0.o(.text); - } - - /* 0x00000000 1422A0-163400 [???] */ - .data001422A0 0x001422A0 : AT(0x1422A0) { - build/bin/papermario.1422A0.bin_1422A0.o(.data); - } - - /* 0x80242BA0 163400-167570 [4170] */ - .text80242BA0 0x80242BA0 : AT(0x163400) { - build/src/code_163400.o(.text); - } - - /* 0x80246D10 167570-168590 [1020] */ - .text80246D10 0x80246D10 : AT(0x167570) { - build/src/code_167570.o(.text); - } - - /* 0x80247D30 168590-169BE0 [1650] */ - .text80247D30 0x80247D30 : AT(0x168590) { - build/src/code_168590.o(.text); - } - - /* 0x80249380 169BE0-16A3E0 [800] */ - .text80249380 0x80249380 : AT(0x169BE0) { - build/src/code_169BE0.o(.text); - } - - /* 0x00000000 16A3E0-16C8E0 [2500] */ - .data0016A3E0 0x0016A3E0 : AT(0x16A3E0) { - build/bin/papermario.16A3E0.bin_16a3e0.o(.data); - } - - /* 0x8023E000 16C8E0-1AF2C0 [429E0] */ - .text8023E000 0x8023E000 : AT(0x16C8E0) { - build/src/code_16c8e0.o(.text); - } - - /* 0x00000000 1AF2C0-3169F0 [167730] */ - .data001AF2C0 0x001AF2C0 : AT(0x1AF2C0) { - build/bin/papermario.1AF2C0.bin_1AF2C0.o(.data); - } - - /* 0x80200000 3169F0-316A70 [80] */ - .text80200000 0x80200000 : AT(0x3169F0) { - build/src/code_3169f0.o(.text); - } - - /* 0x80200080 316A70-316C00 [190] */ - .text80200080 0x80200080 : AT(0x316A70) { - build/src/code_316a70.o(.text); - } - - /* 0x00000000 316C00-316D90 [190] */ - .data00316C00 0x00316C00 : AT(0x316C00) { - build/bin/papermario.316C00.bin_316c00.o(.data); - } - - /* 0x802AE000 316D90-316F30 [1A0] */ - .text802AE000 0x802AE000 : AT(0x316D90) { - build/src/code_316d90.o(.text); - } - - /* 0x802B2000 316F30-317020 [F0] */ - .text802B2000 0x802B2000 : AT(0x316F30) { - build/src/code_316f30.o(.text); - } - - /* 0x00000000 317020-415D90 [FED70] */ - .data00317020 0x00317020 : AT(0x317020) { - build/bin/papermario.317020.bin_317020.o(.data); - } - - /* 0x802A1000 415D90-4200C0 [A330] */ - .text802A1000 0x802A1000 : AT(0x415D90) { - build/src/code_415D90.o(.text); - } - - /* 0x00000000 4200C0-7E0E80 [3C0DC0] */ - .data004200C0 0x004200C0 : AT(0x4200C0) { - build/bin/papermario.4200C0.bin_4200C0.o(.data); - } - - /* 0x80280000 7E0E80-7E2AA0 [1C20] */ - .text80280000 0x80280000 : AT(0x7E0E80) { - build/src/code_7e0e80.o(.text); - } - - /* 0x80281C20 7E2AA0-7E3700 [C60] */ - .text80281C20 0x80281C20 : AT(0x7E2AA0) { - build/src/code_7E2AA0.o(.text); - } - - /* 0x80282880 7E3700-7E4D00 [1600] */ - .text80282880 0x80282880 : AT(0x7E3700) { - build/src/code_7E3700.o(.text); - } - - /* 0x00000000 7E4D00-E20EB0 [63C1B0] */ - .data007E4D00 0x007E4D00 : AT(0x7E4D00) { - build/bin/papermario.7E4D00.bin_7e4d00.o(.data); - } - - /* 0x802B7000 E20EB0-E215C0 [710] */ - .text802B7000 0x802B7000 : AT(0xE20EB0) { - build/src/code_e20eb0.o(.text); - } - - /* 0x00000000 E215C0-F007C0 [DF200] */ - .data00E215C0 0x00E215C0 : AT(0xE215C0) { - build/bin/papermario.E215C0.bin_19e09a8.o(.data); - } - - /* 0x00000000 F007C0-F02160 [19A0] */ - .data00F007C0 0x00F007C0 : AT(0xF007C0) { - build/bgm/papermario.F007C0.bgm.o(.data); - } - - /* 0x00000000 F02160-F03740 [15E0] */ - .data00F02160 0x00F02160 : AT(0xF02160) { - build/bgm/papermario.F02160.bgm.o(.data); - } - - /* 0x00000000 F03740-F043F0 [CB0] */ - .data00F03740 0x00F03740 : AT(0xF03740) { - build/bgm/papermario.F03740.bgm.o(.data); - } - - /* 0x00000000 F043F0-F073C0 [2FD0] */ - .data00F043F0 0x00F043F0 : AT(0xF043F0) { - build/bgm/papermario.F043F0.bgm.o(.data); - } - - /* 0x00000000 F073C0-F08D40 [1980] */ - .data00F073C0 0x00F073C0 : AT(0xF073C0) { - build/bgm/papermario.F073C0.bgm.o(.data); - } - - /* 0x00000000 F08D40-F09600 [8C0] */ - .data00F08D40 0x00F08D40 : AT(0xF08D40) { - build/bgm/papermario.F08D40.bgm.o(.data); - } - - /* 0x00000000 F09600-F0A550 [F50] */ - .data00F09600 0x00F09600 : AT(0xF09600) { - build/bgm/papermario.F09600.bgm.o(.data); - } - - /* 0x00000000 F0A550-F0BAE0 [1590] */ - .data00F0A550 0x00F0A550 : AT(0xF0A550) { - build/bgm/papermario.F0A550.bgm.o(.data); - } - - /* 0x00000000 F0BAE0-F0DEC0 [23E0] */ - .data00F0BAE0 0x00F0BAE0 : AT(0xF0BAE0) { - build/bgm/papermario.F0BAE0.bgm.o(.data); - } - - /* 0x00000000 F0DEC0-F0FD20 [1E60] */ - .data00F0DEC0 0x00F0DEC0 : AT(0xF0DEC0) { - build/bgm/papermario.F0DEC0.bgm.o(.data); - } - - /* 0x00000000 F0FD20-F110D0 [13B0] */ - .data00F0FD20 0x00F0FD20 : AT(0xF0FD20) { - build/bgm/papermario.F0FD20.bgm.o(.data); - } - - /* 0x00000000 F110D0-F116C0 [5F0] */ - .data00F110D0 0x00F110D0 : AT(0xF110D0) { - build/bgm/papermario.F110D0.bgm.o(.data); - } - - /* 0x00000000 F116C0-F12320 [C60] */ - .data00F116C0 0x00F116C0 : AT(0xF116C0) { - build/bgm/papermario.F116C0.bgm.o(.data); - } - - /* 0x00000000 F12320-F13C20 [1900] */ - .data00F12320 0x00F12320 : AT(0xF12320) { - build/bgm/papermario.F12320.bgm.o(.data); - } - - /* 0x00000000 F13C20-F15F40 [2320] */ - .data00F13C20 0x00F13C20 : AT(0xF13C20) { - build/bgm/papermario.F13C20.bgm.o(.data); - } - - /* 0x00000000 F15F40-F16F80 [1040] */ - .data00F15F40 0x00F15F40 : AT(0xF15F40) { - build/bgm/papermario.F15F40.bgm.o(.data); - } - - /* 0x00000000 F16F80-F171D0 [250] */ - .data00F16F80 0x00F16F80 : AT(0xF16F80) { - build/bgm/papermario.F16F80.bgm.o(.data); - } - - /* 0x00000000 F171D0-F17370 [1A0] */ - .data00F171D0 0x00F171D0 : AT(0xF171D0) { - build/bgm/papermario.F171D0.bgm.o(.data); - } - - /* 0x00000000 F17370-F17570 [200] */ - .data00F17370 0x00F17370 : AT(0xF17370) { - build/bgm/papermario.F17370.bgm.o(.data); - } - - /* 0x00000000 F17570-F18940 [13D0] */ - .data00F17570 0x00F17570 : AT(0xF17570) { - build/bgm/papermario.F17570.bgm.o(.data); - } - - /* 0x00000000 F18940-F193D0 [A90] */ - .data00F18940 0x00F18940 : AT(0xF18940) { - build/bgm/papermario.F18940.bgm.o(.data); - } - - /* 0x00000000 F193D0-F19BC0 [7F0] */ - .data00F193D0 0x00F193D0 : AT(0xF193D0) { - build/bgm/papermario.F193D0.bgm.o(.data); - } - - /* 0x00000000 F19BC0-F1A6F0 [B30] */ - .data00F19BC0 0x00F19BC0 : AT(0xF19BC0) { - build/bgm/papermario.F19BC0.bgm.o(.data); - } - - /* 0x00000000 F1A6F0-F1ABD0 [4E0] */ - .data00F1A6F0 0x00F1A6F0 : AT(0xF1A6F0) { - build/bgm/papermario.F1A6F0.bgm.o(.data); - } - - /* 0x00000000 F1ABD0-F1C810 [1C40] */ - .data00F1ABD0 0x00F1ABD0 : AT(0xF1ABD0) { - build/bgm/papermario.F1ABD0.bgm.o(.data); - } - - /* 0x00000000 F1C810-F1DBF0 [13E0] */ - .data00F1C810 0x00F1C810 : AT(0xF1C810) { - build/bgm/papermario.F1C810.bgm.o(.data); - } - - /* 0x00000000 F1DBF0-F1F2E0 [16F0] */ - .data00F1DBF0 0x00F1DBF0 : AT(0xF1DBF0) { - build/bgm/papermario.F1DBF0.bgm.o(.data); - } - - /* 0x00000000 F1F2E0-F20FF0 [1D10] */ - .data00F1F2E0 0x00F1F2E0 : AT(0xF1F2E0) { - build/bgm/papermario.F1F2E0.bgm.o(.data); - } - - /* 0x00000000 F20FF0-F21780 [790] */ - .data00F20FF0 0x00F20FF0 : AT(0xF20FF0) { - build/bgm/papermario.F20FF0.bgm.o(.data); - } - - /* 0x00000000 F21780-F22A00 [1280] */ - .data00F21780 0x00F21780 : AT(0xF21780) { - build/bgm/papermario.F21780.bgm.o(.data); - } - - /* 0x00000000 F22A00-F23A00 [1000] */ - .data00F22A00 0x00F22A00 : AT(0xF22A00) { - build/bgm/papermario.F22A00.bgm.o(.data); - } - - /* 0x00000000 F23A00-F24810 [E10] */ - .data00F23A00 0x00F23A00 : AT(0xF23A00) { - build/bgm/papermario.F23A00.bgm.o(.data); - } - - /* 0x00000000 F24810-F25240 [A30] */ - .data00F24810 0x00F24810 : AT(0xF24810) { - build/bgm/papermario.F24810.bgm.o(.data); - } - - /* 0x00000000 F25240-F26260 [1020] */ - .data00F25240 0x00F25240 : AT(0xF25240) { - build/bgm/papermario.F25240.bgm.o(.data); - } - - /* 0x00000000 F26260-F27840 [15E0] */ - .data00F26260 0x00F26260 : AT(0xF26260) { - build/bgm/papermario.F26260.bgm.o(.data); - } - - /* 0x00000000 F27840-F27E20 [5E0] */ - .data00F27840 0x00F27840 : AT(0xF27840) { - build/bgm/papermario.F27840.bgm.o(.data); - } - - /* 0x00000000 F27E20-F28E20 [1000] */ - .data00F27E20 0x00F27E20 : AT(0xF27E20) { - build/bgm/papermario.F27E20.bgm.o(.data); - } - - /* 0x00000000 F28E20-F29AC0 [CA0] */ - .data00F28E20 0x00F28E20 : AT(0xF28E20) { - build/bgm/papermario.F28E20.bgm.o(.data); - } - - /* 0x00000000 F29AC0-F2E130 [4670] */ - .data00F29AC0 0x00F29AC0 : AT(0xF29AC0) { - build/bgm/papermario.F29AC0.bgm.o(.data); - } - - /* 0x00000000 F2E130-F2EF90 [E60] */ - .data00F2E130 0x00F2E130 : AT(0xF2E130) { - build/bgm/papermario.F2E130.bgm.o(.data); - } - - /* 0x00000000 F2EF90-F30590 [1600] */ - .data00F2EF90 0x00F2EF90 : AT(0xF2EF90) { - build/bgm/papermario.F2EF90.bgm.o(.data); - } - - /* 0x00000000 F30590-F318B0 [1320] */ - .data00F30590 0x00F30590 : AT(0xF30590) { - build/bgm/papermario.F30590.bgm.o(.data); - } - - /* 0x00000000 F318B0-F32220 [970] */ - .data00F318B0 0x00F318B0 : AT(0xF318B0) { - build/bgm/papermario.F318B0.bgm.o(.data); - } - - /* 0x00000000 F32220-F33060 [E40] */ - .data00F32220 0x00F32220 : AT(0xF32220) { - build/bgm/papermario.F32220.bgm.o(.data); - } - - /* 0x00000000 F33060-F33AA0 [A40] */ - .data00F33060 0x00F33060 : AT(0xF33060) { - build/bgm/papermario.F33060.bgm.o(.data); - } - - /* 0x00000000 F33AA0-F33F10 [470] */ - .data00F33AA0 0x00F33AA0 : AT(0xF33AA0) { - build/bgm/papermario.F33AA0.bgm.o(.data); - } - - /* 0x00000000 F33F10-F354E0 [15D0] */ - .data00F33F10 0x00F33F10 : AT(0xF33F10) { - build/bgm/papermario.F33F10.bgm.o(.data); - } - - /* 0x00000000 F354E0-F35ED0 [9F0] */ - .data00F354E0 0x00F354E0 : AT(0xF354E0) { - build/bgm/papermario.F354E0.bgm.o(.data); - } - - /* 0x00000000 F35ED0-F36690 [7C0] */ - .data00F35ED0 0x00F35ED0 : AT(0xF35ED0) { - build/bgm/papermario.F35ED0.bgm.o(.data); - } - - /* 0x00000000 F36690-F379E0 [1350] */ - .data00F36690 0x00F36690 : AT(0xF36690) { - build/bgm/papermario.F36690.bgm.o(.data); - } - - /* 0x00000000 F379E0-F38570 [B90] */ - .data00F379E0 0x00F379E0 : AT(0xF379E0) { - build/bgm/papermario.F379E0.bgm.o(.data); - } - - /* 0x00000000 F38570-F39160 [BF0] */ - .data00F38570 0x00F38570 : AT(0xF38570) { - build/bgm/papermario.F38570.bgm.o(.data); - } - - /* 0x00000000 F39160-F3A0D0 [F70] */ - .data00F39160 0x00F39160 : AT(0xF39160) { - build/bgm/papermario.F39160.bgm.o(.data); - } - - /* 0x00000000 F3A0D0-F3A450 [380] */ - .data00F3A0D0 0x00F3A0D0 : AT(0xF3A0D0) { - build/bgm/papermario.F3A0D0.bgm.o(.data); - } - - /* 0x00000000 F3A450-F3AF20 [AD0] */ - .data00F3A450 0x00F3A450 : AT(0xF3A450) { - build/bgm/papermario.F3A450.bgm.o(.data); - } - - /* 0x00000000 F3AF20-F3C130 [1210] */ - .data00F3AF20 0x00F3AF20 : AT(0xF3AF20) { - build/bgm/papermario.F3AF20.bgm.o(.data); - } - - /* 0x00000000 F3C130-F3CCC0 [B90] */ - .data00F3C130 0x00F3C130 : AT(0xF3C130) { - build/bgm/papermario.F3C130.bgm.o(.data); - } - - /* 0x00000000 F3CCC0-F3E130 [1470] */ - .data00F3CCC0 0x00F3CCC0 : AT(0xF3CCC0) { - build/bgm/papermario.F3CCC0.bgm.o(.data); - } - - /* 0x00000000 F3E130-F3F3E0 [12B0] */ - .data00F3E130 0x00F3E130 : AT(0xF3E130) { - build/bgm/papermario.F3E130.bgm.o(.data); - } - - /* 0x00000000 F3F3E0-F40F00 [1B20] */ - .data00F3F3E0 0x00F3F3E0 : AT(0xF3F3E0) { - build/bgm/papermario.F3F3E0.bgm.o(.data); - } - - /* 0x00000000 F40F00-F42F30 [2030] */ - .data00F40F00 0x00F40F00 : AT(0xF40F00) { - build/bgm/papermario.F40F00.bgm.o(.data); - } - - /* 0x00000000 F42F30-F45500 [25D0] */ - .data00F42F30 0x00F42F30 : AT(0xF42F30) { - build/bgm/papermario.F42F30.bgm.o(.data); - } - - /* 0x00000000 F45500-F465E0 [10E0] */ - .data00F45500 0x00F45500 : AT(0xF45500) { - build/bgm/papermario.F45500.bgm.o(.data); - } - - /* 0x00000000 F465E0-F474A0 [EC0] */ - .data00F465E0 0x00F465E0 : AT(0xF465E0) { - build/bgm/papermario.F465E0.bgm.o(.data); - } - - /* 0x00000000 F474A0-F47E10 [970] */ - .data00F474A0 0x00F474A0 : AT(0xF474A0) { - build/bgm/papermario.F474A0.bgm.o(.data); - } - - /* 0x00000000 F47E10-F48410 [600] */ - .data00F47E10 0x00F47E10 : AT(0xF47E10) { - build/bgm/papermario.F47E10.bgm.o(.data); - } - - /* 0x00000000 F48410-F4A880 [2470] */ - .data00F48410 0x00F48410 : AT(0xF48410) { - build/bgm/papermario.F48410.bgm.o(.data); - } - - /* 0x00000000 F4A880-F4BC00 [1380] */ - .data00F4A880 0x00F4A880 : AT(0xF4A880) { - build/bgm/papermario.F4A880.bgm.o(.data); - } - - /* 0x00000000 F4BC00-F4E690 [2A90] */ - .data00F4BC00 0x00F4BC00 : AT(0xF4BC00) { - build/bgm/papermario.F4BC00.bgm.o(.data); - } - - /* 0x00000000 F4E690-F50A00 [2370] */ - .data00F4E690 0x00F4E690 : AT(0xF4E690) { - build/bgm/papermario.F4E690.bgm.o(.data); - } - - /* 0x00000000 F50A00-F52520 [1B20] */ - .data00F50A00 0x00F50A00 : AT(0xF50A00) { - build/bgm/papermario.F50A00.bgm.o(.data); - } - - /* 0x00000000 F52520-F55C80 [3760] */ - .data00F52520 0x00F52520 : AT(0xF52520) { - build/bgm/papermario.F52520.bgm.o(.data); - } - - /* 0x00000000 F55C80-F58ED0 [3250] */ - .data00F55C80 0x00F55C80 : AT(0xF55C80) { - build/bgm/papermario.F55C80.bgm.o(.data); - } - - /* 0x00000000 F58ED0-F592B0 [3E0] */ - .data00F58ED0 0x00F58ED0 : AT(0xF58ED0) { - build/bgm/papermario.F58ED0.bgm.o(.data); - } - - /* 0x00000000 F592B0-F5AFF0 [1D40] */ - .data00F592B0 0x00F592B0 : AT(0xF592B0) { - build/bgm/papermario.F592B0.bgm.o(.data); - } - - /* 0x00000000 F5AFF0-F5C8D0 [18E0] */ - .data00F5AFF0 0x00F5AFF0 : AT(0xF5AFF0) { - build/bgm/papermario.F5AFF0.bgm.o(.data); - } - - /* 0x00000000 F5C8D0-F5DF40 [1670] */ - .data00F5C8D0 0x00F5C8D0 : AT(0xF5C8D0) { - build/bgm/papermario.F5C8D0.bgm.o(.data); - } - - /* 0x00000000 F5DF40-F5F500 [15C0] */ - .data00F5DF40 0x00F5DF40 : AT(0xF5DF40) { - build/bgm/papermario.F5DF40.bgm.o(.data); - } - - /* 0x00000000 F5F500-F61700 [2200] */ - .data00F5F500 0x00F5F500 : AT(0xF5F500) { - build/bgm/papermario.F5F500.bgm.o(.data); - } - - /* 0x00000000 F61700-F62E50 [1750] */ - .data00F61700 0x00F61700 : AT(0xF61700) { - build/bgm/papermario.F61700.bgm.o(.data); - } - - /* 0x00000000 F62E50-F64220 [13D0] */ - .data00F62E50 0x00F62E50 : AT(0xF62E50) { - build/bgm/papermario.F62E50.bgm.o(.data); - } - - /* 0x00000000 F64220-F64CB0 [A90] */ - .data00F64220 0x00F64220 : AT(0xF64220) { - build/bgm/papermario.F64220.bgm.o(.data); - } - - /* 0x00000000 F64CB0-F65B30 [E80] */ - .data00F64CB0 0x00F64CB0 : AT(0xF64CB0) { - build/bgm/papermario.F64CB0.bgm.o(.data); - } - - /* 0x00000000 F65B30-F66690 [B60] */ - .data00F65B30 0x00F65B30 : AT(0xF65B30) { - build/bgm/papermario.F65B30.bgm.o(.data); - } - - /* 0x00000000 F66690-F66B70 [4E0] */ - .data00F66690 0x00F66690 : AT(0xF66690) { - build/bgm/papermario.F66690.bgm.o(.data); - } - - /* 0x00000000 F66B70-F67F80 [1410] */ - .data00F66B70 0x00F66B70 : AT(0xF66B70) { - build/bgm/papermario.F66B70.bgm.o(.data); - } - - /* 0x00000000 F67F80-F69640 [16C0] */ - .data00F67F80 0x00F67F80 : AT(0xF67F80) { - build/bgm/papermario.F67F80.bgm.o(.data); - } - - /* 0x00000000 F69640-F6A050 [A10] */ - .data00F69640 0x00F69640 : AT(0xF69640) { - build/bgm/papermario.F69640.bgm.o(.data); - } - - /* 0x00000000 F6A050-F6C270 [2220] */ - .data00F6A050 0x00F6A050 : AT(0xF6A050) { - build/bgm/papermario.F6A050.bgm.o(.data); - } - - /* 0x00000000 F6C270-F6CED0 [C60] */ - .data00F6C270 0x00F6C270 : AT(0xF6C270) { - build/bgm/papermario.F6C270.bgm.o(.data); - } - - /* 0x00000000 F6CED0-F6EE40 [1F70] */ - .data00F6CED0 0x00F6CED0 : AT(0xF6CED0) { - build/bgm/papermario.F6CED0.bgm.o(.data); - } - - /* 0x00000000 F6EE40-F73390 [4550] */ - .data00F6EE40 0x00F6EE40 : AT(0xF6EE40) { - build/bgm/papermario.F6EE40.bgm.o(.data); - } - - /* 0x00000000 F73390-F751F0 [1E60] */ - .data00F73390 0x00F73390 : AT(0xF73390) { - build/bgm/papermario.F73390.bgm.o(.data); - } - - /* 0x00000000 F751F0-F759C0 [7D0] */ - .data00F751F0 0x00F751F0 : AT(0xF751F0) { - build/bgm/papermario.F751F0.bgm.o(.data); - } - - /* 0x00000000 F759C0-F77200 [1840] */ - .data00F759C0 0x00F759C0 : AT(0xF759C0) { - build/bgm/papermario.F759C0.bgm.o(.data); - } - - /* 0x00000000 F77200-F77680 [480] */ - .data00F77200 0x00F77200 : AT(0xF77200) { - build/bgm/papermario.F77200.bgm.o(.data); - } - - /* 0x00000000 F77680-F78600 [F80] */ - .data00F77680 0x00F77680 : AT(0xF77680) { - build/bgm/papermario.F77680.bgm.o(.data); - } - - /* 0x00000000 F78600-F79070 [A70] */ - .data00F78600 0x00F78600 : AT(0xF78600) { - build/bgm/papermario.F78600.bgm.o(.data); - } - - /* 0x00000000 F79070-F7A0C0 [1050] */ - .data00F79070 0x00F79070 : AT(0xF79070) { - build/bgm/papermario.F79070.bgm.o(.data); - } - - /* 0x00000000 F7A0C0-F7AA40 [980] */ - .data00F7A0C0 0x00F7A0C0 : AT(0xF7A0C0) { - build/bgm/papermario.F7A0C0.bgm.o(.data); - } - - /* 0x00000000 F7AA40-F7AD90 [350] */ - .data00F7AA40 0x00F7AA40 : AT(0xF7AA40) { - build/bgm/papermario.F7AA40.bgm.o(.data); - } - - /* 0x00000000 F7AD90-F7BEA0 [1110] */ - .data00F7AD90 0x00F7AD90 : AT(0xF7AD90) { - build/bgm/papermario.F7AD90.bgm.o(.data); - } - - /* 0x00000000 F7BEA0-F7C780 [8E0] */ - .data00F7BEA0 0x00F7BEA0 : AT(0xF7BEA0) { - build/bgm/papermario.F7BEA0.bgm.o(.data); - } - - /* 0x00000000 F7C780-F7DC00 [1480] */ - .data00F7C780 0x00F7C780 : AT(0xF7C780) { - build/bgm/papermario.F7C780.bgm.o(.data); - } - - /* 0x00000000 F7DC00-F7E190 [590] */ - .data00F7DC00 0x00F7DC00 : AT(0xF7DC00) { - build/bgm/papermario.F7DC00.bgm.o(.data); - } - - /* 0x00000000 F7E190-F7EE20 [C90] */ - .data00F7E190 0x00F7E190 : AT(0xF7E190) { - build/bgm/papermario.F7E190.bgm.o(.data); - } - - /* 0x00000000 F7EE20-F80230 [1410] */ - .data00F7EE20 0x00F7EE20 : AT(0xF7EE20) { - build/bgm/papermario.F7EE20.bgm.o(.data); - } - - /* 0x00000000 F80230-F81260 [1030] */ - .data00F80230 0x00F80230 : AT(0xF80230) { - build/bgm/papermario.F80230.bgm.o(.data); - } - - /* 0x00000000 F81260-F82460 [1200] */ - .data00F81260 0x00F81260 : AT(0xF81260) { - build/bgm/papermario.F81260.bgm.o(.data); - } - - /* 0x00000000 F82460-F82D00 [8A0] */ - .data00F82460 0x00F82460 : AT(0xF82460) { - build/bgm/papermario.F82460.bgm.o(.data); - } - - /* 0x00000000 F82D00-F83DC0 [10C0] */ - .data00F82D00 0x00F82D00 : AT(0xF82D00) { - build/bgm/papermario.F82D00.bgm.o(.data); - } - - /* 0x00000000 F83DC0-F85590 [17D0] */ - .data00F83DC0 0x00F83DC0 : AT(0xF83DC0) { - build/bgm/papermario.F83DC0.bgm.o(.data); - } - - /* 0x00000000 F85590-F860E0 [B50] */ - .data00F85590 0x00F85590 : AT(0xF85590) { - build/bgm/papermario.F85590.bgm.o(.data); - } - - /* 0x00000000 F860E0-F87000 [F20] */ - .data00F860E0 0x00F860E0 : AT(0xF860E0) { - build/bgm/papermario.F860E0.bgm.o(.data); - } - - /* 0x00000000 F87000-F87610 [610] */ - .data00F87000 0x00F87000 : AT(0xF87000) { - build/bgm/papermario.F87000.bgm.o(.data); - } - - /* 0x00000000 F87610-F88B30 [1520] */ - .data00F87610 0x00F87610 : AT(0xF87610) { - build/bgm/papermario.F87610.bgm.o(.data); - } - - /* 0x00000000 F88B30-F89570 [A40] */ - .data00F88B30 0x00F88B30 : AT(0xF88B30) { - build/bgm/papermario.F88B30.bgm.o(.data); - } - - /* 0x00000000 F89570-F8AAF0 [1580] */ - .data00F89570 0x00F89570 : AT(0xF89570) { - build/bgm/papermario.F89570.bgm.o(.data); - } - - /* 0x00000000 F8AAF0-F8B820 [D30] */ - .data00F8AAF0 0x00F8AAF0 : AT(0xF8AAF0) { - build/bgm/papermario.F8AAF0.bgm.o(.data); - } - - /* 0x00000000 F8B820-F8BD90 [570] */ - .data00F8B820 0x00F8B820 : AT(0xF8B820) { - build/bgm/papermario.F8B820.bgm.o(.data); - } - - /* 0x00000000 F8BD90-F8C360 [5D0] */ - .data00F8BD90 0x00F8BD90 : AT(0xF8BD90) { - build/bgm/papermario.F8BD90.bgm.o(.data); - } - - /* 0x00000000 F8C360-F8D110 [DB0] */ - .data00F8C360 0x00F8C360 : AT(0xF8C360) { - build/bgm/papermario.F8C360.bgm.o(.data); - } - - /* 0x00000000 F8D110-F8D3E0 [2D0] */ - .data00F8D110 0x00F8D110 : AT(0xF8D110) { - build/bgm/papermario.F8D110.bgm.o(.data); - } - - /* 0x00000000 F8D3E0-F90880 [34A0] */ - .data00F8D3E0 0x00F8D3E0 : AT(0xF8D3E0) { - build/bgm/papermario.F8D3E0.bgm.o(.data); - } - - /* 0x00000000 F90880-F92A50 [21D0] */ - .data00F90880 0x00F90880 : AT(0xF90880) { - build/bgm/papermario.F90880.bgm.o(.data); - } - - /* 0x00000000 F92A50-F95510 [2AC0] */ - .data00F92A50 0x00F92A50 : AT(0xF92A50) { - build/bgm/papermario.F92A50.bgm.o(.data); - } - - /* 0x00000000 F95510-F96280 [D70] */ - .data00F95510 0x00F95510 : AT(0xF95510) { - build/bgm/papermario.F95510.bgm.o(.data); - } - - /* 0x00000000 F96280-F98520 [22A0] */ - .data00F96280 0x00F96280 : AT(0xF96280) { - build/bgm/papermario.F96280.bgm.o(.data); - } - - /* 0x00000000 F98520-F98F90 [A70] */ - .data00F98520 0x00F98520 : AT(0xF98520) { - build/bgm/papermario.F98520.bgm.o(.data); - } - - /* 0x00000000 F98F90-F9B830 [28A0] */ - .data00F98F90 0x00F98F90 : AT(0xF98F90) { - build/bgm/papermario.F98F90.bgm.o(.data); - } - - /* 0x00000000 F9B830-F9D3B0 [1B80] */ - .data00F9B830 0x00F9B830 : AT(0xF9B830) { - build/bgm/papermario.F9B830.bgm.o(.data); - } - - /* 0x00000000 F9D3B0-F9D690 [2E0] */ - .data00F9D3B0 0x00F9D3B0 : AT(0xF9D3B0) { - build/bgm/papermario.F9D3B0.bgm.o(.data); - } - - /* 0x00000000 F9D690-F9EF30 [18A0] */ - .data00F9D690 0x00F9D690 : AT(0xF9D690) { - build/bgm/papermario.F9D690.bgm.o(.data); - } - - /* 0x00000000 F9EF30-F9FA30 [B00] */ - .data00F9EF30 0x00F9EF30 : AT(0xF9EF30) { - build/bgm/papermario.F9EF30.bgm.o(.data); - } - - /* 0x00000000 F9FA30-FA08A0 [E70] */ - .data00F9FA30 0x00F9FA30 : AT(0xF9FA30) { - build/bgm/papermario.F9FA30.bgm.o(.data); - } - - /* 0x00000000 FA08A0-FA3C60 [33C0] */ - .data00FA08A0 0x00FA08A0 : AT(0xFA08A0) { - build/bgm/papermario.FA08A0.bgm.o(.data); - } - - /* 0x00000000 FA3C60-FA85F0 [4990] */ - .data00FA3C60 0x00FA3C60 : AT(0xFA3C60) { - build/bgm/papermario.FA3C60.bgm.o(.data); - } - - /* 0x00000000 FA85F0-FABE90 [38A0] */ - .data00FA85F0 0x00FA85F0 : AT(0xFA85F0) { - build/bgm/papermario.FA85F0.bgm.o(.data); - } - - /* 0x00000000 FABE90-FACC80 [DF0] */ - .data00FABE90 0x00FABE90 : AT(0xFABE90) { - build/bgm/papermario.FABE90.bgm.o(.data); - } - - /* 0x00000000 FACC80-FAD210 [590] */ - .data00FACC80 0x00FACC80 : AT(0xFACC80) { - build/bgm/papermario.FACC80.bgm.o(.data); - } - - /* 0x00000000 FAD210-FAD8F0 [6E0] */ - .data00FAD210 0x00FAD210 : AT(0xFAD210) { - build/bgm/papermario.FAD210.bgm.o(.data); - } - - /* 0x00000000 FAD8F0-FADE70 [580] */ - .data00FAD8F0 0x00FAD8F0 : AT(0xFAD8F0) { - build/bgm/papermario.FAD8F0.bgm.o(.data); - } - - /* 0x00000000 FADE70-FAE860 [9F0] */ - .data00FADE70 0x00FADE70 : AT(0xFADE70) { - build/bgm/papermario.FADE70.bgm.o(.data); - } - - /* 0x00000000 FAE860-19E09A8 [A32148] */ - .data00FAE860 0x00FAE860 : AT(0xFAE860) { - build/bin/papermario.FAE860.bin_fae860.o(.data); - } - - /* 0x00000000 19E09A8-19E1390 [9E8] */ - .data019E09A8 0x019E09A8 : AT(0x19E09A8) { - build/yay0/papermario.19E09A8.yay0.o(.data); - } - - /* 0x00000000 19E1390-19E1890 [500] */ - .data019E1390 0x019E1390 : AT(0x19E1390) { - build/yay0/papermario.19E1390.yay0.o(.data); - } - - /* 0x00000000 19E1890-19E2330 [AA0] */ - .data019E1890 0x019E1890 : AT(0x19E1890) { - build/yay0/papermario.19E1890.yay0.o(.data); - } - - /* 0x00000000 19E2330-19E2DE0 [AB0] */ - .data019E2330 0x019E2330 : AT(0x19E2330) { - build/yay0/papermario.19E2330.yay0.o(.data); - } - - /* 0x00000000 19E2DE0-19E3208 [428] */ - .data019E2DE0 0x019E2DE0 : AT(0x19E2DE0) { - build/yay0/papermario.19E2DE0.yay0.o(.data); - } - - /* 0x00000000 19E3208-19E3BA8 [9A0] */ - .data019E3208 0x019E3208 : AT(0x19E3208) { - build/yay0/papermario.19E3208.yay0.o(.data); - } - - /* 0x00000000 19E3BA8-19E3FD8 [430] */ - .data019E3BA8 0x019E3BA8 : AT(0x19E3BA8) { - build/yay0/papermario.19E3BA8.yay0.o(.data); - } - - /* 0x00000000 19E3FD8-19E4828 [850] */ - .data019E3FD8 0x019E3FD8 : AT(0x19E3FD8) { - build/yay0/papermario.19E3FD8.yay0.o(.data); - } - - /* 0x00000000 19E4828-19E4BE0 [3B8] */ - .data019E4828 0x019E4828 : AT(0x19E4828) { - build/yay0/papermario.19E4828.yay0.o(.data); - } - - /* 0x00000000 19E4BE0-19E5758 [B78] */ - .data019E4BE0 0x019E4BE0 : AT(0x19E4BE0) { - build/yay0/papermario.19E4BE0.yay0.o(.data); - } - - /* 0x00000000 19E5758-19E5950 [1F8] */ - .data019E5758 0x019E5758 : AT(0x19E5758) { - build/yay0/papermario.19E5758.yay0.o(.data); - } - - /* 0x00000000 19E5950-19E62A0 [950] */ - .data019E5950 0x019E5950 : AT(0x19E5950) { - build/yay0/papermario.19E5950.yay0.o(.data); - } - - /* 0x00000000 19E62A0-19E67B2 [512] */ - .data019E62A0 0x019E62A0 : AT(0x19E62A0) { - build/yay0/papermario.19E62A0.yay0.o(.data); - } - - /* 0x00000000 19E67B2-19E6B60 [3AE] */ - .data019E67B2 0x019E67B2 : AT(0x19E67B2) { - build/bin/papermario.19E67B2.bin_19e6b60.o(.data); - } - - /* 0x00000000 19E6B60-19E7528 [9C8] */ - .data019E6B60 0x019E6B60 : AT(0x19E6B60) { - build/yay0/papermario.19E6B60.yay0.o(.data); - } - - /* 0x00000000 19E7528-19E9778 [2250] */ - .data019E7528 0x019E7528 : AT(0x19E7528) { - build/yay0/papermario.19E7528.yay0.o(.data); - } - - /* 0x00000000 19E9778-19EAF38 [17C0] */ - .data019E9778 0x019E9778 : AT(0x19E9778) { - build/yay0/papermario.19E9778.yay0.o(.data); - } - - /* 0x00000000 19EAF38-19EC4E0 [15A8] */ - .data019EAF38 0x019EAF38 : AT(0x19EAF38) { - build/yay0/papermario.19EAF38.yay0.o(.data); - } - - /* 0x00000000 19EC4E0-19EDD30 [1850] */ - .data019EC4E0 0x019EC4E0 : AT(0x19EC4E0) { - build/yay0/papermario.19EC4E0.yay0.o(.data); - } - - /* 0x00000000 19EDD30-19EEB18 [DE8] */ - .data019EDD30 0x019EDD30 : AT(0x19EDD30) { - build/yay0/papermario.19EDD30.yay0.o(.data); - } - - /* 0x00000000 19EEB18-19F0070 [1558] */ - .data019EEB18 0x019EEB18 : AT(0x19EEB18) { - build/yay0/papermario.19EEB18.yay0.o(.data); - } - - /* 0x00000000 19F0070-19F15A0 [1530] */ - .data019F0070 0x019F0070 : AT(0x19F0070) { - build/yay0/papermario.19F0070.yay0.o(.data); - } - - /* 0x00000000 19F15A0-19F26D8 [1138] */ - .data019F15A0 0x019F15A0 : AT(0x19F15A0) { - build/yay0/papermario.19F15A0.yay0.o(.data); - } - - /* 0x00000000 19F26D8-19F5390 [2CB8] */ - .data019F26D8 0x019F26D8 : AT(0x19F26D8) { - build/yay0/papermario.19F26D8.yay0.o(.data); - } - - /* 0x00000000 19F5390-19F7398 [2008] */ - .data019F5390 0x019F5390 : AT(0x19F5390) { - build/yay0/papermario.19F5390.yay0.o(.data); - } - - /* 0x00000000 19F7398-19FA128 [2D90] */ - .data019F7398 0x019F7398 : AT(0x19F7398) { - build/yay0/papermario.19F7398.yay0.o(.data); - } - - /* 0x00000000 19FA128-19FCAE8 [29C0] */ - .data019FA128 0x019FA128 : AT(0x19FA128) { - build/yay0/papermario.19FA128.yay0.o(.data); - } - - /* 0x00000000 19FCAE8-19FED70 [2288] */ - .data019FCAE8 0x019FCAE8 : AT(0x19FCAE8) { - build/yay0/papermario.19FCAE8.yay0.o(.data); - } - - /* 0x00000000 19FED70-1A00958 [1BE8] */ - .data019FED70 0x019FED70 : AT(0x19FED70) { - build/yay0/papermario.19FED70.yay0.o(.data); - } - - /* 0x00000000 1A00958-1A02D00 [23A8] */ - .data01A00958 0x01A00958 : AT(0x1A00958) { - build/yay0/papermario.1A00958.yay0.o(.data); - } - - /* 0x00000000 1A02D00-1A04400 [1700] */ - .data01A02D00 0x01A02D00 : AT(0x1A02D00) { - build/yay0/papermario.1A02D00.yay0.o(.data); - } - - /* 0x00000000 1A04400-1A05550 [1150] */ - .data01A04400 0x01A04400 : AT(0x1A04400) { - build/yay0/papermario.1A04400.yay0.o(.data); - } - - /* 0x00000000 1A05550-1A06390 [E40] */ - .data01A05550 0x01A05550 : AT(0x1A05550) { - build/yay0/papermario.1A05550.yay0.o(.data); - } - - /* 0x00000000 1A06390-1A06F98 [C08] */ - .data01A06390 0x01A06390 : AT(0x1A06390) { - build/yay0/papermario.1A06390.yay0.o(.data); - } - - /* 0x00000000 1A06F98-1A07B68 [BD0] */ - .data01A06F98 0x01A06F98 : AT(0x1A06F98) { - build/yay0/papermario.1A06F98.yay0.o(.data); - } - - /* 0x00000000 1A07B68-1A0A0A0 [2538] */ - .data01A07B68 0x01A07B68 : AT(0x1A07B68) { - build/yay0/papermario.1A07B68.yay0.o(.data); - } - - /* 0x00000000 1A0A0A0-1A0ACC8 [C28] */ - .data01A0A0A0 0x01A0A0A0 : AT(0x1A0A0A0) { - build/yay0/papermario.1A0A0A0.yay0.o(.data); - } - - /* 0x00000000 1A0ACC8-1A0B780 [AB8] */ - .data01A0ACC8 0x01A0ACC8 : AT(0x1A0ACC8) { - build/yay0/papermario.1A0ACC8.yay0.o(.data); - } - - /* 0x00000000 1A0B780-1A0BBE0 [460] */ - .data01A0B780 0x01A0B780 : AT(0x1A0B780) { - build/yay0/papermario.1A0B780.yay0.o(.data); - } - - /* 0x00000000 1A0BBE0-1A0C000 [420] */ - .data01A0BBE0 0x01A0BBE0 : AT(0x1A0BBE0) { - build/yay0/papermario.1A0BBE0.yay0.o(.data); - } - - /* 0x00000000 1A0C000-1A0C438 [438] */ - .data01A0C000 0x01A0C000 : AT(0x1A0C000) { - build/yay0/papermario.1A0C000.yay0.o(.data); - } - - /* 0x00000000 1A0C438-1A0C860 [428] */ - .data01A0C438 0x01A0C438 : AT(0x1A0C438) { - build/yay0/papermario.1A0C438.yay0.o(.data); - } - - /* 0x00000000 1A0C860-1A0D1E8 [988] */ - .data01A0C860 0x01A0C860 : AT(0x1A0C860) { - build/yay0/papermario.1A0C860.yay0.o(.data); - } - - /* 0x00000000 1A0D1E8-1A0D5B0 [3C8] */ - .data01A0D1E8 0x01A0D1E8 : AT(0x1A0D1E8) { - build/yay0/papermario.1A0D1E8.yay0.o(.data); - } - - /* 0x00000000 1A0D5B0-1A0D970 [3C0] */ - .data01A0D5B0 0x01A0D5B0 : AT(0x1A0D5B0) { - build/yay0/papermario.1A0D5B0.yay0.o(.data); - } - - /* 0x00000000 1A0D970-1A0EF00 [1590] */ - .data01A0D970 0x01A0D970 : AT(0x1A0D970) { - build/yay0/papermario.1A0D970.yay0.o(.data); - } - - /* 0x00000000 1A0EF00-1A13920 [4A20] */ - .data01A0EF00 0x01A0EF00 : AT(0x1A0EF00) { - build/yay0/papermario.1A0EF00.yay0.o(.data); - } - - /* 0x00000000 1A13920-1A15850 [1F30] */ - .data01A13920 0x01A13920 : AT(0x1A13920) { - build/yay0/papermario.1A13920.yay0.o(.data); - } - - /* 0x00000000 1A15850-1A183F8 [2BA8] */ - .data01A15850 0x01A15850 : AT(0x1A15850) { - build/yay0/papermario.1A15850.yay0.o(.data); - } - - /* 0x00000000 1A183F8-1A1A608 [2210] */ - .data01A183F8 0x01A183F8 : AT(0x1A183F8) { - build/yay0/papermario.1A183F8.yay0.o(.data); - } - - /* 0x00000000 1A1A608-1A1C5E8 [1FE0] */ - .data01A1A608 0x01A1A608 : AT(0x1A1A608) { - build/yay0/papermario.1A1A608.yay0.o(.data); - } - - /* 0x00000000 1A1C5E8-1A1D6D0 [10E8] */ - .data01A1C5E8 0x01A1C5E8 : AT(0x1A1C5E8) { - build/yay0/papermario.1A1C5E8.yay0.o(.data); - } - - /* 0x00000000 1A1D6D0-1A1E478 [DA8] */ - .data01A1D6D0 0x01A1D6D0 : AT(0x1A1D6D0) { - build/yay0/papermario.1A1D6D0.yay0.o(.data); - } - - /* 0x00000000 1A1E478-1A1F370 [EF8] */ - .data01A1E478 0x01A1E478 : AT(0x1A1E478) { - build/yay0/papermario.1A1E478.yay0.o(.data); - } - - /* 0x00000000 1A1F370-1A226B0 [3340] */ - .data01A1F370 0x01A1F370 : AT(0x1A1F370) { - build/yay0/papermario.1A1F370.yay0.o(.data); - } - - /* 0x00000000 1A226B0-1A249B8 [2308] */ - .data01A226B0 0x01A226B0 : AT(0x1A226B0) { - build/yay0/papermario.1A226B0.yay0.o(.data); - } - - /* 0x00000000 1A249B8-1A25E78 [14C0] */ - .data01A249B8 0x01A249B8 : AT(0x1A249B8) { - build/yay0/papermario.1A249B8.yay0.o(.data); - } - - /* 0x00000000 1A25E78-1A27FF0 [2178] */ - .data01A25E78 0x01A25E78 : AT(0x1A25E78) { - build/yay0/papermario.1A25E78.yay0.o(.data); - } - - /* 0x00000000 1A27FF0-1A28BE0 [BF0] */ - .data01A27FF0 0x01A27FF0 : AT(0x1A27FF0) { - build/yay0/papermario.1A27FF0.yay0.o(.data); - } - - /* 0x00000000 1A28BE0-1A29680 [AA0] */ - .data01A28BE0 0x01A28BE0 : AT(0x1A28BE0) { - build/yay0/papermario.1A28BE0.yay0.o(.data); - } - - /* 0x00000000 1A29680-1A2BC68 [25E8] */ - .data01A29680 0x01A29680 : AT(0x1A29680) { - build/yay0/papermario.1A29680.yay0.o(.data); - } - - /* 0x00000000 1A2BC68-1A2E120 [24B8] */ - .data01A2BC68 0x01A2BC68 : AT(0x1A2BC68) { - build/yay0/papermario.1A2BC68.yay0.o(.data); - } - - /* 0x00000000 1A2E120-1A2F3F8 [12D8] */ - .data01A2E120 0x01A2E120 : AT(0x1A2E120) { - build/yay0/papermario.1A2E120.yay0.o(.data); - } - - /* 0x00000000 1A2F3F8-1A31D18 [2920] */ - .data01A2F3F8 0x01A2F3F8 : AT(0x1A2F3F8) { - build/yay0/papermario.1A2F3F8.yay0.o(.data); - } - - /* 0x00000000 1A31D18-1A33AB0 [1D98] */ - .data01A31D18 0x01A31D18 : AT(0x1A31D18) { - build/yay0/papermario.1A31D18.yay0.o(.data); - } - - /* 0x00000000 1A33AB0-1A35BB8 [2108] */ - .data01A33AB0 0x01A33AB0 : AT(0x1A33AB0) { - build/yay0/papermario.1A33AB0.yay0.o(.data); - } - - /* 0x00000000 1A35BB8-1A369A8 [DF0] */ - .data01A35BB8 0x01A35BB8 : AT(0x1A35BB8) { - build/yay0/papermario.1A35BB8.yay0.o(.data); - } - - /* 0x00000000 1A369A8-1A39600 [2C58] */ - .data01A369A8 0x01A369A8 : AT(0x1A369A8) { - build/yay0/papermario.1A369A8.yay0.o(.data); - } - - /* 0x00000000 1A39600-1A3B018 [1A18] */ - .data01A39600 0x01A39600 : AT(0x1A39600) { - build/yay0/papermario.1A39600.yay0.o(.data); - } - - /* 0x00000000 1A3B018-1A3C310 [12F8] */ - .data01A3B018 0x01A3B018 : AT(0x1A3B018) { - build/yay0/papermario.1A3B018.yay0.o(.data); - } - - /* 0x00000000 1A3C310-1A3FCC8 [39B8] */ - .data01A3C310 0x01A3C310 : AT(0x1A3C310) { - build/yay0/papermario.1A3C310.yay0.o(.data); - } - - /* 0x00000000 1A3FCC8-1A423D8 [2710] */ - .data01A3FCC8 0x01A3FCC8 : AT(0x1A3FCC8) { - build/yay0/papermario.1A3FCC8.yay0.o(.data); - } - - /* 0x00000000 1A423D8-1A449C0 [25E8] */ - .data01A423D8 0x01A423D8 : AT(0x1A423D8) { - build/yay0/papermario.1A423D8.yay0.o(.data); - } - - /* 0x00000000 1A449C0-1A46568 [1BA8] */ - .data01A449C0 0x01A449C0 : AT(0x1A449C0) { - build/yay0/papermario.1A449C0.yay0.o(.data); - } - - /* 0x00000000 1A46568-1A49340 [2DD8] */ - .data01A46568 0x01A46568 : AT(0x1A46568) { - build/yay0/papermario.1A46568.yay0.o(.data); - } - - /* 0x00000000 1A49340-1A4AC88 [1948] */ - .data01A49340 0x01A49340 : AT(0x1A49340) { - build/yay0/papermario.1A49340.yay0.o(.data); - } - - /* 0x00000000 1A4AC88-1A4D7E8 [2B60] */ - .data01A4AC88 0x01A4AC88 : AT(0x1A4AC88) { - build/yay0/papermario.1A4AC88.yay0.o(.data); - } - - /* 0x00000000 1A4D7E8-1A4E028 [840] */ - .data01A4D7E8 0x01A4D7E8 : AT(0x1A4D7E8) { - build/yay0/papermario.1A4D7E8.yay0.o(.data); - } - - /* 0x00000000 1A4E028-1A4FA60 [1A38] */ - .data01A4E028 0x01A4E028 : AT(0x1A4E028) { - build/yay0/papermario.1A4E028.yay0.o(.data); - } - - /* 0x00000000 1A4FA60-1A531D0 [3770] */ - .data01A4FA60 0x01A4FA60 : AT(0x1A4FA60) { - build/yay0/papermario.1A4FA60.yay0.o(.data); - } - - /* 0x00000000 1A531D0-1A53D48 [B78] */ - .data01A531D0 0x01A531D0 : AT(0x1A531D0) { - build/yay0/papermario.1A531D0.yay0.o(.data); - } - - /* 0x00000000 1A53D48-1A56C80 [2F38] */ - .data01A53D48 0x01A53D48 : AT(0x1A53D48) { - build/yay0/papermario.1A53D48.yay0.o(.data); - } - - /* 0x00000000 1A56C80-1A58F58 [22D8] */ - .data01A56C80 0x01A56C80 : AT(0x1A56C80) { - build/yay0/papermario.1A56C80.yay0.o(.data); - } - - /* 0x00000000 1A58F58-1A5A5A8 [1650] */ - .data01A58F58 0x01A58F58 : AT(0x1A58F58) { - build/yay0/papermario.1A58F58.yay0.o(.data); - } - - /* 0x00000000 1A5A5A8-1A62B40 [8598] */ - .data01A5A5A8 0x01A5A5A8 : AT(0x1A5A5A8) { - build/yay0/papermario.1A5A5A8.yay0.o(.data); - } - - /* 0x00000000 1A62B40-1A641F8 [16B8] */ - .data01A62B40 0x01A62B40 : AT(0x1A62B40) { - build/yay0/papermario.1A62B40.yay0.o(.data); - } - - /* 0x00000000 1A641F8-1A666F0 [24F8] */ - .data01A641F8 0x01A641F8 : AT(0x1A641F8) { - build/yay0/papermario.1A641F8.yay0.o(.data); - } - - /* 0x00000000 1A666F0-1A68870 [2180] */ - .data01A666F0 0x01A666F0 : AT(0x1A666F0) { - build/yay0/papermario.1A666F0.yay0.o(.data); - } - - /* 0x00000000 1A68870-1A6C630 [3DC0] */ - .data01A68870 0x01A68870 : AT(0x1A68870) { - build/yay0/papermario.1A68870.yay0.o(.data); - } - - /* 0x00000000 1A6C630-1A6D5A0 [F70] */ - .data01A6C630 0x01A6C630 : AT(0x1A6C630) { - build/yay0/papermario.1A6C630.yay0.o(.data); - } - - /* 0x00000000 1A6D5A0-1A6EF50 [19B0] */ - .data01A6D5A0 0x01A6D5A0 : AT(0x1A6D5A0) { - build/yay0/papermario.1A6D5A0.yay0.o(.data); - } - - /* 0x00000000 1A6EF50-1A70FF0 [20A0] */ - .data01A6EF50 0x01A6EF50 : AT(0x1A6EF50) { - build/yay0/papermario.1A6EF50.yay0.o(.data); - } - - /* 0x00000000 1A70FF0-1A74FC0 [3FD0] */ - .data01A70FF0 0x01A70FF0 : AT(0x1A70FF0) { - build/yay0/papermario.1A70FF0.yay0.o(.data); - } - - /* 0x00000000 1A74FC0-1A78A40 [3A80] */ - .data01A74FC0 0x01A74FC0 : AT(0x1A74FC0) { - build/yay0/papermario.1A74FC0.yay0.o(.data); - } - - /* 0x00000000 1A78A40-1A79900 [EC0] */ - .data01A78A40 0x01A78A40 : AT(0x1A78A40) { - build/yay0/papermario.1A78A40.yay0.o(.data); - } - - /* 0x00000000 1A79900-1A7D798 [3E98] */ - .data01A79900 0x01A79900 : AT(0x1A79900) { - build/yay0/papermario.1A79900.yay0.o(.data); - } - - /* 0x00000000 1A7D798-1A7EEA0 [1708] */ - .data01A7D798 0x01A7D798 : AT(0x1A7D798) { - build/yay0/papermario.1A7D798.yay0.o(.data); - } - - /* 0x00000000 1A7EEA0-1A7EFD8 [138] */ - .data01A7EEA0 0x01A7EEA0 : AT(0x1A7EEA0) { - build/yay0/papermario.1A7EEA0.yay0.o(.data); - } - - /* 0x00000000 1A7EFD8-1A83450 [4478] */ - .data01A7EFD8 0x01A7EFD8 : AT(0x1A7EFD8) { - build/yay0/papermario.1A7EFD8.yay0.o(.data); - } - - /* 0x00000000 1A83450-1A85668 [2218] */ - .data01A83450 0x01A83450 : AT(0x1A83450) { - build/yay0/papermario.1A83450.yay0.o(.data); - } - - /* 0x00000000 1A85668-1A87958 [22F0] */ - .data01A85668 0x01A85668 : AT(0x1A85668) { - build/yay0/papermario.1A85668.yay0.o(.data); - } - - /* 0x00000000 1A87958-1A8BF98 [4640] */ - .data01A87958 0x01A87958 : AT(0x1A87958) { - build/yay0/papermario.1A87958.yay0.o(.data); - } - - /* 0x00000000 1A8BF98-1A8FE28 [3E90] */ - .data01A8BF98 0x01A8BF98 : AT(0x1A8BF98) { - build/yay0/papermario.1A8BF98.yay0.o(.data); - } - - /* 0x00000000 1A8FE28-1A93EA0 [4078] */ - .data01A8FE28 0x01A8FE28 : AT(0x1A8FE28) { - build/yay0/papermario.1A8FE28.yay0.o(.data); - } - - /* 0x00000000 1A93EA0-1A94188 [2E8] */ - .data01A93EA0 0x01A93EA0 : AT(0x1A93EA0) { - build/yay0/papermario.1A93EA0.yay0.o(.data); - } - - /* 0x00000000 1A94188-1A94480 [2F8] */ - .data01A94188 0x01A94188 : AT(0x1A94188) { - build/yay0/papermario.1A94188.yay0.o(.data); - } - - /* 0x00000000 1A94480-1A946A8 [228] */ - .data01A94480 0x01A94480 : AT(0x1A94480) { - build/yay0/papermario.1A94480.yay0.o(.data); - } - - /* 0x00000000 1A946A8-1A94A00 [358] */ - .data01A946A8 0x01A946A8 : AT(0x1A946A8) { - build/yay0/papermario.1A946A8.yay0.o(.data); - } - - /* 0x00000000 1A94A00-1A94C58 [258] */ - .data01A94A00 0x01A94A00 : AT(0x1A94A00) { - build/yay0/papermario.1A94A00.yay0.o(.data); - } - - /* 0x00000000 1A94C58-1A98D98 [4140] */ - .data01A94C58 0x01A94C58 : AT(0x1A94C58) { - build/yay0/papermario.1A94C58.yay0.o(.data); - } - - /* 0x00000000 1A98D98-1A9BA80 [2CE8] */ - .data01A98D98 0x01A98D98 : AT(0x1A98D98) { - build/yay0/papermario.1A98D98.yay0.o(.data); - } - - /* 0x00000000 1A9BA80-1A9DB68 [20E8] */ - .data01A9BA80 0x01A9BA80 : AT(0x1A9BA80) { - build/yay0/papermario.1A9BA80.yay0.o(.data); - } - - /* 0x00000000 1A9DB68-1AA0048 [24E0] */ - .data01A9DB68 0x01A9DB68 : AT(0x1A9DB68) { - build/yay0/papermario.1A9DB68.yay0.o(.data); - } - - /* 0x00000000 1AA0048-1AA0698 [650] */ - .data01AA0048 0x01AA0048 : AT(0x1AA0048) { - build/yay0/papermario.1AA0048.yay0.o(.data); - } - - /* 0x00000000 1AA0698-1AA1008 [970] */ - .data01AA0698 0x01AA0698 : AT(0x1AA0698) { - build/yay0/papermario.1AA0698.yay0.o(.data); - } - - /* 0x00000000 1AA1008-1AA6D58 [5D50] */ - .data01AA1008 0x01AA1008 : AT(0x1AA1008) { - build/yay0/papermario.1AA1008.yay0.o(.data); - } - - /* 0x00000000 1AA6D58-1AAD600 [68A8] */ - .data01AA6D58 0x01AA6D58 : AT(0x1AA6D58) { - build/yay0/papermario.1AA6D58.yay0.o(.data); - } - - /* 0x00000000 1AAD600-1AB1BF0 [45F0] */ - .data01AAD600 0x01AAD600 : AT(0x1AAD600) { - build/yay0/papermario.1AAD600.yay0.o(.data); - } - - /* 0x00000000 1AB1BF0-1AB2368 [778] */ - .data01AB1BF0 0x01AB1BF0 : AT(0x1AB1BF0) { - build/yay0/papermario.1AB1BF0.yay0.o(.data); - } - - /* 0x00000000 1AB2368-1ABA290 [7F28] */ - .data01AB2368 0x01AB2368 : AT(0x1AB2368) { - build/yay0/papermario.1AB2368.yay0.o(.data); - } - - /* 0x00000000 1ABA290-1AC14A8 [7218] */ - .data01ABA290 0x01ABA290 : AT(0x1ABA290) { - build/yay0/papermario.1ABA290.yay0.o(.data); - } - - /* 0x00000000 1AC14A8-1AC3910 [2468] */ - .data01AC14A8 0x01AC14A8 : AT(0x1AC14A8) { - build/yay0/papermario.1AC14A8.yay0.o(.data); - } - - /* 0x00000000 1AC3910-1ACBC98 [8388] */ - .data01AC3910 0x01AC3910 : AT(0x1AC3910) { - build/yay0/papermario.1AC3910.yay0.o(.data); - } - - /* 0x00000000 1ACBC98-1ACE058 [23C0] */ - .data01ACBC98 0x01ACBC98 : AT(0x1ACBC98) { - build/yay0/papermario.1ACBC98.yay0.o(.data); - } - - /* 0x00000000 1ACE058-1ACF910 [18B8] */ - .data01ACE058 0x01ACE058 : AT(0x1ACE058) { - build/yay0/papermario.1ACE058.yay0.o(.data); - } - - /* 0x00000000 1ACF910-1AD06D8 [DC8] */ - .data01ACF910 0x01ACF910 : AT(0x1ACF910) { - build/yay0/papermario.1ACF910.yay0.o(.data); - } - - /* 0x00000000 1AD06D8-1AD0B98 [4C0] */ - .data01AD06D8 0x01AD06D8 : AT(0x1AD06D8) { - build/yay0/papermario.1AD06D8.yay0.o(.data); - } - - /* 0x00000000 1AD0B98-1AD1E90 [12F8] */ - .data01AD0B98 0x01AD0B98 : AT(0x1AD0B98) { - build/yay0/papermario.1AD0B98.yay0.o(.data); - } - - /* 0x00000000 1AD1E90-1AD2348 [4B8] */ - .data01AD1E90 0x01AD1E90 : AT(0x1AD1E90) { - build/yay0/papermario.1AD1E90.yay0.o(.data); - } - - /* 0x00000000 1AD2348-1AD27F8 [4B0] */ - .data01AD2348 0x01AD2348 : AT(0x1AD2348) { - build/yay0/papermario.1AD2348.yay0.o(.data); - } - - /* 0x00000000 1AD27F8-1AD28A8 [B0] */ - .data01AD27F8 0x01AD27F8 : AT(0x1AD27F8) { - build/yay0/papermario.1AD27F8.yay0.o(.data); - } - - /* 0x00000000 1AD28A8-1AD44F0 [1C48] */ - .data01AD28A8 0x01AD28A8 : AT(0x1AD28A8) { - build/yay0/papermario.1AD28A8.yay0.o(.data); - } - - /* 0x00000000 1AD44F0-1AD4758 [268] */ - .data01AD44F0 0x01AD44F0 : AT(0x1AD44F0) { - build/yay0/papermario.1AD44F0.yay0.o(.data); - } - - /* 0x00000000 1AD4758-1AD57C0 [1068] */ - .data01AD4758 0x01AD4758 : AT(0x1AD4758) { - build/yay0/papermario.1AD4758.yay0.o(.data); - } - - /* 0x00000000 1AD57C0-1AD9D50 [4590] */ - .data01AD57C0 0x01AD57C0 : AT(0x1AD57C0) { - build/yay0/papermario.1AD57C0.yay0.o(.data); - } - - /* 0x00000000 1AD9D50-1ADA498 [748] */ - .data01AD9D50 0x01AD9D50 : AT(0x1AD9D50) { - build/yay0/papermario.1AD9D50.yay0.o(.data); - } - - /* 0x00000000 1ADA498-1ADCFC0 [2B28] */ - .data01ADA498 0x01ADA498 : AT(0x1ADA498) { - build/yay0/papermario.1ADA498.yay0.o(.data); - } - - /* 0x00000000 1ADCFC0-1AE2168 [51A8] */ - .data01ADCFC0 0x01ADCFC0 : AT(0x1ADCFC0) { - build/yay0/papermario.1ADCFC0.yay0.o(.data); - } - - /* 0x00000000 1AE2168-1AE2EA0 [D38] */ - .data01AE2168 0x01AE2168 : AT(0x1AE2168) { - build/yay0/papermario.1AE2168.yay0.o(.data); - } - - /* 0x00000000 1AE2EA0-1AE6A58 [3BB8] */ - .data01AE2EA0 0x01AE2EA0 : AT(0x1AE2EA0) { - build/yay0/papermario.1AE2EA0.yay0.o(.data); - } - - /* 0x00000000 1AE6A58-1AEB778 [4D20] */ - .data01AE6A58 0x01AE6A58 : AT(0x1AE6A58) { - build/yay0/papermario.1AE6A58.yay0.o(.data); - } - - /* 0x00000000 1AEB778-1AF4958 [91E0] */ - .data01AEB778 0x01AEB778 : AT(0x1AEB778) { - build/yay0/papermario.1AEB778.yay0.o(.data); - } - - /* 0x00000000 1AF4958-1AFCB18 [81C0] */ - .data01AF4958 0x01AF4958 : AT(0x1AF4958) { - build/yay0/papermario.1AF4958.yay0.o(.data); - } - - /* 0x00000000 1AFCB18-1AFF748 [2C30] */ - .data01AFCB18 0x01AFCB18 : AT(0x1AFCB18) { - build/yay0/papermario.1AFCB18.yay0.o(.data); - } - - /* 0x00000000 1AFF748-1B00640 [EF8] */ - .data01AFF748 0x01AFF748 : AT(0x1AFF748) { - build/yay0/papermario.1AFF748.yay0.o(.data); - } - - /* 0x00000000 1B00640-1B01390 [D50] */ - .data01B00640 0x01B00640 : AT(0x1B00640) { - build/yay0/papermario.1B00640.yay0.o(.data); - } - - /* 0x00000000 1B01390-1B01C08 [878] */ - .data01B01390 0x01B01390 : AT(0x1B01390) { - build/yay0/papermario.1B01390.yay0.o(.data); - } - - /* 0x00000000 1B01C08-1B02128 [520] */ - .data01B01C08 0x01B01C08 : AT(0x1B01C08) { - build/yay0/papermario.1B01C08.yay0.o(.data); - } - - /* 0x00000000 1B02128-1B02970 [848] */ - .data01B02128 0x01B02128 : AT(0x1B02128) { - build/yay0/papermario.1B02128.yay0.o(.data); - } - - /* 0x00000000 1B02970-1B03118 [7A8] */ - .data01B02970 0x01B02970 : AT(0x1B02970) { - build/yay0/papermario.1B02970.yay0.o(.data); - } - - /* 0x00000000 1B03118-1B03C18 [B00] */ - .data01B03118 0x01B03118 : AT(0x1B03118) { - build/yay0/papermario.1B03118.yay0.o(.data); - } - - /* 0x00000000 1B03C18-1B045E8 [9D0] */ - .data01B03C18 0x01B03C18 : AT(0x1B03C18) { - build/yay0/papermario.1B03C18.yay0.o(.data); - } - - /* 0x00000000 1B045E8-1B04FC0 [9D8] */ - .data01B045E8 0x01B045E8 : AT(0x1B045E8) { - build/yay0/papermario.1B045E8.yay0.o(.data); - } - - /* 0x00000000 1B04FC0-1B05998 [9D8] */ - .data01B04FC0 0x01B04FC0 : AT(0x1B04FC0) { - build/yay0/papermario.1B04FC0.yay0.o(.data); - } - - /* 0x00000000 1B05998-1B06C88 [12F0] */ - .data01B05998 0x01B05998 : AT(0x1B05998) { - build/yay0/papermario.1B05998.yay0.o(.data); - } - - /* 0x00000000 1B06C88-1B07C48 [FC0] */ - .data01B06C88 0x01B06C88 : AT(0x1B06C88) { - build/yay0/papermario.1B06C88.yay0.o(.data); - } - - /* 0x00000000 1B07C48-1B09440 [17F8] */ - .data01B07C48 0x01B07C48 : AT(0x1B07C48) { - build/yay0/papermario.1B07C48.yay0.o(.data); - } - - /* 0x00000000 1B09440-1B0B290 [1E50] */ - .data01B09440 0x01B09440 : AT(0x1B09440) { - build/yay0/papermario.1B09440.yay0.o(.data); - } - - /* 0x00000000 1B0B290-1B0B9A0 [710] */ - .data01B0B290 0x01B0B290 : AT(0x1B0B290) { - build/yay0/papermario.1B0B290.yay0.o(.data); - } - - /* 0x00000000 1B0B9A0-1B0C548 [BA8] */ - .data01B0B9A0 0x01B0B9A0 : AT(0x1B0B9A0) { - build/yay0/papermario.1B0B9A0.yay0.o(.data); - } - - /* 0x00000000 1B0C548-1B0CAC0 [578] */ - .data01B0C548 0x01B0C548 : AT(0x1B0C548) { - build/yay0/papermario.1B0C548.yay0.o(.data); - } - - /* 0x00000000 1B0CAC0-1B0D130 [670] */ - .data01B0CAC0 0x01B0CAC0 : AT(0x1B0CAC0) { - build/yay0/papermario.1B0CAC0.yay0.o(.data); - } - - /* 0x00000000 1B0D130-1B0EB80 [1A50] */ - .data01B0D130 0x01B0D130 : AT(0x1B0D130) { - build/yay0/papermario.1B0D130.yay0.o(.data); - } - - /* 0x00000000 1B0EB80-1B10CC0 [2140] */ - .data01B0EB80 0x01B0EB80 : AT(0x1B0EB80) { - build/yay0/papermario.1B0EB80.yay0.o(.data); - } - - /* 0x00000000 1B10CC0-1B129A0 [1CE0] */ - .data01B10CC0 0x01B10CC0 : AT(0x1B10CC0) { - build/yay0/papermario.1B10CC0.yay0.o(.data); - } - - /* 0x00000000 1B129A0-1B13548 [BA8] */ - .data01B129A0 0x01B129A0 : AT(0x1B129A0) { - build/yay0/papermario.1B129A0.yay0.o(.data); - } - - /* 0x00000000 1B13548-1B16420 [2ED8] */ - .data01B13548 0x01B13548 : AT(0x1B13548) { - build/yay0/papermario.1B13548.yay0.o(.data); - } - - /* 0x00000000 1B16420-1B17128 [D08] */ - .data01B16420 0x01B16420 : AT(0x1B16420) { - build/yay0/papermario.1B16420.yay0.o(.data); - } - - /* 0x00000000 1B17128-1B17840 [718] */ - .data01B17128 0x01B17128 : AT(0x1B17128) { - build/yay0/papermario.1B17128.yay0.o(.data); - } - - /* 0x00000000 1B17840-1B19318 [1AD8] */ - .data01B17840 0x01B17840 : AT(0x1B17840) { - build/yay0/papermario.1B17840.yay0.o(.data); - } - - /* 0x00000000 1B19318-1B1A030 [D18] */ - .data01B19318 0x01B19318 : AT(0x1B19318) { - build/yay0/papermario.1B19318.yay0.o(.data); - } - - /* 0x00000000 1B1A030-1B1B8C8 [1898] */ - .data01B1A030 0x01B1A030 : AT(0x1B1A030) { - build/yay0/papermario.1B1A030.yay0.o(.data); - } - - /* 0x00000000 1B1B8C8-1B1BC88 [3C0] */ - .data01B1B8C8 0x01B1B8C8 : AT(0x1B1B8C8) { - build/yay0/papermario.1B1B8C8.yay0.o(.data); - } - - /* 0x00000000 1B1BC88-1B1C7A0 [B18] */ - .data01B1BC88 0x01B1BC88 : AT(0x1B1BC88) { - build/yay0/papermario.1B1BC88.yay0.o(.data); - } - - /* 0x00000000 1B1C7A0-1B1CD28 [588] */ - .data01B1C7A0 0x01B1C7A0 : AT(0x1B1C7A0) { - build/yay0/papermario.1B1C7A0.yay0.o(.data); - } - - /* 0x00000000 1B1CD28-1B21C48 [4F20] */ - .data01B1CD28 0x01B1CD28 : AT(0x1B1CD28) { - build/yay0/papermario.1B1CD28.yay0.o(.data); - } - - /* 0x00000000 1B21C48-1B23290 [1648] */ - .data01B21C48 0x01B21C48 : AT(0x1B21C48) { - build/yay0/papermario.1B21C48.yay0.o(.data); - } - - /* 0x00000000 1B23290-1B253E0 [2150] */ - .data01B23290 0x01B23290 : AT(0x1B23290) { - build/yay0/papermario.1B23290.yay0.o(.data); - } - - /* 0x00000000 1B253E0-1B26660 [1280] */ - .data01B253E0 0x01B253E0 : AT(0x1B253E0) { - build/yay0/papermario.1B253E0.yay0.o(.data); - } - - /* 0x00000000 1B26660-1B283F8 [1D98] */ - .data01B26660 0x01B26660 : AT(0x1B26660) { - build/yay0/papermario.1B26660.yay0.o(.data); - } - - /* 0x00000000 1B283F8-1B29C60 [1868] */ - .data01B283F8 0x01B283F8 : AT(0x1B283F8) { - build/yay0/papermario.1B283F8.yay0.o(.data); - } - - /* 0x00000000 1B29C60-1B2A688 [A28] */ - .data01B29C60 0x01B29C60 : AT(0x1B29C60) { - build/yay0/papermario.1B29C60.yay0.o(.data); - } - - /* 0x00000000 1B2A688-1B2B3E8 [D60] */ - .data01B2A688 0x01B2A688 : AT(0x1B2A688) { - build/yay0/papermario.1B2A688.yay0.o(.data); - } - - /* 0x00000000 1B2B3E8-1B2C8D8 [14F0] */ - .data01B2B3E8 0x01B2B3E8 : AT(0x1B2B3E8) { - build/yay0/papermario.1B2B3E8.yay0.o(.data); - } - - /* 0x00000000 1B2C8D8-1B2D7B0 [ED8] */ - .data01B2C8D8 0x01B2C8D8 : AT(0x1B2C8D8) { - build/yay0/papermario.1B2C8D8.yay0.o(.data); - } - - /* 0x00000000 1B2D7B0-1B2E328 [B78] */ - .data01B2D7B0 0x01B2D7B0 : AT(0x1B2D7B0) { - build/yay0/papermario.1B2D7B0.yay0.o(.data); - } - - /* 0x00000000 1B2E328-1B2ED60 [A38] */ - .data01B2E328 0x01B2E328 : AT(0x1B2E328) { - build/yay0/papermario.1B2E328.yay0.o(.data); - } - - /* 0x00000000 1B2ED60-1B2FA18 [CB8] */ - .data01B2ED60 0x01B2ED60 : AT(0x1B2ED60) { - build/yay0/papermario.1B2ED60.yay0.o(.data); - } - - /* 0x00000000 1B2FA18-1B31A18 [2000] */ - .data01B2FA18 0x01B2FA18 : AT(0x1B2FA18) { - build/yay0/papermario.1B2FA18.yay0.o(.data); - } - - /* 0x00000000 1B31A18-1B33000 [15E8] */ - .data01B31A18 0x01B31A18 : AT(0x1B31A18) { - build/yay0/papermario.1B31A18.yay0.o(.data); - } - - /* 0x00000000 1B33000-1B34098 [1098] */ - .data01B33000 0x01B33000 : AT(0x1B33000) { - build/yay0/papermario.1B33000.yay0.o(.data); - } - - /* 0x00000000 1B34098-1B34928 [890] */ - .data01B34098 0x01B34098 : AT(0x1B34098) { - build/yay0/papermario.1B34098.yay0.o(.data); - } - - /* 0x00000000 1B34928-1B34C00 [2D8] */ - .data01B34928 0x01B34928 : AT(0x1B34928) { - build/yay0/papermario.1B34928.yay0.o(.data); - } - - /* 0x00000000 1B34C00-1B35480 [880] */ - .data01B34C00 0x01B34C00 : AT(0x1B34C00) { - build/yay0/papermario.1B34C00.yay0.o(.data); - } - - /* 0x00000000 1B35480-1B36440 [FC0] */ - .data01B35480 0x01B35480 : AT(0x1B35480) { - build/yay0/papermario.1B35480.yay0.o(.data); - } - - /* 0x00000000 1B36440-1B38748 [2308] */ - .data01B36440 0x01B36440 : AT(0x1B36440) { - build/yay0/papermario.1B36440.yay0.o(.data); - } - - /* 0x00000000 1B38748-1B39A98 [1350] */ - .data01B38748 0x01B38748 : AT(0x1B38748) { - build/yay0/papermario.1B38748.yay0.o(.data); - } - - /* 0x00000000 1B39A98-1B3A2E8 [850] */ - .data01B39A98 0x01B39A98 : AT(0x1B39A98) { - build/yay0/papermario.1B39A98.yay0.o(.data); - } - - /* 0x00000000 1B3A2E8-1B3A818 [530] */ - .data01B3A2E8 0x01B3A2E8 : AT(0x1B3A2E8) { - build/yay0/papermario.1B3A2E8.yay0.o(.data); - } - - /* 0x00000000 1B3A818-1B3C488 [1C70] */ - .data01B3A818 0x01B3A818 : AT(0x1B3A818) { - build/yay0/papermario.1B3A818.yay0.o(.data); - } - - /* 0x00000000 1B3C488-1B3CAC8 [640] */ - .data01B3C488 0x01B3C488 : AT(0x1B3C488) { - build/yay0/papermario.1B3C488.yay0.o(.data); - } - - /* 0x00000000 1B3CAC8-1B3D0A0 [5D8] */ - .data01B3CAC8 0x01B3CAC8 : AT(0x1B3CAC8) { - build/yay0/papermario.1B3CAC8.yay0.o(.data); - } - - /* 0x00000000 1B3D0A0-1B3D920 [880] */ - .data01B3D0A0 0x01B3D0A0 : AT(0x1B3D0A0) { - build/yay0/papermario.1B3D0A0.yay0.o(.data); - } - - /* 0x00000000 1B3D920-1B3F060 [1740] */ - .data01B3D920 0x01B3D920 : AT(0x1B3D920) { - build/yay0/papermario.1B3D920.yay0.o(.data); - } - - /* 0x00000000 1B3F060-1B40048 [FE8] */ - .data01B3F060 0x01B3F060 : AT(0x1B3F060) { - build/yay0/papermario.1B3F060.yay0.o(.data); - } - - /* 0x00000000 1B40048-1B40720 [6D8] */ - .data01B40048 0x01B40048 : AT(0x1B40048) { - build/yay0/papermario.1B40048.yay0.o(.data); - } - - /* 0x00000000 1B40720-1B49570 [8E50] */ - .data01B40720 0x01B40720 : AT(0x1B40720) { - build/yay0/papermario.1B40720.yay0.o(.data); - } - - /* 0x00000000 1B49570-1B4C3E8 [2E78] */ - .data01B49570 0x01B49570 : AT(0x1B49570) { - build/yay0/papermario.1B49570.yay0.o(.data); - } - - /* 0x00000000 1B4C3E8-1B4DEA0 [1AB8] */ - .data01B4C3E8 0x01B4C3E8 : AT(0x1B4C3E8) { - build/yay0/papermario.1B4C3E8.yay0.o(.data); - } - - /* 0x00000000 1B4DEA0-1B4FD98 [1EF8] */ - .data01B4DEA0 0x01B4DEA0 : AT(0x1B4DEA0) { - build/yay0/papermario.1B4DEA0.yay0.o(.data); - } - - /* 0x00000000 1B4FD98-1B50CD8 [F40] */ - .data01B4FD98 0x01B4FD98 : AT(0x1B4FD98) { - build/yay0/papermario.1B4FD98.yay0.o(.data); - } - - /* 0x00000000 1B50CD8-1B51B08 [E30] */ - .data01B50CD8 0x01B50CD8 : AT(0x1B50CD8) { - build/yay0/papermario.1B50CD8.yay0.o(.data); - } - - /* 0x00000000 1B51B08-1B54258 [2750] */ - .data01B51B08 0x01B51B08 : AT(0x1B51B08) { - build/yay0/papermario.1B51B08.yay0.o(.data); - } - - /* 0x00000000 1B54258-1B580A0 [3E48] */ - .data01B54258 0x01B54258 : AT(0x1B54258) { - build/yay0/papermario.1B54258.yay0.o(.data); - } - - /* 0x00000000 1B580A0-1B5A248 [21A8] */ - .data01B580A0 0x01B580A0 : AT(0x1B580A0) { - build/yay0/papermario.1B580A0.yay0.o(.data); - } - - /* 0x00000000 1B5A248-1B5BB88 [1940] */ - .data01B5A248 0x01B5A248 : AT(0x1B5A248) { - build/yay0/papermario.1B5A248.yay0.o(.data); - } - - /* 0x00000000 1B5BB88-1B5CC90 [1108] */ - .data01B5BB88 0x01B5BB88 : AT(0x1B5BB88) { - build/yay0/papermario.1B5BB88.yay0.o(.data); - } - - /* 0x00000000 1B5CC90-1B5E968 [1CD8] */ - .data01B5CC90 0x01B5CC90 : AT(0x1B5CC90) { - build/yay0/papermario.1B5CC90.yay0.o(.data); - } - - /* 0x00000000 1B5E968-1B5ED88 [420] */ - .data01B5E968 0x01B5E968 : AT(0x1B5E968) { - build/yay0/papermario.1B5E968.yay0.o(.data); - } - - /* 0x00000000 1B5ED88-1B608C0 [1B38] */ - .data01B5ED88 0x01B5ED88 : AT(0x1B5ED88) { - build/yay0/papermario.1B5ED88.yay0.o(.data); - } - - /* 0x00000000 1B608C0-1B625F8 [1D38] */ - .data01B608C0 0x01B608C0 : AT(0x1B608C0) { - build/yay0/papermario.1B608C0.yay0.o(.data); - } - - /* 0x00000000 1B625F8-1B633D0 [DD8] */ - .data01B625F8 0x01B625F8 : AT(0x1B625F8) { - build/yay0/papermario.1B625F8.yay0.o(.data); - } - - /* 0x00000000 1B633D0-1B64878 [14A8] */ - .data01B633D0 0x01B633D0 : AT(0x1B633D0) { - build/yay0/papermario.1B633D0.yay0.o(.data); - } - - /* 0x00000000 1B64878-1B657E0 [F68] */ - .data01B64878 0x01B64878 : AT(0x1B64878) { - build/yay0/papermario.1B64878.yay0.o(.data); - } - - /* 0x00000000 1B657E0-1B65A08 [228] */ - .data01B657E0 0x01B657E0 : AT(0x1B657E0) { - build/yay0/papermario.1B657E0.yay0.o(.data); - } - - /* 0x00000000 1B65A08-1B65E50 [448] */ - .data01B65A08 0x01B65A08 : AT(0x1B65A08) { - build/yay0/papermario.1B65A08.yay0.o(.data); - } - - /* 0x00000000 1B65E50-1B66238 [3E8] */ - .data01B65E50 0x01B65E50 : AT(0x1B65E50) { - build/yay0/papermario.1B65E50.yay0.o(.data); - } - - /* 0x00000000 1B66238-1B69580 [3348] */ - .data01B66238 0x01B66238 : AT(0x1B66238) { - build/yay0/papermario.1B66238.yay0.o(.data); - } - - /* 0x00000000 1B69580-1B6C318 [2D98] */ - .data01B69580 0x01B69580 : AT(0x1B69580) { - build/yay0/papermario.1B69580.yay0.o(.data); - } - - /* 0x00000000 1B6C318-1B6DD98 [1A80] */ - .data01B6C318 0x01B6C318 : AT(0x1B6C318) { - build/yay0/papermario.1B6C318.yay0.o(.data); - } - - /* 0x00000000 1B6DD98-1B6F150 [13B8] */ - .data01B6DD98 0x01B6DD98 : AT(0x1B6DD98) { - build/yay0/papermario.1B6DD98.yay0.o(.data); - } - - /* 0x00000000 1B6F150-1B71618 [24C8] */ - .data01B6F150 0x01B6F150 : AT(0x1B6F150) { - build/yay0/papermario.1B6F150.yay0.o(.data); - } - - /* 0x00000000 1B71618-1B72890 [1278] */ - .data01B71618 0x01B71618 : AT(0x1B71618) { - build/yay0/papermario.1B71618.yay0.o(.data); - } - - /* 0x00000000 1B72890-1B73B08 [1278] */ - .data01B72890 0x01B72890 : AT(0x1B72890) { - build/yay0/papermario.1B72890.yay0.o(.data); - } - - /* 0x00000000 1B73B08-1B747B8 [CB0] */ - .data01B73B08 0x01B73B08 : AT(0x1B73B08) { - build/yay0/papermario.1B73B08.yay0.o(.data); - } - - /* 0x00000000 1B747B8-1B76E30 [2678] */ - .data01B747B8 0x01B747B8 : AT(0x1B747B8) { - build/yay0/papermario.1B747B8.yay0.o(.data); - } - - /* 0x00000000 1B76E30-1B78EC0 [2090] */ - .data01B76E30 0x01B76E30 : AT(0x1B76E30) { - build/yay0/papermario.1B76E30.yay0.o(.data); - } - - /* 0x00000000 1B78EC0-1B79A20 [B60] */ - .data01B78EC0 0x01B78EC0 : AT(0x1B78EC0) { - build/yay0/papermario.1B78EC0.yay0.o(.data); - } - - /* 0x00000000 1B79A20-1B79F08 [4E8] */ - .data01B79A20 0x01B79A20 : AT(0x1B79A20) { - build/yay0/papermario.1B79A20.yay0.o(.data); - } - - /* 0x00000000 1B79F08-1B7AA08 [B00] */ - .data01B79F08 0x01B79F08 : AT(0x1B79F08) { - build/yay0/papermario.1B79F08.yay0.o(.data); - } - - /* 0x00000000 1B7AA08-1B7B008 [600] */ - .data01B7AA08 0x01B7AA08 : AT(0x1B7AA08) { - build/yay0/papermario.1B7AA08.yay0.o(.data); - } - - /* 0x00000000 1B7B008-1B7BB50 [B48] */ - .data01B7B008 0x01B7B008 : AT(0x1B7B008) { - build/yay0/papermario.1B7B008.yay0.o(.data); - } - - /* 0x00000000 1B7BB50-1B7EC68 [3118] */ - .data01B7BB50 0x01B7BB50 : AT(0x1B7BB50) { - build/yay0/papermario.1B7BB50.yay0.o(.data); - } - - /* 0x00000000 1B7EC68-1B7FF48 [12E0] */ - .data01B7EC68 0x01B7EC68 : AT(0x1B7EC68) { - build/yay0/papermario.1B7EC68.yay0.o(.data); - } - - /* 0x00000000 1B7FF48-1B81E88 [1F40] */ - .data01B7FF48 0x01B7FF48 : AT(0x1B7FF48) { - build/yay0/papermario.1B7FF48.yay0.o(.data); - } - - /* 0x00000000 1B81E88-1B82058 [1D0] */ - .data01B81E88 0x01B81E88 : AT(0x1B81E88) { - build/yay0/papermario.1B81E88.yay0.o(.data); - } - - /* 0x00000000 1B82058-1B82202 [1AA] */ - .data01B82058 0x01B82058 : AT(0x1B82058) { - build/yay0/papermario.1B82058.yay0.o(.data); - } - - /* 0x00000000 1B82202-1E40000 [2BDDFE] */ - .data01B82202 0x01B82202 : AT(0x1B82202) { - build/bin/papermario.1B82202.bin_1b82202.o(.data); - } - - /* 0x00000000 1E40000-27FEE22 [9BEE22] */ - .data01E40000 0x01E40000 : AT(0x1E40000) { - build/Map_Assets.FS/papermario.1E40000.Map_Assets.FS.o(.data); - } - - /* 0x00000000 27FEE22-2800000 [11DE] */ - .data027FEE22 0x027FEE22 : AT(0x27FEE22) { - build/bin/papermario.27FEE22.bin_27fee22.o(.data); - } -} + /* 0x0 0-40 [40] */ + .text0_header 0x0 : AT(0x0) { + build/asm/header.o(.text0_header); + } + + /* 0xA4000040 40-B70 [B30] */ + .text40_boot 0xA4000040 : AT(0x40) { + build/asm/boot.o(.text40_boot); + } + + /* 0x00000000 B70-1000 [490] */ + .data_bootcode_font 0xB70 : AT(0xB70) { + build/bin/bootcode_font.o(.data); + } + + /* 0x80025C00 1000-1060 [60] */ + .text1000_code 0x80025C00 : AT(0x1000) { + build/src/code_1000_len_60.o(.text); + } + + /* 0x80025C60 1060-1370 [310] */ + .text1060_code 0x80025C60 : AT(0x1060) { + build/src/code_1060_len_310.o(.text); + } + + /* 0x80025F70 1370-1B40 [7D0] */ + .text1370_code 0x80025F70 : AT(0x1370) { + build/src/code_1370_len_7d0.o(.text); + } + + /* 0x80026740 1B40-3BF0 [20B0] */ + .text1B40_code 0x80026740 : AT(0x1B40) { + build/src/code_1b40_len_20b0.o(.text); + } + + /* 0x800287F0 3BF0-42E0 [6F0] */ + .text3BF0_code 0x800287F0 : AT(0x3BF0) { + build/src/code_3bf0_len_6f0.o(.text); + } + + /* 0x80028EE0 42E0-6000 [1D20] */ + .text42E0_code 0x80028EE0 : AT(0x42E0) { + build/src/code_42e0_len_1f60.o(.text); + } + + /* 0x8002AC00 6000-6240 [240] */ + .text6000_code 0x8002AC00 : AT(0x6000) { + build/src/code_6000.o(.text); + } + + /* 0x8002AE40 6240-6E40 [C00] */ + .text6240_code 0x8002AE40 : AT(0x6240) { + build/src/code_6240_len_c00.o(.text); + } + + /* 0x8002BA40 6E40-7340 [500] */ + .text6E40_code 0x8002BA40 : AT(0x6E40) { + build/src/code_6e40_len_500.o(.text); + } + + /* 0x8002BF40 7340-7E40 [B00] */ + .text7340_code 0x8002BF40 : AT(0x7340) { + build/src/code_7340_len_b00.o(.text); + } + + /* 0x8002CA40 7E40-8230 [3F0] */ + .text7E40_code 0x8002CA40 : AT(0x7E40) { + build/src/os/code_7e40_len_3f0.o(.text); + } + + /* 0x8002CE30 8230-9D10 [1AE0] */ + .text8230_code 0x8002CE30 : AT(0x8230) { + build/src/code_8230_len_1ae0.o(.text); + } + + /* 0x8002E910 9D10-AD90 [1080] */ + .text9D10_code 0x8002E910 : AT(0x9D10) { + build/src/code_9d10_len_1080.o(.text); + } + + /* 0x8002F990 AD90-D610 [2880] */ + .textAD90_code 0x8002F990 : AT(0xAD90) { + build/src/code_ad90_len_2880.o(.text); + } + + /* 0x80032210 D610-E940 [1330] */ + .textD610_code 0x80032210 : AT(0xD610) { + build/src/code_d610_len_1330.o(.text); + } + + /* 0x80033540 E940-EBD0 [290] */ + .textE940_code 0x80033540 : AT(0xE940) { + build/src/code_e940_len_290.o(.text); + } + + /* 0x800337D0 EBD0-F270 [6A0] */ + .textEBD0_code 0x800337D0 : AT(0xEBD0) { + build/src/code_ebd0_len_6a0.o(.text); + } + + /* 0x80033E70 F270-10400 [1190] */ + .textF270_code 0x80033E70 : AT(0xF270) { + build/src/code_f270_len_1190.o(.text); + } + + /* 0x80035000 10400-11130 [D30] */ + .text10400_code 0x80035000 : AT(0x10400) { + build/src/code_10400_len_d30.o(.text); + } + + /* 0x80035D30 11130-111F0 [C0] */ + .text11130_code 0x80035D30 : AT(0x11130) { + build/src/code_11130_len_c0.o(.text); + } + + /* 0x80035DF0 111F0-11A50 [860] */ + .text111F0_code 0x80035DF0 : AT(0x111F0) { + build/src/code_111f0_len_860.o(.text); + } + + /* 0x80036650 11A50-121F0 [7A0] */ + .text11A50_code 0x80036650 : AT(0x11A50) { + build/src/code_11a50_len_7a0.o(.text); + } + + /* 0x80036DF0 121F0-13480 [1290] */ + .text121F0_code 0x80036DF0 : AT(0x121F0) { + build/src/code_121f0_len_1290.o(.text); + } + + /* 0x80038080 13480-13870 [3F0] */ + .text13480_code 0x80038080 : AT(0x13480) { + build/src/code_13480_len_3f0.o(.text); + } + + /* 0x80038470 13870-1A1F0 [6980] */ + .text13870_code 0x80038470 : AT(0x13870) { + build/src/code_13870_len_6980.o(.text); + } + + /* 0x8003EDF0 1A1F0-1F580 [5390] */ + .text1A1F0_code 0x8003EDF0 : AT(0x1A1F0) { + build/src/code_1a1f0_len_5390.o(.text); + } + + /* 0x80044180 1F580-20EC0 [1940] */ + .text1F580_code 0x80044180 : AT(0x1F580) { + build/src/code_1f580_len_1940.o(.text); + } + + /* 0x80045AC0 20EC0-25F00 [5040] */ + .text20EC0_code 0x80045AC0 : AT(0x20EC0) { + build/src/code_20ec0_len_5040.o(.text); + } + + /* 0x8004AB00 25F00-26840 [940] */ + .text25F00_code 0x8004AB00 : AT(0x25F00) { + build/src/code_25f00_len_940.o(.text); + } + + /* 0x8004B440 26840-28910 [20D0] */ + .text26840_code 0x8004B440 : AT(0x26840) { + build/src/code_26840_len_20d0.o(.text); + } + + /* 0x8004D510 28910-2D9A0 [5090] */ + .text28910_code 0x8004D510 : AT(0x28910) { + build/src/code_28910_len_5090.o(.text); + } + + /* 0x800525A0 2D9A0-2E230 [890] */ + .text2D9A0_code 0x800525A0 : AT(0x2D9A0) { + build/src/code_2d9a0_len_890.o(.text); + } + + /* 0x80052E30 2E230-303C0 [2190] */ + .text2E230_code 0x80052E30 : AT(0x2E230) { + build/src/code_2e230_len_2190.o(.text); + } + + /* 0x80054FC0 303C0-341D0 [3E10] */ + .text303C0_code 0x80054FC0 : AT(0x303C0) { + build/src/code_303c0_len_3e10.o(.text); + } + + /* 0x80058DD0 341D0-362A0 [20D0] */ + .text341D0_code 0x80058DD0 : AT(0x341D0) { + build/src/code_341d0_len_20d0.o(.text); + } + + /* 0x8005AEA0 362A0-39210 [2F70] */ + .text362A0_code 0x8005AEA0 : AT(0x362A0) { + build/src/code_362a0_len_2f70.o(.text); + } + + /* 0x8005DE10 39210-39CB0 [AA0] */ + .text39210_code 0x8005DE10 : AT(0x39210) { + build/src/code_39210_len_aa0.o(.text); + } + + /* 0x8005E8B0 39CB0-39DB0 [100] */ + .text39CB0_code 0x8005E8B0 : AT(0x39CB0) { + build/src/os/code_39cb0_len_100.o(.text); + } + + /* 0x8005E9B0 39DB0-3A650 [8A0] */ + .text39DB0_code 0x8005E9B0 : AT(0x39DB0) { + build/src/os/code_39db0_len_8a0.o(.text); + } + + /* 0x8005F250 3A650-3A690 [40] */ + .text3A650_code 0x8005F250 : AT(0x3A650) { + build/src/os/code_3a650_len_40.o(.text); + } + + /* 0x8005F290 3A690-3A6D0 [40] */ + .text3A690_code 0x8005F290 : AT(0x3A690) { + build/src/os/code_3a690_len_40.o(.text); + } + + /* 0x8005F2D0 3A6D0-3A6F0 [20] */ + .text3A6D0_code 0x8005F2D0 : AT(0x3A6D0) { + build/src/os/code_3a6d0_len_20.o(.text); + } + + /* 0x8005F2F0 3A6F0-3A800 [110] */ + .text3A6F0_code 0x8005F2F0 : AT(0x3A6F0) { + build/src/os/code_3a6f0_len_110.o(.text); + } + + /* 0x8005F400 3A800-3A830 [30] */ + .text3A800_code 0x8005F400 : AT(0x3A800) { + build/src/os/code_3a800_len_30.o(.text); + } + + /* 0x8005F430 3A830-3A850 [20] */ + .text3A830_code 0x8005F430 : AT(0x3A830) { + build/src/os/code_3a830_len_20.o(.text); + } + + /* 0x8005F450 3A850-3B290 [A40] */ + .text3A850_code 0x8005F450 : AT(0x3A850) { + build/src/os/code_3a850_le_a40.o(.text); + } + + /* 0x8005FE90 3B290-3B390 [100] */ + .text3B290_code 0x8005FE90 : AT(0x3B290) { + build/src/os/code_3b290_len_100.o(.text); + } + + /* 0x8005FF90 3B390-3B4A0 [110] */ + .text3B390_code 0x8005FF90 : AT(0x3B390) { + build/src/os/code_3b390_len_110.o(.text); + } + + /* 0x800600A0 3B4A0-3B710 [270] */ + .text3B4A0_code 0x800600A0 : AT(0x3B4A0) { + build/src/os/code_3b4a0_len_270.o(.text); + } + + /* 0x80060310 3B710-3B750 [40] */ + .text3B710_code 0x80060310 : AT(0x3B710) { + build/src/os/code_3b710_len_40.o(.text); + } + + /* 0x80060350 3B750-3B770 [20] */ + .text3B750_code 0x80060350 : AT(0x3B750) { + build/src/code_3b750_len_20.o(.text); + } + + /* 0x80060370 3B770-3B7F0 [80] */ + .text3B770_code 0x80060370 : AT(0x3B770) { + build/src/os/code_3b770_len_80.o(.text); + } + + /* 0x800603F0 3B7F0-3B910 [120] */ + .text3B7F0_code 0x800603F0 : AT(0x3B7F0) { + build/src/os/code_3b7f0_len_120.o(.text); + } + + /* 0x80060510 3B910-3BD20 [410] */ + .text3B910_code 0x80060510 : AT(0x3B910) { + build/src/os/code_3b910_len_410.o(.text); + } + + /* 0x80060920 3BD20-3BDE0 [C0] */ + .text3BD20_code 0x80060920 : AT(0x3BD20) { + build/src/os/code_3bd20_len_c0.o(.text); + } + + /* 0x800609E0 3BDE0-3C1C0 [3E0] */ + .text3BDE0_code 0x800609E0 : AT(0x3BDE0) { + build/src/os/code_3bde0_len_3e0.o(.text); + } + + /* 0x80060DC0 3C1C0-3C220 [60] */ + .text3C1C0_code 0x80060DC0 : AT(0x3C1C0) { + build/src/os/code_3c1c0_len_60.o(.text); + } + + /* 0x80060E20 3C220-3C2C0 [A0] */ + .text3C220_code 0x80060E20 : AT(0x3C220) { + build/src/os/code_3c220_len_a0.o(.text); + } + + /* 0x80060EC0 3C2C0-3C310 [50] */ + .text3C2C0_code 0x80060EC0 : AT(0x3C2C0) { + build/src/os/code_3c2c0_len_50.o(.text); + } + + /* 0x80060F10 3C310-3C490 [180] */ + .text3C310_code 0x80060F10 : AT(0x3C310) { + build/src/os/code_3c310_len_180.o(.text); + } + + /* 0x80061090 3C490-3C850 [3C0] */ + .text3C490_code 0x80061090 : AT(0x3C490) { + build/src/os/code_3c490_len_3c0.o(.text); + } + + /* 0x80061450 3C850-3C940 [F0] */ + .text3C850_code 0x80061450 : AT(0x3C850) { + build/src/os/code_3c850_len_f0.o(.text); + } + + /* 0x80061540 3C940-3CA80 [140] */ + .text3C940_code 0x80061540 : AT(0x3C940) { + build/src/os/code_3c940_len_140.o(.text); + } + + /* 0x80061680 3CA80-3CB20 [A0] */ + .text3CA80_code 0x80061680 : AT(0x3CA80) { + build/src/os/code_3ca80_len_a0.o(.text); + } + + /* 0x80061720 3CB20-3CC50 [130] */ + .text3CB20_code 0x80061720 : AT(0x3CB20) { + build/src/os/code_3cb20_len_130.o(.text); + } + + /* 0x80061850 3CC50-3CCD0 [80] */ + .text3CC50_code 0x80061850 : AT(0x3CC50) { + build/src/os/code_3cc50_len_80.o(.text); + } + + /* 0x800618D0 3CCD0-3CD00 [30] */ + .text3CCD0_code 0x800618D0 : AT(0x3CCD0) { + build/src/os/code_3ccd0_len_30.o(.text); + } + + /* 0x80061900 3CD00-3D2F0 [5F0] */ + .text3CD00_code 0x80061900 : AT(0x3CD00) { + build/src/os/code_3cd00_len_5f0.o(.text); + } + + /* 0x80061EF0 3D2F0-3D300 [10] */ + .text3D2F0_code 0x80061EF0 : AT(0x3D2F0) { + build/src/os/code_3d2f0_len_10.o(.text); + } + + /* 0x80061F00 3D300-3D330 [30] */ + .text3D300_code 0x80061F00 : AT(0x3D300) { + build/src/os/code_3d300_len_30.o(.text); + } + + /* 0x80061F30 3D330-3DCC0 [990] */ + .text3D330_code 0x80061F30 : AT(0x3D330) { + build/src/os/code_3d330_len_990.o(.text); + } + + /* 0x800628C0 3DCC0-3E720 [A60] */ + .text3DCC0_code 0x800628C0 : AT(0x3DCC0) { + build/src/os/code_3dcc0_len_a60.o(.text); + } + + /* 0x80063320 3E720-3ED10 [5F0] */ + .text3E720_code 0x80063320 : AT(0x3E720) { + build/src/os/code_3e720_len_5f0.o(.text); + } + + /* 0x80063910 3ED10-3EF90 [280] */ + .text3ED10_code 0x80063910 : AT(0x3ED10) { + build/src/guOrtho.o(.text); + } + + /* 0x80063B90 3EF90-3F310 [380] */ + .text3EF90_code 0x80063B90 : AT(0x3EF90) { + build/src/os/code_3ef90_len_600.o(.text); + } + + /* 0x80063F10 3F310-3F6D0 [3C0] */ + .text3F310_code 0x80063F10 : AT(0x3F310) { + build/src/os/code_3f310_len_3c0.o(.text); + } + + /* 0x800642D0 3F6D0-3F9F0 [320] */ + .text3F6D0_code 0x800642D0 : AT(0x3F6D0) { + build/src/os/code_3f6d0_len_320.o(.text); + } + + /* 0x800645F0 3F9F0-3FA50 [60] */ + .text3F9F0_code 0x800645F0 : AT(0x3F9F0) { + build/src/os/code_3f9f0_len_60.o(.text); + } + + /* 0x80064650 3FA50-409B0 [F60] */ + .text3FA50_code 0x80064650 : AT(0x3FA50) { + build/src/os/code_3fa50_len_f60.o(.text); + } + + /* 0x800655B0 409B0-40AF0 [140] */ + .text409B0_code 0x800655B0 : AT(0x409B0) { + build/src/os/code_409b0_len_140.o(.text); + } + + /* 0x800656F0 40AF0-40C20 [130] */ + .text40AF0_code 0x800656F0 : AT(0x40AF0) { + build/src/os/code_40af0_len_130.o(.text); + } + + /* 0x80065820 40C20-40E10 [1F0] */ + .text40C20_code 0x80065820 : AT(0x40C20) { + build/src/os/code_40c20_len_1f0.o(.text); + } + + /* 0x80065A10 40E10-41050 [240] */ + .text40E10_code 0x80065A10 : AT(0x40E10) { + build/src/os/code_40e10_len_240.o(.text); + } + + /* 0x80065C50 41050-41170 [120] */ + .text41050_code 0x80065C50 : AT(0x41050) { + build/src/os/code_41050_len_120.o(.text); + } + + /* 0x80065D70 41170-41260 [F0] */ + .text41170_code 0x80065D70 : AT(0x41170) { + build/src/os/code_41170_len_f0.o(.text); + } + + /* 0x80065E60 41260-41330 [D0] */ + .text41260_code 0x80065E60 : AT(0x41260) { + build/src/os/osCreateThread.o(.text); + } + + /* 0x80065F30 41330-41350 [20] */ + .text41330_code 0x80065F30 : AT(0x41330) { + build/src/os/osGetThreadPri.o(.text); + } + + /* 0x80065F50 41350-41420 [D0] */ + .text41350_code 0x80065F50 : AT(0x41350) { + build/src/os/code_41350_len_d0.o(.text); + } + + /* 0x80066020 41420-41540 [120] */ + .text41420_code 0x80066020 : AT(0x41420) { + build/src/os/code_41420_len_120.o(.text); + } + + /* 0x80066140 41540-41600 [C0] */ + .text41540_code 0x80066140 : AT(0x41540) { + build/src/os/code_41540_len_c0.o(.text); + } + + /* 0x80066200 41600-41640 [40] */ + .text41600_code 0x80066200 : AT(0x41600) { + build/src/os/code_41600_len_40.o(.text); + } + + /* 0x80066240 41640-41690 [50] */ + .text41640_code 0x80066240 : AT(0x41640) { + build/src/os/code_41640_len_50.o(.text); + } + + /* 0x80066290 41690-416A0 [10] */ + .text41690_code 0x80066290 : AT(0x41690) { + build/src/os/code_41690_len_10.o(.text); + } + + /* 0x800662A0 416A0-41730 [90] */ + .text416A0_code 0x800662A0 : AT(0x416A0) { + build/src/os/code_416a0_len_90.o(.text); + } + + /* 0x80066330 41730-41750 [20] */ + .text41730_code 0x80066330 : AT(0x41730) { + build/src/os/code_41730_len_20.o(.text); + } + + /* 0x80066350 41750-41BA0 [450] */ + .text41750_code 0x80066350 : AT(0x41750) { + build/src/os/code_41750_len_450.o(.text); + } + + /* 0x800667A0 41BA0-41C60 [C0] */ + .text41BA0_code 0x800667A0 : AT(0x41BA0) { + build/src/os/code_41ba0_len_c0.o(.text); + } + + /* 0x80066860 41C60-41D20 [C0] */ + .text41C60_code 0x80066860 : AT(0x41C60) { + build/src/os/code_41c60_len_c0.o(.text); + } + + /* 0x80066920 41D20-41D60 [40] */ + .text41D20_code 0x80066920 : AT(0x41D20) { + build/src/os/code_41d20_len_40.o(.text); + } + + /* 0x80066960 41D60-41DB0 [50] */ + .text41D60_code 0x80066960 : AT(0x41D60) { + build/src/os/code_41d60_len_50.o(.text); + } + + /* 0x800669B0 41DB0-41DF0 [40] */ + .text41DB0_code 0x800669B0 : AT(0x41DB0) { + build/src/os/code_41db0_len_40.o(.text); + } + + /* 0x800669F0 41DF0-41E30 [40] */ + .text41DF0_code 0x800669F0 : AT(0x41DF0) { + build/src/os/code_41df0_len_40.o(.text); + } + + /* 0x80066A30 41E30-41E70 [40] */ + .text41E30_code 0x80066A30 : AT(0x41E30) { + build/src/os/code_41e30_len_40.o(.text); + } + + /* 0x80066A70 41E70-421B0 [340] */ + .text41E70_code 0x80066A70 : AT(0x41E70) { + build/src/os/code_41e70_len_340.o(.text); + } + + /* 0x80066DB0 421B0-42210 [60] */ + .text421B0_code 0x80066DB0 : AT(0x421B0) { + build/src/os/code_421b0_len_60.o(.text); + } + + /* 0x80066E10 42210-42260 [50] */ + .text42210_code 0x80066E10 : AT(0x42210) { + build/src/os/code_42210_len_50.o(.text); + } + + /* 0x80066E60 42260-423D0 [170] */ + .text42260_code 0x80066E60 : AT(0x42260) { + build/src/os/code_42260_len_170.o(.text); + } + + /* 0x80066FD0 423D0-42420 [50] */ + .text423D0_code 0x80066FD0 : AT(0x423D0) { + build/src/os/code_423d0_len_50.o(.text); + } + + /* 0x80067020 42420-42470 [50] */ + .text42420_code 0x80067020 : AT(0x42420) { + build/src/os/code_42420_len_50.o(.text); + } + + /* 0x80067070 42470-42780 [310] */ + .text42470_code 0x80067070 : AT(0x42470) { + build/src/os/code_42470_len_310.o(.text); + } + + /* 0x80067380 42780-428A0 [120] */ + .text42780_code 0x80067380 : AT(0x42780) { + build/src/os/code_42780_len_120.o(.text); + } + + /* 0x800674A0 428A0-42900 [60] */ + .text428A0_code 0x800674A0 : AT(0x428A0) { + build/src/os/guMtxIdentF.o(.text); + } + + /* 0x80067500 42900-42980 [80] */ + .text42900_code 0x80067500 : AT(0x42900) { + build/src/os/code_42900_len_80.o(.text); + } + + /* 0x80067580 42980-42A00 [80] */ + .text42980_code 0x80067580 : AT(0x42980) { + build/src/os/code_42980_len_80.o(.text); + } + + /* 0x80067600 42A00-42B00 [100] */ + .text42A00_code 0x80067600 : AT(0x42A00) { + build/src/os/code_42a00_len_100.o(.text); + } + + /* 0x80067700 42B00-42BC0 [C0] */ + .text42B00_code 0x80067700 : AT(0x42B00) { + build/src/os/code_42b00_len_c0.o(.text); + } + + /* 0x800677C0 42BC0-42C20 [60] */ + .text42BC0_code 0x800677C0 : AT(0x42BC0) { + build/src/os/code_42bc0_len_60.o(.text); + } + + /* 0x80067820 42C20-42D00 [E0] */ + .text42C20_code 0x80067820 : AT(0x42C20) { + build/src/os/code_42c20_len_e0.o(.text); + } + + /* 0x80067900 42D00-42D60 [60] */ + .text42D00_code 0x80067900 : AT(0x42D00) { + build/src/os/code_42d00_len_60.o(.text); + } + + /* 0x80067960 42D60-42DE0 [80] */ + .text42D60_code 0x80067960 : AT(0x42D60) { + build/src/os/code_42d60_len_80.o(.text); + } + + /* 0x800679E0 42DE0-42E70 [90] */ + .text42DE0_code 0x800679E0 : AT(0x42DE0) { + build/src/os/code_42de0_len_90.o(.text); + } + + /* 0x80067A70 42E70-43200 [390] */ + .text42E70_code 0x80067A70 : AT(0x42E70) { + build/src/os/code_42e70_len_390.o(.text); + } + + /* 0x80067E00 43200-439C0 [7C0] */ + .text43200_code 0x80067E00 : AT(0x43200) { + build/src/os/code_43200_len_7c0.o(.text); + } + + /* 0x800685C0 439C0-43BE0 [220] */ + .text439C0_code 0x800685C0 : AT(0x439C0) { + build/src/os/code_439c0_len_220.o(.text); + } + + /* 0x800687E0 43BE0-441C0 [5E0] */ + .text43BE0_code 0x800687E0 : AT(0x43BE0) { + build/src/os/code_43be0_len_5e0.o(.text); + } + + /* 0x80068DC0 441C0-44380 [1C0] */ + .text441C0_code 0x80068DC0 : AT(0x441C0) { + build/src/os/code_441c0_len_1c0.o(.text); + } + + /* 0x80068F80 44380-44860 [4E0] */ + .text44380_code 0x80068F80 : AT(0x44380) { + build/src/os/code_44380_len_4e0.o(.text); + } + + /* 0x80069460 44860-448C0 [60] */ + .text44860_code 0x80069460 : AT(0x44860) { + build/src/os/code_44860_len_60.o(.text); + } + + /* 0x800694C0 448C0-44AD0 [210] */ + .text448C0_code 0x800694C0 : AT(0x448C0) { + build/src/os/code_448c0_len_210.o(.text); + } + + /* 0x800696D0 44AD0-44B40 [70] */ + .text44AD0_code 0x800696D0 : AT(0x44AD0) { + build/src/os/code_44ad0_len_70.o(.text); + } + + /* 0x80069740 44B40-455D0 [A90] */ + .text44B40_code 0x80069740 : AT(0x44B40) { + build/src/os/code_44b40_len_a90.o(.text); + } + + /* 0x8006A1D0 455D0-457C0 [1F0] */ + .text455D0_code 0x8006A1D0 : AT(0x455D0) { + build/src/os/code_455d0_len_1f0.o(.text); + } + + /* 0x8006A3C0 457C0-45A30 [270] */ + .text457C0_code 0x8006A3C0 : AT(0x457C0) { + build/src/os/code_457c0_len_270.o(.text); + } + + /* 0x8006A630 45A30-45A50 [20] */ + .text45A30_code 0x8006A630 : AT(0x45A30) { + build/src/os/code_45a30_len_20.o(.text); + } + + /* 0x8006A650 45A50-45DF0 [3A0] */ + .text45A50_code 0x8006A650 : AT(0x45A50) { + build/src/os/code_45a50_len_3a0.o(.text); + } + + /* 0x8006A9F0 45DF0-46760 [970] */ + .text45DF0_code 0x8006A9F0 : AT(0x45DF0) { + build/src/os/code_45df0_len_970.o(.text); + } + + /* 0x8006B360 46760-467F0 [90] */ + .text46760_code 0x8006B360 : AT(0x46760) { + build/src/os/code_46760_len_90.o(.text); + } + + /* 0x8006B3F0 467F0-46880 [90] */ + .text467F0_code 0x8006B3F0 : AT(0x467F0) { + build/src/os/code_467f0_len_90.o(.text); + } + + /* 0x8006B480 46880-46AE0 [260] */ + .text46880_code 0x8006B480 : AT(0x46880) { + build/src/os/code_46880_len_260.o(.text); + } + + /* 0x8006B6E0 46AE0-46C50 [170] */ + .text46AE0_code 0x8006B6E0 : AT(0x46AE0) { + build/src/os/code_46ae0_len_170.o(.text); + } + + /* 0x8006B850 46C50-46C70 [20] */ + .text46C50_code 0x8006B850 : AT(0x46C50) { + build/src/os/code_46c50_len_20.o(.text); + } + + /* 0x8006B870 46C70-47A70 [E00] */ + .text46C70_code 0x8006B870 : AT(0x46C70) { + build/src/os/code_46c70_len_e00.o(.text); + } + + /* 0x8006C670 47A70-47A80 [10] */ + .text47A70_code 0x8006C670 : AT(0x47A70) { + build/src/os/code_47a70_len_10.o(.text); + } + + /* 0x8006C680 47A80-47A90 [10] */ + .text47A80_code 0x8006C680 : AT(0x47A80) { + build/src/os/code_47a80_len_10.o(.text); + } + + /* 0x8006C690 47A90-47AE0 [50] */ + .text47A90_code 0x8006C690 : AT(0x47A90) { + build/src/os/code_47a90_len_50.o(.text); + } + + /* 0x8006C6E0 47AE0-47BC0 [E0] */ + .text47AE0_code 0x8006C6E0 : AT(0x47AE0) { + build/src/os/code_47ae0_len_e0.o(.text); + } + + /* 0x8006C7C0 47BC0-47C10 [50] */ + .text47BC0_code 0x8006C7C0 : AT(0x47BC0) { + build/src/os/code_47bc0_len_50.o(.text); + } + + /* 0x8006C810 47C10-47C60 [50] */ + .text47C10_code 0x8006C810 : AT(0x47C10) { + build/src/os/code_47c10_len_50.o(.text); + } + + /* 0x8006C860 47C60-47D50 [F0] */ + .text47C60_code 0x8006C860 : AT(0x47C60) { + build/src/os/code_47c60_len_f0.o(.text); + } + + /* 0x8006C950 47D50-47E30 [E0] */ + .text47D50_code 0x8006C950 : AT(0x47D50) { + build/src/os/code_47d50_len_e0.o(.text); + } + + /* 0x8006CA30 47E30-47E90 [60] */ + .text47E30_code 0x8006CA30 : AT(0x47E30) { + build/src/os/code_47e30_len_60.o(.text); + } + + /* 0x8006CA90 47E90-47FA0 [110] */ + .text47E90_code 0x8006CA90 : AT(0x47E90) { + build/src/os/code_47e90_len_110.o(.text); + } + + /* 0x8006CBA0 47FA0-47FC0 [20] */ + .text47FA0_code 0x8006CBA0 : AT(0x47FA0) { + build/src/os/code_47fa0_len_20.o(.text); + } + + /* 0x8006CBC0 47FC0-48020 [60] */ + .text47FC0_code 0x8006CBC0 : AT(0x47FC0) { + build/src/os/code_47fc0_len_60.o(.text); + } + + /* 0x8006CC20 48020-48A20 [A00] */ + .text48020_code 0x8006CC20 : AT(0x48020) { + build/src/os/code_48020_len_a00.o(.text); + } + + /* 0x8006D620 48A20-48BE0 [1C0] */ + .text48A20_code 0x8006D620 : AT(0x48A20) { + build/src/os/code_48a20_len_1c0.o(.text); + } + + /* 0x8006D7E0 48BE0-48C00 [20] */ + .text48BE0_code 0x8006D7E0 : AT(0x48BE0) { + build/src/os/code_48be0_len_20.o(.text); + } + + /* 0x8006D800 48C00-491C0 [5C0] */ + .text48C00_code 0x8006D800 : AT(0x48C00) { + build/src/os/code_48c00_len_5c0.o(.text); + } + + /* 0x8006DDC0 491C0-49C70 [AB0] */ + .text491C0_code 0x8006DDC0 : AT(0x491C0) { + build/src/os/code_491c0_len_f80.o(.text); + } + + /* 0x8006E870 49C70-4A140 [4D0] */ + .text49C70_code 0x8006E870 : AT(0x49C70) { + build/src/os/code_49C70.o(.text); + } + + /* 0x8006ED40 4A140-4A1B0 [70] */ + .text4A140_code 0x8006ED40 : AT(0x4A140) { + build/src/os/code_4a140_len_70.o(.text); + } + + /* 0x8006EDB0 4A1B0-4A1F0 [40] */ + .text4A1B0_code 0x8006EDB0 : AT(0x4A1B0) { + build/src/os/code_4a1b0_len_40.o(.text); + } + + /* 0x8006EDF0 4A1F0-4A360 [170] */ + .text4A1F0_code 0x8006EDF0 : AT(0x4A1F0) { + build/src/os/code_4a1f0_len_170.o(.text); + } + + /* 0x8006EF60 4A360-4AC90 [930] */ + .text4A360_code 0x8006EF60 : AT(0x4A360) { + build/src/os/code_4a360_len_930.o(.text); + } + + /* 0x8006F890 4AC90-4E5A0 [3910] */ + .text4AC90_code 0x8006F890 : AT(0x4AC90) { + build/src/os/code_4ac90_len_3910.o(.text); + } + + /* 0x00000000 4E5A0-759B0 [27410] */ + .data_4E5A0 0x4E5A0 : AT(0x4E5A0) { + build/bin/4E5A0.o(.data); + } + + /* 0x800DC500 759B0-7BB60 [61B0] */ + .text759B0_code 0x800DC500 : AT(0x759B0) { + build/src/code_759b0_len_61b0.o(.text); + } + + /* 0x800E26B0 7BB60-7FD10 [41B0] */ + .text7BB60_code 0x800E26B0 : AT(0x7BB60) { + build/src/code_7bb60_len_41b0.o(.text); + } + + /* 0x800E6860 7FD10-80850 [B40] */ + .text7FD10_code 0x800E6860 : AT(0x7FD10) { + build/src/code_7fd10_len_b40.o(.text); + } + + /* 0x800E73A0 80850-838B0 [3060] */ + .text80850_code 0x800E73A0 : AT(0x80850) { + build/src/code_80850_len_3060.o(.text); + } + + /* 0x800EA400 838B0-891B0 [5900] */ + .text838B0_code 0x800EA400 : AT(0x838B0) { + build/src/code_838b0_len_5900.o(.text); + } + + /* 0x800EFD00 891B0-8A160 [FB0] */ + .text891B0_code 0x800EFD00 : AT(0x891B0) { + build/src/code_891b0_len_fb0.o(.text); + } + + /* 0x800F0CB0 8A160-8A860 [700] */ + .text8A160_code 0x800F0CB0 : AT(0x8A160) { + build/src/code_8a160_len_700.o(.text); + } + + /* 0x800F13B0 8A860-8E790 [3F30] */ + .text8A860_code 0x800F13B0 : AT(0x8A860) { + build/src/code_8a860_len_3f30.o(.text); + } + + /* 0x800F52E0 8E790-90FE0 [2850] */ + .text8E790_code 0x800F52E0 : AT(0x8E790) { + build/src/code_8e790_len_2850.o(.text); + } + + /* 0x00000000 90FE0-A5DD0 [14DF0] */ + .data_90FE0 0x90FE0 : AT(0x90FE0) { + build/bin/90FE0.o(.data); + } + + /* 0x8010F6D0 A5DD0-B72B0 [114E0] */ + .textA5DD0_code 0x8010F6D0 : AT(0xA5DD0) { + build/src/code_a5dd0_len_114e0.o(.text); + } + + /* 0x80120BB0 B72B0-CD180 [15ED0] */ + .textB72B0_code 0x80120BB0 : AT(0xB72B0) { + build/src/code_b72b0_len_15ed0.o(.text); + } + + /* 0x80136A80 CD180-D0A70 [38F0] */ + .textCD180_code 0x80136A80 : AT(0xCD180) { + build/src/code_cd180_len_38f0.o(.text); + } + + /* 0x8013A370 D0A70-D5A50 [4FE0] */ + .textD0A70_code 0x8013A370 : AT(0xD0A70) { + build/src/code_d0a70_len_4fe0.o(.text); + } + + /* 0x8013F350 D5A50-DBA20 [5FD0] */ + .textD5A50_code 0x8013F350 : AT(0xD5A50) { + build/src/code_d5a50_len_5fd0.o(.text); + } + + /* 0x80145320 DBA20-DBD70 [350] */ + .textDBA20_code 0x80145320 : AT(0xDBA20) { + build/src/code_dba20_len_350.o(.text); + } + + /* 0x80145670 DBD70-DC470 [700] */ + .textDBD70_code 0x80145670 : AT(0xDBD70) { + build/src/code_dbd70_len_700.o(.text); + } + + /* 0x80145D70 DC470-DD930 [14C0] */ + .textDC470_code 0x80145D70 : AT(0xDC470) { + build/src/code_dc470_len_14c0.o(.text); + } + + /* 0x80147230 DD930-DDAF0 [1C0] */ + .textDD930_code 0x80147230 : AT(0xDD930) { + build/src/code_dd930_len_1c0.o(.text); + } + + /* 0x801473F0 DDAF0-DE740 [C50] */ + .textDDAF0_code 0x801473F0 : AT(0xDDAF0) { + build/src/code_ddaf0_len_c50.o(.text); + } + + /* 0x80148040 DE740-E0B30 [23F0] */ + .textDE740_code 0x80148040 : AT(0xDE740) { + build/src/code_de740_len_23f0.o(.text); + } + + /* 0x8014A430 E0B30-E16B0 [B80] */ + .textE0B30_code 0x8014A430 : AT(0xE0B30) { + build/src/code_e0b30_len_b80.o(.text); + } + + /* 0x00000000 E16B0-E79B0 [6300] */ + .data_E16B0 0xE16B0 : AT(0xE16B0) { + build/bin/E16B0.o(.data); + } + + /* 0x802C3000 E79B0-E92D0 [1920] */ + .textE79B0_code 0x802C3000 : AT(0xE79B0) { + build/src/code_e79b0_len_1920.o(.text); + } + + /* 0x802C4920 E92D0-EF070 [5DA0] */ + .textE92D0_code 0x802C4920 : AT(0xE92D0) { + build/src/code_e92d0_len_5da0.o(.text); + } + + /* 0x802CA6C0 EF070-F2470 [3400] */ + .textEF070_code 0x802CA6C0 : AT(0xEF070) { + build/src/code_ef070_len_3400.o(.text); + } + + /* 0x802CDAC0 F2470-F4C60 [27F0] */ + .textF2470_code 0x802CDAC0 : AT(0xF2470) { + build/src/code_f2470_len_27f0.o(.text); + } + + /* 0x802D02B0 F4C60-F8F60 [4300] */ + .textF4C60_code 0x802D02B0 : AT(0xF4C60) { + build/src/code_f4c60_len_4300.o(.text); + } + + /* 0x802D45B0 F8F60-FA4C0 [1560] */ + .textF8F60_code 0x802D45B0 : AT(0xF8F60) { + build/src/code_f8f60_len_1560.o(.text); + } + + /* 0x802D5B10 FA4C0-FE0B0 [3BF0] */ + .textFA4C0_code 0x802D5B10 : AT(0xFA4C0) { + build/src/code_fa4c0_len_3bf0.o(.text); + } + + /* 0x802D9700 FE0B0-FE650 [5A0] */ + .textFE0B0_code 0x802D9700 : AT(0xFE0B0) { + build/src/code_fe0b0_len_5a0.o(.text); + } + + /* 0x00000000 FE650-FEE30 [7E0] */ + .data_FE650 0xFE650 : AT(0xFE650) { + build/bin/FE650.o(.data); + } + + /* 0x802DBD40 FEE30-101B90 [2D60] */ + .textFEE30_code 0x802DBD40 : AT(0xFEE30) { + build/src/code_fee30_len_2d60.o(.text); + } + + /* 0x802DEAA0 101B90-102480 [8F0] */ + .text101B90_code 0x802DEAA0 : AT(0x101B90) { + build/src/code_101b90_len_8f0.o(.text); + } + + /* 0x00000000 102480-102610 [190] */ + .data_102480 0x102480 : AT(0x102480) { + build/bin/102480.o(.data); + } + + /* 0x802E0D90 102610-104940 [2330] */ + .text102610_code 0x802E0D90 : AT(0x102610) { + build/src/code_102610_len_2330.o(.text); + } + + /* 0x802E30C0 104940-105700 [DC0] */ + .text104940_code 0x802E30C0 : AT(0x104940) { + build/src/code_104940_len_dc0.o(.text); + } + + /* 0x802E3E80 105700-107830 [2130] */ + .text105700_code 0x802E3E80 : AT(0x105700) { + build/src/code_105700_len_2130.o(.text); + } + + /* 0x802E5FB0 107830-1086A0 [E70] */ + .text107830_code 0x802E5FB0 : AT(0x107830) { + build/src/code_107830_len_e70.o(.text); + } + + /* 0x802E6E20 1086A0-109660 [FC0] */ + .text1086A0_code 0x802E6E20 : AT(0x1086A0) { + build/src/code_1086a0_len_fc0.o(.text); + } + + /* 0x802E7DE0 109660-10A9F0 [1390] */ + .text109660_code 0x802E7DE0 : AT(0x109660) { + build/src/code_109660_len_1270.o(.text); + } + + /* 0x00000000 10A9F0-131340 [26950] */ + .data_10A9F0 0x10A9F0 : AT(0x10A9F0) { + build/bin/10A9F0.o(.data); + } + + /* 0x00000000 131340-135EE0 [4BA0] */ + .data_131340 0x131340 : AT(0x131340) { + build/bin/131340.o(.data); + } + + /* 0x80242BA0 135EE0-1422A0 [C3C0] */ + .text135EE0_code 0x80242BA0 : AT(0x135EE0) { + build/src/code_135EE0.o(.text); + } + + /* 0x00000000 1422A0-163400 [21160] */ + .data_1422A0 0x1422A0 : AT(0x1422A0) { + build/bin/1422A0.o(.data); + } + + /* 0x80242BA0 163400-167570 [4170] */ + .text163400_code 0x80242BA0 : AT(0x163400) { + build/src/code_163400.o(.text); + } + + /* 0x80246D10 167570-168590 [1020] */ + .text167570_code 0x80246D10 : AT(0x167570) { + build/src/code_167570.o(.text); + } + + /* 0x80247D30 168590-169BE0 [1650] */ + .text168590_code 0x80247D30 : AT(0x168590) { + build/src/code_168590.o(.text); + } + + /* 0x80249380 169BE0-16A3E0 [800] */ + .text169BE0_code 0x80249380 : AT(0x169BE0) { + build/src/code_169BE0.o(.text); + } + + /* 0x00000000 16A3E0-16C8E0 [2500] */ + .data_16A3E0 0x16A3E0 : AT(0x16A3E0) { + build/bin/16A3E0.o(.data); + } + + /* 0x8023E000 16C8E0-1AF2C0 [429E0] */ + .text16C8E0_code 0x8023E000 : AT(0x16C8E0) { + build/src/code_16c8e0.o(.text); + } + + /* 0x00000000 1AF2C0-3169F0 [167730] */ + .data_1AF2C0 0x1AF2C0 : AT(0x1AF2C0) { + build/bin/1AF2C0.o(.data); + } + + /* 0x80200000 3169F0-316A70 [80] */ + .text3169F0_code 0x80200000 : AT(0x3169F0) { + build/src/code_3169f0.o(.text); + } + + /* 0x80200080 316A70-316C00 [190] */ + .text316A70_code 0x80200080 : AT(0x316A70) { + build/src/code_316a70.o(.text); + } + + /* 0x00000000 316C00-316D90 [190] */ + .data_316C00 0x316C00 : AT(0x316C00) { + build/bin/316C00.o(.data); + } + + /* 0x802AE000 316D90-316F30 [1A0] */ + .text316D90_code 0x802AE000 : AT(0x316D90) { + build/src/code_316d90.o(.text); + } + + /* 0x802B2000 316F30-317020 [F0] */ + .text316F30_code 0x802B2000 : AT(0x316F30) { + build/src/code_316f30.o(.text); + } + + /* 0x00000000 317020-415D90 [FED70] */ + .data_317020 0x317020 : AT(0x317020) { + build/bin/317020.o(.data); + } + + /* 0x802A1000 415D90-4200C0 [A330] */ + .text415D90_code 0x802A1000 : AT(0x415D90) { + build/src/code_415D90.o(.text); + } + + /* 0x00000000 4200C0-7E0E80 [3C0DC0] */ + .data_4200C0 0x4200C0 : AT(0x4200C0) { + build/bin/4200C0.o(.data); + } + + /* 0x80280000 7E0E80-7E2AA0 [1C20] */ + .text7E0E80_code 0x80280000 : AT(0x7E0E80) { + build/src/code_7e0e80.o(.text); + } + + /* 0x80281C20 7E2AA0-7E3700 [C60] */ + .text7E2AA0_code 0x80281C20 : AT(0x7E2AA0) { + build/src/code_7E2AA0.o(.text); + } + + /* 0x80282880 7E3700-7E4D00 [1600] */ + .text7E3700_code 0x80282880 : AT(0x7E3700) { + build/src/code_7E3700.o(.text); + } + + /* 0x00000000 7E4D00-E20EB0 [63C1B0] */ + .data_7E4D00 0x7E4D00 : AT(0x7E4D00) { + build/bin/7E4D00.o(.data); + } + + /* 0x802B7000 E20EB0-E215C0 [710] */ + .textE20EB0_code 0x802B7000 : AT(0xE20EB0) { + build/src/code_e20eb0.o(.text); + } + + /* 0x00000000 E215C0-F007C0 [DF200] */ + .data_E215C0 0xE215C0 : AT(0xE215C0) { + build/bin/E215C0.o(.data); + } + + /* 0x00000000 F007C0-F02160 [19A0] */ + .data_Battle_Fanfare_02 0xF007C0 : AT(0xF007C0) { + build/bin/Battle_Fanfare_02.o(.data); + } + + /* 0x00000000 F02160-F03740 [15E0] */ + .data_Hey_You_03 0xF02160 : AT(0xF02160) { + build/bin/Hey_You_03.o(.data); + } + + /* 0x00000000 F03740-F043F0 [CB0] */ + .data_The_Goomba_King_s_Decree_07 0xF03740 : AT(0xF03740) { + build/bin/The_Goomba_King_s_Decree_07.o(.data); + } + + /* 0x00000000 F043F0-F073C0 [2FD0] */ + .data_Attack_of_the_Koopa_Bros_08 0xF043F0 : AT(0xF043F0) { + build/bin/Attack_of_the_Koopa_Bros_08.o(.data); + } + + /* 0x00000000 F073C0-F08D40 [1980] */ + .data_Trojan_Bowser_09 0xF073C0 : AT(0xF073C0) { + build/bin/Trojan_Bowser_09.o(.data); + } + + /* 0x00000000 F08D40-F09600 [8C0] */ + .data_Chomp_Attack_0A 0xF08D40 : AT(0xF08D40) { + build/bin/Chomp_Attack_0A.o(.data); + } + + /* 0x00000000 F09600-F0A550 [F50] */ + .data_Ghost_Gulping_0B 0xF09600 : AT(0xF09600) { + build/bin/Ghost_Gulping_0B.o(.data); + } + + /* 0x00000000 F0A550-F0BAE0 [1590] */ + .data_Keeping_Pace_0C 0xF0A550 : AT(0xF0A550) { + build/bin/Keeping_Pace_0C.o(.data); + } + + /* 0x00000000 F0BAE0-F0DEC0 [23E0] */ + .data_Go_Mario_Go_0D 0xF0BAE0 : AT(0xF0BAE0) { + build/bin/Go_Mario_Go_0D.o(.data); + } + + /* 0x00000000 F0DEC0-F0FD20 [1E60] */ + .data_Huffin_and_Puffin_0E 0xF0DEC0 : AT(0xF0DEC0) { + build/bin/Huffin_and_Puffin_0E.o(.data); + } + + /* 0x00000000 F0FD20-F110D0 [13B0] */ + .data_Freeze_0F 0xF0FD20 : AT(0xF0FD20) { + build/bin/Freeze_0F.o(.data); + } + + /* 0x00000000 F110D0-F116C0 [5F0] */ + .data_Winning_a_Battle_8B 0xF110D0 : AT(0xF110D0) { + build/bin/Winning_a_Battle_8B.o(.data); + } + + /* 0x00000000 F116C0-F12320 [C60] */ + .data_Winning_a_Battle_and_Level_Up_8E 0xF116C0 : AT(0xF116C0) { + build/bin/Winning_a_Battle_and_Level_Up_8E.o(.data); + } + + /* 0x00000000 F12320-F13C20 [1900] */ + .data_Jr_Troopa_Battle_04 0xF12320 : AT(0xF12320) { + build/bin/Jr_Troopa_Battle_04.o(.data); + } + + /* 0x00000000 F13C20-F15F40 [2320] */ + .data_Final_Bowser_Battle_interlude_05 0xF13C20 : AT(0xF13C20) { + build/bin/Final_Bowser_Battle_interlude_05.o(.data); + } + + /* 0x00000000 F15F40-F16F80 [1040] */ + .data_Master_Battle_2C 0xF15F40 : AT(0xF15F40) { + build/bin/Master_Battle_2C.o(.data); + } + + /* 0x00000000 F16F80-F171D0 [250] */ + .data_Game_Over_87 0xF16F80 : AT(0xF16F80) { + build/bin/Game_Over_87.o(.data); + } + + /* 0x00000000 F171D0-F17370 [1A0] */ + .data_Resting_at_the_Toad_House_88 0xF171D0 : AT(0xF171D0) { + build/bin/Resting_at_the_Toad_House_88.o(.data); + } + + /* 0x00000000 F17370-F17570 [200] */ + .data_Running_around_the_Heart_Pillar_in_Ch1_84 0xF17370 : AT(0xF17370) { + build/bin/Running_around_the_Heart_Pillar_in_Ch1_84.o(.data); + } + + /* 0x00000000 F17570-F18940 [13D0] */ + .data_Tutankoopa_s_Warning_45 0xF17570 : AT(0xF17570) { + build/bin/Tutankoopa_s_Warning_45.o(.data); + } + + /* 0x00000000 F18940-F193D0 [A90] */ + .data_Kammy_Koopa_s_Theme_46 0xF18940 : AT(0xF18940) { + build/bin/Kammy_Koopa_s_Theme_46.o(.data); + } + + /* 0x00000000 F193D0-F19BC0 [7F0] */ + .data_Jr_Troopa_s_Theme_47 0xF193D0 : AT(0xF193D0) { + build/bin/Jr_Troopa_s_Theme_47.o(.data); + } + + /* 0x00000000 F19BC0-F1A6F0 [B30] */ + .data_Goomba_King_s_Theme_50 0xF19BC0 : AT(0xF19BC0) { + build/bin/Goomba_King_s_Theme_50.o(.data); + } + + /* 0x00000000 F1A6F0-F1ABD0 [4E0] */ + .data_Koopa_Bros_Defeated_51 0xF1A6F0 : AT(0xF1A6F0) { + build/bin/Koopa_Bros_Defeated_51.o(.data); + } + + /* 0x00000000 F1ABD0-F1C810 [1C40] */ + .data_Koopa_Bros_Theme_52 0xF1ABD0 : AT(0xF1ABD0) { + build/bin/Koopa_Bros_Theme_52.o(.data); + } + + /* 0x00000000 F1C810-F1DBF0 [13E0] */ + .data_Tutankoopa_s_Warning_2_53 0xF1C810 : AT(0xF1C810) { + build/bin/Tutankoopa_s_Warning_2_53.o(.data); + } + + /* 0x00000000 F1DBF0-F1F2E0 [16F0] */ + .data_Tutankoopa_s_Theme_54 0xF1DBF0 : AT(0xF1DBF0) { + build/bin/Tutankoopa_s_Theme_54.o(.data); + } + + /* 0x00000000 F1F2E0-F20FF0 [1D10] */ + .data_Tubba_Blubba_s_Theme_55 0xF1F2E0 : AT(0xF1F2E0) { + build/bin/Tubba_Blubba_s_Theme_55.o(.data); + } + + /* 0x00000000 F20FF0-F21780 [790] */ + .data_General_Guy_s_Theme_56 0xF20FF0 : AT(0xF20FF0) { + build/bin/General_Guy_s_Theme_56.o(.data); + } + + /* 0x00000000 F21780-F22A00 [1280] */ + .data_Lava_Piranha_s_Theme_57 0xF21780 : AT(0xF21780) { + build/bin/Lava_Piranha_s_Theme_57.o(.data); + } + + /* 0x00000000 F22A00-F23A00 [1000] */ + .data_Huff_N_Puff_s_Theme_58 0xF22A00 : AT(0xF22A00) { + build/bin/Huff_N_Puff_s_Theme_58.o(.data); + } + + /* 0x00000000 F23A00-F24810 [E10] */ + .data_Crystal_King_s_Theme_59 0xF23A00 : AT(0xF23A00) { + build/bin/Crystal_King_s_Theme_59.o(.data); + } + + /* 0x00000000 F24810-F25240 [A30] */ + .data_Blooper_s_Theme_5A 0xF24810 : AT(0xF24810) { + build/bin/Blooper_s_Theme_5A.o(.data); + } + + /* 0x00000000 F25240-F26260 [1020] */ + .data_Midboss_Theme_5B 0xF25240 : AT(0xF25240) { + build/bin/Midboss_Theme_5B.o(.data); + } + + /* 0x00000000 F26260-F27840 [15E0] */ + .data_Monstar_s_Theme_5C 0xF26260 : AT(0xF26260) { + build/bin/Monstar_s_Theme_5C.o(.data); + } + + /* 0x00000000 F27840-F27E20 [5E0] */ + .data_Moustafa_s_Theme_86 0xF27840 : AT(0xF27840) { + build/bin/Moustafa_s_Theme_86.o(.data); + } + + /* 0x00000000 F27E20-F28E20 [1000] */ + .data_Fuzzy_Searching_Minigame_85 0xF27E20 : AT(0xF27E20) { + build/bin/Fuzzy_Searching_Minigame_85.o(.data); + } + + /* 0x00000000 F28E20-F29AC0 [CA0] */ + .data_Phonograph_in_Mansion_44 0xF28E20 : AT(0xF28E20) { + build/bin/Phonograph_in_Mansion_44.o(.data); + } + + /* 0x00000000 F29AC0-F2E130 [4670] */ + .data_Toad_Town_00 0xF29AC0 : AT(0xF29AC0) { + build/bin/Toad_Town_00.o(.data); + } + + /* 0x00000000 F2E130-F2EF90 [E60] */ + .data_Bill_Blaster_Theme_48 0xF2E130 : AT(0xF2E130) { + build/bin/Bill_Blaster_Theme_48.o(.data); + } + + /* 0x00000000 F2EF90-F30590 [1600] */ + .data_Monty_Mole_Theme_in_Flower_Fields_49 0xF2EF90 : AT(0xF2EF90) { + build/bin/Monty_Mole_Theme_in_Flower_Fields_49.o(.data); + } + + /* 0x00000000 F30590-F318B0 [1320] */ + .data_Shy_Guys_in_Toad_Town_4A 0xF30590 : AT(0xF30590) { + build/bin/Shy_Guys_in_Toad_Town_4A.o(.data); + } + + /* 0x00000000 F318B0-F32220 [970] */ + .data_Whale_s_Problem_4C 0xF318B0 : AT(0xF318B0) { + build/bin/Whale_s_Problem_4C.o(.data); + } + + /* 0x00000000 F32220-F33060 [E40] */ + .data_Toad_Town_Sewers_4B 0xF32220 : AT(0xF32220) { + build/bin/Toad_Town_Sewers_4B.o(.data); + } + + /* 0x00000000 F33060-F33AA0 [A40] */ + .data_Unused_Theme_4D 0xF33060 : AT(0xF33060) { + build/bin/Unused_Theme_4D.o(.data); + } + + /* 0x00000000 F33AA0-F33F10 [470] */ + .data_Mario_s_House_Prologue_3E 0xF33AA0 : AT(0xF33AA0) { + build/bin/Mario_s_House_Prologue_3E.o(.data); + } + + /* 0x00000000 F33F10-F354E0 [15D0] */ + .data_Peach_s_Party_3F 0xF33F10 : AT(0xF33F10) { + build/bin/Peach_s_Party_3F.o(.data); + } + + /* 0x00000000 F354E0-F35ED0 [9F0] */ + .data_Goomba_Village_01 0xF354E0 : AT(0xF354E0) { + build/bin/Goomba_Village_01.o(.data); + } + + /* 0x00000000 F35ED0-F36690 [7C0] */ + .data_Pleasant_Path_11 0xF35ED0 : AT(0xF35ED0) { + build/bin/Pleasant_Path_11.o(.data); + } + + /* 0x00000000 F36690-F379E0 [1350] */ + .data_Fuzzy_s_Took_My_Shell_12 0xF36690 : AT(0xF36690) { + build/bin/Fuzzy_s_Took_My_Shell_12.o(.data); + } + + /* 0x00000000 F379E0-F38570 [B90] */ + .data_Koopa_Village_13 0xF379E0 : AT(0xF379E0) { + build/bin/Koopa_Village_13.o(.data); + } + + /* 0x00000000 F38570-F39160 [BF0] */ + .data_Koopa_Bros_Fortress_14 0xF38570 : AT(0xF38570) { + build/bin/Koopa_Bros_Fortress_14.o(.data); + } + + /* 0x00000000 F39160-F3A0D0 [F70] */ + .data_Dry_Dry_Ruins_18 0xF39160 : AT(0xF39160) { + build/bin/Dry_Dry_Ruins_18.o(.data); + } + + /* 0x00000000 F3A0D0-F3A450 [380] */ + .data_Dry_Dry_Ruins_Mystery_19 0xF3A0D0 : AT(0xF3A0D0) { + build/bin/Dry_Dry_Ruins_Mystery_19.o(.data); + } + + /* 0x00000000 F3A450-F3AF20 [AD0] */ + .data_Mt_Rugged_16 0xF3A450 : AT(0xF3A450) { + build/bin/Mt_Rugged_16.o(.data); + } + + /* 0x00000000 F3AF20-F3C130 [1210] */ + .data_Dry_Dry_Desert_Oasis_17 0xF3AF20 : AT(0xF3AF20) { + build/bin/Dry_Dry_Desert_Oasis_17.o(.data); + } + + /* 0x00000000 F3C130-F3CCC0 [B90] */ + .data_Dry_Dry_Outpost_15 0xF3C130 : AT(0xF3C130) { + build/bin/Dry_Dry_Outpost_15.o(.data); + } + + /* 0x00000000 F3CCC0-F3E130 [1470] */ + .data_Forever_Forest_1A 0xF3CCC0 : AT(0xF3CCC0) { + build/bin/Forever_Forest_1A.o(.data); + } + + /* 0x00000000 F3E130-F3F3E0 [12B0] */ + .data_Boo_s_Mansion_1B 0xF3E130 : AT(0xF3E130) { + build/bin/Boo_s_Mansion_1B.o(.data); + } + + /* 0x00000000 F3F3E0-F40F00 [1B20] */ + .data_Bow_s_Theme_1C 0xF3F3E0 : AT(0xF3F3E0) { + build/bin/Bow_s_Theme_1C.o(.data); + } + + /* 0x00000000 F40F00-F42F30 [2030] */ + .data_Gusty_Gulch_Adventure_1D 0xF40F00 : AT(0xF40F00) { + build/bin/Gusty_Gulch_Adventure_1D.o(.data); + } + + /* 0x00000000 F42F30-F45500 [25D0] */ + .data_Tubba_Blubba_s_Castle_1E 0xF42F30 : AT(0xF42F30) { + build/bin/Tubba_Blubba_s_Castle_1E.o(.data); + } + + /* 0x00000000 F45500-F465E0 [10E0] */ + .data_The_Castle_Crumbles_1F 0xF45500 : AT(0xF45500) { + build/bin/The_Castle_Crumbles_1F.o(.data); + } + + /* 0x00000000 F465E0-F474A0 [EC0] */ + .data_Shy_Guy_s_Toy_Box_20 0xF465E0 : AT(0xF465E0) { + build/bin/Shy_Guy_s_Toy_Box_20.o(.data); + } + + /* 0x00000000 F474A0-F47E10 [970] */ + .data_Toy_Train_Travel_21 0xF474A0 : AT(0xF474A0) { + build/bin/Toy_Train_Travel_21.o(.data); + } + + /* 0x00000000 F47E10-F48410 [600] */ + .data_Big_Lantern_Ghost_s_Theme_22 0xF47E10 : AT(0xF47E10) { + build/bin/Big_Lantern_Ghost_s_Theme_22.o(.data); + } + + /* 0x00000000 F48410-F4A880 [2470] */ + .data_Jade_Jungle_24 0xF48410 : AT(0xF48410) { + build/bin/Jade_Jungle_24.o(.data); + } + + /* 0x00000000 F4A880-F4BC00 [1380] */ + .data_Deep_Jungle_25 0xF4A880 : AT(0xF4A880) { + build/bin/Deep_Jungle_25.o(.data); + } + + /* 0x00000000 F4BC00-F4E690 [2A90] */ + .data_Lavalava_Island_26 0xF4BC00 : AT(0xF4BC00) { + build/bin/Lavalava_Island_26.o(.data); + } + + /* 0x00000000 F4E690-F50A00 [2370] */ + .data_Search_for_the_Fearsome_5_27 0xF4E690 : AT(0xF4E690) { + build/bin/Search_for_the_Fearsome_5_27.o(.data); + } + + /* 0x00000000 F50A00-F52520 [1B20] */ + .data_Raphael_the_Raven_28 0xF50A00 : AT(0xF50A00) { + build/bin/Raphael_the_Raven_28.o(.data); + } + + /* 0x00000000 F52520-F55C80 [3760] */ + .data_Hot_Times_in_Mt_Lavalava_29 0xF52520 : AT(0xF52520) { + build/bin/Hot_Times_in_Mt_Lavalava_29.o(.data); + } + + /* 0x00000000 F55C80-F58ED0 [3250] */ + .data_Escape_from_Mt_Lavalava_2A 0xF55C80 : AT(0xF55C80) { + build/bin/Escape_from_Mt_Lavalava_2A.o(.data); + } + + /* 0x00000000 F58ED0-F592B0 [3E0] */ + .data_Cloudy_Climb_32 0xF58ED0 : AT(0xF58ED0) { + build/bin/Cloudy_Climb_32.o(.data); + } + + /* 0x00000000 F592B0-F5AFF0 [1D40] */ + .data_Puff_Puff_Machine_33 0xF592B0 : AT(0xF592B0) { + build/bin/Puff_Puff_Machine_33.o(.data); + } + + /* 0x00000000 F5AFF0-F5C8D0 [18E0] */ + .data_Flower_Fields_30 0xF5AFF0 : AT(0xF5AFF0) { + build/bin/Flower_Fields_30.o(.data); + } + + /* 0x00000000 F5C8D0-F5DF40 [1670] */ + .data_Flower_Fields_Sunny_31 0xF5C8D0 : AT(0xF5C8D0) { + build/bin/Flower_Fields_Sunny_31.o(.data); + } + + /* 0x00000000 F5DF40-F5F500 [15C0] */ + .data_Sun_s_Tower_34 0xF5DF40 : AT(0xF5DF40) { + build/bin/Sun_s_Tower_34.o(.data); + } + + /* 0x00000000 F5F500-F61700 [2200] */ + .data_Sun_s_Celebration_35 0xF5F500 : AT(0xF5F500) { + build/bin/Sun_s_Celebration_35.o(.data); + } + + /* 0x00000000 F61700-F62E50 [1750] */ + .data_Shiver_City_38 0xF61700 : AT(0xF61700) { + build/bin/Shiver_City_38.o(.data); + } + + /* 0x00000000 F62E50-F64220 [13D0] */ + .data_Detective_Mario_39 0xF62E50 : AT(0xF62E50) { + build/bin/Detective_Mario_39.o(.data); + } + + /* 0x00000000 F64220-F64CB0 [A90] */ + .data_Snow_Road_3A 0xF64220 : AT(0xF64220) { + build/bin/Snow_Road_3A.o(.data); + } + + /* 0x00000000 F64CB0-F65B30 [E80] */ + .data_Over_Shiver_Mountain_3B 0xF64CB0 : AT(0xF64CB0) { + build/bin/Over_Shiver_Mountain_3B.o(.data); + } + + /* 0x00000000 F65B30-F66690 [B60] */ + .data_Starborn_Valley_3C 0xF65B30 : AT(0xF65B30) { + build/bin/Starborn_Valley_3C.o(.data); + } + + /* 0x00000000 F66690-F66B70 [4E0] */ + .data_Sanctuary_3D 0xF66690 : AT(0xF66690) { + build/bin/Sanctuary_3D.o(.data); + } + + /* 0x00000000 F66B70-F67F80 [1410] */ + .data_Crystal_Palace_37 0xF66B70 : AT(0xF66B70) { + build/bin/Crystal_Palace_37.o(.data); + } + + /* 0x00000000 F67F80-F69640 [16C0] */ + .data_Star_Haven_60 0xF67F80 : AT(0xF67F80) { + build/bin/Star_Haven_60.o(.data); + } + + /* 0x00000000 F69640-F6A050 [A10] */ + .data_Shooting_Star_Summit_61 0xF69640 : AT(0xF69640) { + build/bin/Shooting_Star_Summit_61.o(.data); + } + + /* 0x00000000 F6A050-F6C270 [2220] */ + .data_Legendary_Star_Ship_62 0xF6A050 : AT(0xF6A050) { + build/bin/Legendary_Star_Ship_62.o(.data); + } + + /* 0x00000000 F6C270-F6CED0 [C60] */ + .data_Star_Sanctuary_63 0xF6C270 : AT(0xF6C270) { + build/bin/Star_Sanctuary_63.o(.data); + } + + /* 0x00000000 F6CED0-F6EE40 [1F70] */ + .data_Bowser_s_Castle_-_Caves_65 0xF6CED0 : AT(0xF6CED0) { + build/bin/Bowser_s_Castle_-_Caves_65.o(.data); + } + + /* 0x00000000 F6EE40-F73390 [4550] */ + .data_Bowser_s_Castle_64 0xF6EE40 : AT(0xF6EE40) { + build/bin/Bowser_s_Castle_64.o(.data); + } + + /* 0x00000000 F73390-F751F0 [1E60] */ + .data_Star_Elevator_2B 0xF73390 : AT(0xF73390) { + build/bin/Star_Elevator_2B.o(.data); + } + + /* 0x00000000 F751F0-F759C0 [7D0] */ + .data_Goomba_Bros_Defeated_7E 0xF751F0 : AT(0xF751F0) { + build/bin/Goomba_Bros_Defeated_7E.o(.data); + } + + /* 0x00000000 F759C0-F77200 [1840] */ + .data_Farewell_Twink_70 0xF759C0 : AT(0xF759C0) { + build/bin/Farewell_Twink_70.o(.data); + } + + /* 0x00000000 F77200-F77680 [480] */ + .data_Peach_Cooking_71 0xF77200 : AT(0xF77200) { + build/bin/Peach_Cooking_71.o(.data); + } + + /* 0x00000000 F77680-F78600 [F80] */ + .data_Gourmet_Guy_72 0xF77680 : AT(0xF77680) { + build/bin/Gourmet_Guy_72.o(.data); + } + + /* 0x00000000 F78600-F79070 [A70] */ + .data_Hope_on_the_Balcony_Peach_1_73 0xF78600 : AT(0xF78600) { + build/bin/Hope_on_the_Balcony_Peach_1_73.o(.data); + } + + /* 0x00000000 F79070-F7A0C0 [1050] */ + .data_Peach_s_Theme_2_74 0xF79070 : AT(0xF79070) { + build/bin/Peach_s_Theme_2_74.o(.data); + } + + /* 0x00000000 F7A0C0-F7AA40 [980] */ + .data_Peach_Sneaking_75 0xF7A0C0 : AT(0xF7A0C0) { + build/bin/Peach_Sneaking_75.o(.data); + } + + /* 0x00000000 F7AA40-F7AD90 [350] */ + .data_Peach_Captured_76 0xF7AA40 : AT(0xF7AA40) { + build/bin/Peach_Captured_76.o(.data); + } + + /* 0x00000000 F7AD90-F7BEA0 [1110] */ + .data_Quiz_Show_Intro_77 0xF7AD90 : AT(0xF7AD90) { + build/bin/Quiz_Show_Intro_77.o(.data); + } + + /* 0x00000000 F7BEA0-F7C780 [8E0] */ + .data_Unconscious_Mario_78 0xF7BEA0 : AT(0xF7BEA0) { + build/bin/Unconscious_Mario_78.o(.data); + } + + /* 0x00000000 F7C780-F7DC00 [1480] */ + .data_Petunia_s_Theme_89 0xF7C780 : AT(0xF7C780) { + build/bin/Petunia_s_Theme_89.o(.data); + } + + /* 0x00000000 F7DC00-F7E190 [590] */ + .data_Flower_Fields_Door_appears_8A 0xF7DC00 : AT(0xF7DC00) { + build/bin/Flower_Fields_Door_appears_8A.o(.data); + } + + /* 0x00000000 F7E190-F7EE20 [C90] */ + .data_Beanstalk_7B 0xF7E190 : AT(0xF7E190) { + build/bin/Beanstalk_7B.o(.data); + } + + /* 0x00000000 F7EE20-F80230 [1410] */ + .data_Lakilester_s_Theme_7D 0xF7EE20 : AT(0xF7EE20) { + build/bin/Lakilester_s_Theme_7D.o(.data); + } + + /* 0x00000000 F80230-F81260 [1030] */ + .data_The_Sun_s_Back_7F 0xF80230 : AT(0xF80230) { + build/bin/The_Sun_s_Back_7F.o(.data); + } + + /* 0x00000000 F81260-F82460 [1200] */ + .data_Shiver_City_in_Crisis_79 0xF81260 : AT(0xF81260) { + build/bin/Shiver_City_in_Crisis_79.o(.data); + } + + /* 0x00000000 F82460-F82D00 [8A0] */ + .data_Solved_Shiver_City_Mystery_7A 0xF82460 : AT(0xF82460) { + build/bin/Solved_Shiver_City_Mystery_7A.o(.data); + } + + /* 0x00000000 F82D00-F83DC0 [10C0] */ + .data_Merlon_s_Spell_7C 0xF82D00 : AT(0xF82D00) { + build/bin/Merlon_s_Spell_7C.o(.data); + } + + /* 0x00000000 F83DC0-F85590 [17D0] */ + .data_Bowser_s_Theme_66 0xF83DC0 : AT(0xF83DC0) { + build/bin/Bowser_s_Theme_66.o(.data); + } + + /* 0x00000000 F85590-F860E0 [B50] */ + .data_Train_Travel_80 0xF85590 : AT(0xF85590) { + build/bin/Train_Travel_80.o(.data); + } + + /* 0x00000000 F860E0-F87000 [F20] */ + .data_Whale_Trip_81 0xF860E0 : AT(0xF860E0) { + build/bin/Whale_Trip_81.o(.data); + } + + /* 0x00000000 F87000-F87610 [610] */ + .data_Chanterelle_s_Song_8C 0xF87000 : AT(0xF87000) { + build/bin/Chanterelle_s_Song_8C.o(.data); + } + + /* 0x00000000 F87610-F88B30 [1520] */ + .data_Boo_s_Game_8D 0xF87610 : AT(0xF87610) { + build/bin/Boo_s_Game_8D.o(.data); + } + + /* 0x00000000 F88B30-F89570 [A40] */ + .data_Dry_Dry_Ruins_rises_up_83 0xF88B30 : AT(0xF88B30) { + build/bin/Dry_Dry_Ruins_rises_up_83.o(.data); + } + + /* 0x00000000 F89570-F8AAF0 [1580] */ + .data_End_of_Chapter_40 0xF89570 : AT(0xF89570) { + build/bin/End_of_Chapter_40.o(.data); + } + + /* 0x00000000 F8AAF0-F8B820 [D30] */ + .data_Beginning_of_Chapter_41 0xF8AAF0 : AT(0xF8AAF0) { + build/bin/Beginning_of_Chapter_41.o(.data); + } + + /* 0x00000000 F8B820-F8BD90 [570] */ + .data_Hammer_and_Jump_Upgrade_42 0xF8B820 : AT(0xF8B820) { + build/bin/Hammer_and_Jump_Upgrade_42.o(.data); + } + + /* 0x00000000 F8BD90-F8C360 [5D0] */ + .data_Found_Baby_Yoshi_s_4E 0xF8BD90 : AT(0xF8BD90) { + build/bin/Found_Baby_Yoshi_s_4E.o(.data); + } + + /* 0x00000000 F8C360-F8D110 [DB0] */ + .data_New_Partner_JAP_96 0xF8C360 : AT(0xF8C360) { + build/bin/New_Partner_JAP_96.o(.data); + } + + /* 0x00000000 F8D110-F8D3E0 [2D0] */ + .data_Unused_YI_Fanfare_4F 0xF8D110 : AT(0xF8D110) { + build/bin/Unused_YI_Fanfare_4F.o(.data); + } + + /* 0x00000000 F8D3E0-F90880 [34A0] */ + .data_Unused_YI_Fanfare_2_5D 0xF8D3E0 : AT(0xF8D3E0) { + build/bin/Unused_YI_Fanfare_2_5D.o(.data); + } + + /* 0x00000000 F90880-F92A50 [21D0] */ + .data_Peach_s_Castle_inside_Bubble_5E 0xF90880 : AT(0xF90880) { + build/bin/Peach_s_Castle_inside_Bubble_5E.o(.data); + } + + /* 0x00000000 F92A50-F95510 [2AC0] */ + .data_Angry_Bowser_67 0xF92A50 : AT(0xF92A50) { + build/bin/Angry_Bowser_67.o(.data); + } + + /* 0x00000000 F95510-F96280 [D70] */ + .data_Bowser_s_Castle_explodes_5F 0xF95510 : AT(0xF95510) { + build/bin/Bowser_s_Castle_explodes_5F.o(.data); + } + + /* 0x00000000 F96280-F98520 [22A0] */ + .data_Peach_s_Wish_68 0xF96280 : AT(0xF96280) { + build/bin/Peach_s_Wish_68.o(.data); + } + + /* 0x00000000 F98520-F98F90 [A70] */ + .data_File_Select_69 0xF98520 : AT(0xF98520) { + build/bin/File_Select_69.o(.data); + } + + /* 0x00000000 F98F90-F9B830 [28A0] */ + .data_Title_Screen_6A 0xF98F90 : AT(0xF98F90) { + build/bin/Title_Screen_6A.o(.data); + } + + /* 0x00000000 F9B830-F9D3B0 [1B80] */ + .data_Peach_s_Castle_in_Crisis_6B 0xF9B830 : AT(0xF9B830) { + build/bin/Peach_s_Castle_in_Crisis_6B.o(.data); + } + + /* 0x00000000 F9D3B0-F9D690 [2E0] */ + .data_Mario_falls_from_Bowser_s_Castle_6C 0xF9D3B0 : AT(0xF9D3B0) { + build/bin/Mario_falls_from_Bowser_s_Castle_6C.o(.data); + } + + /* 0x00000000 F9D690-F9EF30 [18A0] */ + .data_Peach_s_Arrival_6D 0xF9D690 : AT(0xF9D690) { + build/bin/Peach_s_Arrival_6D.o(.data); + } + + /* 0x00000000 F9EF30-F9FA30 [B00] */ + .data_Star_Rod_Recovered_6F 0xF9EF30 : AT(0xF9EF30) { + build/bin/Star_Rod_Recovered_6F.o(.data); + } + + /* 0x00000000 F9FA30-FA08A0 [E70] */ + .data_Mario_s_House_94 0xF9FA30 : AT(0xF9FA30) { + build/bin/Mario_s_House_94.o(.data); + } + + /* 0x00000000 FA08A0-FA3C60 [33C0] */ + .data_Bowser_s_Attacks_95 0xFA08A0 : AT(0xFA08A0) { + build/bin/Bowser_s_Attacks_95.o(.data); + } + + /* 0x00000000 FA3C60-FA85F0 [4990] */ + .data_End_Parade_1_90 0xFA3C60 : AT(0xFA3C60) { + build/bin/End_Parade_1_90.o(.data); + } + + /* 0x00000000 FA85F0-FABE90 [38A0] */ + .data_End_Parade_2_91 0xFA85F0 : AT(0xFA85F0) { + build/bin/End_Parade_2_91.o(.data); + } + + /* 0x00000000 FABE90-FACC80 [DF0] */ + .data_The_End_6E 0xFABE90 : AT(0xFABE90) { + build/bin/The_End_6E.o(.data); + } + + /* 0x00000000 FACC80-FAD210 [590] */ + .data_Koopa_Radio_Station_2D 0xFACC80 : AT(0xFACC80) { + build/bin/Koopa_Radio_Station_2D.o(.data); + } + + /* 0x00000000 FAD210-FAD8F0 [6E0] */ + .data_The_End_Low_Frequency__2E 0xFAD210 : AT(0xFAD210) { + build/bin/The_End_Low_Frequency__2E.o(.data); + } + + /* 0x00000000 FAD8F0-FADE70 [580] */ + .data_SMW_Remix_2F 0xFAD8F0 : AT(0xFAD8F0) { + build/bin/SMW_Remix_2F.o(.data); + } + + /* 0x00000000 FADE70-FAE860 [9F0] */ + .data_New_Partner_82 0xFADE70 : AT(0xFADE70) { + build/bin/New_Partner_82.o(.data); + } + + /* 0x00000000 FAE860-19E09A8 [A32148] */ + .data_FAE860 0xFAE860 : AT(0xFAE860) { + build/bin/FAE860.o(.data); + } + + /* 0x00000000 19E09A8-19E1390 [9E8] */ + .data_Yay0_19e09a8_len_1206 0x19E09A8 : AT(0x19E09A8) { + build/bin/Yay0_19e09a8_len_1206.o(.data); + } + + /* 0x00000000 19E1390-19E1888 [4F8] */ + .data_Yay0_19e1390_len_806 0x19E1390 : AT(0x19E1390) { + build/bin/Yay0_19e1390_len_806.o(.data); + } + + /* 0x00000000 19E1888-19E2330 [AA8] */ + .data_Yay0_19e1888_len_2324 0x19E1888 : AT(0x19E1888) { + build/bin/Yay0_19e1888_len_2324.o(.data); + } + + /* 0x00000000 19E2330-19E2DE0 [AB0] */ + .data_Yay0_19e2330_len_cc0 0x19E2330 : AT(0x19E2330) { + build/bin/Yay0_19e2330_len_cc0.o(.data); + } + + /* 0x00000000 19E2DE0-19E3208 [428] */ + .data_Yay0_19e2de0_len_1206 0x19E2DE0 : AT(0x19E2DE0) { + build/bin/Yay0_19e2de0_len_1206.o(.data); + } + + /* 0x00000000 19E3208-19E3BA8 [9A0] */ + .data_Yay0_19e3208_len_9a6 0x19E3208 : AT(0x19E3208) { + build/bin/Yay0_19e3208_len_9a6.o(.data); + } + + /* 0x00000000 19E3BA8-19E3FD8 [430] */ + .data_Yay0_19e3ba8_len_456 0x19E3BA8 : AT(0x19E3BA8) { + build/bin/Yay0_19e3ba8_len_456.o(.data); + } + + /* 0x00000000 19E3FD8-19E4828 [850] */ + .data_Yay0_19e3fd8_len_4024 0x19E3FD8 : AT(0x19E3FD8) { + build/bin/Yay0_19e3fd8_len_4024.o(.data); + } + + /* 0x00000000 19E4828-19E4BE0 [3B8] */ + .data_Yay0_19e4828_len_3c0 0x19E4828 : AT(0x19E4828) { + build/bin/Yay0_19e4828_len_3c0.o(.data); + } + + /* 0x00000000 19E4BE0-19E5758 [B78] */ + .data_Yay0_19e4be0_len_1416 0x19E4BE0 : AT(0x19E4BE0) { + build/bin/Yay0_19e4be0_len_1416.o(.data); + } + + /* 0x00000000 19E5758-19E5950 [1F8] */ + .data_Yay0_19e5758_len_802 0x19E5758 : AT(0x19E5758) { + build/bin/Yay0_19e5758_len_802.o(.data); + } + + /* 0x00000000 19E5950-19E62A0 [950] */ + .data_Yay0_19e5950_len_22a0 0x19E5950 : AT(0x19E5950) { + build/bin/Yay0_19e5950_len_22a0.o(.data); + } + + /* 0x00000000 19E62A0-19E67B2 [512] */ + .data_Yay0_19e62a0_len_512 0x19E62A0 : AT(0x19E62A0) { + build/bin/Yay0_19e62a0_len_512.o(.data); + } + + /* 0x00000000 19E67B2-19E6B60 [3AE] */ + .data_19E67B2 0x19E67B2 : AT(0x19E67B2) { + build/bin/19E67B2.o(.data); + } + + /* 0x00000000 19E6B60-19E7528 [9C8] */ + .data_Yay0_19e6b60_len_1406 0x19E6B60 : AT(0x19E6B60) { + build/bin/Yay0_19e6b60_len_1406.o(.data); + } + + /* 0x00000000 19E7528-19E9778 [2250] */ + .data_Yay0_19e7528_len_8256 0x19E7528 : AT(0x19E7528) { + build/bin/Yay0_19e7528_len_8256.o(.data); + } + + /* 0x00000000 19E9778-19EAF38 [17C0] */ + .data_Yay0_19e9778_len_2800 0x19E9778 : AT(0x19E9778) { + build/bin/Yay0_19e9778_len_2800.o(.data); + } + + /* 0x00000000 19EAF38-19EC4E0 [15A8] */ + .data_Yay0_19eaf38_len_40c0 0x19EAF38 : AT(0x19EAF38) { + build/bin/Yay0_19eaf38_len_40c0.o(.data); + } + + /* 0x00000000 19EC4E0-19EDD30 [1850] */ + .data_Yay0_19ec4e0_len_1910 0x19EC4E0 : AT(0x19EC4E0) { + build/bin/Yay0_19ec4e0_len_1910.o(.data); + } + + /* 0x00000000 19EDD30-19EEB18 [DE8] */ + .data_Yay0_19edd30_len_2204 0x19EDD30 : AT(0x19EDD30) { + build/bin/Yay0_19edd30_len_2204.o(.data); + } + + /* 0x00000000 19EEB18-19F0070 [1558] */ + .data_Yay0_19eeb18_len_10062 0x19EEB18 : AT(0x19EEB18) { + build/bin/Yay0_19eeb18_len_10062.o(.data); + } + + /* 0x00000000 19F0070-19F15A0 [1530] */ + .data_Yay0_19f0070_len_158c 0x19F0070 : AT(0x19F0070) { + build/bin/Yay0_19f0070_len_158c.o(.data); + } + + /* 0x00000000 19F15A0-19F26D8 [1138] */ + .data_Yay0_19f15a0_len_2252 0x19F15A0 : AT(0x19F15A0) { + build/bin/Yay0_19f15a0_len_2252.o(.data); + } + + /* 0x00000000 19F26D8-19F5390 [2CB8] */ + .data_Yay0_19f26d8_len_5102 0x19F26D8 : AT(0x19F26D8) { + build/bin/Yay0_19f26d8_len_5102.o(.data); + } + + /* 0x00000000 19F5390-19F7398 [2008] */ + .data_Yay0_19f5390_len_2002 0x19F5390 : AT(0x19F5390) { + build/bin/Yay0_19f5390_len_2002.o(.data); + } + + /* 0x00000000 19F7398-19FA128 [2D90] */ + .data_Yay0_19f7398_len_8024 0x19F7398 : AT(0x19F7398) { + build/bin/Yay0_19f7398_len_8024.o(.data); + } + + /* 0x00000000 19FA128-19FCAE8 [29C0] */ + .data_Yay0_19fa128_len_4ac6 0x19FA128 : AT(0x19FA128) { + build/bin/Yay0_19fa128_len_4ac6.o(.data); + } + + /* 0x00000000 19FCAE8-19FED70 [2288] */ + .data_Yay0_19fcae8_len_2502 0x19FCAE8 : AT(0x19FCAE8) { + build/bin/Yay0_19fcae8_len_2502.o(.data); + } + + /* 0x00000000 19FED70-1A00958 [1BE8] */ + .data_Yay0_19fed70_len_200004 0x19FED70 : AT(0x19FED70) { + build/bin/Yay0_19fed70_len_200004.o(.data); + } + + /* 0x00000000 1A00958-1A02D00 [23A8] */ + .data_Yay0_1a00958_len_24a2 0x1A00958 : AT(0x1A00958) { + build/bin/Yay0_1a00958_len_24a2.o(.data); + } + + /* 0x00000000 1A02D00-1A04400 [1700] */ + .data_Yay0_1a02d00_len_4000 0x1A02D00 : AT(0x1A02D00) { + build/bin/Yay0_1a02d00_len_4000.o(.data); + } + + /* 0x00000000 1A04400-1A05550 [1150] */ + .data_Yay0_1a04400_len_114c 0x1A04400 : AT(0x1A04400) { + build/bin/Yay0_1a04400_len_114c.o(.data); + } + + /* 0x00000000 1A05550-1A06390 [E40] */ + .data_Yay0_1a05550_len_2280 0x1A05550 : AT(0x1A05550) { + build/bin/Yay0_1a05550_len_2280.o(.data); + } + + /* 0x00000000 1A06390-1A06F98 [C08] */ + .data_Yay0_1a06390_len_c04 0x1A06390 : AT(0x1A06390) { + build/bin/Yay0_1a06390_len_c04.o(.data); + } + + /* 0x00000000 1A06F98-1A07B68 [BD0] */ + .data_Yay0_1a06f98_len_1066 0x1A06F98 : AT(0x1A06F98) { + build/bin/Yay0_1a06f98_len_1066.o(.data); + } + + /* 0x00000000 1A07B68-1A0A0A0 [2538] */ + .data_Yay0_1a07b68_len_8092 0x1A07B68 : AT(0x1A07B68) { + build/bin/Yay0_1a07b68_len_8092.o(.data); + } + + /* 0x00000000 1A0A0A0-1A0ACC8 [C28] */ + .data_Yay0_1a0a0a0_len_c46 0x1A0A0A0 : AT(0x1A0A0A0) { + build/bin/Yay0_1a0a0a0_len_c46.o(.data); + } + + /* 0x00000000 1A0ACC8-1A0B780 [AB8] */ + .data_Yay0_1a0acc8_len_1300 0x1A0ACC8 : AT(0x1A0ACC8) { + build/bin/Yay0_1a0acc8_len_1300.o(.data); + } + + /* 0x00000000 1A0B780-1A0BBE0 [460] */ + .data_Yay0_1a0b780_len_85c 0x1A0B780 : AT(0x1A0B780) { + build/bin/Yay0_1a0b780_len_85c.o(.data); + } + + /* 0x00000000 1A0BBE0-1A0C000 [420] */ + .data_Yay0_1a0bbe0_len_4000 0x1A0BBE0 : AT(0x1A0BBE0) { + build/bin/Yay0_1a0bbe0_len_4000.o(.data); + } + + /* 0x00000000 1A0C000-1A0C438 [438] */ + .data_Yay0_1a0c000_len_438 0x1A0C000 : AT(0x1A0C000) { + build/bin/Yay0_1a0c000_len_438.o(.data); + } + + /* 0x00000000 1A0C438-1A0C860 [428] */ + .data_Yay0_1a0c438_len_842 0x1A0C438 : AT(0x1A0C438) { + build/bin/Yay0_1a0c438_len_842.o(.data); + } + + /* 0x00000000 1A0C860-1A0D1E8 [988] */ + .data_Yay0_1a0c860_len_1186 0x1A0C860 : AT(0x1A0C860) { + build/bin/Yay0_1a0c860_len_1186.o(.data); + } + + /* 0x00000000 1A0D1E8-1A0D5B0 [3C8] */ + .data_Yay0_1a0d1e8_len_406 0x1A0D1E8 : AT(0x1A0D1E8) { + build/bin/Yay0_1a0d1e8_len_406.o(.data); + } + + /* 0x00000000 1A0D5B0-1A0D970 [3C0] */ + .data_Yay0_1a0d5b0_len_840 0x1A0D5B0 : AT(0x1A0D5B0) { + build/bin/Yay0_1a0d5b0_len_840.o(.data); + } + + /* 0x00000000 1A0D970-1A0EF00 [1590] */ + .data_Yay0_1a0d970_len_268e 0x1A0D970 : AT(0x1A0D970) { + build/bin/Yay0_1a0d970_len_268e.o(.data); + } + + /* 0x00000000 1A0EF00-1A13920 [4A20] */ + .data_Yay0_1a0ef00_len_11020 0x1A0EF00 : AT(0x1A0EF00) { + build/bin/Yay0_1a0ef00_len_11020.o(.data); + } + + /* 0x00000000 1A13920-1A15850 [1F30] */ + .data_Yay0_1a13920_len_404c 0x1A13920 : AT(0x1A13920) { + build/bin/Yay0_1a13920_len_404c.o(.data); + } + + /* 0x00000000 1A15850-1A183F8 [2BA8] */ + .data_Yay0_1a15850_len_83a4 0x1A15850 : AT(0x1A15850) { + build/bin/Yay0_1a15850_len_83a4.o(.data); + } + + /* 0x00000000 1A183F8-1A1A608 [2210] */ + .data_Yay0_1a183f8_len_2404 0x1A183F8 : AT(0x1A183F8) { + build/bin/Yay0_1a183f8_len_2404.o(.data); + } + + /* 0x00000000 1A1A608-1A1C5E8 [1FE0] */ + .data_Yay0_1a1a608_len_41e2 0x1A1A608 : AT(0x1A1A608) { + build/bin/Yay0_1a1a608_len_41e2.o(.data); + } + + /* 0x00000000 1A1C5E8-1A1D6D0 [10E8] */ + .data_Yay0_1a1c5e8_len_1202 0x1A1C5E8 : AT(0x1A1C5E8) { + build/bin/Yay0_1a1c5e8_len_1202.o(.data); + } + + /* 0x00000000 1A1D6D0-1A1E478 [DA8] */ + .data_Yay0_1a1d6d0_len_2028 0x1A1D6D0 : AT(0x1A1D6D0) { + build/bin/Yay0_1a1d6d0_len_2028.o(.data); + } + + /* 0x00000000 1A1E478-1A1F370 [EF8] */ + .data_Yay0_1a1e478_len_1306 0x1A1E478 : AT(0x1A1E478) { + build/bin/Yay0_1a1e478_len_1306.o(.data); + } + + /* 0x00000000 1A1F370-1A226B0 [3340] */ + .data_Yay0_1a1f370_len_2048c 0x1A1F370 : AT(0x1A1F370) { + build/bin/Yay0_1a1f370_len_2048c.o(.data); + } + + /* 0x00000000 1A226B0-1A249B8 [2308] */ + .data_Yay0_1a226b0_len_4908 0x1A226B0 : AT(0x1A226B0) { + build/bin/Yay0_1a226b0_len_4908.o(.data); + } + + /* 0x00000000 1A249B8-1A25E78 [14C0] */ + .data_Yay0_1a249b8_len_1644 0x1A249B8 : AT(0x1A249B8) { + build/bin/Yay0_1a249b8_len_1644.o(.data); + } + + /* 0x00000000 1A25E78-1A27FF0 [2178] */ + .data_Yay0_1a25e78_len_2186 0x1A25E78 : AT(0x1A25E78) { + build/bin/Yay0_1a25e78_len_2186.o(.data); + } + + /* 0x00000000 1A27FF0-1A28BE0 [BF0] */ + .data_Yay0_1a27ff0_len_800a 0x1A27FF0 : AT(0x1A27FF0) { + build/bin/Yay0_1a27ff0_len_800a.o(.data); + } + + /* 0x00000000 1A28BE0-1A29680 [AA0] */ + .data_Yay0_1a28be0_len_1400 0x1A28BE0 : AT(0x1A28BE0) { + build/bin/Yay0_1a28be0_len_1400.o(.data); + } + + /* 0x00000000 1A29680-1A2BC68 [25E8] */ + .data_Yay0_1a29680_len_2862 0x1A29680 : AT(0x1A29680) { + build/bin/Yay0_1a29680_len_2862.o(.data); + } + + /* 0x00000000 1A2BC68-1A2E120 [24B8] */ + .data_Yay0_1a2bc68_len_4112 0x1A2BC68 : AT(0x1A2BC68) { + build/bin/Yay0_1a2bc68_len_4112.o(.data); + } + + /* 0x00000000 1A2E120-1A2F3F8 [12D8] */ + .data_Yay0_1a2e120_len_12d8 0x1A2E120 : AT(0x1A2E120) { + build/bin/Yay0_1a2e120_len_12d8.o(.data); + } + + /* 0x00000000 1A2F3F8-1A31D18 [2920] */ + .data_Yay0_1a2f3f8_len_10c06 0x1A2F3F8 : AT(0x1A2F3F8) { + build/bin/Yay0_1a2f3f8_len_10c06.o(.data); + } + + /* 0x00000000 1A31D18-1A33AB0 [1D98] */ + .data_Yay0_1a31d18_len_22a6 0x1A31D18 : AT(0x1A31D18) { + build/bin/Yay0_1a31d18_len_22a6.o(.data); + } + + /* 0x00000000 1A33AB0-1A35BB8 [2108] */ + .data_Yay0_1a33ab0_len_4106 0x1A33AB0 : AT(0x1A33AB0) { + build/bin/Yay0_1a33ab0_len_4106.o(.data); + } + + /* 0x00000000 1A35BB8-1A369A8 [DF0] */ + .data_Yay0_1a35bb8_len_2006 0x1A35BB8 : AT(0x1A35BB8) { + build/bin/Yay0_1a35bb8_len_2006.o(.data); + } + + /* 0x00000000 1A369A8-1A39600 [2C58] */ + .data_Yay0_1a369a8_len_9600 0x1A369A8 : AT(0x1A369A8) { + build/bin/Yay0_1a369a8_len_9600.o(.data); + } + + /* 0x00000000 1A39600-1A3B018 [1A18] */ + .data_Yay0_1a39600_len_2014 0x1A39600 : AT(0x1A39600) { + build/bin/Yay0_1a39600_len_2014.o(.data); + } + + /* 0x00000000 1A3B018-1A3C310 [12F8] */ + .data_Yay0_1a3b018_len_4300 0x1A3B018 : AT(0x1A3B018) { + build/bin/Yay0_1a3b018_len_4300.o(.data); + } + + /* 0x00000000 1A3C310-1A3FCC8 [39B8] */ + .data_Yay0_1a3c310_len_3cc2 0x1A3C310 : AT(0x1A3C310) { + build/bin/Yay0_1a3c310_len_3cc2.o(.data); + } + + /* 0x00000000 1A3FCC8-1A423D8 [2710] */ + .data_Yay0_1a3fcc8_len_40314 0x1A3FCC8 : AT(0x1A3FCC8) { + build/bin/Yay0_1a3fcc8_len_40314.o(.data); + } + + /* 0x00000000 1A423D8-1A449C0 [25E8] */ + .data_Yay0_1a423d8_len_4822 0x1A423D8 : AT(0x1A423D8) { + build/bin/Yay0_1a423d8_len_4822.o(.data); + } + + /* 0x00000000 1A449C0-1A46568 [1BA8] */ + .data_Yay0_1a449c0_len_2422 0x1A449C0 : AT(0x1A449C0) { + build/bin/Yay0_1a449c0_len_2422.o(.data); + } + + /* 0x00000000 1A46568-1A49340 [2DD8] */ + .data_Yay0_1a46568_len_9212 0x1A46568 : AT(0x1A46568) { + build/bin/Yay0_1a46568_len_9212.o(.data); + } + + /* 0x00000000 1A49340-1A4AC88 [1948] */ + .data_Yay0_1a49340_len_2c88 0x1A49340 : AT(0x1A49340) { + build/bin/Yay0_1a49340_len_2c88.o(.data); + } + + /* 0x00000000 1A4AC88-1A4D7E8 [2B60] */ + .data_Yay0_1a4ac88_len_5362 0x1A4AC88 : AT(0x1A4AC88) { + build/bin/Yay0_1a4ac88_len_5362.o(.data); + } + + /* 0x00000000 1A4D7E8-1A4E028 [840] */ + .data_Yay0_1a4d7e8_len_2006 0x1A4D7E8 : AT(0x1A4D7E8) { + build/bin/Yay0_1a4d7e8_len_2006.o(.data); + } + + /* 0x00000000 1A4E028-1A4FA60 [1A38] */ + .data_Yay0_1a4e028_len_1a56 0x1A4E028 : AT(0x1A4E028) { + build/bin/Yay0_1a4e028_len_1a56.o(.data); + } + + /* 0x00000000 1A4FA60-1A531D0 [3770] */ + .data_Yay0_1a4fa60_len_10190 0x1A4FA60 : AT(0x1A4FA60) { + build/bin/Yay0_1a4fa60_len_10190.o(.data); + } + + /* 0x00000000 1A531D0-1A53D48 [B78] */ + .data_Yay0_1a531d0_len_c08 0x1A531D0 : AT(0x1A531D0) { + build/bin/Yay0_1a531d0_len_c08.o(.data); + } + + /* 0x00000000 1A53D48-1A56C80 [2F38] */ + .data_Yay0_1a53d48_len_4032 0x1A53D48 : AT(0x1A53D48) { + build/bin/Yay0_1a53d48_len_4032.o(.data); + } + + /* 0x00000000 1A56C80-1A58F58 [22D8] */ + .data_Yay0_1a56c80_len_8358 0x1A56C80 : AT(0x1A56C80) { + build/bin/Yay0_1a56c80_len_8358.o(.data); + } + + /* 0x00000000 1A58F58-1A5A5A8 [1650] */ + .data_Yay0_1a58f58_len_20a4 0x1A58F58 : AT(0x1A58F58) { + build/bin/Yay0_1a58f58_len_20a4.o(.data); + } + + /* 0x00000000 1A5A5A8-1A62B40 [8598] */ + .data_Yay0_1a5a5a8_len_20a14 0x1A5A5A8 : AT(0x1A5A5A8) { + build/bin/Yay0_1a5a5a8_len_20a14.o(.data); + } + + /* 0x00000000 1A62B40-1A641F8 [16B8] */ + .data_Yay0_1a62b40_len_40b6 0x1A62B40 : AT(0x1A62B40) { + build/bin/Yay0_1a62b40_len_40b6.o(.data); + } + + /* 0x00000000 1A641F8-1A666F0 [24F8] */ + .data_Yay0_1a641f8_len_2602 0x1A641F8 : AT(0x1A641F8) { + build/bin/Yay0_1a641f8_len_2602.o(.data); + } + + /* 0x00000000 1A666F0-1A68870 [2180] */ + .data_Yay0_1a666f0_len_8800 0x1A666F0 : AT(0x1A666F0) { + build/bin/Yay0_1a666f0_len_8800.o(.data); + } + + /* 0x00000000 1A68870-1A6C630 [3DC0] */ + .data_Yay0_1a68870_len_460a 0x1A68870 : AT(0x1A68870) { + build/bin/Yay0_1a68870_len_460a.o(.data); + } + + /* 0x00000000 1A6C630-1A6D5A0 [F70] */ + .data_Yay0_1a6c630_len_118c 0x1A6C630 : AT(0x1A6C630) { + build/bin/Yay0_1a6c630_len_118c.o(.data); + } + + /* 0x00000000 1A6D5A0-1A6EF50 [19B0] */ + .data_Yay0_1a6d5a0_len_2a4c 0x1A6D5A0 : AT(0x1A6D5A0) { + build/bin/Yay0_1a6d5a0_len_2a4c.o(.data); + } + + /* 0x00000000 1A6EF50-1A70FF0 [20A0] */ + .data_Yay0_1a6ef50_len_100ae 0x1A6EF50 : AT(0x1A6EF50) { + build/bin/Yay0_1a6ef50_len_100ae.o(.data); + } + + /* 0x00000000 1A70FF0-1A74FC0 [3FD0] */ + .data_Yay0_1a70ff0_len_4000 0x1A70FF0 : AT(0x1A70FF0) { + build/bin/Yay0_1a70ff0_len_4000.o(.data); + } + + /* 0x00000000 1A74FC0-1A78A40 [3A80] */ + .data_Yay0_1a74fc0_len_803a 0x1A74FC0 : AT(0x1A74FC0) { + build/bin/Yay0_1a74fc0_len_803a.o(.data); + } + + /* 0x00000000 1A78A40-1A79900 [EC0] */ + .data_Yay0_1a78a40_len_1100 0x1A78A40 : AT(0x1A78A40) { + build/bin/Yay0_1a78a40_len_1100.o(.data); + } + + /* 0x00000000 1A79900-1A7D798 [3E98] */ + .data_Yay0_1a79900_len_4698 0x1A79900 : AT(0x1A79900) { + build/bin/Yay0_1a79900_len_4698.o(.data); + } + + /* 0x00000000 1A7D798-1A7EEA0 [1708] */ + .data_Yay0_1a7d798_len_2804 0x1A7D798 : AT(0x1A7D798) { + build/bin/Yay0_1a7d798_len_2804.o(.data); + } + + /* 0x00000000 1A7EEA0-1A7EFD8 [138] */ + .data_Yay0_1a7eea0_len_158 0x1A7EEA0 : AT(0x1A7EEA0) { + build/bin/Yay0_1a7eea0_len_158.o(.data); + } + + /* 0x00000000 1A7EFD8-1A83450 [4478] */ + .data_Yay0_1a7efd8_len_81002 0x1A7EFD8 : AT(0x1A7EFD8) { + build/bin/Yay0_1a7efd8_len_81002.o(.data); + } + + /* 0x00000000 1A83450-1A85668 [2218] */ + .data_Yay0_1a83450_len_4226 0x1A83450 : AT(0x1A83450) { + build/bin/Yay0_1a83450_len_4226.o(.data); + } + + /* 0x00000000 1A85668-1A87958 [22F0] */ + .data_Yay0_1a85668_len_2910 0x1A85668 : AT(0x1A85668) { + build/bin/Yay0_1a85668_len_2910.o(.data); + } + + /* 0x00000000 1A87958-1A8BF98 [4640] */ + .data_Yay0_1a87958_len_8680 0x1A87958 : AT(0x1A87958) { + build/bin/Yay0_1a87958_len_8680.o(.data); + } + + /* 0x00000000 1A8BF98-1A8FE28 [3E90] */ + .data_Yay0_1a8bf98_len_4020 0x1A8BF98 : AT(0x1A8BF98) { + build/bin/Yay0_1a8bf98_len_4020.o(.data); + } + + /* 0x00000000 1A8FE28-1A93EA0 [4078] */ + .data_Yay0_1a8fe28_len_10096 0x1A8FE28 : AT(0x1A8FE28) { + build/bin/Yay0_1a8fe28_len_10096.o(.data); + } + + /* 0x00000000 1A93EA0-1A94188 [2E8] */ + .data_Yay0_1a93ea0_len_4102 0x1A93EA0 : AT(0x1A93EA0) { + build/bin/Yay0_1a93ea0_len_4102.o(.data); + } + + /* 0x00000000 1A94188-1A94480 [2F8] */ + .data_Yay0_1a94188_len_476 0x1A94188 : AT(0x1A94188) { + build/bin/Yay0_1a94188_len_476.o(.data); + } + + /* 0x00000000 1A94480-1A946A8 [228] */ + .data_Yay0_1a94480_len_226 0x1A94480 : AT(0x1A94480) { + build/bin/Yay0_1a94480_len_226.o(.data); + } + + /* 0x00000000 1A946A8-1A94A00 [358] */ + .data_Yay0_1a946a8_len_956 0x1A946A8 : AT(0x1A946A8) { + build/bin/Yay0_1a946a8_len_956.o(.data); + } + + /* 0x00000000 1A94A00-1A94C58 [258] */ + .data_Yay0_1a94a00_len_456 0x1A94A00 : AT(0x1A94A00) { + build/bin/Yay0_1a94a00_len_456.o(.data); + } + + /* 0x00000000 1A94C58-1A98D98 [4140] */ + .data_Yay0_1a94c58_len_8184 0x1A94C58 : AT(0x1A94C58) { + build/bin/Yay0_1a94c58_len_8184.o(.data); + } + + /* 0x00000000 1A98D98-1A9BA80 [2CE8] */ + .data_Yay0_1a98d98_len_3264 0x1A98D98 : AT(0x1A98D98) { + build/bin/Yay0_1a98d98_len_3264.o(.data); + } + + /* 0x00000000 1A9BA80-1A9DB68 [20E8] */ + .data_Yay0_1a9ba80_len_4168 0x1A9BA80 : AT(0x1A9BA80) { + build/bin/Yay0_1a9ba80_len_4168.o(.data); + } + + /* 0x00000000 1A9DB68-1AA0048 [24E0] */ + .data_Yay0_1a9db68_len_20004 0x1A9DB68 : AT(0x1A9DB68) { + build/bin/Yay0_1a9db68_len_20004.o(.data); + } + + /* 0x00000000 1AA0048-1AA0698 [650] */ + .data_Yay0_1aa0048_len_692 0x1AA0048 : AT(0x1AA0048) { + build/bin/Yay0_1aa0048_len_692.o(.data); + } + + /* 0x00000000 1AA0698-1AA1008 [970] */ + .data_Yay0_1aa0698_len_1000 0x1AA0698 : AT(0x1AA0698) { + build/bin/Yay0_1aa0698_len_1000.o(.data); + } + + /* 0x00000000 1AA1008-1AA6D58 [5D50] */ + .data_Yay0_1aa1008_len_6d54 0x1AA1008 : AT(0x1AA1008) { + build/bin/Yay0_1aa1008_len_6d54.o(.data); + } + + /* 0x00000000 1AA6D58-1AAD600 [68A8] */ + .data_Yay0_1aa6d58_len_90a4 0x1AA6D58 : AT(0x1AA6D58) { + build/bin/Yay0_1aa6d58_len_90a4.o(.data); + } + + /* 0x00000000 1AAD600-1AB1BF0 [45F0] */ + .data_Yay0_1aad600_len_109f0 0x1AAD600 : AT(0x1AAD600) { + build/bin/Yay0_1aad600_len_109f0.o(.data); + } + + /* 0x00000000 1AB1BF0-1AB2368 [778] */ + .data_Yay0_1ab1bf0_len_2004 0x1AB1BF0 : AT(0x1AB1BF0) { + build/bin/Yay0_1ab1bf0_len_2004.o(.data); + } + + /* 0x00000000 1AB2368-1ABA290 [7F28] */ + .data_Yay0_1ab2368_len_8086 0x1AB2368 : AT(0x1AB2368) { + build/bin/Yay0_1ab2368_len_8086.o(.data); + } + + /* 0x00000000 1ABA290-1AC14A8 [7218] */ + .data_Yay0_1aba290_len_41422 0x1ABA290 : AT(0x1ABA290) { + build/bin/Yay0_1aba290_len_41422.o(.data); + } + + /* 0x00000000 1AC14A8-1AC3910 [2468] */ + .data_Yay0_1ac14a8_len_2902 0x1AC14A8 : AT(0x1AC14A8) { + build/bin/Yay0_1ac14a8_len_2902.o(.data); + } + + /* 0x00000000 1AC3910-1ACBC98 [8388] */ + .data_Yay0_1ac3910_len_8488 0x1AC3910 : AT(0x1AC3910) { + build/bin/Yay0_1ac3910_len_8488.o(.data); + } + + /* 0x00000000 1ACBC98-1ACE058 [23C0] */ + .data_Yay0_1acbc98_len_4042 0x1ACBC98 : AT(0x1ACBC98) { + build/bin/Yay0_1acbc98_len_4042.o(.data); + } + + /* 0x00000000 1ACE058-1ACF910 [18B8] */ + .data_Yay0_1ace058_len_1902 0x1ACE058 : AT(0x1ACE058) { + build/bin/Yay0_1ace058_len_1902.o(.data); + } + + /* 0x00000000 1ACF910-1AD06D8 [DC8] */ + .data_Yay0_1acf910_len_106c8 0x1ACF910 : AT(0x1ACF910) { + build/bin/Yay0_1acf910_len_106c8.o(.data); + } + + /* 0x00000000 1AD06D8-1AD0B98 [4C0] */ + .data_Yay0_1ad06d8_len_904 0x1AD06D8 : AT(0x1AD06D8) { + build/bin/Yay0_1ad06d8_len_904.o(.data); + } + + /* 0x00000000 1AD0B98-1AD1E90 [12F8] */ + .data_Yay0_1ad0b98_len_1400 0x1AD0B98 : AT(0x1AD0B98) { + build/bin/Yay0_1ad0b98_len_1400.o(.data); + } + + /* 0x00000000 1AD1E90-1AD2348 [4B8] */ + .data_Yay0_1ad1e90_len_2146 0x1AD1E90 : AT(0x1AD1E90) { + build/bin/Yay0_1ad1e90_len_2146.o(.data); + } + + /* 0x00000000 1AD2348-1AD27F8 [4B0] */ + .data_Yay0_1ad2348_len_4b2 0x1AD2348 : AT(0x1AD2348) { + build/bin/Yay0_1ad2348_len_4b2.o(.data); + } + + /* 0x00000000 1AD27F8-1AD28A8 [B0] */ + .data_Yay0_1ad27f8_len_800 0x1AD27F8 : AT(0x1AD27F8) { + build/bin/Yay0_1ad27f8_len_800.o(.data); + } + + /* 0x00000000 1AD28A8-1AD44F0 [1C48] */ + .data_Yay0_1ad28a8_len_4446 0x1AD28A8 : AT(0x1AD28A8) { + build/bin/Yay0_1ad28a8_len_4446.o(.data); + } + + /* 0x00000000 1AD44F0-1AD4758 [268] */ + .data_Yay0_1ad44f0_len_304 0x1AD44F0 : AT(0x1AD44F0) { + build/bin/Yay0_1ad44f0_len_304.o(.data); + } + + /* 0x00000000 1AD4758-1AD57C0 [1068] */ + .data_Yay0_1ad4758_len_1080 0x1AD4758 : AT(0x1AD4758) { + build/bin/Yay0_1ad4758_len_1080.o(.data); + } + + /* 0x00000000 1AD57C0-1AD9D50 [4590] */ + .data_Yay0_1ad57c0_len_880c 0x1AD57C0 : AT(0x1AD57C0) { + build/bin/Yay0_1ad57c0_len_880c.o(.data); + } + + /* 0x00000000 1AD9D50-1ADA498 [748] */ + .data_Yay0_1ad9d50_len_2082 0x1AD9D50 : AT(0x1AD9D50) { + build/bin/Yay0_1ad9d50_len_2082.o(.data); + } + + /* 0x00000000 1ADA498-1ADCFC0 [2B28] */ + .data_Yay0_1ada498_len_4b26 0x1ADA498 : AT(0x1ADA498) { + build/bin/Yay0_1ada498_len_4b26.o(.data); + } + + /* 0x00000000 1ADCFC0-1AE2168 [51A8] */ + .data_Yay0_1adcfc0_len_22024 0x1ADCFC0 : AT(0x1ADCFC0) { + build/bin/Yay0_1adcfc0_len_22024.o(.data); + } + + /* 0x00000000 1AE2168-1AE2EA0 [D38] */ + .data_Yay0_1ae2168_len_e96 0x1AE2168 : AT(0x1AE2168) { + build/bin/Yay0_1ae2168_len_e96.o(.data); + } + + /* 0x00000000 1AE2EA0-1AE6A58 [3BB8] */ + .data_Yay0_1ae2ea0_len_4058 0x1AE2EA0 : AT(0x1AE2EA0) { + build/bin/Yay0_1ae2ea0_len_4058.o(.data); + } + + /* 0x00000000 1AE6A58-1AEB778 [4D20] */ + .data_Yay0_1ae6a58_len_9524 0x1AE6A58 : AT(0x1AE6A58) { + build/bin/Yay0_1ae6a58_len_9524.o(.data); + } + + /* 0x00000000 1AEB778-1AF4958 [91E0] */ + .data_Yay0_1aeb778_len_14802 0x1AEB778 : AT(0x1AEB778) { + build/bin/Yay0_1aeb778_len_14802.o(.data); + } + + /* 0x00000000 1AF4958-1AFCB18 [81C0] */ + .data_Yay0_1af4958_len_8202 0x1AF4958 : AT(0x1AF4958) { + build/bin/Yay0_1af4958_len_8202.o(.data); + } + + /* 0x00000000 1AFCB18-1AFF748 [2C30] */ + .data_Yay0_1afcb18_len_3442 0x1AFCB18 : AT(0x1AFCB18) { + build/bin/Yay0_1afcb18_len_3442.o(.data); + } + + /* 0x00000000 1AFF748-1B00640 [EF8] */ + .data_Yay0_1aff748_len_100000 0x1AFF748 : AT(0x1AFF748) { + build/bin/Yay0_1aff748_len_100000.o(.data); + } + + /* 0x00000000 1B00640-1B01390 [D50] */ + .data_Yay0_1b00640_len_118a 0x1B00640 : AT(0x1B00640) { + build/bin/Yay0_1b00640_len_118a.o(.data); + } + + /* 0x00000000 1B01390-1B01C08 [878] */ + .data_Yay0_1b01390_len_c04 0x1B01390 : AT(0x1B01390) { + build/bin/Yay0_1b01390_len_c04.o(.data); + } + + /* 0x00000000 1B01C08-1B02128 [520] */ + .data_Yay0_1b01c08_len_2120 0x1B01C08 : AT(0x1B01C08) { + build/bin/Yay0_1b01c08_len_2120.o(.data); + } + + /* 0x00000000 1B02128-1B02970 [848] */ + .data_Yay0_1b02128_len_844 0x1B02128 : AT(0x1B02128) { + build/bin/Yay0_1b02128_len_844.o(.data); + } + + /* 0x00000000 1B02970-1B03118 [7A8] */ + .data_Yay0_1b02970_len_1004 0x1B02970 : AT(0x1B02970) { + build/bin/Yay0_1b02970_len_1004.o(.data); + } + + /* 0x00000000 1B03118-1B03C18 [B00] */ + .data_Yay0_1b03118_len_c04 0x1B03118 : AT(0x1B03118) { + build/bin/Yay0_1b03118_len_c04.o(.data); + } + + /* 0x00000000 1B03C18-1B045E8 [9D0] */ + .data_Yay0_1b03c18_len_41e2 0x1B03C18 : AT(0x1B03C18) { + build/bin/Yay0_1b03c18_len_41e2.o(.data); + } + + /* 0x00000000 1B045E8-1B04FC0 [9D8] */ + .data_Yay0_1b045e8_len_a12 0x1B045E8 : AT(0x1B045E8) { + build/bin/Yay0_1b045e8_len_a12.o(.data); + } + + /* 0x00000000 1B04FC0-1B05998 [9D8] */ + .data_Yay0_1b04fc0_len_1012 0x1B04FC0 : AT(0x1B04FC0) { + build/bin/Yay0_1b04fc0_len_1012.o(.data); + } + + /* 0x00000000 1B05998-1B06C88 [12F0] */ + .data_Yay0_1b05998_len_2400 0x1B05998 : AT(0x1B05998) { + build/bin/Yay0_1b05998_len_2400.o(.data); + } + + /* 0x00000000 1B06C88-1B07C48 [FC0] */ + .data_Yay0_1b06c88_len_1046 0x1B06C88 : AT(0x1B06C88) { + build/bin/Yay0_1b06c88_len_1046.o(.data); + } + + /* 0x00000000 1B07C48-1B09440 [17F8] */ + .data_Yay0_1b07c48_len_8034 0x1B07C48 : AT(0x1B07C48) { + build/bin/Yay0_1b07c48_len_8034.o(.data); + } + + /* 0x00000000 1B09440-1B0B290 [1E50] */ + .data_Yay0_1b09440_len_228e 0x1B09440 : AT(0x1B09440) { + build/bin/Yay0_1b09440_len_228e.o(.data); + } + + /* 0x00000000 1B0B290-1B0B9A0 [710] */ + .data_Yay0_1b0b290_len_90c 0x1B0B290 : AT(0x1B0B290) { + build/bin/Yay0_1b0b290_len_90c.o(.data); + } + + /* 0x00000000 1B0B9A0-1B0C548 [BA8] */ + .data_Yay0_1b0b9a0_len_4448 0x1B0B9A0 : AT(0x1B0B9A0) { + build/bin/Yay0_1b0b9a0_len_4448.o(.data); + } + + /* 0x00000000 1B0C548-1B0CAC0 [578] */ + .data_Yay0_1b0c548_len_ab4 0x1B0C548 : AT(0x1B0C548) { + build/bin/Yay0_1b0c548_len_ab4.o(.data); + } + + /* 0x00000000 1B0CAC0-1B0D130 [670] */ + .data_Yay0_1b0cac0_len_1130 0x1B0CAC0 : AT(0x1B0CAC0) { + build/bin/Yay0_1b0cac0_len_1130.o(.data); + } + + /* 0x00000000 1B0D130-1B0EB80 [1A50] */ + .data_Yay0_1b0d130_len_2a4c 0x1B0D130 : AT(0x1B0D130) { + build/bin/Yay0_1b0d130_len_2a4c.o(.data); + } + + /* 0x00000000 1B0EB80-1B10CC0 [2140] */ + .data_Yay0_1b0eb80_len_1043e 0x1B0EB80 : AT(0x1B0EB80) { + build/bin/Yay0_1b0eb80_len_1043e.o(.data); + } + + /* 0x00000000 1B10CC0-1B129A0 [1CE0] */ + .data_Yay0_1b10cc0_len_2120 0x1B10CC0 : AT(0x1B10CC0) { + build/bin/Yay0_1b10cc0_len_2120.o(.data); + } + + /* 0x00000000 1B129A0-1B13548 [BA8] */ + .data_Yay0_1b129a0_len_1444 0x1B129A0 : AT(0x1B129A0) { + build/bin/Yay0_1b129a0_len_1444.o(.data); + } + + /* 0x00000000 1B13548-1B16420 [2ED8] */ + .data_Yay0_1b13548_len_4016 0x1B13548 : AT(0x1B13548) { + build/bin/Yay0_1b13548_len_4016.o(.data); + } + + /* 0x00000000 1B16420-1B17128 [D08] */ + .data_Yay0_1b16420_len_1104 0x1B16420 : AT(0x1B16420) { + build/bin/Yay0_1b16420_len_1104.o(.data); + } + + /* 0x00000000 1B17128-1B17840 [718] */ + .data_Yay0_1b17128_len_814 0x1B17128 : AT(0x1B17128) { + build/bin/Yay0_1b17128_len_814.o(.data); + } + + /* 0x00000000 1B17840-1B19318 [1AD8] */ + .data_Yay0_1b17840_len_8316 0x1B17840 : AT(0x1B17840) { + build/bin/Yay0_1b17840_len_8316.o(.data); + } + + /* 0x00000000 1B19318-1B1A030 [D18] */ + .data_Yay0_1b19318_len_2020 0x1B19318 : AT(0x1B19318) { + build/bin/Yay0_1b19318_len_2020.o(.data); + } + + /* 0x00000000 1B1A030-1B1B8C8 [1898] */ + .data_Yay0_1b1a030_len_18c6 0x1B1A030 : AT(0x1B1A030) { + build/bin/Yay0_1b1a030_len_18c6.o(.data); + } + + /* 0x00000000 1B1B8C8-1B1BC88 [3C0] */ + .data_Yay0_1b1b8c8_len_402 0x1B1B8C8 : AT(0x1B1B8C8) { + build/bin/Yay0_1b1b8c8_len_402.o(.data); + } + + /* 0x00000000 1B1BC88-1B1C7A0 [B18] */ + .data_Yay0_1b1bc88_len_4316 0x1B1BC88 : AT(0x1B1BC88) { + build/bin/Yay0_1b1bc88_len_4316.o(.data); + } + + /* 0x00000000 1B1C7A0-1B1CD28 [588] */ + .data_Yay0_1b1c7a0_len_808 0x1B1C7A0 : AT(0x1B1C7A0) { + build/bin/Yay0_1b1c7a0_len_808.o(.data); + } + + /* 0x00000000 1B1CD28-1B21C48 [4F20] */ + .data_Yay0_1b1cd28_len_21040 0x1B1CD28 : AT(0x1B1CD28) { + build/bin/Yay0_1b1cd28_len_21040.o(.data); + } + + /* 0x00000000 1B21C48-1B23290 [1648] */ + .data_Yay0_1b21c48_len_2290 0x1B21C48 : AT(0x1B21C48) { + build/bin/Yay0_1b21c48_len_2290.o(.data); + } + + /* 0x00000000 1B23290-1B253E0 [2150] */ + .data_Yay0_1b23290_len_414c 0x1B23290 : AT(0x1B23290) { + build/bin/Yay0_1b23290_len_414c.o(.data); + } + + /* 0x00000000 1B253E0-1B26660 [1280] */ + .data_Yay0_1b253e0_len_241c 0x1B253E0 : AT(0x1B253E0) { + build/bin/Yay0_1b253e0_len_241c.o(.data); + } + + /* 0x00000000 1B26660-1B283F8 [1D98] */ + .data_Yay0_1b26660_len_8192 0x1B26660 : AT(0x1B26660) { + build/bin/Yay0_1b26660_len_8192.o(.data); + } + + /* 0x00000000 1B283F8-1B29C60 [1868] */ + .data_Yay0_1b283f8_len_1c02 0x1B283F8 : AT(0x1B283F8) { + build/bin/Yay0_1b283f8_len_1c02.o(.data); + } + + /* 0x00000000 1B29C60-1B2A688 [A28] */ + .data_Yay0_1b29c60_len_2284 0x1B29C60 : AT(0x1B29C60) { + build/bin/Yay0_1b29c60_len_2284.o(.data); + } + + /* 0x00000000 1B2A688-1B2B3E8 [D60] */ + .data_Yay0_1b2a688_len_1166 0x1B2A688 : AT(0x1B2A688) { + build/bin/Yay0_1b2a688_len_1166.o(.data); + } + + /* 0x00000000 1B2B3E8-1B2C8D8 [14F0] */ + .data_Yay0_1b2b3e8_len_4810 0x1B2B3E8 : AT(0x1B2B3E8) { + build/bin/Yay0_1b2b3e8_len_4810.o(.data); + } + + /* 0x00000000 1B2C8D8-1B2D7B0 [ED8] */ + .data_Yay0_1b2c8d8_len_1722 0x1B2C8D8 : AT(0x1B2C8D8) { + build/bin/Yay0_1b2c8d8_len_1722.o(.data); + } + + /* 0x00000000 1B2D7B0-1B2E328 [B78] */ + .data_Yay0_1b2d7b0_len_2006 0x1B2D7B0 : AT(0x1B2D7B0) { + build/bin/Yay0_1b2d7b0_len_2006.o(.data); + } + + /* 0x00000000 1B2E328-1B2ED60 [A38] */ + .data_Yay0_1b2e328_len_c52 0x1B2E328 : AT(0x1B2E328) { + build/bin/Yay0_1b2e328_len_c52.o(.data); + } + + /* 0x00000000 1B2ED60-1B2FA18 [CB8] */ + .data_Yay0_1b2ed60_len_1218 0x1B2ED60 : AT(0x1B2ED60) { + build/bin/Yay0_1b2ed60_len_1218.o(.data); + } + + /* 0x00000000 1B2FA18-1B31A18 [2000] */ + .data_Yay0_1b2fa18_len_10002 0x1B2FA18 : AT(0x1B2FA18) { + build/bin/Yay0_1b2fa18_len_10002.o(.data); + } + + /* 0x00000000 1B31A18-1B33000 [15E8] */ + .data_Yay0_1b31a18_len_25e2 0x1B31A18 : AT(0x1B31A18) { + build/bin/Yay0_1b31a18_len_25e2.o(.data); + } + + /* 0x00000000 1B33000-1B34098 [1098] */ + .data_Yay0_1b33000_len_4096 0x1B33000 : AT(0x1B33000) { + build/bin/Yay0_1b33000_len_4096.o(.data); + } + + /* 0x00000000 1B34098-1B34928 [890] */ + .data_Yay0_1b34098_len_920 0x1B34098 : AT(0x1B34098) { + build/bin/Yay0_1b34098_len_920.o(.data); + } + + /* 0x00000000 1B34928-1B34C00 [2D8] */ + .data_Yay0_1b34928_len_2d4 0x1B34928 : AT(0x1B34928) { + build/bin/Yay0_1b34928_len_2d4.o(.data); + } + + /* 0x00000000 1B34C00-1B35480 [880] */ + .data_Yay0_1b34c00_len_107e 0x1B34C00 : AT(0x1B34C00) { + build/bin/Yay0_1b34c00_len_107e.o(.data); + } + + /* 0x00000000 1B35480-1B36440 [FC0] */ + .data_Yay0_1b35480_len_2040 0x1B35480 : AT(0x1B35480) { + build/bin/Yay0_1b35480_len_2040.o(.data); + } + + /* 0x00000000 1B36440-1B38748 [2308] */ + .data_Yay0_1b36440_len_8306 0x1B36440 : AT(0x1B36440) { + build/bin/Yay0_1b36440_len_8306.o(.data); + } + + /* 0x00000000 1B38748-1B39A98 [1350] */ + .data_Yay0_1b38748_len_1894 0x1B38748 : AT(0x1B38748) { + build/bin/Yay0_1b38748_len_1894.o(.data); + } + + /* 0x00000000 1B39A98-1B3A2E8 [850] */ + .data_Yay0_1b39a98_len_2062 0x1B39A98 : AT(0x1B39A98) { + build/bin/Yay0_1b39a98_len_2062.o(.data); + } + + /* 0x00000000 1B3A2E8-1B3A818 [530] */ + .data_Yay0_1b3a2e8_len_816 0x1B3A2E8 : AT(0x1B3A2E8) { + build/bin/Yay0_1b3a2e8_len_816.o(.data); + } + + /* 0x00000000 1B3A818-1B3C488 [1C70] */ + .data_Yay0_1b3a818_len_4482 0x1B3A818 : AT(0x1B3A818) { + build/bin/Yay0_1b3a818_len_4482.o(.data); + } + + /* 0x00000000 1B3C488-1B3CAC8 [640] */ + .data_Yay0_1b3c488_len_a44 0x1B3C488 : AT(0x1B3C488) { + build/bin/Yay0_1b3c488_len_a44.o(.data); + } + + /* 0x00000000 1B3CAC8-1B3D0A0 [5D8] */ + .data_Yay0_1b3cac8_len_1012 0x1B3CAC8 : AT(0x1B3CAC8) { + build/bin/Yay0_1b3cac8_len_1012.o(.data); + } + + /* 0x00000000 1B3D0A0-1B3D920 [880] */ + .data_Yay0_1b3d0a0_len_91a 0x1B3D0A0 : AT(0x1B3D0A0) { + build/bin/Yay0_1b3d0a0_len_91a.o(.data); + } + + /* 0x00000000 1B3D920-1B3F060 [1740] */ + .data_Yay0_1b3d920_len_205c 0x1B3D920 : AT(0x1B3D920) { + build/bin/Yay0_1b3d920_len_205c.o(.data); + } + + /* 0x00000000 1B3F060-1B40048 [FE8] */ + .data_Yay0_1b3f060_len_40008 0x1B3F060 : AT(0x1B3F060) { + build/bin/Yay0_1b3f060_len_40008.o(.data); + } + + /* 0x00000000 1B40048-1B40720 [6D8] */ + .data_Yay0_1b40048_len_714 0x1B40048 : AT(0x1B40048) { + build/bin/Yay0_1b40048_len_714.o(.data); + } + + /* 0x00000000 1B40720-1B49570 [8E50] */ + .data_Yay0_1b40720_len_904e 0x1B40720 : AT(0x1B40720) { + build/bin/Yay0_1b40720_len_904e.o(.data); + } + + /* 0x00000000 1B49570-1B4C3E8 [2E78] */ + .data_Yay0_1b49570_len_4288 0x1B49570 : AT(0x1B49570) { + build/bin/Yay0_1b49570_len_4288.o(.data); + } + + /* 0x00000000 1B4C3E8-1B4DEA0 [1AB8] */ + .data_Yay0_1b4c3e8_len_1c12 0x1B4C3E8 : AT(0x1B4C3E8) { + build/bin/Yay0_1b4c3e8_len_1c12.o(.data); + } + + /* 0x00000000 1B4DEA0-1B4FD98 [1EF8] */ + .data_Yay0_1b4dea0_len_2116 0x1B4DEA0 : AT(0x1B4DEA0) { + build/bin/Yay0_1b4dea0_len_2116.o(.data); + } + + /* 0x00000000 1B4FD98-1B50CD8 [F40] */ + .data_Yay0_1b4fd98_len_10040 0x1B4FD98 : AT(0x1B4FD98) { + build/bin/Yay0_1b4fd98_len_10040.o(.data); + } + + /* 0x00000000 1B50CD8-1B51B08 [E30] */ + .data_Yay0_1b50cd8_len_1302 0x1B50CD8 : AT(0x1B50CD8) { + build/bin/Yay0_1b50cd8_len_1302.o(.data); + } + + /* 0x00000000 1B51B08-1B54258 [2750] */ + .data_Yay0_1b51b08_len_4052 0x1B51B08 : AT(0x1B51B08) { + build/bin/Yay0_1b51b08_len_4052.o(.data); + } + + /* 0x00000000 1B54258-1B580A0 [3E48] */ + .data_Yay0_1b54258_len_8082 0x1B54258 : AT(0x1B54258) { + build/bin/Yay0_1b54258_len_8082.o(.data); + } + + /* 0x00000000 1B580A0-1B5A248 [21A8] */ + .data_Yay0_1b580a0_len_2242 0x1B580A0 : AT(0x1B580A0) { + build/bin/Yay0_1b580a0_len_2242.o(.data); + } + + /* 0x00000000 1B5A248-1B5BB88 [1940] */ + .data_Yay0_1b5a248_len_1980 0x1B5A248 : AT(0x1B5A248) { + build/bin/Yay0_1b5a248_len_1980.o(.data); + } + + /* 0x00000000 1B5BB88-1B5CC90 [1108] */ + .data_Yay0_1b5bb88_len_4406 0x1B5BB88 : AT(0x1B5BB88) { + build/bin/Yay0_1b5bb88_len_4406.o(.data); + } + + /* 0x00000000 1B5CC90-1B5E968 [1CD8] */ + .data_Yay0_1b5cc90_len_2168 0x1B5CC90 : AT(0x1B5CC90) { + build/bin/Yay0_1b5cc90_len_2168.o(.data); + } + + /* 0x00000000 1B5E968-1B5ED88 [420] */ + .data_Yay0_1b5e968_len_482 0x1B5E968 : AT(0x1B5E968) { + build/bin/Yay0_1b5e968_len_482.o(.data); + } + + /* 0x00000000 1B5ED88-1B608C0 [1B38] */ + .data_Yay0_1b5ed88_len_20040 0x1B5ED88 : AT(0x1B5ED88) { + build/bin/Yay0_1b5ed88_len_20040.o(.data); + } + + /* 0x00000000 1B608C0-1B625F8 [1D38] */ + .data_Yay0_1b608c0_len_2534 0x1B608C0 : AT(0x1B608C0) { + build/bin/Yay0_1b608c0_len_2534.o(.data); + } + + /* 0x00000000 1B625F8-1B633D0 [DD8] */ + .data_Yay0_1b625f8_len_1202 0x1B625F8 : AT(0x1B625F8) { + build/bin/Yay0_1b625f8_len_1202.o(.data); + } + + /* 0x00000000 1B633D0-1B64878 [14A8] */ + .data_Yay0_1b633d0_len_4824 0x1B633D0 : AT(0x1B633D0) { + build/bin/Yay0_1b633d0_len_4824.o(.data); + } + + /* 0x00000000 1B64878-1B657E0 [F68] */ + .data_Yay0_1b64878_len_1786 0x1B64878 : AT(0x1B64878) { + build/bin/Yay0_1b64878_len_1786.o(.data); + } + + /* 0x00000000 1B657E0-1B65A08 [228] */ + .data_Yay0_1b657e0_len_808 0x1B657E0 : AT(0x1B657E0) { + build/bin/Yay0_1b657e0_len_808.o(.data); + } + + /* 0x00000000 1B65A08-1B65E50 [448] */ + .data_Yay0_1b65a08_len_444 0x1B65A08 : AT(0x1B65A08) { + build/bin/Yay0_1b65a08_len_444.o(.data); + } + + /* 0x00000000 1B65E50-1B66238 [3E8] */ + .data_Yay0_1b65e50_len_2024 0x1B65E50 : AT(0x1B65E50) { + build/bin/Yay0_1b65e50_len_2024.o(.data); + } + + /* 0x00000000 1B66238-1B69580 [3348] */ + .data_Yay0_1b66238_len_9542 0x1B66238 : AT(0x1B66238) { + build/bin/Yay0_1b66238_len_9542.o(.data); + } + + /* 0x00000000 1B69580-1B6C318 [2D98] */ + .data_Yay0_1b69580_len_4218 0x1B69580 : AT(0x1B69580) { + build/bin/Yay0_1b69580_len_4218.o(.data); + } + + /* 0x00000000 1B6C318-1B6DD98 [1A80] */ + .data_Yay0_1b6c318_len_1c80 0x1B6C318 : AT(0x1B6C318) { + build/bin/Yay0_1b6c318_len_1c80.o(.data); + } + + /* 0x00000000 1B6DD98-1B6F150 [13B8] */ + .data_Yay0_1b6dd98_len_2046 0x1B6DD98 : AT(0x1B6DD98) { + build/bin/Yay0_1b6dd98_len_2046.o(.data); + } + + /* 0x00000000 1B6F150-1B71618 [24C8] */ + .data_Yay0_1b6f150_len_10608 0x1B6F150 : AT(0x1B6F150) { + build/bin/Yay0_1b6f150_len_10608.o(.data); + } + + /* 0x00000000 1B71618-1B72890 [1278] */ + .data_Yay0_1b71618_len_2882 0x1B71618 : AT(0x1B71618) { + build/bin/Yay0_1b71618_len_2882.o(.data); + } + + /* 0x00000000 1B72890-1B73B08 [1278] */ + .data_Yay0_1b72890_len_1302 0x1B72890 : AT(0x1B72890) { + build/bin/Yay0_1b72890_len_1302.o(.data); + } + + /* 0x00000000 1B73B08-1B747B8 [CB0] */ + .data_Yay0_1b73b08_len_44b0 0x1B73B08 : AT(0x1B73B08) { + build/bin/Yay0_1b73b08_len_44b0.o(.data); + } + + /* 0x00000000 1B747B8-1B76E30 [2678] */ + .data_Yay0_1b747b8_len_2800 0x1B747B8 : AT(0x1B747B8) { + build/bin/Yay0_1b747b8_len_2800.o(.data); + } + + /* 0x00000000 1B76E30-1B78EC0 [2090] */ + .data_Yay0_1b76e30_len_808a 0x1B76E30 : AT(0x1B76E30) { + build/bin/Yay0_1b76e30_len_808a.o(.data); + } + + /* 0x00000000 1B78EC0-1B79A20 [B60] */ + .data_Yay0_1b78ec0_len_101c 0x1B78EC0 : AT(0x1B78EC0) { + build/bin/Yay0_1b78ec0_len_101c.o(.data); + } + + /* 0x00000000 1B79A20-1B79F08 [4E8] */ + .data_Yay0_1b79a20_len_508 0x1B79A20 : AT(0x1B79A20) { + build/bin/Yay0_1b79a20_len_508.o(.data); + } + + /* 0x00000000 1B79F08-1B7AA08 [B00] */ + .data_Yay0_1b79f08_len_2004 0x1B79F08 : AT(0x1B79F08) { + build/bin/Yay0_1b79f08_len_2004.o(.data); + } + + /* 0x00000000 1B7AA08-1B7B008 [600] */ + .data_Yay0_1b7aa08_len_1000 0x1B7AA08 : AT(0x1B7AA08) { + build/bin/Yay0_1b7aa08_len_1000.o(.data); + } + + /* 0x00000000 1B7B008-1B7BB50 [B48] */ + .data_Yay0_1b7b008_len_b44 0x1B7B008 : AT(0x1B7B008) { + build/bin/Yay0_1b7b008_len_b44.o(.data); + } + + /* 0x00000000 1B7BB50-1B7EC68 [3118] */ + .data_Yay0_1b7bb50_len_4424 0x1B7BB50 : AT(0x1B7BB50) { + build/bin/Yay0_1b7bb50_len_4424.o(.data); + } + + /* 0x00000000 1B7EC68-1B7FF48 [12E0] */ + .data_Yay0_1b7ec68_len_1300 0x1B7EC68 : AT(0x1B7EC68) { + build/bin/Yay0_1b7ec68_len_1300.o(.data); + } + + /* 0x00000000 1B7FF48-1B81E88 [1F40] */ + .data_Yay0_1b7ff48_len_80086 0x1B7FF48 : AT(0x1B7FF48) { + build/bin/Yay0_1b7ff48_len_80086.o(.data); + } + + /* 0x00000000 1B81E88-1B82058 [1D0] */ + .data_Yay0_1b81e88_len_2050 0x1B81E88 : AT(0x1B81E88) { + build/bin/Yay0_1b81e88_len_2050.o(.data); + } + + /* 0x00000000 1B82058-1B82202 [1AA] */ + .data_Yay0_1b82058_len_202 0x1B82058 : AT(0x1B82058) { + build/bin/Yay0_1b82058_len_202.o(.data); + } + + /* 0x00000000 1B82202-1E40000 [2BDDFE] */ + .data_1B82202 0x1B82202 : AT(0x1B82202) { + build/bin/1B82202.o(.data); + } + + /* 0x00000000 1E40000-27FEE22 [9BEE22] */ + .data_map_assets.fs 0x1E40000 : AT(0x1E40000) { + build/bin/map_assets.fs.o(.data); + } + + /* 0x00000000 27FEE22-2800000 [11DE] */ + .data_27FEE22 0x27FEE22 : AT(0x27FEE22) { + build/bin/27FEE22.o(.data); + } + +} \ No newline at end of file diff --git a/tools/n64splat b/tools/n64splat new file mode 160000 index 0000000000..932a8fe873 --- /dev/null +++ b/tools/n64splat @@ -0,0 +1 @@ +Subproject commit 932a8fe873977407fe7127430121cf480bb597d2 diff --git a/tools/n64split.yaml b/tools/n64split.yaml deleted file mode 100644 index 616d64a8a4..0000000000 --- a/tools/n64split.yaml +++ /dev/null @@ -1,2861 +0,0 @@ -# ROM splitter configuration file -name: "Paper Mario (U) [!]" -# Graphics uCodeCRC: "21F91834" -# checksums from ROM header offsets 0x10 and 0x14 -# used for auto configuration detection -checksum1: 0x3ae5ee65 -checksum2: 0x3c737ded -# base filename used for outputs - (please, no spaces) -basename: "papermario" -ranges: - # start, end, type, label - - [0x000000, 0x000040, "header", "header"] - - [0x000040, 0x000B70, "asm", "boot", 0xA4000040] - - [0x000B70, 0x001000, "bin", "bootcode_font"] - - [0x1000, 0x1060, "asm", "code_1000_len_60", 0x80025c00] - - [0x1060, 0x1370, "asm", "code_1060_len_310", 0x80025c60] - - [0x1370, 0x1b40, "asm", "code_1370_len_7d0", 0x80025f70] - - [0x1b40, 0x3bf0, "asm", "code_1b40_len_20b0", 0x80026740] - - [0x3bf0, 0x42e0, "asm", "code_3bf0_len_6f0", 0x800287f0] - - [0x42e0, 0x6000, "asm", "code_42e0_len_1f60", 0x80028ee0] - - [0x6000, 0x6240, "asm", "code_6000", 0x8002AC00] - - [0x6240, 0x6e40, "asm", "code_6240_len_c00", 0x8002ae40] - - [0x6e40, 0x7340, "asm", "code_6e40_len_500", 0x8002ba40] - - [0x7340, 0x7e40, "asm", "code_7340_len_b00", 0x8002bf40] - - [0x7e40, 0x8230, "asm", "code_7e40_len_3f0", 0x8002ca40] - - [0x8230, 0x9d10, "asm", "code_8230_len_1ae0", 0x8002ce30] - - [0x9d10, 0xad90, "asm", "code_9d10_len_1080", 0x8002e910] - - [0xad90, 0xd610, "asm", "code_ad90_len_2880", 0x8002f990] - - [0xd610, 0xe940, "asm", "code_d610_len_1330", 0x80032210] - - [0xe940, 0xebd0, "asm", "code_e940_len_290", 0x80033540] - - [0xebd0, 0xf270, "asm", "code_ebd0_len_6a0", 0x800337d0] - - [0xf270, 0x10400, "asm", "code_f270_len_1190", 0x80033e70] - - [0x10400, 0x11130, "asm", "code_10400_len_d30", 0x80035000] - - [0x11130, 0x111f0, "asm", "code_11130_len_c0", 0x80035d30] - - [0x111f0, 0x11a50, "asm", "code_111f0_len_860", 0x80035df0] - - [0x11a50, 0x121f0, "asm", "code_11a50_len_7a0", 0x80036650] - - [0x121f0, 0x13480, "asm", "code_121f0_len_1290", 0x80036df0] - - [0x13480, 0x13870, "asm", "code_13480_len_3f0", 0x80038080] - - [0x13870, 0x1a1f0, "asm", "code_13870_len_6980", 0x80038470] - - [0x1a1f0, 0x1f580, "asm", "code_1a1f0_len_5390", 0x8003edf0] - - [0x1f580, 0x20ec0, "asm", "code_1f580_len_1940", 0x80044180] - - [0x20ec0, 0x25f00, "asm", "code_20ec0_len_5040", 0x80045ac0] - - [0x25f00, 0x26840, "asm", "code_25f00_len_940", 0x8004ab00] - - [0x26840, 0x28910, "asm", "code_26840_len_20d0", 0x8004b440] - - [0x28910, 0x2d9a0, "asm", "code_28910_len_5090", 0x8004d510] - - [0x2d9a0, 0x2e230, "asm", "code_2d9a0_len_890", 0x800525a0] - - [0x2e230, 0x303c0, "asm", "code_2e230_len_2190", 0x80052e30] - - [0x303c0, 0x341d0, "asm", "code_303c0_len_3e10", 0x80054fc0] - - [0x341d0, 0x362a0, "asm", "code_341d0_len_20d0", 0x80058dd0] - - [0x362a0, 0x39210, "asm", "code_362a0_len_2f70", 0x8005aea0] - - [0x39210, 0x39cb0, "asm", "code_39210_len_aa0", 0x8005de10] - - [0x39cb0, 0x39db0, "asm", "code_39cb0_len_100", 0x8005e8b0] - - [0x39db0, 0x3a650, "asm", "code_39db0_len_8a0", 0x8005e9b0] - - [0x3a650, 0x3a690, "asm", "code_3a650_len_40", 0x8005f250] - - [0x3a690, 0x3a6d0, "asm", "code_3a690_len_40", 0x8005f290] - - [0x3a6d0, 0x3a6f0, "asm", "code_3a6d0_len_20", 0x8005f2d0] - - [0x3a6f0, 0x3a800, "asm", "code_3a6f0_len_110", 0x8005f2f0] - - [0x3a800, 0x3a830, "asm", "code_3a800_len_30", 0x8005f400] - - [0x3a830, 0x3a850, "asm", "code_3a830_len_20", 0x8005f430] - - [0x3a850, 0x3b290, "asm", "code_3a850_le_a40", 0x8005f450] - - [0x3b290, 0x3b390, "asm", "code_3b290_len_100", 0x8005fe90] - - [0x3b390, 0x3b4a0, "asm", "code_3b390_len_110", 0x8005ff90] - - [0x3b4a0, 0x3b710, "asm", "code_3b4a0_len_270", 0x800600a0] - - [0x3b710, 0x3b750, "asm", "code_3b710_len_40", 0x80060310] - - [0x3b750, 0x3b770, "asm", "code_3b750_len_20", 0x80060350] - - [0x3b770, 0x3b7f0, "asm", "code_3b770_len_80", 0x80060370] - - [0x3b7f0, 0x3b910, "asm", "code_3b7f0_len_120", 0x800603f0] - - [0x3b910, 0x3bd20, "asm", "code_3b910_len_410", 0x80060510] - - [0x3bd20, 0x3bde0, "asm", "code_3bd20_len_c0", 0x80060920] - - [0x3bde0, 0x3c1c0, "asm", "code_3bde0_len_3e0", 0x800609e0] - - [0x3c1c0, 0x3c220, "asm", "code_3c1c0_len_60", 0x80060dc0] - - [0x3c220, 0x3c2c0, "asm", "code_3c220_len_a0", 0x80060e20] - - [0x3c2c0, 0x3c310, "asm", "code_3c2c0_len_50", 0x80060ec0] - - [0x3c310, 0x3c490, "asm", "code_3c310_len_180", 0x80060f10] - - [0x3c490, 0x3c850, "asm", "code_3c490_len_3c0", 0x80061090] - - [0x3c850, 0x3c940, "asm", "code_3c850_len_f0", 0x80061450] - - [0x3c940, 0x3ca80, "asm", "code_3c940_len_140", 0x80061540] - - [0x3ca80, 0x3cb20, "asm", "code_3ca80_len_a0", 0x80061680] - - [0x3cb20, 0x3cc50, "asm", "code_3cb20_len_130", 0x80061720] - - [0x3cc50, 0x3ccd0, "asm", "code_3cc50_len_80", 0x80061850] - - [0x3ccd0, 0x3cd00, "asm", "code_3ccd0_len_30", 0x800618d0] - - [0x3cd00, 0x3d2f0, "asm", "code_3cd00_len_5f0", 0x80061900] - - [0x3d2f0, 0x3d300, "asm", "code_3d2f0_len_10", 0x80061ef0] - - [0x3d300, 0x3d330, "asm", "code_3d300_len_30", 0x80061f00] - - [0x3d330, 0x3dcc0, "asm", "code_3d330_len_990", 0x80061f30] - - [0x3dcc0, 0x3e720, "asm", "code_3dcc0_len_a60", 0x800628c0] - - [0x3e720, 0x3ed10, "asm", "code_3e720_len_5f0", 0x80063320] - - [0x3ed10, 0x03ef90, "asm", "code_3ed10_len_600", 0x80063910] - - [0x03ef90, 0x3f310, "asm", "code_3ef90_len_600", 0x80063B90] - - [0x3f310, 0x3f6d0, "asm", "code_3f310_len_3c0", 0x80063f10] - - [0x3f6d0, 0x3f9f0, "asm", "code_3f6d0_len_320", 0x800642d0] - - [0x3f9f0, 0x3fa50, "asm", "code_3f9f0_len_60", 0x800645f0] - - [0x3fa50, 0x409b0, "asm", "code_3fa50_len_f60", 0x80064650] - - [0x409b0, 0x40af0, "asm", "code_409b0_len_140", 0x800655b0] - - [0x40af0, 0x40c20, "asm", "code_40af0_len_130", 0x800656f0] - - [0x40c20, 0x40e10, "asm", "code_40c20_len_1f0", 0x80065820] - - [0x40e10, 0x41050, "asm", "code_40e10_len_240", 0x80065a10] - - [0x41050, 0x41170, "asm", "code_41050_len_120", 0x80065c50] - - [0x41170, 0x41260, "asm", "code_41170_len_f0", 0x80065d70] - - [0x41260, 0x41330, "asm", "osCreateThread", 0x80065e60] - - [0x41330, 0x41350, "asm", "osGetThreadPri", 0x80065F30] - - [0x41350, 0x41420, "asm", "code_41350_len_d0", 0x80065f50] - - [0x41420, 0x41540, "asm", "code_41420_len_120", 0x80066020] - - [0x41540, 0x41600, "asm", "code_41540_len_c0", 0x80066140] - - [0x41600, 0x41640, "asm", "code_41600_len_40", 0x80066200] - - [0x41640, 0x41690, "asm", "code_41640_len_50", 0x80066240] - - [0x41690, 0x416a0, "asm", "code_41690_len_10", 0x80066290] - - [0x416a0, 0x41730, "asm", "code_416a0_len_90", 0x800662a0] - - [0x41730, 0x41750, "asm", "code_41730_len_20", 0x80066330] - - [0x41750, 0x41ba0, "asm", "code_41750_len_450", 0x80066350] - - [0x41ba0, 0x41c60, "asm", "code_41ba0_len_c0", 0x800667a0] - - [0x41c60, 0x41d20, "asm", "code_41c60_len_c0", 0x80066860] - - [0x41d20, 0x41d60, "asm", "code_41d20_len_40", 0x80066920] - - [0x41d60, 0x41db0, "asm", "code_41d60_len_50", 0x80066960] - - [0x41db0, 0x41df0, "asm", "code_41db0_len_40", 0x800669b0] - - [0x41df0, 0x41e30, "asm", "code_41df0_len_40", 0x800669f0] - - [0x41e30, 0x41e70, "asm", "code_41e30_len_40", 0x80066a30] - - [0x41e70, 0x421b0, "asm", "code_41e70_len_340", 0x80066a70] - - [0x421b0, 0x42210, "asm", "code_421b0_len_60", 0x80066db0] - - [0x42210, 0x42260, "asm", "code_42210_len_50", 0x80066e10] - - [0x42260, 0x423d0, "asm", "code_42260_len_170", 0x80066e60] - - [0x423d0, 0x42420, "asm", "code_423d0_len_50", 0x80066fd0] - - [0x42420, 0x42470, "asm", "code_42420_len_50", 0x80067020] - - [0x42470, 0x42780, "asm", "code_42470_len_310", 0x80067070] - - [0x42780, 0x428a0, "asm", "code_42780_len_120", 0x80067380] - - [0x428a0, 0x42900, "asm", "guMtxIdentF", 0x800674a0] - - [0x42900, 0x42980, "asm", "code_42900_len_80", 0x80067500] - - [0x42980, 0x42a00, "asm", "code_42980_len_80", 0x80067580] - - [0x42a00, 0x42b00, "asm", "code_42a00_len_100", 0x80067600] - - [0x42b00, 0x42bc0, "asm", "code_42b00_len_c0", 0x80067700] - - [0x42bc0, 0x42c20, "asm", "code_42bc0_len_60", 0x800677c0] - - [0x42c20, 0x42d00, "asm", "code_42c20_len_e0", 0x80067820] - - [0x42d00, 0x42d60, "asm", "code_42d00_len_60", 0x80067900] - - [0x42d60, 0x42de0, "asm", "code_42d60_len_80", 0x80067960] - - [0x42de0, 0x42e70, "asm", "code_42de0_len_90", 0x800679e0] - - [0x42e70, 0x43200, "asm", "code_42e70_len_390", 0x80067a70] - - [0x43200, 0x439c0, "asm", "code_43200_len_7c0", 0x80067e00] - - [0x439c0, 0x43be0, "asm", "code_439c0_len_220", 0x800685c0] - - [0x43be0, 0x441c0, "asm", "code_43be0_len_5e0", 0x800687e0] - - [0x441c0, 0x44380, "asm", "code_441c0_len_1c0", 0x80068dc0] - - [0x44380, 0x44860, "asm", "code_44380_len_4e0", 0x80068f80] - - [0x44860, 0x448c0, "asm", "code_44860_len_60", 0x80069460] - - [0x448c0, 0x44ad0, "asm", "code_448c0_len_210", 0x800694c0] - - [0x44ad0, 0x44b40, "asm", "code_44ad0_len_70", 0x800696d0] - - [0x44b40, 0x455d0, "asm", "code_44b40_len_a90", 0x80069740] - - [0x455d0, 0x457c0, "asm", "code_455d0_len_1f0", 0x8006a1d0] - - [0x457c0, 0x45a30, "asm", "code_457c0_len_270", 0x8006a3c0] - - [0x45a30, 0x45a50, "asm", "code_45a30_len_20", 0x8006a630] - - [0x45a50, 0x45df0, "asm", "code_45a50_len_3a0", 0x8006a650] - - [0x45df0, 0x46760, "asm", "code_45df0_len_970", 0x8006a9f0] - - [0x46760, 0x467f0, "asm", "code_46760_len_90", 0x8006b360] - - [0x467f0, 0x46880, "asm", "code_467f0_len_90", 0x8006b3f0] - - [0x46880, 0x46ae0, "asm", "code_46880_len_260", 0x8006b480] - - [0x46ae0, 0x46c50, "asm", "code_46ae0_len_170", 0x8006b6e0] - - [0x46c50, 0x46c70, "asm", "code_46c50_len_20", 0x8006b850] - - [0x46c70, 0x47a70, "asm", "code_46c70_len_e00", 0x8006b870] - - [0x47a70, 0x47a80, "asm", "code_47a70_len_10", 0x8006c670] - - [0x47a80, 0x47a90, "asm", "code_47a80_len_10", 0x8006c680] - - [0x47a90, 0x47ae0, "asm", "code_47a90_len_50", 0x8006c690] - - [0x47ae0, 0x47bc0, "asm", "code_47ae0_len_e0", 0x8006c6e0] - - [0x47bc0, 0x47c10, "asm", "code_47bc0_len_50", 0x8006c7c0] - - [0x47c10, 0x47c60, "asm", "code_47c10_len_50", 0x8006c810] - - [0x47c60, 0x47d50, "asm", "code_47c60_len_f0", 0x8006c860] - - [0x47d50, 0x47e30, "asm", "code_47d50_len_e0", 0x8006c950] - - [0x47e30, 0x47e90, "asm", "code_47e30_len_60", 0x8006ca30] - - [0x47e90, 0x47fa0, "asm", "code_47e90_len_110", 0x8006ca90] - - [0x47fa0, 0x47fc0, "asm", "code_47fa0_len_20", 0x8006cba0] - - [0x47fc0, 0x48020, "asm", "code_47fc0_len_60", 0x8006cbc0] - - [0x48020, 0x48a20, "asm", "code_48020_len_a00", 0x8006cc20] - - [0x48a20, 0x48be0, "asm", "code_48a20_len_1c0", 0x8006d620] - - [0x48be0, 0x48c00, "asm", "code_48be0_len_20", 0x8006d7e0] - - [0x48c00, 0x491c0, "asm", "code_48c00_len_5c0", 0x8006d800] - - [0x491c0, 0x49C70, "asm", "code_491c0_len_f80", 0x8006ddc0] - - [0x49C70, 0x4a140, "asm", "code_49C70", 0x8006E870] - - [0x4a140, 0x4a1b0, "asm", "code_4a140_len_70", 0x8006ed40] - - [0x4a1b0, 0x4a1f0, "asm", "code_4a1b0_len_40", 0x8006edb0] - - [0x4a1f0, 0x4a360, "asm", "code_4a1f0_len_170", 0x8006edf0] - - [0x4a360, 0x4ac90, "asm", "code_4a360_len_930", 0x8006ef60] - - [0x4ac90, 0x4e5a0, "asm", "code_4ac90_len_3910", 0x8006f890] - - [0x4E5A0, 0x759B0, "bin", "bin_4e5a0_len_27410"] - - [0x759b0, 0x7bb60, "asm", "code_759b0_len_61b0", 0x800DC500] - - [0x7bb60, 0x7fd10, "asm", "code_7bb60_len_41b0", 0x800E26B0] - - [0x7fd10, 0x80850, "asm", "code_7fd10_len_b40", 0x800E6860] - - [0x80850, 0x838b0, "asm", "code_80850_len_3060", 0x800E73A0] - - [0x838b0, 0x891b0, "asm", "code_838b0_len_5900", 0x800EA400] - - [0x891b0, 0x8a160, "asm", "code_891b0_len_fb0", 0x800EFD00] - - [0x8a160, 0x8a860, "asm", "code_8a160_len_700", 0x800F0CB0] - - [0x8a860, 0x8e790, "asm", "code_8a860_len_3f30", 0x800F13B0] - - [0x8e790, 0x90fe0, "asm", "code_8e790_len_2850", 0x800F52E0] - - [0x90fe0, 0xa5dd0, "bin", "bin_90fe0_len_14df0", 0x800F7B30] - - [0xa5dd0, 0xb72b0, "asm", "code_a5dd0_len_114e0", 0x8010f6d0] - - [0xb72b0, 0xcd180, "asm", "code_b72b0_len_15ed0", 0x80120bb0] - - [0xcd180, 0xd0a70, "asm", "code_cd180_len_38f0", 0x80136a80] - - [0xd0a70, 0xd5a50, "asm", "code_d0a70_len_4fe0", 0x8013a370] - - [0xd5a50, 0xdba20, "asm", "code_d5a50_len_5fd0", 0x8013f350] - - [0xdba20, 0xdbd70, "asm", "code_dba20_len_350", 0x80145320] - - [0xdbd70, 0xdc470, "asm", "code_dbd70_len_700", 0x80145670] - - [0xdc470, 0xdd930, "asm", "code_dc470_len_14c0", 0x80145d70] - - [0xdd930, 0xddaf0, "asm", "code_dd930_len_1c0", 0x80147230] - - [0xddaf0, 0xde740, "asm", "code_ddaf0_len_c50", 0x801473f0] - - [0xde740, 0xe0b30, "asm", "code_de740_len_23f0", 0x80148040] - - [0xe0b30, 0xe16b0, "asm", "code_e0b30_len_b80", 0x8014a430] - - [0xe16b0, 0xe79b0, "bin", "bin_e5dd0_len_6300"] - - [0xe79b0, 0xe92d0, "asm", "code_e79b0_len_1920", 0x802c3000] - - [0xe92d0, 0xef070, "asm", "code_e92d0_len_5da0", 0x802c4920] - - [0xef070, 0xf2470, "asm", "code_ef070_len_3400", 0x802ca6c0] - - [0xf2470, 0xf4c60, "asm", "code_f2470_len_27f0", 0x802cdac0] - - [0xf4c60, 0xf8f60, "asm", "code_f4c60_len_4300", 0x802d02b0] - - [0xf8f60, 0xfa4c0, "asm", "code_f8f60_len_1560", 0x802d45b0] - - [0xfa4c0, 0xfe0b0, "asm", "code_fa4c0_len_3bf0", 0x802d5b10] - - [0xfe0b0, 0xfe650, "asm", "code_fe0b0_len_5a0", 0x802d9700] - - [0xFE650, 0xFEE30, "bin", "bin_fee30_len_7e0"] - - [0xfee30, 0x101b90, "asm", "code_fee30_len_2d60", 0x802dbd40] - - [0x101b90, 0x102480, "asm", "code_101b90_len_8f0", 0x802deaa0] - - [0x102480, 0x102610, "bin", "bin_102610_len_190"] - - [0x102610, 0x104940, "asm", "code_102610_len_2330", 0x802E0D90] - - [0x104940, 0x105700, "asm", "code_104940_len_dc0", 0x802E30C0] - - [0x105700, 0x107830, "asm", "code_105700_len_2130", 0x802E3E80] - - [0x107830, 0x1086a0, "asm", "code_107830_len_e70", 0x802E5FB0] - - [0x1086a0, 0x109660, "asm", "code_1086a0_len_fc0", 0x802E6E20] - - [0x109660, 0x10A9F0, "asm", "code_109660_len_1270", 0x802E7DE0] - - [0x10A9F0, 0x131340, "bin", "bin_10A9F0"] - - [0x131340, 0x135EE0, "bin", "bin_131340"] - - [0x135EE0, 0x1422A0, "asm", "code_135EE0", 0x80242BA0] - - [0x1422A0, 0x163400, "bin", "bin_1422A0"] - - [0x163400, 0x167570, "asm", "code_163400", 0x80242BA0] - - [0x167570, 0x168590, "asm", "code_167570", 0x80246D10] - - [0x168590, 0x169BE0, "asm", "code_168590", 0x80247D30] - - [0x169BE0, 0x16a3e0, "asm", "code_169BE0", 0x80249380] - - [0x16a3e0, 0x16C8E0, "bin", "bin_16a3e0"] - - [0x16C8E0, 0x1AF2C0, "asm", "code_16c8e0", 0x8023E000] - - [0x1AF2C0, 0x3169f0, "bin", "bin_1AF2C0"] - - [0x3169f0, 0x316a70, "asm", "code_3169f0", 0x80200000] - - [0x316a70, 0x316c00, "asm", "code_316a70", 0x80200080] - - [0x316c00, 0x316d90, "bin", "bin_316c00"] - - [0x316d90, 0x316f30, "asm", "code_316d90", 0x802AE000] - - [0x316f30, 0x317020, "asm", "code_316f30", 0x802B2000] - - [0x317020, 0x415D90, "bin", "bin_317020"] - - [0x415D90, 0x4200C0, "asm", "code_415D90", 0x802A1000] - - [0x4200C0, 0x7e0e80, "bin", "bin_4200C0"] - - [0x7e0e80, 0x7E2AA0, "asm", "code_7e0e80", 0x80280000] - - [0x7E2AA0, 0x7E3700, "asm", "code_7E2AA0", 0x80281C20] - - [0x7E3700, 0x7e4d00, "asm", "code_7E3700", 0x80282880] - - [0x7e4d00, 0xe20eb0, "bin", "bin_7e4d00"] - - [0xe20eb0, 0xe215c0, "asm", "code_e20eb0", 0x802B7000] - - [0xe215c0, 0xF007C0, "bin", "bin_19e09a8"] - - [0xF007C0, 0xF02160, "bgm", "Battle_Fanfare_02"] - - [0xF02160, 0xF03740, "bgm", "Hey_You_03"] - - [0xF03740, 0xF043F0, "bgm", "The_Goomba_King_s_Decree_07"] - - [0xF043F0, 0xF073C0, "bgm", "Attack_of_the_Koopa_Bros_08"] - - [0xF073C0, 0xF08D40, "bgm", "Trojan_Bowser_09"] - - [0xF08D40, 0xF09600, "bgm", "Chomp_Attack_0A"] - - [0xF09600, 0xF0A550, "bgm", "Ghost_Gulping_0B"] - - [0xF0A550, 0xF0BAE0, "bgm", "Keeping_Pace_0C"] - - [0xF0BAE0, 0xF0DEC0, "bgm", "Go_Mario_Go_0D"] - - [0xF0DEC0, 0xF0FD20, "bgm", "Huffin_and_Puffin_0E"] - - [0xF0FD20, 0xF110D0, "bgm", "Freeze_0F"] - - [0xF110D0, 0xF116C0, "bgm", "Winning_a_Battle_8B"] - - [0xF116C0, 0xF12320, "bgm", "Winning_a_Battle_and_Level_Up_8E"] - - [0xF12320, 0xF13C20, "bgm", "Jr_Troopa_Battle_04"] - - [0xF13C20, 0xF15F40, "bgm", "Final_Bowser_Battle_interlude_05"] - - [0xF15F40, 0xF16F80, "bgm", "Master_Battle_2C"] - - [0xF16F80, 0xF171D0, "bgm", "Game_Over_87"] - - [0xF171D0, 0xF17370, "bgm", "Resting_at_the_Toad_House_88"] - - [0xF17370, 0xF17570, "bgm", "Running_around_the_Heart_Pillar_in_Ch1_84"] - - [0xF17570, 0xF18940, "bgm", "Tutankoopa_s_Warning_45"] - - [0xF18940, 0xF193D0, "bgm", "Kammy_Koopa_s_Theme_46"] - - [0xF193D0, 0xF19BC0, "bgm", "Jr_Troopa_s_Theme_47"] - - [0xF19BC0, 0xF1A6F0, "bgm", "Goomba_King_s_Theme_50"] - - [0xF1A6F0, 0xF1ABD0, "bgm", "Koopa_Bros_Defeated_51"] - - [0xF1ABD0, 0xF1C810, "bgm", "Koopa_Bros_Theme_52"] - - [0xF1C810, 0xF1DBF0, "bgm", "Tutankoopa_s_Warning_2_53"] - - [0xF1DBF0, 0xF1F2E0, "bgm", "Tutankoopa_s_Theme_54"] - - [0xF1F2E0, 0xF20FF0, "bgm", "Tubba_Blubba_s_Theme_55"] - - [0xF20FF0, 0xF21780, "bgm", "General_Guy_s_Theme_56"] - - [0xF21780, 0xF22A00, "bgm", "Lava_Piranha_s_Theme_57"] - - [0xF22A00, 0xF23A00, "bgm", "Huff_N_Puff_s_Theme_58"] - - [0xF23A00, 0xF24810, "bgm", "Crystal_King_s_Theme_59"] - - [0xF24810, 0xF25240, "bgm", "Blooper_s_Theme_5A"] - - [0xF25240, 0xF26260, "bgm", "Midboss_Theme_5B"] - - [0xF26260, 0xF27840, "bgm", "Monstar_s_Theme_5C"] - - [0xF27840, 0xF27E20, "bgm", "Moustafa_s_Theme_86"] - - [0xF27E20, 0xF28E20, "bgm", "Fuzzy_Searching_Minigame_85"] - - [0xF28E20, 0xF29AC0, "bgm", "Phonograph_in_Mansion_44"] - - [0xF29AC0, 0xF2E130, "bgm", "Toad_Town_00"] - - [0xF2E130, 0xF2EF90, "bgm", "Bill_Blaster_Theme_48"] - - [0xF2EF90, 0xF30590, "bgm", "Monty_Mole_Theme_in_Flower_Fields_49"] - - [0xF30590, 0xF318B0, "bgm", "Shy_Guys_in_Toad_Town_4A"] - - [0xF318B0, 0xF32220, "bgm", "Whale_s_Problem_4C"] - - [0xF32220, 0xF33060, "bgm", "Toad_Town_Sewers_4B"] - - [0xF33060, 0xF33AA0, "bgm", "Unused_Theme_4D"] - - [0xF33AA0, 0xF33F10, "bgm", "Mario_s_House_Prologue_3E"] - - [0xF33F10, 0xF354E0, "bgm", "Peach_s_Party_3F"] - - [0xF354E0, 0xF35ED0, "bgm", "Goomba_Village_01"] - - [0xF35ED0, 0xF36690, "bgm", "Pleasant_Path_11"] - - [0xF36690, 0xF379E0, "bgm", "Fuzzy_s_Took_My_Shell_12"] - - [0xF379E0, 0xF38570, "bgm", "Koopa_Village_13"] - - [0xF38570, 0xF39160, "bgm", "Koopa_Bros_Fortress_14"] - - [0xF39160, 0xF3A0D0, "bgm", "Dry_Dry_Ruins_18"] - - [0xF3A0D0, 0xF3A450, "bgm", "Dry_Dry_Ruins_Mystery_19"] - - [0xF3A450, 0xF3AF20, "bgm", "Mt_Rugged_16"] - - [0xF3AF20, 0xF3C130, "bgm", "Dry_Dry_Desert_Oasis_17"] - - [0xF3C130, 0xF3CCC0, "bgm", "Dry_Dry_Outpost_15"] - - [0xF3CCC0, 0xF3E130, "bgm", "Forever_Forest_1A"] - - [0xF3E130, 0xF3F3E0, "bgm", "Boo_s_Mansion_1B"] - - [0xF3F3E0, 0xF40F00, "bgm", "Bow_s_Theme_1C"] - - [0xF40F00, 0xF42F30, "bgm", "Gusty_Gulch_Adventure_1D"] - - [0xF42F30, 0xF45500, "bgm", "Tubba_Blubba_s_Castle_1E"] - - [0xF45500, 0xF465E0, "bgm", "The_Castle_Crumbles_1F"] - - [0xF465E0, 0xF474A0, "bgm", "Shy_Guy_s_Toy_Box_20"] - - [0xF474A0, 0xF47E10, "bgm", "Toy_Train_Travel_21"] - - [0xF47E10, 0xF48410, "bgm", "Big_Lantern_Ghost_s_Theme_22"] - - [0xF48410, 0xF4A880, "bgm", "Jade_Jungle_24"] - - [0xF4A880, 0xF4BC00, "bgm", "Deep_Jungle_25"] - - [0xF4BC00, 0xF4E690, "bgm", "Lavalava_Island_26"] - - [0xF4E690, 0xF50A00, "bgm", "Search_for_the_Fearsome_5_27"] - - [0xF50A00, 0xF52520, "bgm", "Raphael_the_Raven_28"] - - [0xF52520, 0xF55C80, "bgm", "Hot_Times_in_Mt_Lavalava_29"] - - [0xF55C80, 0xF58ED0, "bgm", "Escape_from_Mt_Lavalava_2A"] - - [0xF58ED0, 0xF592B0, "bgm", "Cloudy_Climb_32"] - - [0xF592B0, 0xF5AFF0, "bgm", "Puff_Puff_Machine_33"] - - [0xF5AFF0, 0xF5C8D0, "bgm", "Flower_Fields_30"] - - [0xF5C8D0, 0xF5DF40, "bgm", "Flower_Fields_Sunny_31"] - - [0xF5DF40, 0xF5F500, "bgm", "Sun_s_Tower_34"] - - [0xF5F500, 0xF61700, "bgm", "Sun_s_Celebration_35"] - - [0xF61700, 0xF62E50, "bgm", "Shiver_City_38"] - - [0xF62E50, 0xF64220, "bgm", "Detective_Mario_39"] - - [0xF64220, 0xF64CB0, "bgm", "Snow_Road_3A"] - - [0xF64CB0, 0xF65B30, "bgm", "Over_Shiver_Mountain_3B"] - - [0xF65B30, 0xF66690, "bgm", "Starborn_Valley_3C"] - - [0xF66690, 0xF66B70, "bgm", "Sanctuary_3D"] - - [0xF66B70, 0xF67F80, "bgm", "Crystal_Palace_37"] - - [0xF67F80, 0xF69640, "bgm", "Star_Haven_60"] - - [0xF69640, 0xF6A050, "bgm", "Shooting_Star_Summit_61"] - - [0xF6A050, 0xF6C270, "bgm", "Legendary_Star_Ship_62"] - - [0xF6C270, 0xF6CED0, "bgm", "Star_Sanctuary_63"] - - [0xF6CED0, 0xF6EE40, "bgm", "Bowser_s_Castle_-_Caves_65"] - - [0xF6EE40, 0xF73390, "bgm", "Bowser_s_Castle_64"] - - [0xF73390, 0xF751F0, "bgm", "Star_Elevator_2B"] - - [0xF751F0, 0xF759C0, "bgm", "Goomba_Bros_Defeated_7E"] - - [0xF759C0, 0xF77200, "bgm", "Farewell_Twink_70"] - - [0xF77200, 0xF77680, "bgm", "Peach_Cooking_71"] - - [0xF77680, 0xF78600, "bgm", "Gourmet_Guy_72"] - - [0xF78600, 0xF79070, "bgm", "Hope_on_the_Balcony_Peach_1_73"] - - [0xF79070, 0xF7A0C0, "bgm", "Peach_s_Theme_2_74"] - - [0xF7A0C0, 0xF7AA40, "bgm", "Peach_Sneaking_75"] - - [0xF7AA40, 0xF7AD90, "bgm", "Peach_Captured_76"] - - [0xF7AD90, 0xF7BEA0, "bgm", "Quiz_Show_Intro_77"] - - [0xF7BEA0, 0xF7C780, "bgm", "Unconscious_Mario_78"] - - [0xF7C780, 0xF7DC00, "bgm", "Petunia_s_Theme_89"] - - [0xF7DC00, 0xF7E190, "bgm", "Flower_Fields_Door_appears_8A"] - - [0xF7E190, 0xF7EE20, "bgm", "Beanstalk_7B"] - - [0xF7EE20, 0xF80230, "bgm", "Lakilester_s_Theme_7D"] - - [0xF80230, 0xF81260, "bgm", "The_Sun_s_Back_7F"] - - [0xF81260, 0xF82460, "bgm", "Shiver_City_in_Crisis_79"] - - [0xF82460, 0xF82D00, "bgm", "Solved_Shiver_City_Mystery_7A"] - - [0xF82D00, 0xF83DC0, "bgm", "Merlon_s_Spell_7C"] - - [0xF83DC0, 0xF85590, "bgm", "Bowser_s_Theme_66"] - - [0xF85590, 0xF860E0, "bgm", "Train_Travel_80"] - - [0xF860E0, 0xF87000, "bgm", "Whale_Trip_81"] - - [0xF87000, 0xF87610, "bgm", "Chanterelle_s_Song_8C"] - - [0xF87610, 0xF88B30, "bgm", "Boo_s_Game_8D"] - - [0xF88B30, 0xF89570, "bgm", "Dry_Dry_Ruins_rises_up_83"] - - [0xF89570, 0xF8AAF0, "bgm", "End_of_Chapter_40"] - - [0xF8AAF0, 0xF8B820, "bgm", "Beginning_of_Chapter_41"] - - [0xF8B820, 0xF8BD90, "bgm", "Hammer_and_Jump_Upgrade_42"] - - [0xF8BD90, 0xF8C360, "bgm", "Found_Baby_Yoshi_s_4E"] - - [0xF8C360, 0xF8D110, "bgm", "New_Partner_JAP_96"] - - [0xF8D110, 0xF8D3E0, "bgm", "Unused_YI_Fanfare_4F"] - - [0xF8D3E0, 0xF90880, "bgm", "Unused_YI_Fanfare_2_5D"] - - [0xF90880, 0xF92A50, "bgm", "Peach_s_Castle_inside_Bubble_5E"] - - [0xF92A50, 0xF95510, "bgm", "Angry_Bowser_67"] - - [0xF95510, 0xF96280, "bgm", "Bowser_s_Castle_explodes_5F"] - - [0xF96280, 0xF98520, "bgm", "Peach_s_Wish_68"] - - [0xF98520, 0xF98F90, "bgm", "File_Select_69"] - - [0xF98F90, 0xF9B830, "bgm", "Title_Screen_6A"] - - [0xF9B830, 0xF9D3B0, "bgm", "Peach_s_Castle_in_Crisis_6B"] - - [0xF9D3B0, 0xF9D690, "bgm", "Mario_falls_from_Bowser_s_Castle_6C"] - - [0xF9D690, 0xF9EF30, "bgm", "Peach_s_Arrival_6D"] - - [0xF9EF30, 0xF9FA30, "bgm", "Star_Rod_Recovered_6F"] - - [0xF9FA30, 0xFA08A0, "bgm", "Mario_s_House_94"] - - [0xFA08A0, 0xFA3C60, "bgm", "Bowser_s_Attacks_95"] - - [0xFA3C60, 0xFA85F0, "bgm", "End_Parade_1_90"] - - [0xFA85F0, 0xFABE90, "bgm", "End_Parade_2_91"] - - [0xFABE90, 0xFACC80, "bgm", "The_End_6E"] - - [0xFACC80, 0xFAD210, "bgm", "Koopa_Radio_Station_2D"] - - [0xFAD210, 0xFAD8F0, "bgm", "The_End_Low_Frequency__2E"] - - [0xFAD8F0, 0xFADE70, "bgm", "SMW_Remix_2F"] - - [0xFADE70, 0xFAE860, "bgm", "New_Partner_82"] - - [0xFAE860, 0x19E09A8, "bin", "bin_fae860"] - - [0x19E09A8, 0x19E1390, "yay0", "yay_19e09a8_len_1206"] - - [0x19E1390, 0x19E1890, "yay0", "yay_19e1390_len_806"] - - [0x19E1888, 0x19E2330, "yay0", "yay_19e1888_len_2324"] - - [0x19E2330, 0x19E2DE0, "yay0", "yay_19e2330_len_cc0"] - - [0x19E2DE0, 0x19E3208, "yay0", "yay_19e2de0_len_1206"] - - [0x19E3208, 0x19E3BA8, "yay0", "yay_19e3208_len_9a6"] - - [0x19E3BA8, 0x19E3FD8, "yay0", "yay_19e3ba8_len_456"] - - [0x19E3FD8, 0x19E4828, "yay0", "yay_19e3fd8_len_4024"] - - [0x19E4828, 0x19E4BE0, "yay0", "yay_19e4828_len_3c0"] - - [0x19E4BE0, 0x19E5758, "yay0", "yay_19e4be0_len_1416"] - - [0x19E5758, 0x19E5950, "yay0", "yay_19e5758_len_802"] - - [0x19E5950, 0x19E62A0, "yay0", "yay_19e5950_len_22a0"] - - [0x19E62A0, 0x19E67B2, "yay0", "yay_19e62a0_len_512"] - - [0x19E67B2, 0x19E6B60, "bin", "bin_19e6b60"] - - [0x19E6B60, 0x19E7528, "yay0", "yay_19e6b60_len_1406"] - - [0x19E7528, 0x19E9778, "yay0", "yay_19e7528_len_8256"] - - [0x19E9778, 0x19EAF38, "yay0", "yay_19e9778_len_2800"] - - [0x19EAF38, 0x19EC4E0, "yay0", "yay_19eaf38_len_40c0"] - - [0x19EC4E0, 0x19EDD30, "yay0", "yay_19ec4e0_len_1910"] - - [0x19EDD30, 0x19EEB18, "yay0", "yay_19edd30_len_2204"] - - [0x19EEB18, 0x19F0070, "yay0", "yay_19eeb18_len_10062"] - - [0x19F0070, 0x19F15A0, "yay0", "yay_19f0070_len_158c"] - - [0x19F15A0, 0x19F26D8, "yay0", "yay_19f15a0_len_2252"] - - [0x19F26D8, 0x19F5390, "yay0", "yay_19f26d8_len_5102"] - - [0x19F5390, 0x19F7398, "yay0", "yay_19f5390_len_2002"] - - [0x19F7398, 0x19FA128, "yay0", "yay_19f7398_len_8024"] - - [0x19FA128, 0x19FCAE8, "yay0", "yay_19fa128_len_4ac6"] - - [0x19FCAE8, 0x19FED70, "yay0", "yay_19fcae8_len_2502"] - - [0x19FED70, 0x1A00958, "yay0", "yay_19fed70_len_200004"] - - [0x1A00958, 0x1A02D00, "yay0", "yay_1a00958_len_24a2"] - - [0x1A02D00, 0x1A04400, "yay0", "yay_1a02d00_len_4000"] - - [0x1A04400, 0x1A05550, "yay0", "yay_1a04400_len_114c"] - - [0x1A05550, 0x1A06390, "yay0", "yay_1a05550_len_2280"] - - [0x1A06390, 0x1A06F98, "yay0", "yay_1a06390_len_c04"] - - [0x1A06F98, 0x1A07B68, "yay0", "yay_1a06f98_len_1066"] - - [0x1A07B68, 0x1A0A0A0, "yay0", "yay_1a07b68_len_8092"] - - [0x1A0A0A0, 0x1A0ACC8, "yay0", "yay_1a0a0a0_len_c46"] - - [0x1A0ACC8, 0x1A0B780, "yay0", "yay_1a0acc8_len_1300"] - - [0x1A0B780, 0x1A0BBE0, "yay0", "yay_1a0b780_len_85c"] - - [0x1A0BBE0, 0x1A0C000, "yay0", "yay_1a0bbe0_len_4000"] - - [0x1A0C000, 0x1A0C438, "yay0", "yay_1a0c000_len_438"] - - [0x1A0C438, 0x1A0C860, "yay0", "yay_1a0c438_len_842"] - - [0x1A0C860, 0x1A0D1E8, "yay0", "yay_1a0c860_len_1186"] - - [0x1A0D1E8, 0x1A0D5B0, "yay0", "yay_1a0d1e8_len_406"] - - [0x1A0D5B0, 0x1A0D970, "yay0", "yay_1a0d5b0_len_840"] - - [0x1A0D970, 0x1A0EF00, "yay0", "yay_1a0d970_len_268e"] - - [0x1A0EF00, 0x1A13920, "yay0", "yay_1a0ef00_len_11020"] - - [0x1A13920, 0x1A15850, "yay0", "yay_1a13920_len_404c"] - - [0x1A15850, 0x1A183F8, "yay0", "yay_1a15850_len_83a4"] - - [0x1A183F8, 0x1A1A608, "yay0", "yay_1a183f8_len_2404"] - - [0x1A1A608, 0x1A1C5E8, "yay0", "yay_1a1a608_len_41e2"] - - [0x1A1C5E8, 0x1A1D6D0, "yay0", "yay_1a1c5e8_len_1202"] - - [0x1A1D6D0, 0x1A1E478, "yay0", "yay_1a1d6d0_len_2028"] - - [0x1A1E478, 0x1A1F370, "yay0", "yay_1a1e478_len_1306"] - - [0x1A1F370, 0x1A226B0, "yay0", "yay_1a1f370_len_2048c"] - - [0x1A226B0, 0x1A249B8, "yay0", "yay_1a226b0_len_4908"] - - [0x1A249B8, 0x1A25E78, "yay0", "yay_1a249b8_len_1644"] - - [0x1A25E78, 0x1A27FF0, "yay0", "yay_1a25e78_len_2186"] - - [0x1A27FF0, 0x1A28BE0, "yay0", "yay_1a27ff0_len_800a"] - - [0x1A28BE0, 0x1A29680, "yay0", "yay_1a28be0_len_1400"] - - [0x1A29680, 0x1A2BC68, "yay0", "yay_1a29680_len_2862"] - - [0x1A2BC68, 0x1A2E120, "yay0", "yay_1a2bc68_len_4112"] - - [0x1A2E120, 0x1A2F3F8, "yay0", "yay_1a2e120_len_12d8"] - - [0x1A2F3F8, 0x1A31D18, "yay0", "yay_1a2f3f8_len_10c06"] - - [0x1A31D18, 0x1A33AB0, "yay0", "yay_1a31d18_len_22a6"] - - [0x1A33AB0, 0x1A35BB8, "yay0", "yay_1a33ab0_len_4106"] - - [0x1A35BB8, 0x1A369A8, "yay0", "yay_1a35bb8_len_2006"] - - [0x1A369A8, 0x1A39600, "yay0", "yay_1a369a8_len_9600"] - - [0x1A39600, 0x1A3B018, "yay0", "yay_1a39600_len_2014"] - - [0x1A3B018, 0x1A3C310, "yay0", "yay_1a3b018_len_4300"] - - [0x1A3C310, 0x1A3FCC8, "yay0", "yay_1a3c310_len_3cc2"] - - [0x1A3FCC8, 0x1A423D8, "yay0", "yay_1a3fcc8_len_40314"] - - [0x1A423D8, 0x1A449C0, "yay0", "yay_1a423d8_len_4822"] - - [0x1A449C0, 0x1A46568, "yay0", "yay_1a449c0_len_2422"] - - [0x1A46568, 0x1A49340, "yay0", "yay_1a46568_len_9212"] - - [0x1A49340, 0x1A4AC88, "yay0", "yay_1a49340_len_2c88"] - - [0x1A4AC88, 0x1A4D7E8, "yay0", "yay_1a4ac88_len_5362"] - - [0x1A4D7E8, 0x1A4E028, "yay0", "yay_1a4d7e8_len_2006"] - - [0x1A4E028, 0x1A4FA60, "yay0", "yay_1a4e028_len_1a56"] - - [0x1A4FA60, 0x1A531D0, "yay0", "yay_1a4fa60_len_10190"] - - [0x1A531D0, 0x1A53D48, "yay0", "yay_1a531d0_len_c08"] - - [0x1A53D48, 0x1A56C80, "yay0", "yay_1a53d48_len_4032"] - - [0x1A56C80, 0x1A58F58, "yay0", "yay_1a56c80_len_8358"] - - [0x1A58F58, 0x1A5A5A8, "yay0", "yay_1a58f58_len_20a4"] - - [0x1A5A5A8, 0x1A62B40, "yay0", "yay_1a5a5a8_len_20a14"] - - [0x1A62B40, 0x1A641F8, "yay0", "yay_1a62b40_len_40b6"] - - [0x1A641F8, 0x1A666F0, "yay0", "yay_1a641f8_len_2602"] - - [0x1A666F0, 0x1A68870, "yay0", "yay_1a666f0_len_8800"] - - [0x1A68870, 0x1A6C630, "yay0", "yay_1a68870_len_460a"] - - [0x1A6C630, 0x1A6D5A0, "yay0", "yay_1a6c630_len_118c"] - - [0x1A6D5A0, 0x1A6EF50, "yay0", "yay_1a6d5a0_len_2a4c"] - - [0x1A6EF50, 0x1A70FF0, "yay0", "yay_1a6ef50_len_100ae"] - - [0x1A70FF0, 0x1A74FC0, "yay0", "yay_1a70ff0_len_4000"] - - [0x1A74FC0, 0x1A78A40, "yay0", "yay_1a74fc0_len_803a"] - - [0x1A78A40, 0x1A79900, "yay0", "yay_1a78a40_len_1100"] - - [0x1A79900, 0x1A7D798, "yay0", "yay_1a79900_len_4698"] - - [0x1A7D798, 0x1A7EEA0, "yay0", "yay_1a7d798_len_2804"] - - [0x1A7EEA0, 0x1A7EFD8, "yay0", "yay_1a7eea0_len_158"] - - [0x1A7EFD8, 0x1A83450, "yay0", "yay_1a7efd8_len_81002"] - - [0x1A83450, 0x1A85668, "yay0", "yay_1a83450_len_4226"] - - [0x1A85668, 0x1A87958, "yay0", "yay_1a85668_len_2910"] - - [0x1A87958, 0x1A8BF98, "yay0", "yay_1a87958_len_8680"] - - [0x1A8BF98, 0x1A8FE28, "yay0", "yay_1a8bf98_len_4020"] - - [0x1A8FE28, 0x1A93EA0, "yay0", "yay_1a8fe28_len_10096"] - - [0x1A93EA0, 0x1A94188, "yay0", "yay_1a93ea0_len_4102"] - - [0x1A94188, 0x1A94480, "yay0", "yay_1a94188_len_476"] - - [0x1A94480, 0x1A946A8, "yay0", "yay_1a94480_len_226"] - - [0x1A946A8, 0x1A94A00, "yay0", "yay_1a946a8_len_956"] - - [0x1A94A00, 0x1A94C58, "yay0", "yay_1a94a00_len_456"] - - [0x1A94C58, 0x1A98D98, "yay0", "yay_1a94c58_len_8184"] - - [0x1A98D98, 0x1A9BA80, "yay0", "yay_1a98d98_len_3264"] - - [0x1A9BA80, 0x1A9DB68, "yay0", "yay_1a9ba80_len_4168"] - - [0x1A9DB68, 0x1AA0048, "yay0", "yay_1a9db68_len_20004"] - - [0x1AA0048, 0x1AA0698, "yay0", "yay_1aa0048_len_692"] - - [0x1AA0698, 0x1AA1008, "yay0", "yay_1aa0698_len_1000"] - - [0x1AA1008, 0x1AA6D58, "yay0", "yay_1aa1008_len_6d54"] - - [0x1AA6D58, 0x1AAD600, "yay0", "yay_1aa6d58_len_90a4"] - - [0x1AAD600, 0x1AB1BF0, "yay0", "yay_1aad600_len_109f0"] - - [0x1AB1BF0, 0x1AB2368, "yay0", "yay_1ab1bf0_len_2004"] - - [0x1AB2368, 0x1ABA290, "yay0", "yay_1ab2368_len_8086"] - - [0x1ABA290, 0x1AC14A8, "yay0", "yay_1aba290_len_41422"] - - [0x1AC14A8, 0x1AC3910, "yay0", "yay_1ac14a8_len_2902"] - - [0x1AC3910, 0x1ACBC98, "yay0", "yay_1ac3910_len_8488"] - - [0x1ACBC98, 0x1ACE058, "yay0", "yay_1acbc98_len_4042"] - - [0x1ACE058, 0x1ACF910, "yay0", "yay_1ace058_len_1902"] - - [0x1ACF910, 0x1AD06D8, "yay0", "yay_1acf910_len_106c8"] - - [0x1AD06D8, 0x1AD0B98, "yay0", "yay_1ad06d8_len_904"] - - [0x1AD0B98, 0x1AD1E90, "yay0", "yay_1ad0b98_len_1400"] - - [0x1AD1E90, 0x1AD2348, "yay0", "yay_1ad1e90_len_2146"] - - [0x1AD2348, 0x1AD27F8, "yay0", "yay_1ad2348_len_4b2"] - - [0x1AD27F8, 0x1AD28A8, "yay0", "yay_1ad27f8_len_800"] - - [0x1AD28A8, 0x1AD44F0, "yay0", "yay_1ad28a8_len_4446"] - - [0x1AD44F0, 0x1AD4758, "yay0", "yay_1ad44f0_len_304"] - - [0x1AD4758, 0x1AD57C0, "yay0", "yay_1ad4758_len_1080"] - - [0x1AD57C0, 0x1AD9D50, "yay0", "yay_1ad57c0_len_880c"] - - [0x1AD9D50, 0x1ADA498, "yay0", "yay_1ad9d50_len_2082"] - - [0x1ADA498, 0x1ADCFC0, "yay0", "yay_1ada498_len_4b26"] - - [0x1ADCFC0, 0x1AE2168, "yay0", "yay_1adcfc0_len_22024"] - - [0x1AE2168, 0x1AE2EA0, "yay0", "yay_1ae2168_len_e96"] - - [0x1AE2EA0, 0x1AE6A58, "yay0", "yay_1ae2ea0_len_4058"] - - [0x1AE6A58, 0x1AEB778, "yay0", "yay_1ae6a58_len_9524"] - - [0x1AEB778, 0x1AF4958, "yay0", "yay_1aeb778_len_14802"] - - [0x1AF4958, 0x1AFCB18, "yay0", "yay_1af4958_len_8202"] - - [0x1AFCB18, 0x1AFF748, "yay0", "yay_1afcb18_len_3442"] - - [0x1AFF748, 0x1B00640, "yay0", "yay_1aff748_len_100000"] - - [0x1B00640, 0x1B01390, "yay0", "yay_1b00640_len_118a"] - - [0x1B01390, 0x1B01C08, "yay0", "yay_1b01390_len_c04"] - - [0x1B01C08, 0x1B02128, "yay0", "yay_1b01c08_len_2120"] - - [0x1B02128, 0x1B02970, "yay0", "yay_1b02128_len_844"] - - [0x1B02970, 0x1B03118, "yay0", "yay_1b02970_len_1004"] - - [0x1B03118, 0x1B03C18, "yay0", "yay_1b03118_len_c04"] - - [0x1B03C18, 0x1B045E8, "yay0", "yay_1b03c18_len_41e2"] - - [0x1B045E8, 0x1B04FC0, "yay0", "yay_1b045e8_len_a12"] - - [0x1B04FC0, 0x1B05998, "yay0", "yay_1b04fc0_len_1012"] - - [0x1B05998, 0x1B06C88, "yay0", "yay_1b05998_len_2400"] - - [0x1B06C88, 0x1B07C48, "yay0", "yay_1b06c88_len_1046"] - - [0x1B07C48, 0x1B09440, "yay0", "yay_1b07c48_len_8034"] - - [0x1B09440, 0x1B0B290, "yay0", "yay_1b09440_len_228e"] - - [0x1B0B290, 0x1B0B9A0, "yay0", "yay_1b0b290_len_90c"] - - [0x1B0B9A0, 0x1B0C548, "yay0", "yay_1b0b9a0_len_4448"] - - [0x1B0C548, 0x1B0CAC0, "yay0", "yay_1b0c548_len_ab4"] - - [0x1B0CAC0, 0x1B0D130, "yay0", "yay_1b0cac0_len_1130"] - - [0x1B0D130, 0x1B0EB80, "yay0", "yay_1b0d130_len_2a4c"] - - [0x1B0EB80, 0x1B10CC0, "yay0", "yay_1b0eb80_len_1043e"] - - [0x1B10CC0, 0x1B129A0, "yay0", "yay_1b10cc0_len_2120"] - - [0x1B129A0, 0x1B13548, "yay0", "yay_1b129a0_len_1444"] - - [0x1B13548, 0x1B16420, "yay0", "yay_1b13548_len_4016"] - - [0x1B16420, 0x1B17128, "yay0", "yay_1b16420_len_1104"] - - [0x1B17128, 0x1B17840, "yay0", "yay_1b17128_len_814"] - - [0x1B17840, 0x1B19318, "yay0", "yay_1b17840_len_8316"] - - [0x1B19318, 0x1B1A030, "yay0", "yay_1b19318_len_2020"] - - [0x1B1A030, 0x1B1B8C8, "yay0", "yay_1b1a030_len_18c6"] - - [0x1B1B8C8, 0x1B1BC88, "yay0", "yay_1b1b8c8_len_402"] - - [0x1B1BC88, 0x1B1C7A0, "yay0", "yay_1b1bc88_len_4316"] - - [0x1B1C7A0, 0x1B1CD28, "yay0", "yay_1b1c7a0_len_808"] - - [0x1B1CD28, 0x1B21C48, "yay0", "yay_1b1cd28_len_21040"] - - [0x1B21C48, 0x1B23290, "yay0", "yay_1b21c48_len_2290"] - - [0x1B23290, 0x1B253E0, "yay0", "yay_1b23290_len_414c"] - - [0x1B253E0, 0x1B26660, "yay0", "yay_1b253e0_len_241c"] - - [0x1B26660, 0x1B283F8, "yay0", "yay_1b26660_len_8192"] - - [0x1B283F8, 0x1B29C60, "yay0", "yay_1b283f8_len_1c02"] - - [0x1B29C60, 0x1B2A688, "yay0", "yay_1b29c60_len_2284"] - - [0x1B2A688, 0x1B2B3E8, "yay0", "yay_1b2a688_len_1166"] - - [0x1B2B3E8, 0x1B2C8D8, "yay0", "yay_1b2b3e8_len_4810"] - - [0x1B2C8D8, 0x1B2D7B0, "yay0", "yay_1b2c8d8_len_1722"] - - [0x1B2D7B0, 0x1B2E328, "yay0", "yay_1b2d7b0_len_2006"] - - [0x1B2E328, 0x1B2ED60, "yay0", "yay_1b2e328_len_c52"] - - [0x1B2ED60, 0x1B2FA18, "yay0", "yay_1b2ed60_len_1218"] - - [0x1B2FA18, 0x1B31A18, "yay0", "yay_1b2fa18_len_10002"] - - [0x1B31A18, 0x1B33000, "yay0", "yay_1b31a18_len_25e2"] - - [0x1B33000, 0x1B34098, "yay0", "yay_1b33000_len_4096"] - - [0x1B34098, 0x1B34928, "yay0", "yay_1b34098_len_920"] - - [0x1B34928, 0x1B34C00, "yay0", "yay_1b34928_len_2d4"] - - [0x1B34C00, 0x1B35480, "yay0", "yay_1b34c00_len_107e"] - - [0x1B35480, 0x1B36440, "yay0", "yay_1b35480_len_2040"] - - [0x1B36440, 0x1B38748, "yay0", "yay_1b36440_len_8306"] - - [0x1B38748, 0x1B39A98, "yay0", "yay_1b38748_len_1894"] - - [0x1B39A98, 0x1B3A2E8, "yay0", "yay_1b39a98_len_2062"] - - [0x1B3A2E8, 0x1B3A818, "yay0", "yay_1b3a2e8_len_816"] - - [0x1B3A818, 0x1B3C488, "yay0", "yay_1b3a818_len_4482"] - - [0x1B3C488, 0x1B3CAC8, "yay0", "yay_1b3c488_len_a44"] - - [0x1B3CAC8, 0x1B3D0A0, "yay0", "yay_1b3cac8_len_1012"] - - [0x1B3D0A0, 0x1B3D920, "yay0", "yay_1b3d0a0_len_91a"] - - [0x1B3D920, 0x1B3F060, "yay0", "yay_1b3d920_len_205c"] - - [0x1B3F060, 0x1B40048, "yay0", "yay_1b3f060_len_40008"] - - [0x1B40048, 0x1B40720, "yay0", "yay_1b40048_len_714"] - - [0x1B40720, 0x1B49570, "yay0", "yay_1b40720_len_904e"] - - [0x1B49570, 0x1B4C3E8, "yay0", "yay_1b49570_len_4288"] - - [0x1B4C3E8, 0x1B4DEA0, "yay0", "yay_1b4c3e8_len_1c12"] - - [0x1B4DEA0, 0x1B4FD98, "yay0", "yay_1b4dea0_len_2116"] - - [0x1B4FD98, 0x1B50CD8, "yay0", "yay_1b4fd98_len_10040"] - - [0x1B50CD8, 0x1B51B08, "yay0", "yay_1b50cd8_len_1302"] - - [0x1B51B08, 0x1B54258, "yay0", "yay_1b51b08_len_4052"] - - [0x1B54258, 0x1B580A0, "yay0", "yay_1b54258_len_8082"] - - [0x1B580A0, 0x1B5A248, "yay0", "yay_1b580a0_len_2242"] - - [0x1B5A248, 0x1B5BB88, "yay0", "yay_1b5a248_len_1980"] - - [0x1B5BB88, 0x1B5CC90, "yay0", "yay_1b5bb88_len_4406"] - - [0x1B5CC90, 0x1B5E968, "yay0", "yay_1b5cc90_len_2168"] - - [0x1B5E968, 0x1B5ED88, "yay0", "yay_1b5e968_len_482"] - - [0x1B5ED88, 0x1B608C0, "yay0", "yay_1b5ed88_len_20040"] - - [0x1B608C0, 0x1B625F8, "yay0", "yay_1b608c0_len_2534"] - - [0x1B625F8, 0x1B633D0, "yay0", "yay_1b625f8_len_1202"] - - [0x1B633D0, 0x1B64878, "yay0", "yay_1b633d0_len_4824"] - - [0x1B64878, 0x1B657E0, "yay0", "yay_1b64878_len_1786"] - - [0x1B657E0, 0x1B65A08, "yay0", "yay_1b657e0_len_808"] - - [0x1B65A08, 0x1B65E50, "yay0", "yay_1b65a08_len_444"] - - [0x1B65E50, 0x1B66238, "yay0", "yay_1b65e50_len_2024"] - - [0x1B66238, 0x1B69580, "yay0", "yay_1b66238_len_9542"] - - [0x1B69580, 0x1B6C318, "yay0", "yay_1b69580_len_4218"] - - [0x1B6C318, 0x1B6DD98, "yay0", "yay_1b6c318_len_1c80"] - - [0x1B6DD98, 0x1B6F150, "yay0", "yay_1b6dd98_len_2046"] - - [0x1B6F150, 0x1B71618, "yay0", "yay_1b6f150_len_10608"] - - [0x1B71618, 0x1B72890, "yay0", "yay_1b71618_len_2882"] - - [0x1B72890, 0x1B73B08, "yay0", "yay_1b72890_len_1302"] - - [0x1B73B08, 0x1B747B8, "yay0", "yay_1b73b08_len_44b0"] - - [0x1B747B8, 0x1B76E30, "yay0", "yay_1b747b8_len_2800"] - - [0x1B76E30, 0x1B78EC0, "yay0", "yay_1b76e30_len_808a"] - - [0x1B78EC0, 0x1B79A20, "yay0", "yay_1b78ec0_len_101c"] - - [0x1B79A20, 0x1B79F08, "yay0", "yay_1b79a20_len_508"] - - [0x1B79F08, 0x1B7AA08, "yay0", "yay_1b79f08_len_2004"] - - [0x1B7AA08, 0x1B7B008, "yay0", "yay_1b7aa08_len_1000"] - - [0x1B7B008, 0x1B7BB50, "yay0", "yay_1b7b008_len_b44"] - - [0x1B7BB50, 0x1B7EC68, "yay0", "yay_1b7bb50_len_4424"] - - [0x1B7EC68, 0x1B7FF48, "yay0", "yay_1b7ec68_len_1300"] - - [0x1B7FF48, 0x1B81E88, "yay0", "yay_1b7ff48_len_80086"] - - [0x1B81E88, 0x1B82058, "yay0", "yay_1b81e88_len_2050"] - - [0x1B82058, 0x1B82202, "yay0", "yay_1b82058_len_202"] - - [0x1B82202, 0x1E40000, "bin", "bin_1b82202"] - - [0x1E40000, 0x27FEE22, "Map_Assets.FS", "map_assets_fs_1e40000_len_9b7cea"] - - [0x27FEE22, 0x2800000, "bin", "bin_27fee22"] - -# Labels for functions or data memory addresses -# All label addresses are RAM addresses -# Order does not matter -labels: - - [0x80025C00, "entry_point"] - - [0x80025F70, "boot_main"] - - [0x8002605C, "gfxRetrace_Callback"] - - [0x8002670C, "gfxPreNMI_Callback"] - - [0x80026740, "step_game_loop"] - - [0x80026B08, "gfx_draw_frame"] - - [0x80026DDC, "load_engine_data"] - - [0x80028874, "update_input"] - - [0x80028EE0, "poll_rumble"] - - [0x80028F08, "start_rumble"] - - [0x80028FF0, "length2D"] - - [0x80029030, "_heap_create"] - - [0x8002906C, "_heap_malloc"] - - [0x80029164, "_heap_malloc_tail"] - - [0x8002921C, "_heap_free"] - - [0x800292C4, "_heap_realloc"] - - [0x800293D4, "cosine"] - - [0x800294B0, "sign"] - - [0x800294C4, "int_to_string"] - - [0x80029600, "mem_clear"] - - [0x80029620, "transform_point"] - - [0x80029720, "copy_matrix"] - - [0x8002973C, "dma_copy"] - - [0x80029900, "_advance_rng"] - - [0x800299FC, "rand_int"] - - [0x80029A7C, "signF"] - - [0x80029AC4, "round"] - - [0x80029B24, "clamp_angle"] - - [0x80029C28, "get_clamped_angle_diff"] - - [0x80029C80, "atan2"] - - [0x80029E20, "get_player_normal_yaw"] - - [0x80029E50, "get_player_normal_pitch"] - - [0x80029ED4, "dist2D"] - - [0x80029F2C, "dist3D"] - - [0x80029F9C, "add_vec2D_polar"] - - [0x8002A034, "_wrap_trig_lookup_value"] - - [0x8002A0B4, "sin_cos_rad"] - - [0x8002A16C, "sin_rad"] - - [0x8002A1D0, "cos_rad"] - - [0x8002A234, "sin_cos_deg"] - - [0x8002A2EC, "sin_deg"] - - [0x8002A350, "cos_deg"] - - [0x8002A3B4, "update_lerp"] - - [0x8002AC00, "general_heap_create"] - - [0x8002AC28, "general_heap_malloc"] - - [0x8002AC50, "general_heap_malloc_tail"] - - [0x8002AC78, "general_heap_free"] - - [0x8002ACA0, "battle_heap_create"] - - [0x8002ACE4, "heap_malloc"] - - [0x8002AD2C, "heap_free"] - - [0x8002AD74, "collision_heap_create"] - - [0x8002ADB0, "collision_heap_malloc"] - - [0x8002ADF4, "collision_heap_free"] - - [0x8002AE40, "get_spirits_rescued"] - - [0x8002AF40, "fio_calc_header_checksum"] - - [0x8002AF70, "fio_validate_header_checksums"] - - [0x8002AFD8, "fio_has_valid_backup"] - - [0x8002B04C, "fio_flush_backups"] - - [0x8002B0D0, "fio_calc_file_checksum"] - - [0x8002B0F8, "fio_validate_file_checksum"] - - [0x8002B154, "fio_fetch_saved_file_info"] - - [0x8002B2D0, "fio_load_game"] - - [0x8002B374, "fio_save_game"] - - [0x8002B42C, "fio_erase_game"] - - [0x8002B490, "fio_deserialize_state"] - - [0x8002B630, "fio_serialize_state"] - - [0x8002B84C, "fio_init_flash"] - - [0x8002B868, "fio_read_flash"] - - [0x8002B948, "fio_write_flash"] - - [0x8002BA1C, "fio_erase_flash"] - - [0x8002BF40, "crash_delay_msec"] - - [0x8002C208, "crash_printf_string"] - - [0x8002C2B8, "crash_print_fpr"] - - [0x8002C3B0, "crash_show_handler"] - - [0x8002C81C, "crash_monitor_thread"] - - [0x8002C8B0, "crash_create_monitor"] - - [0x8002CA40, "nuGfxTaskMgr"] - - [0x8002CB38, "nuGfxTaskMgrInit"] - - [0x8002CCC4, "nuGfxTaskStart"] - - [0x8002CE30, "nuSiMgrInit"] - - [0x8002CF28, "nuSiSendMesg"] - - [0x8002CF8C, "nuSiMgrStop"] - - [0x8002CFAC, "nuSiMgrRestart"] - - [0x8002CFD0, "nuSiMgrThread"] - - [0x8002D400, "update_cameras"] - - [0x8002D73C, "render_frame"] - - [0x8002E314, "set_cam_viewport"] - - [0x8002E4E8, "get_cam_viewport"] - - [0x8002E538, "get_screen_coords"] - - [0x8002DEF4, "create_cameras_a"] - - [0x8002E038, "create_cameras_b"] - - [0x8002E16C, "initialize_next_camera"] - - [0x8002E910, "do_camera_type_4"] - - [0x8002ECF8, "do_camera_type_2"] - - [0x8002F290, "do_camera_type_1"] - - [0x8002F850, "do_camera_type_0"] - - [0x8002F990, "do_camera_type_6"] - - [0x8002FCE0, "do_camera_type_unused"] - - [0x80030000, "do_camera_type_5"] - - [0x80030458, "test_ray_zone_aabb"] - - [0x80031494, "do_camera_type_3"] - - [0x800334F0, "set_game_mode"] - - [0x80033528, "get_game_mode"] - - [0x800338D0, "start_battle_countdown"] - - [0x800338E4, "step_battle"] - - [0x8003497C, "step_pause_menu"] - - [0x80035D54, "step_world"] - - [0x80038080, "init_demo_data"] - - [0x800380F4, "next_demo_scene"] - - [0x80038478, "mtx_ident_mirror_y"] - - [0x8003852C, "init_npc_list"] - - [0x800389CC, "free_npc"] - - [0x80038ADC, "get_npc_by_index"] - - [0x8003A7F0, "render_npcs"] - - [0x8003AA54, "npc_move_heading"] - - [0x8003AAEC, "get_npc_unsafe"] - - [0x8003AB48, "get_npc_safe"] - - [0x8003ABA0, "enable_npc_shadow"] - - [0x8003ABFC, "disable_npc_shadow"] - - [0x8003AD24, "enable_npc_blur"] - - [0x8003ADAC, "disable_npc_blur"] - - [0x8003ADF8, "update_npc_blur"] - - [0x8003AE38, "render_npc_blur"] - - [0x8003B340, "set_npc_yaw"] - - [0x8003E400, "clear_encounter_status"] - - [0x8003E678, "make_npcs"] - - [0x8003E730, "kill_encounter"] - - [0x8003E7AC, "kill_enemy"] - - [0x8003E2E0, "COPY_set_defeated"] - - [0x8003E94C, "bind_enemy_ai"] - - [0x8003E9B4, "bind_enemy_aux"] - - [0x8003EA1C, "bind_enemy_interact"] - - [0x8003EA84, "bind_npc_ai"] - - [0x8003EB50, "bind_npc_aux"] - - [0x8003EC1C, "bind_npc_interact"] - - [0x8003ECE8, "get_enemy"] - - [0x8003ED68, "get_enemy_safe"] - - [0x8003EDF0, "get_defeated"] - - [0x8003EE40, "set_defeated"] - - [0x8003F398, "GetCamLookAtObjVector"] - - [0x8003F3F4, "HasMerleeCasts"] - - [0x8003F580, "OnDefeatEnemy"] - - [0x8003F6E8, "OnFleeBattleDrops"] - - [0x80041C5C, "show_first_strike_message"] - - [0x800436B0, "create_npcs"] - - [0x80044180, "SetEncounterStatusFlags"] - - [0x80044264, "LoadDemoBattle"] - - [0x80044298, "MakeNpcs"] - - [0x80044340, "RemoveNpc"] - - [0x80044478, "RemoveEncounter"] - - [0x8004457C, "GetBattleOutcome"] - - [0x80044600, "GetOwnerEncountered"] - - [0x800446B4, "start_battle"] - - [0x8004462C, "DoNpcDefeat"] - - [0x80044840, "StartBattle"] - - [0x80044860, "StartBattleWith"] - - [0x8004489C, "StartBossBattle"] - - [0x80044A38, "SetBattleMusic"] - - [0x80044A78, "BindNpcAI"] - - [0x80044BAC, "BindNpcIdle"] - - [0x80044C2C, "RestartNpcAI"] - - [0x80044CF0, "EnableNpcAI"] - - [0x80044DA4, "SetNpcAux"] - - [0x80044EB8, "BindNpcAux"] - - [0x80044F38, "RestartNpcAux"] - - [0x80044FF0, "EnableNpcAux"] - - [0x800450A4, "BindNpcInteract"] - - [0x80045140, "BindNpcHit"] - - [0x800451DC, "BindNpcDefeat"] - - [0x8004525C, "SetSelfVar"] - - [0x800452C0, "GetSelfVar"] - - [0x80045320, "SetNpcVar"] - - [0x800453BC, "GetNpcVar"] - - [0x8004545C, "SetSelfRotation"] - - [0x8004550C, "SetSelfEnemyFlags"] - - [0x80045524, "SetSelfEnemyFlagBits"] - - [0x80045614, "GetSelfNpcID"] - - [0x80045640, "ClearDefeatedEnemies"] - - [0x80045688, "SetEnemyFlagBits"] - - [0x80045734, "GetSelfAnimationFromTable"] - - [0x80077E38, "NpcDefeat"] - - [0x80048D50, "get_coin_drop_amount"] - - [0x80048280, "spawn_drops"] - - [0x80048FD4, "is_point_within_region"] - - [0x8004B074, "nuAuDmaCallBack"] - - [0x8004B224, "nuAuDmaNew"] - - [0x8004B268, "nuAuCleanDMABuffers"] - - [0x8004B3EC, "alLink"] - - [0x8004B40C, "alUnlink"] - - [0x800542BC, "al_LoadINIT"] - - [0x8005447C, "al_CopyFileTableEntry"] - - [0x800544F8, "al_LoadPER"] - - [0x800545B4, "al_LoadPRG"] - - [0x800547C8, "al_LoadBank"] - - [0x80054E00, "al_DmaCopy"] - - [0x80054F74, "al_CopyWords"] - - [0x80054FC0, "al_LoadBKHeaders"] - - [0x800565C0, "alAudioFrame"] - - [0x80057F90, "alHeapAlloc"] - - [0x80059EF4, "render_effects"] - - [0x8005A450, "remove_effect"] - - [0x8005A4E0, "remove_all_effects"] - - [0x8005A564, "play_effect"] - - [0x8005A6C0, "load_map_script_lib"] - - [0x8005A6F4, "load_map_by_IDs"] - - [0x8005ABD8, "get_current_map_config"] - - [0x8005ABE8, "get_current_map_header"] - - [0x8005ABF8, "get_map_IDs_by_name"] - - [0x8005ACE8, "load_asset_by_name"] - - [0x8005ADD0, "get_asset_offset"] - - [0x8005AEA0, "allocate_hit_tables"] - - [0x8005AF94, "initialize_collision"] - - [0x8005AFC0, "load_hit_asset"] - - [0x8005B058, "load_collision"] - - [0x8005B1A0, "load_stage_collision"] - - [0x8005B23C, "load_hit_data"] - - [0x8005B780, "parent_collider_to_model"] - - [0x8005B9A0, "_add_hit_vert_to_buffer"] - - [0x8005B9F4, "_get_hit_vert_index_from_buffer"] - - [0x8005BA24, "update_collider_transform"] - - [0x8005BDA8, "get_collider_type_by_id"] - - [0x8005BE10, "get_collider_center"] - - [0x8005BE84, "test_ray_triangle_general"] - - [0x8005C49C, "test_down_ray_triangle"] - - [0x8005C7A4, "test_up_ray_triangle"] - - [0x8005CCD0, "test_ray_colliders"] - - [0x8005D124, "test_ray_zones"] - - [0x8005D2DC, "test_up_ray_collider"] - - [0x8005D448, "test_ray_entities"] - - [0x8005DE10, "get_npc_pos"] - - [0x8005E8B0, "nuBoot"] - - [0x8005E90C, "boot_idle"] - - [0x8005E9B0, "nuScCreateScheduler"] - - [0x8005EBE0, "nuScExecuteAudio"] - - [0x8005ED14, "nuScExecuteGraphics"] - - [0x8005EE30, "nuScAddClient"] - - [0x8005EEBC, "nuScRemoveClient"] - - [0x8005EF38, "nuScResetClientMesgType"] - - [0x8005EF78, "nuScGetGfxMQ"] - - [0x8005EF84, "nuScGetAudioMQ"] - - [0x8005EF90, "nuScSetFrameBufferNum"] - - [0x8005EF9C, "nuScGetFrameRate"] - - [0x8005EFA8, "nuScEventHandler"] - - [0x8005F0C0, "nuScEventBroadcast"] - - [0x8005F120, "nuScWaitTaskReady"] - - [0x8005F250, "nuGfxFuncSet"] - - [0x8005F290, "nuGfxPreNMIFuncSet"] - - [0x8005F2D0, "nuGfxTaskAllEndWait"] - - [0x8005F2F0, "nuGfxSetCfb"] - - [0x8005F400, "nuGfxDisplayOff"] - - [0x8005F430, "nuGfxDisplayOn"] - - [0x8005F450, "nuPiInit"] - - [0x8005F490, "nuPiReadRom"] - - [0x8005F560, "nuGfxInit"] - - [0x8005F610, "nuContInit"] - - [0x8005F650, "nuContDataGet"] - - [0x8005F6B0, "nuContPakMgrInit"] - - [0x8005F6D4, "nuContPakMgrRemove"] - - [0x8005F6F8, "contPakOpen"] - - [0x8005F748, "contPakFree"] - - [0x8005F770, "contPakFileReadWrite"] - - [0x8005F7B0, "contPakFileOpen"] - - [0x8005F864, "contPakFileDelete"] - - [0x8005F8A4, "contPakFileState"] - - [0x8005F8D0, "contPakFileNum"] - - [0x8005F8FC, "contPakRepairId"] - - [0x8005F920, "osMotorStop"] - - [0x8005FB10, "contRmbControl"] - - [0x8005FC8C, "nuContRmbMgrInit"] - - [0x8005FCEC, "nuContRmbMgrRemove"] - - [0x8005FD10, "contRmbCheckMesg"] - - [0x8005FD58, "contRmbStartMesg"] - - [0x8005FE90, "nuContRmbStart"] - - [0x8005FEF0, "nuContRmbCheck"] - - [0x8005FF90, "nuContRmbModeSet"] - - [0x800600A0, "nuContRmbForceStop"] - - [0x800600C0, "nuContRmbForceStopEnd"] - - [0x800600E0, "nuPiReadRomOverlay"] - - [0x800601F0, "nuGfxThreadStart"] - - [0x80060248, "nuGfxThread"] - - [0x80060310, "nuGfxSwapCfbFuncSet"] - - [0x80060350, "nuGfxSwapCfb"] - - [0x80060370, "nuGfxRetraceWait"] - - [0x800603F0, "nuSiCallBackAdd"] - - [0x80060490, "nuSiCallBackRemove"] - - [0x80060510, "nuContMgrInit"] - - [0x800605E8, "nuContMgrRemove"] - - [0x8006060C, "nuContDataClose"] - - [0x80060634, "nuContDataOpen"] - - [0x8006065C, "contRetrace"] - - [0x80060738, "contReadData"] - - [0x800607B4, "contReadNW"] - - [0x80060870, "contQuery"] - - [0x800608C0, "nuContDataLock"] - - [0x800608F0, "nuContDataUnLock"] - - [0x80060920, "nuContQueryRead"] - - [0x80060940, "osSetIntMask"] - - [0x800609E0, "osCreatePiManager"] - - [0x80060B70, "osEPiRawStartDma"] - - [0x80060D60, "osEPiWriteIo"] - - [0x80060DC0, "osEPiReadIo"] - - [0x80060E20, "osEPiStartDma"] - - [0x80060EC0, "osEPiLinkHandle"] - - [0x80060F10, "osCartRomInit"] - - [0x80061090, "osDevMgrMain"] - - [0x80061450, "osPiCreateAccessQueue"] - - [0x800614A4, "osPiGetAccess"] - - [0x80061510, "osPiRelAccess"] - - [0x80061540, "osAiGetLength"] - - [0x80061550, "osAiGetStatus"] - - [0x80061560, "osAiSetFrequency"] - - [0x80061680, "osAiSetNextBuffer"] - - [0x80061720, "osInvalDCache"] - - [0x800617D0, "osInvalICache"] - - [0x80061850, "osWritebackDCache"] - - [0x800618D0, "osWritebackDCacheAll"] - - [0x80061900, "osContStartQuery"] - - [0x80061980, "osContGetQuery"] - - [0x800619A0, "osContStartReadData"] - - [0x80061A28, "osContGetReadData"] - - [0x80061AC4, "osPackReadData"] - - [0x80061B80, "osContInit"] - - [0x80061D1C, "osContGetInitData"] - - [0x80061DD0, "osPackRequestData"] - - [0x80061E90, "osVirtualToPhysical"] - - [0x80061EF0, "sqrtf"] - - [0x80061F00, "coss"] - - [0x80061F30, "guFrustumF"] - - [0x80062060, "guFrustum"] - - [0x800621B0, "guLookAtF"] - - [0x80062530, "guLookAt"] - - [0x800628C0, "guLookAtHiliteF"] - - [0x80063244, "guLookAtHilite"] - - [0x80063320, "guLookAtReflectF"] - - [0x80063898, "guLookAtReflect"] - - [0x80063910, "guOrthoF"] - - [0x80063A40, "guOrtho"] - - [0x80063B90, "guPerspectiveF"] - - [0x80063D40, "guPerspective"] - - [0x80063F10, "guPositionF"] - - [0x800640E8, "guPosition"] - - [0x800642D0, "guRotateAnglesF"] - - [0x80064458, "guRotateAngles"] - - [0x800645F0, "sins"] - - [0x80064650, "bcopy"] - - [0x80064970, "bzero"] - - [0x80064A10, "strchr"] - - [0x80064A50, "strlen"] - - [0x80064A74, "memcpy"] - - [0x80064AA0, "_Printf"] - - [0x80065020, "_Putfld"] - - [0x800654F0, "sprintf"] - - [0x80065548, "proutSprintf"] - - [0x80065580, "osCreateMesgQueue"] - - [0x800655B0, "osJamMesg"] - - [0x800656F0, "osRecvMesg"] - - [0x80065820, "osSendMesg"] - - [0x80065950, "osSetEventMesg"] - - [0x80065A00, "osGetCount"] - - [0x80065A10, "osSpTaskLoad"] - - [0x80065C1C, "osSpTaskStartGo"] - - [0x80065C50, "osSpTaskYield"] - - [0x80065C70, "osSpTaskYielded"] - - [0x80065CC0, "osSiRawStartDma"] - - [0x80065D70, "osSiCreateAccessQueue"] - - [0x80065DC4, "osSiGetAccess"] - - [0x80065E30, "osSiRelAccess"] - - [0x80065E60, "osCreateThread"] - - [0x80065F30, "osGetThreadPri"] - - [0x80065F50, "osSetThreadPri"] - - [0x80066020, "osStartThread"] - - [0x80066140, "osStopThread"] - - [0x80066200, "osDequeueThread"] - - [0x80066240, "osYieldThread"] - - [0x80066290, "osGetActiveQueue"] - - [0x800662A0, "osGetTime"] - - [0x80066330, "osSetTime"] - - [0x80066350, "osSetTimer"] - - [0x80066480, "osTimerServicesInit"] - - [0x800664D4, "osTimerInterrupt"] - - [0x80066610, "osSetTimerIntr"] - - [0x80066690, "osInsertTimer"] - - [0x800667A0, "osMapTLB"] - - [0x80066860, "osProbeTLB"] - - [0x80066920, "osUnmapTLB"] - - [0x80066960, "osUnmapTLBAll"] - - [0x800669B0, "osViGetCurrentFramebuffer"] - - [0x800669F0, "osViGetNextFramebuffer"] - - [0x80066A30, "osViGetCurrentMode"] - - [0x80066A70, "osCreateViManager"] - - [0x80066C10, "viMgrMain"] - - [0x80066DB0, "osViSetEvent"] - - [0x80066E10, "osViSetMode"] - - [0x80066E60, "osViSetSpecialFeatures"] - - [0x80066FD0, "osViSetYScale"] - - [0x80067020, "osViSwapBuffer"] - - [0x80067070, "osViSwapContext"] - - [0x80067380, "osViBlack"] - - [0x800673E0, "osViRepeatLine"] - - [0x80067440, "guMtxIdent"] - - [0x800674A0, "guMtxIdentF"] - - [0x80067500, "guMtxF2L"] - - [0x80067580, "guMtxL2F"] - - [0x80067600, "guMtxCatF"] - - [0x80067700, "guScale"] - - [0x800677C0, "guScaleF"] - - [0x80067820, "guTranslate"] - - [0x80067900, "guTranslateF"] - - [0x80067960, "guMtxCat"] - - [0x800679E0, "guMtxXFML"] - - [0x80067A70, "guMtxXFMF"] - - [0x80067B20, "guRotateF"] - - [0x80067C80, "guRotate"] - - [0x80067E00, "osMotorAccess"] - - [0x80067F44, "osMotorInit"] - - [0x80068190, "osPfsAllocateFile"] - - [0x8006849C, "osPfsDeclearPage"] - - [0x800685C0, "osPfsDeleteFile"] - - [0x8006876C, "osPfsReleasePages"] - - [0x800687E0, "osPfsReadWriteFile"] - - [0x80068C20, "osPfsFileState"] - - [0x80068DC0, "osPfsFindFile"] - - [0x80068F80, "osPfsFreeBlocks"] - - [0x80069090, "osPfsNumFiles"] - - [0x80069190, "osPfsInitPak"] - - [0x80069388, "osPfsCheckRamArea"] - - [0x80069460, "osPfsRepairId"] - - [0x800694C0, "osPfsGetStatus"] - - [0x800695B0, "osPfsRequestOneChannel"] - - [0x80069644, "osPfsGetOneChannelData"] - - [0x800696D0, "osPfsSelectBank"] - - [0x80069740, "osSumcalc"] - - [0x80069774, "osIdCheckSum"] - - [0x800697B8, "osRepairPackId"] - - [0x80069AA4, "osCheckPackId"] - - [0x80069C08, "osGetId"] - - [0x80069DD4, "osCheckId"] - - [0x80069E8C, "osPfsRWInode"] - - [0x8006A1D0, "osContRamRead"] - - [0x8006A3C0, "osContRamWrite"] - - [0x8006A630, "osAfterPreNMI"] - - [0x8006A708, "osInitialize"] - - [0x8006AA00, "osExceptionPreamble"] - - [0x8006AA34, "savecontext"] - - [0x8006AB34, "savercp"] - - [0x8006AB6C, "endrcp"] - - [0x8006AC08, "handle_interrupt"] - - [0x8006AC0C, "next_interrupt"] - - [0x8006AC44, "IP6_Hdlr"] - - [0x8006AC50, "IP7_Hdlr"] - - [0x8006AC5C, "counter"] - - [0x8006AC80, "cart"] - - [0x8006ACC8, "rcp"] - - [0x8006AD2C, "sp_other_break"] - - [0x8006AD3C, "vi"] - - [0x8006AD64, "ai"] - - [0x8006AD90, "si"] - - [0x8006ADB8, "pi"] - - [0x8006AE0C, "dp"] - - [0x8006AE30, "NoMoreRcpInts"] - - [0x8006AE3C, "prenmi"] - - [0x8006AE6C, "firstnmi"] - - [0x8006AEA0, "sw2"] - - [0x8006AEC4, "sw1"] - - [0x8006AEE8, "handle_break"] - - [0x8006AF00, "redispatch"] - - [0x8006AF34, "enqueueRunning"] - - [0x8006AF4C, "panic"] - - [0x8006AF7C, "send_mesg"] - - [0x8006AFC4, "send_done"] - - [0x8006B038, "handle_CPU"] - - [0x8006B06C, "osEnqueueAndYield"] - - [0x8006B16C, "noEnqueue"] - - [0x8006B174, "osEnqueueThread"] - - [0x8006B1BC, "osPopThread"] - - [0x8006B1CC, "osNop"] - - [0x8006B1D4, "osDispatchThread"] - - [0x8006B1F4, "osDispatchThreadSave"] - - [0x8006B350, "osCleanupThread"] - - [0x8006B360, "osDisableInt"] - - [0x8006B3D0, "osRestoreInt"] - - [0x8006B3F0, "osSetGlobalIntMask"] - - [0x8006B430, "osResetGlobalIntMask"] - - [0x8006B480, "osPiRawStartDma"] - - [0x8006B550, "osPiGetCmdQueue"] - - [0x8006B570, "osEPiRawReadIo"] - - [0x8006B6E0, "osEPiRawWriteIo"] - - [0x8006B850, "osAiDeviceBusy"] - - [0x8006B870, "bcmp"] - - [0x8006B980, "_Litob"] - - [0x8006BBD0, "_Ldtob"] - - [0x8006C01C, "_Ldunscale"] - - [0x8006C0B4, "_Genld"] - - [0x8006C660, "osGetCause"] - - [0x8006C670, "osGetSR"] - - [0x8006C680, "osSetCompare"] - - [0x8006C690, "osSetFpcCsr"] - - [0x8006C6A0, "osSetSR"] - - [0x8006C6B0, "osSetWatchLo"] - - [0x8006C6C0, "osSpDeviceBusy"] - - [0x8006C6E0, "osSpGetStatus"] - - [0x8006C6F0, "osSpSetStatus"] - - [0x8006C700, "osSpSetPc"] - - [0x8006C730, "osSpRawStartDma"] - - [0x8006C7C0, "osSiRawReadIo"] - - [0x8006C810, "osSiRawWriteIo"] - - [0x8006C860, "osContAddressCrc"] - - [0x8006C8CC, "osContDataCrc"] - - [0x8006C950, "osDestroyThread"] - - [0x8006CA30, "osMapTLBRdb"] - - [0x8006CA90, "osViInit"] - - [0x8006CBA0, "osViGetCurrentContext"] - - [0x8006CBC0, "guNormalize"] - - [0x8006CC20, "osPfsChecker"] - - [0x8006D080, "corrupted_init"] - - [0x8006D1D8, "corrupted"] - - [0x8006D340, "osPfsIsPlug"] - - [0x8006D4BC, "osPfsRequestData"] - - [0x8006D560, "osPfsGetInitData"] - - [0x8006D620, "ldiv"] - - [0x8006D6A4, "lldiv"] - - [0x8006D7E0, "osSiDeviceBusy"] - - [0x8006ED40, "strcpy"] - - [0x8006ED70, "strcmp"] - - [0x8006EDB0, "memset"] - - [0x8006EDF0, "decode_yay0"] - - [0x8006EF68, "osFlashInit"] - - [0x8006F0B8, "osFlashReadStatus"] - - [0x8006F184, "osFlashReadId"] - - [0x8006F29C, "osFlashClearStatus"] - - [0x8006F308, "osFlashAllErase"] - - [0x8006F424, "osFlashSectorErase"] - - [0x8006F550, "osFlashWriteBuffer"] - - [0x8006F61C, "osFlashWriteArray"] - - [0x8006F75C, "osFlashReadArray"] - - [0x8006FAD0, "fx_walk_large"] - - [0x8006FB30, "fx_walk_normal"] - - [0x8006FE90, "fx_emote"] - - [0x80070790, "fx_sweat"] - - [0x800707F0, "fx_sleep_bubble"] - - [0x80072C90, "load_battle"] - - [0x80072D2C, "setup_demo_player"] - - [0x80072E14, "load_demo_battle"] - - [0x800DDFD0, "test_below_player"] - - [0x800DE54C, "trace_below_player"] - - [0x800DEA08, "trace_above_player"] - - [0x800DF460, "test_player_lateral"] - - [0x800DFA00, "check_input_use_partner"] - - [0x800DFC50, "clear_player_status"] - - [0x800E00B0, "enable_player_shadow"] - - [0x800E00E4, "disable_player_shadow"] - - [0x800E0114, "enable_player_physics"] - - [0x800E0140, "disable_player_physics"] - - [0x800E1138, "render_player"] - - [0x800E1168, "render_player_model"] - - [0x800E12F4, "make_player_display_list"] - - [0x800E1704, "make_spinning_player_display_list"] - - [0x800E1BC4, "update_below_player"] - - [0x800E2778, "move_player"] - - [0x800E4FCC, "check_input_midair_jump"] - - [0x800E5DA4, "set_action_state"] - - [0x800E5F68, "update_locomotion_state"] - - [0x800E5FD0, "start_falling"] - - [0x800E6034, "start_bounce_a"] - - [0x800E608C, "start_bounce_b"] - - [0x800E60E0, "check_input_hammer"] - - [0x800E6160, "check_input_jump"] - - [0x800E6268, "check_input_spin"] - - [0x800E728C, "check_input_status_menu"] - - [0x800E73A0, "clear_player_data"] - - [0x800E7564, "get_player_data"] - - [0x800E7574, "add_item"] - - [0x800E75EC, "get_item_count"] - - [0x800E7620, "get_item_empty_count"] - - [0x800E7644, "find_item"] - - [0x800E76CC, "sort_items"] - - [0x800E773C, "add_badge"] - - [0x800E77C4, "store_item"] - - [0x800E7814, "get_stored_count"] - - [0x800E7848, "get_stored_empty_count"] - - [0x800E786C, "enforce_hpfp_limits"] - - [0x800E7934, "initialize_status_menu"] - - [0x800E7CA4, "status_menu_draw_number"] - - [0x800E7E34, "status_menu_draw_stat"] - - [0x800E80B4, "update_status_menu"] - - [0x800E92D8, "coin_counter_draw_content"] - - [0x800E93DC, "update_coin_counter"] - - [0x800E9518, "show_coin_counter"] - - [0x800E9698, "hide_coin_counter"] - - [0x800E96F8, "ShowCoinCounter"] - - [0x800E9760, "open_status_menu_long"] - - [0x800E978C, "open_status_menu_short"] - - [0x800E9910, "is_status_menu_visible"] - - [0x800E9920, "status_menu_start_blinking_hp"] - - [0x800E9964, "status_menu_stop_blinking_hp"] - - [0x800E998C, "status_menu_start_blinking_fp"] - - [0x800E99D0, "status_menu_stop_blinking_fp"] - - [0x800E99F4, "status_menu_start_blinking_coins"] - - [0x800E9A38, "status_menu_stop_blinking_coins"] - - [0x800E9A60, "status_menu_start_blinking_sp"] - - [0x800E9A94, "status_menu_stop_blinking_sp"] - - [0x800E9AB8, "status_menu_start_blinking_sp_bars"] - - [0x800E9AE4, "status_menu_start_blinking_starpoints"] - - [0x800E9B0C, "status_menu_stop_blinking_starpoints"] - - [0x800E9B30, "decrement_status_menu_disabled"] - - [0x800E9B54, "increment_status_menu_disabled"] - - [0x800E9B6C, "sync_status_menu"] - - [0x800E9BB0, "reset_status_menu"] - - [0x800E9D48, "is_ability_active"] - - [0x800EA0B8, "is_partner_ability_active"] - - [0x800EA0C0, "add_coins"] - - [0x800EA128, "add_star_points"] - - [0x800EA170, "add_star_pieces"] - - [0x800EA1B4, "increment_max_SP"] - - [0x800EA1D8, "set_max_SP"] - - [0x800EA1F4, "add_SP"] - - [0x800EA264, "recover_fp"] - - [0x800EA2CC, "recover_hp"] - - [0x800EA334, "subtract_hp"] - - [0x800EA360, "has_full_hp"] - - [0x800EA37C, "has_full_fp"] - - [0x800EA398, "add_fortress_keys"] - - [0x800EA3B8, "subtract_fortress_keys"] - - [0x800EA3E4, "get_fortress_key_count"] - - [0x800EA400, "use_consumable"] - - [0x800EA47C, "remove_consumable"] - - [0x800EB314, "use_partner_ability"] - - [0x800EB8A8, "enable_partner_walking"] - - [0x800ED310, "enable_partner_flying"] - - [0x800EF328, "enable_partner_ai"] - - [0x800ED4B8, "update_player_move_history"] - - [0x800EF45C, "clear_partner_move_history"] - - [0x800F4648, "draw_submenu_title"] - - [0x800F52E0, "draw_box"] - - [0x8010F6D0, "update_entities"] - - [0x8010FA98, "update_shadows"] - - [0x801105E8, "get_entity_by_index"] - - [0x80110604, "get_shadow_by_index"] - - [0x80110620, "get_entity_list"] - - [0x8011064C, "get_shadow_list"] - - [0x80110AAC, "test_player_entity_aabb"] - - [0x80110BB0, "is_player_action_state"] - - [0x80110C14, "load_entity_data"] - - [0x801118C4, "create_entity"] - - [0x80111BD8, "create_shadow_from_data"] - - [0x80111D38, "MakeEntity"] - - [0x80111FB0, "AssignScript"] - - [0x80111FF8, "AssignAreaFlag"] - - [0x801120B8, "AssignFlag"] - - [0x8011206C, "AssignBlockFlag"] - - [0x80112114, "AssignPanelFlag"] - - [0x80112170, "AssignCrateFlag"] - - [0x801121CC, "create_entity_shadow"] - - [0x80112260, "create_shadow_type"] - - [0x8011285C, "set_standard_shadow_scale"] - - [0x801129D4, "set_shadow_scale_peach"] - - [0x80112E78, "step_current_game_mode"] - - [0x80112F58, "render_ui"] - - [0x80114D6C, "load_tile_header"] - - [0x80115B0C, "get_model_property"] - - [0x80115B44, "_load_model_textures"] - - [0x80115C24, "load_model_textures"] - - [0x80115D44, "clear_model_data"] - - [0x80115FE8, "init_model_data"] - - [0x8011612C, "calculate_model_sizes"] - - [0x80116B90, "render_models"] - - [0x8011AD30, "get_model_from_list_index"] - - [0x8011AD48, "load_data_for_models"] - - [0x8011ADC8, "load_model_transforms"] - - [0x8011B010, "get_model_list_index_from_tree_index"] - - [0x8011B0EC, "get_model_center_and_size"] - - [0x8011B6F0, "clone_model"] - - [0x8011BB88, "set_fog_color"] - - [0x8011BBD8, "get_fog_color"] - - [0x8011BC14, "set_tex_panner"] - - [0x8011BC1C, "set_main_pan_u"] - - [0x8011BC34, "set_main_pan_v"] - - [0x8011BC4C, "set_aux_pan_u"] - - [0x8011BC64, "set_aux_pan_v"] - - [0x8011D910, "queue_render_task"] - - [0x80120148, "play_model_animation"] - - [0x80123660, "clear_character_set"] - - [0x80123674, "clear_printers"] - - [0x80123708, "load_font_data"] - - [0x80123734, "load_font"] - - [0x801237D8, "update_messages"] - - [0x80123898, "_update_message"] - - [0x80124204, "render_messages"] - - [0x801256A4, "initialize_printer"] - - [0x80125804, "dma_load_string"] - - [0x8012588C, "load_message_to_buffer"] - - [0x80125900, "load_string"] - - [0x8012591C, "_load_string"] - - [0x80125A68, "load_message_to_printer"] - - [0x80125AB8, "clamp_printer_coords"] - - [0x80125B08, "cancel_message"] - - [0x80125B2C, "set_message_images"] - - [0x80125B3C, "set_message_string"] - - [0x80125BE8, "set_message_value"] - - [0x80125C70, "close_message"] - - [0x80125DF4, "get_char_width"] - - [0x80125F68, "get_string_properties"] - - [0x80126474, "get_string_width"] - - [0x801264EC, "draw_string"] - - [0x8012769C, "draw_number"] - - [0x8012CC08, "_draw_message_box"] - - [0x80130B0C, "draw_coin_sparkles"] - - [0x80130F58, "get_item_entity"] - - [0x80130FF0, "clear_item_entity_data"] - - [0x801310CC, "init_item_entity_list"] - - [0x801313F4, "make_item_entity"] - - [0x80131A94, "make_item_entity_nodelay"] - - [0x80131AC8, "make_item_entity_delayed"] - - [0x80131B00, "init_got_item"] - - [0x80131EEC, "update_item_entities"] - - [0x801321A4, "draw_item_entity"] - - [0x80132C80, "draw_item_entities"] - - [0x801230B0, "stub_item_entity_nodraw"] - - [0x80133930, "remove_item_entity_by_reference"] - - [0x801339FC, "remove_item_entity_by_index"] - - [0x80133B0C, "test_item_player_collision"] - - [0x80134148, "set_item_entity_flags"] - - [0x80134188, "clear_item_entity_flags"] - - [0x8013420C, "set_item_entity_position"] - - [0x80134250, "update_item_entity_collectable"] - - [0x80135658, "update_item_entity_static"] - - [0x801356DC, "update_item_entity_temp"] - - [0x801382A0, "set_map_transition_effect"] - - [0x80141300, "init_menu_icon_list"] - - [0x801414A4, "create_icon"] - - [0x80141610, "update_menu_icons"] - - [0x80142BFC, "render_menu_icon"] - - [0x801436B4, "render_menu_icons"] - - [0x80144298, "draw_menu_icon"] - - [0x801447A8, "draw_icon_0"] - - [0x801447C4, "draw_icon_1"] - - [0x80147368, "play_ambient_sounds"] - - [0x801447FC, "set_menu_icon_script"] - - [0x801448B0, "get_menu_icon_script"] - - [0x801448D4, "get_menu_icon"] - - [0x801448F4, "free_icon"] - - [0x80144984, "set_icon_render_pos"] - - [0x801449AC, "get_icon_render_pos"] - - [0x80144A00, "set_icon_flags"] - - [0x80144A2C, "clear_icon_flags"] - - [0x80145320, "clear_saved_variables"] - - [0x80145390, "clear_area_flags"] - - [0x801453E0, "clear_global_flag"] - - [0x80145450, "set_global_flag"] - - [0x801454BC, "get_global_flag"] - - [0x80145520, "set_global_byte"] - - [0x80145538, "get_global_byte"] - - [0x8014554C, "clear_area_flag"] - - [0x801455A0, "set_area_flag"] - - [0x801455F0, "get_area_flag"] - - [0x80145638, "set_area_byte"] - - [0x80145650, "get_area_byte"] - - [0x80145670, "default_trigger_function_handler"] - - [0x80145680, "clear_trigger_data"] - - [0x80145728, "init_trigger_list"] - - [0x8014576C, "create_trigger"] - - [0x80145860, "update_triggers"] - - [0x80145BF4, "delete_trigger"] - - [0x80145C6C, "is_trigger_bound"] - - [0x80145CD0, "get_trigger_by_id"] - - [0x80145D70, "load_map_bg"] - - [0x80145E28, "read_background_size"] - - [0x80145E70, "set_background_size"] - - [0x80147264, "update_music_players"] - - [0x80149AB8, "_play_sound"] - - [0x80149C6C, "stop_sound"] - - [0x80149CB4, "play_sound"] - - [0x80149CD8, "play_sound_at_player"] - - [0x80149D08, "play_sound_at_npc"] - - [0x80149D5C, "play_sound_at_position"] - - [0x8014A430, "get_default_variation_for_song"] - - [0x8014A7E0, "_set_music_track"] - - [0x8014A918, "set_music_track"] - - [0x8023E000, "get_dpad_input_radial"] - - [0x8023E130, "initialize_battle"] - - [0x8023E438, "update_battle_state"] - - [0x8023EA7C, "draw_main_battle_ui"] - - [0x80242024, "update_heroes_end_turn"] - - [0x80242AC8, "switch_to_player"] - - [0x80242BB0, "update_partner_change_turn"] - - [0x80242F00, "switch_to_partner"] - - [0x80243918, "switch_order"] - - [0x80244F00, "update_run_away"] - - [0x802456B8, "EnablePartnerBlur"] - - [0x802456D8, "DisablePartnerBlur"] - - [0x80245AD0, "update_player_action"] - - [0x80246B34, "update_partner_action"] - - [0x80246450, "update_player_change_turn"] - - [0x802472AC, "update_enemy_change_turn"] - - [0x80247570, "update_enemy_action"] - - [0x802403BC, "update_starpoints_display"] - - [0x80240BBC, "delete_actor"] - - [0x80240D68, "delete_player_actor"] - - [0x80241218, "begin_battle"] - - [0x80244A50, "end_battle"] - - [0x802456F8, "update_swap_partner"] - - [0x8024CF34, "use_cam_preset"] - - [0x8024E43C, "cam_target_actor"] - - [0x8024E4D8, "move_cam_over"] - - [0x8024E520, "set_cam_target_pos"] - - [0x8024E594, "set_cam_zoom"] - - [0x8024E5B4, "add_cam_zoom"] - - [0x8024E5E0, "set_cam_zoffset"] - - [0x8024E600, "unfreeze_cam"] - - [0x8024E61C, "UseCamPreset"] - - [0x8024E90C, "SetBattleCamTarget"] - - [0x8024EA58, "SetBattleCamOffsetZ"] - - [0x8024EA98, "AddBattleCamOffsetZ"] - - [0x8024EAE4, "SetBattleCamYaw"] - - [0x8024EB24, "BattleCamTargetActor"] - - [0x8024EC08, "MoveBattleCamOver"] - - [0x8024EC6C, "SetBattleCamZoom"] - - [0x8024ECAC, "AddBattleCamZoom"] - - [0x8024ED78, "FreezeBattleCam"] - - [0x8024EF68, "create_popup"] - - [0x8024F960, "show_battle_message"] - - [0x8024FA04, "show_variable_battle_message"] - - [0x8024FAB4, "is_popup_displayed"] - - [0x8024FAC4, "set_popup_duration"] - - [0x8024FB0C, "close_action_command_instruction_popup"] - - [0x80250EA4, "show_message_popup"] - - [0x802512B4, "ShowMessageBox"] - - [0x8025130C, "ShowVariableMessageBox"] - - [0x80251384, "IsMessageBoxDisplayed"] - - [0x802513CC, "WaitForMessageBoxDone"] - - [0x802513F0, "ForceCloseMessageBox"] - - [0x80251408, "SetMessageBoxDuration"] - - [0x802516E8, "calc_item_damage_enemy"] - - [0x802515D0, "calc_item_check_hit"] - - [0x80252728, "ItemDamageEnemy"] - - [0x80252924, "ItemAfflictEnemy"] - - [0x80252D40, "ItemCheckHit"] - - [0x80252F30, "ActorSpeak"] - - [0x802532D0, "EndActorSpeech"] - - [0x80253538, "ShowBattleChoice"] - - [0x802535F8, "OverrideBattleDmaDest"] - - [0x80253624, "LoadBattleDmaData"] - - [0x8025385C, "PlaySoundAtActor"] - - [0x802538D0, "PlaySoundAtPart"] - - [0x80253AA8, "SetForegroundModelsVisibleUnchecked"] - - [0x80253AEC, "SetForegroundModelsVisible"] - - [0x80253B94, "MakeStatusField"] - - [0x80253C20, "is_actor_hp_bar_visible"] - - [0x80253C9C, "is_actortype_hpbar_visible"] - - [0x80253D10, "save_tattle_flags"] - - [0x80253E78, "load_tattle_flags"] - - [0x80253FDC, "MultiplyByActorScale"] - - [0x80254048, "MultiplyVec2ByActorScale"] - - [0x802540DC, "MultiplyVec3ByActorScale"] - - [0x80254198, "ApplyShrinkFromOwner"] - - [0x80254218, "StartRumble"] - - [0x80254288, "mtx_mirror_y"] - - [0x802542CC, "enable_actor_blur"] - - [0x8025455C, "disable_actor_blur"] - - [0x80254644, "enable_partner_blur"] - - [0x80254668, "disable_partner_blur"] - - [0x802546D4, "enable_player_blur"] - - [0x80254914, "disable_player_blur"] - - [0x8025D03C, "_remove_part_decoration"] - - [0x80260B04, "activate_defend_command"] - - [0x802619C8, "HasMerleeCastsLeft"] - - [0x80261BA8, "FXRecoverHP"] - - [0x80261C68, "FXRecoverFP"] - - [0x80261D28, "IncrementPlayerHP"] - - [0x80261D60, "IncrementPlayerFP"] - - [0x80262240, "create_target_list"] - - [0x8026302C, "player_create_target_list"] - - [0x80263048, "enemy_create_target_list"] - - [0x80263B10, "count_power_plus"] - - [0x80263BC8, "deduct_current_move_fp"] - - [0x80263CFC, "set_animation"] - - [0x80263EB8, "set_animation_rate"] - - [0x80263F68, "set_actor_yaw"] - - [0x80263F9C, "set_part_yaw"] - - [0x80264128, "add_xz_vec3f"] - - [0x802641C0, "add_xz_vec3f_copy1"] - - [0x80264258, "add_xz_vec3f_copy2"] - - [0x802642F0, "play_movement_dust_effects"] - - [0x8026445C, "get_actor_part"] - - [0x802644A4, "load_player_actor"] - - [0x80264B74, "load_partner_actor"] - - [0x802653A4, "create_actor"] - - [0x80265E44, "lookup_defense"] - - [0x80265E98, "lookup_status_chance"] - - [0x80265EEC, "lookup_status_duration_mod"] - - [0x80265F40, "inflict_status"] - - [0x80266254, "inflict_partner_ko"] - - [0x802662BC, "get_defense"] - - [0x80266B78, "try_inflict_status"] - - [0x80266CF0, "inflict_status_set_duration"] - - [0x802665AC, "show_damage_popup"] - - [0x80267114, "add_part_decoration"] - - [0x80267190, "add_actor_decoration"] - - [0x80267218, "remove_part_decoration"] - - [0x80267234, "remove_actor_decoration"] - - [0x802672AC, "heroes_is_ability_active"] - - [0x8026731C, "create_part_shadow"] - - [0x802673A0, "remove_part_shadow"] - - [0x80267454, "remove_player_buffs"] - - [0x80267A9C, "reset_all_actor_sounds"] - - [0x80267BDC, "hide_foreground_models_unchecked"] - - [0x80267C48, "show_foreground_models_unchecked"] - - [0x80267CB4, "hide_foreground_models"] - - [0x80267D28, "show_foreground_models"] - - [0x80267D9C, "StartRumbleWithParams"] - - [0x80267DF4, "start_rumble_type"] - - [0x80267ED0, "LoadItemScript"] - - [0x8026801C, "LoadFreeItemScript"] - - [0x80268130, "LoadMoveScript"] - - [0x802681C0, "LoadActionCommand"] - - [0x80268ECC, "check_block_input"] - - [0x80269294, "GetActionSuccess"] - - [0x802692C0, "SetActionSuccess"] - - [0x802694F8, "GetActionSuccessCopy"] - - [0x8026957C, "GetBlockResult"] - - [0x80269410, "CloseActionCommandInfo"] - - [0x80269660, "count_targets"] - - [0x80269698, "get_nearest_home_index"] - - [0x80269754, "set_goal_pos_to_part"] - - [0x802699D8, "set_part_goal_to_actor_part"] - - [0x80269C24, "set_actor_current_position"] - - [0x80269C70, "set_part_absolute_position"] - - [0x80269D20, "set_actor_home_position"] - - [0x80269D6C, "get_actor"] - - [0x80269DE4, "LoadBattleSection"] - - [0x80269E28, "GetBattlePhase"] - - [0x80269E54, "GetLastElement"] - - [0x80269EC4, "SetGoalToHome"] - - [0x80269F2C, "SetIdleGoalToHome"] - - [0x80269F94, "SetGoalToIndex"] - - [0x8026A05C, "GetIndexFromPos"] - - [0x8026A0D4, "GetIndexFromHome"] - - [0x8026A14C, "CountPlayerTargets"] - - [0x8026A1EC, "ForceHomePos"] - - [0x8026A2D0, "SetHomePos"] - - [0x8026A3A8, "SetGoalToTarget"] - - [0x8026A404, "SetPartGoalToTarget"] - - [0x8026A49C, "SetGoalToFirstTarget"] - - [0x8026A510, "SetGoalPos"] - - [0x8026A62C, "SetIdleGoal"] - - [0x8026A748, "AddGoalPos"] - - [0x8026A820, "GetGoalPos"] - - [0x8026A8EC, "GetIdleGoal"] - - [0x8026A9B8, "GetPartTarget"] - - [0x8026AAA8, "GetActorPos"] - - [0x8026AB74, "GetPartOffset"] - - [0x8026AC88, "GetPartPos"] - - [0x8026AD74, "GetHomePos"] - - [0x8026AE40, "SetActorPos"] - - [0x8026AF18, "SetPartPos"] - - [0x8026B0A0, "SetEnemyTargetOffset"] - - [0x8026B1B0, "SetAnimation"] - - [0x8026B238, "GetAnimation"] - - [0x8026B2D0, "SetAnimationRate"] - - [0x8026B358, "SetActorYaw"] - - [0x8026B3C8, "GetActorYaw"] - - [0x8026B438, "SetPartYaw"] - - [0x8026B4C0, "GetPartYaw"] - - [0x8026B55C, "SetActorJumpGravity"] - - [0x8026B5D8, "SetActorIdleJumpGravity"] - - [0x8026B654, "SetActorSpeed"] - - [0x8026B6D0, "SetActorIdleSpeed"] - - [0x8026B74C, "SetPartJumpGravity"] - - [0x8026B7EC, "SetPartMoveSpeed"] - - [0x8026B88C, "SetJumpAnimations"] - - [0x8026B92C, "AddActorPos"] - - [0x8026BA04, "SetActorDispOffset"] - - [0x8026BAE8, "GetPartDispOffset"] - - [0x8026BC38, "SetPartDispOffset"] - - [0x8026BD88, "AddPartDispOffset"] - - [0x8026BFB4, "GetActorVar"] - - [0x8026C044, "SetActorVar"] - - [0x8026C0D4, "AddActorVar"] - - [0x8026C170, "GetPartMovementVar"] - - [0x8026C22C, "SetPartMovementVar"] - - [0x8026C2E8, "AddPartMovementVar"] - - [0x8026C3AC, "SetActorRotation"] - - [0x8026C4AC, "SetActorRotationOffset"] - - [0x8026C56C, "GetActorRotation"] - - [0x8026C634, "SetPartRotation"] - - [0x8026C740, "SetPartRotationOffset"] - - [0x8026C828, "GetPartRotation"] - - [0x8026C904, "SetActorScale"] - - [0x8026C9C4, "SetActorScaleModifier"] - - [0x8026CA84, "GetActorScale"] - - [0x8026CB4C, "SetPartScale"] - - [0x8026CC34, "GetPartScale"] - - [0x8026CD10, "GetBattleFlags"] - - [0x8026CD3C, "SetBattleFlagBits"] - - [0x8026CDA0, "GetBattleFlags2"] - - [0x8026CDCC, "SetBattleFlagBits2"] - - [0x8026CE30, "SetActorFlags"] - - [0x8026CE8C, "SetActorFlagBits"] - - [0x8026CF20, "GetActorFlags"] - - [0x8026CF88, "SetPartFlags"] - - [0x8026D010, "SetPartFlagBits"] - - [0x8026D0D0, "SetPartTargetFlags"] - - [0x8026D158, "SetPartTargetFlagBits"] - - [0x8026D218, "GetPartFlags"] - - [0x8026D2AC, "GetPartTargetFlags"] - - [0x8026D340, "SetPartEventFlags"] - - [0x8026D3C8, "SetPartEventBits"] - - [0x8026D488, "GetPartEventFlags"] - - [0x8026D664, "HPBarToHome"] - - [0x8026D7A8, "HPBarToCurrent"] - - [0x8026DB64, "SummonEnemy"] - - [0x8026DE00, "GetOwnerID"] - - [0x8026DE28, "SetOwnerID"] - - [0x8026DE5C, "ActorExists"] - - [0x8026E050, "SetBattleInputMask"] - - [0x8026E068, "SetBattleInputButtons"] - - [0x8026E098, "CheckButtonPress"] - - [0x8026E0D0, "CheckButtonHeld"] - - [0x8026E108, "CheckButtonDown"] - - [0x8026E140, "GetBattleState"] - - [0x8026E2CC, "PlayerCreateTargetList"] - - [0x8026E310, "EnemyCreateTargetList"] - - [0x8026E354, "InitTargetIterator"] - - [0x8026E3A8, "SetOwnerTarget"] - - [0x8026E414, "ChooseNextTarget"] - - [0x8026E864, "GetTargetListLength"] - - [0x8026E8AC, "GetOwnerTarget"] - - [0x8026E974, "GetPlayerActorID"] - - [0x8026E9FC, "GetDistanceToGoal"] - - [0x8026EE88, "AddActorDecoration"] - - [0x8026EF4C, "RemoveActorDecoration"] - - [0x8026EFF0, "ModifyActorDecoration"] - - [0x8026F0EC, "UseIdleAnimation"] - - [0x8026F230, "GetStatusFlags"] - - [0x8026F44C, "RemovePlayerBuffs"] - - [0x8026F470, "SetPartAlpha"] - - [0x8026F52C, "CreatePartShadow"] - - [0x8026F59C, "RemovePartShadow"] - - [0x8026F638, "SetBattleVar"] - - [0x8026F694, "GetBattleVar"] - - [0x8026F6EC, "ResetAllActorSounds"] - - [0x8026F740, "SetActorSounds"] - - [0x8026F838, "ResetActorSounds"] - - [0x8026FA00, "SetPartSounds"] - - [0x8026FB20, "SetActorType"] - - [0x8026FBB0, "ShowShockEffect"] - - [0x8026FC04, "GetActorAttackBoost"] - - [0x8026FC6C, "GetActorDefenseBoost"] - - [0x8026FCD4, "BoostAttack"] - - [0x80270174, "BoostDefense"] - - [0x80270614, "VanishActor"] - - [0x8027095C, "ElectrifyActor"] - - [0x80270CA4, "HealActor"] - - [0x8027114C, "WaitForBuffDone"] - - [0x80271160, "CopyBuffs"] - - [0x80271658, "dispatch_event_player"] - - [0x802716E4, "dispatch_event_player_continue_turn"] - - [0x80271754, "calc_player_test_enemy"] - - [0x80271944, "calc_player_damage_enemy"] - - [0x802731BC, "dispatch_damage_event_player"] - - [0x8027337C, "dispatch_damage_event_player_0"] - - [0x802733A8, "dispatch_damage_event_player_1"] - - [0x802733C4, "GetMenuSelection"] - - [0x80273894, "PlayerFallToGoal"] - - [0x80273B04, "PlayerLandJump"] - - [0x80273C64, "PlayerRunToGoal"] - - [0x80273EFC, "CancelablePlayerRunToGoal"] - - [0x80274234, "GetPlayerHP"] - - [0x80274260, "PlayerDamageEnemy"] - - [0x802744A0, "PlayerPowerBounceEnemy"] - - [0x802746F0, "PlayerTestEnemy"] - - [0x8027491C, "DispatchDamagePlayerEvent"] - - [0x80274978, "EnablePlayerBlur"] - - [0x80276EB4, "DidActionSucceed"] - - [0x80276F8C, "dispatch_event_general"] - - [0x80277004, "play_hit_sound"] - - [0x80277160, "dispatch_event_actor"] - - [0x802771F8, "calc_enemy_test_target"] - - [0x8027742C, "calc_enemy_damage_target"] - - [0x802786D4, "dispatch_damage_event_actor"] - - [0x802788F8, "dispatch_damage_event_actor_0"] - - [0x80278914, "dispatch_damage_event_actor_1"] - - [0x80278930, "BindTakeTurn"] - - [0x802789A4, "PauseTakeTurn"] - - [0x80278A1C, "ResumeTakeTurn"] - - [0x80278A94, "BindIdle"] - - [0x80278B4C, "EnableIdleScript"] - - [0x80278C20, "BindHandleEvent"] - - [0x80278C94, "BindNextTurn"] - - [0x80278D08, "JumpToGoal"] - - [0x8027910C, "IdleJumpToGoal"] - - [0x80279420, "JumpToGoalSimple2"] - - [0x80279728, "JumpWithBounce"] - - [0x80279AD4, "LandJump"] - - [0x80279BEC, "FallToGoal"] - - [0x80279E64, "RunToGoal"] - - [0x8027A264, "IdleRunToGoal"] - - [0x8027A4E4, "JumpPartTo"] - - [0x8027A854, "FallPartTo"] - - [0x8027AB5C, "LandJumpPart"] - - [0x8027ACAC, "RunPartTo"] - - [0x8027B0DC, "update_lerp_battle"] - - [0x8027B624, "FlyToGoal"] - - [0x8027BBB8, "IdleFlyToGoal"] - - [0x8027BF38, "FlyPartTo"] - - [0x8027C4E0, "GetLastEvent"] - - [0x8027C548, "SetTargetActor"] - - [0x8027C5C8, "SetEnemyHP"] - - [0x8027C6A0, "GetActorHP"] - - [0x8027C748, "GetEnemyMaxHP"] - - [0x8027C7B0, "RemoveActor"] - - [0x8027C8A4, "DropStarPoints"] - - [0x8027CA74, "SetDefenseTable"] - - [0x8027CB08, "SetStatusTable"] - - [0x8027CB7C, "SetIdleAnimations"] - - [0x8027CCB4, "EnemyDamageTarget"] - - [0x8027CED4, "EnemyFollowupAfflictTarget"] - - [0x8027CFB8, "EnemyTestTarget"] - - [0x8027D1BC, "DispatchDamageEvent"] - - [0x8027D264, "DispatchEvent"] - - [0x8027D380, "SetTargetOffset"] - - [0x8027D57C, "EnableActorBlur"] - - [0x8027D67C, "AfflictActor"] - - [0x8027D7C4, "GetEncounterState"] - - [0x8027D7F0, "YieldTurn"] - - [0x8027D810, "SetActorSize"] - - [0x8027D8E0, "GetActorSize"] - - [0x8027D970, "SetPartSize"] - - [0x8027DA68, "GetOriginalActorType"] - - [0x8027DAD4, "GetCurrentActorType"] - - [0x8027DB3C, "GetLastDamage"] - - [0x8027DBA4, "EnableActorGlow"] - - [0x8027DC68, "WasStatusInflicted"] - - [0x8027DCBC, "CopyStatusEffects"] - - [0x8027DDA0, "ClearStatusEffects"] - - [0x8027DE80, "dispatch_event_partner"] - - [0x8027DF0C, "dispatch_event_partner_continue_turn"] - - [0x8027DF7C, "calc_partner_test_enemy"] - - [0x8027E328, "calc_partner_damage_enemy"] - - [0x8027F9CC, "dispatch_damage_event_partner"] - - [0x8027FB80, "dispatch_damage_event_partner_0"] - - [0x8027FB9C, "dispatch_damage_event_partner_1"] - - [0x8027FBB8, "MakeOwnerTargetIndex"] - - [0x8027FD48, "GetActorLevel"] - - [0x8027FDB4, "PartnerDamageEnemy"] - - [0x80280004, "PartnerAfflictEnemy"] - - [0x80280270, "PartnerPowerBounceEnemy"] - - [0x802804D0, "PartnerTestEnemy"] - - [0x802807A8, "DeletePartner"] - - [0x80280840, "GetDamageIntensity"] - - [0x80280880, "ActorAddMovePos"] - - [0x80280950, "LoadStarPowerScript"] - - [0x802A5818, "can_switch_to_player"] - - [0x802A5988, "update_player_menu"] - - [0x802A81C8, "update_partner_menu"] - - [0x802AA688, "update_targeting_enemies"] - - [0x80284EBC, "PlayerScriptDispatcher"] - - [0x80285010, "PeachScriptDispatcher"] - - [0x8028505C, "ExecutePlayerAction"] - - [0x80285174, "ExecutePeachAction"] - - [0x802852D4, "HandleEvent_Player"] - - [0x80280A34, "BtlPutPartnerAway"] - - [0x80280B6C, "BtlBringPartnerOut"] - - [0x80284A40, "MarioEnterStage"] - - [0x80284D04, "PeachEnterStage"] - - [0x802851FC, "PlayerFirstStrike"] - - [0x802852B8, "StartDefend"] - - [0x80286194, "PlayerCelebrate"] - - [0x80286228, "ExitStage"] - - [0x802868BC, "RunAwayStart"] - - [0x80287078, "RunAwayFail"] - - [0x80287128, "RunAwayReset"] - - [0x802878D0, "PlayEatFX"] - - [0x80287948, "PlayDrinkFX"] - - [0x802879C0, "UseLifeShroom"] - - [0x80288398, "MerleeRunOut"] - - [0x80288400, "MerleeAttackBonus"] - - [0x8028870C, "MerleeDefenseBonus"] - - [0x80288A58, "MerleeExpBonus"] - - [0x80288D64, "PlayerHappy"] - - [0x8028907C, "DoDizzyAttack"] - - [0x80289110, "RegainAbility"] - - [0x80293E40, "UseMystery"] - - [0x802945E0, "DoSleepHit"] - - [0x802945FC, "DoDizzyHit"] - - [0x80294618, "DoParalyzeHit"] - - [0x80294634, "DoPoisonHit"] - - [0x80294650, "DoStopHit"] - - [0x8029466C, "DoFreezeHit"] - - [0x802946B8, "DoShinkHit"] - - [0x80298BF0, "ForceNextTarget"] - - [0x80299044, "DoNormalHit"] - - [0x8029A0D0, "DoBurnHit"] - - [0x8029A6FC, "DoShockHit"] - - [0x8029AC70, "DoImmune"] - - [0x8029AEC0, "DoDeath"] - - [0x8029AF08, "Collapse"] - - [0x8029B22C, "DoScareAway"] - - [0x8029B998, "DoSpinSmashHit"] - - [0x8029BD70, "DoJumpBack"] - - [0x8029BEB8, "DoReturnHome"] - - [0x8029BFA0, "DoRecover"] - - [0x8029C37C, "DoAirLift"] - - [0x8029C4A8, "DoBlowAway"] - - [0x802939C4, "Rumble_1"] - - [0x80293A10, "Rumble_2"] - - [0x80293A34, "Rumble_3"] - - [0x80293A58, "Rumble_4"] - - [0x80293A7C, "Rumble_5"] - - [0x80293AA0, "Rumble_6"] - - [0x80293AC4, "Rumble_7"] - - [0x80293AE8, "Rumble_Unused_1"] - - [0x80293B0C, "Rumble_Unused_2"] - - [0x80293B30, "Rumble_Unused_3"] - - [0x80293B54, "Rumble_Unused_4"] - - [0x80280E54, "CamPreset_A"] - - [0x80280CE8, "CamPreset_B"] - - [0x80280DAC, "CamPreset_C"] - - [0x80280DC8, "CamPreset_D"] - - [0x80280DE4, "CamPreset_E"] - - [0x80280D04, "CamPreset_F"] - - [0x80280D3C, "CamPreset_G"] - - [0x80280D74, "CamPreset_H"] - - [0x80280D58, "CamPreset_I"] - - [0x80280E00, "CamPreset_J"] - - [0x80280E1C, "CamPreset_K"] - - [0x80280E38, "CamPreset_L"] - - [0x80280D20, "CamPreset_M"] - - [0x80280D90, "CamPreset_N"] - - [0x802C3000, "sort_scripts"] - - [0x802C3148, "find_script_labels"] - - [0x802C31DC, "clear_script_list"] - - [0x802C32EC, "init_script_list"] - - [0x802C33E0, "start_script"] - - [0x802C35D0, "start_script_in_group"] - - [0x802C37C8, "start_child_script"] - - [0x802C3D04, "restart_script"] - - [0x802C3D74, "update_scripts"] - - [0x802C3F3C, "kill_script"] - - [0x802C40AC, "kill_script_by_ID"] - - [0x802C4114, "kill_all_scripts"] - - [0x802C4164, "does_script_exist"] - - [0x802C41A4, "does_script_exist_by_ref"] - - [0x802C41D8, "set_script_priority"] - - [0x802C41E0, "set_script_timescale"] - - [0x802C4200, "set_global_timespace"] - - [0x802C420C, "get_global_timespace"] - - [0x802C4218, "set_script_group"] - - [0x802C4220, "bind_trigger"] - - [0x802C42A8, "bind_trigger_1"] - - [0x802C42D8, "suspend_group_script"] - - [0x802C437C, "resume_group_script"] - - [0x802C4420, "suspend_all_script"] - - [0x802C448C, "resume_all_script"] - - [0x802C44F8, "suspend_group_script_index"] - - [0x802C4570, "resume_group_script_index"] - - [0x802C45E8, "suspend_all_group"] - - [0x802C4648, "resume_all_group"] - - [0x802C46A8, "suspend_group_others"] - - [0x802C471C, "resume_group_others"] - - [0x802C4790, "get_script_by_index"] - - [0x802C47A8, "get_script_by_id"] - - [0x802C47E8, "set_script_flags"] - - [0x802C4880, "clear_script_flags"] - - [0x802C4920, "fixed_var_to_float"] - - [0x802C496C, "float_to_fixed_var"] - - [0x802C4998, "si_handle_return"] - - [0x802C49B8, "si_handle_label"] - - [0x802C49C0, "si_handle_goto"] - - [0x802C4A00, "si_handle_Loop"] - - [0x802C4A48, "si_handle_end_loop"] - - [0x802C4B0C, "si_handle_break_loop"] - - [0x802C4B5C, "si_handle_wait"] - - [0x802C4BB8, "si_handle_wait_seconds"] - - [0x802C4C40, "si_handle_if_equal"] - - [0x802C4CA0, "si_handle_if_not_equal"] - - [0x802C4D00, "si_handle_if_less"] - - [0x802C4D64, "si_handle_if_greater"] - - [0x802C4DC8, "si_handle_if_less_equal"] - - [0x802C4E2C, "si_handle_if_greater_equal"] - - [0x802C4E90, "si_handle_if_AND"] - - [0x802C4EE8, "si_handle_if_not_AND"] - - [0x802C4F40, "si_handle_else"] - - [0x802C4F6C, "si_handle_end_if"] - - [0x802C4F74, "si_handle_switch"] - - [0x802C4FE4, "si_handle_switch_const"] - - [0x802C5030, "si_handle_case_equal"] - - [0x802C50BC, "si_handle_case_not_equal"] - - [0x802C5148, "si_handle_case_less"] - - [0x802C51D8, "si_handle_case_less_equal"] - - [0x802C5268, "si_handle_case_greater"] - - [0x802C52F8, "si_handle_case_greater_equal"] - - [0x802C5388, "si_handle_case_range"] - - [0x802C5444, "si_handle_case_default"] - - [0x802C549C, "si_handle_case_AND"] - - [0x802C5518, "si_handle_case_equal_OR"] - - [0x802C55B8, "si_handle_case_equal_AND"] - - [0x802C565C, "si_handle_end_case_group"] - - [0x802C56D4, "si_handle_break_case"] - - [0x802C5718, "si_handle_end_switch"] - - [0x802C5744, "si_handle_set_var"] - - [0x802C5790, "si_handle_set_const"] - - [0x802C57B8, "si_handle_set_float"] - - [0x802C5804, "si_handle_add"] - - [0x802C5868, "si_handle_subtract"] - - [0x802C58CC, "si_handle_multiply"] - - [0x802C5934, "si_handle_divide"] - - [0x802C59BC, "si_handle_mod"] - - [0x802C5A84, "si_handle_addF"] - - [0x802C5AEC, "si_handle_subtractF"] - - [0x802C5B54, "si_handle_multiplyF"] - - [0x802C5BC0, "si_handle_divideF"] - - [0x802C5C28, "si_handle_set_int_buffer_ptr"] - - [0x802C5C5C, "si_handle_set_float_buffer_ptr"] - - [0x802C5C90, "si_handle_get_1_word"] - - [0x802C5CC4, "si_handle_get_2_word"] - - [0x802C5D2C, "si_handle_get_3_word"] - - [0x802C5DB4, "si_handle_get_4_word"] - - [0x802C5E5C, "si_handle_get_Nth_word"] - - [0x802C5EB4, "si_handle_get_1_float"] - - [0x802C5F0C, "si_handle_get_2_float"] - - [0x802C5F9C, "si_handle_get_3_float"] - - [0x802C605C, "si_handle_get_4_float"] - - [0x802C614C, "si_handle_get_Nth_float"] - - [0x802C61AC, "si_handle_set_array"] - - [0x802C61E0, "si_handle_set_flag_array"] - - [0x802C6214, "si_handle_allocate_array"] - - [0x802C6270, "si_handle_AND"] - - [0x802C62D4, "si_handle_AND_const"] - - [0x802C632C, "si_handle_OR"] - - [0x802C6390, "si_handle_OR_const"] - - [0x802C63E8, "si_handle_call"] - - [0x802C646C, "si_handle_exec1"] - - [0x802C6524, "si_handle_exec2"] - - [0x802C65FC, "si_handle_exec_wait"] - - [0x802C6640, "si_handle_jump"] - - [0x802C667C, "_bound_script_trigger_handler"] - - [0x802C6714, "si_handle_bind"] - - [0x802C6824, "DeleteTrigger"] - - [0x802C6850, "si_handle_unbind"] - - [0x802C6870, "si_handle_kill"] - - [0x802C689C, "si_handle_set_priority"] - - [0x802C68D8, "si_handle_set_timescale"] - - [0x802C6914, "si_handle_set_group"] - - [0x802C6950, "si_handle_suspend_all"] - - [0x802C697C, "si_handle_resume_all"] - - [0x802C69A8, "si_handle_suspend_others"] - - [0x802C69E4, "si_handle_resume_others"] - - [0x802C6A20, "si_handle_suspend"] - - [0x802C6A4C, "si_handle_resume"] - - [0x802C6A78, "si_handle_does_script_exist"] - - [0x802C6B54, "si_handle_bind_lock"] - - [0x802C6C78, "si_handle_thread"] - - [0x802C6D4C, "si_handle_end_thread"] - - [0x802C6D6C, "si_handle_child_thread"] - - [0x802C6DF4, "si_handle_end_child_thread"] - - [0x802C6E1C, "si_handle_print_debug_var"] - - [0x802C7404, "si_execute_next_command"] - - [0x802C7A54, "si_handle_end"] - - [0x802C7ABC, "get_variable"] - - [0x802C7DA8, "get_variable_index"] - - [0x802C7F20, "get_variable_index_alt"] - - [0x802C8098, "set_variable"] - - [0x802C842C, "get_float_variable"] - - [0x802C8640, "set_float_variable"] - - [0x802C8890, "si_goto_label"] - - [0x802C88FC, "si_skip_if"] - - [0x802C8978, "si_skip_else"] - - [0x802C89E4, "si_goto_end_case"] - - [0x802C8A60, "si_goto_next_case"] - - [0x802C8AE4, "si_goto_end_loop"] - - [0x802C8B60, "TranslateModel"] - - [0x802C8C64, "RotateModel"] - - [0x802C8D88, "ScaleModel"] - - [0x802C8F28, "CloneModel"] - - [0x802C8E8C, "GetModelIndex"] - - [0x802C8F80, "GetModelCenter"] - - [0x802C9000, "SetTexPanner"] - - [0x802C907C, "SetModelFlag10"] - - [0x802C9208, "EnableTexPanning"] - - [0x802C9288, "EnableModel"] - - [0x802C9308, "SetGroupEnabled"] - - [0x802C9364, "SetTexPanOffset"] - - [0x802C9518, "SetModelFlags"] - - [0x802C97B4, "TranslateGroup"] - - [0x802C98D8, "RotateGroup"] - - [0x802C9A1C, "ScaleGroup"] - - [0x802C9B98, "EnableGroup"] - - [0x802C9CE8, "modify_collider_family_flags"] - - [0x802C9DCC, "ModifyColliderFlags"] - - [0x802C9ED8, "ResetFromLava"] - - [0x802CA0AC, "GetColliderCenter"] - - [0x802CA114, "ParentColliderToModel"] - - [0x802CA188, "UpdateColliderTransform"] - - [0x802CA304, "goto_map"] - - [0x802CA400, "GotoMap"] - - [0x802CA420, "GotoMapSpecial"] - - [0x802CA440, "GotoMapByID"] - - [0x802CA460, "GetEntryID"] - - [0x802CA490, "GetMapID"] - - [0x802CA4C0, "GetLoadType"] - - [0x802CA4F4, "SetRenderMode"] - - [0x802CA558, "PlaySoundAtModel"] - - [0x802CA614, "PlaySoundAtCollider"] - - [0x802CA6C0, "SetCamEnabled"] - - [0x802CA774, "SetCamFlag80"] - - [0x802CA828, "SetCamPerspective"] - - [0x802CAB18, "SetCamViewport"] - - [0x802CAD98, "SetCamBGColor"] - - [0x802CAF2C, "SetCamTarget"] - - [0x802CB2A8, "ShakeCam"] - - [0x802CB56C, "exec_ShakeCam1"] - - [0x802CB5C8, "exec_ShakeCamX"] - - [0x802CB680, "SetCamLeadPlayer"] - - [0x802CB79C, "PanToTarget"] - - [0x802CB860, "UseSettingsFrom"] - - [0x802CB9F8, "LoadSettings"] - - [0x802CBAB4, "SetCamType"] - - [0x802CBB48, "SetCamPitch"] - - [0x802CBBE4, "SetCamDistance"] - - [0x802CBC58, "SetCamPosA"] - - [0x802CBCF4, "SetCamPosB"] - - [0x802CBD90, "SetCamPosC"] - - [0x802CBE2C, "SetPanTarget"] - - [0x802CBEF0, "SetCamSpeed"] - - [0x802CBF64, "GetCamType"] - - [0x802CBFF4, "GetCamPitch"] - - [0x802CC084, "GetCamDistance"] - - [0x802CC0F4, "GetCamPosA"] - - [0x802CC184, "GetCamPosB"] - - [0x802CC214, "GetCamPosC"] - - [0x802CC2A4, "GetCamPosition"] - - [0x802CC354, "WaitForCam"] - - [0x802CC3EC, "SetCamProperties"] - - [0x802CC660, "AdjustCam"] - - [0x802CC8C8, "ResetCam"] - - [0x802CCB18, "draw_anim_models"] - - [0x802CCFE4, "SetAnimModelPosition"] - - [0x802CD090, "GetAnimModelPosition"] - - [0x802CD12C, "AddAnimModelPosition"] - - [0x802CD1F0, "SetAnimModelRotation"] - - [0x802CD29C, "SetAnimModelScale"] - - [0x802CCCEC, "LoadModelAnimation"] - - [0x802CCE6C, "PlayModelAnimation"] - - [0x802CCF6C, "ChangeModelAnimation"] - - [0x802CDB0C, "set_npc_animation"] - - [0x802CDC1C, "DeleteNpc"] - - [0x802CDC58, "GetNpcPointer"] - - [0x802CDCB0, "SetNpcPos"] - - [0x802CDDB0, "SetNpcRotation"] - - [0x802CDED4, "SetNpcScale"] - - [0x802CDF8C, "SetNpcCollisionSize"] - - [0x802CE01C, "SetNpcSpeed"] - - [0x802CE088, "SetNpcJumpscale"] - - [0x802CE0F4, "SetNpcAnimation"] - - [0x802CE160, "GetNpcAnimation"] - - [0x802CE22C, "NpcMoveTo"] - - [0x802CE434, "_npc_jump_to"] - - [0x802CE6C4, "NpcJump0"] - - [0x802CE6E0, "NpcJump1"] - - [0x802CE6FC, "NpcFlyTo"] - - [0x802CEA10, "GetNpcYaw"] - - [0x802CEA84, "SetNpcYaw"] - - [0x802CEB04, "InterpNpcYaw"] - - [0x802CECC8, "NpcFacePlayer"] - - [0x802CEE80, "NpcFaceNpc"] - - [0x802CF060, "SetNpcFlagBits"] - - [0x802CF0F4, "GetNpcPos"] - - [0x802CF268, "EnableNpcShadow"] - - [0x802CF2EC, "EnableNpcBlur"] - - [0x802CF370, "ClearPartnerMoveHistory"] - - [0x802CF3BC, "NpcSetHomePosToCurrent"] - - [0x802CF438, "GetPartnerPos"] - - [0x802CF4E8, "DisablePartnerAI"] - - [0x802CF52C, "EnablePartnerAI"] - - [0x802CF5B8, "BringPartnerOut"] - - [0x802CF988, "PutPartnerAway"] - - [0x802CFC74, "GetCurrentPartnerID"] - - [0x802D0118, "SetNpcEffect"] - - [0x802D01AC, "PlaySoundAtNpc"] - - [0x802D02B0, "SpeakToPlayer"] - - [0x802D02CC, "EndSpeech"] - - [0x802D02E8, "ContinueSpeech"] - - [0x802D0304, "SpeakToNpc"] - - [0x802D0320, "_show_message"] - - [0x802D0894, "ShowMessageAtScreenPos"] - - [0x802D095C, "ShowMessageAtWorldPos"] - - [0x802D0A98, "CloseMessage"] - - [0x802D0AFC, "SwitchMessage"] - - [0x802D0B6C, "ShowChoice"] - - [0x802D0BF8, "CloseChoice"] - - [0x802D0C20, "CancelMessage"] - - [0x802D0C48, "CancelMessageAndBlock"] - - [0x802D0C70, "SetMessageImages"] - - [0x802D0CEC, "SetMessageString"] - - [0x802D0D44, "SetMessageValue"] - - [0x802D0DA0, "HidePlayerShadow"] - - [0x802D0DE4, "DisablePlayerPhysics"] - - [0x802D0E28, "DisablePlayerInput"] - - [0x802D0EF0, "SetPlayerPos"] - - [0x802D0FB0, "SetPlayerCollisionSize"] - - [0x802D1024, "SetPlayerSpeed"] - - [0x802D1054, "SetPlayerJumpscale"] - - [0x802D1084, "SetPlayerAnimation"] - - [0x802D10D8, "SetPlayerActionState"] - - [0x802D1134, "MovePlayerTo"] - - [0x802D14E0, "player_jump"] - - [0x802D18E8, "PlayerJump"] - - [0x802D1904, "PlayerJump1"] - - [0x802D1920, "PlayerJump2"] - - [0x802D193C, "InterpPlayerYaw"] - - [0x802D1B04, "PlayerFaceNpc"] - - [0x802D1D28, "GetPlayerTargetYaw"] - - [0x802D1D60, "SetPlayerFlagBits"] - - [0x802D1DD0, "GetPlayerActionState"] - - [0x802D1DFC, "GetPlayerPos"] - - [0x802D1E94, "GetPlayerAnimation"] - - [0x802D1EC0, "FullyRestoreHPandFP"] - - [0x802D1EE0, "FullyRestoreSP"] - - [0x802D1EFC, "EnablePartner"] - - [0x802D1F38, "DisablePartner"] - - [0x802D1F70, "ForceExitHeading"] - - [0x802D216C, "UseExitHeading"] - - [0x802D2AA8, "DisablePulseStone"] - - [0x802D2B0C, "GetCurrentPartner"] - - [0x802D2B88, "Disable8bitMario"] - - [0x802D2CD8, "PlaySoundAtPlayer"] - - [0x802D3474, "CreateImageObj"] - - [0x802D3624, "RemoveImageObj"] - - [0x802D36E0, "SetObjPosition"] - - [0x802D3840, "SetObjRotation"] - - [0x802D38EC, "SetObjScale"] - - [0x802D39FC, "SetObjJumpScale"] - - [0x802D3C58, "JumpObj"] - - [0x802D45B0, "MakeLerp"] - - [0x802D462C, "UpdateLerp"] - - [0x802D46B0, "RandInt"] - - [0x802D4708, "GetAngleBetweenNPCs"] - - [0x802D47B4, "GetAngleToNPC"] - - [0x802D4830, "GetAngleToPlayer"] - - [0x802D48AC, "AwaitPlayerApproach"] - - [0x802D4964, "IsPlayerWithin"] - - [0x802D4A5C, "AwaitPlayerLeave"] - - [0x802D4B14, "AddVectorPolar"] - - [0x802D5430, "LoadPath"] - - [0x802D4DAC, "setup_path_data"] - - [0x802D5524, "GetNextPathPos"] - - [0x802D5770, "GetDist2D"] - - [0x802D58E0, "SetValueByRef"] - - [0x802D593C, "GetValueByRef"] - - [0x802D5998, "EnableStatusMenu"] - - [0x802D59DC, "ShowStatusMenu"] - - [0x802D5A28, "SetGameMode"] - - [0x802D5A58, "ClampAngleInt"] - - [0x802D5AB4, "ClampAngleFloat"] - - [0x802D5CE0, "FadeOutMusic"] - - [0x802D5D4C, "SetMusicTrack"] - - [0x802D5DF4, "FadeInMusic"] - - [0x802D611C, "PlayAmbientSounds"] - - [0x802D6150, "PlaySound"] - - [0x802D61DC, "PlaySoundAt"] - - [0x802D62B8, "StopSound"] - - [0x802D6314, "UseDoorSounds"] - - [0x802D636C, "PlaySoundAtF"] - - [0x802D6858, "RemoveKeyItemAt"] - - [0x802D688C, "RemoveItemAt"] - - [0x802D68C8, "AddKeyItem"] - - [0x802D699C, "HasKeyItem"] - - [0x802D6A14, "FindKeyItem"] - - [0x802D6A98, "AddItem"] - - [0x802D6B18, "FindItem"] - - [0x802D6B9C, "RemoveItem"] - - [0x802D6C4C, "CountFortressKeys"] - - [0x802D6C94, "RemoveFortressKeys"] - - [0x802D6CC0, "MakeItemEntity"] - - [0x802D6DC0, "DropItemEntity"] - - [0x802D6EC0, "DropItemEntityB"] - - [0x802D6FCC, "RemoveItemEntity"] - - [0x802D6FF8, "AddBadge"] - - [0x802D7050, "RemoveBadge"] - - [0x802D70D0, "SetItemPos"] - - [0x802D7194, "SetItemFlags"] - - [0x802D7278, "AddCoin"] - - [0x802D72B4, "AddStarPoints"] - - [0x802D72F0, "AddStarPieces"] - - [0x802D732C, "GetItemPower"] - - [0x802D73A4, "ShowGotItem"] - - [0x802D78A0, "ShowEmote"] - - [0x802D8028, "ShowSleepBubble"] - - [0x802D7AE4, "RemoveEffect"] - - [0x802D829C, "PlayEffect"] - - [0x802D9700, "SetSpriteShading"] - - [0x802D9A3C, "EnableSpriteShading"] - - [0x802D9A90, "GetDemoState"] - - [0x802D9ACC, "DemoPressButton"] - - [0x802D9AF8, "DemoReleaseButton"] - - [0x802D9B34, "DemoSetButtons"] - - [0x802D9B64, "DemoJoystickRadial"] - - [0x802D9C10, "DemoJoystickXY"] - - [0x802D9CB0, "ShakeCam1"] - - [0x802D9CE8, "ShakeCamX"] - - [0x802DC8F4, "spr_appendMDL_component"] - - [0x802DCD00, "spr_transform_point"] - - [0x802DCEDC, "spr_draw_component"] - - [0x802DD0DC, "_spr_sign_extend_12bit"] - - [0x802DD0FC, "_spr_sign_extend_16bit"] - - [0x802DD11C, "update_component"] - - [0x802DDC40, "render_sprite"] - - [0x802DEB0C, "load_sprite"] - - [0x802E11A0, "save_game_at_player_position"] - - [0x802E8CCC, "player_enter_blue_pipe"] - - [0x802E8E4C, "push_entity_matrix"] - - [0x8004A47C, "DoBasicAI"] - - [0x80281524, "draw_shop_items"] - - [0x80281860, "MakeShop"] - - [0x80281BD8, "MakeShopOwner"] - - [0x80281CAC, "MakeDoorAdvanced"] - - [0x802831DC, "CheckActionState"] - - [0x802832E0, "CreatePushBlockGrid"] - - [0x8028347C, "SetPushBlock"] - - [0x802835C0, "GetPushBlock"] - - [0x802836B8, "GetGridIndexFromPos"] - - [0x802837AC, "SetPushBlockFallEffect"] - - [0x80285960, "EnterWalk"] - - [0x80285CB0, "EnterSavePoint"] - - [0x80285CF4, "ExitWalk"] - - [0x80285DAC, "ExitSingleDoor"] - - [0x80285DD4, "EnterSingleDoor"] - - [0x80285E4C, "ExitDoubleDoor"] - - [0x80285E74, "EnterDoubleDoor"] - - [0x80025C60, "func_80025C60"] - - [0x800269EC, "func_800269EC"] - - [0x80027088, "func_80027088"] - - [0x80027190, "func_80027190"] - - [0x800271A0, "func_800271A0"] - - [0x80028838, "func_80028838"] - - [0x80028F8C, "func_80028F8C"] - - [0x80029934, "func_80029934"] - - [0x8002AB5C, "func_8002AB5C"] - - [0x8002ACDC, "func_8002ACDC"] - - [0x8002BA40, "func_8002BA40"] - - [0x8002BA78, "func_8002BA78"] - - [0x8002BA80, "func_8002BA80"] - - [0x8002BEDC, "func_8002BEDC"] - - [0x8002BEEC, "func_8002BEEC"] - - [0x8002BF04, "func_8002BF04"] - - [0x8002BF14, "func_8002BF14"] - - [0x8002BF24, "func_8002BF24"] - - [0x8002C890, "func_8002C890"] - - [0x8002D160, "func_8002D160"] - - [0x80033394, "func_80033394"] - - [0x800337D0, "func_800337D0"] - - [0x800337E0, "func_800337E0"] - - [0x800337F8, "func_800337F8"] - - [0x80033830, "func_80033830"] - - [0x80033874, "func_80033874"] - - [0x800384BC, "func_800384BC"] - - [0x8003857C, "func_8003857C"] - - [0x80038844, "func_80038844"] - - [0x80038864, "func_80038864"] - - [0x80038880, "func_80038880"] - - [0x800388A0, "func_800388A0"] - - [0x80038AFC, "func_80038AFC"] - - [0x800397E8, "func_800397E8"] - - [0x80039930, "func_80039930"] - - [0x8003AC5C, "func_8003AC5C"] - - [0x8003B1A8, "func_8003B1A8"] - - [0x8003B1B0, "func_8003B1B0"] - - [0x8003B3D0, "func_8003B3D0"] - - [0x8003B44C, "func_8003B44C"] - - [0x8003B464, "func_8003B464"] - - [0x8003C3D8, "func_8003C3D8"] - - [0x8003D1D4, "func_8003D1D4"] - - [0x8003D624, "func_8003D624"] - - [0x8003D660, "func_8003D660"] - - [0x8003E338, "func_8003E338"] - - [0x8003E524, "func_8003E524"] - - [0x8003E5B0, "func_8003E5B0"] - - [0x8003E63C, "func_8003E63C"] - - [0x8003F7CC, "func_8003F7CC"] - - [0x8004135C, "func_8004135C"] - - [0x80041364, "func_80041364"] - - [0x80041964, "func_80041964"] - - [0x80041F10, "func_80041F10"] - - [0x8004304C, "func_8004304C"] - - [0x8004309C, "func_8004309C"] - - [0x800431D4, "func_800431D4"] - - [0x800431DC, "func_800431DC"] - - [0x80044140, "func_80044140"] - - [0x80044148, "func_80044148"] - - [0x80045AC0, "func_80045AC0"] - - [0x80045B68, "func_80045B68"] - - [0x80045C28, "func_80045C28"] - - [0x80045D00, "func_80045D00"] - - [0x80045FA4, "func_80045FA4"] - - [0x800494C0, "func_800494C0"] - - [0x8004B440, "func_8004B440"] - - [0x8004B62C, "func_8004B62C"] - - [0x8004B6D8, "func_8004B6D8"] - - [0x8004B748, "func_8004B748"] - - [0x8004B9E4, "func_8004B9E4"] - - [0x8004BA54, "func_8004BA54"] - - [0x8004C444, "func_8004C444"] - - [0x8004D510, "func_8004D510"] - - [0x8004D7E0, "func_8004D7E0"] - - [0x8004DA0C, "func_8004DA0C"] - - [0x8004DA74, "func_8004DA74"] - - [0x8004DAE0, "func_8004DAE0"] - - [0x8004DB28, "func_8004DB28"] - - [0x8004DB4C, "func_8004DB4C"] - - [0x8004DCB8, "func_8004DCB8"] - - [0x8004DE2C, "func_8004DE2C"] - - [0x8004DFD4, "func_8004DFD4"] - - [0x8004E0F4, "func_8004E0F4"] - - [0x8004E158, "func_8004E158"] - - [0x8004E344, "func_8004E344"] - - [0x8004E3A4, "func_8004E3A4"] - - [0x8004E444, "func_8004E444"] - - [0x8004E4B8, "func_8004E4B8"] - - [0x800506C8, "func_800506C8"] - - [0x80050770, "func_80050770"] - - [0x80050818, "func_80050818"] - - [0x8005083C, "func_8005083C"] - - [0x8005087C, "func_8005087C"] - - [0x80050970, "func_80050970"] - - [0x80050B90, "func_80050B90"] - - [0x80050C30, "func_80050C30"] - - [0x80050C54, "func_80050C54"] - - [0x80050C64, "func_80050C64"] - - [0x80050CA0, "func_80050CA0"] - - [0x80050E18, "func_80050E18"] - - [0x80050E84, "func_80050E84"] - - [0x80050EF0, "func_80050EF0"] - - [0x80050F64, "func_80050F64"] - - [0x80050FD0, "func_80050FD0"] - - [0x80051050, "func_80051050"] - - [0x800511BC, "func_800511BC"] - - [0x80052614, "func_80052614"] - - [0x80052660, "func_80052660"] - - [0x80052BF8, "func_80052BF8"] - - [0x80052E30, "func_80052E30"] - - [0x80052E5C, "func_80052E5C"] - - [0x800533D0, "func_800533D0"] - - [0x800535C0, "func_800535C0"] - - [0x80053888, "func_80053888"] - - [0x800538C4, "func_800538C4"] - - [0x800538F8, "func_800538F8"] - - [0x80053974, "func_80053974"] - - [0x80053A18, "func_80053A18"] - - [0x80053A98, "func_80053A98"] - - [0x80053AEC, "func_80053AEC"] - - [0x80053B04, "func_80053B04"] - - [0x80053BE8, "func_80053BE8"] - - [0x80053C58, "func_80053C58"] - - [0x80053CF8, "func_80053CF8"] - - [0x80053E58, "func_80053E58"] - - [0x80053F64, "func_80053F64"] - - [0x80053F80, "func_80053F80"] - - [0x80054248, "func_80054248"] - - [0x80054CE0, "func_80054CE0"] - - [0x80054D74, "func_80054D74"] - - [0x80054DA8, "func_80054DA8"] - - [0x80054E90, "func_80054E90"] - - [0x80055050, "func_80055050"] - - [0x80055110, "func_80055110"] - - [0x80055240, "func_80055240"] - - [0x80055330, "func_80055330"] - - [0x800553C0, "func_800553C0"] - - [0x80055448, "func_80055448"] - - [0x80055464, "func_80055464"] - - [0x800554A4, "func_800554A4"] - - [0x800554E8, "func_800554E8"] - - [0x8005553C, "func_8005553C"] - - [0x80055590, "func_80055590"] - - [0x800555E4, "func_800555E4"] - - [0x800558D4, "func_800558D4"] - - [0x80055970, "func_80055970"] - - [0x800559C4, "func_800559C4"] - - [0x800559FC, "func_800559FC"] - - [0x80055A18, "func_80055A18"] - - [0x80055ABC, "func_80055ABC"] - - [0x80055AF0, "func_80055AF0"] - - [0x80055B28, "func_80055B28"] - - [0x80055B80, "func_80055B80"] - - [0x80055BB8, "func_80055BB8"] - - [0x80055CC4, "func_80055CC4"] - - [0x80055DDC, "func_80055DDC"] - - [0x80055E48, "func_80055E48"] - - [0x80056028, "func_80056028"] - - [0x80056044, "func_80056044"] - - [0x80056068, "func_80056068"] - - [0x8005608C, "func_8005608C"] - - [0x800560A8, "func_800560A8"] - - [0x800560BC, "func_800560BC"] - - [0x8005610C, "func_8005610C"] - - [0x8005615C, "func_8005615C"] - - [0x80056180, "func_80056180"] - - [0x800561A4, "func_800561A4"] - - [0x800561E4, "func_800561E4"] - - [0x80056204, "func_80056204"] - - [0x80056228, "func_80056228"] - - [0x80056250, "func_80056250"] - - [0x80056D34, "func_80056D34"] - - [0x80056D44, "func_80056D44"] - - [0x80056D50, "func_80056D50"] - - [0x80056D78, "func_80056D78"] - - [0x80056DCC, "func_80056DCC"] - - [0x80056EC0, "func_80056EC0"] - - [0x80056EE8, "func_80056EE8"] - - [0x80056FA4, "func_80056FA4"] - - [0x80057224, "func_80057224"] - - [0x80057344, "func_80057344"] - - [0x8005736C, "func_8005736C"] - - [0x80057548, "func_80057548"] - - [0x800576EC, "func_800576EC"] - - [0x80057DC8, "func_80057DC8"] - - [0x80057E08, "func_80057E08"] - - [0x80057E5C, "func_80057E5C"] - - [0x80057EB0, "func_80057EB0"] - - [0x80057ED0, "func_80057ED0"] - - [0x80057F20, "func_80057F20"] - - [0x80058E84, "func_80058E84"] - - [0x8005904C, "func_8005904C"] - - [0x80059310, "func_80059310"] - - [0x800598A0, "func_800598A0"] - - [0x80059C9C, "func_80059C9C"] - - [0x80059D50, "func_80059D50"] - - [0x80059F94, "func_80059F94"] - - [0x8005AF84, "func_8005AF84"] - - [0x8005BDD8, "func_8005BDD8"] - - [0x8006D800, "func_8006D800"] - - [0x8006DDC0, "func_8006DDC0"] - - [0x8006E310, "func_8006E310"] - - [0x8006E870, "func_8006E870"] - - [0x8006F8F0, "func_8006F8F0"] - - [0x8006FB90, "func_8006FB90"] - - [0x8006FBF0, "func_8006FBF0"] - - [0x8006FC50, "func_8006FC50"] - - [0x8006FCB0, "func_8006FCB0"] - - [0x8006FD10, "func_8006FD10"] - - [0x8006FD70, "func_8006FD70"] - - [0x8006FDD0, "func_8006FDD0"] - - [0x8006FE30, "func_8006FE30"] - - [0x8006FEF0, "func_8006FEF0"] - - [0x8006FF50, "func_8006FF50"] - - [0x8006FFB0, "func_8006FFB0"] - - [0x80070010, "func_80070010"] - - [0x80070070, "func_80070070"] - - [0x800700D0, "func_800700D0"] - - [0x80070130, "func_80070130"] - - [0x80070190, "func_80070190"] - - [0x800701F0, "func_800701F0"] - - [0x80070250, "func_80070250"] - - [0x800702B0, "func_800702B0"] - - [0x80070310, "func_80070310"] - - [0x80070370, "func_80070370"] - - [0x800703D0, "func_800703D0"] - - [0x80070430, "func_80070430"] - - [0x80070490, "func_80070490"] - - [0x800704F0, "func_800704F0"] - - [0x80070550, "func_80070550"] - - [0x800705B0, "func_800705B0"] - - [0x80070610, "func_80070610"] - - [0x80070670, "func_80070670"] - - [0x800706D0, "func_800706D0"] - - [0x80070730, "func_80070730"] - - [0x800708B0, "func_800708B0"] - - [0x80070910, "func_80070910"] - - [0x80070970, "func_80070970"] - - [0x800709D0, "func_800709D0"] - - [0x80070A30, "func_80070A30"] - - [0x80070A90, "func_80070A90"] - - [0x80070AF0, "func_80070AF0"] - - [0x80070B50, "func_80070B50"] - - [0x80070BB0, "func_80070BB0"] - - [0x80070C10, "func_80070C10"] - - [0x80070C70, "func_80070C70"] - - [0x80070CD0, "func_80070CD0"] - - [0x80070D30, "func_80070D30"] - - [0x80070D90, "func_80070D90"] - - [0x80070DF0, "func_80070DF0"] - - [0x80070E50, "func_80070E50"] - - [0x80070EB0, "func_80070EB0"] - - [0x80070F10, "func_80070F10"] - - [0x80070F70, "func_80070F70"] - - [0x80070FD0, "func_80070FD0"] - - [0x80071030, "func_80071030"] - - [0x80071090, "func_80071090"] - - [0x800710F0, "func_800710F0"] - - [0x80071150, "func_80071150"] - - [0x800711B0, "func_800711B0"] - - [0x80071210, "func_80071210"] - - [0x80071270, "func_80071270"] - - [0x800712D0, "func_800712D0"] - - [0x80071330, "func_80071330"] - - [0x80071390, "func_80071390"] - - [0x800713F0, "func_800713F0"] - - [0x80071450, "func_80071450"] - - [0x800714B0, "func_800714B0"] - - [0x80071510, "func_80071510"] - - [0x80071570, "func_80071570"] - - [0x800715D0, "func_800715D0"] - - [0x80071630, "func_80071630"] - - [0x800716F0, "func_800716F0"] - - [0x80071750, "func_80071750"] - - [0x800717B0, "func_800717B0"] - - [0x80071870, "func_80071870"] - - [0x800718D0, "func_800718D0"] - - [0x80071930, "func_80071930"] - - [0x80071990, "func_80071990"] - - [0x800719F0, "func_800719F0"] - - [0x80071A50, "func_80071A50"] - - [0x80071AB0, "func_80071AB0"] - - [0x80071B10, "func_80071B10"] - - [0x80071B70, "func_80071B70"] - - [0x80071BD0, "func_80071BD0"] - - [0x80071C30, "func_80071C30"] - - [0x80071C90, "func_80071C90"] - - [0x80071CF0, "func_80071CF0"] - - [0x80071D50, "func_80071D50"] - - [0x80071DB0, "func_80071DB0"] - - [0x80071E10, "func_80071E10"] - - [0x80071E70, "func_80071E70"] - - [0x80071ED0, "func_80071ED0"] - - [0x80071F30, "func_80071F30"] - - [0x80071F90, "func_80071F90"] - - [0x80071FF0, "func_80071FF0"] - - [0x800720B0, "func_800720B0"] - - [0x80072110, "func_80072110"] - - [0x80072170, "func_80072170"] - - [0x800721D0, "func_800721D0"] - - [0x80072230, "func_80072230"] - - [0x80072290, "func_80072290"] - - [0x800722F0, "func_800722F0"] - - [0x80072350, "func_80072350"] - - [0x800723B0, "func_800723B0"] - - [0x80072410, "func_80072410"] - - [0x80072470, "func_80072470"] - - [0x80072530, "func_80072530"] - - [0x80072590, "func_80072590"] - - [0x800725F0, "func_800725F0"] - - [0x80072650, "func_80072650"] - - [0x800726B0, "func_800726B0"] - - [0x80072710, "func_80072710"] - - [0x80072770, "func_80072770"] - - [0x800727D0, "func_800727D0"] - - [0x80072830, "func_80072830"] - - [0x80072890, "func_80072890"] - - [0x800728F0, "func_800728F0"] - - [0x80072950, "func_80072950"] - - [0x800729B0, "func_800729B0"] - - [0x80072A10, "func_80072A10"] - - [0x80072A70, "func_80072A70"] - - [0x80072AD0, "func_80072AD0"] - - [0x80072B30, "func_80072B30"] - - [0x80072BCC, "func_80072BCC"] - - [0x80072BDC, "func_80072BDC"] - - [0x80072CCC, "func_80072CCC"] - - [0x80072CDC, "func_80072CDC"] - - [0x800DC778, "func_800DC778"] - - [0x800DCB7C, "func_800DCB7C"] - - [0x800DCE70, "func_800DCE70"] - - [0x800DDAE4, "func_800DDAE4"] - - [0x800DDC44, "func_800DDC44"] - - [0x800DDD94, "func_800DDD94"] - - [0x800DF740, "func_800DF740"] - - [0x800DFC74, "func_800DFC74"] - - [0x800DFCF4, "func_800DFCF4"] - - [0x800DFEFC, "func_800DFEFC"] - - [0x800DFF78, "func_800DFF78"] - - [0x800E0088, "func_800E0088"] - - [0x800E0178, "func_800E0178"] - - [0x800E01A4, "func_800E01A4"] - - [0x800E01DC, "func_800E01DC"] - - [0x800E0260, "func_800E0260"] - - [0x800E06C0, "func_800E06C0"] - - [0x800E26C4, "func_800E26C4"] - - [0x800E306C, "func_800E306C"] - - [0x800E315C, "func_800E315C"] - - [0x800E3514, "func_800E3514"] - - [0x800E5088, "func_800E5088"] - - [0x800E52F8, "func_800E52F8"] - - [0x800E546C, "func_800E546C"] - - [0x800E96C8, "func_800E96C8"] - - [0x800E973C, "func_800E973C"] - - [0x800E97B8, "func_800E97B8"] - - [0x800E97E4, "func_800E97E4"] - - [0x800E983C, "func_800E983C"] - - [0x800E984C, "func_800E984C"] - - [0x800E9894, "status_menu_enable_ignore_changes"] - - [0x800E98C4, "func_800E98C4"] - - [0x800E98EC, "func_800E98EC"] - - [0x800E9900, "func_800E9900"] - - [0x800EA5A4, "func_800EA5A4"] - - [0x800EB200, "func_800EB200"] - - [0x800EB42C, "func_800EB42C"] - - [0x800EB474, "func_800EB474"] - - [0x800EB580, "func_800EB580"] - - [0x800EB5E4, "func_800EB5E4"] - - [0x800EB638, "func_800EB638"] - - [0x800EB658, "func_800EB658"] - - [0x800EB6C4, "func_800EB6C4"] - - [0x800EF300, "func_800EF300"] - - [0x800EF314, "func_800EF314"] - - [0x800EF394, "func_800EF394"] - - [0x800EF3A4, "func_800EF3A4"] - - [0x800EF3D4, "func_800EF3D4"] - - [0x800EF3E4, "func_800EF3E4"] - - [0x800EF414, "func_800EF414"] - - [0x800EF43C, "func_800EF43C"] - - [0x800EF600, "func_800EF600"] - - [0x800EF628, "func_800EF628"] - - [0x800EFD08, "func_800EFD08"] - - [0x800F13B0, "func_800F13B0"] - - [0x800F1538, "func_800F1538"] - - [0x800F4E40, "func_800F4E40"] - - [0x800F4FC4, "func_800F4FC4"] - - [0x8010FBC0, "func_8010FBC0"] - - [0x8010FD68, "func_8010FD68"] - - [0x8010FEB4, "func_8010FEB4"] - - [0x80110678, "func_80110678"] - - [0x801106A4, "func_801106A4"] - - [0x80110BCC, "func_80110BCC"] - - [0x80110CB8, "func_80110CB8"] - - [0x80110E58, "func_80110E58"] - - [0x80112328, "func_80112328"] - - [0x801125E8, "func_801125E8"] - - [0x80112900, "func_80112900"] - - [0x80112B20, "func_80112B20"] - - [0x80112B98, "func_80112B98"] - - [0x80112CA8, "func_80112CA8"] - - [0x80112D84, "func_80112D84"] - - [0x80112FC4, "func_80112FC4"] - - [0x80116674, "func_80116674"] - - [0x80116698, "func_80116698"] - - [0x8011B090, "func_8011B090"] - - [0x8011B1C0, "func_8011B1C0"] - - [0x8011B37C, "func_8011B37C"] - - [0x8011B5D0, "func_8011B5D0"] - - [0x8011B660, "func_8011B660"] - - [0x8011B7C0, "func_8011B7C0"] - - [0x8011B950, "func_8011B950"] - - [0x8011BAE8, "func_8011BAE8"] - - [0x8011BBA4, "func_8011BBA4"] - - [0x8011BC7C, "func_8011BC7C"] - - [0x8011BCB4, "func_8011BCB4"] - - [0x8011BCD0, "func_8011BCD0"] - - [0x8011BE5C, "func_8011BE5C"] - - [0x8011BE80, "func_8011BE80"] - - [0x8011BFD4, "func_8011BFD4"] - - [0x8011C164, "func_8011C164"] - - [0x8011C32C, "func_8011C32C"] - - [0x8011D72C, "func_8011D72C"] - - [0x8011D7E4, "func_8011D7E4"] - - [0x8011D82C, "func_8011D82C"] - - [0x8011D890, "func_8011D890"] - - [0x8011D9B8, "func_8011D9B8"] - - [0x8011E224, "func_8011E224"] - - [0x8011E310, "func_8011E310"] - - [0x8011E438, "func_8011E438"] - - [0x8011E4B8, "func_8011E4B8"] - - [0x8011EA54, "func_8011EA54"] - - [0x8011F304, "func_8011F304"] - - [0x8011FF74, "func_8011FF74"] - - [0x8011FF98, "func_8011FF98"] - - [0x8011FFE0, "func_8011FFE0"] - - [0x80120198, "func_80120198"] - - [0x801203AC, "func_801203AC"] - - [0x80120474, "func_80120474"] - - [0x80120BB0, "func_80120BB0"] - - [0x80120C58, "func_80120C58"] - - [0x80120CE0, "func_80120CE0"] - - [0x80120DE4, "func_80120DE4"] - - [0x80120F04, "func_80120F04"] - - [0x80121CE8, "func_80121CE8"] - - [0x80121EB8, "func_80121EB8"] - - [0x80122288, "func_80122288"] - - [0x80122D7C, "func_80122D7C"] - - [0x80122DDC, "func_80122DDC"] - - [0x80122DFC, "func_80122DFC"] - - [0x80122EE8, "func_80122EE8"] - - [0x80122F24, "func_80122F24"] - - [0x80122F64, "func_80122F64"] - - [0x801230B8, "func_801230B8"] - - [0x80123114, "func_80123114"] - - [0x80123158, "func_80123158"] - - [0x8012323C, "func_8012323C"] - - [0x80123320, "func_80123320"] - - [0x80123404, "func_80123404"] - - [0x80123470, "func_80123470"] - - [0x801234E0, "func_801234E0"] - - [0x80123550, "func_80123550"] - - [0x801235C0, "func_801235C0"] - - [0x8012363C, "func_8012363C"] - - [0x801264B0, "func_801264B0"] - - [0x8012FE10, "func_8012FE10"] - - [0x80132E54, "func_80132E54"] - - [0x801341E8, "func_801341E8"] - - [0x80134230, "func_80134230"] - - [0x80134240, "func_80134240"] - - [0x80136A80, "func_80136A80"] - - [0x80137D88, "func_80137D88"] - - [0x80137DA4, "func_80137DA4"] - - [0x80137DC0, "func_80137DC0"] - - [0x80137E10, "func_80137E10"] - - [0x80137E4C, "func_80137E4C"] - - [0x801380D4, "func_801380D4"] - - [0x80138108, "func_80138108"] - - [0x80138188, "func_80138188"] - - [0x80138198, "func_80138198"] - - [0x801381A0, "func_801381A0"] - - [0x80138220, "func_80138220"] - - [0x801382AC, "func_801382AC"] - - [0x801385D4, "func_801385D4"] - - [0x8013A37C, "func_8013A37C"] - - [0x8013A4D0, "func_8013A4D0"] - - [0x8013A6E8, "func_8013A6E8"] - - [0x8013A704, "func_8013A704"] - - [0x8013A854, "func_8013A854"] - - [0x8013AA9C, "func_8013AA9C"] - - [0x8013AF70, "func_8013AF70"] - - [0x80141100, "func_80141100"] - - [0x80142210, "func_80142210"] - - [0x8014271C, "func_8014271C"] - - [0x801447E0, "func_801447E0"] - - [0x80144C20, "func_80144C20"] - - [0x80144EB0, "func_80144EB0"] - - [0x80144EFC, "func_80144EFC"] - - [0x801452B4, "func_801452B4"] - - [0x801452E8, "func_801452E8"] - - [0x80145CE8, "func_80145CE8"] - - [0x80145DF8, "func_80145DF8"] - - [0x80145EC0, "func_80145EC0"] - - [0x80147230, "func_80147230"] - - [0x801473F0, "func_801473F0"] - - [0x80147414, "func_80147414"] - - [0x80147AC4, "func_80147AC4"] - - [0x80147CC8, "func_80147CC8"] - - [0x80147D70, "func_80147D70"] - - [0x80147E7C, "func_80147E7C"] - - [0x80147EC4, "func_80147EC4"] - - [0x80147F30, "func_80147F30"] - - [0x80148040, "func_80148040"] - - [0x801480F0, "func_801480F0"] - - [0x801481C4, "func_801481C4"] - - [0x801491E4, "func_801491E4"] - - [0x80149600, "func_80149600"] - - [0x80149618, "func_80149618"] - - [0x80149670, "func_80149670"] - - [0x80149734, "func_80149734"] - - [0x801497FC, "func_801497FC"] - - [0x80149828, "func_80149828"] - - [0x80149838, "func_80149838"] - - [0x80149A6C, "func_80149A6C"] - - [0x8014A498, "func_8014A498"] - - [0x8014A52C, "func_8014A52C"] - - [0x8014A548, "func_8014A548"] - - [0x8014A964, "func_8014A964"] - - [0x8014AA54, "func_8014AA54"] - - [0x8014AB0C, "func_8014AB0C"] - - [0x8014AC08, "func_8014AC08"] - - [0x8014AC5C, "func_8014AC5C"] - - [0x8014AC70, "func_8014AC70"] - - [0x8014ADA4, "func_8014ADA4"] - - [0x8014ADF8, "func_8014ADF8"] - - [0x8014AE6C, "func_8014AE6C"] - - [0x8014AEF8, "func_8014AEF8"] - - [0x8014AF8C, "func_8014AF8C"] - - [0x80200000, "func_80200000"] - - [0x80200080, "func_80200080"] - - [0x802431A0, "func_802431A0"] - - [0x80244060, "func_80244060"] - - [0x80244424, "func_80244424"] - - [0x80244708, "func_80244708"] - - [0x802448E0, "func_802448E0"] - - [0x80244B00, "func_80244B00"] - - [0x80244BC4, "func_80244BC4"] - - [0x802AE000, "func_802AE000"] - - [0x802B2000, "func_802B2000"] - - [0x802B203C, "func_802B203C"] - - [0x802B2078, "func_802B2078"] - - [0x802B20B4, "func_802B20B4"] - - [0x802B7000, "func_802B7000"] - - [0x802B71C8, "func_802B71C8"] - - [0x802B71D4, "func_802B71D4"] - - [0x802B71E8, "func_802B71E8"] - - [0x802C39F8, "func_802C39F8"] - - [0x802C3EE4, "func_802C3EE4"] - - [0x802CD4B4, "func_802CD4B4"] - - [0x802CD57C, "func_802CD57C"] - - [0x802CDAC0, "resolve_npc"] - - [0x802D4488, "func_802D4488"] - - [0x802D4560, "func_802D4560"] - - [0x802DD8F8, "func_802DD8F8"] - - [0x802DDA60, "func_802DDA60"] - - [0x802DDA8C, "func_802DDA8C"] - - [0x802DDEC4, "func_802DDEC4"] - - [0x802DDEE4, "func_802DDEE4"] - - [0x802DDFF8, "func_802DDFF8"] - - [0x802DE0EC, "func_802DE0EC"] - - [0x802DE2AC, "func_802DE2AC"] - - [0x802DE3D8, "func_802DE3D8"] - - [0x802DE5C8, "func_802DE5C8"] - - [0x802DE5E8, "func_802DE5E8"] - - [0x802DE894, "func_802DE894"] - - [0x802DE9D8, "func_802DE9D8"] - - [0x802DEA40, "func_802DEA40"] - - [0x802DEA6C, "func_802DEA6C"] - - [0x802DED60, "func_802DED60"] - - [0x802DEEA0, "func_802DEEA0"] - - [0x802DEFB4, "func_802DEFB4"] - - [0x802DF00C, "func_802DF00C"] - - [0x802DF2D8, "func_802DF2D8"] - - [0x802E0DB0, "func_802E0DB0"] - - [0x802E3650, "func_802E3650"] - - [0x802E36E4, "func_802E36E4"] diff --git a/tools/n64splitter b/tools/n64splitter deleted file mode 160000 index 678acb2ea0..0000000000 --- a/tools/n64splitter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 678acb2ea026162039be6700486499db526dfba6 diff --git a/tools/splat.yaml b/tools/splat.yaml new file mode 100644 index 0000000000..229e122c11 --- /dev/null +++ b/tools/splat.yaml @@ -0,0 +1,736 @@ +name: "Paper Mario (North America)" +basename: "papermario" +options: ["skip-asm"] +segments: + - name: header + type: code + start: 0x00 + end: 0x40 + vram: 0 + files: + - [0x0000, "asm", "header"] + - name: boot + type: code + start: 0x0040 + end: 0x0B70 + vram: 0xA4000040 + files: + - [0x0040, "asm", "boot"] + - [0x0B70, "bin", "bootcode_font"] + - name: code + type: code + start: 0x1000 + end: 0x4E5A0 + vram: 0x80025C00 + files: + - [0x1000, "c", "code_1000_len_60"] + - [0x1060, "c", "code_1060_len_310"] + - [0x1370, "c", "code_1370_len_7d0"] + - [0x1b40, "c", "code_1b40_len_20b0"] + - [0x3bf0, "c", "code_3bf0_len_6f0"] + - [0x42e0, "c", "code_42e0_len_1f60"] + - [0x6000, "c", "code_6000"] + - [0x6240, "c", "code_6240_len_c00"] + - [0x6e40, "c", "code_6e40_len_500"] + - [0x7340, "c", "code_7340_len_b00"] + - [0x7e40, "c", "os/code_7e40_len_3f0"] + - [0x8230, "c", "code_8230_len_1ae0"] + - [0x9d10, "c", "code_9d10_len_1080"] + - [0xad90, "c", "code_ad90_len_2880"] + - [0xd610, "c", "code_d610_len_1330"] + - [0xe940, "c", "code_e940_len_290"] + - [0xebd0, "c", "code_ebd0_len_6a0"] + - [0xf270, "c", "code_f270_len_1190"] + - [0x10400, "c", "code_10400_len_d30"] + - [0x11130, "c", "code_11130_len_c0"] + - [0x111f0, "c", "code_111f0_len_860"] + - [0x11a50, "c", "code_11a50_len_7a0"] + - [0x121f0, "c", "code_121f0_len_1290"] + - [0x13480, "c", "code_13480_len_3f0"] + - [0x13870, "c", "code_13870_len_6980"] + - [0x1a1f0, "c", "code_1a1f0_len_5390"] + - [0x1f580, "c", "code_1f580_len_1940"] + - [0x20ec0, "c", "code_20ec0_len_5040"] + - [0x25f00, "c", "code_25f00_len_940"] + - [0x26840, "c", "code_26840_len_20d0"] + - [0x28910, "c", "code_28910_len_5090"] + - [0x2d9a0, "c", "code_2d9a0_len_890"] + - [0x2e230, "c", "code_2e230_len_2190"] + - [0x303c0, "c", "code_303c0_len_3e10"] + - [0x341d0, "c", "code_341d0_len_20d0"] + - [0x362a0, "c", "code_362a0_len_2f70"] + - [0x39210, "c", "code_39210_len_aa0"] + - [0x39cb0, "c", "os/code_39cb0_len_100"] + - [0x39db0, "c", "os/code_39db0_len_8a0"] + - [0x3a650, "c", "os/code_3a650_len_40"] + - [0x3a690, "c", "os/code_3a690_len_40"] + - [0x3a6d0, "c", "os/code_3a6d0_len_20"] + - [0x3a6f0, "c", "os/code_3a6f0_len_110"] + - [0x3a800, "c", "os/code_3a800_len_30"] + - [0x3a830, "c", "os/code_3a830_len_20"] + - [0x3a850, "c", "os/code_3a850_le_a40"] + - [0x3b290, "c", "os/code_3b290_len_100"] + - [0x3b390, "c", "os/code_3b390_len_110"] + - [0x3b4a0, "c", "os/code_3b4a0_len_270"] + - [0x3b710, "c", "os/code_3b710_len_40"] + - [0x3b750, "c", "code_3b750_len_20"] + - [0x3b770, "c", "os/code_3b770_len_80"] + - [0x3b7f0, "c", "os/code_3b7f0_len_120"] + - [0x3b910, "c", "os/code_3b910_len_410"] + - [0x3bd20, "c", "os/code_3bd20_len_c0"] + - [0x3bde0, "c", "os/code_3bde0_len_3e0"] + - [0x3c1c0, "c", "os/code_3c1c0_len_60"] + - [0x3c220, "c", "os/code_3c220_len_a0"] + - [0x3c2c0, "c", "os/code_3c2c0_len_50"] + - [0x3c310, "c", "os/code_3c310_len_180"] + - [0x3c490, "c", "os/code_3c490_len_3c0"] + - [0x3c850, "c", "os/code_3c850_len_f0"] + - [0x3c940, "c", "os/code_3c940_len_140"] + - [0x3ca80, "c", "os/code_3ca80_len_a0"] + - [0x3cb20, "c", "os/code_3cb20_len_130"] + - [0x3cc50, "c", "os/code_3cc50_len_80"] + - [0x3ccd0, "c", "os/code_3ccd0_len_30"] + - [0x3cd00, "c", "os/code_3cd00_len_5f0"] + - [0x3d2f0, "c", "os/code_3d2f0_len_10"] + - [0x3d300, "c", "os/code_3d300_len_30"] + - [0x3d330, "c", "os/code_3d330_len_990"] + - [0x3dcc0, "c", "os/code_3dcc0_len_a60"] + - [0x3e720, "c", "os/code_3e720_len_5f0"] + - [0x3ed10, "c", "guOrtho"] + - [0x3ef90, "c", "os/code_3ef90_len_600"] + - [0x3f310, "c", "os/code_3f310_len_3c0"] + - [0x3f6d0, "c", "os/code_3f6d0_len_320"] + - [0x3f9f0, "c", "os/code_3f9f0_len_60"] + - [0x3fa50, "c", "os/code_3fa50_len_f60"] + - [0x409b0, "c", "os/code_409b0_len_140"] + - [0x40af0, "c", "os/code_40af0_len_130"] + - [0x40c20, "c", "os/code_40c20_len_1f0"] + - [0x40e10, "c", "os/code_40e10_len_240"] + - [0x41050, "c", "os/code_41050_len_120"] + - [0x41170, "c", "os/code_41170_len_f0"] + - [0x41260, "c", "os/osCreateThread"] + - [0x41330, "c", "os/osGetThreadPri"] + - [0x41350, "c", "os/code_41350_len_d0"] + - [0x41420, "c", "os/code_41420_len_120"] + - [0x41540, "c", "os/code_41540_len_c0"] + - [0x41600, "c", "os/code_41600_len_40"] + - [0x41640, "c", "os/code_41640_len_50"] + - [0x41690, "c", "os/code_41690_len_10"] + - [0x416a0, "c", "os/code_416a0_len_90"] + - [0x41730, "c", "os/code_41730_len_20"] + - [0x41750, "c", "os/code_41750_len_450"] + - [0x41ba0, "c", "os/code_41ba0_len_c0"] + - [0x41c60, "c", "os/code_41c60_len_c0"] + - [0x41d20, "c", "os/code_41d20_len_40"] + - [0x41d60, "c", "os/code_41d60_len_50"] + - [0x41db0, "c", "os/code_41db0_len_40"] + - [0x41df0, "c", "os/code_41df0_len_40"] + - [0x41e30, "c", "os/code_41e30_len_40"] + - [0x41e70, "c", "os/code_41e70_len_340"] + - [0x421b0, "c", "os/code_421b0_len_60"] + - [0x42210, "c", "os/code_42210_len_50"] + - [0x42260, "c", "os/code_42260_len_170"] + - [0x423d0, "c", "os/code_423d0_len_50"] + - [0x42420, "c", "os/code_42420_len_50"] + - [0x42470, "c", "os/code_42470_len_310"] + - [0x42780, "c", "os/code_42780_len_120"] + - [0x428a0, "c", "os/guMtxIdentF"] + - [0x42900, "c", "os/code_42900_len_80"] + - [0x42980, "c", "os/code_42980_len_80"] + - [0x42a00, "c", "os/code_42a00_len_100"] + - [0x42b00, "c", "os/code_42b00_len_c0"] + - [0x42bc0, "c", "os/code_42bc0_len_60"] + - [0x42c20, "c", "os/code_42c20_len_e0"] + - [0x42d00, "c", "os/code_42d00_len_60"] + - [0x42d60, "c", "os/code_42d60_len_80"] + - [0x42de0, "c", "os/code_42de0_len_90"] + - [0x42e70, "c", "os/code_42e70_len_390"] + - [0x43200, "c", "os/code_43200_len_7c0"] + - [0x439c0, "c", "os/code_439c0_len_220"] + - [0x43be0, "c", "os/code_43be0_len_5e0"] + - [0x441c0, "c", "os/code_441c0_len_1c0"] + - [0x44380, "c", "os/code_44380_len_4e0"] + - [0x44860, "c", "os/code_44860_len_60"] + - [0x448c0, "c", "os/code_448c0_len_210"] + - [0x44ad0, "c", "os/code_44ad0_len_70"] + - [0x44b40, "c", "os/code_44b40_len_a90"] + - [0x455d0, "c", "os/code_455d0_len_1f0"] + - [0x457c0, "c", "os/code_457c0_len_270"] + - [0x45a30, "c", "os/code_45a30_len_20"] + - [0x45a50, "c", "os/code_45a50_len_3a0"] + - [0x45df0, "c", "os/code_45df0_len_970"] + - [0x46760, "c", "os/code_46760_len_90"] + - [0x467f0, "c", "os/code_467f0_len_90"] + - [0x46880, "c", "os/code_46880_len_260"] + - [0x46ae0, "c", "os/code_46ae0_len_170"] + - [0x46c50, "c", "os/code_46c50_len_20"] + - [0x46c70, "c", "os/code_46c70_len_e00"] + - [0x47a70, "c", "os/code_47a70_len_10"] + - [0x47a80, "c", "os/code_47a80_len_10"] + - [0x47a90, "c", "os/code_47a90_len_50"] + - [0x47ae0, "c", "os/code_47ae0_len_e0"] + - [0x47bc0, "c", "os/code_47bc0_len_50"] + - [0x47c10, "c", "os/code_47c10_len_50"] + - [0x47c60, "c", "os/code_47c60_len_f0"] + - [0x47d50, "c", "os/code_47d50_len_e0"] + - [0x47e30, "c", "os/code_47e30_len_60"] + - [0x47e90, "c", "os/code_47e90_len_110"] + - [0x47fa0, "c", "os/code_47fa0_len_20"] + - [0x47fc0, "c", "os/code_47fc0_len_60"] + - [0x48020, "c", "os/code_48020_len_a00"] + - [0x48a20, "c", "os/code_48a20_len_1c0"] + - [0x48be0, "c", "os/code_48be0_len_20"] + - [0x48c00, "c", "os/code_48c00_len_5c0"] + - [0x491c0, "c", "os/code_491c0_len_f80"] + - [0x49C70, "c", "os/code_49C70"] + - [0x4a140, "c", "os/code_4a140_len_70"] + - [0x4a1b0, "c", "os/code_4a1b0_len_40"] + - [0x4a1f0, "c", "os/code_4a1f0_len_170"] + - [0x4a360, "c", "os/code_4a360_len_930"] + - [0x4ac90, "c", "os/code_4ac90_len_3910"] + - [0x4E5A0, "bin"] + - name: code + type: code + start: 0x759B0 + end: 0x90FE0 + vram: 0x800DC500 + files: + - [0x759b0, "c", "code_759b0_len_61b0"] + - [0x7bb60, "c", "code_7bb60_len_41b0"] + - [0x7fd10, "c", "code_7fd10_len_b40"] + - [0x80850, "c", "code_80850_len_3060"] + - [0x838b0, "c", "code_838b0_len_5900"] + - [0x891b0, "c", "code_891b0_len_fb0"] + - [0x8a160, "c", "code_8a160_len_700"] + - [0x8a860, "c", "code_8a860_len_3f30"] + - [0x8e790, "c", "code_8e790_len_2850"] + - [0x90fe0, "bin"] + - name: code + type: code + start: 0xA5DD0 + end: 0xE16B0 + vram: 0x8010F6D0 + files: + - [0xa5dd0, "c", "code_a5dd0_len_114e0"] + - [0xb72b0, "c", "code_b72b0_len_15ed0"] + - [0xcd180, "c", "code_cd180_len_38f0"] + - [0xd0a70, "c", "code_d0a70_len_4fe0"] + - [0xd5a50, "c", "code_d5a50_len_5fd0"] + - [0xdba20, "c", "code_dba20_len_350"] + - [0xdbd70, "c", "code_dbd70_len_700"] + - [0xdc470, "c", "code_dc470_len_14c0"] + - [0xdd930, "c", "code_dd930_len_1c0"] + - [0xddaf0, "c", "code_ddaf0_len_c50"] + - [0xde740, "c", "code_de740_len_23f0"] + - [0xe0b30, "c", "code_e0b30_len_b80"] + - [0xe16b0, "bin"] + - name: code + type: code + start: 0xE79B0 + end: 0xFE650 + vram: 0x802C3000 + files: + - [0xe79b0, "c", "code_e79b0_len_1920"] + - [0xe92d0, "c", "code_e92d0_len_5da0"] + - [0xef070, "c", "code_ef070_len_3400"] + - [0xf2470, "c", "code_f2470_len_27f0"] + - [0xf4c60, "c", "code_f4c60_len_4300"] + - [0xf8f60, "c", "code_f8f60_len_1560"] + - [0xfa4c0, "c", "code_fa4c0_len_3bf0"] + - [0xfe0b0, "c", "code_fe0b0_len_5a0"] + - [0xFE650, "bin"] + - name: code + type: code + start: 0xFEE30 + end: 0x102480 + vram: 0x802DBD40 + files: + - [0xfee30, "c", "code_fee30_len_2d60"] + - [0x101b90, "c", "code_101b90_len_8f0"] + - [0x102480, "bin"] + - name: code + type: code + start: 0x102610 + end: 0x10A9F0 + vram: 0x802E0D90 + files: + - [0x102610, "c", "code_102610_len_2330"] + - [0x104940, "c", "code_104940_len_dc0"] + - [0x105700, "c", "code_105700_len_2130"] + - [0x107830, "c", "code_107830_len_e70"] + - [0x1086a0, "c", "code_1086a0_len_fc0"] + - [0x109660, "c", "code_109660_len_1270"] + - [0x10A9F0, "bin"] + - [0x131340, "bin"] + - name: code + type: code + start: 0x135EE0 + end: 0x1422A0 + vram: 0x80242BA0 + files: + - [0x135EE0, "c", "code_135EE0"] + - [0x1422A0, "bin"] + - name: code + type: code + start: 0x163400 + end: 0x16A3E0 + vram: 0x80242BA0 + files: + - [0x163400, "c", "code_163400"] + - [0x167570, "c", "code_167570"] + - [0x168590, "c", "code_168590"] + - [0x169BE0, "c", "code_169BE0"] + - [0x16a3e0, "bin"] + - name: code + type: code + start: 0x16C8E0 + end: 0x1AF2C0 + vram: 0x8023E000 + files: + - [0x16C8E0, "c", "code_16c8e0"] + - [0x1AF2C0, "bin"] + - name: code + type: code + start: 0x3169F0 + end: 0x316C00 + vram: 0x80200000 + files: + - [0x3169f0, "c", "code_3169f0"] + - [0x316a70, "c", "code_316a70"] + - [0x316c00, "bin"] + - name: code + type: code + start: 0x316D90 + end: 0x316f30 + vram: 0x802AE000 + files: + - [0x316d90, "c", "code_316d90"] + - name: code + type: code + start: 0x316f30 + end: 0x317020 + vram: 0x802B2000 + files: + - [0x316f30, "c", "code_316f30"] + - [0x317020, "bin"] + - name: code + type: code + start: 0x415D90 + end: 0x4200C0 + vram: 0x802A1000 + files: + - [0x415D90, "c", "code_415D90"] + - [0x4200C0, "bin"] + - name: code + type: code + start: 0x7E0E80 + end: 0x7E4D00 + vram: 0x80280000 + files: + - [0x7e0e80, "c", "code_7e0e80"] + - [0x7E2AA0, "c", "code_7E2AA0"] + - [0x7E3700, "c", "code_7E3700"] + - [0x7e4d00, "bin"] + - name: code + type: code + start: 0xE20EB0 + end: 0xE215C0 + vram: 0x802B7000 + files: + - [0xe20eb0, "c", "code_e20eb0"] + - [0xe215c0, "bin"] + - [0xF007C0, "bin", "Battle_Fanfare_02"] # BGM start + - [0xF02160, "bin", "Hey_You_03"] + - [0xF03740, "bin", "The_Goomba_King_s_Decree_07"] + - [0xF043F0, "bin", "Attack_of_the_Koopa_Bros_08"] + - [0xF073C0, "bin", "Trojan_Bowser_09"] + - [0xF08D40, "bin", "Chomp_Attack_0A"] + - [0xF09600, "bin", "Ghost_Gulping_0B"] + - [0xF0A550, "bin", "Keeping_Pace_0C"] + - [0xF0BAE0, "bin", "Go_Mario_Go_0D"] + - [0xF0DEC0, "bin", "Huffin_and_Puffin_0E"] + - [0xF0FD20, "bin", "Freeze_0F"] + - [0xF110D0, "bin", "Winning_a_Battle_8B"] + - [0xF116C0, "bin", "Winning_a_Battle_and_Level_Up_8E"] + - [0xF12320, "bin", "Jr_Troopa_Battle_04"] + - [0xF13C20, "bin", "Final_Bowser_Battle_interlude_05"] + - [0xF15F40, "bin", "Master_Battle_2C"] + - [0xF16F80, "bin", "Game_Over_87"] + - [0xF171D0, "bin", "Resting_at_the_Toad_House_88"] + - [0xF17370, "bin", "Running_around_the_Heart_Pillar_in_Ch1_84"] + - [0xF17570, "bin", "Tutankoopa_s_Warning_45"] + - [0xF18940, "bin", "Kammy_Koopa_s_Theme_46"] + - [0xF193D0, "bin", "Jr_Troopa_s_Theme_47"] + - [0xF19BC0, "bin", "Goomba_King_s_Theme_50"] + - [0xF1A6F0, "bin", "Koopa_Bros_Defeated_51"] + - [0xF1ABD0, "bin", "Koopa_Bros_Theme_52"] + - [0xF1C810, "bin", "Tutankoopa_s_Warning_2_53"] + - [0xF1DBF0, "bin", "Tutankoopa_s_Theme_54"] + - [0xF1F2E0, "bin", "Tubba_Blubba_s_Theme_55"] + - [0xF20FF0, "bin", "General_Guy_s_Theme_56"] + - [0xF21780, "bin", "Lava_Piranha_s_Theme_57"] + - [0xF22A00, "bin", "Huff_N_Puff_s_Theme_58"] + - [0xF23A00, "bin", "Crystal_King_s_Theme_59"] + - [0xF24810, "bin", "Blooper_s_Theme_5A"] + - [0xF25240, "bin", "Midboss_Theme_5B"] + - [0xF26260, "bin", "Monstar_s_Theme_5C"] + - [0xF27840, "bin", "Moustafa_s_Theme_86"] + - [0xF27E20, "bin", "Fuzzy_Searching_Minigame_85"] + - [0xF28E20, "bin", "Phonograph_in_Mansion_44"] + - [0xF29AC0, "bin", "Toad_Town_00"] + - [0xF2E130, "bin", "Bill_Blaster_Theme_48"] + - [0xF2EF90, "bin", "Monty_Mole_Theme_in_Flower_Fields_49"] + - [0xF30590, "bin", "Shy_Guys_in_Toad_Town_4A"] + - [0xF318B0, "bin", "Whale_s_Problem_4C"] + - [0xF32220, "bin", "Toad_Town_Sewers_4B"] + - [0xF33060, "bin", "Unused_Theme_4D"] + - [0xF33AA0, "bin", "Mario_s_House_Prologue_3E"] + - [0xF33F10, "bin", "Peach_s_Party_3F"] + - [0xF354E0, "bin", "Goomba_Village_01"] + - [0xF35ED0, "bin", "Pleasant_Path_11"] + - [0xF36690, "bin", "Fuzzy_s_Took_My_Shell_12"] + - [0xF379E0, "bin", "Koopa_Village_13"] + - [0xF38570, "bin", "Koopa_Bros_Fortress_14"] + - [0xF39160, "bin", "Dry_Dry_Ruins_18"] + - [0xF3A0D0, "bin", "Dry_Dry_Ruins_Mystery_19"] + - [0xF3A450, "bin", "Mt_Rugged_16"] + - [0xF3AF20, "bin", "Dry_Dry_Desert_Oasis_17"] + - [0xF3C130, "bin", "Dry_Dry_Outpost_15"] + - [0xF3CCC0, "bin", "Forever_Forest_1A"] + - [0xF3E130, "bin", "Boo_s_Mansion_1B"] + - [0xF3F3E0, "bin", "Bow_s_Theme_1C"] + - [0xF40F00, "bin", "Gusty_Gulch_Adventure_1D"] + - [0xF42F30, "bin", "Tubba_Blubba_s_Castle_1E"] + - [0xF45500, "bin", "The_Castle_Crumbles_1F"] + - [0xF465E0, "bin", "Shy_Guy_s_Toy_Box_20"] + - [0xF474A0, "bin", "Toy_Train_Travel_21"] + - [0xF47E10, "bin", "Big_Lantern_Ghost_s_Theme_22"] + - [0xF48410, "bin", "Jade_Jungle_24"] + - [0xF4A880, "bin", "Deep_Jungle_25"] + - [0xF4BC00, "bin", "Lavalava_Island_26"] + - [0xF4E690, "bin", "Search_for_the_Fearsome_5_27"] + - [0xF50A00, "bin", "Raphael_the_Raven_28"] + - [0xF52520, "bin", "Hot_Times_in_Mt_Lavalava_29"] + - [0xF55C80, "bin", "Escape_from_Mt_Lavalava_2A"] + - [0xF58ED0, "bin", "Cloudy_Climb_32"] + - [0xF592B0, "bin", "Puff_Puff_Machine_33"] + - [0xF5AFF0, "bin", "Flower_Fields_30"] + - [0xF5C8D0, "bin", "Flower_Fields_Sunny_31"] + - [0xF5DF40, "bin", "Sun_s_Tower_34"] + - [0xF5F500, "bin", "Sun_s_Celebration_35"] + - [0xF61700, "bin", "Shiver_City_38"] + - [0xF62E50, "bin", "Detective_Mario_39"] + - [0xF64220, "bin", "Snow_Road_3A"] + - [0xF64CB0, "bin", "Over_Shiver_Mountain_3B"] + - [0xF65B30, "bin", "Starborn_Valley_3C"] + - [0xF66690, "bin", "Sanctuary_3D"] + - [0xF66B70, "bin", "Crystal_Palace_37"] + - [0xF67F80, "bin", "Star_Haven_60"] + - [0xF69640, "bin", "Shooting_Star_Summit_61"] + - [0xF6A050, "bin", "Legendary_Star_Ship_62"] + - [0xF6C270, "bin", "Star_Sanctuary_63"] + - [0xF6CED0, "bin", "Bowser_s_Castle_-_Caves_65"] + - [0xF6EE40, "bin", "Bowser_s_Castle_64"] + - [0xF73390, "bin", "Star_Elevator_2B"] + - [0xF751F0, "bin", "Goomba_Bros_Defeated_7E"] + - [0xF759C0, "bin", "Farewell_Twink_70"] + - [0xF77200, "bin", "Peach_Cooking_71"] + - [0xF77680, "bin", "Gourmet_Guy_72"] + - [0xF78600, "bin", "Hope_on_the_Balcony_Peach_1_73"] + - [0xF79070, "bin", "Peach_s_Theme_2_74"] + - [0xF7A0C0, "bin", "Peach_Sneaking_75"] + - [0xF7AA40, "bin", "Peach_Captured_76"] + - [0xF7AD90, "bin", "Quiz_Show_Intro_77"] + - [0xF7BEA0, "bin", "Unconscious_Mario_78"] + - [0xF7C780, "bin", "Petunia_s_Theme_89"] + - [0xF7DC00, "bin", "Flower_Fields_Door_appears_8A"] + - [0xF7E190, "bin", "Beanstalk_7B"] + - [0xF7EE20, "bin", "Lakilester_s_Theme_7D"] + - [0xF80230, "bin", "The_Sun_s_Back_7F"] + - [0xF81260, "bin", "Shiver_City_in_Crisis_79"] + - [0xF82460, "bin", "Solved_Shiver_City_Mystery_7A"] + - [0xF82D00, "bin", "Merlon_s_Spell_7C"] + - [0xF83DC0, "bin", "Bowser_s_Theme_66"] + - [0xF85590, "bin", "Train_Travel_80"] + - [0xF860E0, "bin", "Whale_Trip_81"] + - [0xF87000, "bin", "Chanterelle_s_Song_8C"] + - [0xF87610, "bin", "Boo_s_Game_8D"] + - [0xF88B30, "bin", "Dry_Dry_Ruins_rises_up_83"] + - [0xF89570, "bin", "End_of_Chapter_40"] + - [0xF8AAF0, "bin", "Beginning_of_Chapter_41"] + - [0xF8B820, "bin", "Hammer_and_Jump_Upgrade_42"] + - [0xF8BD90, "bin", "Found_Baby_Yoshi_s_4E"] + - [0xF8C360, "bin", "New_Partner_JAP_96"] + - [0xF8D110, "bin", "Unused_YI_Fanfare_4F"] + - [0xF8D3E0, "bin", "Unused_YI_Fanfare_2_5D"] + - [0xF90880, "bin", "Peach_s_Castle_inside_Bubble_5E"] + - [0xF92A50, "bin", "Angry_Bowser_67"] + - [0xF95510, "bin", "Bowser_s_Castle_explodes_5F"] + - [0xF96280, "bin", "Peach_s_Wish_68"] + - [0xF98520, "bin", "File_Select_69"] + - [0xF98F90, "bin", "Title_Screen_6A"] + - [0xF9B830, "bin", "Peach_s_Castle_in_Crisis_6B"] + - [0xF9D3B0, "bin", "Mario_falls_from_Bowser_s_Castle_6C"] + - [0xF9D690, "bin", "Peach_s_Arrival_6D"] + - [0xF9EF30, "bin", "Star_Rod_Recovered_6F"] + - [0xF9FA30, "bin", "Mario_s_House_94"] + - [0xFA08A0, "bin", "Bowser_s_Attacks_95"] + - [0xFA3C60, "bin", "End_Parade_1_90"] + - [0xFA85F0, "bin", "End_Parade_2_91"] + - [0xFABE90, "bin", "The_End_6E"] + - [0xFACC80, "bin", "Koopa_Radio_Station_2D"] + - [0xFAD210, "bin", "The_End_Low_Frequency__2E"] + - [0xFAD8F0, "bin", "SMW_Remix_2F"] + - [0xFADE70, "bin", "New_Partner_82"] # BGM end + - [0xFAE860, "bin"] + - [0x19E09A8, "bin", "Yay0_19e09a8_len_1206"] + - [0x19E1390, "bin", "Yay0_19e1390_len_806"] + - [0x19E1888, "bin", "Yay0_19e1888_len_2324"] + - [0x19E2330, "bin", "Yay0_19e2330_len_cc0"] + - [0x19E2DE0, "bin", "Yay0_19e2de0_len_1206"] + - [0x19E3208, "bin", "Yay0_19e3208_len_9a6"] + - [0x19E3BA8, "bin", "Yay0_19e3ba8_len_456"] + - [0x19E3FD8, "bin", "Yay0_19e3fd8_len_4024"] + - [0x19E4828, "bin", "Yay0_19e4828_len_3c0"] + - [0x19E4BE0, "bin", "Yay0_19e4be0_len_1416"] + - [0x19E5758, "bin", "Yay0_19e5758_len_802"] + - [0x19E5950, "bin", "Yay0_19e5950_len_22a0"] + - [0x19E62A0, "bin", "Yay0_19e62a0_len_512"] + - [0x19E67B2, "bin"] + - [0x19E6B60, "bin", "Yay0_19e6b60_len_1406"] + - [0x19E7528, "bin", "Yay0_19e7528_len_8256"] + - [0x19E9778, "bin", "Yay0_19e9778_len_2800"] + - [0x19EAF38, "bin", "Yay0_19eaf38_len_40c0"] + - [0x19EC4E0, "bin", "Yay0_19ec4e0_len_1910"] + - [0x19EDD30, "bin", "Yay0_19edd30_len_2204"] + - [0x19EEB18, "bin", "Yay0_19eeb18_len_10062"] + - [0x19F0070, "bin", "Yay0_19f0070_len_158c"] + - [0x19F15A0, "bin", "Yay0_19f15a0_len_2252"] + - [0x19F26D8, "bin", "Yay0_19f26d8_len_5102"] + - [0x19F5390, "bin", "Yay0_19f5390_len_2002"] + - [0x19F7398, "bin", "Yay0_19f7398_len_8024"] + - [0x19FA128, "bin", "Yay0_19fa128_len_4ac6"] + - [0x19FCAE8, "bin", "Yay0_19fcae8_len_2502"] + - [0x19FED70, "bin", "Yay0_19fed70_len_200004"] + - [0x1A00958, "bin", "Yay0_1a00958_len_24a2"] + - [0x1A02D00, "bin", "Yay0_1a02d00_len_4000"] + - [0x1A04400, "bin", "Yay0_1a04400_len_114c"] + - [0x1A05550, "bin", "Yay0_1a05550_len_2280"] + - [0x1A06390, "bin", "Yay0_1a06390_len_c04"] + - [0x1A06F98, "bin", "Yay0_1a06f98_len_1066"] + - [0x1A07B68, "bin", "Yay0_1a07b68_len_8092"] + - [0x1A0A0A0, "bin", "Yay0_1a0a0a0_len_c46"] + - [0x1A0ACC8, "bin", "Yay0_1a0acc8_len_1300"] + - [0x1A0B780, "bin", "Yay0_1a0b780_len_85c"] + - [0x1A0BBE0, "bin", "Yay0_1a0bbe0_len_4000"] + - [0x1A0C000, "bin", "Yay0_1a0c000_len_438"] + - [0x1A0C438, "bin", "Yay0_1a0c438_len_842"] + - [0x1A0C860, "bin", "Yay0_1a0c860_len_1186"] + - [0x1A0D1E8, "bin", "Yay0_1a0d1e8_len_406"] + - [0x1A0D5B0, "bin", "Yay0_1a0d5b0_len_840"] + - [0x1A0D970, "bin", "Yay0_1a0d970_len_268e"] + - [0x1A0EF00, "bin", "Yay0_1a0ef00_len_11020"] + - [0x1A13920, "bin", "Yay0_1a13920_len_404c"] + - [0x1A15850, "bin", "Yay0_1a15850_len_83a4"] + - [0x1A183F8, "bin", "Yay0_1a183f8_len_2404"] + - [0x1A1A608, "bin", "Yay0_1a1a608_len_41e2"] + - [0x1A1C5E8, "bin", "Yay0_1a1c5e8_len_1202"] + - [0x1A1D6D0, "bin", "Yay0_1a1d6d0_len_2028"] + - [0x1A1E478, "bin", "Yay0_1a1e478_len_1306"] + - [0x1A1F370, "bin", "Yay0_1a1f370_len_2048c"] + - [0x1A226B0, "bin", "Yay0_1a226b0_len_4908"] + - [0x1A249B8, "bin", "Yay0_1a249b8_len_1644"] + - [0x1A25E78, "bin", "Yay0_1a25e78_len_2186"] + - [0x1A27FF0, "bin", "Yay0_1a27ff0_len_800a"] + - [0x1A28BE0, "bin", "Yay0_1a28be0_len_1400"] + - [0x1A29680, "bin", "Yay0_1a29680_len_2862"] + - [0x1A2BC68, "bin", "Yay0_1a2bc68_len_4112"] + - [0x1A2E120, "bin", "Yay0_1a2e120_len_12d8"] + - [0x1A2F3F8, "bin", "Yay0_1a2f3f8_len_10c06"] + - [0x1A31D18, "bin", "Yay0_1a31d18_len_22a6"] + - [0x1A33AB0, "bin", "Yay0_1a33ab0_len_4106"] + - [0x1A35BB8, "bin", "Yay0_1a35bb8_len_2006"] + - [0x1A369A8, "bin", "Yay0_1a369a8_len_9600"] + - [0x1A39600, "bin", "Yay0_1a39600_len_2014"] + - [0x1A3B018, "bin", "Yay0_1a3b018_len_4300"] + - [0x1A3C310, "bin", "Yay0_1a3c310_len_3cc2"] + - [0x1A3FCC8, "bin", "Yay0_1a3fcc8_len_40314"] + - [0x1A423D8, "bin", "Yay0_1a423d8_len_4822"] + - [0x1A449C0, "bin", "Yay0_1a449c0_len_2422"] + - [0x1A46568, "bin", "Yay0_1a46568_len_9212"] + - [0x1A49340, "bin", "Yay0_1a49340_len_2c88"] + - [0x1A4AC88, "bin", "Yay0_1a4ac88_len_5362"] + - [0x1A4D7E8, "bin", "Yay0_1a4d7e8_len_2006"] + - [0x1A4E028, "bin", "Yay0_1a4e028_len_1a56"] + - [0x1A4FA60, "bin", "Yay0_1a4fa60_len_10190"] + - [0x1A531D0, "bin", "Yay0_1a531d0_len_c08"] + - [0x1A53D48, "bin", "Yay0_1a53d48_len_4032"] + - [0x1A56C80, "bin", "Yay0_1a56c80_len_8358"] + - [0x1A58F58, "bin", "Yay0_1a58f58_len_20a4"] + - [0x1A5A5A8, "bin", "Yay0_1a5a5a8_len_20a14"] + - [0x1A62B40, "bin", "Yay0_1a62b40_len_40b6"] + - [0x1A641F8, "bin", "Yay0_1a641f8_len_2602"] + - [0x1A666F0, "bin", "Yay0_1a666f0_len_8800"] + - [0x1A68870, "bin", "Yay0_1a68870_len_460a"] + - [0x1A6C630, "bin", "Yay0_1a6c630_len_118c"] + - [0x1A6D5A0, "bin", "Yay0_1a6d5a0_len_2a4c"] + - [0x1A6EF50, "bin", "Yay0_1a6ef50_len_100ae"] + - [0x1A70FF0, "bin", "Yay0_1a70ff0_len_4000"] + - [0x1A74FC0, "bin", "Yay0_1a74fc0_len_803a"] + - [0x1A78A40, "bin", "Yay0_1a78a40_len_1100"] + - [0x1A79900, "bin", "Yay0_1a79900_len_4698"] + - [0x1A7D798, "bin", "Yay0_1a7d798_len_2804"] + - [0x1A7EEA0, "bin", "Yay0_1a7eea0_len_158"] + - [0x1A7EFD8, "bin", "Yay0_1a7efd8_len_81002"] + - [0x1A83450, "bin", "Yay0_1a83450_len_4226"] + - [0x1A85668, "bin", "Yay0_1a85668_len_2910"] + - [0x1A87958, "bin", "Yay0_1a87958_len_8680"] + - [0x1A8BF98, "bin", "Yay0_1a8bf98_len_4020"] + - [0x1A8FE28, "bin", "Yay0_1a8fe28_len_10096"] + - [0x1A93EA0, "bin", "Yay0_1a93ea0_len_4102"] + - [0x1A94188, "bin", "Yay0_1a94188_len_476"] + - [0x1A94480, "bin", "Yay0_1a94480_len_226"] + - [0x1A946A8, "bin", "Yay0_1a946a8_len_956"] + - [0x1A94A00, "bin", "Yay0_1a94a00_len_456"] + - [0x1A94C58, "bin", "Yay0_1a94c58_len_8184"] + - [0x1A98D98, "bin", "Yay0_1a98d98_len_3264"] + - [0x1A9BA80, "bin", "Yay0_1a9ba80_len_4168"] + - [0x1A9DB68, "bin", "Yay0_1a9db68_len_20004"] + - [0x1AA0048, "bin", "Yay0_1aa0048_len_692"] + - [0x1AA0698, "bin", "Yay0_1aa0698_len_1000"] + - [0x1AA1008, "bin", "Yay0_1aa1008_len_6d54"] + - [0x1AA6D58, "bin", "Yay0_1aa6d58_len_90a4"] + - [0x1AAD600, "bin", "Yay0_1aad600_len_109f0"] + - [0x1AB1BF0, "bin", "Yay0_1ab1bf0_len_2004"] + - [0x1AB2368, "bin", "Yay0_1ab2368_len_8086"] + - [0x1ABA290, "bin", "Yay0_1aba290_len_41422"] + - [0x1AC14A8, "bin", "Yay0_1ac14a8_len_2902"] + - [0x1AC3910, "bin", "Yay0_1ac3910_len_8488"] + - [0x1ACBC98, "bin", "Yay0_1acbc98_len_4042"] + - [0x1ACE058, "bin", "Yay0_1ace058_len_1902"] + - [0x1ACF910, "bin", "Yay0_1acf910_len_106c8"] + - [0x1AD06D8, "bin", "Yay0_1ad06d8_len_904"] + - [0x1AD0B98, "bin", "Yay0_1ad0b98_len_1400"] + - [0x1AD1E90, "bin", "Yay0_1ad1e90_len_2146"] + - [0x1AD2348, "bin", "Yay0_1ad2348_len_4b2"] + - [0x1AD27F8, "bin", "Yay0_1ad27f8_len_800"] + - [0x1AD28A8, "bin", "Yay0_1ad28a8_len_4446"] + - [0x1AD44F0, "bin", "Yay0_1ad44f0_len_304"] + - [0x1AD4758, "bin", "Yay0_1ad4758_len_1080"] + - [0x1AD57C0, "bin", "Yay0_1ad57c0_len_880c"] + - [0x1AD9D50, "bin", "Yay0_1ad9d50_len_2082"] + - [0x1ADA498, "bin", "Yay0_1ada498_len_4b26"] + - [0x1ADCFC0, "bin", "Yay0_1adcfc0_len_22024"] + - [0x1AE2168, "bin", "Yay0_1ae2168_len_e96"] + - [0x1AE2EA0, "bin", "Yay0_1ae2ea0_len_4058"] + - [0x1AE6A58, "bin", "Yay0_1ae6a58_len_9524"] + - [0x1AEB778, "bin", "Yay0_1aeb778_len_14802"] + - [0x1AF4958, "bin", "Yay0_1af4958_len_8202"] + - [0x1AFCB18, "bin", "Yay0_1afcb18_len_3442"] + - [0x1AFF748, "bin", "Yay0_1aff748_len_100000"] + - [0x1B00640, "bin", "Yay0_1b00640_len_118a"] + - [0x1B01390, "bin", "Yay0_1b01390_len_c04"] + - [0x1B01C08, "bin", "Yay0_1b01c08_len_2120"] + - [0x1B02128, "bin", "Yay0_1b02128_len_844"] + - [0x1B02970, "bin", "Yay0_1b02970_len_1004"] + - [0x1B03118, "bin", "Yay0_1b03118_len_c04"] + - [0x1B03C18, "bin", "Yay0_1b03c18_len_41e2"] + - [0x1B045E8, "bin", "Yay0_1b045e8_len_a12"] + - [0x1B04FC0, "bin", "Yay0_1b04fc0_len_1012"] + - [0x1B05998, "bin", "Yay0_1b05998_len_2400"] + - [0x1B06C88, "bin", "Yay0_1b06c88_len_1046"] + - [0x1B07C48, "bin", "Yay0_1b07c48_len_8034"] + - [0x1B09440, "bin", "Yay0_1b09440_len_228e"] + - [0x1B0B290, "bin", "Yay0_1b0b290_len_90c"] + - [0x1B0B9A0, "bin", "Yay0_1b0b9a0_len_4448"] + - [0x1B0C548, "bin", "Yay0_1b0c548_len_ab4"] + - [0x1B0CAC0, "bin", "Yay0_1b0cac0_len_1130"] + - [0x1B0D130, "bin", "Yay0_1b0d130_len_2a4c"] + - [0x1B0EB80, "bin", "Yay0_1b0eb80_len_1043e"] + - [0x1B10CC0, "bin", "Yay0_1b10cc0_len_2120"] + - [0x1B129A0, "bin", "Yay0_1b129a0_len_1444"] + - [0x1B13548, "bin", "Yay0_1b13548_len_4016"] + - [0x1B16420, "bin", "Yay0_1b16420_len_1104"] + - [0x1B17128, "bin", "Yay0_1b17128_len_814"] + - [0x1B17840, "bin", "Yay0_1b17840_len_8316"] + - [0x1B19318, "bin", "Yay0_1b19318_len_2020"] + - [0x1B1A030, "bin", "Yay0_1b1a030_len_18c6"] + - [0x1B1B8C8, "bin", "Yay0_1b1b8c8_len_402"] + - [0x1B1BC88, "bin", "Yay0_1b1bc88_len_4316"] + - [0x1B1C7A0, "bin", "Yay0_1b1c7a0_len_808"] + - [0x1B1CD28, "bin", "Yay0_1b1cd28_len_21040"] + - [0x1B21C48, "bin", "Yay0_1b21c48_len_2290"] + - [0x1B23290, "bin", "Yay0_1b23290_len_414c"] + - [0x1B253E0, "bin", "Yay0_1b253e0_len_241c"] + - [0x1B26660, "bin", "Yay0_1b26660_len_8192"] + - [0x1B283F8, "bin", "Yay0_1b283f8_len_1c02"] + - [0x1B29C60, "bin", "Yay0_1b29c60_len_2284"] + - [0x1B2A688, "bin", "Yay0_1b2a688_len_1166"] + - [0x1B2B3E8, "bin", "Yay0_1b2b3e8_len_4810"] + - [0x1B2C8D8, "bin", "Yay0_1b2c8d8_len_1722"] + - [0x1B2D7B0, "bin", "Yay0_1b2d7b0_len_2006"] + - [0x1B2E328, "bin", "Yay0_1b2e328_len_c52"] + - [0x1B2ED60, "bin", "Yay0_1b2ed60_len_1218"] + - [0x1B2FA18, "bin", "Yay0_1b2fa18_len_10002"] + - [0x1B31A18, "bin", "Yay0_1b31a18_len_25e2"] + - [0x1B33000, "bin", "Yay0_1b33000_len_4096"] + - [0x1B34098, "bin", "Yay0_1b34098_len_920"] + - [0x1B34928, "bin", "Yay0_1b34928_len_2d4"] + - [0x1B34C00, "bin", "Yay0_1b34c00_len_107e"] + - [0x1B35480, "bin", "Yay0_1b35480_len_2040"] + - [0x1B36440, "bin", "Yay0_1b36440_len_8306"] + - [0x1B38748, "bin", "Yay0_1b38748_len_1894"] + - [0x1B39A98, "bin", "Yay0_1b39a98_len_2062"] + - [0x1B3A2E8, "bin", "Yay0_1b3a2e8_len_816"] + - [0x1B3A818, "bin", "Yay0_1b3a818_len_4482"] + - [0x1B3C488, "bin", "Yay0_1b3c488_len_a44"] + - [0x1B3CAC8, "bin", "Yay0_1b3cac8_len_1012"] + - [0x1B3D0A0, "bin", "Yay0_1b3d0a0_len_91a"] + - [0x1B3D920, "bin", "Yay0_1b3d920_len_205c"] + - [0x1B3F060, "bin", "Yay0_1b3f060_len_40008"] + - [0x1B40048, "bin", "Yay0_1b40048_len_714"] + - [0x1B40720, "bin", "Yay0_1b40720_len_904e"] + - [0x1B49570, "bin", "Yay0_1b49570_len_4288"] + - [0x1B4C3E8, "bin", "Yay0_1b4c3e8_len_1c12"] + - [0x1B4DEA0, "bin", "Yay0_1b4dea0_len_2116"] + - [0x1B4FD98, "bin", "Yay0_1b4fd98_len_10040"] + - [0x1B50CD8, "bin", "Yay0_1b50cd8_len_1302"] + - [0x1B51B08, "bin", "Yay0_1b51b08_len_4052"] + - [0x1B54258, "bin", "Yay0_1b54258_len_8082"] + - [0x1B580A0, "bin", "Yay0_1b580a0_len_2242"] + - [0x1B5A248, "bin", "Yay0_1b5a248_len_1980"] + - [0x1B5BB88, "bin", "Yay0_1b5bb88_len_4406"] + - [0x1B5CC90, "bin", "Yay0_1b5cc90_len_2168"] + - [0x1B5E968, "bin", "Yay0_1b5e968_len_482"] + - [0x1B5ED88, "bin", "Yay0_1b5ed88_len_20040"] + - [0x1B608C0, "bin", "Yay0_1b608c0_len_2534"] + - [0x1B625F8, "bin", "Yay0_1b625f8_len_1202"] + - [0x1B633D0, "bin", "Yay0_1b633d0_len_4824"] + - [0x1B64878, "bin", "Yay0_1b64878_len_1786"] + - [0x1B657E0, "bin", "Yay0_1b657e0_len_808"] + - [0x1B65A08, "bin", "Yay0_1b65a08_len_444"] + - [0x1B65E50, "bin", "Yay0_1b65e50_len_2024"] + - [0x1B66238, "bin", "Yay0_1b66238_len_9542"] + - [0x1B69580, "bin", "Yay0_1b69580_len_4218"] + - [0x1B6C318, "bin", "Yay0_1b6c318_len_1c80"] + - [0x1B6DD98, "bin", "Yay0_1b6dd98_len_2046"] + - [0x1B6F150, "bin", "Yay0_1b6f150_len_10608"] + - [0x1B71618, "bin", "Yay0_1b71618_len_2882"] + - [0x1B72890, "bin", "Yay0_1b72890_len_1302"] + - [0x1B73B08, "bin", "Yay0_1b73b08_len_44b0"] + - [0x1B747B8, "bin", "Yay0_1b747b8_len_2800"] + - [0x1B76E30, "bin", "Yay0_1b76e30_len_808a"] + - [0x1B78EC0, "bin", "Yay0_1b78ec0_len_101c"] + - [0x1B79A20, "bin", "Yay0_1b79a20_len_508"] + - [0x1B79F08, "bin", "Yay0_1b79f08_len_2004"] + - [0x1B7AA08, "bin", "Yay0_1b7aa08_len_1000"] + - [0x1B7B008, "bin", "Yay0_1b7b008_len_b44"] + - [0x1B7BB50, "bin", "Yay0_1b7bb50_len_4424"] + - [0x1B7EC68, "bin", "Yay0_1b7ec68_len_1300"] + - [0x1B7FF48, "bin", "Yay0_1b7ff48_len_80086"] + - [0x1B81E88, "bin", "Yay0_1b81e88_len_2050"] + - [0x1B82058, "bin", "Yay0_1b82058_len_202"] + - [0x1B82202, "bin"] + - [0x1E40000, "bin", "map_assets.fs"] # todo add fs support + - [0x27FEE22, "bin"] + - [0x2800000] From 51eca76be391c6d50dab4de2146ccad1015d127b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 20 Aug 2020 02:25:11 -0400 Subject: [PATCH 37/37] Update splat --- tools/splat.yaml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/tools/splat.yaml b/tools/splat.yaml index 229e122c11..2849d06763 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -5,14 +5,12 @@ segments: - name: header type: code start: 0x00 - end: 0x40 vram: 0 files: - [0x0000, "asm", "header"] - name: boot type: code start: 0x0040 - end: 0x0B70 vram: 0xA4000040 files: - [0x0040, "asm", "boot"] @@ -20,7 +18,6 @@ segments: - name: code type: code start: 0x1000 - end: 0x4E5A0 vram: 0x80025C00 files: - [0x1000, "c", "code_1000_len_60"] @@ -192,7 +189,6 @@ segments: - name: code type: code start: 0x759B0 - end: 0x90FE0 vram: 0x800DC500 files: - [0x759b0, "c", "code_759b0_len_61b0"] @@ -208,7 +204,6 @@ segments: - name: code type: code start: 0xA5DD0 - end: 0xE16B0 vram: 0x8010F6D0 files: - [0xa5dd0, "c", "code_a5dd0_len_114e0"] @@ -227,7 +222,6 @@ segments: - name: code type: code start: 0xE79B0 - end: 0xFE650 vram: 0x802C3000 files: - [0xe79b0, "c", "code_e79b0_len_1920"] @@ -242,7 +236,6 @@ segments: - name: code type: code start: 0xFEE30 - end: 0x102480 vram: 0x802DBD40 files: - [0xfee30, "c", "code_fee30_len_2d60"] @@ -251,7 +244,6 @@ segments: - name: code type: code start: 0x102610 - end: 0x10A9F0 vram: 0x802E0D90 files: - [0x102610, "c", "code_102610_len_2330"] @@ -265,7 +257,6 @@ segments: - name: code type: code start: 0x135EE0 - end: 0x1422A0 vram: 0x80242BA0 files: - [0x135EE0, "c", "code_135EE0"] @@ -273,7 +264,6 @@ segments: - name: code type: code start: 0x163400 - end: 0x16A3E0 vram: 0x80242BA0 files: - [0x163400, "c", "code_163400"] @@ -284,7 +274,6 @@ segments: - name: code type: code start: 0x16C8E0 - end: 0x1AF2C0 vram: 0x8023E000 files: - [0x16C8E0, "c", "code_16c8e0"] @@ -292,7 +281,6 @@ segments: - name: code type: code start: 0x3169F0 - end: 0x316C00 vram: 0x80200000 files: - [0x3169f0, "c", "code_3169f0"] @@ -301,14 +289,12 @@ segments: - name: code type: code start: 0x316D90 - end: 0x316f30 vram: 0x802AE000 files: - [0x316d90, "c", "code_316d90"] - name: code type: code start: 0x316f30 - end: 0x317020 vram: 0x802B2000 files: - [0x316f30, "c", "code_316f30"] @@ -316,7 +302,6 @@ segments: - name: code type: code start: 0x415D90 - end: 0x4200C0 vram: 0x802A1000 files: - [0x415D90, "c", "code_415D90"] @@ -324,7 +309,6 @@ segments: - name: code type: code start: 0x7E0E80 - end: 0x7E4D00 vram: 0x80280000 files: - [0x7e0e80, "c", "code_7e0e80"] @@ -334,7 +318,6 @@ segments: - name: code type: code start: 0xE20EB0 - end: 0xE215C0 vram: 0x802B7000 files: - [0xe20eb0, "c", "code_e20eb0"]