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);