diff --git a/asm/nonmatchings/code_1000_len_60/entry_point.s b/asm/nonmatchings/code_1000_len_60/entry_point.s index eedf47199c..d3f681390e 100644 --- a/asm/nonmatchings/code_1000_len_60/entry_point.s +++ b/asm/nonmatchings/code_1000_len_60/entry_point.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel entry_point /* 001000 80025C00 3C08800A */ lui $t0, 0x800a diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s index 899617e2ff..9714b2657f 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DEAA0 /* 101B90 802DEAA0 00C0102D */ daddu $v0, $a2, $zero diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s index cbcbf1f4e3..b49bd18c68 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DED60 /* 101E50 802DED60 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s index b547ef7ae4..b2fee75ffa 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DEEA0 /* 101F90 802DEEA0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s index 760fdaa5b2..acae140e6c 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DEFB4 /* 1020A4 802DEFB4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s index 46694695c4..8c78489520 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DF00C /* 1020FC 802DF00C 27BDFE30 */ addiu $sp, $sp, -0x1d0 diff --git a/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s b/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s index f5bcd87415..64dca71869 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s +++ b/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DF2D8 /* 1023C8 802DF2D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s b/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s index 1913b8c246..632d1ecb16 100644 --- a/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s +++ b/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_sprite /* 101BFC 802DEB0C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E0D90.s b/asm/nonmatchings/code_102610_len_2330/func_802E0D90.s index 1fbaee99fd..cd5a434e99 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E0D90.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E0D90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E0D90 /* 102610 802E0D90 3C013DCC */ lui $at, 0x3dcc diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s b/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s index 27dc58908f..e13ec3cf38 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E0DB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E0DB0 /* 102630 802E0DB0 90820006 */ lbu $v0, 6($a0) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s index 05ca8b8ec0..21d375d1b6 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E0DE0 /* 102660 802E0DE0 27BDFF28 */ addiu $sp, $sp, -0xd8 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E153C.s b/asm/nonmatchings/code_102610_len_2330/func_802E153C.s index 135bc10595..fe96ba1ae2 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E153C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E153C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E153C /* 102DBC 802E153C 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E234C.s b/asm/nonmatchings/code_102610_len_2330/func_802E234C.s index 4de390feb8..f80300fc27 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E234C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E234C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E234C /* 103BCC 802E234C 3C058011 */ lui $a1, 0x8011 diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s b/asm/nonmatchings/code_102610_len_2330/func_802E246C.s index 0b635217cf..29003afb5e 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E246C.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E246C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E246C /* 103CEC 802E246C 27BDFF40 */ addiu $sp, $sp, -0xc0 diff --git a/asm/nonmatchings/code_102610_len_2330/save_game_at_player_position.s b/asm/nonmatchings/code_102610_len_2330/save_game_at_player_position.s index 7df1d244a6..9a848f8a12 100644 --- a/asm/nonmatchings/code_102610_len_2330/save_game_at_player_position.s +++ b/asm/nonmatchings/code_102610_len_2330/save_game_at_player_position.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel save_game_at_player_position /* 102A20 802E11A0 3C04800F */ lui $a0, 0x800f diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035000_2.s b/asm/nonmatchings/code_10400_len_d30/func_80035000_2.s index cfc44fbfa2..b70ac68ac1 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035000_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035000_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035000_2 /* 010400 80035000 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035058_2.s b/asm/nonmatchings/code_10400_len_d30/func_80035058_2.s index 4c741dcbaf..39f2ec527e 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035058_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035058_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035058_2 /* 010458 80035058 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_10400_len_d30/func_800351C8_2.s b/asm/nonmatchings/code_10400_len_d30/func_800351C8_2.s index b8ce557ead..4973bf35be 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800351C8_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800351C8_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800351C8_2 /* 0105C8 800351C8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_10400_len_d30/func_800354EC_2.s b/asm/nonmatchings/code_10400_len_d30/func_800354EC_2.s index 63acbf944e..ebc37c9ab3 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800354EC_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800354EC_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800354EC_2 /* 0108EC 800354EC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_10400_len_d30/func_800355C4_2.s b/asm/nonmatchings/code_10400_len_d30/func_800355C4_2.s index 99768ae988..603d61c124 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800355C4_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800355C4_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800355C4_2 /* 0109C4 800355C4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_10400_len_d30/func_800355CC_2.s b/asm/nonmatchings/code_10400_len_d30/func_800355CC_2.s index 2f4bc672b9..e20e7c9d51 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800355CC_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800355CC_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800355CC_2 /* 0109CC 800355CC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_10400_len_d30/func_800355D4_2.s b/asm/nonmatchings/code_10400_len_d30/func_800355D4_2.s index 08ea4bedf4..ea46bcd9d3 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_800355D4_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_800355D4_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800355D4_2 /* 0109D4 800355D4 3C05800A */ lui $a1, 0x800a diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035660_2.s b/asm/nonmatchings/code_10400_len_d30/func_80035660_2.s index ad5b439980..2c0937ed35 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035660_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035660_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035660_2 /* 010A60 80035660 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035704.s b/asm/nonmatchings/code_10400_len_d30/func_80035704.s index 34d2254b5b..81e5555613 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035704.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035704.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035704 /* 010B04 80035704 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035B40_2.s b/asm/nonmatchings/code_10400_len_d30/func_80035B40_2.s index 1d2412d1b4..83a3a27f15 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035B40_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035B40_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035B40_2 /* 010F40 80035B40 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035D18_2.s b/asm/nonmatchings/code_10400_len_d30/func_80035D18_2.s index bcc2f051c1..68f0220ca0 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035D18_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035D18_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035D18_2 /* 011118 80035D18 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_10400_len_d30/func_80035D20_2.s b/asm/nonmatchings/code_10400_len_d30/func_80035D20_2.s index d4b72fab95..8bc120ae94 100644 --- a/asm/nonmatchings/code_10400_len_d30/func_80035D20_2.s +++ b/asm/nonmatchings/code_10400_len_d30/func_80035D20_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035D20_2 /* 011120 80035D20 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s b/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s index 6334d4272f..82e56c8420 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E30C0 /* 104940 802E30C0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s index 42e557a63f..dcffb3de07 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E3370 /* 104BF0 802E3370 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s index 23dab219ff..f9c1e584fa 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3650.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E3650 /* 104ED0 802E3650 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E36E4.s b/asm/nonmatchings/code_104940_len_dc0/func_802E36E4.s index 44328735ed..3142afea0d 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E36E4.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E36E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E36E4 /* 104F64 802E36E4 8C820040 */ lw $v0, 0x40($a0) diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s index b55af0b391..56047208d7 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3A00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E3A00 /* 105280 802E3A00 2403000E */ addiu $v1, $zero, 0xe diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s b/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s index 9ae9311ae1..5eee775e29 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E3E80 /* 105700 802E3E80 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E464C.s b/asm/nonmatchings/code_105700_len_2130/func_802E464C.s index 2a95b56e8e..b33a468253 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E464C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E464C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E464C /* 105ECC 802E464C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4710.s b/asm/nonmatchings/code_105700_len_2130/func_802E4710.s index 1a5f1cd8e6..a6bf7bcc5b 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4710.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4710.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E4710 /* 105F90 802E4710 94820024 */ lhu $v0, 0x24($a0) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4730.s b/asm/nonmatchings/code_105700_len_2130/func_802E4730.s index 381cd1b3dc..8d7d138fb2 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4730.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4730.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E4730 /* 105FB0 802E4730 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4B10.s b/asm/nonmatchings/code_105700_len_2130/func_802E4B10.s index 3b45b52875..df2b603bc4 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4B10.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4B10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E4B10 /* 106390 802E4B10 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s b/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s index 631a497113..9885b882ae 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4B60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E4B60 /* 1063E0 802E4B60 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s b/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s index 6fe351760f..0be0f60118 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E4C10 /* 106490 802E4C10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s b/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s index 10043b239b..e007116e77 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E4E04 /* 106684 802E4E04 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5324.s b/asm/nonmatchings/code_105700_len_2130/func_802E5324.s index dc31a90fa2..298e23d665 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5324.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5324.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E5324 /* 106BA4 802E5324 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E55A8.s b/asm/nonmatchings/code_105700_len_2130/func_802E55A8.s index abebacfadf..91c719c2fd 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E55A8.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E55A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E55A8 /* 106E28 802E55A8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5670.s b/asm/nonmatchings/code_105700_len_2130/func_802E5670.s index 2e00a5ef7d..7d69de5122 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5670.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5670.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E5670 /* 106EF0 802E5670 948200D0 */ lhu $v0, 0xd0($a0) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E578C.s b/asm/nonmatchings/code_105700_len_2130/func_802E578C.s index 7d92ccc84d..ecdde6d622 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E578C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E578C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E578C /* 10700C 802E578C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E581C.s b/asm/nonmatchings/code_105700_len_2130/func_802E581C.s index 75e1d84d8a..b07c393e1e 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E581C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E581C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E581C /* 10709C 802E581C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1060_len_310/func_80025C60.s b/asm/nonmatchings/code_1060_len_310/func_80025C60.s index 064c00359b..32c0df679f 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025C60.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025C60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80025C60 /* 001060 80025C60 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1060_len_310/func_80025CFC.s b/asm/nonmatchings/code_1060_len_310/func_80025CFC.s index c3cc4b6971..7d7a435ef9 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025CFC.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025CFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80025CFC /* 0010FC 80025CFC AFA40000 */ sw $a0, ($sp) diff --git a/asm/nonmatchings/code_1060_len_310/func_80025D38.s b/asm/nonmatchings/code_1060_len_310/func_80025D38.s index 54ed0cc50d..28a06f1fc7 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025D38.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025D38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80025D38 /* 001138 80025D38 AFA40000 */ sw $a0, ($sp) diff --git a/asm/nonmatchings/code_1060_len_310/func_80025D74.s b/asm/nonmatchings/code_1060_len_310/func_80025D74.s index cc745cdc8c..53e4b3b551 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025D74.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025D74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80025D74 /* 001174 80025D74 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_1060_len_310/func_80025F44.s b/asm/nonmatchings/code_1060_len_310/func_80025F44.s index ac2b17cf71..89a6999dde 100644 --- a/asm/nonmatchings/code_1060_len_310/func_80025F44.s +++ b/asm/nonmatchings/code_1060_len_310/func_80025F44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80025F44 /* 001344 80025F44 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s b/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s index ef14cd7957..1576b594c9 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E5FB0 /* 107830 802E5FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s b/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s index 6431f46f7e..249af78510 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E6B6C /* 1083EC 802E6B6C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s index 3d22e486b3..8079adf0b4 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E6E20 /* 1086A0 802E6E20 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s index 014ccd3f5c..0c10ab7aad 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E7230 /* 108AB0 802E7230 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s index 8fe498c8a1..e5f7e87b4a 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E7D38 /* 1095B8 802E7D38 8C820040 */ lw $v0, 0x40($a0) diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s b/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s index d222d4e80d..95155ebfed 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E7DE0 /* 109660 802E7DE0 27BDFF48 */ addiu $sp, $sp, -0xb8 diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E7F6C.s b/asm/nonmatchings/code_109660_len_1270/func_802E7F6C.s index 2871184d97..c173920093 100644 --- a/asm/nonmatchings/code_109660_len_1270/func_802E7F6C.s +++ b/asm/nonmatchings/code_109660_len_1270/func_802E7F6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802E7F6C /* 1097EC 802E7F6C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_109660_len_1270/player_enter_blue_pipe.s b/asm/nonmatchings/code_109660_len_1270/player_enter_blue_pipe.s index 5a1c5e5e6b..241bd6f6af 100644 --- a/asm/nonmatchings/code_109660_len_1270/player_enter_blue_pipe.s +++ b/asm/nonmatchings/code_109660_len_1270/player_enter_blue_pipe.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel player_enter_blue_pipe /* 10A54C 802E8CCC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s index dc42d4c99a..446319328f 100644 --- a/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s +++ b/asm/nonmatchings/code_109660_len_1270/push_entity_matrix.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel push_entity_matrix /* 10A6CC 802E8E4C 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_111f0_len_860/func_80035E00.s b/asm/nonmatchings/code_111f0_len_860/func_80035E00.s index beaf749f94..41d123a359 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80035E00.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80035E00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035E00 /* 011200 80035E00 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_111f0_len_860/func_80035E24.s b/asm/nonmatchings/code_111f0_len_860/func_80035E24.s index 8a8a9c48f1..a7ac089a94 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80035E24.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80035E24.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035E24 /* 011224 80035E24 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_111f0_len_860/func_80035E54.s b/asm/nonmatchings/code_111f0_len_860/func_80035E54.s index 0960d8a992..756737d98a 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80035E54.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80035E54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035E54 /* 011254 80035E54 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s index ac825610f2..135e0488b0 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80035EEC /* 0112EC 80035EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s index 77f2e24e39..374b0a3306 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003617C /* 01157C 8003617C 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s index 60172f57f3..a9150a3c17 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003646C /* 01186C 8003646C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_111f0_len_860/func_80036640.s b/asm/nonmatchings/code_111f0_len_860/func_80036640.s index e0fef7c2c2..2ee2c9b209 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80036640.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80036640.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80036640 /* 011A40 80036640 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_11a50_len_7a0/func_80036650.s b/asm/nonmatchings/code_11a50_len_7a0/func_80036650.s index f8fff45e65..59c9b5bbad 100644 --- a/asm/nonmatchings/code_11a50_len_7a0/func_80036650.s +++ b/asm/nonmatchings/code_11a50_len_7a0/func_80036650.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80036650 /* 011A50 80036650 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80036DF0.s b/asm/nonmatchings/code_121f0_len_1290/func_80036DF0.s index c177fb64fd..6726a848e1 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80036DF0.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80036DF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80036DF0 /* 0121F0 80036DF0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037960.s b/asm/nonmatchings/code_121f0_len_1290/func_80037960.s index 664bf09061..d0dde1ee75 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037960.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037960.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80037960 /* 012D60 80037960 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037968.s b/asm/nonmatchings/code_121f0_len_1290/func_80037968.s index 977cc1a50e..ee25ac4108 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037968.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037968.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80037968 /* 012D68 80037968 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s index a21e20b3e7..b24f3cf439 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037994.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037994.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80037994 /* 012D94 80037994 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s b/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s index 70a91129e3..45e5fffe9c 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037BC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80037BC8 /* 012FC8 80037BC8 3C048007 */ lui $a0, 0x8007 diff --git a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s index 9cc58913de..9b7c19b104 100644 --- a/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s +++ b/asm/nonmatchings/code_121f0_len_1290/func_80037E14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80037E14 /* 013214 80037E14 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13480_len_3f0/init_demo_data.s b/asm/nonmatchings/code_13480_len_3f0/init_demo_data.s index 52afa00966..0646f43580 100644 --- a/asm/nonmatchings/code_13480_len_3f0/init_demo_data.s +++ b/asm/nonmatchings/code_13480_len_3f0/init_demo_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_demo_data /* 013480 80038080 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s b/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s index 8168d67cb1..5527bf2fb0 100644 --- a/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s +++ b/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel next_demo_scene /* 0134F4 800380F4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_135EE0/func_80242BA0_2.s b/asm/nonmatchings/code_135EE0/func_80242BA0_2.s index a11cac5ee1..1abdbd26f7 100644 --- a/asm/nonmatchings/code_135EE0/func_80242BA0_2.s +++ b/asm/nonmatchings/code_135EE0/func_80242BA0_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242BA0_2 /* 135EE0 80242BA0 3C018025 */ lui $at, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/func_80242BAC.s b/asm/nonmatchings/code_135EE0/func_80242BAC.s index d6d70c5fa0..b0118cf8e5 100644 --- a/asm/nonmatchings/code_135EE0/func_80242BAC.s +++ b/asm/nonmatchings/code_135EE0/func_80242BAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242BAC /* 135EEC 80242BAC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_135EE0/func_80242C2C.s b/asm/nonmatchings/code_135EE0/func_80242C2C.s index f467f2e5be..db83ca5446 100644 --- a/asm/nonmatchings/code_135EE0/func_80242C2C.s +++ b/asm/nonmatchings/code_135EE0/func_80242C2C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242C2C /* 135F6C 80242C2C 10400025 */ beqz $v0, .L80242CC4 diff --git a/asm/nonmatchings/code_135EE0/func_80242C34.s b/asm/nonmatchings/code_135EE0/func_80242C34.s index 72e50807c2..671efec063 100644 --- a/asm/nonmatchings/code_135EE0/func_80242C34.s +++ b/asm/nonmatchings/code_135EE0/func_80242C34.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242C34 .L80242C34: diff --git a/asm/nonmatchings/code_135EE0/func_80242CE8.s b/asm/nonmatchings/code_135EE0/func_80242CE8.s index 9061508092..c0e32347a3 100644 --- a/asm/nonmatchings/code_135EE0/func_80242CE8.s +++ b/asm/nonmatchings/code_135EE0/func_80242CE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242CE8 /* 136028 80242CE8 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80242CF8.s b/asm/nonmatchings/code_135EE0/func_80242CF8.s index 22cf066c3f..f0947cf039 100644 --- a/asm/nonmatchings/code_135EE0/func_80242CF8.s +++ b/asm/nonmatchings/code_135EE0/func_80242CF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242CF8 /* 136038 80242CF8 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80242D04.s b/asm/nonmatchings/code_135EE0/func_80242D04.s index 2e7eb94efa..9ca91dc5fc 100644 --- a/asm/nonmatchings/code_135EE0/func_80242D04.s +++ b/asm/nonmatchings/code_135EE0/func_80242D04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242D04 /* 136044 80242D04 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_135EE0/func_80242D20.s b/asm/nonmatchings/code_135EE0/func_80242D20.s index 2b9fd9069a..abeccbca80 100644 --- a/asm/nonmatchings/code_135EE0/func_80242D20.s +++ b/asm/nonmatchings/code_135EE0/func_80242D20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242D20 /* 136060 80242D20 26949D50 */ addiu $s4, $s4, -0x62b0 diff --git a/asm/nonmatchings/code_135EE0/func_80242D54.s b/asm/nonmatchings/code_135EE0/func_80242D54.s index f9baa8df11..d556a5ff74 100644 --- a/asm/nonmatchings/code_135EE0/func_80242D54.s +++ b/asm/nonmatchings/code_135EE0/func_80242D54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242D54 /* 136094 80242D54 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/code_135EE0/func_80242E6C.s b/asm/nonmatchings/code_135EE0/func_80242E6C.s index 56edb3cbc8..06026e81a6 100644 --- a/asm/nonmatchings/code_135EE0/func_80242E6C.s +++ b/asm/nonmatchings/code_135EE0/func_80242E6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242E6C /* 1361AC 80242E6C 3C0A8025 */ lui $t2, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/func_80242F48.s b/asm/nonmatchings/code_135EE0/func_80242F48.s index 2662bd36e9..1e3469b0c7 100644 --- a/asm/nonmatchings/code_135EE0/func_80242F48.s +++ b/asm/nonmatchings/code_135EE0/func_80242F48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242F48 /* 136288 80242F48 2442FF80 */ addiu $v0, $v0, -0x80 diff --git a/asm/nonmatchings/code_135EE0/func_80243418.s b/asm/nonmatchings/code_135EE0/func_80243418.s index 239ec6808e..066c4dd428 100644 --- a/asm/nonmatchings/code_135EE0/func_80243418.s +++ b/asm/nonmatchings/code_135EE0/func_80243418.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243418 /* 136758 80243418 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_135EE0/func_8024346C.s b/asm/nonmatchings/code_135EE0/func_8024346C.s index 7d46b9a302..addab08706 100644 --- a/asm/nonmatchings/code_135EE0/func_8024346C.s +++ b/asm/nonmatchings/code_135EE0/func_8024346C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024346C /* 1367AC 8024346C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_135EE0/func_802434DC.s b/asm/nonmatchings/code_135EE0/func_802434DC.s index 7ad355b85d..ca397bf01a 100644 --- a/asm/nonmatchings/code_135EE0/func_802434DC.s +++ b/asm/nonmatchings/code_135EE0/func_802434DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802434DC /* 13681C 802434DC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_135EE0/func_80243B00.s b/asm/nonmatchings/code_135EE0/func_80243B00.s index 4e228801d4..44743b099b 100644 --- a/asm/nonmatchings/code_135EE0/func_80243B00.s +++ b/asm/nonmatchings/code_135EE0/func_80243B00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243B00 /* 136E40 80243B00 3C05438C */ lui $a1, 0x438c diff --git a/asm/nonmatchings/code_135EE0/func_80243B14.s b/asm/nonmatchings/code_135EE0/func_80243B14.s index f840daba04..8631c515d9 100644 --- a/asm/nonmatchings/code_135EE0/func_80243B14.s +++ b/asm/nonmatchings/code_135EE0/func_80243B14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243B14 /* 136E54 80243B14 3C063F4C */ lui $a2, 0x3f4c diff --git a/asm/nonmatchings/code_135EE0/func_80243BA4.s b/asm/nonmatchings/code_135EE0/func_80243BA4.s index 5cf5bc4bca..ed41f0ff19 100644 --- a/asm/nonmatchings/code_135EE0/func_80243BA4.s +++ b/asm/nonmatchings/code_135EE0/func_80243BA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243BA4 /* 136EE4 80243BA4 0C019D40 */ jal guMtxF2L diff --git a/asm/nonmatchings/code_135EE0/func_80243D8C.s b/asm/nonmatchings/code_135EE0/func_80243D8C.s index 11b3d98d20..86121f521d 100644 --- a/asm/nonmatchings/code_135EE0/func_80243D8C.s +++ b/asm/nonmatchings/code_135EE0/func_80243D8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243D8C /* 1370CC 80243D8C 4600018D */ trunc.w.s $f6, $f0 diff --git a/asm/nonmatchings/code_135EE0/func_80243D9C.s b/asm/nonmatchings/code_135EE0/func_80243D9C.s index 4a895382cc..acfc3d7c28 100644 --- a/asm/nonmatchings/code_135EE0/func_80243D9C.s +++ b/asm/nonmatchings/code_135EE0/func_80243D9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243D9C /* 1370DC 80243D9C 8FAE012C */ lw $t6, 0x12c($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80243E60.s b/asm/nonmatchings/code_135EE0/func_80243E60.s index 0c9b856057..e3a0fcd30a 100644 --- a/asm/nonmatchings/code_135EE0/func_80243E60.s +++ b/asm/nonmatchings/code_135EE0/func_80243E60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243E60 /* 1371A0 80243E60 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80244060.s b/asm/nonmatchings/code_135EE0/func_80244060.s index 241e2e9366..86fc65ef5d 100644 --- a/asm/nonmatchings/code_135EE0/func_80244060.s +++ b/asm/nonmatchings/code_135EE0/func_80244060.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244060 /* 1373A0 80244060 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_135EE0/func_80244118.s b/asm/nonmatchings/code_135EE0/func_80244118.s index 17ee9df148..fbbc40add5 100644 --- a/asm/nonmatchings/code_135EE0/func_80244118.s +++ b/asm/nonmatchings/code_135EE0/func_80244118.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244118 /* 137458 80244118 0C051FCC */ jal func_80147F30 diff --git a/asm/nonmatchings/code_135EE0/func_8024411C.s b/asm/nonmatchings/code_135EE0/func_8024411C.s index 7358dc0f59..0f61f42d63 100644 --- a/asm/nonmatchings/code_135EE0/func_8024411C.s +++ b/asm/nonmatchings/code_135EE0/func_8024411C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024411C /* 13745C 8024411C 0000882D */ daddu $s1, $zero, $zero diff --git a/asm/nonmatchings/code_135EE0/func_8024412C.s b/asm/nonmatchings/code_135EE0/func_8024412C.s index 02b21969d6..5944256b2c 100644 --- a/asm/nonmatchings/code_135EE0/func_8024412C.s +++ b/asm/nonmatchings/code_135EE0/func_8024412C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024412C /* 13746C 8024412C AC200110 */ sw $zero, 0x110($at) diff --git a/asm/nonmatchings/code_135EE0/func_802441BC.s b/asm/nonmatchings/code_135EE0/func_802441BC.s index 06fc70e577..0ca31d07c7 100644 --- a/asm/nonmatchings/code_135EE0/func_802441BC.s +++ b/asm/nonmatchings/code_135EE0/func_802441BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802441BC /* 1374FC 802441BC 24050002 */ addiu $a1, $zero, 2 diff --git a/asm/nonmatchings/code_135EE0/func_802441C4.s b/asm/nonmatchings/code_135EE0/func_802441C4.s index 214030a080..bb06ca9e09 100644 --- a/asm/nonmatchings/code_135EE0/func_802441C4.s +++ b/asm/nonmatchings/code_135EE0/func_802441C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802441C4 /* 137504 802441C4 2673FFE0 */ addiu $s3, $s3, -0x20 diff --git a/asm/nonmatchings/code_135EE0/func_802441CC.s b/asm/nonmatchings/code_135EE0/func_802441CC.s index 847a00cc9c..9be6d6fc60 100644 --- a/asm/nonmatchings/code_135EE0/func_802441CC.s +++ b/asm/nonmatchings/code_135EE0/func_802441CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802441CC /* 13750C 802441CC A462000C */ sh $v0, 0xc($v1) diff --git a/asm/nonmatchings/code_135EE0/func_802441D8.s b/asm/nonmatchings/code_135EE0/func_802441D8.s index f0719469db..0e93aef1da 100644 --- a/asm/nonmatchings/code_135EE0/func_802441D8.s +++ b/asm/nonmatchings/code_135EE0/func_802441D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802441D8 /* 137518 802441D8 2652FFFF */ addiu $s2, $s2, -1 diff --git a/asm/nonmatchings/code_135EE0/func_80244250.s b/asm/nonmatchings/code_135EE0/func_80244250.s index 57e6a1df30..ba080dc7e7 100644 --- a/asm/nonmatchings/code_135EE0/func_80244250.s +++ b/asm/nonmatchings/code_135EE0/func_80244250.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244250 /* 137590 80244250 2A220003 */ slti $v0, $s1, 3 diff --git a/asm/nonmatchings/code_135EE0/func_80244258.s b/asm/nonmatchings/code_135EE0/func_80244258.s index 805c425712..999cd588ad 100644 --- a/asm/nonmatchings/code_135EE0/func_80244258.s +++ b/asm/nonmatchings/code_135EE0/func_80244258.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244258 /* 137598 80244258 26520004 */ addiu $s2, $s2, 4 diff --git a/asm/nonmatchings/code_135EE0/func_80244264.s b/asm/nonmatchings/code_135EE0/func_80244264.s index 7292a3d60f..3bee01de40 100644 --- a/asm/nonmatchings/code_135EE0/func_80244264.s +++ b/asm/nonmatchings/code_135EE0/func_80244264.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244264 /* 1375A4 80244264 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/code_135EE0/func_8024428C.s b/asm/nonmatchings/code_135EE0/func_8024428C.s index 03a7f2b192..ec140c6d4d 100644 --- a/asm/nonmatchings/code_135EE0/func_8024428C.s +++ b/asm/nonmatchings/code_135EE0/func_8024428C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024428C /* 1375CC 8024428C 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_135EE0/func_802442A0.s b/asm/nonmatchings/code_135EE0/func_802442A0.s index e15dbb410d..09bd0db5b7 100644 --- a/asm/nonmatchings/code_135EE0/func_802442A0.s +++ b/asm/nonmatchings/code_135EE0/func_802442A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802442A0 /* 1375E0 802442A0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_135EE0/func_802442FC.s b/asm/nonmatchings/code_135EE0/func_802442FC.s index 11bf2ab478..4bd5abbb2f 100644 --- a/asm/nonmatchings/code_135EE0/func_802442FC.s +++ b/asm/nonmatchings/code_135EE0/func_802442FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802442FC /* 13763C 802442FC 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_135EE0/func_802443FC.s b/asm/nonmatchings/code_135EE0/func_802443FC.s index a0d2b2ff56..0c965bb859 100644 --- a/asm/nonmatchings/code_135EE0/func_802443FC.s +++ b/asm/nonmatchings/code_135EE0/func_802443FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802443FC /* 13773C 802443FC 0220802D */ daddu $s0, $s1, $zero diff --git a/asm/nonmatchings/code_135EE0/func_80244400.s b/asm/nonmatchings/code_135EE0/func_80244400.s index 3ebd12cc8b..6365a95515 100644 --- a/asm/nonmatchings/code_135EE0/func_80244400.s +++ b/asm/nonmatchings/code_135EE0/func_80244400.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244400 .L80244400: diff --git a/asm/nonmatchings/code_135EE0/func_80244424.s b/asm/nonmatchings/code_135EE0/func_80244424.s index 3759b16ece..a7038b19fa 100644 --- a/asm/nonmatchings/code_135EE0/func_80244424.s +++ b/asm/nonmatchings/code_135EE0/func_80244424.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244424 /* 137764 80244424 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_135EE0/func_802444C4.s b/asm/nonmatchings/code_135EE0/func_802444C4.s index 9ad6f99b0f..61d52d6f2b 100644 --- a/asm/nonmatchings/code_135EE0/func_802444C4.s +++ b/asm/nonmatchings/code_135EE0/func_802444C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802444C4 /* 137804 802444C4 3C05F840 */ lui $a1, 0xf840 diff --git a/asm/nonmatchings/code_135EE0/func_802447F4.s b/asm/nonmatchings/code_135EE0/func_802447F4.s index 3873a08b15..55a6689f75 100644 --- a/asm/nonmatchings/code_135EE0/func_802447F4.s +++ b/asm/nonmatchings/code_135EE0/func_802447F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802447F4 /* 137B34 802447F4 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_135EE0/func_80244858.s b/asm/nonmatchings/code_135EE0/func_80244858.s index 8d632eda4a..8ac4019b48 100644 --- a/asm/nonmatchings/code_135EE0/func_80244858.s +++ b/asm/nonmatchings/code_135EE0/func_80244858.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244858 /* 137B98 80244858 2882F581 */ slti $v0, $a0, -0xa7f diff --git a/asm/nonmatchings/code_135EE0/func_80244A4C.s b/asm/nonmatchings/code_135EE0/func_80244A4C.s index 79e44c179e..24f06d7c2a 100644 --- a/asm/nonmatchings/code_135EE0/func_80244A4C.s +++ b/asm/nonmatchings/code_135EE0/func_80244A4C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244A4C /* 137D8C 80244A4C 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_135EE0/func_80245070.s b/asm/nonmatchings/code_135EE0/func_80245070.s index 3e672b275c..6aa79af7c1 100644 --- a/asm/nonmatchings/code_135EE0/func_80245070.s +++ b/asm/nonmatchings/code_135EE0/func_80245070.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245070 /* 1383B0 80245070 8E040010 */ lw $a0, 0x10($s0) diff --git a/asm/nonmatchings/code_135EE0/func_802450D8.s b/asm/nonmatchings/code_135EE0/func_802450D8.s index df00597851..d16b503f63 100644 --- a/asm/nonmatchings/code_135EE0/func_802450D8.s +++ b/asm/nonmatchings/code_135EE0/func_802450D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802450D8 /* 138418 802450D8 0C0513AC */ jal func_80144EB0 diff --git a/asm/nonmatchings/code_135EE0/func_802451B4.s b/asm/nonmatchings/code_135EE0/func_802451B4.s index 3b83ccfcba..f52a8604fc 100644 --- a/asm/nonmatchings/code_135EE0/func_802451B4.s +++ b/asm/nonmatchings/code_135EE0/func_802451B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802451B4 /* 1384F4 802451B4 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/func_80245200.s b/asm/nonmatchings/code_135EE0/func_80245200.s index 61f8f5993e..b58d7c4285 100644 --- a/asm/nonmatchings/code_135EE0/func_80245200.s +++ b/asm/nonmatchings/code_135EE0/func_80245200.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245200 /* 138540 80245200 0C0513AC */ jal func_80144EB0 diff --git a/asm/nonmatchings/code_135EE0/func_802452C4.s b/asm/nonmatchings/code_135EE0/func_802452C4.s index 957b49f767..03d656b559 100644 --- a/asm/nonmatchings/code_135EE0/func_802452C4.s +++ b/asm/nonmatchings/code_135EE0/func_802452C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802452C4 /* 138604 802452C4 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/code_135EE0/func_80245568.s b/asm/nonmatchings/code_135EE0/func_80245568.s index b24d098100..cb91b340e2 100644 --- a/asm/nonmatchings/code_135EE0/func_80245568.s +++ b/asm/nonmatchings/code_135EE0/func_80245568.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245568 /* 1388A8 80245568 240400C9 */ addiu $a0, $zero, 0xc9 diff --git a/asm/nonmatchings/code_135EE0/func_8024563C.s b/asm/nonmatchings/code_135EE0/func_8024563C.s index 28255c5122..1fc1aa32a7 100644 --- a/asm/nonmatchings/code_135EE0/func_8024563C.s +++ b/asm/nonmatchings/code_135EE0/func_8024563C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024563C /* 13897C 8024563C 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_135EE0/func_80245748.s b/asm/nonmatchings/code_135EE0/func_80245748.s index 4ecd910fff..3517e5cf00 100644 --- a/asm/nonmatchings/code_135EE0/func_80245748.s +++ b/asm/nonmatchings/code_135EE0/func_80245748.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245748 /* 138A88 80245748 0080802D */ daddu $s0, $a0, $zero diff --git a/asm/nonmatchings/code_135EE0/func_802457B8.s b/asm/nonmatchings/code_135EE0/func_802457B8.s index 9891ef1076..9323fb1369 100644 --- a/asm/nonmatchings/code_135EE0/func_802457B8.s +++ b/asm/nonmatchings/code_135EE0/func_802457B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802457B8 /* 138AF8 802457B8 14800051 */ bnez $a0, .L80245900 diff --git a/asm/nonmatchings/code_135EE0/func_80245910.s b/asm/nonmatchings/code_135EE0/func_80245910.s index 592421ad84..d05014c7db 100644 --- a/asm/nonmatchings/code_135EE0/func_80245910.s +++ b/asm/nonmatchings/code_135EE0/func_80245910.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245910 /* 138C50 80245910 8FB50024 */ lw $s5, 0x24($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80245984.s b/asm/nonmatchings/code_135EE0/func_80245984.s index ded8854525..49feba4736 100644 --- a/asm/nonmatchings/code_135EE0/func_80245984.s +++ b/asm/nonmatchings/code_135EE0/func_80245984.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245984 /* 138CC4 80245984 AFBE0078 */ sw $fp, 0x78($sp) diff --git a/asm/nonmatchings/code_135EE0/func_802459E0.s b/asm/nonmatchings/code_135EE0/func_802459E0.s index 76216577e9..836bfb8030 100644 --- a/asm/nonmatchings/code_135EE0/func_802459E0.s +++ b/asm/nonmatchings/code_135EE0/func_802459E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802459E0 /* 138D20 802459E0 27D00065 */ addiu $s0, $fp, 0x65 diff --git a/asm/nonmatchings/code_135EE0/func_80245B70.s b/asm/nonmatchings/code_135EE0/func_80245B70.s index d5012ebc8f..18a0d7e522 100644 --- a/asm/nonmatchings/code_135EE0/func_80245B70.s +++ b/asm/nonmatchings/code_135EE0/func_80245B70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245B70 /* 138EB0 80245B70 AFA80014 */ sw $t0, 0x14($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80245C6C.s b/asm/nonmatchings/code_135EE0/func_80245C6C.s index 39ea1a3fa6..dbd0b8ad61 100644 --- a/asm/nonmatchings/code_135EE0/func_80245C6C.s +++ b/asm/nonmatchings/code_135EE0/func_80245C6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245C6C /* 138FAC 80245C6C 24070001 */ addiu $a3, $zero, 1 diff --git a/asm/nonmatchings/code_135EE0/func_80245CAC.s b/asm/nonmatchings/code_135EE0/func_80245CAC.s index 6d4ca43e8b..fc5dd9bd5f 100644 --- a/asm/nonmatchings/code_135EE0/func_80245CAC.s +++ b/asm/nonmatchings/code_135EE0/func_80245CAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245CAC /* 138FEC 80245CAC 8E240020 */ lw $a0, 0x20($s1) diff --git a/asm/nonmatchings/code_135EE0/func_80245D5C.s b/asm/nonmatchings/code_135EE0/func_80245D5C.s index b96e15c548..d8dc5911f9 100644 --- a/asm/nonmatchings/code_135EE0/func_80245D5C.s +++ b/asm/nonmatchings/code_135EE0/func_80245D5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245D5C /* 13909C 80245D5C 02C0282D */ daddu $a1, $s6, $zero diff --git a/asm/nonmatchings/code_135EE0/func_80245D78.s b/asm/nonmatchings/code_135EE0/func_80245D78.s index e48b7b2d98..f2a3f21933 100644 --- a/asm/nonmatchings/code_135EE0/func_80245D78.s +++ b/asm/nonmatchings/code_135EE0/func_80245D78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245D78 /* 1390B8 80245D78 8E240024 */ lw $a0, 0x24($s1) diff --git a/asm/nonmatchings/code_135EE0/func_80245FE4.s b/asm/nonmatchings/code_135EE0/func_80245FE4.s index b6eb27f8a0..e452943748 100644 --- a/asm/nonmatchings/code_135EE0/func_80245FE4.s +++ b/asm/nonmatchings/code_135EE0/func_80245FE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245FE4 /* 139324 80245FE4 AFA80010 */ sw $t0, 0x10($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80246060.s b/asm/nonmatchings/code_135EE0/func_80246060.s index 2d9c9cdf33..a1fd7fff49 100644 --- a/asm/nonmatchings/code_135EE0/func_80246060.s +++ b/asm/nonmatchings/code_135EE0/func_80246060.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246060 /* 1393A0 80246060 AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80246168.s b/asm/nonmatchings/code_135EE0/func_80246168.s index 23156da7c9..6571960b84 100644 --- a/asm/nonmatchings/code_135EE0/func_80246168.s +++ b/asm/nonmatchings/code_135EE0/func_80246168.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246168 /* 1394A8 80246168 0040902D */ daddu $s2, $v0, $zero diff --git a/asm/nonmatchings/code_135EE0/func_802461C0.s b/asm/nonmatchings/code_135EE0/func_802461C0.s index e120a65699..e43adacff7 100644 --- a/asm/nonmatchings/code_135EE0/func_802461C0.s +++ b/asm/nonmatchings/code_135EE0/func_802461C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802461C0 /* 139500 802461C0 25100089 */ addiu $s0, $t0, 0x89 diff --git a/asm/nonmatchings/code_135EE0/func_802461E4.s b/asm/nonmatchings/code_135EE0/func_802461E4.s index a1792fe784..fb967d58b4 100644 --- a/asm/nonmatchings/code_135EE0/func_802461E4.s +++ b/asm/nonmatchings/code_135EE0/func_802461E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802461E4 /* 139524 802461E4 8EC40004 */ lw $a0, 4($s6) diff --git a/asm/nonmatchings/code_135EE0/func_80246284.s b/asm/nonmatchings/code_135EE0/func_80246284.s index ec41d1eb30..c1fd654722 100644 --- a/asm/nonmatchings/code_135EE0/func_80246284.s +++ b/asm/nonmatchings/code_135EE0/func_80246284.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246284 /* 1395C4 80246284 8EC40008 */ lw $a0, 8($s6) diff --git a/asm/nonmatchings/code_135EE0/func_80246288.s b/asm/nonmatchings/code_135EE0/func_80246288.s index 2f11e7f444..cea2377f28 100644 --- a/asm/nonmatchings/code_135EE0/func_80246288.s +++ b/asm/nonmatchings/code_135EE0/func_80246288.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246288 /* 1395C8 80246288 0C0511F8 */ jal func_801447E0 diff --git a/asm/nonmatchings/code_135EE0/func_80246298.s b/asm/nonmatchings/code_135EE0/func_80246298.s index 909fc6a730..a6372fc8a7 100644 --- a/asm/nonmatchings/code_135EE0/func_80246298.s +++ b/asm/nonmatchings/code_135EE0/func_80246298.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246298 /* 1395D8 80246298 0C093BA0 */ jal func_8024EE80 diff --git a/asm/nonmatchings/code_135EE0/func_802462F0.s b/asm/nonmatchings/code_135EE0/func_802462F0.s index f801b10fe6..0dd7b04d03 100644 --- a/asm/nonmatchings/code_135EE0/func_802462F0.s +++ b/asm/nonmatchings/code_135EE0/func_802462F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802462F0 /* 139630 802462F0 86E30290 */ lh $v1, 0x290($s7) diff --git a/asm/nonmatchings/code_135EE0/func_80246348.s b/asm/nonmatchings/code_135EE0/func_80246348.s index a943184d64..3f61c3839d 100644 --- a/asm/nonmatchings/code_135EE0/func_80246348.s +++ b/asm/nonmatchings/code_135EE0/func_80246348.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246348 /* 139688 80246348 3C058025 */ lui $a1, 0x8025 diff --git a/asm/nonmatchings/code_135EE0/func_80246358.s b/asm/nonmatchings/code_135EE0/func_80246358.s index 33108b3352..dfe2a63164 100644 --- a/asm/nonmatchings/code_135EE0/func_80246358.s +++ b/asm/nonmatchings/code_135EE0/func_80246358.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246358 /* 139698 80246358 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/code_135EE0/func_80246490.s b/asm/nonmatchings/code_135EE0/func_80246490.s index cf60318d94..e63914e355 100644 --- a/asm/nonmatchings/code_135EE0/func_80246490.s +++ b/asm/nonmatchings/code_135EE0/func_80246490.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246490 /* 1397D0 80246490 0276102A */ slt $v0, $s3, $s6 diff --git a/asm/nonmatchings/code_135EE0/func_80246504.s b/asm/nonmatchings/code_135EE0/func_80246504.s index 61a9e07fb6..e6cd2ff016 100644 --- a/asm/nonmatchings/code_135EE0/func_80246504.s +++ b/asm/nonmatchings/code_135EE0/func_80246504.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246504 /* 139844 80246504 0276102A */ slt $v0, $s3, $s6 diff --git a/asm/nonmatchings/code_135EE0/func_8024651C.s b/asm/nonmatchings/code_135EE0/func_8024651C.s index 38762d25e7..0f7d718862 100644 --- a/asm/nonmatchings/code_135EE0/func_8024651C.s +++ b/asm/nonmatchings/code_135EE0/func_8024651C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024651C /* 13985C 8024651C 00B02821 */ addu $a1, $a1, $s0 diff --git a/asm/nonmatchings/code_135EE0/func_80246578.s b/asm/nonmatchings/code_135EE0/func_80246578.s index f151de667a..9c957a1ac1 100644 --- a/asm/nonmatchings/code_135EE0/func_80246578.s +++ b/asm/nonmatchings/code_135EE0/func_80246578.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246578 /* 1398B8 80246578 0276102A */ slt $v0, $s3, $s6 diff --git a/asm/nonmatchings/code_135EE0/func_802465EC.s b/asm/nonmatchings/code_135EE0/func_802465EC.s index 0c67cfb27b..dcca8ae0e9 100644 --- a/asm/nonmatchings/code_135EE0/func_802465EC.s +++ b/asm/nonmatchings/code_135EE0/func_802465EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802465EC /* 13992C 802465EC 0276102A */ slt $v0, $s3, $s6 diff --git a/asm/nonmatchings/code_135EE0/func_80246BE4.s b/asm/nonmatchings/code_135EE0/func_80246BE4.s index 8fd12ffad2..47a44d2d33 100644 --- a/asm/nonmatchings/code_135EE0/func_80246BE4.s +++ b/asm/nonmatchings/code_135EE0/func_80246BE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246BE4 /* 139F24 80246BE4 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/func_80246C9C.s b/asm/nonmatchings/code_135EE0/func_80246C9C.s index 7d1dc55665..f7fcaae18e 100644 --- a/asm/nonmatchings/code_135EE0/func_80246C9C.s +++ b/asm/nonmatchings/code_135EE0/func_80246C9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246C9C .L80246C9C: diff --git a/asm/nonmatchings/code_135EE0/func_80246DB8.s b/asm/nonmatchings/code_135EE0/func_80246DB8.s index 4af4b76a52..b7d1b06b38 100644 --- a/asm/nonmatchings/code_135EE0/func_80246DB8.s +++ b/asm/nonmatchings/code_135EE0/func_80246DB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246DB8 .L80246DB8: diff --git a/asm/nonmatchings/code_135EE0/func_80246DEC.s b/asm/nonmatchings/code_135EE0/func_80246DEC.s index 683b6cc82e..4ee390865d 100644 --- a/asm/nonmatchings/code_135EE0/func_80246DEC.s +++ b/asm/nonmatchings/code_135EE0/func_80246DEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246DEC /* 13A12C 80246DEC 82040001 */ lb $a0, 1($s0) diff --git a/asm/nonmatchings/code_135EE0/func_80246F28.s b/asm/nonmatchings/code_135EE0/func_80246F28.s index 45886c8171..e872bdb1a8 100644 --- a/asm/nonmatchings/code_135EE0/func_80246F28.s +++ b/asm/nonmatchings/code_135EE0/func_80246F28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246F28 .L80246F28: diff --git a/asm/nonmatchings/code_135EE0/func_80246FF4.s b/asm/nonmatchings/code_135EE0/func_80246FF4.s index 9d03bff052..d7ab368456 100644 --- a/asm/nonmatchings/code_135EE0/func_80246FF4.s +++ b/asm/nonmatchings/code_135EE0/func_80246FF4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246FF4 .L80246FF4: diff --git a/asm/nonmatchings/code_135EE0/func_80246FFC.s b/asm/nonmatchings/code_135EE0/func_80246FFC.s index ce2665ccd5..bdc75247db 100644 --- a/asm/nonmatchings/code_135EE0/func_80246FFC.s +++ b/asm/nonmatchings/code_135EE0/func_80246FFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246FFC /* 13A33C 80246FFC 946378E6 */ lhu $v1, 0x78e6($v1) diff --git a/asm/nonmatchings/code_135EE0/func_80247000.s b/asm/nonmatchings/code_135EE0/func_80247000.s index ae667b34d0..1f3e2e6b4f 100644 --- a/asm/nonmatchings/code_135EE0/func_80247000.s +++ b/asm/nonmatchings/code_135EE0/func_80247000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247000 /* 13A340 80247000 84A20000 */ lh $v0, ($a1) diff --git a/asm/nonmatchings/code_135EE0/func_80247020.s b/asm/nonmatchings/code_135EE0/func_80247020.s index b24dceac5d..4342dd8e58 100644 --- a/asm/nonmatchings/code_135EE0/func_80247020.s +++ b/asm/nonmatchings/code_135EE0/func_80247020.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247020 /* 13A360 80247020 00031400 */ sll $v0, $v1, 0x10 diff --git a/asm/nonmatchings/code_135EE0/func_80247054.s b/asm/nonmatchings/code_135EE0/func_80247054.s index 9fa1ec508b..b35706e69a 100644 --- a/asm/nonmatchings/code_135EE0/func_80247054.s +++ b/asm/nonmatchings/code_135EE0/func_80247054.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247054 /* 13A394 80247054 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_135EE0/func_802470B0.s b/asm/nonmatchings/code_135EE0/func_802470B0.s index 6501d8f151..dd2e5681e8 100644 --- a/asm/nonmatchings/code_135EE0/func_802470B0.s +++ b/asm/nonmatchings/code_135EE0/func_802470B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802470B0 /* 13A3F0 802470B0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_135EE0/func_8024710C.s b/asm/nonmatchings/code_135EE0/func_8024710C.s index 2e845f225d..bb0f44c5d3 100644 --- a/asm/nonmatchings/code_135EE0/func_8024710C.s +++ b/asm/nonmatchings/code_135EE0/func_8024710C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024710C /* 13A44C 8024710C 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_135EE0/func_80247164.s b/asm/nonmatchings/code_135EE0/func_80247164.s index d6f8d02826..9fe4153630 100644 --- a/asm/nonmatchings/code_135EE0/func_80247164.s +++ b/asm/nonmatchings/code_135EE0/func_80247164.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247164 /* 13A4A4 80247164 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/func_80247168.s b/asm/nonmatchings/code_135EE0/func_80247168.s index 6433749b12..d803e251af 100644 --- a/asm/nonmatchings/code_135EE0/func_80247168.s +++ b/asm/nonmatchings/code_135EE0/func_80247168.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247168 /* 13A4A8 80247168 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_802471D8.s b/asm/nonmatchings/code_135EE0/func_802471D8.s index c898a6d7ec..d150ed3721 100644 --- a/asm/nonmatchings/code_135EE0/func_802471D8.s +++ b/asm/nonmatchings/code_135EE0/func_802471D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802471D8 /* 13A518 802471D8 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_135EE0/func_80247220.s b/asm/nonmatchings/code_135EE0/func_80247220.s index dd28d6658d..64e812ea2f 100644 --- a/asm/nonmatchings/code_135EE0/func_80247220.s +++ b/asm/nonmatchings/code_135EE0/func_80247220.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247220 /* 13A560 80247220 3C038027 */ lui $v1, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80247270.s b/asm/nonmatchings/code_135EE0/func_80247270.s index d1df51aed2..5a3ac23bb0 100644 --- a/asm/nonmatchings/code_135EE0/func_80247270.s +++ b/asm/nonmatchings/code_135EE0/func_80247270.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247270 /* 13A5B0 80247270 3C038027 */ lui $v1, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80247298.s b/asm/nonmatchings/code_135EE0/func_80247298.s index 2f58f813e6..586fffc5db 100644 --- a/asm/nonmatchings/code_135EE0/func_80247298.s +++ b/asm/nonmatchings/code_135EE0/func_80247298.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247298 /* 13A5D8 80247298 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_802472A8.s b/asm/nonmatchings/code_135EE0/func_802472A8.s index 7b3f4f6dc1..6ad2538a07 100644 --- a/asm/nonmatchings/code_135EE0/func_802472A8.s +++ b/asm/nonmatchings/code_135EE0/func_802472A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802472A8 /* 13A5E8 802472A8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_135EE0/func_802472B0.s b/asm/nonmatchings/code_135EE0/func_802472B0.s index 411b1b182a..572dff524d 100644 --- a/asm/nonmatchings/code_135EE0/func_802472B0.s +++ b/asm/nonmatchings/code_135EE0/func_802472B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802472B0 /* 13A5F0 802472B0 3C068011 */ lui $a2, 0x8011 diff --git a/asm/nonmatchings/code_135EE0/func_80247314.s b/asm/nonmatchings/code_135EE0/func_80247314.s index c673ce271b..4ceb47cbe0 100644 --- a/asm/nonmatchings/code_135EE0/func_80247314.s +++ b/asm/nonmatchings/code_135EE0/func_80247314.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247314 /* 13A654 80247314 28A2003F */ slti $v0, $a1, 0x3f diff --git a/asm/nonmatchings/code_135EE0/func_80247318.s b/asm/nonmatchings/code_135EE0/func_80247318.s index 8a39f4c7f1..a7eef037f9 100644 --- a/asm/nonmatchings/code_135EE0/func_80247318.s +++ b/asm/nonmatchings/code_135EE0/func_80247318.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247318 /* 13A658 80247318 5440FFFB */ bnezl $v0, .L80247308 diff --git a/asm/nonmatchings/code_135EE0/func_80247338.s b/asm/nonmatchings/code_135EE0/func_80247338.s index 77cc6d8ef5..e2face2aeb 100644 --- a/asm/nonmatchings/code_135EE0/func_80247338.s +++ b/asm/nonmatchings/code_135EE0/func_80247338.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247338 /* 13A678 80247338 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_135EE0/func_802473E4.s b/asm/nonmatchings/code_135EE0/func_802473E4.s index 734275608a..2a13237f55 100644 --- a/asm/nonmatchings/code_135EE0/func_802473E4.s +++ b/asm/nonmatchings/code_135EE0/func_802473E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802473E4 /* 13A724 802473E4 00220821 */ addu $at, $at, $v0 diff --git a/asm/nonmatchings/code_135EE0/func_80247440.s b/asm/nonmatchings/code_135EE0/func_80247440.s index 071650a6cc..8b79b6e9d1 100644 --- a/asm/nonmatchings/code_135EE0/func_80247440.s +++ b/asm/nonmatchings/code_135EE0/func_80247440.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247440 /* 13A780 80247440 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/code_135EE0/func_80247444.s b/asm/nonmatchings/code_135EE0/func_80247444.s index abe003504a..c2a2fb6909 100644 --- a/asm/nonmatchings/code_135EE0/func_80247444.s +++ b/asm/nonmatchings/code_135EE0/func_80247444.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247444 .L80247444: diff --git a/asm/nonmatchings/code_135EE0/func_80247458.s b/asm/nonmatchings/code_135EE0/func_80247458.s index 2862cca65d..af444a332b 100644 --- a/asm/nonmatchings/code_135EE0/func_80247458.s +++ b/asm/nonmatchings/code_135EE0/func_80247458.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247458 /* 13A798 80247458 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_135EE0/func_80247BB0.s b/asm/nonmatchings/code_135EE0/func_80247BB0.s index 8a242244ee..83aae9f976 100644 --- a/asm/nonmatchings/code_135EE0/func_80247BB0.s +++ b/asm/nonmatchings/code_135EE0/func_80247BB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247BB0 /* 13AEF0 80247BB0 8FAA00C4 */ lw $t2, 0xc4($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80247BB8.s b/asm/nonmatchings/code_135EE0/func_80247BB8.s index 46e3637539..01628755a0 100644 --- a/asm/nonmatchings/code_135EE0/func_80247BB8.s +++ b/asm/nonmatchings/code_135EE0/func_80247BB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247BB8 /* 13AEF8 80247BB8 0C091CA6 */ jal func_80247298 diff --git a/asm/nonmatchings/code_135EE0/func_80247C24.s b/asm/nonmatchings/code_135EE0/func_80247C24.s index 5f3a8bd28a..072903bf4c 100644 --- a/asm/nonmatchings/code_135EE0/func_80247C24.s +++ b/asm/nonmatchings/code_135EE0/func_80247C24.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247C24 /* 13AF64 80247C24 8FAB0054 */ lw $t3, 0x54($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80247CD4.s b/asm/nonmatchings/code_135EE0/func_80247CD4.s index bf97e2350b..63358df790 100644 --- a/asm/nonmatchings/code_135EE0/func_80247CD4.s +++ b/asm/nonmatchings/code_135EE0/func_80247CD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247CD4 /* 13B014 80247CD4 000212C3 */ sra $v0, $v0, 0xb diff --git a/asm/nonmatchings/code_135EE0/func_80247CE0.s b/asm/nonmatchings/code_135EE0/func_80247CE0.s index 5adcbe603e..07e2c09d54 100644 --- a/asm/nonmatchings/code_135EE0/func_80247CE0.s +++ b/asm/nonmatchings/code_135EE0/func_80247CE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247CE0 /* 13B020 80247CE0 004B1021 */ addu $v0, $v0, $t3 diff --git a/asm/nonmatchings/code_135EE0/func_80247CF4.s b/asm/nonmatchings/code_135EE0/func_80247CF4.s index 7827eaa0c7..9f922cfffa 100644 --- a/asm/nonmatchings/code_135EE0/func_80247CF4.s +++ b/asm/nonmatchings/code_135EE0/func_80247CF4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247CF4 /* 13B034 80247CF4 004A1021 */ addu $v0, $v0, $t2 diff --git a/asm/nonmatchings/code_135EE0/func_80247D2C.s b/asm/nonmatchings/code_135EE0/func_80247D2C.s index edbbb71b36..24bb7956a3 100644 --- a/asm/nonmatchings/code_135EE0/func_80247D2C.s +++ b/asm/nonmatchings/code_135EE0/func_80247D2C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247D2C /* 13B06C 80247D2C 0C0511FF */ jal set_menu_icon_script diff --git a/asm/nonmatchings/code_135EE0/func_80247D44.s b/asm/nonmatchings/code_135EE0/func_80247D44.s index b2a3528fe3..215a37dd63 100644 --- a/asm/nonmatchings/code_135EE0/func_80247D44.s +++ b/asm/nonmatchings/code_135EE0/func_80247D44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247D44 /* 13B084 80247D44 0C091CAA */ jal func_802472A8 diff --git a/asm/nonmatchings/code_135EE0/func_80247DA4.s b/asm/nonmatchings/code_135EE0/func_80247DA4.s index a841a1fe1b..82b2ee77d9 100644 --- a/asm/nonmatchings/code_135EE0/func_80247DA4.s +++ b/asm/nonmatchings/code_135EE0/func_80247DA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247DA4 /* 13B0E4 80247DA4 8FAA0058 */ lw $t2, 0x58($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80247E30.s b/asm/nonmatchings/code_135EE0/func_80247E30.s index 3ece2cb14e..c4659d93d7 100644 --- a/asm/nonmatchings/code_135EE0/func_80247E30.s +++ b/asm/nonmatchings/code_135EE0/func_80247E30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247E30 /* 13B170 80247E30 2442F348 */ addiu $v0, $v0, -0xcb8 diff --git a/asm/nonmatchings/code_135EE0/func_80247F80.s b/asm/nonmatchings/code_135EE0/func_80247F80.s index 9157cd4dd7..a1aa700f08 100644 --- a/asm/nonmatchings/code_135EE0/func_80247F80.s +++ b/asm/nonmatchings/code_135EE0/func_80247F80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247F80 /* 13B2C0 80247F80 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_135EE0/func_80247F94.s b/asm/nonmatchings/code_135EE0/func_80247F94.s index ede260dc07..992b71a1cc 100644 --- a/asm/nonmatchings/code_135EE0/func_80247F94.s +++ b/asm/nonmatchings/code_135EE0/func_80247F94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247F94 /* 13B2D4 80247F94 000A1A00 */ sll $v1, $t2, 8 diff --git a/asm/nonmatchings/code_135EE0/func_80247F98.s b/asm/nonmatchings/code_135EE0/func_80247F98.s index cc772d89fb..e63c334443 100644 --- a/asm/nonmatchings/code_135EE0/func_80247F98.s +++ b/asm/nonmatchings/code_135EE0/func_80247F98.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247F98 /* 13B2D8 80247F98 00431025 */ or $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/func_80247FA4.s b/asm/nonmatchings/code_135EE0/func_80247FA4.s index 3fcf4698ea..2564897fde 100644 --- a/asm/nonmatchings/code_135EE0/func_80247FA4.s +++ b/asm/nonmatchings/code_135EE0/func_80247FA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247FA4 /* 13B2E4 80247FA4 AC850004 */ sw $a1, 4($a0) diff --git a/asm/nonmatchings/code_135EE0/func_8024824C.s b/asm/nonmatchings/code_135EE0/func_8024824C.s index 5150f09ce3..4b7a576c92 100644 --- a/asm/nonmatchings/code_135EE0/func_8024824C.s +++ b/asm/nonmatchings/code_135EE0/func_8024824C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024824C /* 13B58C 8024824C 46041082 */ mul.s $f2, $f2, $f4 diff --git a/asm/nonmatchings/code_135EE0/func_80248274.s b/asm/nonmatchings/code_135EE0/func_80248274.s index c9c47481ab..18ede059fe 100644 --- a/asm/nonmatchings/code_135EE0/func_80248274.s +++ b/asm/nonmatchings/code_135EE0/func_80248274.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248274 /* 13B5B4 80248274 44871000 */ mtc1 $a3, $f2 diff --git a/asm/nonmatchings/code_135EE0/func_80248284.s b/asm/nonmatchings/code_135EE0/func_80248284.s index a1e9e2fb3c..91b5a06f8b 100644 --- a/asm/nonmatchings/code_135EE0/func_80248284.s +++ b/asm/nonmatchings/code_135EE0/func_80248284.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248284 /* 13B5C4 80248284 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/func_802483B8.s b/asm/nonmatchings/code_135EE0/func_802483B8.s index b32bf67861..5a483f4329 100644 --- a/asm/nonmatchings/code_135EE0/func_802483B8.s +++ b/asm/nonmatchings/code_135EE0/func_802483B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802483B8 /* 13B6F8 802483B8 2413000A */ addiu $s3, $zero, 0xa diff --git a/asm/nonmatchings/code_135EE0/func_80248B70.s b/asm/nonmatchings/code_135EE0/func_80248B70.s index 6454d13cdb..09a2eabca7 100644 --- a/asm/nonmatchings/code_135EE0/func_80248B70.s +++ b/asm/nonmatchings/code_135EE0/func_80248B70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248B70 /* 13BEB0 80248B70 0C091CAA */ jal func_802472A8 diff --git a/asm/nonmatchings/code_135EE0/func_80248BA0.s b/asm/nonmatchings/code_135EE0/func_80248BA0.s index 67da8df80a..ca4e4f38ef 100644 --- a/asm/nonmatchings/code_135EE0/func_80248BA0.s +++ b/asm/nonmatchings/code_135EE0/func_80248BA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248BA0 .L80248BA0: diff --git a/asm/nonmatchings/code_135EE0/func_80248BCC.s b/asm/nonmatchings/code_135EE0/func_80248BCC.s index 196b69f0a9..961887aa76 100644 --- a/asm/nonmatchings/code_135EE0/func_80248BCC.s +++ b/asm/nonmatchings/code_135EE0/func_80248BCC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248BCC /* 13BF0C 80248BCC 0C090AEB */ jal func_80242BAC diff --git a/asm/nonmatchings/code_135EE0/func_80248BE4.s b/asm/nonmatchings/code_135EE0/func_80248BE4.s index 34f9c9a643..8a45536d3f 100644 --- a/asm/nonmatchings/code_135EE0/func_80248BE4.s +++ b/asm/nonmatchings/code_135EE0/func_80248BE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248BE4 /* 13BF24 80248BE4 8FAB00C4 */ lw $t3, 0xc4($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80248BF4.s b/asm/nonmatchings/code_135EE0/func_80248BF4.s index 594dbee4bb..22cf416c6c 100644 --- a/asm/nonmatchings/code_135EE0/func_80248BF4.s +++ b/asm/nonmatchings/code_135EE0/func_80248BF4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248BF4 /* 13BF34 80248BF4 0C090B41 */ jal func_80242D04 diff --git a/asm/nonmatchings/code_135EE0/func_80248BFC.s b/asm/nonmatchings/code_135EE0/func_80248BFC.s index fd1f91f7c6..1a788a020b 100644 --- a/asm/nonmatchings/code_135EE0/func_80248BFC.s +++ b/asm/nonmatchings/code_135EE0/func_80248BFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248BFC .L80248BFC: diff --git a/asm/nonmatchings/code_135EE0/func_80248C4C.s b/asm/nonmatchings/code_135EE0/func_80248C4C.s index 38956bd4f9..07b7f42ba0 100644 --- a/asm/nonmatchings/code_135EE0/func_80248C4C.s +++ b/asm/nonmatchings/code_135EE0/func_80248C4C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248C4C /* 13BF8C 80248C4C AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80248CCC.s b/asm/nonmatchings/code_135EE0/func_80248CCC.s index 49a6f90913..25b2eb39f5 100644 --- a/asm/nonmatchings/code_135EE0/func_80248CCC.s +++ b/asm/nonmatchings/code_135EE0/func_80248CCC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248CCC /* 13C00C 80248CCC 8FAA00C8 */ lw $t2, 0xc8($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80248CD0.s b/asm/nonmatchings/code_135EE0/func_80248CD0.s index 1cc08530ca..a7f324f517 100644 --- a/asm/nonmatchings/code_135EE0/func_80248CD0.s +++ b/asm/nonmatchings/code_135EE0/func_80248CD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248CD0 /* 13C010 80248CD0 240200AD */ addiu $v0, $zero, 0xad diff --git a/asm/nonmatchings/code_135EE0/func_80248D40.s b/asm/nonmatchings/code_135EE0/func_80248D40.s index 10233e3ff4..721cd5b942 100644 --- a/asm/nonmatchings/code_135EE0/func_80248D40.s +++ b/asm/nonmatchings/code_135EE0/func_80248D40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248D40 /* 13C080 80248D40 8FAA00C8 */ lw $t2, 0xc8($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80248D54.s b/asm/nonmatchings/code_135EE0/func_80248D54.s index 0f0387dd29..c6f7f21754 100644 --- a/asm/nonmatchings/code_135EE0/func_80248D54.s +++ b/asm/nonmatchings/code_135EE0/func_80248D54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248D54 /* 13C094 80248D54 0C04993B */ jal draw_string diff --git a/asm/nonmatchings/code_135EE0/func_80248D8C.s b/asm/nonmatchings/code_135EE0/func_80248D8C.s index cad0799c21..4856453cfc 100644 --- a/asm/nonmatchings/code_135EE0/func_80248D8C.s +++ b/asm/nonmatchings/code_135EE0/func_80248D8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248D8C /* 13C0CC 80248D8C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_135EE0/func_80248E40.s b/asm/nonmatchings/code_135EE0/func_80248E40.s index 6be48ebf53..91bcfbff77 100644 --- a/asm/nonmatchings/code_135EE0/func_80248E40.s +++ b/asm/nonmatchings/code_135EE0/func_80248E40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248E40 .L80248E40: diff --git a/asm/nonmatchings/code_135EE0/func_80248EB4.s b/asm/nonmatchings/code_135EE0/func_80248EB4.s index 3a5ac5d4e3..c659a7b41a 100644 --- a/asm/nonmatchings/code_135EE0/func_80248EB4.s +++ b/asm/nonmatchings/code_135EE0/func_80248EB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248EB4 /* 13C1F4 80248EB4 3C018027 */ lui $at, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80248EDC.s b/asm/nonmatchings/code_135EE0/func_80248EDC.s index 1246891733..98fdee8731 100644 --- a/asm/nonmatchings/code_135EE0/func_80248EDC.s +++ b/asm/nonmatchings/code_135EE0/func_80248EDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248EDC /* 13C21C 80248EDC 84E20000 */ lh $v0, ($a3) diff --git a/asm/nonmatchings/code_135EE0/func_80248F80.s b/asm/nonmatchings/code_135EE0/func_80248F80.s index 4bdc24beaf..4977dbed33 100644 --- a/asm/nonmatchings/code_135EE0/func_80248F80.s +++ b/asm/nonmatchings/code_135EE0/func_80248F80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248F80 /* 13C2C0 80248F80 24A5000C */ addiu $a1, $a1, 0xc diff --git a/asm/nonmatchings/code_135EE0/func_80248F9C.s b/asm/nonmatchings/code_135EE0/func_80248F9C.s index 822092848b..37a9a4926a 100644 --- a/asm/nonmatchings/code_135EE0/func_80248F9C.s +++ b/asm/nonmatchings/code_135EE0/func_80248F9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248F9C /* 13C2DC 80248F9C 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80249008.s b/asm/nonmatchings/code_135EE0/func_80249008.s index babf2dbf88..5b739f97de 100644 --- a/asm/nonmatchings/code_135EE0/func_80249008.s +++ b/asm/nonmatchings/code_135EE0/func_80249008.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249008 /* 13C348 80249008 24027FFE */ addiu $v0, $zero, 0x7ffe diff --git a/asm/nonmatchings/code_135EE0/func_80249034.s b/asm/nonmatchings/code_135EE0/func_80249034.s index 631cf32685..6d76a32b6e 100644 --- a/asm/nonmatchings/code_135EE0/func_80249034.s +++ b/asm/nonmatchings/code_135EE0/func_80249034.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249034 /* 13C374 80249034 0C050529 */ jal create_icon diff --git a/asm/nonmatchings/code_135EE0/func_8024908C.s b/asm/nonmatchings/code_135EE0/func_8024908C.s index 5b0d613d2c..783d5dd78d 100644 --- a/asm/nonmatchings/code_135EE0/func_8024908C.s +++ b/asm/nonmatchings/code_135EE0/func_8024908C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024908C /* 13C3CC 8024908C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80249110.s b/asm/nonmatchings/code_135EE0/func_80249110.s index ab651903c5..ce9712fcef 100644 --- a/asm/nonmatchings/code_135EE0/func_80249110.s +++ b/asm/nonmatchings/code_135EE0/func_80249110.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249110 .L80249110: diff --git a/asm/nonmatchings/code_135EE0/func_80249274.s b/asm/nonmatchings/code_135EE0/func_80249274.s index 2e2bea0644..686100fbea 100644 --- a/asm/nonmatchings/code_135EE0/func_80249274.s +++ b/asm/nonmatchings/code_135EE0/func_80249274.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249274 /* 13C5B4 80249274 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/code_135EE0/func_8024928C.s b/asm/nonmatchings/code_135EE0/func_8024928C.s index 65b50d7c22..30553d021e 100644 --- a/asm/nonmatchings/code_135EE0/func_8024928C.s +++ b/asm/nonmatchings/code_135EE0/func_8024928C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024928C /* 13C5CC 8024928C 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/func_80249290.s b/asm/nonmatchings/code_135EE0/func_80249290.s index a6507476fd..3ce0b09051 100644 --- a/asm/nonmatchings/code_135EE0/func_80249290.s +++ b/asm/nonmatchings/code_135EE0/func_80249290.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249290 /* 13C5D0 80249290 0C05272D */ jal play_sound diff --git a/asm/nonmatchings/code_135EE0/func_802492B4.s b/asm/nonmatchings/code_135EE0/func_802492B4.s index 347e937465..2d756653ae 100644 --- a/asm/nonmatchings/code_135EE0/func_802492B4.s +++ b/asm/nonmatchings/code_135EE0/func_802492B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802492B4 /* 13C5F4 802492B4 34422000 */ ori $v0, $v0, 0x2000 diff --git a/asm/nonmatchings/code_135EE0/func_802492E4.s b/asm/nonmatchings/code_135EE0/func_802492E4.s index 80de8e0f74..d1dffa5471 100644 --- a/asm/nonmatchings/code_135EE0/func_802492E4.s +++ b/asm/nonmatchings/code_135EE0/func_802492E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802492E4 /* 13C624 802492E4 00031040 */ sll $v0, $v1, 1 diff --git a/asm/nonmatchings/code_135EE0/func_80249310.s b/asm/nonmatchings/code_135EE0/func_80249310.s index a02bd8c171..63d34daeb9 100644 --- a/asm/nonmatchings/code_135EE0/func_80249310.s +++ b/asm/nonmatchings/code_135EE0/func_80249310.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249310 .L80249310: diff --git a/asm/nonmatchings/code_135EE0/func_80249420.s b/asm/nonmatchings/code_135EE0/func_80249420.s index 88fb3239f6..04e641146c 100644 --- a/asm/nonmatchings/code_135EE0/func_80249420.s +++ b/asm/nonmatchings/code_135EE0/func_80249420.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249420 .L80249420: diff --git a/asm/nonmatchings/code_135EE0/func_802494AC.s b/asm/nonmatchings/code_135EE0/func_802494AC.s index a08ce2e88d..e025f8fca6 100644 --- a/asm/nonmatchings/code_135EE0/func_802494AC.s +++ b/asm/nonmatchings/code_135EE0/func_802494AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802494AC .L802494AC: diff --git a/asm/nonmatchings/code_135EE0/func_8024950C.s b/asm/nonmatchings/code_135EE0/func_8024950C.s index f7134d3d3d..01d2b69d01 100644 --- a/asm/nonmatchings/code_135EE0/func_8024950C.s +++ b/asm/nonmatchings/code_135EE0/func_8024950C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024950C .L8024950C: diff --git a/asm/nonmatchings/code_135EE0/func_80249590.s b/asm/nonmatchings/code_135EE0/func_80249590.s index 346b925e6b..2f844e7ad0 100644 --- a/asm/nonmatchings/code_135EE0/func_80249590.s +++ b/asm/nonmatchings/code_135EE0/func_80249590.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249590 /* 13C8D0 80249590 3C018027 */ lui $at, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80249594.s b/asm/nonmatchings/code_135EE0/func_80249594.s index d1b387300f..99bee2216b 100644 --- a/asm/nonmatchings/code_135EE0/func_80249594.s +++ b/asm/nonmatchings/code_135EE0/func_80249594.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249594 /* 13C8D4 80249594 AC2000CC */ sw $zero, 0xcc($at) diff --git a/asm/nonmatchings/code_135EE0/func_80249598.s b/asm/nonmatchings/code_135EE0/func_80249598.s index 4a7fb4926b..2159ccde40 100644 --- a/asm/nonmatchings/code_135EE0/func_80249598.s +++ b/asm/nonmatchings/code_135EE0/func_80249598.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249598 /* 13C8D8 80249598 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80249604.s b/asm/nonmatchings/code_135EE0/func_80249604.s index 7628460414..e70a5ba9df 100644 --- a/asm/nonmatchings/code_135EE0/func_80249604.s +++ b/asm/nonmatchings/code_135EE0/func_80249604.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249604 .L80249604: diff --git a/asm/nonmatchings/code_135EE0/func_8024961C.s b/asm/nonmatchings/code_135EE0/func_8024961C.s index 5d5206047c..412f3fe278 100644 --- a/asm/nonmatchings/code_135EE0/func_8024961C.s +++ b/asm/nonmatchings/code_135EE0/func_8024961C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024961C /* 13C95C 8024961C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_135EE0/func_802496FC.s b/asm/nonmatchings/code_135EE0/func_802496FC.s index 77f6d71872..c4ed7c6652 100644 --- a/asm/nonmatchings/code_135EE0/func_802496FC.s +++ b/asm/nonmatchings/code_135EE0/func_802496FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802496FC .L802496FC: diff --git a/asm/nonmatchings/code_135EE0/func_802497AC.s b/asm/nonmatchings/code_135EE0/func_802497AC.s index def218c1cb..15f1c23817 100644 --- a/asm/nonmatchings/code_135EE0/func_802497AC.s +++ b/asm/nonmatchings/code_135EE0/func_802497AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802497AC /* 13CAEC 802497AC 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/func_802497D0.s b/asm/nonmatchings/code_135EE0/func_802497D0.s index 8424e4e3ac..74d7c6816b 100644 --- a/asm/nonmatchings/code_135EE0/func_802497D0.s +++ b/asm/nonmatchings/code_135EE0/func_802497D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802497D0 /* 13CB10 802497D0 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_135EE0/func_802497D8.s b/asm/nonmatchings/code_135EE0/func_802497D8.s index a1af369397..844220b9ff 100644 --- a/asm/nonmatchings/code_135EE0/func_802497D8.s +++ b/asm/nonmatchings/code_135EE0/func_802497D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802497D8 /* 13CB18 802497D8 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_135EE0/func_80249828.s b/asm/nonmatchings/code_135EE0/func_80249828.s index 1be4bdd840..f9d66c5b3c 100644 --- a/asm/nonmatchings/code_135EE0/func_80249828.s +++ b/asm/nonmatchings/code_135EE0/func_80249828.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249828 /* 13CB68 80249828 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80249898.s b/asm/nonmatchings/code_135EE0/func_80249898.s index 26c852f300..1b013c7111 100644 --- a/asm/nonmatchings/code_135EE0/func_80249898.s +++ b/asm/nonmatchings/code_135EE0/func_80249898.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249898 /* 13CBD8 80249898 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_135EE0/func_802498E0.s b/asm/nonmatchings/code_135EE0/func_802498E0.s index ec1ccaa6df..6352cf11e1 100644 --- a/asm/nonmatchings/code_135EE0/func_802498E0.s +++ b/asm/nonmatchings/code_135EE0/func_802498E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802498E0 /* 13CC20 802498E0 3C038027 */ lui $v1, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80249930.s b/asm/nonmatchings/code_135EE0/func_80249930.s index 7c4e60e8fe..10798a519c 100644 --- a/asm/nonmatchings/code_135EE0/func_80249930.s +++ b/asm/nonmatchings/code_135EE0/func_80249930.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249930 /* 13CC70 80249930 3C038027 */ lui $v1, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024994C.s b/asm/nonmatchings/code_135EE0/func_8024994C.s index e32f7ed813..7e9df50705 100644 --- a/asm/nonmatchings/code_135EE0/func_8024994C.s +++ b/asm/nonmatchings/code_135EE0/func_8024994C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024994C /* 13CC8C 8024994C 0082102A */ slt $v0, $a0, $v0 diff --git a/asm/nonmatchings/code_135EE0/func_80249950.s b/asm/nonmatchings/code_135EE0/func_80249950.s index a4c2b42503..c1589416a3 100644 --- a/asm/nonmatchings/code_135EE0/func_80249950.s +++ b/asm/nonmatchings/code_135EE0/func_80249950.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249950 .L80249950: diff --git a/asm/nonmatchings/code_135EE0/func_80249954.s b/asm/nonmatchings/code_135EE0/func_80249954.s index bb1f083e8d..123750f10d 100644 --- a/asm/nonmatchings/code_135EE0/func_80249954.s +++ b/asm/nonmatchings/code_135EE0/func_80249954.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249954 /* 13CC94 80249954 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_135EE0/func_80249958.s b/asm/nonmatchings/code_135EE0/func_80249958.s index ed8e5eb60d..3ffcb5b3ca 100644 --- a/asm/nonmatchings/code_135EE0/func_80249958.s +++ b/asm/nonmatchings/code_135EE0/func_80249958.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249958 /* 13CC98 80249958 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80249968.s b/asm/nonmatchings/code_135EE0/func_80249968.s index cb624d4836..f9cae3985e 100644 --- a/asm/nonmatchings/code_135EE0/func_80249968.s +++ b/asm/nonmatchings/code_135EE0/func_80249968.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249968 /* 13CCA8 80249968 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_135EE0/func_80249B30.s b/asm/nonmatchings/code_135EE0/func_80249B30.s index d239d57736..6af92398c6 100644 --- a/asm/nonmatchings/code_135EE0/func_80249B30.s +++ b/asm/nonmatchings/code_135EE0/func_80249B30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249B30 /* 13CE70 80249B30 3C04ED00 */ lui $a0, 0xed00 diff --git a/asm/nonmatchings/code_135EE0/func_80249C94.s b/asm/nonmatchings/code_135EE0/func_80249C94.s index 520b49c454..f2c32bc2f4 100644 --- a/asm/nonmatchings/code_135EE0/func_80249C94.s +++ b/asm/nonmatchings/code_135EE0/func_80249C94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249C94 /* 13CFD4 80249C94 3C038027 */ lui $v1, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80249CB0.s b/asm/nonmatchings/code_135EE0/func_80249CB0.s index 8105c6ac1d..a9bc99f376 100644 --- a/asm/nonmatchings/code_135EE0/func_80249CB0.s +++ b/asm/nonmatchings/code_135EE0/func_80249CB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249CB0 /* 13CFF0 80249CB0 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_80249CD4.s b/asm/nonmatchings/code_135EE0/func_80249CD4.s index a1a8bc9cc1..aade1a691a 100644 --- a/asm/nonmatchings/code_135EE0/func_80249CD4.s +++ b/asm/nonmatchings/code_135EE0/func_80249CD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249CD4 /* 13D014 80249CD4 0000A02D */ daddu $s4, $zero, $zero diff --git a/asm/nonmatchings/code_135EE0/func_80249E0C.s b/asm/nonmatchings/code_135EE0/func_80249E0C.s index c4def09c4e..fa640f4706 100644 --- a/asm/nonmatchings/code_135EE0/func_80249E0C.s +++ b/asm/nonmatchings/code_135EE0/func_80249E0C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249E0C /* 13D14C 80249E0C 0C04993B */ jal draw_string diff --git a/asm/nonmatchings/code_135EE0/func_80249EE4.s b/asm/nonmatchings/code_135EE0/func_80249EE4.s index ef6775b8f6..d9a9e17991 100644 --- a/asm/nonmatchings/code_135EE0/func_80249EE4.s +++ b/asm/nonmatchings/code_135EE0/func_80249EE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249EE4 /* 13D224 80249EE4 8FA40068 */ lw $a0, 0x68($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80249F48.s b/asm/nonmatchings/code_135EE0/func_80249F48.s index 8a74ab8255..18f83cc455 100644 --- a/asm/nonmatchings/code_135EE0/func_80249F48.s +++ b/asm/nonmatchings/code_135EE0/func_80249F48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249F48 /* 13D288 80249F48 8FAB0078 */ lw $t3, 0x78($sp) diff --git a/asm/nonmatchings/code_135EE0/func_80249FB4.s b/asm/nonmatchings/code_135EE0/func_80249FB4.s index d43902f577..65f56d170f 100644 --- a/asm/nonmatchings/code_135EE0/func_80249FB4.s +++ b/asm/nonmatchings/code_135EE0/func_80249FB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249FB4 /* 13D2F4 80249FB4 8D250000 */ lw $a1, ($t1) diff --git a/asm/nonmatchings/code_135EE0/func_8024A1E8.s b/asm/nonmatchings/code_135EE0/func_8024A1E8.s index 2ef548e135..c5421641c3 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A1E8.s +++ b/asm/nonmatchings/code_135EE0/func_8024A1E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A1E8 /* 13D528 8024A1E8 25670007 */ addiu $a3, $t3, 7 diff --git a/asm/nonmatchings/code_135EE0/func_8024A1FC.s b/asm/nonmatchings/code_135EE0/func_8024A1FC.s index bab56f7c90..79cef2b68c 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A1FC.s +++ b/asm/nonmatchings/code_135EE0/func_8024A1FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A1FC /* 13D53C 8024A1FC 24040004 */ addiu $a0, $zero, 4 diff --git a/asm/nonmatchings/code_135EE0/func_8024A29C.s b/asm/nonmatchings/code_135EE0/func_8024A29C.s index 009ea76ba4..a79a166001 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A29C.s +++ b/asm/nonmatchings/code_135EE0/func_8024A29C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A29C .L8024A29C: diff --git a/asm/nonmatchings/code_135EE0/func_8024A2D4.s b/asm/nonmatchings/code_135EE0/func_8024A2D4.s index 025029278a..221ead7ae2 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A2D4.s +++ b/asm/nonmatchings/code_135EE0/func_8024A2D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A2D4 /* 13D614 8024A2D4 24040004 */ addiu $a0, $zero, 4 diff --git a/asm/nonmatchings/code_135EE0/func_8024A454.s b/asm/nonmatchings/code_135EE0/func_8024A454.s index b800077ac9..9d231a8f85 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A454.s +++ b/asm/nonmatchings/code_135EE0/func_8024A454.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A454 .L8024A454: diff --git a/asm/nonmatchings/code_135EE0/func_8024A4A4.s b/asm/nonmatchings/code_135EE0/func_8024A4A4.s index a7ea5df170..7ee63cf4f1 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A4A4.s +++ b/asm/nonmatchings/code_135EE0/func_8024A4A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A4A4 /* 13D7E4 8024A4A4 0C090B41 */ jal func_80242D04 diff --git a/asm/nonmatchings/code_135EE0/func_8024A4AC.s b/asm/nonmatchings/code_135EE0/func_8024A4AC.s index 833caafa17..32b3c84bfc 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A4AC.s +++ b/asm/nonmatchings/code_135EE0/func_8024A4AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A4AC .L8024A4AC: diff --git a/asm/nonmatchings/code_135EE0/func_8024A4DC.s b/asm/nonmatchings/code_135EE0/func_8024A4DC.s index 0f9eb2bb12..49ad29dc8f 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A4DC.s +++ b/asm/nonmatchings/code_135EE0/func_8024A4DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A4DC /* 13D81C 8024A4DC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_135EE0/func_8024A57C.s b/asm/nonmatchings/code_135EE0/func_8024A57C.s index 674e40a0bc..e757274d8a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A57C.s +++ b/asm/nonmatchings/code_135EE0/func_8024A57C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A57C /* 13D8BC 8024A57C 16000005 */ bnez $s0, .L8024A594 diff --git a/asm/nonmatchings/code_135EE0/func_8024A5AC.s b/asm/nonmatchings/code_135EE0/func_8024A5AC.s index 494cca8343..60f86494f6 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A5AC.s +++ b/asm/nonmatchings/code_135EE0/func_8024A5AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A5AC /* 13D8EC 8024A5AC 3C018027 */ lui $at, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024A634.s b/asm/nonmatchings/code_135EE0/func_8024A634.s index a91a383a1f..b51f20eb29 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A634.s +++ b/asm/nonmatchings/code_135EE0/func_8024A634.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A634 /* 13D974 8024A634 84E20000 */ lh $v0, ($a3) diff --git a/asm/nonmatchings/code_135EE0/func_8024A6D8.s b/asm/nonmatchings/code_135EE0/func_8024A6D8.s index 6317bdca89..85ea44ac1b 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A6D8.s +++ b/asm/nonmatchings/code_135EE0/func_8024A6D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A6D8 /* 13DA18 8024A6D8 24A5000C */ addiu $a1, $a1, 0xc diff --git a/asm/nonmatchings/code_135EE0/func_8024A7A0.s b/asm/nonmatchings/code_135EE0/func_8024A7A0.s index c40776e7d2..6a85842bd0 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A7A0.s +++ b/asm/nonmatchings/code_135EE0/func_8024A7A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A7A0 /* 13DAE0 8024A7A0 24420024 */ addiu $v0, $v0, 0x24 diff --git a/asm/nonmatchings/code_135EE0/func_8024A960.s b/asm/nonmatchings/code_135EE0/func_8024A960.s index 81d05a8c47..c5a73c48bf 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A960.s +++ b/asm/nonmatchings/code_135EE0/func_8024A960.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A960 /* 13DCA0 8024A960 10400011 */ beqz $v0, .L8024A9A8 diff --git a/asm/nonmatchings/code_135EE0/func_8024A9A8.s b/asm/nonmatchings/code_135EE0/func_8024A9A8.s index f0d85445ad..a5cd96cb08 100644 --- a/asm/nonmatchings/code_135EE0/func_8024A9A8.s +++ b/asm/nonmatchings/code_135EE0/func_8024A9A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024A9A8 .L8024A9A8: diff --git a/asm/nonmatchings/code_135EE0/func_8024AA80.s b/asm/nonmatchings/code_135EE0/func_8024AA80.s index 38981c92aa..92de21f4dd 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AA80.s +++ b/asm/nonmatchings/code_135EE0/func_8024AA80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AA80 .L8024AA80: diff --git a/asm/nonmatchings/code_135EE0/func_8024AAA0.s b/asm/nonmatchings/code_135EE0/func_8024AAA0.s index ed8d53696d..234f159778 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AAA0.s +++ b/asm/nonmatchings/code_135EE0/func_8024AAA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AAA0 /* 13DDE0 8024AAA0 00A40018 */ mult $a1, $a0 diff --git a/asm/nonmatchings/code_135EE0/func_8024AAEC.s b/asm/nonmatchings/code_135EE0/func_8024AAEC.s index 326303d1b5..c7ba68fb46 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AAEC.s +++ b/asm/nonmatchings/code_135EE0/func_8024AAEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AAEC .L8024AAEC: diff --git a/asm/nonmatchings/code_135EE0/func_8024AB0C.s b/asm/nonmatchings/code_135EE0/func_8024AB0C.s index ba64bce42a..42bc4e508c 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AB0C.s +++ b/asm/nonmatchings/code_135EE0/func_8024AB0C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AB0C .L8024AB0C: diff --git a/asm/nonmatchings/code_135EE0/func_8024AB6C.s b/asm/nonmatchings/code_135EE0/func_8024AB6C.s index aa493c89d9..481c26c7ed 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AB6C.s +++ b/asm/nonmatchings/code_135EE0/func_8024AB6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AB6C .L8024AB6C: diff --git a/asm/nonmatchings/code_135EE0/func_8024ABF0.s b/asm/nonmatchings/code_135EE0/func_8024ABF0.s index 1e0e479cfc..e1d7653568 100644 --- a/asm/nonmatchings/code_135EE0/func_8024ABF0.s +++ b/asm/nonmatchings/code_135EE0/func_8024ABF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024ABF0 /* 13DF30 8024ABF0 3C018027 */ lui $at, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024ABF8.s b/asm/nonmatchings/code_135EE0/func_8024ABF8.s index ebd8ebbe0f..ff07a30ca3 100644 --- a/asm/nonmatchings/code_135EE0/func_8024ABF8.s +++ b/asm/nonmatchings/code_135EE0/func_8024ABF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024ABF8 /* 13DF38 8024ABF8 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024AC44.s b/asm/nonmatchings/code_135EE0/func_8024AC44.s index 6964c31b12..b060f95aaa 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AC44.s +++ b/asm/nonmatchings/code_135EE0/func_8024AC44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AC44 .L8024AC44: diff --git a/asm/nonmatchings/code_135EE0/func_8024AD34.s b/asm/nonmatchings/code_135EE0/func_8024AD34.s index acee409a03..1e6edba1b3 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AD34.s +++ b/asm/nonmatchings/code_135EE0/func_8024AD34.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AD34 .L8024AD34: diff --git a/asm/nonmatchings/code_135EE0/func_8024AD94.s b/asm/nonmatchings/code_135EE0/func_8024AD94.s index bff6f36c77..b8b180139a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AD94.s +++ b/asm/nonmatchings/code_135EE0/func_8024AD94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AD94 /* 13E0D4 8024AD94 AFB10014 */ sw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024ADE0.s b/asm/nonmatchings/code_135EE0/func_8024ADE0.s index 8cf0204628..80692d6703 100644 --- a/asm/nonmatchings/code_135EE0/func_8024ADE0.s +++ b/asm/nonmatchings/code_135EE0/func_8024ADE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024ADE0 /* 13E120 8024ADE0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_135EE0/func_8024AFBC.s b/asm/nonmatchings/code_135EE0/func_8024AFBC.s index a58ecfe1c6..c1a4083939 100644 --- a/asm/nonmatchings/code_135EE0/func_8024AFBC.s +++ b/asm/nonmatchings/code_135EE0/func_8024AFBC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024AFBC /* 13E2FC 8024AFBC 27A40050 */ addiu $a0, $sp, 0x50 diff --git a/asm/nonmatchings/code_135EE0/func_8024B0E0.s b/asm/nonmatchings/code_135EE0/func_8024B0E0.s index 4cce7eef4d..ca4e494097 100644 --- a/asm/nonmatchings/code_135EE0/func_8024B0E0.s +++ b/asm/nonmatchings/code_135EE0/func_8024B0E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024B0E0 /* 13E420 8024B0E0 0006000D */ break 6 diff --git a/asm/nonmatchings/code_135EE0/func_8024B128.s b/asm/nonmatchings/code_135EE0/func_8024B128.s index 3e5dfae500..43b3957589 100644 --- a/asm/nonmatchings/code_135EE0/func_8024B128.s +++ b/asm/nonmatchings/code_135EE0/func_8024B128.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024B128 /* 13E468 8024B128 45010005 */ bc1t .L8024B140 diff --git a/asm/nonmatchings/code_135EE0/func_8024B3FC.s b/asm/nonmatchings/code_135EE0/func_8024B3FC.s index e744219d5e..a5663fa03a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024B3FC.s +++ b/asm/nonmatchings/code_135EE0/func_8024B3FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024B3FC /* 13E73C 8024B3FC 24020040 */ addiu $v0, $zero, 0x40 diff --git a/asm/nonmatchings/code_135EE0/func_8024B5D4.s b/asm/nonmatchings/code_135EE0/func_8024B5D4.s index 2118cb7b50..12afcd932a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024B5D4.s +++ b/asm/nonmatchings/code_135EE0/func_8024B5D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024B5D4 /* 13E914 8024B5D4 14610004 */ bne $v1, $at, .L8024B5E8 diff --git a/asm/nonmatchings/code_135EE0/func_8024B7BC.s b/asm/nonmatchings/code_135EE0/func_8024B7BC.s index 7f61a6bdce..10959ff10e 100644 --- a/asm/nonmatchings/code_135EE0/func_8024B7BC.s +++ b/asm/nonmatchings/code_135EE0/func_8024B7BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024B7BC /* 13EAFC 8024B7BC AC620008 */ sw $v0, 8($v1) diff --git a/asm/nonmatchings/code_135EE0/func_8024B974.s b/asm/nonmatchings/code_135EE0/func_8024B974.s index 2b4ba5f3ed..0959b1ad6f 100644 --- a/asm/nonmatchings/code_135EE0/func_8024B974.s +++ b/asm/nonmatchings/code_135EE0/func_8024B974.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024B974 /* 13ECB4 8024B974 AC790000 */ sw $t9, ($v1) diff --git a/asm/nonmatchings/code_135EE0/func_8024BBC0.s b/asm/nonmatchings/code_135EE0/func_8024BBC0.s index 6a88f63948..f1117e1116 100644 --- a/asm/nonmatchings/code_135EE0/func_8024BBC0.s +++ b/asm/nonmatchings/code_135EE0/func_8024BBC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024BBC0 /* 13EF00 8024BBC0 AFB40028 */ sw $s4, 0x28($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024BD10.s b/asm/nonmatchings/code_135EE0/func_8024BD10.s index a578ed6a00..520f39cb25 100644 --- a/asm/nonmatchings/code_135EE0/func_8024BD10.s +++ b/asm/nonmatchings/code_135EE0/func_8024BD10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024BD10 /* 13F050 8024BD10 0C0511F8 */ jal func_801447E0 diff --git a/asm/nonmatchings/code_135EE0/func_8024BD78.s b/asm/nonmatchings/code_135EE0/func_8024BD78.s index 4988ed3d09..2a6221ec59 100644 --- a/asm/nonmatchings/code_135EE0/func_8024BD78.s +++ b/asm/nonmatchings/code_135EE0/func_8024BD78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024BD78 /* 13F0B8 8024BD78 00031880 */ sll $v1, $v1, 2 diff --git a/asm/nonmatchings/code_135EE0/func_8024BDD0.s b/asm/nonmatchings/code_135EE0/func_8024BDD0.s index 9013cb60aa..aafcf36a3d 100644 --- a/asm/nonmatchings/code_135EE0/func_8024BDD0.s +++ b/asm/nonmatchings/code_135EE0/func_8024BDD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024BDD0 .L8024BDD0: diff --git a/asm/nonmatchings/code_135EE0/func_8024BE84.s b/asm/nonmatchings/code_135EE0/func_8024BE84.s index 2420102c6a..f69af5875a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024BE84.s +++ b/asm/nonmatchings/code_135EE0/func_8024BE84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024BE84 /* 13F1C4 8024BE84 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/func_8024BEF4.s b/asm/nonmatchings/code_135EE0/func_8024BEF4.s index 9bc5b4cd1c..5f3bc274f6 100644 --- a/asm/nonmatchings/code_135EE0/func_8024BEF4.s +++ b/asm/nonmatchings/code_135EE0/func_8024BEF4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024BEF4 /* 13F234 8024BEF4 8FA50020 */ lw $a1, 0x20($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024BF9C.s b/asm/nonmatchings/code_135EE0/func_8024BF9C.s index b6d7a1f985..18cea46f9a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024BF9C.s +++ b/asm/nonmatchings/code_135EE0/func_8024BF9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024BF9C /* 13F2DC 8024BF9C 3C048027 */ lui $a0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024C154.s b/asm/nonmatchings/code_135EE0/func_8024C154.s index b4d5a05ab4..2a5e4ac5c7 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C154.s +++ b/asm/nonmatchings/code_135EE0/func_8024C154.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C154 /* 13F494 8024C154 AC500000 */ sw $s0, ($v0) diff --git a/asm/nonmatchings/code_135EE0/func_8024C298.s b/asm/nonmatchings/code_135EE0/func_8024C298.s index 890eb266d7..600b16770f 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C298.s +++ b/asm/nonmatchings/code_135EE0/func_8024C298.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C298 .L8024C298: diff --git a/asm/nonmatchings/code_135EE0/func_8024C318.s b/asm/nonmatchings/code_135EE0/func_8024C318.s index cb04f5d055..42b267b33d 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C318.s +++ b/asm/nonmatchings/code_135EE0/func_8024C318.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C318 /* 13F658 8024C318 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024C38C.s b/asm/nonmatchings/code_135EE0/func_8024C38C.s index b2cbe1086f..3d99535d42 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C38C.s +++ b/asm/nonmatchings/code_135EE0/func_8024C38C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C38C /* 13F6CC 8024C38C 3C020004 */ lui $v0, 4 diff --git a/asm/nonmatchings/code_135EE0/func_8024C470.s b/asm/nonmatchings/code_135EE0/func_8024C470.s index d7515e0cd2..480f63ed7a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C470.s +++ b/asm/nonmatchings/code_135EE0/func_8024C470.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C470 .L8024C470: diff --git a/asm/nonmatchings/code_135EE0/func_8024C4E0.s b/asm/nonmatchings/code_135EE0/func_8024C4E0.s index 8048831082..35989c5b23 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C4E0.s +++ b/asm/nonmatchings/code_135EE0/func_8024C4E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C4E0 .L8024C4E0: diff --git a/asm/nonmatchings/code_135EE0/func_8024C544.s b/asm/nonmatchings/code_135EE0/func_8024C544.s index 691741350e..9e0250748c 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C544.s +++ b/asm/nonmatchings/code_135EE0/func_8024C544.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C544 /* 13F884 8024C544 8C23F6B0 */ lw $v1, -0x950($at) diff --git a/asm/nonmatchings/code_135EE0/func_8024C580.s b/asm/nonmatchings/code_135EE0/func_8024C580.s index 7704fed05b..f06acb375d 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C580.s +++ b/asm/nonmatchings/code_135EE0/func_8024C580.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C580 .L8024C580: diff --git a/asm/nonmatchings/code_135EE0/func_8024C600.s b/asm/nonmatchings/code_135EE0/func_8024C600.s index d7560f9868..193ad50bbe 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C600.s +++ b/asm/nonmatchings/code_135EE0/func_8024C600.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C600 .L8024C600: diff --git a/asm/nonmatchings/code_135EE0/func_8024C760.s b/asm/nonmatchings/code_135EE0/func_8024C760.s index be5f6e2110..4b22f6bbd4 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C760.s +++ b/asm/nonmatchings/code_135EE0/func_8024C760.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C760 /* 13FAA0 8024C760 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_135EE0/func_8024C774.s b/asm/nonmatchings/code_135EE0/func_8024C774.s index 4fd4d64a0e..e8be3bd6b2 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C774.s +++ b/asm/nonmatchings/code_135EE0/func_8024C774.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C774 /* 13FAB4 8024C774 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_135EE0/func_8024C788.s b/asm/nonmatchings/code_135EE0/func_8024C788.s index 3342bd3c85..c387373420 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C788.s +++ b/asm/nonmatchings/code_135EE0/func_8024C788.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C788 /* 13FAC8 8024C788 3C018027 */ lui $at, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024C790.s b/asm/nonmatchings/code_135EE0/func_8024C790.s index 3b39ed8523..a63ea46c0d 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C790.s +++ b/asm/nonmatchings/code_135EE0/func_8024C790.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C790 /* 13FAD0 8024C790 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024C8B4.s b/asm/nonmatchings/code_135EE0/func_8024C8B4.s index 64a8afe476..785906a353 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C8B4.s +++ b/asm/nonmatchings/code_135EE0/func_8024C8B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C8B4 /* 13FBF4 8024C8B4 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024C918.s b/asm/nonmatchings/code_135EE0/func_8024C918.s index cd272a05a7..94ca2822df 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C918.s +++ b/asm/nonmatchings/code_135EE0/func_8024C918.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C918 /* 13FC58 8024C918 8C440000 */ lw $a0, ($v0) diff --git a/asm/nonmatchings/code_135EE0/func_8024C944.s b/asm/nonmatchings/code_135EE0/func_8024C944.s index c56510934d..b6f3236462 100644 --- a/asm/nonmatchings/code_135EE0/func_8024C944.s +++ b/asm/nonmatchings/code_135EE0/func_8024C944.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024C944 /* 13FC84 8024C944 0C0B78AB */ jal func_802DE2AC diff --git a/asm/nonmatchings/code_135EE0/func_8024D314.s b/asm/nonmatchings/code_135EE0/func_8024D314.s index 4aa747df39..76e675d096 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D314.s +++ b/asm/nonmatchings/code_135EE0/func_8024D314.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D314 /* 140654 8024D314 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_135EE0/func_8024D330.s b/asm/nonmatchings/code_135EE0/func_8024D330.s index f53b06d51c..3a1d33da4e 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D330.s +++ b/asm/nonmatchings/code_135EE0/func_8024D330.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D330 /* 140670 8024D330 26660001 */ addiu $a2, $s3, 1 diff --git a/asm/nonmatchings/code_135EE0/func_8024D570.s b/asm/nonmatchings/code_135EE0/func_8024D570.s index a7dfe1ff8d..098a56c4c3 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D570.s +++ b/asm/nonmatchings/code_135EE0/func_8024D570.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D570 .L8024D570: diff --git a/asm/nonmatchings/code_135EE0/func_8024D5AC.s b/asm/nonmatchings/code_135EE0/func_8024D5AC.s index b5b9e3a02f..91abde867a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D5AC.s +++ b/asm/nonmatchings/code_135EE0/func_8024D5AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D5AC /* 1408EC 8024D5AC A2020001 */ sb $v0, 1($s0) diff --git a/asm/nonmatchings/code_135EE0/func_8024D628.s b/asm/nonmatchings/code_135EE0/func_8024D628.s index c021628119..75bb405d34 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D628.s +++ b/asm/nonmatchings/code_135EE0/func_8024D628.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D628 .L8024D628: diff --git a/asm/nonmatchings/code_135EE0/func_8024D6F8.s b/asm/nonmatchings/code_135EE0/func_8024D6F8.s index 885bbefeb2..e6744435a4 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D6F8.s +++ b/asm/nonmatchings/code_135EE0/func_8024D6F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D6F8 .L8024D6F8: diff --git a/asm/nonmatchings/code_135EE0/func_8024D718.s b/asm/nonmatchings/code_135EE0/func_8024D718.s index 10df6d3e4e..78cd9458bf 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D718.s +++ b/asm/nonmatchings/code_135EE0/func_8024D718.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D718 /* 140A58 8024D718 82020002 */ lb $v0, 2($s0) diff --git a/asm/nonmatchings/code_135EE0/func_8024D7E8.s b/asm/nonmatchings/code_135EE0/func_8024D7E8.s index 2df7b17109..2541b0d404 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D7E8.s +++ b/asm/nonmatchings/code_135EE0/func_8024D7E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D7E8 /* 140B28 8024D7E8 3C018027 */ lui $at, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024D7F0.s b/asm/nonmatchings/code_135EE0/func_8024D7F0.s index cd1e8411f3..14b58bf8ba 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D7F0.s +++ b/asm/nonmatchings/code_135EE0/func_8024D7F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D7F0 /* 140B30 8024D7F0 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024D890.s b/asm/nonmatchings/code_135EE0/func_8024D890.s index cadfaa6f73..e56211f6c8 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D890.s +++ b/asm/nonmatchings/code_135EE0/func_8024D890.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D890 /* 140BD0 8024D890 3C063F80 */ lui $a2, 0x3f80 diff --git a/asm/nonmatchings/code_135EE0/func_8024D940.s b/asm/nonmatchings/code_135EE0/func_8024D940.s index 3b40d2e4ce..70da60be29 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D940.s +++ b/asm/nonmatchings/code_135EE0/func_8024D940.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D940 /* 140C80 8024D940 90830004 */ lbu $v1, 4($a0) diff --git a/asm/nonmatchings/code_135EE0/func_8024D964.s b/asm/nonmatchings/code_135EE0/func_8024D964.s index 6dc53f55a6..768c3f4d1f 100644 --- a/asm/nonmatchings/code_135EE0/func_8024D964.s +++ b/asm/nonmatchings/code_135EE0/func_8024D964.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024D964 /* 140CA4 8024D964 84820000 */ lh $v0, ($a0) diff --git a/asm/nonmatchings/code_135EE0/func_8024DA28.s b/asm/nonmatchings/code_135EE0/func_8024DA28.s index 8d128d6a70..a1f8bfef31 100644 --- a/asm/nonmatchings/code_135EE0/func_8024DA28.s +++ b/asm/nonmatchings/code_135EE0/func_8024DA28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024DA28 /* 140D68 8024DA28 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_135EE0/func_8024DA68.s b/asm/nonmatchings/code_135EE0/func_8024DA68.s index a112cfc5f9..d966f9e05e 100644 --- a/asm/nonmatchings/code_135EE0/func_8024DA68.s +++ b/asm/nonmatchings/code_135EE0/func_8024DA68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024DA68 /* 140DA8 8024DA68 080936B8 */ j func_8024DAE0 diff --git a/asm/nonmatchings/code_135EE0/func_8024DAE0.s b/asm/nonmatchings/code_135EE0/func_8024DAE0.s index f0dca8ff26..38eb8d1e53 100644 --- a/asm/nonmatchings/code_135EE0/func_8024DAE0.s +++ b/asm/nonmatchings/code_135EE0/func_8024DAE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024DAE0 /* 140E20 8024DAE0 00683021 */ addu $a2, $v1, $t0 diff --git a/asm/nonmatchings/code_135EE0/func_8024DAF4.s b/asm/nonmatchings/code_135EE0/func_8024DAF4.s index 3ef96d9698..96cf5df406 100644 --- a/asm/nonmatchings/code_135EE0/func_8024DAF4.s +++ b/asm/nonmatchings/code_135EE0/func_8024DAF4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024DAF4 /* 140E34 8024DAF4 AFA20018 */ sw $v0, 0x18($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024DB04.s b/asm/nonmatchings/code_135EE0/func_8024DB04.s index c94789bf35..05592b4a1a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024DB04.s +++ b/asm/nonmatchings/code_135EE0/func_8024DB04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024DB04 /* 140E44 8024DB04 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/asm/nonmatchings/code_135EE0/func_8024E72C.s b/asm/nonmatchings/code_135EE0/func_8024E72C.s index d0b8c8e83b..c664b73903 100644 --- a/asm/nonmatchings/code_135EE0/func_8024E72C.s +++ b/asm/nonmatchings/code_135EE0/func_8024E72C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E72C /* 141A6C 8024E72C 3C018027 */ lui $at, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024E734.s b/asm/nonmatchings/code_135EE0/func_8024E734.s index d9ca45e0ca..3d72b4899e 100644 --- a/asm/nonmatchings/code_135EE0/func_8024E734.s +++ b/asm/nonmatchings/code_135EE0/func_8024E734.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E734 /* 141A74 8024E734 468010A0 */ cvt.s.w $f2, $f2 diff --git a/asm/nonmatchings/code_135EE0/func_8024E738.s b/asm/nonmatchings/code_135EE0/func_8024E738.s index 59081b59a9..017e08c05a 100644 --- a/asm/nonmatchings/code_135EE0/func_8024E738.s +++ b/asm/nonmatchings/code_135EE0/func_8024E738.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E738 /* 141A78 8024E738 3C038027 */ lui $v1, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/func_8024E804.s b/asm/nonmatchings/code_135EE0/func_8024E804.s index ffb59b9bb3..244668f9c2 100644 --- a/asm/nonmatchings/code_135EE0/func_8024E804.s +++ b/asm/nonmatchings/code_135EE0/func_8024E804.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E804 /* 141B44 8024E804 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/func_8024EE80.s b/asm/nonmatchings/code_135EE0/func_8024EE80.s index 4449c498aa..e8b1a5942e 100644 --- a/asm/nonmatchings/code_135EE0/func_8024EE80.s +++ b/asm/nonmatchings/code_135EE0/func_8024EE80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EE80 /* 1421C0 8024EE80 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_135EE0/func_8024EE94.s b/asm/nonmatchings/code_135EE0/func_8024EE94.s index 2103ec8748..e121291d39 100644 --- a/asm/nonmatchings/code_135EE0/func_8024EE94.s +++ b/asm/nonmatchings/code_135EE0/func_8024EE94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EE94 /* 1421D4 8024EE94 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_1370_len_7d0/boot_main.s b/asm/nonmatchings/code_1370_len_7d0/boot_main.s index 55ade76fdd..2752b0389f 100644 --- a/asm/nonmatchings/code_1370_len_7d0/boot_main.s +++ b/asm/nonmatchings/code_1370_len_7d0/boot_main.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel boot_main /* 001370 80025F70 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s index 805f78c923..ecf10d8644 100644 --- a/asm/nonmatchings/code_1370_len_7d0/func_80026164.s +++ b/asm/nonmatchings/code_1370_len_7d0/func_80026164.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80026164 /* 001564 80026164 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s b/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s index 8ee948bc97..7eb98961d6 100644 --- a/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s +++ b/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel gfxPreNMI_Callback /* 001B0C 8002670C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s index f34441a24a..7d7c1395df 100644 --- a/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s +++ b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel gfxRetrace_Callback /* 00145C 8002605C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/COPY_set_defeated.s b/asm/nonmatchings/code_13870_len_6980/COPY_set_defeated.s index 19cdac9c3f..ba1907982c 100644 --- a/asm/nonmatchings/code_13870_len_6980/COPY_set_defeated.s +++ b/asm/nonmatchings/code_13870_len_6980/COPY_set_defeated.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel COPY_set_defeated /* 0196E0 8003E2E0 0080182D */ daddu $v1, $a0, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s b/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s index 80c6325f67..913f423dd5 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_enemy_ai /* 019D4C 8003E94C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s b/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s index 3ab5b98776..96f46ddf69 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_enemy_aux /* 019DB4 8003E9B4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s b/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s index cf381765ee..479812dffe 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_enemy_interact /* 019E1C 8003EA1C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s b/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s index d8ff6423c7..2aa0cd855c 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_npc_ai /* 019E84 8003EA84 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s b/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s index 05f336deed..bf4ad9b903 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_npc_aux /* 019F50 8003EB50 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s b/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s index 30b2681ae3..8dba03cf87 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_npc_interact /* 01A01C 8003EC1C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s b/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s index 9d8a1a199b..52ad9fa8c3 100644 --- a/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s +++ b/asm/nonmatchings/code_13870_len_6980/clear_encounter_status.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_encounter_status /* 019800 8003E400 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/disable_npc_blur.s b/asm/nonmatchings/code_13870_len_6980/disable_npc_blur.s index b9c7f0aabb..2ef426c694 100644 --- a/asm/nonmatchings/code_13870_len_6980/disable_npc_blur.s +++ b/asm/nonmatchings/code_13870_len_6980/disable_npc_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel disable_npc_blur /* 0161AC 8003ADAC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s b/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s index dee51a9732..7fddacb827 100644 --- a/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s +++ b/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel disable_npc_shadow /* 015FFC 8003ABFC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s b/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s index 1a8bcab981..17909910d4 100644 --- a/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s +++ b/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_npc_blur /* 016124 8003AD24 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s b/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s index 7a6d91ef8f..7718d75a4b 100644 --- a/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s +++ b/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_npc_shadow /* 015FA0 8003ABA0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/free_npc.s b/asm/nonmatchings/code_13870_len_6980/free_npc.s index 2959ab4b08..c1a4c255ff 100644 --- a/asm/nonmatchings/code_13870_len_6980/free_npc.s +++ b/asm/nonmatchings/code_13870_len_6980/free_npc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel free_npc /* 013DCC 800389CC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_80038470.s b/asm/nonmatchings/code_13870_len_6980/func_80038470.s index 0056d0fcc2..7ce3d43e01 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80038470.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80038470.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80038470 /* 013870 80038470 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_800384BC.s b/asm/nonmatchings/code_13870_len_6980/func_800384BC.s index 8d63092000..b1ab92b51a 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_800384BC.s +++ b/asm/nonmatchings/code_13870_len_6980/func_800384BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800384BC /* 0138BC 800384BC 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003857C.s b/asm/nonmatchings/code_13870_len_6980/func_8003857C.s index b63b482dba..4d7073869b 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003857C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003857C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003857C /* 01397C 8003857C 0000182D */ daddu $v1, $zero, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/func_80038598.s b/asm/nonmatchings/code_13870_len_6980/func_80038598.s index eb63d286a9..574e690011 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80038598.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80038598.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80038598 /* 013998 80038598 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_13870_len_6980/func_80038844.s b/asm/nonmatchings/code_13870_len_6980/func_80038844.s index 892f4765d5..cdc690217a 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80038844.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80038844.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80038844 /* 013C44 80038844 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_80038864.s b/asm/nonmatchings/code_13870_len_6980/func_80038864.s index eb2d2b55f4..be5afe6aed 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80038864.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80038864.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80038864 /* 013C64 80038864 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_80038880.s b/asm/nonmatchings/code_13870_len_6980/func_80038880.s index e75d8ae3bc..8b10541b64 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80038880.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80038880.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80038880 /* 013C80 80038880 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_800388A0.s b/asm/nonmatchings/code_13870_len_6980/func_800388A0.s index a9cd2bc740..9d57993ce4 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_800388A0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_800388A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800388A0 /* 013CA0 800388A0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_80038AFC.s b/asm/nonmatchings/code_13870_len_6980/func_80038AFC.s index ddc4f118a5..2c0919b216 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80038AFC.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80038AFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80038AFC /* 013EFC 80038AFC 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003900C.s b/asm/nonmatchings/code_13870_len_6980/func_8003900C.s index 1128f99f96..c1e727fc85 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003900C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003900C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003900C /* 01440C 8003900C 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_13870_len_6980/func_800392D8.s b/asm/nonmatchings/code_13870_len_6980/func_800392D8.s index d0cc1e25bd..2ec3080548 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_800392D8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_800392D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800392D8 /* 0146D8 800392D8 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_13870_len_6980/func_80039688.s b/asm/nonmatchings/code_13870_len_6980/func_80039688.s index c28c2607c0..f5b17b63d7 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80039688.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80039688.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80039688 /* 014A88 80039688 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_13870_len_6980/func_800397E8.s b/asm/nonmatchings/code_13870_len_6980/func_800397E8.s index 48a7d162ab..3c90b5945e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_800397E8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_800397E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800397E8 /* 014BE8 800397E8 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_13870_len_6980/func_80039930.s b/asm/nonmatchings/code_13870_len_6980/func_80039930.s index a3046dd94c..da4ab05e78 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80039930.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80039930.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80039930 /* 014D30 80039930 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s b/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s index bc5e0f0527..cb11b0dea1 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80039DA4 /* 0151A4 80039DA4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s b/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s index 44a2d5a611..a52c9a9969 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003AC5C /* 01605C 8003AC5C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B1A8.s b/asm/nonmatchings/code_13870_len_6980/func_8003B1A8.s index 8f0c4616fd..a54e94bfec 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B1A8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B1A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B1A8 /* 0165A8 8003B1A8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s b/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s index 0febf96b4d..11a0a85dbb 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B1B0 /* 0165B0 8003B1B0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s b/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s index c6a5d01c24..451c32ec70 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B3D0 /* 0167D0 8003B3D0 808200B4 */ lb $v0, 0xb4($a0) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B44C.s b/asm/nonmatchings/code_13870_len_6980/func_8003B44C.s index 7ef655b981..92a56736de 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B44C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B44C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B44C /* 01684C 8003B44C 8FA20010 */ lw $v0, 0x10($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B464.s b/asm/nonmatchings/code_13870_len_6980/func_8003B464.s index c80e027a83..7ffeccc55f 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B464.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B464.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B464 /* 016864 8003B464 8FA20010 */ lw $v0, 0x10($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s b/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s index 0462193653..719ebb53cf 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B47C /* 01687C 8003B47C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B500.s b/asm/nonmatchings/code_13870_len_6980/func_8003B500.s index f3b6baf9e1..a5b76fa4c4 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B500.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B500.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B500 /* 016900 8003B500 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s b/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s index 5df06d7ef4..d9e347b81c 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B5B4 /* 0169B4 8003B5B4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B96C.s b/asm/nonmatchings/code_13870_len_6980/func_8003B96C.s index d06d495286..e02611cebc 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B96C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B96C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003B96C /* 016D6C 8003B96C 3084FFFF */ andi $a0, $a0, 0xffff diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s b/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s index 406f035270..e70f89909c 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003BA60 /* 016E60 8003BA60 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s b/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s index f86ea2a423..0b7918670d 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003BED8 /* 0172D8 8003BED8 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C3D8.s b/asm/nonmatchings/code_13870_len_6980/func_8003C3D8.s index 1e7beddf39..ab163d054e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C3D8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C3D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C3D8 /* 0177D8 8003C3D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C428.s b/asm/nonmatchings/code_13870_len_6980/func_8003C428.s index d0a3dfd245..ee509e39ef 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C428.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C428.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C428 /* 017828 8003C428 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C444.s b/asm/nonmatchings/code_13870_len_6980/func_8003C444.s index 46a1b4c1d3..2511131d78 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C444.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C444.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C444 /* 017844 8003C444 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s b/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s index ea757884c2..a619ad14d9 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C53C /* 01793C 8003C53C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s b/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s index 1288acf1f1..c21a22f50e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C61C /* 017A1C 8003C61C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C658.s b/asm/nonmatchings/code_13870_len_6980/func_8003C658.s index 0688bc7e91..cf203befaa 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C658.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C658.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C658 /* 017A58 8003C658 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C660.s b/asm/nonmatchings/code_13870_len_6980/func_8003C660.s index 8e828e9859..0d743ad8c6 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C660.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C660.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C660 /* 017A60 8003C660 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C668.s b/asm/nonmatchings/code_13870_len_6980/func_8003C668.s index 20094fb26a..3610084283 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C668.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C668.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C668 /* 017A68 8003C668 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C78C.s b/asm/nonmatchings/code_13870_len_6980/func_8003C78C.s index 30e071ddff..0caa596e21 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C78C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C78C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C78C /* 017B8C 8003C78C 00052880 */ sll $a1, $a1, 2 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s b/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s index 6ebc29f16f..ea8d6c759e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C7A8 /* 017BA8 8003C7A8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C8AC.s b/asm/nonmatchings/code_13870_len_6980/func_8003C8AC.s index 2d9e93c10f..a83c5b4a2d 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C8AC.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C8AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C8AC /* 017CAC 8003C8AC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s b/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s index a9134f2c5a..fa7f8d03f9 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C8B4 /* 017CB4 8003C8B4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C984.s b/asm/nonmatchings/code_13870_len_6980/func_8003C984.s index 2ef3aff71f..f26334ed76 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C984.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C984.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C984 /* 017D84 8003C984 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s b/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s index 2c2409c18f..35ea468979 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003C9A8 /* 017DA8 8003C9A8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CB20.s b/asm/nonmatchings/code_13870_len_6980/func_8003CB20.s index b58daa526d..4bf39123ac 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CB20.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CB20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003CB20 /* 017F20 8003CB20 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s b/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s index f735a85678..6b43c6a0f7 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003CB44 /* 017F44 8003CB44 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CC8C.s b/asm/nonmatchings/code_13870_len_6980/func_8003CC8C.s index e9ad10f5c2..a6a00c736d 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CC8C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CC8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003CC8C /* 01808C 8003CC8C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s b/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s index ecc9212aae..961b247c84 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003CCB0 /* 0180B0 8003CCB0 27BDFF60 */ addiu $sp, $sp, -0xa0 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CFA0.s b/asm/nonmatchings/code_13870_len_6980/func_8003CFA0.s index 8192f540ce..ea50680f4e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CFA0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CFA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003CFA0 /* 0183A0 8003CFA0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CFA8.s b/asm/nonmatchings/code_13870_len_6980/func_8003CFA8.s index e176a42215..7ae4430a82 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CFA8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CFA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003CFA8 /* 0183A8 8003CFA8 00852021 */ addu $a0, $a0, $a1 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s b/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s index 4a0a97bb70..98110de08c 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003D1D4 /* 0185D4 8003D1D4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s b/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s index 8f49e49152..ee0879669e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003D2F8 /* 0186F8 8003D2F8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s b/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s index 9acdab3640..6a06a88e98 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003D3BC /* 0187BC 8003D3BC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D624.s b/asm/nonmatchings/code_13870_len_6980/func_8003D624.s index 2fb1dcfe01..6942d6bd92 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D624.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D624.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003D624 /* 018A24 8003D624 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D660.s b/asm/nonmatchings/code_13870_len_6980/func_8003D660.s index 4a8739c65e..d57942e56f 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D660.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D660.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003D660 /* 018A60 8003D660 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D788.s b/asm/nonmatchings/code_13870_len_6980/func_8003D788.s index cca8d2f256..2efda5542c 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D788.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D788.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003D788 /* 018B88 8003D788 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s b/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s index 9630a52a71..862e941b8d 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003DA38 /* 018E38 8003DA38 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s index b189cbd456..2f3780963e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003DC38 /* 019038 8003DC38 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s b/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s index 1793b69604..81be89a899 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003DFA0 /* 0193A0 8003DFA0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s b/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s index 6b0c7536a1..a56a88eca8 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003E0D4 /* 0194D4 8003E0D4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s b/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s index 1c6bb638a4..17f3f2fc57 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003E1D0 /* 0195D0 8003E1D0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E338.s b/asm/nonmatchings/code_13870_len_6980/func_8003E338.s index 196f324548..1d77dd16a4 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E338.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E338.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003E338 /* 019738 8003E338 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s index 0fe9ec3c8b..c97c3778fc 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003E514 /* 019914 8003E514 3C01800B */ lui $at, 0x800b diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s b/asm/nonmatchings/code_13870_len_6980/func_8003E524.s index e82428671b..8db7a9664a 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E524.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003E524 /* 019924 8003E524 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s b/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s index 730beb2825..332700a75e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003E5B0 /* 0199B0 8003E5B0 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s b/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s index ab1f6550bd..74c61980e6 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003E63C /* 019A3C 8003E63C 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_13870_len_6980/get_enemy.s b/asm/nonmatchings/code_13870_len_6980/get_enemy.s index 0656fb6b0e..d4042a608a 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_enemy.s +++ b/asm/nonmatchings/code_13870_len_6980/get_enemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_enemy /* 01A0E8 8003ECE8 3C03800B */ lui $v1, 0x800b diff --git a/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s b/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s index dae92c74c6..7e3a9f4613 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s +++ b/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_enemy_safe /* 01A168 8003ED68 3C03800B */ lui $v1, 0x800b diff --git a/asm/nonmatchings/code_13870_len_6980/get_npc_by_index.s b/asm/nonmatchings/code_13870_len_6980/get_npc_by_index.s index 57d6a6033b..12a1a7adab 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_npc_by_index.s +++ b/asm/nonmatchings/code_13870_len_6980/get_npc_by_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_npc_by_index /* 013EDC 80038ADC 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s b/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s index 4cae4c9294..46364a9e9f 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s +++ b/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_npc_safe /* 015F48 8003AB48 0000182D */ daddu $v1, $zero, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s b/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s index 02e1b467cc..171f3eac43 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s +++ b/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_npc_unsafe /* 015EEC 8003AAEC 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/init_npc_list.s b/asm/nonmatchings/code_13870_len_6980/init_npc_list.s index d34a54f3e4..afd31d16d8 100644 --- a/asm/nonmatchings/code_13870_len_6980/init_npc_list.s +++ b/asm/nonmatchings/code_13870_len_6980/init_npc_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_npc_list /* 01392C 8003852C 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s index 7df6fca775..9f8baf6afd 100644 --- a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s +++ b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel kill_encounter /* 019B30 8003E730 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s index 22cbddcd6e..d87b5b6566 100644 --- a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s +++ b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel kill_enemy /* 019BAC 8003E7AC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/make_npcs.s b/asm/nonmatchings/code_13870_len_6980/make_npcs.s index d851560ad5..3b9a802cd8 100644 --- a/asm/nonmatchings/code_13870_len_6980/make_npcs.s +++ b/asm/nonmatchings/code_13870_len_6980/make_npcs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel make_npcs /* 019A78 8003E678 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_13870_len_6980/mtx_ident_mirror_y.s b/asm/nonmatchings/code_13870_len_6980/mtx_ident_mirror_y.s index 9ea3d60f99..285d13f92f 100644 --- a/asm/nonmatchings/code_13870_len_6980/mtx_ident_mirror_y.s +++ b/asm/nonmatchings/code_13870_len_6980/mtx_ident_mirror_y.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel mtx_ident_mirror_y /* 013878 80038478 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/npc_move_heading.s b/asm/nonmatchings/code_13870_len_6980/npc_move_heading.s index daaa16bb19..5f8322a447 100644 --- a/asm/nonmatchings/code_13870_len_6980/npc_move_heading.s +++ b/asm/nonmatchings/code_13870_len_6980/npc_move_heading.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel npc_move_heading /* 015E54 8003AA54 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_13870_len_6980/render_npc_blur.s b/asm/nonmatchings/code_13870_len_6980/render_npc_blur.s index 4a2dcd29a0..174904eb09 100644 --- a/asm/nonmatchings/code_13870_len_6980/render_npc_blur.s +++ b/asm/nonmatchings/code_13870_len_6980/render_npc_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_npc_blur /* 016238 8003AE38 27BDFF08 */ addiu $sp, $sp, -0xf8 diff --git a/asm/nonmatchings/code_13870_len_6980/render_npcs.s b/asm/nonmatchings/code_13870_len_6980/render_npcs.s index 1bd768e0ba..4280bc4fc1 100644 --- a/asm/nonmatchings/code_13870_len_6980/render_npcs.s +++ b/asm/nonmatchings/code_13870_len_6980/render_npcs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_npcs /* 015BF0 8003A7F0 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_13870_len_6980/set_npc_yaw.s b/asm/nonmatchings/code_13870_len_6980/set_npc_yaw.s index 76e27f59b6..91f4ae7104 100644 --- a/asm/nonmatchings/code_13870_len_6980/set_npc_yaw.s +++ b/asm/nonmatchings/code_13870_len_6980/set_npc_yaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_npc_yaw /* 016740 8003B340 44857000 */ mtc1 $a1, $f14 diff --git a/asm/nonmatchings/code_13870_len_6980/update_npc_blur.s b/asm/nonmatchings/code_13870_len_6980/update_npc_blur.s index 623e1a44f9..d4d0b8a754 100644 --- a/asm/nonmatchings/code_13870_len_6980/update_npc_blur.s +++ b/asm/nonmatchings/code_13870_len_6980/update_npc_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_npc_blur /* 0161F8 8003ADF8 8C850020 */ lw $a1, 0x20($a0) diff --git a/asm/nonmatchings/code_163400/func_80242BA0.s b/asm/nonmatchings/code_163400/func_80242BA0.s index bd42a98018..e1e97630d8 100644 --- a/asm/nonmatchings/code_163400/func_80242BA0.s +++ b/asm/nonmatchings/code_163400/func_80242BA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242BA0 /* 163400 80242BA0 2882F581 */ slti $v0, $a0, -0xa7f diff --git a/asm/nonmatchings/code_163400/func_80242D94.s b/asm/nonmatchings/code_163400/func_80242D94.s index 6fdc7dc3d8..fc4002e935 100644 --- a/asm/nonmatchings/code_163400/func_80242D94.s +++ b/asm/nonmatchings/code_163400/func_80242D94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242D94 /* 1635F4 80242D94 80820004 */ lb $v0, 4($a0) diff --git a/asm/nonmatchings/code_163400/func_80242DEC.s b/asm/nonmatchings/code_163400/func_80242DEC.s index 455d28bfb5..b0cd2b9a66 100644 --- a/asm/nonmatchings/code_163400/func_80242DEC.s +++ b/asm/nonmatchings/code_163400/func_80242DEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242DEC /* 16364C 80242DEC 3C018025 */ lui $at, 0x8025 diff --git a/asm/nonmatchings/code_163400/func_80242E00.s b/asm/nonmatchings/code_163400/func_80242E00.s index d8fcd7acb6..cc4d8fceb7 100644 --- a/asm/nonmatchings/code_163400/func_80242E00.s +++ b/asm/nonmatchings/code_163400/func_80242E00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242E00 /* 163660 80242E00 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_163400/func_80242F68.s b/asm/nonmatchings/code_163400/func_80242F68.s index 868637b6f0..6390b6ecab 100644 --- a/asm/nonmatchings/code_163400/func_80242F68.s +++ b/asm/nonmatchings/code_163400/func_80242F68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242F68 /* 1637C8 80242F68 3C0A8025 */ lui $t2, 0x8025 diff --git a/asm/nonmatchings/code_163400/func_802431A0.s b/asm/nonmatchings/code_163400/func_802431A0.s index 10b9b89c1a..f3a3544557 100644 --- a/asm/nonmatchings/code_163400/func_802431A0.s +++ b/asm/nonmatchings/code_163400/func_802431A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802431A0 /* 163A00 802431A0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_163400/func_802448E0.s b/asm/nonmatchings/code_163400/func_802448E0.s index 9aec436ea5..53effd7a03 100644 --- a/asm/nonmatchings/code_163400/func_802448E0.s +++ b/asm/nonmatchings/code_163400/func_802448E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802448E0 /* 165140 802448E0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_163400/func_80244B00.s b/asm/nonmatchings/code_163400/func_80244B00.s index 932533e4aa..f912920ebc 100644 --- a/asm/nonmatchings/code_163400/func_80244B00.s +++ b/asm/nonmatchings/code_163400/func_80244B00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244B00 /* 165360 80244B00 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_163400/func_80244BC4.s b/asm/nonmatchings/code_163400/func_80244BC4.s index f8e7ed071e..7ef83b2045 100644 --- a/asm/nonmatchings/code_163400/func_80244BC4.s +++ b/asm/nonmatchings/code_163400/func_80244BC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244BC4 /* 165424 80244BC4 3C048025 */ lui $a0, 0x8025 diff --git a/asm/nonmatchings/code_163400/func_80244FD4.s b/asm/nonmatchings/code_163400/func_80244FD4.s index df4f51f3ef..beb1aab4cb 100644 --- a/asm/nonmatchings/code_163400/func_80244FD4.s +++ b/asm/nonmatchings/code_163400/func_80244FD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244FD4 /* 165834 80244FD4 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_163400/func_8024544C.s b/asm/nonmatchings/code_163400/func_8024544C.s index a9df66d0ee..4de983a6b3 100644 --- a/asm/nonmatchings/code_163400/func_8024544C.s +++ b/asm/nonmatchings/code_163400/func_8024544C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024544C /* 165CAC 8024544C 3C028025 */ lui $v0, 0x8025 diff --git a/asm/nonmatchings/code_167570/func_80246D10.s b/asm/nonmatchings/code_167570/func_80246D10.s index ef18692ba7..22d5a92edc 100644 --- a/asm/nonmatchings/code_167570/func_80246D10.s +++ b/asm/nonmatchings/code_167570/func_80246D10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246D10 /* 167570 80246D10 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_168590/func_80247D30.s b/asm/nonmatchings/code_168590/func_80247D30.s index 83a52f18af..824756621a 100644 --- a/asm/nonmatchings/code_168590/func_80247D30.s +++ b/asm/nonmatchings/code_168590/func_80247D30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247D30 /* 168590 80247D30 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_169BE0/func_80249380.s b/asm/nonmatchings/code_169BE0/func_80249380.s index 8a43477b44..286e9fe5d3 100644 --- a/asm/nonmatchings/code_169BE0/func_80249380.s +++ b/asm/nonmatchings/code_169BE0/func_80249380.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249380 /* 169BE0 80249380 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_169BE0/func_8024997C.s b/asm/nonmatchings/code_169BE0/func_8024997C.s index f676abb95b..ce41a65446 100644 --- a/asm/nonmatchings/code_169BE0/func_8024997C.s +++ b/asm/nonmatchings/code_169BE0/func_8024997C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024997C /* 16A1DC 8024997C 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_169BE0/func_80249AA4.s b/asm/nonmatchings/code_169BE0/func_80249AA4.s index c92505cbc9..15f03ceaa8 100644 --- a/asm/nonmatchings/code_169BE0/func_80249AA4.s +++ b/asm/nonmatchings/code_169BE0/func_80249AA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249AA4 /* 16A304 80249AA4 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_169BE0/func_80249AB8.s b/asm/nonmatchings/code_169BE0/func_80249AB8.s index ced7dafe70..a2e9706e88 100644 --- a/asm/nonmatchings/code_169BE0/func_80249AB8.s +++ b/asm/nonmatchings/code_169BE0/func_80249AB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80249AB8 /* 16A318 80249AB8 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/ActorAddMovePos.s b/asm/nonmatchings/code_16c8e0/ActorAddMovePos.s index 362c47ba07..874851a8e3 100644 --- a/asm/nonmatchings/code_16c8e0/ActorAddMovePos.s +++ b/asm/nonmatchings/code_16c8e0/ActorAddMovePos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ActorAddMovePos /* 1AF160 80280880 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/ActorExists.s b/asm/nonmatchings/code_16c8e0/ActorExists.s index 99e3336214..f98d95dd58 100644 --- a/asm/nonmatchings/code_16c8e0/ActorExists.s +++ b/asm/nonmatchings/code_16c8e0/ActorExists.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ActorExists /* 19C73C 8026DE5C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/ActorSpeak.s b/asm/nonmatchings/code_16c8e0/ActorSpeak.s index f20345a30a..80f8e3b657 100644 --- a/asm/nonmatchings/code_16c8e0/ActorSpeak.s +++ b/asm/nonmatchings/code_16c8e0/ActorSpeak.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ActorSpeak /* 181810 80252F30 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/AddActorDecoration.s b/asm/nonmatchings/code_16c8e0/AddActorDecoration.s index b32afc4aad..41a275e94a 100644 --- a/asm/nonmatchings/code_16c8e0/AddActorDecoration.s +++ b/asm/nonmatchings/code_16c8e0/AddActorDecoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddActorDecoration /* 19D768 8026EE88 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/AddActorPos.s b/asm/nonmatchings/code_16c8e0/AddActorPos.s index 72dbdb7639..daa16a3f29 100644 --- a/asm/nonmatchings/code_16c8e0/AddActorPos.s +++ b/asm/nonmatchings/code_16c8e0/AddActorPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddActorPos /* 19A20C 8026B92C 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/AddActorVar.s b/asm/nonmatchings/code_16c8e0/AddActorVar.s index c34159d7c3..48de661f65 100644 --- a/asm/nonmatchings/code_16c8e0/AddActorVar.s +++ b/asm/nonmatchings/code_16c8e0/AddActorVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddActorVar /* 19A9B4 8026C0D4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/AddBattleCamOffsetZ.s b/asm/nonmatchings/code_16c8e0/AddBattleCamOffsetZ.s index 290312eb49..fe000cd87e 100644 --- a/asm/nonmatchings/code_16c8e0/AddBattleCamOffsetZ.s +++ b/asm/nonmatchings/code_16c8e0/AddBattleCamOffsetZ.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddBattleCamOffsetZ /* 17D378 8024EA98 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/AddBattleCamZoom.s b/asm/nonmatchings/code_16c8e0/AddBattleCamZoom.s index 78e32af813..4e3272fd58 100644 --- a/asm/nonmatchings/code_16c8e0/AddBattleCamZoom.s +++ b/asm/nonmatchings/code_16c8e0/AddBattleCamZoom.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddBattleCamZoom /* 17D58C 8024ECAC 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/AddGoalPos.s b/asm/nonmatchings/code_16c8e0/AddGoalPos.s index cb10683a53..96e3eeecce 100644 --- a/asm/nonmatchings/code_16c8e0/AddGoalPos.s +++ b/asm/nonmatchings/code_16c8e0/AddGoalPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddGoalPos /* 199028 8026A748 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/AddPartDispOffset.s b/asm/nonmatchings/code_16c8e0/AddPartDispOffset.s index 9bf019d8a5..0ee4d05989 100644 --- a/asm/nonmatchings/code_16c8e0/AddPartDispOffset.s +++ b/asm/nonmatchings/code_16c8e0/AddPartDispOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddPartDispOffset /* 19A668 8026BD88 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/AddPartMovementVar.s b/asm/nonmatchings/code_16c8e0/AddPartMovementVar.s index 9a61ce3b99..74858f5453 100644 --- a/asm/nonmatchings/code_16c8e0/AddPartMovementVar.s +++ b/asm/nonmatchings/code_16c8e0/AddPartMovementVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddPartMovementVar /* 19ABC8 8026C2E8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/AfflictActor.s b/asm/nonmatchings/code_16c8e0/AfflictActor.s index f12d0b069b..67976a4c82 100644 --- a/asm/nonmatchings/code_16c8e0/AfflictActor.s +++ b/asm/nonmatchings/code_16c8e0/AfflictActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AfflictActor /* 1ABF5C 8027D67C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/ApplyShrinkFromOwner.s b/asm/nonmatchings/code_16c8e0/ApplyShrinkFromOwner.s index 9fdc65d72c..bf57b048da 100644 --- a/asm/nonmatchings/code_16c8e0/ApplyShrinkFromOwner.s +++ b/asm/nonmatchings/code_16c8e0/ApplyShrinkFromOwner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ApplyShrinkFromOwner /* 182A78 80254198 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/BattleCamTargetActor.s b/asm/nonmatchings/code_16c8e0/BattleCamTargetActor.s index 39a1b0d990..d2f711f12a 100644 --- a/asm/nonmatchings/code_16c8e0/BattleCamTargetActor.s +++ b/asm/nonmatchings/code_16c8e0/BattleCamTargetActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BattleCamTargetActor /* 17D404 8024EB24 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/BindHandleEvent.s b/asm/nonmatchings/code_16c8e0/BindHandleEvent.s index bb3e7b0a56..b91cb11bcf 100644 --- a/asm/nonmatchings/code_16c8e0/BindHandleEvent.s +++ b/asm/nonmatchings/code_16c8e0/BindHandleEvent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindHandleEvent /* 1A7500 80278C20 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/BindIdle.s b/asm/nonmatchings/code_16c8e0/BindIdle.s index a72bf75eb4..c15ea2d3e5 100644 --- a/asm/nonmatchings/code_16c8e0/BindIdle.s +++ b/asm/nonmatchings/code_16c8e0/BindIdle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindIdle /* 1A7374 80278A94 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/BindNextTurn.s b/asm/nonmatchings/code_16c8e0/BindNextTurn.s index 074433c511..6fbd665104 100644 --- a/asm/nonmatchings/code_16c8e0/BindNextTurn.s +++ b/asm/nonmatchings/code_16c8e0/BindNextTurn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindNextTurn /* 1A7574 80278C94 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/BindTakeTurn.s b/asm/nonmatchings/code_16c8e0/BindTakeTurn.s index bb7f291fa6..0f1e386d88 100644 --- a/asm/nonmatchings/code_16c8e0/BindTakeTurn.s +++ b/asm/nonmatchings/code_16c8e0/BindTakeTurn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindTakeTurn /* 1A7210 80278930 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/BoostAttack.s b/asm/nonmatchings/code_16c8e0/BoostAttack.s index 20e8c23c0f..8b325675a5 100644 --- a/asm/nonmatchings/code_16c8e0/BoostAttack.s +++ b/asm/nonmatchings/code_16c8e0/BoostAttack.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BoostAttack /* 19E5B4 8026FCD4 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/BoostDefense.s b/asm/nonmatchings/code_16c8e0/BoostDefense.s index 17ecbcc7da..a9cb3ac070 100644 --- a/asm/nonmatchings/code_16c8e0/BoostDefense.s +++ b/asm/nonmatchings/code_16c8e0/BoostDefense.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BoostDefense /* 19EA54 80270174 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/CancelablePlayerRunToGoal.s b/asm/nonmatchings/code_16c8e0/CancelablePlayerRunToGoal.s index 0e452845ce..d0658acf1b 100644 --- a/asm/nonmatchings/code_16c8e0/CancelablePlayerRunToGoal.s +++ b/asm/nonmatchings/code_16c8e0/CancelablePlayerRunToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CancelablePlayerRunToGoal /* 1A27DC 80273EFC 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/CheckButtonDown.s b/asm/nonmatchings/code_16c8e0/CheckButtonDown.s index 963324a044..ad1dd51aa6 100644 --- a/asm/nonmatchings/code_16c8e0/CheckButtonDown.s +++ b/asm/nonmatchings/code_16c8e0/CheckButtonDown.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CheckButtonDown /* 19C9E8 8026E108 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/CheckButtonHeld.s b/asm/nonmatchings/code_16c8e0/CheckButtonHeld.s index 015e2d0d68..29dfde3ec5 100644 --- a/asm/nonmatchings/code_16c8e0/CheckButtonHeld.s +++ b/asm/nonmatchings/code_16c8e0/CheckButtonHeld.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CheckButtonHeld /* 19C9B0 8026E0D0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/CheckButtonPress.s b/asm/nonmatchings/code_16c8e0/CheckButtonPress.s index 0b6787094f..46b2e82d91 100644 --- a/asm/nonmatchings/code_16c8e0/CheckButtonPress.s +++ b/asm/nonmatchings/code_16c8e0/CheckButtonPress.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CheckButtonPress /* 19C978 8026E098 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/ChooseNextTarget.s b/asm/nonmatchings/code_16c8e0/ChooseNextTarget.s index 1a27d550e0..6196bb11af 100644 --- a/asm/nonmatchings/code_16c8e0/ChooseNextTarget.s +++ b/asm/nonmatchings/code_16c8e0/ChooseNextTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ChooseNextTarget /* 19CCF4 8026E414 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/ClearStatusEffects.s b/asm/nonmatchings/code_16c8e0/ClearStatusEffects.s index 9dc5f536df..9412604161 100644 --- a/asm/nonmatchings/code_16c8e0/ClearStatusEffects.s +++ b/asm/nonmatchings/code_16c8e0/ClearStatusEffects.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ClearStatusEffects /* 1AC680 8027DDA0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/CloseActionCommandInfo.s b/asm/nonmatchings/code_16c8e0/CloseActionCommandInfo.s index 20e323c6d3..0a8b4f6747 100644 --- a/asm/nonmatchings/code_16c8e0/CloseActionCommandInfo.s +++ b/asm/nonmatchings/code_16c8e0/CloseActionCommandInfo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CloseActionCommandInfo /* 197CF0 80269410 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/CopyBuffs.s b/asm/nonmatchings/code_16c8e0/CopyBuffs.s index e1e12f19fd..d525457590 100644 --- a/asm/nonmatchings/code_16c8e0/CopyBuffs.s +++ b/asm/nonmatchings/code_16c8e0/CopyBuffs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CopyBuffs /* 19FA40 80271160 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/CopyStatusEffects.s b/asm/nonmatchings/code_16c8e0/CopyStatusEffects.s index 7eca3c91e7..df09066f2b 100644 --- a/asm/nonmatchings/code_16c8e0/CopyStatusEffects.s +++ b/asm/nonmatchings/code_16c8e0/CopyStatusEffects.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CopyStatusEffects /* 1AC59C 8027DCBC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/CountPlayerTargets.s b/asm/nonmatchings/code_16c8e0/CountPlayerTargets.s index f53ea10796..0b0f1f85af 100644 --- a/asm/nonmatchings/code_16c8e0/CountPlayerTargets.s +++ b/asm/nonmatchings/code_16c8e0/CountPlayerTargets.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CountPlayerTargets /* 198A2C 8026A14C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/CreatePartShadow.s b/asm/nonmatchings/code_16c8e0/CreatePartShadow.s index 9777d00e56..6e26e9e0e6 100644 --- a/asm/nonmatchings/code_16c8e0/CreatePartShadow.s +++ b/asm/nonmatchings/code_16c8e0/CreatePartShadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CreatePartShadow /* 19DE0C 8026F52C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/DeletePartner.s b/asm/nonmatchings/code_16c8e0/DeletePartner.s index 7ca91813f8..e65cc2d3db 100644 --- a/asm/nonmatchings/code_16c8e0/DeletePartner.s +++ b/asm/nonmatchings/code_16c8e0/DeletePartner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DeletePartner /* 1AF088 802807A8 3C04800E */ lui $a0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/DidActionSucceed.s b/asm/nonmatchings/code_16c8e0/DidActionSucceed.s index 03f12578f1..f9b9d46558 100644 --- a/asm/nonmatchings/code_16c8e0/DidActionSucceed.s +++ b/asm/nonmatchings/code_16c8e0/DidActionSucceed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DidActionSucceed /* 1A5794 80276EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/DisablePartnerBlur.s b/asm/nonmatchings/code_16c8e0/DisablePartnerBlur.s index 3aef79163c..522426b383 100644 --- a/asm/nonmatchings/code_16c8e0/DisablePartnerBlur.s +++ b/asm/nonmatchings/code_16c8e0/DisablePartnerBlur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DisablePartnerBlur /* 173FB8 802456D8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/DispatchDamageEvent.s b/asm/nonmatchings/code_16c8e0/DispatchDamageEvent.s index 0e88e678df..bb19abd672 100644 --- a/asm/nonmatchings/code_16c8e0/DispatchDamageEvent.s +++ b/asm/nonmatchings/code_16c8e0/DispatchDamageEvent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DispatchDamageEvent /* 1ABA9C 8027D1BC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/DispatchDamagePlayerEvent.s b/asm/nonmatchings/code_16c8e0/DispatchDamagePlayerEvent.s index 71e319e6a4..3b000cd5b5 100644 --- a/asm/nonmatchings/code_16c8e0/DispatchDamagePlayerEvent.s +++ b/asm/nonmatchings/code_16c8e0/DispatchDamagePlayerEvent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DispatchDamagePlayerEvent /* 1A31FC 8027491C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/DispatchEvent.s b/asm/nonmatchings/code_16c8e0/DispatchEvent.s index 867f711765..a2c9f6f71a 100644 --- a/asm/nonmatchings/code_16c8e0/DispatchEvent.s +++ b/asm/nonmatchings/code_16c8e0/DispatchEvent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DispatchEvent /* 1ABB44 8027D264 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/DropStarPoints.s b/asm/nonmatchings/code_16c8e0/DropStarPoints.s index 04b58807da..d3adb1c1cc 100644 --- a/asm/nonmatchings/code_16c8e0/DropStarPoints.s +++ b/asm/nonmatchings/code_16c8e0/DropStarPoints.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DropStarPoints /* 1AB184 8027C8A4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/ElectrifyActor.s b/asm/nonmatchings/code_16c8e0/ElectrifyActor.s index 1e4a2d4460..3ab4f40ad4 100644 --- a/asm/nonmatchings/code_16c8e0/ElectrifyActor.s +++ b/asm/nonmatchings/code_16c8e0/ElectrifyActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ElectrifyActor /* 19F23C 8027095C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/EnableActorBlur.s b/asm/nonmatchings/code_16c8e0/EnableActorBlur.s index 447f33d8a7..fd6a2332ff 100644 --- a/asm/nonmatchings/code_16c8e0/EnableActorBlur.s +++ b/asm/nonmatchings/code_16c8e0/EnableActorBlur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableActorBlur /* 1ABE5C 8027D57C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/EnableActorGlow.s b/asm/nonmatchings/code_16c8e0/EnableActorGlow.s index 578f818568..7f157a402b 100644 --- a/asm/nonmatchings/code_16c8e0/EnableActorGlow.s +++ b/asm/nonmatchings/code_16c8e0/EnableActorGlow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableActorGlow /* 1AC484 8027DBA4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/EnableIdleScript.s b/asm/nonmatchings/code_16c8e0/EnableIdleScript.s index 1b2f013a17..b7ef77ca60 100644 --- a/asm/nonmatchings/code_16c8e0/EnableIdleScript.s +++ b/asm/nonmatchings/code_16c8e0/EnableIdleScript.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableIdleScript /* 1A742C 80278B4C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/EnablePartnerBlur.s b/asm/nonmatchings/code_16c8e0/EnablePartnerBlur.s index 97e859f528..a536fea199 100644 --- a/asm/nonmatchings/code_16c8e0/EnablePartnerBlur.s +++ b/asm/nonmatchings/code_16c8e0/EnablePartnerBlur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnablePartnerBlur /* 173F98 802456B8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/EnablePlayerBlur.s b/asm/nonmatchings/code_16c8e0/EnablePlayerBlur.s index 59dd36ea8c..abeef00fb6 100644 --- a/asm/nonmatchings/code_16c8e0/EnablePlayerBlur.s +++ b/asm/nonmatchings/code_16c8e0/EnablePlayerBlur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnablePlayerBlur /* 1A3258 80274978 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/EndActorSpeech.s b/asm/nonmatchings/code_16c8e0/EndActorSpeech.s index 7eb2389880..775f079f2a 100644 --- a/asm/nonmatchings/code_16c8e0/EndActorSpeech.s +++ b/asm/nonmatchings/code_16c8e0/EndActorSpeech.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EndActorSpeech /* 181BB0 802532D0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/EnemyCreateTargetList.s b/asm/nonmatchings/code_16c8e0/EnemyCreateTargetList.s index a182ada771..a5055b5234 100644 --- a/asm/nonmatchings/code_16c8e0/EnemyCreateTargetList.s +++ b/asm/nonmatchings/code_16c8e0/EnemyCreateTargetList.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnemyCreateTargetList /* 19CBF0 8026E310 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/EnemyDamageTarget.s b/asm/nonmatchings/code_16c8e0/EnemyDamageTarget.s index ce6b61de0d..c41c081e53 100644 --- a/asm/nonmatchings/code_16c8e0/EnemyDamageTarget.s +++ b/asm/nonmatchings/code_16c8e0/EnemyDamageTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnemyDamageTarget /* 1AB594 8027CCB4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/EnemyFollowupAfflictTarget.s b/asm/nonmatchings/code_16c8e0/EnemyFollowupAfflictTarget.s index 4adc1f1dd1..d022a8f830 100644 --- a/asm/nonmatchings/code_16c8e0/EnemyFollowupAfflictTarget.s +++ b/asm/nonmatchings/code_16c8e0/EnemyFollowupAfflictTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnemyFollowupAfflictTarget /* 1AB7B4 8027CED4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/EnemyTestTarget.s b/asm/nonmatchings/code_16c8e0/EnemyTestTarget.s index e23ab36f2e..999e5bcd36 100644 --- a/asm/nonmatchings/code_16c8e0/EnemyTestTarget.s +++ b/asm/nonmatchings/code_16c8e0/EnemyTestTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnemyTestTarget /* 1AB898 8027CFB8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/FXRecoverFP.s b/asm/nonmatchings/code_16c8e0/FXRecoverFP.s index 948935419f..489b019ac6 100644 --- a/asm/nonmatchings/code_16c8e0/FXRecoverFP.s +++ b/asm/nonmatchings/code_16c8e0/FXRecoverFP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FXRecoverFP /* 190548 80261C68 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/FXRecoverHP.s b/asm/nonmatchings/code_16c8e0/FXRecoverHP.s index 437bd71807..37bca324bc 100644 --- a/asm/nonmatchings/code_16c8e0/FXRecoverHP.s +++ b/asm/nonmatchings/code_16c8e0/FXRecoverHP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FXRecoverHP /* 190488 80261BA8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/FallPartTo.s b/asm/nonmatchings/code_16c8e0/FallPartTo.s index 735d39f589..05db28c99a 100644 --- a/asm/nonmatchings/code_16c8e0/FallPartTo.s +++ b/asm/nonmatchings/code_16c8e0/FallPartTo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FallPartTo /* 1A9134 8027A854 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_16c8e0/FallToGoal.s b/asm/nonmatchings/code_16c8e0/FallToGoal.s index 9302c3087f..502ac4eb9e 100644 --- a/asm/nonmatchings/code_16c8e0/FallToGoal.s +++ b/asm/nonmatchings/code_16c8e0/FallToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FallToGoal /* 1A84CC 80279BEC 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/FlyPartTo.s b/asm/nonmatchings/code_16c8e0/FlyPartTo.s index 81e484d786..e1e477a4f6 100644 --- a/asm/nonmatchings/code_16c8e0/FlyPartTo.s +++ b/asm/nonmatchings/code_16c8e0/FlyPartTo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FlyPartTo /* 1AA818 8027BF38 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/FlyToGoal.s b/asm/nonmatchings/code_16c8e0/FlyToGoal.s index 4519386ee6..722969f047 100644 --- a/asm/nonmatchings/code_16c8e0/FlyToGoal.s +++ b/asm/nonmatchings/code_16c8e0/FlyToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FlyToGoal /* 1A9F04 8027B624 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/ForceCloseMessageBox.s b/asm/nonmatchings/code_16c8e0/ForceCloseMessageBox.s index a5442dcfde..98c89cf95d 100644 --- a/asm/nonmatchings/code_16c8e0/ForceCloseMessageBox.s +++ b/asm/nonmatchings/code_16c8e0/ForceCloseMessageBox.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ForceCloseMessageBox /* 17FCD0 802513F0 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/ForceHomePos.s b/asm/nonmatchings/code_16c8e0/ForceHomePos.s index 4550ae4f01..cd4f165086 100644 --- a/asm/nonmatchings/code_16c8e0/ForceHomePos.s +++ b/asm/nonmatchings/code_16c8e0/ForceHomePos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ForceHomePos /* 198ACC 8026A1EC 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/FreezeBattleCam.s b/asm/nonmatchings/code_16c8e0/FreezeBattleCam.s index d73a5a601f..30d15b6720 100644 --- a/asm/nonmatchings/code_16c8e0/FreezeBattleCam.s +++ b/asm/nonmatchings/code_16c8e0/FreezeBattleCam.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FreezeBattleCam /* 17D658 8024ED78 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetActionSuccess.s b/asm/nonmatchings/code_16c8e0/GetActionSuccess.s index b793c51d8f..557eda6cb9 100644 --- a/asm/nonmatchings/code_16c8e0/GetActionSuccess.s +++ b/asm/nonmatchings/code_16c8e0/GetActionSuccess.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActionSuccess /* 197B74 80269294 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetActionSuccessCopy.s b/asm/nonmatchings/code_16c8e0/GetActionSuccessCopy.s index 1423a9c4c7..f20f33f2fa 100644 --- a/asm/nonmatchings/code_16c8e0/GetActionSuccessCopy.s +++ b/asm/nonmatchings/code_16c8e0/GetActionSuccessCopy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActionSuccessCopy /* 197DD8 802694F8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetActorAttackBoost.s b/asm/nonmatchings/code_16c8e0/GetActorAttackBoost.s index 93940ad5eb..214b8c4e3b 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorAttackBoost.s +++ b/asm/nonmatchings/code_16c8e0/GetActorAttackBoost.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorAttackBoost /* 19E4E4 8026FC04 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetActorDefenseBoost.s b/asm/nonmatchings/code_16c8e0/GetActorDefenseBoost.s index 213a6499e3..83aec6febb 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorDefenseBoost.s +++ b/asm/nonmatchings/code_16c8e0/GetActorDefenseBoost.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorDefenseBoost /* 19E54C 8026FC6C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetActorFlags.s b/asm/nonmatchings/code_16c8e0/GetActorFlags.s index e62a38dac1..8a387c42d8 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorFlags.s +++ b/asm/nonmatchings/code_16c8e0/GetActorFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorFlags /* 19B800 8026CF20 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetActorHP.s b/asm/nonmatchings/code_16c8e0/GetActorHP.s index feea3056e6..4945b978ad 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorHP.s +++ b/asm/nonmatchings/code_16c8e0/GetActorHP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorHP /* 1AAF80 8027C6A0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetActorLevel.s b/asm/nonmatchings/code_16c8e0/GetActorLevel.s index e0e0bf8d43..4b6aa4c464 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorLevel.s +++ b/asm/nonmatchings/code_16c8e0/GetActorLevel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorLevel /* 1AE628 8027FD48 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetActorPos.s b/asm/nonmatchings/code_16c8e0/GetActorPos.s index acdaa5d1ca..4aae39a301 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorPos.s +++ b/asm/nonmatchings/code_16c8e0/GetActorPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorPos /* 199388 8026AAA8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetActorRotation.s b/asm/nonmatchings/code_16c8e0/GetActorRotation.s index 2befd8ac61..0b3bd442ff 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorRotation.s +++ b/asm/nonmatchings/code_16c8e0/GetActorRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorRotation /* 19AE4C 8026C56C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetActorScale.s b/asm/nonmatchings/code_16c8e0/GetActorScale.s index 15b39f3549..e1653412ef 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorScale.s +++ b/asm/nonmatchings/code_16c8e0/GetActorScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorScale /* 19B364 8026CA84 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/GetActorSize.s b/asm/nonmatchings/code_16c8e0/GetActorSize.s index 44f285418b..e717d3a9e8 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorSize.s +++ b/asm/nonmatchings/code_16c8e0/GetActorSize.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorSize /* 1AC1C0 8027D8E0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetActorVar.s b/asm/nonmatchings/code_16c8e0/GetActorVar.s index d7dcc795d4..b5069dbec3 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorVar.s +++ b/asm/nonmatchings/code_16c8e0/GetActorVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorVar /* 19A894 8026BFB4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetActorYaw.s b/asm/nonmatchings/code_16c8e0/GetActorYaw.s index a6b7015b93..7a5a942bba 100644 --- a/asm/nonmatchings/code_16c8e0/GetActorYaw.s +++ b/asm/nonmatchings/code_16c8e0/GetActorYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetActorYaw /* 199CA8 8026B3C8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetAnimation.s b/asm/nonmatchings/code_16c8e0/GetAnimation.s index a589420b88..919c7756c1 100644 --- a/asm/nonmatchings/code_16c8e0/GetAnimation.s +++ b/asm/nonmatchings/code_16c8e0/GetAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetAnimation /* 199B18 8026B238 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetBattleFlags.s b/asm/nonmatchings/code_16c8e0/GetBattleFlags.s index 4e72af5935..778da5b4da 100644 --- a/asm/nonmatchings/code_16c8e0/GetBattleFlags.s +++ b/asm/nonmatchings/code_16c8e0/GetBattleFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetBattleFlags /* 19B5F0 8026CD10 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetBattleFlags2.s b/asm/nonmatchings/code_16c8e0/GetBattleFlags2.s index 0f8c96b395..61a1f431ef 100644 --- a/asm/nonmatchings/code_16c8e0/GetBattleFlags2.s +++ b/asm/nonmatchings/code_16c8e0/GetBattleFlags2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetBattleFlags2 /* 19B680 8026CDA0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetBattlePhase.s b/asm/nonmatchings/code_16c8e0/GetBattlePhase.s index 90bcd75772..db4c05ad98 100644 --- a/asm/nonmatchings/code_16c8e0/GetBattlePhase.s +++ b/asm/nonmatchings/code_16c8e0/GetBattlePhase.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetBattlePhase /* 198708 80269E28 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetBattleState.s b/asm/nonmatchings/code_16c8e0/GetBattleState.s index 308336f942..8c4d7274de 100644 --- a/asm/nonmatchings/code_16c8e0/GetBattleState.s +++ b/asm/nonmatchings/code_16c8e0/GetBattleState.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetBattleState /* 19CA20 8026E140 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetBattleVar.s b/asm/nonmatchings/code_16c8e0/GetBattleVar.s index d6bd6e99cc..306a8d836f 100644 --- a/asm/nonmatchings/code_16c8e0/GetBattleVar.s +++ b/asm/nonmatchings/code_16c8e0/GetBattleVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetBattleVar /* 19DF74 8026F694 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetBlockResult.s b/asm/nonmatchings/code_16c8e0/GetBlockResult.s index b4b608eed4..1e3ea234f8 100644 --- a/asm/nonmatchings/code_16c8e0/GetBlockResult.s +++ b/asm/nonmatchings/code_16c8e0/GetBlockResult.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetBlockResult /* 197E5C 8026957C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetCurrentActorType.s b/asm/nonmatchings/code_16c8e0/GetCurrentActorType.s index 58e1f5bbb8..293cc0e1bc 100644 --- a/asm/nonmatchings/code_16c8e0/GetCurrentActorType.s +++ b/asm/nonmatchings/code_16c8e0/GetCurrentActorType.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCurrentActorType /* 1AC3B4 8027DAD4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetDamageIntensity.s b/asm/nonmatchings/code_16c8e0/GetDamageIntensity.s index c70d1c0b16..d22fe29f53 100644 --- a/asm/nonmatchings/code_16c8e0/GetDamageIntensity.s +++ b/asm/nonmatchings/code_16c8e0/GetDamageIntensity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetDamageIntensity /* 1AF120 80280840 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/GetDistanceToGoal.s b/asm/nonmatchings/code_16c8e0/GetDistanceToGoal.s index f7326f8d60..ec1ab80eb6 100644 --- a/asm/nonmatchings/code_16c8e0/GetDistanceToGoal.s +++ b/asm/nonmatchings/code_16c8e0/GetDistanceToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetDistanceToGoal /* 19D2DC 8026E9FC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetEncounterState.s b/asm/nonmatchings/code_16c8e0/GetEncounterState.s index ae862a86a3..4d3d541d3c 100644 --- a/asm/nonmatchings/code_16c8e0/GetEncounterState.s +++ b/asm/nonmatchings/code_16c8e0/GetEncounterState.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetEncounterState /* 1AC0A4 8027D7C4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetEnemyMaxHP.s b/asm/nonmatchings/code_16c8e0/GetEnemyMaxHP.s index 41f653ed79..9f106482f4 100644 --- a/asm/nonmatchings/code_16c8e0/GetEnemyMaxHP.s +++ b/asm/nonmatchings/code_16c8e0/GetEnemyMaxHP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetEnemyMaxHP /* 1AB028 8027C748 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetGoalPos.s b/asm/nonmatchings/code_16c8e0/GetGoalPos.s index ea40148896..dc727ffaa9 100644 --- a/asm/nonmatchings/code_16c8e0/GetGoalPos.s +++ b/asm/nonmatchings/code_16c8e0/GetGoalPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetGoalPos /* 199100 8026A820 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetHomePos.s b/asm/nonmatchings/code_16c8e0/GetHomePos.s index 611a9330be..eecb055291 100644 --- a/asm/nonmatchings/code_16c8e0/GetHomePos.s +++ b/asm/nonmatchings/code_16c8e0/GetHomePos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetHomePos /* 199654 8026AD74 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetIdleGoal.s b/asm/nonmatchings/code_16c8e0/GetIdleGoal.s index d91080b59d..861686890a 100644 --- a/asm/nonmatchings/code_16c8e0/GetIdleGoal.s +++ b/asm/nonmatchings/code_16c8e0/GetIdleGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetIdleGoal /* 1991CC 8026A8EC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetIndexFromHome.s b/asm/nonmatchings/code_16c8e0/GetIndexFromHome.s index 387dad51e6..3c2021209f 100644 --- a/asm/nonmatchings/code_16c8e0/GetIndexFromHome.s +++ b/asm/nonmatchings/code_16c8e0/GetIndexFromHome.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetIndexFromHome /* 1989B4 8026A0D4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetIndexFromPos.s b/asm/nonmatchings/code_16c8e0/GetIndexFromPos.s index 17a7e441f8..b872daf7e6 100644 --- a/asm/nonmatchings/code_16c8e0/GetIndexFromPos.s +++ b/asm/nonmatchings/code_16c8e0/GetIndexFromPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetIndexFromPos /* 19893C 8026A05C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetLastDamage.s b/asm/nonmatchings/code_16c8e0/GetLastDamage.s index a794bab46e..572845188f 100644 --- a/asm/nonmatchings/code_16c8e0/GetLastDamage.s +++ b/asm/nonmatchings/code_16c8e0/GetLastDamage.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetLastDamage /* 1AC41C 8027DB3C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetLastElement.s b/asm/nonmatchings/code_16c8e0/GetLastElement.s index 79812825ca..8d79eade44 100644 --- a/asm/nonmatchings/code_16c8e0/GetLastElement.s +++ b/asm/nonmatchings/code_16c8e0/GetLastElement.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetLastElement /* 198734 80269E54 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetLastEvent.s b/asm/nonmatchings/code_16c8e0/GetLastEvent.s index d100e19ad5..6705b3896c 100644 --- a/asm/nonmatchings/code_16c8e0/GetLastEvent.s +++ b/asm/nonmatchings/code_16c8e0/GetLastEvent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetLastEvent /* 1AADC0 8027C4E0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetMenuSelection.s b/asm/nonmatchings/code_16c8e0/GetMenuSelection.s index e2960b4222..3768ac9f19 100644 --- a/asm/nonmatchings/code_16c8e0/GetMenuSelection.s +++ b/asm/nonmatchings/code_16c8e0/GetMenuSelection.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetMenuSelection /* 1A1CA4 802733C4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetOriginalActorType.s b/asm/nonmatchings/code_16c8e0/GetOriginalActorType.s index ffc88e4067..9fb566d0ec 100644 --- a/asm/nonmatchings/code_16c8e0/GetOriginalActorType.s +++ b/asm/nonmatchings/code_16c8e0/GetOriginalActorType.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetOriginalActorType /* 1AC348 8027DA68 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetOwnerID.s b/asm/nonmatchings/code_16c8e0/GetOwnerID.s index 21faeece7b..8184588d2f 100644 --- a/asm/nonmatchings/code_16c8e0/GetOwnerID.s +++ b/asm/nonmatchings/code_16c8e0/GetOwnerID.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetOwnerID /* 19C6E0 8026DE00 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetOwnerTarget.s b/asm/nonmatchings/code_16c8e0/GetOwnerTarget.s index 5bdc14a75d..96657a5885 100644 --- a/asm/nonmatchings/code_16c8e0/GetOwnerTarget.s +++ b/asm/nonmatchings/code_16c8e0/GetOwnerTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetOwnerTarget /* 19D18C 8026E8AC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetPartDispOffset.s b/asm/nonmatchings/code_16c8e0/GetPartDispOffset.s index 05bce6edf0..7a22cb3fee 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartDispOffset.s +++ b/asm/nonmatchings/code_16c8e0/GetPartDispOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartDispOffset /* 19A3C8 8026BAE8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/GetPartEventFlags.s b/asm/nonmatchings/code_16c8e0/GetPartEventFlags.s index f9cea55267..44f832335c 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartEventFlags.s +++ b/asm/nonmatchings/code_16c8e0/GetPartEventFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartEventFlags /* 19BD68 8026D488 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetPartFlags.s b/asm/nonmatchings/code_16c8e0/GetPartFlags.s index 33661eb3cc..6302ba765d 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartFlags.s +++ b/asm/nonmatchings/code_16c8e0/GetPartFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartFlags /* 19BAF8 8026D218 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetPartMovementVar.s b/asm/nonmatchings/code_16c8e0/GetPartMovementVar.s index 42e1643434..99343f7895 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartMovementVar.s +++ b/asm/nonmatchings/code_16c8e0/GetPartMovementVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartMovementVar /* 19AA50 8026C170 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetPartOffset.s b/asm/nonmatchings/code_16c8e0/GetPartOffset.s index ba91af013b..0c6c08ea5f 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartOffset.s +++ b/asm/nonmatchings/code_16c8e0/GetPartOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartOffset /* 199454 8026AB74 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetPartPos.s b/asm/nonmatchings/code_16c8e0/GetPartPos.s index 9a169b6876..6c7a80691f 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartPos.s +++ b/asm/nonmatchings/code_16c8e0/GetPartPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartPos /* 199568 8026AC88 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetPartRotation.s b/asm/nonmatchings/code_16c8e0/GetPartRotation.s index 6830805d1e..49df4727d7 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartRotation.s +++ b/asm/nonmatchings/code_16c8e0/GetPartRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartRotation /* 19B108 8026C828 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/GetPartScale.s b/asm/nonmatchings/code_16c8e0/GetPartScale.s index 8c33c0ee2d..195d87f0da 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartScale.s +++ b/asm/nonmatchings/code_16c8e0/GetPartScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartScale /* 19B514 8026CC34 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/GetPartTarget.s b/asm/nonmatchings/code_16c8e0/GetPartTarget.s index 784d6c3fde..bab7ebd327 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartTarget.s +++ b/asm/nonmatchings/code_16c8e0/GetPartTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartTarget /* 199298 8026A9B8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/GetPartTargetFlags.s b/asm/nonmatchings/code_16c8e0/GetPartTargetFlags.s index 523729469a..fad2395211 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartTargetFlags.s +++ b/asm/nonmatchings/code_16c8e0/GetPartTargetFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartTargetFlags /* 19BB8C 8026D2AC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetPartYaw.s b/asm/nonmatchings/code_16c8e0/GetPartYaw.s index ce7289c5ac..d77c0cf718 100644 --- a/asm/nonmatchings/code_16c8e0/GetPartYaw.s +++ b/asm/nonmatchings/code_16c8e0/GetPartYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartYaw /* 199DA0 8026B4C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetPlayerActorID.s b/asm/nonmatchings/code_16c8e0/GetPlayerActorID.s index 9a2ac05cc0..7b694d6320 100644 --- a/asm/nonmatchings/code_16c8e0/GetPlayerActorID.s +++ b/asm/nonmatchings/code_16c8e0/GetPlayerActorID.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPlayerActorID /* 19D254 8026E974 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetPlayerHP.s b/asm/nonmatchings/code_16c8e0/GetPlayerHP.s index fa49c0a905..5189bc63f9 100644 --- a/asm/nonmatchings/code_16c8e0/GetPlayerHP.s +++ b/asm/nonmatchings/code_16c8e0/GetPlayerHP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPlayerHP /* 1A2B14 80274234 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/GetStatusFlags.s b/asm/nonmatchings/code_16c8e0/GetStatusFlags.s index 5bdb7f4fe1..9cb39a0a03 100644 --- a/asm/nonmatchings/code_16c8e0/GetStatusFlags.s +++ b/asm/nonmatchings/code_16c8e0/GetStatusFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetStatusFlags /* 19DB10 8026F230 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/GetTargetListLength.s b/asm/nonmatchings/code_16c8e0/GetTargetListLength.s index 129794f400..b6e8d74c12 100644 --- a/asm/nonmatchings/code_16c8e0/GetTargetListLength.s +++ b/asm/nonmatchings/code_16c8e0/GetTargetListLength.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetTargetListLength /* 19D144 8026E864 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/HPBarToCurrent.s b/asm/nonmatchings/code_16c8e0/HPBarToCurrent.s index f8a5209a85..c12b535e9d 100644 --- a/asm/nonmatchings/code_16c8e0/HPBarToCurrent.s +++ b/asm/nonmatchings/code_16c8e0/HPBarToCurrent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel HPBarToCurrent /* 19C088 8026D7A8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/HPBarToHome.s b/asm/nonmatchings/code_16c8e0/HPBarToHome.s index bd8786dc56..7768202a80 100644 --- a/asm/nonmatchings/code_16c8e0/HPBarToHome.s +++ b/asm/nonmatchings/code_16c8e0/HPBarToHome.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel HPBarToHome /* 19BF44 8026D664 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/HasMerleeCastsLeft.s b/asm/nonmatchings/code_16c8e0/HasMerleeCastsLeft.s index dfff742f43..e19042047f 100644 --- a/asm/nonmatchings/code_16c8e0/HasMerleeCastsLeft.s +++ b/asm/nonmatchings/code_16c8e0/HasMerleeCastsLeft.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel HasMerleeCastsLeft /* 1902A8 802619C8 AC800084 */ sw $zero, 0x84($a0) diff --git a/asm/nonmatchings/code_16c8e0/HealActor.s b/asm/nonmatchings/code_16c8e0/HealActor.s index 24b0f853e6..99226186bc 100644 --- a/asm/nonmatchings/code_16c8e0/HealActor.s +++ b/asm/nonmatchings/code_16c8e0/HealActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel HealActor /* 19F584 80270CA4 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_16c8e0/IdleFlyToGoal.s b/asm/nonmatchings/code_16c8e0/IdleFlyToGoal.s index 16a1be85af..1651e4a1ee 100644 --- a/asm/nonmatchings/code_16c8e0/IdleFlyToGoal.s +++ b/asm/nonmatchings/code_16c8e0/IdleFlyToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IdleFlyToGoal /* 1AA498 8027BBB8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/IdleJumpToGoal.s b/asm/nonmatchings/code_16c8e0/IdleJumpToGoal.s index cd21ab54e7..6bc0c72978 100644 --- a/asm/nonmatchings/code_16c8e0/IdleJumpToGoal.s +++ b/asm/nonmatchings/code_16c8e0/IdleJumpToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IdleJumpToGoal /* 1A79EC 8027910C 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/IdleRunToGoal.s b/asm/nonmatchings/code_16c8e0/IdleRunToGoal.s index 79070da64d..3c933fe93e 100644 --- a/asm/nonmatchings/code_16c8e0/IdleRunToGoal.s +++ b/asm/nonmatchings/code_16c8e0/IdleRunToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IdleRunToGoal /* 1A8B44 8027A264 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/IncrementPlayerFP.s b/asm/nonmatchings/code_16c8e0/IncrementPlayerFP.s index 4b3b90d387..fa510c38f8 100644 --- a/asm/nonmatchings/code_16c8e0/IncrementPlayerFP.s +++ b/asm/nonmatchings/code_16c8e0/IncrementPlayerFP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IncrementPlayerFP /* 190640 80261D60 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_16c8e0/IncrementPlayerHP.s b/asm/nonmatchings/code_16c8e0/IncrementPlayerHP.s index 8ca978d207..5599350bab 100644 --- a/asm/nonmatchings/code_16c8e0/IncrementPlayerHP.s +++ b/asm/nonmatchings/code_16c8e0/IncrementPlayerHP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IncrementPlayerHP /* 190608 80261D28 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_16c8e0/InitTargetIterator.s b/asm/nonmatchings/code_16c8e0/InitTargetIterator.s index ca2b3f40d3..43d14af990 100644 --- a/asm/nonmatchings/code_16c8e0/InitTargetIterator.s +++ b/asm/nonmatchings/code_16c8e0/InitTargetIterator.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel InitTargetIterator /* 19CC34 8026E354 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/IsMessageBoxDisplayed.s b/asm/nonmatchings/code_16c8e0/IsMessageBoxDisplayed.s index 26135807aa..15488f4b8f 100644 --- a/asm/nonmatchings/code_16c8e0/IsMessageBoxDisplayed.s +++ b/asm/nonmatchings/code_16c8e0/IsMessageBoxDisplayed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IsMessageBoxDisplayed /* 17FC64 80251384 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/ItemAfflictEnemy.s b/asm/nonmatchings/code_16c8e0/ItemAfflictEnemy.s index 80eda8fe27..8e2f497efc 100644 --- a/asm/nonmatchings/code_16c8e0/ItemAfflictEnemy.s +++ b/asm/nonmatchings/code_16c8e0/ItemAfflictEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ItemAfflictEnemy /* 181204 80252924 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/ItemCheckHit.s b/asm/nonmatchings/code_16c8e0/ItemCheckHit.s index da37f670a0..fc2ac6eff8 100644 --- a/asm/nonmatchings/code_16c8e0/ItemCheckHit.s +++ b/asm/nonmatchings/code_16c8e0/ItemCheckHit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ItemCheckHit /* 181620 80252D40 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/ItemDamageEnemy.s b/asm/nonmatchings/code_16c8e0/ItemDamageEnemy.s index 5a1392b624..fc82647e6b 100644 --- a/asm/nonmatchings/code_16c8e0/ItemDamageEnemy.s +++ b/asm/nonmatchings/code_16c8e0/ItemDamageEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ItemDamageEnemy /* 181008 80252728 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/JumpPartTo.s b/asm/nonmatchings/code_16c8e0/JumpPartTo.s index d6fec07bb9..e5bbbc9fb2 100644 --- a/asm/nonmatchings/code_16c8e0/JumpPartTo.s +++ b/asm/nonmatchings/code_16c8e0/JumpPartTo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel JumpPartTo /* 1A8DC4 8027A4E4 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_16c8e0/JumpToGoal.s b/asm/nonmatchings/code_16c8e0/JumpToGoal.s index f2a55f8292..1549f801c6 100644 --- a/asm/nonmatchings/code_16c8e0/JumpToGoal.s +++ b/asm/nonmatchings/code_16c8e0/JumpToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel JumpToGoal /* 1A75E8 80278D08 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_16c8e0/JumpToGoalSimple2.s b/asm/nonmatchings/code_16c8e0/JumpToGoalSimple2.s index 28ae11e849..37af5e51ab 100644 --- a/asm/nonmatchings/code_16c8e0/JumpToGoalSimple2.s +++ b/asm/nonmatchings/code_16c8e0/JumpToGoalSimple2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel JumpToGoalSimple2 /* 1A7D00 80279420 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/JumpWithBounce.s b/asm/nonmatchings/code_16c8e0/JumpWithBounce.s index e490e5bd4a..9a2d1b701b 100644 --- a/asm/nonmatchings/code_16c8e0/JumpWithBounce.s +++ b/asm/nonmatchings/code_16c8e0/JumpWithBounce.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel JumpWithBounce /* 1A8008 80279728 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/LandJump.s b/asm/nonmatchings/code_16c8e0/LandJump.s index ffa98a4e37..84fab156f3 100644 --- a/asm/nonmatchings/code_16c8e0/LandJump.s +++ b/asm/nonmatchings/code_16c8e0/LandJump.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LandJump /* 1A83B4 80279AD4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/LandJumpPart.s b/asm/nonmatchings/code_16c8e0/LandJumpPart.s index 3d8d5191e0..bb3bec0358 100644 --- a/asm/nonmatchings/code_16c8e0/LandJumpPart.s +++ b/asm/nonmatchings/code_16c8e0/LandJumpPart.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LandJumpPart /* 1A943C 8027AB5C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/LoadActionCommand.s b/asm/nonmatchings/code_16c8e0/LoadActionCommand.s index 227cbb9ec7..dcd3299aac 100644 --- a/asm/nonmatchings/code_16c8e0/LoadActionCommand.s +++ b/asm/nonmatchings/code_16c8e0/LoadActionCommand.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadActionCommand /* 196AA0 802681C0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/LoadBattleDmaData.s b/asm/nonmatchings/code_16c8e0/LoadBattleDmaData.s index af18fcb72d..4343936321 100644 --- a/asm/nonmatchings/code_16c8e0/LoadBattleDmaData.s +++ b/asm/nonmatchings/code_16c8e0/LoadBattleDmaData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadBattleDmaData /* 181F04 80253624 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/LoadBattleSection.s b/asm/nonmatchings/code_16c8e0/LoadBattleSection.s index 77aab17e47..f9cfa70b39 100644 --- a/asm/nonmatchings/code_16c8e0/LoadBattleSection.s +++ b/asm/nonmatchings/code_16c8e0/LoadBattleSection.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadBattleSection /* 1986C4 80269DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/LoadFreeItemScript.s b/asm/nonmatchings/code_16c8e0/LoadFreeItemScript.s index 459d2ee5a0..e023adbc44 100644 --- a/asm/nonmatchings/code_16c8e0/LoadFreeItemScript.s +++ b/asm/nonmatchings/code_16c8e0/LoadFreeItemScript.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadFreeItemScript /* 1968FC 8026801C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/LoadItemScript.s b/asm/nonmatchings/code_16c8e0/LoadItemScript.s index efd8d96645..f9c9ba2744 100644 --- a/asm/nonmatchings/code_16c8e0/LoadItemScript.s +++ b/asm/nonmatchings/code_16c8e0/LoadItemScript.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadItemScript /* 1967B0 80267ED0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/LoadMoveScript.s b/asm/nonmatchings/code_16c8e0/LoadMoveScript.s index 542b7847a2..45aca2c790 100644 --- a/asm/nonmatchings/code_16c8e0/LoadMoveScript.s +++ b/asm/nonmatchings/code_16c8e0/LoadMoveScript.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadMoveScript /* 196A10 80268130 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/LoadStarPowerScript.s b/asm/nonmatchings/code_16c8e0/LoadStarPowerScript.s index 5f97f1d9ed..c4763eef9b 100644 --- a/asm/nonmatchings/code_16c8e0/LoadStarPowerScript.s +++ b/asm/nonmatchings/code_16c8e0/LoadStarPowerScript.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadStarPowerScript /* 1AF230 80280950 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/MakeOwnerTargetIndex.s b/asm/nonmatchings/code_16c8e0/MakeOwnerTargetIndex.s index 05966c3cb4..8032623045 100644 --- a/asm/nonmatchings/code_16c8e0/MakeOwnerTargetIndex.s +++ b/asm/nonmatchings/code_16c8e0/MakeOwnerTargetIndex.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeOwnerTargetIndex /* 1AE498 8027FBB8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/MakeStatusField.s b/asm/nonmatchings/code_16c8e0/MakeStatusField.s index 68bf242a7d..3f30048a77 100644 --- a/asm/nonmatchings/code_16c8e0/MakeStatusField.s +++ b/asm/nonmatchings/code_16c8e0/MakeStatusField.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeStatusField /* 182474 80253B94 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/ModifyActorDecoration.s b/asm/nonmatchings/code_16c8e0/ModifyActorDecoration.s index 54f5580b91..6ad4a762d3 100644 --- a/asm/nonmatchings/code_16c8e0/ModifyActorDecoration.s +++ b/asm/nonmatchings/code_16c8e0/ModifyActorDecoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ModifyActorDecoration /* 19D8D0 8026EFF0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/MoveBattleCamOver.s b/asm/nonmatchings/code_16c8e0/MoveBattleCamOver.s index 240f4d3f64..8a296b625a 100644 --- a/asm/nonmatchings/code_16c8e0/MoveBattleCamOver.s +++ b/asm/nonmatchings/code_16c8e0/MoveBattleCamOver.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MoveBattleCamOver /* 17D4E8 8024EC08 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/MultiplyByActorScale.s b/asm/nonmatchings/code_16c8e0/MultiplyByActorScale.s index a70617ff7b..975df4e9f7 100644 --- a/asm/nonmatchings/code_16c8e0/MultiplyByActorScale.s +++ b/asm/nonmatchings/code_16c8e0/MultiplyByActorScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MultiplyByActorScale /* 1828BC 80253FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/MultiplyVec2ByActorScale.s b/asm/nonmatchings/code_16c8e0/MultiplyVec2ByActorScale.s index 2b63ae3b93..bc1722110e 100644 --- a/asm/nonmatchings/code_16c8e0/MultiplyVec2ByActorScale.s +++ b/asm/nonmatchings/code_16c8e0/MultiplyVec2ByActorScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MultiplyVec2ByActorScale /* 182928 80254048 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/MultiplyVec3ByActorScale.s b/asm/nonmatchings/code_16c8e0/MultiplyVec3ByActorScale.s index 36b1dcf11b..df0b1ccc2b 100644 --- a/asm/nonmatchings/code_16c8e0/MultiplyVec3ByActorScale.s +++ b/asm/nonmatchings/code_16c8e0/MultiplyVec3ByActorScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MultiplyVec3ByActorScale /* 1829BC 802540DC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/OverrideBattleDmaDest.s b/asm/nonmatchings/code_16c8e0/OverrideBattleDmaDest.s index 9f048a4eb9..fb829a00b2 100644 --- a/asm/nonmatchings/code_16c8e0/OverrideBattleDmaDest.s +++ b/asm/nonmatchings/code_16c8e0/OverrideBattleDmaDest.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel OverrideBattleDmaDest /* 181ED8 802535F8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/PartnerAfflictEnemy.s b/asm/nonmatchings/code_16c8e0/PartnerAfflictEnemy.s index 178568facc..20ed8fbc55 100644 --- a/asm/nonmatchings/code_16c8e0/PartnerAfflictEnemy.s +++ b/asm/nonmatchings/code_16c8e0/PartnerAfflictEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PartnerAfflictEnemy /* 1AE8E4 80280004 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PartnerDamageEnemy.s b/asm/nonmatchings/code_16c8e0/PartnerDamageEnemy.s index d73df289b6..898ecf4a43 100644 --- a/asm/nonmatchings/code_16c8e0/PartnerDamageEnemy.s +++ b/asm/nonmatchings/code_16c8e0/PartnerDamageEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PartnerDamageEnemy /* 1AE694 8027FDB4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PartnerPowerBounceEnemy.s b/asm/nonmatchings/code_16c8e0/PartnerPowerBounceEnemy.s index 3a6968d1d7..79090f0224 100644 --- a/asm/nonmatchings/code_16c8e0/PartnerPowerBounceEnemy.s +++ b/asm/nonmatchings/code_16c8e0/PartnerPowerBounceEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PartnerPowerBounceEnemy /* 1AEB50 80280270 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PartnerTestEnemy.s b/asm/nonmatchings/code_16c8e0/PartnerTestEnemy.s index 59775669d6..5200f01fb1 100644 --- a/asm/nonmatchings/code_16c8e0/PartnerTestEnemy.s +++ b/asm/nonmatchings/code_16c8e0/PartnerTestEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PartnerTestEnemy /* 1AEDB0 802804D0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PauseTakeTurn.s b/asm/nonmatchings/code_16c8e0/PauseTakeTurn.s index 4f3598fd0e..bc9bfeec9c 100644 --- a/asm/nonmatchings/code_16c8e0/PauseTakeTurn.s +++ b/asm/nonmatchings/code_16c8e0/PauseTakeTurn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PauseTakeTurn /* 1A7284 802789A4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/PlaySoundAtActor.s b/asm/nonmatchings/code_16c8e0/PlaySoundAtActor.s index 189f7607f1..5664fd7366 100644 --- a/asm/nonmatchings/code_16c8e0/PlaySoundAtActor.s +++ b/asm/nonmatchings/code_16c8e0/PlaySoundAtActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlaySoundAtActor /* 18213C 8025385C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PlaySoundAtPart.s b/asm/nonmatchings/code_16c8e0/PlaySoundAtPart.s index 253794d7ac..03e0edf595 100644 --- a/asm/nonmatchings/code_16c8e0/PlaySoundAtPart.s +++ b/asm/nonmatchings/code_16c8e0/PlaySoundAtPart.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlaySoundAtPart /* 1821B0 802538D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/PlayerCreateTargetList.s b/asm/nonmatchings/code_16c8e0/PlayerCreateTargetList.s index 7d83aec80f..2333d3365d 100644 --- a/asm/nonmatchings/code_16c8e0/PlayerCreateTargetList.s +++ b/asm/nonmatchings/code_16c8e0/PlayerCreateTargetList.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerCreateTargetList /* 19CBAC 8026E2CC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/PlayerDamageEnemy.s b/asm/nonmatchings/code_16c8e0/PlayerDamageEnemy.s index f3c722ab5c..5a0f4e97b8 100644 --- a/asm/nonmatchings/code_16c8e0/PlayerDamageEnemy.s +++ b/asm/nonmatchings/code_16c8e0/PlayerDamageEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerDamageEnemy /* 1A2B40 80274260 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PlayerFallToGoal.s b/asm/nonmatchings/code_16c8e0/PlayerFallToGoal.s index 0176900537..8908ab5e78 100644 --- a/asm/nonmatchings/code_16c8e0/PlayerFallToGoal.s +++ b/asm/nonmatchings/code_16c8e0/PlayerFallToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerFallToGoal /* 1A2174 80273894 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/PlayerLandJump.s b/asm/nonmatchings/code_16c8e0/PlayerLandJump.s index dd13a9317a..8171817a13 100644 --- a/asm/nonmatchings/code_16c8e0/PlayerLandJump.s +++ b/asm/nonmatchings/code_16c8e0/PlayerLandJump.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerLandJump /* 1A23E4 80273B04 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PlayerPowerBounceEnemy.s b/asm/nonmatchings/code_16c8e0/PlayerPowerBounceEnemy.s index 115f2d4a99..4aabf86723 100644 --- a/asm/nonmatchings/code_16c8e0/PlayerPowerBounceEnemy.s +++ b/asm/nonmatchings/code_16c8e0/PlayerPowerBounceEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerPowerBounceEnemy /* 1A2D80 802744A0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/PlayerRunToGoal.s b/asm/nonmatchings/code_16c8e0/PlayerRunToGoal.s index de843d476f..f1a5ec6956 100644 --- a/asm/nonmatchings/code_16c8e0/PlayerRunToGoal.s +++ b/asm/nonmatchings/code_16c8e0/PlayerRunToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerRunToGoal /* 1A2544 80273C64 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/PlayerTestEnemy.s b/asm/nonmatchings/code_16c8e0/PlayerTestEnemy.s index e7f86215c0..a3a4779fa2 100644 --- a/asm/nonmatchings/code_16c8e0/PlayerTestEnemy.s +++ b/asm/nonmatchings/code_16c8e0/PlayerTestEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerTestEnemy /* 1A2FD0 802746F0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/RemoveActor.s b/asm/nonmatchings/code_16c8e0/RemoveActor.s index dc039ab642..fa64d1e8ff 100644 --- a/asm/nonmatchings/code_16c8e0/RemoveActor.s +++ b/asm/nonmatchings/code_16c8e0/RemoveActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveActor /* 1AB090 8027C7B0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/RemoveActorDecoration.s b/asm/nonmatchings/code_16c8e0/RemoveActorDecoration.s index a104d7c380..1a6bc396bc 100644 --- a/asm/nonmatchings/code_16c8e0/RemoveActorDecoration.s +++ b/asm/nonmatchings/code_16c8e0/RemoveActorDecoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveActorDecoration /* 19D82C 8026EF4C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/RemovePartShadow.s b/asm/nonmatchings/code_16c8e0/RemovePartShadow.s index ea8aaf84b5..fd9f4aae17 100644 --- a/asm/nonmatchings/code_16c8e0/RemovePartShadow.s +++ b/asm/nonmatchings/code_16c8e0/RemovePartShadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemovePartShadow /* 19DE7C 8026F59C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/RemovePlayerBuffs.s b/asm/nonmatchings/code_16c8e0/RemovePlayerBuffs.s index e81ca5549f..4a71ce7fd7 100644 --- a/asm/nonmatchings/code_16c8e0/RemovePlayerBuffs.s +++ b/asm/nonmatchings/code_16c8e0/RemovePlayerBuffs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemovePlayerBuffs /* 19DD2C 8026F44C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/ResetActorSounds.s b/asm/nonmatchings/code_16c8e0/ResetActorSounds.s index 1a3555f00d..2e7e88a611 100644 --- a/asm/nonmatchings/code_16c8e0/ResetActorSounds.s +++ b/asm/nonmatchings/code_16c8e0/ResetActorSounds.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ResetActorSounds /* 19E118 8026F838 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/ResetAllActorSounds.s b/asm/nonmatchings/code_16c8e0/ResetAllActorSounds.s index c09e5ce068..a8d1f32573 100644 --- a/asm/nonmatchings/code_16c8e0/ResetAllActorSounds.s +++ b/asm/nonmatchings/code_16c8e0/ResetAllActorSounds.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ResetAllActorSounds /* 19DFCC 8026F6EC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/ResumeTakeTurn.s b/asm/nonmatchings/code_16c8e0/ResumeTakeTurn.s index 7c28f5875a..a4dd652b60 100644 --- a/asm/nonmatchings/code_16c8e0/ResumeTakeTurn.s +++ b/asm/nonmatchings/code_16c8e0/ResumeTakeTurn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ResumeTakeTurn /* 1A72FC 80278A1C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/RunPartTo.s b/asm/nonmatchings/code_16c8e0/RunPartTo.s index 103032e8d8..9b519a96cb 100644 --- a/asm/nonmatchings/code_16c8e0/RunPartTo.s +++ b/asm/nonmatchings/code_16c8e0/RunPartTo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RunPartTo /* 1A958C 8027ACAC 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/RunToGoal.s b/asm/nonmatchings/code_16c8e0/RunToGoal.s index 3981722fcb..1508b2775c 100644 --- a/asm/nonmatchings/code_16c8e0/RunToGoal.s +++ b/asm/nonmatchings/code_16c8e0/RunToGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RunToGoal /* 1A8744 80279E64 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/SetActionSuccess.s b/asm/nonmatchings/code_16c8e0/SetActionSuccess.s index a07c514540..9a3e43046e 100644 --- a/asm/nonmatchings/code_16c8e0/SetActionSuccess.s +++ b/asm/nonmatchings/code_16c8e0/SetActionSuccess.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActionSuccess /* 197BA0 802692C0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetActorDispOffset.s b/asm/nonmatchings/code_16c8e0/SetActorDispOffset.s index ad9402c9d6..480800b08a 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorDispOffset.s +++ b/asm/nonmatchings/code_16c8e0/SetActorDispOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorDispOffset /* 19A2E4 8026BA04 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/SetActorFlagBits.s b/asm/nonmatchings/code_16c8e0/SetActorFlagBits.s index 9de88283cc..70def7ecde 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorFlagBits.s +++ b/asm/nonmatchings/code_16c8e0/SetActorFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorFlagBits /* 19B76C 8026CE8C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetActorFlags.s b/asm/nonmatchings/code_16c8e0/SetActorFlags.s index 9231822e6d..4dca32bb7d 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorFlags.s +++ b/asm/nonmatchings/code_16c8e0/SetActorFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorFlags /* 19B710 8026CE30 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetActorIdleJumpGravity.s b/asm/nonmatchings/code_16c8e0/SetActorIdleJumpGravity.s index 714fb8a7da..10fc31f996 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorIdleJumpGravity.s +++ b/asm/nonmatchings/code_16c8e0/SetActorIdleJumpGravity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorIdleJumpGravity /* 199EB8 8026B5D8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorIdleSpeed.s b/asm/nonmatchings/code_16c8e0/SetActorIdleSpeed.s index 611bfebb17..5edd3b0abb 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorIdleSpeed.s +++ b/asm/nonmatchings/code_16c8e0/SetActorIdleSpeed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorIdleSpeed /* 199FB0 8026B6D0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorJumpGravity.s b/asm/nonmatchings/code_16c8e0/SetActorJumpGravity.s index d4cfdc7d19..fd04ca5edc 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorJumpGravity.s +++ b/asm/nonmatchings/code_16c8e0/SetActorJumpGravity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorJumpGravity /* 199E3C 8026B55C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorPos.s b/asm/nonmatchings/code_16c8e0/SetActorPos.s index c123a29b43..a445b5bcff 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorPos.s +++ b/asm/nonmatchings/code_16c8e0/SetActorPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorPos /* 199720 8026AE40 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/SetActorRotation.s b/asm/nonmatchings/code_16c8e0/SetActorRotation.s index afbf695ce6..d36e196fd1 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorRotation.s +++ b/asm/nonmatchings/code_16c8e0/SetActorRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorRotation /* 19AC8C 8026C3AC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorRotationOffset.s b/asm/nonmatchings/code_16c8e0/SetActorRotationOffset.s index eff2c65c6e..194d623d5f 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorRotationOffset.s +++ b/asm/nonmatchings/code_16c8e0/SetActorRotationOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorRotationOffset /* 19AD8C 8026C4AC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorScale.s b/asm/nonmatchings/code_16c8e0/SetActorScale.s index 314275fc1f..528478900a 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorScale.s +++ b/asm/nonmatchings/code_16c8e0/SetActorScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorScale /* 19B1E4 8026C904 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/SetActorScaleModifier.s b/asm/nonmatchings/code_16c8e0/SetActorScaleModifier.s index 17b49e4760..e649c764ee 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorScaleModifier.s +++ b/asm/nonmatchings/code_16c8e0/SetActorScaleModifier.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorScaleModifier /* 19B2A4 8026C9C4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/SetActorSize.s b/asm/nonmatchings/code_16c8e0/SetActorSize.s index 9b2d34e40c..2a04e39175 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorSize.s +++ b/asm/nonmatchings/code_16c8e0/SetActorSize.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorSize /* 1AC0F0 8027D810 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorSounds.s b/asm/nonmatchings/code_16c8e0/SetActorSounds.s index d7478c8417..2b2d253c90 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorSounds.s +++ b/asm/nonmatchings/code_16c8e0/SetActorSounds.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorSounds /* 19E020 8026F740 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorSpeed.s b/asm/nonmatchings/code_16c8e0/SetActorSpeed.s index cbce54f95d..77ef3e5002 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorSpeed.s +++ b/asm/nonmatchings/code_16c8e0/SetActorSpeed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorSpeed /* 199F34 8026B654 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetActorType.s b/asm/nonmatchings/code_16c8e0/SetActorType.s index dedfcb6c12..71bfda1a83 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorType.s +++ b/asm/nonmatchings/code_16c8e0/SetActorType.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorType /* 19E400 8026FB20 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetActorVar.s b/asm/nonmatchings/code_16c8e0/SetActorVar.s index 37ada05aea..24d76396ff 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorVar.s +++ b/asm/nonmatchings/code_16c8e0/SetActorVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorVar /* 19A924 8026C044 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetActorYaw.s b/asm/nonmatchings/code_16c8e0/SetActorYaw.s index abd5a8f6d9..0dd9d2c912 100644 --- a/asm/nonmatchings/code_16c8e0/SetActorYaw.s +++ b/asm/nonmatchings/code_16c8e0/SetActorYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetActorYaw /* 199C38 8026B358 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetAnimation.s b/asm/nonmatchings/code_16c8e0/SetAnimation.s index d6416976aa..17e1c37212 100644 --- a/asm/nonmatchings/code_16c8e0/SetAnimation.s +++ b/asm/nonmatchings/code_16c8e0/SetAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetAnimation /* 199A90 8026B1B0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetAnimationRate.s b/asm/nonmatchings/code_16c8e0/SetAnimationRate.s index 9b959cd9f9..8603797253 100644 --- a/asm/nonmatchings/code_16c8e0/SetAnimationRate.s +++ b/asm/nonmatchings/code_16c8e0/SetAnimationRate.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetAnimationRate /* 199BB0 8026B2D0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamOffsetZ.s b/asm/nonmatchings/code_16c8e0/SetBattleCamOffsetZ.s index 9d64fed7ad..b062d79e3c 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleCamOffsetZ.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleCamOffsetZ.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleCamOffsetZ /* 17D338 8024EA58 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamTarget.s b/asm/nonmatchings/code_16c8e0/SetBattleCamTarget.s index a092050164..fee780ad07 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleCamTarget.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleCamTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleCamTarget /* 17D1EC 8024E90C 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamYaw.s b/asm/nonmatchings/code_16c8e0/SetBattleCamYaw.s index 344b2a6211..6776b937f8 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleCamYaw.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleCamYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleCamYaw /* 17D3C4 8024EAE4 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/SetBattleCamZoom.s b/asm/nonmatchings/code_16c8e0/SetBattleCamZoom.s index 9ef1d4f107..2377598b39 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleCamZoom.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleCamZoom.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleCamZoom /* 17D54C 8024EC6C 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/SetBattleFlagBits.s b/asm/nonmatchings/code_16c8e0/SetBattleFlagBits.s index 6262c97d27..990d0084f5 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleFlagBits.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleFlagBits /* 19B61C 8026CD3C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetBattleFlagBits2.s b/asm/nonmatchings/code_16c8e0/SetBattleFlagBits2.s index 8ada91eb3f..f7eed69c2c 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleFlagBits2.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleFlagBits2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleFlagBits2 /* 19B6AC 8026CDCC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetBattleInputButtons.s b/asm/nonmatchings/code_16c8e0/SetBattleInputButtons.s index 613a83fb69..7fa3040189 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleInputButtons.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleInputButtons.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleInputButtons /* 19C948 8026E068 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/code_16c8e0/SetBattleInputMask.s b/asm/nonmatchings/code_16c8e0/SetBattleInputMask.s index 946724e797..a850344cdd 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleInputMask.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleInputMask.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleInputMask /* 19C930 8026E050 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/code_16c8e0/SetBattleVar.s b/asm/nonmatchings/code_16c8e0/SetBattleVar.s index 97f6a271bc..08936903be 100644 --- a/asm/nonmatchings/code_16c8e0/SetBattleVar.s +++ b/asm/nonmatchings/code_16c8e0/SetBattleVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleVar /* 19DF18 8026F638 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetDefenseTable.s b/asm/nonmatchings/code_16c8e0/SetDefenseTable.s index c701653f99..529dd0ee11 100644 --- a/asm/nonmatchings/code_16c8e0/SetDefenseTable.s +++ b/asm/nonmatchings/code_16c8e0/SetDefenseTable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetDefenseTable /* 1AB354 8027CA74 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetEnemyHP.s b/asm/nonmatchings/code_16c8e0/SetEnemyHP.s index 86f8d06f25..960512ca5c 100644 --- a/asm/nonmatchings/code_16c8e0/SetEnemyHP.s +++ b/asm/nonmatchings/code_16c8e0/SetEnemyHP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetEnemyHP /* 1AAEA8 8027C5C8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetEnemyTargetOffset.s b/asm/nonmatchings/code_16c8e0/SetEnemyTargetOffset.s index 87b0cb61ee..654acc375c 100644 --- a/asm/nonmatchings/code_16c8e0/SetEnemyTargetOffset.s +++ b/asm/nonmatchings/code_16c8e0/SetEnemyTargetOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetEnemyTargetOffset /* 199980 8026B0A0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisible.s b/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisible.s index 8d91ca44ce..8e60ca59f3 100644 --- a/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisible.s +++ b/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisible.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetForegroundModelsVisible /* 1823CC 80253AEC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisibleUnchecked.s b/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisibleUnchecked.s index d1aeab24c7..789540d28c 100644 --- a/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisibleUnchecked.s +++ b/asm/nonmatchings/code_16c8e0/SetForegroundModelsVisibleUnchecked.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetForegroundModelsVisibleUnchecked /* 182388 80253AA8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetGoalPos.s b/asm/nonmatchings/code_16c8e0/SetGoalPos.s index 8346a3d42e..f8fc0b13d7 100644 --- a/asm/nonmatchings/code_16c8e0/SetGoalPos.s +++ b/asm/nonmatchings/code_16c8e0/SetGoalPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetGoalPos /* 198DF0 8026A510 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToFirstTarget.s b/asm/nonmatchings/code_16c8e0/SetGoalToFirstTarget.s index 327da4a254..358b868036 100644 --- a/asm/nonmatchings/code_16c8e0/SetGoalToFirstTarget.s +++ b/asm/nonmatchings/code_16c8e0/SetGoalToFirstTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetGoalToFirstTarget /* 198D7C 8026A49C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToHome.s b/asm/nonmatchings/code_16c8e0/SetGoalToHome.s index 57a1a79455..115a7005e1 100644 --- a/asm/nonmatchings/code_16c8e0/SetGoalToHome.s +++ b/asm/nonmatchings/code_16c8e0/SetGoalToHome.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetGoalToHome /* 1987A4 80269EC4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToIndex.s b/asm/nonmatchings/code_16c8e0/SetGoalToIndex.s index 0ebe345015..6624b9cfcb 100644 --- a/asm/nonmatchings/code_16c8e0/SetGoalToIndex.s +++ b/asm/nonmatchings/code_16c8e0/SetGoalToIndex.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetGoalToIndex /* 198874 80269F94 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetGoalToTarget.s b/asm/nonmatchings/code_16c8e0/SetGoalToTarget.s index d68ebc3cfe..73422131dc 100644 --- a/asm/nonmatchings/code_16c8e0/SetGoalToTarget.s +++ b/asm/nonmatchings/code_16c8e0/SetGoalToTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetGoalToTarget /* 198C88 8026A3A8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetHomePos.s b/asm/nonmatchings/code_16c8e0/SetHomePos.s index 972196ba2f..2ad1aa0b22 100644 --- a/asm/nonmatchings/code_16c8e0/SetHomePos.s +++ b/asm/nonmatchings/code_16c8e0/SetHomePos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetHomePos /* 198BB0 8026A2D0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/SetIdleAnimations.s b/asm/nonmatchings/code_16c8e0/SetIdleAnimations.s index 87d062907d..9aa59c76d6 100644 --- a/asm/nonmatchings/code_16c8e0/SetIdleAnimations.s +++ b/asm/nonmatchings/code_16c8e0/SetIdleAnimations.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetIdleAnimations /* 1AB45C 8027CB7C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetIdleGoal.s b/asm/nonmatchings/code_16c8e0/SetIdleGoal.s index 09b0ac7283..a56ddc9d88 100644 --- a/asm/nonmatchings/code_16c8e0/SetIdleGoal.s +++ b/asm/nonmatchings/code_16c8e0/SetIdleGoal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetIdleGoal /* 198F0C 8026A62C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/SetIdleGoalToHome.s b/asm/nonmatchings/code_16c8e0/SetIdleGoalToHome.s index ee7f244ac3..60cd628ead 100644 --- a/asm/nonmatchings/code_16c8e0/SetIdleGoalToHome.s +++ b/asm/nonmatchings/code_16c8e0/SetIdleGoalToHome.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetIdleGoalToHome /* 19880C 80269F2C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetJumpAnimations.s b/asm/nonmatchings/code_16c8e0/SetJumpAnimations.s index a48afeea65..73a205b8ff 100644 --- a/asm/nonmatchings/code_16c8e0/SetJumpAnimations.s +++ b/asm/nonmatchings/code_16c8e0/SetJumpAnimations.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetJumpAnimations /* 19A16C 8026B88C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetMessageBoxDuration.s b/asm/nonmatchings/code_16c8e0/SetMessageBoxDuration.s index c84096e6d4..423085b51f 100644 --- a/asm/nonmatchings/code_16c8e0/SetMessageBoxDuration.s +++ b/asm/nonmatchings/code_16c8e0/SetMessageBoxDuration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetMessageBoxDuration /* 17FCE8 80251408 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetOwnerID.s b/asm/nonmatchings/code_16c8e0/SetOwnerID.s index 42884ca989..40dc48acb0 100644 --- a/asm/nonmatchings/code_16c8e0/SetOwnerID.s +++ b/asm/nonmatchings/code_16c8e0/SetOwnerID.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetOwnerID /* 19C708 8026DE28 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/SetOwnerTarget.s b/asm/nonmatchings/code_16c8e0/SetOwnerTarget.s index 10fb2517a8..c4541d24df 100644 --- a/asm/nonmatchings/code_16c8e0/SetOwnerTarget.s +++ b/asm/nonmatchings/code_16c8e0/SetOwnerTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetOwnerTarget /* 19CC88 8026E3A8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetPartAlpha.s b/asm/nonmatchings/code_16c8e0/SetPartAlpha.s index f1905f1c19..8ff5cdb1ee 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartAlpha.s +++ b/asm/nonmatchings/code_16c8e0/SetPartAlpha.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartAlpha /* 19DD50 8026F470 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartDispOffset.s b/asm/nonmatchings/code_16c8e0/SetPartDispOffset.s index 421c4e2c43..d8f457478c 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartDispOffset.s +++ b/asm/nonmatchings/code_16c8e0/SetPartDispOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartDispOffset /* 19A518 8026BC38 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/SetPartEventBits.s b/asm/nonmatchings/code_16c8e0/SetPartEventBits.s index e1aadea1b9..512bde2bac 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartEventBits.s +++ b/asm/nonmatchings/code_16c8e0/SetPartEventBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartEventBits /* 19BCA8 8026D3C8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartEventFlags.s b/asm/nonmatchings/code_16c8e0/SetPartEventFlags.s index 6e22728213..f8601867fa 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartEventFlags.s +++ b/asm/nonmatchings/code_16c8e0/SetPartEventFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartEventFlags /* 19BC20 8026D340 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetPartFlagBits.s b/asm/nonmatchings/code_16c8e0/SetPartFlagBits.s index fbe36a0063..c1a09b44a0 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartFlagBits.s +++ b/asm/nonmatchings/code_16c8e0/SetPartFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartFlagBits /* 19B8F0 8026D010 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartFlags.s b/asm/nonmatchings/code_16c8e0/SetPartFlags.s index ced5865b4b..c43c962d3c 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartFlags.s +++ b/asm/nonmatchings/code_16c8e0/SetPartFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartFlags /* 19B868 8026CF88 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetPartGoalToTarget.s b/asm/nonmatchings/code_16c8e0/SetPartGoalToTarget.s index 67e7d98585..c89a2b4702 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartGoalToTarget.s +++ b/asm/nonmatchings/code_16c8e0/SetPartGoalToTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartGoalToTarget /* 198CE4 8026A404 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartJumpGravity.s b/asm/nonmatchings/code_16c8e0/SetPartJumpGravity.s index 1ad6c1ce44..229c7cc9dd 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartJumpGravity.s +++ b/asm/nonmatchings/code_16c8e0/SetPartJumpGravity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartJumpGravity /* 19A02C 8026B74C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartMoveSpeed.s b/asm/nonmatchings/code_16c8e0/SetPartMoveSpeed.s index abcb7db6d9..92d8d10805 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartMoveSpeed.s +++ b/asm/nonmatchings/code_16c8e0/SetPartMoveSpeed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartMoveSpeed /* 19A0CC 8026B7EC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartMovementVar.s b/asm/nonmatchings/code_16c8e0/SetPartMovementVar.s index c3a9975f8e..83bb2d646f 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartMovementVar.s +++ b/asm/nonmatchings/code_16c8e0/SetPartMovementVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartMovementVar /* 19AB0C 8026C22C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartPos.s b/asm/nonmatchings/code_16c8e0/SetPartPos.s index 0cd67cab5d..f4a1815ca8 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartPos.s +++ b/asm/nonmatchings/code_16c8e0/SetPartPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartPos /* 1997F8 8026AF18 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/SetPartRotation.s b/asm/nonmatchings/code_16c8e0/SetPartRotation.s index 3e7279cb32..e99fee5dc4 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartRotation.s +++ b/asm/nonmatchings/code_16c8e0/SetPartRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartRotation /* 19AF14 8026C634 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartRotationOffset.s b/asm/nonmatchings/code_16c8e0/SetPartRotationOffset.s index 98ff003e10..0d6a891145 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartRotationOffset.s +++ b/asm/nonmatchings/code_16c8e0/SetPartRotationOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartRotationOffset /* 19B020 8026C740 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartScale.s b/asm/nonmatchings/code_16c8e0/SetPartScale.s index cdf6d7c5eb..87eab339df 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartScale.s +++ b/asm/nonmatchings/code_16c8e0/SetPartScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartScale /* 19B42C 8026CB4C 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/SetPartSize.s b/asm/nonmatchings/code_16c8e0/SetPartSize.s index fc0f66cd97..37a47b2ea7 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartSize.s +++ b/asm/nonmatchings/code_16c8e0/SetPartSize.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartSize /* 1AC250 8027D970 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartSounds.s b/asm/nonmatchings/code_16c8e0/SetPartSounds.s index 624f110bce..3459fb6704 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartSounds.s +++ b/asm/nonmatchings/code_16c8e0/SetPartSounds.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartSounds /* 19E2E0 8026FA00 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartTargetFlagBits.s b/asm/nonmatchings/code_16c8e0/SetPartTargetFlagBits.s index fd2b7ea19d..0808c3880e 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartTargetFlagBits.s +++ b/asm/nonmatchings/code_16c8e0/SetPartTargetFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartTargetFlagBits /* 19BA38 8026D158 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/SetPartTargetFlags.s b/asm/nonmatchings/code_16c8e0/SetPartTargetFlags.s index c5891bec83..e9a480b9fd 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartTargetFlags.s +++ b/asm/nonmatchings/code_16c8e0/SetPartTargetFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartTargetFlags /* 19B9B0 8026D0D0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetPartYaw.s b/asm/nonmatchings/code_16c8e0/SetPartYaw.s index 49e0eeb26e..9aa264da0a 100644 --- a/asm/nonmatchings/code_16c8e0/SetPartYaw.s +++ b/asm/nonmatchings/code_16c8e0/SetPartYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPartYaw /* 199D18 8026B438 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetStatusTable.s b/asm/nonmatchings/code_16c8e0/SetStatusTable.s index ef405ccf27..bc37a70cb0 100644 --- a/asm/nonmatchings/code_16c8e0/SetStatusTable.s +++ b/asm/nonmatchings/code_16c8e0/SetStatusTable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetStatusTable /* 1AB3E8 8027CB08 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetTargetActor.s b/asm/nonmatchings/code_16c8e0/SetTargetActor.s index a3aeb13b79..23fa0719f2 100644 --- a/asm/nonmatchings/code_16c8e0/SetTargetActor.s +++ b/asm/nonmatchings/code_16c8e0/SetTargetActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetTargetActor /* 1AAE28 8027C548 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SetTargetOffset.s b/asm/nonmatchings/code_16c8e0/SetTargetOffset.s index e988462cb1..73e302e371 100644 --- a/asm/nonmatchings/code_16c8e0/SetTargetOffset.s +++ b/asm/nonmatchings/code_16c8e0/SetTargetOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetTargetOffset /* 1ABC60 8027D380 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/ShowBattleChoice.s b/asm/nonmatchings/code_16c8e0/ShowBattleChoice.s index 655316579f..7d5298409b 100644 --- a/asm/nonmatchings/code_16c8e0/ShowBattleChoice.s +++ b/asm/nonmatchings/code_16c8e0/ShowBattleChoice.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowBattleChoice /* 181E18 80253538 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/ShowMessageBox.s b/asm/nonmatchings/code_16c8e0/ShowMessageBox.s index 516cd771e1..9530eae8ee 100644 --- a/asm/nonmatchings/code_16c8e0/ShowMessageBox.s +++ b/asm/nonmatchings/code_16c8e0/ShowMessageBox.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowMessageBox /* 17FB94 802512B4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/ShowShockEffect.s b/asm/nonmatchings/code_16c8e0/ShowShockEffect.s index 96562f89d5..5a93a5838e 100644 --- a/asm/nonmatchings/code_16c8e0/ShowShockEffect.s +++ b/asm/nonmatchings/code_16c8e0/ShowShockEffect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowShockEffect /* 19E490 8026FBB0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/ShowVariableMessageBox.s b/asm/nonmatchings/code_16c8e0/ShowVariableMessageBox.s index 87e3cb4b32..cf5e69a75e 100644 --- a/asm/nonmatchings/code_16c8e0/ShowVariableMessageBox.s +++ b/asm/nonmatchings/code_16c8e0/ShowVariableMessageBox.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowVariableMessageBox /* 17FBEC 8025130C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/StartRumble.s b/asm/nonmatchings/code_16c8e0/StartRumble.s index 93ea36d5a2..1c889c8b3d 100644 --- a/asm/nonmatchings/code_16c8e0/StartRumble.s +++ b/asm/nonmatchings/code_16c8e0/StartRumble.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel StartRumble /* 182AF8 80254218 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/StartRumbleWithParams.s b/asm/nonmatchings/code_16c8e0/StartRumbleWithParams.s index e31fa10ae0..c72cf87d23 100644 --- a/asm/nonmatchings/code_16c8e0/StartRumbleWithParams.s +++ b/asm/nonmatchings/code_16c8e0/StartRumbleWithParams.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel StartRumbleWithParams /* 19667C 80267D9C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/SummonEnemy.s b/asm/nonmatchings/code_16c8e0/SummonEnemy.s index 504bf75092..7c39d493a4 100644 --- a/asm/nonmatchings/code_16c8e0/SummonEnemy.s +++ b/asm/nonmatchings/code_16c8e0/SummonEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SummonEnemy /* 19C444 8026DB64 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/UseCamPreset.s b/asm/nonmatchings/code_16c8e0/UseCamPreset.s index d8abdd4f27..a427b229d4 100644 --- a/asm/nonmatchings/code_16c8e0/UseCamPreset.s +++ b/asm/nonmatchings/code_16c8e0/UseCamPreset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel UseCamPreset /* 17CEFC 8024E61C 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/UseIdleAnimation.s b/asm/nonmatchings/code_16c8e0/UseIdleAnimation.s index 1f634ea1c1..234deb55eb 100644 --- a/asm/nonmatchings/code_16c8e0/UseIdleAnimation.s +++ b/asm/nonmatchings/code_16c8e0/UseIdleAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel UseIdleAnimation /* 19D9CC 8026F0EC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/VanishActor.s b/asm/nonmatchings/code_16c8e0/VanishActor.s index e69758e168..528680944f 100644 --- a/asm/nonmatchings/code_16c8e0/VanishActor.s +++ b/asm/nonmatchings/code_16c8e0/VanishActor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel VanishActor /* 19EEF4 80270614 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/WaitForBuffDone.s b/asm/nonmatchings/code_16c8e0/WaitForBuffDone.s index a3ff44257c..0530914b64 100644 --- a/asm/nonmatchings/code_16c8e0/WaitForBuffDone.s +++ b/asm/nonmatchings/code_16c8e0/WaitForBuffDone.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel WaitForBuffDone /* 19FA2C 8027114C 3C02802A */ lui $v0, 0x802a diff --git a/asm/nonmatchings/code_16c8e0/WaitForMessageBoxDone.s b/asm/nonmatchings/code_16c8e0/WaitForMessageBoxDone.s index 504864e729..4a891638db 100644 --- a/asm/nonmatchings/code_16c8e0/WaitForMessageBoxDone.s +++ b/asm/nonmatchings/code_16c8e0/WaitForMessageBoxDone.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel WaitForMessageBoxDone /* 17FCAC 802513CC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/WasStatusInflicted.s b/asm/nonmatchings/code_16c8e0/WasStatusInflicted.s index 5fdc770913..ea343a279c 100644 --- a/asm/nonmatchings/code_16c8e0/WasStatusInflicted.s +++ b/asm/nonmatchings/code_16c8e0/WasStatusInflicted.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel WasStatusInflicted /* 1AC548 8027DC68 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/YieldTurn.s b/asm/nonmatchings/code_16c8e0/YieldTurn.s index ba35190676..86001bfd46 100644 --- a/asm/nonmatchings/code_16c8e0/YieldTurn.s +++ b/asm/nonmatchings/code_16c8e0/YieldTurn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel YieldTurn /* 1AC0D0 8027D7F0 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/_remove_part_decoration.s b/asm/nonmatchings/code_16c8e0/_remove_part_decoration.s index 0ba1fcf582..4da0aa4434 100644 --- a/asm/nonmatchings/code_16c8e0/_remove_part_decoration.s +++ b/asm/nonmatchings/code_16c8e0/_remove_part_decoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _remove_part_decoration /* 18B91C 8025D03C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/activate_defend_command.s b/asm/nonmatchings/code_16c8e0/activate_defend_command.s index eee6675e5c..5f68618d4d 100644 --- a/asm/nonmatchings/code_16c8e0/activate_defend_command.s +++ b/asm/nonmatchings/code_16c8e0/activate_defend_command.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel activate_defend_command /* 18F3E4 80260B04 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/add_actor_decoration.s b/asm/nonmatchings/code_16c8e0/add_actor_decoration.s index 6d8faa5395..9d4e44ad7a 100644 --- a/asm/nonmatchings/code_16c8e0/add_actor_decoration.s +++ b/asm/nonmatchings/code_16c8e0/add_actor_decoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel add_actor_decoration /* 195A70 80267190 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/add_cam_zoom.s b/asm/nonmatchings/code_16c8e0/add_cam_zoom.s index 4ea56964e5..1e4cc778cf 100644 --- a/asm/nonmatchings/code_16c8e0/add_cam_zoom.s +++ b/asm/nonmatchings/code_16c8e0/add_cam_zoom.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel add_cam_zoom /* 17CE94 8024E5B4 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/add_part_decoration.s b/asm/nonmatchings/code_16c8e0/add_part_decoration.s index 44b3b1ff5f..44fd251f25 100644 --- a/asm/nonmatchings/code_16c8e0/add_part_decoration.s +++ b/asm/nonmatchings/code_16c8e0/add_part_decoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel add_part_decoration /* 1959F4 80267114 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/add_xz_vec3f.s b/asm/nonmatchings/code_16c8e0/add_xz_vec3f.s index 5a77ddbf41..26682fbda0 100644 --- a/asm/nonmatchings/code_16c8e0/add_xz_vec3f.s +++ b/asm/nonmatchings/code_16c8e0/add_xz_vec3f.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel add_xz_vec3f /* 192A08 80264128 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy1.s b/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy1.s index c9c74c982e..0943db632e 100644 --- a/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy1.s +++ b/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel add_xz_vec3f_copy1 /* 192AA0 802641C0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy2.s b/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy2.s index d7255cc3aa..93d6a422e5 100644 --- a/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy2.s +++ b/asm/nonmatchings/code_16c8e0/add_xz_vec3f_copy2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel add_xz_vec3f_copy2 /* 192B38 80264258 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/begin_battle.s b/asm/nonmatchings/code_16c8e0/begin_battle.s index e7e8612595..656ed1f73c 100644 --- a/asm/nonmatchings/code_16c8e0/begin_battle.s +++ b/asm/nonmatchings/code_16c8e0/begin_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel begin_battle /* 16FAF8 80241218 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/calc_enemy_damage_target.s b/asm/nonmatchings/code_16c8e0/calc_enemy_damage_target.s index 850870b05d..dea27c08e7 100644 --- a/asm/nonmatchings/code_16c8e0/calc_enemy_damage_target.s +++ b/asm/nonmatchings/code_16c8e0/calc_enemy_damage_target.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_enemy_damage_target /* 1A5D0C 8027742C 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/calc_enemy_test_target.s b/asm/nonmatchings/code_16c8e0/calc_enemy_test_target.s index cc1107aabf..1b5e209c1a 100644 --- a/asm/nonmatchings/code_16c8e0/calc_enemy_test_target.s +++ b/asm/nonmatchings/code_16c8e0/calc_enemy_test_target.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_enemy_test_target /* 1A5AD8 802771F8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/calc_item_check_hit.s b/asm/nonmatchings/code_16c8e0/calc_item_check_hit.s index 1a245b2d86..6a28e3fd98 100644 --- a/asm/nonmatchings/code_16c8e0/calc_item_check_hit.s +++ b/asm/nonmatchings/code_16c8e0/calc_item_check_hit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_item_check_hit /* 17FEB0 802515D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/calc_item_damage_enemy.s b/asm/nonmatchings/code_16c8e0/calc_item_damage_enemy.s index 8173fb95f0..30f34f937f 100644 --- a/asm/nonmatchings/code_16c8e0/calc_item_damage_enemy.s +++ b/asm/nonmatchings/code_16c8e0/calc_item_damage_enemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_item_damage_enemy /* 17FFC8 802516E8 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/calc_partner_damage_enemy.s b/asm/nonmatchings/code_16c8e0/calc_partner_damage_enemy.s index 6695193dd2..e21f63edf4 100644 --- a/asm/nonmatchings/code_16c8e0/calc_partner_damage_enemy.s +++ b/asm/nonmatchings/code_16c8e0/calc_partner_damage_enemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_partner_damage_enemy /* 1ACC08 8027E328 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/calc_partner_test_enemy.s b/asm/nonmatchings/code_16c8e0/calc_partner_test_enemy.s index 76a43a4589..a00db2093b 100644 --- a/asm/nonmatchings/code_16c8e0/calc_partner_test_enemy.s +++ b/asm/nonmatchings/code_16c8e0/calc_partner_test_enemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_partner_test_enemy /* 1AC85C 8027DF7C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/calc_player_damage_enemy.s b/asm/nonmatchings/code_16c8e0/calc_player_damage_enemy.s index 51d3f8aa12..901ecc6c91 100644 --- a/asm/nonmatchings/code_16c8e0/calc_player_damage_enemy.s +++ b/asm/nonmatchings/code_16c8e0/calc_player_damage_enemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_player_damage_enemy /* 1A0224 80271944 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_16c8e0/calc_player_test_enemy.s b/asm/nonmatchings/code_16c8e0/calc_player_test_enemy.s index cb4d93d716..dbc4fb7797 100644 --- a/asm/nonmatchings/code_16c8e0/calc_player_test_enemy.s +++ b/asm/nonmatchings/code_16c8e0/calc_player_test_enemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calc_player_test_enemy /* 1A0034 80271754 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/cam_target_actor.s b/asm/nonmatchings/code_16c8e0/cam_target_actor.s index 03e4e7a0c0..db4d18fd36 100644 --- a/asm/nonmatchings/code_16c8e0/cam_target_actor.s +++ b/asm/nonmatchings/code_16c8e0/cam_target_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel cam_target_actor /* 17CD1C 8024E43C 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/check_block_input.s b/asm/nonmatchings/code_16c8e0/check_block_input.s index c8ddeaa7d3..be8ce9b2eb 100644 --- a/asm/nonmatchings/code_16c8e0/check_block_input.s +++ b/asm/nonmatchings/code_16c8e0/check_block_input.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel check_block_input /* 1977AC 80268ECC 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/close_action_command_instruction_popup.s b/asm/nonmatchings/code_16c8e0/close_action_command_instruction_popup.s index 26ea578861..216f3218e5 100644 --- a/asm/nonmatchings/code_16c8e0/close_action_command_instruction_popup.s +++ b/asm/nonmatchings/code_16c8e0/close_action_command_instruction_popup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel close_action_command_instruction_popup /* 17E3EC 8024FB0C 3C038028 */ lui $v1, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/count_power_plus.s b/asm/nonmatchings/code_16c8e0/count_power_plus.s index 348beae022..e820d285f7 100644 --- a/asm/nonmatchings/code_16c8e0/count_power_plus.s +++ b/asm/nonmatchings/code_16c8e0/count_power_plus.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel count_power_plus /* 1923F0 80263B10 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_16c8e0/count_targets.s b/asm/nonmatchings/code_16c8e0/count_targets.s index edd0274b0b..80fa35378d 100644 --- a/asm/nonmatchings/code_16c8e0/count_targets.s +++ b/asm/nonmatchings/code_16c8e0/count_targets.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel count_targets /* 197F40 80269660 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/create_actor.s b/asm/nonmatchings/code_16c8e0/create_actor.s index 64bf45d902..d310d224fe 100644 --- a/asm/nonmatchings/code_16c8e0/create_actor.s +++ b/asm/nonmatchings/code_16c8e0/create_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_actor /* 193C84 802653A4 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/create_part_shadow.s b/asm/nonmatchings/code_16c8e0/create_part_shadow.s index b06b2f5a97..cd1f1ea338 100644 --- a/asm/nonmatchings/code_16c8e0/create_part_shadow.s +++ b/asm/nonmatchings/code_16c8e0/create_part_shadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_part_shadow /* 195BFC 8026731C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/create_popup.s b/asm/nonmatchings/code_16c8e0/create_popup.s index 74731273c9..30ddc86a9c 100644 --- a/asm/nonmatchings/code_16c8e0/create_popup.s +++ b/asm/nonmatchings/code_16c8e0/create_popup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_popup /* 17D848 8024EF68 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/create_target_list.s b/asm/nonmatchings/code_16c8e0/create_target_list.s index f047cfc196..5013954f1c 100644 --- a/asm/nonmatchings/code_16c8e0/create_target_list.s +++ b/asm/nonmatchings/code_16c8e0/create_target_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_target_list /* 190B20 80262240 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/deduct_current_move_fp.s b/asm/nonmatchings/code_16c8e0/deduct_current_move_fp.s index 3c0ed34d24..d205df3907 100644 --- a/asm/nonmatchings/code_16c8e0/deduct_current_move_fp.s +++ b/asm/nonmatchings/code_16c8e0/deduct_current_move_fp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel deduct_current_move_fp /* 1924A8 80263BC8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/delete_actor.s b/asm/nonmatchings/code_16c8e0/delete_actor.s index a1648c8142..c6089515ec 100644 --- a/asm/nonmatchings/code_16c8e0/delete_actor.s +++ b/asm/nonmatchings/code_16c8e0/delete_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel delete_actor /* 16F49C 80240BBC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/delete_player_actor.s b/asm/nonmatchings/code_16c8e0/delete_player_actor.s index 514e856073..c9d25f4615 100644 --- a/asm/nonmatchings/code_16c8e0/delete_player_actor.s +++ b/asm/nonmatchings/code_16c8e0/delete_player_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel delete_player_actor /* 16F648 80240D68 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/disable_actor_blur.s b/asm/nonmatchings/code_16c8e0/disable_actor_blur.s index feac26ef6c..ab5196f72b 100644 --- a/asm/nonmatchings/code_16c8e0/disable_actor_blur.s +++ b/asm/nonmatchings/code_16c8e0/disable_actor_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel disable_actor_blur /* 182E3C 8025455C 8C8301F4 */ lw $v1, 0x1f4($a0) diff --git a/asm/nonmatchings/code_16c8e0/disable_partner_blur.s b/asm/nonmatchings/code_16c8e0/disable_partner_blur.s index 9868391bfd..c9091a9b2d 100644 --- a/asm/nonmatchings/code_16c8e0/disable_partner_blur.s +++ b/asm/nonmatchings/code_16c8e0/disable_partner_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel disable_partner_blur /* 182F48 80254668 3C04800E */ lui $a0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/disable_player_blur.s b/asm/nonmatchings/code_16c8e0/disable_player_blur.s index 8b45de4657..f79c7dc9de 100644 --- a/asm/nonmatchings/code_16c8e0/disable_player_blur.s +++ b/asm/nonmatchings/code_16c8e0/disable_player_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel disable_player_blur /* 1831F4 80254914 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor.s index ece2ee5cc2..681624e4fb 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_actor /* 1A6FB4 802786D4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_0.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_0.s index 8f76914238..82dd71f6dc 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_0.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_actor_0 /* 1A71D8 802788F8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_1.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_1.s index 83a8a04829..c6731f3c61 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_1.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_actor_1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_actor_1 /* 1A71F4 80278914 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner.s index 78425cbe75..4bf3dd6b31 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_partner /* 1AE2AC 8027F9CC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_0.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_0.s index fcde7fdb97..80bd7a9dcf 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_0.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_partner_0 /* 1AE460 8027FB80 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_1.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_1.s index 300a80be1e..9dcfbe6d06 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_1.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_partner_1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_partner_1 /* 1AE47C 8027FB9C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player.s index 42b7d538d0..763baae3b6 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_player /* 1A1A9C 802731BC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_0.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_0.s index 27dc251d6e..de8b4a3b63 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_0.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_player_0 /* 1A1C5C 8027337C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_1.s b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_1.s index 489188ef70..04ad854a2c 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_1.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_damage_event_player_1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_damage_event_player_1 /* 1A1C88 802733A8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_actor.s b/asm/nonmatchings/code_16c8e0/dispatch_event_actor.s index 3fb178c2f1..f9fda3cd9b 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_event_actor.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_event_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_event_actor /* 1A5A40 80277160 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_general.s b/asm/nonmatchings/code_16c8e0/dispatch_event_general.s index 67afea4f95..d937559d6d 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_event_general.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_event_general.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_event_general /* 1A586C 80276F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_partner.s b/asm/nonmatchings/code_16c8e0/dispatch_event_partner.s index 73e346b76a..e601197a6d 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_event_partner.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_event_partner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_event_partner /* 1AC760 8027DE80 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_partner_continue_turn.s b/asm/nonmatchings/code_16c8e0/dispatch_event_partner_continue_turn.s index c7b9043e4e..8e43d62415 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_event_partner_continue_turn.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_event_partner_continue_turn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_event_partner_continue_turn /* 1AC7EC 8027DF0C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_player.s b/asm/nonmatchings/code_16c8e0/dispatch_event_player.s index fc0149e335..f99809e131 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_event_player.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_event_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_event_player /* 19FF38 80271658 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/dispatch_event_player_continue_turn.s b/asm/nonmatchings/code_16c8e0/dispatch_event_player_continue_turn.s index c9b1e27bdd..6219137ff8 100644 --- a/asm/nonmatchings/code_16c8e0/dispatch_event_player_continue_turn.s +++ b/asm/nonmatchings/code_16c8e0/dispatch_event_player_continue_turn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dispatch_event_player_continue_turn /* 19FFC4 802716E4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s b/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s index 17dfe39dd0..cf1681e0ff 100644 --- a/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s +++ b/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_main_battle_ui /* 16D35C 8023EA7C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/enable_actor_blur.s b/asm/nonmatchings/code_16c8e0/enable_actor_blur.s index a884abe4fd..622d297713 100644 --- a/asm/nonmatchings/code_16c8e0/enable_actor_blur.s +++ b/asm/nonmatchings/code_16c8e0/enable_actor_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_actor_blur /* 182BAC 802542CC 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/enable_partner_blur.s b/asm/nonmatchings/code_16c8e0/enable_partner_blur.s index 9fa7247f74..baaa1ad296 100644 --- a/asm/nonmatchings/code_16c8e0/enable_partner_blur.s +++ b/asm/nonmatchings/code_16c8e0/enable_partner_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_partner_blur /* 182F24 80254644 3C04800E */ lui $a0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/enable_player_blur.s b/asm/nonmatchings/code_16c8e0/enable_player_blur.s index bf108859a9..20bc46091a 100644 --- a/asm/nonmatchings/code_16c8e0/enable_player_blur.s +++ b/asm/nonmatchings/code_16c8e0/enable_player_blur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_player_blur /* 182FB4 802546D4 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/end_battle.s b/asm/nonmatchings/code_16c8e0/end_battle.s index 27c96bb4b0..dc82a71a00 100644 --- a/asm/nonmatchings/code_16c8e0/end_battle.s +++ b/asm/nonmatchings/code_16c8e0/end_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel end_battle /* 173330 80244A50 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/enemy_create_target_list.s b/asm/nonmatchings/code_16c8e0/enemy_create_target_list.s index c8b9fc9a67..1f6d9baf03 100644 --- a/asm/nonmatchings/code_16c8e0/enemy_create_target_list.s +++ b/asm/nonmatchings/code_16c8e0/enemy_create_target_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enemy_create_target_list /* 191928 80263048 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_8023E104.s b/asm/nonmatchings/code_16c8e0/func_8023E104.s index 6c6fa3f94a..2044ae8f76 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023E104.s +++ b/asm/nonmatchings/code_16c8e0/func_8023E104.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8023E104 /* 16C9E4 8023E104 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_16c8e0/func_8023E11C.s b/asm/nonmatchings/code_16c8e0/func_8023E11C.s index 53fdb682b3..8169f10643 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023E11C.s +++ b/asm/nonmatchings/code_16c8e0/func_8023E11C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8023E11C /* 16C9FC 8023E11C 3C018028 */ lui $at, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/func_8023E404.s b/asm/nonmatchings/code_16c8e0/func_8023E404.s index 3ca3be8738..7516865e8e 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023E404.s +++ b/asm/nonmatchings/code_16c8e0/func_8023E404.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8023E404 /* 16CCE4 8023E404 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_8023F060.s b/asm/nonmatchings/code_16c8e0/func_8023F060.s index db729834ac..6753b4c721 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023F060.s +++ b/asm/nonmatchings/code_16c8e0/func_8023F060.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8023F060 /* 16D940 8023F060 3082FFFF */ andi $v0, $a0, 0xffff diff --git a/asm/nonmatchings/code_16c8e0/func_8023FFA0.s b/asm/nonmatchings/code_16c8e0/func_8023FFA0.s index 3156a93ac5..746754e069 100644 --- a/asm/nonmatchings/code_16c8e0/func_8023FFA0.s +++ b/asm/nonmatchings/code_16c8e0/func_8023FFA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8023FFA0 /* 16E880 8023FFA0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_16c8e0/func_802409F4.s b/asm/nonmatchings/code_16c8e0/func_802409F4.s index 290b47f610..510be9102f 100644 --- a/asm/nonmatchings/code_16c8e0/func_802409F4.s +++ b/asm/nonmatchings/code_16c8e0/func_802409F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802409F4 /* 16F2D4 802409F4 3C088011 */ lui $t0, 0x8011 diff --git a/asm/nonmatchings/code_16c8e0/func_80240AA8.s b/asm/nonmatchings/code_16c8e0/func_80240AA8.s index 01aeda467a..992248c18b 100644 --- a/asm/nonmatchings/code_16c8e0/func_80240AA8.s +++ b/asm/nonmatchings/code_16c8e0/func_80240AA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80240AA8 /* 16F388 80240AA8 3C088011 */ lui $t0, 0x8011 diff --git a/asm/nonmatchings/code_16c8e0/func_80240E60.s b/asm/nonmatchings/code_16c8e0/func_80240E60.s index 196633d11c..d8f13ae792 100644 --- a/asm/nonmatchings/code_16c8e0/func_80240E60.s +++ b/asm/nonmatchings/code_16c8e0/func_80240E60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80240E60 /* 16F740 80240E60 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_80240FDC.s b/asm/nonmatchings/code_16c8e0/func_80240FDC.s index 681d624489..aa02e6999c 100644 --- a/asm/nonmatchings/code_16c8e0/func_80240FDC.s +++ b/asm/nonmatchings/code_16c8e0/func_80240FDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80240FDC /* 16F8BC 80240FDC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_80241190.s b/asm/nonmatchings/code_16c8e0/func_80241190.s index 3d643f3d29..d999764d11 100644 --- a/asm/nonmatchings/code_16c8e0/func_80241190.s +++ b/asm/nonmatchings/code_16c8e0/func_80241190.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80241190 /* 16FA70 80241190 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_80241AB8.s b/asm/nonmatchings/code_16c8e0/func_80241AB8.s index a37c523623..ba2d681689 100644 --- a/asm/nonmatchings/code_16c8e0/func_80241AB8.s +++ b/asm/nonmatchings/code_16c8e0/func_80241AB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80241AB8 /* 170398 80241AB8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80241B14.s b/asm/nonmatchings/code_16c8e0/func_80241B14.s index f9f6ce3f33..8e577bc25d 100644 --- a/asm/nonmatchings/code_16c8e0/func_80241B14.s +++ b/asm/nonmatchings/code_16c8e0/func_80241B14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80241B14 /* 1703F4 80241B14 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8024201C.s b/asm/nonmatchings/code_16c8e0/func_8024201C.s index 3f689cc5f7..ced03fbf0e 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024201C.s +++ b/asm/nonmatchings/code_16c8e0/func_8024201C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024201C /* 1708FC 8024201C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80242AC0.s b/asm/nonmatchings/code_16c8e0/func_80242AC0.s index 19603b4610..3d2ca655e5 100644 --- a/asm/nonmatchings/code_16c8e0/func_80242AC0.s +++ b/asm/nonmatchings/code_16c8e0/func_80242AC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242AC0 /* 1713A0 80242AC0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80242BA8.s b/asm/nonmatchings/code_16c8e0/func_80242BA8.s index 0f37a429e3..f320f4a55b 100644 --- a/asm/nonmatchings/code_16c8e0/func_80242BA8.s +++ b/asm/nonmatchings/code_16c8e0/func_80242BA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242BA8 /* 171488 80242BA8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80242EF8.s b/asm/nonmatchings/code_16c8e0/func_80242EF8.s index 3f30b461c2..3289b35a29 100644 --- a/asm/nonmatchings/code_16c8e0/func_80242EF8.s +++ b/asm/nonmatchings/code_16c8e0/func_80242EF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242EF8 /* 1717D8 80242EF8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80242FD8.s b/asm/nonmatchings/code_16c8e0/func_80242FD8.s index 4471f87024..b0ca0be319 100644 --- a/asm/nonmatchings/code_16c8e0/func_80242FD8.s +++ b/asm/nonmatchings/code_16c8e0/func_80242FD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242FD8 /* 1718B8 80242FD8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80242FE0.s b/asm/nonmatchings/code_16c8e0/func_80242FE0.s index 31544512fe..b77292fe33 100644 --- a/asm/nonmatchings/code_16c8e0/func_80242FE0.s +++ b/asm/nonmatchings/code_16c8e0/func_80242FE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80242FE0 /* 1718C0 80242FE0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/func_80243910.s b/asm/nonmatchings/code_16c8e0/func_80243910.s index 6158928edd..8cd3c42752 100644 --- a/asm/nonmatchings/code_16c8e0/func_80243910.s +++ b/asm/nonmatchings/code_16c8e0/func_80243910.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243910 /* 1721F0 80243910 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_802439D0.s b/asm/nonmatchings/code_16c8e0/func_802439D0.s index 4eb42ad0ec..35b2cf7228 100644 --- a/asm/nonmatchings/code_16c8e0/func_802439D0.s +++ b/asm/nonmatchings/code_16c8e0/func_802439D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802439D0 /* 1722B0 802439D0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_802439D8.s b/asm/nonmatchings/code_16c8e0/func_802439D8.s index adafda20cb..6de50fe43a 100644 --- a/asm/nonmatchings/code_16c8e0/func_802439D8.s +++ b/asm/nonmatchings/code_16c8e0/func_802439D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802439D8 /* 1722B8 802439D8 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/func_80243FD4.s b/asm/nonmatchings/code_16c8e0/func_80243FD4.s index b1502a1c51..d2c3945061 100644 --- a/asm/nonmatchings/code_16c8e0/func_80243FD4.s +++ b/asm/nonmatchings/code_16c8e0/func_80243FD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243FD4 /* 1728B4 80243FD4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80243FDC.s b/asm/nonmatchings/code_16c8e0/func_80243FDC.s index 32b638e40c..3b31f98df4 100644 --- a/asm/nonmatchings/code_16c8e0/func_80243FDC.s +++ b/asm/nonmatchings/code_16c8e0/func_80243FDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80243FDC /* 1728BC 80243FDC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80244000.s b/asm/nonmatchings/code_16c8e0/func_80244000.s index 2e6d179085..22dcf540bf 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244000.s +++ b/asm/nonmatchings/code_16c8e0/func_80244000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244000 /* 1728E0 80244000 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80244008.s b/asm/nonmatchings/code_16c8e0/func_80244008.s index fd1ed4b313..4f7af1480f 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244008.s +++ b/asm/nonmatchings/code_16c8e0/func_80244008.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244008 /* 1728E8 80244008 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/func_80244708.s b/asm/nonmatchings/code_16c8e0/func_80244708.s index bb515be721..bb39d4f80b 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244708.s +++ b/asm/nonmatchings/code_16c8e0/func_80244708.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244708 /* 172FE8 80244708 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80244710.s b/asm/nonmatchings/code_16c8e0/func_80244710.s index d0a2c5627f..63251179f8 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244710.s +++ b/asm/nonmatchings/code_16c8e0/func_80244710.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244710 /* 172FF0 80244710 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/func_80244A48.s b/asm/nonmatchings/code_16c8e0/func_80244A48.s index 4241ac71c5..fc12eeac6e 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244A48.s +++ b/asm/nonmatchings/code_16c8e0/func_80244A48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244A48 /* 173328 80244A48 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80244D90.s b/asm/nonmatchings/code_16c8e0/func_80244D90.s index 0c9f8791b1..f0a3c48fb8 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244D90.s +++ b/asm/nonmatchings/code_16c8e0/func_80244D90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244D90 /* 173670 80244D90 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80244E38.s b/asm/nonmatchings/code_16c8e0/func_80244E38.s index fd139e5c1b..033e21f126 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244E38.s +++ b/asm/nonmatchings/code_16c8e0/func_80244E38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244E38 /* 173718 80244E38 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_80244EF8.s b/asm/nonmatchings/code_16c8e0/func_80244EF8.s index d9d96be7b4..4940c58bc3 100644 --- a/asm/nonmatchings/code_16c8e0/func_80244EF8.s +++ b/asm/nonmatchings/code_16c8e0/func_80244EF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80244EF8 /* 1737D8 80244EF8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80245438.s b/asm/nonmatchings/code_16c8e0/func_80245438.s index 697e5e335c..2d5e42c087 100644 --- a/asm/nonmatchings/code_16c8e0/func_80245438.s +++ b/asm/nonmatchings/code_16c8e0/func_80245438.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245438 /* 173D18 80245438 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80245440.s b/asm/nonmatchings/code_16c8e0/func_80245440.s index 5187cd4f64..230acadf5f 100644 --- a/asm/nonmatchings/code_16c8e0/func_80245440.s +++ b/asm/nonmatchings/code_16c8e0/func_80245440.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245440 /* 173D20 80245440 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_802456B0.s b/asm/nonmatchings/code_16c8e0/func_802456B0.s index 0b3b4fd0ff..b82ffb79a5 100644 --- a/asm/nonmatchings/code_16c8e0/func_802456B0.s +++ b/asm/nonmatchings/code_16c8e0/func_802456B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802456B0 /* 173F90 802456B0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80245AC8.s b/asm/nonmatchings/code_16c8e0/func_80245AC8.s index 2f26e9b4e4..e9d0b044b9 100644 --- a/asm/nonmatchings/code_16c8e0/func_80245AC8.s +++ b/asm/nonmatchings/code_16c8e0/func_80245AC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80245AC8 /* 1743A8 80245AC8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80246448.s b/asm/nonmatchings/code_16c8e0/func_80246448.s index 81cc09f9da..ad252016b7 100644 --- a/asm/nonmatchings/code_16c8e0/func_80246448.s +++ b/asm/nonmatchings/code_16c8e0/func_80246448.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246448 /* 174D28 80246448 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80246B2C.s b/asm/nonmatchings/code_16c8e0/func_80246B2C.s index 92f578d704..5cd3490bc1 100644 --- a/asm/nonmatchings/code_16c8e0/func_80246B2C.s +++ b/asm/nonmatchings/code_16c8e0/func_80246B2C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80246B2C /* 17540C 80246B2C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80247214.s b/asm/nonmatchings/code_16c8e0/func_80247214.s index 69d5f0c875..4847fb21a5 100644 --- a/asm/nonmatchings/code_16c8e0/func_80247214.s +++ b/asm/nonmatchings/code_16c8e0/func_80247214.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247214 /* 175AF4 80247214 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_8024721C.s b/asm/nonmatchings/code_16c8e0/func_8024721C.s index 7734fbf9ff..ccf2af9866 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024721C.s +++ b/asm/nonmatchings/code_16c8e0/func_8024721C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024721C /* 175AFC 8024721C 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_802472A4.s b/asm/nonmatchings/code_16c8e0/func_802472A4.s index 762393568b..5a1fad88db 100644 --- a/asm/nonmatchings/code_16c8e0/func_802472A4.s +++ b/asm/nonmatchings/code_16c8e0/func_802472A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802472A4 /* 175B84 802472A4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80247568.s b/asm/nonmatchings/code_16c8e0/func_80247568.s index 3590fcef04..0d03f5fbef 100644 --- a/asm/nonmatchings/code_16c8e0/func_80247568.s +++ b/asm/nonmatchings/code_16c8e0/func_80247568.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247568 /* 175E48 80247568 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80247AFC.s b/asm/nonmatchings/code_16c8e0/func_80247AFC.s index 558afebadf..38e37469d8 100644 --- a/asm/nonmatchings/code_16c8e0/func_80247AFC.s +++ b/asm/nonmatchings/code_16c8e0/func_80247AFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247AFC /* 1763DC 80247AFC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80247B04.s b/asm/nonmatchings/code_16c8e0/func_80247B04.s index 59a961fe3f..9c71dd0563 100644 --- a/asm/nonmatchings/code_16c8e0/func_80247B04.s +++ b/asm/nonmatchings/code_16c8e0/func_80247B04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80247B04 /* 1763E4 80247B04 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_802480F0.s b/asm/nonmatchings/code_16c8e0/func_802480F0.s index 80ea5eaee3..ccf3daf1c3 100644 --- a/asm/nonmatchings/code_16c8e0/func_802480F0.s +++ b/asm/nonmatchings/code_16c8e0/func_802480F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802480F0 /* 1769D0 802480F0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80248190.s b/asm/nonmatchings/code_16c8e0/func_80248190.s index 6a5a9d18ae..10f30879e4 100644 --- a/asm/nonmatchings/code_16c8e0/func_80248190.s +++ b/asm/nonmatchings/code_16c8e0/func_80248190.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248190 /* 176A70 80248190 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_802485FC.s b/asm/nonmatchings/code_16c8e0/func_802485FC.s index 4ea6b19cfb..c69cb6a1ef 100644 --- a/asm/nonmatchings/code_16c8e0/func_802485FC.s +++ b/asm/nonmatchings/code_16c8e0/func_802485FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802485FC /* 176EDC 802485FC 3C02802A */ lui $v0, 0x802a diff --git a/asm/nonmatchings/code_16c8e0/func_80248660.s b/asm/nonmatchings/code_16c8e0/func_80248660.s index 6ce0ced8a8..1b4c4eab1f 100644 --- a/asm/nonmatchings/code_16c8e0/func_80248660.s +++ b/asm/nonmatchings/code_16c8e0/func_80248660.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248660 /* 176F40 80248660 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_80248AA4.s b/asm/nonmatchings/code_16c8e0/func_80248AA4.s index 37d3caf64e..3122bf7413 100644 --- a/asm/nonmatchings/code_16c8e0/func_80248AA4.s +++ b/asm/nonmatchings/code_16c8e0/func_80248AA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248AA4 /* 177384 80248AA4 3C02802A */ lui $v0, 0x802a diff --git a/asm/nonmatchings/code_16c8e0/func_80248B08.s b/asm/nonmatchings/code_16c8e0/func_80248B08.s index dd0c2e0e04..eb7239bb39 100644 --- a/asm/nonmatchings/code_16c8e0/func_80248B08.s +++ b/asm/nonmatchings/code_16c8e0/func_80248B08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248B08 /* 1773E8 80248B08 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_80248D78.s b/asm/nonmatchings/code_16c8e0/func_80248D78.s index 3949f26578..5ac2823542 100644 --- a/asm/nonmatchings/code_16c8e0/func_80248D78.s +++ b/asm/nonmatchings/code_16c8e0/func_80248D78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80248D78 /* 177658 80248D78 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_8024E3D8.s b/asm/nonmatchings/code_16c8e0/func_8024E3D8.s index 7959a17dec..c5ea0e6547 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024E3D8.s +++ b/asm/nonmatchings/code_16c8e0/func_8024E3D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E3D8 /* 17CCB8 8024E3D8 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/func_8024E40C.s b/asm/nonmatchings/code_16c8e0/func_8024E40C.s index b89ec90f05..1eba9765a9 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024E40C.s +++ b/asm/nonmatchings/code_16c8e0/func_8024E40C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E40C /* 17CCEC 8024E40C 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/func_8024E45C.s b/asm/nonmatchings/code_16c8e0/func_8024E45C.s index 2dc55549aa..07adad143a 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024E45C.s +++ b/asm/nonmatchings/code_16c8e0/func_8024E45C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E45C /* 17CD3C 8024E45C 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/func_8024E484.s b/asm/nonmatchings/code_16c8e0/func_8024E484.s index f0ff6acd5f..5c0c51db11 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024E484.s +++ b/asm/nonmatchings/code_16c8e0/func_8024E484.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E484 /* 17CD64 8024E484 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/func_8024E584.s b/asm/nonmatchings/code_16c8e0/func_8024E584.s index 1de558e87f..bb17744fd9 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024E584.s +++ b/asm/nonmatchings/code_16c8e0/func_8024E584.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E584 /* 17CE64 8024E584 3C02802A */ lui $v0, 0x802a diff --git a/asm/nonmatchings/code_16c8e0/func_8024E60C.s b/asm/nonmatchings/code_16c8e0/func_8024E60C.s index 390e2f0f44..a7c0a12ada 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024E60C.s +++ b/asm/nonmatchings/code_16c8e0/func_8024E60C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024E60C /* 17CEEC 8024E60C 3C01802A */ lui $at, 0x802a diff --git a/asm/nonmatchings/code_16c8e0/func_8024EDC0.s b/asm/nonmatchings/code_16c8e0/func_8024EDC0.s index 850151fda9..35eaee4cac 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024EDC0.s +++ b/asm/nonmatchings/code_16c8e0/func_8024EDC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EDC0 /* 17D6A0 8024EDC0 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_8024EE48.s b/asm/nonmatchings/code_16c8e0/func_8024EE48.s index 7b1955c9ab..5172bb24e2 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024EE48.s +++ b/asm/nonmatchings/code_16c8e0/func_8024EE48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EE48 /* 17D728 8024EE48 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_8024EEA8.s b/asm/nonmatchings/code_16c8e0/func_8024EEA8.s index a07a35db58..6137b73d37 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024EEA8.s +++ b/asm/nonmatchings/code_16c8e0/func_8024EEA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EEA8 /* 17D788 8024EEA8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_8024EF08.s b/asm/nonmatchings/code_16c8e0/func_8024EF08.s index d81a010b7c..be71eab956 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024EF08.s +++ b/asm/nonmatchings/code_16c8e0/func_8024EF08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EF08 /* 17D7E8 8024EF08 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_8024EFA4.s b/asm/nonmatchings/code_16c8e0/func_8024EFA4.s index 75cf15f929..f11a1b0ded 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024EFA4.s +++ b/asm/nonmatchings/code_16c8e0/func_8024EFA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EFA4 /* 17D884 8024EFA4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_8024EFE0.s b/asm/nonmatchings/code_16c8e0/func_8024EFE0.s index 979b8bdd33..39951304a0 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024EFE0.s +++ b/asm/nonmatchings/code_16c8e0/func_8024EFE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024EFE0 /* 17D8C0 8024EFE0 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_16c8e0/func_8024F7C8.s b/asm/nonmatchings/code_16c8e0/func_8024F7C8.s index 52da58525e..33301eea2c 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024F7C8.s +++ b/asm/nonmatchings/code_16c8e0/func_8024F7C8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024F7C8 /* 17E0A8 8024F7C8 0000382D */ daddu $a3, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_8024FAE8.s b/asm/nonmatchings/code_16c8e0/func_8024FAE8.s index c72e28e80a..d2348562a9 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024FAE8.s +++ b/asm/nonmatchings/code_16c8e0/func_8024FAE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024FAE8 /* 17E3C8 8024FAE8 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_16c8e0/func_8024FAFC.s b/asm/nonmatchings/code_16c8e0/func_8024FAFC.s index a3d20480cb..8af4823cbf 100644 --- a/asm/nonmatchings/code_16c8e0/func_8024FAFC.s +++ b/asm/nonmatchings/code_16c8e0/func_8024FAFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8024FAFC /* 17E3DC 8024FAFC 3C01802A */ lui $at, 0x802a diff --git a/asm/nonmatchings/code_16c8e0/func_80251474.s b/asm/nonmatchings/code_16c8e0/func_80251474.s index 9ac1e6ea87..14347bb080 100644 --- a/asm/nonmatchings/code_16c8e0/func_80251474.s +++ b/asm/nonmatchings/code_16c8e0/func_80251474.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80251474 /* 17FD54 80251474 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_80254250.s b/asm/nonmatchings/code_16c8e0/func_80254250.s index fbec9feae0..3c3f63b124 100644 --- a/asm/nonmatchings/code_16c8e0/func_80254250.s +++ b/asm/nonmatchings/code_16c8e0/func_80254250.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80254250 /* 182B30 80254250 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_802545AC.s b/asm/nonmatchings/code_16c8e0/func_802545AC.s index 4dd35f1e6a..53b5df98ee 100644 --- a/asm/nonmatchings/code_16c8e0/func_802545AC.s +++ b/asm/nonmatchings/code_16c8e0/func_802545AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802545AC /* 182E8C 802545AC 8C8301F4 */ lw $v1, 0x1f4($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_80254610.s b/asm/nonmatchings/code_16c8e0/func_80254610.s index fa4927afb6..fd70923ff4 100644 --- a/asm/nonmatchings/code_16c8e0/func_80254610.s +++ b/asm/nonmatchings/code_16c8e0/func_80254610.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80254610 /* 182EF0 80254610 8C8301F4 */ lw $v1, 0x1f4($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_80254950.s b/asm/nonmatchings/code_16c8e0/func_80254950.s index 3b034d1273..1b532e94c3 100644 --- a/asm/nonmatchings/code_16c8e0/func_80254950.s +++ b/asm/nonmatchings/code_16c8e0/func_80254950.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80254950 /* 183230 80254950 3C04800E */ lui $a0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_802549A0.s b/asm/nonmatchings/code_16c8e0/func_802549A0.s index 0eae57f909..a6ac3749f0 100644 --- a/asm/nonmatchings/code_16c8e0/func_802549A0.s +++ b/asm/nonmatchings/code_16c8e0/func_802549A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802549A0 /* 183280 802549A0 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_802549C0.s b/asm/nonmatchings/code_16c8e0/func_802549C0.s index 8fd8c0bc27..bf169d5be2 100644 --- a/asm/nonmatchings/code_16c8e0/func_802549C0.s +++ b/asm/nonmatchings/code_16c8e0/func_802549C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802549C0 /* 1832A0 802549C0 3C05EFFF */ lui $a1, 0xefff diff --git a/asm/nonmatchings/code_16c8e0/func_802549F4.s b/asm/nonmatchings/code_16c8e0/func_802549F4.s index 7cc3d26d66..201feddb75 100644 --- a/asm/nonmatchings/code_16c8e0/func_802549F4.s +++ b/asm/nonmatchings/code_16c8e0/func_802549F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802549F4 /* 1832D4 802549F4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_802550BC.s b/asm/nonmatchings/code_16c8e0/func_802550BC.s index 62015f9ae2..6e139f51c9 100644 --- a/asm/nonmatchings/code_16c8e0/func_802550BC.s +++ b/asm/nonmatchings/code_16c8e0/func_802550BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802550BC /* 18399C 802550BC 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/func_802552EC.s b/asm/nonmatchings/code_16c8e0/func_802552EC.s index 157ca0b033..d1bcca277c 100644 --- a/asm/nonmatchings/code_16c8e0/func_802552EC.s +++ b/asm/nonmatchings/code_16c8e0/func_802552EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802552EC /* 183BCC 802552EC 27BDFC68 */ addiu $sp, $sp, -0x398 diff --git a/asm/nonmatchings/code_16c8e0/func_8025593C.s b/asm/nonmatchings/code_16c8e0/func_8025593C.s index b6db50acc5..ec478b8eb9 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025593C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025593C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025593C /* 18421C 8025593C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_8025597C.s b/asm/nonmatchings/code_16c8e0/func_8025597C.s index c14202f97e..9130d45137 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025597C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025597C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025597C /* 18425C 8025597C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_802559BC.s b/asm/nonmatchings/code_16c8e0/func_802559BC.s index 63f1c39346..1667482954 100644 --- a/asm/nonmatchings/code_16c8e0/func_802559BC.s +++ b/asm/nonmatchings/code_16c8e0/func_802559BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802559BC /* 18429C 802559BC 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_16c8e0/func_80255F5C.s b/asm/nonmatchings/code_16c8e0/func_80255F5C.s index bd19a1ddf8..b14ace3d04 100644 --- a/asm/nonmatchings/code_16c8e0/func_80255F5C.s +++ b/asm/nonmatchings/code_16c8e0/func_80255F5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80255F5C /* 18483C 80255F5C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_80255FAC.s b/asm/nonmatchings/code_16c8e0/func_80255FAC.s index 77af7300ff..3d006787c2 100644 --- a/asm/nonmatchings/code_16c8e0/func_80255FAC.s +++ b/asm/nonmatchings/code_16c8e0/func_80255FAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80255FAC /* 18488C 80255FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80255FD8.s b/asm/nonmatchings/code_16c8e0/func_80255FD8.s index ad9db17e69..e35278083c 100644 --- a/asm/nonmatchings/code_16c8e0/func_80255FD8.s +++ b/asm/nonmatchings/code_16c8e0/func_80255FD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80255FD8 /* 1848B8 80255FD8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80255FE0.s b/asm/nonmatchings/code_16c8e0/func_80255FE0.s index ca82088cbc..6a6faf4f8d 100644 --- a/asm/nonmatchings/code_16c8e0/func_80255FE0.s +++ b/asm/nonmatchings/code_16c8e0/func_80255FE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80255FE0 /* 1848C0 80255FE0 27BDFC30 */ addiu $sp, $sp, -0x3d0 diff --git a/asm/nonmatchings/code_16c8e0/func_802571F0.s b/asm/nonmatchings/code_16c8e0/func_802571F0.s index 060f812863..fd610c6412 100644 --- a/asm/nonmatchings/code_16c8e0/func_802571F0.s +++ b/asm/nonmatchings/code_16c8e0/func_802571F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802571F0 /* 185AD0 802571F0 27BDFC38 */ addiu $sp, $sp, -0x3c8 diff --git a/asm/nonmatchings/code_16c8e0/func_80257BAC.s b/asm/nonmatchings/code_16c8e0/func_80257BAC.s index 873186a944..055d1e78f1 100644 --- a/asm/nonmatchings/code_16c8e0/func_80257BAC.s +++ b/asm/nonmatchings/code_16c8e0/func_80257BAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80257BAC /* 18648C 80257BAC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/func_802591EC.s b/asm/nonmatchings/code_16c8e0/func_802591EC.s index 0e9eee0baa..2ee5659d98 100644 --- a/asm/nonmatchings/code_16c8e0/func_802591EC.s +++ b/asm/nonmatchings/code_16c8e0/func_802591EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802591EC /* 187ACC 802591EC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_80259494.s b/asm/nonmatchings/code_16c8e0/func_80259494.s index 617df3b4e0..757d722856 100644 --- a/asm/nonmatchings/code_16c8e0/func_80259494.s +++ b/asm/nonmatchings/code_16c8e0/func_80259494.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80259494 /* 187D74 80259494 8C8800C0 */ lw $t0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025950C.s b/asm/nonmatchings/code_16c8e0/func_8025950C.s index 2c10b0b108..47110896f6 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025950C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025950C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025950C /* 187DEC 8025950C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_802596C0.s b/asm/nonmatchings/code_16c8e0/func_802596C0.s index 82bc786426..7eca57f2e8 100644 --- a/asm/nonmatchings/code_16c8e0/func_802596C0.s +++ b/asm/nonmatchings/code_16c8e0/func_802596C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802596C0 /* 187FA0 802596C0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/func_802597B0.s b/asm/nonmatchings/code_16c8e0/func_802597B0.s index 6a5e57e814..b800c70e8e 100644 --- a/asm/nonmatchings/code_16c8e0/func_802597B0.s +++ b/asm/nonmatchings/code_16c8e0/func_802597B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802597B0 /* 188090 802597B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025995C.s b/asm/nonmatchings/code_16c8e0/func_8025995C.s index 8849c422bc..d8d0ef8ea7 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025995C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025995C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025995C /* 18823C 8025995C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_80259A48.s b/asm/nonmatchings/code_16c8e0/func_80259A48.s index 4d663332fe..78c487a72a 100644 --- a/asm/nonmatchings/code_16c8e0/func_80259A48.s +++ b/asm/nonmatchings/code_16c8e0/func_80259A48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80259A48 /* 188328 80259A48 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80259AAC.s b/asm/nonmatchings/code_16c8e0/func_80259AAC.s index ca8da01424..8252850d64 100644 --- a/asm/nonmatchings/code_16c8e0/func_80259AAC.s +++ b/asm/nonmatchings/code_16c8e0/func_80259AAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80259AAC /* 18838C 80259AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_80259D9C.s b/asm/nonmatchings/code_16c8e0/func_80259D9C.s index 66984e1161..c367c77793 100644 --- a/asm/nonmatchings/code_16c8e0/func_80259D9C.s +++ b/asm/nonmatchings/code_16c8e0/func_80259D9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80259D9C /* 18867C 80259D9C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025A2C4.s b/asm/nonmatchings/code_16c8e0/func_8025A2C4.s index b7dad562b2..6680c3a689 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025A2C4.s +++ b/asm/nonmatchings/code_16c8e0/func_8025A2C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025A2C4 /* 188BA4 8025A2C4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025A50C.s b/asm/nonmatchings/code_16c8e0/func_8025A50C.s index e3cb8b0f43..2fbb8be9df 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025A50C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025A50C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025A50C /* 188DEC 8025A50C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025A74C.s b/asm/nonmatchings/code_16c8e0/func_8025A74C.s index 816e795bfb..ac8297a4c2 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025A74C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025A74C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025A74C /* 18902C 8025A74C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025AA80.s b/asm/nonmatchings/code_16c8e0/func_8025AA80.s index 6c2e3290c0..90cf81c764 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025AA80.s +++ b/asm/nonmatchings/code_16c8e0/func_8025AA80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025AA80 /* 189360 8025AA80 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025AD90.s b/asm/nonmatchings/code_16c8e0/func_8025AD90.s index d5a7a3c09f..b08ca39f65 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025AD90.s +++ b/asm/nonmatchings/code_16c8e0/func_8025AD90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025AD90 /* 189670 8025AD90 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025B1A8.s b/asm/nonmatchings/code_16c8e0/func_8025B1A8.s index 8bf35cacc8..5af9a0e0ca 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025B1A8.s +++ b/asm/nonmatchings/code_16c8e0/func_8025B1A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025B1A8 /* 189A88 8025B1A8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025B5C0.s b/asm/nonmatchings/code_16c8e0/func_8025B5C0.s index f1f173a4fa..23fb08d187 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025B5C0.s +++ b/asm/nonmatchings/code_16c8e0/func_8025B5C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025B5C0 /* 189EA0 8025B5C0 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/func_8025BAA0.s b/asm/nonmatchings/code_16c8e0/func_8025BAA0.s index 25e28719fa..16a82189db 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025BAA0.s +++ b/asm/nonmatchings/code_16c8e0/func_8025BAA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025BAA0 /* 18A380 8025BAA0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/func_8025C120.s b/asm/nonmatchings/code_16c8e0/func_8025C120.s index 1e2cab6f6c..399c11f370 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025C120.s +++ b/asm/nonmatchings/code_16c8e0/func_8025C120.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025C120 /* 18AA00 8025C120 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/func_8025C840.s b/asm/nonmatchings/code_16c8e0/func_8025C840.s index ff7dfe1217..82c73a527c 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025C840.s +++ b/asm/nonmatchings/code_16c8e0/func_8025C840.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025C840 /* 18B120 8025C840 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_8025C8A0.s b/asm/nonmatchings/code_16c8e0/func_8025C8A0.s index fb60e74bb1..087ee8190a 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025C8A0.s +++ b/asm/nonmatchings/code_16c8e0/func_8025C8A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025C8A0 /* 18B180 8025C8A0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025C918.s b/asm/nonmatchings/code_16c8e0/func_8025C918.s index 721093aa70..c4a7c03719 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025C918.s +++ b/asm/nonmatchings/code_16c8e0/func_8025C918.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025C918 /* 18B1F8 8025C918 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_16c8e0/func_8025CCC8.s b/asm/nonmatchings/code_16c8e0/func_8025CCC8.s index 442ecfb249..305aa06bb7 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025CCC8.s +++ b/asm/nonmatchings/code_16c8e0/func_8025CCC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025CCC8 /* 18B5A8 8025CCC8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_8025CD28.s b/asm/nonmatchings/code_16c8e0/func_8025CD28.s index 4b3ad5635c..abce9d6245 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025CD28.s +++ b/asm/nonmatchings/code_16c8e0/func_8025CD28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025CD28 /* 18B608 8025CD28 8CA300C0 */ lw $v1, 0xc0($a1) diff --git a/asm/nonmatchings/code_16c8e0/func_8025CD40.s b/asm/nonmatchings/code_16c8e0/func_8025CD40.s index 82b0353e94..8b17d52be3 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025CD40.s +++ b/asm/nonmatchings/code_16c8e0/func_8025CD40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025CD40 /* 18B620 8025CD40 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025CEC8.s b/asm/nonmatchings/code_16c8e0/func_8025CEC8.s index 4d967f3782..634eb012b9 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025CEC8.s +++ b/asm/nonmatchings/code_16c8e0/func_8025CEC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025CEC8 /* 18B7A8 8025CEC8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D150.s b/asm/nonmatchings/code_16c8e0/func_8025D150.s index b7a125732d..3b3a7e9533 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D150.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D150.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D150 /* 18BA30 8025D150 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_8025D158.s b/asm/nonmatchings/code_16c8e0/func_8025D158.s index 6e75e3f0e0..ca0b395179 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D158.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D158.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D158 /* 18BA38 8025D158 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_8025D160.s b/asm/nonmatchings/code_16c8e0/func_8025D160.s index 6d17a15ce8..f7045f564f 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D160.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D160.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D160 /* 18BA40 8025D160 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D290.s b/asm/nonmatchings/code_16c8e0/func_8025D290.s index 414f1d327f..2d297ca636 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D290.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D290.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D290 /* 18BB70 8025D290 8C8200C0 */ lw $v0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025D2B0.s b/asm/nonmatchings/code_16c8e0/func_8025D2B0.s index 846c879969..a69347fe8e 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D2B0.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D2B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D2B0 /* 18BB90 8025D2B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D3C4.s b/asm/nonmatchings/code_16c8e0/func_8025D3C4.s index e7c61c959e..779f6a285a 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D3C4.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D3C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D3C4 /* 18BCA4 8025D3C4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_8025D3CC.s b/asm/nonmatchings/code_16c8e0/func_8025D3CC.s index 2b3ae709d6..edac629f5d 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D3CC.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D3CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D3CC /* 18BCAC 8025D3CC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D4A0.s b/asm/nonmatchings/code_16c8e0/func_8025D4A0.s index 481088025c..4ff3916a2d 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D4A0.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D4A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D4A0 /* 18BD80 8025D4A0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D4C8.s b/asm/nonmatchings/code_16c8e0/func_8025D4C8.s index f4b6caa0eb..0b3a6673a6 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D4C8.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D4C8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D4C8 /* 18BDA8 8025D4C8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D620.s b/asm/nonmatchings/code_16c8e0/func_8025D620.s index 74baf345ff..741832e1e6 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D620.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D620.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D620 /* 18BF00 8025D620 8C8200C0 */ lw $v0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025D640.s b/asm/nonmatchings/code_16c8e0/func_8025D640.s index c56286f778..8f915093ee 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D640.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D640.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D640 /* 18BF20 8025D640 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D6FC.s b/asm/nonmatchings/code_16c8e0/func_8025D6FC.s index 177c960e0a..f5ebc57fbc 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D6FC.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D6FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D6FC /* 18BFDC 8025D6FC 8C8200C0 */ lw $v0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025D71C.s b/asm/nonmatchings/code_16c8e0/func_8025D71C.s index de74998434..8e4fcf13c4 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D71C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D71C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D71C /* 18BFFC 8025D71C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D810.s b/asm/nonmatchings/code_16c8e0/func_8025D810.s index f60be9b997..d8643d9432 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D810.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D810.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D810 /* 18C0F0 8025D810 8C8200C0 */ lw $v0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025D830.s b/asm/nonmatchings/code_16c8e0/func_8025D830.s index 0248b73d88..9b8601e7e8 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D830.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D830.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D830 /* 18C110 8025D830 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025D8EC.s b/asm/nonmatchings/code_16c8e0/func_8025D8EC.s index d598859492..59bebed022 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D8EC.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D8EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D8EC /* 18C1CC 8025D8EC 8C8200C0 */ lw $v0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025D90C.s b/asm/nonmatchings/code_16c8e0/func_8025D90C.s index 1f0f86e2e0..4e411e5ffc 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025D90C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025D90C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025D90C /* 18C1EC 8025D90C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_8025DA60.s b/asm/nonmatchings/code_16c8e0/func_8025DA60.s index 8700076988..59290d29e5 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025DA60.s +++ b/asm/nonmatchings/code_16c8e0/func_8025DA60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025DA60 /* 18C340 8025DA60 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_8025DA68.s b/asm/nonmatchings/code_16c8e0/func_8025DA68.s index 28ed6b7ace..64c9d39f28 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025DA68.s +++ b/asm/nonmatchings/code_16c8e0/func_8025DA68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025DA68 /* 18C348 8025DA68 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/func_8025DBC8.s b/asm/nonmatchings/code_16c8e0/func_8025DBC8.s index 6b8b8ab76f..84843a2562 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025DBC8.s +++ b/asm/nonmatchings/code_16c8e0/func_8025DBC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025DBC8 /* 18C4A8 8025DBC8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_8025DBD0.s b/asm/nonmatchings/code_16c8e0/func_8025DBD0.s index faf4781639..bcdaf729b4 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025DBD0.s +++ b/asm/nonmatchings/code_16c8e0/func_8025DBD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025DBD0 /* 18C4B0 8025DBD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025DD40.s b/asm/nonmatchings/code_16c8e0/func_8025DD40.s index 7a4ab720dc..9a7b4bf01c 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025DD40.s +++ b/asm/nonmatchings/code_16c8e0/func_8025DD40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025DD40 /* 18C620 8025DD40 8C8200C0 */ lw $v0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025DD60.s b/asm/nonmatchings/code_16c8e0/func_8025DD60.s index 06898d357a..150d8c5009 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025DD60.s +++ b/asm/nonmatchings/code_16c8e0/func_8025DD60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025DD60 /* 18C640 8025DD60 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_8025DE88.s b/asm/nonmatchings/code_16c8e0/func_8025DE88.s index b8d33048b7..97b12a14bb 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025DE88.s +++ b/asm/nonmatchings/code_16c8e0/func_8025DE88.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025DE88 /* 18C768 8025DE88 8C8200C0 */ lw $v0, 0xc0($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8025E190.s b/asm/nonmatchings/code_16c8e0/func_8025E190.s index 2076b5d253..3d7577044b 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025E190.s +++ b/asm/nonmatchings/code_16c8e0/func_8025E190.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025E190 /* 18CA70 8025E190 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_8025FF8C.s b/asm/nonmatchings/code_16c8e0/func_8025FF8C.s index 4a857b0d1e..212e40d5af 100644 --- a/asm/nonmatchings/code_16c8e0/func_8025FF8C.s +++ b/asm/nonmatchings/code_16c8e0/func_8025FF8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8025FF8C /* 18E86C 8025FF8C 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_16c8e0/func_802601BC.s b/asm/nonmatchings/code_16c8e0/func_802601BC.s index a57d602e95..422b83f81e 100644 --- a/asm/nonmatchings/code_16c8e0/func_802601BC.s +++ b/asm/nonmatchings/code_16c8e0/func_802601BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802601BC /* 18EA9C 802601BC 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_80260A60.s b/asm/nonmatchings/code_16c8e0/func_80260A60.s index 36fafdd863..b3cb387125 100644 --- a/asm/nonmatchings/code_16c8e0/func_80260A60.s +++ b/asm/nonmatchings/code_16c8e0/func_80260A60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80260A60 /* 18F340 80260A60 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80263064.s b/asm/nonmatchings/code_16c8e0/func_80263064.s index d4dd4399fd..7b25a15e3a 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263064.s +++ b/asm/nonmatchings/code_16c8e0/func_80263064.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263064 /* 191944 80263064 0000402D */ daddu $t0, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_80263230.s b/asm/nonmatchings/code_16c8e0/func_80263230.s index 50efbc9510..0507795f56 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263230.s +++ b/asm/nonmatchings/code_16c8e0/func_80263230.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263230 /* 191B10 80263230 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80263268.s b/asm/nonmatchings/code_16c8e0/func_80263268.s index 38d61835bf..dc074cd3a3 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263268.s +++ b/asm/nonmatchings/code_16c8e0/func_80263268.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263268 /* 191B48 80263268 3C07800E */ lui $a3, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_80263300.s b/asm/nonmatchings/code_16c8e0/func_80263300.s index 74b8d5d6ef..3b67a02bf3 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263300.s +++ b/asm/nonmatchings/code_16c8e0/func_80263300.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263300 /* 191BE0 80263300 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/func_802633E8.s b/asm/nonmatchings/code_16c8e0/func_802633E8.s index 9fccc2f8e6..365d3e4660 100644 --- a/asm/nonmatchings/code_16c8e0/func_802633E8.s +++ b/asm/nonmatchings/code_16c8e0/func_802633E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802633E8 /* 191CC8 802633E8 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_80263434.s b/asm/nonmatchings/code_16c8e0/func_80263434.s index 3327fc4ad3..f6ae2210c9 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263434.s +++ b/asm/nonmatchings/code_16c8e0/func_80263434.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263434 /* 191D14 80263434 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80263464.s b/asm/nonmatchings/code_16c8e0/func_80263464.s index 2ce1f79265..c9e9ef445b 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263464.s +++ b/asm/nonmatchings/code_16c8e0/func_80263464.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263464 /* 191D44 80263464 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_16c8e0/func_802634B8.s b/asm/nonmatchings/code_16c8e0/func_802634B8.s index afa0f196f0..3e12589f4b 100644 --- a/asm/nonmatchings/code_16c8e0/func_802634B8.s +++ b/asm/nonmatchings/code_16c8e0/func_802634B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802634B8 /* 191D98 802634B8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/func_802636E4.s b/asm/nonmatchings/code_16c8e0/func_802636E4.s index 74b89dd331..936d70772d 100644 --- a/asm/nonmatchings/code_16c8e0/func_802636E4.s +++ b/asm/nonmatchings/code_16c8e0/func_802636E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802636E4 /* 191FC4 802636E4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/func_80263914.s b/asm/nonmatchings/code_16c8e0/func_80263914.s index daae4a6f69..89c8f1230a 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263914.s +++ b/asm/nonmatchings/code_16c8e0/func_80263914.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263914 /* 1921F4 80263914 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/func_80263C60.s b/asm/nonmatchings/code_16c8e0/func_80263C60.s index 07cf0b43f5..602de53088 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263C60.s +++ b/asm/nonmatchings/code_16c8e0/func_80263C60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263C60 /* 192540 80263C60 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_80263E08.s b/asm/nonmatchings/code_16c8e0/func_80263E08.s index cdaa31202f..ebb3f7e15f 100644 --- a/asm/nonmatchings/code_16c8e0/func_80263E08.s +++ b/asm/nonmatchings/code_16c8e0/func_80263E08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80263E08 /* 1926E8 80263E08 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80265CE8.s b/asm/nonmatchings/code_16c8e0/func_80265CE8.s index 2cf4170068..29fe890ffe 100644 --- a/asm/nonmatchings/code_16c8e0/func_80265CE8.s +++ b/asm/nonmatchings/code_16c8e0/func_80265CE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80265CE8 /* 1945C8 80265CE8 14800006 */ bnez $a0, .L80265D04 diff --git a/asm/nonmatchings/code_16c8e0/func_80265D44.s b/asm/nonmatchings/code_16c8e0/func_80265D44.s index 63d1b882ae..d214809fd5 100644 --- a/asm/nonmatchings/code_16c8e0/func_80265D44.s +++ b/asm/nonmatchings/code_16c8e0/func_80265D44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80265D44 /* 194624 80265D44 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/func_802664DC.s b/asm/nonmatchings/code_16c8e0/func_802664DC.s index e2dfb109c8..ccb7b66b40 100644 --- a/asm/nonmatchings/code_16c8e0/func_802664DC.s +++ b/asm/nonmatchings/code_16c8e0/func_802664DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802664DC /* 194DBC 802664DC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_80266684.s b/asm/nonmatchings/code_16c8e0/func_80266684.s index 84453fa035..3e320b0b39 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266684.s +++ b/asm/nonmatchings/code_16c8e0/func_80266684.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266684 /* 194F64 80266684 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_802666E4.s b/asm/nonmatchings/code_16c8e0/func_802666E4.s index 57b0900aa2..8c9f8d9135 100644 --- a/asm/nonmatchings/code_16c8e0/func_802666E4.s +++ b/asm/nonmatchings/code_16c8e0/func_802666E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802666E4 /* 194FC4 802666E4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_802667F0.s b/asm/nonmatchings/code_16c8e0/func_802667F0.s index d76811d7f8..62783904eb 100644 --- a/asm/nonmatchings/code_16c8e0/func_802667F0.s +++ b/asm/nonmatchings/code_16c8e0/func_802667F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802667F0 /* 1950D0 802667F0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_80266970.s b/asm/nonmatchings/code_16c8e0/func_80266970.s index 0331ca56e6..e34d058b07 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266970.s +++ b/asm/nonmatchings/code_16c8e0/func_80266970.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266970 /* 195250 80266970 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16c8e0/func_80266978.s b/asm/nonmatchings/code_16c8e0/func_80266978.s index 24be4c17f7..380141df9d 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266978.s +++ b/asm/nonmatchings/code_16c8e0/func_80266978.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266978 /* 195258 80266978 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_80266ADC.s b/asm/nonmatchings/code_16c8e0/func_80266ADC.s index f0b4c993f1..facb87bf1b 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266ADC.s +++ b/asm/nonmatchings/code_16c8e0/func_80266ADC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266ADC /* 1953BC 80266ADC 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_16c8e0/func_80266AF8.s b/asm/nonmatchings/code_16c8e0/func_80266AF8.s index 26f26a1373..6f3cf1fa55 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266AF8.s +++ b/asm/nonmatchings/code_16c8e0/func_80266AF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266AF8 /* 1953D8 80266AF8 3C03FFF7 */ lui $v1, 0xfff7 diff --git a/asm/nonmatchings/code_16c8e0/func_80266B14.s b/asm/nonmatchings/code_16c8e0/func_80266B14.s index 79127d9c2d..d95e519593 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266B14.s +++ b/asm/nonmatchings/code_16c8e0/func_80266B14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266B14 /* 1953F4 80266B14 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/func_80266D6C.s b/asm/nonmatchings/code_16c8e0/func_80266D6C.s index 81c14c2525..bc297a1408 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266D6C.s +++ b/asm/nonmatchings/code_16c8e0/func_80266D6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266D6C /* 19564C 80266D6C 8C820094 */ lw $v0, 0x94($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_80266DAC.s b/asm/nonmatchings/code_16c8e0/func_80266DAC.s index 2aff309a3d..307456f600 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266DAC.s +++ b/asm/nonmatchings/code_16c8e0/func_80266DAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266DAC /* 19568C 80266DAC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_80266E14.s b/asm/nonmatchings/code_16c8e0/func_80266E14.s index 832d82af10..d75d8861de 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266E14.s +++ b/asm/nonmatchings/code_16c8e0/func_80266E14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266E14 /* 1956F4 80266E14 8C820094 */ lw $v0, 0x94($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_80266E40.s b/asm/nonmatchings/code_16c8e0/func_80266E40.s index 8d1a684bab..f284215219 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266E40.s +++ b/asm/nonmatchings/code_16c8e0/func_80266E40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266E40 /* 195720 80266E40 8C8401F4 */ lw $a0, 0x1f4($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_80266EA8.s b/asm/nonmatchings/code_16c8e0/func_80266EA8.s index 026f2c50a0..a7f6a3d3de 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266EA8.s +++ b/asm/nonmatchings/code_16c8e0/func_80266EA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266EA8 /* 195788 80266EA8 8C820094 */ lw $v0, 0x94($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_80266EE8.s b/asm/nonmatchings/code_16c8e0/func_80266EE8.s index 6730538d3c..39d2fa5e14 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266EE8.s +++ b/asm/nonmatchings/code_16c8e0/func_80266EE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266EE8 /* 1957C8 80266EE8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_80266FD8.s b/asm/nonmatchings/code_16c8e0/func_80266FD8.s index 58e6a2070e..59898d4244 100644 --- a/asm/nonmatchings/code_16c8e0/func_80266FD8.s +++ b/asm/nonmatchings/code_16c8e0/func_80266FD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80266FD8 /* 1958B8 80266FD8 8C820094 */ lw $v0, 0x94($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_80267018.s b/asm/nonmatchings/code_16c8e0/func_80267018.s index 3df4a5a3da..0c35048350 100644 --- a/asm/nonmatchings/code_16c8e0/func_80267018.s +++ b/asm/nonmatchings/code_16c8e0/func_80267018.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80267018 /* 1958F8 80267018 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_8026709C.s b/asm/nonmatchings/code_16c8e0/func_8026709C.s index 47d0bf6a1e..3e85a120f5 100644 --- a/asm/nonmatchings/code_16c8e0/func_8026709C.s +++ b/asm/nonmatchings/code_16c8e0/func_8026709C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8026709C /* 19597C 8026709C 8C820094 */ lw $v0, 0x94($a0) diff --git a/asm/nonmatchings/code_16c8e0/func_8026777C.s b/asm/nonmatchings/code_16c8e0/func_8026777C.s index 596e20d9ee..30b2ca4bc0 100644 --- a/asm/nonmatchings/code_16c8e0/func_8026777C.s +++ b/asm/nonmatchings/code_16c8e0/func_8026777C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8026777C /* 19605C 8026777C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/func_8026787C.s b/asm/nonmatchings/code_16c8e0/func_8026787C.s index 0ac03edc82..49f8dfd90f 100644 --- a/asm/nonmatchings/code_16c8e0/func_8026787C.s +++ b/asm/nonmatchings/code_16c8e0/func_8026787C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8026787C /* 19615C 8026787C 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/code_16c8e0/func_80267A3C.s b/asm/nonmatchings/code_16c8e0/func_80267A3C.s index 55b8364407..13979d8756 100644 --- a/asm/nonmatchings/code_16c8e0/func_80267A3C.s +++ b/asm/nonmatchings/code_16c8e0/func_80267A3C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80267A3C /* 19631C 80267A3C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/func_80268284.s b/asm/nonmatchings/code_16c8e0/func_80268284.s index 42881aef8f..bb0dfb9ba5 100644 --- a/asm/nonmatchings/code_16c8e0/func_80268284.s +++ b/asm/nonmatchings/code_16c8e0/func_80268284.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80268284 /* 196B64 80268284 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_16c8e0/func_80268C9C.s b/asm/nonmatchings/code_16c8e0/func_80268C9C.s index 1a0c051248..ad794eb1fb 100644 --- a/asm/nonmatchings/code_16c8e0/func_80268C9C.s +++ b/asm/nonmatchings/code_16c8e0/func_80268C9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80268C9C /* 19757C 80268C9C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80268E88.s b/asm/nonmatchings/code_16c8e0/func_80268E88.s index a645c0e293..698301218a 100644 --- a/asm/nonmatchings/code_16c8e0/func_80268E88.s +++ b/asm/nonmatchings/code_16c8e0/func_80268E88.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80268E88 /* 197768 80268E88 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/func_80276F50.s b/asm/nonmatchings/code_16c8e0/func_80276F50.s index 6dfdfebe43..ffa328ff11 100644 --- a/asm/nonmatchings/code_16c8e0/func_80276F50.s +++ b/asm/nonmatchings/code_16c8e0/func_80276F50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80276F50 /* 1A5830 80276F50 8C8301F4 */ lw $v1, 0x1f4($a0) diff --git a/asm/nonmatchings/code_16c8e0/get_actor.s b/asm/nonmatchings/code_16c8e0/get_actor.s index 28ef79a146..4939ab8f29 100644 --- a/asm/nonmatchings/code_16c8e0/get_actor.s +++ b/asm/nonmatchings/code_16c8e0/get_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_actor /* 19864C 80269D6C 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_16c8e0/get_actor_part.s b/asm/nonmatchings/code_16c8e0/get_actor_part.s index 8c30420315..0fe8e8f303 100644 --- a/asm/nonmatchings/code_16c8e0/get_actor_part.s +++ b/asm/nonmatchings/code_16c8e0/get_actor_part.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_actor_part /* 192D3C 8026445C 04A00004 */ bltz $a1, .L80264470 diff --git a/asm/nonmatchings/code_16c8e0/get_defense.s b/asm/nonmatchings/code_16c8e0/get_defense.s index d6606a59ac..27b2dcb545 100644 --- a/asm/nonmatchings/code_16c8e0/get_defense.s +++ b/asm/nonmatchings/code_16c8e0/get_defense.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_defense /* 194B9C 802662BC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/get_dpad_input_radial.s b/asm/nonmatchings/code_16c8e0/get_dpad_input_radial.s index 38802caadd..07d548d77f 100644 --- a/asm/nonmatchings/code_16c8e0/get_dpad_input_radial.s +++ b/asm/nonmatchings/code_16c8e0/get_dpad_input_radial.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_dpad_input_radial /* 16C8E0 8023E000 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/get_nearest_home_index.s b/asm/nonmatchings/code_16c8e0/get_nearest_home_index.s index 1d106cf3a7..1cbd712eb2 100644 --- a/asm/nonmatchings/code_16c8e0/get_nearest_home_index.s +++ b/asm/nonmatchings/code_16c8e0/get_nearest_home_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_nearest_home_index /* 197F78 80269698 3C014220 */ lui $at, 0x4220 diff --git a/asm/nonmatchings/code_16c8e0/heroes_is_ability_active.s b/asm/nonmatchings/code_16c8e0/heroes_is_ability_active.s index 4ea99586c0..5b1010f2be 100644 --- a/asm/nonmatchings/code_16c8e0/heroes_is_ability_active.s +++ b/asm/nonmatchings/code_16c8e0/heroes_is_ability_active.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel heroes_is_ability_active /* 195B8C 802672AC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/hide_foreground_models.s b/asm/nonmatchings/code_16c8e0/hide_foreground_models.s index f6590eb4df..a66ec88888 100644 --- a/asm/nonmatchings/code_16c8e0/hide_foreground_models.s +++ b/asm/nonmatchings/code_16c8e0/hide_foreground_models.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel hide_foreground_models /* 196594 80267CB4 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/hide_foreground_models_unchecked.s b/asm/nonmatchings/code_16c8e0/hide_foreground_models_unchecked.s index 38ad1d2f43..2822d00b8e 100644 --- a/asm/nonmatchings/code_16c8e0/hide_foreground_models_unchecked.s +++ b/asm/nonmatchings/code_16c8e0/hide_foreground_models_unchecked.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel hide_foreground_models_unchecked /* 1964BC 80267BDC 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/inflict_partner_ko.s b/asm/nonmatchings/code_16c8e0/inflict_partner_ko.s index 04c6babec5..1aae734874 100644 --- a/asm/nonmatchings/code_16c8e0/inflict_partner_ko.s +++ b/asm/nonmatchings/code_16c8e0/inflict_partner_ko.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel inflict_partner_ko /* 194B34 80266254 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/inflict_status.s b/asm/nonmatchings/code_16c8e0/inflict_status.s index 565a334dd2..6b19cb7e46 100644 --- a/asm/nonmatchings/code_16c8e0/inflict_status.s +++ b/asm/nonmatchings/code_16c8e0/inflict_status.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel inflict_status /* 194820 80265F40 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/inflict_status_set_duration.s b/asm/nonmatchings/code_16c8e0/inflict_status_set_duration.s index b1d0bce6f1..c2347bd343 100644 --- a/asm/nonmatchings/code_16c8e0/inflict_status_set_duration.s +++ b/asm/nonmatchings/code_16c8e0/inflict_status_set_duration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel inflict_status_set_duration /* 1955D0 80266CF0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/initialize_battle.s b/asm/nonmatchings/code_16c8e0/initialize_battle.s index a692400cb7..437cc9b0c3 100644 --- a/asm/nonmatchings/code_16c8e0/initialize_battle.s +++ b/asm/nonmatchings/code_16c8e0/initialize_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel initialize_battle /* 16CA10 8023E130 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/is_actor_hp_bar_visible.s b/asm/nonmatchings/code_16c8e0/is_actor_hp_bar_visible.s index e2c62c3a56..7d1854f65d 100644 --- a/asm/nonmatchings/code_16c8e0/is_actor_hp_bar_visible.s +++ b/asm/nonmatchings/code_16c8e0/is_actor_hp_bar_visible.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel is_actor_hp_bar_visible /* 182500 80253C20 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/is_actortype_hpbar_visible.s b/asm/nonmatchings/code_16c8e0/is_actortype_hpbar_visible.s index f19ce3104d..36c9c2296a 100644 --- a/asm/nonmatchings/code_16c8e0/is_actortype_hpbar_visible.s +++ b/asm/nonmatchings/code_16c8e0/is_actortype_hpbar_visible.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel is_actortype_hpbar_visible /* 18257C 80253C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/is_popup_displayed.s b/asm/nonmatchings/code_16c8e0/is_popup_displayed.s index 166c674c03..bcbd0441c3 100644 --- a/asm/nonmatchings/code_16c8e0/is_popup_displayed.s +++ b/asm/nonmatchings/code_16c8e0/is_popup_displayed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel is_popup_displayed /* 17E394 8024FAB4 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/load_partner_actor.s b/asm/nonmatchings/code_16c8e0/load_partner_actor.s index 84cdd47839..73763b11fa 100644 --- a/asm/nonmatchings/code_16c8e0/load_partner_actor.s +++ b/asm/nonmatchings/code_16c8e0/load_partner_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_partner_actor /* 193454 80264B74 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/load_player_actor.s b/asm/nonmatchings/code_16c8e0/load_player_actor.s index cb571267d4..91284e4299 100644 --- a/asm/nonmatchings/code_16c8e0/load_player_actor.s +++ b/asm/nonmatchings/code_16c8e0/load_player_actor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_player_actor /* 192D84 802644A4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/load_tattle_flags.s b/asm/nonmatchings/code_16c8e0/load_tattle_flags.s index bf2a23038c..7f6defd4ba 100644 --- a/asm/nonmatchings/code_16c8e0/load_tattle_flags.s +++ b/asm/nonmatchings/code_16c8e0/load_tattle_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_tattle_flags /* 182758 80253E78 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/lookup_defense.s b/asm/nonmatchings/code_16c8e0/lookup_defense.s index 0b4b8531e3..30b4d59829 100644 --- a/asm/nonmatchings/code_16c8e0/lookup_defense.s +++ b/asm/nonmatchings/code_16c8e0/lookup_defense.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel lookup_defense /* 194724 80265E44 0080182D */ daddu $v1, $a0, $zero diff --git a/asm/nonmatchings/code_16c8e0/lookup_status_chance.s b/asm/nonmatchings/code_16c8e0/lookup_status_chance.s index 071e88edc9..2c7c04f67b 100644 --- a/asm/nonmatchings/code_16c8e0/lookup_status_chance.s +++ b/asm/nonmatchings/code_16c8e0/lookup_status_chance.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel lookup_status_chance /* 194778 80265E98 0080182D */ daddu $v1, $a0, $zero diff --git a/asm/nonmatchings/code_16c8e0/lookup_status_duration_mod.s b/asm/nonmatchings/code_16c8e0/lookup_status_duration_mod.s index 0a167c1a24..d11110232e 100644 --- a/asm/nonmatchings/code_16c8e0/lookup_status_duration_mod.s +++ b/asm/nonmatchings/code_16c8e0/lookup_status_duration_mod.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel lookup_status_duration_mod /* 1947CC 80265EEC 0080182D */ daddu $v1, $a0, $zero diff --git a/asm/nonmatchings/code_16c8e0/move_cam_over.s b/asm/nonmatchings/code_16c8e0/move_cam_over.s index 07fa0e1d0b..9cd4d38524 100644 --- a/asm/nonmatchings/code_16c8e0/move_cam_over.s +++ b/asm/nonmatchings/code_16c8e0/move_cam_over.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel move_cam_over /* 17CDB8 8024E4D8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/mtx_mirror_y.s b/asm/nonmatchings/code_16c8e0/mtx_mirror_y.s index de78fdb342..cb635ef451 100644 --- a/asm/nonmatchings/code_16c8e0/mtx_mirror_y.s +++ b/asm/nonmatchings/code_16c8e0/mtx_mirror_y.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel mtx_mirror_y /* 182B68 80254288 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/play_hit_sound.s b/asm/nonmatchings/code_16c8e0/play_hit_sound.s index 0c0fe1ab61..7eb7dc9e67 100644 --- a/asm/nonmatchings/code_16c8e0/play_hit_sound.s +++ b/asm/nonmatchings/code_16c8e0/play_hit_sound.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_hit_sound /* 1A58E4 80277004 44850000 */ mtc1 $a1, $f0 diff --git a/asm/nonmatchings/code_16c8e0/play_movement_dust_effects.s b/asm/nonmatchings/code_16c8e0/play_movement_dust_effects.s index 4311170cbd..2758a39595 100644 --- a/asm/nonmatchings/code_16c8e0/play_movement_dust_effects.s +++ b/asm/nonmatchings/code_16c8e0/play_movement_dust_effects.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_movement_dust_effects /* 192BD0 802642F0 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/player_create_target_list.s b/asm/nonmatchings/code_16c8e0/player_create_target_list.s index 63a5d322f1..d06be27a55 100644 --- a/asm/nonmatchings/code_16c8e0/player_create_target_list.s +++ b/asm/nonmatchings/code_16c8e0/player_create_target_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel player_create_target_list /* 19190C 8026302C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/remove_actor_decoration.s b/asm/nonmatchings/code_16c8e0/remove_actor_decoration.s index d120591de9..294c209077 100644 --- a/asm/nonmatchings/code_16c8e0/remove_actor_decoration.s +++ b/asm/nonmatchings/code_16c8e0/remove_actor_decoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_actor_decoration /* 195B14 80267234 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/remove_part_decoration.s b/asm/nonmatchings/code_16c8e0/remove_part_decoration.s index bfade1d9eb..331392b4d7 100644 --- a/asm/nonmatchings/code_16c8e0/remove_part_decoration.s +++ b/asm/nonmatchings/code_16c8e0/remove_part_decoration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_part_decoration /* 195AF8 80267218 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/remove_part_shadow.s b/asm/nonmatchings/code_16c8e0/remove_part_shadow.s index 3cf00c1fbf..d678731cb9 100644 --- a/asm/nonmatchings/code_16c8e0/remove_part_shadow.s +++ b/asm/nonmatchings/code_16c8e0/remove_part_shadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_part_shadow /* 195C80 802673A0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/remove_player_buffs.s b/asm/nonmatchings/code_16c8e0/remove_player_buffs.s index c7230928e6..5bda5f7714 100644 --- a/asm/nonmatchings/code_16c8e0/remove_player_buffs.s +++ b/asm/nonmatchings/code_16c8e0/remove_player_buffs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_player_buffs /* 195D34 80267454 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_16c8e0/reset_all_actor_sounds.s b/asm/nonmatchings/code_16c8e0/reset_all_actor_sounds.s index f5c2186563..da5e80f762 100644 --- a/asm/nonmatchings/code_16c8e0/reset_all_actor_sounds.s +++ b/asm/nonmatchings/code_16c8e0/reset_all_actor_sounds.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel reset_all_actor_sounds /* 19637C 80267A9C 90830136 */ lbu $v1, 0x136($a0) diff --git a/asm/nonmatchings/code_16c8e0/save_tattle_flags.s b/asm/nonmatchings/code_16c8e0/save_tattle_flags.s index e1410d689f..3ea6c710af 100644 --- a/asm/nonmatchings/code_16c8e0/save_tattle_flags.s +++ b/asm/nonmatchings/code_16c8e0/save_tattle_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel save_tattle_flags /* 1825F0 80253D10 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/set_actor_current_position.s b/asm/nonmatchings/code_16c8e0/set_actor_current_position.s index 2af97c9f73..cb4c85d674 100644 --- a/asm/nonmatchings/code_16c8e0/set_actor_current_position.s +++ b/asm/nonmatchings/code_16c8e0/set_actor_current_position.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_actor_current_position /* 198504 80269C24 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/set_actor_home_position.s b/asm/nonmatchings/code_16c8e0/set_actor_home_position.s index e69058ce29..6184ea565f 100644 --- a/asm/nonmatchings/code_16c8e0/set_actor_home_position.s +++ b/asm/nonmatchings/code_16c8e0/set_actor_home_position.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_actor_home_position /* 198600 80269D20 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/set_actor_yaw.s b/asm/nonmatchings/code_16c8e0/set_actor_yaw.s index 539880a0a1..712447d97c 100644 --- a/asm/nonmatchings/code_16c8e0/set_actor_yaw.s +++ b/asm/nonmatchings/code_16c8e0/set_actor_yaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_actor_yaw /* 192848 80263F68 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/set_animation.s b/asm/nonmatchings/code_16c8e0/set_animation.s index 6b1019b5b1..6a8efafd28 100644 --- a/asm/nonmatchings/code_16c8e0/set_animation.s +++ b/asm/nonmatchings/code_16c8e0/set_animation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_animation /* 1925DC 80263CFC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/set_animation_rate.s b/asm/nonmatchings/code_16c8e0/set_animation_rate.s index 5baa23ee7a..daead8439c 100644 --- a/asm/nonmatchings/code_16c8e0/set_animation_rate.s +++ b/asm/nonmatchings/code_16c8e0/set_animation_rate.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_animation_rate /* 192798 80263EB8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/set_cam_target_pos.s b/asm/nonmatchings/code_16c8e0/set_cam_target_pos.s index 78ebf6c031..f86930e5f4 100644 --- a/asm/nonmatchings/code_16c8e0/set_cam_target_pos.s +++ b/asm/nonmatchings/code_16c8e0/set_cam_target_pos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_cam_target_pos /* 17CE00 8024E520 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/set_cam_zoffset.s b/asm/nonmatchings/code_16c8e0/set_cam_zoffset.s index a9790ebe0c..7abe31761e 100644 --- a/asm/nonmatchings/code_16c8e0/set_cam_zoffset.s +++ b/asm/nonmatchings/code_16c8e0/set_cam_zoffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_cam_zoffset /* 17CEC0 8024E5E0 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/set_cam_zoom.s b/asm/nonmatchings/code_16c8e0/set_cam_zoom.s index 343344650d..a45cf6fd9b 100644 --- a/asm/nonmatchings/code_16c8e0/set_cam_zoom.s +++ b/asm/nonmatchings/code_16c8e0/set_cam_zoom.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_cam_zoom /* 17CE74 8024E594 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/set_goal_pos_to_part.s b/asm/nonmatchings/code_16c8e0/set_goal_pos_to_part.s index a19a8a6d63..d5bd4ec77a 100644 --- a/asm/nonmatchings/code_16c8e0/set_goal_pos_to_part.s +++ b/asm/nonmatchings/code_16c8e0/set_goal_pos_to_part.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_goal_pos_to_part /* 198034 80269754 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/set_part_absolute_position.s b/asm/nonmatchings/code_16c8e0/set_part_absolute_position.s index ebd2afecf4..ef41b13906 100644 --- a/asm/nonmatchings/code_16c8e0/set_part_absolute_position.s +++ b/asm/nonmatchings/code_16c8e0/set_part_absolute_position.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_part_absolute_position /* 198550 80269C70 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/set_part_goal_to_actor_part.s b/asm/nonmatchings/code_16c8e0/set_part_goal_to_actor_part.s index 7d92f753ae..9150283fee 100644 --- a/asm/nonmatchings/code_16c8e0/set_part_goal_to_actor_part.s +++ b/asm/nonmatchings/code_16c8e0/set_part_goal_to_actor_part.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_part_goal_to_actor_part /* 1982B8 802699D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/set_part_yaw.s b/asm/nonmatchings/code_16c8e0/set_part_yaw.s index d1ad8e175f..0f811a722b 100644 --- a/asm/nonmatchings/code_16c8e0/set_part_yaw.s +++ b/asm/nonmatchings/code_16c8e0/set_part_yaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_part_yaw /* 19287C 80263F9C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/set_popup_duration.s b/asm/nonmatchings/code_16c8e0/set_popup_duration.s index bd7f3de964..f37e991410 100644 --- a/asm/nonmatchings/code_16c8e0/set_popup_duration.s +++ b/asm/nonmatchings/code_16c8e0/set_popup_duration.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_popup_duration /* 17E3A4 8024FAC4 3C02802A */ lui $v0, 0x802a diff --git a/asm/nonmatchings/code_16c8e0/show_battle_message.s b/asm/nonmatchings/code_16c8e0/show_battle_message.s index c5c877030f..c443eecd0e 100644 --- a/asm/nonmatchings/code_16c8e0/show_battle_message.s +++ b/asm/nonmatchings/code_16c8e0/show_battle_message.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel show_battle_message /* 17E240 8024F960 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/show_damage_popup.s b/asm/nonmatchings/code_16c8e0/show_damage_popup.s index 636dac0f0b..4188cf97c9 100644 --- a/asm/nonmatchings/code_16c8e0/show_damage_popup.s +++ b/asm/nonmatchings/code_16c8e0/show_damage_popup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel show_damage_popup /* 194E8C 802665AC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/show_foreground_models.s b/asm/nonmatchings/code_16c8e0/show_foreground_models.s index 2e42ed3cef..45d2808c3d 100644 --- a/asm/nonmatchings/code_16c8e0/show_foreground_models.s +++ b/asm/nonmatchings/code_16c8e0/show_foreground_models.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel show_foreground_models /* 196608 80267D28 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/show_foreground_models_unchecked.s b/asm/nonmatchings/code_16c8e0/show_foreground_models_unchecked.s index 2d7bbb05f3..cbb76d0fbc 100644 --- a/asm/nonmatchings/code_16c8e0/show_foreground_models_unchecked.s +++ b/asm/nonmatchings/code_16c8e0/show_foreground_models_unchecked.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel show_foreground_models_unchecked /* 196528 80267C48 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/show_message_popup.s b/asm/nonmatchings/code_16c8e0/show_message_popup.s index 4d1837b39e..8804dad08d 100644 --- a/asm/nonmatchings/code_16c8e0/show_message_popup.s +++ b/asm/nonmatchings/code_16c8e0/show_message_popup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel show_message_popup /* 17F784 80250EA4 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/show_variable_battle_message.s b/asm/nonmatchings/code_16c8e0/show_variable_battle_message.s index a8eb2f7153..343ee68d19 100644 --- a/asm/nonmatchings/code_16c8e0/show_variable_battle_message.s +++ b/asm/nonmatchings/code_16c8e0/show_variable_battle_message.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel show_variable_battle_message /* 17E2E4 8024FA04 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/start_rumble_type.s b/asm/nonmatchings/code_16c8e0/start_rumble_type.s index cfcfe996a9..709992b800 100644 --- a/asm/nonmatchings/code_16c8e0/start_rumble_type.s +++ b/asm/nonmatchings/code_16c8e0/start_rumble_type.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_rumble_type /* 1966D4 80267DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_16c8e0/switch_order.s b/asm/nonmatchings/code_16c8e0/switch_order.s index 8bda79e830..372e1a8188 100644 --- a/asm/nonmatchings/code_16c8e0/switch_order.s +++ b/asm/nonmatchings/code_16c8e0/switch_order.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel switch_order /* 1721F8 80243918 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/switch_to_partner.s b/asm/nonmatchings/code_16c8e0/switch_to_partner.s index a6b0ba0a83..18700243e4 100644 --- a/asm/nonmatchings/code_16c8e0/switch_to_partner.s +++ b/asm/nonmatchings/code_16c8e0/switch_to_partner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel switch_to_partner /* 1717E0 80242F00 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/switch_to_player.s b/asm/nonmatchings/code_16c8e0/switch_to_player.s index 85973d3dcf..f29daa0b9b 100644 --- a/asm/nonmatchings/code_16c8e0/switch_to_player.s +++ b/asm/nonmatchings/code_16c8e0/switch_to_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel switch_to_player /* 1713A8 80242AC8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/try_inflict_status.s b/asm/nonmatchings/code_16c8e0/try_inflict_status.s index fc4e2d9714..063a2a66f2 100644 --- a/asm/nonmatchings/code_16c8e0/try_inflict_status.s +++ b/asm/nonmatchings/code_16c8e0/try_inflict_status.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel try_inflict_status /* 195458 80266B78 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/unfreeze_cam.s b/asm/nonmatchings/code_16c8e0/unfreeze_cam.s index 5797e11d5b..98eab4241e 100644 --- a/asm/nonmatchings/code_16c8e0/unfreeze_cam.s +++ b/asm/nonmatchings/code_16c8e0/unfreeze_cam.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel unfreeze_cam /* 17CEE0 8024E600 3C018028 */ lui $at, 0x8028 diff --git a/asm/nonmatchings/code_16c8e0/update_battle_state.s b/asm/nonmatchings/code_16c8e0/update_battle_state.s index 0444ba3ea7..f7860d1516 100644 --- a/asm/nonmatchings/code_16c8e0/update_battle_state.s +++ b/asm/nonmatchings/code_16c8e0/update_battle_state.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_battle_state /* 16CD18 8023E438 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/update_enemy_action.s b/asm/nonmatchings/code_16c8e0/update_enemy_action.s index fbb7f2630c..1f9c857e34 100644 --- a/asm/nonmatchings/code_16c8e0/update_enemy_action.s +++ b/asm/nonmatchings/code_16c8e0/update_enemy_action.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_enemy_action /* 175E50 80247570 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/update_enemy_change_turn.s b/asm/nonmatchings/code_16c8e0/update_enemy_change_turn.s index 0932c5deb0..ebe1d691d7 100644 --- a/asm/nonmatchings/code_16c8e0/update_enemy_change_turn.s +++ b/asm/nonmatchings/code_16c8e0/update_enemy_change_turn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_enemy_change_turn /* 175B8C 802472AC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_16c8e0/update_heroes_end_turn.s b/asm/nonmatchings/code_16c8e0/update_heroes_end_turn.s index 7aa2ecfd72..27563bd63d 100644 --- a/asm/nonmatchings/code_16c8e0/update_heroes_end_turn.s +++ b/asm/nonmatchings/code_16c8e0/update_heroes_end_turn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_heroes_end_turn /* 170904 80242024 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/update_lerp_battle.s b/asm/nonmatchings/code_16c8e0/update_lerp_battle.s index 58d7e48bdb..0977ec3b63 100644 --- a/asm/nonmatchings/code_16c8e0/update_lerp_battle.s +++ b/asm/nonmatchings/code_16c8e0/update_lerp_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_lerp_battle /* 1A99BC 8027B0DC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_16c8e0/update_partner_action.s b/asm/nonmatchings/code_16c8e0/update_partner_action.s index 372b4d36c8..9193a5606b 100644 --- a/asm/nonmatchings/code_16c8e0/update_partner_action.s +++ b/asm/nonmatchings/code_16c8e0/update_partner_action.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_partner_action /* 175414 80246B34 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_16c8e0/update_partner_change_turn.s b/asm/nonmatchings/code_16c8e0/update_partner_change_turn.s index 083909e7f5..b3b53741e7 100644 --- a/asm/nonmatchings/code_16c8e0/update_partner_change_turn.s +++ b/asm/nonmatchings/code_16c8e0/update_partner_change_turn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_partner_change_turn /* 171490 80242BB0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/update_player_action.s b/asm/nonmatchings/code_16c8e0/update_player_action.s index 92cdb09e9a..600feeb250 100644 --- a/asm/nonmatchings/code_16c8e0/update_player_action.s +++ b/asm/nonmatchings/code_16c8e0/update_player_action.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_player_action /* 1743B0 80245AD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_16c8e0/update_player_change_turn.s b/asm/nonmatchings/code_16c8e0/update_player_change_turn.s index 057dacb980..1ad69d12eb 100644 --- a/asm/nonmatchings/code_16c8e0/update_player_change_turn.s +++ b/asm/nonmatchings/code_16c8e0/update_player_change_turn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_player_change_turn /* 174D30 80246450 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_16c8e0/update_run_away.s b/asm/nonmatchings/code_16c8e0/update_run_away.s index 3722e91894..e33b89a9c9 100644 --- a/asm/nonmatchings/code_16c8e0/update_run_away.s +++ b/asm/nonmatchings/code_16c8e0/update_run_away.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_run_away /* 1737E0 80244F00 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_16c8e0/update_starpoints_display.s b/asm/nonmatchings/code_16c8e0/update_starpoints_display.s index f90fe6b966..dfebfd14bd 100644 --- a/asm/nonmatchings/code_16c8e0/update_starpoints_display.s +++ b/asm/nonmatchings/code_16c8e0/update_starpoints_display.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_starpoints_display /* 16EC9C 802403BC 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/code_16c8e0/update_swap_partner.s b/asm/nonmatchings/code_16c8e0/update_swap_partner.s index 49c3877b41..af03f917f8 100644 --- a/asm/nonmatchings/code_16c8e0/update_swap_partner.s +++ b/asm/nonmatchings/code_16c8e0/update_swap_partner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_swap_partner /* 173FD8 802456F8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_16c8e0/use_cam_preset.s b/asm/nonmatchings/code_16c8e0/use_cam_preset.s index 0ceec34cca..cd5d52babb 100644 --- a/asm/nonmatchings/code_16c8e0/use_cam_preset.s +++ b/asm/nonmatchings/code_16c8e0/use_cam_preset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel use_cam_preset /* 17B814 8024CF34 3C028028 */ lui $v0, 0x8028 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/GetCamLookAtObjVector.s b/asm/nonmatchings/code_1a1f0_len_5390/GetCamLookAtObjVector.s index b26b688012..2865809512 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/GetCamLookAtObjVector.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/GetCamLookAtObjVector.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamLookAtObjVector /* 01A798 8003F398 3C038007 */ lui $v1, 0x8007 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/HasMerleeCasts.s b/asm/nonmatchings/code_1a1f0_len_5390/HasMerleeCasts.s index 2faf536fd6..1ad30aa1e7 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/HasMerleeCasts.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/HasMerleeCasts.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel HasMerleeCasts /* 01A7F4 8003F3F4 AC800084 */ sw $zero, 0x84($a0) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s b/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s index 0c74db4abd..9efc5dae48 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/OnDefeatEnemy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel OnDefeatEnemy /* 01A980 8003F580 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/OnFleeBattleDrops.s b/asm/nonmatchings/code_1a1f0_len_5390/OnFleeBattleDrops.s index 3a3be4d4cc..fdda881d77 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/OnFleeBattleDrops.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/OnFleeBattleDrops.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel OnFleeBattleDrops /* 01AAE8 8003F6E8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s index bbadd84e98..3ee42ba7b1 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/create_npcs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_npcs /* 01EAB0 800436B0 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s index 16be083ec1..abc4fab44a 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003F7CC /* 01ABCC 8003F7CC 27BDFF40 */ addiu $sp, $sp, -0xc0 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8004135C.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8004135C.s index f766af453b..d24436ec24 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8004135C.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8004135C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004135C /* 01C75C 8004135C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s index fd3af1e878..c61832b961 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80041364.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80041364 /* 01C764 80041364 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s index f7de6ac5b0..1fb6ae8809 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80041964.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80041964 /* 01CD64 80041964 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s index 2aa747c982..3b8bfb5a0f 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80041F10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80041F10 /* 01D310 80041F10 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8004304C.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8004304C.s index d030c48c83..de4e9ce388 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8004304C.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8004304C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004304C /* 01E44C 8004304C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s index 06184feeb4..baed685c90 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8004309C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004309C /* 01E49C 8004309C 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_800431D4.s b/asm/nonmatchings/code_1a1f0_len_5390/func_800431D4.s index 1650ed2e9b..1c3926f163 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_800431D4.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_800431D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800431D4 /* 01E5D4 800431D4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s index 9ffe52e803..7f77eb9559 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_800431DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800431DC /* 01E5DC 800431DC 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80044140.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80044140.s index bfbb4b08d6..a8611f0227 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80044140.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80044140.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80044140 /* 01F540 80044140 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_80044148.s b/asm/nonmatchings/code_1a1f0_len_5390/func_80044148.s index 462c083e24..941ca07962 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_80044148.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_80044148.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80044148 /* 01F548 80044148 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_1a1f0_len_5390/get_defeated.s b/asm/nonmatchings/code_1a1f0_len_5390/get_defeated.s index b869dc1102..865edfdf4d 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/get_defeated.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/get_defeated.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_defeated /* 01A1F0 8003EDF0 0080302D */ daddu $a2, $a0, $zero diff --git a/asm/nonmatchings/code_1a1f0_len_5390/set_defeated.s b/asm/nonmatchings/code_1a1f0_len_5390/set_defeated.s index 776eb23724..a3dd670de7 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/set_defeated.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/set_defeated.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_defeated /* 01A240 8003EE40 0080182D */ daddu $v1, $a0, $zero diff --git a/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s b/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s index 57e381d11b..833ffd40d0 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel show_first_strike_message /* 01D05C 80041C5C 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s index 2982a7d07b..ac6e3814a5 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800269EC /* 001DEC 800269EC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s index c8a9b4c71c..1233588981 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80027088 /* 002488 80027088 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s b/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s index 52877dc3d2..74d0613f2c 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800271A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800271A0 /* 0025A0 800271A0 3C04800A */ lui $a0, 0x800a diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800271FC.s b/asm/nonmatchings/code_1b40_len_20b0/func_800271FC.s index 4c1b5c399f..5f3a079228 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800271FC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800271FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800271FC /* 0025FC 800271FC 00061880 */ sll $v1, $a2, 2 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s b/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s index c61dae79c5..0f57019554 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002725C /* 00265C 8002725C 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027600.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027600.s index 896e63cbc5..bb8aa355b4 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027600.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027600.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80027600 /* 002A00 80027600 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027774.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027774.s index af83a5e39f..9aaba9b253 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027774.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027774.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80027774 /* 002B74 80027774 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s b/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s index 50d7783311..d4fde0ec19 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800279B4 /* 002DB4 800279B4 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s index 5234003135..63773fbb69 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80027BAC /* 002FAC 80027BAC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s index e323db8bfa..b1fc308a10 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80027E10 /* 003210 80027E10 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s index 8d080f83d9..01d644860a 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel gfx_draw_frame /* 001F08 80026B08 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s index 4d52bdf303..e2878f599d 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s +++ b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_engine_data /* 0021DC 80026DDC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s b/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s index 565f809af2..ac3dae2a0d 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s +++ b/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel step_game_loop /* 001B40 80026740 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s b/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s index b7d7d941d0..a769686528 100644 --- a/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s +++ b/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindNpcAI /* 01FE78 80044A78 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_1f580_len_1940/BindNpcAux.s b/asm/nonmatchings/code_1f580_len_1940/BindNpcAux.s index 608d7c87fc..4502b0c947 100644 --- a/asm/nonmatchings/code_1f580_len_1940/BindNpcAux.s +++ b/asm/nonmatchings/code_1f580_len_1940/BindNpcAux.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindNpcAux /* 0202B8 80044EB8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/BindNpcDefeat.s b/asm/nonmatchings/code_1f580_len_1940/BindNpcDefeat.s index 3e7b165928..e4a1e99175 100644 --- a/asm/nonmatchings/code_1f580_len_1940/BindNpcDefeat.s +++ b/asm/nonmatchings/code_1f580_len_1940/BindNpcDefeat.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindNpcDefeat /* 0205DC 800451DC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/BindNpcHit.s b/asm/nonmatchings/code_1f580_len_1940/BindNpcHit.s index b6dbbf0c00..ec7c0cc4cb 100644 --- a/asm/nonmatchings/code_1f580_len_1940/BindNpcHit.s +++ b/asm/nonmatchings/code_1f580_len_1940/BindNpcHit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindNpcHit /* 020540 80045140 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/BindNpcIdle.s b/asm/nonmatchings/code_1f580_len_1940/BindNpcIdle.s index 73c4673856..2ed063538b 100644 --- a/asm/nonmatchings/code_1f580_len_1940/BindNpcIdle.s +++ b/asm/nonmatchings/code_1f580_len_1940/BindNpcIdle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindNpcIdle /* 01FFAC 80044BAC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/BindNpcInteract.s b/asm/nonmatchings/code_1f580_len_1940/BindNpcInteract.s index d7d6ab1c67..3a0a3d7a17 100644 --- a/asm/nonmatchings/code_1f580_len_1940/BindNpcInteract.s +++ b/asm/nonmatchings/code_1f580_len_1940/BindNpcInteract.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BindNpcInteract /* 0204A4 800450A4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/ClearDefeatedEnemies.s b/asm/nonmatchings/code_1f580_len_1940/ClearDefeatedEnemies.s index 3a6b1fe3da..41c8430f46 100644 --- a/asm/nonmatchings/code_1f580_len_1940/ClearDefeatedEnemies.s +++ b/asm/nonmatchings/code_1f580_len_1940/ClearDefeatedEnemies.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ClearDefeatedEnemies /* 020A40 80045640 3C07800B */ lui $a3, 0x800b diff --git a/asm/nonmatchings/code_1f580_len_1940/DoNpcDefeat.s b/asm/nonmatchings/code_1f580_len_1940/DoNpcDefeat.s index 63e7d1a0a7..be3425eb3f 100644 --- a/asm/nonmatchings/code_1f580_len_1940/DoNpcDefeat.s +++ b/asm/nonmatchings/code_1f580_len_1940/DoNpcDefeat.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DoNpcDefeat /* 01FA2C 8004462C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/EnableNpcAI.s b/asm/nonmatchings/code_1f580_len_1940/EnableNpcAI.s index f437d2d1a8..f88faa11e8 100644 --- a/asm/nonmatchings/code_1f580_len_1940/EnableNpcAI.s +++ b/asm/nonmatchings/code_1f580_len_1940/EnableNpcAI.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableNpcAI /* 0200F0 80044CF0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/EnableNpcAux.s b/asm/nonmatchings/code_1f580_len_1940/EnableNpcAux.s index 0feda362d2..39ea7688a4 100644 --- a/asm/nonmatchings/code_1f580_len_1940/EnableNpcAux.s +++ b/asm/nonmatchings/code_1f580_len_1940/EnableNpcAux.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableNpcAux /* 0203F0 80044FF0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/GetBattleOutcome.s b/asm/nonmatchings/code_1f580_len_1940/GetBattleOutcome.s index e9a0586346..a1981c69f1 100644 --- a/asm/nonmatchings/code_1f580_len_1940/GetBattleOutcome.s +++ b/asm/nonmatchings/code_1f580_len_1940/GetBattleOutcome.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetBattleOutcome /* 01F97C 8004457C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1f580_len_1940/GetNpcVar.s b/asm/nonmatchings/code_1f580_len_1940/GetNpcVar.s index d52dc792d2..89617b6e2c 100644 --- a/asm/nonmatchings/code_1f580_len_1940/GetNpcVar.s +++ b/asm/nonmatchings/code_1f580_len_1940/GetNpcVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetNpcVar /* 0207BC 800453BC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/GetSelfAnimationFromTable.s b/asm/nonmatchings/code_1f580_len_1940/GetSelfAnimationFromTable.s index 012d4ea97b..44127b6de8 100644 --- a/asm/nonmatchings/code_1f580_len_1940/GetSelfAnimationFromTable.s +++ b/asm/nonmatchings/code_1f580_len_1940/GetSelfAnimationFromTable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetSelfAnimationFromTable /* 020B34 80045734 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/GetSelfVar.s b/asm/nonmatchings/code_1f580_len_1940/GetSelfVar.s index 3b52611da6..17e43d96cf 100644 --- a/asm/nonmatchings/code_1f580_len_1940/GetSelfVar.s +++ b/asm/nonmatchings/code_1f580_len_1940/GetSelfVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetSelfVar /* 0206C0 800452C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/MakeNpcs.s b/asm/nonmatchings/code_1f580_len_1940/MakeNpcs.s index 93e8a51962..f5828b9664 100644 --- a/asm/nonmatchings/code_1f580_len_1940/MakeNpcs.s +++ b/asm/nonmatchings/code_1f580_len_1940/MakeNpcs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeNpcs /* 01F698 80044298 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s b/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s index 086cf4b2ce..92711e718d 100644 --- a/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s +++ b/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveEncounter /* 01F878 80044478 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s b/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s index 7f6925e806..3d25c3677a 100644 --- a/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s +++ b/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveNpc /* 01F740 80044340 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/RestartNpcAI.s b/asm/nonmatchings/code_1f580_len_1940/RestartNpcAI.s index 8bc7800c07..13225c8a09 100644 --- a/asm/nonmatchings/code_1f580_len_1940/RestartNpcAI.s +++ b/asm/nonmatchings/code_1f580_len_1940/RestartNpcAI.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RestartNpcAI /* 02002C 80044C2C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/RestartNpcAux.s b/asm/nonmatchings/code_1f580_len_1940/RestartNpcAux.s index 23eda5af15..554f1cd70e 100644 --- a/asm/nonmatchings/code_1f580_len_1940/RestartNpcAux.s +++ b/asm/nonmatchings/code_1f580_len_1940/RestartNpcAux.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RestartNpcAux /* 020338 80044F38 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetBattleMusic.s b/asm/nonmatchings/code_1f580_len_1940/SetBattleMusic.s index 1335fbbe90..523596408c 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetBattleMusic.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetBattleMusic.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetBattleMusic /* 01FE38 80044A38 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetEncounterStatusFlags.s b/asm/nonmatchings/code_1f580_len_1940/SetEncounterStatusFlags.s index b0a12d8db4..387f86b150 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetEncounterStatusFlags.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetEncounterStatusFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetEncounterStatusFlags /* 01F580 80044180 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetEnemyFlagBits.s b/asm/nonmatchings/code_1f580_len_1940/SetEnemyFlagBits.s index a0cf465ea7..e250da0ab9 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetEnemyFlagBits.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetEnemyFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetEnemyFlagBits /* 020A88 80045688 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s b/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s index d0a300034b..d434cbe188 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcAux /* 0201A4 80044DA4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetNpcVar.s b/asm/nonmatchings/code_1f580_len_1940/SetNpcVar.s index 91323960e9..62dcca3ced 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetNpcVar.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetNpcVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcVar /* 020720 80045320 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetSelfEnemyFlagBits.s b/asm/nonmatchings/code_1f580_len_1940/SetSelfEnemyFlagBits.s index 5c0489cd9a..47505a2566 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetSelfEnemyFlagBits.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetSelfEnemyFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetSelfEnemyFlagBits /* 020924 80045524 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetSelfRotation.s b/asm/nonmatchings/code_1f580_len_1940/SetSelfRotation.s index 7b5f6646f3..0878e4ed35 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetSelfRotation.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetSelfRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetSelfRotation /* 02085C 8004545C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetSelfVar.s b/asm/nonmatchings/code_1f580_len_1940/SetSelfVar.s index 6039759ba9..89579b9e4a 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetSelfVar.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetSelfVar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetSelfVar /* 02065C 8004525C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s b/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s index 6f764cd182..fbe098a280 100644 --- a/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s +++ b/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel StartBossBattle /* 01FC9C 8004489C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_1f580_len_1940/start_battle.s b/asm/nonmatchings/code_1f580_len_1940/start_battle.s index 9d21ef6e68..9630fda18c 100644 --- a/asm/nonmatchings/code_1f580_len_1940/start_battle.s +++ b/asm/nonmatchings/code_1f580_len_1940/start_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_battle /* 01FAB4 800446B4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s index 1a0761cecb..02a28cda5c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s +++ b/asm/nonmatchings/code_20ec0_len_5040/DoBasicAI.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DoBasicAI /* 02587C 8004A47C 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s index 9ea0bbf478..dbba88484f 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045AC0 /* 020EC0 80045AC0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045B68.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045B68.s index a9e035fec1..a5a4ce235c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045B68.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045B68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045B68 /* 020F68 80045B68 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045C28.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045C28.s index 55e47d6f4b..af01604b60 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045C28.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045C28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045C28 /* 021028 80045C28 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045C88.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045C88.s index 1821df99f0..4d9ed02a04 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045C88.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045C88.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045C88 /* 021088 80045C88 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s index ae64ae6917..8cd5172f95 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045CC4 /* 0210C4 80045CC4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s index 17b4e412ce..a1b4f3d145 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045D00 /* 021100 80045D00 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s index bd5dbf0943..7161f4b440 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045FA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045FA4 /* 0213A4 80045FA4 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s index 3cbef75b03..3af342a7e0 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80045FB4 /* 0213B4 80045FB4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s index 5e85d0a583..3607a0a974 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047608 /* 022A08 80047608 3C04800A */ lui $a0, 0x800a diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800476F4.s b/asm/nonmatchings/code_20ec0_len_5040/func_800476F4.s index 180a7fa827..582c321e01 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800476F4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800476F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800476F4 /* 022AF4 800476F4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004778C.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004778C.s index d8ad48ba4a..8d200d1a6c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004778C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004778C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004778C /* 022B8C 8004778C 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800477F4.s b/asm/nonmatchings/code_20ec0_len_5040/func_800477F4.s index 664b88832c..32a71d9642 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800477F4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800477F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800477F4 /* 022BF4 800477F4 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047820.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047820.s index b4e3bd4068..31d80ac904 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047820.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047820.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047820 /* 022C20 80047820 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s index 360a224c03..27a9074ec6 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047898 /* 022C98 80047898 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800478F8.s b/asm/nonmatchings/code_20ec0_len_5040/func_800478F8.s index 059834e88f..4acc122865 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800478F8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800478F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800478F8 /* 022CF8 800478F8 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047928.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047928.s index 139604d66a..290af2691c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047928.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047928.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047928 /* 022D28 80047928 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s b/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s index cc2514b0e2..120269b052 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800479A0 /* 022DA0 800479A0 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047A00.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047A00.s index 9c02b759c1..0f3631867e 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047A00.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047A00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047A00 /* 022E00 80047A00 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047A30.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047A30.s index e91c9ee857..46c946561e 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047A30.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047A30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047A30 /* 022E30 80047A30 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s index b5df80c576..9b3d513207 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047AA8 /* 022EA8 80047AA8 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047B08.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047B08.s index afc8c0c095..0f99b81799 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047B08.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047B08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047B08 /* 022F08 80047B08 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s index 9634cdf1b9..82b85f479b 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047B38 /* 022F38 80047B38 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s index cf04b0f714..49b0da33e5 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047B84 /* 022F84 80047B84 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047BE4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047BE4.s index fb37f260ec..0bd7c2cb43 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047BE4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047BE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047BE4 /* 022FE4 80047BE4 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047C14.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047C14.s index f088d88942..0d58eedf2a 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047C14.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047C14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047C14 /* 023014 80047C14 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047CA4.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047CA4.s index b03678ea48..cafd8579ad 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047CA4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047CA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047CA4 /* 0230A4 80047CA4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047D00.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047D00.s index 8c726f448e..14ec7b2d14 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047D00.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047D00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047D00 /* 023100 80047D00 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047D30.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047D30.s index 00d55cc72d..40694ec8bb 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047D30.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047D30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047D30 /* 023130 80047D30 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s index 6c2f75af6b..bd6ca499b0 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047DC0 /* 0231C0 80047DC0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047E1C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047E1C.s index 2e634de452..c55c82efe0 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047E1C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047E1C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047E1C /* 02321C 80047E1C 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047E4C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047E4C.s index 1a16035507..947a8f2f3c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047E4C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047E4C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047E4C /* 02324C 80047E4C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s index 891d88cb3c..3a8a2fea81 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047EDC /* 0232DC 80047EDC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047F28.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047F28.s index 6571f4f842..8b4d783d09 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047F28.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047F28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047F28 /* 023328 80047F28 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047F58.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047F58.s index 8aab253f99..c31a7f6b7b 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047F58.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047F58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047F58 /* 023358 80047F58 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s b/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s index a098ccdfd7..8d1e88a179 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80047FE8 /* 0233E8 80047FE8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048034.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048034.s index b096dcbae9..900d8e1d21 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048034.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048034.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80048034 /* 023434 80048034 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048064.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048064.s index 4f9502cd23..3b4588b3d4 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048064.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048064.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80048064 /* 023464 80048064 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s b/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s index 52b885c875..6d7339930a 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800480F4 /* 0234F4 800480F4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048140.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048140.s index decf786c72..1175c0dda6 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048140.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048140.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80048140 /* 023540 80048140 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048170.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048170.s index 0dc9ee93d6..c31fb06e31 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048170.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048170.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80048170 /* 023570 80048170 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s b/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s index e02109f4b2..5ec1c269e9 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80048200 /* 023600 80048200 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s index 06315f17cc..ef9a6ef1c3 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004824C /* 02364C 8004824C 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s b/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s index ebc5799e3d..aacb04d277 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800490B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800490B4 /* 0244B4 800490B4 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800494C0.s b/asm/nonmatchings/code_20ec0_len_5040/func_800494C0.s index 967ffeae19..b1271fa44c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800494C0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800494C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800494C0 /* 0248C0 800494C0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s b/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s index 79d225d1d7..b7e8c94c3d 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800495A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800495A0 /* 0249A0 800495A0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s b/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s index ad1e257c50..cc266a64ef 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_800496B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800496B8 /* 024AB8 800496B8 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s index 8ff7fbdfd1..7e8b8dc670 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049B44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80049B44 /* 024F44 80049B44 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s index 41a156575d..ffdd317df5 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049C04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80049C04 /* 025004 80049C04 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049E3C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049E3C.s index 26aa26b7ea..973ad797a8 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049E3C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049E3C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80049E3C /* 02523C 80049E3C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s index fb685185d1..07e0c07947 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049ECC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80049ECC /* 0252CC 80049ECC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s b/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s index 7c1d93d932..8f98bccf65 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_80049F7C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80049F7C /* 02537C 80049F7C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s index 2331d7425a..027870b1f9 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A124.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004A124 /* 025524 8004A124 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s index 5226394bee..e0dc5b0707 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A3E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004A3E8 /* 0257E8 8004A3E8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s index bd4012647d..30cf76ed35 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A73C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004A73C /* 025B3C 8004A73C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s b/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s index 015f3a799f..6105521e49 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s +++ b/asm/nonmatchings/code_20ec0_len_5040/func_8004A784.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004A784 /* 025B84 8004A784 27BDFF68 */ addiu $sp, $sp, -0x98 diff --git a/asm/nonmatchings/code_20ec0_len_5040/get_coin_drop_amount.s b/asm/nonmatchings/code_20ec0_len_5040/get_coin_drop_amount.s index 22247b13e1..28a8cc6186 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/get_coin_drop_amount.s +++ b/asm/nonmatchings/code_20ec0_len_5040/get_coin_drop_amount.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_coin_drop_amount /* 024150 80048D50 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_20ec0_len_5040/is_point_within_region.s b/asm/nonmatchings/code_20ec0_len_5040/is_point_within_region.s index 59024f18c7..e17e9944c1 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/is_point_within_region.s +++ b/asm/nonmatchings/code_20ec0_len_5040/is_point_within_region.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel is_point_within_region /* 0243D4 80048FD4 44856000 */ mtc1 $a1, $f12 diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s index 5b0c8b45ba..0aa6ed987c 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s +++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel spawn_drops /* 023680 80048280 27BDFF68 */ addiu $sp, $sp, -0x98 diff --git a/asm/nonmatchings/code_25f00_len_940/alRename1.s b/asm/nonmatchings/code_25f00_len_940/alRename1.s index 39ea5c9881..b75476c56e 100644 --- a/asm/nonmatchings/code_25f00_len_940/alRename1.s +++ b/asm/nonmatchings/code_25f00_len_940/alRename1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel alLink /* 0267EC 8004B3EC 8CA20000 */ lw $v0, ($a1) diff --git a/asm/nonmatchings/code_25f00_len_940/alRename2.s b/asm/nonmatchings/code_25f00_len_940/alRename2.s index c613d63790..a87f24424f 100644 --- a/asm/nonmatchings/code_25f00_len_940/alRename2.s +++ b/asm/nonmatchings/code_25f00_len_940/alRename2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel alUnlink /* 02680C 8004B40C 8C830000 */ lw $v1, ($a0) diff --git a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s index aaafb22a7c..f549c6b9db 100644 --- a/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s +++ b/asm/nonmatchings/code_25f00_len_940/func_8004AB00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004AB00 /* 025F00 8004AB00 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s b/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s index 6e760de822..cc11927051 100644 --- a/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s +++ b/asm/nonmatchings/code_25f00_len_940/nuAuCleanDMABuffers.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuAuCleanDMABuffers /* 026668 8004B268 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s index dfe9962f5e..2b95f7f932 100644 --- a/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s +++ b/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuAuDmaCallBack /* 026474 8004B074 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s b/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s index 5e6b94aac9..9b84489ce3 100644 --- a/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s +++ b/asm/nonmatchings/code_25f00_len_940/nuAuDmaNew.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuAuDmaNew /* 026624 8004B224 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B440.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B440.s index 4898be55a3..14ee670530 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B440.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B440.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004B440 /* 026840 8004B440 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s index fb11684205..511d9ac671 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B62C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004B62C /* 026A2C 8004B62C 24080008 */ addiu $t0, $zero, 8 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B698.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B698.s index 7d8d1c62a0..8e9fbf3a76 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B698.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B698.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004B698 /* 026A98 8004B698 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B6D8.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B6D8.s index 9a40957745..f7fd327275 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B6D8.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B6D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004B6D8 /* 026AD8 8004B6D8 90830164 */ lbu $v1, 0x164($a0) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s index 432ecdfd2d..04d4e45cbe 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004B748 /* 026B48 8004B748 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004B9E4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004B9E4.s index 98d2d001ae..f8e161dec6 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004B9E4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004B9E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004B9E4 /* 026DE4 8004B9E4 30A500FF */ andi $a1, $a1, 0xff diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004BA54.s b/asm/nonmatchings/code_26840_len_20d0/func_8004BA54.s index 87a5e01c6a..02bedb2ba5 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004BA54.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004BA54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004BA54 /* 026E54 8004BA54 14A00003 */ bnez $a1, .L8004BA64 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s b/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s index c82e908cc7..e91905ea38 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004BA74 /* 026E74 8004BA74 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s index 6531f18fde..560423b2ed 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C0E4 /* 0274E4 8004C0E4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s index 51758a051a..a5ec13dacd 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C268 /* 027668 8004C268 30A20C00 */ andi $v0, $a1, 0xc00 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s index 69009b41cc..a43fc97167 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C2A4 /* 0276A4 8004C2A4 0000382D */ daddu $a3, $zero, $zero diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s index f926ba73f4..a30bc7fb64 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C300 /* 027700 8004C300 0000382D */ daddu $a3, $zero, $zero diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C358.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C358.s index a7adbd36e8..6123bbb5d2 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C358.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C358.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C358 /* 027758 8004C358 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C3D4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C3D4.s index 0312e1c0b4..e5ff9797eb 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C3D4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C3D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C3D4 /* 0277D4 8004C3D4 9082009A */ lbu $v0, 0x9a($a0) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s index 8a91de3516..ff7c93ef90 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C444 /* 027844 8004C444 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s index 5546ab6161..5bcc92e9e0 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C578 /* 027978 8004C578 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C844.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C844.s index 04fe736f7a..5cfd5e58af 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C844.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C844.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C844 /* 027C44 8004C844 948300B8 */ lhu $v1, 0xb8($a0) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s b/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s index 905d75b8d0..e28cf5fc62 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004C884 /* 027C84 8004C884 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004CD94.s b/asm/nonmatchings/code_26840_len_20d0/func_8004CD94.s index c545a85571..3221fde558 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004CD94.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004CD94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004CD94 /* 028194 8004CD94 94A300B8 */ lhu $v1, 0xb8($a1) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004CE70.s b/asm/nonmatchings/code_26840_len_20d0/func_8004CE70.s index 53ec508274..8e45163b3f 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004CE70.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004CE70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004CE70 /* 028270 8004CE70 8CA20000 */ lw $v0, ($a1) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004CEA4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004CEA4.s index dac5225875..dc16ca3c6b 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004CEA4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004CEA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004CEA4 /* 0282A4 8004CEA4 8CA20000 */ lw $v0, ($a1) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004CEC4.s b/asm/nonmatchings/code_26840_len_20d0/func_8004CEC4.s index 2576d24fa8..1d2d1a4a48 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004CEC4.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004CEC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004CEC4 /* 0282C4 8004CEC4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004CF0C.s b/asm/nonmatchings/code_26840_len_20d0/func_8004CF0C.s index 234e9e01c5..89dee59698 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004CF0C.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004CF0C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004CF0C /* 02830C 8004CF0C 8CA20000 */ lw $v0, ($a1) diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D428.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D428.s index 6417c099b4..f43f0bade4 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D428.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D428.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004D428 /* 028828 8004D428 000419C3 */ sra $v1, $a0, 7 diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D484.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D484.s index ee1599ced7..b6a38e4f3e 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D484.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D484.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004D484 /* 028884 8004D484 308200CC */ andi $v0, $a0, 0xcc diff --git a/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s b/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s index ed1c10f610..81a5f90d67 100644 --- a/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s +++ b/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004D4BC /* 0288BC 8004D4BC 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004D510.s b/asm/nonmatchings/code_28910_len_5090/func_8004D510.s index f1c971518e..a8879fbb57 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004D510.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004D510.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004D510 /* 028910 8004D510 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004D794.s b/asm/nonmatchings/code_28910_len_5090/func_8004D794.s index 4799996b43..cddafd9ec6 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004D794.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004D794.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004D794 /* 028B94 8004D794 3C05800A */ lui $a1, 0x800a diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s b/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s index 271911cf8e..dbd88399d7 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004D7E0 /* 028BE0 8004D7E0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s b/asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s index 11582bfb28..b75eda1cbf 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DA0C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DA0C /* 028E0C 8004DA0C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s b/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s index a33af2ff11..d6ba559ef9 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DA74 /* 028E74 8004DA74 3C04800A */ lui $a0, 0x800a diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s b/asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s index 5e8f018b82..e116f1d153 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DAA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DAA8 /* 028EA8 8004DAA8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s b/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s index 58b674b2bc..d4f7946d0c 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DAE0 /* 028EE0 8004DAE0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s b/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s index 6ccb297742..58609b0c80 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DB28 /* 028F28 8004DB28 8C82001C */ lw $v0, 0x1c($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s b/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s index 6801c1e6d5..27a289db79 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DB4C /* 028F4C 8004DB4C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DC80.s b/asm/nonmatchings/code_28910_len_5090/func_8004DC80.s index a2e1ddcc60..9d0754da0c 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DC80.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DC80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DC80 /* 029080 8004DC80 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s b/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s index 071aec5a95..f13ec0c358 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DCB8 /* 0290B8 8004DCB8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s b/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s index df4c365c50..ab14180125 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DE2C /* 02922C 8004DE2C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s b/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s index 1c19615b9d..5e09d41b4b 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004DFD4 /* 0293D4 8004DFD4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s b/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s index 204f75a4bc..1aaae19b7b 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E0F4 /* 0294F4 8004E0F4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E158.s b/asm/nonmatchings/code_28910_len_5090/func_8004E158.s index 8e89b5882d..fee8483686 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E158.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E158.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E158 /* 029558 8004E158 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E344.s b/asm/nonmatchings/code_28910_len_5090/func_8004E344.s index 2df0f6bccc..ab1a0048c2 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E344.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E344.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E344 /* 029744 8004E344 0000182D */ daddu $v1, $zero, $zero diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E3A4.s b/asm/nonmatchings/code_28910_len_5090/func_8004E3A4.s index 8b98a30d49..3d222033af 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E3A4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E3A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E3A4 /* 0297A4 8004E3A4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E444.s b/asm/nonmatchings/code_28910_len_5090/func_8004E444.s index 960c2fbda2..9f2244bc3f 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E444.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E444.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E444 /* 029844 8004E444 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s b/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s index c28fb7bd28..c014f19ff5 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E4B8 /* 0298B8 8004E4B8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E5D8.s b/asm/nonmatchings/code_28910_len_5090/func_8004E5D8.s index be73e837ae..e365113050 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E5D8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E5D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E5D8 /* 0299D8 8004E5D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E844.s b/asm/nonmatchings/code_28910_len_5090/func_8004E844.s index e0d0187e5a..210d5e5cd3 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E844.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E844.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E844 /* 029C44 8004E844 000510C0 */ sll $v0, $a1, 3 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E880.s b/asm/nonmatchings/code_28910_len_5090/func_8004E880.s index cdf088891d..8542e41def 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E880.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E880.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E880 /* 029C80 8004E880 3C02009F */ lui $v0, 0x9f diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E904.s b/asm/nonmatchings/code_28910_len_5090/func_8004E904.s index 7e97510a77..ed719a646e 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E904.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E904.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004E904 /* 029D04 8004E904 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s b/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s index 757d350fa9..a1cbadbe95 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004EA34 /* 029E34 8004EA34 30A8001F */ andi $t0, $a1, 0x1f diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s b/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s index a2b89071fa..31eb6a608d 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004EAD4 /* 029ED4 8004EAD4 0000402D */ daddu $t0, $zero, $zero diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004EC04.s b/asm/nonmatchings/code_28910_len_5090/func_8004EC04.s index 218b9eeea5..22cb2b56c4 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004EC04.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004EC04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004EC04 /* 02A004 8004EC04 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s b/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s index faafef37bc..4d244d6556 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004EC68 /* 02A068 8004EC68 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004FC08.s b/asm/nonmatchings/code_28910_len_5090/func_8004FC08.s index 6a20010ea4..7604987b64 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004FC08.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004FC08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004FC08 /* 02B008 8004FC08 44852000 */ mtc1 $a1, $f4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004FD38.s b/asm/nonmatchings/code_28910_len_5090/func_8004FD38.s index a6186560d5..7630b7e27d 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004FD38.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004FD38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004FD38 /* 02B138 8004FD38 908200D4 */ lbu $v0, 0xd4($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004FEB0.s b/asm/nonmatchings/code_28910_len_5090/func_8004FEB0.s index 4b7cce15da..f8055a1525 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004FEB0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004FEB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004FEB0 /* 02B2B0 8004FEB0 908200D4 */ lbu $v0, 0xd4($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004FED0.s b/asm/nonmatchings/code_28910_len_5090/func_8004FED0.s index 32dd649c5f..34ac803435 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004FED0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004FED0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8004FED0 /* 02B2D0 8004FED0 908200D6 */ lbu $v0, 0xd6($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050568.s b/asm/nonmatchings/code_28910_len_5090/func_80050568.s index aef05fe4a8..21a143bc17 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050568.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050568.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050568 /* 02B968 80050568 8C820050 */ lw $v0, 0x50($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_800505E4.s b/asm/nonmatchings/code_28910_len_5090/func_800505E4.s index 3c5a63eb7d..f6db57c747 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800505E4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800505E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800505E4 /* 02B9E4 800505E4 00041903 */ sra $v1, $a0, 4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050654.s b/asm/nonmatchings/code_28910_len_5090/func_80050654.s index 97c2d5d4cb..3f6a7c4da6 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050654.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050654.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050654 /* 02BA54 80050654 00041203 */ sra $v0, $a0, 8 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8005068C.s b/asm/nonmatchings/code_28910_len_5090/func_8005068C.s index 9617bbcbe2..366705fd68 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8005068C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8005068C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005068C /* 02BA8C 8005068C 000411C3 */ sra $v0, $a0, 7 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800506C8.s b/asm/nonmatchings/code_28910_len_5090/func_800506C8.s index 900015644d..69326658b1 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800506C8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800506C8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800506C8 /* 02BAC8 800506C8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050770.s b/asm/nonmatchings/code_28910_len_5090/func_80050770.s index 66a2a8a6c5..c629241b8d 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050770.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050770.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050770 /* 02BB70 80050770 44852000 */ mtc1 $a1, $f4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050818.s b/asm/nonmatchings/code_28910_len_5090/func_80050818.s index e40f5512de..f3f4ae7543 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050818.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050818.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050818 /* 02BC18 80050818 28A204B1 */ slti $v0, $a1, 0x4b1 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8005083C.s b/asm/nonmatchings/code_28910_len_5090/func_8005083C.s index 641f17fb6e..aaf67bcd86 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8005083C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8005083C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005083C /* 02BC3C 8005083C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8005087C.s b/asm/nonmatchings/code_28910_len_5090/func_8005087C.s index 48c5847fe9..e4dc1f94f2 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8005087C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8005087C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005087C /* 02BC7C 8005087C AC850204 */ sw $a1, 0x204($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050888.s b/asm/nonmatchings/code_28910_len_5090/func_80050888.s index 01d9de8721..257d5edafd 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050888.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050888.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050888 /* 02BC88 80050888 10C00002 */ beqz $a2, .L80050894 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050900.s b/asm/nonmatchings/code_28910_len_5090/func_80050900.s index 0207af030a..7b02af6a8f 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050900.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050900.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050900 /* 02BD00 80050900 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050970.s b/asm/nonmatchings/code_28910_len_5090/func_80050970.s index fbc3f74b8c..3213e373c3 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050970.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050970.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050970 /* 02BD70 80050970 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050B90.s b/asm/nonmatchings/code_28910_len_5090/func_80050B90.s index 4a5b011d10..6021072c40 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050B90.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050B90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050B90 /* 02BF90 80050B90 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050C30.s b/asm/nonmatchings/code_28910_len_5090/func_80050C30.s index 880e8527cb..a007f83e89 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050C30.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050C30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050C30 /* 02C030 80050C30 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050C54.s b/asm/nonmatchings/code_28910_len_5090/func_80050C54.s index 0e617b9d4e..00da28a145 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050C54.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050C54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050C54 /* 02C054 80050C54 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050C64.s b/asm/nonmatchings/code_28910_len_5090/func_80050C64.s index ff67d1e246..5a06c72527 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050C64.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050C64.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050C64 /* 02C064 80050C64 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s b/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s index ec9aecc06b..0381629775 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050CA0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050CA0 /* 02C0A0 80050CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050D50.s b/asm/nonmatchings/code_28910_len_5090/func_80050D50.s index 5564a5a0e3..cc8fa1fd06 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050D50.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050D50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050D50 /* 02C150 80050D50 0080302D */ daddu $a2, $a0, $zero diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050E18.s b/asm/nonmatchings/code_28910_len_5090/func_80050E18.s index a2c541644c..09e6e8c890 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050E18.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050E18.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050E18 /* 02C218 80050E18 00041100 */ sll $v0, $a0, 4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050E84.s b/asm/nonmatchings/code_28910_len_5090/func_80050E84.s index d717d5306c..4edd1cc92e 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050E84.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050E84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050E84 /* 02C284 80050E84 00041100 */ sll $v0, $a0, 4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s b/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s index 8227ef204d..639a4d9c70 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050EF0 /* 02C2F0 80050EF0 00041100 */ sll $v0, $a0, 4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050F64.s b/asm/nonmatchings/code_28910_len_5090/func_80050F64.s index eab90fd271..841df38ef4 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050F64.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050F64.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050F64 /* 02C364 80050F64 00041100 */ sll $v0, $a0, 4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s b/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s index 1f619d6294..cb129c876b 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050FD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80050FD0 /* 02C3D0 80050FD0 00041100 */ sll $v0, $a0, 4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80051050.s b/asm/nonmatchings/code_28910_len_5090/func_80051050.s index d08f21f0e5..da711ed97a 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80051050.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80051050.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80051050 /* 02C450 80051050 00041100 */ sll $v0, $a0, 4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800510A4.s b/asm/nonmatchings/code_28910_len_5090/func_800510A4.s index d0af8db70d..47900d517d 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800510A4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800510A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800510A4 /* 02C4A4 800510A4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800511BC.s b/asm/nonmatchings/code_28910_len_5090/func_800511BC.s index 8a2b9204d6..a4e3b1aafb 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800511BC.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800511BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800511BC /* 02C5BC 800511BC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80051334.s b/asm/nonmatchings/code_28910_len_5090/func_80051334.s index 175d463c75..5d76075195 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80051334.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80051334.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80051334 /* 02C734 80051334 8CA30000 */ lw $v1, ($a1) diff --git a/asm/nonmatchings/code_28910_len_5090/func_80051434.s b/asm/nonmatchings/code_28910_len_5090/func_80051434.s index 8a104c72df..a310c9a378 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80051434.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80051434.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80051434 /* 02C834 80051434 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800521D0.s b/asm/nonmatchings/code_28910_len_5090/func_800521D0.s index d6a81a16d8..03f46dbd52 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800521D0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800521D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800521D0 /* 02D5D0 800521D0 8C830008 */ lw $v1, 8($a0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_800521E8.s b/asm/nonmatchings/code_28910_len_5090/func_800521E8.s index 690d948b2a..cb375627b5 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800521E8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800521E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800521E8 /* 02D5E8 800521E8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800522A8.s b/asm/nonmatchings/code_28910_len_5090/func_800522A8.s index e2a2d7cc3f..4d7fa58158 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800522A8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800522A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800522A8 /* 02D6A8 800522A8 24A901D4 */ addiu $t1, $a1, 0x1d4 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8005232C.s b/asm/nonmatchings/code_28910_len_5090/func_8005232C.s index d179d3b25f..bf73882c45 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8005232C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8005232C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005232C /* 02D72C 8005232C 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_800525A0.s b/asm/nonmatchings/code_2d9a0_len_890/func_800525A0.s index 469ef67134..aef3407e11 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_800525A0.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_800525A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800525A0 /* 02D9A0 800525A0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052614.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052614.s index c0bf4400c4..89f64c86cb 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052614.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052614.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052614 /* 02DA14 80052614 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s index 252c928cb4..95dab1e035 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052660 /* 02DA60 80052660 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052B44.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052B44.s index c5498714f1..8bfc9f54d5 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052B44.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052B44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052B44 /* 02DF44 80052B44 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052BC0.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052BC0.s index 0673c1ff49..8c2cda3dff 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052BC0.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052BC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052BC0 /* 02DFC0 80052BC0 3C02B65C */ lui $v0, 0xb65c diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s index 6256d308f6..db07758e04 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052BF8 /* 02DFF8 80052BF8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s b/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s index b7918b8b32..171b60140f 100644 --- a/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s +++ b/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052CFC /* 02E0FC 80052CFC 240A00FC */ addiu $t2, $zero, 0xfc diff --git a/asm/nonmatchings/code_2e230_len_2190/al_CopyFileTableEntry.s b/asm/nonmatchings/code_2e230_len_2190/al_CopyFileTableEntry.s index ef1b555851..ce95e6041b 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_CopyFileTableEntry.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_CopyFileTableEntry.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_CopyFileTableEntry /* 02F87C 8005447C 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/code_2e230_len_2190/al_CopyWords.s b/asm/nonmatchings/code_2e230_len_2190/al_CopyWords.s index 1b0a2bf45f..088636e160 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_CopyWords.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_CopyWords.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_CopyWords /* 030374 80054F74 04C10002 */ bgez $a2, .L80054F80 diff --git a/asm/nonmatchings/code_2e230_len_2190/al_DmaCopy.s b/asm/nonmatchings/code_2e230_len_2190/al_DmaCopy.s index 8b9e7f03a2..eb734745c4 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_DmaCopy.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_DmaCopy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_DmaCopy /* 030200 80054E00 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s b/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s index 0df3d96752..0509b24a51 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_LoadBank.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_LoadBank /* 02FBC8 800547C8 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_2e230_len_2190/al_LoadINIT.s b/asm/nonmatchings/code_2e230_len_2190/al_LoadINIT.s index 435f4c0a98..a84ed94fce 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_LoadINIT.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_LoadINIT.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_LoadINIT /* 02F6BC 800542BC 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/code_2e230_len_2190/al_LoadPER.s b/asm/nonmatchings/code_2e230_len_2190/al_LoadPER.s index a9d0081fba..45268500ae 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_LoadPER.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_LoadPER.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_LoadPER /* 02F8F8 800544F8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_2e230_len_2190/al_LoadPRG.s b/asm/nonmatchings/code_2e230_len_2190/al_LoadPRG.s index 9feffba9ef..a7caa5bf88 100644 --- a/asm/nonmatchings/code_2e230_len_2190/al_LoadPRG.s +++ b/asm/nonmatchings/code_2e230_len_2190/al_LoadPRG.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_LoadPRG /* 02F9B4 800545B4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80052E30.s b/asm/nonmatchings/code_2e230_len_2190/func_80052E30.s index b7c7f10b74..568698b508 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80052E30.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80052E30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052E30 /* 02E230 80052E30 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80052E5C.s b/asm/nonmatchings/code_2e230_len_2190/func_80052E5C.s index fbaa2a48d1..7a2a3e0830 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80052E5C.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80052E5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80052E5C /* 02E25C 80052E5C 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800532F4.s b/asm/nonmatchings/code_2e230_len_2190/func_800532F4.s index c5ad6e8d4f..f08f1321b6 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800532F4.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800532F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800532F4 /* 02E6F4 800532F4 3C013F00 */ lui $at, 0x3f00 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053370.s b/asm/nonmatchings/code_2e230_len_2190/func_80053370.s index 37c1d1250d..be229801a6 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053370.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053370.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053370 /* 02E770 80053370 24022010 */ addiu $v0, $zero, 0x2010 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800533A8.s b/asm/nonmatchings/code_2e230_len_2190/func_800533A8.s index e319897b50..4c966fb51b 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800533A8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800533A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800533A8 /* 02E7A8 800533A8 24022010 */ addiu $v0, $zero, 0x2010 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s index d93842acae..85b8944a16 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800533D0 /* 02E7D0 800533D0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800535C0.s b/asm/nonmatchings/code_2e230_len_2190/func_800535C0.s index c6d8f1d9c7..a61041d772 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800535C0.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800535C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800535C0 /* 02E9C0 800535C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053654.s b/asm/nonmatchings/code_2e230_len_2190/func_80053654.s index 14ab700b3f..bb13706107 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053654.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053654.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053654 /* 02EA54 80053654 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053888.s b/asm/nonmatchings/code_2e230_len_2190/func_80053888.s index b1b622308d..75bfbdf73b 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053888.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053888.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053888 /* 02EC88 80053888 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800538C4.s b/asm/nonmatchings/code_2e230_len_2190/func_800538C4.s index 15341758a3..1de449f0dc 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800538C4.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800538C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800538C4 /* 02ECC4 800538C4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s b/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s index a462b2997c..96f450facb 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800538F8 /* 02ECF8 800538F8 0080282D */ daddu $a1, $a0, $zero diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053974.s b/asm/nonmatchings/code_2e230_len_2190/func_80053974.s index 73933c39f3..f19940e699 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053974.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053974.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053974 /* 02ED74 80053974 0080402D */ daddu $t0, $a0, $zero diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053A18.s b/asm/nonmatchings/code_2e230_len_2190/func_80053A18.s index 048010c48a..3f7c8a0cb5 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053A18.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053A18.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053A18 /* 02EE18 80053A18 A480000A */ sh $zero, 0xa($a0) diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053A28.s b/asm/nonmatchings/code_2e230_len_2190/func_80053A28.s index ac703a6c3e..6ce894bb83 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053A28.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053A28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053A28 /* 02EE28 80053A28 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053A98.s b/asm/nonmatchings/code_2e230_len_2190/func_80053A98.s index 08d274270c..66ecc3e00f 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053A98.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053A98.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053A98 /* 02EE98 80053A98 30A5FFFF */ andi $a1, $a1, 0xffff diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053AC8.s b/asm/nonmatchings/code_2e230_len_2190/func_80053AC8.s index 9c659dd8ec..41c7bcac7f 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053AC8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053AC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053AC8 /* 02EEC8 80053AC8 8482000A */ lh $v0, 0xa($a0) diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053AEC.s b/asm/nonmatchings/code_2e230_len_2190/func_80053AEC.s index eb4379a6b4..0de2126baf 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053AEC.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053AEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053AEC /* 02EEEC 80053AEC 00051400 */ sll $v0, $a1, 0x10 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053B04.s b/asm/nonmatchings/code_2e230_len_2190/func_80053B04.s index 0b221f98be..4f0f961180 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053B04.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053B04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053B04 /* 02EF04 80053B04 3C020001 */ lui $v0, 1 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053BA8.s b/asm/nonmatchings/code_2e230_len_2190/func_80053BA8.s index 5108b06a86..0bf0cbcc6d 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053BA8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053BA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053BA8 /* 02EFA8 80053BA8 9482001A */ lhu $v0, 0x1a($a0) diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s b/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s index 2b668e7fc9..616592731f 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053BE8 /* 02EFE8 80053BE8 30A20070 */ andi $v0, $a1, 0x70 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s b/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s index 869ccbff29..ece7e46922 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053C58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053C58 /* 02F058 80053C58 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s b/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s index fb8cd3df94..6f9743b2e3 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053CF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053CF8 /* 02F0F8 80053CF8 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s b/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s index 8144052d62..33cf3cd26b 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053E58 /* 02F258 80053E58 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053F64.s b/asm/nonmatchings/code_2e230_len_2190/func_80053F64.s index 8418d1be75..c609ed4ee9 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053F64.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053F64.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053F64 /* 02F364 80053F64 14800004 */ bnez $a0, .L80053F78 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s b/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s index 17cb9fb36b..c7a77cf216 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80053F80 /* 02F380 80053F80 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054248.s b/asm/nonmatchings/code_2e230_len_2190/func_80054248.s index dda5fa9d4c..b01093ab22 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054248.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054248.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80054248 /* 02F648 80054248 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054744.s b/asm/nonmatchings/code_2e230_len_2190/func_80054744.s index 4f2b5a9fb3..532276321b 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054744.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054744.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80054744 /* 02FB44 80054744 0000182D */ daddu $v1, $zero, $zero diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s b/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s index 7fa41a5186..26ad018f66 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800549F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800549F8 /* 02FDF8 800549F8 00A0582D */ daddu $t3, $a1, $zero diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054C4C.s b/asm/nonmatchings/code_2e230_len_2190/func_80054C4C.s index 8409c7ebe4..4bf5ee1573 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054C4C.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054C4C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80054C4C /* 03004C 80054C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s b/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s index 3341242ca0..28428f2c30 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80054CE0 /* 0300E0 80054CE0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054D74.s b/asm/nonmatchings/code_2e230_len_2190/func_80054D74.s index f4b0a8b5a3..88636a8d62 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054D74.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054D74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80054D74 /* 030174 80054D74 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s b/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s index 6bcf21d745..9251e9177c 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80054DA8 /* 0301A8 80054DA8 30840001 */ andi $a0, $a0, 1 diff --git a/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s b/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s index ed0732a806..aa52bfbe91 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_80054E90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80054E90 /* 030290 80054E90 10A0000A */ beqz $a1, .L80054EBC diff --git a/asm/nonmatchings/code_303c0_len_3e10/alRename3.s b/asm/nonmatchings/code_303c0_len_3e10/alRename3.s index bd432b1627..a896ea231f 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/alRename3.s +++ b/asm/nonmatchings/code_303c0_len_3e10/alRename3.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel alHeapAlloc /* 033390 80057F90 0080382D */ daddu $a3, $a0, $zero diff --git a/asm/nonmatchings/code_303c0_len_3e10/alRename4.s b/asm/nonmatchings/code_303c0_len_3e10/alRename4.s index 71bbcfab2f..4cfc3fed3d 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/alRename4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/alRename4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel alAudioFrame /* 0319C0 800565C0 3C028008 */ lui $v0, 0x8008 diff --git a/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s b/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s index 5ad3802f0a..ac9318063c 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s +++ b/asm/nonmatchings/code_303c0_len_3e10/al_LoadBKHeaders.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel al_LoadBKHeaders /* 0303C0 80054FC0 27BDFE98 */ addiu $sp, $sp, -0x168 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055050.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055050.s index 376c447851..5809d00b19 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055050.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055050.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055050 /* 030450 80055050 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055110.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055110.s index 65f10af825..7090632483 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055110.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055110.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055110 /* 030510 80055110 24030007 */ addiu $v1, $zero, 7 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055240.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055240.s index d56b3694c2..3ec3d0cddf 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055240.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055240.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055240 /* 030640 80055240 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055330.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055330.s index 5ec0e8a9ba..c37bb381fe 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055330.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055330.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055330 /* 030730 80055330 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800553C0.s b/asm/nonmatchings/code_303c0_len_3e10/func_800553C0.s index ddc5542d51..5a292ac325 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800553C0.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800553C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800553C0 /* 0307C0 800553C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055448.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055448.s index bdeff585ac..09edc8b159 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055448.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055448.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055448 /* 030848 80055448 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055464.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055464.s index 63e9761382..91e70631d0 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055464.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055464.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055464 /* 030864 80055464 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800554A4.s b/asm/nonmatchings/code_303c0_len_3e10/func_800554A4.s index aec03d6609..f7fc68f069 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800554A4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800554A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800554A4 /* 0308A4 800554A4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800554E8.s b/asm/nonmatchings/code_303c0_len_3e10/func_800554E8.s index 475cec7de0..50eac5e970 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800554E8.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800554E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800554E8 /* 0308E8 800554E8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005553C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005553C.s index 97cba9bbb6..9a44d459b8 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005553C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005553C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005553C /* 03093C 8005553C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055590.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055590.s index 94e2933f26..bd184c8348 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055590.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055590.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055590 /* 030990 80055590 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800555E4.s b/asm/nonmatchings/code_303c0_len_3e10/func_800555E4.s index df6b896de5..48be607aca 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800555E4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800555E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800555E4 /* 0309E4 800555E4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800556D0.s b/asm/nonmatchings/code_303c0_len_3e10/func_800556D0.s index 1798d702c8..16de893431 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800556D0.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800556D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800556D0 /* 030AD0 800556D0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055718.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055718.s index 86901e6aba..d4a979cf78 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055718.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055718.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055718 /* 030B18 80055718 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055848.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055848.s index 41ca070554..97a422c6cc 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055848.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055848.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055848 /* 030C48 80055848 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800558D4.s b/asm/nonmatchings/code_303c0_len_3e10/func_800558D4.s index ad64c577e0..a38e32fdeb 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800558D4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800558D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800558D4 /* 030CD4 800558D4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s index 65542db763..c361e9dc20 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055970 /* 030D70 80055970 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s b/asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s index ae2b79dd69..0de67a6a2a 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800559C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800559C4 /* 030DC4 800559C4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800559FC.s b/asm/nonmatchings/code_303c0_len_3e10/func_800559FC.s index 6e15025cff..9e46dd3be4 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800559FC.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800559FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800559FC /* 030DFC 800559FC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s index 80e8f27b45..0d4dadb144 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055A18 /* 030E18 80055A18 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055ABC.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055ABC.s index a832ff3250..c11de5123d 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055ABC.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055ABC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055ABC /* 030EBC 80055ABC 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055AF0.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055AF0.s index 95867be21b..a2d0d17109 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055AF0.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055AF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055AF0 /* 030EF0 80055AF0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s index f5a6a6e9e5..306a2ea8d5 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055B28 /* 030F28 80055B28 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055B80.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055B80.s index 2eed9be075..ee438d8bad 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055B80.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055B80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055B80 /* 030F80 80055B80 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055BB8.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055BB8.s index cbacf67cf1..09c0673113 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055BB8.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055BB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055BB8 /* 030FB8 80055BB8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055CC4.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055CC4.s index 16fb70c5a0..335aceacc7 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055CC4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055CC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055CC4 /* 0310C4 80055CC4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055CE8.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055CE8.s index 8c07896a8f..442bb5604f 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055CE8.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055CE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055CE8 /* 0310E8 80055CE8 3C07800A */ lui $a3, 0x800a diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055DDC.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055DDC.s index bab28a32af..3343437bb7 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055DDC.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055DDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055DDC /* 0311DC 80055DDC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055E48.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055E48.s index 786f59b50c..b5f4006052 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055E48.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055E48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055E48 /* 031248 80055E48 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055EB4.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055EB4.s index 755cfa5e5f..88ae7f0dd6 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055EB4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055EB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055EB4 /* 0312B4 80055EB4 2C820008 */ sltiu $v0, $a0, 8 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055F58.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055F58.s index 1ec12b9c5d..66e4f473e3 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055F58.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055F58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80055F58 /* 031358 80055F58 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056028.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056028.s index cc55b03bec..da328d1367 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056028.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056028.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056028 /* 031428 80056028 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056044.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056044.s index 81a4ae5ab3..ed1335bf75 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056044.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056044.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056044 /* 031444 80056044 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056068.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056068.s index a480d360cd..d05eb6f2ea 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056068.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056068.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056068 /* 031468 80056068 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005608C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005608C.s index 601471be4e..0f80bd1b42 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005608C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005608C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005608C /* 03148C 8005608C 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800560A8.s b/asm/nonmatchings/code_303c0_len_3e10/func_800560A8.s index b94e586898..fca1d09ab7 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800560A8.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800560A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800560A8 /* 0314A8 800560A8 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s b/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s index 7ef1c05f1e..5721c8261c 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800560BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800560BC /* 0314BC 800560BC 3C07800A */ lui $a3, 0x800a diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005610C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005610C.s index b46788ad1f..0f804c4396 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005610C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005610C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005610C /* 03150C 8005610C 3C05800A */ lui $a1, 0x800a diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005615C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005615C.s index 1cd786748d..db342a2b11 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005615C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005615C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005615C /* 03155C 8005615C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056180.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056180.s index 7747dcf11d..23241fe806 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056180.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056180.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056180 /* 031580 80056180 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800561A4.s b/asm/nonmatchings/code_303c0_len_3e10/func_800561A4.s index bc2533dbed..92b178e833 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800561A4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800561A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800561A4 /* 0315A4 800561A4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800561E4.s b/asm/nonmatchings/code_303c0_len_3e10/func_800561E4.s index 2496972a26..e8ca2123f9 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800561E4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800561E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800561E4 /* 0315E4 800561E4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056204.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056204.s index 9a6ceda5f1..8dd0a3c7d3 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056204.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056204.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056204 /* 031604 80056204 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056228.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056228.s index 36e25b59fd..62f6562e71 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056228.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056228.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056228 /* 031628 80056228 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056250.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056250.s index 9e38aa1839..3958ba02de 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056250.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056250.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056250 /* 031650 80056250 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056D34.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056D34.s index 30aa84a7f4..88171f76f8 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056D34.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056D34.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056D34 /* 032134 80056D34 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056D44.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056D44.s index 093a2c338e..c5ab168395 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056D44.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056D44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056D44 /* 032144 80056D44 3C018008 */ lui $at, 0x8008 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056D50.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056D50.s index ada52b6783..e088b3ba5e 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056D50.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056D50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056D50 /* 032150 80056D50 3C028008 */ lui $v0, 0x8008 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056D5C.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056D5C.s index 57dd083c13..e358f61cb9 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056D5C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056D5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056D5C /* 03215C 80056D5C 3C028008 */ lui $v0, 0x8008 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056D78.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056D78.s index be14b2ec15..2718ab2f35 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056D78.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056D78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056D78 /* 032178 80056D78 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056DCC.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056DCC.s index fc0fa33ab8..2f8581f3f4 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056DCC.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056DCC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056DCC /* 0321CC 80056DCC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056EC0.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056EC0.s index 39390ec134..b623ca4e7f 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056EC0.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056EC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056EC0 /* 0322C0 80056EC0 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056EE8.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056EE8.s index 7274ffdc48..b6f9b60282 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056EE8.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056EE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056EE8 /* 0322E8 80056EE8 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80056FA4.s b/asm/nonmatchings/code_303c0_len_3e10/func_80056FA4.s index 32d17e6178..296d725929 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80056FA4.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80056FA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80056FA4 /* 0323A4 80056FA4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057224.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057224.s index 98dd9c55c2..f8335e3853 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057224.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057224.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057224 /* 032624 80057224 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057344.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057344.s index 4cd33d99de..372caa6522 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057344.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057344.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057344 /* 032744 80057344 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005736C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005736C.s index 0b99303821..84fa718dc1 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005736C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005736C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005736C /* 03276C 8005736C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057548.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057548.s index b4650131db..f3f6748289 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057548.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057548.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057548 /* 032948 80057548 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_800576EC.s b/asm/nonmatchings/code_303c0_len_3e10/func_800576EC.s index 271f1984e2..37b73b1d3b 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_800576EC.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_800576EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800576EC /* 032AEC 800576EC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057874.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057874.s index fd5ba84c25..2c7cc7f9bc 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057874.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057874.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057874 /* 032C74 80057874 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057DC8.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057DC8.s index 0b64d76b28..bbc9de3fe0 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057DC8.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057DC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057DC8 /* 0331C8 80057DC8 28820002 */ slti $v0, $a0, 2 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057E08.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057E08.s index e81e2dc426..93f67093c6 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057E08.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057E08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057E08 /* 033208 80057E08 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057E5C.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057E5C.s index 91cd3271dc..a82dfb8ac6 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057E5C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057E5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057E5C /* 03325C 80057E5C 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s index b47472fe04..90ab4831c8 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057EB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057EB0 /* 0332B0 80057EB0 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057ED0.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057ED0.s index 6d0f1f5208..c373d9875c 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057ED0.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057ED0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057ED0 /* 0332D0 80057ED0 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057F20.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057F20.s index 784aa0e8b9..6037c618c0 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057F20.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057F20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057F20 /* 033320 80057F20 30A3000F */ andi $v1, $a1, 0xf diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80057FD8.s b/asm/nonmatchings/code_303c0_len_3e10/func_80057FD8.s index ceac546d3d..5f2d90e3e1 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80057FD8.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80057FD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80057FD8 /* 0333D8 80057FD8 18C00008 */ blez $a2, .L80057FFC diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80058004.s b/asm/nonmatchings/code_303c0_len_3e10/func_80058004.s index 31b73d3c38..0e5f1c04cd 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80058004.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80058004.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80058004 /* 033404 80058004 000528C3 */ sra $a1, $a1, 3 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80058050.s b/asm/nonmatchings/code_303c0_len_3e10/func_80058050.s index 69c3057fcf..2e79dadb7f 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80058050.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80058050.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80058050 /* 033450 80058050 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80058B20.s b/asm/nonmatchings/code_303c0_len_3e10/func_80058B20.s index fc764c2d5a..c66dce5fe6 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80058B20.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80058B20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80058B20 /* 033F20 80058B20 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80058C6C.s b/asm/nonmatchings/code_303c0_len_3e10/func_80058C6C.s index 1388ee8be9..7ab5d82bfc 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80058C6C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80058C6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80058C6C /* 03406C 80058C6C 8FA20010 */ lw $v0, 0x10($sp) diff --git a/asm/nonmatchings/code_3169f0/func_80200000.s b/asm/nonmatchings/code_3169f0/func_80200000.s index 8e820a478d..f771aac85f 100644 --- a/asm/nonmatchings/code_3169f0/func_80200000.s +++ b/asm/nonmatchings/code_3169f0/func_80200000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80200000 /* 3169F0 80200000 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_316a70/func_80200080.s b/asm/nonmatchings/code_316a70/func_80200080.s index 37c0b42bc7..0514f8ceb2 100644 --- a/asm/nonmatchings/code_316a70/func_80200080.s +++ b/asm/nonmatchings/code_316a70/func_80200080.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80200080 /* 316A70 80200080 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_316d90/func_802AE000.s b/asm/nonmatchings/code_316d90/func_802AE000.s index 17fc504ed9..f94d91a9aa 100644 --- a/asm/nonmatchings/code_316d90/func_802AE000.s +++ b/asm/nonmatchings/code_316d90/func_802AE000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AE000 /* 316D90 802AE000 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s index c6b581df88..7ad5dddfce 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80058DD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80058DD0 /* 0341D0 80058DD0 24050007 */ addiu $a1, $zero, 7 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s b/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s index 67df86081b..fadad44c83 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80058E84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80058E84 /* 034284 80058E84 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s index d95a790ccd..75c78d004e 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80059008.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80059008 /* 034408 80059008 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s b/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s index a68964c06a..82bb4589f0 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_8005904C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005904C /* 03444C 8005904C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s index 1ca4334991..b3db25b17e 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80059310.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80059310 /* 034710 80059310 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s b/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s index a89c35ab7b..152709bb16 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_800598A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800598A0 /* 034CA0 800598A0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s index c522700998..c24d6c540e 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80059AB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80059AB8 /* 034EB8 80059AB8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s index 30e2146207..6ec5a41f46 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80059BD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80059BD4 /* 034FD4 80059BD4 C4800010 */ lwc1 $f0, 0x10($a0) diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s index 2562bea22e..1b49f9672b 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80059C9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80059C9C /* 03509C 80059C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s index 1dccb11e4f..2c228e8fd3 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80059D50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80059D50 /* 035150 80059D50 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s b/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s index d1acc8ac3f..ff317f8a97 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s +++ b/asm/nonmatchings/code_341d0_len_20d0/func_80059F94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80059F94 /* 035394 80059F94 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s b/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s index d1478ddf56..92121b120c 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s +++ b/asm/nonmatchings/code_341d0_len_20d0/get_asset_offset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_asset_offset /* 0361D0 8005ADD0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s index ad91c59875..87ee20ad30 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s +++ b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_config.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_current_map_config /* 035FD8 8005ABD8 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s index b98e1d264c..7659bdecd8 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s +++ b/asm/nonmatchings/code_341d0_len_20d0/get_current_map_header.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_current_map_header /* 035FE8 8005ABE8 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s index a23d307d8e..10cd2d69cd 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s +++ b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_map_IDs_by_name /* 035FF8 8005ABF8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s index 884225ebe8..0e6908300f 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s +++ b/asm/nonmatchings/code_341d0_len_20d0/load_asset_by_name.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_asset_by_name /* 0360E8 8005ACE8 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s b/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s index d739b253cb..099266215c 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s +++ b/asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_map_by_IDs /* 035AF4 8005A6F4 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_341d0_len_20d0/load_map_script_lib.s b/asm/nonmatchings/code_341d0_len_20d0/load_map_script_lib.s index acd61d0617..38d591c346 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/load_map_script_lib.s +++ b/asm/nonmatchings/code_341d0_len_20d0/load_map_script_lib.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_map_script_lib /* 035AC0 8005A6C0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_341d0_len_20d0/play_effect.s b/asm/nonmatchings/code_341d0_len_20d0/play_effect.s index 8ab62532c4..77c8212248 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/play_effect.s +++ b/asm/nonmatchings/code_341d0_len_20d0/play_effect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_effect /* 035964 8005A564 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s b/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s index 55d1d00466..a9f4df7b67 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s +++ b/asm/nonmatchings/code_341d0_len_20d0/remove_all_effects.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_all_effects /* 0358E0 8005A4E0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s b/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s index 33186f9ea5..010ed0ab61 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s +++ b/asm/nonmatchings/code_341d0_len_20d0/remove_effect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_effect /* 035850 8005A450 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_341d0_len_20d0/render_effects.s b/asm/nonmatchings/code_341d0_len_20d0/render_effects.s index 195a6ab66e..d397e5409f 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/render_effects.s +++ b/asm/nonmatchings/code_341d0_len_20d0/render_effects.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_effects /* 0352F4 80059EF4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s b/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s index 4fdd3c3452..0f2e8b96a7 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s +++ b/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _add_hit_vert_to_buffer /* 036DA0 8005B9A0 8CC80000 */ lw $t0, ($a2) diff --git a/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s b/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s index 05f80c4bd9..fdb8f234dc 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s +++ b/asm/nonmatchings/code_362a0_len_2f70/_get_hit_vert_index_from_buffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _get_hit_vert_index_from_buffer /* 036DF4 8005B9F4 8CC60000 */ lw $a2, ($a2) diff --git a/asm/nonmatchings/code_362a0_len_2f70/allocate_hit_tables.s b/asm/nonmatchings/code_362a0_len_2f70/allocate_hit_tables.s index 806ffe73ac..13dca92ada 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/allocate_hit_tables.s +++ b/asm/nonmatchings/code_362a0_len_2f70/allocate_hit_tables.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel allocate_hit_tables /* 0362A0 8005AEA0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_362a0_len_2f70/func_8005AF84.s b/asm/nonmatchings/code_362a0_len_2f70/func_8005AF84.s index 7c78af4f5f..93362716f7 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/func_8005AF84.s +++ b/asm/nonmatchings/code_362a0_len_2f70/func_8005AF84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005AF84 /* 036384 8005AF84 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_362a0_len_2f70/func_8005BDD8.s b/asm/nonmatchings/code_362a0_len_2f70/func_8005BDD8.s index f2f6b40e48..64cb72d4a7 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/func_8005BDD8.s +++ b/asm/nonmatchings/code_362a0_len_2f70/func_8005BDD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8005BDD8 /* 0371D8 8005BDD8 000410C0 */ sll $v0, $a0, 3 diff --git a/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s b/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s index 3c35fbfc45..ef5a427ae0 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s +++ b/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_collider_center /* 037210 8005BE10 000410C0 */ sll $v0, $a0, 3 diff --git a/asm/nonmatchings/code_362a0_len_2f70/get_collider_type_by_id.s b/asm/nonmatchings/code_362a0_len_2f70/get_collider_type_by_id.s index 3f5fe8ac7f..5b20c99523 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/get_collider_type_by_id.s +++ b/asm/nonmatchings/code_362a0_len_2f70/get_collider_type_by_id.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_collider_type_by_id /* 0371A8 8005BDA8 30824000 */ andi $v0, $a0, 0x4000 diff --git a/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s b/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s index 6baf4ea076..618836eb65 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s +++ b/asm/nonmatchings/code_362a0_len_2f70/initialize_collision.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel initialize_collision /* 036394 8005AF94 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_362a0_len_2f70/load_collision.s b/asm/nonmatchings/code_362a0_len_2f70/load_collision.s index 9741e2a891..fc325e0c2f 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/load_collision.s +++ b/asm/nonmatchings/code_362a0_len_2f70/load_collision.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_collision /* 036458 8005B058 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_362a0_len_2f70/load_hit_asset.s b/asm/nonmatchings/code_362a0_len_2f70/load_hit_asset.s index 307e418357..515fb9a5c4 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/load_hit_asset.s +++ b/asm/nonmatchings/code_362a0_len_2f70/load_hit_asset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_hit_asset /* 0363C0 8005AFC0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s b/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s index 5f03630c56..2b30968b07 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s +++ b/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_hit_data /* 03663C 8005B23C 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s b/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s index 47c81e2b8f..89b485fec3 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s +++ b/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_stage_collision /* 0365A0 8005B1A0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_362a0_len_2f70/parent_collider_to_model.s b/asm/nonmatchings/code_362a0_len_2f70/parent_collider_to_model.s index 2f1d2e15d3..184cda401f 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/parent_collider_to_model.s +++ b/asm/nonmatchings/code_362a0_len_2f70/parent_collider_to_model.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel parent_collider_to_model /* 036B80 8005B780 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s b/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s index bc16aeff40..9fcddcfc36 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_down_ray_triangle /* 03789C 8005C49C C4800030 */ lwc1 $f0, 0x30($a0) diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s index 1a723bec2e..a2221b788f 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_ray_colliders /* 0380D0 8005CCD0 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s index f64f8ef0bb..57e68b7942 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_ray_entities /* 038848 8005D448 27BDFE60 */ addiu $sp, $sp, -0x1a0 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s index 18aecadded..a7c6df847a 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_ray_triangle_general /* 037284 8005BE84 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s b/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s index a527637918..b9dd5247d5 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_ray_zones /* 038524 8005D124 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s index 0445125e50..30825c1cb5 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_up_ray_collider /* 0386DC 8005D2DC 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s index de16efde30..4cf215b44d 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s +++ b/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_up_ray_triangle /* 037BA4 8005C7A4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s b/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s index 5d81fedbd4..d6ba88e09b 100644 --- a/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s +++ b/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_collider_transform /* 036E24 8005BA24 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_39210_len_aa0/get_npc_pos.s b/asm/nonmatchings/code_39210_len_aa0/get_npc_pos.s index a44cf175c6..2d171c0ae9 100644 --- a/asm/nonmatchings/code_39210_len_aa0/get_npc_pos.s +++ b/asm/nonmatchings/code_39210_len_aa0/get_npc_pos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_npc_pos /* 039210 8005DE10 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_3bf0_len_6f0/func_800287F0.s b/asm/nonmatchings/code_3bf0_len_6f0/func_800287F0.s index 2f87e191ef..d78620dc2c 100644 --- a/asm/nonmatchings/code_3bf0_len_6f0/func_800287F0.s +++ b/asm/nonmatchings/code_3bf0_len_6f0/func_800287F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800287F0 /* 003BF0 800287F0 3C038007 */ lui $v1, 0x8007 diff --git a/asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s b/asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s index 2f4daf3208..26559d9770 100644 --- a/asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s +++ b/asm/nonmatchings/code_3bf0_len_6f0/func_80028838.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80028838 /* 003C38 80028838 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_3bf0_len_6f0/update_input.s b/asm/nonmatchings/code_3bf0_len_6f0/update_input.s index 1f1f5d7062..5a4d08fb05 100644 --- a/asm/nonmatchings/code_3bf0_len_6f0/update_input.s +++ b/asm/nonmatchings/code_3bf0_len_6f0/update_input.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_input /* 003C74 80028874 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_415D90/can_switch_to_player.s b/asm/nonmatchings/code_415D90/can_switch_to_player.s index c074fffba2..de1be1f128 100644 --- a/asm/nonmatchings/code_415D90/can_switch_to_player.s +++ b/asm/nonmatchings/code_415D90/can_switch_to_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel can_switch_to_player /* 41A5A8 802A5818 3C06800E */ lui $a2, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802A1000.s b/asm/nonmatchings/code_415D90/func_802A1000.s index 1a37ac63be..38fbe93cf8 100644 --- a/asm/nonmatchings/code_415D90/func_802A1000.s +++ b/asm/nonmatchings/code_415D90/func_802A1000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A1000 /* 415D90 802A1000 240200FF */ addiu $v0, $zero, 0xff diff --git a/asm/nonmatchings/code_415D90/func_802A1030.s b/asm/nonmatchings/code_415D90/func_802A1030.s index 6ab6ac6838..fe37755753 100644 --- a/asm/nonmatchings/code_415D90/func_802A1030.s +++ b/asm/nonmatchings/code_415D90/func_802A1030.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A1030 /* 415DC0 802A1030 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/code_415D90/func_802A1050.s b/asm/nonmatchings/code_415D90/func_802A1050.s index b026c616b4..ea6d22aa6b 100644 --- a/asm/nonmatchings/code_415D90/func_802A1050.s +++ b/asm/nonmatchings/code_415D90/func_802A1050.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A1050 /* 415DE0 802A1050 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_415D90/func_802A1078.s b/asm/nonmatchings/code_415D90/func_802A1078.s index 9c6c0e11c4..72b2900b2f 100644 --- a/asm/nonmatchings/code_415D90/func_802A1078.s +++ b/asm/nonmatchings/code_415D90/func_802A1078.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A1078 /* 415E08 802A1078 240200FF */ addiu $v0, $zero, 0xff diff --git a/asm/nonmatchings/code_415D90/func_802A1098.s b/asm/nonmatchings/code_415D90/func_802A1098.s index 5ce2101548..eb851a4c56 100644 --- a/asm/nonmatchings/code_415D90/func_802A1098.s +++ b/asm/nonmatchings/code_415D90/func_802A1098.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A1098 /* 415E28 802A1098 24020064 */ addiu $v0, $zero, 0x64 diff --git a/asm/nonmatchings/code_415D90/func_802A10B8.s b/asm/nonmatchings/code_415D90/func_802A10B8.s index 9157eaf52e..b3c49c2288 100644 --- a/asm/nonmatchings/code_415D90/func_802A10B8.s +++ b/asm/nonmatchings/code_415D90/func_802A10B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A10B8 /* 415E48 802A10B8 3C02802B */ lui $v0, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A11B0.s b/asm/nonmatchings/code_415D90/func_802A11B0.s index 4c105df0fa..6a42c94aed 100644 --- a/asm/nonmatchings/code_415D90/func_802A11B0.s +++ b/asm/nonmatchings/code_415D90/func_802A11B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A11B0 /* 415F40 802A11B0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_415D90/func_802A1C54.s b/asm/nonmatchings/code_415D90/func_802A1C54.s index 2106035eca..c131dd1697 100644 --- a/asm/nonmatchings/code_415D90/func_802A1C54.s +++ b/asm/nonmatchings/code_415D90/func_802A1C54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A1C54 /* 4169E4 802A1C54 3C02802B */ lui $v0, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A2684.s b/asm/nonmatchings/code_415D90/func_802A2684.s index 60a24730fb..166e4f7a8d 100644 --- a/asm/nonmatchings/code_415D90/func_802A2684.s +++ b/asm/nonmatchings/code_415D90/func_802A2684.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A2684 /* 417414 802A2684 3C03802B */ lui $v1, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A27D0.s b/asm/nonmatchings/code_415D90/func_802A27D0.s index 2157e6d1ad..b96cce3f3b 100644 --- a/asm/nonmatchings/code_415D90/func_802A27D0.s +++ b/asm/nonmatchings/code_415D90/func_802A27D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A27D0 /* 417560 802A27D0 2402000A */ addiu $v0, $zero, 0xa diff --git a/asm/nonmatchings/code_415D90/func_802A27E4.s b/asm/nonmatchings/code_415D90/func_802A27E4.s index 19290c3f33..f324a16764 100644 --- a/asm/nonmatchings/code_415D90/func_802A27E4.s +++ b/asm/nonmatchings/code_415D90/func_802A27E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A27E4 /* 417574 802A27E4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A2910.s b/asm/nonmatchings/code_415D90/func_802A2910.s index 115ccbf7b4..b0da115a60 100644 --- a/asm/nonmatchings/code_415D90/func_802A2910.s +++ b/asm/nonmatchings/code_415D90/func_802A2910.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A2910 /* 4176A0 802A2910 3C02802B */ lui $v0, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A2AB8.s b/asm/nonmatchings/code_415D90/func_802A2AB8.s index 859e1e9751..540dc68ac1 100644 --- a/asm/nonmatchings/code_415D90/func_802A2AB8.s +++ b/asm/nonmatchings/code_415D90/func_802A2AB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A2AB8 /* 417848 802A2AB8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A2C58.s b/asm/nonmatchings/code_415D90/func_802A2C58.s index a9361936d8..3020c31c86 100644 --- a/asm/nonmatchings/code_415D90/func_802A2C58.s +++ b/asm/nonmatchings/code_415D90/func_802A2C58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A2C58 /* 4179E8 802A2C58 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_415D90/func_802A2C84.s b/asm/nonmatchings/code_415D90/func_802A2C84.s index b599744c8d..7937b4e495 100644 --- a/asm/nonmatchings/code_415D90/func_802A2C84.s +++ b/asm/nonmatchings/code_415D90/func_802A2C84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A2C84 /* 417A14 802A2C84 3C02802B */ lui $v0, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A45D8.s b/asm/nonmatchings/code_415D90/func_802A45D8.s index 40a496d517..1a909e368a 100644 --- a/asm/nonmatchings/code_415D90/func_802A45D8.s +++ b/asm/nonmatchings/code_415D90/func_802A45D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A45D8 /* 419368 802A45D8 3C03802B */ lui $v1, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A4718.s b/asm/nonmatchings/code_415D90/func_802A4718.s index 657a423b87..05e1cd30ba 100644 --- a/asm/nonmatchings/code_415D90/func_802A4718.s +++ b/asm/nonmatchings/code_415D90/func_802A4718.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A4718 /* 4194A8 802A4718 2402000A */ addiu $v0, $zero, 0xa diff --git a/asm/nonmatchings/code_415D90/func_802A472C.s b/asm/nonmatchings/code_415D90/func_802A472C.s index 9fa3a819d5..1037383b8a 100644 --- a/asm/nonmatchings/code_415D90/func_802A472C.s +++ b/asm/nonmatchings/code_415D90/func_802A472C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A472C /* 4194BC 802A472C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A47E0.s b/asm/nonmatchings/code_415D90/func_802A47E0.s index 8bfaac6e08..59977d0634 100644 --- a/asm/nonmatchings/code_415D90/func_802A47E0.s +++ b/asm/nonmatchings/code_415D90/func_802A47E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A47E0 /* 419570 802A47E0 3C02802B */ lui $v0, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A48FC.s b/asm/nonmatchings/code_415D90/func_802A48FC.s index a7f07b8170..1441b22d1b 100644 --- a/asm/nonmatchings/code_415D90/func_802A48FC.s +++ b/asm/nonmatchings/code_415D90/func_802A48FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A48FC /* 41968C 802A48FC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_415D90/func_802A4A10.s b/asm/nonmatchings/code_415D90/func_802A4A10.s index 31fd3f384d..a025112fa1 100644 --- a/asm/nonmatchings/code_415D90/func_802A4A10.s +++ b/asm/nonmatchings/code_415D90/func_802A4A10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A4A10 /* 4197A0 802A4A10 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_415D90/func_802A4A54.s b/asm/nonmatchings/code_415D90/func_802A4A54.s index 667dcef043..ac4d42e6e4 100644 --- a/asm/nonmatchings/code_415D90/func_802A4A54.s +++ b/asm/nonmatchings/code_415D90/func_802A4A54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A4A54 /* 4197E4 802A4A54 3C02802B */ lui $v0, 0x802b diff --git a/asm/nonmatchings/code_415D90/func_802A58D0.s b/asm/nonmatchings/code_415D90/func_802A58D0.s index 460b39c2dc..cd956c0494 100644 --- a/asm/nonmatchings/code_415D90/func_802A58D0.s +++ b/asm/nonmatchings/code_415D90/func_802A58D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A58D0 /* 41A660 802A58D0 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802A8180.s b/asm/nonmatchings/code_415D90/func_802A8180.s index bbbaa38238..30225f4da3 100644 --- a/asm/nonmatchings/code_415D90/func_802A8180.s +++ b/asm/nonmatchings/code_415D90/func_802A8180.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A8180 /* 41CF10 802A8180 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802A97AC.s b/asm/nonmatchings/code_415D90/func_802A97AC.s index eebd45763b..04ba32638d 100644 --- a/asm/nonmatchings/code_415D90/func_802A97AC.s +++ b/asm/nonmatchings/code_415D90/func_802A97AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A97AC /* 41E53C 802A97AC AC22CC6C */ sw $v0, -0x3394($at) diff --git a/asm/nonmatchings/code_415D90/func_802A97BC.s b/asm/nonmatchings/code_415D90/func_802A97BC.s index a0a4aea1be..eb3b91ef55 100644 --- a/asm/nonmatchings/code_415D90/func_802A97BC.s +++ b/asm/nonmatchings/code_415D90/func_802A97BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A97BC /* 41E54C 802A97BC 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802A97CC.s b/asm/nonmatchings/code_415D90/func_802A97CC.s index 52fd520ba0..da35329e62 100644 --- a/asm/nonmatchings/code_415D90/func_802A97CC.s +++ b/asm/nonmatchings/code_415D90/func_802A97CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A97CC /* 41E55C 802A97CC 240200CB */ addiu $v0, $zero, 0xcb diff --git a/asm/nonmatchings/code_415D90/func_802A97F8.s b/asm/nonmatchings/code_415D90/func_802A97F8.s index 2b72d65069..7bf7bca392 100644 --- a/asm/nonmatchings/code_415D90/func_802A97F8.s +++ b/asm/nonmatchings/code_415D90/func_802A97F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A97F8 /* 41E588 802A97F8 2508EEC4 */ addiu $t0, $t0, -0x113c diff --git a/asm/nonmatchings/code_415D90/func_802A97FC.s b/asm/nonmatchings/code_415D90/func_802A97FC.s index ea47c57e09..f0d9aa2507 100644 --- a/asm/nonmatchings/code_415D90/func_802A97FC.s +++ b/asm/nonmatchings/code_415D90/func_802A97FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A97FC /* 41E58C 802A97FC 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/code_415D90/func_802A9810.s b/asm/nonmatchings/code_415D90/func_802A9810.s index 0b58ae6013..ac2a502b24 100644 --- a/asm/nonmatchings/code_415D90/func_802A9810.s +++ b/asm/nonmatchings/code_415D90/func_802A9810.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9810 /* 41E5A0 802A9810 50400019 */ beql $v0, $zero, .L802A9878 diff --git a/asm/nonmatchings/code_415D90/func_802A981C.s b/asm/nonmatchings/code_415D90/func_802A981C.s index 87148b41c1..c25e440186 100644 --- a/asm/nonmatchings/code_415D90/func_802A981C.s +++ b/asm/nonmatchings/code_415D90/func_802A981C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A981C /* 41E5AC 802A981C 00053880 */ sll $a3, $a1, 2 diff --git a/asm/nonmatchings/code_415D90/func_802A9834.s b/asm/nonmatchings/code_415D90/func_802A9834.s index 09cb87b16c..aa13e7e0ae 100644 --- a/asm/nonmatchings/code_415D90/func_802A9834.s +++ b/asm/nonmatchings/code_415D90/func_802A9834.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9834 /* 41E5C4 802A9834 AC820000 */ sw $v0, ($a0) diff --git a/asm/nonmatchings/code_415D90/func_802A984C.s b/asm/nonmatchings/code_415D90/func_802A984C.s index b68e3d9cf7..f628b9a996 100644 --- a/asm/nonmatchings/code_415D90/func_802A984C.s +++ b/asm/nonmatchings/code_415D90/func_802A984C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A984C /* 41E5DC 802A984C AC820210 */ sw $v0, 0x210($a0) diff --git a/asm/nonmatchings/code_415D90/func_802A9894.s b/asm/nonmatchings/code_415D90/func_802A9894.s index 195e2bd754..18faf86d5c 100644 --- a/asm/nonmatchings/code_415D90/func_802A9894.s +++ b/asm/nonmatchings/code_415D90/func_802A9894.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9894 /* 41E624 802A9894 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_415D90/func_802A9898.s b/asm/nonmatchings/code_415D90/func_802A9898.s index 706076aa2b..0034e298a8 100644 --- a/asm/nonmatchings/code_415D90/func_802A9898.s +++ b/asm/nonmatchings/code_415D90/func_802A9898.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9898 /* 41E628 802A9898 AE420318 */ sw $v0, 0x318($s2) diff --git a/asm/nonmatchings/code_415D90/func_802A98B0.s b/asm/nonmatchings/code_415D90/func_802A98B0.s index 937c185924..57dd6aabf5 100644 --- a/asm/nonmatchings/code_415D90/func_802A98B0.s +++ b/asm/nonmatchings/code_415D90/func_802A98B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A98B0 /* 41E640 802A98B0 0240202D */ daddu $a0, $s2, $zero diff --git a/asm/nonmatchings/code_415D90/func_802A98D0.s b/asm/nonmatchings/code_415D90/func_802A98D0.s index 74653e2a9b..2db4ae47db 100644 --- a/asm/nonmatchings/code_415D90/func_802A98D0.s +++ b/asm/nonmatchings/code_415D90/func_802A98D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A98D0 /* 41E660 802A98D0 080AA6A9 */ j .L802A9AA4 diff --git a/asm/nonmatchings/code_415D90/func_802A98DC.s b/asm/nonmatchings/code_415D90/func_802A98DC.s index d075194126..9651d276c2 100644 --- a/asm/nonmatchings/code_415D90/func_802A98DC.s +++ b/asm/nonmatchings/code_415D90/func_802A98DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A98DC /* 41E66C 802A98DC 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_415D90/func_802A98E0.s b/asm/nonmatchings/code_415D90/func_802A98E0.s index ce544e5141..1e016f7886 100644 --- a/asm/nonmatchings/code_415D90/func_802A98E0.s +++ b/asm/nonmatchings/code_415D90/func_802A98E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A98E0 /* 41E670 802A98E0 10620070 */ beq $v1, $v0, .L802A9AA4 diff --git a/asm/nonmatchings/code_415D90/func_802A9914.s b/asm/nonmatchings/code_415D90/func_802A9914.s index f97f434cac..1198c6d69c 100644 --- a/asm/nonmatchings/code_415D90/func_802A9914.s +++ b/asm/nonmatchings/code_415D90/func_802A9914.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9914 /* 41E6A4 802A9914 0C0AA072 */ jal update_partner_menu diff --git a/asm/nonmatchings/code_415D90/func_802A992C.s b/asm/nonmatchings/code_415D90/func_802A992C.s index 4ac68e4b67..d8f45e624e 100644 --- a/asm/nonmatchings/code_415D90/func_802A992C.s +++ b/asm/nonmatchings/code_415D90/func_802A992C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A992C /* 41E6BC 802A992C 24030023 */ addiu $v1, $zero, 0x23 diff --git a/asm/nonmatchings/code_415D90/func_802A9AE8.s b/asm/nonmatchings/code_415D90/func_802A9AE8.s index 86e76ae9b0..7695b63ef1 100644 --- a/asm/nonmatchings/code_415D90/func_802A9AE8.s +++ b/asm/nonmatchings/code_415D90/func_802A9AE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9AE8 /* 41E878 802A9AE8 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802A9B30.s b/asm/nonmatchings/code_415D90/func_802A9B30.s index 4d7a193ca1..bc0857ab9e 100644 --- a/asm/nonmatchings/code_415D90/func_802A9B30.s +++ b/asm/nonmatchings/code_415D90/func_802A9B30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9B30 /* 41E8C0 802A9B30 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802A9B44.s b/asm/nonmatchings/code_415D90/func_802A9B44.s index 7c164a196e..5389f87599 100644 --- a/asm/nonmatchings/code_415D90/func_802A9B44.s +++ b/asm/nonmatchings/code_415D90/func_802A9B44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802A9B44 /* 41E8D4 802A9B44 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802AA014.s b/asm/nonmatchings/code_415D90/func_802AA014.s index 3f201027d4..e5b67e0d76 100644 --- a/asm/nonmatchings/code_415D90/func_802AA014.s +++ b/asm/nonmatchings/code_415D90/func_802AA014.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AA014 /* 41EDA4 802AA014 00000000 */ nop diff --git a/asm/nonmatchings/code_415D90/func_802AA05C.s b/asm/nonmatchings/code_415D90/func_802AA05C.s index 328265e42a..61a88448e0 100644 --- a/asm/nonmatchings/code_415D90/func_802AA05C.s +++ b/asm/nonmatchings/code_415D90/func_802AA05C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AA05C /* 41EDEC 802AA05C 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802AA0A4.s b/asm/nonmatchings/code_415D90/func_802AA0A4.s index 99b9e0dbf3..7b5d471a03 100644 --- a/asm/nonmatchings/code_415D90/func_802AA0A4.s +++ b/asm/nonmatchings/code_415D90/func_802AA0A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AA0A4 /* 41EE34 802AA0A4 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802AA0B8.s b/asm/nonmatchings/code_415D90/func_802AA0B8.s index 7bbf5283e8..b1c69b006c 100644 --- a/asm/nonmatchings/code_415D90/func_802AA0B8.s +++ b/asm/nonmatchings/code_415D90/func_802AA0B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AA0B8 /* 41EE48 802AA0B8 3C03800E */ lui $v1, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802AA0D8.s b/asm/nonmatchings/code_415D90/func_802AA0D8.s index 16672cc49c..1bc0daee3b 100644 --- a/asm/nonmatchings/code_415D90/func_802AA0D8.s +++ b/asm/nonmatchings/code_415D90/func_802AA0D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AA0D8 /* 41EE68 802AA0D8 AFB00010 */ sw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_415D90/func_802AA640.s b/asm/nonmatchings/code_415D90/func_802AA640.s index ce333ff20a..084bca72a2 100644 --- a/asm/nonmatchings/code_415D90/func_802AA640.s +++ b/asm/nonmatchings/code_415D90/func_802AA640.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AA640 /* 41F3D0 802AA640 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_415D90/func_802AACD8.s b/asm/nonmatchings/code_415D90/func_802AACD8.s index 5b0e684705..be3ab1debb 100644 --- a/asm/nonmatchings/code_415D90/func_802AACD8.s +++ b/asm/nonmatchings/code_415D90/func_802AACD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802AACD8 /* 41FA68 802AACD8 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_415D90/update_partner_menu.s b/asm/nonmatchings/code_415D90/update_partner_menu.s index 37557effc7..83a8b71587 100644 --- a/asm/nonmatchings/code_415D90/update_partner_menu.s +++ b/asm/nonmatchings/code_415D90/update_partner_menu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_partner_menu /* 41CF58 802A81C8 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_415D90/update_player_menu.s b/asm/nonmatchings/code_415D90/update_player_menu.s index 60c7e389f1..d98fb961f8 100644 --- a/asm/nonmatchings/code_415D90/update_player_menu.s +++ b/asm/nonmatchings/code_415D90/update_player_menu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_player_menu /* 41A718 802A5988 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_415D90/update_targeting_enemies.s b/asm/nonmatchings/code_415D90/update_targeting_enemies.s index 49ae970210..ec6c0b2c13 100644 --- a/asm/nonmatchings/code_415D90/update_targeting_enemies.s +++ b/asm/nonmatchings/code_415D90/update_targeting_enemies.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_targeting_enemies /* 41F418 802AA688 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_42e0_len_1f60/_advance_rng.s b/asm/nonmatchings/code_42e0_len_1f60/_advance_rng.s index 4185146627..f75d132f9a 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_advance_rng.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_advance_rng.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _advance_rng /* 004D00 80029900 3C035D58 */ lui $v1, 0x5d58 diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_create.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_create.s index b922d7d159..4b3f927bff 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_create.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_create.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _heap_create /* 004430 80029030 2CA20020 */ sltiu $v0, $a1, 0x20 diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s index 22b34fdd16..a55ed06053 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _heap_free /* 00461C 8002921C 14A00003 */ bnez $a1, .L8002922C diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s index 7e14159164..0e93051148 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _heap_malloc /* 00446C 8002906C 24A5000F */ addiu $a1, $a1, 0xf diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s index 933e70591e..850cd30633 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _heap_malloc_tail /* 004564 80029164 24A5000F */ addiu $a1, $a1, 0xf diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_realloc.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_realloc.s index b9c9e250a9..f96c0ff569 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_realloc.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_realloc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _heap_realloc /* 0046C4 800292C4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s b/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s index c671816498..a408f88839 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _wrap_trig_lookup_value /* 005434 8002A034 3C014980 */ lui $at, 0x4980 diff --git a/asm/nonmatchings/code_42e0_len_1f60/add_vec2D_polar.s b/asm/nonmatchings/code_42e0_len_1f60/add_vec2D_polar.s index d209cf2e38..9416def1f5 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/add_vec2D_polar.s +++ b/asm/nonmatchings/code_42e0_len_1f60/add_vec2D_polar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel add_vec2D_polar /* 00539C 80029F9C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_42e0_len_1f60/atan2.s b/asm/nonmatchings/code_42e0_len_1f60/atan2.s index 131d0eb497..d0431105f8 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/atan2.s +++ b/asm/nonmatchings/code_42e0_len_1f60/atan2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel atan2 /* 005080 80029C80 44863000 */ mtc1 $a2, $f6 diff --git a/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s b/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s index 2d0a7f25f0..7b6c80e20d 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s +++ b/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clamp_angle /* 004F24 80029B24 3C014561 */ lui $at, 0x4561 diff --git a/asm/nonmatchings/code_42e0_len_1f60/copy_matrix.s b/asm/nonmatchings/code_42e0_len_1f60/copy_matrix.s index 1223119048..0fd44edf35 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/copy_matrix.s +++ b/asm/nonmatchings/code_42e0_len_1f60/copy_matrix.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel copy_matrix /* 004B20 80029720 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s b/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s index fb717651d6..8b8747b3f3 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s +++ b/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel cos_deg /* 005750 8002A350 3C014336 */ lui $at, 0x4336 diff --git a/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s b/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s index f910aa6f04..d99405e5c6 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s +++ b/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel cos_rad /* 0055D0 8002A1D0 3C014622 */ lui $at, 0x4622 diff --git a/asm/nonmatchings/code_42e0_len_1f60/cosine.s b/asm/nonmatchings/code_42e0_len_1f60/cosine.s index 8379ab3a7c..9b2e101ecc 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/cosine.s +++ b/asm/nonmatchings/code_42e0_len_1f60/cosine.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel cosine /* 0047D4 800293D4 3C06B60B */ lui $a2, 0xb60b diff --git a/asm/nonmatchings/code_42e0_len_1f60/dist2D.s b/asm/nonmatchings/code_42e0_len_1f60/dist2D.s index 193c786362..5b50431470 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/dist2D.s +++ b/asm/nonmatchings/code_42e0_len_1f60/dist2D.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dist2D /* 0052D4 80029ED4 44861000 */ mtc1 $a2, $f2 diff --git a/asm/nonmatchings/code_42e0_len_1f60/dist3D.s b/asm/nonmatchings/code_42e0_len_1f60/dist3D.s index c7320414c9..8d58798e39 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/dist3D.s +++ b/asm/nonmatchings/code_42e0_len_1f60/dist3D.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dist3D /* 00532C 80029F2C 44872000 */ mtc1 $a3, $f4 diff --git a/asm/nonmatchings/code_42e0_len_1f60/dma_copy.s b/asm/nonmatchings/code_42e0_len_1f60/dma_copy.s index 3ffa9eac04..dabc71f343 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/dma_copy.s +++ b/asm/nonmatchings/code_42e0_len_1f60/dma_copy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dma_copy /* 004B3C 8002973C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s b/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s index 033c5f444d..22f5d779fe 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80028F8C /* 00438C 80028F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80028FE0.s b/asm/nonmatchings/code_42e0_len_1f60/func_80028FE0.s index 7024be8218..5105e53c56 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80028FE0.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80028FE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80028FE0 /* 0043E0 80028FE0 2402012C */ addiu $v0, $zero, 0x12c diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s b/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s index 8090b6ce56..a77dc0ab16 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80029860.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80029860 /* 004C60 80029860 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s b/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s index 1b60864fea..d098e3ce54 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80029934 /* 004D34 80029934 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80029994.s b/asm/nonmatchings/code_42e0_len_1f60/func_80029994.s index aa52254ccc..5b67233937 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80029994.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80029994.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80029994 /* 004D94 80029994 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s index f5f19f539f..1ce7b53ec3 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_8002A904.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002A904 /* 005D04 8002A904 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_8002AAC4.s b/asm/nonmatchings/code_42e0_len_1f60/func_8002AAC4.s index 51718fcd2b..f8616e8490 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_8002AAC4.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_8002AAC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002AAC4 /* 005EC4 8002AAC4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s b/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s index 30f4314003..2449483e6c 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002AB5C /* 005F5C 8002AB5C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_42e0_len_1f60/get_clamped_angle_diff.s b/asm/nonmatchings/code_42e0_len_1f60/get_clamped_angle_diff.s index 287e20b487..997f852e52 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/get_clamped_angle_diff.s +++ b/asm/nonmatchings/code_42e0_len_1f60/get_clamped_angle_diff.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_clamped_angle_diff /* 005028 80029C28 460C7001 */ sub.s $f0, $f14, $f12 diff --git a/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_pitch.s b/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_pitch.s index d629d4b981..5b95996bea 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_pitch.s +++ b/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_pitch.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_player_normal_pitch /* 005250 80029E50 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_yaw.s b/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_yaw.s index b68f615d40..9500b82016 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_yaw.s +++ b/asm/nonmatchings/code_42e0_len_1f60/get_player_normal_yaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_player_normal_yaw /* 005220 80029E20 44806000 */ mtc1 $zero, $f12 diff --git a/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s b/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s index 6b0879a9f2..88628d80de 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s +++ b/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel int_to_string /* 0048C4 800294C4 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_42e0_len_1f60/length2D.s b/asm/nonmatchings/code_42e0_len_1f60/length2D.s index ac76b6ea38..e6bbc47e6c 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/length2D.s +++ b/asm/nonmatchings/code_42e0_len_1f60/length2D.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel length2D /* 0043F0 80028FF0 460C6302 */ mul.s $f12, $f12, $f12 diff --git a/asm/nonmatchings/code_42e0_len_1f60/mem_clear.s b/asm/nonmatchings/code_42e0_len_1f60/mem_clear.s index 235d7ce756..268b55ae3a 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/mem_clear.s +++ b/asm/nonmatchings/code_42e0_len_1f60/mem_clear.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel mem_clear /* 004A00 80029600 18A00005 */ blez $a1, .L80029618 diff --git a/asm/nonmatchings/code_42e0_len_1f60/poll_rumble.s b/asm/nonmatchings/code_42e0_len_1f60/poll_rumble.s index 5be3de36b2..fa55dc8f60 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/poll_rumble.s +++ b/asm/nonmatchings/code_42e0_len_1f60/poll_rumble.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel poll_rumble /* 0042E0 80028EE0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_42e0_len_1f60/rand_int.s b/asm/nonmatchings/code_42e0_len_1f60/rand_int.s index 026e627d0b..f79813b71c 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/rand_int.s +++ b/asm/nonmatchings/code_42e0_len_1f60/rand_int.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel rand_int /* 004DFC 800299FC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_42e0_len_1f60/round.s b/asm/nonmatchings/code_42e0_len_1f60/round.s index 5b8218bc0a..b463d1fec2 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/round.s +++ b/asm/nonmatchings/code_42e0_len_1f60/round.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel round /* 004EC4 80029AC4 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/code_42e0_len_1f60/sign.s b/asm/nonmatchings/code_42e0_len_1f60/sign.s index bdfa3dd7ed..753379408c 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sign.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sign.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sign /* 0048B0 800294B0 04800002 */ bltz $a0, .L800294BC diff --git a/asm/nonmatchings/code_42e0_len_1f60/signF.s b/asm/nonmatchings/code_42e0_len_1f60/signF.s index 5e26a47f73..d7249a10d3 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/signF.s +++ b/asm/nonmatchings/code_42e0_len_1f60/signF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel signF /* 004E7C 80029A7C 44801000 */ mtc1 $zero, $f2 diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s index 1b38dd942b..7f7ac2fb86 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sin_cos_deg /* 005634 8002A234 3C014336 */ lui $at, 0x4336 diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s index a1b243e120..6a3e59d30d 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sin_cos_rad /* 0054B4 8002A0B4 3C014622 */ lui $at, 0x4622 diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s b/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s index a67da54bf5..5f5b95106d 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sin_deg /* 0056EC 8002A2EC 3C014336 */ lui $at, 0x4336 diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s b/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s index e9974d1d09..3562a3b845 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sin_rad /* 00556C 8002A16C 3C014622 */ lui $at, 0x4622 diff --git a/asm/nonmatchings/code_42e0_len_1f60/start_rumble.s b/asm/nonmatchings/code_42e0_len_1f60/start_rumble.s index 4af0240a50..b56b89095a 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/start_rumble.s +++ b/asm/nonmatchings/code_42e0_len_1f60/start_rumble.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_rumble /* 004308 80028F08 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_42e0_len_1f60/transform_point.s b/asm/nonmatchings/code_42e0_len_1f60/transform_point.s index 918362c59a..b88ca8356b 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/transform_point.s +++ b/asm/nonmatchings/code_42e0_len_1f60/transform_point.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel transform_point /* 004A20 80029620 44853000 */ mtc1 $a1, $f6 diff --git a/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s b/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s index e992c46bc4..8157913b1b 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s +++ b/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_lerp /* 0057B4 8002A3B4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_6000/battle_heap_create.s b/asm/nonmatchings/code_6000/battle_heap_create.s index 9be70b9d22..8db312d1df 100644 --- a/asm/nonmatchings/code_6000/battle_heap_create.s +++ b/asm/nonmatchings/code_6000/battle_heap_create.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel battle_heap_create /* 0060A0 8002ACA0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6000/collision_heap_create.s b/asm/nonmatchings/code_6000/collision_heap_create.s index 5e85388895..495d6c074e 100644 --- a/asm/nonmatchings/code_6000/collision_heap_create.s +++ b/asm/nonmatchings/code_6000/collision_heap_create.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel collision_heap_create /* 006174 8002AD74 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6000/collision_heap_free.s b/asm/nonmatchings/code_6000/collision_heap_free.s index c68c9b8c1f..a7a7c04b41 100644 --- a/asm/nonmatchings/code_6000/collision_heap_free.s +++ b/asm/nonmatchings/code_6000/collision_heap_free.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel collision_heap_free /* 0061F4 8002ADF4 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_6000/collision_heap_malloc.s b/asm/nonmatchings/code_6000/collision_heap_malloc.s index 864d3eba0f..ba19258281 100644 --- a/asm/nonmatchings/code_6000/collision_heap_malloc.s +++ b/asm/nonmatchings/code_6000/collision_heap_malloc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel collision_heap_malloc /* 0061B0 8002ADB0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_calc_file_checksum.s b/asm/nonmatchings/code_6240_len_c00/fio_calc_file_checksum.s index 9d9af1a093..7ca5812aaf 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_calc_file_checksum.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_calc_file_checksum.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_calc_file_checksum /* 0064D0 8002B0D0 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_6240_len_c00/fio_calc_header_checksum.s b/asm/nonmatchings/code_6240_len_c00/fio_calc_header_checksum.s index 192ed2602e..ea49485d25 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_calc_header_checksum.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_calc_header_checksum.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_calc_header_checksum /* 006340 8002AF40 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s b/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s index d7cfc4660f..f173bf6e2d 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_deserialize_state /* 006890 8002B490 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_erase_flash.s b/asm/nonmatchings/code_6240_len_c00/fio_erase_flash.s index 726f4025f1..73ab34c4ae 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_erase_flash.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_erase_flash.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_erase_flash /* 006E1C 8002BA1C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_erase_game.s b/asm/nonmatchings/code_6240_len_c00/fio_erase_game.s index c85ab2ba0a..e0cd294ad9 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_erase_game.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_erase_game.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_erase_game /* 00682C 8002B42C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s b/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s index fb95990905..78e646e462 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_fetch_saved_file_info /* 006554 8002B154 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_flush_backups.s b/asm/nonmatchings/code_6240_len_c00/fio_flush_backups.s index 8b6db4849d..47d4fecde3 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_flush_backups.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_flush_backups.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_flush_backups /* 00644C 8002B04C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s b/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s index 217910a17c..1d86441de9 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_has_valid_backup /* 0063D8 8002AFD8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_init_flash.s b/asm/nonmatchings/code_6240_len_c00/fio_init_flash.s index 340a24a2dc..92f1a87fa2 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_init_flash.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_init_flash.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_init_flash /* 006C4C 8002B84C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_load_game.s b/asm/nonmatchings/code_6240_len_c00/fio_load_game.s index 4e7fa79118..39a1d1bbe9 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_load_game.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_load_game.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_load_game /* 0066D0 8002B2D0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_read_flash.s b/asm/nonmatchings/code_6240_len_c00/fio_read_flash.s index 41b0323255..d41d29e48e 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_read_flash.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_read_flash.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_read_flash /* 006C68 8002B868 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_save_game.s b/asm/nonmatchings/code_6240_len_c00/fio_save_game.s index 53a101c83d..52545c69fc 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_save_game.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_save_game.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_save_game /* 006774 8002B374 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s b/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s index e51fe5f102..18f774fbfe 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_serialize_state /* 006A30 8002B630 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_validate_file_checksum.s b/asm/nonmatchings/code_6240_len_c00/fio_validate_file_checksum.s index acc563eb55..e8ae37c5bb 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_validate_file_checksum.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_validate_file_checksum.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_validate_file_checksum /* 0064F8 8002B0F8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s b/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s index 9919f4bedf..1ef9505f84 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_validate_header_checksums /* 006370 8002AF70 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_write_flash.s b/asm/nonmatchings/code_6240_len_c00/fio_write_flash.s index f54449c810..e824cc53c4 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_write_flash.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_write_flash.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fio_write_flash /* 006D48 8002B948 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_6240_len_c00/get_spirits_rescued.s b/asm/nonmatchings/code_6240_len_c00/get_spirits_rescued.s index b9eec6c7ef..9e0e84f7df 100644 --- a/asm/nonmatchings/code_6240_len_c00/get_spirits_rescued.s +++ b/asm/nonmatchings/code_6240_len_c00/get_spirits_rescued.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_spirits_rescued /* 006240 8002AE40 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BA40.s b/asm/nonmatchings/code_6e40_len_500/func_8002BA40.s index 2665e51660..e76b1ec60a 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BA40.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BA40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BA40 /* 006E40 8002BA40 3C014000 */ lui $at, 0x4000 diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BA78.s b/asm/nonmatchings/code_6e40_len_500/func_8002BA78.s index bb8a7104cf..b0efc32a27 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BA78.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BA78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BA78 /* 006E78 8002BA78 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BA80.s b/asm/nonmatchings/code_6e40_len_500/func_8002BA80.s index 41fdb68d23..c46c79dfaa 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BA80.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BA80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BA80 /* 006E80 8002BA80 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BEDC.s b/asm/nonmatchings/code_6e40_len_500/func_8002BEDC.s index c59d684741..5f0817c1e3 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BEDC.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BEDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BEDC /* 0072DC 8002BEDC 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BEEC.s b/asm/nonmatchings/code_6e40_len_500/func_8002BEEC.s index e38e76174a..3b4b789596 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BEEC.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BEEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BEEC /* 0072EC 8002BEEC 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BF04.s b/asm/nonmatchings/code_6e40_len_500/func_8002BF04.s index 6f9a61e7b3..dfa40a6bd0 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BF04.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BF04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BF04 /* 007304 8002BF04 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BF14.s b/asm/nonmatchings/code_6e40_len_500/func_8002BF14.s index ffcba93f47..22ddff6962 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BF14.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BF14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BF14 /* 007314 8002BF14 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_6e40_len_500/func_8002BF24.s b/asm/nonmatchings/code_6e40_len_500/func_8002BF24.s index 206076447f..2b58a4ca6d 100644 --- a/asm/nonmatchings/code_6e40_len_500/func_8002BF24.s +++ b/asm/nonmatchings/code_6e40_len_500/func_8002BF24.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BF24 /* 007324 8002BF24 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s b/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s index 3348fbb2f3..13ad7e9688 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel crash_create_monitor /* 007CB0 8002C8B0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s b/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s index d75f2b64ea..8e123907ad 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel crash_delay_msec /* 007340 8002BF40 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s b/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s index 7420d87e4c..8a793d551c 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel crash_monitor_thread /* 007C1C 8002C81C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s b/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s index de8a9cc664..ab6a95ef57 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel crash_print_fpr /* 0076B8 8002C2B8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s b/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s index 5b9ffc0fe9..fe350261bc 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel crash_printf_string /* 007608 8002C208 AFA60008 */ sw $a2, 8($sp) diff --git a/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s b/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s index aa4542ef00..38be26bf2f 100644 --- a/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s +++ b/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel crash_show_handler /* 0077B0 8002C3B0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s b/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s index 713851b168..4c27f0f88e 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002BFB0 /* 0073B0 8002BFB0 3C08800A */ lui $t0, 0x800a diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C054.s b/asm/nonmatchings/code_7340_len_b00/func_8002C054.s index 2a8d346aff..9608382b19 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C054.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C054.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002C054 /* 007454 8002C054 3C026666 */ lui $v0, 0x6666 diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C324.s b/asm/nonmatchings/code_7340_len_b00/func_8002C324.s index dab01c77a4..0c9e834068 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C324.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C324.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002C324 /* 007724 8002C324 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s b/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s index 92165a6aa2..3dd48b934c 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002C7B0 /* 007BB0 8002C7B0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7340_len_b00/func_8002C890.s b/asm/nonmatchings/code_7340_len_b00/func_8002C890.s index a07e3c757f..a246a14da7 100644 --- a/asm/nonmatchings/code_7340_len_b00/func_8002C890.s +++ b/asm/nonmatchings/code_7340_len_b00/func_8002C890.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002C890 /* 007C90 8002C890 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s b/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s index 8af552f2d6..faabb09d8c 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s +++ b/asm/nonmatchings/code_759b0_len_61b0/check_input_use_partner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel check_input_use_partner /* 078EB0 800DFA00 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/clear_player_status.s b/asm/nonmatchings/code_759b0_len_61b0/clear_player_status.s index 4b6d82d2aa..317291e170 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/clear_player_status.s +++ b/asm/nonmatchings/code_759b0_len_61b0/clear_player_status.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_player_status /* 079100 800DFC50 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/disable_player_physics.s b/asm/nonmatchings/code_759b0_len_61b0/disable_player_physics.s index 313fadc09e..36b3374182 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/disable_player_physics.s +++ b/asm/nonmatchings/code_759b0_len_61b0/disable_player_physics.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel disable_player_physics /* 0795F0 800E0140 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/disable_player_shadow.s b/asm/nonmatchings/code_759b0_len_61b0/disable_player_shadow.s index 95879a4b03..d6cf55be7c 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/disable_player_shadow.s +++ b/asm/nonmatchings/code_759b0_len_61b0/disable_player_shadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel disable_player_shadow /* 079594 800E00E4 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/enable_player_physics.s b/asm/nonmatchings/code_759b0_len_61b0/enable_player_physics.s index 19a463d9c6..9b91ed0733 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/enable_player_physics.s +++ b/asm/nonmatchings/code_759b0_len_61b0/enable_player_physics.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_player_physics /* 0795C4 800E0114 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/enable_player_shadow.s b/asm/nonmatchings/code_759b0_len_61b0/enable_player_shadow.s index 29ac438a4e..e210917bd5 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/enable_player_shadow.s +++ b/asm/nonmatchings/code_759b0_len_61b0/enable_player_shadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_player_shadow /* 079560 800E00B0 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s index b11325d377..a3f6817b77 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DC500 /* 0759B0 800DC500 27BDFF60 */ addiu $sp, $sp, -0xa0 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s index ec98ed8791..7a6a74bcbf 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DC778 /* 075C28 800DC778 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s index 4bdccfde19..aae222fd26 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DCB7C /* 07602C 800DCB7C 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s index 0819ae3e01..5a77e815b7 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DCE70 /* 076320 800DCE70 27BDFF50 */ addiu $sp, $sp, -0xb0 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s index f02cd7eb34..be31c6543c 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DD04C /* 0764FC 800DD04C 27BDFF60 */ addiu $sp, $sp, -0xa0 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD44C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD44C.s index 8f315775b7..18ddce37ac 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD44C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD44C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DD44C /* 0768FC 800DD44C 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD5B4.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD5B4.s index c7912dc870..ee69966948 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD5B4.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD5B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DD5B4 /* 076A64 800DD5B4 44863000 */ mtc1 $a2, $f6 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s index 166d610fe0..a862810f7b 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DD618 /* 076AC8 800DD618 27BDFF50 */ addiu $sp, $sp, -0xb0 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s index 3877038b49..5ec4bdbddc 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DD8FC /* 076DAC 800DD8FC 27BDFF68 */ addiu $sp, $sp, -0x98 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s index 42f7daea93..14bdf35446 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DDAE4 /* 076F94 800DDAE4 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s index 2ddd527535..171c56b6ce 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DDC44 /* 0770F4 800DDC44 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s index a57e508add..c8a00fee02 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DDD94 /* 077244 800DDD94 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s index 3d8aff74ff..7fc8fae791 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DE46C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DE46C /* 07791C 800DE46C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DE7E4.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DE7E4.s index 0760cfa6b1..69bcbc98a2 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DE7E4.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DE7E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DE7E4 /* 077C94 800DE7E4 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DEC04.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DEC04.s index ea052ecf79..77fc48a91c 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DEC04.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DEC04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DEC04 /* 0780B4 800DEC04 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s index e611bdb2e7..dbfda841f4 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DEE5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DEE5C /* 07830C 800DEE5C 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s index fe990a5c36..cd3a3cb748 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DF15C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DF15C /* 07860C 800DF15C 27BDFF60 */ addiu $sp, $sp, -0xa0 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DF3FC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DF3FC.s index 78afc17f28..06533ddac6 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DF3FC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DF3FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DF3FC /* 0788AC 800DF3FC 44863000 */ mtc1 $a2, $f6 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DF740.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DF740.s index 0f61b1f5e7..5f81a95088 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DF740.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DF740.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DF740 /* 078BF0 800DF740 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s index a2f3c5f044..7ca7646fc0 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFAAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFAAC /* 078F5C 800DFAAC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFBE8.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFBE8.s index 96a113ec3a..6b3d5f1d12 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFBE8.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFBE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFBE8 /* 079098 800DFBE8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFC74.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFC74.s index 0d041b38dc..5efe8bfc2d 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFC74.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFC74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFC74 /* 079124 800DFC74 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFCF4.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFCF4.s index 353a6e72d1..e02d4bf84f 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFCF4.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFCF4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFCF4 /* 0791A4 800DFCF4 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s index 7e8f85bed2..8e256dfc44 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFD48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFD48 /* 0791F8 800DFD48 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFEFC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFEFC.s index a32f960734..6878bffbee 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFEFC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFEFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFEFC /* 0793AC 800DFEFC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFF78.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFF78.s index 08ad1f54f0..9041010e77 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFF78.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFF78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFF78 /* 079428 800DFF78 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s index 566ff6b459..bc7cf3e484 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800DFFCC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800DFFCC /* 07947C 800DFFCC 3C058011 */ lui $a1, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0088.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0088.s index 89f0bdbba4..9b1336f3d1 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0088.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0088.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0088 /* 079538 800E0088 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0178.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0178.s index e0fce67ff7..7898a7d02d 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0178.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0178.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0178 /* 079628 800E0178 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E01A4.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E01A4.s index 3a411c6fbb..7834c879d6 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E01A4.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E01A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E01A4 /* 079654 800E01A4 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E01DC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E01DC.s index 7c138b8e7c..ae2125a274 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E01DC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E01DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E01DC /* 07968C 800E01DC 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0208.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0208.s index 7bba5654d2..7e9192f741 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0208.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0208.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0208 /* 0796B8 800E0208 3C038007 */ lui $v1, 0x8007 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0260.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0260.s index 9cd14aa9d9..0b74bfef1d 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0260.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0260.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0260 /* 079710 800E0260 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s index 0415194e99..763131f265 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0294.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0294 /* 079744 800E0294 3C028016 */ lui $v0, 0x8016 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0330.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0330.s index bf9de408dc..39b419f9b3 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0330.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0330.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0330 /* 0797E0 800E0330 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0374.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0374.s index b78619fc86..15a26b8cab 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0374.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0374.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0374 /* 079824 800E0374 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s index 9a76f493a6..759f64acc5 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0398.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0398 /* 079848 800E0398 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E04D0.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E04D0.s index afe9a2212d..b56f900721 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E04D0.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E04D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E04D0 /* 079980 800E04D0 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0514.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0514.s index 5132133917..a7640e8d15 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0514.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0514.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0514 /* 0799C4 800E0514 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0538.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0538.s index e270d6ee49..6e1cafa74e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0538.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0538.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0538 /* 0799E8 800E0538 3C058011 */ lui $a1, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s index 18010f2e8a..b581f6a739 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0580.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0580 /* 079A30 800E0580 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0658.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0658.s index 370221b815..2b41152ca3 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0658.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0658.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0658 /* 079B08 800E0658 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E069C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E069C.s index d4e21c2a84..69e6122c16 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E069C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E069C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E069C /* 079B4C 800E069C 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E06C0.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E06C0.s index bdc1148624..bc36c44259 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E06C0.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E06C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E06C0 /* 079B70 800E06C0 38840001 */ xori $a0, $a0, 1 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s index ed264bc969..bf166c78e9 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0818.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0818 /* 079CC8 800E0818 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0AD0.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0AD0.s index 80a8e9ffbc..f24c166be0 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0AD0.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0AD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0AD0 /* 079F80 800E0AD0 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B14.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B14.s index ebe67fede4..08308f393e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B14.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0B14 /* 079FC4 800E0B14 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B38.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B38.s index 187fd8bc52..cbb5ff6be8 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B38.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B38.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0B38 /* 079FE8 800E0B38 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s index 8422ba51fc..39be96d374 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0B90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0B90 /* 07A040 800E0B90 3C038007 */ lui $v1, 0x8007 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s index 14fe0e370e..c14a989769 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E0FEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E0FEC /* 07A49C 800E0FEC 00041403 */ sra $v0, $a0, 0x10 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E1F90.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E1F90.s index 967f89c784..106b28ec13 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E1F90.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E1F90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E1F90 /* 07B440 800E1F90 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s index ba933c1ccc..177f4ecdc5 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E205C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E205C /* 07B50C 800E205C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E2304.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E2304.s index 93b4469907..87256065c8 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E2304.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E2304.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E2304 /* 07B7B4 800E2304 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s b/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s index 01875aa27c..f95650c634 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s +++ b/asm/nonmatchings/code_759b0_len_61b0/func_800E24F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E24F8 /* 07B9A8 800E24F8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/make_player_display_list.s b/asm/nonmatchings/code_759b0_len_61b0/make_player_display_list.s index 45651bd3ff..85f3debe9f 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/make_player_display_list.s +++ b/asm/nonmatchings/code_759b0_len_61b0/make_player_display_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel make_player_display_list /* 07A7A4 800E12F4 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_759b0_len_61b0/make_spinning_player_display_list.s b/asm/nonmatchings/code_759b0_len_61b0/make_spinning_player_display_list.s index c032a1763a..987a95f9a8 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/make_spinning_player_display_list.s +++ b/asm/nonmatchings/code_759b0_len_61b0/make_spinning_player_display_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel make_spinning_player_display_list /* 07ABB4 800E1704 27BDFE80 */ addiu $sp, $sp, -0x180 diff --git a/asm/nonmatchings/code_759b0_len_61b0/render_player.s b/asm/nonmatchings/code_759b0_len_61b0/render_player.s index b9d91a90ce..b4dae26e1b 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/render_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/render_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_player /* 07A5E8 800E1138 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s b/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s index 4411ab0198..877b32fcba 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s +++ b/asm/nonmatchings/code_759b0_len_61b0/render_player_model.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_player_model /* 07A618 800E1168 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s b/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s index c5a42ba804..b2343ff990 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/test_below_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_below_player /* 077480 800DDFD0 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s b/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s index 4f44d95005..2d3caaeb4e 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s +++ b/asm/nonmatchings/code_759b0_len_61b0/test_player_lateral.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_player_lateral /* 078910 800DF460 27BDFF48 */ addiu $sp, $sp, -0xb8 diff --git a/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s b/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s index d679b71d7d..e01d76e306 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/trace_above_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel trace_above_player /* 077EB8 800DEA08 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s b/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s index bcd332217b..b4f713076b 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/trace_below_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel trace_below_player /* 0779FC 800DE54C 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_759b0_len_61b0/update_below_player.s b/asm/nonmatchings/code_759b0_len_61b0/update_below_player.s index ed5f6680e7..80f9ff5c47 100644 --- a/asm/nonmatchings/code_759b0_len_61b0/update_below_player.s +++ b/asm/nonmatchings/code_759b0_len_61b0/update_below_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_below_player /* 07B074 800E1BC4 3C02800F */ lui $v0, 0x800f diff --git a/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s b/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s index c71a36ec2e..4b4a267807 100644 --- a/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s +++ b/asm/nonmatchings/code_7E2AA0/MakeDoorAdvanced.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeDoorAdvanced /* 7E2B2C 80281CAC 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_7E2AA0/func_80281C20.s b/asm/nonmatchings/code_7E2AA0/func_80281C20.s index 58d250659d..4b3e15178f 100644 --- a/asm/nonmatchings/code_7E2AA0/func_80281C20.s +++ b/asm/nonmatchings/code_7E2AA0/func_80281C20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80281C20 /* 7E2AA0 80281C20 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7E3700/CheckActionState.s b/asm/nonmatchings/code_7E3700/CheckActionState.s index bc22b8076b..93d4a04dd4 100644 --- a/asm/nonmatchings/code_7E3700/CheckActionState.s +++ b/asm/nonmatchings/code_7E3700/CheckActionState.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CheckActionState /* 7E405C 802831DC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s b/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s index 27282e2267..4fe9ce07c7 100644 --- a/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s +++ b/asm/nonmatchings/code_7E3700/CreatePushBlockGrid.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CreatePushBlockGrid /* 7E4160 802832E0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s b/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s index 120e301511..b8c844e9c6 100644 --- a/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s +++ b/asm/nonmatchings/code_7E3700/GetGridIndexFromPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetGridIndexFromPos /* 7E4538 802836B8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_7E3700/GetPushBlock.s b/asm/nonmatchings/code_7E3700/GetPushBlock.s index 63321783e6..1dd00ef0f3 100644 --- a/asm/nonmatchings/code_7E3700/GetPushBlock.s +++ b/asm/nonmatchings/code_7E3700/GetPushBlock.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPushBlock /* 7E4440 802835C0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_7E3700/SetPushBlock.s b/asm/nonmatchings/code_7E3700/SetPushBlock.s index 42c816b53a..f22bbabaed 100644 --- a/asm/nonmatchings/code_7E3700/SetPushBlock.s +++ b/asm/nonmatchings/code_7E3700/SetPushBlock.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPushBlock /* 7E42FC 8028347C 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s b/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s index 82049aba2a..1c42577162 100644 --- a/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s +++ b/asm/nonmatchings/code_7E3700/SetPushBlockFallEffect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPushBlockFallEffect /* 7E462C 802837AC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7E3700/func_80282880.s b/asm/nonmatchings/code_7E3700/func_80282880.s index c0be6a3b08..41ced3a6d3 100644 --- a/asm/nonmatchings/code_7E3700/func_80282880.s +++ b/asm/nonmatchings/code_7E3700/func_80282880.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80282880 /* 7E3700 80282880 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_hammer.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_hammer.s index 496d2e839e..77c7af5e5c 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_hammer.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_hammer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel check_input_hammer /* 07F590 800E60E0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s index 23c55820e1..1ff1eeaa6d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel check_input_jump /* 07F610 800E6160 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s index 867c305458..9599539cbb 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel check_input_midair_jump /* 07E47C 800E4FCC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s index f8dbbc4a52..ba41fe2ad6 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel check_input_spin /* 07F718 800E6268 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E26B0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E26B0.s index 5ed97316d9..eed4d3280d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E26B0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E26B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E26B0 /* 07BB60 800E26B0 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s index 212ba53ef4..7df8d861c0 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E26C4 /* 07BB74 800E26C4 3C04800F */ lui $a0, 0x800f diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E27E0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E27E0.s index 7d017eb9cb..2fc7271fe8 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E27E0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E27E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E27E0 /* 07BC90 800E27E0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s index 8f762d22dd..962aeb1203 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E29C8 /* 07BE78 800E29C8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s index ad35aa9bf4..4a57772ac8 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E2BB0 /* 07C060 800E2BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2D18.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2D18.s index fc05f2c07a..b7d47f77f4 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2D18.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2D18.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E2D18 /* 07C1C8 800E2D18 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E306C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E306C.s index 99e0631861..9493cb5578 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E306C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E306C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E306C /* 07C51C 800E306C 3C04800F */ lui $a0, 0x800f diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s index 86684ce0b3..190d6a3fdd 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E3100 /* 07C5B0 800E3100 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s index 348bc64a81..9b694cbfd3 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E315C /* 07C60C 800E315C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3278.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3278.s index 4ba9095f76..3ad59c3ebe 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3278.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3278.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E3278 /* 07C728 800E3278 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3448.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3448.s index 4c24695799..b90a76fe92 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3448.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3448.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E3448 /* 07C8F8 800E3448 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E34D8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E34D8.s index aeece3670e..012c9214b2 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E34D8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E34D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E34D8 /* 07C988 800E34D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s index c597a2f628..69ddbd5d39 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E3514 /* 07C9C4 800E3514 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E363C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E363C.s index 11e7f28f0a..4cedd8dc28 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E363C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E363C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E363C /* 07CAEC 800E363C 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4308.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4308.s index fb2957b1d9..e3a0389bba 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4308.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4308.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E4308 /* 07D7B8 800E4308 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s index 679034b50a..6fec556855 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E4404 /* 07D8B4 800E4404 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s index ebb27e862c..6d524fa246 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E4508 /* 07D9B8 800E4508 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s index de4b4fe7ce..c1d9ae4c10 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E45E0 /* 07DA90 800E45E0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s index 9c0800a878..a867830919 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E4744 /* 07DBF4 800E4744 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s index ced0bf7b65..68b920f3ae 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E4BB8 /* 07E068 800E4BB8 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s index 3f1970d1d4..7d74241f15 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E4F10 /* 07E3C0 800E4F10 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5088.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5088.s index 47fc530ad6..d1c3f44964 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5088.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5088.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5088 /* 07E538 800E5088 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s index f837b6488b..fd53741ee8 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5174 /* 07E624 800E5174 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E52F8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E52F8.s index 043fba2ece..804243f74d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E52F8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E52F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E52F8 /* 07E7A8 800E52F8 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s index a0ad610aaa..45e6992b93 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5348 /* 07E7F8 800E5348 3C038007 */ lui $v1, 0x8007 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s index c8ed99c198..01d5b81bde 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E546C /* 07E91C 800E546C 3C018011 */ lui $at, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E54E0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E54E0.s index 23615caadf..e522346a34 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E54E0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E54E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E54E0 /* 07E990 800E54E0 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5520.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5520.s index 308bf01b7e..ab7cfd3b7e 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5520.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5520.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5520 /* 07E9D0 800E5520 3C018011 */ lui $at, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s index ffb3cd31b6..2c47935585 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5530 /* 07E9E0 800E5530 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s index 339be34afa..22ce2497f6 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5938 /* 07EDE8 800E5938 3C088011 */ lui $t0, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E59A0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E59A0.s index 7119340d6b..f76cb96b17 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E59A0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E59A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E59A0 /* 07EE50 800E59A0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s index fcb3869c98..7718de14b5 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5A2C /* 07EEDC 800E5A2C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s index c30a628c66..bb9535a5a9 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E5C78 /* 07F128 800E5C78 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E636C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E636C.s index 93017cabe2..b56c4fea39 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E636C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E636C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E636C /* 07F81C 800E636C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s index 126baa7b45..b35eb28f3f 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6428 /* 07F8D8 800E6428 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s index 27f0d5a042..9a73d0d6dd 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6500 /* 07F9B0 800E6500 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E657C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E657C.s index 7dd16d6822..867c6e3ea3 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E657C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E657C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E657C /* 07FA2C 800E657C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/move_player.s b/asm/nonmatchings/code_7bb60_len_41b0/move_player.s index dff9c085d3..245018e8b0 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/move_player.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/move_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel move_player /* 07BC28 800E2778 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/set_action_state.s b/asm/nonmatchings/code_7bb60_len_41b0/set_action_state.s index 6fde08f255..80f7d315a8 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/set_action_state.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/set_action_state.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_action_state /* 07F254 800E5DA4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_a.s b/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_a.s index 69be4fde34..c1161847bc 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_a.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_a.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_bounce_a /* 07F4E4 800E6034 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_b.s b/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_b.s index 9d9d236a35..f6b717b46a 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_b.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/start_bounce_b.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_bounce_b /* 07F53C 800E608C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/start_falling.s b/asm/nonmatchings/code_7bb60_len_41b0/start_falling.s index f73dc89a89..0fc544dee4 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/start_falling.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/start_falling.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_falling /* 07F480 800E5FD0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/update_locomotion_state.s b/asm/nonmatchings/code_7bb60_len_41b0/update_locomotion_state.s index 427d3cf448..7c8e73c1ab 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/update_locomotion_state.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/update_locomotion_state.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_locomotion_state /* 07F418 800E5F68 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7e0e80/BtlBringPartnerOut.s b/asm/nonmatchings/code_7e0e80/BtlBringPartnerOut.s index fdc39c5a4e..462ea7a45d 100644 --- a/asm/nonmatchings/code_7e0e80/BtlBringPartnerOut.s +++ b/asm/nonmatchings/code_7e0e80/BtlBringPartnerOut.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BtlBringPartnerOut /* 7E19EC 80280B6C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_A.s b/asm/nonmatchings/code_7e0e80/CamPreset_A.s index d999e5c701..6c4885b581 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_A.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_A.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_A /* 7E1CD4 80280E54 14400005 */ bnez $v0, .L80280E6C diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_B.s b/asm/nonmatchings/code_7e0e80/CamPreset_B.s index 7ab28ddb68..09e341d8a3 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_B.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_B.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_B /* 7E1B68 80280CE8 24020029 */ addiu $v0, $zero, 0x29 diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_C.s b/asm/nonmatchings/code_7e0e80/CamPreset_C.s index 6a66679a38..257296eb33 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_C.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_C /* 7E1C2C 80280DAC 28620002 */ slti $v0, $v1, 2 diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_D.s b/asm/nonmatchings/code_7e0e80/CamPreset_D.s index 6641ad2bbf..59d2966e27 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_D.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_D.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_D .L80280DC8: diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_E.s b/asm/nonmatchings/code_7e0e80/CamPreset_E.s index f5b660e6cf..68607ed7fa 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_E.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_E.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_E /* 7E1C64 80280DE4 24040005 */ addiu $a0, $zero, 5 diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_F.s b/asm/nonmatchings/code_7e0e80/CamPreset_F.s index 0c1888d6dd..c56aee8612 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_F.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_F.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_F .L80280D04: diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_G.s b/asm/nonmatchings/code_7e0e80/CamPreset_G.s index 50d547fc22..5e414f0298 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_G.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_G.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_G /* 7E1BBC 80280D3C 1062018C */ beq $v1, $v0, .L80281370 diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_H.s b/asm/nonmatchings/code_7e0e80/CamPreset_H.s index e3a5469c75..f9e0dba655 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_H.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_H.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_H /* 7E1BF4 80280D74 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_I.s b/asm/nonmatchings/code_7e0e80/CamPreset_I.s index ac3ee74b23..222fef4d22 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_I.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_I.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_I /* 7E1BD8 80280D58 10620138 */ beq $v1, $v0, .L8028123C diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_J.s b/asm/nonmatchings/code_7e0e80/CamPreset_J.s index 494c4e4850..acb88af188 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_J.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_J.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_J /* 7E1C80 80280E00 00000000 */ nop diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_K.s b/asm/nonmatchings/code_7e0e80/CamPreset_K.s index c1daafe317..79f3781599 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_K.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_K.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_K /* 7E1C9C 80280E1C AE220074 */ sw $v0, 0x74($s1) diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_L.s b/asm/nonmatchings/code_7e0e80/CamPreset_L.s index ed87b38374..baadc147e7 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_L.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_L.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_L /* 7E1CB8 80280E38 00000000 */ nop diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_M.s b/asm/nonmatchings/code_7e0e80/CamPreset_M.s index 30d987253e..d380dc0e0a 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_M.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_M.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_M .L80280D20: diff --git a/asm/nonmatchings/code_7e0e80/CamPreset_N.s b/asm/nonmatchings/code_7e0e80/CamPreset_N.s index 70114cd2f2..c7c486b723 100644 --- a/asm/nonmatchings/code_7e0e80/CamPreset_N.s +++ b/asm/nonmatchings/code_7e0e80/CamPreset_N.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CamPreset_N /* 7E1C10 80280D90 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_7e0e80/MakeShop.s b/asm/nonmatchings/code_7e0e80/MakeShop.s index 8bf14073cd..da7ea05f6f 100644 --- a/asm/nonmatchings/code_7e0e80/MakeShop.s +++ b/asm/nonmatchings/code_7e0e80/MakeShop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeShop /* 7E26E0 80281860 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_7e0e80/MakeShopOwner.s b/asm/nonmatchings/code_7e0e80/MakeShopOwner.s index c26a4008ce..92d3aaf256 100644 --- a/asm/nonmatchings/code_7e0e80/MakeShopOwner.s +++ b/asm/nonmatchings/code_7e0e80/MakeShopOwner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeShopOwner /* 7E2A58 80281BD8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7e0e80/draw_shop_items.s b/asm/nonmatchings/code_7e0e80/draw_shop_items.s index fc895f770e..cf4433bdf7 100644 --- a/asm/nonmatchings/code_7e0e80/draw_shop_items.s +++ b/asm/nonmatchings/code_7e0e80/draw_shop_items.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_shop_items /* 7E23A4 80281524 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_80280000.s b/asm/nonmatchings/code_7e0e80/func_80280000.s index 190ba9ca43..d136f2d51e 100644 --- a/asm/nonmatchings/code_7e0e80/func_80280000.s +++ b/asm/nonmatchings/code_7e0e80/func_80280000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80280000 /* 7E0E80 80280000 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_80280088.s b/asm/nonmatchings/code_7e0e80/func_80280088.s index f1448a86a7..54d30b6694 100644 --- a/asm/nonmatchings/code_7e0e80/func_80280088.s +++ b/asm/nonmatchings/code_7e0e80/func_80280088.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80280088 /* 7E0F08 80280088 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_8028017C.s b/asm/nonmatchings/code_7e0e80/func_8028017C.s index c122d97885..ad1e4a6bd9 100644 --- a/asm/nonmatchings/code_7e0e80/func_8028017C.s +++ b/asm/nonmatchings/code_7e0e80/func_8028017C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8028017C /* 7E0FFC 8028017C 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_80280208.s b/asm/nonmatchings/code_7e0e80/func_80280208.s index 9881a30f6a..bf4c52f05e 100644 --- a/asm/nonmatchings/code_7e0e80/func_80280208.s +++ b/asm/nonmatchings/code_7e0e80/func_80280208.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80280208 /* 7E1088 80280208 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_802802D0.s b/asm/nonmatchings/code_7e0e80/func_802802D0.s index c3d0563d03..61c12e3d10 100644 --- a/asm/nonmatchings/code_7e0e80/func_802802D0.s +++ b/asm/nonmatchings/code_7e0e80/func_802802D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802802D0 /* 7E1150 802802D0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_8028035C.s b/asm/nonmatchings/code_7e0e80/func_8028035C.s index ef71788675..bd45a61b97 100644 --- a/asm/nonmatchings/code_7e0e80/func_8028035C.s +++ b/asm/nonmatchings/code_7e0e80/func_8028035C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8028035C /* 7E11DC 8028035C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7e0e80/func_80280954.s b/asm/nonmatchings/code_7e0e80/func_80280954.s index 9de2f3f4b6..ae5b8dc562 100644 --- a/asm/nonmatchings/code_7e0e80/func_80280954.s +++ b/asm/nonmatchings/code_7e0e80/func_80280954.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80280954 /* 7E17D4 80280954 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_80280AC4.s b/asm/nonmatchings/code_7e0e80/func_80280AC4.s index 90daec1b6a..eed4c65b0e 100644 --- a/asm/nonmatchings/code_7e0e80/func_80280AC4.s +++ b/asm/nonmatchings/code_7e0e80/func_80280AC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80280AC4 /* 7E1944 80280AC4 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7e0e80/func_80280B44.s b/asm/nonmatchings/code_7e0e80/func_80280B44.s index d613042b7a..12620e324b 100644 --- a/asm/nonmatchings/code_7e0e80/func_80280B44.s +++ b/asm/nonmatchings/code_7e0e80/func_80280B44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80280B44 /* 7E19C4 80280B44 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_7e0e80/func_80280B78.s b/asm/nonmatchings/code_7e0e80/func_80280B78.s index 003ecc1c37..eb10d3c907 100644 --- a/asm/nonmatchings/code_7e0e80/func_80280B78.s +++ b/asm/nonmatchings/code_7e0e80/func_80280B78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80280B78 /* 7E19F8 80280B78 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s b/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s index baa2e59d3f..4d79922fa4 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s +++ b/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel check_input_status_menu /* 08073C 800E728C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E6860.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E6860.s index ef641a8387..5347bb1e2c 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E6860.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E6860.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6860 /* 07FD10 800E6860 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s index f1b26f580d..02825eac13 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6904 /* 07FDB4 800E6904 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E69DC.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E69DC.s index 5acc6ec5a0..950e410466 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E69DC.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E69DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E69DC /* 07FE8C 800E69DC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E6B68.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E6B68.s index 2e4ab93b16..39c6a41deb 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E6B68.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E6B68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6B68 /* 080018 800E6B68 3C018011 */ lui $at, 0x8011 diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E6B78.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E6B78.s index ec19598682..2f725f6afd 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E6B78.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E6B78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6B78 /* 080028 800E6B78 3C0B8011 */ lui $t3, 0x8011 diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E6C44.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E6C44.s index 752171336e..4eac78a8ff 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E6C44.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E6C44.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6C44 /* 0800F4 800E6C44 0000402D */ daddu $t0, $zero, $zero diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E6CE4.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E6CE4.s index eb7326db11..ec1868cbb2 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E6CE4.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E6CE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800E6CE4 /* 080194 800E6CE4 3C038007 */ lui $v1, 0x8007 diff --git a/asm/nonmatchings/code_80850_len_3060/initialize_status_menu.s b/asm/nonmatchings/code_80850_len_3060/initialize_status_menu.s index c448d5a51c..54025fb412 100644 --- a/asm/nonmatchings/code_80850_len_3060/initialize_status_menu.s +++ b/asm/nonmatchings/code_80850_len_3060/initialize_status_menu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel initialize_status_menu /* 080DE4 800E7934 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s index c19b2f8904..f5d6cc86dd 100644 --- a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s +++ b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel is_ability_active /* 0831F8 800E9D48 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_80850_len_3060/status_menu_draw_number.s b/asm/nonmatchings/code_80850_len_3060/status_menu_draw_number.s index 398ba7801e..04f74dea82 100644 --- a/asm/nonmatchings/code_80850_len_3060/status_menu_draw_number.s +++ b/asm/nonmatchings/code_80850_len_3060/status_menu_draw_number.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel status_menu_draw_number /* 081154 800E7CA4 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_80850_len_3060/status_menu_draw_stat.s b/asm/nonmatchings/code_80850_len_3060/status_menu_draw_stat.s index 3933b5f96a..930c38f497 100644 --- a/asm/nonmatchings/code_80850_len_3060/status_menu_draw_stat.s +++ b/asm/nonmatchings/code_80850_len_3060/status_menu_draw_stat.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel status_menu_draw_stat /* 0812E4 800E7E34 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s index e220bfc7cd..919ef093ef 100644 --- a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s +++ b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_status_menu /* 081564 800E80B4 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/code_8230_len_1ae0/create_cameras_a.s b/asm/nonmatchings/code_8230_len_1ae0/create_cameras_a.s index 46ffa7808e..d37a5ba5f9 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/create_cameras_a.s +++ b/asm/nonmatchings/code_8230_len_1ae0/create_cameras_a.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_cameras_a /* 0092F4 8002DEF4 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_8230_len_1ae0/create_cameras_b.s b/asm/nonmatchings/code_8230_len_1ae0/create_cameras_b.s index 6dfb07496c..5c40a1e41e 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/create_cameras_b.s +++ b/asm/nonmatchings/code_8230_len_1ae0/create_cameras_b.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_cameras_b /* 009438 8002E038 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s b/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s index 5a7d40e9bf..704fd06f79 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s +++ b/asm/nonmatchings/code_8230_len_1ae0/func_8002D160.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8002D160 /* 008560 8002D160 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_8230_len_1ae0/get_cam_viewport.s b/asm/nonmatchings/code_8230_len_1ae0/get_cam_viewport.s index 651e5243a1..9bd248dea0 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/get_cam_viewport.s +++ b/asm/nonmatchings/code_8230_len_1ae0/get_cam_viewport.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_cam_viewport /* 0098E8 8002E4E8 3C08800B */ lui $t0, 0x800b diff --git a/asm/nonmatchings/code_8230_len_1ae0/get_screen_coords.s b/asm/nonmatchings/code_8230_len_1ae0/get_screen_coords.s index 26921ccf9e..09a9d215dd 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/get_screen_coords.s +++ b/asm/nonmatchings/code_8230_len_1ae0/get_screen_coords.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_screen_coords /* 009938 8002E538 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_8230_len_1ae0/initialize_next_camera.s b/asm/nonmatchings/code_8230_len_1ae0/initialize_next_camera.s index 6ff1b55cfe..2a88fcc61c 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/initialize_next_camera.s +++ b/asm/nonmatchings/code_8230_len_1ae0/initialize_next_camera.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel initialize_next_camera /* 00956C 8002E16C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s index 4dd69fc9f0..43cfc1bd67 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s +++ b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuSiMgrInit /* 008230 8002CE30 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrRestart.s b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrRestart.s index 5fbb1020ce..854cd85a12 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrRestart.s +++ b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrRestart.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuSiMgrRestart /* 0083AC 8002CFAC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrStop.s b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrStop.s index 598f026151..45f1f74dad 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrStop.s +++ b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrStop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuSiMgrStop /* 00838C 8002CF8C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrThread.s b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrThread.s index b8dcdd04c4..a75b2806ff 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrThread.s +++ b/asm/nonmatchings/code_8230_len_1ae0/nuSiMgrThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuSiMgrThread /* 0083D0 8002CFD0 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_8230_len_1ae0/nuSiSendMesg.s b/asm/nonmatchings/code_8230_len_1ae0/nuSiSendMesg.s index 9a8323cc7f..b566513a15 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/nuSiSendMesg.s +++ b/asm/nonmatchings/code_8230_len_1ae0/nuSiSendMesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuSiSendMesg /* 008328 8002CF28 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_8230_len_1ae0/render_frame.s b/asm/nonmatchings/code_8230_len_1ae0/render_frame.s index b7476e0bcd..e04e4000d2 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/render_frame.s +++ b/asm/nonmatchings/code_8230_len_1ae0/render_frame.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_frame /* 008B3C 8002D73C 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_8230_len_1ae0/set_cam_viewport.s b/asm/nonmatchings/code_8230_len_1ae0/set_cam_viewport.s index 179bd504d8..721b3bf0fc 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/set_cam_viewport.s +++ b/asm/nonmatchings/code_8230_len_1ae0/set_cam_viewport.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_cam_viewport /* 009714 8002E314 3C08800B */ lui $t0, 0x800b diff --git a/asm/nonmatchings/code_8230_len_1ae0/update_cameras.s b/asm/nonmatchings/code_8230_len_1ae0/update_cameras.s index 6d2f3dab43..1e981bf856 100644 --- a/asm/nonmatchings/code_8230_len_1ae0/update_cameras.s +++ b/asm/nonmatchings/code_8230_len_1ae0/update_cameras.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_cameras /* 008800 8002D400 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s b/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s index 27f78f9595..394484c0f8 100644 --- a/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s +++ b/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_partner_move_history /* 08890C 800EF45C 3C058011 */ lui $a1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s b/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s index 764a0ed18f..aa3cf60975 100644 --- a/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s +++ b/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_partner_ai /* 0887D8 800EF328 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s b/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s index 79e6717e30..94dd433a80 100644 --- a/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s +++ b/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_partner_flying /* 0867C0 800ED310 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s b/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s index 64cc5b185e..03ff671dae 100644 --- a/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s +++ b/asm/nonmatchings/code_838b0_len_5900/enable_partner_walking.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enable_partner_walking /* 084D58 800EB8A8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s index fc02e72088..054986bb33 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EA4B0 /* 083960 800EA4B0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA5A4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA5A4.s index 76b6dfc049..666e893c47 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA5A4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA5A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EA5A4 /* 083A54 800EA5A4 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA5B8.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA5B8.s index c77e17af31..8cd13373ab 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA5B8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA5B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EA5B8 /* 083A68 800EA5B8 3C03FDFF */ lui $v1, 0xfdff diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s index f9d62de370..967a5d5630 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EA5D0 /* 083A80 800EA5D0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s index ba2a25ceed..1aea0527c1 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EA6A8 /* 083B58 800EA6A8 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s index fb62428b20..5ab0cd9778 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EA6CC /* 083B7C 800EA6CC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s index 026d51705c..71374191ed 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB168 /* 084618 800EB168 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s index eb72ad3665..5284fcb072 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB200 /* 0846B0 800EB200 3C058011 */ lui $a1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB3E0.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB3E0.s index 2152588152..173f6e6775 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB3E0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB3E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB3E0 /* 084890 800EB3E0 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB42C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB42C.s index 4853f5585a..8eceaba50a 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB42C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB42C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB42C /* 0848DC 800EB42C 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB474.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB474.s index 3a7d085c03..ee2670b26d 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB474.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB474.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB474 /* 084924 800EB474 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB580.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB580.s index e30f030e1a..6abd8601ac 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB580.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB580.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB580 /* 084A30 800EB580 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB5E4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB5E4.s index 59f73feb60..73e3f8f28d 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB5E4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB5E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB5E4 /* 084A94 800EB5E4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB638.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB638.s index fffba9ec67..97eed22bb0 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB638.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB638.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB638 /* 084AE8 800EB638 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB658.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB658.s index b24dd86ef0..dcb960f35b 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB658.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB658.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB658 /* 084B08 800EB658 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB6C4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB6C4.s index 9880ba3735..5a938e9096 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB6C4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB6C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EB6C4 /* 084B74 800EB6C4 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s b/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s index 373777450a..74238fad92 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EBC74 /* 085124 800EBC74 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s b/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s index a00ed982b8..02cc4799f2 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800ED9F8 /* 086EA8 800ED9F8 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s index 9f26ec083f..ee936593b6 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF300 /* 0887B0 800EF300 24020028 */ addiu $v0, $zero, 0x28 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s index f5fea7e662..1cc92cad53 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF314 /* 0887C4 800EF314 24020032 */ addiu $v0, $zero, 0x32 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s index 562d5023cd..987c17ad64 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF394 /* 088844 800EF394 3C018011 */ lui $at, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s index 166cd23791..5feeaf0a5d 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF3A4 /* 088854 800EF3A4 3C014220 */ lui $at, 0x4220 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3C0.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF3C0.s index 19b3d6eb7c..cb589ac1fe 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3C0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF3C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF3C0 /* 088870 800EF3C0 3C018010 */ lui $at, 0x8010 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s index d471660eb4..1e05cd3c69 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF3D4 /* 088884 800EF3D4 3C018011 */ lui $at, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s index 6c1e89e6cc..a6a3e99b9e 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF3E4 /* 088894 800EF3E4 2402000F */ addiu $v0, $zero, 0xf diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s index 9109f9a91a..2b2bee877b 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF414 /* 0888C4 800EF414 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s index 72c8aba338..0a5b114cb1 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF43C /* 0888EC 800EF43C 3C018011 */ lui $at, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s index 20b7ec937f..4e6a5d4c0e 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF600 /* 088AB0 800EF600 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF628.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF628.s index efc240a12a..3cc6ba40d8 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF628.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF628.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF628 /* 088AD8 800EF628 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s index 618411c3ec..68a88c189c 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF640 /* 088AF0 800EF640 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s index ed3f21c40f..488548b8ab 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EF82C /* 088CDC 800EF82C 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_838b0_len_5900/remove_consumable.s b/asm/nonmatchings/code_838b0_len_5900/remove_consumable.s index 1f3731b112..b47b764e77 100644 --- a/asm/nonmatchings/code_838b0_len_5900/remove_consumable.s +++ b/asm/nonmatchings/code_838b0_len_5900/remove_consumable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_consumable /* 08392C 800EA47C 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s b/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s index 33080855df..9dd749e59c 100644 --- a/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s +++ b/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_player_move_history /* 086968 800ED4B8 3C058011 */ lui $a1, 0x8011 diff --git a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s index 3111d80014..3ceee2c824 100644 --- a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s +++ b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel use_consumable /* 0838B0 800EA400 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_838b0_len_5900/use_partner_ability.s b/asm/nonmatchings/code_838b0_len_5900/use_partner_ability.s index 0450486490..b6a3a0f3d2 100644 --- a/asm/nonmatchings/code_838b0_len_5900/use_partner_ability.s +++ b/asm/nonmatchings/code_838b0_len_5900/use_partner_ability.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel use_partner_ability /* 0847C4 800EB314 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD00.s b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD00.s index 5af24b3180..dbf709918a 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD00.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EFD00 /* 0891B0 800EFD00 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s index 6cb0543658..c321cf2b48 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EFD08 /* 0891B8 800EFD08 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s b/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s index 74fa9eb7d6..9f71240723 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800EFE2C /* 0892DC 800EFE2C 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s index e357656e5b..e8e1929d23 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F0248 /* 0896F8 800F0248 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s index e3093c8ef2..cb9d4b88d9 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F0490 /* 089940 800F0490 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s index 3c4ba08b53..fe22db7f61 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F0864 /* 089D14 800F0864 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s index 4a20e6df3b..a631dd701b 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F09EC /* 089E9C 800F09EC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s index 0ef13889c8..3c21296039 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F0B3C /* 089FEC 800F0B3C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s index e052599d4a..c7a4efb97d 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F0C9C /* 08A14C 800F0C9C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s b/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s index 37ba617b5f..2d45b85f0c 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F0CB0 /* 08A160 800F0CB0 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s b/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s index 40822fc1b7..b635a4c1a1 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F0D80 /* 08A230 800F0D80 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s index ee2a1cf226..b5cf2a20b1 100644 --- a/asm/nonmatchings/code_8a160_len_700/func_800F102C.s +++ b/asm/nonmatchings/code_8a160_len_700/func_800F102C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F102C /* 08A4DC 800F102C 27BDFF28 */ addiu $sp, $sp, -0xd8 diff --git a/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s b/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s index 11445525e1..492f6439c6 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s +++ b/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_submenu_title /* 08DAF8 800F4648 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s index 705041c76a..7279707253 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F13B0 /* 08A860 800F13B0 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s index 2f49c8979c..bcf6bfbe95 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F1538 /* 08A9E8 800F1538 3C048011 */ lui $a0, 0x8011 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s index f4fc8e2e33..fef73aeced 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F16CC /* 08AB7C 800F16CC 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s index 9ba6fddf2c..0bd524b4bb 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F1A10 /* 08AEC0 800F1A10 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s index 99161310e9..23e218f779 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F4E40 /* 08E2F0 800F4E40 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s index 9cd7872b03..454f76e2f3 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F4FC4 /* 08E474 800F4FC4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s b/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s index bbbeb5c943..4cd1200e38 100644 --- a/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s +++ b/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800F513C /* 08E5EC 800F513C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_8e790_len_2850/draw_box.s b/asm/nonmatchings/code_8e790_len_2850/draw_box.s index 1f5b201177..0e4a58ca4e 100644 --- a/asm/nonmatchings/code_8e790_len_2850/draw_box.s +++ b/asm/nonmatchings/code_8e790_len_2850/draw_box.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_box /* 08E790 800F52E0 27BDFE10 */ addiu $sp, $sp, -0x1f0 diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s index 303de32cc5..b6c6e8eaaa 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_0 /* 00AC50 8002F850 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s index 3a2c837a25..50db444c1f 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_1 /* 00A690 8002F290 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s index ef4756a681..72dd0a2cdf 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_2 /* 00A0F8 8002ECF8 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s index fc90a2554b..dff1189e90 100644 --- a/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s +++ b/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_4 /* 009D10 8002E910 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s index 1ba80666f1..77c47bc017 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AssignAreaFlag /* 0A86F8 80111FF8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s index 151eb3e870..50ef12d853 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AssignBlockFlag /* 0A876C 8011206C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s index d683494853..658d2e76b2 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AssignCrateFlag /* 0A8870 80112170 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignFlag.s index a20cf6aed5..1f2250bf1f 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignFlag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AssignFlag /* 0A87B8 801120B8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s index 0a048913f7..3f189558a3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AssignPanelFlag /* 0A8814 80112114 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s b/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s index 20a97c7a63..003555fe1d 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AssignScript /* 0A86B0 80111FB0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s b/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s index 000a273289..8995e053ab 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeEntity /* 0A8438 80111D38 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s b/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s index c75ac90b7f..d3b69dd0ed 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _load_model_textures /* 0AC244 80115B44 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s b/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s index 127ea18d66..3ac822add7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel calculate_model_sizes /* 0AC82C 8011612C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s index e0f90aaa31..57817f8ff1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_model_data /* 0AC444 80115D44 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s b/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s index 04484b12b9..94aee88282 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/clone_model.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clone_model /* 0B1DF0 8011B6F0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s index 04b4511af0..d8a7895174 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_entity /* 0A7FC4 801118C4 AFA40000 */ sw $a0, ($sp) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s index 70b5fd3e94..e6fe3fb80e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_entity_shadow /* 0A88CC 801121CC 44850000 */ mtc1 $a1, $f0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s index ed6392dad4..2d5617c386 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_shadow_from_data /* 0A82D8 80111BD8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s index 7c6005d0be..1d2944fab6 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_shadow_type /* 0A8960 80112260 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBC0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBC0.s index 0f15223f04..45c1eff036 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBC0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8010FBC0 /* 0A62C0 8010FBC0 AC850018 */ sw $a1, 0x18($a0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s index 9822ca25b8..557083be78 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FBD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8010FBD8 /* 0A62D8 8010FBD8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s index 1461ce9e0d..9e7d2c6511 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8010FD68 /* 0A6468 8010FD68 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s index 3cc418e918..79c0fc9e84 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FD98.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8010FD98 /* 0A6498 8010FD98 00A0382D */ daddu $a3, $a1, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FEB4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FEB4.s index ede6e69f8b..844ee50928 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FEB4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8010FEB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8010FEB4 /* 0A65B4 8010FEB4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801100CC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801100CC.s index 46b1129afc..9dd7fd1085 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801100CC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801100CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801100CC /* 0A67CC 801100CC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011022C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011022C.s index dbfbd2933c..e7cefa87a1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011022C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011022C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011022C /* 0A692C 8011022C 27BDFE00 */ addiu $sp, $sp, -0x200 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110374.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110374.s index 0f84015cca..ad328872f1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110374.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110374.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80110374 /* 0A6A74 80110374 27BDFE00 */ addiu $sp, $sp, -0x200 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801104A4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801104A4.s index aa8f7366d2..3b45171ae1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801104A4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801104A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801104A4 /* 0A6BA4 801104A4 27BDFF48 */ addiu $sp, $sp, -0xb8 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110678.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110678.s index 992ea321e4..8428f61e30 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110678.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110678.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80110678 /* 0A6D78 80110678 0080282D */ daddu $a1, $a0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801106A4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801106A4.s index 6cc1f8f0c7..72029723d8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801106A4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801106A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801106A4 /* 0A6DA4 801106A4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801106D0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801106D0.s index 7e2b336da9..90c980d3d9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801106D0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801106D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801106D0 /* 0A6DD0 801106D0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110790.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110790.s index cc96041f5b..ce618d953e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110790.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110790.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80110790 /* 0A6E90 80110790 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011085C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011085C.s index cf305ca8ce..8ce5a7e27a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011085C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011085C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011085C /* 0A6F5C 8011085C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801108B8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801108B8.s index 089491d916..0581c986e7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801108B8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801108B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801108B8 /* 0A6FB8 801108B8 3C020002 */ lui $v0, 2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s index 7e0ac2a42c..aee7bcb845 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110BCC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80110BCC /* 0A72CC 80110BCC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110CB8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110CB8.s index ba27045377..00fcb2c591 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110CB8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110CB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80110CB8 /* 0A73B8 80110CB8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s index 64d3045027..77a618bb2a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80110E58 /* 0A7558 80110E58 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s index 4482d52f36..e8e6a611d4 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80110F10 /* 0A7610 80110F10 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801110B4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801110B4.s index 0ce406e482..3ddec9d09a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801110B4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801110B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801110B4 /* 0A77B4 801110B4 2407FFFF */ addiu $a3, $zero, -1 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011115C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011115C.s index c26c6ae1a4..593eb51d9d 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011115C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011115C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011115C /* 0A785C 8011115C ACC00000 */ sw $zero, ($a2) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801112A4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801112A4.s index a0e32e46c5..3d4bc1017b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801112A4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801112A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801112A4 /* 0A79A4 801112A4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111408.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111408.s index 567d33be03..7d9db34293 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111408.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111408.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80111408 /* 0A7B08 80111408 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s index 36d1ab84fc..e323d24f94 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80111790 /* 0A7E90 80111790 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s index 793bbb9e93..1d99767ab6 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801117DC /* 0A7EDC 801117DC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s index 18c0e58954..5a0d43d3b9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112328 /* 0A8A28 80112328 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s index 46f3ac3583..e1d7d99274 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112344 /* 0A8A44 80112344 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s index 7bf71abbcb..0da8bfe342 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801125E8 /* 0A8CE8 801125E8 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112900.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112900.s index 880ba5decb..0bd67f57f1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112900.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112900.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112900 /* 0A9000 80112900 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s index 0e5c254da6..607c910267 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112B20 /* 0A9220 80112B20 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s index 063ed02c7e..400f144e3a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112B98 /* 0A9298 80112B98 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112CA8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112CA8.s index 06fa791b41..37e925eba5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112CA8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112CA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112CA8 /* 0A93A8 80112CA8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s index 99f971091d..d3aee66923 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112D84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112D84 /* 0A9484 80112D84 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s index 94a77f0d58..0b4860a25a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80112FC4 /* 0A96C4 80112FC4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80113090.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80113090.s index 36054b8910..9a58c7f0c8 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80113090.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80113090.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80113090 /* 0A9790 80113090 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s index 0542a32b36..6549619f02 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80114B58 /* 0AB258 80114B58 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s index 05bf95a531..7ea1072a1c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80115498 /* 0ABB98 80115498 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s index 8d478bf5ac..aaa02b3e2b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80115CA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80115CA8 /* 0AC3A8 80115CA8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s index feb5896c0c..ba81a90f56 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011620C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011620C /* 0AC90C 8011620C 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s index 0609f11f40..dd4beab6a0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80116674 /* 0ACD74 80116674 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s index 466c7aaab8..470e512672 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80116698 /* 0ACD98 80116698 27BDFF20 */ addiu $sp, $sp, -0xe0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117C94.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117C94.s index 70b8466009..4dc0b3cd66 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117C94.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117C94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80117C94 /* 0AE394 80117C94 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s index 57b67ed68e..b7e00c2c26 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80117D00 /* 0AE400 80117D00 27BDFF20 */ addiu $sp, $sp, -0xe0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s index 26cb31178a..efb2910001 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80117E74 /* 0AE574 80117E74 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s index 221d8e6c12..40e3311e3c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801180E8 /* 0AE7E8 801180E8 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B090.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B090.s index 7fe4aeedfd..a7d30eb213 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B090.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B090.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B090 /* 0B1790 8011B090 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1C0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1C0.s index 17b7b7abf2..a4eab070d6 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1C0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B1C0 /* 0B18C0 8011B1C0 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s index 72dca2fdde..8f48efd219 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B1D8 /* 0B18D8 8011B1D8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s index ed541c901d..8f9ebc9d8c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B37C /* 0B1A7C 8011B37C 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s index 4889127071..c2e2655bdb 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B5D0 /* 0B1CD0 8011B5D0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s index 6d64bd00be..14946d4ce4 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B660 /* 0B1D60 8011B660 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s index e7c37ce917..7099df11e5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B7C0 /* 0B1EC0 8011B7C0 3084FFFF */ andi $a0, $a0, 0xffff diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s index dfe4581e7b..31c4b79f9a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011B950 /* 0B2050 8011B950 3084FFFF */ andi $a0, $a0, 0xffff diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s index b41a2558ca..a3ded03279 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BAE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BAE8 /* 0B21E8 8011BAE8 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BBA4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BBA4.s index 48db6acbe7..3fd9c00449 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BBA4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BBA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BBA4 /* 0B22A4 8011BBA4 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s index 955e2df017..cdeba95cb1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BC7C /* 0B237C 8011BC7C 2403FFFF */ addiu $v1, $zero, -1 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCB4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCB4.s index 6716d25d86..986007837b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCB4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BCB4 /* 0B23B4 8011BCB4 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCD0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCD0.s index b17bd2c840..c7646fe6d7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCD0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BCD0 /* 0B23D0 8011BCD0 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s index bfcf90ea58..370a47ebc5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BCEC /* 0B23EC 8011BCEC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE14.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE14.s index 5156264d8f..faed415f15 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE14.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BE14 /* 0B2514 8011BE14 14800005 */ bnez $a0, .L8011BE2C diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE5C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE5C.s index fe713ac5ca..5d7b24070e 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE5C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BE5C /* 0B255C 8011BE5C 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE80.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE80.s index a82dbd8d53..734c85c566 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE80.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BE80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BE80 /* 0B2580 8011BE80 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BFD4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BFD4.s index 50fa3fac41..31aa9c9005 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BFD4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BFD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011BFD4 /* 0B26D4 8011BFD4 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s index 263782559d..c3b820ba58 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011C028 /* 0B2728 8011C028 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s index 88b071d729..b6b9443b83 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011C0DC /* 0B27DC 8011C0DC 0080482D */ daddu $t1, $a0, $zero diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s index 8f143be287..a338a1945a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011C130 /* 0B2830 8011C130 00052900 */ sll $a1, $a1, 4 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s index 58dba0b033..af7fb6d895 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011C164 /* 0B2864 8011C164 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s index 83c90fd59b..eac6da285c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011C32C /* 0B2A2C 8011C32C 27BDFF68 */ addiu $sp, $sp, -0x98 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s index 3d7ef5480f..0b90b0a728 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D72C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011D72C /* 0B3E2C 8011D72C 27BDFF28 */ addiu $sp, $sp, -0xd8 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s index 5049da10aa..150cd58b41 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011D7E4 /* 0B3EE4 8011D7E4 3C030002 */ lui $v1, 2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D82C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D82C.s index 51647b2f99..a51ebaf41a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D82C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D82C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011D82C /* 0B3F2C 8011D82C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s index 0f92bcfd79..77d1bf7728 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011D890 /* 0B3F90 8011D890 24040002 */ addiu $a0, $zero, 2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s index 401a8a44e5..a0ade64c98 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011D9B8 /* 0B40B8 8011D9B8 27BDFB88 */ addiu $sp, $sp, -0x478 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s index 24e612b63a..ae7133e1c0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DE80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011DE80 /* 0B4580 8011DE80 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DFD0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DFD0.s index 22f8be9af0..1d08f4b370 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DFD0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011DFD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011DFD0 /* 0B46D0 8011DFD0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E014.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E014.s index 6c2b07714c..418438b493 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E014.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E014.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E014 /* 0B4714 8011E014 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E058.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E058.s index 597b8e1801..a983cb0262 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E058.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E058.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E058 /* 0B4758 8011E058 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s index f357917b8a..4b54c96436 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E09C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E09C /* 0B479C 8011E09C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E0DC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E0DC.s index 456dcd5e82..c787e7d792 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E0DC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E0DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E0DC /* 0B47DC 8011E0DC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E150.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E150.s index bee766b6ef..703da54bcb 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E150.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E150.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E150 /* 0B4850 8011E150 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s index f54aacc226..45469c3989 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E1C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E1C4 /* 0B48C4 8011E1C4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s index 0d52900267..dfcd896829 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E224.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E224 /* 0B4924 8011E224 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s index ee03f68ac3..c1bd3999b5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E310.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E310 /* 0B4A10 8011E310 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s index 7ccca17902..c91e05a0a6 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E398.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E398 /* 0B4A98 8011E398 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s index 02131e6905..b3b616910a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E400.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E400 /* 0B4B00 8011E400 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s index 60a23bdbc1..24e51147b0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E438.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E438 /* 0B4B38 8011E438 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s index 1438e26007..9ed039ba6c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E4B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E4B8 /* 0B4BB8 8011E4B8 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s index e2a33aa2f7..97afb6ea6b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E5E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E5E0 /* 0B4CE0 8011E5E0 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s index afccd3625d..ee7ce0bbba 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E718.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E718 /* 0B4E18 8011E718 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s index 6d6891108b..7da60ad40c 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011E8BC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011E8BC /* 0B4FBC 8011E8BC 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s index bdf719ace8..dd594690a7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EA54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011EA54 /* 0B5154 8011EA54 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s index d61e68b4b2..5cdbd7b05b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011EBF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011EBF0 /* 0B52F0 8011EBF0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s index f8a9c340df..1c266e127a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F058.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011F058 /* 0B5758 8011F058 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s index 2f9139b941..b79a8aefc9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F118.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011F118 /* 0B5818 8011F118 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s index 395480278a..77dc2e6560 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F304.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011F304 /* 0B5A04 8011F304 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s index e0d5f2c90f..d031214f5b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011F3E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011F3E8 /* 0B5AE8 8011F3E8 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s index 2b3e1680be..35d99b0239 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FA54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011FA54 /* 0B6154 8011FA54 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF74.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF74.s index e267c5fb57..2c639ff029 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF74.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF74.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011FF74 /* 0B6674 8011FF74 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF98.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF98.s index 51b9e45e05..bdfa7b626a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF98.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FF98.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011FF98 /* 0B6698 8011FF98 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s index ae80b4ecea..507748dfce 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011FFB4 /* 0B66B4 8011FFB4 18C00008 */ blez $a2, .L8011FFD8 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFE0.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFE0.s index 8e547122f4..fcec9f0825 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFE0.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_8011FFE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8011FFE0 /* 0B66E0 8011FFE0 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120000.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120000.s index fcad69856c..162bb48c38 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120000.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120000 /* 0B6700 80120000 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s index 9b6174691c..9baecb15db 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120198.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120198 /* 0B6898 80120198 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s index 6d624e93e0..76ea5385a7 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120234.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120234 /* 0B6934 80120234 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801203AC.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801203AC.s index 8f867dcba3..997f4a98b5 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801203AC.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801203AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801203AC /* 0B6AAC 801203AC 27BDFE00 */ addiu $sp, $sp, -0x200 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s index d3ef155739..235b15e1da 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120420.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120420 /* 0B6B20 80120420 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s index fda77844c4..ad23229412 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120474.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120474 /* 0B6B74 80120474 27BDFE00 */ addiu $sp, $sp, -0x200 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s index e0fba83e85..f95d816f23 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120530.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120530 /* 0B6C30 80120530 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120678.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120678.s index 6f7a01eb96..140ffa6675 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_80120678.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_80120678.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120678 /* 0B6D78 80120678 27BDFE00 */ addiu $sp, $sp, -0x200 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s b/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s index 58ddd43132..dc71c02cbd 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/func_801206F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801206F8 /* 0B6DF8 801206F8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_by_index.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_by_index.s index f11a07141c..d5a6bc8772 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_by_index.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_by_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_entity_by_index /* 0A6CE8 801105E8 30840FFF */ andi $a0, $a0, 0xfff diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_list.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_list.s index 03dc8c42f2..dc7f970eed 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_list.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_entity_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_entity_list /* 0A6D20 80110620 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_fog_color.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_fog_color.s index 889bfbdf4d..3e741af094 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_fog_color.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_fog_color.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_fog_color /* 0B22D8 8011BBD8 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s index 9bf5990df1..445f39ccab 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_model_center_and_size /* 0B17EC 8011B0EC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_from_list_index.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_from_list_index.s index 445cf2dfb1..617cb4b316 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_from_list_index.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_from_list_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_model_from_list_index /* 0B1430 8011AD30 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_list_index_from_tree_index.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_list_index_from_tree_index.s index 8ac1e5613e..b7288d2309 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_list_index_from_tree_index.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_list_index_from_tree_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_model_list_index_from_tree_index /* 0B1710 8011B010 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_property.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_property.s index 87ef3f31ca..497c3f6335 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_model_property.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_model_property.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_model_property /* 0AC20C 80115B0C 8C870008 */ lw $a3, 8($a0) diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_by_index.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_by_index.s index 6be5f917ea..7bb4f9fb8b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_by_index.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_by_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_shadow_by_index /* 0A6D04 80110604 30840FFF */ andi $a0, $a0, 0xfff diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_list.s b/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_list.s index fa24c3ab43..43228575e3 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_list.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/get_shadow_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_shadow_list /* 0A6D4C 8011064C 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s index 1ebbc560b3..b61a85aebf 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_model_data /* 0AC6E8 80115FE8 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/is_player_action_state.s b/asm/nonmatchings/code_a5dd0_len_114e0/is_player_action_state.s index f6353ede03..58743f9230 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/is_player_action_state.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/is_player_action_state.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel is_player_action_state /* 0A72B0 80110BB0 00041600 */ sll $v0, $a0, 0x18 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_data_for_models.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_data_for_models.s index 66ba166b5a..33121fa92a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_data_for_models.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_data_for_models.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_data_for_models /* 0B1448 8011AD48 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_entity_data.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_entity_data.s index 4a73c5c36f..d450827562 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_entity_data.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_entity_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_entity_data /* 0A7314 80110C14 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s index 393bbd2f5e..e0687173ac 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_model_textures /* 0AC324 80115C24 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s index 38aab994cf..fe5807fb3a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_model_transforms /* 0B14C8 8011ADC8 27BDFF00 */ addiu $sp, $sp, -0x100 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s b/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s index a643baa04f..13176529ba 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_tile_header /* 0AB46C 80114D6C 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/play_model_animation.s b/asm/nonmatchings/code_a5dd0_len_114e0/play_model_animation.s index 2d92a233d7..bc3750ce21 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/play_model_animation.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/play_model_animation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_model_animation /* 0B6848 80120148 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s b/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s index c1e2d21c90..457fefb560 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/queue_render_task.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel queue_render_task /* 0B4010 8011D910 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s index a12bb22ceb..d1f795f731 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_models /* 0AD290 80116B90 27BDFF10 */ addiu $sp, $sp, -0xf0 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s b/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s index d3a21d4bc1..05ffdc89f0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_ui /* 0A9658 80112F58 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s index b5ad8e3ed6..201ab6daf9 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_u.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_aux_pan_u /* 0B234C 8011BC4C 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s index 3106689a21..5655229645 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_aux_pan_v.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_aux_pan_v /* 0B2364 8011BC64 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_fog_color.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_fog_color.s index 9d5abb2535..7af28c55f0 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_fog_color.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_fog_color.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_fog_color /* 0B2288 8011BB88 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s index 30ec68ec78..1801f85ee6 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_u.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_main_pan_u /* 0B231C 8011BC1C 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s index 625347edb1..ee7e99410a 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_main_pan_v.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_main_pan_v /* 0B2334 8011BC34 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_shadow_scale_peach.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_shadow_scale_peach.s index 74c6a21b3e..83971b71ea 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_shadow_scale_peach.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_shadow_scale_peach.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_shadow_scale_peach /* 0A90D4 801129D4 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s index 2176fecdfd..f5a4320800 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_standard_shadow_scale /* 0A8F5C 8011285C 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/set_tex_panner.s b/asm/nonmatchings/code_a5dd0_len_114e0/set_tex_panner.s index ef797af07d..4deb46c7f1 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/set_tex_panner.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/set_tex_panner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_tex_panner /* 0B2314 8011BC14 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/step_current_game_mode.s b/asm/nonmatchings/code_a5dd0_len_114e0/step_current_game_mode.s index 53a323397e..023e740361 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/step_current_game_mode.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/step_current_game_mode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel step_current_game_mode /* 0A9578 80112E78 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s b/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s index 77d192129c..a291ebe46b 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_player_entity_aabb /* 0A71AC 80110AAC 3C058011 */ lui $a1, 0x8011 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s b/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s index 6fc422d95a..32739d8476 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_entities /* 0A5DD0 8010F6D0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s b/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s index b0fb41f601..9eb4762904 100644 --- a/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s +++ b/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_shadows /* 0A6198 8010FA98 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s index bfd7c1a5b6..8e293a66d7 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_3 /* 00C894 80031494 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s index 903c3f4f6b..07ab765d4f 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_5 /* 00B400 80030000 3C014190 */ lui $at, 0x4190 diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s index 08ef9d3fd4..307e87f594 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_6 /* 00AD90 8002F990 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s index f271877e8a..c583fb5679 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel do_camera_type_unused /* 00B0E0 8002FCE0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_ad90_len_2880/func_80030210.s b/asm/nonmatchings/code_ad90_len_2880/func_80030210.s index b23bbbc34c..30c6a68d8e 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_80030210.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_80030210.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80030210 /* 00B610 80030210 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s b/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s index b531aecc36..5d7ab5427d 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8003034C /* 00B74C 8003034C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ad90_len_2880/func_80030450.s b/asm/nonmatchings/code_ad90_len_2880/func_80030450.s index b0f318a1c6..4554c134aa 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_80030450.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_80030450.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80030450 /* 00B850 80030450 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s b/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s index ea944c3bd6..d107e8197c 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800304FC /* 00B8FC 800304FC 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_ad90_len_2880/test_ray_zone_aabb.s b/asm/nonmatchings/code_ad90_len_2880/test_ray_zone_aabb.s index 2f4a8b039c..3b970517dc 100644 --- a/asm/nonmatchings/code_ad90_len_2880/test_ray_zone_aabb.s +++ b/asm/nonmatchings/code_ad90_len_2880/test_ray_zone_aabb.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_ray_zone_aabb /* 00B858 80030458 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/_draw_message_box.s b/asm/nonmatchings/code_b72b0_len_15ed0/_draw_message_box.s index 0bb1dcbe28..34a440373e 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/_draw_message_box.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/_draw_message_box.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _draw_message_box /* 0C3308 8012CC08 27BDFF28 */ addiu $sp, $sp, -0xd8 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/_load_string.s b/asm/nonmatchings/code_b72b0_len_15ed0/_load_string.s index 1ce3406984..34a1e977ee 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/_load_string.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/_load_string.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _load_string /* 0BC01C 8012591C 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/_update_message.s b/asm/nonmatchings/code_b72b0_len_15ed0/_update_message.s index eaa266a92b..8db4b4b742 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/_update_message.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/_update_message.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _update_message /* 0B9F98 80123898 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/cancel_message.s b/asm/nonmatchings/code_b72b0_len_15ed0/cancel_message.s index 814fc70f50..a11d617c87 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/cancel_message.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/cancel_message.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel cancel_message /* 0BC208 80125B08 8C8304FC */ lw $v1, 0x4fc($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clamp_printer_coords.s b/asm/nonmatchings/code_b72b0_len_15ed0/clamp_printer_coords.s index ff4fd21125..7f44c0ea14 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clamp_printer_coords.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clamp_printer_coords.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clamp_printer_coords /* 0BC1B8 80125AB8 A485050A */ sh $a1, 0x50a($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_character_set.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_character_set.s index 9a239f0c4a..6d89ec017a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_character_set.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clear_character_set.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_character_set /* 0B9D60 80123660 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s index ca829dd293..3b248a24b3 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_item_entity_data /* 0C76F0 80130FF0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_flags.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_flags.s index e32fb1711f..213e66c6c4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_flags.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clear_item_entity_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_item_entity_flags /* 0CA888 80134188 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/clear_printers.s b/asm/nonmatchings/code_b72b0_len_15ed0/clear_printers.s index 8111d98d0b..c7305d9ca0 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/clear_printers.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/clear_printers.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_printers /* 0B9D74 80123674 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/close_message.s b/asm/nonmatchings/code_b72b0_len_15ed0/close_message.s index 8d83c45ec6..16682a2292 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/close_message.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/close_message.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel close_message /* 0BC370 80125C70 8C8204FC */ lw $v0, 0x4fc($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/dma_load_string.s b/asm/nonmatchings/code_b72b0_len_15ed0/dma_load_string.s index aac60c7337..daf7f28411 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/dma_load_string.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/dma_load_string.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dma_load_string /* 0BBF04 80125804 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_coin_sparkles.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_coin_sparkles.s index 98aa961e32..8a11202cc5 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_coin_sparkles.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_coin_sparkles.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_coin_sparkles /* 0C720C 80130B0C 27BDFE78 */ addiu $sp, $sp, -0x188 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s index b4fd6ddf94..6ae82e4946 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entities.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_item_entities /* 0C9380 80132C80 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entity.s index a48d503168..5facbc7b5c 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entity.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_item_entity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_item_entity /* 0C88A4 801321A4 27BDFEB8 */ addiu $sp, $sp, -0x148 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s index e08c9b9c1b..e7049554a8 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_number.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_number /* 0BDD9C 8012769C 27BDFF38 */ addiu $sp, $sp, -0xc8 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/draw_string.s b/asm/nonmatchings/code_b72b0_len_15ed0/draw_string.s index d00cf3c147..bd6e76adc4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/draw_string.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/draw_string.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_string /* 0BCBEC 801264EC 27BDFA58 */ addiu $sp, $sp, -0x5a8 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120BB0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120BB0.s index 71197ee09f..0f442115b3 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120BB0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120BB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120BB0 /* 0B72B0 80120BB0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120C58.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120C58.s index ed05e69a1f..1858f36994 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120C58.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120C58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120C58 /* 0B7358 80120C58 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120CE0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120CE0.s index 07d5975355..33a0010325 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120CE0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120CE0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120CE0 /* 0B73E0 80120CE0 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s index 8dc7562b16..92a2146bb4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120DE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120DE4 /* 0B74E4 80120DE4 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s index aec41e9666..c684c770b8 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120F04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120F04 /* 0B7604 80120F04 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s index 3dd0587a04..e7ac2bd8f5 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80120FB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80120FB8 /* 0B76B8 80120FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121140.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121140.s index 2f96f19e40..f4edfd46a7 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121140.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121140.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80121140 /* 0B7840 80121140 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s index cde0771de0..503dccd093 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121CE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80121CE8 /* 0B83E8 80121CE8 27BDFF60 */ addiu $sp, $sp, -0xa0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s index 34a8858557..91cc598aab 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80121EB8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80121EB8 /* 0B85B8 80121EB8 27BDFF60 */ addiu $sp, $sp, -0xa0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s index ab6b127067..cd7af70bcd 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122288.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122288 /* 0B8988 80122288 27BDFF08 */ addiu $sp, $sp, -0xf8 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s index d0d73ea2e4..bd4df5afb0 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122D7C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122D7C /* 0B947C 80122D7C 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DDC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DDC.s index 610a693b9c..4b376a14f0 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DDC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122DDC /* 0B94DC 80122DDC 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s index bbc6a6eb0d..b9dab67093 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122DFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122DFC /* 0B94FC 80122DFC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s index 0e07680575..9e7c064e8b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122E94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122E94 /* 0B9594 80122E94 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s index 6c14c7418d..e2e650d002 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122EE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122EE8 /* 0B95E8 80122EE8 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s index 2d24e60f87..263f395ddf 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F24.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122F24 /* 0B9624 80122F24 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F64.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F64.s index a1fc2ebca5..6f6684f83c 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F64.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80122F64.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80122F64 /* 0B9664 80122F64 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801230B8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801230B8.s index 44398e2999..cad3cdb3ff 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801230B8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801230B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801230B8 /* 0B97B8 801230B8 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123114.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123114.s index 1c82147fb6..69bbf20d94 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123114.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123114.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80123114 /* 0B9814 80123114 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123158.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123158.s index 1d55862e8f..bd87f6dae6 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123158.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123158.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80123158 /* 0B9858 80123158 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012323C.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012323C.s index 2320d1ae65..99a5ebfd2d 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012323C.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012323C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012323C /* 0B993C 8012323C 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123320.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123320.s index 60c9d9ab02..b0144c64c3 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123320.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123320.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80123320 /* 0B9A20 80123320 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123404.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123404.s index 652a3e70c9..c76fd91e79 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123404.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123404.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80123404 /* 0B9B04 80123404 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123470.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123470.s index 267696bf57..1fd57131b9 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123470.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123470.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80123470 /* 0B9B70 80123470 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s index fec7cd40d9..8173b8168b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801234E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801234E0 /* 0B9BE0 801234E0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s index ba9036d426..3105c65f5f 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80123550.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80123550 /* 0B9C50 80123550 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s index 76e90d9545..e2c27bd38b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801235C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801235C0 /* 0B9CC0 801235C0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012363C.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012363C.s index cdc951f88c..94cc52669f 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012363C.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012363C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012363C /* 0B9D3C 8012363C 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80124434.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80124434.s index 99681e2fbe..10e76a5edf 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80124434.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80124434.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80124434 /* 0BAB34 80124434 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80124570.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80124570.s index 6cbb3f2201..e636abb9b1 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80124570.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80124570.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80124570 /* 0BAC70 80124570 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80125C84.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80125C84.s index 666e931fff..356b7384b2 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80125C84.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80125C84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80125C84 /* 0BC384 80125C84 288200F0 */ slti $v0, $a0, 0xf0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801264B0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801264B0.s index 9265f0fbe6..61d1e5fb02 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801264B0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801264B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801264B0 /* 0BCBB0 801264B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s index 98f79a1c30..a3d2ff1f2c 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126790.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80126790 /* 0BCE90 80126790 27BDFF18 */ addiu $sp, $sp, -0xe8 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126EAC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126EAC.s index 68a34b3655..81b8577510 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126EAC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126EAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80126EAC /* 0BD5AC 80126EAC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126F78.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126F78.s index 07399d89a0..f2f97dec4d 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80126F78.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80126F78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80126F78 /* 0BD678 80126F78 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801274C0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801274C0.s index 62b6dcaf85..27188b64bb 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801274C0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801274C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801274C0 /* 0BDBC0 801274C0 3C0A800A */ lui $t2, 0x800a diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127BA4.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127BA4.s index 8c2621e1d3..ce0f505e59 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127BA4.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127BA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80127BA4 /* 0BE2A4 80127BA4 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s index 2a00fad056..7e45cf5230 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80127D90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80127D90 /* 0BE490 80127D90 27BDFEC0 */ addiu $sp, $sp, -0x140 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s index 0a764cfa03..37addcb404 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C2E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012C2E0 /* 0C29E0 8012C2E0 3C04800A */ lui $a0, 0x800a diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C324.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C324.s index 8ec8f395e9..06158f6605 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C324.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C324.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012C324 /* 0C2A24 8012C324 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C9A8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C9A8.s index 4ff14139fb..87323deb4b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C9A8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012C9A8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012C9A8 /* 0C30A8 8012C9A8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012CA08.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012CA08.s index f67810b077..8ce97f1593 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012CA08.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012CA08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012CA08 /* 0C3108 8012CA08 0080502D */ daddu $t2, $a0, $zero diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s index 2849a4d96f..c3ea68a8b8 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012D3DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012D3DC /* 0C3ADC 8012D3DC 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s index b27d36456f..ebfd428727 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012DB58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012DB58 /* 0C4258 8012DB58 27BDFEB0 */ addiu $sp, $sp, -0x150 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s index 5cb55fcfbf..c1cd01e460 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012E9A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012E9A0 /* 0C50A0 8012E9A0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s index 1bee2484de..1c27d66404 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012EC94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012EC94 /* 0C5394 8012EC94 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE10.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE10.s index 94069f6723..98225969d1 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE10.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8012FE10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8012FE10 /* 0C6510 8012FE10 44841000 */ mtc1 $a0, $f2 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801309F0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801309F0.s index b3dafb0b05..07d0db2983 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801309F0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801309F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801309F0 /* 0C70F0 801309F0 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130A04.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130A04.s index dce7c6642c..0674321ad6 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130A04.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130A04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80130A04 /* 0C7104 80130A04 8C830040 */ lw $v1, 0x40($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130ACC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130ACC.s index 87543f2743..5d81fe6b63 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130ACC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130ACC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80130ACC /* 0C71CC 80130ACC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130F70.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130F70.s index 8036840767..a83bab1552 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130F70.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130F70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80130F70 /* 0C7670 80130F70 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130FAC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130FAC.s index 0a063c0787..7ba3b13730 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80130FAC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80130FAC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80130FAC /* 0C76AC 80130FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80131128.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80131128.s index 5a2fed0c1f..203d748717 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80131128.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80131128.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80131128 /* 0C7828 80131128 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80131DD4.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80131DD4.s index df3d14f919..bd5b731901 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80131DD4.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80131DD4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80131DD4 /* 0C84D4 80131DD4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80132E54.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80132E54.s index 872abf4f7c..0b6c9204fd 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80132E54.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80132E54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80132E54 /* 0C9554 80132E54 27BDFEB0 */ addiu $sp, $sp, -0x150 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801341E8.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801341E8.s index 915d9f09f6..3edc0eaa27 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801341E8.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801341E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801341E8 /* 0CA8E8 801341E8 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134230.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80134230.s index 82e6062b9b..014b3eb0f2 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134230.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80134230.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80134230 /* 0CA930 80134230 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134240.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_80134240.s index 5ea6f23927..ab03d25462 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_80134240.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_80134240.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80134240 /* 0CA940 80134240 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013559C.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_8013559C.s index 1125d3bf9c..9b6b153f68 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_8013559C.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_8013559C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013559C /* 0CBC9C 8013559C 8083001A */ lb $v1, 0x1a($a0) diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801356C4.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801356C4.s index 7508b84e56..6d9a90a302 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801356C4.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801356C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801356C4 /* 0CBDC4 801356C4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801356CC.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801356CC.s index 637c347b6d..a526001c8b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801356CC.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801356CC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801356CC /* 0CBDCC 801356CC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801356D4.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801356D4.s index dce7feac65..99abd94bce 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801356D4.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801356D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801356D4 /* 0CBDD4 801356D4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s b/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s index f46f5e142d..5bceab8044 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/func_801363A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801363A0 /* 0CCAA0 801363A0 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_char_width.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_char_width.s index 60f8922e4d..b671164582 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_char_width.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/get_char_width.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_char_width /* 0BC4F4 80125DF4 288200F0 */ slti $v0, $a0, 0xf0 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_item_entity.s index ebd11e14ab..ebc57e2b57 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_item_entity.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/get_item_entity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_item_entity /* 0C7658 80130F58 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_string_properties.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_string_properties.s index 6bb8d46e4f..b5fbcae522 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_string_properties.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/get_string_properties.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_string_properties /* 0BC668 80125F68 27BDFEB0 */ addiu $sp, $sp, -0x150 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/get_string_width.s b/asm/nonmatchings/code_b72b0_len_15ed0/get_string_width.s index 20a9331ca7..fc491806e8 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/get_string_width.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/get_string_width.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_string_width /* 0BCB74 80126474 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s b/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s index c1cb26b8b5..224a6b5fa7 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/init_got_item.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_got_item /* 0C8200 80131B00 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/init_item_entity_list.s b/asm/nonmatchings/code_b72b0_len_15ed0/init_item_entity_list.s index cb4e5872d6..0fbb8e53c6 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/init_item_entity_list.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/init_item_entity_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_item_entity_list /* 0C77CC 801310CC 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/initialize_printer.s b/asm/nonmatchings/code_b72b0_len_15ed0/initialize_printer.s index 692aec595a..a3ca670784 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/initialize_printer.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/initialize_printer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel initialize_printer /* 0BBDA4 801256A4 0000182D */ daddu $v1, $zero, $zero diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_font.s b/asm/nonmatchings/code_b72b0_len_15ed0/load_font.s index 304fda07f1..319b6482e4 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_font.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/load_font.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_font /* 0B9E34 80123734 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_font_data.s b/asm/nonmatchings/code_b72b0_len_15ed0/load_font_data.s index a1c65dfca3..5ae38cc014 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_font_data.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/load_font_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_font_data /* 0B9E08 80123708 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_buffer.s b/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_buffer.s index 727df24205..1d76461228 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_buffer.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_buffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_message_to_buffer /* 0BBF8C 8012588C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_printer.s b/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_printer.s index 78d83176ba..30b9a428d9 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_printer.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/load_message_to_printer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_message_to_printer /* 0BC168 80125A68 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/load_string.s b/asm/nonmatchings/code_b72b0_len_15ed0/load_string.s index 4c2c7388a5..1e7158904a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/load_string.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/load_string.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_string /* 0BC000 80125900 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s index 1cc0b6a772..6a46312ff2 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel make_item_entity /* 0C7AF4 801313F4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_delayed.s b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_delayed.s index 14e4f55e9f..9f10ffbb76 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_delayed.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_delayed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel make_item_entity_delayed /* 0C81C8 80131AC8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_nodelay.s b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_nodelay.s index cf54be9cd2..ebf01038da 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_nodelay.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/make_item_entity_nodelay.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel make_item_entity_nodelay /* 0C8194 80131A94 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_index.s b/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_index.s index 99ecc9f10b..369a572eb6 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_index.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_item_entity_by_index /* 0CA0FC 801339FC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_reference.s b/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_reference.s index 253fb0f2cb..7f996a5e02 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_reference.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/remove_item_entity_by_reference.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel remove_item_entity_by_reference /* 0CA030 80133930 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/render_messages.s b/asm/nonmatchings/code_b72b0_len_15ed0/render_messages.s index 82d36036c6..8194550c6b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/render_messages.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/render_messages.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_messages /* 0BA904 80124204 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_flags.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_flags.s index f731e6a2d1..3a3ee817e6 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_flags.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_item_entity_flags /* 0CA848 80134148 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_position.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_position.s index f5cc5b454b..e04f4ded8e 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_position.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/set_item_entity_position.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_item_entity_position /* 0CA90C 8013420C 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_images.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_message_images.s index b6fa634977..0a523d73a2 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_images.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/set_message_images.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_message_images /* 0BC22C 80125B2C 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_string.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_message_string.s index 807f54ea49..7d271dc8e8 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_string.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/set_message_string.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_message_string /* 0BC23C 80125B3C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_value.s b/asm/nonmatchings/code_b72b0_len_15ed0/set_message_value.s index ecabdfc8d0..5cc5c8b33b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/set_message_value.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/set_message_value.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_message_value /* 0BC2E8 80125BE8 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/stub_item_entity_nodraw.s b/asm/nonmatchings/code_b72b0_len_15ed0/stub_item_entity_nodraw.s index 805fa3c1d4..7ca6da227a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/stub_item_entity_nodraw.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/stub_item_entity_nodraw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel stub_item_entity_nodraw /* 0B97B0 801230B0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/test_item_player_collision.s b/asm/nonmatchings/code_b72b0_len_15ed0/test_item_player_collision.s index a3345ee46c..d5b6ed5d8a 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/test_item_player_collision.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/test_item_player_collision.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel test_item_player_collision /* 0CA20C 80133B0C 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entities.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entities.s index 5d0d18df00..669fb50c6b 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entities.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entities.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_item_entities /* 0C85EC 80131EEC 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_collectable.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_collectable.s index dcb505488a..b910639e68 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_collectable.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_collectable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_item_entity_collectable /* 0CA950 80134250 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_static.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_static.s index 51c887e506..c7b90e9075 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_static.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_static.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_item_entity_static /* 0CBD58 80135658 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s index bb14ba3f8f..3146164d0d 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_item_entity_temp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_item_entity_temp /* 0CBDDC 801356DC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_b72b0_len_15ed0/update_messages.s b/asm/nonmatchings/code_b72b0_len_15ed0/update_messages.s index 63ebc0db0b..6c32137208 100644 --- a/asm/nonmatchings/code_b72b0_len_15ed0/update_messages.s +++ b/asm/nonmatchings/code_b72b0_len_15ed0/update_messages.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_messages /* 0B9ED8 801237D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s index ee1e7d35ed..698a08de81 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80136A80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80136A80 /* 0CD180 80136A80 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s index 44f61113d1..bb7ffe30af 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137D88.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80137D88 /* 0CE488 80137D88 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s index 7fdfe6ea7f..db4dcfd76c 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137DA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80137DA4 /* 0CE4A4 80137DA4 308400FF */ andi $a0, $a0, 0xff diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s index d651cd6ba3..14641ecade 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80137DC0 /* 0CE4C0 80137DC0 10800005 */ beqz $a0, .L80137DD8 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s index 2141a1b519..8dc110980f 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137E10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80137E10 /* 0CE510 80137E10 28820002 */ slti $v0, $a0, 2 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s b/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s index df0a4cf265..4a0c47d7ec 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80137E4C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80137E4C /* 0CE54C 80137E4C 28820002 */ slti $v0, $a0, 2 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s b/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s index d63afd11cb..69b848fcb4 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801380D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801380D4 /* 0CE7D4 801380D4 44850000 */ mtc1 $a1, $f0 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s index c063f5a3bd..e80541c5af 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138108.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80138108 /* 0CE808 80138108 3C048016 */ lui $a0, 0x8016 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s index 636d524f57..d0a38b2985 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80138188 /* 0CE888 80138188 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138198.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138198.s index 833da31f33..7e2727a5bd 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138198.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138198.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80138198 /* 0CE898 80138198 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s b/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s index ec7573c01a..0ca8d51327 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801381A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801381A0 /* 0CE8A0 801381A0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s index 806248a6af..20c73124ee 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138220.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80138220 /* 0CE920 80138220 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s b/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s index edcee84a12..b7c12a6287 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801382AC /* 0CE9AC 801382AC 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s b/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s index 7ce045d316..23d869e100 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801385D4 /* 0CECD4 801385D4 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s index 1d225b045b..3df47171bd 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138740.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80138740 /* 0CEE40 80138740 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s index a7783961be..3f30e7e60d 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138D88.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80138D88 /* 0CF488 80138D88 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s index 47f9bca4d7..77c3b6c020 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80138E54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80138E54 /* 0CF554 80138E54 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s b/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s index 97537d3ff1..57d21a7c6a 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s +++ b/asm/nonmatchings/code_cd180_len_38f0/func_80139F10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80139F10 /* 0D0610 80139F10 0080782D */ daddu $t7, $a0, $zero diff --git a/asm/nonmatchings/code_cd180_len_38f0/set_map_transition_effect.s b/asm/nonmatchings/code_cd180_len_38f0/set_map_transition_effect.s index 485f9c4de6..add24b01b4 100644 --- a/asm/nonmatchings/code_cd180_len_38f0/set_map_transition_effect.s +++ b/asm/nonmatchings/code_cd180_len_38f0/set_map_transition_effect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_map_transition_effect /* 0CE9A0 801382A0 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A370.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A370.s index 3d6826c968..5971d4f992 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A370.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A370.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A370 /* 0D0A70 8013A370 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s index 83ecbe345c..a182124005 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A37C /* 0D0A7C 8013A37C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s index 0c22e6d404..f29c98ab8d 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A4D0 /* 0D0BD0 8013A4D0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s index 59386d06da..1196d5367e 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A610 /* 0D0D10 8013A610 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s index ba9c785e86..37c7bc3015 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A650 /* 0D0D50 8013A650 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s index 3254e3a200..164a365531 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A6E8 /* 0D0DE8 8013A6E8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s index e5c6690ae7..6261be1de7 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A704 /* 0D0E04 8013A704 3C028015 */ lui $v0, 0x8015 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A854.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A854.s index f4c3f64eaf..1e686aea95 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A854.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A854.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A854 /* 0D0F54 8013A854 2C82005A */ sltiu $v0, $a0, 0x5a diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s index 587c218223..e0327f790c 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A93C /* 0D103C 8013A93C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9C8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9C8.s index 17adc1b794..4a39795ff3 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9C8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9C8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A9C8 /* 0D10C8 8013A9C8 AC800064 */ sw $zero, 0x64($a0) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s index 920b5fdf8d..39d9d2d73c 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013A9E8 /* 0D10E8 8013A9E8 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s index cca3309280..2d966d79a0 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013AA9C /* 0D119C 8013AA9C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s index 866c7b11d2..1f00c1174f 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013AF70 /* 0D1670 8013AF70 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s index 0600e5e9cf..f4100f8c6d 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013B0EC /* 0D17EC 8013B0EC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index 4233f3df1e..f043db161a 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013B1B0 /* 0D18B0 8013B1B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s index 04898d2f94..54ed1df3fd 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013BC88 /* 0D2388 8013BC88 0080C02D */ daddu $t8, $a0, $zero diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s index fc25b9011c..78d0f7b515 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013C048 /* 0D2748 8013C048 0080582D */ daddu $t3, $a0, $zero diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s index ca9c4fcf30..b554918b5c 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013C220 /* 0D2920 8013C220 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s index c9342dbf1f..6588fca0ae 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013C3F0 /* 0D2AF0 8013C3F0 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s index 9511ca61a9..d576c55479 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013CFA8 /* 0D36A8 8013CFA8 27BDFFA8 */ addiu $sp, $sp, -0x58 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s index ba2f73a234..6c78770d50 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013DAB4 /* 0D41B4 8013DAB4 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s index b39e765a27..10f437c28c 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013E2F0 /* 0D49F0 8013E2F0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s index c93e73b352..b4d6740ce6 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013E904 /* 0D5004 8013E904 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE48.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE48.s index fc7494bf2e..7c67752812 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE48.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013EE48 /* 0D5548 8013EE48 3C014248 */ lui $at, 0x4248 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s index ab7cdec8cf..c803c4ae7b 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013EE68 /* 0D5568 8013EE68 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s index 87426aade3..0dc9141e76 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013F1F8 /* 0D58F8 8013F1F8 0080382D */ daddu $a3, $a0, $zero diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/clear_icon_flags.s b/asm/nonmatchings/code_d5a50_len_5fd0/clear_icon_flags.s index 54e3edfc76..37f6500fea 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/clear_icon_flags.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/clear_icon_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_icon_flags /* 0DB12C 80144A2C 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s index 5b76c89ed7..0e26b0c9b4 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_icon /* 0D7BA4 801414A4 3C038015 */ lui $v1, 0x8015 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_0.s b/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_0.s index 3534a45cb3..48e791dde9 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_0.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_icon_0 /* 0DAEA8 801447A8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_1.s b/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_1.s index aab2936dde..5be39fa606 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_1.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_icon_1 /* 0DAEC4 801447C4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s index 8f68456951..afbc0702bb 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_menu_icon /* 0DA998 80144298 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s index a80eda71ae..111993e18f 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel free_icon /* 0DAFF4 801448F4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s index 90973acd4b..4e7f65d86e 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013F350 /* 0D5A50 8013F350 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s index b23bfd0356..00f7787a49 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8013F704 /* 0D5E04 8013F704 27BDFF48 */ addiu $sp, $sp, -0xb8 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s index 3beef29e0c..43816be9de 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80141100 /* 0D7800 80141100 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801413F8.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801413F8.s index 9d157c863f..577a24a9c1 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801413F8.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801413F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801413F8 /* 0D7AF8 801413F8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s index accacca683..be41bde559 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80141704 /* 0D7E04 80141704 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s index a8d65ff18d..d2c6635bb3 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80142210 /* 0D8910 80142210 27BDFAB0 */ addiu $sp, $sp, -0x550 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s index cf41b1949d..368a01eb11 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014271C /* 0D8E1C 8014271C 27BDFAB0 */ addiu $sp, $sp, -0x550 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s index 149688dea4..71b41ce018 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80143C48 /* 0DA348 80143C48 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144218.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144218.s index 258a7ff568..80840434c5 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144218.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144218.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144218 /* 0DA918 80144218 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144238.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144238.s index 1dae954803..7075d70dfe 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144238.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144238.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144238 /* 0DA938 80144238 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144258.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144258.s index 69b21a571c..4cc502540f 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144258.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144258.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144258 /* 0DA958 80144258 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144278.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144278.s index c0aff40b03..6c534b61ad 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144278.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144278.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144278 /* 0DA978 80144278 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801447E0.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801447E0.s index 03ddb0ff97..e3a45a1057 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801447E0.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801447E0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801447E0 /* 0DAEE0 801447E0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801449DC.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801449DC.s index b3e92363c2..5cc05f16d0 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801449DC.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801449DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801449DC /* 0DB0DC 801449DC 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s index 9b5f73b85a..56a1d783e0 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144C20 /* 0DB320 80144C20 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EB0.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EB0.s index df80bbda49..6d99746e4e 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EB0.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144EB0 /* 0DB5B0 80144EB0 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EFC.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EFC.s index cc83e2fef1..147ef23751 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EFC.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144EFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144EFC /* 0DB5FC 80144EFC 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s index ba0bfea6f9..4ad2b0382e 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80144FD8 /* 0DB6D8 80144FD8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s index 904ec4cd8c..53aba9a8a5 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80145108 /* 0DB808 80145108 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s index 36170099ea..18f52de44d 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80145184 /* 0DB884 80145184 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s index 6f0c58c2b6..12d9d37831 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801451D4 /* 0DB8D4 801451D4 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s index 9b8448cf38..79c79f796c 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80145224 /* 0DB924 80145224 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s index 90568d5875..86e5adb8d0 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80145274 /* 0DB974 80145274 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s index 4511c3bb09..c2064135d0 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801452B4 /* 0DB9B4 801452B4 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s index 630c42843c..ff3ac61871 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801452E8 /* 0DB9E8 801452E8 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/get_icon_render_pos.s b/asm/nonmatchings/code_d5a50_len_5fd0/get_icon_render_pos.s index 82121158f6..4ab6401718 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/get_icon_render_pos.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/get_icon_render_pos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_icon_render_pos /* 0DB0AC 801449AC 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon.s index f96a5d69a9..45ae361071 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_menu_icon /* 0DAFD4 801448D4 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon_script.s b/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon_script.s index f9533ee753..6c7bafd3c9 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon_script.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_menu_icon_script /* 0DAFB0 801448B0 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s b/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s index b875599eba..8886aaa224 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_menu_icon_list /* 0D7A00 80141300 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s index b262f7c1ca..a806b18cc8 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_menu_icon /* 0D92FC 80142BFC 27BDFCF8 */ addiu $sp, $sp, -0x308 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s index de5a5a5a48..c411092a35 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_menu_icons /* 0D9DB4 801436B4 27BDFAE0 */ addiu $sp, $sp, -0x520 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_flags.s b/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_flags.s index 85eb070be7..8a4f95e3ec 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_flags.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_icon_flags /* 0DB100 80144A00 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_render_pos.s b/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_render_pos.s index d3a57c8342..d2b45bb60f 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_render_pos.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_render_pos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_icon_render_pos /* 0DB084 80144984 2402F7FF */ addiu $v0, $zero, -0x801 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s b/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s index abaf48984f..ec1b5fee97 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_menu_icon_script /* 0DAEFC 801447FC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s b/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s index 54462441a6..12e905bab3 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_menu_icons /* 0D7D10 80141610 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_d610_len_1330/func_80032210.s b/asm/nonmatchings/code_d610_len_1330/func_80032210.s index 2e9a16c858..4ea91bd64e 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80032210.s +++ b/asm/nonmatchings/code_d610_len_1330/func_80032210.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80032210 /* 00D610 80032210 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_d610_len_1330/func_800322DC.s b/asm/nonmatchings/code_d610_len_1330/func_800322DC.s index 4f2c3a60cf..682db12f84 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_800322DC.s +++ b/asm/nonmatchings/code_d610_len_1330/func_800322DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800322DC /* 00D6DC 800322DC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_d610_len_1330/func_800325E4.s b/asm/nonmatchings/code_d610_len_1330/func_800325E4.s index 715a925116..fea87338f8 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_800325E4.s +++ b/asm/nonmatchings/code_d610_len_1330/func_800325E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800325E4 /* 00D9E4 800325E4 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_d610_len_1330/func_800328A4.s b/asm/nonmatchings/code_d610_len_1330/func_800328A4.s index 69a79c2e9a..720fd6b4fb 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_800328A4.s +++ b/asm/nonmatchings/code_d610_len_1330/func_800328A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800328A4 /* 00DCA4 800328A4 44857000 */ mtc1 $a1, $f14 diff --git a/asm/nonmatchings/code_d610_len_1330/func_80032970.s b/asm/nonmatchings/code_d610_len_1330/func_80032970.s index e3711ead59..b6dd994080 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80032970.s +++ b/asm/nonmatchings/code_d610_len_1330/func_80032970.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80032970 /* 00DD70 80032970 44853000 */ mtc1 $a1, $f6 diff --git a/asm/nonmatchings/code_d610_len_1330/func_80032C64.s b/asm/nonmatchings/code_d610_len_1330/func_80032C64.s index 7e8a2261dc..683f32a4cb 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80032C64.s +++ b/asm/nonmatchings/code_d610_len_1330/func_80032C64.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80032C64 /* 00E064 80032C64 27BDFF68 */ addiu $sp, $sp, -0x98 diff --git a/asm/nonmatchings/code_d610_len_1330/func_80033394.s b/asm/nonmatchings/code_d610_len_1330/func_80033394.s index 215a1e3a69..86014fbeac 100644 --- a/asm/nonmatchings/code_d610_len_1330/func_80033394.s +++ b/asm/nonmatchings/code_d610_len_1330/func_80033394.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033394 /* 00E794 80033394 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_d610_len_1330/get_game_mode.s b/asm/nonmatchings/code_d610_len_1330/get_game_mode.s index cbc1f68a08..9dfdf97de5 100644 --- a/asm/nonmatchings/code_d610_len_1330/get_game_mode.s +++ b/asm/nonmatchings/code_d610_len_1330/get_game_mode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_game_mode /* 00E928 80033528 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_d610_len_1330/set_game_mode.s b/asm/nonmatchings/code_d610_len_1330/set_game_mode.s index 0f840bde96..9919c2c53f 100644 --- a/asm/nonmatchings/code_d610_len_1330/set_game_mode.s +++ b/asm/nonmatchings/code_d610_len_1330/set_game_mode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_game_mode /* 00E8F0 800334F0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_dba20_len_350/clear_area_flag.s b/asm/nonmatchings/code_dba20_len_350/clear_area_flag.s index 246db7e2f0..399ad85b41 100644 --- a/asm/nonmatchings/code_dba20_len_350/clear_area_flag.s +++ b/asm/nonmatchings/code_dba20_len_350/clear_area_flag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_area_flag /* 0DBC4C 8014554C 04810002 */ bgez $a0, .L80145558 diff --git a/asm/nonmatchings/code_dba20_len_350/clear_area_flags.s b/asm/nonmatchings/code_dba20_len_350/clear_area_flags.s index 68963d8c8d..a22a7fdd91 100644 --- a/asm/nonmatchings/code_dba20_len_350/clear_area_flags.s +++ b/asm/nonmatchings/code_dba20_len_350/clear_area_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_area_flags /* 0DBA90 80145390 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_dba20_len_350/clear_global_flag.s b/asm/nonmatchings/code_dba20_len_350/clear_global_flag.s index 56da2770af..0754164162 100644 --- a/asm/nonmatchings/code_dba20_len_350/clear_global_flag.s +++ b/asm/nonmatchings/code_dba20_len_350/clear_global_flag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_global_flag /* 0DBAE0 801453E0 3C02F8D8 */ lui $v0, 0xf8d8 diff --git a/asm/nonmatchings/code_dba20_len_350/clear_saved_variables.s b/asm/nonmatchings/code_dba20_len_350/clear_saved_variables.s index 119a63589d..3e57a3bab7 100644 --- a/asm/nonmatchings/code_dba20_len_350/clear_saved_variables.s +++ b/asm/nonmatchings/code_dba20_len_350/clear_saved_variables.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_saved_variables /* 0DBA20 80145320 2402003F */ addiu $v0, $zero, 0x3f diff --git a/asm/nonmatchings/code_dba20_len_350/get_area_byte.s b/asm/nonmatchings/code_dba20_len_350/get_area_byte.s index 91a21f2498..e0546bd6eb 100644 --- a/asm/nonmatchings/code_dba20_len_350/get_area_byte.s +++ b/asm/nonmatchings/code_dba20_len_350/get_area_byte.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_area_byte /* 0DBD50 80145650 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_dba20_len_350/get_area_flag.s b/asm/nonmatchings/code_dba20_len_350/get_area_flag.s index 0dc44b9c2d..cb334c5c93 100644 --- a/asm/nonmatchings/code_dba20_len_350/get_area_flag.s +++ b/asm/nonmatchings/code_dba20_len_350/get_area_flag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_area_flag /* 0DBCF0 801455F0 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/code_dba20_len_350/get_global_byte.s b/asm/nonmatchings/code_dba20_len_350/get_global_byte.s index 755d7b3501..83900ec067 100644 --- a/asm/nonmatchings/code_dba20_len_350/get_global_byte.s +++ b/asm/nonmatchings/code_dba20_len_350/get_global_byte.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_global_byte /* 0DBC38 80145538 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_dba20_len_350/get_global_flag.s b/asm/nonmatchings/code_dba20_len_350/get_global_flag.s index 24c684a786..cb4bea4c5d 100644 --- a/asm/nonmatchings/code_dba20_len_350/get_global_flag.s +++ b/asm/nonmatchings/code_dba20_len_350/get_global_flag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_global_flag /* 0DBBBC 801454BC 0080282D */ daddu $a1, $a0, $zero diff --git a/asm/nonmatchings/code_dba20_len_350/set_area_byte.s b/asm/nonmatchings/code_dba20_len_350/set_area_byte.s index a16c9efcc9..0d53dc2238 100644 --- a/asm/nonmatchings/code_dba20_len_350/set_area_byte.s +++ b/asm/nonmatchings/code_dba20_len_350/set_area_byte.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_area_byte /* 0DBD38 80145638 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_dba20_len_350/set_area_flag.s b/asm/nonmatchings/code_dba20_len_350/set_area_flag.s index 48af528c2d..80a09ca210 100644 --- a/asm/nonmatchings/code_dba20_len_350/set_area_flag.s +++ b/asm/nonmatchings/code_dba20_len_350/set_area_flag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_area_flag /* 0DBCA0 801455A0 04810002 */ bgez $a0, .L801455AC diff --git a/asm/nonmatchings/code_dba20_len_350/set_global_byte.s b/asm/nonmatchings/code_dba20_len_350/set_global_byte.s index fa2d5e7cff..5c8a96b50c 100644 --- a/asm/nonmatchings/code_dba20_len_350/set_global_byte.s +++ b/asm/nonmatchings/code_dba20_len_350/set_global_byte.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_global_byte /* 0DBC20 80145520 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/code_dba20_len_350/set_global_flag.s b/asm/nonmatchings/code_dba20_len_350/set_global_flag.s index 6060c77b1c..f3e9933478 100644 --- a/asm/nonmatchings/code_dba20_len_350/set_global_flag.s +++ b/asm/nonmatchings/code_dba20_len_350/set_global_flag.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_global_flag /* 0DBB50 80145450 3C02F8D8 */ lui $v0, 0xf8d8 diff --git a/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s b/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s index b39a337d0a..5d9d90562c 100644 --- a/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s +++ b/asm/nonmatchings/code_dbd70_len_700/clear_trigger_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_trigger_data /* 0DBD80 80145680 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s index 6a430ec305..2431ef1959 100644 --- a/asm/nonmatchings/code_dbd70_len_700/create_trigger.s +++ b/asm/nonmatchings/code_dbd70_len_700/create_trigger.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel create_trigger /* 0DBE6C 8014576C 3C038016 */ lui $v1, 0x8016 diff --git a/asm/nonmatchings/code_dbd70_len_700/default_trigger_function_handler.s b/asm/nonmatchings/code_dbd70_len_700/default_trigger_function_handler.s index cc693cc036..4baa3fd3cd 100644 --- a/asm/nonmatchings/code_dbd70_len_700/default_trigger_function_handler.s +++ b/asm/nonmatchings/code_dbd70_len_700/default_trigger_function_handler.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel default_trigger_function_handler /* 0DBD70 80145670 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/code_dbd70_len_700/delete_trigger.s b/asm/nonmatchings/code_dbd70_len_700/delete_trigger.s index 110ff4e14c..f834eda7d1 100644 --- a/asm/nonmatchings/code_dbd70_len_700/delete_trigger.s +++ b/asm/nonmatchings/code_dbd70_len_700/delete_trigger.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel delete_trigger /* 0DC2F4 80145BF4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_dbd70_len_700/func_80145CE8.s b/asm/nonmatchings/code_dbd70_len_700/func_80145CE8.s index 0aae6d1325..aa6b7517e9 100644 --- a/asm/nonmatchings/code_dbd70_len_700/func_80145CE8.s +++ b/asm/nonmatchings/code_dbd70_len_700/func_80145CE8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80145CE8 /* 0DC3E8 80145CE8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_dbd70_len_700/get_trigger_by_id.s b/asm/nonmatchings/code_dbd70_len_700/get_trigger_by_id.s index 730f7c6e08..0001190631 100644 --- a/asm/nonmatchings/code_dbd70_len_700/get_trigger_by_id.s +++ b/asm/nonmatchings/code_dbd70_len_700/get_trigger_by_id.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_trigger_by_id /* 0DC3D0 80145CD0 3C028016 */ lui $v0, 0x8016 diff --git a/asm/nonmatchings/code_dbd70_len_700/init_trigger_list.s b/asm/nonmatchings/code_dbd70_len_700/init_trigger_list.s index 82410c5324..643ae9acd7 100644 --- a/asm/nonmatchings/code_dbd70_len_700/init_trigger_list.s +++ b/asm/nonmatchings/code_dbd70_len_700/init_trigger_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_trigger_list /* 0DBE28 80145728 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s b/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s index 4c1505f40e..789783232c 100644 --- a/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s +++ b/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel is_trigger_bound /* 0DC36C 80145C6C 0000402D */ daddu $t0, $zero, $zero diff --git a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s index cf638250c6..3bf2cd085b 100644 --- a/asm/nonmatchings/code_dbd70_len_700/update_triggers.s +++ b/asm/nonmatchings/code_dbd70_len_700/update_triggers.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_triggers /* 0DBF60 80145860 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s index b8fe985b95..85f40e5aea 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s +++ b/asm/nonmatchings/code_dc470_len_14c0/func_80145EC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80145EC0 /* 0DC5C0 80145EC0 27BDFF48 */ addiu $sp, $sp, -0xb8 diff --git a/asm/nonmatchings/code_dc470_len_14c0/load_map_bg.s b/asm/nonmatchings/code_dc470_len_14c0/load_map_bg.s index 8491baf32e..6e3b92dec3 100644 --- a/asm/nonmatchings/code_dc470_len_14c0/load_map_bg.s +++ b/asm/nonmatchings/code_dc470_len_14c0/load_map_bg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_map_bg /* 0DC470 80145D70 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_801473F0.s b/asm/nonmatchings/code_ddaf0_len_c50/func_801473F0.s index 5636cafc7c..518ef73012 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_801473F0.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_801473F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801473F0 /* 0DDAF0 801473F0 3C038016 */ lui $v1, 0x8016 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s index e83ffe8ef9..f8e5ca5703 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147414.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147414 /* 0DDB14 80147414 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s index 5d2693d250..a881acf3b4 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147698.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147698 /* 0DDD98 80147698 27BDFF10 */ addiu $sp, $sp, -0xf0 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s index 872429fe4c..adaf7257f4 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147AC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147AC4 /* 0DE1C4 80147AC4 27BDFED0 */ addiu $sp, $sp, -0x130 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147CC8.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147CC8.s index 42a582c237..92e9c7560a 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147CC8.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147CC8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147CC8 /* 0DE3C8 80147CC8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s index ad8723820b..27d6b31da5 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147D70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147D70 /* 0DE470 80147D70 30A200FF */ andi $v0, $a1, 0xff diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s index 05da7dbdfe..1733401d38 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E48.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147E48 /* 0DE548 80147E48 3C028016 */ lui $v0, 0x8016 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s index 9383b05e0f..af0cc4c35f 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147E7C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147E7C /* 0DE57C 80147E7C 3C028016 */ lui $v0, 0x8016 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s index 1dc5f89fb8..360524219a 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147EC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147EC4 /* 0DE5C4 80147EC4 3C068016 */ lui $a2, 0x8016 diff --git a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s index 2a96bf4168..2c236178ee 100644 --- a/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s +++ b/asm/nonmatchings/code_ddaf0_len_c50/func_80147F30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80147F30 /* 0DE630 80147F30 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_de740_len_23f0/_play_sound.s b/asm/nonmatchings/code_de740_len_23f0/_play_sound.s index a5b2678532..ce705a3db2 100644 --- a/asm/nonmatchings/code_de740_len_23f0/_play_sound.s +++ b/asm/nonmatchings/code_de740_len_23f0/_play_sound.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _play_sound /* 0E01B8 80149AB8 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80148040.s b/asm/nonmatchings/code_de740_len_23f0/func_80148040.s index ef8aae8018..54aeaf8793 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80148040.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80148040.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80148040 /* 0DE740 80148040 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s b/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s index 3f5a825bc2..69212fa159 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801480F0 /* 0DE7F0 801480F0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s b/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s index ceb144e2cf..3c4b473bc6 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801481C4 /* 0DE8C4 801481C4 27BDFF08 */ addiu $sp, $sp, -0xf8 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s b/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s index 74c5ce7f00..3d39a6b658 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801489B8 /* 0DF0B8 801489B8 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s index b89bf917d8..9b1c54ed5f 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801491E4 /* 0DF8E4 801491E4 3C06800A */ lui $a2, 0x800a diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149250.s b/asm/nonmatchings/code_de740_len_23f0/func_80149250.s index b174fd18c8..61654effe8 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149250.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149250.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149250 /* 0DF950 80149250 44860000 */ mtc1 $a2, $f0 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149600.s b/asm/nonmatchings/code_de740_len_23f0/func_80149600.s index 5825bdf492..f26f6f6de3 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149600.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149600.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149600 /* 0DFD00 80149600 3C018015 */ lui $at, 0x8015 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149618.s b/asm/nonmatchings/code_de740_len_23f0/func_80149618.s index d7c4410808..984646af76 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149618.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149618.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149618 /* 0DFD18 80149618 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149670.s b/asm/nonmatchings/code_de740_len_23f0/func_80149670.s index 2e0dd6f5a2..da6d9a9d6a 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149670.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149670.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149670 /* 0DFD70 80149670 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149734.s b/asm/nonmatchings/code_de740_len_23f0/func_80149734.s index b9a9747b0d..8615f2a277 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149734.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149734.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149734 /* 0DFE34 80149734 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801497FC.s b/asm/nonmatchings/code_de740_len_23f0/func_801497FC.s index 88e85032c7..64927799b1 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801497FC.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801497FC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801497FC /* 0DFEFC 801497FC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149828.s b/asm/nonmatchings/code_de740_len_23f0/func_80149828.s index 1a1506f486..07a1445469 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149828.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149828.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149828 /* 0DFF28 80149828 3C028016 */ lui $v0, 0x8016 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149838.s b/asm/nonmatchings/code_de740_len_23f0/func_80149838.s index 9cd84e4610..4109707b09 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149838.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149838.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149838 /* 0DFF38 80149838 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801498C4.s b/asm/nonmatchings/code_de740_len_23f0/func_801498C4.s index da379f1b1a..f1918a6b44 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801498C4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801498C4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_801498C4 /* 0DFFC4 801498C4 3C038016 */ lui $v1, 0x8016 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149908.s b/asm/nonmatchings/code_de740_len_23f0/func_80149908.s index 6c0ec205fa..c8ccee26a2 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149908.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149908.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149908 /* 0E0008 80149908 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149974.s b/asm/nonmatchings/code_de740_len_23f0/func_80149974.s index 8fb2ca181f..5a336a70c6 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149974.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149974.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149974 /* 0E0074 80149974 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s b/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s index e6b0365af8..a1f19f3c5e 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149A6C /* 0E016C 80149A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s b/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s index 4ed0834f1f..ec823a5ff9 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149E04 /* 0E0504 80149E04 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s b/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s index 654f236716..6011580586 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80149F58 /* 0E0658 80149F58 44860000 */ mtc1 $a2, $f0 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s b/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s index f9d6c6c7e4..269f318f76 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014A1B4 /* 0E08B4 8014A1B4 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_de740_len_23f0/play_sound.s b/asm/nonmatchings/code_de740_len_23f0/play_sound.s index 7c249b4aa6..34ab85b2dc 100644 --- a/asm/nonmatchings/code_de740_len_23f0/play_sound.s +++ b/asm/nonmatchings/code_de740_len_23f0/play_sound.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_sound /* 0E03B4 80149CB4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_npc.s b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_npc.s index 86fbbed480..9fc1bf9b01 100644 --- a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_npc.s +++ b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_npc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_sound_at_npc /* 0E0408 80149D08 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_player.s b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_player.s index b8beb75887..abcd1f510d 100644 --- a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_player.s +++ b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_sound_at_player /* 0E03D8 80149CD8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s index 55b8189032..5e94f67f8c 100644 --- a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s +++ b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel play_sound_at_position /* 0E045C 80149D5C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_de740_len_23f0/stop_sound.s b/asm/nonmatchings/code_de740_len_23f0/stop_sound.s index 0fb6845211..0eb04d8aa2 100644 --- a/asm/nonmatchings/code_de740_len_23f0/stop_sound.s +++ b/asm/nonmatchings/code_de740_len_23f0/stop_sound.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel stop_sound /* 0E036C 80149C6C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s b/asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s index e0ab4cc5c9..dd233cc91e 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s +++ b/asm/nonmatchings/code_e0b30_len_b80/_set_music_track.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _set_music_track /* 0E0EE0 8014A7E0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s index fee9b8e780..379acb828b 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A498.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014A498 /* 0E0B98 8014A498 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A52C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A52C.s index 16b00224ec..e21891a187 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A52C.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A52C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014A52C /* 0E0C2C 8014A52C 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s index 31d9bbd4b7..81a6df087b 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014A548 /* 0E0C48 8014A548 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s index 08b2ee7ebf..44fca2704f 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A964.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014A964 /* 0E1064 8014A964 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s index ecf70a03ce..2942731003 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AA54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AA54 /* 0E1154 8014AA54 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s index 4cec26efd5..fd6ffee5e6 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AB0C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AB0C /* 0E120C 8014AB0C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s index 8681e01b70..e1d2b944c1 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC08.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AC08 /* 0E1308 8014AC08 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s index fa90dcdab7..d19d71469e 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC5C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AC5C /* 0E135C 8014AC5C 24020004 */ addiu $v0, $zero, 4 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s index d2d3e56843..1852fdd644 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AC70 /* 0E1370 8014AC70 24020008 */ addiu $v0, $zero, 8 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s index 12e36ae219..54c21e66b1 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC84.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AC84 /* 0E1384 8014AC84 3C018016 */ lui $at, 0x8016 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s index ee41da5757..456cbe536b 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AC94 /* 0E1394 8014AC94 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s index 8e1ab85ab0..c765978422 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014ADA4 /* 0E14A4 8014ADA4 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s index e94c2cff7f..2dd851a95c 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014ADF8 /* 0E14F8 8014ADF8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s index 9656e66d2f..c1dbe3f310 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AE6C /* 0E156C 8014AE6C 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s index 839a848b73..cca46b2744 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AEF8 /* 0E15F8 8014AEF8 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s index e4f7cfe983..33d2188d53 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AF8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8014AF8C /* 0E168C 8014AF8C 3C028016 */ lui $v0, 0x8016 diff --git a/asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s b/asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s index c8af1e904a..31e623ddc8 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s +++ b/asm/nonmatchings/code_e0b30_len_b80/get_default_variation_for_song.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_default_variation_for_song /* 0E0B30 8014A430 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_e0b30_len_b80/set_music_track.s b/asm/nonmatchings/code_e0b30_len_b80/set_music_track.s index 93da1d577b..cada1e397f 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/set_music_track.s +++ b/asm/nonmatchings/code_e0b30_len_b80/set_music_track.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_music_track /* 0E1018 8014A918 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e20eb0/func_802B7000.s b/asm/nonmatchings/code_e20eb0/func_802B7000.s index 7b628189a4..60a38959e2 100644 --- a/asm/nonmatchings/code_e20eb0/func_802B7000.s +++ b/asm/nonmatchings/code_e20eb0/func_802B7000.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802B7000 /* E20EB0 802B7000 3C014387 */ lui $at, 0x4387 diff --git a/asm/nonmatchings/code_e20eb0/func_802B70B4.s b/asm/nonmatchings/code_e20eb0/func_802B70B4.s index e6183c6341..563f1f5e61 100644 --- a/asm/nonmatchings/code_e20eb0/func_802B70B4.s +++ b/asm/nonmatchings/code_e20eb0/func_802B70B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802B70B4 /* E20F64 802B70B4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e20eb0/func_802B71C8.s b/asm/nonmatchings/code_e20eb0/func_802B71C8.s index e895482012..e8c244d31f 100644 --- a/asm/nonmatchings/code_e20eb0/func_802B71C8.s +++ b/asm/nonmatchings/code_e20eb0/func_802B71C8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802B71C8 /* E21078 802B71C8 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_e20eb0/func_802B742C.s b/asm/nonmatchings/code_e20eb0/func_802B742C.s index 5be3817783..9aed3adce1 100644 --- a/asm/nonmatchings/code_e20eb0/func_802B742C.s +++ b/asm/nonmatchings/code_e20eb0/func_802B742C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802B742C /* E212DC 802B742C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e79b0_len_1920/bind_trigger.s b/asm/nonmatchings/code_e79b0_len_1920/bind_trigger.s index bd09b6ea16..7058d9718c 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/bind_trigger.s +++ b/asm/nonmatchings/code_e79b0_len_1920/bind_trigger.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_trigger /* 0E8BD0 802C4220 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_e79b0_len_1920/bind_trigger_1.s b/asm/nonmatchings/code_e79b0_len_1920/bind_trigger_1.s index 53a84abb45..bd7a8cc107 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/bind_trigger_1.s +++ b/asm/nonmatchings/code_e79b0_len_1920/bind_trigger_1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bind_trigger_1 /* 0E8C58 802C42A8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e79b0_len_1920/clear_script_flags.s b/asm/nonmatchings/code_e79b0_len_1920/clear_script_flags.s index aff2d45eca..83bce91b6c 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/clear_script_flags.s +++ b/asm/nonmatchings/code_e79b0_len_1920/clear_script_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_script_flags /* 0E9230 802C4880 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/clear_script_list.s b/asm/nonmatchings/code_e79b0_len_1920/clear_script_list.s index f81bab5d1b..7a37ee670d 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/clear_script_list.s +++ b/asm/nonmatchings/code_e79b0_len_1920/clear_script_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel clear_script_list /* 0E7B8C 802C31DC 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_e79b0_len_1920/does_script_exist.s b/asm/nonmatchings/code_e79b0_len_1920/does_script_exist.s index 13e11c0bf6..a139b48c0c 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/does_script_exist.s +++ b/asm/nonmatchings/code_e79b0_len_1920/does_script_exist.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel does_script_exist /* 0E8B14 802C4164 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_e79b0_len_1920/does_script_exist_by_ref.s b/asm/nonmatchings/code_e79b0_len_1920/does_script_exist_by_ref.s index f3c5e7caa6..eea0be9e36 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/does_script_exist_by_ref.s +++ b/asm/nonmatchings/code_e79b0_len_1920/does_script_exist_by_ref.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel does_script_exist_by_ref /* 0E8B54 802C41A4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_e79b0_len_1920/find_script_labels.s b/asm/nonmatchings/code_e79b0_len_1920/find_script_labels.s index 708ac5da7d..02c12137c2 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/find_script_labels.s +++ b/asm/nonmatchings/code_e79b0_len_1920/find_script_labels.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel find_script_labels /* 0E7AF8 802C3148 0000182D */ daddu $v1, $zero, $zero diff --git a/asm/nonmatchings/code_e79b0_len_1920/func_802C3390.s b/asm/nonmatchings/code_e79b0_len_1920/func_802C3390.s index d8e18a654d..1b32d65558 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/func_802C3390.s +++ b/asm/nonmatchings/code_e79b0_len_1920/func_802C3390.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C3390 /* 0E7D40 802C3390 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s b/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s index cf7920624c..dec2619782 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s +++ b/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C39F8 /* 0E83A8 802C39F8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s b/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s index 164df6d419..e3a1501ef3 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s +++ b/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C3EE4 /* 0E8894 802C3EE4 3C02802E */ lui $v0, 0x802e diff --git a/asm/nonmatchings/code_e79b0_len_1920/get_global_timespace.s b/asm/nonmatchings/code_e79b0_len_1920/get_global_timespace.s index 3f12206fca..26fe74b081 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/get_global_timespace.s +++ b/asm/nonmatchings/code_e79b0_len_1920/get_global_timespace.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_global_timespace /* 0E8BBC 802C420C 3C01802E */ lui $at, 0x802e diff --git a/asm/nonmatchings/code_e79b0_len_1920/get_script_by_id.s b/asm/nonmatchings/code_e79b0_len_1920/get_script_by_id.s index 73954e8e1c..9e79481109 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/get_script_by_id.s +++ b/asm/nonmatchings/code_e79b0_len_1920/get_script_by_id.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_script_by_id /* 0E9158 802C47A8 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_e79b0_len_1920/get_script_by_index.s b/asm/nonmatchings/code_e79b0_len_1920/get_script_by_index.s index ca90a13099..1d4d5a1af1 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/get_script_by_index.s +++ b/asm/nonmatchings/code_e79b0_len_1920/get_script_by_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_script_by_index /* 0E9140 802C4790 3C02802E */ lui $v0, 0x802e diff --git a/asm/nonmatchings/code_e79b0_len_1920/init_script_list.s b/asm/nonmatchings/code_e79b0_len_1920/init_script_list.s index 926260b74f..fe542601ed 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/init_script_list.s +++ b/asm/nonmatchings/code_e79b0_len_1920/init_script_list.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel init_script_list /* 0E7C9C 802C32EC 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_e79b0_len_1920/kill_all_scripts.s b/asm/nonmatchings/code_e79b0_len_1920/kill_all_scripts.s index 5d944f1d2e..59d1c542ae 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/kill_all_scripts.s +++ b/asm/nonmatchings/code_e79b0_len_1920/kill_all_scripts.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel kill_all_scripts /* 0E8AC4 802C4114 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e79b0_len_1920/kill_script.s b/asm/nonmatchings/code_e79b0_len_1920/kill_script.s index 407ec030e1..48ab63400d 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/kill_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/kill_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel kill_script /* 0E88EC 802C3F3C 3C03802E */ lui $v1, 0x802e diff --git a/asm/nonmatchings/code_e79b0_len_1920/kill_script_by_ID.s b/asm/nonmatchings/code_e79b0_len_1920/kill_script_by_ID.s index 5d89963749..05d2f2b48b 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/kill_script_by_ID.s +++ b/asm/nonmatchings/code_e79b0_len_1920/kill_script_by_ID.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel kill_script_by_ID /* 0E8A5C 802C40AC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/restart_script.s b/asm/nonmatchings/code_e79b0_len_1920/restart_script.s index 1d7503e5c1..ed639326ed 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/restart_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/restart_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel restart_script /* 0E86B4 802C3D04 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e79b0_len_1920/resume_all_group.s b/asm/nonmatchings/code_e79b0_len_1920/resume_all_group.s index fb7959c69c..d16a7958d3 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/resume_all_group.s +++ b/asm/nonmatchings/code_e79b0_len_1920/resume_all_group.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel resume_all_group /* 0E8FF8 802C4648 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/resume_all_script.s b/asm/nonmatchings/code_e79b0_len_1920/resume_all_script.s index b2c842b61e..1c17dc1062 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/resume_all_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/resume_all_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel resume_all_script /* 0E8E3C 802C448C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/resume_group_others.s b/asm/nonmatchings/code_e79b0_len_1920/resume_group_others.s index 66d514efd9..d7a7f9e1a4 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/resume_group_others.s +++ b/asm/nonmatchings/code_e79b0_len_1920/resume_group_others.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel resume_group_others /* 0E90CC 802C471C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/resume_group_script.s b/asm/nonmatchings/code_e79b0_len_1920/resume_group_script.s index dc0335fb61..29cd8157a4 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/resume_group_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/resume_group_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel resume_group_script /* 0E8D2C 802C437C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/resume_group_script_index.s b/asm/nonmatchings/code_e79b0_len_1920/resume_group_script_index.s index 62cad1bc84..9c0f2eec4c 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/resume_group_script_index.s +++ b/asm/nonmatchings/code_e79b0_len_1920/resume_group_script_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel resume_group_script_index /* 0E8F20 802C4570 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/set_global_timespace.s b/asm/nonmatchings/code_e79b0_len_1920/set_global_timespace.s index 885581ffa8..2aa6b2d195 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/set_global_timespace.s +++ b/asm/nonmatchings/code_e79b0_len_1920/set_global_timespace.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_global_timespace /* 0E8BB0 802C4200 3C01802E */ lui $at, 0x802e diff --git a/asm/nonmatchings/code_e79b0_len_1920/set_script_flags.s b/asm/nonmatchings/code_e79b0_len_1920/set_script_flags.s index f4a3e4adf3..f676bac13c 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/set_script_flags.s +++ b/asm/nonmatchings/code_e79b0_len_1920/set_script_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_script_flags /* 0E9198 802C47E8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/set_script_group.s b/asm/nonmatchings/code_e79b0_len_1920/set_script_group.s index ec942fd61f..da0ea1ffd6 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/set_script_group.s +++ b/asm/nonmatchings/code_e79b0_len_1920/set_script_group.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_script_group /* 0E8BC8 802C4218 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_e79b0_len_1920/set_script_priority.s b/asm/nonmatchings/code_e79b0_len_1920/set_script_priority.s index 5b614f8c32..e022600d07 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/set_script_priority.s +++ b/asm/nonmatchings/code_e79b0_len_1920/set_script_priority.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_script_priority /* 0E8B88 802C41D8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_e79b0_len_1920/set_script_timescale.s b/asm/nonmatchings/code_e79b0_len_1920/set_script_timescale.s index 3fe83c00af..14ea4397bf 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/set_script_timescale.s +++ b/asm/nonmatchings/code_e79b0_len_1920/set_script_timescale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_script_timescale /* 0E8B90 802C41E0 3C01802E */ lui $at, 0x802e diff --git a/asm/nonmatchings/code_e79b0_len_1920/sort_scripts.s b/asm/nonmatchings/code_e79b0_len_1920/sort_scripts.s index 9cd86e472f..c0af14d653 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/sort_scripts.s +++ b/asm/nonmatchings/code_e79b0_len_1920/sort_scripts.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sort_scripts /* 0E79B0 802C3000 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s index 071838f818..ee8ce9f34f 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_child_script /* 0E8178 802C37C8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_script.s b/asm/nonmatchings/code_e79b0_len_1920/start_script.s index 2be5ae1437..2cdfbd732d 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_script /* 0E7D90 802C33E0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s b/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s index 052eefde9b..cea7229f47 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s +++ b/asm/nonmatchings/code_e79b0_len_1920/start_script_in_group.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel start_script_in_group /* 0E7F80 802C35D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_e79b0_len_1920/suspend_all_group.s b/asm/nonmatchings/code_e79b0_len_1920/suspend_all_group.s index b731b0b7ac..bc0d6670ba 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/suspend_all_group.s +++ b/asm/nonmatchings/code_e79b0_len_1920/suspend_all_group.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel suspend_all_group /* 0E8F98 802C45E8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/suspend_all_script.s b/asm/nonmatchings/code_e79b0_len_1920/suspend_all_script.s index c6fa17cb9f..1c7bc99de8 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/suspend_all_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/suspend_all_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel suspend_all_script /* 0E8DD0 802C4420 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/suspend_group_others.s b/asm/nonmatchings/code_e79b0_len_1920/suspend_group_others.s index 93ce339208..85ace0f352 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/suspend_group_others.s +++ b/asm/nonmatchings/code_e79b0_len_1920/suspend_group_others.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel suspend_group_others /* 0E9058 802C46A8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script.s b/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script.s index de05f110f9..402f4e73c7 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script.s +++ b/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel suspend_group_script /* 0E8C88 802C42D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script_index.s b/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script_index.s index 57c3004838..1977ca53c5 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script_index.s +++ b/asm/nonmatchings/code_e79b0_len_1920/suspend_group_script_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel suspend_group_script_index /* 0E8EA8 802C44F8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s b/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s index 78bf607f4e..fdd86c2b00 100644 --- a/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s +++ b/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_scripts /* 0E8724 802C3D74 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/DeleteTrigger.s b/asm/nonmatchings/code_e92d0_len_5da0/DeleteTrigger.s index ca36b262b4..f42afc3320 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/DeleteTrigger.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/DeleteTrigger.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DeleteTrigger /* 0EB1D4 802C6824 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/EnableGroup.s b/asm/nonmatchings/code_e92d0_len_5da0/EnableGroup.s index ed9941b3ef..8b0342e9d0 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/EnableGroup.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/EnableGroup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableGroup /* 0EE548 802C9B98 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/EnableModel.s b/asm/nonmatchings/code_e92d0_len_5da0/EnableModel.s index e16fef8ccb..359a225eed 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/EnableModel.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/EnableModel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableModel /* 0EDC38 802C9288 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/EnableTexPanning.s b/asm/nonmatchings/code_e92d0_len_5da0/EnableTexPanning.s index 45b9f79f0e..bf03cf2e9e 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/EnableTexPanning.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/EnableTexPanning.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableTexPanning /* 0EDBB8 802C9208 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/GetColliderCenter.s b/asm/nonmatchings/code_e92d0_len_5da0/GetColliderCenter.s index 48353ed69e..3be829c002 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/GetColliderCenter.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/GetColliderCenter.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetColliderCenter /* 0EEA5C 802CA0AC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/GetEntryID.s b/asm/nonmatchings/code_e92d0_len_5da0/GetEntryID.s index c6331bf521..d5df153f89 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/GetEntryID.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/GetEntryID.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetEntryID /* 0EEE10 802CA460 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/GetLoadType.s b/asm/nonmatchings/code_e92d0_len_5da0/GetLoadType.s index 3e0c28570e..1e6b3ccbee 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/GetLoadType.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/GetLoadType.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetLoadType /* 0EEE70 802CA4C0 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/GetModelCenter.s b/asm/nonmatchings/code_e92d0_len_5da0/GetModelCenter.s index 859c546418..942b0f1188 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/GetModelCenter.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/GetModelCenter.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetModelCenter /* 0ED930 802C8F80 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/GetModelIndex.s b/asm/nonmatchings/code_e92d0_len_5da0/GetModelIndex.s index e032a68f7f..1bcf5d402a 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/GetModelIndex.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/GetModelIndex.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetModelIndex /* 0ED83C 802C8E8C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/ModifyColliderFlags.s b/asm/nonmatchings/code_e92d0_len_5da0/ModifyColliderFlags.s index 9ac9e430d1..5c1217900b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/ModifyColliderFlags.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/ModifyColliderFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ModifyColliderFlags /* 0EE77C 802C9DCC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/ParentColliderToModel.s b/asm/nonmatchings/code_e92d0_len_5da0/ParentColliderToModel.s index 23947e599d..9b5142530b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/ParentColliderToModel.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/ParentColliderToModel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ParentColliderToModel /* 0EEAC4 802CA114 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtCollider.s b/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtCollider.s index 34e0413fec..01da0dcfaf 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtCollider.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtCollider.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlaySoundAtCollider /* 0EEFC4 802CA614 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtModel.s b/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtModel.s index ec49c6ac3f..4fd064b524 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtModel.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/PlaySoundAtModel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlaySoundAtModel /* 0EEF08 802CA558 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/ResetFromLava.s b/asm/nonmatchings/code_e92d0_len_5da0/ResetFromLava.s index 6695acbc68..5093cfd63a 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/ResetFromLava.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/ResetFromLava.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ResetFromLava /* 0EE888 802C9ED8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/RotateGroup.s b/asm/nonmatchings/code_e92d0_len_5da0/RotateGroup.s index b7b51b195e..9602d4d5e8 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/RotateGroup.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/RotateGroup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RotateGroup /* 0EE288 802C98D8 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/RotateModel.s b/asm/nonmatchings/code_e92d0_len_5da0/RotateModel.s index 070a50cf49..a38bc4d40b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/RotateModel.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/RotateModel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RotateModel /* 0ED614 802C8C64 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/ScaleGroup.s b/asm/nonmatchings/code_e92d0_len_5da0/ScaleGroup.s index 11f32442f8..3bcfe37267 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/ScaleGroup.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/ScaleGroup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ScaleGroup /* 0EE3CC 802C9A1C 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/ScaleModel.s b/asm/nonmatchings/code_e92d0_len_5da0/ScaleModel.s index ce2472dbc7..f5130d7284 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/ScaleModel.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/ScaleModel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ScaleModel /* 0ED738 802C8D88 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetGroupEnabled.s b/asm/nonmatchings/code_e92d0_len_5da0/SetGroupEnabled.s index c5999357e3..d909d21aba 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetGroupEnabled.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/SetGroupEnabled.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetGroupEnabled /* 0EDCB8 802C9308 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlag10.s b/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlag10.s index dec6455c43..710ea2e6a9 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlag10.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlag10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetModelFlag10 /* 0EDA2C 802C907C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlags.s b/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlags.s index 8481322f05..76c1ef37b3 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlags.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetModelFlags /* 0EDEC8 802C9518 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetRenderMode.s b/asm/nonmatchings/code_e92d0_len_5da0/SetRenderMode.s index 326df0249a..474a9c2c6f 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetRenderMode.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/SetRenderMode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetRenderMode /* 0EEEA4 802CA4F4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanOffset.s b/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanOffset.s index a396e764c6..7b870b1e3e 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanOffset.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanOffset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetTexPanOffset /* 0EDD14 802C9364 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanner.s b/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanner.s index 818fcac78a..4d4478a67f 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanner.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetTexPanner /* 0ED9B0 802C9000 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/TranslateGroup.s b/asm/nonmatchings/code_e92d0_len_5da0/TranslateGroup.s index 75abba48d0..814e15999d 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/TranslateGroup.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/TranslateGroup.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel TranslateGroup /* 0EE164 802C97B4 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/TranslateModel.s b/asm/nonmatchings/code_e92d0_len_5da0/TranslateModel.s index 9c34a7e2fc..daa40b44ea 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/TranslateModel.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/TranslateModel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel TranslateModel /* 0ED510 802C8B60 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/_bound_script_trigger_handler.s b/asm/nonmatchings/code_e92d0_len_5da0/_bound_script_trigger_handler.s index 478db96cc3..ed5ee868c5 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/_bound_script_trigger_handler.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/_bound_script_trigger_handler.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _bound_script_trigger_handler /* 0EB02C 802C667C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/fixed_var_to_float.s b/asm/nonmatchings/code_e92d0_len_5da0/fixed_var_to_float.s index a398d90286..5cccd32fd6 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/fixed_var_to_float.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/fixed_var_to_float.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fixed_var_to_float /* 0E92D0 802C4920 3C02F2E3 */ lui $v0, 0xf2e3 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/float_to_fixed_var.s b/asm/nonmatchings/code_e92d0_len_5da0/float_to_fixed_var.s index 1470a8bae4..70946c480f 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/float_to_fixed_var.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/float_to_fixed_var.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel float_to_fixed_var /* 0E931C 802C496C 3C014480 */ lui $at, 0x4480 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C6E14.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C6E14.s index 9bf5f0d98a..2ea666aa26 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C6E14.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/func_802C6E14.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C6E14 /* 0EB7C4 802C6E14 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C739C.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C739C.s index 75cb3d2f5e..b1b00b9d2c 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C739C.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/func_802C739C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C739C /* 0EBD4C 802C739C 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B0.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B0.s index 2b08c31cda..2d056673f2 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B0.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C73B0 /* 0EBD60 802C73B0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B8.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B8.s index b07547d454..646e2379aa 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B8.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/func_802C73B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C73B8 /* 0EBD68 802C73B8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C95A0.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C95A0.s index cd11c6ade6..c716b2af36 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C95A0.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/func_802C95A0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802C95A0 /* 0EDF50 802C95A0 27BDFE70 */ addiu $sp, $sp, -0x190 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802CA1B8.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802CA1B8.s index c2e631e595..f035163973 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802CA1B8.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/func_802CA1B8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802CA1B8 /* 0EEB68 802CA1B8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/get_float_variable.s b/asm/nonmatchings/code_e92d0_len_5da0/get_float_variable.s index 2107b21357..534e1ef00e 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/get_float_variable.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/get_float_variable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_float_variable /* 0ECDDC 802C842C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/get_variable.s b/asm/nonmatchings/code_e92d0_len_5da0/get_variable.s index c6adab8603..72c4e73cc7 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/get_variable.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/get_variable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_variable /* 0EC46C 802C7ABC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index.s b/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index.s index 84c1f2a729..c6dd291d0d 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_variable_index /* 0EC758 802C7DA8 3C02EFE8 */ lui $v0, 0xefe8 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index_alt.s b/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index_alt.s index 6d50bc07e8..253311d7c7 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index_alt.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/get_variable_index_alt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel get_variable_index_alt /* 0EC8D0 802C7F20 3C02EFE8 */ lui $v0, 0xefe8 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/goto_map.s b/asm/nonmatchings/code_e92d0_len_5da0/goto_map.s index cb12b64014..612a007f68 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/goto_map.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/goto_map.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel goto_map /* 0EECB4 802CA304 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/modify_collider_family_flags.s b/asm/nonmatchings/code_e92d0_len_5da0/modify_collider_family_flags.s index a7a9ccab7f..1d4c07003b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/modify_collider_family_flags.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/modify_collider_family_flags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel modify_collider_family_flags /* 0EE698 802C9CE8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/set_float_variable.s b/asm/nonmatchings/code_e92d0_len_5da0/set_float_variable.s index 24605efa30..9aa2047466 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/set_float_variable.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/set_float_variable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_float_variable /* 0ECFF0 802C8640 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/set_variable.s b/asm/nonmatchings/code_e92d0_len_5da0/set_variable.s index b0492fcf33..48ec52b3c7 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/set_variable.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/set_variable.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_variable /* 0ECA48 802C8098 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_execute_next_command.s b/asm/nonmatchings/code_e92d0_len_5da0/si_execute_next_command.s index 7b32e41407..1c7eea8e3f 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_execute_next_command.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_execute_next_command.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_execute_next_command /* 0EBDB4 802C7404 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_case.s b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_case.s index 388c612370..39570fd349 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_case.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_case.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_goto_end_case /* 0ED394 802C89E4 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_loop.s b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_loop.s index b665f50e1c..ff6df96bba 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_loop.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_end_loop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_goto_end_loop /* 0ED494 802C8AE4 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_label.s b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_label.s index f39387a5ab..7f3ad2fae3 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_label.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_label.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_goto_label /* 0ED240 802C8890 8C86000C */ lw $a2, 0xc($a0) diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_next_case.s b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_next_case.s index 0350f5d20b..1c1c02766d 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_goto_next_case.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_goto_next_case.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_goto_next_case /* 0ED410 802C8A60 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND.s index a29331f7a5..c4744a5697 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_AND /* 0EAC20 802C6270 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND_const.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND_const.s index f17445cfbb..877e2a350b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND_const.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND_const.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_AND_const /* 0EAC84 802C62D4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s index 3d463f0b3d..de2382833d 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_Loop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_Loop /* 0E93B0 802C4A00 8C83000C */ lw $v1, 0xc($a0) diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR.s index 498815d1a0..3b607968d6 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_OR /* 0EACDC 802C632C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR_const.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR_const.s index abb94a98f3..518cff7a2b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR_const.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR_const.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_OR_const /* 0EAD40 802C6390 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_add.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_add.s index bc5cbf95d5..25a8bf14be 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_add.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_add.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_add /* 0EA1B4 802C5804 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_addF.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_addF.s index 7d36c2a4ac..2149c917f7 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_addF.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_addF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_addF /* 0EA434 802C5A84 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_allocate_array.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_allocate_array.s index 04129b6edc..3d5d6aa48b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_allocate_array.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_allocate_array.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_allocate_array /* 0EABC4 802C6214 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind.s index 45053d1d89..d22c59e9fd 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_bind /* 0EB0C4 802C6714 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s index d0c9e82a25..0d9f90d63c 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_bind_lock.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_bind_lock /* 0EB504 802C6B54 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_case.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_case.s index 3aa5dd9222..cb05379c73 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_case.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_case.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_break_case /* 0EA084 802C56D4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_loop.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_loop.s index 2a2b8e34b6..d020ac0e24 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_loop.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_break_loop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_break_loop /* 0E94BC 802C4B0C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_call.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_call.s index d16eba21f2..0183b14b5d 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_call.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_call.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_call /* 0EAD98 802C63E8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_AND.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_AND.s index e4c7e331da..3c510ea2d5 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_AND.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_AND.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_AND /* 0E9E4C 802C549C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_default.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_default.s index 83d7ed5dba..254ae4f808 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_default.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_default.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_default /* 0E9DF4 802C5444 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal.s index e27d02162d..35061bdeb9 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_equal /* 0E99E0 802C5030 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_AND.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_AND.s index 7bb2da54f8..a1b0a946b4 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_AND.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_AND.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_equal_AND /* 0E9F68 802C55B8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_OR.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_OR.s index 38822a8044..09b6078b7b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_OR.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_equal_OR.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_equal_OR /* 0E9EC8 802C5518 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater.s index a55870b9c2..b659c3a876 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_greater /* 0E9C18 802C5268 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater_equal.s index d6d7587298..a2800069a4 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_greater_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_greater_equal /* 0E9CA8 802C52F8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less.s index 5fa9db8317..cfab9e011a 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_less /* 0E9AF8 802C5148 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less_equal.s index 74ef631c6b..2c8d2ec66d 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_less_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_less_equal /* 0E9B88 802C51D8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_not_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_not_equal.s index cd3cca39b9..c5e30e9a6f 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_not_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_not_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_not_equal /* 0E9A6C 802C50BC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_range.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_range.s index 95b0860fd8..caf4bcee38 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_range.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_case_range.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_case_range /* 0E9D38 802C5388 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_child_thread.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_child_thread.s index 9bcdd35c50..ad5da8e025 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_child_thread.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_child_thread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_child_thread /* 0EB71C 802C6D6C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divide.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divide.s index eeb430ab9a..83db321325 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divide.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divide.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_divide /* 0EA2E4 802C5934 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divideF.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divideF.s index 660ce470b5..c2f1874ccb 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divideF.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_divideF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_divideF /* 0EA570 802C5BC0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_does_script_exist.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_does_script_exist.s index bf0a8cc328..5ceeb2f7d4 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_does_script_exist.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_does_script_exist.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_does_script_exist /* 0EB428 802C6A78 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_else.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_else.s index f66dd12b42..d571d5d1b6 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_else.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_else.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_else /* 0E98F0 802C4F40 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end.s index 26e3ee631f..a64a2280a4 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_end /* 0EC404 802C7A54 24020003 */ addiu $v0, $zero, 3 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_case_group.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_case_group.s index ebf1bbd51a..6fc4cb81f8 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_case_group.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_case_group.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_end_case_group /* 0EA00C 802C565C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_child_thread.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_child_thread.s index f1bf5c4b3e..954bd5f914 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_child_thread.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_child_thread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_end_child_thread /* 0EB7A4 802C6DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_if.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_if.s index 3c70d1a328..339b7c8621 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_if.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_if.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_end_if /* 0E991C 802C4F6C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_loop.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_loop.s index 355eb65d94..1d99d32a45 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_loop.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_loop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_end_loop /* 0E93F8 802C4A48 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s index c12c0968d9..fae1fd0e38 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_switch.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_end_switch /* 0EA0C8 802C5718 80820007 */ lb $v0, 7($a0) diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_thread.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_thread.s index fbc7899afe..4c31517945 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_thread.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_end_thread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_end_thread /* 0EB6FC 802C6D4C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec1.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec1.s index 8d2634e18a..54f47d23a1 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec1.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_exec1 /* 0EAE1C 802C646C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec2.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec2.s index 8fb2fb0aa2..ed495bc233 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec2.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_exec2 /* 0EAED4 802C6524 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec_wait.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec_wait.s index 61574036c1..a4ac1bf5a2 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec_wait.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_exec_wait.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_exec_wait /* 0EAFAC 802C65FC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s index ee7b7559b9..0408e44e97 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_float.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_1_float /* 0EA864 802C5EB4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_word.s index ad77fa81a0..0a0184f8e9 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_word.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_1_word.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_1_word /* 0EA640 802C5C90 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s index 81315de129..1515734e85 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_float.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_2_float /* 0EA8BC 802C5F0C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s index 783f243813..d3fad7af84 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_2_word.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_2_word /* 0EA674 802C5CC4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s index 6903fa1a36..19101f0014 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_float.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_3_float /* 0EA94C 802C5F9C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s index e3939c743f..882286e7b5 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_3_word.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_3_word /* 0EA6DC 802C5D2C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s index 6a069ce60a..39b9ae9d30 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_float.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_4_float /* 0EAA0C 802C605C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s index 2b1d59e073..cfd27ed5ca 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_4_word.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_4_word /* 0EA764 802C5DB4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s index 72f2780018..01b0054588 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_float.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_Nth_float /* 0EAAFC 802C614C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_word.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_word.s index b60b6bd8a0..a702cb5e63 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_word.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_get_Nth_word.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_get_Nth_word /* 0EA80C 802C5E5C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_goto.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_goto.s index af74c55442..e18c6af949 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_goto.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_goto.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_goto /* 0E9370 802C49C0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_AND.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_AND.s index 4cd000ab3e..c4c0451fc2 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_AND.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_AND.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_AND /* 0E9840 802C4E90 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_equal.s index f122089a49..489d86e8df 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_equal /* 0E95F0 802C4C40 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater.s index e36e7692c7..076b741f35 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_greater /* 0E9714 802C4D64 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater_equal.s index 14ccdb6a15..3c27f7f0ae 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_greater_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_greater_equal /* 0E97DC 802C4E2C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less.s index 35402f88df..99e67e7851 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_less /* 0E96B0 802C4D00 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less_equal.s index 434a3ff6f7..fdd48194b1 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_less_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_less_equal /* 0E9778 802C4DC8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s index 47cc19aaec..35c3d92c0c 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_AND.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_not_AND /* 0E9898 802C4EE8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_equal.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_equal.s index dee52d5e47..f54596aeaf 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_equal.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_if_not_equal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_if_not_equal /* 0E9650 802C4CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_jump.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_jump.s index d3ce924aac..f6decd87e7 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_jump.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_jump.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_jump /* 0EAFF0 802C6640 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_kill.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_kill.s index d6ef3171cd..d88ea9f422 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_kill.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_kill.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_kill /* 0EB220 802C6870 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_label.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_label.s index 9af1c55686..c24a92b834 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_label.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_label.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_label /* 0E9368 802C49B8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_mod.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_mod.s index 7f734efd71..a615c84ff7 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_mod.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_mod.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_mod /* 0EA36C 802C59BC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiply.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiply.s index c3386c34ec..909c5479fe 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiply.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiply.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_multiply /* 0EA27C 802C58CC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiplyF.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiplyF.s index 9faa14735e..a9a624af0a 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiplyF.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_multiplyF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_multiplyF /* 0EA504 802C5B54 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_print_debug_var.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_print_debug_var.s index d70393e978..e0197d0ed8 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_print_debug_var.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_print_debug_var.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_print_debug_var /* 0EB7CC 802C6E1C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume.s index deaa255bb1..d4fbdd82a9 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_resume /* 0EB3FC 802C6A4C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_all.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_all.s index b72321fb71..5a67aa7df9 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_all.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_all.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_resume_all /* 0EB32C 802C697C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_others.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_others.s index 26447e042d..2530b7c2a4 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_others.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_resume_others.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_resume_others /* 0EB394 802C69E4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_return.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_return.s index fc03543060..e7edd2214f 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_return.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_return.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_return /* 0E9348 802C4998 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_array.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_array.s index 8d42e9ccb2..86d54d5490 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_array.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_array.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_array /* 0EAB5C 802C61AC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_const.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_const.s index dcc88bbb5d..acdd8784a3 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_const.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_const.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_const /* 0EA140 802C5790 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_flag_array.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_flag_array.s index 31c993fe1d..5a768ae6b0 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_flag_array.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_flag_array.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_flag_array /* 0EAB90 802C61E0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float.s index d0772f2390..8d4e7625c3 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_float /* 0EA168 802C57B8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float_buffer_ptr.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float_buffer_ptr.s index bf0d3d4207..86c7cc4284 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float_buffer_ptr.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_float_buffer_ptr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_float_buffer_ptr /* 0EA60C 802C5C5C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_group.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_group.s index 7c22ae5ec2..0d64b586e5 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_group.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_group.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_group /* 0EB2C4 802C6914 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_int_buffer_ptr.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_int_buffer_ptr.s index 91199838ab..26bf27b131 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_int_buffer_ptr.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_int_buffer_ptr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_int_buffer_ptr /* 0EA5D8 802C5C28 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_priority.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_priority.s index a903059348..c6fe775f25 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_priority.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_priority.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_priority /* 0EB24C 802C689C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_timescale.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_timescale.s index d4ae1d75fa..4bae3f7738 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_timescale.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_timescale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_timescale /* 0EB288 802C68D8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_var.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_var.s index 645e971a7c..88e5928d0e 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_var.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_set_var.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_set_var /* 0EA0F4 802C5744 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtract.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtract.s index d052c55213..d08c3fabdd 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtract.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtract.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_subtract /* 0EA218 802C5868 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtractF.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtractF.s index a4af403d90..a721876626 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtractF.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_subtractF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_subtractF /* 0EA49C 802C5AEC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend.s index 214fb26b86..97813a02cf 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_suspend /* 0EB3D0 802C6A20 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_all.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_all.s index f12d1be471..adcd4377bc 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_all.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_all.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_suspend_all /* 0EB300 802C6950 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_others.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_others.s index ddd9204c7f..3e40fb1c51 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_others.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_suspend_others.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_suspend_others /* 0EB358 802C69A8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch.s index 88287a2d35..6979b906b9 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_switch /* 0E9924 802C4F74 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch_const.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch_const.s index 6111fa6968..4ebe1731c4 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch_const.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_switch_const.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_switch_const /* 0E9994 802C4FE4 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_thread.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_thread.s index 09bfdb7748..79ebddbc4b 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_thread.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_thread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_thread /* 0EB628 802C6C78 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_unbind.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_unbind.s index 2fdd4c5cfe..ea9f311a73 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_unbind.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_unbind.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_unbind /* 0EB200 802C6850 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait.s index dfdfdb0e45..7b874f1596 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_wait /* 0E950C 802C4B5C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait_seconds.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait_seconds.s index 3c4f8e37fe..174f4ca6c7 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait_seconds.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_wait_seconds.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_handle_wait_seconds /* 0E9568 802C4BB8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_skip_else.s b/asm/nonmatchings/code_e92d0_len_5da0/si_skip_else.s index 58ddca1370..3e35d29732 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_skip_else.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_skip_else.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_skip_else /* 0ED328 802C8978 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_skip_if.s b/asm/nonmatchings/code_e92d0_len_5da0/si_skip_if.s index 92a4654f32..d4beb4648a 100644 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_skip_if.s +++ b/asm/nonmatchings/code_e92d0_len_5da0/si_skip_if.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si_skip_if /* 0ED2AC 802C88FC 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_e940_len_290/func_80033540.s b/asm/nonmatchings/code_e940_len_290/func_80033540.s index 119c45f15a..10c212fd08 100644 --- a/asm/nonmatchings/code_e940_len_290/func_80033540.s +++ b/asm/nonmatchings/code_e940_len_290/func_80033540.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033540 /* 00E940 80033540 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/code_e940_len_290/func_80033568.s b/asm/nonmatchings/code_e940_len_290/func_80033568.s index f8738100e8..e271c4a462 100644 --- a/asm/nonmatchings/code_e940_len_290/func_80033568.s +++ b/asm/nonmatchings/code_e940_len_290/func_80033568.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033568 /* 00E968 80033568 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_e940_len_290/func_80033788.s b/asm/nonmatchings/code_e940_len_290/func_80033788.s index 29a7303992..bd85dcce08 100644 --- a/asm/nonmatchings/code_e940_len_290/func_80033788.s +++ b/asm/nonmatchings/code_e940_len_290/func_80033788.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033788 /* 00EB88 80033788 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s index 26bdd4fdc7..4e9275d836 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033B54.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033B54 /* 00EF54 80033B54 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 00EF58 80033B58 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s index ef6f943fd5..ae57c0d01d 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033B88.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033B88 /* 00EF88 80033B88 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 00EF8C 80033B8C 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s index 1de8c8bc7a..49825ee7d8 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033BC0 /* 00EFC0 80033BC0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s index 36bf34f9e7..cefe54b3d1 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033E64.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033E64 /* 00F264 80033E64 03E00008 */ jr $ra /* 00F268 80033E68 00000000 */ nop diff --git a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s index d0993c3387..4b93670c46 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel step_battle /* 00ECE4 800338E4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s b/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s index 22c0900779..7346b3945b 100644 --- a/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s +++ b/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddAnimModelPosition /* 0F1ADC 802CD12C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s b/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s index 39991b4225..1b7a72857f 100644 --- a/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s +++ b/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AdjustCam /* 0F1010 802CC660 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s b/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s index 1a30e9163c..957599c828 100644 --- a/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s +++ b/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ChangeModelAnimation /* 0F191C 802CCF6C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s b/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s index 48746e5142..4d540aaba7 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetAnimModelPosition /* 0F1A40 802CD090 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetCamDistance.s b/asm/nonmatchings/code_ef070_len_3400/GetCamDistance.s index 9a919caf81..539974112a 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetCamDistance.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetCamDistance.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamDistance /* 0F0A34 802CC084 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetCamPitch.s b/asm/nonmatchings/code_ef070_len_3400/GetCamPitch.s index edce55b0d5..c40b1017dc 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetCamPitch.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetCamPitch.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamPitch /* 0F09A4 802CBFF4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetCamPosA.s b/asm/nonmatchings/code_ef070_len_3400/GetCamPosA.s index 0a54f8edd3..edec4f467b 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetCamPosA.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetCamPosA.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamPosA /* 0F0AA4 802CC0F4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetCamPosB.s b/asm/nonmatchings/code_ef070_len_3400/GetCamPosB.s index 065c956b99..e4383ae5ba 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetCamPosB.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetCamPosB.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamPosB /* 0F0B34 802CC184 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetCamPosC.s b/asm/nonmatchings/code_ef070_len_3400/GetCamPosC.s index 9d73337209..67fa5a98e7 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetCamPosC.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetCamPosC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamPosC /* 0F0BC4 802CC214 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetCamPosition.s b/asm/nonmatchings/code_ef070_len_3400/GetCamPosition.s index 8c7ac3c58d..f355fdb285 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetCamPosition.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetCamPosition.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamPosition /* 0F0C54 802CC2A4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/GetCamType.s b/asm/nonmatchings/code_ef070_len_3400/GetCamType.s index 62fe1c0013..43bb9fcd83 100644 --- a/asm/nonmatchings/code_ef070_len_3400/GetCamType.s +++ b/asm/nonmatchings/code_ef070_len_3400/GetCamType.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCamType /* 0F0914 802CBF64 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s b/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s index 86aada8787..e1fab99492 100644 --- a/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s +++ b/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadModelAnimation /* 0F169C 802CCCEC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/LoadSettings.s b/asm/nonmatchings/code_ef070_len_3400/LoadSettings.s index b6214ff5c3..9db2ad6f7d 100644 --- a/asm/nonmatchings/code_ef070_len_3400/LoadSettings.s +++ b/asm/nonmatchings/code_ef070_len_3400/LoadSettings.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadSettings /* 0F03A8 802CB9F8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/PanToTarget.s b/asm/nonmatchings/code_ef070_len_3400/PanToTarget.s index b21f414ccd..864ee143a1 100644 --- a/asm/nonmatchings/code_ef070_len_3400/PanToTarget.s +++ b/asm/nonmatchings/code_ef070_len_3400/PanToTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PanToTarget /* 0F014C 802CB79C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s b/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s index 24a1bb29d4..bf933bb2b6 100644 --- a/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s +++ b/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayModelAnimation /* 0F181C 802CCE6C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/ResetCam.s b/asm/nonmatchings/code_ef070_len_3400/ResetCam.s index 5b282af7f4..0f2cd8fbc9 100644 --- a/asm/nonmatchings/code_ef070_len_3400/ResetCam.s +++ b/asm/nonmatchings/code_ef070_len_3400/ResetCam.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ResetCam /* 0F1278 802CC8C8 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s index 30778edd50..1d25af146f 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetAnimModelPosition /* 0F1994 802CCFE4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s index 1fb249bef5..9be6bc7c73 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetAnimModelRotation /* 0F1BA0 802CD1F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s index 3e3390c3cf..b665b3db29 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetAnimModelScale /* 0F1C4C 802CD29C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamBGColor.s b/asm/nonmatchings/code_ef070_len_3400/SetCamBGColor.s index b9e508dfc0..27a2e3b3ab 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamBGColor.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamBGColor.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamBGColor /* 0EF748 802CAD98 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamDistance.s b/asm/nonmatchings/code_ef070_len_3400/SetCamDistance.s index 1c4ed591d9..3906d17a81 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamDistance.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamDistance.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamDistance /* 0F0594 802CBBE4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamEnabled.s b/asm/nonmatchings/code_ef070_len_3400/SetCamEnabled.s index 60f8b41d3d..0992c90c45 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamEnabled.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamEnabled.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamEnabled /* 0EF070 802CA6C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamFlag80.s b/asm/nonmatchings/code_ef070_len_3400/SetCamFlag80.s index 04bb229dce..ae06a1ad63 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamFlag80.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamFlag80.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamFlag80 /* 0EF124 802CA774 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamLeadPlayer.s b/asm/nonmatchings/code_ef070_len_3400/SetCamLeadPlayer.s index c4dbb83b6d..c1ec961634 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamLeadPlayer.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamLeadPlayer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamLeadPlayer /* 0F0030 802CB680 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamPerspective.s b/asm/nonmatchings/code_ef070_len_3400/SetCamPerspective.s index 1538611580..71966586a8 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamPerspective.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamPerspective.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamPerspective /* 0EF1D8 802CA828 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamPitch.s b/asm/nonmatchings/code_ef070_len_3400/SetCamPitch.s index 504256ad3e..98f60d2b6f 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamPitch.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamPitch.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamPitch /* 0F04F8 802CBB48 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamPosA.s b/asm/nonmatchings/code_ef070_len_3400/SetCamPosA.s index 390a8ae360..54a4acaa14 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamPosA.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamPosA.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamPosA /* 0F0608 802CBC58 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamPosB.s b/asm/nonmatchings/code_ef070_len_3400/SetCamPosB.s index cfe65cddf6..76808229f7 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamPosB.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamPosB.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamPosB /* 0F06A4 802CBCF4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamPosC.s b/asm/nonmatchings/code_ef070_len_3400/SetCamPosC.s index 5a7e2c749a..1b04e11ce4 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamPosC.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamPosC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamPosC /* 0F0740 802CBD90 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s b/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s index 8411ea01c0..5142eaa430 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamProperties /* 0F0D9C 802CC3EC 27BDFF60 */ addiu $sp, $sp, -0xa0 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamSpeed.s b/asm/nonmatchings/code_ef070_len_3400/SetCamSpeed.s index 0bd00ae663..ea9532eacc 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamSpeed.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamSpeed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamSpeed /* 0F08A0 802CBEF0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamTarget.s b/asm/nonmatchings/code_ef070_len_3400/SetCamTarget.s index 494aab193b..88e8d142ce 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamTarget.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamTarget /* 0EF8DC 802CAF2C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamType.s b/asm/nonmatchings/code_ef070_len_3400/SetCamType.s index 605737a760..db74fe30ea 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamType.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamType.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamType /* 0F0464 802CBAB4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetCamViewport.s b/asm/nonmatchings/code_ef070_len_3400/SetCamViewport.s index d358e1c5ac..070fff8387 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetCamViewport.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetCamViewport.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetCamViewport /* 0EF4C8 802CAB18 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/SetPanTarget.s b/asm/nonmatchings/code_ef070_len_3400/SetPanTarget.s index 933c844749..6fbfcd7ba3 100644 --- a/asm/nonmatchings/code_ef070_len_3400/SetPanTarget.s +++ b/asm/nonmatchings/code_ef070_len_3400/SetPanTarget.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPanTarget /* 0F07DC 802CBE2C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s b/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s index 317bcb8d6a..59aa6ac181 100644 --- a/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s +++ b/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShakeCam /* 0EFC58 802CB2A8 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_ef070_len_3400/UseSettingsFrom.s b/asm/nonmatchings/code_ef070_len_3400/UseSettingsFrom.s index 18daea8841..17cc68237b 100644 --- a/asm/nonmatchings/code_ef070_len_3400/UseSettingsFrom.s +++ b/asm/nonmatchings/code_ef070_len_3400/UseSettingsFrom.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel UseSettingsFrom /* 0F0210 802CB860 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_ef070_len_3400/WaitForCam.s b/asm/nonmatchings/code_ef070_len_3400/WaitForCam.s index bfdd506b81..db5e0cdd17 100644 --- a/asm/nonmatchings/code_ef070_len_3400/WaitForCam.s +++ b/asm/nonmatchings/code_ef070_len_3400/WaitForCam.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel WaitForCam /* 0F0D04 802CC354 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s b/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s index 181c348cda..810a3316d0 100644 --- a/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s +++ b/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel draw_anim_models /* 0F14C8 802CCB18 27BDFDA8 */ addiu $sp, $sp, -0x258 diff --git a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s index 0b4257c07c..a28914aaf9 100644 --- a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s +++ b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCam1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel exec_ShakeCam1 /* 0EFF1C 802CB56C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s index 9976e1d2d5..f8ed79a0ba 100644 --- a/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s +++ b/asm/nonmatchings/code_ef070_len_3400/exec_ShakeCamX.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel exec_ShakeCamX /* 0EFF78 802CB5C8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s index 03613f0ab7..4f9a41f160 100644 --- a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s +++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802CD4B4 /* 0F1E64 802CD4B4 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s index fe3fdec3d3..9e625e7e13 100644 --- a/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s +++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802CD57C /* 0F1F2C 802CD57C 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s b/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s index 5579461abe..e4d0b465eb 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s +++ b/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel BringPartnerOut /* 0F3F68 802CF5B8 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s b/asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s index dc24abced3..c3ca802313 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s +++ b/asm/nonmatchings/code_f2470_len_27f0/ClearPartnerMoveHistory.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ClearPartnerMoveHistory /* 0F3D20 802CF370 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/DeleteNpc.s b/asm/nonmatchings/code_f2470_len_27f0/DeleteNpc.s index e52de0127c..b80cee382e 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/DeleteNpc.s +++ b/asm/nonmatchings/code_f2470_len_27f0/DeleteNpc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DeleteNpc /* 0F25CC 802CDC1C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s b/asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s index 11cc628287..5f5fb43f4d 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s +++ b/asm/nonmatchings/code_f2470_len_27f0/DisablePartnerAI.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DisablePartnerAI /* 0F3E98 802CF4E8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s b/asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s index 279937a977..cb73f3e671 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s +++ b/asm/nonmatchings/code_f2470_len_27f0/EnableNpcBlur.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableNpcBlur /* 0F3C9C 802CF2EC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s b/asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s index f374030f22..0586c50ccc 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s +++ b/asm/nonmatchings/code_f2470_len_27f0/EnableNpcShadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableNpcShadow /* 0F3C18 802CF268 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s b/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s index 26c80eb9ff..18711a8d6f 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s +++ b/asm/nonmatchings/code_f2470_len_27f0/EnablePartnerAI.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnablePartnerAI /* 0F3EDC 802CF52C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetCurrentPartnerID.s b/asm/nonmatchings/code_f2470_len_27f0/GetCurrentPartnerID.s index 54673fcb93..9405067605 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/GetCurrentPartnerID.s +++ b/asm/nonmatchings/code_f2470_len_27f0/GetCurrentPartnerID.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCurrentPartnerID /* 0F4624 802CFC74 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s b/asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s index a90c906e36..9469b7b053 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s +++ b/asm/nonmatchings/code_f2470_len_27f0/GetNpcAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetNpcAnimation /* 0F2B10 802CE160 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetNpcPointer.s b/asm/nonmatchings/code_f2470_len_27f0/GetNpcPointer.s index b68d9fc645..2b4efa6c2a 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/GetNpcPointer.s +++ b/asm/nonmatchings/code_f2470_len_27f0/GetNpcPointer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetNpcPointer /* 0F2608 802CDC58 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s b/asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s index 8189c6c082..ed64f85213 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s +++ b/asm/nonmatchings/code_f2470_len_27f0/GetNpcPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetNpcPos /* 0F3AA4 802CF0F4 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s b/asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s index 105be37a0b..db0711c48e 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s +++ b/asm/nonmatchings/code_f2470_len_27f0/GetNpcYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetNpcYaw /* 0F33C0 802CEA10 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s b/asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s index f1e09c9a22..08befc6ef9 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s +++ b/asm/nonmatchings/code_f2470_len_27f0/GetPartnerPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPartnerPos /* 0F3DE8 802CF438 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s b/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s index 6c3c57ea33..d4b13e23a5 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s +++ b/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel InterpNpcYaw /* 0F34B4 802CEB04 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s b/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s index d77c60e0cd..35aeac28d5 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NpcFaceNpc /* 0F3830 802CEE80 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s b/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s index de373d6fc9..c490c16148 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NpcFacePlayer /* 0F3678 802CECC8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s b/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s index e56df79344..195963b9a2 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NpcFlyTo /* 0F30AC 802CE6FC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s b/asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s index ec7b4a450f..4562c6e55d 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcJump0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NpcJump0 /* 0F3074 802CE6C4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s b/asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s index 319241ff81..990cfe08e0 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcJump1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NpcJump1 /* 0F3090 802CE6E0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s b/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s index f6299eb3d6..6568ec2374 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NpcMoveTo /* 0F2BDC 802CE22C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s b/asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s index 46fdaad771..815e163a82 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s +++ b/asm/nonmatchings/code_f2470_len_27f0/NpcSetHomePosToCurrent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NpcSetHomePosToCurrent /* 0F3D6C 802CF3BC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s b/asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s index f5f1e7227a..8739b69946 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s +++ b/asm/nonmatchings/code_f2470_len_27f0/PlaySoundAtNpc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlaySoundAtNpc /* 0F4B5C 802D01AC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s b/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s index 7a1b362784..47b20c3432 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s +++ b/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PutPartnerAway /* 0F4338 802CF988 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s index fab7e26277..740359ce79 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcAnimation /* 0F2AA4 802CE0F4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s index fbc5de393d..0cd8f14c11 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcCollisionSize.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcCollisionSize /* 0F293C 802CDF8C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s index d9e34f7931..a27ed45d84 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcEffect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcEffect /* 0F4AC8 802D0118 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcFlagBits.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcFlagBits.s index 916132435b..edc991ed15 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcFlagBits.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcFlagBits /* 0F3A10 802CF060 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s index f298108250..33f8a9db39 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcJumpscale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcJumpscale /* 0F2A38 802CE088 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcPos.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcPos.s index 9094fc4120..b71e6d24cc 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcPos.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcPos /* 0F2660 802CDCB0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s index f2cae1c511..f74fbdaf78 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcRotation /* 0F2760 802CDDB0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s index 1c9bc86d24..7286149372 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcScale /* 0F2884 802CDED4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s index 17e2babd97..dc139b1257 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcSpeed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcSpeed /* 0F29CC 802CE01C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s b/asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s index 75ec25adac..92f6e46890 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s +++ b/asm/nonmatchings/code_f2470_len_27f0/SetNpcYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetNpcYaw /* 0F3434 802CEA84 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s b/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s index 8c9d72a7e4..049a30b871 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s +++ b/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _npc_jump_to /* 0F2DE4 802CE434 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_f2470_len_27f0/func_802CDAC0.s b/asm/nonmatchings/code_f2470_len_27f0/func_802CDAC0.s index e1d3c5a4c5..487d3087ba 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/func_802CDAC0.s +++ b/asm/nonmatchings/code_f2470_len_27f0/func_802CDAC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802CDAC0 /* 0F2470 802CDAC0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s b/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s index 8f536bc572..ce2c17cd00 100644 --- a/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s +++ b/asm/nonmatchings/code_f2470_len_27f0/set_npc_animation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel set_npc_animation /* 0F24BC 802CDB0C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f270_len_1190/func_80033E70.s b/asm/nonmatchings/code_f270_len_1190/func_80033E70.s index 8a3e49fa47..e20204fd53 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80033E70.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80033E70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80033E70 /* 00F270 80033E70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f270_len_1190/func_800340A4.s b/asm/nonmatchings/code_f270_len_1190/func_800340A4.s index 8736323be0..ef380f2c58 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_800340A4.s +++ b/asm/nonmatchings/code_f270_len_1190/func_800340A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800340A4 /* 00F4A4 800340A4 3C038007 */ lui $v1, 0x8007 diff --git a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s index ac91ffc6f6..4960632409 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_800343A4.s +++ b/asm/nonmatchings/code_f270_len_1190/func_800343A4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800343A4 /* 00F7A4 800343A4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034940.s b/asm/nonmatchings/code_f270_len_1190/func_80034940.s index 8430535dec..03c6fd26d1 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034940.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034940.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80034940 /* 00FD40 80034940 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s b/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s index a8c4832b7c..ac317470c3 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034BFC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80034BFC /* 00FFFC 80034BFC 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s index 05d9475e6c..51e017f964 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034C3C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80034C3C /* 01003C 80034C3C 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f270_len_1190/func_80034FF0.s b/asm/nonmatchings/code_f270_len_1190/func_80034FF0.s index 7517a317c1..bfec1013d3 100644 --- a/asm/nonmatchings/code_f270_len_1190/func_80034FF0.s +++ b/asm/nonmatchings/code_f270_len_1190/func_80034FF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80034FF0 /* 0103F0 80034FF0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s b/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s index 538b1698d3..e3603f78bc 100644 --- a/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s +++ b/asm/nonmatchings/code_f270_len_1190/step_pause_menu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel step_pause_menu /* 00FD7C 8003497C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/CancelMessage.s b/asm/nonmatchings/code_f4c60_len_4300/CancelMessage.s index c0baf9f156..451377f77a 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/CancelMessage.s +++ b/asm/nonmatchings/code_f4c60_len_4300/CancelMessage.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CancelMessage /* 0F55D0 802D0C20 3C04802E */ lui $a0, 0x802e diff --git a/asm/nonmatchings/code_f4c60_len_4300/CancelMessageAndBlock.s b/asm/nonmatchings/code_f4c60_len_4300/CancelMessageAndBlock.s index b5066c9cb5..aa3de8c503 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/CancelMessageAndBlock.s +++ b/asm/nonmatchings/code_f4c60_len_4300/CancelMessageAndBlock.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CancelMessageAndBlock /* 0F55F8 802D0C48 3C04802E */ lui $a0, 0x802e diff --git a/asm/nonmatchings/code_f4c60_len_4300/CloseChoice.s b/asm/nonmatchings/code_f4c60_len_4300/CloseChoice.s index 414594bcf6..cf0b877771 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/CloseChoice.s +++ b/asm/nonmatchings/code_f4c60_len_4300/CloseChoice.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CloseChoice /* 0F55A8 802D0BF8 3C04802E */ lui $a0, 0x802e diff --git a/asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s b/asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s index 166e958083..2061ab50ba 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s +++ b/asm/nonmatchings/code_f4c60_len_4300/CloseMessage.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CloseMessage /* 0F5448 802D0A98 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/ContinueSpeech.s b/asm/nonmatchings/code_f4c60_len_4300/ContinueSpeech.s index d0c85d51f5..7b44a3f5ae 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/ContinueSpeech.s +++ b/asm/nonmatchings/code_f4c60_len_4300/ContinueSpeech.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ContinueSpeech /* 0F4C98 802D02E8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/CreateImageObj.s b/asm/nonmatchings/code_f4c60_len_4300/CreateImageObj.s index 8f7ef0f368..3721f0b4f5 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/CreateImageObj.s +++ b/asm/nonmatchings/code_f4c60_len_4300/CreateImageObj.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CreateImageObj /* 0F7E24 802D3474 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f4c60_len_4300/Disable8bitMario.s b/asm/nonmatchings/code_f4c60_len_4300/Disable8bitMario.s index 5c0d9c4d92..ac8dd4d834 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/Disable8bitMario.s +++ b/asm/nonmatchings/code_f4c60_len_4300/Disable8bitMario.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel Disable8bitMario /* 0F7538 802D2B88 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/DisablePartner.s b/asm/nonmatchings/code_f4c60_len_4300/DisablePartner.s index 9152d6813e..7a65215f08 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/DisablePartner.s +++ b/asm/nonmatchings/code_f4c60_len_4300/DisablePartner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DisablePartner /* 0F68E8 802D1F38 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerInput.s b/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerInput.s index 3811251bd2..0c4aae4196 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerInput.s +++ b/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerInput.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DisablePlayerInput /* 0F57D8 802D0E28 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerPhysics.s b/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerPhysics.s index 0e52738ebf..e32a97d64c 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerPhysics.s +++ b/asm/nonmatchings/code_f4c60_len_4300/DisablePlayerPhysics.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DisablePlayerPhysics /* 0F5794 802D0DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/DisablePulseStone.s b/asm/nonmatchings/code_f4c60_len_4300/DisablePulseStone.s index 9f1ec50cd5..7d9f1e5c91 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/DisablePulseStone.s +++ b/asm/nonmatchings/code_f4c60_len_4300/DisablePulseStone.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DisablePulseStone /* 0F7458 802D2AA8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/EnablePartner.s b/asm/nonmatchings/code_f4c60_len_4300/EnablePartner.s index 840682a721..431c3aa0e8 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/EnablePartner.s +++ b/asm/nonmatchings/code_f4c60_len_4300/EnablePartner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnablePartner /* 0F68AC 802D1EFC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/EndSpeech.s b/asm/nonmatchings/code_f4c60_len_4300/EndSpeech.s index a25c4693c9..406216c568 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/EndSpeech.s +++ b/asm/nonmatchings/code_f4c60_len_4300/EndSpeech.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EndSpeech /* 0F4C7C 802D02CC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/ForceExitHeading.s b/asm/nonmatchings/code_f4c60_len_4300/ForceExitHeading.s index 2dd38210f1..ca02c2204c 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/ForceExitHeading.s +++ b/asm/nonmatchings/code_f4c60_len_4300/ForceExitHeading.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ForceExitHeading /* 0F6920 802D1F70 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreHPandFP.s b/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreHPandFP.s index fada01a2f6..7711221d82 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreHPandFP.s +++ b/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreHPandFP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FullyRestoreHPandFP /* 0F6870 802D1EC0 3C028011 */ lui $v0, 0x8011 diff --git a/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreSP.s b/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreSP.s index bdc250f381..28ca73abd4 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreSP.s +++ b/asm/nonmatchings/code_f4c60_len_4300/FullyRestoreSP.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FullyRestoreSP /* 0F6890 802D1EE0 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_f4c60_len_4300/GetCurrentPartner.s b/asm/nonmatchings/code_f4c60_len_4300/GetCurrentPartner.s index b0109796ce..70e7286a46 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/GetCurrentPartner.s +++ b/asm/nonmatchings/code_f4c60_len_4300/GetCurrentPartner.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetCurrentPartner /* 0F74BC 802D2B0C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerActionState.s b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerActionState.s index b62fa56261..a9309bd580 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerActionState.s +++ b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerActionState.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPlayerActionState /* 0F6780 802D1DD0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerAnimation.s b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerAnimation.s index dbd2939127..e7c03f8d41 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerAnimation.s +++ b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPlayerAnimation /* 0F6844 802D1E94 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerPos.s b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerPos.s index 52d2a9806d..e060c4a122 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerPos.s +++ b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPlayerPos /* 0F67AC 802D1DFC 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerTargetYaw.s b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerTargetYaw.s index 00560c9e2d..55998fd3e4 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/GetPlayerTargetYaw.s +++ b/asm/nonmatchings/code_f4c60_len_4300/GetPlayerTargetYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetPlayerTargetYaw /* 0F66D8 802D1D28 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/HidePlayerShadow.s b/asm/nonmatchings/code_f4c60_len_4300/HidePlayerShadow.s index 66a19dc008..ddb8b9457d 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/HidePlayerShadow.s +++ b/asm/nonmatchings/code_f4c60_len_4300/HidePlayerShadow.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel HidePlayerShadow /* 0F5750 802D0DA0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/InterpPlayerYaw.s b/asm/nonmatchings/code_f4c60_len_4300/InterpPlayerYaw.s index 7cb4826b88..878a038b61 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/InterpPlayerYaw.s +++ b/asm/nonmatchings/code_f4c60_len_4300/InterpPlayerYaw.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel InterpPlayerYaw /* 0F62EC 802D193C 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f4c60_len_4300/JumpObj.s b/asm/nonmatchings/code_f4c60_len_4300/JumpObj.s index a8cb73f79c..e69f0b02b9 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/JumpObj.s +++ b/asm/nonmatchings/code_f4c60_len_4300/JumpObj.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel JumpObj /* 0F8608 802D3C58 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_f4c60_len_4300/MovePlayerTo.s b/asm/nonmatchings/code_f4c60_len_4300/MovePlayerTo.s index b694fe8731..77d3319618 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/MovePlayerTo.s +++ b/asm/nonmatchings/code_f4c60_len_4300/MovePlayerTo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MovePlayerTo /* 0F5AE4 802D1134 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f4c60_len_4300/PlaySoundAtPlayer.s b/asm/nonmatchings/code_f4c60_len_4300/PlaySoundAtPlayer.s index 6030786310..4412cbc515 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/PlaySoundAtPlayer.s +++ b/asm/nonmatchings/code_f4c60_len_4300/PlaySoundAtPlayer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlaySoundAtPlayer /* 0F7688 802D2CD8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/PlayerFaceNpc.s b/asm/nonmatchings/code_f4c60_len_4300/PlayerFaceNpc.s index 3b891e0c00..5632431f29 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/PlayerFaceNpc.s +++ b/asm/nonmatchings/code_f4c60_len_4300/PlayerFaceNpc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerFaceNpc /* 0F64B4 802D1B04 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f4c60_len_4300/PlayerJump.s b/asm/nonmatchings/code_f4c60_len_4300/PlayerJump.s index dc6e6e5e3b..77b25c07e4 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/PlayerJump.s +++ b/asm/nonmatchings/code_f4c60_len_4300/PlayerJump.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerJump /* 0F6298 802D18E8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/PlayerJump1.s b/asm/nonmatchings/code_f4c60_len_4300/PlayerJump1.s index 3a5a6aff16..14ad7bbc27 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/PlayerJump1.s +++ b/asm/nonmatchings/code_f4c60_len_4300/PlayerJump1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerJump1 /* 0F62B4 802D1904 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/PlayerJump2.s b/asm/nonmatchings/code_f4c60_len_4300/PlayerJump2.s index 389782d922..aa50531064 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/PlayerJump2.s +++ b/asm/nonmatchings/code_f4c60_len_4300/PlayerJump2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayerJump2 /* 0F62D0 802D1920 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/RemoveImageObj.s b/asm/nonmatchings/code_f4c60_len_4300/RemoveImageObj.s index 566567d21d..a9bbaa8d24 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/RemoveImageObj.s +++ b/asm/nonmatchings/code_f4c60_len_4300/RemoveImageObj.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveImageObj /* 0F7FD4 802D3624 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetMessageImages.s b/asm/nonmatchings/code_f4c60_len_4300/SetMessageImages.s index fed43ff980..3892e6e4e4 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetMessageImages.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetMessageImages.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetMessageImages /* 0F5620 802D0C70 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetMessageString.s b/asm/nonmatchings/code_f4c60_len_4300/SetMessageString.s index 17fff0b148..a8504c8786 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetMessageString.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetMessageString.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetMessageString /* 0F569C 802D0CEC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetMessageValue.s b/asm/nonmatchings/code_f4c60_len_4300/SetMessageValue.s index 17f877a862..53921fcad9 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetMessageValue.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetMessageValue.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetMessageValue /* 0F56F4 802D0D44 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetObjJumpScale.s b/asm/nonmatchings/code_f4c60_len_4300/SetObjJumpScale.s index 228044404c..3cb4a0ebed 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetObjJumpScale.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetObjJumpScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetObjJumpScale /* 0F83AC 802D39FC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetObjPosition.s b/asm/nonmatchings/code_f4c60_len_4300/SetObjPosition.s index 57a8da5b21..8995f1ed14 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetObjPosition.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetObjPosition.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetObjPosition /* 0F8090 802D36E0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetObjRotation.s b/asm/nonmatchings/code_f4c60_len_4300/SetObjRotation.s index 5c276b4889..127e4d813d 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetObjRotation.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetObjRotation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetObjRotation /* 0F81F0 802D3840 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetObjScale.s b/asm/nonmatchings/code_f4c60_len_4300/SetObjScale.s index df0a3ee082..3b2027389c 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetObjScale.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetObjScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetObjScale /* 0F829C 802D38EC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerActionState.s b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerActionState.s index 00fae5b6d6..6f59eecfe4 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerActionState.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerActionState.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPlayerActionState /* 0F5A88 802D10D8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerAnimation.s b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerAnimation.s index 9fd4be595e..ea606350d0 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerAnimation.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerAnimation.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPlayerAnimation /* 0F5A34 802D1084 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerCollisionSize.s b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerCollisionSize.s index 0d7d2785b0..6d5c88b6c5 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerCollisionSize.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerCollisionSize.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPlayerCollisionSize /* 0F5960 802D0FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerFlagBits.s b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerFlagBits.s index d4ff3cbddd..7ea6c5573f 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerFlagBits.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerFlagBits.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPlayerFlagBits /* 0F6710 802D1D60 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerJumpscale.s b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerJumpscale.s index 0c337a2053..524d9c5904 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerJumpscale.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerJumpscale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPlayerJumpscale /* 0F5A04 802D1054 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerPos.s b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerPos.s index f767e77a6e..683d9f32a5 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerPos.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPlayerPos /* 0F58A0 802D0EF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerSpeed.s b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerSpeed.s index 16e836f710..fb08b250f5 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SetPlayerSpeed.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SetPlayerSpeed.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetPlayerSpeed /* 0F59D4 802D1024 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/ShowChoice.s b/asm/nonmatchings/code_f4c60_len_4300/ShowChoice.s index 1d3fd8548f..c0cf742118 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/ShowChoice.s +++ b/asm/nonmatchings/code_f4c60_len_4300/ShowChoice.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowChoice /* 0F551C 802D0B6C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtScreenPos.s b/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtScreenPos.s index ed9e47cb14..cfe075fb87 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtScreenPos.s +++ b/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtScreenPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowMessageAtScreenPos /* 0F5244 802D0894 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s b/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s index 48263f0be5..a6df8d3836 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s +++ b/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowMessageAtWorldPos /* 0F530C 802D095C 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SpeakToNpc.s b/asm/nonmatchings/code_f4c60_len_4300/SpeakToNpc.s index a8924b18a5..99be0dee08 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SpeakToNpc.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SpeakToNpc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SpeakToNpc /* 0F4CB4 802D0304 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SpeakToPlayer.s b/asm/nonmatchings/code_f4c60_len_4300/SpeakToPlayer.s index fb491afbad..f3b29c0137 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SpeakToPlayer.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SpeakToPlayer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SpeakToPlayer /* 0F4C60 802D02B0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s b/asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s index ba6df67e23..1bb8c56d6d 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s +++ b/asm/nonmatchings/code_f4c60_len_4300/SwitchMessage.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SwitchMessage /* 0F54AC 802D0AFC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/UseExitHeading.s b/asm/nonmatchings/code_f4c60_len_4300/UseExitHeading.s index 92be8ccd3e..08b5f34258 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/UseExitHeading.s +++ b/asm/nonmatchings/code_f4c60_len_4300/UseExitHeading.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel UseExitHeading /* 0F6B1C 802D216C 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_f4c60_len_4300/_show_message.s b/asm/nonmatchings/code_f4c60_len_4300/_show_message.s index f3bc030819..f6335d8623 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/_show_message.s +++ b/asm/nonmatchings/code_f4c60_len_4300/_show_message.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _show_message /* 0F4CD0 802D0320 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_f4c60_len_4300/func_802D23F8.s b/asm/nonmatchings/code_f4c60_len_4300/func_802D23F8.s index 63dd1d2966..bdd89b7e65 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/func_802D23F8.s +++ b/asm/nonmatchings/code_f4c60_len_4300/func_802D23F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D23F8 /* 0F6DA8 802D23F8 3C038011 */ lui $v1, 0x8011 diff --git a/asm/nonmatchings/code_f4c60_len_4300/func_802D2D30.s b/asm/nonmatchings/code_f4c60_len_4300/func_802D2D30.s index 5ffc4a9c15..711c317ef3 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/func_802D2D30.s +++ b/asm/nonmatchings/code_f4c60_len_4300/func_802D2D30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D2D30 /* 0F76E0 802D2D30 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/code_f4c60_len_4300/func_802D2F34.s b/asm/nonmatchings/code_f4c60_len_4300/func_802D2F34.s index 05b67835f4..600592e9a6 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/func_802D2F34.s +++ b/asm/nonmatchings/code_f4c60_len_4300/func_802D2F34.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D2F34 /* 0F78E4 802D2F34 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f4c60_len_4300/func_802D4164.s b/asm/nonmatchings/code_f4c60_len_4300/func_802D4164.s index 69918faf16..3ca4ec4805 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/func_802D4164.s +++ b/asm/nonmatchings/code_f4c60_len_4300/func_802D4164.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D4164 /* 0F8B14 802D4164 3C02802E */ lui $v0, 0x802e diff --git a/asm/nonmatchings/code_f4c60_len_4300/func_802D43F4.s b/asm/nonmatchings/code_f4c60_len_4300/func_802D43F4.s index 1d2d1ba191..018e50b86c 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/func_802D43F4.s +++ b/asm/nonmatchings/code_f4c60_len_4300/func_802D43F4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D43F4 /* 0F8DA4 802D43F4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f4c60_len_4300/func_802D4488.s b/asm/nonmatchings/code_f4c60_len_4300/func_802D4488.s index f17eefa739..eb5a8062ee 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/func_802D4488.s +++ b/asm/nonmatchings/code_f4c60_len_4300/func_802D4488.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D4488 /* 0F8E38 802D4488 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_f4c60_len_4300/func_802D4560.s b/asm/nonmatchings/code_f4c60_len_4300/func_802D4560.s index f378db351d..bbef3bf231 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/func_802D4560.s +++ b/asm/nonmatchings/code_f4c60_len_4300/func_802D4560.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D4560 /* 0F8F10 802D4560 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/code_f4c60_len_4300/player_jump.s b/asm/nonmatchings/code_f4c60_len_4300/player_jump.s index de056c27fb..b04ea23be3 100644 --- a/asm/nonmatchings/code_f4c60_len_4300/player_jump.s +++ b/asm/nonmatchings/code_f4c60_len_4300/player_jump.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel player_jump /* 0F5E90 802D14E0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_f8f60_len_1560/AddVectorPolar.s b/asm/nonmatchings/code_f8f60_len_1560/AddVectorPolar.s index 5e4f5cd361..77e0ac5e4b 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/AddVectorPolar.s +++ b/asm/nonmatchings/code_f8f60_len_1560/AddVectorPolar.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddVectorPolar /* 0F94C4 802D4B14 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerApproach.s b/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerApproach.s index 7d867d51f7..8390c0b1e4 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerApproach.s +++ b/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerApproach.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AwaitPlayerApproach /* 0F925C 802D48AC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerLeave.s b/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerLeave.s index 8269664da4..4288df5b67 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerLeave.s +++ b/asm/nonmatchings/code_f8f60_len_1560/AwaitPlayerLeave.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AwaitPlayerLeave /* 0F940C 802D4A5C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/ClampAngleFloat.s b/asm/nonmatchings/code_f8f60_len_1560/ClampAngleFloat.s index 9068efff32..26638780e1 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/ClampAngleFloat.s +++ b/asm/nonmatchings/code_f8f60_len_1560/ClampAngleFloat.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ClampAngleFloat /* 0FA464 802D5AB4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/ClampAngleInt.s b/asm/nonmatchings/code_f8f60_len_1560/ClampAngleInt.s index 8871f1701d..9412933461 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/ClampAngleInt.s +++ b/asm/nonmatchings/code_f8f60_len_1560/ClampAngleInt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ClampAngleInt /* 0FA408 802D5A58 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/EnableStatusMenu.s b/asm/nonmatchings/code_f8f60_len_1560/EnableStatusMenu.s index 63d406acac..f893983e7e 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/EnableStatusMenu.s +++ b/asm/nonmatchings/code_f8f60_len_1560/EnableStatusMenu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel EnableStatusMenu /* 0FA348 802D5998 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f8f60_len_1560/GetAngleBetweenNPCs.s b/asm/nonmatchings/code_f8f60_len_1560/GetAngleBetweenNPCs.s index fddb178d7d..7c53799337 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/GetAngleBetweenNPCs.s +++ b/asm/nonmatchings/code_f8f60_len_1560/GetAngleBetweenNPCs.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetAngleBetweenNPCs /* 0F90B8 802D4708 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_f8f60_len_1560/GetAngleToNPC.s b/asm/nonmatchings/code_f8f60_len_1560/GetAngleToNPC.s index b9d61cc9f0..62a42c7105 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/GetAngleToNPC.s +++ b/asm/nonmatchings/code_f8f60_len_1560/GetAngleToNPC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetAngleToNPC /* 0F9164 802D47B4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/GetAngleToPlayer.s b/asm/nonmatchings/code_f8f60_len_1560/GetAngleToPlayer.s index dae2bae56f..61d3f3dcc1 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/GetAngleToPlayer.s +++ b/asm/nonmatchings/code_f8f60_len_1560/GetAngleToPlayer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetAngleToPlayer /* 0F91E0 802D4830 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/GetDist2D.s b/asm/nonmatchings/code_f8f60_len_1560/GetDist2D.s index e446a55526..66cb2e144d 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/GetDist2D.s +++ b/asm/nonmatchings/code_f8f60_len_1560/GetDist2D.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetDist2D /* 0FA120 802D5770 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s b/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s index d3ee600c6e..3d7a601a1e 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s +++ b/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetNextPathPos /* 0F9ED4 802D5524 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_f8f60_len_1560/GetValueByRef.s b/asm/nonmatchings/code_f8f60_len_1560/GetValueByRef.s index 95f5047702..8d6838e3fd 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/GetValueByRef.s +++ b/asm/nonmatchings/code_f8f60_len_1560/GetValueByRef.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetValueByRef /* 0FA2EC 802D593C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/IsPlayerWithin.s b/asm/nonmatchings/code_f8f60_len_1560/IsPlayerWithin.s index b0e2d0d3d6..07064667c7 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/IsPlayerWithin.s +++ b/asm/nonmatchings/code_f8f60_len_1560/IsPlayerWithin.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IsPlayerWithin /* 0F9314 802D4964 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f8f60_len_1560/LoadPath.s b/asm/nonmatchings/code_f8f60_len_1560/LoadPath.s index 931b2c9411..e07c94ee05 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/LoadPath.s +++ b/asm/nonmatchings/code_f8f60_len_1560/LoadPath.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel LoadPath /* 0F9DE0 802D5430 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_f8f60_len_1560/MakeLerp.s b/asm/nonmatchings/code_f8f60_len_1560/MakeLerp.s index 0e7c3f628a..bb7c3327e8 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/MakeLerp.s +++ b/asm/nonmatchings/code_f8f60_len_1560/MakeLerp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeLerp /* 0F8F60 802D45B0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/RandInt.s b/asm/nonmatchings/code_f8f60_len_1560/RandInt.s index df0b8182f9..f00b48b3db 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/RandInt.s +++ b/asm/nonmatchings/code_f8f60_len_1560/RandInt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RandInt /* 0F9060 802D46B0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/SetGameMode.s b/asm/nonmatchings/code_f8f60_len_1560/SetGameMode.s index 6b7adf959f..57f5c7b490 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/SetGameMode.s +++ b/asm/nonmatchings/code_f8f60_len_1560/SetGameMode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetGameMode /* 0FA3D8 802D5A28 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f8f60_len_1560/SetValueByRef.s b/asm/nonmatchings/code_f8f60_len_1560/SetValueByRef.s index acec6fdd03..9d0d6acf78 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/SetValueByRef.s +++ b/asm/nonmatchings/code_f8f60_len_1560/SetValueByRef.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetValueByRef /* 0FA290 802D58E0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/ShowStatusMenu.s b/asm/nonmatchings/code_f8f60_len_1560/ShowStatusMenu.s index 722f287d1f..7b0659bd0c 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/ShowStatusMenu.s +++ b/asm/nonmatchings/code_f8f60_len_1560/ShowStatusMenu.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowStatusMenu /* 0FA38C 802D59DC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_f8f60_len_1560/UpdateLerp.s b/asm/nonmatchings/code_f8f60_len_1560/UpdateLerp.s index b6de021569..ba161b3879 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/UpdateLerp.s +++ b/asm/nonmatchings/code_f8f60_len_1560/UpdateLerp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel UpdateLerp /* 0F8FDC 802D462C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s b/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s index 0669231e00..71b003b1d1 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s +++ b/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D5270 /* 0F9C20 802D5270 24C6FFFF */ addiu $a2, $a2, -1 diff --git a/asm/nonmatchings/code_f8f60_len_1560/setup_path_data.s b/asm/nonmatchings/code_f8f60_len_1560/setup_path_data.s index 4dcc107426..d6ce642b6b 100644 --- a/asm/nonmatchings/code_f8f60_len_1560/setup_path_data.s +++ b/asm/nonmatchings/code_f8f60_len_1560/setup_path_data.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel setup_path_data /* 0F975C 802D4DAC 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s b/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s index 3c3b5b4931..944d2a4154 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/AddKeyItem.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel AddKeyItem /* 0FB278 802D68C8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/CountFortessKeys.s b/asm/nonmatchings/code_fa4c0_len_3bf0/CountFortessKeys.s index 6306f349eb..a355c71b82 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/CountFortessKeys.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/CountFortessKeys.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel CountFortessKeys /* 0FB5FC 802D6C4C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntity.s b/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntity.s index 7874229235..20b6f13381 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntity.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DropItemEntity /* 0FB770 802D6DC0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntityB.s b/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntityB.s index 6b053c027e..14991ad207 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntityB.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/DropItemEntityB.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel DropItemEntityB /* 0FB870 802D6EC0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s b/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s index 30dd0ed0ea..8064e18dcd 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/FadeInMusic.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FadeInMusic /* 0FA7A4 802D5DF4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/FindItem.s b/asm/nonmatchings/code_fa4c0_len_3bf0/FindItem.s index f67ede32b7..74940b4668 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/FindItem.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/FindItem.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FindItem /* 0FB4C8 802D6B18 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/FindKeyItem.s b/asm/nonmatchings/code_fa4c0_len_3bf0/FindKeyItem.s index 5b819a24e3..0357297b8a 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/FindKeyItem.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/FindKeyItem.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel FindKeyItem /* 0FB3C4 802D6A14 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/GetItemPower.s b/asm/nonmatchings/code_fa4c0_len_3bf0/GetItemPower.s index 6b277c5850..077a323d9d 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/GetItemPower.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/GetItemPower.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel GetItemPower /* 0FBCDC 802D732C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/HasKeyItem.s b/asm/nonmatchings/code_fa4c0_len_3bf0/HasKeyItem.s index 5ec0555f06..b681d8dfad 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/HasKeyItem.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/HasKeyItem.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel HasKeyItem /* 0FB34C 802D699C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/MakeItemEntity.s b/asm/nonmatchings/code_fa4c0_len_3bf0/MakeItemEntity.s index 147bb5ec89..77b4177c34 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/MakeItemEntity.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/MakeItemEntity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel MakeItemEntity /* 0FB670 802D6CC0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/PlayEffect.s b/asm/nonmatchings/code_fa4c0_len_3bf0/PlayEffect.s index e1bcb3b7e5..1abacae3db 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/PlayEffect.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/PlayEffect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlayEffect /* 0FCC4C 802D829C 27BDFF38 */ addiu $sp, $sp, -0xc8 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAtF.s b/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAtF.s index a222e5f2ff..2b2d439c68 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAtF.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/PlaySoundAtF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel PlaySoundAtF /* 0FAD1C 802D636C 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveBadge.s b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveBadge.s index 9d712a8ba1..fac49d31ce 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveBadge.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveBadge.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveBadge /* 0FBA00 802D7050 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveEffect.s b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveEffect.s index 56d41a33e8..31e5833d24 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveEffect.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveEffect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveEffect /* 0FC494 802D7AE4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveFortressKeys.s b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveFortressKeys.s index b2397218f9..b3756b9e4a 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveFortressKeys.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveFortressKeys.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveFortressKeys /* 0FB644 802D6C94 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItem.s b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItem.s index a117215355..67d5b178e6 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItem.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItem.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveItem /* 0FB54C 802D6B9C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemEntity.s b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemEntity.s index 0472a72c21..523e302a4b 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemEntity.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/RemoveItemEntity.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel RemoveItemEntity /* 0FB97C 802D6FCC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemFlags.s b/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemFlags.s index 85dc739cec..80876b2618 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemFlags.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/SetItemFlags.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetItemFlags /* 0FBB44 802D7194 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/ShowEmote.s b/asm/nonmatchings/code_fa4c0_len_3bf0/ShowEmote.s index 0e7aa9af95..446912c092 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/ShowEmote.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/ShowEmote.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowEmote /* 0FC250 802D78A0 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/ShowGotItem.s b/asm/nonmatchings/code_fa4c0_len_3bf0/ShowGotItem.s index 2b0bb3dedd..9779ed663a 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/ShowGotItem.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/ShowGotItem.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowGotItem /* 0FBD54 802D73A4 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/ShowSleepBubble.s b/asm/nonmatchings/code_fa4c0_len_3bf0/ShowSleepBubble.s index bc85b9730b..09b6bbf347 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/ShowSleepBubble.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/ShowSleepBubble.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ShowSleepBubble /* 0FC9D8 802D8028 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s index 5ad45ade51..076ec1fda8 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D5B10 /* 0FA4C0 802D5B10 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D7460.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D7460.s index 11843f9f25..996f0dbe96 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D7460.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D7460.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D7460 /* 0FBE10 802D7460 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D74C0.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D74C0.s index c6551ba933..965d35ee51 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D74C0.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D74C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802D74C0 /* 0FBE70 802D74C0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s b/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s index 45b0c97c06..ee829e564e 100644 --- a/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s +++ b/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel SetSpriteShading /* 0FE0B0 802D9700 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_12bit.s b/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_12bit.s index efaab16fb4..b82213f7f7 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_12bit.s +++ b/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_12bit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _spr_sign_extend_12bit /* 1001CC 802DD0DC 30840FFF */ andi $a0, $a0, 0xfff diff --git a/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_16bit.s b/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_16bit.s index 52307b7a83..b4d42c834e 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_16bit.s +++ b/asm/nonmatchings/code_fee30_len_2d60/_spr_sign_extend_16bit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _spr_sign_extend_16bit /* 1001EC 802DD0FC 3084FFFF */ andi $a0, $a0, 0xffff diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DBD40.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DBD40.s index 17452afdfc..55d428fafb 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DBD40.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DBD40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DBD40 /* 0FEE30 802DBD40 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DBD8C.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DBD8C.s index 806e996021..5f2459ab9a 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DBD8C.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DBD8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DBD8C /* 0FEE7C 802DBD8C 3C02802E */ lui $v0, 0x802e diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DBDBC.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DBDBC.s index 54f46a2558..186492b54f 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DBDBC.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DBDBC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DBDBC /* 0FEEAC 802DBDBC 0080382D */ daddu $a3, $a0, $zero diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s index f862c32268..f352aea5f3 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DBE78 /* 0FEF68 802DBE78 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s index 5489f7b341..2878d1ce42 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DBFC0 /* 0FF0B0 802DBFC0 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s index 4b1ac19d68..3a15bed936 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DC008 /* 0FF0F8 802DC008 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s index 7fdf4226c2..b335ba034d 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DD634 /* 100724 802DD634 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s index e9acc96870..696cb22821 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DD6DC /* 1007CC 802DD6DC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD7B0.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD7B0.s index ac0c9c270d..fe7dc03619 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD7B0.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD7B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DD7B0 /* 1008A0 802DD7B0 2403FFFF */ addiu $v1, $zero, -1 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s index e0e3d0e059..8eb2b1df13 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DD820 /* 100910 802DD820 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD88C.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD88C.s index 19f4a11a3c..705e2adbb5 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD88C.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD88C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DD88C /* 10097C 802DD88C 460C6300 */ add.s $f12, $f12, $f12 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD89C.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD89C.s index cf7681e335..f087492fba 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD89C.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD89C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DD89C /* 10098C 802DD89C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s index ec0522dcac..0a087647a1 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DD8F8 /* 1009E8 802DD8F8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDA60.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDA60.s index 7e7bc2b314..c94f816678 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDA60.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDA60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DDA60 /* 100B50 802DDA60 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s index cb9925cc1a..4a2052aa9f 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DDA8C /* 100B7C 802DDA8C 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s index d6cdef8652..0f441c66a4 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DDEC4 /* 100FB4 802DDEC4 00041040 */ sll $v0, $a0, 1 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s index dae79f82f0..58be4dc06d 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DDEE4 /* 100FD4 802DDEE4 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DDFF8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DDFF8.s index f3893ce6bd..611e436516 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DDFF8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DDFF8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DDFF8 /* 1010E8 802DDFF8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s index e793a25708..7896c3bfcb 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE0C0 /* 1011B0 802DE0C0 2484FFFF */ addiu $a0, $a0, -1 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s index 1c1bc0a216..d9a0492db2 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE0EC /* 1011DC 802DE0EC 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE2AC.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE2AC.s index c72fec9f22..e84d5f2750 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE2AC.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE2AC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE2AC /* 10139C 802DE2AC 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s index 8505100fc7..f7652f14b0 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE3D8 /* 1014C8 802DE3D8 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s index 33c4fc6cef..c2295f49aa 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE5C8 /* 1016B8 802DE5C8 00041080 */ sll $v0, $a0, 2 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s index 883f88b1ab..baaa22cb30 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE5E8 /* 1016D8 802DE5E8 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s index 8e958f52fb..1a816e54f5 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE780 /* 101870 802DE780 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE894.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE894.s index de81407dfa..01aa882977 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE894.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE894.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE894 /* 101984 802DE894 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DE9D8.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DE9D8.s index b3bd79e537..67f4dd4ad6 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DE9D8.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DE9D8.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DE9D8 /* 101AC8 802DE9D8 0080382D */ daddu $a3, $a0, $zero diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s index 745fb3eb31..b4139da258 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DEA40 /* 101B30 802DEA40 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s index f2a954e777..599a958180 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s +++ b/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_802DEA6C /* 101B5C 802DEA6C 00042080 */ sll $a0, $a0, 2 diff --git a/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s b/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s index 961b36839e..4503adb59a 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s +++ b/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel render_sprite /* 100D30 802DDC40 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s index b4955297a0..7da555b811 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel spr_appendMDL_component /* 0FF9E4 802DC8F4 27BDFEF0 */ addiu $sp, $sp, -0x110 diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s b/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s index 1d98a4051f..a75cf577de 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel spr_draw_component /* 0FFFCC 802DCEDC 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s b/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s index 59fcadcfdf..694b427e26 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s +++ b/asm/nonmatchings/code_fee30_len_2d60/spr_transform_point.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel spr_transform_point /* 0FFDF0 802DCD00 27BDFF20 */ addiu $sp, $sp, -0xe0 diff --git a/asm/nonmatchings/code_fee30_len_2d60/update_component.s b/asm/nonmatchings/code_fee30_len_2d60/update_component.s index ee3b478a45..450ec346b2 100644 --- a/asm/nonmatchings/code_fee30_len_2d60/update_component.s +++ b/asm/nonmatchings/code_fee30_len_2d60/update_component.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel update_component /* 10020C 802DD11C 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/guOrtho/guOrtho.s b/asm/nonmatchings/guOrtho/guOrtho.s index 3215d95dd7..80bf413a74 100644 --- a/asm/nonmatchings/guOrtho/guOrtho.s +++ b/asm/nonmatchings/guOrtho/guOrtho.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guOrtho /* 03EE40 80063A40 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/guOrtho/guOrthoF.s b/asm/nonmatchings/guOrtho/guOrthoF.s index 46e88bb08a..35632fb51e 100644 --- a/asm/nonmatchings/guOrtho/guOrthoF.s +++ b/asm/nonmatchings/guOrtho/guOrthoF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guOrthoF /* 03ED10 80063910 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s b/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s index 8e64099f9d..158b1f419a 100644 --- a/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s +++ b/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel boot_idle /* 039D0C 8005E90C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s b/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s index a2adfddde5..103669ce85 100644 --- a/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s +++ b/asm/nonmatchings/os/code_39cb0_len_100/nuBoot.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuBoot /* 039CB0 8005E8B0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScAddClient.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScAddClient.s index 5b372a6f8f..023356131c 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScAddClient.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScAddClient.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScAddClient /* 03A230 8005EE30 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScCreateScheduler.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScCreateScheduler.s index 9a98e9e283..6290c8529a 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScCreateScheduler.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScCreateScheduler.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScCreateScheduler /* 039DB0 8005E9B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s index 4cf0b6065e..2fbab9d20b 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScEventBroadcast /* 03A4C0 8005F0C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventHandler.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventHandler.s index a4d83ada4d..f9a5ad2345 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventHandler.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventHandler.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScEventHandler /* 03A3A8 8005EFA8 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteAudio.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteAudio.s index 45eeb0e451..32e512ef19 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteAudio.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteAudio.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScExecuteAudio /* 039FE0 8005EBE0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteGraphics.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteGraphics.s index 8cdf599031..ff91f903c6 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteGraphics.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScExecuteGraphics.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScExecuteGraphics /* 03A114 8005ED14 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetAudioMQ.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetAudioMQ.s index a7464e92e8..eeb870e29e 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetAudioMQ.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetAudioMQ.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScGetAudioMQ /* 03A384 8005EF84 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetFrameRate.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetFrameRate.s index cd9fcea8b2..eed9eef0f8 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetFrameRate.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetFrameRate.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScGetFrameRate /* 03A39C 8005EF9C 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetGfxMQ.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetGfxMQ.s index a2c9850ad3..fd3138391b 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetGfxMQ.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScGetGfxMQ.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScGetGfxMQ /* 03A378 8005EF78 3C02800E */ lui $v0, 0x800e diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s index 5ab4b7c561..b472ae74c1 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScRemoveClient /* 03A2BC 8005EEBC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s index b4693da071..f52727e702 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScResetClientMesgType /* 03A338 8005EF38 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScSetFrameBufferNum.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScSetFrameBufferNum.s index be54bed1b9..20232efa90 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScSetFrameBufferNum.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScSetFrameBufferNum.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScSetFrameBufferNum /* 03A390 8005EF90 3C01800E */ lui $at, 0x800e diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScWaitTaskReady.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScWaitTaskReady.s index 5a79d73930..f759efae21 100644 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScWaitTaskReady.s +++ b/asm/nonmatchings/os/code_39db0_len_8a0/nuScWaitTaskReady.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuScWaitTaskReady /* 03A520 8005F120 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s b/asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s index 472e3d4c16..573db2af81 100644 --- a/asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s +++ b/asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxFuncSet /* 03A650 8005F250 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s b/asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s index 2a00e37477..0c72eb4723 100644 --- a/asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s +++ b/asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxPreNMIFuncSet /* 03A690 8005F290 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s b/asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s index 576ab54ac9..a07e2e4ffc 100644 --- a/asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s +++ b/asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxTaskAllEndWait .L8005F2D0: diff --git a/asm/nonmatchings/os/code_3a6f0_len_110/nuGfxSetCfb.s b/asm/nonmatchings/os/code_3a6f0_len_110/nuGfxSetCfb.s index 88168118e8..1f17311cf7 100644 --- a/asm/nonmatchings/os/code_3a6f0_len_110/nuGfxSetCfb.s +++ b/asm/nonmatchings/os/code_3a6f0_len_110/nuGfxSetCfb.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxSetCfb /* 03A6F0 8005F2F0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s b/asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s index 97aa14aa91..84fef71f3e 100644 --- a/asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s +++ b/asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxDisplayOff /* 03A800 8005F400 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s b/asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s index 0b4664392d..22be1ccc70 100644 --- a/asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s +++ b/asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxDisplayOn /* 03A830 8005F430 24020080 */ addiu $v0, $zero, 0x80 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s index 3aeec8e1b1..3be86b3dfa 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakFileDelete /* 03AC64 8005F864 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s index 8479f9f1b1..473940630d 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakFileNum /* 03ACD0 8005F8D0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s index a888335d0d..9634c6add3 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakFileOpen /* 03ABB0 8005F7B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s index fb83f71849..31164be2a2 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakFileReadWrite /* 03AB70 8005F770 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s index 7b6f490692..5d9d5aa571 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakFileState /* 03ACA4 8005F8A4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s index d4251ecf40..d285cfc4f6 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakFree /* 03AB48 8005F748 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s index a4d3e0cfed..b8aca7037f 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakOpen /* 03AAF8 8005F6F8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s index 5d1827c2a5..9ea1b6f79d 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contPakRepairId /* 03ACFC 8005F8FC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s b/asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s index 1b8504fca4..bed361ae45 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contRmbCheckMesg /* 03B110 8005FD10 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s b/asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s index 2862eb2412..ebcf23ae6d 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contRmbControl /* 03AF10 8005FB10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s b/asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s index 0425250e25..2e8180ebd9 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contRmbStartMesg /* 03B158 8005FD58 8C84000C */ lw $a0, 0xc($a0) diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s index 145e24a48a..0a77402c06 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContDataGet /* 03AA50 8005F650 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s index 61d97f0eef..8d33ba1f01 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContInit /* 03AA10 8005F610 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s index 4496d06c28..4a32d4c414 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContPakMgrInit /* 03AAB0 8005F6B0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s index 40de99e856..3d9c5dc23b 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContPakMgrRemove /* 03AAD4 8005F6D4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrInit.s index 65567cd0a0..dc7e951a74 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrInit.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContRmbMgrInit /* 03B08C 8005FC8C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s index 695de08a92..c2c4fe84d9 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContRmbMgrRemove /* 03B0EC 8005FCEC 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s index a260dea4c5..0aa914db1e 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxInit /* 03A960 8005F560 27BDF7E8 */ addiu $sp, $sp, -0x818 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s index bff47127d8..936252342a 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuPiInit /* 03A850 8005F450 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s b/asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s index a20376185a..c76516624f 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuPiReadRom /* 03A890 8005F490 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s b/asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s index 0f2caed7f0..6297547d84 100644 --- a/asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s +++ b/asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osMotorStop /* 03AD20 8005F920 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s b/asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s index e711f4357e..85af1ed20e 100644 --- a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s +++ b/asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContRmbCheck /* 03B2F0 8005FEF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s b/asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s index 011d7c1331..5615495ec7 100644 --- a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s +++ b/asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContRmbStart /* 03B290 8005FE90 00041080 */ sll $v0, $a0, 2 diff --git a/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s b/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s index 7416a7e342..9471756b78 100644 --- a/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s +++ b/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContRmbModeSet /* 03B390 8005FF90 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStop.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStop.s index fc19380e06..6610894233 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStop.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContRmbForceStop /* 03B4A0 800600A0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStopEnd.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStopEnd.s index 8ec4f5a69b..add00c6984 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStopEnd.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuContRmbForceStopEnd.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContRmbForceStopEnd /* 03B4C0 800600C0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s index 8a0c1e2bcf..cae4aa5502 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxThread /* 03B648 80060248 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s index 87d9d1183f..80574b1192 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThreadStart.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxThreadStart /* 03B5F0 800601F0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s index 01ea099a3e..a9c29a1ee7 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuPiReadRomOverlay /* 03B4E0 800600E0 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s b/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s index 8ead27644e..981a7dc90d 100644 --- a/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s +++ b/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxSwapCfbFuncSet /* 03B710 80060310 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s b/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s index c24ce9d614..6ffb90256c 100644 --- a/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s +++ b/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxRetraceWait /* 03B770 80060370 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s index 0972fc540e..e9b6deb226 100644 --- a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s +++ b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuSiCallBackAdd /* 03B7F0 800603F0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s index 5c4f400551..ded7f07c1f 100644 --- a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s +++ b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuSiCallBackRemove /* 03B890 80060490 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3b910_len_410/contQuery.s b/asm/nonmatchings/os/code_3b910_len_410/contQuery.s index 73c50f94db..eb1350181d 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contQuery.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contQuery.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contQuery /* 03BC70 80060870 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/contReadData.s b/asm/nonmatchings/os/code_3b910_len_410/contReadData.s index ae5ac3ad89..2a175f7a61 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contReadData.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contReadData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contReadData /* 03BB38 80060738 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s b/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s index 9823fb1a20..245947e077 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contReadNW /* 03BBB4 800607B4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s b/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s index 336e66f30d..65a6803481 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel contRetrace /* 03BA5C 8006065C 3C02800A */ lui $v0, 0x800a diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContDataClose.s b/asm/nonmatchings/os/code_3b910_len_410/nuContDataClose.s index 59c19d6791..1de4daa942 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContDataClose.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContDataClose.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContDataClose /* 03BA0C 8006060C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContDataLock.s b/asm/nonmatchings/os/code_3b910_len_410/nuContDataLock.s index 9fa2a16c56..918f079af5 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContDataLock.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContDataLock.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContDataLock /* 03BCC0 800608C0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContDataOpen.s b/asm/nonmatchings/os/code_3b910_len_410/nuContDataOpen.s index 25f8c9661c..3e2c95eb35 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContDataOpen.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContDataOpen.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContDataOpen /* 03BA34 80060634 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s b/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s index 659acfcc75..eefeab88a2 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContDataUnLock /* 03BCF0 800608F0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s index c444772a9f..c55e82625e 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContMgrInit /* 03B910 80060510 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s index 29ce681728..911b5eff23 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContMgrRemove /* 03B9E8 800605E8 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3bd20_len_c0/nuContQueryRead.s b/asm/nonmatchings/os/code_3bd20_len_c0/nuContQueryRead.s index c07545f62d..46ef803ced 100644 --- a/asm/nonmatchings/os/code_3bd20_len_c0/nuContQueryRead.s +++ b/asm/nonmatchings/os/code_3bd20_len_c0/nuContQueryRead.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuContQueryRead /* 03BD20 80060920 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3bd20_len_c0/osSetIntMask.s b/asm/nonmatchings/os/code_3bd20_len_c0/osSetIntMask.s index e535f25b53..efdb7ff7c4 100644 --- a/asm/nonmatchings/os/code_3bd20_len_c0/osSetIntMask.s +++ b/asm/nonmatchings/os/code_3bd20_len_c0/osSetIntMask.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetIntMask /* 03BD40 80060940 400C6000 */ mfc0 $t4, $12 diff --git a/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s b/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s index bca2e0def4..251c599084 100644 --- a/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s +++ b/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCreatePiManager /* 03BDE0 800609E0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s b/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s index 03e1c3e977..83efdfea7c 100644 --- a/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s +++ b/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEPiRawStartDma /* 03BF70 80060B70 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiWriteIo.s b/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiWriteIo.s index bb6665dde9..5422178e23 100644 --- a/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiWriteIo.s +++ b/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiWriteIo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEPiWriteIo /* 03C160 80060D60 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3c1c0_len_60/osEPiReadIo.s b/asm/nonmatchings/os/code_3c1c0_len_60/osEPiReadIo.s index 108f6c4d2f..5e36df28a4 100644 --- a/asm/nonmatchings/os/code_3c1c0_len_60/osEPiReadIo.s +++ b/asm/nonmatchings/os/code_3c1c0_len_60/osEPiReadIo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEPiReadIo /* 03C1C0 80060DC0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s b/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s index a2f99dfb4c..c74d8a4299 100644 --- a/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s +++ b/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEPiStartDma /* 03C220 80060E20 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s b/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s index 7e430eb446..40c840020c 100644 --- a/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s +++ b/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEPiLinkHandle /* 03C2C0 80060EC0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s b/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s index c107610e5e..6ab660700b 100644 --- a/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s +++ b/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCartRomInit /* 03C310 80060F10 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s b/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s index a3ecc0de3a..cb3d8f4e09 100644 --- a/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s +++ b/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osDevMgrMain /* 03C490 80061090 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/os/code_3c850_len_f0/osPiCreateAccessQueue.s b/asm/nonmatchings/os/code_3c850_len_f0/osPiCreateAccessQueue.s index 01ebaac746..2efef22d3f 100644 --- a/asm/nonmatchings/os/code_3c850_len_f0/osPiCreateAccessQueue.s +++ b/asm/nonmatchings/os/code_3c850_len_f0/osPiCreateAccessQueue.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPiCreateAccessQueue /* 03C850 80061450 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3c850_len_f0/osPiGetAccess.s b/asm/nonmatchings/os/code_3c850_len_f0/osPiGetAccess.s index c001554909..3613e41d66 100644 --- a/asm/nonmatchings/os/code_3c850_len_f0/osPiGetAccess.s +++ b/asm/nonmatchings/os/code_3c850_len_f0/osPiGetAccess.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPiGetAccess /* 03C8A4 800614A4 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s b/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s index 1ba6ca916e..798fad651a 100644 --- a/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s +++ b/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPiRelAccess /* 03C910 80061510 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3c940_len_140/osAiGetLength.s b/asm/nonmatchings/os/code_3c940_len_140/osAiGetLength.s index bec8bb3113..2025db22da 100644 --- a/asm/nonmatchings/os/code_3c940_len_140/osAiGetLength.s +++ b/asm/nonmatchings/os/code_3c940_len_140/osAiGetLength.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osAiGetLength /* 03C940 80061540 3C02A450 */ lui $v0, 0xa450 diff --git a/asm/nonmatchings/os/code_3c940_len_140/osAiGetStatus.s b/asm/nonmatchings/os/code_3c940_len_140/osAiGetStatus.s index 328423de35..02b4028cb0 100644 --- a/asm/nonmatchings/os/code_3c940_len_140/osAiGetStatus.s +++ b/asm/nonmatchings/os/code_3c940_len_140/osAiGetStatus.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osAiGetStatus /* 03C950 80061550 3C02A450 */ lui $v0, 0xa450 diff --git a/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s b/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s index cd8c16c349..3a4cea333a 100644 --- a/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s +++ b/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osAiSetFrequency /* 03C960 80061560 44841000 */ mtc1 $a0, $f2 diff --git a/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s b/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s index 301a9c95cb..2ae37b58e5 100644 --- a/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s +++ b/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osAiSetNextBuffer /* 03CA80 80061680 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s b/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s index 93c00ae2d4..893927c70e 100644 --- a/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s +++ b/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osInvalDCache /* 03CB20 80061720 18A00020 */ blez $a1, .L800617A4 diff --git a/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s b/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s index 195df91a04..cabd6b0586 100644 --- a/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s +++ b/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osInvalICache /* 03CBD0 800617D0 18A00011 */ blez $a1, .L80061818 diff --git a/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s b/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s index 9d6977b752..2e0f8d0bd1 100644 --- a/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s +++ b/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osWritebackDCache /* 03CC50 80061850 18A00011 */ blez $a1, .L80061898 diff --git a/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s b/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s index add1b81e94..f7d3571814 100644 --- a/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s +++ b/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osWritebackDCacheAll /* 03CCD0 800618D0 3C088000 */ lui $t0, 0x8000 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetInitData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetInitData.s index b79ef8b242..6e5add9f8f 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetInitData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetInitData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContGetInitData /* 03D11C 80061D1C 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetQuery.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetQuery.s index eef881f9b9..cf43011557 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetQuery.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetQuery.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContGetQuery /* 03CD80 80061980 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s index eef8a65acf..1561a5ee3b 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContGetReadData /* 03CE28 80061A28 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContInit.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContInit.s index 86911760c1..00834f41f6 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContInit.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContInit /* 03CF80 80061B80 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s index a1d61d2f28..b4ad701047 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContStartQuery /* 03CD00 80061900 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s index 23fdf0dc5c..71882daaa9 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContStartReadData /* 03CDA0 800619A0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s index d451d78423..006fdd0230 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPackReadData /* 03CEC4 80061AC4 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s index d8475e04e7..42df17eba3 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPackRequestData /* 03D1D0 80061DD0 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s index 26b564478d..9c520554ee 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osVirtualToPhysical /* 03D290 80061E90 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s b/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s index 1363810ce6..723c0c0d32 100644 --- a/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s +++ b/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sqrtf /* 03D2F0 80061EF0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/os/code_3d300_len_30/coss.s b/asm/nonmatchings/os/code_3d300_len_30/coss.s index 547245d24f..9f856330c0 100644 --- a/asm/nonmatchings/os/code_3d300_len_30/coss.s +++ b/asm/nonmatchings/os/code_3d300_len_30/coss.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel coss /* 03D300 80061F00 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s b/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s index 59a355bd6d..c27df1a744 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guFrustum /* 03D460 80062060 27BDFF70 */ addiu $sp, $sp, -0x90 diff --git a/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s b/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s index f6514ab17b..a35868de52 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guFrustumF /* 03D330 80061F30 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s b/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s index 9e12a8348f..d2fbe36e3d 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guLookAt /* 03D930 80062530 27BDFF48 */ addiu $sp, $sp, -0xb8 diff --git a/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s b/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s index 59d0df4652..395597981a 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guLookAtF /* 03D5B0 800621B0 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s index a6fb096591..f9d0e94490 100644 --- a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s +++ b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guLookAtHilite /* 03E644 80063244 27BDFF48 */ addiu $sp, $sp, -0xb8 diff --git a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s index d04e7e6410..b817ba97c1 100644 --- a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s +++ b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guLookAtHiliteF /* 03DCC0 800628C0 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s index fd12fde536..72835095f6 100644 --- a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s +++ b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guLookAtReflect /* 03EC98 80063898 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s index b00475fb2a..4454f1fd91 100644 --- a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s +++ b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guLookAtReflectF /* 03E720 80063320 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s b/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s index 0299ebcff5..4cda449718 100644 --- a/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s +++ b/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guPerspective /* 03F140 80063D40 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s b/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s index d7eebe85cf..bc50b67075 100644 --- a/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s +++ b/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guPerspectiveF /* 03EF90 80063B90 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s b/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s index 49be8766ca..7b5a0912ab 100644 --- a/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s +++ b/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guPosition /* 03F4E8 800640E8 3C018009 */ lui $at, 0x8009 diff --git a/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s b/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s index 2c29ef595b..009766d5eb 100644 --- a/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s +++ b/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guPositionF /* 03F310 80063F10 3C018009 */ lui $at, 0x8009 diff --git a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s index adc47046c7..7b436bb0fa 100644 --- a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s +++ b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guRotateAngles /* 03F858 80064458 3C018009 */ lui $at, 0x8009 diff --git a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s index 3e0e742a90..aadf517b8d 100644 --- a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s +++ b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guRotateAnglesF /* 03F6D0 800642D0 3C018009 */ lui $at, 0x8009 diff --git a/asm/nonmatchings/os/code_3f9f0_len_60/sins.s b/asm/nonmatchings/os/code_3f9f0_len_60/sins.s index dafd807ef6..514d058a41 100644 --- a/asm/nonmatchings/os/code_3f9f0_len_60/sins.s +++ b/asm/nonmatchings/os/code_3f9f0_len_60/sins.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sins /* 03F9F0 800645F0 3084FFFF */ andi $a0, $a0, 0xffff diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s b/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s index 9cced52834..4914a40766 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _Printf /* 03FEA0 80064AA0 27BDFF50 */ addiu $sp, $sp, -0xb0 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s b/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s index ded77fa270..5cc03d02b2 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _Putfld /* 040420 80065020 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s b/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s index 4d48be790d..dd2215d7ef 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bcopy /* 03FA50 80064650 10C0001B */ beqz $a2, .L800646C0 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s b/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s index 17b98df719..8a5d21229f 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bzero /* 03FD70 80064970 00041823 */ negu $v1, $a0 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s b/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s index e82b2d4964..85094f9ee4 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel memcpy /* 03FE74 80064A74 10C00007 */ beqz $a2, .L80064A94 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s b/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s index fd141776ab..c350dfc2cc 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCreateMesgQueue /* 040980 80065580 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s b/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s index db6de81244..f445275146 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel proutSprintf /* 040948 80065548 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s b/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s index eee707a2d3..e4024c0933 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/sprintf.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sprintf /* 0408F0 800654F0 AFA50004 */ sw $a1, 4($sp) diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/strchr.s b/asm/nonmatchings/os/code_3fa50_len_f60/strchr.s index 1d37d69694..de61dd32be 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/strchr.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/strchr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel strchr /* 03FE10 80064A10 90830000 */ lbu $v1, ($a0) diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/strlen.s b/asm/nonmatchings/os/code_3fa50_len_f60/strlen.s index 398dc34246..1590799cb5 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/strlen.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/strlen.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel strlen /* 03FE50 80064A50 80820000 */ lb $v0, ($a0) diff --git a/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s b/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s index b1b1570e6b..686a8e24da 100644 --- a/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s +++ b/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osJamMesg /* 0409B0 800655B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s b/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s index 058130c8f7..3420cfe4bf 100644 --- a/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s +++ b/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osRecvMesg /* 040AF0 800656F0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s b/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s index f4346ef918..da08a97640 100644 --- a/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s +++ b/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osGetCount /* 040E00 80065A00 40024800 */ mfc0 $v0, $9 diff --git a/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s b/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s index 0862c8b0c6..07d55b5f69 100644 --- a/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s +++ b/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSendMesg /* 040C20 80065820 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s b/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s index e8b6254208..d619d4cb55 100644 --- a/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s +++ b/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetEventMesg /* 040D50 80065950 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s index 60855152f9..179d6b7b22 100644 --- a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s +++ b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpTaskLoad /* 040E10 80065A10 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s index ee773d8293..5feb911202 100644 --- a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s +++ b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpTaskStartGo /* 04101C 80065C1C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s b/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s index 4eb8fba929..9780c2ed04 100644 --- a/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s +++ b/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSiRawStartDma /* 0410C0 80065CC0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s index aa6c720bc2..fc81b87686 100644 --- a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s +++ b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpTaskYield /* 041050 80065C50 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s index d834b3fef3..ecb83f1ff0 100644 --- a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s +++ b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpTaskYielded /* 041070 80065C70 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41170_len_f0/osSiCreateAccessQueue.s b/asm/nonmatchings/os/code_41170_len_f0/osSiCreateAccessQueue.s index 4e5103ca74..1b74228ffb 100644 --- a/asm/nonmatchings/os/code_41170_len_f0/osSiCreateAccessQueue.s +++ b/asm/nonmatchings/os/code_41170_len_f0/osSiCreateAccessQueue.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSiCreateAccessQueue /* 041170 80065D70 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41170_len_f0/osSiGetAccess.s b/asm/nonmatchings/os/code_41170_len_f0/osSiGetAccess.s index ad9b55ad6c..f7878620f8 100644 --- a/asm/nonmatchings/os/code_41170_len_f0/osSiGetAccess.s +++ b/asm/nonmatchings/os/code_41170_len_f0/osSiGetAccess.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSiGetAccess /* 0411C4 80065DC4 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s b/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s index bfe5b66842..ecca9e1d7f 100644 --- a/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s +++ b/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSiRelAccess /* 041230 80065E30 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s b/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s index 4244cc1045..56bfd2a907 100644 --- a/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s +++ b/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetThreadPri /* 041350 80065F50 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_41420_len_120/osStartThread.s b/asm/nonmatchings/os/code_41420_len_120/osStartThread.s index 22b99f2665..a363c06bea 100644 --- a/asm/nonmatchings/os/code_41420_len_120/osStartThread.s +++ b/asm/nonmatchings/os/code_41420_len_120/osStartThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osStartThread /* 041420 80066020 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s b/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s index 5057c8cd35..c95acb01c6 100644 --- a/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s +++ b/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osStopThread /* 041540 80066140 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s b/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s index d2728d0407..f4438000c8 100644 --- a/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s +++ b/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osDequeueThread /* 041600 80066200 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s b/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s index bedc6ead29..89795cccce 100644 --- a/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s +++ b/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osYieldThread /* 041640 80066240 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s b/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s index 8bbf3ca183..c165b40572 100644 --- a/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s +++ b/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osGetActiveQueue /* 041690 80066290 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s b/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s index 25cf4522c3..63b814423f 100644 --- a/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s +++ b/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osGetTime /* 0416A0 800662A0 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_41730_len_20/osSetTime.s b/asm/nonmatchings/os/code_41730_len_20/osSetTime.s index 5ed1ffef71..aef1dcd894 100644 --- a/asm/nonmatchings/os/code_41730_len_20/osSetTime.s +++ b/asm/nonmatchings/os/code_41730_len_20/osSetTime.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetTime /* 041730 80066330 3C01800A */ lui $at, 0x800a diff --git a/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s b/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s index 1699b74ebb..b768910322 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s +++ b/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osInsertTimer /* 041A90 80066690 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s b/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s index 5c94cb2290..de39d093f3 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s +++ b/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetTimer /* 041750 80066350 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s b/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s index caa8534ae6..26e8898e4c 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s +++ b/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetTimerIntr /* 041A10 80066610 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s b/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s index a91f1dccb7..85c04b13ba 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s +++ b/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osTimerInterrupt /* 0418D4 800664D4 3C038009 */ lui $v1, 0x8009 diff --git a/asm/nonmatchings/os/code_41750_len_450/osTimerServicesInit.s b/asm/nonmatchings/os/code_41750_len_450/osTimerServicesInit.s index cd7b5979d7..6f0f382a86 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osTimerServicesInit.s +++ b/asm/nonmatchings/os/code_41750_len_450/osTimerServicesInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osTimerServicesInit /* 041880 80066480 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s b/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s index aaa454166e..74dd2f7f09 100644 --- a/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s +++ b/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osMapTLB /* 041BA0 800667A0 40085000 */ mfc0 $t0, $10 diff --git a/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s b/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s index 7c9f51fe40..081482a56b 100644 --- a/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s +++ b/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osProbeTLB /* 041C60 80066860 40085000 */ mfc0 $t0, $10 diff --git a/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s b/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s index 5365c6c774..4eb4afb195 100644 --- a/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s +++ b/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osUnmapTLB /* 041D20 80066920 40085000 */ mfc0 $t0, $10 diff --git a/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s b/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s index 3db5b2b18e..f55783f70d 100644 --- a/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s +++ b/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osUnmapTLBAll /* 041D60 80066960 40085000 */ mfc0 $t0, $10 diff --git a/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s b/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s index e414d7d80d..993acfe0f2 100644 --- a/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s +++ b/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViGetCurrentFramebuffer /* 041DB0 800669B0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s b/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s index fca9b33166..0bbce70907 100644 --- a/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s +++ b/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViGetNextFramebuffer /* 041DF0 800669F0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s b/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s index 268649abb9..c7e4ad4b66 100644 --- a/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s +++ b/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViGetCurrentMode /* 041E30 80066A30 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s b/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s index 430ac10066..951663fbc2 100644 --- a/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s +++ b/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCreateViManager /* 041E70 80066A70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s b/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s index 99c5094548..58def62913 100644 --- a/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s +++ b/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel viMgrMain /* 042010 80066C10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s b/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s index 275a77ba58..2a5f6ea81e 100644 --- a/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s +++ b/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViSetEvent /* 0421B0 80066DB0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s b/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s index de5f28a8cb..c0be8b5400 100644 --- a/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s +++ b/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViSetMode /* 042210 80066E10 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s b/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s index f4ecee0d36..f480c2c029 100644 --- a/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s +++ b/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViSetSpecialFeatures /* 042260 80066E60 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s b/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s index 6b62be38ad..e9dd71c83d 100644 --- a/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s +++ b/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViSetYScale /* 0423D0 80066FD0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s b/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s index 51313b7cd9..a3ab85d064 100644 --- a/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s +++ b/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViSwapBuffer /* 042420 80067020 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s b/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s index e0b81a8f6e..9cc4568ca1 100644 --- a/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s +++ b/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViSwapContext /* 042470 80067070 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s b/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s index 02cce7e8cd..7e42763c00 100644 --- a/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s +++ b/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxIdent /* 042840 80067440 20080001 */ addi $t0, $zero, 1 diff --git a/asm/nonmatchings/os/code_42780_len_120/osViBlack.s b/asm/nonmatchings/os/code_42780_len_120/osViBlack.s index 48abc4ae63..15139ed9f8 100644 --- a/asm/nonmatchings/os/code_42780_len_120/osViBlack.s +++ b/asm/nonmatchings/os/code_42780_len_120/osViBlack.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViBlack /* 042780 80067380 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s b/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s index 73be23d929..1b2274aa03 100644 --- a/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s +++ b/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViRepeatLine /* 0427E0 800673E0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s b/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s index 0219af3f5f..24cb98427d 100644 --- a/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s +++ b/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxF2L /* 042900 80067500 3C014780 */ lui $at, 0x4780 diff --git a/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s b/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s index 322dcc706a..e597a5077f 100644 --- a/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s +++ b/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxL2F /* 042980 80067580 3C013780 */ lui $at, 0x3780 diff --git a/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s b/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s index 6892c1b3ea..9bafd8019d 100644 --- a/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s +++ b/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxCatF /* 042A00 80067600 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/os/code_42b00_len_c0/guScale.s b/asm/nonmatchings/os/code_42b00_len_c0/guScale.s index d4e326c023..d907c309a2 100644 --- a/asm/nonmatchings/os/code_42b00_len_c0/guScale.s +++ b/asm/nonmatchings/os/code_42b00_len_c0/guScale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guScale /* 042B00 80067700 3C014780 */ lui $at, 0x4780 diff --git a/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s b/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s index 9846397266..bd72d02d6c 100644 --- a/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s +++ b/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guScaleF /* 042BC0 800677C0 AC850000 */ sw $a1, ($a0) diff --git a/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s b/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s index 60bd1b6daf..ddbde882eb 100644 --- a/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s +++ b/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guTranslate /* 042C20 80067820 3C014780 */ lui $at, 0x4780 diff --git a/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s b/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s index dd89e011d2..7c7e79a44b 100644 --- a/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s +++ b/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guTranslateF /* 042D00 80067900 3C083F80 */ lui $t0, 0x3f80 diff --git a/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s b/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s index 6c00123d69..39e4efd6a8 100644 --- a/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s +++ b/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxCat /* 042D60 80067960 27BDFF20 */ addiu $sp, $sp, -0xe0 diff --git a/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s b/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s index f2a0139b6e..6184613c58 100644 --- a/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s +++ b/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxXFML /* 042DE0 800679E0 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s b/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s index d526a78d7a..8503584015 100644 --- a/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s +++ b/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxXFMF /* 042E70 80067A70 C4820000 */ lwc1 $f2, ($a0) diff --git a/asm/nonmatchings/os/code_42e70_len_390/guRotate.s b/asm/nonmatchings/os/code_42e70_len_390/guRotate.s index bcd0cd7f19..074be7a606 100644 --- a/asm/nonmatchings/os/code_42e70_len_390/guRotate.s +++ b/asm/nonmatchings/os/code_42e70_len_390/guRotate.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guRotate /* 043080 80067C80 27BDFF58 */ addiu $sp, $sp, -0xa8 diff --git a/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s b/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s index b84e88accf..94f89048a6 100644 --- a/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s +++ b/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guRotateF /* 042F20 80067B20 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/os/code_43200_len_7c0/osMotorAccess.s b/asm/nonmatchings/os/code_43200_len_7c0/osMotorAccess.s index 570782d83c..2b4f1d8d31 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/osMotorAccess.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/osMotorAccess.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osMotorAccess /* 043200 80067E00 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s b/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s index 8737772811..d878dc79c6 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osMotorInit /* 043344 80067F44 27BDFF88 */ addiu $sp, $sp, -0x78 diff --git a/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s b/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s index a35b0cf4fb..8cc8443664 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsAllocateFile /* 043590 80068190 27BDFD68 */ addiu $sp, $sp, -0x298 diff --git a/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s b/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s index 062bb0d230..ec8d8f1fa6 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsDeclearPage /* 04389C 8006849C 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s b/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s index 41f12b3b92..aa795286e1 100644 --- a/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s +++ b/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsDeleteFile /* 0439C0 800685C0 27BDFEA0 */ addiu $sp, $sp, -0x160 diff --git a/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s b/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s index 7998e836ad..c68f8059bf 100644 --- a/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s +++ b/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsReleasePages /* 043B6C 8006876C 8FA90010 */ lw $t1, 0x10($sp) diff --git a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s index 77d50884a0..e01bb5e069 100644 --- a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s +++ b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsFileState /* 044020 80068C20 27BDFEB0 */ addiu $sp, $sp, -0x150 diff --git a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s index 607d9d27e6..ebc8e923ed 100644 --- a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s +++ b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsReadWriteFile /* 043BE0 800687E0 27BDFEA0 */ addiu $sp, $sp, -0x160 diff --git a/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s b/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s index 7bc17d4eb7..ddf65e9376 100644 --- a/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s +++ b/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsFindFile /* 0441C0 80068DC0 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s index f1c2804701..8d7f09ba84 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsCheckRamArea /* 044788 80069388 27BDFF78 */ addiu $sp, $sp, -0x88 diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s index 741cc5770f..c7b69e23ac 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsFreeBlocks /* 044380 80068F80 27BDFED0 */ addiu $sp, $sp, -0x130 diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s index a30fc975e7..d7ed5691ac 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsInitPak /* 044590 80069190 27BDFF90 */ addiu $sp, $sp, -0x70 diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s index 263d63fdc7..f47fb7505f 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsNumFiles /* 044490 80069090 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s b/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s index a793045779..70c4c5fbfa 100644 --- a/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s +++ b/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsRepairId /* 044860 80069460 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s index bbd9819b66..732e0a3986 100644 --- a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s +++ b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsGetOneChannelData /* 044A44 80069644 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s index d032e7d04d..a96a94eba9 100644 --- a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s +++ b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsGetStatus /* 0448C0 800694C0 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/os/code_448c0_len_210/osPfsRequestOneChannel.s b/asm/nonmatchings/os/code_448c0_len_210/osPfsRequestOneChannel.s index 552cad8629..f0f929cf5e 100644 --- a/asm/nonmatchings/os/code_448c0_len_210/osPfsRequestOneChannel.s +++ b/asm/nonmatchings/os/code_448c0_len_210/osPfsRequestOneChannel.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsRequestOneChannel /* 0449B0 800695B0 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s b/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s index e8e320b4b4..ee3b8a442c 100644 --- a/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s +++ b/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsSelectBank /* 044AD0 800696D0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s b/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s index d9bc1e9046..f2d4455ebb 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCheckId /* 0451D4 80069DD4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s b/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s index 2289069e9f..fee955435a 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCheckPackId /* 044EA4 80069AA4 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s b/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s index 8d10dbe5b4..803756b9dc 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osGetId /* 045008 80069C08 27BDFF98 */ addiu $sp, $sp, -0x68 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s b/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s index c745599676..44339906cb 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osIdCheckSum /* 044B74 80069774 2487001C */ addiu $a3, $a0, 0x1c diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s b/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s index 131bebff43..f56ae4804f 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsRWInode /* 04528C 80069E8C 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s b/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s index 522df5bba5..2f5ada1e4d 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osRepairPackId /* 044BB8 800697B8 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osSumcalc.s b/asm/nonmatchings/os/code_44b40_len_a90/osSumcalc.s index f5d3bea8f6..900066d8f9 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osSumcalc.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osSumcalc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSumcalc /* 044B40 80069740 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s b/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s index ff861f788a..327df94fa3 100644 --- a/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s +++ b/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContRamRead /* 0455D0 8006A1D0 27BDFFB0 */ addiu $sp, $sp, -0x50 diff --git a/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s b/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s index d086b8641a..c312dca8a8 100644 --- a/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s +++ b/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContRamWrite /* 0457C0 8006A3C0 27BDFFB8 */ addiu $sp, $sp, -0x48 diff --git a/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s b/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s index 8b6bd9a682..f72b3c84d6 100644 --- a/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s +++ b/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osAfterPreNMI /* 045A30 8006A630 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A650.s b/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A650.s index b2c405519b..d12a5e7c46 100644 --- a/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A650.s +++ b/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A650.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006A650 /* 045A50 8006A650 3C05A460 */ lui $a1, 0xa460 diff --git a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s index 63ae1eb77c..0126d76076 100644 --- a/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s +++ b/asm/nonmatchings/os/code_45a50_len_3a0/osInitialize.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osInitialize /* 045B08 8006A708 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s b/asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s index d37a1210cf..a7b8252e1a 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s +++ b/asm/nonmatchings/os/code_45df0_len_970/IP6_Hdlr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IP6_Hdlr /* 046044 8006AC44 2401DFFF */ addiu $at, $zero, -0x2001 diff --git a/asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s b/asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s index cb43dd35b5..7f6f895efc 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s +++ b/asm/nonmatchings/os/code_45df0_len_970/IP7_Hdlr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel IP7_Hdlr /* 046050 8006AC50 2401BFFF */ addiu $at, $zero, -0x4001 diff --git a/asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s b/asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s index dda1a47932..092dc1cf67 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s +++ b/asm/nonmatchings/os/code_45df0_len_970/NoMoreRcpInts.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel NoMoreRcpInts .L8006AE30: diff --git a/asm/nonmatchings/os/code_45df0_len_970/ai.s b/asm/nonmatchings/os/code_45df0_len_970/ai.s index d1c4c195e9..3d419c2664 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/ai.s +++ b/asm/nonmatchings/os/code_45df0_len_970/ai.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ai .L8006AD64: diff --git a/asm/nonmatchings/os/code_45df0_len_970/cart.s b/asm/nonmatchings/os/code_45df0_len_970/cart.s index 4c58ee68e2..c967c2c64b 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/cart.s +++ b/asm/nonmatchings/os/code_45df0_len_970/cart.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel cart /* 046080 8006AC80 2401F7FF */ addiu $at, $zero, -0x801 diff --git a/asm/nonmatchings/os/code_45df0_len_970/counter.s b/asm/nonmatchings/os/code_45df0_len_970/counter.s index bf842c4a9f..d5e62ddbf1 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/counter.s +++ b/asm/nonmatchings/os/code_45df0_len_970/counter.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel counter /* 04605C 8006AC5C 40095800 */ mfc0 $t1, $11 diff --git a/asm/nonmatchings/os/code_45df0_len_970/dp.s b/asm/nonmatchings/os/code_45df0_len_970/dp.s index bf73f90db2..ab8159df58 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/dp.s +++ b/asm/nonmatchings/os/code_45df0_len_970/dp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel dp .L8006AE0C: diff --git a/asm/nonmatchings/os/code_45df0_len_970/endrcp.s b/asm/nonmatchings/os/code_45df0_len_970/endrcp.s index db41b18524..cfbacd1b3a 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/endrcp.s +++ b/asm/nonmatchings/os/code_45df0_len_970/endrcp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel endrcp .L8006AB6C: diff --git a/asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s b/asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s index 7ce14be81f..f17f276c3e 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s +++ b/asm/nonmatchings/os/code_45df0_len_970/enqueueRunning.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel enqueueRunning .L8006AF34: diff --git a/asm/nonmatchings/os/code_45df0_len_970/firstnmi.s b/asm/nonmatchings/os/code_45df0_len_970/firstnmi.s index 1f2940deb6..9e6046ff10 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/firstnmi.s +++ b/asm/nonmatchings/os/code_45df0_len_970/firstnmi.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel firstnmi .L8006AE6C: diff --git a/asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s b/asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s index a663c8e368..4966bf0815 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s +++ b/asm/nonmatchings/os/code_45df0_len_970/func_8006A9F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006A9F0 /* 045DF0 8006A9F0 3C1A8007 */ lui $k0, 0x8007 diff --git a/asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s b/asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s index 0fb0817beb..cf14a657bc 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s +++ b/asm/nonmatchings/os/code_45df0_len_970/handle_CPU.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel handle_CPU .L8006B038: diff --git a/asm/nonmatchings/os/code_45df0_len_970/handle_break.s b/asm/nonmatchings/os/code_45df0_len_970/handle_break.s index a082f5c524..e0156ad8ed 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/handle_break.s +++ b/asm/nonmatchings/os/code_45df0_len_970/handle_break.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel handle_break .L8006AEE8: diff --git a/asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s b/asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s index 197fb73611..727a6ffa94 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s +++ b/asm/nonmatchings/os/code_45df0_len_970/handle_interrupt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel handle_interrupt /* 046008 8006AC08 03688024 */ and $s0, $k1, $t0 diff --git a/asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s b/asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s index 7079861a41..4e82a47a14 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s +++ b/asm/nonmatchings/os/code_45df0_len_970/next_interrupt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel next_interrupt .L8006AC0C: diff --git a/asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s b/asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s index 0bef319626..1e42939b3f 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s +++ b/asm/nonmatchings/os/code_45df0_len_970/noEnqueue.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel noEnqueue .L8006B16C: diff --git a/asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s b/asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s index 461f40845e..9052d6ad3e 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osCleanupThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCleanupThread /* 046750 8006B350 00002021 */ addu $a0, $zero, $zero diff --git a/asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s b/asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s index 70eb35aec0..7eb6111c1c 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osDispatchThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osDispatchThread /* 0465D4 8006B1D4 3C048009 */ lui $a0, 0x8009 diff --git a/asm/nonmatchings/os/code_45df0_len_970/osDispatchThreadSave.s b/asm/nonmatchings/os/code_45df0_len_970/osDispatchThreadSave.s index 49b09e0a8a..c3d32285de 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osDispatchThreadSave.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osDispatchThreadSave.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osDispatchThreadSave /* 0465F4 8006B1F4 8F5B0118 */ lw $k1, 0x118($k0) diff --git a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s b/asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s index e4b5df3c1b..f584a9cb80 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osEnqueueAndYield.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEnqueueAndYield /* 04646C 8006B06C 3C058009 */ lui $a1, 0x8009 diff --git a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s b/asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s index 31e0b39c79..8bba0504e7 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osEnqueueThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEnqueueThread /* 046574 8006B174 0080C821 */ addu $t9, $a0, $zero diff --git a/asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s b/asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s index 6add6ccdd5..c7b0dde819 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osExceptionPreamble.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osExceptionPreamble /* 045E00 8006AA00 3C1A800B */ lui $k0, 0x800b diff --git a/asm/nonmatchings/os/code_45df0_len_970/osNop.s b/asm/nonmatchings/os/code_45df0_len_970/osNop.s index 7a9c7d11a7..c0febdfce6 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osNop.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osNop.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osNop /* 0465CC 8006B1CC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/os/code_45df0_len_970/osPopThread.s b/asm/nonmatchings/os/code_45df0_len_970/osPopThread.s index d42a6b88fc..fca3c9ae50 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/osPopThread.s +++ b/asm/nonmatchings/os/code_45df0_len_970/osPopThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPopThread /* 0465BC 8006B1BC 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/os/code_45df0_len_970/panic.s b/asm/nonmatchings/os/code_45df0_len_970/panic.s index cddc2534b0..254f66a2ff 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/panic.s +++ b/asm/nonmatchings/os/code_45df0_len_970/panic.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel panic .L8006AF4C: diff --git a/asm/nonmatchings/os/code_45df0_len_970/pi.s b/asm/nonmatchings/os/code_45df0_len_970/pi.s index 63e229cbf3..3ab790b030 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/pi.s +++ b/asm/nonmatchings/os/code_45df0_len_970/pi.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel pi .L8006ADB8: diff --git a/asm/nonmatchings/os/code_45df0_len_970/prenmi.s b/asm/nonmatchings/os/code_45df0_len_970/prenmi.s index 250ed9b2a4..5d3e0dea57 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/prenmi.s +++ b/asm/nonmatchings/os/code_45df0_len_970/prenmi.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel prenmi /* 04623C 8006AE3C 8F5B0118 */ lw $k1, 0x118($k0) diff --git a/asm/nonmatchings/os/code_45df0_len_970/rcp.s b/asm/nonmatchings/os/code_45df0_len_970/rcp.s index 2de974d6f8..abaa9212c1 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/rcp.s +++ b/asm/nonmatchings/os/code_45df0_len_970/rcp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel rcp /* 0460C8 8006ACC8 3C11A430 */ lui $s1, 0xa430 diff --git a/asm/nonmatchings/os/code_45df0_len_970/redispatch.s b/asm/nonmatchings/os/code_45df0_len_970/redispatch.s index a4e0341c9f..1b63d10f9d 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/redispatch.s +++ b/asm/nonmatchings/os/code_45df0_len_970/redispatch.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel redispatch .L8006AF00: diff --git a/asm/nonmatchings/os/code_45df0_len_970/savecontext.s b/asm/nonmatchings/os/code_45df0_len_970/savecontext.s index 30b164ce90..69e0384d65 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/savecontext.s +++ b/asm/nonmatchings/os/code_45df0_len_970/savecontext.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel savecontext /* 045E34 8006AA34 03404021 */ addu $t0, $k0, $zero diff --git a/asm/nonmatchings/os/code_45df0_len_970/savercp.s b/asm/nonmatchings/os/code_45df0_len_970/savercp.s index c666ac8892..5bb25e7b25 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/savercp.s +++ b/asm/nonmatchings/os/code_45df0_len_970/savercp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel savercp .L8006AB34: diff --git a/asm/nonmatchings/os/code_45df0_len_970/send_done.s b/asm/nonmatchings/os/code_45df0_len_970/send_done.s index 2ed47f9305..3364f169c5 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/send_done.s +++ b/asm/nonmatchings/os/code_45df0_len_970/send_done.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel send_done .L8006AFC4: diff --git a/asm/nonmatchings/os/code_45df0_len_970/send_mesg.s b/asm/nonmatchings/os/code_45df0_len_970/send_mesg.s index f026ccf8de..ba9e84d370 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/send_mesg.s +++ b/asm/nonmatchings/os/code_45df0_len_970/send_mesg.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel send_mesg /* 04637C 8006AF7C 03E09021 */ addu $s2, $ra, $zero diff --git a/asm/nonmatchings/os/code_45df0_len_970/si.s b/asm/nonmatchings/os/code_45df0_len_970/si.s index 30dbd9b4b5..4fd4fd7496 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/si.s +++ b/asm/nonmatchings/os/code_45df0_len_970/si.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel si .L8006AD90: diff --git a/asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s b/asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s index ccf9b07027..31c113d9ce 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s +++ b/asm/nonmatchings/os/code_45df0_len_970/sp_other_break.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sp_other_break .L8006AD2C: diff --git a/asm/nonmatchings/os/code_45df0_len_970/sw1.s b/asm/nonmatchings/os/code_45df0_len_970/sw1.s index caf75b10c6..9ed7db0edc 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/sw1.s +++ b/asm/nonmatchings/os/code_45df0_len_970/sw1.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sw1 /* 0462C4 8006AEC4 2401FEFF */ addiu $at, $zero, -0x101 diff --git a/asm/nonmatchings/os/code_45df0_len_970/sw2.s b/asm/nonmatchings/os/code_45df0_len_970/sw2.s index f6cee12f38..e08ec67e11 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/sw2.s +++ b/asm/nonmatchings/os/code_45df0_len_970/sw2.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel sw2 /* 0462A0 8006AEA0 2401FDFF */ addiu $at, $zero, -0x201 diff --git a/asm/nonmatchings/os/code_45df0_len_970/vi.s b/asm/nonmatchings/os/code_45df0_len_970/vi.s index 4c01648973..4d9f5d3148 100644 --- a/asm/nonmatchings/os/code_45df0_len_970/vi.s +++ b/asm/nonmatchings/os/code_45df0_len_970/vi.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel vi .L8006AD3C: diff --git a/asm/nonmatchings/os/code_46760_len_90/__osDisableInt.s b/asm/nonmatchings/os/code_46760_len_90/__osDisableInt.s index b3845a3cbd..766f4db040 100644 --- a/asm/nonmatchings/os/code_46760_len_90/__osDisableInt.s +++ b/asm/nonmatchings/os/code_46760_len_90/__osDisableInt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel __osDisableInt /* 046760 8006B360 3C0A8009 */ lui $t2, 0x8009 diff --git a/asm/nonmatchings/os/code_46760_len_90/__osRestoreInt.s b/asm/nonmatchings/os/code_46760_len_90/__osRestoreInt.s index 004d59ae39..b00d37d8dd 100644 --- a/asm/nonmatchings/os/code_46760_len_90/__osRestoreInt.s +++ b/asm/nonmatchings/os/code_46760_len_90/__osRestoreInt.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel __osRestoreInt /* 0467D0 8006B3D0 40086000 */ mfc0 $t0, $12 diff --git a/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s b/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s index 1fbc7faa8d..d9fd1641e5 100644 --- a/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s +++ b/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osResetGlobalIntMask /* 046830 8006B430 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_467f0_len_90/osSetGlobalIntMask.s b/asm/nonmatchings/os/code_467f0_len_90/osSetGlobalIntMask.s index 430c979423..db96f11b22 100644 --- a/asm/nonmatchings/os/code_467f0_len_90/osSetGlobalIntMask.s +++ b/asm/nonmatchings/os/code_467f0_len_90/osSetGlobalIntMask.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetGlobalIntMask /* 0467F0 8006B3F0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s b/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s index 95a0e7c2df..a94f9124dd 100644 --- a/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s +++ b/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEPiRawReadIo /* 046970 8006B570 3C02A460 */ lui $v0, 0xa460 diff --git a/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s b/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s index 17d753a191..c2cad19c7e 100644 --- a/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s +++ b/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPiGetCmdQueue /* 046950 8006B550 3C038009 */ lui $v1, 0x8009 diff --git a/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s b/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s index f27b1c3c11..20a4b5de2c 100644 --- a/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s +++ b/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPiRawStartDma /* 046880 8006B480 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s b/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s index 035b53c162..53621926c1 100644 --- a/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s +++ b/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osEPiRawWriteIo /* 046AE0 8006B6E0 3C02A460 */ lui $v0, 0xa460 diff --git a/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s b/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s index 657ae54de7..ca5e76c0a3 100644 --- a/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s +++ b/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osAiDeviceBusy /* 046C50 8006B850 3C02A450 */ lui $v0, 0xa450 diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s b/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s index 11d04e1ecd..7e345666c0 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _Genld /* 0474B4 8006C0B4 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s b/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s index 0cd9615a4a..9e602f0960 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _Ldtob /* 046FD0 8006BBD0 27BDFF80 */ addiu $sp, $sp, -0x80 diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s b/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s index 6cf4b738bb..029eab4b3d 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _Ldunscale /* 04741C 8006C01C 94A30000 */ lhu $v1, ($a1) diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s b/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s index 80da125342..98b85fc83b 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel _Litob /* 046D80 8006B980 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s b/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s index ffbef6f663..f400f8388e 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel bcmp /* 046C70 8006B870 00851026 */ xor $v0, $a0, $a1 diff --git a/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s b/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s index 82a1131368..36336cbf06 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osGetCause /* 047A60 8006C660 40026800 */ mfc0 $v0, $13 diff --git a/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s b/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s index 8235d10c23..2040432592 100644 --- a/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s +++ b/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osGetSR /* 047A70 8006C670 40026000 */ mfc0 $v0, $12 diff --git a/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s b/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s index 0732e7f20c..74b7dd939e 100644 --- a/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s +++ b/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetCompare /* 047A80 8006C680 40845800 */ mtc0 $a0, $11 diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s b/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s index 2d94cf2101..3745944b20 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetFpcCsr /* 047A90 8006C690 4442F800 */ cfc1 $v0, $31 diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s b/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s index e992f6e78c..cd6985d00d 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetSR /* 047AA0 8006C6A0 40846000 */ mtc0 $a0, $12 diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s b/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s index 6a5204dced..bd895a6444 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSetWatchLo /* 047AB0 8006C6B0 40849000 */ mtc0 $a0, $18 diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s b/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s index e0175576bc..5714025704 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpDeviceBusy /* 047AC0 8006C6C0 3C02A404 */ lui $v0, 0xa404 diff --git a/asm/nonmatchings/os/code_47ae0_len_e0/osSpGetStatus.s b/asm/nonmatchings/os/code_47ae0_len_e0/osSpGetStatus.s index 4afb885baf..9b53f56d3c 100644 --- a/asm/nonmatchings/os/code_47ae0_len_e0/osSpGetStatus.s +++ b/asm/nonmatchings/os/code_47ae0_len_e0/osSpGetStatus.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpGetStatus /* 047AE0 8006C6E0 3C02A404 */ lui $v0, 0xa404 diff --git a/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s b/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s index edc26e9ffe..fe66438505 100644 --- a/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s +++ b/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpRawStartDma /* 047B30 8006C730 27BDFFD8 */ addiu $sp, $sp, -0x28 diff --git a/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s b/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s index 3560041b9d..b23b0dd8d9 100644 --- a/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s +++ b/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpSetPc /* 047B00 8006C700 3C02A404 */ lui $v0, 0xa404 diff --git a/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetStatus.s b/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetStatus.s index 35654ceff2..035b8737b9 100644 --- a/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetStatus.s +++ b/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetStatus.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSpSetStatus /* 047AF0 8006C6F0 3C02A404 */ lui $v0, 0xa404 diff --git a/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s b/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s index 0a9f187183..e2ae806ac9 100644 --- a/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s +++ b/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSiRawReadIo /* 047BC0 8006C7C0 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s b/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s index 64be562eca..2e7316cd88 100644 --- a/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s +++ b/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSiRawWriteIo /* 047C10 8006C810 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_47c60_len_f0/osContAddressCrc.s b/asm/nonmatchings/os/code_47c60_len_f0/osContAddressCrc.s index 860c1cee1f..5818602da6 100644 --- a/asm/nonmatchings/os/code_47c60_len_f0/osContAddressCrc.s +++ b/asm/nonmatchings/os/code_47c60_len_f0/osContAddressCrc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContAddressCrc /* 047C60 8006C860 00001821 */ addu $v1, $zero, $zero diff --git a/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s b/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s index 06a916d3f3..a6dd29a938 100644 --- a/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s +++ b/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osContDataCrc /* 047CCC 8006C8CC 00001821 */ addu $v1, $zero, $zero diff --git a/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s b/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s index d4522b1149..942a7ffe45 100644 --- a/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s +++ b/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osDestroyThread /* 047D50 8006C950 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s b/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s index d0974818f0..e2b4515cb4 100644 --- a/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s +++ b/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osMapTLBRdb /* 047E30 8006CA30 40085000 */ mfc0 $t0, $10 diff --git a/asm/nonmatchings/os/code_47e90_len_110/osViInit.s b/asm/nonmatchings/os/code_47e90_len_110/osViInit.s index df6728ed45..dad5b488f5 100644 --- a/asm/nonmatchings/os/code_47e90_len_110/osViInit.s +++ b/asm/nonmatchings/os/code_47e90_len_110/osViInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViInit /* 047E90 8006CA90 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s b/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s index f3fa443fd1..c360683950 100644 --- a/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s +++ b/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osViGetCurrentContext /* 047FA0 8006CBA0 3C028009 */ lui $v0, 0x8009 diff --git a/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s b/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s index 2a774d1657..e56395ae1e 100644 --- a/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s +++ b/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guNormalize /* 047FC0 8006CBC0 C4840000 */ lwc1 $f4, ($a0) diff --git a/asm/nonmatchings/os/code_48020_len_a00/corrupted.s b/asm/nonmatchings/os/code_48020_len_a00/corrupted.s index a63e475bed..346149ce90 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/corrupted.s +++ b/asm/nonmatchings/os/code_48020_len_a00/corrupted.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel corrupted /* 0485D8 8006D1D8 00052C03 */ sra $a1, $a1, 0x10 diff --git a/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s b/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s index 07b18a7a18..66e78f477e 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s +++ b/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel corrupted_init /* 048480 8006D080 27BDFED0 */ addiu $sp, $sp, -0x130 diff --git a/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s b/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s index c7885770cc..ca4f390cde 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s +++ b/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsChecker /* 048020 8006CC20 27BDFB60 */ addiu $sp, $sp, -0x4a0 diff --git a/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s b/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s index 18dcdd949d..bf6bd7f4a8 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s +++ b/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsGetInitData /* 048960 8006D560 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s b/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s index 1fc479a1a7..2d68f5110d 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s +++ b/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsIsPlug /* 048740 8006D340 27BDFFA0 */ addiu $sp, $sp, -0x60 diff --git a/asm/nonmatchings/os/code_48020_len_a00/osPfsRequestData.s b/asm/nonmatchings/os/code_48020_len_a00/osPfsRequestData.s index 8ed373b05b..0807d46c41 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/osPfsRequestData.s +++ b/asm/nonmatchings/os/code_48020_len_a00/osPfsRequestData.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osPfsRequestData /* 0488BC 8006D4BC 27BDFFF0 */ addiu $sp, $sp, -0x10 diff --git a/asm/nonmatchings/os/code_48a20_len_1c0/ldiv.s b/asm/nonmatchings/os/code_48a20_len_1c0/ldiv.s index 917bd9d508..8f739c5d4d 100644 --- a/asm/nonmatchings/os/code_48a20_len_1c0/ldiv.s +++ b/asm/nonmatchings/os/code_48a20_len_1c0/ldiv.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel ldiv /* 048A20 8006D620 00A6001A */ div $zero, $a1, $a2 diff --git a/asm/nonmatchings/os/code_48a20_len_1c0/lldiv.s b/asm/nonmatchings/os/code_48a20_len_1c0/lldiv.s index 10098fd6ac..8c3f835c1a 100644 --- a/asm/nonmatchings/os/code_48a20_len_1c0/lldiv.s +++ b/asm/nonmatchings/os/code_48a20_len_1c0/lldiv.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel lldiv /* 048AA4 8006D6A4 27BDFFC8 */ addiu $sp, $sp, -0x38 diff --git a/asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s b/asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s index 66de837ce5..576720e175 100644 --- a/asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s +++ b/asm/nonmatchings/os/code_48be0_len_20/osSiDeviceBusy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osSiDeviceBusy /* 048BE0 8006D7E0 3C02A480 */ lui $v0, 0xa480 diff --git a/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s b/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s index 6d6ea89e86..be4faca831 100644 --- a/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s +++ b/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006D800 /* 048C00 8006D800 04810008 */ bgez $a0, .L8006D824 diff --git a/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s b/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s index d2aca65b88..0f73e478db 100644 --- a/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s +++ b/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006DDC0 /* 0491C0 8006DDC0 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s b/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s index 265eea9b6f..8b01e7f310 100644 --- a/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s +++ b/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006E310 /* 049710 8006E310 00E0482D */ daddu $t1, $a3, $zero diff --git a/asm/nonmatchings/os/code_49C70/func_8006E870.s b/asm/nonmatchings/os/code_49C70/func_8006E870.s index b510b3a77f..e8da44f66d 100644 --- a/asm/nonmatchings/os/code_49C70/func_8006E870.s +++ b/asm/nonmatchings/os/code_49C70/func_8006E870.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006E870 /* 049C70 8006E870 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/os/code_4a140_len_70/strcmp.s b/asm/nonmatchings/os/code_4a140_len_70/strcmp.s index d32b4446a5..90dd36b098 100644 --- a/asm/nonmatchings/os/code_4a140_len_70/strcmp.s +++ b/asm/nonmatchings/os/code_4a140_len_70/strcmp.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel strcmp .L8006ED70: diff --git a/asm/nonmatchings/os/code_4a140_len_70/strcpy.s b/asm/nonmatchings/os/code_4a140_len_70/strcpy.s index 96c1c7dd02..7795de1465 100644 --- a/asm/nonmatchings/os/code_4a140_len_70/strcpy.s +++ b/asm/nonmatchings/os/code_4a140_len_70/strcpy.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel strcpy /* 04A140 8006ED40 90A20000 */ lbu $v0, ($a1) diff --git a/asm/nonmatchings/os/code_4a1b0_len_40/memset.s b/asm/nonmatchings/os/code_4a1b0_len_40/memset.s index 1a4bab30f9..e8a1b7e0b1 100644 --- a/asm/nonmatchings/os/code_4a1b0_len_40/memset.s +++ b/asm/nonmatchings/os/code_4a1b0_len_40/memset.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel memset /* 04A1B0 8006EDB0 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s index 68e2eb022a..40ba327e1b 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel decode_yay0 /* 04A1F0 8006EDF0 8C980004 */ lw $t8, 4($a0) diff --git a/asm/nonmatchings/os/code_4a360_len_930/func_8008EF60.s b/asm/nonmatchings/os/code_4a360_len_930/func_8008EF60.s index 32fc902ec7..9abaec9b37 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/func_8008EF60.s +++ b/asm/nonmatchings/os/code_4a360_len_930/func_8008EF60.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006EF60 /* 04A360 8006EF60 03E00008 */ jr $ra diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s index ea271cf686..70119f36b8 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashAllErase /* 04A708 8006F308 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s index d4a511b856..9873384b95 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashClearStatus /* 04A69C 8006F29C 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s index b2e54176a3..1ee6bc917e 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashInit /* 04A368 8006EF68 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s index 9d58ca79e8..d03a7c77ad 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashReadArray /* 04AB5C 8006F75C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s index 237fd462fb..026db0539f 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashReadId /* 04A584 8006F184 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s index e8f5168c08..848bc7ecfa 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashReadStatus /* 04A4B8 8006F0B8 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s index ad3f02644d..f8733c5afe 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashSectorErase /* 04A824 8006F424 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s index 16ff96307d..18e10e9b4a 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashWriteArray /* 04AA1C 8006F61C 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s index d82404b364..4217580790 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osFlashWriteBuffer /* 04A950 8006F550 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s index ea3fbd55bd..0096ff8d4f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006F890 /* 04AC90 8006F890 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s index 1633c7f870..23865441e0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006F8F0 /* 04ACF0 8006F8F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s index def819683e..e0de88ddfa 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FB90 /* 04AF90 8006FB90 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s index 19ff51c1cd..efcce28e4e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FBF0 /* 04AFF0 8006FBF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s index 5812accefb..707ca8d3e0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FC50 /* 04B050 8006FC50 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s index ea2cdb0ff0..f977a76d4a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FCB0 /* 04B0B0 8006FCB0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s index 42820228cc..42f6f77ad8 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FD10 /* 04B110 8006FD10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s index 1969953ba3..92f81553ab 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FD70 /* 04B170 8006FD70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s index ddb284930f..49d66d7d8b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FDD0 /* 04B1D0 8006FDD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s index 029a3a6870..6d7f6c7a80 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FE30 /* 04B230 8006FE30 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s index 36035d1612..8978e38aea 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FEF0 /* 04B2F0 8006FEF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s index f96cdc45cd..cbc451ad8b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FF50 /* 04B350 8006FF50 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s index 983b832f06..7ecb50750e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_8006FFB0 /* 04B3B0 8006FFB0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s index a78822adaa..cc046223bb 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070010 /* 04B410 80070010 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s index e46e367ae9..9d7ff376db 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070070 /* 04B470 80070070 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s index cf4bcf2d8a..18e8c1eba4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800700D0 /* 04B4D0 800700D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s index c3ef456cb2..48d7f7a5a6 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070130 /* 04B530 80070130 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s index 5c6c4cfb4b..38b10afe6b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070190 /* 04B590 80070190 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s index 300749bde2..fded0cf1b0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800701F0 /* 04B5F0 800701F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s index 6f64b124ee..75ab695651 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070250 /* 04B650 80070250 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s index 1e6fd5121f..f6053b5bbc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800702B0 /* 04B6B0 800702B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s index 26ceff3b07..7f0eac157a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070310 /* 04B710 80070310 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s index 4b3a8e73ba..3b51b9f518 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070370 /* 04B770 80070370 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s index 71bddd3331..c1236d7af6 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800703D0 /* 04B7D0 800703D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s index dd063c8ac2..11190254e4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070430 /* 04B830 80070430 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s index dc6aa04fca..d3f7c5cc63 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070490 /* 04B890 80070490 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s index 1f788aceb9..c3ba38f831 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800704F0 /* 04B8F0 800704F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s index a9c3c87b4a..9e283aef09 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070550 /* 04B950 80070550 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s index c764c05602..9fea792372 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800705B0 /* 04B9B0 800705B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s index 23b5f9bced..1a1d734db0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070610 /* 04BA10 80070610 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s index c5e820cb00..26fe668b11 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070670 /* 04BA70 80070670 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s index 8e62873d53..b65ee378de 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800706D0 /* 04BAD0 800706D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s index 063a49d5a5..f7b0d24a22 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070730 /* 04BB30 80070730 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s index e58c8929fe..b37de6d42c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800708B0 /* 04BCB0 800708B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s index 8a02f6ced5..3dd49b88e4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070910 /* 04BD10 80070910 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s index e619d5d34e..0cc5f7212b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070970 /* 04BD70 80070970 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s index 7075a2315e..092a884143 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800709D0 /* 04BDD0 800709D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s index 1429a5deb5..3623df5fe9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070A30 /* 04BE30 80070A30 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s index 4e48aba3c8..3a11ff777c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070A90 /* 04BE90 80070A90 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s index b1e756bb2c..c1b4fad0db 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070AF0 /* 04BEF0 80070AF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s index 3ce77280cc..1446aee8c7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070B50 /* 04BF50 80070B50 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s index 46151430bf..b40d5f94d8 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070BB0 /* 04BFB0 80070BB0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s index bf58796f9b..00556c941e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070C10 /* 04C010 80070C10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s index 84a852a3bc..6c38815345 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070C70 /* 04C070 80070C70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s index 3b1378240b..8aea2720a2 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070CD0 /* 04C0D0 80070CD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s index 7b00a7344d..3f1967754d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070D30 /* 04C130 80070D30 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s index 2f3dcbcdb8..38054e588b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070D90 /* 04C190 80070D90 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s index 4dd14fe27e..279de2d71c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070DF0 /* 04C1F0 80070DF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s index 7b02dc282a..3e9e24256b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070E50 /* 04C250 80070E50 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s index 6cc6a259d3..20c2aaa241 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070EB0 /* 04C2B0 80070EB0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s index a1b2a731c1..bda8e85068 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070F10 /* 04C310 80070F10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s index ccedf21b42..6bdfa3b056 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070F70 /* 04C370 80070F70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s index bc3a1a1cf9..d1306d6253 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80070FD0 /* 04C3D0 80070FD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s index f51e1f172c..37a6bbe1d5 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071030 /* 04C430 80071030 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s index b199f89da3..9d625bde8c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071090 /* 04C490 80071090 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s index 3d4a971b3b..d78d4f5b19 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800710F0 /* 04C4F0 800710F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s index ef5736f1e4..a639590f19 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071150 /* 04C550 80071150 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s index b6b864e9ff..89a1f589bf 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800711B0 /* 04C5B0 800711B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s index 6f71b39325..376749495a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071210 /* 04C610 80071210 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s index fc4ef5b75f..df2f298921 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071270 /* 04C670 80071270 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s index 8379eee8cd..fca273b7c1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800712D0 /* 04C6D0 800712D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s index 010ac57229..e38b12f41a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071330 /* 04C730 80071330 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s index c6db884d46..7660402b94 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071390 /* 04C790 80071390 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s index 4d485e9661..04601dd70d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800713F0 /* 04C7F0 800713F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s index c815e274fd..17315993ec 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071450 /* 04C850 80071450 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s index db37921452..4214cd41b7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800714B0 /* 04C8B0 800714B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s index 97c7873773..b2e2c87e6e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071510 /* 04C910 80071510 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s index d3405c5ed4..e1a467f042 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071570 /* 04C970 80071570 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s index 957469fba0..7da5cb295f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800715D0 /* 04C9D0 800715D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s index be40ac3f7f..62898b7eb4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071630 /* 04CA30 80071630 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s index bb5cb6dc37..415f81a6f1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800716F0 /* 04CAF0 800716F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s index a7508407a4..e7656cc5fc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071750 /* 04CB50 80071750 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s index 34c5de6565..7d1c6b1703 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800717B0 /* 04CBB0 800717B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s index 696f0bf787..ed23305070 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071870 /* 04CC70 80071870 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s index 8e021eafac..5eae5e3f4a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800718D0 /* 04CCD0 800718D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s index 43e395190e..123312647a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071930 /* 04CD30 80071930 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s index c1ae50db61..44e66f58a2 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071990 /* 04CD90 80071990 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s index 3259492c77..5c324ffb83 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800719F0 /* 04CDF0 800719F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s index ae9df6dd80..03780c3379 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071A50 /* 04CE50 80071A50 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s index 15c710a4fc..ef9fb883fe 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071AB0 /* 04CEB0 80071AB0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s index 84b70785c0..b585774179 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071B10 /* 04CF10 80071B10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s index 3768b5122b..41d6e2e4e3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071B70 /* 04CF70 80071B70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s index 2a2bfb39e8..01b81f6d2d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071BD0 /* 04CFD0 80071BD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s index dbd39173f9..e3eff68031 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071C30 /* 04D030 80071C30 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s index f67efea84d..364ebf3b98 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071C90 /* 04D090 80071C90 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s index 125cefa3cd..baa8565668 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071CF0 /* 04D0F0 80071CF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s index 812cb1e86f..bbd802d086 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071D50 /* 04D150 80071D50 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s index d9a2895e90..9c70949c76 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071DB0 /* 04D1B0 80071DB0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s index 42eebe7999..3e666df5fc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071E10 /* 04D210 80071E10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s index b30bcfb54a..c4e5d05cc4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071E70 /* 04D270 80071E70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s index a9180f50f6..4b146e0ff0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071ED0 /* 04D2D0 80071ED0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s index 1b9c49b807..0ccb803d6d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071F30 /* 04D330 80071F30 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s index 633bc1cb44..aed4e5ae71 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071F90 /* 04D390 80071F90 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s index 719f6e54ec..ed9e8523eb 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80071FF0 /* 04D3F0 80071FF0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s index 9754ee2c62..31469c7b69 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800720B0 /* 04D4B0 800720B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s index 55f4b519e7..955ba2df57 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072110 /* 04D510 80072110 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s index 68b44c5fa9..8a854f6794 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072170 /* 04D570 80072170 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s index b6fbb8f235..9194217d4b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800721D0 /* 04D5D0 800721D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s index 24b436526d..6d50c9d4a1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072230 /* 04D630 80072230 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s index 4a1b801e81..b798d632a7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072290 /* 04D690 80072290 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s index dff3ff8056..3182f1b459 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800722F0 /* 04D6F0 800722F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s index d473584811..c2a54b6259 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072350 /* 04D750 80072350 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s index 43f908b6ee..de10a8797f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800723B0 /* 04D7B0 800723B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s index b902481e51..83a8696dcd 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072410 /* 04D810 80072410 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s index a061e8fa0d..8cfbe34fa9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072470 /* 04D870 80072470 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s index e22aa587e0..054120e8d5 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072530 /* 04D930 80072530 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s index 27f5fdb8f1..02616c1b97 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072590 /* 04D990 80072590 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s index 5c82a6bcc2..655874f717 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800725F0 /* 04D9F0 800725F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s index 9ce66ccc97..a37dcf4162 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072650 /* 04DA50 80072650 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s index c2e6e9b632..4febbae639 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800726B0 /* 04DAB0 800726B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s index 4acc262147..acffedcbbf 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072710 /* 04DB10 80072710 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s index 6d92ee0996..cfb590bbda 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072770 /* 04DB70 80072770 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s index 7439cbc71d..645d014806 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800727D0 /* 04DBD0 800727D0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s index 15ca999adb..9ad02f5f8e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072830 /* 04DC30 80072830 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s index e1a342a53a..f39a0add69 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072890 /* 04DC90 80072890 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s index d309c087ce..8f6555486d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800728F0 /* 04DCF0 800728F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s index a97a2747cc..5c483db5c3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072950 /* 04DD50 80072950 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s index 767b8dad6a..4e3fb6c54b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_800729B0 /* 04DDB0 800729B0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s index 7f671e5532..a7a908e6c9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072A10 /* 04DE10 80072A10 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s index e74c10a8a8..48aa178e19 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072A70 /* 04DE70 80072A70 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s index 5533088abe..32265b4091 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072AD0 /* 04DED0 80072AD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s index 5d30b33931..85fdb9e710 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072B30 /* 04DF30 80072B30 3C028007 */ lui $v0, 0x8007 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s index b85df0d3b7..a25f14383b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072BCC /* 04DFCC 80072BCC 3C01800E */ lui $at, 0x800e diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s index 8acbc9ea6b..eeac3c327a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072BDC /* 04DFDC 80072BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s index a5a160201a..927bbf3584 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072CCC /* 04E0CC 80072CCC 3C01800E */ lui $at, 0x800e diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s index fc55201f6b..a4f01f48b0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072CDC /* 04E0DC 80072CDC 3C01800E */ lui $at, 0x800e diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s index 91e2adc83c..ca171a1bfa 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel func_80072CEC /* 04E0EC 80072CEC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s index 32cc15a475..afeeb299de 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fx_emote /* 04B290 8006FE90 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s index 09cd345868..a3836b52dc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fx_sleep_bubble /* 04BBF0 800707F0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s index 206c17d23a..4196ea2439 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fx_sweat /* 04BB90 80070790 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s index 3909a95355..cc699e241a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fx_walk_large /* 04AED0 8006FAD0 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s index 0f7841100e..a0ab7cacb5 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel fx_walk_normal /* 04AF30 8006FB30 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/load_battle.s b/asm/nonmatchings/os/code_4ac90_len_3910/load_battle.s index 37e80b140f..913e30aafc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/load_battle.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/load_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_battle /* 04E090 80072C90 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s b/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s index 3673a76f02..8893acb88b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/load_demo_battle.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel load_demo_battle /* 04E214 80072E14 27BDFFE0 */ addiu $sp, $sp, -0x20 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/setup_demo_player.s b/asm/nonmatchings/os/code_4ac90_len_3910/setup_demo_player.s index b89fa3b630..b0585d76ac 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/setup_demo_player.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/setup_demo_player.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel setup_demo_player /* 04E12C 80072D2C 24030001 */ addiu $v1, $zero, 1 diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s index e60344a138..7f64ac4a54 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxTaskMgr /* 007E40 8002CA40 27BDFFD0 */ addiu $sp, $sp, -0x30 diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s index 788c9d603e..6f402e5bc1 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgrInit.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxTaskMgrInit /* 007F38 8002CB38 27BDFFC0 */ addiu $sp, $sp, -0x40 diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s index fdd06301df..6dae2e1b8a 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel nuGfxTaskStart /* 0080C4 8002CCC4 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s b/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s index 84dbe3ddce..aef9dcee1f 100644 --- a/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s +++ b/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel guMtxIdentF /* 0428A0 800674A0 3C083F80 */ lui $t0, 0x3f80 diff --git a/asm/nonmatchings/os/osCreateThread/osCreateThread.s b/asm/nonmatchings/os/osCreateThread/osCreateThread.s index fceb4f4714..0a50b36047 100644 --- a/asm/nonmatchings/os/osCreateThread/osCreateThread.s +++ b/asm/nonmatchings/os/osCreateThread/osCreateThread.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osCreateThread /* 041260 80065E60 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s b/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s index 8efee183e3..03b7a52116 100644 --- a/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s +++ b/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s @@ -1,7 +1,6 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -.include "include/macro.inc" glabel osGetThreadPri /* 041330 80065F30 14800003 */ bnez $a0, .L80065F40