diff --git a/asm/nonmatchings/code_13480_len_3f0/func_8003845C.s b/asm/nonmatchings/code_13480_len_3f0/func_8003845C.s deleted file mode 100644 index 9613b9d151..0000000000 --- a/asm/nonmatchings/code_13480_len_3f0/func_8003845C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8003845C -/* 1385C 8003845C 03E00008 */ jr $ra -/* 13860 80038460 00000000 */ nop -/* 13864 80038464 00000000 */ nop -/* 13868 80038468 00000000 */ nop -/* 1386C 8003846C 00000000 */ nop diff --git a/asm/nonmatchings/code_135EE0/pause_items_scroll_offset_x.s b/asm/nonmatchings/code_135EE0/pause_items_scroll_offset_x.s deleted file mode 100644 index cdc17a3dff..0000000000 --- a/asm/nonmatchings/code_135EE0/pause_items_scroll_offset_x.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_items_scroll_offset_x -/* 13CCA8 80249968 03E00008 */ jr $ra -/* 13CCAC 8024996C 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/code_135EE0/pause_tabs_draw_invis.s b/asm/nonmatchings/code_135EE0/pause_tabs_draw_invis.s deleted file mode 100644 index 0dd769d5ad..0000000000 --- a/asm/nonmatchings/code_135EE0/pause_tabs_draw_invis.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel pause_tabs_draw_invis -/* 137ED0 80244B90 03E00008 */ jr $ra -/* 137ED4 80244B94 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/NOP_npc_callback.s b/asm/nonmatchings/code_13870_len_6980/NOP_npc_callback.s deleted file mode 100644 index 5a0f5af797..0000000000 --- a/asm/nonmatchings/code_13870_len_6980/NOP_npc_callback.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel NOP_npc_callback -/* 13870 80038470 03E00008 */ jr $ra -/* 13874 80038474 00000000 */ nop 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 deleted file mode 100644 index f71e67dafb..0000000000 --- a/asm/nonmatchings/code_13870_len_6980/get_npc_by_index.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel get_npc_by_index -/* 13EDC 80038ADC 2402F7FF */ addiu $v0, $zero, -0x801 -/* 13EE0 80038AE0 00822024 */ and $a0, $a0, $v0 -/* 13EE4 80038AE4 3C02800A */ lui $v0, 0x800a -/* 13EE8 80038AE8 8C420B90 */ lw $v0, 0xb90($v0) -/* 13EEC 80038AEC 00042080 */ sll $a0, $a0, 2 -/* 13EF0 80038AF0 00822021 */ addu $a0, $a0, $v0 -/* 13EF4 80038AF4 03E00008 */ jr $ra -/* 13EF8 80038AF8 8C820000 */ lw $v0, ($a0) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/HasMerleeCasts.s b/asm/nonmatchings/code_1a1f0_len_5390/HasMerleeCasts.s deleted file mode 100644 index c83ac55de0..0000000000 --- a/asm/nonmatchings/code_1a1f0_len_5390/HasMerleeCasts.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel HasMerleeCasts -/* 1A7F4 8003F3F4 AC800084 */ sw $zero, 0x84($a0) -/* 1A7F8 8003F3F8 3C028011 */ lui $v0, 0x8011 -/* 1A7FC 8003F3FC 8042F51A */ lb $v0, -0xae6($v0) -/* 1A800 8003F400 18400002 */ blez $v0, .L8003F40C -/* 1A804 8003F404 24020001 */ addiu $v0, $zero, 1 -/* 1A808 8003F408 AC820084 */ sw $v0, 0x84($a0) -.L8003F40C: -/* 1A80C 8003F40C 03E00008 */ jr $ra -/* 1A810 8003F410 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_1a1f0_len_5390/UnfadeBackgroundFromBlack.s b/asm/nonmatchings/code_1a1f0_len_5390/UnfadeBackgroundFromBlack.s deleted file mode 100644 index b7f09f2032..0000000000 --- a/asm/nonmatchings/code_1a1f0_len_5390/UnfadeBackgroundFromBlack.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel UnfadeBackgroundFromBlack -/* 1A398 8003EF98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 1A39C 8003EF9C AFB00010 */ sw $s0, 0x10($sp) -/* 1A3A0 8003EFA0 0080802D */ daddu $s0, $a0, $zero -/* 1A3A4 8003EFA4 10A00003 */ beqz $a1, .L8003EFB4 -/* 1A3A8 8003EFA8 AFBF0014 */ sw $ra, 0x14($sp) -/* 1A3AC 8003EFAC 24020019 */ addiu $v0, $zero, 0x19 -/* 1A3B0 8003EFB0 AE020070 */ sw $v0, 0x70($s0) -.L8003EFB4: -/* 1A3B4 8003EFB4 0000202D */ daddu $a0, $zero, $zero -/* 1A3B8 8003EFB8 0080282D */ daddu $a1, $a0, $zero -/* 1A3BC 8003EFBC 8E020070 */ lw $v0, 0x70($s0) -/* 1A3C0 8003EFC0 0080302D */ daddu $a2, $a0, $zero -/* 1A3C4 8003EFC4 00023880 */ sll $a3, $v0, 2 -/* 1A3C8 8003EFC8 00E23821 */ addu $a3, $a3, $v0 -/* 1A3CC 8003EFCC 00073840 */ sll $a3, $a3, 1 -/* 1A3D0 8003EFD0 0C046F97 */ jal set_background_color_blend -/* 1A3D4 8003EFD4 30E700FE */ andi $a3, $a3, 0xfe -/* 1A3D8 8003EFD8 8E020070 */ lw $v0, 0x70($s0) -/* 1A3DC 8003EFDC 2442FFFB */ addiu $v0, $v0, -5 -/* 1A3E0 8003EFE0 10400003 */ beqz $v0, .L8003EFF0 -/* 1A3E4 8003EFE4 AE020070 */ sw $v0, 0x70($s0) -/* 1A3E8 8003EFE8 0800FC02 */ j .L8003F008 -/* 1A3EC 8003EFEC 0000102D */ daddu $v0, $zero, $zero -.L8003EFF0: -/* 1A3F0 8003EFF0 0000202D */ daddu $a0, $zero, $zero -/* 1A3F4 8003EFF4 0080282D */ daddu $a1, $a0, $zero -/* 1A3F8 8003EFF8 0080302D */ daddu $a2, $a0, $zero -/* 1A3FC 8003EFFC 0C046F97 */ jal set_background_color_blend -/* 1A400 8003F000 0080382D */ daddu $a3, $a0, $zero -/* 1A404 8003F004 24020002 */ addiu $v0, $zero, 2 -.L8003F008: -/* 1A408 8003F008 8FBF0014 */ lw $ra, 0x14($sp) -/* 1A40C 8003F00C 8FB00010 */ lw $s0, 0x10($sp) -/* 1A410 8003F010 03E00008 */ jr $ra -/* 1A414 8003F014 27BD0018 */ 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 deleted file mode 100644 index d76accc301..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/clear_player_status.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel clear_player_status -/* 79100 800DFC50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 79104 800DFC54 3C048011 */ lui $a0, 0x8011 -/* 79108 800DFC58 2484EFC8 */ addiu $a0, $a0, -0x1038 -/* 7910C 800DFC5C AFBF0010 */ sw $ra, 0x10($sp) -/* 79110 800DFC60 0C00A580 */ jal mem_clear -/* 79114 800DFC64 24050288 */ addiu $a1, $zero, 0x288 -/* 79118 800DFC68 8FBF0010 */ lw $ra, 0x10($sp) -/* 7911C 800DFC6C 03E00008 */ jr $ra -/* 79120 800DFC70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/disable_player_input.s b/asm/nonmatchings/code_759b0_len_61b0/disable_player_input.s deleted file mode 100644 index ed59d4637f..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/disable_player_input.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel disable_player_input -/* 79628 800E0178 3C038011 */ lui $v1, 0x8011 -/* 7962C 800E017C 2463EFC8 */ addiu $v1, $v1, -0x1038 -/* 79630 800E0180 8C640000 */ lw $a0, ($v1) -/* 79634 800E0184 90620015 */ lbu $v0, 0x15($v1) -/* 79638 800E0188 34842000 */ ori $a0, $a0, 0x2000 -/* 7963C 800E018C 24420001 */ addiu $v0, $v0, 1 -/* 79640 800E0190 A0620015 */ sb $v0, 0x15($v1) -/* 79644 800E0194 00021600 */ sll $v0, $v0, 0x18 -/* 79648 800E0198 00021603 */ sra $v0, $v0, 0x18 -/* 7964C 800E019C 03E00008 */ jr $ra -/* 79650 800E01A0 AC640000 */ sw $a0, ($v1) diff --git a/asm/nonmatchings/code_759b0_len_61b0/disable_player_shadow.s b/asm/nonmatchings/code_759b0_len_61b0/disable_player_shadow.s deleted file mode 100644 index 714b69001f..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/disable_player_shadow.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel disable_player_shadow -/* 79594 800E00E4 3C048011 */ lui $a0, 0x8011 -/* 79598 800E00E8 8C84F094 */ lw $a0, -0xf6c($a0) -/* 7959C 800E00EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 795A0 800E00F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 795A4 800E00F4 0C044181 */ jal get_shadow_by_index -/* 795A8 800E00F8 00000000 */ nop -/* 795AC 800E00FC 8C430000 */ lw $v1, ($v0) -/* 795B0 800E0100 34630001 */ ori $v1, $v1, 1 -/* 795B4 800E0104 AC430000 */ sw $v1, ($v0) -/* 795B8 800E0108 8FBF0010 */ lw $ra, 0x10($sp) -/* 795BC 800E010C 03E00008 */ jr $ra -/* 795C0 800E0110 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/disable_player_static_collisions.s b/asm/nonmatchings/code_759b0_len_61b0/disable_player_static_collisions.s deleted file mode 100644 index 5396711c67..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/disable_player_static_collisions.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel disable_player_static_collisions -/* 795C4 800E0114 3C038011 */ lui $v1, 0x8011 -/* 795C8 800E0118 2463EFC8 */ addiu $v1, $v1, -0x1038 -/* 795CC 800E011C 8C640000 */ lw $a0, ($v1) -/* 795D0 800E0120 90620014 */ lbu $v0, 0x14($v1) -/* 795D4 800E0124 34841000 */ ori $a0, $a0, 0x1000 -/* 795D8 800E0128 24420001 */ addiu $v0, $v0, 1 -/* 795DC 800E012C A0620014 */ sb $v0, 0x14($v1) -/* 795E0 800E0130 00021600 */ sll $v0, $v0, 0x18 -/* 795E4 800E0134 00021603 */ sra $v0, $v0, 0x18 -/* 795E8 800E0138 03E00008 */ jr $ra -/* 795EC 800E013C AC640000 */ sw $a0, ($v1) diff --git a/asm/nonmatchings/code_759b0_len_61b0/enable_player_input.s b/asm/nonmatchings/code_759b0_len_61b0/enable_player_input.s deleted file mode 100644 index c7f58943da..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/enable_player_input.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel enable_player_input -/* 79654 800E01A4 3C048011 */ lui $a0, 0x8011 -/* 79658 800E01A8 2484EFC8 */ addiu $a0, $a0, -0x1038 -/* 7965C 800E01AC 90820015 */ lbu $v0, 0x15($a0) -/* 79660 800E01B0 2442FFFF */ addiu $v0, $v0, -1 -/* 79664 800E01B4 A0820015 */ sb $v0, 0x15($a0) -/* 79668 800E01B8 00021600 */ sll $v0, $v0, 0x18 -/* 7966C 800E01BC 00022E03 */ sra $a1, $v0, 0x18 -/* 79670 800E01C0 14A00004 */ bnez $a1, .L800E01D4 -/* 79674 800E01C4 2403DFFF */ addiu $v1, $zero, -0x2001 -/* 79678 800E01C8 8C820000 */ lw $v0, ($a0) -/* 7967C 800E01CC 00431024 */ and $v0, $v0, $v1 -/* 79680 800E01D0 AC820000 */ sw $v0, ($a0) -.L800E01D4: -/* 79684 800E01D4 03E00008 */ jr $ra -/* 79688 800E01D8 00A0102D */ daddu $v0, $a1, $zero diff --git a/asm/nonmatchings/code_759b0_len_61b0/enable_player_shadow.s b/asm/nonmatchings/code_759b0_len_61b0/enable_player_shadow.s deleted file mode 100644 index 54d03d371f..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/enable_player_shadow.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel enable_player_shadow -/* 79560 800E00B0 3C048011 */ lui $a0, 0x8011 -/* 79564 800E00B4 8C84F094 */ lw $a0, -0xf6c($a0) -/* 79568 800E00B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7956C 800E00BC AFBF0010 */ sw $ra, 0x10($sp) -/* 79570 800E00C0 0C044181 */ jal get_shadow_by_index -/* 79574 800E00C4 00000000 */ nop -/* 79578 800E00C8 8C430000 */ lw $v1, ($v0) -/* 7957C 800E00CC 2404FFFE */ addiu $a0, $zero, -2 -/* 79580 800E00D0 00641824 */ and $v1, $v1, $a0 -/* 79584 800E00D4 AC430000 */ sw $v1, ($v0) -/* 79588 800E00D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 7958C 800E00DC 03E00008 */ jr $ra -/* 79590 800E00E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_759b0_len_61b0/enable_player_static_collisions.s b/asm/nonmatchings/code_759b0_len_61b0/enable_player_static_collisions.s deleted file mode 100644 index 275f65360d..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/enable_player_static_collisions.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel enable_player_static_collisions -/* 795F0 800E0140 3C048011 */ lui $a0, 0x8011 -/* 795F4 800E0144 2484EFC8 */ addiu $a0, $a0, -0x1038 -/* 795F8 800E0148 90820014 */ lbu $v0, 0x14($a0) -/* 795FC 800E014C 2442FFFF */ addiu $v0, $v0, -1 -/* 79600 800E0150 A0820014 */ sb $v0, 0x14($a0) -/* 79604 800E0154 00021600 */ sll $v0, $v0, 0x18 -/* 79608 800E0158 00022E03 */ sra $a1, $v0, 0x18 -/* 7960C 800E015C 14A00004 */ bnez $a1, .L800E0170 -/* 79610 800E0160 2403EFFF */ addiu $v1, $zero, -0x1001 -/* 79614 800E0164 8C820000 */ lw $v0, ($a0) -/* 79618 800E0168 00431024 */ and $v0, $v0, $v1 -/* 7961C 800E016C AC820000 */ sw $v0, ($a0) -.L800E0170: -/* 79620 800E0170 03E00008 */ jr $ra -/* 79624 800E0174 00A0102D */ daddu $v0, $a1, $zero diff --git a/asm/nonmatchings/code_759b0_len_61b0/render_player.s b/asm/nonmatchings/code_759b0_len_61b0/render_player.s deleted file mode 100644 index 1ab26b5c3d..0000000000 --- a/asm/nonmatchings/code_759b0_len_61b0/render_player.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel render_player -/* 7A5E8 800E1138 3C028007 */ lui $v0, 0x8007 -/* 7A5EC 800E113C 8C42419C */ lw $v0, 0x419c($v0) -/* 7A5F0 800E1140 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7A5F4 800E1144 AFBF0010 */ sw $ra, 0x10($sp) -/* 7A5F8 800E1148 80420078 */ lb $v0, 0x78($v0) -/* 7A5FC 800E114C 14400003 */ bnez $v0, .L800E115C -/* 7A600 800E1150 00000000 */ nop -/* 7A604 800E1154 0C03845A */ jal render_player_model -/* 7A608 800E1158 00000000 */ nop -.L800E115C: -/* 7A60C 800E115C 8FBF0010 */ lw $ra, 0x10($sp) -/* 7A610 800E1160 03E00008 */ jr $ra -/* 7A614 800E1164 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/remove_consumable.s b/asm/nonmatchings/code_838b0_len_5900/remove_consumable.s deleted file mode 100644 index 490d21f6fb..0000000000 --- a/asm/nonmatchings/code_838b0_len_5900/remove_consumable.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel remove_consumable -/* 8392C 800EA47C 3C028011 */ lui $v0, 0x8011 -/* 83930 800EA480 8C42CD20 */ lw $v0, -0x32e0($v0) -/* 83934 800EA484 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 83938 800EA488 AFBF0010 */ sw $ra, 0x10($sp) -/* 8393C 800EA48C 00021040 */ sll $v0, $v0, 1 -/* 83940 800EA490 3C018011 */ lui $at, 0x8011 -/* 83944 800EA494 00220821 */ addu $at, $at, $v0 -/* 83948 800EA498 A420F444 */ sh $zero, -0xbbc($at) -/* 8394C 800EA49C 0C039DB3 */ jal sort_items -/* 83950 800EA4A0 00000000 */ nop -/* 83954 800EA4A4 8FBF0010 */ lw $ra, 0x10($sp) -/* 83958 800EA4A8 03E00008 */ jr $ra -/* 8395C 800EA4AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/EnableTexPanning.s b/asm/nonmatchings/code_e92d0_len_5da0/EnableTexPanning.s deleted file mode 100644 index 1795483344..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/EnableTexPanning.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel EnableTexPanning -/* EDBB8 802C9208 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDBBC 802C920C AFB10014 */ sw $s1, 0x14($sp) -/* EDBC0 802C9210 0080882D */ daddu $s1, $a0, $zero -/* EDBC4 802C9214 AFBF0018 */ sw $ra, 0x18($sp) -/* EDBC8 802C9218 AFB00010 */ sw $s0, 0x10($sp) -/* EDBCC 802C921C 8E30000C */ lw $s0, 0xc($s1) -/* EDBD0 802C9220 8E050000 */ lw $a1, ($s0) -/* EDBD4 802C9224 0C0B1EAF */ jal get_variable -/* EDBD8 802C9228 26100004 */ addiu $s0, $s0, 4 -/* EDBDC 802C922C 0220202D */ daddu $a0, $s1, $zero -/* EDBE0 802C9230 8E050000 */ lw $a1, ($s0) -/* EDBE4 802C9234 0C0B1EAF */ jal get_variable -/* EDBE8 802C9238 0040802D */ daddu $s0, $v0, $zero -/* EDBEC 802C923C 0200202D */ daddu $a0, $s0, $zero -/* EDBF0 802C9240 0C046C04 */ jal get_model_list_index_from_tree_index -/* EDBF4 802C9244 0040802D */ daddu $s0, $v0, $zero -/* EDBF8 802C9248 0C046B4C */ jal get_model_from_list_index -/* EDBFC 802C924C 0040202D */ daddu $a0, $v0, $zero -/* EDC00 802C9250 12000004 */ beqz $s0, .L802C9264 -/* EDC04 802C9254 0040182D */ daddu $v1, $v0, $zero -/* EDC08 802C9258 94620000 */ lhu $v0, ($v1) -/* EDC0C 802C925C 080B249B */ j .L802C926C -/* EDC10 802C9260 34420800 */ ori $v0, $v0, 0x800 -.L802C9264: -/* EDC14 802C9264 94620000 */ lhu $v0, ($v1) -/* EDC18 802C9268 3042F7FF */ andi $v0, $v0, 0xf7ff -.L802C926C: -/* EDC1C 802C926C A4620000 */ sh $v0, ($v1) -/* EDC20 802C9270 8FBF0018 */ lw $ra, 0x18($sp) -/* EDC24 802C9274 8FB10014 */ lw $s1, 0x14($sp) -/* EDC28 802C9278 8FB00010 */ lw $s0, 0x10($sp) -/* EDC2C 802C927C 24020002 */ addiu $v0, $zero, 2 -/* EDC30 802C9280 03E00008 */ jr $ra -/* EDC34 802C9284 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/ParentColliderToModel.s b/asm/nonmatchings/code_e92d0_len_5da0/ParentColliderToModel.s deleted file mode 100644 index d9bbfb611b..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/ParentColliderToModel.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel ParentColliderToModel -/* EEAC4 802CA114 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EEAC8 802CA118 AFB10014 */ sw $s1, 0x14($sp) -/* EEACC 802CA11C 0080882D */ daddu $s1, $a0, $zero -/* EEAD0 802CA120 AFBF0018 */ sw $ra, 0x18($sp) -/* EEAD4 802CA124 AFB00010 */ sw $s0, 0x10($sp) -/* EEAD8 802CA128 8E30000C */ lw $s0, 0xc($s1) -/* EEADC 802CA12C 8E050000 */ lw $a1, ($s0) -/* EEAE0 802CA130 0C0B1EAF */ jal get_variable -/* EEAE4 802CA134 26100004 */ addiu $s0, $s0, 4 -/* EEAE8 802CA138 0220202D */ daddu $a0, $s1, $zero -/* EEAEC 802CA13C 8E050000 */ lw $a1, ($s0) -/* EEAF0 802CA140 0C0B1EAF */ jal get_variable -/* EEAF4 802CA144 0040802D */ daddu $s0, $v0, $zero -/* EEAF8 802CA148 0C046C04 */ jal get_model_list_index_from_tree_index -/* EEAFC 802CA14C 0040202D */ daddu $a0, $v0, $zero -/* EEB00 802CA150 00108400 */ sll $s0, $s0, 0x10 -/* EEB04 802CA154 00108403 */ sra $s0, $s0, 0x10 -/* EEB08 802CA158 0200202D */ daddu $a0, $s0, $zero -/* EEB0C 802CA15C 00021400 */ sll $v0, $v0, 0x10 -/* EEB10 802CA160 0C016DE0 */ jal parent_collider_to_model -/* EEB14 802CA164 00022C03 */ sra $a1, $v0, 0x10 -/* EEB18 802CA168 0C016E89 */ jal update_collider_transform -/* EEB1C 802CA16C 0200202D */ daddu $a0, $s0, $zero -/* EEB20 802CA170 8FBF0018 */ lw $ra, 0x18($sp) -/* EEB24 802CA174 8FB10014 */ lw $s1, 0x14($sp) -/* EEB28 802CA178 8FB00010 */ lw $s0, 0x10($sp) -/* EEB2C 802CA17C 24020002 */ addiu $v0, $zero, 2 -/* EEB30 802CA180 03E00008 */ jr $ra -/* EEB34 802CA184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlag10.s b/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlag10.s deleted file mode 100644 index ed5ab97c67..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetModelFlag10.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetModelFlag10 -/* EDA2C 802C907C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDA30 802C9080 AFB10014 */ sw $s1, 0x14($sp) -/* EDA34 802C9084 0080882D */ daddu $s1, $a0, $zero -/* EDA38 802C9088 AFBF0018 */ sw $ra, 0x18($sp) -/* EDA3C 802C908C AFB00010 */ sw $s0, 0x10($sp) -/* EDA40 802C9090 8E30000C */ lw $s0, 0xc($s1) -/* EDA44 802C9094 8E050000 */ lw $a1, ($s0) -/* EDA48 802C9098 0C0B1EAF */ jal get_variable -/* EDA4C 802C909C 26100004 */ addiu $s0, $s0, 4 -/* EDA50 802C90A0 0220202D */ daddu $a0, $s1, $zero -/* EDA54 802C90A4 8E050000 */ lw $a1, ($s0) -/* EDA58 802C90A8 0C0B1EAF */ jal get_variable -/* EDA5C 802C90AC 0040802D */ daddu $s0, $v0, $zero -/* EDA60 802C90B0 0200202D */ daddu $a0, $s0, $zero -/* EDA64 802C90B4 0C046C04 */ jal get_model_list_index_from_tree_index -/* EDA68 802C90B8 0040802D */ daddu $s0, $v0, $zero -/* EDA6C 802C90BC 0C046B4C */ jal get_model_from_list_index -/* EDA70 802C90C0 0040202D */ daddu $a0, $v0, $zero -/* EDA74 802C90C4 12000004 */ beqz $s0, .L802C90D8 -/* EDA78 802C90C8 0040182D */ daddu $v1, $v0, $zero -/* EDA7C 802C90CC 94620000 */ lhu $v0, ($v1) -/* EDA80 802C90D0 080B2438 */ j .L802C90E0 -/* EDA84 802C90D4 34420010 */ ori $v0, $v0, 0x10 -.L802C90D8: -/* EDA88 802C90D8 94620000 */ lhu $v0, ($v1) -/* EDA8C 802C90DC 3042FFEF */ andi $v0, $v0, 0xffef -.L802C90E0: -/* EDA90 802C90E0 A4620000 */ sh $v0, ($v1) -/* EDA94 802C90E4 8FBF0018 */ lw $ra, 0x18($sp) -/* EDA98 802C90E8 8FB10014 */ lw $s1, 0x14($sp) -/* EDA9C 802C90EC 8FB00010 */ lw $s0, 0x10($sp) -/* EDAA0 802C90F0 24020002 */ addiu $v0, $zero, 2 -/* EDAA4 802C90F4 03E00008 */ jr $ra -/* EDAA8 802C90F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanner.s b/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanner.s deleted file mode 100644 index a9e45f3702..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/SetTexPanner.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel SetTexPanner -/* ED9B0 802C9000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ED9B4 802C9004 AFB10014 */ sw $s1, 0x14($sp) -/* ED9B8 802C9008 0080882D */ daddu $s1, $a0, $zero -/* ED9BC 802C900C AFBF0018 */ sw $ra, 0x18($sp) -/* ED9C0 802C9010 AFB00010 */ sw $s0, 0x10($sp) -/* ED9C4 802C9014 8E30000C */ lw $s0, 0xc($s1) -/* ED9C8 802C9018 8E050000 */ lw $a1, ($s0) -/* ED9CC 802C901C 0C0B1EAF */ jal get_variable -/* ED9D0 802C9020 26100004 */ addiu $s0, $s0, 4 -/* ED9D4 802C9024 0220202D */ daddu $a0, $s1, $zero -/* ED9D8 802C9028 8E050000 */ lw $a1, ($s0) -/* ED9DC 802C902C 0C0B1EAF */ jal get_variable -/* ED9E0 802C9030 0040802D */ daddu $s0, $v0, $zero -/* ED9E4 802C9034 0200202D */ daddu $a0, $s0, $zero -/* ED9E8 802C9038 0C046C04 */ jal get_model_list_index_from_tree_index -/* ED9EC 802C903C 0040882D */ daddu $s1, $v0, $zero -/* ED9F0 802C9040 0C046B4C */ jal get_model_from_list_index -/* ED9F4 802C9044 0040202D */ daddu $a0, $v0, $zero -/* ED9F8 802C9048 0040802D */ daddu $s0, $v0, $zero -/* ED9FC 802C904C 0200202D */ daddu $a0, $s0, $zero -/* EDA00 802C9050 0C046F05 */ jal set_tex_panner -/* EDA04 802C9054 0220282D */ daddu $a1, $s1, $zero -/* EDA08 802C9058 96030000 */ lhu $v1, ($s0) -/* EDA0C 802C905C 34630800 */ ori $v1, $v1, 0x800 -/* EDA10 802C9060 A6030000 */ sh $v1, ($s0) -/* EDA14 802C9064 8FBF0018 */ lw $ra, 0x18($sp) -/* EDA18 802C9068 8FB10014 */ lw $s1, 0x14($sp) -/* EDA1C 802C906C 8FB00010 */ lw $s0, 0x10($sp) -/* EDA20 802C9070 24020002 */ addiu $v0, $zero, 2 -/* EDA24 802C9074 03E00008 */ jr $ra -/* EDA28 802C9078 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C91A4.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C91A4.s deleted file mode 100644 index 765303e49d..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C91A4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802C91A4 -/* EDB54 802C91A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDB58 802C91A8 AFB10014 */ sw $s1, 0x14($sp) -/* EDB5C 802C91AC 0080882D */ daddu $s1, $a0, $zero -/* EDB60 802C91B0 AFBF0018 */ sw $ra, 0x18($sp) -/* EDB64 802C91B4 AFB00010 */ sw $s0, 0x10($sp) -/* EDB68 802C91B8 8E30000C */ lw $s0, 0xc($s1) -/* EDB6C 802C91BC 8E050000 */ lw $a1, ($s0) -/* EDB70 802C91C0 0C0B1EAF */ jal get_variable -/* EDB74 802C91C4 26100004 */ addiu $s0, $s0, 4 -/* EDB78 802C91C8 0220202D */ daddu $a0, $s1, $zero -/* EDB7C 802C91CC 8E050000 */ lw $a1, ($s0) -/* EDB80 802C91D0 0C0B1EAF */ jal get_variable -/* EDB84 802C91D4 0040802D */ daddu $s0, $v0, $zero -/* EDB88 802C91D8 0200202D */ daddu $a0, $s0, $zero -/* EDB8C 802C91DC 0C046C04 */ jal get_model_list_index_from_tree_index -/* EDB90 802C91E0 0040802D */ daddu $s0, $v0, $zero -/* EDB94 802C91E4 0C046B4C */ jal get_model_from_list_index -/* EDB98 802C91E8 0040202D */ daddu $a0, $v0, $zero -/* EDB9C 802C91EC A05000A9 */ sb $s0, 0xa9($v0) -/* EDBA0 802C91F0 8FBF0018 */ lw $ra, 0x18($sp) -/* EDBA4 802C91F4 8FB10014 */ lw $s1, 0x14($sp) -/* EDBA8 802C91F8 8FB00010 */ lw $s0, 0x10($sp) -/* EDBAC 802C91FC 24020002 */ addiu $v0, $zero, 2 -/* EDBB0 802C9200 03E00008 */ jr $ra -/* EDBB4 802C9204 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9428.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C9428.s deleted file mode 100644 index 8a9f220e45..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9428.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802C9428 -/* EDDD8 802C9428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDDDC 802C942C AFB10014 */ sw $s1, 0x14($sp) -/* EDDE0 802C9430 0080882D */ daddu $s1, $a0, $zero -/* EDDE4 802C9434 AFBF001C */ sw $ra, 0x1c($sp) -/* EDDE8 802C9438 AFB20018 */ sw $s2, 0x18($sp) -/* EDDEC 802C943C AFB00010 */ sw $s0, 0x10($sp) -/* EDDF0 802C9440 8E30000C */ lw $s0, 0xc($s1) -/* EDDF4 802C9444 8E050000 */ lw $a1, ($s0) -/* EDDF8 802C9448 0C0B1EAF */ jal get_variable -/* EDDFC 802C944C 26100004 */ addiu $s0, $s0, 4 -/* EDE00 802C9450 8E050000 */ lw $a1, ($s0) -/* EDE04 802C9454 26100004 */ addiu $s0, $s0, 4 -/* EDE08 802C9458 0220202D */ daddu $a0, $s1, $zero -/* EDE0C 802C945C 0C0B1EAF */ jal get_variable -/* EDE10 802C9460 0040902D */ daddu $s2, $v0, $zero -/* EDE14 802C9464 0220202D */ daddu $a0, $s1, $zero -/* EDE18 802C9468 8E050000 */ lw $a1, ($s0) -/* EDE1C 802C946C 0C0B1EAF */ jal get_variable -/* EDE20 802C9470 0040802D */ daddu $s0, $v0, $zero -/* EDE24 802C9474 0240202D */ daddu $a0, $s2, $zero -/* EDE28 802C9478 0200282D */ daddu $a1, $s0, $zero -/* EDE2C 802C947C 0C046F2D */ jal func_8011BCB4 -/* EDE30 802C9480 0040302D */ daddu $a2, $v0, $zero -/* EDE34 802C9484 8FBF001C */ lw $ra, 0x1c($sp) -/* EDE38 802C9488 8FB20018 */ lw $s2, 0x18($sp) -/* EDE3C 802C948C 8FB10014 */ lw $s1, 0x14($sp) -/* EDE40 802C9490 8FB00010 */ lw $s0, 0x10($sp) -/* EDE44 802C9494 24020002 */ addiu $v0, $zero, 2 -/* EDE48 802C9498 03E00008 */ jr $ra -/* EDE4C 802C949C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C94A0.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C94A0.s deleted file mode 100644 index b7fb4e188a..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C94A0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802C94A0 -/* EDE50 802C94A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EDE54 802C94A4 AFB10014 */ sw $s1, 0x14($sp) -/* EDE58 802C94A8 0080882D */ daddu $s1, $a0, $zero -/* EDE5C 802C94AC AFBF001C */ sw $ra, 0x1c($sp) -/* EDE60 802C94B0 AFB20018 */ sw $s2, 0x18($sp) -/* EDE64 802C94B4 AFB00010 */ sw $s0, 0x10($sp) -/* EDE68 802C94B8 8E30000C */ lw $s0, 0xc($s1) -/* EDE6C 802C94BC 8E050000 */ lw $a1, ($s0) -/* EDE70 802C94C0 0C0B1EAF */ jal get_variable -/* EDE74 802C94C4 26100004 */ addiu $s0, $s0, 4 -/* EDE78 802C94C8 8E050000 */ lw $a1, ($s0) -/* EDE7C 802C94CC 26100004 */ addiu $s0, $s0, 4 -/* EDE80 802C94D0 0220202D */ daddu $a0, $s1, $zero -/* EDE84 802C94D4 0C0B1EAF */ jal get_variable -/* EDE88 802C94D8 0040902D */ daddu $s2, $v0, $zero -/* EDE8C 802C94DC 0220202D */ daddu $a0, $s1, $zero -/* EDE90 802C94E0 8E050000 */ lw $a1, ($s0) -/* EDE94 802C94E4 0C0B1EAF */ jal get_variable -/* EDE98 802C94E8 0040802D */ daddu $s0, $v0, $zero -/* EDE9C 802C94EC 0240202D */ daddu $a0, $s2, $zero -/* EDEA0 802C94F0 0200282D */ daddu $a1, $s0, $zero -/* EDEA4 802C94F4 0C046F34 */ jal func_8011BCD0 -/* EDEA8 802C94F8 0040302D */ daddu $a2, $v0, $zero -/* EDEAC 802C94FC 8FBF001C */ lw $ra, 0x1c($sp) -/* EDEB0 802C9500 8FB20018 */ lw $s2, 0x18($sp) -/* EDEB4 802C9504 8FB10014 */ lw $s1, 0x14($sp) -/* EDEB8 802C9508 8FB00010 */ lw $s0, 0x10($sp) -/* EDEBC 802C950C 24020002 */ addiu $v0, $zero, 2 -/* EDEC0 802C9510 03E00008 */ jr $ra -/* EDEC4 802C9514 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C971C.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C971C.s deleted file mode 100644 index 13ef81097b..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C971C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802C971C -/* EE0CC 802C971C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* EE0D0 802C9720 AFBF0010 */ sw $ra, 0x10($sp) -/* EE0D4 802C9724 8C82000C */ lw $v0, 0xc($a0) -/* EE0D8 802C9728 0C0B1EAF */ jal get_variable -/* EE0DC 802C972C 8C450000 */ lw $a1, ($v0) -/* EE0E0 802C9730 0C046CDF */ jal func_8011B37C -/* EE0E4 802C9734 3044FFFF */ andi $a0, $v0, 0xffff -/* EE0E8 802C9738 8FBF0010 */ lw $ra, 0x10($sp) -/* EE0EC 802C973C 24020002 */ addiu $v0, $zero, 2 -/* EE0F0 802C9740 03E00008 */ jr $ra -/* EE0F4 802C9744 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9748.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C9748.s deleted file mode 100644 index edef50150b..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9748.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802C9748 -/* EE0F8 802C9748 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EE0FC 802C974C AFB00010 */ sw $s0, 0x10($sp) -/* EE100 802C9750 0080802D */ daddu $s0, $a0, $zero -/* EE104 802C9754 AFBF0018 */ sw $ra, 0x18($sp) -/* EE108 802C9758 AFB10014 */ sw $s1, 0x14($sp) -/* EE10C 802C975C 8E11000C */ lw $s1, 0xc($s0) -/* EE110 802C9760 8E250000 */ lw $a1, ($s1) -/* EE114 802C9764 0C0B1EAF */ jal get_variable -/* EE118 802C9768 26310004 */ addiu $s1, $s1, 4 -/* EE11C 802C976C 0200202D */ daddu $a0, $s0, $zero -/* EE120 802C9770 8E250000 */ lw $a1, ($s1) -/* EE124 802C9774 0C0B1EAF */ jal get_variable -/* EE128 802C9778 0040802D */ daddu $s0, $v0, $zero -/* EE12C 802C977C 10400005 */ beqz $v0, .L802C9794 -/* EE130 802C9780 00000000 */ nop -/* EE134 802C9784 0C046D74 */ jal func_8011B5D0 -/* EE138 802C9788 3204FFFF */ andi $a0, $s0, 0xffff -/* EE13C 802C978C 080B25E7 */ j .L802C979C -/* EE140 802C9790 00000000 */ nop -.L802C9794: -/* EE144 802C9794 0C046D98 */ jal func_8011B660 -/* EE148 802C9798 3204FFFF */ andi $a0, $s0, 0xffff -.L802C979C: -/* EE14C 802C979C 8FBF0018 */ lw $ra, 0x18($sp) -/* EE150 802C97A0 8FB10014 */ lw $s1, 0x14($sp) -/* EE154 802C97A4 8FB00010 */ lw $s0, 0x10($sp) -/* EE158 802C97A8 24020002 */ addiu $v0, $zero, 2 -/* EE15C 802C97AC 03E00008 */ jr $ra -/* EE160 802C97B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9B40.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C9B40.s deleted file mode 100644 index 12a08d6727..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9B40.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802C9B40 -/* EE4F0 802C9B40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EE4F4 802C9B44 AFB10014 */ sw $s1, 0x14($sp) -/* EE4F8 802C9B48 0080882D */ daddu $s1, $a0, $zero -/* EE4FC 802C9B4C AFBF0018 */ sw $ra, 0x18($sp) -/* EE500 802C9B50 AFB00010 */ sw $s0, 0x10($sp) -/* EE504 802C9B54 8E30000C */ lw $s0, 0xc($s1) -/* EE508 802C9B58 8E050000 */ lw $a1, ($s0) -/* EE50C 802C9B5C 0C0B1EAF */ jal get_variable -/* EE510 802C9B60 26100004 */ addiu $s0, $s0, 4 -/* EE514 802C9B64 8E100000 */ lw $s0, ($s0) -/* EE518 802C9B68 0C046C24 */ jal func_8011B090 -/* EE51C 802C9B6C 0040202D */ daddu $a0, $v0, $zero -/* EE520 802C9B70 0220202D */ daddu $a0, $s1, $zero -/* EE524 802C9B74 0040302D */ daddu $a2, $v0, $zero -/* EE528 802C9B78 0C0B2026 */ jal set_variable -/* EE52C 802C9B7C 0200282D */ daddu $a1, $s0, $zero -/* EE530 802C9B80 8FBF0018 */ lw $ra, 0x18($sp) -/* EE534 802C9B84 8FB10014 */ lw $s1, 0x14($sp) -/* EE538 802C9B88 8FB00010 */ lw $s0, 0x10($sp) -/* EE53C 802C9B8C 24020002 */ addiu $v0, $zero, 2 -/* EE540 802C9B90 03E00008 */ jr $ra -/* EE544 802C9B94 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9C70.s b/asm/nonmatchings/code_e92d0_len_5da0/func_802C9C70.s deleted file mode 100644 index 28d7b0f3f3..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/func_802C9C70.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802C9C70 -/* EE620 802C9C70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EE624 802C9C74 AFB10014 */ sw $s1, 0x14($sp) -/* EE628 802C9C78 0080882D */ daddu $s1, $a0, $zero -/* EE62C 802C9C7C AFBF001C */ sw $ra, 0x1c($sp) -/* EE630 802C9C80 AFB20018 */ sw $s2, 0x18($sp) -/* EE634 802C9C84 AFB00010 */ sw $s0, 0x10($sp) -/* EE638 802C9C88 8E30000C */ lw $s0, 0xc($s1) -/* EE63C 802C9C8C 8E050000 */ lw $a1, ($s0) -/* EE640 802C9C90 0C0B1EAF */ jal get_variable -/* EE644 802C9C94 26100004 */ addiu $s0, $s0, 4 -/* EE648 802C9C98 8E050000 */ lw $a1, ($s0) -/* EE64C 802C9C9C 26100004 */ addiu $s0, $s0, 4 -/* EE650 802C9CA0 0220202D */ daddu $a0, $s1, $zero -/* EE654 802C9CA4 0C0B1EAF */ jal get_variable -/* EE658 802C9CA8 0040902D */ daddu $s2, $v0, $zero -/* EE65C 802C9CAC 0220202D */ daddu $a0, $s1, $zero -/* EE660 802C9CB0 8E050000 */ lw $a1, ($s0) -/* EE664 802C9CB4 0C0B1EAF */ jal get_variable -/* EE668 802C9CB8 0040802D */ daddu $s0, $v0, $zero -/* EE66C 802C9CBC 0240202D */ daddu $a0, $s2, $zero -/* EE670 802C9CC0 3205FFFF */ andi $a1, $s0, 0xffff -/* EE674 802C9CC4 0C047059 */ jal func_8011C164 -/* EE678 802C9CC8 0040302D */ daddu $a2, $v0, $zero -/* EE67C 802C9CCC 8FBF001C */ lw $ra, 0x1c($sp) -/* EE680 802C9CD0 8FB20018 */ lw $s2, 0x18($sp) -/* EE684 802C9CD4 8FB10014 */ lw $s1, 0x14($sp) -/* EE688 802C9CD8 8FB00010 */ lw $s0, 0x10($sp) -/* EE68C 802C9CDC 24020002 */ addiu $v0, $zero, 2 -/* EE690 802C9CE0 03E00008 */ jr $ra -/* EE694 802C9CE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND.s deleted file mode 100644 index 4cfa5aa626..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_AND.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel si_handle_AND -/* EAC20 802C6270 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EAC24 802C6274 AFB10014 */ sw $s1, 0x14($sp) -/* EAC28 802C6278 0080882D */ daddu $s1, $a0, $zero -/* EAC2C 802C627C AFBF001C */ sw $ra, 0x1c($sp) -/* EAC30 802C6280 AFB20018 */ sw $s2, 0x18($sp) -/* EAC34 802C6284 AFB00010 */ sw $s0, 0x10($sp) -/* EAC38 802C6288 8E22000C */ lw $v0, 0xc($s1) -/* EAC3C 802C628C 8C450004 */ lw $a1, 4($v0) -/* EAC40 802C6290 0C0B1EAF */ jal get_variable -/* EAC44 802C6294 8C520000 */ lw $s2, ($v0) -/* EAC48 802C6298 0040802D */ daddu $s0, $v0, $zero -/* EAC4C 802C629C 0220202D */ daddu $a0, $s1, $zero -/* EAC50 802C62A0 0C0B1EAF */ jal get_variable -/* EAC54 802C62A4 0240282D */ daddu $a1, $s2, $zero -/* EAC58 802C62A8 0220202D */ daddu $a0, $s1, $zero -/* EAC5C 802C62AC 0240282D */ daddu $a1, $s2, $zero -/* EAC60 802C62B0 0C0B2026 */ jal set_variable -/* EAC64 802C62B4 02023024 */ and $a2, $s0, $v0 -/* EAC68 802C62B8 8FBF001C */ lw $ra, 0x1c($sp) -/* EAC6C 802C62BC 8FB20018 */ lw $s2, 0x18($sp) -/* EAC70 802C62C0 8FB10014 */ lw $s1, 0x14($sp) -/* EAC74 802C62C4 8FB00010 */ lw $s0, 0x10($sp) -/* EAC78 802C62C8 24020002 */ addiu $v0, $zero, 2 -/* EAC7C 802C62CC 03E00008 */ jr $ra -/* EAC80 802C62D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR.s b/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR.s deleted file mode 100644 index a7a639968f..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_OR.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel si_handle_OR -/* EACDC 802C632C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EACE0 802C6330 AFB10014 */ sw $s1, 0x14($sp) -/* EACE4 802C6334 0080882D */ daddu $s1, $a0, $zero -/* EACE8 802C6338 AFBF001C */ sw $ra, 0x1c($sp) -/* EACEC 802C633C AFB20018 */ sw $s2, 0x18($sp) -/* EACF0 802C6340 AFB00010 */ sw $s0, 0x10($sp) -/* EACF4 802C6344 8E22000C */ lw $v0, 0xc($s1) -/* EACF8 802C6348 8C450004 */ lw $a1, 4($v0) -/* EACFC 802C634C 0C0B1EAF */ jal get_variable -/* EAD00 802C6350 8C520000 */ lw $s2, ($v0) -/* EAD04 802C6354 0040802D */ daddu $s0, $v0, $zero -/* EAD08 802C6358 0220202D */ daddu $a0, $s1, $zero -/* EAD0C 802C635C 0C0B1EAF */ jal get_variable -/* EAD10 802C6360 0240282D */ daddu $a1, $s2, $zero -/* EAD14 802C6364 0220202D */ daddu $a0, $s1, $zero -/* EAD18 802C6368 0240282D */ daddu $a1, $s2, $zero -/* EAD1C 802C636C 0C0B2026 */ jal set_variable -/* EAD20 802C6370 02023025 */ or $a2, $s0, $v0 -/* EAD24 802C6374 8FBF001C */ lw $ra, 0x1c($sp) -/* EAD28 802C6378 8FB20018 */ lw $s2, 0x18($sp) -/* EAD2C 802C637C 8FB10014 */ lw $s1, 0x14($sp) -/* EAD30 802C6380 8FB00010 */ lw $s0, 0x10($sp) -/* EAD34 802C6384 24020002 */ addiu $v0, $zero, 2 -/* EAD38 802C6388 03E00008 */ jr $ra -/* EAD3C 802C638C 27BD0020 */ addiu $sp, $sp, 0x20 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 deleted file mode 100644 index 7c782f31d7..0000000000 --- a/asm/nonmatchings/code_e92d0_len_5da0/si_handle_does_script_exist.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel si_handle_does_script_exist -/* EB428 802C6A78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* EB42C 802C6A7C AFB10014 */ sw $s1, 0x14($sp) -/* EB430 802C6A80 0080882D */ daddu $s1, $a0, $zero -/* EB434 802C6A84 AFBF0018 */ sw $ra, 0x18($sp) -/* EB438 802C6A88 AFB00010 */ sw $s0, 0x10($sp) -/* EB43C 802C6A8C 8E30000C */ lw $s0, 0xc($s1) -/* EB440 802C6A90 8E050000 */ lw $a1, ($s0) -/* EB444 802C6A94 0C0B1EAF */ jal get_variable -/* EB448 802C6A98 26100004 */ addiu $s0, $s0, 4 -/* EB44C 802C6A9C 8E100000 */ lw $s0, ($s0) -/* EB450 802C6AA0 0C0B1059 */ jal does_script_exist -/* EB454 802C6AA4 0040202D */ daddu $a0, $v0, $zero -/* EB458 802C6AA8 0220202D */ daddu $a0, $s1, $zero -/* EB45C 802C6AAC 0040302D */ daddu $a2, $v0, $zero -/* EB460 802C6AB0 0C0B2026 */ jal set_variable -/* EB464 802C6AB4 0200282D */ daddu $a1, $s0, $zero -/* EB468 802C6AB8 8FBF0018 */ lw $ra, 0x18($sp) -/* EB46C 802C6ABC 8FB10014 */ lw $s1, 0x14($sp) -/* EB470 802C6AC0 8FB00010 */ lw $s0, 0x10($sp) -/* EB474 802C6AC4 24020002 */ addiu $v0, $zero, 2 -/* EB478 802C6AC8 03E00008 */ jr $ra -/* EB47C 802C6ACC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/include/common_structs.h b/include/common_structs.h index 3a352f84ce..f7f7b244ab 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -115,7 +115,7 @@ typedef struct PlayerData { /* 0x208 */ s16 equippedBadges[64]; /* 0x288 */ char unk_288; /* 0x289 */ u8 merleeSpellType; - /* 0x28A */ u8 merleeCastsLeft; + /* 0x28A */ s8 merleeCastsLeft; /* 0x28B */ char unk_28B; /* 0x28C */ s16 merleeTurnCount; /* 0x28E */ s8 maxStarPower; @@ -679,7 +679,8 @@ typedef struct Model { /* 0xA6 */ u8 renderMode; /* Created by retype action */ /* 0xA7 */ char unk_A7; /* 0xA8 */ u8 textureID; - /* 0xA9 */ char unk_A9[7]; + /* 0xA9 */ u8 unk_A9; + /* 0xAA */ char unk_AA[6]; } Model; // size = 0xB0 typedef struct AnimatedMesh { @@ -855,7 +856,7 @@ typedef struct GameStatus { /* 0x072 */ u8 nextDemoScene; /* which part of the demo to play next */ /* 0x073 */ u8 contBitPattern; /* 0x074 */ char unk_74[4]; - /* 0x078 */ u8 disableScripts; + /* 0x078 */ s8 disableScripts; /* 0x079 */ char unk_79; /* 0x07A */ s8 musicEnabled; /* 0x07B */ char unk_7B[3]; @@ -1342,8 +1343,8 @@ typedef struct PlayerStatus { /* 0x00C */ u8 peachDisguise; /* 0x00D */ char unk_0D[5]; /* 0x012 */ s16 moveFrames; - /* 0x014 */ u8 enableCollisionOverlapsCheck; - /* 0x015 */ u8 statusMenuCounterinputEnabledCounter; /* whether the C-up menu can appear */ + /* 0x014 */ s8 enableCollisionOverlapsCheck; + /* 0x015 */ s8 statusMenuCounterinputEnabledCounter; /* whether the C-up menu can appear */ /* 0x016 */ s16 lastGoodPosition[3]; /* 0x01C */ struct Vec3f extraVelocity; /* 0x028 */ struct Vec3f position; diff --git a/include/functions.h b/include/functions.h index 8b45338456..88f6ecd129 100644 --- a/include/functions.h +++ b/include/functions.h @@ -15,8 +15,14 @@ s32 get_global_flag(s32 index); s32 get_area_byte(s32 index); s32 get_area_flag(s32 index); +Shadow* get_shadow_by_index(s32 index); + +void render_player_model(); + +void parent_collider_to_model(s32 colliderID, s16 modelIndex); void clone_model(u16 srcModelID, u16 newModelID); Model* get_model_from_list_index(s32 listIndex); +s32 get_model_list_index_from_tree_index(s32 treeIndex); void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); @@ -68,4 +74,7 @@ void add_vec2D_polar(f32* x, f32* y, f32 r, f32 theta); s32 play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); s32 set_music_track(s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); + +ScriptInstance* get_script_by_index(s32 index); + #endif diff --git a/include/macros.h b/include/macros.h index 5c72ec148a..79b7384cb4 100644 --- a/include/macros.h +++ b/include/macros.h @@ -2,13 +2,10 @@ #define _MACROS_H_ #ifndef SPLAT -#define INCLUDE_ASM(FOLDER, NAME, ARGS...) \ - __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"include/macro.inc\"\n.include \"asm/nonmatchings/"FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); } -#define INCLUDE_ASM_T(TYPE, FOLDER, NAME, ARGS...) \ +#define INCLUDE_ASM(TYPE, FOLDER, NAME, ARGS...) \ TYPE __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"include/macro.inc\"\n.include \"asm/nonmatchings/"FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); } #else -#define INCLUDE_ASM(FOLDER, NAME, ARGS...) -#define INCLUDE_ASM_T(TYPE, FOLDER, NAME, ARGS...) +#define INCLUDE_ASM(TYPE, FOLDER, NAME, ARGS...) #endif #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) diff --git a/include/si.h b/include/si.h index 222ba5cfef..d44c845ae4 100644 --- a/include/si.h +++ b/include/si.h @@ -23,7 +23,7 @@ typedef s32 ApiStatus; #define API_FUN(NAME) ApiStatus (*NAME)(struct ScriptInstance* script, s32 isInitialCall) #ifndef SPLAT -#define INCLUDE_API_ASM(FOLDER, NAME) ApiStatus INCLUDE_ASM(FOLDER, NAME, struct ScriptInstance* script, s32 isInitialCall) +#define INCLUDE_API_ASM(FOLDER, NAME) INCLUDE_ASM(ApiStatus, FOLDER, NAME, struct ScriptInstance* script, s32 isInitialCall) #else #define INCLUDE_API_ASM(FOLDER, NAME) #endif diff --git a/include/variables.h b/include/variables.h index e3ce26db17..6d9d81015d 100644 --- a/include/variables.h +++ b/include/variables.h @@ -43,7 +43,11 @@ extern Entity** gCurrentEntityListPtr[30]; extern UNK_TYPE* gWorldDynamicEntityList[16]; extern UNK_TYPE* gBattleDynamicEntityList[16]; -extern UNK_TYPE** gCurrentDynamicEntityListPtr[16]; +extern UNK_TYPE*** gCurrentDynamicEntityListPtr; + +extern Npc* gWorldNpcList[64]; +extern Npc* gBattleNpcList[64]; +extern Npc** gCurrentNpcListPtr[64]; extern Shadow* gWorldShadowList[60]; extern Shadow* gBattleShadowList[60]; @@ -61,6 +65,8 @@ extern EncounterStatus gCurrentEncounter; extern s16* D_80151328; extern s16 D_8010CD10; extern s16 D_8010CD12; +extern s32 D_8010CD20; +extern s32 D_8010F094; // player shadow index? extern s32 D_801595A0; extern s16 D_80159AE2; extern s16 D_80159AE4; diff --git a/src/code_1000_len_60.c b/src/code_1000_len_60.c index aac67b0561..07cee9c00d 100644 --- a/src/code_1000_len_60.c +++ b/src/code_1000_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("code_1000_len_60", entry_point); +INCLUDE_ASM(s32, "code_1000_len_60", entry_point); diff --git a/src/code_101b90_len_8f0.c b/src/code_101b90_len_8f0.c index dfef87ce54..cd7562c1d9 100644 --- a/src/code_101b90_len_8f0.c +++ b/src/code_101b90_len_8f0.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM("code_101b90_len_8f0", func_802DEAA0); +INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DEAA0); -INCLUDE_ASM("code_101b90_len_8f0", load_sprite); +INCLUDE_ASM(s32, "code_101b90_len_8f0", load_sprite); -INCLUDE_ASM("code_101b90_len_8f0", func_802DED60); +INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DED60); -INCLUDE_ASM("code_101b90_len_8f0", func_802DEEA0); +INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DEEA0); -INCLUDE_ASM("code_101b90_len_8f0", func_802DEFB4); +INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DEFB4); -INCLUDE_ASM("code_101b90_len_8f0", func_802DF00C); +INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DF00C); -INCLUDE_ASM("code_101b90_len_8f0", func_802DF2D8); +INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DF2D8); diff --git a/src/code_102610_len_2330.c b/src/code_102610_len_2330.c index de83e2fc39..79b804e965 100644 --- a/src/code_102610_len_2330.c +++ b/src/code_102610_len_2330.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM("code_102610_len_2330", create_shadow_callback); +INCLUDE_ASM(s32, "code_102610_len_2330", create_shadow_callback); // Needs rodata support /*void create_shadow_callback(Shadow* shadow) { shadow->scale.x = 0.1f; @@ -8,15 +8,15 @@ INCLUDE_ASM("code_102610_len_2330", create_shadow_callback); shadow->scale.z = 0.1f; }*/ -INCLUDE_ASM("code_102610_len_2330", func_802E0DB0); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E0DB0); -INCLUDE_ASM("code_102610_len_2330", func_802E0DE0); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E0DE0); -INCLUDE_ASM("code_102610_len_2330", func_802E10F4); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E10F4); -INCLUDE_ASM("code_102610_len_2330", func_802E114C); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E114C); -INCLUDE_ASM("code_102610_len_2330", func_802E117C); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E117C); void save_game_at_player_position(void) { GameStatus* gameStatus = GAME_STATUS; @@ -27,56 +27,56 @@ void save_game_at_player_position(void) { fio_save_game(gameStatus->saveSlot); } -INCLUDE_ASM("code_102610_len_2330", func_802E1204); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1204); -INCLUDE_ASM("code_102610_len_2330", func_802E1270); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1270); -INCLUDE_ASM("code_102610_len_2330", func_802E1298); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1298); -INCLUDE_ASM("code_102610_len_2330", func_802E12F8); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E12F8); -INCLUDE_ASM("code_102610_len_2330", func_802E1328); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1328); -INCLUDE_ASM("code_102610_len_2330", func_802E1350); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1350); -INCLUDE_ASM("code_102610_len_2330", func_802E13B8); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E13B8); -INCLUDE_ASM("code_102610_len_2330", func_802E1400); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1400); -INCLUDE_ASM("code_102610_len_2330", func_802E1460); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1460); -INCLUDE_ASM("code_102610_len_2330", func_802E14D8); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E14D8); -INCLUDE_ASM("code_102610_len_2330", func_802E153C); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E153C); -INCLUDE_ASM("code_102610_len_2330", func_802E1614); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1614); -INCLUDE_ASM("code_102610_len_2330", func_802E1660); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1660); -INCLUDE_ASM("code_102610_len_2330", func_802E1740); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1740); -INCLUDE_ASM("code_102610_len_2330", func_802E176C); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E176C); -INCLUDE_ASM("code_102610_len_2330", func_802E17A8); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E17A8); -INCLUDE_ASM("code_102610_len_2330", func_802E1EA8); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1EA8); -INCLUDE_ASM("code_102610_len_2330", func_802E1EDC); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E1EDC); -INCLUDE_ASM("code_102610_len_2330", func_802E234C); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E234C); -INCLUDE_ASM("code_102610_len_2330", entity_init_BlueSwitch); +INCLUDE_ASM(s32, "code_102610_len_2330", entity_init_BlueSwitch); -INCLUDE_ASM("code_102610_len_2330", entity_init_HugeBlueSwitch); +INCLUDE_ASM(s32, "code_102610_len_2330", entity_init_HugeBlueSwitch); -INCLUDE_ASM("code_102610_len_2330", func_802E2450); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2450); -INCLUDE_ASM("code_102610_len_2330", func_802E246C); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E246C); -INCLUDE_ASM("code_102610_len_2330", func_802E263C); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E263C); -INCLUDE_ASM("code_102610_len_2330", func_802E2BA4); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2BA4); -INCLUDE_ASM("code_102610_len_2330", func_802E2EB0); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2EB0); -INCLUDE_ASM("code_102610_len_2330", func_802E2FD0); +INCLUDE_ASM(s32, "code_102610_len_2330", func_802E2FD0); diff --git a/src/code_10400_len_d30.c b/src/code_10400_len_d30.c index ad135498c1..80711c89f1 100644 --- a/src/code_10400_len_d30.c +++ b/src/code_10400_len_d30.c @@ -1,25 +1,25 @@ #include "common.h" -INCLUDE_ASM("code_10400_len_d30", func_80035000); +INCLUDE_ASM(s32, "code_10400_len_d30", func_80035000); -INCLUDE_ASM("code_10400_len_d30", func_80035058); +INCLUDE_ASM(s32, "code_10400_len_d30", func_80035058); -INCLUDE_ASM("code_10400_len_d30", func_800351C8); +INCLUDE_ASM(s32, "code_10400_len_d30", func_800351C8); -INCLUDE_ASM("code_10400_len_d30", func_800354EC); +INCLUDE_ASM(s32, "code_10400_len_d30", func_800354EC); -INCLUDE_ASM("code_10400_len_d30", func_800355C4); +INCLUDE_ASM(s32, "code_10400_len_d30", func_800355C4); -INCLUDE_ASM("code_10400_len_d30", func_800355CC); +INCLUDE_ASM(s32, "code_10400_len_d30", func_800355CC); -INCLUDE_ASM("code_10400_len_d30", func_800355D4); +INCLUDE_ASM(s32, "code_10400_len_d30", func_800355D4); -INCLUDE_ASM("code_10400_len_d30", func_80035660); +INCLUDE_ASM(s32, "code_10400_len_d30", func_80035660); -INCLUDE_ASM("code_10400_len_d30", func_80035704); +INCLUDE_ASM(s32, "code_10400_len_d30", func_80035704); -INCLUDE_ASM("code_10400_len_d30", func_80035B40); +INCLUDE_ASM(s32, "code_10400_len_d30", func_80035B40); -INCLUDE_ASM("code_10400_len_d30", func_80035D18); +INCLUDE_ASM(s32, "code_10400_len_d30", func_80035D18); -INCLUDE_ASM("code_10400_len_d30", func_80035D20); +INCLUDE_ASM(s32, "code_10400_len_d30", func_80035D20); diff --git a/src/code_104940_len_dc0.c b/src/code_104940_len_dc0.c index ce2a9d59ae..00619eff78 100644 --- a/src/code_104940_len_dc0.c +++ b/src/code_104940_len_dc0.c @@ -1,37 +1,37 @@ #include "common.h" -INCLUDE_ASM("code_104940_len_dc0", func_802E30C0); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E30C0); -INCLUDE_ASM("code_104940_len_dc0", func_802E31B0); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E31B0); -INCLUDE_ASM("code_104940_len_dc0", func_802E31EC); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E31EC); -INCLUDE_ASM("code_104940_len_dc0", func_802E328C); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E328C); -INCLUDE_ASM("code_104940_len_dc0", func_802E3370); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3370); -INCLUDE_ASM("code_104940_len_dc0", func_802E3650); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3650); -INCLUDE_ASM("code_104940_len_dc0", entity_init_Hammer23Block_normal); +INCLUDE_ASM(s32, "code_104940_len_dc0", entity_init_Hammer23Block_normal); -INCLUDE_ASM("code_104940_len_dc0", func_802E3714); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3714); -INCLUDE_ASM("code_104940_len_dc0", func_802E3728); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3728); -INCLUDE_ASM("code_104940_len_dc0", func_802E37E4); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E37E4); -INCLUDE_ASM("code_104940_len_dc0", func_802E3898); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3898); -INCLUDE_ASM("code_104940_len_dc0", func_802E38D8); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E38D8); -INCLUDE_ASM("code_104940_len_dc0", func_802E3A00); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3A00); -INCLUDE_ASM("code_104940_len_dc0", func_802E3A48); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3A48); -INCLUDE_ASM("code_104940_len_dc0", func_802E3B08); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3B08); -INCLUDE_ASM("code_104940_len_dc0", func_802E3BA4); +INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3BA4); -INCLUDE_ASM("code_104940_len_dc0", entity_init_Hammer1Block_normal); +INCLUDE_ASM(s32, "code_104940_len_dc0", entity_init_Hammer1Block_normal); -INCLUDE_ASM("code_104940_len_dc0", entity_init_HammerBlock_small); +INCLUDE_ASM(s32, "code_104940_len_dc0", entity_init_HammerBlock_small); diff --git a/src/code_105700_len_2130.c b/src/code_105700_len_2130.c index 5f5a6683f1..c2d8644019 100644 --- a/src/code_105700_len_2130.c +++ b/src/code_105700_len_2130.c @@ -1,99 +1,99 @@ #include "common.h" -INCLUDE_ASM("code_105700_len_2130", func_802E3E80); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E3E80); -INCLUDE_ASM("code_105700_len_2130", func_802E3E9C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E3E9C); -INCLUDE_ASM("code_105700_len_2130", func_802E3EE0); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E3EE0); -INCLUDE_ASM("code_105700_len_2130", func_802E3F0C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E3F0C); -INCLUDE_ASM("code_105700_len_2130", func_802E4040); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4040); -INCLUDE_ASM("code_105700_len_2130", func_802E405C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E405C); -INCLUDE_ASM("code_105700_len_2130", func_802E40A0); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E40A0); -INCLUDE_ASM("code_105700_len_2130", func_802E4108); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4108); -INCLUDE_ASM("code_105700_len_2130", func_802E4154); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4154); -INCLUDE_ASM("code_105700_len_2130", func_802E421C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E421C); -INCLUDE_ASM("code_105700_len_2130", func_802E4484); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4484); -INCLUDE_ASM("code_105700_len_2130", func_802E44CC); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E44CC); -INCLUDE_ASM("code_105700_len_2130", func_802E44F8); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E44F8); -INCLUDE_ASM("code_105700_len_2130", func_802E4540); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4540); -INCLUDE_ASM("code_105700_len_2130", func_802E455C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E455C); -INCLUDE_ASM("code_105700_len_2130", func_802E464C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E464C); -INCLUDE_ASM("code_105700_len_2130", func_802E4694); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4694); -INCLUDE_ASM("code_105700_len_2130", func_802E46BC); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E46BC); -INCLUDE_ASM("code_105700_len_2130", func_802E4710); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4710); -INCLUDE_ASM("code_105700_len_2130", func_802E4730); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4730); -INCLUDE_ASM("code_105700_len_2130", func_802E4AEC); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4AEC); -INCLUDE_ASM("code_105700_len_2130", func_802E4B10); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4B10); -INCLUDE_ASM("code_105700_len_2130", func_802E4B60); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4B60); -INCLUDE_ASM("code_105700_len_2130", func_802E4C10); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4C10); -INCLUDE_ASM("code_105700_len_2130", func_802E4DE0); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4DE0); -INCLUDE_ASM("code_105700_len_2130", func_802E4E04); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E4E04); -INCLUDE_ASM("code_105700_len_2130", func_802E5308); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5308); -INCLUDE_ASM("code_105700_len_2130", func_802E5324); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5324); -INCLUDE_ASM("code_105700_len_2130", func_802E540C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E540C); -INCLUDE_ASM("code_105700_len_2130", func_802E5428); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5428); -INCLUDE_ASM("code_105700_len_2130", func_802E545C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E545C); -INCLUDE_ASM("code_105700_len_2130", func_802E548C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E548C); -INCLUDE_ASM("code_105700_len_2130", func_802E54A8); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E54A8); -INCLUDE_ASM("code_105700_len_2130", func_802E54CC); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E54CC); -INCLUDE_ASM("code_105700_len_2130", func_802E555C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E555C); -INCLUDE_ASM("code_105700_len_2130", func_802E55A8); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E55A8); -INCLUDE_ASM("code_105700_len_2130", func_802E5648); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5648); -INCLUDE_ASM("code_105700_len_2130", func_802E5670); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5670); -INCLUDE_ASM("code_105700_len_2130", func_802E5690); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5690); -INCLUDE_ASM("code_105700_len_2130", func_802E56D0); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E56D0); -INCLUDE_ASM("code_105700_len_2130", func_802E56EC); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E56EC); -INCLUDE_ASM("code_105700_len_2130", func_802E578C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E578C); -INCLUDE_ASM("code_105700_len_2130", func_802E57E4); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E57E4); -INCLUDE_ASM("code_105700_len_2130", func_802E5800); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5800); -INCLUDE_ASM("code_105700_len_2130", func_802E581C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E581C); -INCLUDE_ASM("code_105700_len_2130", func_802E586C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E586C); -INCLUDE_ASM("code_105700_len_2130", func_802E5E50); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5E50); -INCLUDE_ASM("code_105700_len_2130", func_802E5F50); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5F50); -INCLUDE_ASM("code_105700_len_2130", func_802E5F7C); +INCLUDE_ASM(s32, "code_105700_len_2130", func_802E5F7C); diff --git a/src/code_1060_len_310.c b/src/code_1060_len_310.c index abb3973528..57f3c89846 100644 --- a/src/code_1060_len_310.c +++ b/src/code_1060_len_310.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM("code_1060_len_310", func_80025C60); +INCLUDE_ASM(s32, "code_1060_len_310", func_80025C60); -INCLUDE_ASM("code_1060_len_310", func_80025CC0); +INCLUDE_ASM(s32, "code_1060_len_310", func_80025CC0); -INCLUDE_ASM("code_1060_len_310", func_80025CFC); +INCLUDE_ASM(s32, "code_1060_len_310", func_80025CFC); -INCLUDE_ASM("code_1060_len_310", func_80025D38); +INCLUDE_ASM(s32, "code_1060_len_310", func_80025D38); -INCLUDE_ASM("code_1060_len_310", func_80025D74); +INCLUDE_ASM(s32, "code_1060_len_310", func_80025D74); -INCLUDE_ASM("code_1060_len_310", func_80025F44); +INCLUDE_ASM(s32, "code_1060_len_310", func_80025F44); diff --git a/src/code_107830_len_e70.c b/src/code_107830_len_e70.c index c1cefe81e3..400d2f495d 100644 --- a/src/code_107830_len_e70.c +++ b/src/code_107830_len_e70.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_ASM("code_107830_len_e70", func_802E5FB0); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E5FB0); -INCLUDE_ASM("code_107830_len_e70", func_802E6064); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6064); -INCLUDE_ASM("code_107830_len_e70", func_802E6118); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6118); -INCLUDE_ASM("code_107830_len_e70", func_802E6178); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6178); -INCLUDE_ASM("code_107830_len_e70", func_802E6194); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6194); -INCLUDE_ASM("code_107830_len_e70", func_802E619C); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E619C); -INCLUDE_ASM("code_107830_len_e70", func_802E61B0); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E61B0); -INCLUDE_ASM("code_107830_len_e70", func_802E6338); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6338); -INCLUDE_ASM("code_107830_len_e70", func_802E6390); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6390); -INCLUDE_ASM("code_107830_len_e70", func_802E63A8); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E63A8); -INCLUDE_ASM("code_107830_len_e70", func_802E6574); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6574); -INCLUDE_ASM("code_107830_len_e70", func_802E6B6C); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6B6C); -INCLUDE_ASM("code_107830_len_e70", func_802E6C24); +INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6C24); diff --git a/src/code_1086a0_len_fc0.c b/src/code_1086a0_len_fc0.c index 1b00661801..e3aa61b55e 100644 --- a/src/code_1086a0_len_fc0.c +++ b/src/code_1086a0_len_fc0.c @@ -1,37 +1,37 @@ #include "common.h" -INCLUDE_ASM("code_1086a0_len_fc0", func_802E6E20); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E6E20); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E6E90); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E6E90); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E6ED8); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E6ED8); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7034); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7034); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E70B0); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E70B0); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E71F8); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E71F8); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7230); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7230); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E742C); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E742C); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E75C0); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E75C0); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E75E4); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E75E4); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7AE4); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7AE4); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7C70); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7C70); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7C8C); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7C8C); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7CB8); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7CB8); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7D28); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7D28); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7D38); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7D38); -INCLUDE_ASM("code_1086a0_len_fc0", func_802E7D54); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7D54); -INCLUDE_ASM("code_1086a0_len_fc0", entity_init_Chest); +INCLUDE_ASM(s32, "code_1086a0_len_fc0", entity_init_Chest); diff --git a/src/code_109660_len_1270.c b/src/code_109660_len_1270.c index 98f3005b9e..54cd26fbcd 100644 --- a/src/code_109660_len_1270.c +++ b/src/code_109660_len_1270.c @@ -1,30 +1,30 @@ #include "common.h" -INCLUDE_ASM("code_109660_len_1270", func_802E7DE0); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7DE0); -INCLUDE_ASM("code_109660_len_1270", func_802E7F40); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7F40); -INCLUDE_ASM("code_109660_len_1270", func_802E7F6C); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7F6C); -INCLUDE_ASM("code_109660_len_1270", func_802E7FA0); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7FA0); -INCLUDE_ASM("code_109660_len_1270", func_802E854C); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E854C); -INCLUDE_ASM("code_109660_len_1270", func_802E8858); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8858); -INCLUDE_ASM("code_109660_len_1270", func_802E88EC); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E88EC); -INCLUDE_ASM("code_109660_len_1270", func_802E89B0); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E89B0); -INCLUDE_ASM("code_109660_len_1270", func_802E89F8); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E89F8); -INCLUDE_ASM("code_109660_len_1270", func_802E8A58); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8A58); -INCLUDE_ASM("code_109660_len_1270", func_802E8ADC); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8ADC); -INCLUDE_ASM("code_109660_len_1270", func_802E8BC0); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8BC0); -INCLUDE_ASM("code_109660_len_1270", func_802E8C94); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8C94); void player_enter_blue_pipe(Entity* bluePipe) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -62,6 +62,6 @@ void func_802E8E10(Entity* entity) { func_80110678(); } -INCLUDE_ASM("code_109660_len_1270", push_entity_matrix); +INCLUDE_ASM(s32, "code_109660_len_1270", push_entity_matrix); -INCLUDE_ASM("code_109660_len_1270", func_802E8F94); +INCLUDE_ASM(s32, "code_109660_len_1270", func_802E8F94); diff --git a/src/code_10A8D0.c b/src/code_10A8D0.c index 50dafd5aeb..b2800820e3 100644 --- a/src/code_10A8D0.c +++ b/src/code_10A8D0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("code_10A8D0", func_802E9050); +INCLUDE_ASM(s32, "code_10A8D0", func_802E9050); diff --git a/src/code_111f0_len_860.c b/src/code_111f0_len_860.c index e8c8fe1463..750a84062d 100644 --- a/src/code_111f0_len_860.c +++ b/src/code_111f0_len_860.c @@ -5,13 +5,13 @@ void func_80035DF0(s16 arg0) { *tempPtr = arg0; } -INCLUDE_ASM("code_111f0_len_860", func_80035E00); +INCLUDE_ASM(s32, "code_111f0_len_860", func_80035E00); -INCLUDE_ASM("code_111f0_len_860", func_80035E24); +INCLUDE_ASM(s32, "code_111f0_len_860", func_80035E24); -INCLUDE_ASM("code_111f0_len_860", func_80035E54); +INCLUDE_ASM(s32, "code_111f0_len_860", func_80035E54); -INCLUDE_ASM("code_111f0_len_860", func_80035EEC); +INCLUDE_ASM(s32, "code_111f0_len_860", func_80035EEC); void func_800360FC(void) { GameStatus* gameStatus = *gGameStatusPtr; @@ -36,7 +36,7 @@ void func_80036130(void) { } } -INCLUDE_ASM("code_111f0_len_860", func_8003617C); +INCLUDE_ASM(s32, "code_111f0_len_860", func_8003617C); s32 func_800363FC(void) { s32 phi_return; @@ -59,7 +59,7 @@ s32 func_80036430(void) { return playerStatus->flags; } -INCLUDE_ASM("code_111f0_len_860", func_8003646C); +INCLUDE_ASM(s32, "code_111f0_len_860", func_8003646C); void func_80036640(void) { } diff --git a/src/code_11a50_len_7a0.c b/src/code_11a50_len_7a0.c index 86ee8315bc..b14218f0db 100644 --- a/src/code_11a50_len_7a0.c +++ b/src/code_11a50_len_7a0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM("code_11a50_len_7a0", begin_state_intro); +INCLUDE_ASM(s32, "code_11a50_len_7a0", begin_state_intro); -INCLUDE_ASM("code_11a50_len_7a0", step_intro); +INCLUDE_ASM(s32, "code_11a50_len_7a0", step_intro); -INCLUDE_ASM("code_11a50_len_7a0", func_80036DE0); +INCLUDE_ASM(s32, "code_11a50_len_7a0", func_80036DE0); diff --git a/src/code_121f0_len_1290.c b/src/code_121f0_len_1290.c index 26dee20361..32855cc392 100644 --- a/src/code_121f0_len_1290.c +++ b/src/code_121f0_len_1290.c @@ -1,19 +1,19 @@ #include "common.h" -INCLUDE_ASM("code_121f0_len_1290", begin_state_title_screen); +INCLUDE_ASM(s32, "code_121f0_len_1290", begin_state_title_screen); -INCLUDE_ASM("code_121f0_len_1290", step_title_screen); +INCLUDE_ASM(s32, "code_121f0_len_1290", step_title_screen); -INCLUDE_ASM("code_121f0_len_1290", func_800375A4); +INCLUDE_ASM(s32, "code_121f0_len_1290", func_800375A4); -INCLUDE_ASM("code_121f0_len_1290", func_80037638); +INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037638); -INCLUDE_ASM("code_121f0_len_1290", func_80037960); +INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037960); -INCLUDE_ASM("code_121f0_len_1290", func_80037968); +INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037968); -INCLUDE_ASM("code_121f0_len_1290", func_80037994); +INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037994); -INCLUDE_ASM("code_121f0_len_1290", func_80037BC8); +INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037BC8); -INCLUDE_ASM("code_121f0_len_1290", func_80037E14); +INCLUDE_ASM(s32, "code_121f0_len_1290", func_80037E14); diff --git a/src/code_13480_len_3f0.c b/src/code_13480_len_3f0.c index 675bdd2dad..58c0088ca9 100644 --- a/src/code_13480_len_3f0.c +++ b/src/code_13480_len_3f0.c @@ -1,7 +1,28 @@ #include "common.h" -INCLUDE_ASM("code_13480_len_3f0", init_demo_data); +#ifdef NON_MATCHING +void init_demo_data(void) { + if (GAME_STATUS->demoState == 0) { + GAME_STATUS->nextDemoScene = 0; + GAME_STATUS->demoState = 1; + } + + GAME_STATUS->demoStickX = 0; + GAME_STATUS->demoButtonInput = 0; + GAME_STATUS->demoStickY = 0; + + func_80056228(); + set_map_transition_effect(2); + func_80137D88(0, 255.0f); + clear_saved_variables(); + clear_script_list(); +} +#else +INCLUDE_ASM(s32, "code_13480_len_3f0", init_demo_data); +#endif -INCLUDE_ASM("code_13480_len_3f0", next_demo_scene); +INCLUDE_ASM(s32, "code_13480_len_3f0", next_demo_scene); -INCLUDE_ASM("code_13480_len_3f0", func_8003845C); +void func_8003845C(void) { + +} diff --git a/src/code_135EE0.c b/src/code_135EE0.c index 71c2aaae69..00388d6445 100644 --- a/src/code_135EE0.c +++ b/src/code_135EE0.c @@ -1,203 +1,206 @@ #include "common.h" -INCLUDE_ASM("code_135EE0", pause_set_cursor_opacity); +INCLUDE_ASM(s32, "code_135EE0", pause_set_cursor_opacity); -INCLUDE_ASM("code_135EE0", func_80242BAC); +INCLUDE_ASM(s32, "code_135EE0", func_80242BAC); -INCLUDE_ASM("code_135EE0", func_80242D04); +INCLUDE_ASM(s32, "code_135EE0", func_80242D04); -INCLUDE_ASM("code_135EE0", pause_interp_cursor); +INCLUDE_ASM(s32, "code_135EE0", pause_interp_cursor); -INCLUDE_ASM("code_135EE0", func_80242F90); +INCLUDE_ASM(s32, "code_135EE0", func_80242F90); -INCLUDE_ASM("code_135EE0", func_80242FBC); +INCLUDE_ASM(s32, "code_135EE0", func_80242FBC); -INCLUDE_ASM("code_135EE0", func_80242FF4); +INCLUDE_ASM(s32, "code_135EE0", func_80242FF4); -INCLUDE_ASM("code_135EE0", func_80243090); +INCLUDE_ASM(s32, "code_135EE0", func_80243090); -INCLUDE_ASM("code_135EE0", func_802430E4); +INCLUDE_ASM(s32, "code_135EE0", func_802430E4); -INCLUDE_ASM("code_135EE0", func_8024313C); +INCLUDE_ASM(s32, "code_135EE0", func_8024313C); -INCLUDE_ASM("code_135EE0", func_80243188); +INCLUDE_ASM(s32, "code_135EE0", func_80243188); -INCLUDE_ASM("code_135EE0", func_80243238); +INCLUDE_ASM(s32, "code_135EE0", func_80243238); -INCLUDE_ASM("code_135EE0", func_802432E8); +INCLUDE_ASM(s32, "code_135EE0", func_802432E8); -INCLUDE_ASM("code_135EE0", func_80243388); +INCLUDE_ASM(s32, "code_135EE0", func_80243388); -INCLUDE_ASM("code_135EE0", pause_interp_text_scroll); +INCLUDE_ASM(s32, "code_135EE0", pause_interp_text_scroll); -INCLUDE_ASM("code_135EE0", pause_interp_vertical_scroll); +INCLUDE_ASM(s32, "code_135EE0", pause_interp_vertical_scroll); -INCLUDE_ASM("code_135EE0", pause_update_cursor); +INCLUDE_ASM(s32, "code_135EE0", pause_update_cursor); -INCLUDE_ASM("code_135EE0", func_80243568); +INCLUDE_ASM(s32, "code_135EE0", func_80243568); -INCLUDE_ASM("code_135EE0", pause_textbox_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_textbox_draw_contents); -INCLUDE_ASM("code_135EE0", pause_tutorial_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_tutorial_draw_contents); -INCLUDE_ASM("code_135EE0", pause_init); +INCLUDE_ASM(s32, "code_135EE0", pause_init); -INCLUDE_ASM("code_135EE0", pause_tutorial_input); +INCLUDE_ASM(s32, "code_135EE0", pause_tutorial_input); -INCLUDE_ASM("code_135EE0", pause_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_handle_input); -INCLUDE_ASM("code_135EE0", pause_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_cleanup); -INCLUDE_ASM("code_135EE0", pause_get_total_equipped_bp_cost); +INCLUDE_ASM(s32, "code_135EE0", pause_get_total_equipped_bp_cost); -INCLUDE_ASM("code_135EE0", pause_draw_rect); +INCLUDE_ASM(s32, "code_135EE0", pause_draw_rect); -INCLUDE_ASM("code_135EE0", pause_sort_item_list); +INCLUDE_ASM(s32, "code_135EE0", pause_sort_item_list); -INCLUDE_ASM("code_135EE0", pause_tabs_draw_invis); +void pause_tabs_draw_invis(void) { +} -INCLUDE_ASM("code_135EE0", pause_tabs_draw_stats); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_stats); -INCLUDE_ASM("code_135EE0", pause_tabs_draw_badges); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_badges); -INCLUDE_ASM("code_135EE0", pause_tabs_draw_items); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_items); -INCLUDE_ASM("code_135EE0", pause_tabs_draw_party); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_party); -INCLUDE_ASM("code_135EE0", pause_tabs_draw_spirits); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_spirits); -INCLUDE_ASM("code_135EE0", pause_tabs_draw_map); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_draw_map); -INCLUDE_ASM("code_135EE0", pause_tabs_init); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_init); -INCLUDE_ASM("code_135EE0", pause_tabs_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_handle_input); -INCLUDE_ASM("code_135EE0", pause_tabs_update); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_update); -INCLUDE_ASM("code_135EE0", pause_tabs_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_tabs_cleanup); -INCLUDE_ASM("code_135EE0", pause_stats_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_stats_draw_contents); -INCLUDE_ASM("code_135EE0", pause_stats_init); +INCLUDE_ASM(s32, "code_135EE0", pause_stats_init); -INCLUDE_ASM("code_135EE0", pause_stats_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_stats_handle_input); -INCLUDE_ASM("code_135EE0", pause_stats_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_stats_cleanup); -INCLUDE_ASM("code_135EE0", pause_badges_comparator); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_comparator); -INCLUDE_ASM("code_135EE0", pause_badges_count_all); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_count_all); -INCLUDE_ASM("code_135EE0", pause_badges_count_equipped); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_count_equipped); -INCLUDE_ASM("code_135EE0", pause_badges_get_pos_x); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_pos_x); -INCLUDE_ASM("code_135EE0", pause_badges_get_pos_y); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_pos_y); -INCLUDE_ASM("code_135EE0", pause_badges_get_column); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_column); -INCLUDE_ASM("code_135EE0", pause_badges_get_row); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_get_row); -INCLUDE_ASM("code_135EE0", pause_badges_is_visible); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_is_visible); -INCLUDE_ASM("code_135EE0", pause_badges_scroll_offset_y); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_scroll_offset_y); -INCLUDE_ASM("code_135EE0", pause_badges_scroll_offset_x); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_scroll_offset_x); -INCLUDE_ASM("code_135EE0", pause_badges_try_remove); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_try_remove); -INCLUDE_ASM("code_135EE0", pause_badges_try_equip); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_try_equip); -INCLUDE_ASM("code_135EE0", pause_badges_draw_bp_orbs); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_draw_bp_orbs); -INCLUDE_ASM("code_135EE0", pause_badges_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_draw_contents); -INCLUDE_ASM("code_135EE0", pause_badges_load_badges); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_load_badges); -INCLUDE_ASM("code_135EE0", pause_badges_init); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_init); -INCLUDE_ASM("code_135EE0", pause_badges_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_handle_input); -INCLUDE_ASM("code_135EE0", pause_badges_update); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_update); -INCLUDE_ASM("code_135EE0", pause_badges_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_badges_cleanup); -INCLUDE_ASM("code_135EE0", pause_items_comparator); +INCLUDE_ASM(s32, "code_135EE0", pause_items_comparator); -INCLUDE_ASM("code_135EE0", pause_items_get_pos_x); +INCLUDE_ASM(s32, "code_135EE0", pause_items_get_pos_x); -INCLUDE_ASM("code_135EE0", pause_items_get_pos_y); +INCLUDE_ASM(s32, "code_135EE0", pause_items_get_pos_y); -INCLUDE_ASM("code_135EE0", pause_items_get_column); +INCLUDE_ASM(s32, "code_135EE0", pause_items_get_column); -INCLUDE_ASM("code_135EE0", pause_items_get_row); +INCLUDE_ASM(s32, "code_135EE0", pause_items_get_row); -INCLUDE_ASM("code_135EE0", pause_items_is_visible); +INCLUDE_ASM(s32, "code_135EE0", pause_items_is_visible); -INCLUDE_ASM("code_135EE0", pause_items_scroll_offset_y); +INCLUDE_ASM(s32, "code_135EE0", pause_items_scroll_offset_y); -INCLUDE_ASM("code_135EE0", pause_items_scroll_offset_x); +s32 pause_items_scroll_offset_x(s32 beforeX) { + return beforeX; +} -INCLUDE_ASM("code_135EE0", pause_items_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_items_draw_contents); -INCLUDE_ASM("code_135EE0", pause_items_load_items); +INCLUDE_ASM(s32, "code_135EE0", pause_items_load_items); -INCLUDE_ASM("code_135EE0", pause_items_init); +INCLUDE_ASM(s32, "code_135EE0", pause_items_init); -INCLUDE_ASM("code_135EE0", pause_items_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_items_handle_input); -INCLUDE_ASM("code_135EE0", pause_items_update); +INCLUDE_ASM(s32, "code_135EE0", pause_items_update); -INCLUDE_ASM("code_135EE0", pause_items_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_items_cleanup); -INCLUDE_ASM("code_135EE0", pause_partners_load_portrait); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_load_portrait); -INCLUDE_ASM("code_135EE0", pause_partners_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_contents); -INCLUDE_ASM("code_135EE0", pause_partners_draw_title); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_title); -INCLUDE_ASM("code_135EE0", pause_partners_draw_movelist); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist); -INCLUDE_ASM("code_135EE0", pause_partners_draw_movelist_title); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist_title); -INCLUDE_ASM("code_135EE0", pause_partners_draw_movelist_flower); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_draw_movelist_flower); -INCLUDE_ASM("code_135EE0", pause_partners_init); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_init); -INCLUDE_ASM("code_135EE0", pause_partners_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_handle_input); -INCLUDE_ASM("code_135EE0", pause_partners_update); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_update); -INCLUDE_ASM("code_135EE0", pause_partners_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_partners_cleanup); -INCLUDE_ASM("code_135EE0", pause_spirits_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_spirits_draw_contents); -INCLUDE_ASM("code_135EE0", pause_spirits_draw_title); +INCLUDE_ASM(s32, "code_135EE0", pause_spirits_draw_title); -INCLUDE_ASM("code_135EE0", pause_spirits_init); +INCLUDE_ASM(s32, "code_135EE0", pause_spirits_init); -INCLUDE_ASM("code_135EE0", pause_spirits_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_spirits_handle_input); -INCLUDE_ASM("code_135EE0", pause_spirits_update); +INCLUDE_ASM(s32, "code_135EE0", pause_spirits_update); -INCLUDE_ASM("code_135EE0", pause_spirits_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_spirits_cleanup); -INCLUDE_ASM("code_135EE0", func_8024D930); +INCLUDE_ASM(s32, "code_135EE0", func_8024D930); -INCLUDE_ASM("code_135EE0", pause_map_draw_border_arrows); +INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_border_arrows); -INCLUDE_ASM("code_135EE0", pause_map_draw_contents); +INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_contents); -INCLUDE_ASM("code_135EE0", pause_map_draw_title); +INCLUDE_ASM(s32, "code_135EE0", pause_map_draw_title); -INCLUDE_ASM("code_135EE0", pause_map_init); +INCLUDE_ASM(s32, "code_135EE0", pause_map_init); -INCLUDE_ASM("code_135EE0", pause_map_handle_input); +INCLUDE_ASM(s32, "code_135EE0", pause_map_handle_input); -INCLUDE_ASM("code_135EE0", pause_map_update); +INCLUDE_ASM(s32, "code_135EE0", pause_map_update); -INCLUDE_ASM("code_135EE0", pause_map_cleanup); +INCLUDE_ASM(s32, "code_135EE0", pause_map_cleanup); -INCLUDE_ASM("code_135EE0", pause_get_menu_string); +INCLUDE_ASM(s32, "code_135EE0", pause_get_menu_string); -INCLUDE_ASM("code_135EE0", pause_draw_menu_label); +INCLUDE_ASM(s32, "code_135EE0", pause_draw_menu_label); diff --git a/src/code_1370_len_7d0.c b/src/code_1370_len_7d0.c index 9722dd472a..42f1924ee7 100644 --- a/src/code_1370_len_7d0.c +++ b/src/code_1370_len_7d0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM("code_1370_len_7d0", boot_main); +INCLUDE_ASM(s32, "code_1370_len_7d0", boot_main); -INCLUDE_ASM("code_1370_len_7d0", func_80026164); +INCLUDE_ASM(s32, "code_1370_len_7d0", func_80026164); -INCLUDE_ASM("code_1370_len_7d0", gfxPreNMI_Callback); +INCLUDE_ASM(s32, "code_1370_len_7d0", gfxPreNMI_Callback); diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c index d788944e4c..7bf1869933 100644 --- a/src/code_13870_len_6980.c +++ b/src/code_13870_len_6980.c @@ -1,201 +1,204 @@ #include "common.h" -INCLUDE_ASM("code_13870_len_6980", NOP_npc_callback); +void NOP_npc_callback(void) { +} -INCLUDE_ASM("code_13870_len_6980", mtx_ident_mirror_y); +INCLUDE_ASM(s32, "code_13870_len_6980", mtx_ident_mirror_y); -INCLUDE_ASM("code_13870_len_6980", clear_npcs); +INCLUDE_ASM(s32, "code_13870_len_6980", clear_npcs); -INCLUDE_ASM("code_13870_len_6980", init_npc_list); +INCLUDE_ASM(s32, "code_13870_len_6980", init_npc_list); -INCLUDE_ASM("code_13870_len_6980", func_8003857C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003857C); -INCLUDE_ASM("code_13870_len_6980", _create_npc); +INCLUDE_ASM(s32, "code_13870_len_6980", _create_npc, ); -INCLUDE_ASM("code_13870_len_6980", create_basic_npc); +INCLUDE_ASM(s32, "code_13870_len_6980", create_basic_npc); -INCLUDE_ASM("code_13870_len_6980", create_standard_npc); +INCLUDE_ASM(s32, "code_13870_len_6980", create_standard_npc); -INCLUDE_ASM("code_13870_len_6980", create_partner_npc); +INCLUDE_ASM(s32, "code_13870_len_6980", create_partner_npc); -INCLUDE_ASM("code_13870_len_6980", free_npc_by_index); +INCLUDE_ASM(s32, "code_13870_len_6980", free_npc_by_index); -INCLUDE_ASM("code_13870_len_6980", free_npc); +INCLUDE_ASM(s32, "code_13870_len_6980", free_npc); -INCLUDE_ASM("code_13870_len_6980", get_npc_by_index); +Npc* get_npc_by_index(s32 listIndex) { + return gCurrentNpcListPtr[0][listIndex & ~0x800]; +} -INCLUDE_ASM("code_13870_len_6980", npc_do_world_collision); +INCLUDE_ASM(s32, "code_13870_len_6980", npc_do_world_collision); -INCLUDE_ASM("code_13870_len_6980", npc_do_other_npc_collision); +INCLUDE_ASM(s32, "code_13870_len_6980", npc_do_other_npc_collision); -INCLUDE_ASM("code_13870_len_6980", npc_do_player_collision); +INCLUDE_ASM(s32, "code_13870_len_6980", npc_do_player_collision); -INCLUDE_ASM("code_13870_len_6980", func_80039688); +INCLUDE_ASM(s32, "code_13870_len_6980", func_80039688); -INCLUDE_ASM("code_13870_len_6980", func_800397E8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_800397E8); -INCLUDE_ASM("code_13870_len_6980", update_npcs); +INCLUDE_ASM(s32, "code_13870_len_6980", update_npcs); -INCLUDE_ASM("code_13870_len_6980", func_80039DA4); +INCLUDE_ASM(s32, "code_13870_len_6980", func_80039DA4); -INCLUDE_ASM("code_13870_len_6980", appendGfx_npc); +INCLUDE_ASM(s32, "code_13870_len_6980", appendGfx_npc); -INCLUDE_ASM("code_13870_len_6980", render_npcs); +INCLUDE_ASM(s32, "code_13870_len_6980", render_npcs); -INCLUDE_ASM("code_13870_len_6980", npc_move_heading); +INCLUDE_ASM(s32, "code_13870_len_6980", npc_move_heading); -INCLUDE_ASM_T(Npc*, "code_13870_len_6980", get_npc_unsafe, NpcId npcId); +INCLUDE_ASM(Npc*, "code_13870_len_6980", get_npc_unsafe, NpcId npcId); -INCLUDE_ASM_T(Npc*, "code_13870_len_6980", get_npc_safe, NpcId npcId); +INCLUDE_ASM(Npc*, "code_13870_len_6980", get_npc_safe, NpcId npcId); -INCLUDE_ASM("code_13870_len_6980", enable_npc_shadow); +INCLUDE_ASM(s32, "code_13870_len_6980", enable_npc_shadow); -INCLUDE_ASM("code_13870_len_6980", disable_npc_shadow); +INCLUDE_ASM(s32, "code_13870_len_6980", disable_npc_shadow); -INCLUDE_ASM("code_13870_len_6980", func_8003AC5C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003AC5C); -INCLUDE_ASM("code_13870_len_6980", enable_npc_blur); +INCLUDE_ASM(s32, "code_13870_len_6980", enable_npc_blur); -INCLUDE_ASM("code_13870_len_6980", disable_npc_blur); +INCLUDE_ASM(s32, "code_13870_len_6980", disable_npc_blur); -INCLUDE_ASM("code_13870_len_6980", update_npc_blur); +INCLUDE_ASM(s32, "code_13870_len_6980", update_npc_blur); -INCLUDE_ASM("code_13870_len_6980", appedGfx_npc_blur); +INCLUDE_ASM(s32, "code_13870_len_6980", appedGfx_npc_blur); -INCLUDE_ASM("code_13870_len_6980", func_8003B184); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B184); -INCLUDE_ASM("code_13870_len_6980", func_8003B198); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B198); -INCLUDE_ASM("code_13870_len_6980", func_8003B1A8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B1A8); -INCLUDE_ASM("code_13870_len_6980", func_8003B1B0); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B1B0); -INCLUDE_ASM_T(void, "code_13870_len_6980", set_npc_yaw, Npc* npcPtr, f32 angle); +INCLUDE_ASM(void, "code_13870_len_6980", set_npc_yaw, Npc* npcPtr, f32 angle); -INCLUDE_ASM("code_13870_len_6980", func_8003B3D0); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B3D0); -INCLUDE_ASM("code_13870_len_6980", func_8003B3F8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B3F8); -INCLUDE_ASM("code_13870_len_6980", func_8003B420); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B420); -INCLUDE_ASM("code_13870_len_6980", func_8003B44C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B44C); -INCLUDE_ASM("code_13870_len_6980", func_8003B464); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B464); -INCLUDE_ASM("code_13870_len_6980", func_8003B47C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B47C); -INCLUDE_ASM("code_13870_len_6980", func_8003B500); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B500); -INCLUDE_ASM("code_13870_len_6980", func_8003B5B4); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B5B4); -INCLUDE_ASM("code_13870_len_6980", func_8003B96C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B96C); -INCLUDE_ASM("code_13870_len_6980", func_8003BA60); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003BA60); -INCLUDE_ASM("code_13870_len_6980", func_8003BED8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003BED8); -INCLUDE_ASM("code_13870_len_6980", func_8003C3D8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C3D8); -INCLUDE_ASM("code_13870_len_6980", func_8003C428); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C428); -INCLUDE_ASM("code_13870_len_6980", func_8003C444); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C444); -INCLUDE_ASM("code_13870_len_6980", func_8003C53C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C53C); -INCLUDE_ASM("code_13870_len_6980", func_8003C61C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C61C); -INCLUDE_ASM("code_13870_len_6980", func_8003C658); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C658); -INCLUDE_ASM("code_13870_len_6980", func_8003C660); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C660); -INCLUDE_ASM("code_13870_len_6980", func_8003C668); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C668); -INCLUDE_ASM("code_13870_len_6980", func_8003C78C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C78C); -INCLUDE_ASM("code_13870_len_6980", func_8003C7A8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C7A8); -INCLUDE_ASM("code_13870_len_6980", func_8003C8AC); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C8AC); -INCLUDE_ASM("code_13870_len_6980", func_8003C8B4); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C8B4); -INCLUDE_ASM("code_13870_len_6980", func_8003C984); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C984); -INCLUDE_ASM("code_13870_len_6980", func_8003C9A8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C9A8); -INCLUDE_ASM("code_13870_len_6980", func_8003CB20); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CB20); -INCLUDE_ASM("code_13870_len_6980", func_8003CB44); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CB44); -INCLUDE_ASM("code_13870_len_6980", func_8003CC8C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CC8C); -INCLUDE_ASM("code_13870_len_6980", func_8003CCB0); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CCB0); -INCLUDE_ASM("code_13870_len_6980", func_8003CFA0); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFA0); -INCLUDE_ASM("code_13870_len_6980", func_8003CFA8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFA8); -INCLUDE_ASM("code_13870_len_6980", func_8003CFB4); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFB4); -INCLUDE_ASM("code_13870_len_6980", func_8003D0C4); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D0C4); -INCLUDE_ASM("code_13870_len_6980", func_8003D1D4); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D1D4); -INCLUDE_ASM("code_13870_len_6980", func_8003D2F8); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D2F8); -INCLUDE_ASM("code_13870_len_6980", func_8003D3BC); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D3BC); -INCLUDE_ASM("code_13870_len_6980", func_8003D624); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D624); -INCLUDE_ASM("code_13870_len_6980", func_8003D660); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D660); -INCLUDE_ASM("code_13870_len_6980", func_8003D788); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D788); -INCLUDE_ASM("code_13870_len_6980", func_8003DA38); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003DA38); -INCLUDE_ASM("code_13870_len_6980", func_8003DC38); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003DC38); -INCLUDE_ASM("code_13870_len_6980", func_8003DFA0); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003DFA0); -INCLUDE_ASM("code_13870_len_6980", func_8003E0D4); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E0D4); -INCLUDE_ASM("code_13870_len_6980", func_8003E1D0); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E1D0); -INCLUDE_ASM("code_13870_len_6980", COPY_set_defeated); +INCLUDE_ASM(s32, "code_13870_len_6980", COPY_set_defeated); -INCLUDE_ASM("code_13870_len_6980", func_8003E338); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E338); -INCLUDE_ASM("code_13870_len_6980", clear_encounter_status); +INCLUDE_ASM(s32, "code_13870_len_6980", clear_encounter_status); -INCLUDE_ASM("code_13870_len_6980", func_8003E50C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E50C); -INCLUDE_ASM("code_13870_len_6980", func_8003E514); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E514); -INCLUDE_ASM("code_13870_len_6980", func_8003E524); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E524); -INCLUDE_ASM("code_13870_len_6980", func_8003E5B0); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E5B0); -INCLUDE_ASM("code_13870_len_6980", func_8003E63C); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E63C); -INCLUDE_ASM("code_13870_len_6980", func_8003E670); +INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E670); -INCLUDE_ASM("code_13870_len_6980", make_npcs); +INCLUDE_ASM(s32, "code_13870_len_6980", make_npcs); -INCLUDE_ASM("code_13870_len_6980", kill_encounter); +INCLUDE_ASM(s32, "code_13870_len_6980", kill_encounter); -INCLUDE_ASM("code_13870_len_6980", kill_enemy); +INCLUDE_ASM(s32, "code_13870_len_6980", kill_enemy); -INCLUDE_ASM("code_13870_len_6980", bind_enemy_ai); +INCLUDE_ASM(s32, "code_13870_len_6980", bind_enemy_ai); -INCLUDE_ASM("code_13870_len_6980", bind_enemy_aux); +INCLUDE_ASM(s32, "code_13870_len_6980", bind_enemy_aux); -INCLUDE_ASM("code_13870_len_6980", bind_enemy_interact); +INCLUDE_ASM(s32, "code_13870_len_6980", bind_enemy_interact); -INCLUDE_ASM("code_13870_len_6980", bind_npc_ai); +INCLUDE_ASM(s32, "code_13870_len_6980", bind_npc_ai); -INCLUDE_ASM("code_13870_len_6980", bind_npc_aux); +INCLUDE_ASM(s32, "code_13870_len_6980", bind_npc_aux); -INCLUDE_ASM("code_13870_len_6980", bind_npc_interact); +INCLUDE_ASM(s32, "code_13870_len_6980", bind_npc_interact); -INCLUDE_ASM("code_13870_len_6980", get_enemy); +INCLUDE_ASM(s32, "code_13870_len_6980", get_enemy); -INCLUDE_ASM("code_13870_len_6980", get_enemy_safe); +INCLUDE_ASM(s32, "code_13870_len_6980", get_enemy_safe); diff --git a/src/code_163400.c b/src/code_163400.c index e63b662647..f65f205101 100644 --- a/src/code_163400.c +++ b/src/code_163400.c @@ -1,99 +1,99 @@ #include "common.h" -INCLUDE_ASM("code_163400", func_80242BA0); +INCLUDE_ASM(s32, "code_163400", func_80242BA0); -INCLUDE_ASM("code_163400", func_80242D94); +INCLUDE_ASM(s32, "code_163400", func_80242D94); -INCLUDE_ASM("code_163400", func_80242DEC); +INCLUDE_ASM(s32, "code_163400", func_80242DEC); -INCLUDE_ASM("code_163400", func_80242E00); +INCLUDE_ASM(s32, "code_163400", func_80242E00); -INCLUDE_ASM("code_163400", func_80242F68); +INCLUDE_ASM(s32, "code_163400", func_80242F68); -INCLUDE_ASM("code_163400", func_802431A0); +INCLUDE_ASM(s32, "code_163400", func_802431A0); -INCLUDE_ASM("code_163400", func_8024330C); +INCLUDE_ASM(s32, "code_163400", func_8024330C); -INCLUDE_ASM("code_163400", func_80243380); +INCLUDE_ASM(s32, "code_163400", func_80243380); -INCLUDE_ASM("code_163400", func_802433F4); +INCLUDE_ASM(s32, "code_163400", func_802433F4); -INCLUDE_ASM("code_163400", func_80243468); +INCLUDE_ASM(s32, "code_163400", func_80243468); -INCLUDE_ASM("code_163400", func_802434DC); +INCLUDE_ASM(s32, "code_163400", func_802434DC); -INCLUDE_ASM("code_163400", func_80243550); +INCLUDE_ASM(s32, "code_163400", func_80243550); -INCLUDE_ASM("code_163400", func_802435C4); +INCLUDE_ASM(s32, "code_163400", func_802435C4); -INCLUDE_ASM("code_163400", func_80243628); +INCLUDE_ASM(s32, "code_163400", func_80243628); -INCLUDE_ASM("code_163400", func_8024368C); +INCLUDE_ASM(s32, "code_163400", func_8024368C); -INCLUDE_ASM("code_163400", func_802436F0); +INCLUDE_ASM(s32, "code_163400", func_802436F0); -INCLUDE_ASM("code_163400", func_80243754); +INCLUDE_ASM(s32, "code_163400", func_80243754); -INCLUDE_ASM("code_163400", func_802437B8); +INCLUDE_ASM(s32, "code_163400", func_802437B8); -INCLUDE_ASM("code_163400", func_8024381C); +INCLUDE_ASM(s32, "code_163400", func_8024381C); -INCLUDE_ASM("code_163400", func_80243898); +INCLUDE_ASM(s32, "code_163400", func_80243898); -INCLUDE_ASM("code_163400", func_80243908); +INCLUDE_ASM(s32, "code_163400", func_80243908); -INCLUDE_ASM("code_163400", func_80243B10); +INCLUDE_ASM(s32, "code_163400", func_80243B10); -INCLUDE_ASM("code_163400", func_80243CCC); +INCLUDE_ASM(s32, "code_163400", func_80243CCC); -INCLUDE_ASM("code_163400", func_80243EEC); +INCLUDE_ASM(s32, "code_163400", func_80243EEC); -INCLUDE_ASM("code_163400", func_80244030); +INCLUDE_ASM(s32, "code_163400", func_80244030); -INCLUDE_ASM("code_163400", func_802440BC); +INCLUDE_ASM(s32, "code_163400", func_802440BC); -INCLUDE_ASM("code_163400", func_802448E0); +INCLUDE_ASM(s32, "code_163400", func_802448E0); -INCLUDE_ASM("code_163400", func_80244B00); +INCLUDE_ASM(s32, "code_163400", func_80244B00); -INCLUDE_ASM("code_163400", func_80244BC4); +INCLUDE_ASM(s32, "code_163400", func_80244BC4); -INCLUDE_ASM("code_163400", func_80244C30); +INCLUDE_ASM(s32, "code_163400", func_80244C30); -INCLUDE_ASM("code_163400", func_80244CEC); +INCLUDE_ASM(s32, "code_163400", func_80244CEC); -INCLUDE_ASM("code_163400", func_80244D60); +INCLUDE_ASM(s32, "code_163400", func_80244D60); -INCLUDE_ASM("code_163400", func_80244DD0); +INCLUDE_ASM(s32, "code_163400", func_80244DD0); -INCLUDE_ASM("code_163400", func_80244E54); +INCLUDE_ASM(s32, "code_163400", func_80244E54); -INCLUDE_ASM("code_163400", func_80244F44); +INCLUDE_ASM(s32, "code_163400", func_80244F44); -INCLUDE_ASM("code_163400", func_80244FD4); +INCLUDE_ASM(s32, "code_163400", func_80244FD4); -INCLUDE_ASM("code_163400", func_8024544C); +INCLUDE_ASM(s32, "code_163400", func_8024544C); -INCLUDE_ASM("code_163400", func_80245588); +INCLUDE_ASM(s32, "code_163400", func_80245588); -INCLUDE_ASM("code_163400", func_802455D8); +INCLUDE_ASM(s32, "code_163400", func_802455D8); -INCLUDE_ASM("code_163400", func_80245628); +INCLUDE_ASM(s32, "code_163400", func_80245628); -INCLUDE_ASM("code_163400", func_80245678); +INCLUDE_ASM(s32, "code_163400", func_80245678); -INCLUDE_ASM("code_163400", func_802456C8); +INCLUDE_ASM(s32, "code_163400", func_802456C8); -INCLUDE_ASM("code_163400", func_80245718); +INCLUDE_ASM(s32, "code_163400", func_80245718); -INCLUDE_ASM("code_163400", func_80245768); +INCLUDE_ASM(s32, "code_163400", func_80245768); -INCLUDE_ASM("code_163400", func_802457B8); +INCLUDE_ASM(s32, "code_163400", func_802457B8); -INCLUDE_ASM("code_163400", func_80245808); +INCLUDE_ASM(s32, "code_163400", func_80245808); -INCLUDE_ASM("code_163400", func_80245A40); +INCLUDE_ASM(s32, "code_163400", func_80245A40); -INCLUDE_ASM("code_163400", func_80246B2C); +INCLUDE_ASM(s32, "code_163400", func_80246B2C); -INCLUDE_ASM("code_163400", func_80246CBC); +INCLUDE_ASM(s32, "code_163400", func_80246CBC); diff --git a/src/code_167570.c b/src/code_167570.c index dc0f805808..45758bacc5 100644 --- a/src/code_167570.c +++ b/src/code_167570.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM("code_167570", func_80246D10); +INCLUDE_ASM(s32, "code_167570", func_80246D10); -INCLUDE_ASM("code_167570", func_80246E24); +INCLUDE_ASM(s32, "code_167570", func_80246E24); -INCLUDE_ASM("code_167570", func_80247198); +INCLUDE_ASM(s32, "code_167570", func_80247198); -INCLUDE_ASM("code_167570", func_802471EC); +INCLUDE_ASM(s32, "code_167570", func_802471EC); -INCLUDE_ASM("code_167570", func_80247D14); +INCLUDE_ASM(s32, "code_167570", func_80247D14); -INCLUDE_ASM("code_167570", func_80247D1C); +INCLUDE_ASM(s32, "code_167570", func_80247D1C); diff --git a/src/code_168590.c b/src/code_168590.c index 4d3f13150a..d1202f6cda 100644 --- a/src/code_168590.c +++ b/src/code_168590.c @@ -1,25 +1,25 @@ #include "common.h" -INCLUDE_ASM("code_168590", func_80247D30); +INCLUDE_ASM(s32, "code_168590", func_80247D30); -INCLUDE_ASM("code_168590", func_80247FD0); +INCLUDE_ASM(s32, "code_168590", func_80247FD0); -INCLUDE_ASM("code_168590", func_80248024); +INCLUDE_ASM(s32, "code_168590", func_80248024); -INCLUDE_ASM("code_168590", func_80248160); +INCLUDE_ASM(s32, "code_168590", func_80248160); -INCLUDE_ASM("code_168590", func_80248168); +INCLUDE_ASM(s32, "code_168590", func_80248168); -INCLUDE_ASM("code_168590", func_80248170); +INCLUDE_ASM(s32, "code_168590", func_80248170); -INCLUDE_ASM("code_168590", func_802481B8); +INCLUDE_ASM(s32, "code_168590", func_802481B8); -INCLUDE_ASM("code_168590", func_8024830C); +INCLUDE_ASM(s32, "code_168590", func_8024830C); -INCLUDE_ASM("code_168590", func_80248A80); +INCLUDE_ASM(s32, "code_168590", func_80248A80); -INCLUDE_ASM("code_168590", func_80248BF4); +INCLUDE_ASM(s32, "code_168590", func_80248BF4); -INCLUDE_ASM("code_168590", func_80249324); +INCLUDE_ASM(s32, "code_168590", func_80249324); -INCLUDE_ASM("code_168590", func_8024932C); +INCLUDE_ASM(s32, "code_168590", func_8024932C); diff --git a/src/code_169BE0.c b/src/code_169BE0.c index c56d8b8d61..50afc46992 100644 --- a/src/code_169BE0.c +++ b/src/code_169BE0.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM("code_169BE0", func_80249380); +INCLUDE_ASM(s32, "code_169BE0", func_80249380); -INCLUDE_ASM("code_169BE0", func_8024997C); +INCLUDE_ASM(s32, "code_169BE0", func_8024997C); -INCLUDE_ASM("code_169BE0", func_80249AA4); +INCLUDE_ASM(s32, "code_169BE0", func_80249AA4); -INCLUDE_ASM("code_169BE0", func_80249AB8); +INCLUDE_ASM(s32, "code_169BE0", func_80249AB8); diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index 6e07792c76..92c09b8c86 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -1,1106 +1,1106 @@ #include "common.h" -INCLUDE_ASM("code_16c8e0", get_dpad_input_radial); +INCLUDE_ASM(s32, "code_16c8e0", get_dpad_input_radial); -INCLUDE_ASM("code_16c8e0", func_8023E104); +INCLUDE_ASM(s32, "code_16c8e0", func_8023E104); -INCLUDE_ASM("code_16c8e0", func_8023E11C); +INCLUDE_ASM(s32, "code_16c8e0", func_8023E11C); -INCLUDE_ASM("code_16c8e0", initialize_battle); +INCLUDE_ASM(s32, "code_16c8e0", initialize_battle); -INCLUDE_ASM("code_16c8e0", func_8023E3FC); +INCLUDE_ASM(s32, "code_16c8e0", func_8023E3FC); -INCLUDE_ASM("code_16c8e0", update_actor_shadows); +INCLUDE_ASM(s32, "code_16c8e0", update_actor_shadows); -INCLUDE_ASM("code_16c8e0", update_battle_state); +INCLUDE_ASM(s32, "code_16c8e0", update_battle_state); -INCLUDE_ASM("code_16c8e0", draw_main_battle_ui); +INCLUDE_ASM(s32, "code_16c8e0", draw_main_battle_ui); -INCLUDE_ASM("code_16c8e0", func_8023ED5C); +INCLUDE_ASM(s32, "code_16c8e0", func_8023ED5C); -INCLUDE_ASM("code_16c8e0", func_8023F060); +INCLUDE_ASM(s32, "code_16c8e0", func_8023F060); -INCLUDE_ASM("code_16c8e0", func_8023F088); +INCLUDE_ASM(s32, "code_16c8e0", func_8023F088); -INCLUDE_ASM("code_16c8e0", func_8023FF84); +INCLUDE_ASM(s32, "code_16c8e0", func_8023FF84); -INCLUDE_ASM("code_16c8e0", draw_enemy_health_bars); +INCLUDE_ASM(s32, "code_16c8e0", draw_enemy_health_bars); -INCLUDE_ASM("code_16c8e0", update_starpoints_display); +INCLUDE_ASM(s32, "code_16c8e0", update_starpoints_display); -INCLUDE_ASM("code_16c8e0", func_802409F4); +INCLUDE_ASM(s32, "code_16c8e0", func_802409F4); -INCLUDE_ASM("code_16c8e0", func_80240AA8); +INCLUDE_ASM(s32, "code_16c8e0", func_80240AA8); -INCLUDE_ASM("code_16c8e0", delete_actor); +INCLUDE_ASM(s32, "code_16c8e0", delete_actor); -INCLUDE_ASM("code_16c8e0", delete_player_actor); +INCLUDE_ASM(s32, "code_16c8e0", delete_player_actor); -INCLUDE_ASM("code_16c8e0", func_80240E60); +INCLUDE_ASM(s32, "code_16c8e0", func_80240E60); -INCLUDE_ASM("code_16c8e0", func_80240FDC); +INCLUDE_ASM(s32, "code_16c8e0", func_80240FDC); -INCLUDE_ASM("code_16c8e0", func_80241190); +INCLUDE_ASM(s32, "code_16c8e0", func_80241190); -INCLUDE_ASM("code_16c8e0", begin_battle); +INCLUDE_ASM(s32, "code_16c8e0", begin_battle); -INCLUDE_ASM("code_16c8e0", func_80241AB8); +INCLUDE_ASM(s32, "code_16c8e0", func_80241AB8); -INCLUDE_ASM("code_16c8e0", func_80241B14); +INCLUDE_ASM(s32, "code_16c8e0", func_80241B14); -INCLUDE_ASM("code_16c8e0", func_8024201C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024201C); -INCLUDE_ASM("code_16c8e0", update_heroes_start_turn); +INCLUDE_ASM(s32, "code_16c8e0", update_heroes_start_turn); -INCLUDE_ASM("code_16c8e0", func_80242AC0); +INCLUDE_ASM(s32, "code_16c8e0", func_80242AC0); -INCLUDE_ASM("code_16c8e0", switch_to_player); +INCLUDE_ASM(s32, "code_16c8e0", switch_to_player); -INCLUDE_ASM("code_16c8e0", func_80242BA8); +INCLUDE_ASM(s32, "code_16c8e0", func_80242BA8); -INCLUDE_ASM("code_16c8e0", update_end_player_turn); +INCLUDE_ASM(s32, "code_16c8e0", update_end_player_turn); -INCLUDE_ASM("code_16c8e0", func_80242EF8); +INCLUDE_ASM(s32, "code_16c8e0", func_80242EF8); -INCLUDE_ASM("code_16c8e0", switch_to_partner); +INCLUDE_ASM(s32, "code_16c8e0", switch_to_partner); -INCLUDE_ASM("code_16c8e0", func_80242FD8); +INCLUDE_ASM(s32, "code_16c8e0", func_80242FD8); -INCLUDE_ASM("code_16c8e0", func_80242FE0); +INCLUDE_ASM(s32, "code_16c8e0", func_80242FE0); -INCLUDE_ASM("code_16c8e0", func_80243910); +INCLUDE_ASM(s32, "code_16c8e0", func_80243910); -INCLUDE_ASM("code_16c8e0", switch_order); +INCLUDE_ASM(s32, "code_16c8e0", switch_order); -INCLUDE_ASM("code_16c8e0", func_802439D0); +INCLUDE_ASM(s32, "code_16c8e0", func_802439D0); -INCLUDE_ASM("code_16c8e0", func_802439D8); +INCLUDE_ASM(s32, "code_16c8e0", func_802439D8); -INCLUDE_ASM("code_16c8e0", func_80243FD4); +INCLUDE_ASM(s32, "code_16c8e0", func_80243FD4); -INCLUDE_ASM("code_16c8e0", func_80243FDC); +INCLUDE_ASM(s32, "code_16c8e0", func_80243FDC); -INCLUDE_ASM("code_16c8e0", func_80244000); +INCLUDE_ASM(s32, "code_16c8e0", func_80244000); -INCLUDE_ASM("code_16c8e0", func_80244008); +INCLUDE_ASM(s32, "code_16c8e0", func_80244008); -INCLUDE_ASM("code_16c8e0", func_80244708); +INCLUDE_ASM(s32, "code_16c8e0", func_80244708); -INCLUDE_ASM("code_16c8e0", func_80244710); +INCLUDE_ASM(s32, "code_16c8e0", func_80244710); -INCLUDE_ASM("code_16c8e0", func_80244A48); +INCLUDE_ASM(s32, "code_16c8e0", func_80244A48); -INCLUDE_ASM("code_16c8e0", end_battle); +INCLUDE_ASM(s32, "code_16c8e0", end_battle); -INCLUDE_ASM("code_16c8e0", func_80244D90); +INCLUDE_ASM(s32, "code_16c8e0", func_80244D90); -INCLUDE_ASM("code_16c8e0", func_80244E38); +INCLUDE_ASM(s32, "code_16c8e0", func_80244E38); -INCLUDE_ASM("code_16c8e0", func_80244EF8); +INCLUDE_ASM(s32, "code_16c8e0", func_80244EF8); -INCLUDE_ASM("code_16c8e0", update_run_away); +INCLUDE_ASM(s32, "code_16c8e0", update_run_away); -INCLUDE_ASM("code_16c8e0", func_80245438); +INCLUDE_ASM(s32, "code_16c8e0", func_80245438); -INCLUDE_ASM("code_16c8e0", func_80245440); +INCLUDE_ASM(s32, "code_16c8e0", func_80245440); -INCLUDE_ASM("code_16c8e0", func_802456B0); +INCLUDE_ASM(s32, "code_16c8e0", func_802456B0); -INCLUDE_ASM("code_16c8e0", EnablePartnerBlur); +INCLUDE_ASM(s32, "code_16c8e0", EnablePartnerBlur); -INCLUDE_ASM("code_16c8e0", DisablePartnerBlur); +INCLUDE_ASM(s32, "code_16c8e0", DisablePartnerBlur); -INCLUDE_ASM("code_16c8e0", update_swap_partner); +INCLUDE_ASM(s32, "code_16c8e0", update_swap_partner); -INCLUDE_ASM("code_16c8e0", func_80245AC8); +INCLUDE_ASM(s32, "code_16c8e0", func_80245AC8); -INCLUDE_ASM("code_16c8e0", update_player_action); +INCLUDE_ASM(s32, "code_16c8e0", update_player_action); -INCLUDE_ASM("code_16c8e0", func_80246448); +INCLUDE_ASM(s32, "code_16c8e0", func_80246448); -INCLUDE_ASM("code_16c8e0", update_player_change_turn); +INCLUDE_ASM(s32, "code_16c8e0", update_player_change_turn); -INCLUDE_ASM("code_16c8e0", func_80246B2C_code); +INCLUDE_ASM(s32, "code_16c8e0", func_80246B2C_code); -INCLUDE_ASM("code_16c8e0", update_partner_action); +INCLUDE_ASM(s32, "code_16c8e0", update_partner_action); -INCLUDE_ASM("code_16c8e0", func_80247214); +INCLUDE_ASM(s32, "code_16c8e0", func_80247214); -INCLUDE_ASM("code_16c8e0", func_8024721C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024721C); -INCLUDE_ASM("code_16c8e0", func_802472A4); +INCLUDE_ASM(s32, "code_16c8e0", func_802472A4); -INCLUDE_ASM("code_16c8e0", update_enemy_change_turn); +INCLUDE_ASM(s32, "code_16c8e0", update_enemy_change_turn); -INCLUDE_ASM("code_16c8e0", func_80247568); +INCLUDE_ASM(s32, "code_16c8e0", func_80247568); -INCLUDE_ASM("code_16c8e0", update_enemy_action); +INCLUDE_ASM(s32, "code_16c8e0", update_enemy_action); -INCLUDE_ASM("code_16c8e0", func_80247AFC); +INCLUDE_ASM(s32, "code_16c8e0", func_80247AFC); -INCLUDE_ASM("code_16c8e0", func_80247B04); +INCLUDE_ASM(s32, "code_16c8e0", func_80247B04); -INCLUDE_ASM("code_16c8e0", func_802480F0); +INCLUDE_ASM(s32, "code_16c8e0", func_802480F0); -INCLUDE_ASM("code_16c8e0", func_80248190); +INCLUDE_ASM(s32, "code_16c8e0", func_80248190); -INCLUDE_ASM("code_16c8e0", func_802485FC); +INCLUDE_ASM(s32, "code_16c8e0", func_802485FC); -INCLUDE_ASM("code_16c8e0", func_80248660); +INCLUDE_ASM(s32, "code_16c8e0", func_80248660); -INCLUDE_ASM("code_16c8e0", func_80248AA4); +INCLUDE_ASM(s32, "code_16c8e0", func_80248AA4); -INCLUDE_ASM("code_16c8e0", func_80248B08); +INCLUDE_ASM(s32, "code_16c8e0", func_80248B08); -INCLUDE_ASM("code_16c8e0", func_80248D78); +INCLUDE_ASM(s32, "code_16c8e0", func_80248D78); -INCLUDE_ASM("code_16c8e0", func_80248DD0); +INCLUDE_ASM(s32, "code_16c8e0", func_80248DD0); -INCLUDE_ASM("code_16c8e0", func_80248DE4); +INCLUDE_ASM(s32, "code_16c8e0", func_80248DE4); -INCLUDE_ASM("code_16c8e0", func_80249804); +INCLUDE_ASM(s32, "code_16c8e0", func_80249804); -INCLUDE_ASM("code_16c8e0", func_8024A214); +INCLUDE_ASM(s32, "code_16c8e0", func_8024A214); -INCLUDE_ASM("code_16c8e0", func_8024A990); +INCLUDE_ASM(s32, "code_16c8e0", func_8024A990); -INCLUDE_ASM("code_16c8e0", func_8024AFE4); +INCLUDE_ASM(s32, "code_16c8e0", func_8024AFE4); -INCLUDE_ASM("code_16c8e0", func_8024B5FC); +INCLUDE_ASM(s32, "code_16c8e0", func_8024B5FC); -INCLUDE_ASM("code_16c8e0", func_8024B9A0); +INCLUDE_ASM(s32, "code_16c8e0", func_8024B9A0); -INCLUDE_ASM("code_16c8e0", func_8024BDA4); +INCLUDE_ASM(s32, "code_16c8e0", func_8024BDA4); -INCLUDE_ASM("code_16c8e0", func_8024C180); +INCLUDE_ASM(s32, "code_16c8e0", func_8024C180); -INCLUDE_ASM("code_16c8e0", func_8024C570); +INCLUDE_ASM(s32, "code_16c8e0", func_8024C570); -INCLUDE_ASM("code_16c8e0", func_8024C944); +INCLUDE_ASM(s32, "code_16c8e0", func_8024C944); -INCLUDE_ASM("code_16c8e0", func_8024CB68); +INCLUDE_ASM(s32, "code_16c8e0", func_8024CB68); -INCLUDE_ASM("code_16c8e0", func_8024CE9C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024CE9C); -INCLUDE_ASM("code_16c8e0", use_cam_preset); +INCLUDE_ASM(s32, "code_16c8e0", use_cam_preset); -INCLUDE_ASM("code_16c8e0", func_8024E3D8); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E3D8); -INCLUDE_ASM("code_16c8e0", func_8024E40C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E40C); -INCLUDE_ASM("code_16c8e0", cam_target_actor); +INCLUDE_ASM(s32, "code_16c8e0", cam_target_actor); -INCLUDE_ASM("code_16c8e0", func_8024E45C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E45C); -INCLUDE_ASM("code_16c8e0", func_8024E484); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E484); -INCLUDE_ASM("code_16c8e0", move_cam_over); +INCLUDE_ASM(s32, "code_16c8e0", move_cam_over); -INCLUDE_ASM("code_16c8e0", set_cam_target_pos); +INCLUDE_ASM(s32, "code_16c8e0", set_cam_target_pos); -INCLUDE_ASM("code_16c8e0", func_8024E554); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E554); -INCLUDE_ASM("code_16c8e0", func_8024E584); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E584); -INCLUDE_ASM("code_16c8e0", set_cam_zoom); +INCLUDE_ASM(s32, "code_16c8e0", set_cam_zoom); -INCLUDE_ASM("code_16c8e0", add_cam_zoom); +INCLUDE_ASM(s32, "code_16c8e0", add_cam_zoom); -INCLUDE_ASM("code_16c8e0", set_cam_zoffset); +INCLUDE_ASM(s32, "code_16c8e0", set_cam_zoffset); -INCLUDE_ASM("code_16c8e0", unfreeze_cam); +INCLUDE_ASM(s32, "code_16c8e0", unfreeze_cam); -INCLUDE_ASM("code_16c8e0", func_8024E60C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E60C); -INCLUDE_ASM("code_16c8e0", UseCamPreset); +INCLUDE_ASM(s32, "code_16c8e0", UseCamPreset); -INCLUDE_ASM("code_16c8e0", func_8024E664); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E664); -INCLUDE_ASM("code_16c8e0", func_8024E6B4); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E6B4); -INCLUDE_ASM("code_16c8e0", func_8024E748); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E748); -INCLUDE_ASM("code_16c8e0", func_8024E820); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E820); -INCLUDE_ASM("code_16c8e0", SetBattleCamTarget); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamTarget); -INCLUDE_ASM("code_16c8e0", func_8024E9B0); +INCLUDE_ASM(s32, "code_16c8e0", func_8024E9B0); -INCLUDE_ASM("code_16c8e0", SetBattleCamOffsetZ); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamOffsetZ); -INCLUDE_ASM("code_16c8e0", AddBattleCamOffsetZ); +INCLUDE_ASM(s32, "code_16c8e0", AddBattleCamOffsetZ); -INCLUDE_ASM("code_16c8e0", SetBattleCamYaw); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamYaw); -INCLUDE_ASM("code_16c8e0", BattleCamTargetActor); +INCLUDE_ASM(s32, "code_16c8e0", BattleCamTargetActor); -INCLUDE_ASM("code_16c8e0", func_8024EB84); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EB84); -INCLUDE_ASM("code_16c8e0", MoveBattleCamOver); +INCLUDE_ASM(s32, "code_16c8e0", MoveBattleCamOver); -INCLUDE_ASM("code_16c8e0", SetBattleCamZoom); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleCamZoom); -INCLUDE_ASM("code_16c8e0", AddBattleCamZoom); +INCLUDE_ASM(s32, "code_16c8e0", AddBattleCamZoom); -INCLUDE_ASM("code_16c8e0", func_8024ECF8); +INCLUDE_ASM(s32, "code_16c8e0", func_8024ECF8); -INCLUDE_ASM("code_16c8e0", FreezeBattleCam); +INCLUDE_ASM(s32, "code_16c8e0", FreezeBattleCam); -INCLUDE_ASM("code_16c8e0", func_8024EDA4); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EDA4); -INCLUDE_ASM("code_16c8e0", func_8024EDC0); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EDC0); -INCLUDE_ASM("code_16c8e0", func_8024EDEC); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EDEC); -INCLUDE_ASM("code_16c8e0", func_8024EE48); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EE48); -INCLUDE_ASM("code_16c8e0", func_8024EEA8); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EEA8); -INCLUDE_ASM("code_16c8e0", func_8024EF08); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EF08); -INCLUDE_ASM("code_16c8e0", create_popup); +INCLUDE_ASM(s32, "code_16c8e0", create_popup); -INCLUDE_ASM("code_16c8e0", func_8024EFA4); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EFA4); -INCLUDE_ASM("code_16c8e0", func_8024EFE0); +INCLUDE_ASM(s32, "code_16c8e0", func_8024EFE0); -INCLUDE_ASM("code_16c8e0", func_8024F394); +INCLUDE_ASM(s32, "code_16c8e0", func_8024F394); -INCLUDE_ASM("code_16c8e0", func_8024F5AC); +INCLUDE_ASM(s32, "code_16c8e0", func_8024F5AC); -INCLUDE_ASM("code_16c8e0", func_8024F768); +INCLUDE_ASM(s32, "code_16c8e0", func_8024F768); -INCLUDE_ASM("code_16c8e0", func_8024F7C8); +INCLUDE_ASM(s32, "code_16c8e0", func_8024F7C8); -INCLUDE_ASM("code_16c8e0", func_8024F84C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024F84C); -INCLUDE_ASM("code_16c8e0", func_8024F940); +INCLUDE_ASM(s32, "code_16c8e0", func_8024F940); -INCLUDE_ASM("code_16c8e0", show_battle_message); +INCLUDE_ASM(s32, "code_16c8e0", show_battle_message); -INCLUDE_ASM("code_16c8e0", show_variable_battle_message); +INCLUDE_ASM(s32, "code_16c8e0", show_variable_battle_message); -INCLUDE_ASM("code_16c8e0", is_popup_displayed); +INCLUDE_ASM(s32, "code_16c8e0", is_popup_displayed); -INCLUDE_ASM("code_16c8e0", set_popup_duration); +INCLUDE_ASM(s32, "code_16c8e0", set_popup_duration); -INCLUDE_ASM("code_16c8e0", func_8024FAE8); +INCLUDE_ASM(s32, "code_16c8e0", func_8024FAE8); -INCLUDE_ASM("code_16c8e0", func_8024FAFC); +INCLUDE_ASM(s32, "code_16c8e0", func_8024FAFC); -INCLUDE_ASM("code_16c8e0", close_action_command_instruction_popup); +INCLUDE_ASM(s32, "code_16c8e0", close_action_command_instruction_popup); -INCLUDE_ASM("code_16c8e0", func_8024FB3C); +INCLUDE_ASM(s32, "code_16c8e0", func_8024FB3C); -INCLUDE_ASM("code_16c8e0", func_80250818); +INCLUDE_ASM(s32, "code_16c8e0", func_80250818); -INCLUDE_ASM("code_16c8e0", show_message_popup); +INCLUDE_ASM(s32, "code_16c8e0", show_message_popup); -INCLUDE_ASM("code_16c8e0", ShowMessageBox); +INCLUDE_ASM(s32, "code_16c8e0", ShowMessageBox); -INCLUDE_ASM("code_16c8e0", ShowVariableMessageBox); +INCLUDE_ASM(s32, "code_16c8e0", ShowVariableMessageBox); -INCLUDE_ASM("code_16c8e0", IsMessageBoxDisplayed); +INCLUDE_ASM(s32, "code_16c8e0", IsMessageBoxDisplayed); -INCLUDE_ASM("code_16c8e0", WaitForMessageBoxDone); +INCLUDE_ASM(s32, "code_16c8e0", WaitForMessageBoxDone); -INCLUDE_ASM("code_16c8e0", ForceCloseMessageBox); +INCLUDE_ASM(s32, "code_16c8e0", ForceCloseMessageBox); -INCLUDE_ASM("code_16c8e0", SetMessageBoxDuration); +INCLUDE_ASM(s32, "code_16c8e0", SetMessageBoxDuration); -INCLUDE_ASM("code_16c8e0", func_80251434); +INCLUDE_ASM(s32, "code_16c8e0", func_80251434); -INCLUDE_ASM("code_16c8e0", func_80251454); +INCLUDE_ASM(s32, "code_16c8e0", func_80251454); -INCLUDE_ASM("code_16c8e0", func_80251474); +INCLUDE_ASM(s32, "code_16c8e0", func_80251474); -INCLUDE_ASM("code_16c8e0", calc_item_check_hit); +INCLUDE_ASM(s32, "code_16c8e0", calc_item_check_hit); -INCLUDE_ASM("code_16c8e0", calc_item_damage_enemy); +INCLUDE_ASM(s32, "code_16c8e0", calc_item_damage_enemy); -INCLUDE_ASM("code_16c8e0", ItemDamageEnemy); +INCLUDE_ASM(s32, "code_16c8e0", ItemDamageEnemy); -INCLUDE_ASM("code_16c8e0", ItemAfflictEnemy); +INCLUDE_ASM(s32, "code_16c8e0", ItemAfflictEnemy); -INCLUDE_ASM("code_16c8e0", func_80252B3C); +INCLUDE_ASM(s32, "code_16c8e0", func_80252B3C); -INCLUDE_ASM("code_16c8e0", ItemCheckHit); +INCLUDE_ASM(s32, "code_16c8e0", ItemCheckHit); -INCLUDE_ASM("code_16c8e0", ActorSpeak); +INCLUDE_ASM(s32, "code_16c8e0", ActorSpeak); -INCLUDE_ASM("code_16c8e0", EndActorSpeech); +INCLUDE_ASM(s32, "code_16c8e0", EndActorSpeech); -INCLUDE_ASM("code_16c8e0", ShowBattleChoice); +INCLUDE_ASM(s32, "code_16c8e0", ShowBattleChoice); -INCLUDE_ASM("code_16c8e0", func_802535B4); +INCLUDE_ASM(s32, "code_16c8e0", func_802535B4); -INCLUDE_ASM("code_16c8e0", OverrideBattleDmaDest); +INCLUDE_ASM(s32, "code_16c8e0", OverrideBattleDmaDest); -INCLUDE_ASM("code_16c8e0", LoadBattleDmaData); +INCLUDE_ASM(s32, "code_16c8e0", LoadBattleDmaData); -INCLUDE_ASM("code_16c8e0", func_802536A8); +INCLUDE_ASM(s32, "code_16c8e0", func_802536A8); -INCLUDE_ASM("code_16c8e0", func_80253734); +INCLUDE_ASM(s32, "code_16c8e0", func_80253734); -INCLUDE_ASM("code_16c8e0", func_802537C0); +INCLUDE_ASM(s32, "code_16c8e0", func_802537C0); -INCLUDE_ASM("code_16c8e0", PlaySoundAtActor); +INCLUDE_ASM(s32, "code_16c8e0", PlaySoundAtActor); -INCLUDE_ASM("code_16c8e0", PlaySoundAtPart); +INCLUDE_ASM(s32, "code_16c8e0", PlaySoundAtPart); -INCLUDE_ASM("code_16c8e0", PlayLoopingSoundAtActor); +INCLUDE_ASM(s32, "code_16c8e0", PlayLoopingSoundAtActor); -INCLUDE_ASM("code_16c8e0", StopLoopingSoundAtActor); +INCLUDE_ASM(s32, "code_16c8e0", StopLoopingSoundAtActor); -INCLUDE_ASM("code_16c8e0", SetForegroundModelsVisibleUnchecked); +INCLUDE_ASM(s32, "code_16c8e0", SetForegroundModelsVisibleUnchecked); -INCLUDE_ASM("code_16c8e0", SetForegroundModelsVisible); +INCLUDE_ASM(s32, "code_16c8e0", SetForegroundModelsVisible); -INCLUDE_ASM("code_16c8e0", func_80253B30); +INCLUDE_ASM(s32, "code_16c8e0", func_80253B30); -INCLUDE_ASM("code_16c8e0", MakeStatusField); +INCLUDE_ASM(s32, "code_16c8e0", MakeStatusField); -INCLUDE_ASM("code_16c8e0", is_actor_hp_bar_visible); +INCLUDE_ASM(s32, "code_16c8e0", is_actor_hp_bar_visible); -INCLUDE_ASM("code_16c8e0", is_actortype_hpbar_visible); +INCLUDE_ASM(s32, "code_16c8e0", is_actortype_hpbar_visible); -INCLUDE_ASM("code_16c8e0", save_tattle_flags); +INCLUDE_ASM(s32, "code_16c8e0", save_tattle_flags); -INCLUDE_ASM("code_16c8e0", load_tattle_flags); +INCLUDE_ASM(s32, "code_16c8e0", load_tattle_flags); -INCLUDE_ASM("code_16c8e0", func_80253FB0); +INCLUDE_ASM(s32, "code_16c8e0", func_80253FB0); -INCLUDE_ASM("code_16c8e0", MultiplyByActorScale); +INCLUDE_ASM(s32, "code_16c8e0", MultiplyByActorScale); -INCLUDE_ASM("code_16c8e0", MultiplyVec2ByActorScale); +INCLUDE_ASM(s32, "code_16c8e0", MultiplyVec2ByActorScale); -INCLUDE_ASM("code_16c8e0", MultiplyVec3ByActorScale); +INCLUDE_ASM(s32, "code_16c8e0", MultiplyVec3ByActorScale); -INCLUDE_ASM("code_16c8e0", ApplyShrinkFromOwner); +INCLUDE_ASM(s32, "code_16c8e0", ApplyShrinkFromOwner); -INCLUDE_ASM("code_16c8e0", StartRumble); +INCLUDE_ASM(s32, "code_16c8e0", StartRumble); -INCLUDE_ASM("code_16c8e0", func_80254250); +INCLUDE_ASM(s32, "code_16c8e0", func_80254250); -INCLUDE_ASM("code_16c8e0", mtx_mirror_y); +INCLUDE_ASM(s32, "code_16c8e0", mtx_mirror_y); -INCLUDE_ASM("code_16c8e0", enable_actor_blur); +INCLUDE_ASM(s32, "code_16c8e0", enable_actor_blur); -INCLUDE_ASM("code_16c8e0", disable_actor_blur); +INCLUDE_ASM(s32, "code_16c8e0", disable_actor_blur); -INCLUDE_ASM("code_16c8e0", reset_actor_blur); +INCLUDE_ASM(s32, "code_16c8e0", reset_actor_blur); -INCLUDE_ASM("code_16c8e0", func_80254610); +INCLUDE_ASM(s32, "code_16c8e0", func_80254610); -INCLUDE_ASM("code_16c8e0", enable_partner_blur); +INCLUDE_ASM(s32, "code_16c8e0", enable_partner_blur); -INCLUDE_ASM("code_16c8e0", disable_partner_blur); +INCLUDE_ASM(s32, "code_16c8e0", disable_partner_blur); -INCLUDE_ASM("code_16c8e0", reset_partner_blur); +INCLUDE_ASM(s32, "code_16c8e0", reset_partner_blur); -INCLUDE_ASM("code_16c8e0", func_802546B0); +INCLUDE_ASM(s32, "code_16c8e0", func_802546B0); -INCLUDE_ASM("code_16c8e0", enable_player_blur); +INCLUDE_ASM(s32, "code_16c8e0", enable_player_blur); -INCLUDE_ASM("code_16c8e0", disable_player_blur); +INCLUDE_ASM(s32, "code_16c8e0", disable_player_blur); -INCLUDE_ASM("code_16c8e0", func_80254950); +INCLUDE_ASM(s32, "code_16c8e0", func_80254950); -INCLUDE_ASM("code_16c8e0", func_802549A0); +INCLUDE_ASM(s32, "code_16c8e0", func_802549A0); -INCLUDE_ASM("code_16c8e0", func_802549C0); +INCLUDE_ASM(s32, "code_16c8e0", func_802549C0); -INCLUDE_ASM("code_16c8e0", func_802549F4); +INCLUDE_ASM(s32, "code_16c8e0", func_802549F4); -INCLUDE_ASM("code_16c8e0", func_80254C50); +INCLUDE_ASM(s32, "code_16c8e0", func_80254C50); -INCLUDE_ASM("code_16c8e0", func_802550BC); +INCLUDE_ASM(s32, "code_16c8e0", func_802550BC); -INCLUDE_ASM("code_16c8e0", func_802552EC); +INCLUDE_ASM(s32, "code_16c8e0", func_802552EC); -INCLUDE_ASM("code_16c8e0", func_8025593C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025593C); -INCLUDE_ASM("code_16c8e0", func_8025595C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025595C); -INCLUDE_ASM("code_16c8e0", func_8025597C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025597C); -INCLUDE_ASM("code_16c8e0", func_8025599C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025599C); -INCLUDE_ASM("code_16c8e0", update_actor_shadow); +INCLUDE_ASM(s32, "code_16c8e0", update_actor_shadow); -INCLUDE_ASM("code_16c8e0", update_enemy_shadows); +INCLUDE_ASM(s32, "code_16c8e0", update_enemy_shadows); -INCLUDE_ASM("code_16c8e0", update_hero_shadows); +INCLUDE_ASM(s32, "code_16c8e0", update_hero_shadows); -INCLUDE_ASM("code_16c8e0", func_80255FD8); +INCLUDE_ASM(s32, "code_16c8e0", func_80255FD8); -INCLUDE_ASM("code_16c8e0", func_80255FE0); +INCLUDE_ASM(s32, "code_16c8e0", func_80255FE0); -INCLUDE_ASM("code_16c8e0", func_802571F0); +INCLUDE_ASM(s32, "code_16c8e0", func_802571F0); -INCLUDE_ASM("code_16c8e0", func_80257B28); +INCLUDE_ASM(s32, "code_16c8e0", func_80257B28); -INCLUDE_ASM("code_16c8e0", func_80257B48); +INCLUDE_ASM(s32, "code_16c8e0", func_80257B48); -INCLUDE_ASM("code_16c8e0", func_80257B68); +INCLUDE_ASM(s32, "code_16c8e0", func_80257B68); -INCLUDE_ASM("code_16c8e0", func_80257B88); +INCLUDE_ASM(s32, "code_16c8e0", func_80257B88); -INCLUDE_ASM("code_16c8e0", update_player_actor_shadow); +INCLUDE_ASM(s32, "code_16c8e0", update_player_actor_shadow); -INCLUDE_ASM("code_16c8e0", func_80257DA4); +INCLUDE_ASM(s32, "code_16c8e0", func_80257DA4); -INCLUDE_ASM("code_16c8e0", func_80258E14); +INCLUDE_ASM(s32, "code_16c8e0", func_80258E14); -INCLUDE_ASM("code_16c8e0", func_802591EC); +INCLUDE_ASM(s32, "code_16c8e0", func_802591EC); -INCLUDE_ASM("code_16c8e0", func_80259494); +INCLUDE_ASM(s32, "code_16c8e0", func_80259494); -INCLUDE_ASM("code_16c8e0", func_8025950C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025950C); -INCLUDE_ASM("code_16c8e0", func_802596C0); +INCLUDE_ASM(s32, "code_16c8e0", func_802596C0); -INCLUDE_ASM("code_16c8e0", func_802597B0); +INCLUDE_ASM(s32, "code_16c8e0", func_802597B0); -INCLUDE_ASM("code_16c8e0", func_8025995C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025995C); -INCLUDE_ASM("code_16c8e0", func_80259A48); +INCLUDE_ASM(s32, "code_16c8e0", func_80259A48); -INCLUDE_ASM("code_16c8e0", func_80259AAC); +INCLUDE_ASM(s32, "code_16c8e0", func_80259AAC); -INCLUDE_ASM("code_16c8e0", func_80259D9C); +INCLUDE_ASM(s32, "code_16c8e0", func_80259D9C); -INCLUDE_ASM("code_16c8e0", func_8025A2C4); +INCLUDE_ASM(s32, "code_16c8e0", func_8025A2C4); -INCLUDE_ASM("code_16c8e0", func_8025A50C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025A50C); -INCLUDE_ASM("code_16c8e0", func_8025A74C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025A74C); -INCLUDE_ASM("code_16c8e0", func_8025AA80); +INCLUDE_ASM(s32, "code_16c8e0", func_8025AA80); -INCLUDE_ASM("code_16c8e0", func_8025AD90); +INCLUDE_ASM(s32, "code_16c8e0", func_8025AD90); -INCLUDE_ASM("code_16c8e0", func_8025B1A8); +INCLUDE_ASM(s32, "code_16c8e0", func_8025B1A8); -INCLUDE_ASM("code_16c8e0", func_8025B5C0); +INCLUDE_ASM(s32, "code_16c8e0", func_8025B5C0); -INCLUDE_ASM("code_16c8e0", func_8025BAA0); +INCLUDE_ASM(s32, "code_16c8e0", func_8025BAA0); -INCLUDE_ASM("code_16c8e0", func_8025C120); +INCLUDE_ASM(s32, "code_16c8e0", func_8025C120); -INCLUDE_ASM("code_16c8e0", func_8025C840); +INCLUDE_ASM(s32, "code_16c8e0", func_8025C840); -INCLUDE_ASM("code_16c8e0", func_8025C8A0); +INCLUDE_ASM(s32, "code_16c8e0", func_8025C8A0); -INCLUDE_ASM("code_16c8e0", func_8025C918); +INCLUDE_ASM(s32, "code_16c8e0", func_8025C918); -INCLUDE_ASM("code_16c8e0", func_8025CCC8); +INCLUDE_ASM(s32, "code_16c8e0", func_8025CCC8); -INCLUDE_ASM("code_16c8e0", func_8025CD28); +INCLUDE_ASM(s32, "code_16c8e0", func_8025CD28); -INCLUDE_ASM("code_16c8e0", func_8025CD40); +INCLUDE_ASM(s32, "code_16c8e0", func_8025CD40); -INCLUDE_ASM("code_16c8e0", func_8025CEC8); +INCLUDE_ASM(s32, "code_16c8e0", func_8025CEC8); -INCLUDE_ASM("code_16c8e0", _remove_part_decoration); +INCLUDE_ASM(s32, "code_16c8e0", _remove_part_decoration); -INCLUDE_ASM("code_16c8e0", func_8025D150); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D150); -INCLUDE_ASM("code_16c8e0", func_8025D158); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D158); -INCLUDE_ASM("code_16c8e0", func_8025D160); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D160); -INCLUDE_ASM("code_16c8e0", func_8025D290); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D290); -INCLUDE_ASM("code_16c8e0", func_8025D2B0); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D2B0); -INCLUDE_ASM("code_16c8e0", func_8025D3C4); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D3C4); -INCLUDE_ASM("code_16c8e0", func_8025D3CC); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D3CC); -INCLUDE_ASM("code_16c8e0", func_8025D4A0); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D4A0); -INCLUDE_ASM("code_16c8e0", func_8025D4C8); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D4C8); -INCLUDE_ASM("code_16c8e0", func_8025D620); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D620); -INCLUDE_ASM("code_16c8e0", func_8025D640); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D640); -INCLUDE_ASM("code_16c8e0", func_8025D6FC); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D6FC); -INCLUDE_ASM("code_16c8e0", func_8025D71C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D71C); -INCLUDE_ASM("code_16c8e0", func_8025D810); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D810); -INCLUDE_ASM("code_16c8e0", func_8025D830); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D830); -INCLUDE_ASM("code_16c8e0", func_8025D8EC); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D8EC); -INCLUDE_ASM("code_16c8e0", func_8025D90C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025D90C); -INCLUDE_ASM("code_16c8e0", func_8025DA60); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DA60); -INCLUDE_ASM("code_16c8e0", func_8025DA68); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DA68); -INCLUDE_ASM("code_16c8e0", func_8025DBC8); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DBC8); -INCLUDE_ASM("code_16c8e0", func_8025DBD0); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DBD0); -INCLUDE_ASM("code_16c8e0", func_8025DD40); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DD40); -INCLUDE_ASM("code_16c8e0", func_8025DD60); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DD60); -INCLUDE_ASM("code_16c8e0", func_8025DE88); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DE88); -INCLUDE_ASM("code_16c8e0", func_8025DEB0); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DEB0); -INCLUDE_ASM("code_16c8e0", func_8025DEC4); +INCLUDE_ASM(s32, "code_16c8e0", func_8025DEC4); -INCLUDE_ASM("code_16c8e0", func_8025E030); +INCLUDE_ASM(s32, "code_16c8e0", func_8025E030); -INCLUDE_ASM("code_16c8e0", func_8025E044); +INCLUDE_ASM(s32, "code_16c8e0", func_8025E044); -INCLUDE_ASM("code_16c8e0", func_8025E108); +INCLUDE_ASM(s32, "code_16c8e0", func_8025E108); -INCLUDE_ASM("code_16c8e0", func_8025E14C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025E14C); -INCLUDE_ASM("code_16c8e0", func_8025E190); +INCLUDE_ASM(s32, "code_16c8e0", func_8025E190); -INCLUDE_ASM("code_16c8e0", func_8025FF8C); +INCLUDE_ASM(s32, "code_16c8e0", func_8025FF8C); -INCLUDE_ASM("code_16c8e0", func_802601BC); +INCLUDE_ASM(s32, "code_16c8e0", func_802601BC); -INCLUDE_ASM("code_16c8e0", func_80260948); +INCLUDE_ASM(s32, "code_16c8e0", func_80260948); -INCLUDE_ASM("code_16c8e0", func_80260A20); +INCLUDE_ASM(s32, "code_16c8e0", func_80260A20); -INCLUDE_ASM("code_16c8e0", func_80260A60); +INCLUDE_ASM(s32, "code_16c8e0", func_80260A60); -INCLUDE_ASM("code_16c8e0", func_80260AD4); +INCLUDE_ASM(s32, "code_16c8e0", func_80260AD4); -INCLUDE_ASM("code_16c8e0", activate_defend_command); +INCLUDE_ASM(s32, "code_16c8e0", activate_defend_command); -INCLUDE_ASM("code_16c8e0", func_80260B70); +INCLUDE_ASM(s32, "code_16c8e0", func_80260B70); -INCLUDE_ASM("code_16c8e0", func_80260BF4); +INCLUDE_ASM(s32, "code_16c8e0", func_80260BF4); -INCLUDE_ASM("code_16c8e0", func_80260DB8); +INCLUDE_ASM(s32, "code_16c8e0", func_80260DB8); -INCLUDE_ASM("code_16c8e0", func_80260DD8); +INCLUDE_ASM(s32, "code_16c8e0", func_80260DD8); -INCLUDE_ASM("code_16c8e0", func_80260E38); +INCLUDE_ASM(s32, "code_16c8e0", func_80260E38); -INCLUDE_ASM("code_16c8e0", func_80260E5C); +INCLUDE_ASM(s32, "code_16c8e0", func_80260E5C); -INCLUDE_ASM("code_16c8e0", func_80260E90); +INCLUDE_ASM(s32, "code_16c8e0", func_80260E90); -INCLUDE_ASM("code_16c8e0", func_80261064); +INCLUDE_ASM(s32, "code_16c8e0", func_80261064); -INCLUDE_ASM("code_16c8e0", func_802610CC); +INCLUDE_ASM(s32, "code_16c8e0", func_802610CC); -INCLUDE_ASM("code_16c8e0", func_80261164); +INCLUDE_ASM(s32, "code_16c8e0", func_80261164); -INCLUDE_ASM("code_16c8e0", func_802611E8); +INCLUDE_ASM(s32, "code_16c8e0", func_802611E8); -INCLUDE_ASM("code_16c8e0", func_8026127C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026127C); -INCLUDE_ASM("code_16c8e0", func_80261388); +INCLUDE_ASM(s32, "code_16c8e0", func_80261388); -INCLUDE_ASM("code_16c8e0", func_802613A8); +INCLUDE_ASM(s32, "code_16c8e0", func_802613A8); -INCLUDE_ASM("code_16c8e0", func_802613BC); +INCLUDE_ASM(s32, "code_16c8e0", func_802613BC); -INCLUDE_ASM("code_16c8e0", func_80261478); +INCLUDE_ASM(s32, "code_16c8e0", func_80261478); -INCLUDE_ASM("code_16c8e0", func_80261530); +INCLUDE_ASM(s32, "code_16c8e0", func_80261530); -INCLUDE_ASM("code_16c8e0", func_802615C8); +INCLUDE_ASM(s32, "code_16c8e0", func_802615C8); -INCLUDE_ASM("code_16c8e0", func_80261648); +INCLUDE_ASM(s32, "code_16c8e0", func_80261648); -INCLUDE_ASM("code_16c8e0", func_802616B4); +INCLUDE_ASM(s32, "code_16c8e0", func_802616B4); -INCLUDE_ASM("code_16c8e0", func_802616F4); +INCLUDE_ASM(s32, "code_16c8e0", func_802616F4); -INCLUDE_ASM("code_16c8e0", func_802619B4); +INCLUDE_ASM(s32, "code_16c8e0", func_802619B4); -INCLUDE_ASM("code_16c8e0", HasMerleeCastsLeft); +INCLUDE_ASM(s32, "code_16c8e0", HasMerleeCastsLeft); -INCLUDE_ASM("code_16c8e0", func_802619E8); +INCLUDE_ASM(s32, "code_16c8e0", func_802619E8); -INCLUDE_ASM("code_16c8e0", func_80261B40); +INCLUDE_ASM(s32, "code_16c8e0", func_80261B40); -INCLUDE_ASM("code_16c8e0", FXRecoverHP); +INCLUDE_ASM(s32, "code_16c8e0", FXRecoverHP); -INCLUDE_ASM("code_16c8e0", FXRecoverFP); +INCLUDE_ASM(s32, "code_16c8e0", FXRecoverFP); -INCLUDE_ASM("code_16c8e0", IncrementPlayerHP); +INCLUDE_ASM(s32, "code_16c8e0", IncrementPlayerHP); -INCLUDE_ASM("code_16c8e0", IncrementPlayerFP); +INCLUDE_ASM(s32, "code_16c8e0", IncrementPlayerFP); -INCLUDE_ASM("code_16c8e0", func_80261D98); +INCLUDE_ASM(s32, "code_16c8e0", func_80261D98); -INCLUDE_ASM("code_16c8e0", func_80261DD4); +INCLUDE_ASM(s32, "code_16c8e0", func_80261DD4); -INCLUDE_ASM("code_16c8e0", func_80261DF4); +INCLUDE_ASM(s32, "code_16c8e0", func_80261DF4); -INCLUDE_ASM("code_16c8e0", func_80261FB4); +INCLUDE_ASM(s32, "code_16c8e0", func_80261FB4); -INCLUDE_ASM("code_16c8e0", func_802620F8); +INCLUDE_ASM(s32, "code_16c8e0", func_802620F8); -INCLUDE_ASM("code_16c8e0", func_80262130); +INCLUDE_ASM(s32, "code_16c8e0", func_80262130); -INCLUDE_ASM("code_16c8e0", func_8026220C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026220C); -INCLUDE_ASM("code_16c8e0", create_target_list); +INCLUDE_ASM(s32, "code_16c8e0", create_target_list); -INCLUDE_ASM("code_16c8e0", player_create_target_list); +INCLUDE_ASM(s32, "code_16c8e0", player_create_target_list); -INCLUDE_ASM("code_16c8e0", enemy_create_target_list); +INCLUDE_ASM(s32, "code_16c8e0", enemy_create_target_list); -INCLUDE_ASM("code_16c8e0", func_80263064); +INCLUDE_ASM(s32, "code_16c8e0", func_80263064); -INCLUDE_ASM("code_16c8e0", func_80263230); +INCLUDE_ASM(s32, "code_16c8e0", func_80263230); -INCLUDE_ASM("code_16c8e0", func_8026324C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026324C); -INCLUDE_ASM("code_16c8e0", func_80263268); +INCLUDE_ASM(s32, "code_16c8e0", func_80263268); -INCLUDE_ASM("code_16c8e0", func_80263300); +INCLUDE_ASM(s32, "code_16c8e0", func_80263300); -INCLUDE_ASM("code_16c8e0", func_802633E8); +INCLUDE_ASM(s32, "code_16c8e0", func_802633E8); -INCLUDE_ASM("code_16c8e0", func_80263434); +INCLUDE_ASM(s32, "code_16c8e0", func_80263434); -INCLUDE_ASM("code_16c8e0", func_80263464); +INCLUDE_ASM(s32, "code_16c8e0", func_80263464); -INCLUDE_ASM("code_16c8e0", func_802634B8); +INCLUDE_ASM(s32, "code_16c8e0", func_802634B8); -INCLUDE_ASM("code_16c8e0", func_802636E4); +INCLUDE_ASM(s32, "code_16c8e0", func_802636E4); -INCLUDE_ASM("code_16c8e0", func_80263914); +INCLUDE_ASM(s32, "code_16c8e0", func_80263914); -INCLUDE_ASM("code_16c8e0", count_power_plus); +INCLUDE_ASM(s32, "code_16c8e0", count_power_plus); -INCLUDE_ASM("code_16c8e0", deduct_current_move_fp); +INCLUDE_ASM(s32, "code_16c8e0", deduct_current_move_fp); -INCLUDE_ASM("code_16c8e0", func_80263C60); +INCLUDE_ASM(s32, "code_16c8e0", func_80263C60); -INCLUDE_ASM("code_16c8e0", func_80263CC4); +INCLUDE_ASM(s32, "code_16c8e0", func_80263CC4); -INCLUDE_ASM("code_16c8e0", set_animation); +INCLUDE_ASM(s32, "code_16c8e0", set_animation); -INCLUDE_ASM("code_16c8e0", func_80263E08); +INCLUDE_ASM(s32, "code_16c8e0", func_80263E08); -INCLUDE_ASM("code_16c8e0", set_animation_rate); +INCLUDE_ASM(s32, "code_16c8e0", set_animation_rate); -INCLUDE_ASM("code_16c8e0", set_actor_yaw); +INCLUDE_ASM(s32, "code_16c8e0", set_actor_yaw); -INCLUDE_ASM("code_16c8e0", set_part_yaw); +INCLUDE_ASM(s32, "code_16c8e0", set_part_yaw); -INCLUDE_ASM("code_16c8e0", func_80263FE8); +INCLUDE_ASM(s32, "code_16c8e0", func_80263FE8); -INCLUDE_ASM("code_16c8e0", func_80264084); +INCLUDE_ASM(s32, "code_16c8e0", func_80264084); -INCLUDE_ASM("code_16c8e0", add_xz_vec3f); +INCLUDE_ASM(s32, "code_16c8e0", add_xz_vec3f); -INCLUDE_ASM("code_16c8e0", add_xz_vec3f_copy1); +INCLUDE_ASM(s32, "code_16c8e0", add_xz_vec3f_copy1); -INCLUDE_ASM("code_16c8e0", add_xz_vec3f_copy2); +INCLUDE_ASM(s32, "code_16c8e0", add_xz_vec3f_copy2); -INCLUDE_ASM("code_16c8e0", play_movement_dust_effects); +INCLUDE_ASM(s32, "code_16c8e0", play_movement_dust_effects); -INCLUDE_ASM("code_16c8e0", get_actor_part); +INCLUDE_ASM(s32, "code_16c8e0", get_actor_part); -INCLUDE_ASM("code_16c8e0", load_player_actor); +INCLUDE_ASM(s32, "code_16c8e0", load_player_actor); -INCLUDE_ASM("code_16c8e0", load_partner_actor); +INCLUDE_ASM(s32, "code_16c8e0", load_partner_actor); -INCLUDE_ASM("code_16c8e0", create_actor); +INCLUDE_ASM(s32, "code_16c8e0", create_actor); -INCLUDE_ASM("code_16c8e0", func_80265CE8); +INCLUDE_ASM(s32, "code_16c8e0", func_80265CE8); -INCLUDE_ASM("code_16c8e0", func_80265D44); +INCLUDE_ASM(s32, "code_16c8e0", func_80265D44); -INCLUDE_ASM("code_16c8e0", lookup_defense); +INCLUDE_ASM(s32, "code_16c8e0", lookup_defense); -INCLUDE_ASM("code_16c8e0", lookup_status_chance); +INCLUDE_ASM(s32, "code_16c8e0", lookup_status_chance); -INCLUDE_ASM("code_16c8e0", lookup_status_duration_mod); +INCLUDE_ASM(s32, "code_16c8e0", lookup_status_duration_mod); -INCLUDE_ASM("code_16c8e0", inflict_status); +INCLUDE_ASM(s32, "code_16c8e0", inflict_status); -INCLUDE_ASM("code_16c8e0", inflict_partner_ko); +INCLUDE_ASM(s32, "code_16c8e0", inflict_partner_ko); -INCLUDE_ASM("code_16c8e0", get_defense); +INCLUDE_ASM(s32, "code_16c8e0", get_defense); -INCLUDE_ASM("code_16c8e0", func_802664DC); +INCLUDE_ASM(s32, "code_16c8e0", func_802664DC); -INCLUDE_ASM("code_16c8e0", show_damage_popup); +INCLUDE_ASM(s32, "code_16c8e0", show_damage_popup); -INCLUDE_ASM("code_16c8e0", func_80266684); +INCLUDE_ASM(s32, "code_16c8e0", func_80266684); -INCLUDE_ASM("code_16c8e0", func_802666E4); +INCLUDE_ASM(s32, "code_16c8e0", func_802666E4); -INCLUDE_ASM("code_16c8e0", func_802667F0); +INCLUDE_ASM(s32, "code_16c8e0", func_802667F0); -INCLUDE_ASM("code_16c8e0", func_80266970); +INCLUDE_ASM(s32, "code_16c8e0", func_80266970); -INCLUDE_ASM("code_16c8e0", func_80266978); +INCLUDE_ASM(s32, "code_16c8e0", func_80266978); -INCLUDE_ASM("code_16c8e0", func_80266ADC); +INCLUDE_ASM(s32, "code_16c8e0", func_80266ADC); -INCLUDE_ASM("code_16c8e0", func_80266AF8); +INCLUDE_ASM(s32, "code_16c8e0", func_80266AF8); -INCLUDE_ASM("code_16c8e0", func_80266B14); +INCLUDE_ASM(s32, "code_16c8e0", func_80266B14); -INCLUDE_ASM("code_16c8e0", try_inflict_status); +INCLUDE_ASM(s32, "code_16c8e0", try_inflict_status); -INCLUDE_ASM("code_16c8e0", inflict_status_set_duration); +INCLUDE_ASM(s32, "code_16c8e0", inflict_status_set_duration); -INCLUDE_ASM("code_16c8e0", func_80266D6C); +INCLUDE_ASM(s32, "code_16c8e0", func_80266D6C); -INCLUDE_ASM("code_16c8e0", func_80266DAC); +INCLUDE_ASM(s32, "code_16c8e0", func_80266DAC); -INCLUDE_ASM("code_16c8e0", func_80266E14); +INCLUDE_ASM(s32, "code_16c8e0", func_80266E14); -INCLUDE_ASM("code_16c8e0", func_80266E40); +INCLUDE_ASM(s32, "code_16c8e0", func_80266E40); -INCLUDE_ASM("code_16c8e0", func_80266EA8); +INCLUDE_ASM(s32, "code_16c8e0", func_80266EA8); -INCLUDE_ASM("code_16c8e0", func_80266EE8); +INCLUDE_ASM(s32, "code_16c8e0", func_80266EE8); -INCLUDE_ASM("code_16c8e0", func_80266F60); +INCLUDE_ASM(s32, "code_16c8e0", func_80266F60); -INCLUDE_ASM("code_16c8e0", func_80266F8C); +INCLUDE_ASM(s32, "code_16c8e0", func_80266F8C); -INCLUDE_ASM("code_16c8e0", func_80266FD8); +INCLUDE_ASM(s32, "code_16c8e0", func_80266FD8); -INCLUDE_ASM("code_16c8e0", func_80267018); +INCLUDE_ASM(s32, "code_16c8e0", func_80267018); -INCLUDE_ASM("code_16c8e0", func_8026709C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026709C); -INCLUDE_ASM("code_16c8e0", func_802670C8); +INCLUDE_ASM(s32, "code_16c8e0", func_802670C8); -INCLUDE_ASM("code_16c8e0", add_part_decoration); +INCLUDE_ASM(s32, "code_16c8e0", add_part_decoration); -INCLUDE_ASM("code_16c8e0", add_actor_decoration); +INCLUDE_ASM(s32, "code_16c8e0", add_actor_decoration); -INCLUDE_ASM("code_16c8e0", remove_part_decoration); +INCLUDE_ASM(s32, "code_16c8e0", remove_part_decoration); -INCLUDE_ASM("code_16c8e0", remove_actor_decoration); +INCLUDE_ASM(s32, "code_16c8e0", remove_actor_decoration); -INCLUDE_ASM("code_16c8e0", heroes_is_ability_active); +INCLUDE_ASM(s32, "code_16c8e0", heroes_is_ability_active); -INCLUDE_ASM("code_16c8e0", create_part_shadow); +INCLUDE_ASM(s32, "code_16c8e0", create_part_shadow); -INCLUDE_ASM("code_16c8e0", remove_part_shadow); +INCLUDE_ASM(s32, "code_16c8e0", remove_part_shadow); -INCLUDE_ASM("code_16c8e0", func_802673E4); +INCLUDE_ASM(s32, "code_16c8e0", func_802673E4); -INCLUDE_ASM("code_16c8e0", remove_player_buffs); +INCLUDE_ASM(s32, "code_16c8e0", remove_player_buffs); -INCLUDE_ASM("code_16c8e0", func_8026777C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026777C); -INCLUDE_ASM("code_16c8e0", func_8026787C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026787C); -INCLUDE_ASM("code_16c8e0", func_80267A3C); +INCLUDE_ASM(s32, "code_16c8e0", func_80267A3C); -INCLUDE_ASM("code_16c8e0", reset_all_actor_sounds); +INCLUDE_ASM(s32, "code_16c8e0", reset_all_actor_sounds); -INCLUDE_ASM("code_16c8e0", hide_foreground_models_unchecked); +INCLUDE_ASM(s32, "code_16c8e0", hide_foreground_models_unchecked); -INCLUDE_ASM("code_16c8e0", show_foreground_models_unchecked); +INCLUDE_ASM(s32, "code_16c8e0", show_foreground_models_unchecked); -INCLUDE_ASM("code_16c8e0", hide_foreground_models); +INCLUDE_ASM(s32, "code_16c8e0", hide_foreground_models); -INCLUDE_ASM("code_16c8e0", show_foreground_models); +INCLUDE_ASM(s32, "code_16c8e0", show_foreground_models); -INCLUDE_ASM("code_16c8e0", StartRumbleWithParams); +INCLUDE_ASM(s32, "code_16c8e0", StartRumbleWithParams); -INCLUDE_ASM("code_16c8e0", start_rumble_type); +INCLUDE_ASM(s32, "code_16c8e0", start_rumble_type); -INCLUDE_ASM("code_16c8e0", LoadItemScript); +INCLUDE_ASM(s32, "code_16c8e0", LoadItemScript); -INCLUDE_ASM("code_16c8e0", LoadFreeItemScript); +INCLUDE_ASM(s32, "code_16c8e0", LoadFreeItemScript); -INCLUDE_ASM("code_16c8e0", LoadMoveScript); +INCLUDE_ASM(s32, "code_16c8e0", LoadMoveScript); -INCLUDE_ASM("code_16c8e0", LoadActionCommand); +INCLUDE_ASM(s32, "code_16c8e0", LoadActionCommand); -INCLUDE_ASM("code_16c8e0", func_80268224); +INCLUDE_ASM(s32, "code_16c8e0", func_80268224); -INCLUDE_ASM("code_16c8e0", func_80268284); +INCLUDE_ASM(s32, "code_16c8e0", func_80268284); -INCLUDE_ASM("code_16c8e0", func_80268770); +INCLUDE_ASM(s32, "code_16c8e0", func_80268770); -INCLUDE_ASM("code_16c8e0", func_80268798); +INCLUDE_ASM(s32, "code_16c8e0", func_80268798); -INCLUDE_ASM("code_16c8e0", func_802687BC); +INCLUDE_ASM(s32, "code_16c8e0", func_802687BC); -INCLUDE_ASM("code_16c8e0", func_802687E4); +INCLUDE_ASM(s32, "code_16c8e0", func_802687E4); -INCLUDE_ASM("code_16c8e0", func_8026880C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026880C); -INCLUDE_ASM("code_16c8e0", func_80268834); +INCLUDE_ASM(s32, "code_16c8e0", func_80268834); -INCLUDE_ASM("code_16c8e0", func_80268858); +INCLUDE_ASM(s32, "code_16c8e0", func_80268858); -INCLUDE_ASM("code_16c8e0", func_80268938); +INCLUDE_ASM(s32, "code_16c8e0", func_80268938); -INCLUDE_ASM("code_16c8e0", func_80268AF8); +INCLUDE_ASM(s32, "code_16c8e0", func_80268AF8); -INCLUDE_ASM("code_16c8e0", func_80268C9C); +INCLUDE_ASM(s32, "code_16c8e0", func_80268C9C); -INCLUDE_ASM("code_16c8e0", func_80268E88); +INCLUDE_ASM(s32, "code_16c8e0", func_80268E88); -INCLUDE_ASM("code_16c8e0", check_block_input); +INCLUDE_ASM(s32, "code_16c8e0", check_block_input); -INCLUDE_ASM("code_16c8e0", func_80269118); +INCLUDE_ASM(s32, "code_16c8e0", func_80269118); -INCLUDE_ASM("code_16c8e0", func_80269160); +INCLUDE_ASM(s32, "code_16c8e0", func_80269160); -INCLUDE_ASM("code_16c8e0", func_8026919C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026919C); -INCLUDE_ASM("code_16c8e0", func_802691C8); +INCLUDE_ASM(s32, "code_16c8e0", func_802691C8); -INCLUDE_ASM("code_16c8e0", GetActionSuccess); +INCLUDE_ASM(s32, "code_16c8e0", GetActionSuccess); -INCLUDE_ASM("code_16c8e0", SetActionSuccess); +INCLUDE_ASM(s32, "code_16c8e0", SetActionSuccess); -INCLUDE_ASM("code_16c8e0", func_802692EC); +INCLUDE_ASM(s32, "code_16c8e0", func_802692EC); -INCLUDE_ASM("code_16c8e0", func_80269318); +INCLUDE_ASM(s32, "code_16c8e0", func_80269318); -INCLUDE_ASM("code_16c8e0", func_80269344); +INCLUDE_ASM(s32, "code_16c8e0", func_80269344); -INCLUDE_ASM("code_16c8e0", func_80269370); +INCLUDE_ASM(s32, "code_16c8e0", func_80269370); -INCLUDE_ASM("code_16c8e0", func_8026939C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026939C); -INCLUDE_ASM("code_16c8e0", func_802693F0); +INCLUDE_ASM(s32, "code_16c8e0", func_802693F0); -INCLUDE_ASM("code_16c8e0", CloseActionCommandInfo); +INCLUDE_ASM(s32, "code_16c8e0", CloseActionCommandInfo); -INCLUDE_ASM("code_16c8e0", func_80269470); +INCLUDE_ASM(s32, "code_16c8e0", func_80269470); -INCLUDE_ASM("code_16c8e0", func_802694A4); +INCLUDE_ASM(s32, "code_16c8e0", func_802694A4); -INCLUDE_ASM("code_16c8e0", GetActionSuccessCopy); +INCLUDE_ASM(s32, "code_16c8e0", GetActionSuccessCopy); -INCLUDE_ASM("code_16c8e0", func_80269524); +INCLUDE_ASM(s32, "code_16c8e0", func_80269524); -INCLUDE_ASM("code_16c8e0", func_80269550); +INCLUDE_ASM(s32, "code_16c8e0", func_80269550); -INCLUDE_ASM("code_16c8e0", GetBlockResult); +INCLUDE_ASM(s32, "code_16c8e0", GetBlockResult); -INCLUDE_ASM("code_16c8e0", func_802695A8); +INCLUDE_ASM(s32, "code_16c8e0", func_802695A8); -INCLUDE_ASM("code_16c8e0", func_802695D4); +INCLUDE_ASM(s32, "code_16c8e0", func_802695D4); -INCLUDE_ASM("code_16c8e0", func_80269600); +INCLUDE_ASM(s32, "code_16c8e0", func_80269600); -INCLUDE_ASM("code_16c8e0", func_8026962C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026962C); -INCLUDE_ASM("code_16c8e0", count_targets); +INCLUDE_ASM(s32, "code_16c8e0", count_targets); -INCLUDE_ASM("code_16c8e0", get_nearest_home_index); +INCLUDE_ASM(s32, "code_16c8e0", get_nearest_home_index); -INCLUDE_ASM("code_16c8e0", set_goal_pos_to_part); +INCLUDE_ASM(s32, "code_16c8e0", set_goal_pos_to_part); -INCLUDE_ASM("code_16c8e0", set_part_goal_to_actor_part); +INCLUDE_ASM(s32, "code_16c8e0", set_part_goal_to_actor_part); -INCLUDE_ASM("code_16c8e0", set_actor_current_position); +INCLUDE_ASM(s32, "code_16c8e0", set_actor_current_position); -INCLUDE_ASM("code_16c8e0", set_part_absolute_position); +INCLUDE_ASM(s32, "code_16c8e0", set_part_absolute_position); -INCLUDE_ASM("code_16c8e0", set_actor_home_position); +INCLUDE_ASM(s32, "code_16c8e0", set_actor_home_position); -INCLUDE_ASM_T(Actor*, "code_16c8e0", get_actor, s32 actorID); +INCLUDE_ASM(Actor*, "code_16c8e0", get_actor, s32 actorID); -INCLUDE_ASM("code_16c8e0", LoadBattleSection); +INCLUDE_ASM(s32, "code_16c8e0", LoadBattleSection); -INCLUDE_ASM("code_16c8e0", GetBattlePhase); +INCLUDE_ASM(s32, "code_16c8e0", GetBattlePhase); -INCLUDE_ASM("code_16c8e0", GetLastElement); +INCLUDE_ASM(s32, "code_16c8e0", GetLastElement); -INCLUDE_ASM("code_16c8e0", func_80269E80); +INCLUDE_ASM(s32, "code_16c8e0", func_80269E80); -INCLUDE_ASM("code_16c8e0", func_80269EAC); +INCLUDE_ASM(s32, "code_16c8e0", func_80269EAC); -INCLUDE_ASM("code_16c8e0", SetGoalToHome); +INCLUDE_ASM(s32, "code_16c8e0", SetGoalToHome); -INCLUDE_ASM("code_16c8e0", SetIdleGoalToHome); +INCLUDE_ASM(s32, "code_16c8e0", SetIdleGoalToHome); -INCLUDE_ASM("code_16c8e0", SetGoalToIndex); +INCLUDE_ASM(s32, "code_16c8e0", SetGoalToIndex); -INCLUDE_ASM("code_16c8e0", GetIndexFromPos); +INCLUDE_ASM(s32, "code_16c8e0", GetIndexFromPos); -INCLUDE_ASM("code_16c8e0", GetIndexFromHome); +INCLUDE_ASM(s32, "code_16c8e0", GetIndexFromHome); -INCLUDE_ASM("code_16c8e0", CountPlayerTargets); +INCLUDE_ASM(s32, "code_16c8e0", CountPlayerTargets); -INCLUDE_ASM("code_16c8e0", ForceHomePos); +INCLUDE_ASM(s32, "code_16c8e0", ForceHomePos); -INCLUDE_ASM("code_16c8e0", SetHomePos); +INCLUDE_ASM(s32, "code_16c8e0", SetHomePos); -INCLUDE_ASM("code_16c8e0", SetGoalToTarget); +INCLUDE_ASM(s32, "code_16c8e0", SetGoalToTarget); -INCLUDE_ASM("code_16c8e0", SetPartGoalToTarget); +INCLUDE_ASM(s32, "code_16c8e0", SetPartGoalToTarget); -INCLUDE_ASM("code_16c8e0", SetGoalToFirstTarget); +INCLUDE_ASM(s32, "code_16c8e0", SetGoalToFirstTarget); -INCLUDE_ASM("code_16c8e0", SetGoalPos); +INCLUDE_ASM(s32, "code_16c8e0", SetGoalPos); -INCLUDE_ASM("code_16c8e0", SetIdleGoal); +INCLUDE_ASM(s32, "code_16c8e0", SetIdleGoal); -INCLUDE_ASM("code_16c8e0", AddGoalPos); +INCLUDE_ASM(s32, "code_16c8e0", AddGoalPos); -INCLUDE_ASM("code_16c8e0", GetGoalPos); +INCLUDE_ASM(s32, "code_16c8e0", GetGoalPos); -INCLUDE_ASM("code_16c8e0", GetIdleGoal); +INCLUDE_ASM(s32, "code_16c8e0", GetIdleGoal); -INCLUDE_ASM("code_16c8e0", GetPartTarget); +INCLUDE_ASM(s32, "code_16c8e0", GetPartTarget); -INCLUDE_ASM("code_16c8e0", GetActorPos); +INCLUDE_ASM(s32, "code_16c8e0", GetActorPos); -INCLUDE_ASM("code_16c8e0", GetPartOffset); +INCLUDE_ASM(s32, "code_16c8e0", GetPartOffset); -INCLUDE_ASM("code_16c8e0", GetPartPos); +INCLUDE_ASM(s32, "code_16c8e0", GetPartPos); -INCLUDE_ASM("code_16c8e0", GetHomePos); +INCLUDE_ASM(s32, "code_16c8e0", GetHomePos); -INCLUDE_ASM("code_16c8e0", SetActorPos); +INCLUDE_ASM(s32, "code_16c8e0", SetActorPos); -INCLUDE_ASM("code_16c8e0", SetPartPos); +INCLUDE_ASM(s32, "code_16c8e0", SetPartPos); -INCLUDE_ASM("code_16c8e0", SetEnemyTargetOffset); +INCLUDE_ASM(s32, "code_16c8e0", SetEnemyTargetOffset); -INCLUDE_ASM("code_16c8e0", SetAnimation); +INCLUDE_ASM(s32, "code_16c8e0", SetAnimation); -INCLUDE_ASM("code_16c8e0", GetAnimation); +INCLUDE_ASM(s32, "code_16c8e0", GetAnimation); -INCLUDE_ASM("code_16c8e0", SetAnimationRate); +INCLUDE_ASM(s32, "code_16c8e0", SetAnimationRate); -INCLUDE_ASM("code_16c8e0", SetActorYaw); +INCLUDE_ASM(s32, "code_16c8e0", SetActorYaw); -INCLUDE_ASM("code_16c8e0", GetActorYaw); +INCLUDE_ASM(s32, "code_16c8e0", GetActorYaw); -INCLUDE_ASM("code_16c8e0", SetPartYaw); +INCLUDE_ASM(s32, "code_16c8e0", SetPartYaw); -INCLUDE_ASM("code_16c8e0", GetPartYaw); +INCLUDE_ASM(s32, "code_16c8e0", GetPartYaw); -INCLUDE_ASM("code_16c8e0", SetActorJumpGravity); +INCLUDE_ASM(s32, "code_16c8e0", SetActorJumpGravity); -INCLUDE_ASM("code_16c8e0", SetActorIdleJumpGravity); +INCLUDE_ASM(s32, "code_16c8e0", SetActorIdleJumpGravity); -INCLUDE_ASM("code_16c8e0", SetActorSpeed); +INCLUDE_ASM(s32, "code_16c8e0", SetActorSpeed); -INCLUDE_ASM("code_16c8e0", SetActorIdleSpeed); +INCLUDE_ASM(s32, "code_16c8e0", SetActorIdleSpeed); -INCLUDE_ASM("code_16c8e0", SetPartJumpGravity); +INCLUDE_ASM(s32, "code_16c8e0", SetPartJumpGravity); -INCLUDE_ASM("code_16c8e0", SetPartMoveSpeed); +INCLUDE_ASM(s32, "code_16c8e0", SetPartMoveSpeed); -INCLUDE_ASM("code_16c8e0", SetJumpAnimations); +INCLUDE_ASM(s32, "code_16c8e0", SetJumpAnimations); -INCLUDE_ASM("code_16c8e0", AddActorPos); +INCLUDE_ASM(s32, "code_16c8e0", AddActorPos); -INCLUDE_ASM("code_16c8e0", SetActorDispOffset); +INCLUDE_ASM(s32, "code_16c8e0", SetActorDispOffset); -INCLUDE_ASM("code_16c8e0", GetPartDispOffset); +INCLUDE_ASM(s32, "code_16c8e0", GetPartDispOffset); -INCLUDE_ASM("code_16c8e0", SetPartDispOffset); +INCLUDE_ASM(s32, "code_16c8e0", SetPartDispOffset); -INCLUDE_ASM("code_16c8e0", AddPartDispOffset); +INCLUDE_ASM(s32, "code_16c8e0", AddPartDispOffset); -INCLUDE_ASM("code_16c8e0", func_8026BF48); +INCLUDE_ASM(s32, "code_16c8e0", func_8026BF48); -INCLUDE_ASM("code_16c8e0", GetActorVar); +INCLUDE_ASM(s32, "code_16c8e0", GetActorVar); -INCLUDE_ASM("code_16c8e0", SetActorVar); +INCLUDE_ASM(s32, "code_16c8e0", SetActorVar); -INCLUDE_ASM("code_16c8e0", AddActorVar); +INCLUDE_ASM(s32, "code_16c8e0", AddActorVar); -INCLUDE_ASM("code_16c8e0", GetPartMovementVar); +INCLUDE_ASM(s32, "code_16c8e0", GetPartMovementVar); -INCLUDE_ASM("code_16c8e0", SetPartMovementVar); +INCLUDE_ASM(s32, "code_16c8e0", SetPartMovementVar); -INCLUDE_ASM("code_16c8e0", AddPartMovementVar); +INCLUDE_ASM(s32, "code_16c8e0", AddPartMovementVar); -INCLUDE_ASM("code_16c8e0", SetActorRotation); +INCLUDE_ASM(s32, "code_16c8e0", SetActorRotation); -INCLUDE_ASM("code_16c8e0", SetActorRotationOffset); +INCLUDE_ASM(s32, "code_16c8e0", SetActorRotationOffset); -INCLUDE_ASM("code_16c8e0", GetActorRotation); +INCLUDE_ASM(s32, "code_16c8e0", GetActorRotation); -INCLUDE_ASM("code_16c8e0", SetPartRotation); +INCLUDE_ASM(s32, "code_16c8e0", SetPartRotation); -INCLUDE_ASM("code_16c8e0", SetPartRotationOffset); +INCLUDE_ASM(s32, "code_16c8e0", SetPartRotationOffset); -INCLUDE_ASM("code_16c8e0", GetPartRotation); +INCLUDE_ASM(s32, "code_16c8e0", GetPartRotation); -INCLUDE_ASM("code_16c8e0", SetActorScale); +INCLUDE_ASM(s32, "code_16c8e0", SetActorScale); -INCLUDE_ASM("code_16c8e0", SetActorScaleModifier); +INCLUDE_ASM(s32, "code_16c8e0", SetActorScaleModifier); -INCLUDE_ASM("code_16c8e0", GetActorScale); +INCLUDE_ASM(s32, "code_16c8e0", GetActorScale); -INCLUDE_ASM("code_16c8e0", SetPartScale); +INCLUDE_ASM(s32, "code_16c8e0", SetPartScale); -INCLUDE_ASM("code_16c8e0", GetPartScale); +INCLUDE_ASM(s32, "code_16c8e0", GetPartScale); -INCLUDE_ASM("code_16c8e0", GetBattleFlags); +INCLUDE_ASM(s32, "code_16c8e0", GetBattleFlags); -INCLUDE_ASM("code_16c8e0", SetBattleFlagBits); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleFlagBits); -INCLUDE_ASM("code_16c8e0", GetBattleFlags2); +INCLUDE_ASM(s32, "code_16c8e0", GetBattleFlags2); -INCLUDE_ASM("code_16c8e0", SetBattleFlagBits2); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleFlagBits2); -INCLUDE_ASM("code_16c8e0", SetActorFlags); +INCLUDE_ASM(s32, "code_16c8e0", SetActorFlags); -INCLUDE_ASM("code_16c8e0", SetActorFlagBits); +INCLUDE_ASM(s32, "code_16c8e0", SetActorFlagBits); -INCLUDE_ASM("code_16c8e0", GetActorFlags); +INCLUDE_ASM(s32, "code_16c8e0", GetActorFlags); -INCLUDE_ASM("code_16c8e0", SetPartFlags); +INCLUDE_ASM(s32, "code_16c8e0", SetPartFlags); -INCLUDE_ASM("code_16c8e0", SetPartFlagBits); +INCLUDE_ASM(s32, "code_16c8e0", SetPartFlagBits); -INCLUDE_ASM("code_16c8e0", SetPartTargetFlags); +INCLUDE_ASM(s32, "code_16c8e0", SetPartTargetFlags); -INCLUDE_ASM("code_16c8e0", SetPartTargetFlagBits); +INCLUDE_ASM(s32, "code_16c8e0", SetPartTargetFlagBits); -INCLUDE_ASM("code_16c8e0", GetPartFlags); +INCLUDE_ASM(s32, "code_16c8e0", GetPartFlags); -INCLUDE_ASM("code_16c8e0", GetPartTargetFlags); +INCLUDE_ASM(s32, "code_16c8e0", GetPartTargetFlags); -INCLUDE_ASM("code_16c8e0", SetPartEventFlags); +INCLUDE_ASM(s32, "code_16c8e0", SetPartEventFlags); -INCLUDE_ASM("code_16c8e0", SetPartEventBits); +INCLUDE_ASM(s32, "code_16c8e0", SetPartEventBits); -INCLUDE_ASM("code_16c8e0", GetPartEventFlags); +INCLUDE_ASM(s32, "code_16c8e0", GetPartEventFlags); -INCLUDE_ASM("code_16c8e0", func_8026D51C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026D51C); -INCLUDE_ASM("code_16c8e0", func_8026D5A4); +INCLUDE_ASM(s32, "code_16c8e0", func_8026D5A4); -INCLUDE_ASM("code_16c8e0", HPBarToHome); +INCLUDE_ASM(s32, "code_16c8e0", HPBarToHome); -INCLUDE_ASM("code_16c8e0", HPBarToCurrent); +INCLUDE_ASM(s32, "code_16c8e0", HPBarToCurrent); -INCLUDE_ASM("code_16c8e0", func_8026D8EC); +INCLUDE_ASM(s32, "code_16c8e0", func_8026D8EC); -INCLUDE_ASM("code_16c8e0", func_8026D940); +INCLUDE_ASM(s32, "code_16c8e0", func_8026D940); -INCLUDE_ASM("code_16c8e0", func_8026DA94); +INCLUDE_ASM(s32, "code_16c8e0", func_8026DA94); -INCLUDE_ASM("code_16c8e0", SummonEnemy); +INCLUDE_ASM(s32, "code_16c8e0", SummonEnemy); -INCLUDE_ASM("code_16c8e0", GetOwnerID); +INCLUDE_ASM(s32, "code_16c8e0", GetOwnerID); -INCLUDE_ASM("code_16c8e0", SetOwnerID); +INCLUDE_ASM(s32, "code_16c8e0", SetOwnerID); ApiStatus ActorExists(ScriptInstance* script, s32 isInitialCall) { Bytecode isExist; @@ -1121,349 +1121,349 @@ ApiStatus ActorExists(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_16c8e0", func_8026DEF0); +INCLUDE_ASM(s32, "code_16c8e0", func_8026DEF0); -INCLUDE_ASM("code_16c8e0", func_8026DF88); +INCLUDE_ASM(s32, "code_16c8e0", func_8026DF88); -INCLUDE_ASM("code_16c8e0", func_8026E020); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E020); -INCLUDE_ASM("code_16c8e0", func_8026E038); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E038); -INCLUDE_ASM("code_16c8e0", SetBattleInputMask); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleInputMask); -INCLUDE_ASM("code_16c8e0", SetBattleInputButtons); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleInputButtons); -INCLUDE_ASM("code_16c8e0", CheckButtonPress); +INCLUDE_ASM(s32, "code_16c8e0", CheckButtonPress); -INCLUDE_ASM("code_16c8e0", CheckButtonHeld); +INCLUDE_ASM(s32, "code_16c8e0", CheckButtonHeld); -INCLUDE_ASM("code_16c8e0", CheckButtonDown); +INCLUDE_ASM(s32, "code_16c8e0", CheckButtonDown); -INCLUDE_ASM("code_16c8e0", GetBattleState); +INCLUDE_ASM(s32, "code_16c8e0", GetBattleState); -INCLUDE_ASM("code_16c8e0", func_8026E16C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E16C); -INCLUDE_ASM("code_16c8e0", func_8026E198); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E198); -INCLUDE_ASM("code_16c8e0", func_8026E208); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E208); -INCLUDE_ASM("code_16c8e0", func_8026E260); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E260); -INCLUDE_ASM("code_16c8e0", PlayerCreateTargetList); +INCLUDE_ASM(s32, "code_16c8e0", PlayerCreateTargetList); -INCLUDE_ASM("code_16c8e0", EnemyCreateTargetList); +INCLUDE_ASM(s32, "code_16c8e0", EnemyCreateTargetList); -INCLUDE_ASM("code_16c8e0", InitTargetIterator); +INCLUDE_ASM(s32, "code_16c8e0", InitTargetIterator); -INCLUDE_ASM("code_16c8e0", SetOwnerTarget); +INCLUDE_ASM(s32, "code_16c8e0", SetOwnerTarget); -INCLUDE_ASM("code_16c8e0", ChooseNextTarget); +INCLUDE_ASM(s32, "code_16c8e0", ChooseNextTarget); -INCLUDE_ASM("code_16c8e0", func_8026E558); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E558); -INCLUDE_ASM("code_16c8e0", GetTargetListLength); +INCLUDE_ASM(s32, "code_16c8e0", GetTargetListLength); -INCLUDE_ASM("code_16c8e0", GetOwnerTarget); +INCLUDE_ASM(s32, "code_16c8e0", GetOwnerTarget); -INCLUDE_ASM("code_16c8e0", func_8026E914); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E914); -INCLUDE_ASM("code_16c8e0", GetPlayerActorID); +INCLUDE_ASM(s32, "code_16c8e0", GetPlayerActorID); -INCLUDE_ASM("code_16c8e0", func_8026E9A0); +INCLUDE_ASM(s32, "code_16c8e0", func_8026E9A0); -INCLUDE_ASM("code_16c8e0", GetDistanceToGoal); +INCLUDE_ASM(s32, "code_16c8e0", GetDistanceToGoal); -INCLUDE_ASM("code_16c8e0", func_8026EA7C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026EA7C); -INCLUDE_ASM("code_16c8e0", func_8026EB20); +INCLUDE_ASM(s32, "code_16c8e0", func_8026EB20); -INCLUDE_ASM("code_16c8e0", func_8026EBF8); +INCLUDE_ASM(s32, "code_16c8e0", func_8026EBF8); -INCLUDE_ASM("code_16c8e0", func_8026ED20); +INCLUDE_ASM(s32, "code_16c8e0", func_8026ED20); -INCLUDE_ASM("code_16c8e0", func_8026EDE4); +INCLUDE_ASM(s32, "code_16c8e0", func_8026EDE4); -INCLUDE_ASM("code_16c8e0", AddActorDecoration); +INCLUDE_ASM(s32, "code_16c8e0", AddActorDecoration); -INCLUDE_ASM("code_16c8e0", RemoveActorDecoration); +INCLUDE_ASM(s32, "code_16c8e0", RemoveActorDecoration); -INCLUDE_ASM("code_16c8e0", ModifyActorDecoration); +INCLUDE_ASM(s32, "code_16c8e0", ModifyActorDecoration); -INCLUDE_ASM("code_16c8e0", UseIdleAnimation); +INCLUDE_ASM(s32, "code_16c8e0", UseIdleAnimation); -INCLUDE_ASM("code_16c8e0", func_8026F1A0); +INCLUDE_ASM(s32, "code_16c8e0", func_8026F1A0); -INCLUDE_ASM("code_16c8e0", GetStatusFlags); +INCLUDE_ASM(s32, "code_16c8e0", GetStatusFlags); -INCLUDE_ASM("code_16c8e0", RemovePlayerBuffs); +INCLUDE_ASM(s32, "code_16c8e0", RemovePlayerBuffs); -INCLUDE_ASM("code_16c8e0", SetPartAlpha); +INCLUDE_ASM(s32, "code_16c8e0", SetPartAlpha); -INCLUDE_ASM("code_16c8e0", CreatePartShadow); +INCLUDE_ASM(s32, "code_16c8e0", CreatePartShadow); -INCLUDE_ASM("code_16c8e0", RemovePartShadow); +INCLUDE_ASM(s32, "code_16c8e0", RemovePartShadow); -INCLUDE_ASM("code_16c8e0", func_8026F60C); +INCLUDE_ASM(s32, "code_16c8e0", func_8026F60C); -INCLUDE_ASM("code_16c8e0", SetBattleVar); +INCLUDE_ASM(s32, "code_16c8e0", SetBattleVar); -INCLUDE_ASM("code_16c8e0", GetBattleVar); +INCLUDE_ASM(s32, "code_16c8e0", GetBattleVar); -INCLUDE_ASM("code_16c8e0", ResetAllActorSounds); +INCLUDE_ASM(s32, "code_16c8e0", ResetAllActorSounds); -INCLUDE_ASM("code_16c8e0", SetActorSounds); +INCLUDE_ASM(s32, "code_16c8e0", SetActorSounds); -INCLUDE_ASM("code_16c8e0", ResetActorSounds); +INCLUDE_ASM(s32, "code_16c8e0", ResetActorSounds); -INCLUDE_ASM("code_16c8e0", SetPartSounds); +INCLUDE_ASM(s32, "code_16c8e0", SetPartSounds); -INCLUDE_ASM("code_16c8e0", SetActorType); +INCLUDE_ASM(s32, "code_16c8e0", SetActorType); -INCLUDE_ASM("code_16c8e0", ShowShockEffect); +INCLUDE_ASM(s32, "code_16c8e0", ShowShockEffect); -INCLUDE_ASM("code_16c8e0", GetActorAttackBoost); +INCLUDE_ASM(s32, "code_16c8e0", GetActorAttackBoost); -INCLUDE_ASM("code_16c8e0", GetActorDefenseBoost); +INCLUDE_ASM(s32, "code_16c8e0", GetActorDefenseBoost); -INCLUDE_ASM("code_16c8e0", BoostAttack); +INCLUDE_ASM(s32, "code_16c8e0", BoostAttack); -INCLUDE_ASM("code_16c8e0", BoostDefense); +INCLUDE_ASM(s32, "code_16c8e0", BoostDefense); -INCLUDE_ASM("code_16c8e0", VanishActor); +INCLUDE_ASM(s32, "code_16c8e0", VanishActor); -INCLUDE_ASM("code_16c8e0", ElectrifyActor); +INCLUDE_ASM(s32, "code_16c8e0", ElectrifyActor); -INCLUDE_ASM("code_16c8e0", HealActor); +INCLUDE_ASM(s32, "code_16c8e0", HealActor); -INCLUDE_ASM("code_16c8e0", WaitForBuffDone); +INCLUDE_ASM(s32, "code_16c8e0", WaitForBuffDone); -INCLUDE_ASM("code_16c8e0", CopyBuffs); +INCLUDE_ASM(s32, "code_16c8e0", CopyBuffs); -INCLUDE_ASM("code_16c8e0", func_80271210); +INCLUDE_ASM(s32, "code_16c8e0", func_80271210); -INCLUDE_ASM("code_16c8e0", func_80271258); +INCLUDE_ASM(s32, "code_16c8e0", func_80271258); -INCLUDE_ASM("code_16c8e0", func_802712A0); +INCLUDE_ASM(s32, "code_16c8e0", func_802712A0); -INCLUDE_ASM("code_16c8e0", func_80271328); +INCLUDE_ASM(s32, "code_16c8e0", func_80271328); -INCLUDE_ASM("code_16c8e0", func_802713B0); +INCLUDE_ASM(s32, "code_16c8e0", func_802713B0); -INCLUDE_ASM("code_16c8e0", func_8027143C); +INCLUDE_ASM(s32, "code_16c8e0", func_8027143C); -INCLUDE_ASM("code_16c8e0", func_80271484); +INCLUDE_ASM(s32, "code_16c8e0", func_80271484); -INCLUDE_ASM("code_16c8e0", func_80271588); +INCLUDE_ASM(s32, "code_16c8e0", func_80271588); -INCLUDE_ASM("code_16c8e0", dispatch_event_player); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_player); -INCLUDE_ASM("code_16c8e0", dispatch_event_player_continue_turn); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_player_continue_turn); -INCLUDE_ASM("code_16c8e0", calc_player_test_enemy); +INCLUDE_ASM(s32, "code_16c8e0", calc_player_test_enemy); -INCLUDE_ASM("code_16c8e0", calc_player_damage_enemy); +INCLUDE_ASM(s32, "code_16c8e0", calc_player_damage_enemy); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_player); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_player); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_player_0); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_player_0); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_player_1); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_player_1); -INCLUDE_ASM("code_16c8e0", GetMenuSelection); +INCLUDE_ASM(s32, "code_16c8e0", GetMenuSelection); -INCLUDE_ASM("code_16c8e0", func_80273444); +INCLUDE_ASM(s32, "code_16c8e0", func_80273444); -INCLUDE_ASM("code_16c8e0", PlayerFallToGoal); +INCLUDE_ASM(s32, "code_16c8e0", PlayerFallToGoal); -INCLUDE_ASM("code_16c8e0", PlayerLandJump); +INCLUDE_ASM(s32, "code_16c8e0", PlayerLandJump); -INCLUDE_ASM("code_16c8e0", PlayerRunToGoal); +INCLUDE_ASM(s32, "code_16c8e0", PlayerRunToGoal); -INCLUDE_ASM("code_16c8e0", CancelablePlayerRunToGoal); +INCLUDE_ASM(s32, "code_16c8e0", CancelablePlayerRunToGoal); -INCLUDE_ASM("code_16c8e0", GetPlayerHP); +INCLUDE_ASM(s32, "code_16c8e0", GetPlayerHP); -INCLUDE_ASM("code_16c8e0", PlayerDamageEnemy); +INCLUDE_ASM(s32, "code_16c8e0", PlayerDamageEnemy); -INCLUDE_ASM("code_16c8e0", PlayerPowerBounceEnemy); +INCLUDE_ASM(s32, "code_16c8e0", PlayerPowerBounceEnemy); -INCLUDE_ASM("code_16c8e0", PlayerTestEnemy); +INCLUDE_ASM(s32, "code_16c8e0", PlayerTestEnemy); -INCLUDE_ASM("code_16c8e0", DispatchDamagePlayerEvent); +INCLUDE_ASM(s32, "code_16c8e0", DispatchDamagePlayerEvent); -INCLUDE_ASM("code_16c8e0", EnablePlayerBlur); +INCLUDE_ASM(s32, "code_16c8e0", EnablePlayerBlur); -INCLUDE_ASM("code_16c8e0", func_802749D8); +INCLUDE_ASM(s32, "code_16c8e0", func_802749D8); -INCLUDE_ASM("code_16c8e0", func_802749F8); +INCLUDE_ASM(s32, "code_16c8e0", func_802749F8); -INCLUDE_ASM("code_16c8e0", func_80274A18); +INCLUDE_ASM(s32, "code_16c8e0", func_80274A18); -INCLUDE_ASM("code_16c8e0", func_802752AC); +INCLUDE_ASM(s32, "code_16c8e0", func_802752AC); -INCLUDE_ASM("code_16c8e0", func_80275F00); +INCLUDE_ASM(s32, "code_16c8e0", func_80275F00); -INCLUDE_ASM("code_16c8e0", DidActionSucceed); +INCLUDE_ASM(s32, "code_16c8e0", DidActionSucceed); -INCLUDE_ASM("code_16c8e0", func_80276EFC); +INCLUDE_ASM(s32, "code_16c8e0", func_80276EFC); -INCLUDE_ASM("code_16c8e0", func_80276F1C); +INCLUDE_ASM(s32, "code_16c8e0", func_80276F1C); -INCLUDE_ASM("code_16c8e0", func_80276F50); +INCLUDE_ASM(s32, "code_16c8e0", func_80276F50); -INCLUDE_ASM("code_16c8e0", dispatch_event_general); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_general); -INCLUDE_ASM("code_16c8e0", play_hit_sound); +INCLUDE_ASM(s32, "code_16c8e0", play_hit_sound); -INCLUDE_ASM("code_16c8e0", dispatch_event_actor); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_actor); -INCLUDE_ASM("code_16c8e0", calc_enemy_test_target); +INCLUDE_ASM(s32, "code_16c8e0", calc_enemy_test_target); -INCLUDE_ASM("code_16c8e0", calc_enemy_damage_target); +INCLUDE_ASM(s32, "code_16c8e0", calc_enemy_damage_target); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_actor); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_actor); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_actor_0); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_actor_0); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_actor_1); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_actor_1); -INCLUDE_ASM("code_16c8e0", BindTakeTurn); +INCLUDE_ASM(s32, "code_16c8e0", BindTakeTurn); -INCLUDE_ASM("code_16c8e0", PauseTakeTurn); +INCLUDE_ASM(s32, "code_16c8e0", PauseTakeTurn); -INCLUDE_ASM("code_16c8e0", ResumeTakeTurn); +INCLUDE_ASM(s32, "code_16c8e0", ResumeTakeTurn); -INCLUDE_ASM("code_16c8e0", BindIdle); +INCLUDE_ASM(s32, "code_16c8e0", BindIdle); -INCLUDE_ASM("code_16c8e0", EnableIdleScript); +INCLUDE_ASM(s32, "code_16c8e0", EnableIdleScript); -INCLUDE_ASM("code_16c8e0", BindHandleEvent); +INCLUDE_ASM(s32, "code_16c8e0", BindHandleEvent); -INCLUDE_ASM("code_16c8e0", BindNextTurn); +INCLUDE_ASM(s32, "code_16c8e0", BindNextTurn); -INCLUDE_ASM("code_16c8e0", JumpToGoal); +INCLUDE_ASM(s32, "code_16c8e0", JumpToGoal); -INCLUDE_ASM("code_16c8e0", IdleJumpToGoal); +INCLUDE_ASM(s32, "code_16c8e0", IdleJumpToGoal); -INCLUDE_ASM("code_16c8e0", JumpToGoalSimple2); +INCLUDE_ASM(s32, "code_16c8e0", JumpToGoalSimple2); -INCLUDE_ASM("code_16c8e0", JumpWithBounce); +INCLUDE_ASM(s32, "code_16c8e0", JumpWithBounce); -INCLUDE_ASM("code_16c8e0", LandJump); +INCLUDE_ASM(s32, "code_16c8e0", LandJump); -INCLUDE_ASM("code_16c8e0", FallToGoal); +INCLUDE_ASM(s32, "code_16c8e0", FallToGoal); -INCLUDE_ASM("code_16c8e0", RunToGoal); +INCLUDE_ASM(s32, "code_16c8e0", RunToGoal); -INCLUDE_ASM("code_16c8e0", IdleRunToGoal); +INCLUDE_ASM(s32, "code_16c8e0", IdleRunToGoal); -INCLUDE_ASM("code_16c8e0", JumpPartTo); +INCLUDE_ASM(s32, "code_16c8e0", JumpPartTo); -INCLUDE_ASM("code_16c8e0", FallPartTo); +INCLUDE_ASM(s32, "code_16c8e0", FallPartTo); -INCLUDE_ASM("code_16c8e0", LandJumpPart); +INCLUDE_ASM(s32, "code_16c8e0", LandJumpPart); -INCLUDE_ASM("code_16c8e0", RunPartTo); +INCLUDE_ASM(s32, "code_16c8e0", RunPartTo); -INCLUDE_ASM("code_16c8e0", update_lerp_battle); +INCLUDE_ASM(s32, "code_16c8e0", update_lerp_battle); -INCLUDE_ASM("code_16c8e0", FlyToGoal); +INCLUDE_ASM(s32, "code_16c8e0", FlyToGoal); -INCLUDE_ASM("code_16c8e0", IdleFlyToGoal); +INCLUDE_ASM(s32, "code_16c8e0", IdleFlyToGoal); -INCLUDE_ASM("code_16c8e0", FlyPartTo); +INCLUDE_ASM(s32, "code_16c8e0", FlyPartTo); -INCLUDE_ASM("code_16c8e0", GetLastEvent); +INCLUDE_ASM(s32, "code_16c8e0", GetLastEvent); -INCLUDE_ASM("code_16c8e0", SetTargetActor); +INCLUDE_ASM(s32, "code_16c8e0", SetTargetActor); -INCLUDE_ASM("code_16c8e0", SetEnemyHP); +INCLUDE_ASM(s32, "code_16c8e0", SetEnemyHP); -INCLUDE_ASM("code_16c8e0", GetActorHP); +INCLUDE_ASM(s32, "code_16c8e0", GetActorHP); -INCLUDE_ASM("code_16c8e0", GetEnemyMaxHP); +INCLUDE_ASM(s32, "code_16c8e0", GetEnemyMaxHP); -INCLUDE_ASM("code_16c8e0", RemoveActor); +INCLUDE_ASM(s32, "code_16c8e0", RemoveActor); -INCLUDE_ASM("code_16c8e0", DropStarPoints); +INCLUDE_ASM(s32, "code_16c8e0", DropStarPoints); -INCLUDE_ASM("code_16c8e0", SetDefenseTable); +INCLUDE_ASM(s32, "code_16c8e0", SetDefenseTable); -INCLUDE_ASM("code_16c8e0", SetStatusTable); +INCLUDE_ASM(s32, "code_16c8e0", SetStatusTable); -INCLUDE_ASM("code_16c8e0", SetIdleAnimations); +INCLUDE_ASM(s32, "code_16c8e0", SetIdleAnimations); -INCLUDE_ASM("code_16c8e0", func_8027CC10); +INCLUDE_ASM(s32, "code_16c8e0", func_8027CC10); -INCLUDE_ASM("code_16c8e0", EnemyDamageTarget); +INCLUDE_ASM(s32, "code_16c8e0", EnemyDamageTarget); -INCLUDE_ASM("code_16c8e0", EnemyFollowupAfflictTarget); +INCLUDE_ASM(s32, "code_16c8e0", EnemyFollowupAfflictTarget); -INCLUDE_ASM("code_16c8e0", EnemyTestTarget); +INCLUDE_ASM(s32, "code_16c8e0", EnemyTestTarget); -INCLUDE_ASM("code_16c8e0", DispatchDamageEvent); +INCLUDE_ASM(s32, "code_16c8e0", DispatchDamageEvent); -INCLUDE_ASM("code_16c8e0", DispatchEvent); +INCLUDE_ASM(s32, "code_16c8e0", DispatchEvent); -INCLUDE_ASM("code_16c8e0", func_8027D2D8); +INCLUDE_ASM(s32, "code_16c8e0", func_8027D2D8); -INCLUDE_ASM("code_16c8e0", func_8027D32C); +INCLUDE_ASM(s32, "code_16c8e0", func_8027D32C); -INCLUDE_ASM("code_16c8e0", SetTargetOffset); +INCLUDE_ASM(s32, "code_16c8e0", SetTargetOffset); -INCLUDE_ASM("code_16c8e0", func_8027D434); +INCLUDE_ASM(s32, "code_16c8e0", func_8027D434); -INCLUDE_ASM("code_16c8e0", func_8027D4C8); +INCLUDE_ASM(s32, "code_16c8e0", func_8027D4C8); -INCLUDE_ASM("code_16c8e0", EnableActorBlur); +INCLUDE_ASM(s32, "code_16c8e0", EnableActorBlur); -INCLUDE_ASM("code_16c8e0", func_8027D628); +INCLUDE_ASM(s32, "code_16c8e0", func_8027D628); -INCLUDE_ASM("code_16c8e0", AfflictActor); +INCLUDE_ASM(s32, "code_16c8e0", AfflictActor); -INCLUDE_ASM("code_16c8e0", func_8027D75C); +INCLUDE_ASM(s32, "code_16c8e0", func_8027D75C); -INCLUDE_ASM("code_16c8e0", GetEncounterState); +INCLUDE_ASM(s32, "code_16c8e0", GetEncounterState); -INCLUDE_ASM("code_16c8e0", YieldTurn); +INCLUDE_ASM(s32, "code_16c8e0", YieldTurn); -INCLUDE_ASM("code_16c8e0", SetActorSize); +INCLUDE_ASM(s32, "code_16c8e0", SetActorSize); -INCLUDE_ASM("code_16c8e0", GetActorSize); +INCLUDE_ASM(s32, "code_16c8e0", GetActorSize); -INCLUDE_ASM("code_16c8e0", SetPartSize); +INCLUDE_ASM(s32, "code_16c8e0", SetPartSize); -INCLUDE_ASM("code_16c8e0", GetOriginalActorType); +INCLUDE_ASM(s32, "code_16c8e0", GetOriginalActorType); -INCLUDE_ASM("code_16c8e0", GetCurrentActorType); +INCLUDE_ASM(s32, "code_16c8e0", GetCurrentActorType); -INCLUDE_ASM("code_16c8e0", GetLastDamage); +INCLUDE_ASM(s32, "code_16c8e0", GetLastDamage); -INCLUDE_ASM("code_16c8e0", EnableActorGlow); +INCLUDE_ASM(s32, "code_16c8e0", EnableActorGlow); -INCLUDE_ASM("code_16c8e0", WasStatusInflicted); +INCLUDE_ASM(s32, "code_16c8e0", WasStatusInflicted); -INCLUDE_ASM("code_16c8e0", CopyStatusEffects); +INCLUDE_ASM(s32, "code_16c8e0", CopyStatusEffects); -INCLUDE_ASM("code_16c8e0", ClearStatusEffects); +INCLUDE_ASM(s32, "code_16c8e0", ClearStatusEffects); -INCLUDE_ASM("code_16c8e0", dispatch_event_partner); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_partner); -INCLUDE_ASM("code_16c8e0", dispatch_event_partner_continue_turn); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_event_partner_continue_turn); -INCLUDE_ASM("code_16c8e0", calc_partner_test_enemy); +INCLUDE_ASM(s32, "code_16c8e0", calc_partner_test_enemy); -INCLUDE_ASM("code_16c8e0", calc_partner_damage_enemy); +INCLUDE_ASM(s32, "code_16c8e0", calc_partner_damage_enemy); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_partner); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_partner); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_partner_0); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_partner_0); -INCLUDE_ASM("code_16c8e0", dispatch_damage_event_partner_1); +INCLUDE_ASM(s32, "code_16c8e0", dispatch_damage_event_partner_1); -INCLUDE_ASM("code_16c8e0", MakeOwnerTargetIndex); +INCLUDE_ASM(s32, "code_16c8e0", MakeOwnerTargetIndex); -INCLUDE_ASM("code_16c8e0", func_8027FC90); +INCLUDE_ASM(s32, "code_16c8e0", func_8027FC90); ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -1480,24 +1480,24 @@ ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_16c8e0", PartnerDamageEnemy); +INCLUDE_ASM(s32, "code_16c8e0", PartnerDamageEnemy); -INCLUDE_ASM("code_16c8e0", PartnerAfflictEnemy); +INCLUDE_ASM(s32, "code_16c8e0", PartnerAfflictEnemy); -INCLUDE_ASM("code_16c8e0", PartnerPowerBounceEnemy); +INCLUDE_ASM(s32, "code_16c8e0", PartnerPowerBounceEnemy); -INCLUDE_ASM("code_16c8e0", PartnerTestEnemy); +INCLUDE_ASM(s32, "code_16c8e0", PartnerTestEnemy); -INCLUDE_ASM("code_16c8e0", func_8028070C); +INCLUDE_ASM(s32, "code_16c8e0", func_8028070C); -INCLUDE_ASM("code_16c8e0", DeletePartner); +INCLUDE_ASM(s32, "code_16c8e0", DeletePartner); -INCLUDE_ASM("code_16c8e0", func_802807D0); +INCLUDE_ASM(s32, "code_16c8e0", func_802807D0); -INCLUDE_ASM("code_16c8e0", func_80280818); +INCLUDE_ASM(s32, "code_16c8e0", func_80280818); -INCLUDE_ASM("code_16c8e0", GetDamageIntensity); +INCLUDE_ASM(s32, "code_16c8e0", GetDamageIntensity); -INCLUDE_ASM("code_16c8e0", ActorAddMovePos); +INCLUDE_ASM(s32, "code_16c8e0", ActorAddMovePos); -INCLUDE_ASM("code_16c8e0", LoadStarPowerScript); +INCLUDE_ASM(s32, "code_16c8e0", LoadStarPowerScript); diff --git a/src/code_1a1f0_len_5390.c b/src/code_1a1f0_len_5390.c index 80d9455edd..c52544e8c3 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/code_1a1f0_len_5390.c @@ -1,24 +1,38 @@ #include "common.h" -INCLUDE_ASM("code_1a1f0_len_5390", get_defeated); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", get_defeated); -INCLUDE_ASM("code_1a1f0_len_5390", set_defeated); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", set_defeated); -INCLUDE_ASM("code_1a1f0_len_5390", func_8003EE98); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003EE98); -INCLUDE_ASM("code_1a1f0_len_5390", func_8003EECC); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003EECC); -INCLUDE_ASM("code_1a1f0_len_5390", FadeBackgroundToBlack); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", FadeBackgroundToBlack); -INCLUDE_ASM("code_1a1f0_len_5390", UnfadeBackgroundFromBlack); +ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) { + if (isInitialCall) { + script->functionTemp[0] = 25; + } -INCLUDE_ASM("code_1a1f0_len_5390", func_8003F018); + set_background_color_blend(0, 0, 0, (script->functionTemp[0] * 10) & 0xFE); + script->functionTemp[0] -= 5; -INCLUDE_ASM("code_1a1f0_len_5390", func_8003F084); + if (script->functionTemp[0] == 0) { + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} -INCLUDE_ASM("code_1a1f0_len_5390", func_8003F0C4); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F018); -INCLUDE_ASM("code_1a1f0_len_5390", func_8003F384); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F084); + +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F0C4); + +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F384); ApiStatus GetCamLookAtObjVector(ScriptInstance* script, s32 isInitialCall) { // Almost certainly a CURRENT_CAM macro @@ -29,11 +43,18 @@ ApiStatus GetCamLookAtObjVector(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM("code_1a1f0_len_5390", HasMerleeCasts); +ApiStatus HasMerleeCasts(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = 0; + if (gPlayerData.merleeCastsLeft > 0) { + script->varTable[0] = 1; + } -INCLUDE_ASM("code_1a1f0_len_5390", func_8003F414); + return ApiStatus_DONE2; +} -INCLUDE_ASM("code_1a1f0_len_5390", func_8003F4CC); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F414); + +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F4CC); INCLUDE_API_ASM("code_1a1f0_len_5390", OnDefeatEnemy); @@ -62,18 +83,18 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) { return --script->functionTemp[1] == 0; } -INCLUDE_ASM("code_1a1f0_len_5390", func_8003F7CC); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F7CC); void func_8004135C() { } -INCLUDE_ASM("code_1a1f0_len_5390", func_80041364); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_80041364); -INCLUDE_ASM("code_1a1f0_len_5390", func_80041964); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_80041964); -INCLUDE_ASM("code_1a1f0_len_5390", show_first_strike_message); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", show_first_strike_message); -INCLUDE_ASM("code_1a1f0_len_5390", func_80041F10); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_80041F10); s32 func_8004304C(void) { EncounterStatus* currentEncounter = &gCurrentEncounter; @@ -87,14 +108,14 @@ s32 func_8004304C(void) { return ret; } -INCLUDE_ASM("code_1a1f0_len_5390", func_8004309C); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8004309C); void func_800431D4() { } -INCLUDE_ASM("code_1a1f0_len_5390", func_800431DC); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_800431DC); -INCLUDE_ASM("code_1a1f0_len_5390", create_npcs); +INCLUDE_ASM(s32, "code_1a1f0_len_5390", create_npcs); void func_80044140() { } diff --git a/src/code_1b40_len_20b0.c b/src/code_1b40_len_20b0.c index 5a6d7a6b17..6222269339 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/code_1b40_len_20b0.c @@ -34,13 +34,13 @@ extern s32 D_8009A5D8; void dma_copy(void*, void*, void*); -INCLUDE_ASM("code_1b40_len_20b0", step_game_loop); +INCLUDE_ASM(s32, "code_1b40_len_20b0", step_game_loop); -INCLUDE_ASM("code_1b40_len_20b0", func_800269EC); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800269EC); -INCLUDE_ASM("code_1b40_len_20b0", gfx_draw_frame); +INCLUDE_ASM(s32, "code_1b40_len_20b0", gfx_draw_frame); -INCLUDE_ASM("code_1b40_len_20b0", load_engine_data); +INCLUDE_ASM(s32, "code_1b40_len_20b0", load_engine_data); /*void load_engine_data(void) { game_status *phi_s0; s32 i; @@ -111,13 +111,13 @@ INCLUDE_ASM("code_1b40_len_20b0", load_engine_data); set_game_mode(0); }*/ -INCLUDE_ASM("code_1b40_len_20b0", func_80027088); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027088); s32 func_80027190(void) { return D_8009A5D8; } -INCLUDE_ASM("code_1b40_len_20b0", func_800271A0); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800271A0); /*void func_800271A0(void) { Gfx *temp = D_8009A66C[0] + 1; @@ -128,16 +128,16 @@ INCLUDE_ASM("code_1b40_len_20b0", func_800271A0); gSPDisplayList(D_8009A66C[0]++, &D_00074210); }*/ -INCLUDE_ASM("code_1b40_len_20b0", func_800271FC); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800271FC); -INCLUDE_ASM("code_1b40_len_20b0", func_8002725C); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_8002725C); -INCLUDE_ASM("code_1b40_len_20b0", func_80027600); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027600); -INCLUDE_ASM("code_1b40_len_20b0", func_80027774); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027774); -INCLUDE_ASM("code_1b40_len_20b0", func_800279B4); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800279B4); -INCLUDE_ASM("code_1b40_len_20b0", func_80027BAC); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027BAC); -INCLUDE_ASM("code_1b40_len_20b0", func_80027E10); +INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027E10); diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c index 9df5e86cee..00b9c3e03f 100644 --- a/src/code_1f580_len_1940.c +++ b/src/code_1f580_len_1940.c @@ -2,9 +2,9 @@ INCLUDE_API_ASM("code_1f580_len_1940", SetEncounterStatusFlags); -INCLUDE_ASM("code_1f580_len_1940", func_800441F0); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_800441F0); -INCLUDE_ASM("code_1f580_len_1940", func_80044238); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_80044238); ApiStatus LoadDemoBattle(ScriptInstance* script, s32 isInitialCall) { load_demo_battle(get_variable(script, *script->ptrReadPos)); @@ -24,9 +24,9 @@ INCLUDE_API_ASM("code_1f580_len_1940", RemoveEncounter); INCLUDE_API_ASM("code_1f580_len_1940", GetBattleOutcome); -INCLUDE_ASM("code_1f580_len_1940", func_800445A8); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_800445A8); -INCLUDE_ASM("code_1f580_len_1940", func_800445D4); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_800445D4); ApiStatus GetOwnerEncountered(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, script->ownerActorID->encountered); @@ -35,7 +35,7 @@ ApiStatus GetOwnerEncountered(ScriptInstance* script, s32 isInitialCall) { INCLUDE_API_ASM("code_1f580_len_1940", DoNpcDefeat); -INCLUDE_ASM("code_1f580_len_1940", start_battle); +INCLUDE_ASM(s32, "code_1f580_len_1940", start_battle); ApiStatus StartBattle(ScriptInstance* script, s32 isInitialCall) { start_battle(script, -1); @@ -98,7 +98,7 @@ ApiStatus SetSelfEnemyFlags(ScriptInstance* script, s32 isInitialCall) { INCLUDE_API_ASM("code_1f580_len_1940", SetSelfEnemyFlagBits); -INCLUDE_ASM("code_1f580_len_1940", func_80045580); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_80045580); ApiStatus GetSelfNpcID(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, script->ownerActorID->npcID); @@ -109,22 +109,22 @@ INCLUDE_API_ASM("code_1f580_len_1940", ClearDefeatedEnemies); INCLUDE_API_ASM("code_1f580_len_1940", SetEnemyFlagBits); -INCLUDE_ASM("code_1f580_len_1940", func_8004572C); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_8004572C); INCLUDE_API_ASM("code_1f580_len_1940", GetSelfAnimationFromTable); -INCLUDE_ASM("code_1f580_len_1940", func_80045798); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_80045798); -INCLUDE_ASM("code_1f580_len_1940", func_800457C4); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_800457C4); -INCLUDE_ASM("code_1f580_len_1940", func_800457F8); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_800457F8); -INCLUDE_ASM("code_1f580_len_1940", func_8004580C); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_8004580C); -INCLUDE_ASM("code_1f580_len_1940", func_80045838); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_80045838); -INCLUDE_ASM("code_1f580_len_1940", func_800458CC); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_800458CC); -INCLUDE_ASM("code_1f580_len_1940", func_80045900); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_80045900); -INCLUDE_ASM("code_1f580_len_1940", func_80045A58); +INCLUDE_ASM(s32, "code_1f580_len_1940", func_80045A58); diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c index d2eceb8448..f06eaaed0f 100644 --- a/src/code_20ec0_len_5040.c +++ b/src/code_20ec0_len_5040.c @@ -1,143 +1,143 @@ #include "common.h" -INCLUDE_ASM("code_20ec0_len_5040", func_80045AC0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045AC0); -INCLUDE_ASM("code_20ec0_len_5040", func_80045B10); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045B10); -INCLUDE_ASM("code_20ec0_len_5040", func_80045B68); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045B68); -INCLUDE_ASM("code_20ec0_len_5040", func_80045BC8); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045BC8); -INCLUDE_ASM("code_20ec0_len_5040", func_80045C28); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045C28); -INCLUDE_ASM("code_20ec0_len_5040", func_80045C88); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045C88); -INCLUDE_ASM("code_20ec0_len_5040", func_80045CC4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045CC4); -INCLUDE_ASM("code_20ec0_len_5040", func_80045D00); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045D00); -INCLUDE_ASM("code_20ec0_len_5040", func_80045D7C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045D7C); -INCLUDE_ASM("code_20ec0_len_5040", func_80045E4C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045E4C); -INCLUDE_ASM("code_20ec0_len_5040", func_80045ED0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045ED0); -INCLUDE_ASM("code_20ec0_len_5040", func_80045FA4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045FA4); -INCLUDE_ASM("code_20ec0_len_5040", func_80045FB4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045FB4); -INCLUDE_ASM("code_20ec0_len_5040", func_80046030); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80046030); -INCLUDE_ASM("code_20ec0_len_5040", func_800465E0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800465E0); -INCLUDE_ASM("code_20ec0_len_5040", func_80047608); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047608); -INCLUDE_ASM("code_20ec0_len_5040", func_800476F4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800476F4); -INCLUDE_ASM("code_20ec0_len_5040", func_8004778C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004778C); -INCLUDE_ASM("code_20ec0_len_5040", func_800477F4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800477F4); -INCLUDE_ASM("code_20ec0_len_5040", func_80047820); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047820); -INCLUDE_ASM("code_20ec0_len_5040", func_80047898); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047898); -INCLUDE_ASM("code_20ec0_len_5040", func_800478F8); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800478F8); -INCLUDE_ASM("code_20ec0_len_5040", func_80047928); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047928); -INCLUDE_ASM("code_20ec0_len_5040", func_800479A0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800479A0); -INCLUDE_ASM("code_20ec0_len_5040", func_80047A00); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047A00); -INCLUDE_ASM("code_20ec0_len_5040", func_80047A30); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047A30); -INCLUDE_ASM("code_20ec0_len_5040", func_80047AA8); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047AA8); -INCLUDE_ASM("code_20ec0_len_5040", func_80047B08); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047B08); -INCLUDE_ASM("code_20ec0_len_5040", func_80047B38); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047B38); -INCLUDE_ASM("code_20ec0_len_5040", func_80047B84); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047B84); -INCLUDE_ASM("code_20ec0_len_5040", func_80047BE4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047BE4); -INCLUDE_ASM("code_20ec0_len_5040", func_80047C14); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047C14); -INCLUDE_ASM("code_20ec0_len_5040", func_80047CA4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047CA4); -INCLUDE_ASM("code_20ec0_len_5040", func_80047D00); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047D00); -INCLUDE_ASM("code_20ec0_len_5040", func_80047D30); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047D30); -INCLUDE_ASM("code_20ec0_len_5040", func_80047DC0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047DC0); -INCLUDE_ASM("code_20ec0_len_5040", func_80047E1C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047E1C); -INCLUDE_ASM("code_20ec0_len_5040", func_80047E4C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047E4C); -INCLUDE_ASM("code_20ec0_len_5040", func_80047EDC); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047EDC); -INCLUDE_ASM("code_20ec0_len_5040", func_80047F28); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047F28); -INCLUDE_ASM("code_20ec0_len_5040", func_80047F58); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047F58); -INCLUDE_ASM("code_20ec0_len_5040", func_80047FE8); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047FE8); -INCLUDE_ASM("code_20ec0_len_5040", func_80048034); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048034); -INCLUDE_ASM("code_20ec0_len_5040", func_80048064); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048064); -INCLUDE_ASM("code_20ec0_len_5040", func_800480F4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800480F4); -INCLUDE_ASM("code_20ec0_len_5040", func_80048140); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048140); -INCLUDE_ASM("code_20ec0_len_5040", func_80048170); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048170); -INCLUDE_ASM("code_20ec0_len_5040", func_80048200); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048200); -INCLUDE_ASM("code_20ec0_len_5040", func_8004824C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004824C); -INCLUDE_ASM("code_20ec0_len_5040", spawn_drops); +INCLUDE_ASM(s32, "code_20ec0_len_5040", spawn_drops); -INCLUDE_ASM("code_20ec0_len_5040", get_coin_drop_amount); +INCLUDE_ASM(s32, "code_20ec0_len_5040", get_coin_drop_amount); -INCLUDE_ASM("code_20ec0_len_5040", func_80048E34); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048E34); -INCLUDE_ASM("code_20ec0_len_5040", func_80048F0C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048F0C); -INCLUDE_ASM("code_20ec0_len_5040", is_point_within_region); +INCLUDE_ASM(s32, "code_20ec0_len_5040", is_point_within_region); -INCLUDE_ASM("code_20ec0_len_5040", func_800490B4); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800490B4); -INCLUDE_ASM("code_20ec0_len_5040", func_800493EC); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800493EC); -INCLUDE_ASM("code_20ec0_len_5040", func_800494C0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800494C0); -INCLUDE_ASM("code_20ec0_len_5040", func_80049550); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049550); -INCLUDE_ASM("code_20ec0_len_5040", func_800495A0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800495A0); -INCLUDE_ASM("code_20ec0_len_5040", func_800496B8); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800496B8); -INCLUDE_ASM("code_20ec0_len_5040", func_80049B44); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049B44); -INCLUDE_ASM("code_20ec0_len_5040", func_80049C04); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049C04); -INCLUDE_ASM("code_20ec0_len_5040", func_80049E3C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049E3C); -INCLUDE_ASM("code_20ec0_len_5040", func_80049ECC); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049ECC); -INCLUDE_ASM("code_20ec0_len_5040", func_80049F7C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80049F7C); -INCLUDE_ASM("code_20ec0_len_5040", func_8004A124); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004A124); -INCLUDE_ASM("code_20ec0_len_5040", func_8004A3E8); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004A3E8); -INCLUDE_ASM("code_20ec0_len_5040", DoBasicAI); +INCLUDE_ASM(s32, "code_20ec0_len_5040", DoBasicAI); -INCLUDE_ASM("code_20ec0_len_5040", func_8004A6F0); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004A6F0); -INCLUDE_ASM("code_20ec0_len_5040", func_8004A73C); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004A73C); -INCLUDE_ASM("code_20ec0_len_5040", func_8004A784); +INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004A784); diff --git a/src/code_25f00_len_940.c b/src/code_25f00_len_940.c index 154d2887c6..d460528198 100644 --- a/src/code_25f00_len_940.c +++ b/src/code_25f00_len_940.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM("code_25f00_len_940", func_8004AB00); +INCLUDE_ASM(s32, "code_25f00_len_940", func_8004AB00); -INCLUDE_ASM("code_25f00_len_940", func_8004ADD0); +INCLUDE_ASM(s32, "code_25f00_len_940", func_8004ADD0); -INCLUDE_ASM("code_25f00_len_940", func_8004AE08); +INCLUDE_ASM(s32, "code_25f00_len_940", func_8004AE08); -INCLUDE_ASM("code_25f00_len_940", nuAuDmaNew); +INCLUDE_ASM(s32, "code_25f00_len_940", nuAuDmaNew); -INCLUDE_ASM("code_25f00_len_940", nuAuCleanDMABuffers); +INCLUDE_ASM(s32, "code_25f00_len_940", nuAuCleanDMABuffers); -INCLUDE_ASM("code_25f00_len_940", func_8004B328); +INCLUDE_ASM(s32, "code_25f00_len_940", func_8004B328); -INCLUDE_ASM_T(void, "code_25f00_len_940", alLink, ALLink* element, ALLink* after); +INCLUDE_ASM(void, "code_25f00_len_940", alLink, ALLink* element, ALLink* after); -INCLUDE_ASM_T(void, "code_25f00_len_940", alUnlink, ALLink* element); +INCLUDE_ASM(void, "code_25f00_len_940", alUnlink, ALLink* element); diff --git a/src/code_26840_len_20d0.c b/src/code_26840_len_20d0.c index db3fd6e064..7405bce716 100644 --- a/src/code_26840_len_20d0.c +++ b/src/code_26840_len_20d0.c @@ -1,97 +1,97 @@ #include "common.h" -INCLUDE_ASM("code_26840_len_20d0", func_8004B440); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004B440); -INCLUDE_ASM("code_26840_len_20d0", func_8004B62C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004B62C); -INCLUDE_ASM("code_26840_len_20d0", func_8004B698); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004B698); -INCLUDE_ASM("code_26840_len_20d0", func_8004B6D8); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004B6D8); -INCLUDE_ASM("code_26840_len_20d0", func_8004B748); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004B748); -INCLUDE_ASM("code_26840_len_20d0", func_8004B9E4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004B9E4); -INCLUDE_ASM("code_26840_len_20d0", func_8004BA54); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004BA54); -INCLUDE_ASM("code_26840_len_20d0", func_8004BA74); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004BA74); -INCLUDE_ASM("code_26840_len_20d0", func_8004C0E4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C0E4); -INCLUDE_ASM("code_26840_len_20d0", func_8004C268); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C268); -INCLUDE_ASM("code_26840_len_20d0", func_8004C2A4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C2A4); -INCLUDE_ASM("code_26840_len_20d0", func_8004C300); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C300); -INCLUDE_ASM("code_26840_len_20d0", func_8004C358); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C358); -INCLUDE_ASM("code_26840_len_20d0", func_8004C3D4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C3D4); -INCLUDE_ASM("code_26840_len_20d0", func_8004C444); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C444); -INCLUDE_ASM("code_26840_len_20d0", func_8004C578); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C578); -INCLUDE_ASM("code_26840_len_20d0", func_8004C844); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C844); -INCLUDE_ASM("code_26840_len_20d0", func_8004C884); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C884); -INCLUDE_ASM("code_26840_len_20d0", func_8004CD94); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CD94); -INCLUDE_ASM("code_26840_len_20d0", func_8004CDF8); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CDF8); -INCLUDE_ASM("code_26840_len_20d0", func_8004CE70); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CE70); -INCLUDE_ASM("code_26840_len_20d0", func_8004CEA4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CEA4); -INCLUDE_ASM("code_26840_len_20d0", func_8004CEC4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CEC4); -INCLUDE_ASM("code_26840_len_20d0", func_8004CF0C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CF0C); -INCLUDE_ASM("code_26840_len_20d0", func_8004CF3C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CF3C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D00C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D00C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D038); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D038); -INCLUDE_ASM("code_26840_len_20d0", func_8004D050); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D050); -INCLUDE_ASM("code_26840_len_20d0", func_8004D07C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D07C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D114); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D114); -INCLUDE_ASM("code_26840_len_20d0", func_8004D130); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D130); -INCLUDE_ASM("code_26840_len_20d0", func_8004D15C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D15C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D180); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D180); -INCLUDE_ASM("code_26840_len_20d0", func_8004D1B4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D1B4); -INCLUDE_ASM("code_26840_len_20d0", func_8004D23C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D23C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D2B0); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D2B0); -INCLUDE_ASM("code_26840_len_20d0", func_8004D2E4); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D2E4); -INCLUDE_ASM("code_26840_len_20d0", func_8004D310); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D310); -INCLUDE_ASM("code_26840_len_20d0", func_8004D31C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D31C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D324); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D324); -INCLUDE_ASM("code_26840_len_20d0", func_8004D33C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D33C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D354); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D354); -INCLUDE_ASM("code_26840_len_20d0", func_8004D36C); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D36C); -INCLUDE_ASM("code_26840_len_20d0", func_8004D3A0); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D3A0); -INCLUDE_ASM("code_26840_len_20d0", func_8004D3F8); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D3F8); -INCLUDE_ASM("code_26840_len_20d0", func_8004D428); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D428); -INCLUDE_ASM("code_26840_len_20d0", func_8004D484); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D484); -INCLUDE_ASM("code_26840_len_20d0", func_8004D4BC); +INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D4BC); diff --git a/src/code_28910_len_5090.c b/src/code_28910_len_5090.c index 4b2a283747..d5cbd602d1 100644 --- a/src/code_28910_len_5090.c +++ b/src/code_28910_len_5090.c @@ -1,177 +1,177 @@ #include "common.h" -INCLUDE_ASM("code_28910_len_5090", func_8004D510); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D510); -INCLUDE_ASM("code_28910_len_5090", func_8004D794); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D794); -INCLUDE_ASM("code_28910_len_5090", func_8004D7E0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D7E0); -INCLUDE_ASM("code_28910_len_5090", func_8004DA0C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA0C); -INCLUDE_ASM("code_28910_len_5090", func_8004DA74); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA74); -INCLUDE_ASM("code_28910_len_5090", func_8004DAA8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DAA8); -INCLUDE_ASM("code_28910_len_5090", func_8004DAE0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DAE0); -INCLUDE_ASM("code_28910_len_5090", func_8004DB28); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DB28); -INCLUDE_ASM("code_28910_len_5090", func_8004DB4C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DB4C); -INCLUDE_ASM("code_28910_len_5090", func_8004DC80); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DC80); -INCLUDE_ASM("code_28910_len_5090", func_8004DCB8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DCB8); -INCLUDE_ASM("code_28910_len_5090", func_8004DE2C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DE2C); -INCLUDE_ASM("code_28910_len_5090", func_8004DFD4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DFD4); -INCLUDE_ASM("code_28910_len_5090", func_8004E0F4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E0F4); -INCLUDE_ASM("code_28910_len_5090", func_8004E158); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E158); -INCLUDE_ASM("code_28910_len_5090", func_8004E344); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E344); -INCLUDE_ASM("code_28910_len_5090", func_8004E3A4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E3A4); -INCLUDE_ASM("code_28910_len_5090", func_8004E444); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E444); -INCLUDE_ASM("code_28910_len_5090", func_8004E4B8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E4B8); -INCLUDE_ASM("code_28910_len_5090", func_8004E5D8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E5D8); -INCLUDE_ASM("code_28910_len_5090", func_8004E844); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E844); -INCLUDE_ASM("code_28910_len_5090", func_8004E880); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E880); -INCLUDE_ASM("code_28910_len_5090", func_8004E904); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E904); -INCLUDE_ASM("code_28910_len_5090", func_8004EA34); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EA34); -INCLUDE_ASM("code_28910_len_5090", func_8004EAD4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EAD4); -INCLUDE_ASM("code_28910_len_5090", func_8004EC04); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC04); -INCLUDE_ASM("code_28910_len_5090", func_8004EC68); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC68); -INCLUDE_ASM("code_28910_len_5090", func_8004FBBC); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FBBC); -INCLUDE_ASM("code_28910_len_5090", func_8004FC08); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FC08); -INCLUDE_ASM("code_28910_len_5090", func_8004FCB4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FCB4); -INCLUDE_ASM("code_28910_len_5090", func_8004FCE4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FCE4); -INCLUDE_ASM("code_28910_len_5090", func_8004FD04); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FD04); -INCLUDE_ASM("code_28910_len_5090", func_8004FD38); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FD38); -INCLUDE_ASM("code_28910_len_5090", func_8004FD94); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FD94); -INCLUDE_ASM("code_28910_len_5090", func_8004FE10); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FE10); -INCLUDE_ASM("code_28910_len_5090", func_8004FE6C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FE6C); -INCLUDE_ASM("code_28910_len_5090", func_8004FEB0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FEB0); -INCLUDE_ASM("code_28910_len_5090", func_8004FED0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FED0); -INCLUDE_ASM("code_28910_len_5090", func_8004FF3C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FF3C); -INCLUDE_ASM("code_28910_len_5090", func_8004FF58); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FF58); -INCLUDE_ASM("code_28910_len_5090", func_8004FF70); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FF70); -INCLUDE_ASM("code_28910_len_5090", func_8004FF88); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FF88); -INCLUDE_ASM("code_28910_len_5090", func_8004FFA8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FFA8); -INCLUDE_ASM("code_28910_len_5090", func_8004FFB4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FFB4); -INCLUDE_ASM("code_28910_len_5090", func_8004FFC8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FFC8); -INCLUDE_ASM("code_28910_len_5090", func_8004FFE4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FFE4); -INCLUDE_ASM("code_28910_len_5090", func_8004FFF0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FFF0); -INCLUDE_ASM("code_28910_len_5090", func_8004FFFC); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8004FFFC); -INCLUDE_ASM("code_28910_len_5090", func_80050004); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050004); -INCLUDE_ASM("code_28910_len_5090", func_80050020); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050020); -INCLUDE_ASM("code_28910_len_5090", func_80050128); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050128); -INCLUDE_ASM("code_28910_len_5090", func_8005015C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8005015C); -INCLUDE_ASM("code_28910_len_5090", func_80050184); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050184); -INCLUDE_ASM("code_28910_len_5090", func_800501A8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800501A8); -INCLUDE_ASM("code_28910_len_5090", func_800502F0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800502F0); -INCLUDE_ASM("code_28910_len_5090", func_80050560); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050560); -INCLUDE_ASM("code_28910_len_5090", func_80050568); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050568); -INCLUDE_ASM("code_28910_len_5090", func_800505E4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800505E4); -INCLUDE_ASM("code_28910_len_5090", func_80050654); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050654); -INCLUDE_ASM("code_28910_len_5090", func_8005068C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8005068C); -INCLUDE_ASM("code_28910_len_5090", func_800506C8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800506C8); -INCLUDE_ASM("code_28910_len_5090", func_80050770); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050770); -INCLUDE_ASM("code_28910_len_5090", func_80050818); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050818); -INCLUDE_ASM("code_28910_len_5090", func_8005083C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8005083C); -INCLUDE_ASM("code_28910_len_5090", func_8005087C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8005087C); -INCLUDE_ASM("code_28910_len_5090", func_80050888); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050888); -INCLUDE_ASM("code_28910_len_5090", func_80050900); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050900); -INCLUDE_ASM("code_28910_len_5090", func_80050970); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050970); -INCLUDE_ASM("code_28910_len_5090", func_80050B90); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050B90); -INCLUDE_ASM("code_28910_len_5090", func_80050C30); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050C30); -INCLUDE_ASM("code_28910_len_5090", func_80050C54); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050C54); -INCLUDE_ASM("code_28910_len_5090", func_80050C64); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050C64); -INCLUDE_ASM("code_28910_len_5090", func_80050CA0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050CA0); -INCLUDE_ASM("code_28910_len_5090", func_80050D50); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050D50); -INCLUDE_ASM("code_28910_len_5090", func_80050E18); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050E18); -INCLUDE_ASM("code_28910_len_5090", func_80050E84); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050E84); -INCLUDE_ASM("code_28910_len_5090", func_80050EF0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050EF0); -INCLUDE_ASM("code_28910_len_5090", func_80050F64); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050F64); -INCLUDE_ASM("code_28910_len_5090", func_80050FD0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80050FD0); -INCLUDE_ASM("code_28910_len_5090", func_80051050); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80051050); -INCLUDE_ASM("code_28910_len_5090", func_800510A4); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800510A4); -INCLUDE_ASM("code_28910_len_5090", func_800511BC); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800511BC); -INCLUDE_ASM("code_28910_len_5090", func_80051334); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80051334); -INCLUDE_ASM("code_28910_len_5090", func_80051434); +INCLUDE_ASM(s32, "code_28910_len_5090", func_80051434); -INCLUDE_ASM("code_28910_len_5090", func_800521D0); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800521D0); -INCLUDE_ASM("code_28910_len_5090", func_800521E8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800521E8); -INCLUDE_ASM("code_28910_len_5090", func_800522A8); +INCLUDE_ASM(s32, "code_28910_len_5090", func_800522A8); -INCLUDE_ASM("code_28910_len_5090", func_8005232C); +INCLUDE_ASM(s32, "code_28910_len_5090", func_8005232C); diff --git a/src/code_2d9a0_len_890.c b/src/code_2d9a0_len_890.c index a0cae16c7c..168ab886c9 100644 --- a/src/code_2d9a0_len_890.c +++ b/src/code_2d9a0_len_890.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM("code_2d9a0_len_890", func_800525A0); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_800525A0); -INCLUDE_ASM("code_2d9a0_len_890", func_80052614); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052614); -INCLUDE_ASM("code_2d9a0_len_890", func_80052660); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052660); -INCLUDE_ASM("code_2d9a0_len_890", func_80052B44); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052B44); -INCLUDE_ASM("code_2d9a0_len_890", func_80052BC0); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052BC0); -INCLUDE_ASM("code_2d9a0_len_890", func_80052BF8); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052BF8); -INCLUDE_ASM("code_2d9a0_len_890", func_80052CFC); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052CFC); -INCLUDE_ASM("code_2d9a0_len_890", func_80052E18); +INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052E18); diff --git a/src/code_2e230_len_2190.c b/src/code_2e230_len_2190.c index 0dec86d1a9..7716dc523f 100644 --- a/src/code_2e230_len_2190.c +++ b/src/code_2e230_len_2190.c @@ -1,91 +1,91 @@ #include "common.h" -INCLUDE_ASM("code_2e230_len_2190", func_80052E30); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80052E30); -INCLUDE_ASM("code_2e230_len_2190", func_80052E5C); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80052E5C); -INCLUDE_ASM("code_2e230_len_2190", func_800532F4); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_800532F4); -INCLUDE_ASM("code_2e230_len_2190", func_80053370); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053370); -INCLUDE_ASM("code_2e230_len_2190", func_800533A8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_800533A8); -INCLUDE_ASM("code_2e230_len_2190", func_800533D0); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_800533D0); -INCLUDE_ASM("code_2e230_len_2190", func_800535C0); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_800535C0); -INCLUDE_ASM("code_2e230_len_2190", func_80053654); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053654); -INCLUDE_ASM("code_2e230_len_2190", func_80053888); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053888); -INCLUDE_ASM("code_2e230_len_2190", func_800538C4); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_800538C4); -INCLUDE_ASM("code_2e230_len_2190", func_800538F8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_800538F8); -INCLUDE_ASM("code_2e230_len_2190", func_80053974); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053974); -INCLUDE_ASM("code_2e230_len_2190", func_80053A18); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053A18); -INCLUDE_ASM("code_2e230_len_2190", func_80053A28); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053A28); -INCLUDE_ASM("code_2e230_len_2190", func_80053A98); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053A98); -INCLUDE_ASM("code_2e230_len_2190", func_80053AC8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053AC8); -INCLUDE_ASM("code_2e230_len_2190", func_80053AEC); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053AEC); -INCLUDE_ASM("code_2e230_len_2190", func_80053B04); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053B04); -INCLUDE_ASM("code_2e230_len_2190", func_80053BA8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053BA8); -INCLUDE_ASM("code_2e230_len_2190", func_80053BE8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053BE8); -INCLUDE_ASM("code_2e230_len_2190", func_80053C58); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053C58); -INCLUDE_ASM("code_2e230_len_2190", func_80053CB4); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053CB4); -INCLUDE_ASM("code_2e230_len_2190", func_80053CF8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053CF8); -INCLUDE_ASM("code_2e230_len_2190", func_80053E58); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053E58); -INCLUDE_ASM("code_2e230_len_2190", func_80053F64); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053F64); -INCLUDE_ASM("code_2e230_len_2190", func_80053F80); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053F80); -INCLUDE_ASM("code_2e230_len_2190", func_80054248); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054248); -INCLUDE_ASM("code_2e230_len_2190", al_LoadINIT); +INCLUDE_ASM(s32, "code_2e230_len_2190", al_LoadINIT); -INCLUDE_ASM("code_2e230_len_2190", al_CopyFileTableEntry); +INCLUDE_ASM(s32, "code_2e230_len_2190", al_CopyFileTableEntry); -INCLUDE_ASM("code_2e230_len_2190", al_LoadPER); +INCLUDE_ASM(s32, "code_2e230_len_2190", al_LoadPER); -INCLUDE_ASM("code_2e230_len_2190", al_LoadPRG); +INCLUDE_ASM(s32, "code_2e230_len_2190", al_LoadPRG); -INCLUDE_ASM("code_2e230_len_2190", func_8005465C); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_8005465C); -INCLUDE_ASM("code_2e230_len_2190", func_80054744); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054744); -INCLUDE_ASM("code_2e230_len_2190", al_LoadBank); +INCLUDE_ASM(s32, "code_2e230_len_2190", al_LoadBank); -INCLUDE_ASM("code_2e230_len_2190", func_800549F8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_800549F8); -INCLUDE_ASM("code_2e230_len_2190", func_80054AA0); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054AA0); -INCLUDE_ASM("code_2e230_len_2190", func_80054C4C); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054C4C); -INCLUDE_ASM("code_2e230_len_2190", func_80054C84); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054C84); -INCLUDE_ASM("code_2e230_len_2190", func_80054CE0); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054CE0); -INCLUDE_ASM("code_2e230_len_2190", func_80054D74); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054D74); -INCLUDE_ASM("code_2e230_len_2190", func_80054DA8); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054DA8); -INCLUDE_ASM("code_2e230_len_2190", al_DmaCopy); +INCLUDE_ASM(s32, "code_2e230_len_2190", al_DmaCopy); -INCLUDE_ASM("code_2e230_len_2190", func_80054E90); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054E90); -INCLUDE_ASM("code_2e230_len_2190", func_80054F48); +INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054F48); -INCLUDE_ASM("code_2e230_len_2190", al_CopyWords); +INCLUDE_ASM(s32, "code_2e230_len_2190", al_CopyWords); diff --git a/src/code_303c0_len_3e10.c b/src/code_303c0_len_3e10.c index 3f848999a5..d0fef616f3 100644 --- a/src/code_303c0_len_3e10.c +++ b/src/code_303c0_len_3e10.c @@ -1,224 +1,224 @@ #include "common.h" -INCLUDE_ASM("code_303c0_len_3e10", al_LoadBKHeaders); +INCLUDE_ASM(s32, "code_303c0_len_3e10", al_LoadBKHeaders); -INCLUDE_ASM("code_303c0_len_3e10", func_80055050); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055050); -INCLUDE_ASM("code_303c0_len_3e10", func_80055068); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055068); -INCLUDE_ASM("code_303c0_len_3e10", func_80055110); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055110); -INCLUDE_ASM("code_303c0_len_3e10", func_8005513C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005513C); -INCLUDE_ASM("code_303c0_len_3e10", func_800551E0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800551E0); -INCLUDE_ASM("code_303c0_len_3e10", func_80055240); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055240); -INCLUDE_ASM("code_303c0_len_3e10", func_800552D0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800552D0); -INCLUDE_ASM("code_303c0_len_3e10", func_80055330); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055330); -INCLUDE_ASM("code_303c0_len_3e10", func_800553C0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800553C0); -INCLUDE_ASM("code_303c0_len_3e10", func_800553F4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800553F4); -INCLUDE_ASM("code_303c0_len_3e10", func_80055408); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055408); -INCLUDE_ASM_T(s32, "code_303c0_len_3e10", func_80055448, s32 arg0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055448, s32 arg0); -INCLUDE_ASM_T(s32, "code_303c0_len_3e10", func_80055464, s32 arg0, s32 arg1); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055464, s32 arg0, s32 arg1); -INCLUDE_ASM_T(s32, "code_303c0_len_3e10", func_800554A4, s32 arg0, s32 arg1); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800554A4, s32 arg0, s32 arg1); -INCLUDE_ASM_T(s32, "code_303c0_len_3e10", func_800554E8, s32 arg0, s32 arg1); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800554E8, s32 arg0, s32 arg1); -INCLUDE_ASM("code_303c0_len_3e10", func_8005553C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005553C); -INCLUDE_ASM("code_303c0_len_3e10", func_80055590); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055590); -INCLUDE_ASM_T(s32, "code_303c0_len_3e10", func_800555E4, s32 arg0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800555E4, s32 arg0); -INCLUDE_ASM("code_303c0_len_3e10", func_80055618); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055618); -INCLUDE_ASM("code_303c0_len_3e10", func_8005566C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005566C); -INCLUDE_ASM("code_303c0_len_3e10", func_800556D0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800556D0); -INCLUDE_ASM("code_303c0_len_3e10", func_80055718); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055718); -INCLUDE_ASM("code_303c0_len_3e10", func_80055760); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055760); -INCLUDE_ASM("code_303c0_len_3e10", func_800557CC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800557CC); -INCLUDE_ASM("code_303c0_len_3e10", func_80055848); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055848); -INCLUDE_ASM("code_303c0_len_3e10", func_800558D4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800558D4); -INCLUDE_ASM("code_303c0_len_3e10", func_8005591C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005591C); -INCLUDE_ASM("code_303c0_len_3e10", func_80055970); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055970); -INCLUDE_ASM("code_303c0_len_3e10", func_800559C4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800559C4); -INCLUDE_ASM("code_303c0_len_3e10", func_800559E0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800559E0); -INCLUDE_ASM("code_303c0_len_3e10", func_800559FC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800559FC); -INCLUDE_ASM("code_303c0_len_3e10", func_80055A18); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055A18); -INCLUDE_ASM("code_303c0_len_3e10", func_80055A6C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055A6C); -INCLUDE_ASM("code_303c0_len_3e10", func_80055ABC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055ABC); -INCLUDE_ASM("code_303c0_len_3e10", func_80055AF0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055AF0); -INCLUDE_ASM("code_303c0_len_3e10", func_80055B28); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055B28); -INCLUDE_ASM("code_303c0_len_3e10", func_80055B80); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055B80); -INCLUDE_ASM("code_303c0_len_3e10", func_80055BB8); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055BB8); -INCLUDE_ASM("code_303c0_len_3e10", func_80055BF0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055BF0); -INCLUDE_ASM("code_303c0_len_3e10", func_80055C2C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055C2C); -INCLUDE_ASM("code_303c0_len_3e10", func_80055C64); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055C64); -INCLUDE_ASM("code_303c0_len_3e10", func_80055C94); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055C94); -INCLUDE_ASM("code_303c0_len_3e10", func_80055CC4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055CC4); -INCLUDE_ASM("code_303c0_len_3e10", func_80055CE8); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055CE8); -INCLUDE_ASM("code_303c0_len_3e10", func_80055D38); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055D38); -INCLUDE_ASM("code_303c0_len_3e10", func_80055D8C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055D8C); -INCLUDE_ASM("code_303c0_len_3e10", func_80055DDC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055DDC); -INCLUDE_ASM("code_303c0_len_3e10", func_80055E48); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055E48); -INCLUDE_ASM("code_303c0_len_3e10", func_80055EB4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055EB4); -INCLUDE_ASM("code_303c0_len_3e10", func_80055F58); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055F58); -INCLUDE_ASM("code_303c0_len_3e10", func_80055FD4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055FD4); -INCLUDE_ASM("code_303c0_len_3e10", func_80055FF0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80055FF0); -INCLUDE_ASM("code_303c0_len_3e10", func_8005600C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005600C); -INCLUDE_ASM("code_303c0_len_3e10", func_80056028); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056028); -INCLUDE_ASM("code_303c0_len_3e10", func_80056044); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056044); -INCLUDE_ASM("code_303c0_len_3e10", func_80056068); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056068); -INCLUDE_ASM("code_303c0_len_3e10", func_8005608C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005608C); -INCLUDE_ASM("code_303c0_len_3e10", func_800560A8); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800560A8); -INCLUDE_ASM("code_303c0_len_3e10", func_800560BC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800560BC); -INCLUDE_ASM("code_303c0_len_3e10", func_8005610C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005610C); -INCLUDE_ASM("code_303c0_len_3e10", func_80056144); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056144); -INCLUDE_ASM("code_303c0_len_3e10", func_8005615C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005615C); -INCLUDE_ASM("code_303c0_len_3e10", func_80056180); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056180); -INCLUDE_ASM("code_303c0_len_3e10", func_800561A4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800561A4); -INCLUDE_ASM("code_303c0_len_3e10", func_800561C4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800561C4); -INCLUDE_ASM("code_303c0_len_3e10", func_800561E4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800561E4); -INCLUDE_ASM("code_303c0_len_3e10", func_80056204); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056204); -INCLUDE_ASM("code_303c0_len_3e10", func_80056228); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056228); -INCLUDE_ASM("code_303c0_len_3e10", func_80056250); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056250); -INCLUDE_ASM("code_303c0_len_3e10", func_800565A4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800565A4); -INCLUDE_ASM_T(Acmd*, "code_303c0_len_3e10", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen); +INCLUDE_ASM(Acmd*, "code_303c0_len_3e10", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen); -INCLUDE_ASM("code_303c0_len_3e10", func_80056D34); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056D34); -INCLUDE_ASM("code_303c0_len_3e10", func_80056D44); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056D44); -INCLUDE_ASM("code_303c0_len_3e10", func_80056D50); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056D50); -INCLUDE_ASM("code_303c0_len_3e10", func_80056D5C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056D5C); -INCLUDE_ASM("code_303c0_len_3e10", func_80056D78); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056D78); -INCLUDE_ASM("code_303c0_len_3e10", func_80056DA4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056DA4); -INCLUDE_ASM("code_303c0_len_3e10", func_80056DCC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056DCC); -INCLUDE_ASM("code_303c0_len_3e10", func_80056E34); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056E34); -INCLUDE_ASM("code_303c0_len_3e10", func_80056EC0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056EC0); -INCLUDE_ASM("code_303c0_len_3e10", func_80056EE8); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056EE8); -INCLUDE_ASM("code_303c0_len_3e10", func_80056F78); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056F78); -INCLUDE_ASM("code_303c0_len_3e10", func_80056FA4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80056FA4); -INCLUDE_ASM("code_303c0_len_3e10", func_80057224); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057224); -INCLUDE_ASM("code_303c0_len_3e10", func_80057344); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057344); -INCLUDE_ASM("code_303c0_len_3e10", func_8005736C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_8005736C); -INCLUDE_ASM("code_303c0_len_3e10", func_80057548); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057548); -INCLUDE_ASM("code_303c0_len_3e10", func_800576EC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800576EC); -INCLUDE_ASM("code_303c0_len_3e10", func_80057874); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057874); -INCLUDE_ASM("code_303c0_len_3e10", func_800579D8); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_800579D8); -INCLUDE_ASM("code_303c0_len_3e10", func_80057B64); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057B64); -INCLUDE_ASM("code_303c0_len_3e10", func_80057B8C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057B8C); -INCLUDE_ASM("code_303c0_len_3e10", func_80057BB4); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057BB4); -INCLUDE_ASM("code_303c0_len_3e10", func_80057BDC); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057BDC); -INCLUDE_ASM("code_303c0_len_3e10", func_80057C04); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057C04); -INCLUDE_ASM("code_303c0_len_3e10", func_80057C2C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057C2C); -INCLUDE_ASM("code_303c0_len_3e10", func_80057C54); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057C54); -INCLUDE_ASM("code_303c0_len_3e10", func_80057D0C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057D0C); -INCLUDE_ASM("code_303c0_len_3e10", func_80057DC8); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057DC8); -INCLUDE_ASM("code_303c0_len_3e10", func_80057E08); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057E08); -INCLUDE_ASM("code_303c0_len_3e10", func_80057E5C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057E5C); -INCLUDE_ASM("code_303c0_len_3e10", func_80057EB0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057EB0); -INCLUDE_ASM("code_303c0_len_3e10", func_80057ED0); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057ED0); -INCLUDE_ASM("code_303c0_len_3e10", func_80057F20); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057F20); #undef alHeapAlloc -INCLUDE_ASM_T(void, "code_303c0_len_3e10", alHeapAlloc, u8* file, s32 line, ALHeap* hp, s32 num, s32 size); +INCLUDE_ASM(void, "code_303c0_len_3e10", alHeapAlloc, u8* file, s32 line, ALHeap* hp, s32 num, s32 size); -INCLUDE_ASM("code_303c0_len_3e10", func_80057FD8); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80057FD8); -INCLUDE_ASM("code_303c0_len_3e10", func_80058004); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80058004); -INCLUDE_ASM("code_303c0_len_3e10", func_80058050); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80058050); -INCLUDE_ASM("code_303c0_len_3e10", func_80058B20); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80058B20); -INCLUDE_ASM("code_303c0_len_3e10", func_80058C6C); +INCLUDE_ASM(s32, "code_303c0_len_3e10", func_80058C6C); diff --git a/src/code_3169f0.c b/src/code_3169f0.c index b05cee9a3c..d55e7653c6 100644 --- a/src/code_3169f0.c +++ b/src/code_3169f0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("code_3169f0", func_80200000); +INCLUDE_ASM(s32, "code_3169f0", func_80200000); diff --git a/src/code_316a70.c b/src/code_316a70.c index f107acf3da..c2fdcc5e33 100644 --- a/src/code_316a70.c +++ b/src/code_316a70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("code_316a70", func_80200080); +INCLUDE_ASM(s32, "code_316a70", func_80200080); diff --git a/src/code_316d90.c b/src/code_316d90.c index eb1ab6a230..110e9772b3 100644 --- a/src/code_316d90.c +++ b/src/code_316d90.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("code_316d90", func_802AE000); +INCLUDE_ASM(s32, "code_316d90", func_802AE000); diff --git a/src/code_341d0_len_20d0.c b/src/code_341d0_len_20d0.c index 6e8c0ee741..ceae8aaa1c 100644 --- a/src/code_341d0_len_20d0.c +++ b/src/code_341d0_len_20d0.c @@ -1,55 +1,55 @@ #include "common.h" -INCLUDE_ASM("code_341d0_len_20d0", func_80058DD0); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0); -INCLUDE_ASM("code_341d0_len_20d0", func_80058E84); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84); -INCLUDE_ASM("code_341d0_len_20d0", func_80058F88); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058F88); -INCLUDE_ASM("code_341d0_len_20d0", func_80059008); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059008); -INCLUDE_ASM("code_341d0_len_20d0", func_8005904C); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005904C); -INCLUDE_ASM("code_341d0_len_20d0", func_80059310); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059310); -INCLUDE_ASM("code_341d0_len_20d0", func_800598A0); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_800598A0); -INCLUDE_ASM("code_341d0_len_20d0", func_80059AB8); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8); -INCLUDE_ASM("code_341d0_len_20d0", func_80059BD4); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4); -INCLUDE_ASM("code_341d0_len_20d0", func_80059C80); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C80); -INCLUDE_ASM("code_341d0_len_20d0", func_80059C88); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88); -INCLUDE_ASM("code_341d0_len_20d0", func_80059C9C); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C); -INCLUDE_ASM("code_341d0_len_20d0", func_80059D48); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D48); -INCLUDE_ASM("code_341d0_len_20d0", func_80059D50); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50); -INCLUDE_ASM("code_341d0_len_20d0", render_effects); +INCLUDE_ASM(s32, "code_341d0_len_20d0", render_effects); -INCLUDE_ASM("code_341d0_len_20d0", func_80059F94); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059F94); -INCLUDE_ASM("code_341d0_len_20d0", func_8005A2BC); +INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005A2BC); -INCLUDE_ASM("code_341d0_len_20d0", remove_effect); +INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_effect); -INCLUDE_ASM("code_341d0_len_20d0", remove_all_effects); +INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects); -INCLUDE_ASM("code_341d0_len_20d0", play_effect); +INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect); -INCLUDE_ASM("code_341d0_len_20d0", load_map_script_lib); +INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_script_lib); -INCLUDE_ASM("code_341d0_len_20d0", load_map_by_IDs); +INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs); -INCLUDE_ASM("code_341d0_len_20d0", get_current_map_config); +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config); -INCLUDE_ASM("code_341d0_len_20d0", get_current_map_header); +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_header); -INCLUDE_ASM("code_341d0_len_20d0", get_map_IDs_by_name); +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name); -INCLUDE_ASM_T(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize); +INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize); -INCLUDE_ASM("code_341d0_len_20d0", get_asset_offset); +INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset); diff --git a/src/code_362a0_len_2f70.c b/src/code_362a0_len_2f70.c index db7a087b99..5182848aca 100644 --- a/src/code_362a0_len_2f70.c +++ b/src/code_362a0_len_2f70.c @@ -1,51 +1,51 @@ #include "common.h" -INCLUDE_ASM("code_362a0_len_2f70", allocate_hit_tables); +INCLUDE_ASM(s32, "code_362a0_len_2f70", allocate_hit_tables); -INCLUDE_ASM("code_362a0_len_2f70", func_8005AF84); +INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005AF84); -INCLUDE_ASM("code_362a0_len_2f70", func_8005AF8C); +INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005AF8C); -INCLUDE_ASM("code_362a0_len_2f70", initialize_collision); +INCLUDE_ASM(s32, "code_362a0_len_2f70", initialize_collision); -INCLUDE_ASM("code_362a0_len_2f70", load_hit_asset); +INCLUDE_ASM(s32, "code_362a0_len_2f70", load_hit_asset); -INCLUDE_ASM("code_362a0_len_2f70", load_collision); +INCLUDE_ASM(s32, "code_362a0_len_2f70", load_collision); -INCLUDE_ASM("code_362a0_len_2f70", load_stage_collision); +INCLUDE_ASM(s32, "code_362a0_len_2f70", load_stage_collision); -INCLUDE_ASM("code_362a0_len_2f70", load_hit_data); +INCLUDE_ASM(s32, "code_362a0_len_2f70", load_hit_data); -INCLUDE_ASM("code_362a0_len_2f70", parent_collider_to_model); +INCLUDE_ASM(void, "code_362a0_len_2f70", parent_collider_to_model, s32 colliderID, s16 modelIndex); -INCLUDE_ASM("code_362a0_len_2f70", _add_hit_vert_to_buffer); +INCLUDE_ASM(s32, "code_362a0_len_2f70", _add_hit_vert_to_buffer); -INCLUDE_ASM("code_362a0_len_2f70", _get_hit_vert_index_from_buffer); +INCLUDE_ASM(s32, "code_362a0_len_2f70", _get_hit_vert_index_from_buffer); -INCLUDE_ASM_T(void, "code_362a0_len_2f70", update_collider_transform, s16 colliderID); +INCLUDE_ASM(void, "code_362a0_len_2f70", update_collider_transform, s16 colliderID); -INCLUDE_ASM("code_362a0_len_2f70", get_collider_type_by_id); +INCLUDE_ASM(s32, "code_362a0_len_2f70", get_collider_type_by_id); -INCLUDE_ASM("code_362a0_len_2f70", func_8005BDD8); +INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005BDD8); -INCLUDE_ASM_T(void, "code_362a0_len_2f70", get_collider_center, s32 colliderID, f32* x, f32* y, f32* z); +INCLUDE_ASM(void, "code_362a0_len_2f70", get_collider_center, s32 colliderID, f32* x, f32* y, f32* z); -INCLUDE_ASM("code_362a0_len_2f70", test_ray_triangle_general); +INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_triangle_general); -INCLUDE_ASM("code_362a0_len_2f70", test_down_ray_triangle); +INCLUDE_ASM(s32, "code_362a0_len_2f70", test_down_ray_triangle); -INCLUDE_ASM("code_362a0_len_2f70", test_up_ray_triangle); +INCLUDE_ASM(s32, "code_362a0_len_2f70", test_up_ray_triangle); -INCLUDE_ASM("code_362a0_len_2f70", test_ray_colliders); +INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_colliders); -INCLUDE_ASM("code_362a0_len_2f70", test_ray_zones); +INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_zones); -INCLUDE_ASM("code_362a0_len_2f70", test_up_ray_collider); +INCLUDE_ASM(s32, "code_362a0_len_2f70", test_up_ray_collider); -INCLUDE_ASM("code_362a0_len_2f70", test_ray_entities); +INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_entities); -INCLUDE_ASM("code_362a0_len_2f70", func_8005DB00); +INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005DB00); -INCLUDE_ASM("code_362a0_len_2f70", func_8005DD54); +INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005DD54); -INCLUDE_ASM("code_362a0_len_2f70", func_8005DDF0); +INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005DDF0); diff --git a/src/code_39210_len_aa0.c b/src/code_39210_len_aa0.c index db1db482f1..6b22aa4441 100644 --- a/src/code_39210_len_aa0.c +++ b/src/code_39210_len_aa0.c @@ -28,8 +28,8 @@ void get_npc_pos(s32 arg0, f32* outX, f32* outY, f32* outZ, s32* arg4) { } } -INCLUDE_ASM("code_39210_len_aa0", func_8005DECC); +INCLUDE_ASM(s32, "code_39210_len_aa0", func_8005DECC); -INCLUDE_ASM("code_39210_len_aa0", func_8005DFD4); +INCLUDE_ASM(s32, "code_39210_len_aa0", func_8005DFD4); -INCLUDE_ASM("code_39210_len_aa0", func_8005E12C); +INCLUDE_ASM(s32, "code_39210_len_aa0", func_8005E12C); diff --git a/src/code_3bf0_len_6f0.c b/src/code_3bf0_len_6f0.c index ac393025ff..3d7b58373e 100644 --- a/src/code_3bf0_len_6f0.c +++ b/src/code_3bf0_len_6f0.c @@ -24,6 +24,6 @@ void func_800287F0(void) { } } -INCLUDE_ASM("code_3bf0_len_6f0", func_80028838); +INCLUDE_ASM(s32, "code_3bf0_len_6f0", func_80028838); -INCLUDE_ASM("code_3bf0_len_6f0", update_input); +INCLUDE_ASM(s32, "code_3bf0_len_6f0", update_input); diff --git a/src/code_415D90.c b/src/code_415D90.c index 94ad5b3ac7..51d7b35e07 100644 --- a/src/code_415D90.c +++ b/src/code_415D90.c @@ -1,91 +1,91 @@ #include "common.h" -INCLUDE_ASM("code_415D90", func_802A1000); +INCLUDE_ASM(s32, "code_415D90", func_802A1000); -INCLUDE_ASM("code_415D90", func_802A1030); +INCLUDE_ASM(s32, "code_415D90", func_802A1030); -INCLUDE_ASM("code_415D90", func_802A1050); +INCLUDE_ASM(s32, "code_415D90", func_802A1050); -INCLUDE_ASM("code_415D90", func_802A1078); +INCLUDE_ASM(s32, "code_415D90", func_802A1078); -INCLUDE_ASM("code_415D90", func_802A1098); +INCLUDE_ASM(s32, "code_415D90", func_802A1098); -INCLUDE_ASM("code_415D90", func_802A10B8); +INCLUDE_ASM(s32, "code_415D90", func_802A10B8); -INCLUDE_ASM("code_415D90", func_802A11B0); +INCLUDE_ASM(s32, "code_415D90", func_802A11B0); -INCLUDE_ASM("code_415D90", draw_battle_wheel); +INCLUDE_ASM(s32, "code_415D90", draw_battle_wheel); -INCLUDE_ASM("code_415D90", func_802A2684); +INCLUDE_ASM(s32, "code_415D90", func_802A2684); -INCLUDE_ASM("code_415D90", func_802A27D0); +INCLUDE_ASM(s32, "code_415D90", func_802A27D0); -INCLUDE_ASM("code_415D90", func_802A27E4); +INCLUDE_ASM(s32, "code_415D90", func_802A27E4); -INCLUDE_ASM("code_415D90", func_802A2910); +INCLUDE_ASM(s32, "code_415D90", func_802A2910); -INCLUDE_ASM("code_415D90", func_802A2AB8); +INCLUDE_ASM(s32, "code_415D90", func_802A2AB8); -INCLUDE_ASM("code_415D90", func_802A2C58); +INCLUDE_ASM(s32, "code_415D90", func_802A2C58); -INCLUDE_ASM("code_415D90", func_802A2C84); +INCLUDE_ASM(s32, "code_415D90", func_802A2C84); -INCLUDE_ASM("code_415D90", func_802A3C98); +INCLUDE_ASM(s32, "code_415D90", func_802A3C98); -INCLUDE_ASM("code_415D90", func_802A43DC); +INCLUDE_ASM(s32, "code_415D90", func_802A43DC); -INCLUDE_ASM("code_415D90", func_802A4448); +INCLUDE_ASM(s32, "code_415D90", func_802A4448); -INCLUDE_ASM("code_415D90", func_802A4494); +INCLUDE_ASM(s32, "code_415D90", func_802A4494); -INCLUDE_ASM("code_415D90", func_802A4534); +INCLUDE_ASM(s32, "code_415D90", func_802A4534); -INCLUDE_ASM("code_415D90", func_802A45D8); +INCLUDE_ASM(s32, "code_415D90", func_802A45D8); -INCLUDE_ASM("code_415D90", func_802A4718); +INCLUDE_ASM(s32, "code_415D90", func_802A4718); -INCLUDE_ASM("code_415D90", func_802A472C); +INCLUDE_ASM(s32, "code_415D90", func_802A472C); -INCLUDE_ASM("code_415D90", func_802A47E0); +INCLUDE_ASM(s32, "code_415D90", func_802A47E0); -INCLUDE_ASM("code_415D90", func_802A48FC); +INCLUDE_ASM(s32, "code_415D90", func_802A48FC); -INCLUDE_ASM("code_415D90", func_802A4A10); +INCLUDE_ASM(s32, "code_415D90", func_802A4A10); -INCLUDE_ASM("code_415D90", func_802A4A54); +INCLUDE_ASM(s32, "code_415D90", func_802A4A54); -INCLUDE_ASM("code_415D90", func_802A5290); +INCLUDE_ASM(s32, "code_415D90", func_802A5290); -INCLUDE_ASM("code_415D90", func_802A56F8); +INCLUDE_ASM(s32, "code_415D90", func_802A56F8); -INCLUDE_ASM("code_415D90", func_802A5738); +INCLUDE_ASM(s32, "code_415D90", func_802A5738); -INCLUDE_ASM("code_415D90", func_802A57C8); +INCLUDE_ASM(s32, "code_415D90", func_802A57C8); -INCLUDE_ASM("code_415D90", can_switch_to_player); +INCLUDE_ASM(s32, "code_415D90", can_switch_to_player); -INCLUDE_ASM("code_415D90", func_802A58D0); +INCLUDE_ASM(s32, "code_415D90", func_802A58D0); -INCLUDE_ASM("code_415D90", update_player_menu); +INCLUDE_ASM(s32, "code_415D90", update_player_menu); -INCLUDE_ASM("code_415D90", func_802A8180); +INCLUDE_ASM(s32, "code_415D90", func_802A8180); -INCLUDE_ASM("code_415D90", update_partner_menu); +INCLUDE_ASM(s32, "code_415D90", update_partner_menu); -INCLUDE_ASM("code_415D90", func_802A9AE8); +INCLUDE_ASM(s32, "code_415D90", func_802A9AE8); -INCLUDE_ASM("code_415D90", func_802A9B30); +INCLUDE_ASM(s32, "code_415D90", func_802A9B30); -INCLUDE_ASM("code_415D90", func_802A9B44); +INCLUDE_ASM(s32, "code_415D90", func_802A9B44); -INCLUDE_ASM("code_415D90", func_802AA05C); +INCLUDE_ASM(s32, "code_415D90", func_802AA05C); -INCLUDE_ASM("code_415D90", func_802AA0A4); +INCLUDE_ASM(s32, "code_415D90", func_802AA0A4); -INCLUDE_ASM("code_415D90", func_802AA0B8); +INCLUDE_ASM(s32, "code_415D90", func_802AA0B8); -INCLUDE_ASM("code_415D90", func_802AA640); +INCLUDE_ASM(s32, "code_415D90", func_802AA640); -INCLUDE_ASM("code_415D90", update_targeting_enemies); +INCLUDE_ASM(s32, "code_415D90", update_targeting_enemies); -INCLUDE_ASM("code_415D90", func_802AACD8); +INCLUDE_ASM(s32, "code_415D90", func_802AACD8); diff --git a/src/code_42e0_len_1f60.c b/src/code_42e0_len_1f60.c index d1e9485c91..4d3726e758 100644 --- a/src/code_42e0_len_1f60.c +++ b/src/code_42e0_len_1f60.c @@ -6,25 +6,25 @@ void poll_rumble(void) { nuContRmbModeSet(0, 2); } -INCLUDE_ASM("code_42e0_len_1f60", start_rumble); +INCLUDE_ASM(s32, "code_42e0_len_1f60", start_rumble); -INCLUDE_ASM("code_42e0_len_1f60", func_80028F8C); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_80028F8C); -INCLUDE_ASM("code_42e0_len_1f60", func_80028FE0); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_80028FE0); f32 length2D(f32 x, f32 y) { return sqrtf(SQ(x) + SQ(y)); } -INCLUDE_ASM_T(HeapNode*, "code_42e0_len_1f60", _heap_create, void* addr, s32 size); +INCLUDE_ASM(HeapNode*, "code_42e0_len_1f60", _heap_create, void* addr, s32 size); -INCLUDE_ASM("code_42e0_len_1f60", _heap_malloc); +INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_malloc); -INCLUDE_ASM("code_42e0_len_1f60", _heap_malloc_tail); +INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_malloc_tail); -INCLUDE_ASM("code_42e0_len_1f60", _heap_free); +INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_free); -INCLUDE_ASM("code_42e0_len_1f60", _heap_realloc); +INCLUDE_ASM(s32, "code_42e0_len_1f60", _heap_realloc); INCLUDE_API_ASM("code_42e0_len_1f60", cosine); @@ -37,7 +37,7 @@ s32 sign(s32 val) { return sign; } -INCLUDE_ASM("code_42e0_len_1f60", int_to_string); +INCLUDE_ASM(s32, "code_42e0_len_1f60", int_to_string); void mem_clear(s8* data, s32 numBytes) { while (numBytes > 0) { @@ -47,17 +47,17 @@ void mem_clear(s8* data, s32 numBytes) { } } -INCLUDE_ASM("code_42e0_len_1f60", transform_point); +INCLUDE_ASM(s32, "code_42e0_len_1f60", transform_point); void copy_matrix(Matrix4f* src, Matrix4f* dest) { bcopy(src, dest, sizeof(Matrix4f)); } -INCLUDE_ASM("code_42e0_len_1f60", dma_copy); +INCLUDE_ASM(s32, "code_42e0_len_1f60", dma_copy); -INCLUDE_ASM("code_42e0_len_1f60", func_800297D4); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_800297D4); -INCLUDE_ASM("code_42e0_len_1f60", func_80029860); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_80029860); s32 _advance_rng(void) { s32* rngVal = &gRandSeed; @@ -67,11 +67,11 @@ s32 _advance_rng(void) { return *rngVal; } -INCLUDE_ASM("code_42e0_len_1f60", func_80029934); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_80029934); -INCLUDE_ASM("code_42e0_len_1f60", func_80029994); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_80029994); -INCLUDE_ASM_T(s32, "code_42e0_len_1f60", rand_int, s32 arg0); +INCLUDE_ASM(s32, "code_42e0_len_1f60", rand_int, s32 arg0); f32 signF(f32 val) { f32 sign; @@ -90,7 +90,7 @@ f32 signF(f32 val) { INCLUDE_API_ASM("code_42e0_len_1f60", round); -INCLUDE_ASM_T(f32, "code_42e0_len_1f60", clamp_angle, f32 theta); +INCLUDE_ASM(f32, "code_42e0_len_1f60", clamp_angle, f32 theta); f32 get_clamped_angle_diff(f32 a, f32 b) { if (fabsf(b - a) >= 180.0f) { @@ -103,13 +103,13 @@ f32 get_clamped_angle_diff(f32 a, f32 b) { return b - a; } -INCLUDE_ASM_T(f32, "code_42e0_len_1f60", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); +INCLUDE_ASM(f32, "code_42e0_len_1f60", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); f32 get_player_normal_yaw(void) { return atan2(0, 0, (*gGameStatusPtr)->playerTraceNormal.x, (*gGameStatusPtr)->playerTraceNormal.z); } -INCLUDE_ASM("code_42e0_len_1f60", get_player_normal_pitch); +INCLUDE_ASM(s32, "code_42e0_len_1f60", get_player_normal_pitch); f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by) { f32 xDiff = bx - ax; @@ -126,26 +126,26 @@ f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz) { return sqrtf(SQ(xDiff) + SQ(yDiff) + SQ(zDiff)); } -INCLUDE_ASM_T(void, "code_42e0_len_1f60", add_vec2D_polar, f32* x, f32* y, f32 r, f32 theta); +INCLUDE_ASM(void, "code_42e0_len_1f60", add_vec2D_polar, f32* x, f32* y, f32 r, f32 theta); -INCLUDE_ASM("code_42e0_len_1f60", _wrap_trig_lookup_value); +INCLUDE_ASM(s32, "code_42e0_len_1f60", _wrap_trig_lookup_value); -INCLUDE_ASM("code_42e0_len_1f60", sin_cos_rad); +INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_cos_rad); -INCLUDE_ASM("code_42e0_len_1f60", sin_rad); +INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_rad); -INCLUDE_ASM("code_42e0_len_1f60", cos_rad); +INCLUDE_ASM(s32, "code_42e0_len_1f60", cos_rad); -INCLUDE_ASM("code_42e0_len_1f60", sin_cos_deg); +INCLUDE_ASM(s32, "code_42e0_len_1f60", sin_cos_deg); -INCLUDE_ASM_T(f32, "code_42e0_len_1f60", sin_deg, f32 x); +INCLUDE_ASM(f32, "code_42e0_len_1f60", sin_deg, f32 x); -INCLUDE_ASM_T(f32, "code_42e0_len_1f60", cos_deg, f32 x); +INCLUDE_ASM(f32, "code_42e0_len_1f60", cos_deg, f32 x); -INCLUDE_ASM_T(f32, "code_42e0_len_1f60", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); +INCLUDE_ASM(f32, "code_42e0_len_1f60", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); -INCLUDE_ASM("code_42e0_len_1f60", func_8002A904); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002A904); -INCLUDE_ASM("code_42e0_len_1f60", func_8002AAC4); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002AAC4); -INCLUDE_ASM("code_42e0_len_1f60", func_8002AB5C); +INCLUDE_ASM(s32, "code_42e0_len_1f60", func_8002AB5C); diff --git a/src/code_6240_len_c00.c b/src/code_6240_len_c00.c index 3aa60a6bce..269386f05c 100644 --- a/src/code_6240_len_c00.c +++ b/src/code_6240_len_c00.c @@ -1,40 +1,40 @@ #include "common.h" -INCLUDE_ASM("code_6240_len_c00", get_spirits_rescued); +INCLUDE_ASM(s32, "code_6240_len_c00", get_spirits_rescued); -INCLUDE_ASM("code_6240_len_c00", fio_calc_header_checksum); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_calc_header_checksum); -INCLUDE_ASM("code_6240_len_c00", fio_validate_header_checksums); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_validate_header_checksums); -INCLUDE_ASM("code_6240_len_c00", fio_has_valid_backup); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_has_valid_backup); -INCLUDE_ASM("code_6240_len_c00", fio_flush_backups); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_flush_backups); -INCLUDE_ASM("code_6240_len_c00", fio_calc_file_checksum); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_calc_file_checksum); -INCLUDE_ASM("code_6240_len_c00", fio_validate_file_checksum); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_validate_file_checksum); -INCLUDE_ASM("code_6240_len_c00", fio_fetch_saved_file_info); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_fetch_saved_file_info); -INCLUDE_ASM("code_6240_len_c00", fio_load_game); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_load_game); -INCLUDE_ASM("code_6240_len_c00", fio_save_game); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_save_game); -INCLUDE_ASM("code_6240_len_c00", fio_erase_game); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_erase_game); -INCLUDE_ASM("code_6240_len_c00", fio_deserialize_state); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_deserialize_state); -INCLUDE_ASM("code_6240_len_c00", func_8002B608); +INCLUDE_ASM(s32, "code_6240_len_c00", func_8002B608); -INCLUDE_ASM("code_6240_len_c00", fio_serialize_state); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_serialize_state); void fio_init_flash(void) { osFlashInit(); } -INCLUDE_ASM("code_6240_len_c00", fio_read_flash); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_read_flash); -INCLUDE_ASM("code_6240_len_c00", fio_write_flash); +INCLUDE_ASM(s32, "code_6240_len_c00", fio_write_flash); void fio_erase_flash(s32 pageNum) { osFlashSectorErase(pageNum * 128); diff --git a/src/code_6e40_len_500.c b/src/code_6e40_len_500.c index 73fd3d8046..51015e79f2 100644 --- a/src/code_6e40_len_500.c +++ b/src/code_6e40_len_500.c @@ -1,18 +1,18 @@ #include "common.h" -INCLUDE_ASM("code_6e40_len_500", initialize_curtains) +INCLUDE_ASM(s32, "code_6e40_len_500", initialize_curtains) void update_curtains(void) { } -INCLUDE_ASM("code_6e40_len_500", render_curtains); +INCLUDE_ASM(s32, "code_6e40_len_500", render_curtains); -INCLUDE_ASM("code_6e40_len_500", set_curtain_scale_goal); +INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_scale_goal); -INCLUDE_ASM("code_6e40_len_500", set_curtain_scale); +INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_scale); -INCLUDE_ASM("code_6e40_len_500", set_curtain_draw_callback); +INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_draw_callback); -INCLUDE_ASM("code_6e40_len_500", set_curtain_fade_goal); +INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_fade_goal); -INCLUDE_ASM("code_6e40_len_500", set_curtain_fade); +INCLUDE_ASM(s32, "code_6e40_len_500", set_curtain_fade); diff --git a/src/code_7340_len_b00.c b/src/code_7340_len_b00.c index 5d81795a55..ffd87a6f99 100644 --- a/src/code_7340_len_b00.c +++ b/src/code_7340_len_b00.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_ASM("code_7340_len_b00", crash_delay_msec); +INCLUDE_ASM(s32, "code_7340_len_b00", crash_delay_msec); -INCLUDE_ASM("code_7340_len_b00", func_8002BFB0); +INCLUDE_ASM(s32, "code_7340_len_b00", func_8002BFB0); -INCLUDE_ASM("code_7340_len_b00", func_8002C054); +INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C054); -INCLUDE_ASM("code_7340_len_b00", func_8002C1D4); +INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C1D4); -INCLUDE_ASM("code_7340_len_b00", crash_printf_string); +INCLUDE_ASM(s32, "code_7340_len_b00", crash_printf_string); -INCLUDE_ASM("code_7340_len_b00", crash_print_fpr); +INCLUDE_ASM(s32, "code_7340_len_b00", crash_print_fpr); -INCLUDE_ASM("code_7340_len_b00", func_8002C324); +INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C324); -INCLUDE_ASM("code_7340_len_b00", crash_show_handler); +INCLUDE_ASM(s32, "code_7340_len_b00", crash_show_handler); -INCLUDE_ASM("code_7340_len_b00", func_8002C7B0); +INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C7B0); -INCLUDE_ASM("code_7340_len_b00", crash_monitor_thread); +INCLUDE_ASM(s32, "code_7340_len_b00", crash_monitor_thread); -INCLUDE_ASM("code_7340_len_b00", func_8002C890); +INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C890); -INCLUDE_ASM("code_7340_len_b00", crash_create_monitor); +INCLUDE_ASM(s32, "code_7340_len_b00", crash_create_monitor); -INCLUDE_ASM("code_7340_len_b00", func_8002C94C); +INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C94C); diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c index ea47c99df3..159fdaedc7 100644 --- a/src/code_759b0_len_61b0.c +++ b/src/code_759b0_len_61b0.c @@ -1,151 +1,189 @@ #include "common.h" -INCLUDE_ASM("code_759b0_len_61b0", func_800DC500); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DC500); -INCLUDE_ASM("code_759b0_len_61b0", func_800DC778); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DC778); -INCLUDE_ASM("code_759b0_len_61b0", func_800DCB7C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DCB7C); -INCLUDE_ASM("code_759b0_len_61b0", func_800DCE70); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DCE70); -INCLUDE_ASM("code_759b0_len_61b0", func_800DD04C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD04C); -INCLUDE_ASM("code_759b0_len_61b0", func_800DD228); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD228); -INCLUDE_ASM("code_759b0_len_61b0", func_800DD44C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD44C); -INCLUDE_ASM("code_759b0_len_61b0", func_800DD5B4); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD5B4); -INCLUDE_ASM("code_759b0_len_61b0", func_800DD618); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD618); -INCLUDE_ASM("code_759b0_len_61b0", func_800DD8FC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD8FC); -INCLUDE_ASM("code_759b0_len_61b0", func_800DDAE4); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDAE4); -INCLUDE_ASM("code_759b0_len_61b0", func_800DDC44); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDC44); -INCLUDE_ASM("code_759b0_len_61b0", func_800DDCEC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDCEC); -INCLUDE_ASM("code_759b0_len_61b0", func_800DDD94); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDD94); -INCLUDE_ASM("code_759b0_len_61b0", test_below_player); +INCLUDE_ASM(s32, "code_759b0_len_61b0", test_below_player); -INCLUDE_ASM("code_759b0_len_61b0", func_800DE46C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DE46C); -INCLUDE_ASM("code_759b0_len_61b0", trace_below_player); +INCLUDE_ASM(s32, "code_759b0_len_61b0", trace_below_player); -INCLUDE_ASM("code_759b0_len_61b0", collision_check_above); +INCLUDE_ASM(s32, "code_759b0_len_61b0", collision_check_above); -INCLUDE_ASM("code_759b0_len_61b0", trace_above_player); +INCLUDE_ASM(s32, "code_759b0_len_61b0", trace_above_player); -INCLUDE_ASM("code_759b0_len_61b0", do_lateral_collision); +INCLUDE_ASM(s32, "code_759b0_len_61b0", do_lateral_collision); -INCLUDE_ASM("code_759b0_len_61b0", func_800DEE5C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DEE5C); -INCLUDE_ASM("code_759b0_len_61b0", func_800DF15C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DF15C); -INCLUDE_ASM("code_759b0_len_61b0", func_800DF3FC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DF3FC); -INCLUDE_ASM("code_759b0_len_61b0", test_player_lateral); +INCLUDE_ASM(s32, "code_759b0_len_61b0", test_player_lateral); -INCLUDE_ASM("code_759b0_len_61b0", update_player); +INCLUDE_ASM(s32, "code_759b0_len_61b0", update_player); -INCLUDE_ASM("code_759b0_len_61b0", check_input_use_partner); +INCLUDE_ASM(s32, "code_759b0_len_61b0", check_input_use_partner); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFAAC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFAAC); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFBE8); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFBE8); -INCLUDE_ASM("code_759b0_len_61b0", clear_player_status); +void clear_player_status(void) { + mem_clear(&gPlayerStatus, sizeof(gPlayerStatus)); +} -INCLUDE_ASM("code_759b0_len_61b0", func_800DFC74); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFC74); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFCF4); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFCF4); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFD48); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFD48); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFEFC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFEFC); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFF50); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFF50); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFF78); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFF78); -INCLUDE_ASM("code_759b0_len_61b0", func_800DFFCC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFFCC); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0088); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0088); -INCLUDE_ASM("code_759b0_len_61b0", enable_player_shadow); +void enable_player_shadow(void) { + get_shadow_by_index(D_8010F094)->flags &= ~1; +} -INCLUDE_ASM_T(void, "code_759b0_len_61b0", disable_player_shadow); +void disable_player_shadow(void) { + get_shadow_by_index(D_8010F094)->flags |= 1; +} -INCLUDE_ASM("code_759b0_len_61b0", disable_player_static_collisions); +s32 disable_player_static_collisions(void) { + PlayerStatus* playerStatus = &gPlayerStatus; -INCLUDE_ASM("code_759b0_len_61b0", enable_player_static_collisions); + playerStatus->flags |= 0x1000; + playerStatus->enableCollisionOverlapsCheck++; + return playerStatus->enableCollisionOverlapsCheck; +} -INCLUDE_ASM("code_759b0_len_61b0", disable_player_input); +s32 enable_player_static_collisions(void) { + PlayerStatus* playerStatus = &gPlayerStatus; -INCLUDE_ASM("code_759b0_len_61b0", enable_player_input); + playerStatus->enableCollisionOverlapsCheck--; + if (playerStatus->enableCollisionOverlapsCheck == 0) { + playerStatus->flags &= ~0x1000; + } + return playerStatus->enableCollisionOverlapsCheck; +} -INCLUDE_ASM("code_759b0_len_61b0", func_800E01DC); +s32 disable_player_input(void) { + PlayerStatus* playerStatus = &gPlayerStatus; -INCLUDE_ASM("code_759b0_len_61b0", func_800E0208); + playerStatus->flags |= 0x2000; + playerStatus->statusMenuCounterinputEnabledCounter++; + return playerStatus->statusMenuCounterinputEnabledCounter; +} -INCLUDE_ASM("code_759b0_len_61b0", func_800E0260); +s32 enable_player_input(void) { + PlayerStatus* playerStatus = &gPlayerStatus; -INCLUDE_ASM("code_759b0_len_61b0", func_800E0294); + playerStatus->statusMenuCounterinputEnabledCounter--; + if (playerStatus->statusMenuCounterinputEnabledCounter == 0) { + playerStatus->flags &= ~0x2000; + } + return playerStatus->statusMenuCounterinputEnabledCounter; +} -INCLUDE_ASM("code_759b0_len_61b0", func_800E0330); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E01DC); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0374); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0208); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0398); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0260); -INCLUDE_ASM("code_759b0_len_61b0", func_800E04D0); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0294); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0514); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0330); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0538); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0374); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0580); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0398); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0658); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E04D0); -INCLUDE_ASM("code_759b0_len_61b0", func_800E069C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0514); -INCLUDE_ASM("code_759b0_len_61b0", func_800E06C0); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0538); -INCLUDE_ASM("code_759b0_len_61b0", func_800E06D8); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0580); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0818); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0658); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0AD0); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E069C); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0B14); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E06C0); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0B38); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E06D8); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0B90); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0818); -INCLUDE_ASM("code_759b0_len_61b0", func_800E0FEC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0AD0); -INCLUDE_ASM("code_759b0_len_61b0", render_player); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0B14); -INCLUDE_ASM("code_759b0_len_61b0", render_player_model); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0B38); -INCLUDE_ASM("code_759b0_len_61b0", appendGfx_player); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0B90); -INCLUDE_ASM("code_759b0_len_61b0", appendGfx_player_spin); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0FEC); -INCLUDE_ASM("code_759b0_len_61b0", update_player_shadow); +void render_player(void) { + if (!GAME_STATUS->disableScripts) { + render_player_model(); + } +} -INCLUDE_ASM("code_759b0_len_61b0", update_player_input); +INCLUDE_ASM(void, "code_759b0_len_61b0", render_player_model); -INCLUDE_ASM("code_759b0_len_61b0", func_800E205C); +INCLUDE_ASM(s32, "code_759b0_len_61b0", appendGfx_player); -INCLUDE_ASM("code_759b0_len_61b0", func_800E22E4); +INCLUDE_ASM(s32, "code_759b0_len_61b0", appendGfx_player_spin); -INCLUDE_ASM("code_759b0_len_61b0", input_to_move_vector); +INCLUDE_ASM(s32, "code_759b0_len_61b0", update_player_shadow); -INCLUDE_ASM("code_759b0_len_61b0", func_800E23FC); +INCLUDE_ASM(s32, "code_759b0_len_61b0", update_player_input); -INCLUDE_ASM("code_759b0_len_61b0", func_800E24F8); +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E205C); + +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E22E4); + +INCLUDE_ASM(s32, "code_759b0_len_61b0", input_to_move_vector); + +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E23FC); + +INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E24F8); diff --git a/src/code_7E2AA0.c b/src/code_7E2AA0.c index 1c20a5eb94..668652e8e6 100644 --- a/src/code_7E2AA0.c +++ b/src/code_7E2AA0.c @@ -1,41 +1,41 @@ #include "common.h" -INCLUDE_ASM("code_7E2AA0", func_80281C20); +INCLUDE_ASM(s32, "code_7E2AA0", func_80281C20); -INCLUDE_ASM("code_7E2AA0", func_80281C84); +INCLUDE_ASM(s32, "code_7E2AA0", func_80281C84); -INCLUDE_ASM("code_7E2AA0", MakeDoorAdvanced); +INCLUDE_ASM(s32, "code_7E2AA0", MakeDoorAdvanced); -INCLUDE_ASM("code_7E2AA0", func_802822A8); +INCLUDE_ASM(s32, "code_7E2AA0", func_802822A8); -INCLUDE_ASM("code_7E2AA0", func_80282314); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282314); -INCLUDE_ASM("code_7E2AA0", func_80282324); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282324); -INCLUDE_ASM("code_7E2AA0", func_80282338); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282338); -INCLUDE_ASM("code_7E2AA0", func_8028236C); +INCLUDE_ASM(s32, "code_7E2AA0", func_8028236C); -INCLUDE_ASM("code_7E2AA0", func_802823B0); +INCLUDE_ASM(s32, "code_7E2AA0", func_802823B0); -INCLUDE_ASM("code_7E2AA0", func_80282414); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282414); -INCLUDE_ASM("code_7E2AA0", func_80282594); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282594); -INCLUDE_ASM("code_7E2AA0", func_802825FC); +INCLUDE_ASM(s32, "code_7E2AA0", func_802825FC); -INCLUDE_ASM("code_7E2AA0", func_80282610); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282610); -INCLUDE_ASM("code_7E2AA0", func_80282624); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282624); -INCLUDE_ASM("code_7E2AA0", func_80282634); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282634); -INCLUDE_ASM("code_7E2AA0", func_80282700); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282700); -INCLUDE_ASM("code_7E2AA0", func_80282774); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282774); -INCLUDE_ASM("code_7E2AA0", func_802827A8); +INCLUDE_ASM(s32, "code_7E2AA0", func_802827A8); -INCLUDE_ASM("code_7E2AA0", func_802827CC); +INCLUDE_ASM(s32, "code_7E2AA0", func_802827CC); -INCLUDE_ASM("code_7E2AA0", func_80282868); +INCLUDE_ASM(s32, "code_7E2AA0", func_80282868); diff --git a/src/code_7E3700.c b/src/code_7E3700.c index 70dd82ce36..2390838886 100644 --- a/src/code_7E3700.c +++ b/src/code_7E3700.c @@ -1,51 +1,51 @@ #include "common.h" -INCLUDE_ASM("code_7E3700", func_80282880); +INCLUDE_ASM(s32, "code_7E3700", func_80282880); -INCLUDE_ASM("code_7E3700", func_802828DC); +INCLUDE_ASM(s32, "code_7E3700", func_802828DC); -INCLUDE_ASM("code_7E3700", func_80282C40); +INCLUDE_ASM(s32, "code_7E3700", func_80282C40); -INCLUDE_ASM("code_7E3700", func_80282E30); +INCLUDE_ASM(s32, "code_7E3700", func_80282E30); -INCLUDE_ASM("code_7E3700", func_80283080); +INCLUDE_ASM(s32, "code_7E3700", func_80283080); -INCLUDE_ASM("code_7E3700", func_80283174); +INCLUDE_ASM(s32, "code_7E3700", func_80283174); -INCLUDE_ASM("code_7E3700", CheckActionState); +INCLUDE_ASM(s32, "code_7E3700", CheckActionState); -INCLUDE_ASM("code_7E3700", func_80283240); +INCLUDE_ASM(s32, "code_7E3700", func_80283240); -INCLUDE_ASM("code_7E3700", CreatePushBlockGrid); +INCLUDE_ASM(s32, "code_7E3700", CreatePushBlockGrid); -INCLUDE_ASM("code_7E3700", SetPushBlock); +INCLUDE_ASM(s32, "code_7E3700", SetPushBlock); -INCLUDE_ASM("code_7E3700", GetPushBlock); +INCLUDE_ASM(s32, "code_7E3700", GetPushBlock); -INCLUDE_ASM("code_7E3700", GetGridIndexFromPos); +INCLUDE_ASM(s32, "code_7E3700", GetGridIndexFromPos); -INCLUDE_ASM("code_7E3700", SetPushBlockFallEffect); +INCLUDE_ASM(s32, "code_7E3700", SetPushBlockFallEffect); -INCLUDE_ASM("code_7E3700", func_80283810); +INCLUDE_ASM(s32, "code_7E3700", func_80283810); -INCLUDE_ASM("code_7E3700", TeleportPartnerToPlayer); +INCLUDE_ASM(s32, "code_7E3700", TeleportPartnerToPlayer); -INCLUDE_ASM("code_7E3700", func_80283908); +INCLUDE_ASM(s32, "code_7E3700", func_80283908); -INCLUDE_ASM("code_7E3700", func_80283A50); +INCLUDE_ASM(s32, "code_7E3700", func_80283A50); -INCLUDE_ASM("code_7E3700", func_80283B88); +INCLUDE_ASM(s32, "code_7E3700", func_80283B88); -INCLUDE_ASM("code_7E3700", func_80283BB0); +INCLUDE_ASM(s32, "code_7E3700", func_80283BB0); -INCLUDE_ASM("code_7E3700", func_80283BD0); +INCLUDE_ASM(s32, "code_7E3700", func_80283BD0); -INCLUDE_ASM("code_7E3700", func_80283C34); +INCLUDE_ASM(s32, "code_7E3700", func_80283C34); -INCLUDE_ASM("code_7E3700", func_80283D00); +INCLUDE_ASM(s32, "code_7E3700", func_80283D00); -INCLUDE_ASM("code_7E3700", func_80283D6C); +INCLUDE_ASM(s32, "code_7E3700", func_80283D6C); -INCLUDE_ASM("code_7E3700", func_80283DF0); +INCLUDE_ASM(s32, "code_7E3700", func_80283DF0); -INCLUDE_ASM("code_7E3700", func_80283E2C); +INCLUDE_ASM(s32, "code_7E3700", func_80283E2C); diff --git a/src/code_7bb60_len_41b0.c b/src/code_7bb60_len_41b0.c index 0037960775..3544adb4d7 100644 --- a/src/code_7bb60_len_41b0.c +++ b/src/code_7bb60_len_41b0.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM("code_7bb60_len_41b0", func_800E26B0); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E26B0); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E26C4); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E26C4); void set_action_state(s32 actionState); @@ -19,83 +19,83 @@ void move_player(s16 duration, f32 heading, f32 speed) { } } -INCLUDE_ASM("code_7bb60_len_41b0", collision_main_above); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_main_above); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E29C8); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E29C8); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E2BB0); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E2BB0); -INCLUDE_ASM("code_7bb60_len_41b0", update_fall_state); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", update_fall_state); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E2F60); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E2F60); -INCLUDE_ASM("code_7bb60_len_41b0", gravity_use_fall_parms); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", gravity_use_fall_parms); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E3100); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E3100); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E315C); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E315C); -INCLUDE_ASM("code_7bb60_len_41b0", phys_player_land); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", phys_player_land); -INCLUDE_ASM("code_7bb60_len_41b0", integrate_gravity); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", integrate_gravity); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E34D8); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E34D8); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E3514); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E3514); -INCLUDE_ASM("code_7bb60_len_41b0", collision_main_lateral); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_main_lateral); -INCLUDE_ASM("code_7bb60_len_41b0", collision_check_player_intersecting_world); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_check_player_intersecting_world); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E4404); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4404); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E4508); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4508); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E45E0); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E45E0); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E46C8); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E46C8); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E4744); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4744); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E4AD8); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4AD8); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E4B40); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4B40); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E4BB8); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4BB8); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E4F10); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4F10); -INCLUDE_ASM("code_7bb60_len_41b0", check_input_midair_jump); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", check_input_midair_jump); -INCLUDE_ASM("code_7bb60_len_41b0", get_current_partner_id); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", get_current_partner_id); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5098); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5098); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5150); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5150); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5174); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5174); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E52F8); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E52F8); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5348); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5348); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E546C); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E546C); -INCLUDE_ASM("code_7bb60_len_41b0", save_ground_pos); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", save_ground_pos); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5520); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5520); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5530); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5530); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E58F0); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E58F0); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5938); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5938); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E59A0); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E59A0); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5A2C); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5A2C); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E5C78); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5C78); void set_action_state(s32 actionState) { PlayerStatus* player_status = &gPlayerStatus; @@ -170,13 +170,13 @@ void set_action_state(s32 actionState) { } } -INCLUDE_ASM("code_7bb60_len_41b0", update_locomotion_state); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", update_locomotion_state); -INCLUDE_ASM("code_7bb60_len_41b0", start_falling); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", start_falling); -INCLUDE_ASM("code_7bb60_len_41b0", start_bounce_a); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", start_bounce_a); -INCLUDE_ASM("code_7bb60_len_41b0", start_bounce_b); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", start_bounce_b); s32 check_input_hammer(void) { PlayerStatus* player_status = &gPlayerStatus; @@ -196,18 +196,18 @@ s32 check_input_hammer(void) { return FALSE; } -INCLUDE_ASM("code_7bb60_len_41b0", check_input_jump); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", check_input_jump); -INCLUDE_ASM("code_7bb60_len_41b0", check_input_spin); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", check_input_spin); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E636C); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E636C); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E63A4); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E63A4); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E6428); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E6428); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E6500); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E6500); -INCLUDE_ASM("code_7bb60_len_41b0", make_disguise_npc); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", make_disguise_npc); -INCLUDE_ASM("code_7bb60_len_41b0", func_800E66C4); +INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E66C4); diff --git a/src/code_7e0e80.c b/src/code_7e0e80.c index eadcf47eb7..4b8e83951d 100644 --- a/src/code_7e0e80.c +++ b/src/code_7e0e80.c @@ -1,39 +1,39 @@ #include "common.h" -INCLUDE_ASM("code_7e0e80", func_80280000); +INCLUDE_ASM(s32, "code_7e0e80", func_80280000); -INCLUDE_ASM("code_7e0e80", func_80280088); +INCLUDE_ASM(s32, "code_7e0e80", func_80280088); -INCLUDE_ASM("code_7e0e80", func_8028017C); +INCLUDE_ASM(s32, "code_7e0e80", func_8028017C); -INCLUDE_ASM("code_7e0e80", func_80280208); +INCLUDE_ASM(s32, "code_7e0e80", func_80280208); -INCLUDE_ASM("code_7e0e80", func_802802D0); +INCLUDE_ASM(s32, "code_7e0e80", func_802802D0); -INCLUDE_ASM("code_7e0e80", func_8028035C); +INCLUDE_ASM(s32, "code_7e0e80", func_8028035C); -INCLUDE_ASM("code_7e0e80", func_802803C8); +INCLUDE_ASM(s32, "code_7e0e80", func_802803C8); -INCLUDE_ASM("code_7e0e80", func_80280410); +INCLUDE_ASM(s32, "code_7e0e80", func_80280410); -INCLUDE_ASM("code_7e0e80", func_8028051C); +INCLUDE_ASM(s32, "code_7e0e80", func_8028051C); -INCLUDE_ASM("code_7e0e80", func_80280954); +INCLUDE_ASM(s32, "code_7e0e80", func_80280954); -INCLUDE_ASM("code_7e0e80", func_80280AC4); +INCLUDE_ASM(s32, "code_7e0e80", func_80280AC4); -INCLUDE_ASM("code_7e0e80", func_80280B44); +INCLUDE_ASM(s32, "code_7e0e80", func_80280B44); -INCLUDE_ASM("code_7e0e80", func_80280B78); +INCLUDE_ASM(s32, "code_7e0e80", func_80280B78); -INCLUDE_ASM("code_7e0e80", func_80280BD0); +INCLUDE_ASM(s32, "code_7e0e80", func_80280BD0); -INCLUDE_ASM("code_7e0e80", func_80281434); +INCLUDE_ASM(s32, "code_7e0e80", func_80281434); -INCLUDE_ASM("code_7e0e80", func_802814D0); +INCLUDE_ASM(s32, "code_7e0e80", func_802814D0); -INCLUDE_ASM("code_7e0e80", draw_shop_items); +INCLUDE_ASM(s32, "code_7e0e80", draw_shop_items); -INCLUDE_ASM("code_7e0e80", MakeShop); +INCLUDE_ASM(s32, "code_7e0e80", MakeShop); -INCLUDE_ASM("code_7e0e80", MakeShopOwner); +INCLUDE_ASM(s32, "code_7e0e80", MakeShopOwner); diff --git a/src/code_7fd10_len_b40.c b/src/code_7fd10_len_b40.c index 364387d7cd..103012d8c8 100644 --- a/src/code_7fd10_len_b40.c +++ b/src/code_7fd10_len_b40.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM("code_7fd10_len_b40", func_800E6860); +INCLUDE_ASM(s32, "code_7fd10_len_b40", func_800E6860); -INCLUDE_ASM("code_7fd10_len_b40", func_800E6904); +INCLUDE_ASM(s32, "code_7fd10_len_b40", func_800E6904); -INCLUDE_ASM("code_7fd10_len_b40", can_pause); +INCLUDE_ASM(s32, "code_7fd10_len_b40", can_pause); -INCLUDE_ASM("code_7fd10_len_b40", func_800E6B68); +INCLUDE_ASM(s32, "code_7fd10_len_b40", func_800E6B68); -INCLUDE_ASM("code_7fd10_len_b40", setup_partner_popup); +INCLUDE_ASM(s32, "code_7fd10_len_b40", setup_partner_popup); -INCLUDE_ASM("code_7fd10_len_b40", setup_item_popup); +INCLUDE_ASM(s32, "code_7fd10_len_b40", setup_item_popup); -INCLUDE_ASM("code_7fd10_len_b40", check_input_open_menus); +INCLUDE_ASM(s32, "code_7fd10_len_b40", check_input_open_menus); -INCLUDE_ASM("code_7fd10_len_b40", check_input_status_menu); +INCLUDE_ASM(s32, "code_7fd10_len_b40", check_input_status_menu); diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c index ec15c0886f..9fb4ca8b98 100644 --- a/src/code_80850_len_3060.c +++ b/src/code_80850_len_3060.c @@ -268,13 +268,13 @@ void enforce_hpfp_limits(void) { } } -INCLUDE_ASM("code_80850_len_3060", initialize_status_menu); +INCLUDE_ASM(s32, "code_80850_len_3060", initialize_status_menu); -INCLUDE_ASM("code_80850_len_3060", status_menu_draw_number); +INCLUDE_ASM(s32, "code_80850_len_3060", status_menu_draw_number); -INCLUDE_ASM("code_80850_len_3060", status_menu_draw_stat); +INCLUDE_ASM(s32, "code_80850_len_3060", status_menu_draw_stat); -INCLUDE_ASM("code_80850_len_3060", update_status_menu); +INCLUDE_ASM(s32, "code_80850_len_3060", update_status_menu); void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { UiStatus* uiStatus = &gUIStatus; @@ -965,7 +965,7 @@ s32 is_ability_active(s32 arg0) { } } #else -INCLUDE_ASM_T(s32, "code_80850_len_3060", is_ability_active, s32 arg0); +INCLUDE_ASM(s32, "code_80850_len_3060", is_ability_active, s32 arg0); #endif s32 is_partner_ability_active(void) { diff --git a/src/code_8230_len_1ae0.c b/src/code_8230_len_1ae0.c index 77ec13b1ee..a7eca5948f 100644 --- a/src/code_8230_len_1ae0.c +++ b/src/code_8230_len_1ae0.c @@ -10,26 +10,26 @@ INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrRestart); INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrThread); -INCLUDE_ASM("code_8230_len_1ae0", func_8002D160); +INCLUDE_ASM(s32, "code_8230_len_1ae0", func_8002D160); -INCLUDE_ASM("code_8230_len_1ae0", update_cameras); +INCLUDE_ASM(s32, "code_8230_len_1ae0", update_cameras); -INCLUDE_ASM("code_8230_len_1ae0", render_frame); +INCLUDE_ASM(s32, "code_8230_len_1ae0", render_frame); -INCLUDE_ASM("code_8230_len_1ae0", create_cameras_a); +INCLUDE_ASM(s32, "code_8230_len_1ae0", create_cameras_a); -INCLUDE_ASM("code_8230_len_1ae0", create_cameras_b); +INCLUDE_ASM(s32, "code_8230_len_1ae0", create_cameras_b); -INCLUDE_ASM("code_8230_len_1ae0", initialize_next_camera); +INCLUDE_ASM(s32, "code_8230_len_1ae0", initialize_next_camera); -INCLUDE_ASM_T(void, "code_8230_len_1ae0", set_cam_viewport, s16 id, s16 x, s16 y, s16 width, s16 height); +INCLUDE_ASM(void, "code_8230_len_1ae0", set_cam_viewport, s16 id, s16 x, s16 y, s16 width, s16 height); -INCLUDE_ASM("code_8230_len_1ae0", get_cam_viewport); +INCLUDE_ASM(s32, "code_8230_len_1ae0", get_cam_viewport); -INCLUDE_ASM("code_8230_len_1ae0", get_screen_coords); +INCLUDE_ASM(s32, "code_8230_len_1ae0", get_screen_coords); -INCLUDE_ASM("code_8230_len_1ae0", func_8002E754); +INCLUDE_ASM(s32, "code_8230_len_1ae0", func_8002E754); -INCLUDE_ASM("code_8230_len_1ae0", func_8002E7CC); +INCLUDE_ASM(s32, "code_8230_len_1ae0", func_8002E7CC); -INCLUDE_ASM("code_8230_len_1ae0", func_8002E82C); +INCLUDE_ASM(s32, "code_8230_len_1ae0", func_8002E82C); diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c index 58b27526b0..e82bb3cc25 100644 --- a/src/code_838b0_len_5900.c +++ b/src/code_838b0_len_5900.c @@ -1,109 +1,112 @@ #include "common.h" -INCLUDE_ASM("code_838b0_len_5900", use_consumable); +INCLUDE_ASM(s32, "code_838b0_len_5900", use_consumable); -INCLUDE_ASM("code_838b0_len_5900", remove_consumable); +void remove_consumable(void) { + gPlayerData.invItems[D_8010CD20] = 0; + sort_items(); +} -INCLUDE_ASM("code_838b0_len_5900", func_800EA4B0); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA4B0); -INCLUDE_ASM("code_838b0_len_5900", func_800EA514); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA514); -INCLUDE_ASM("code_838b0_len_5900", func_800EA524); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA524); -INCLUDE_ASM("code_838b0_len_5900", func_800EA52C); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA52C); -INCLUDE_ASM("code_838b0_len_5900", is_current_partner_flying); +INCLUDE_ASM(s32, "code_838b0_len_5900", is_current_partner_flying); -INCLUDE_ASM("code_838b0_len_5900", func_800EA5B8); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA5B8); -INCLUDE_ASM("code_838b0_len_5900", func_800EA5D0); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA5D0); -INCLUDE_ASM("code_838b0_len_5900", func_800EA6A8); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8); -INCLUDE_ASM("code_838b0_len_5900", func_800EA6CC); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6CC); -INCLUDE_ASM("code_838b0_len_5900", func_800EB168); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168); -INCLUDE_ASM("code_838b0_len_5900", func_800EB200); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB200); -INCLUDE_ASM("code_838b0_len_5900", func_800EB2A4); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB2A4); -INCLUDE_ASM("code_838b0_len_5900", partner_use_ability); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_use_ability); -INCLUDE_ASM("code_838b0_len_5900", partner_player_can_pause); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_player_can_pause); -INCLUDE_ASM("code_838b0_len_5900", partner_can_use_ability); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_can_use_ability); -INCLUDE_ASM("code_838b0_len_5900", partner_reset_data); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_reset_data); -INCLUDE_ASM("code_838b0_len_5900", partner_initialize_data); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_initialize_data); -INCLUDE_ASM("code_838b0_len_5900", partner_test_enemy_collision); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_test_enemy_collision); -INCLUDE_ASM("code_838b0_len_5900", partner_get_ride_script); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_get_ride_script); -INCLUDE_ASM("code_838b0_len_5900", partner_handle_before_battle); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_handle_before_battle); -INCLUDE_ASM("code_838b0_len_5900", partner_handle_after_battle); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_handle_after_battle); -INCLUDE_ASM("code_838b0_len_5900", partner_kill_ability_script); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_kill_ability_script); -INCLUDE_ASM("code_838b0_len_5900", partner_suspend_ability_script); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_suspend_ability_script); -INCLUDE_ASM("code_838b0_len_5900", partner_resume_ability_script); +INCLUDE_ASM(s32, "code_838b0_len_5900", partner_resume_ability_script); -INCLUDE_ASM("code_838b0_len_5900", enable_partner_walking); +INCLUDE_ASM(s32, "code_838b0_len_5900", enable_partner_walking); -INCLUDE_ASM("code_838b0_len_5900", func_800EBA3C); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EBA3C); -INCLUDE_ASM("code_838b0_len_5900", func_800EBB40); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EBB40); -INCLUDE_ASM("code_838b0_len_5900", func_800EBC74); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EBC74); -INCLUDE_ASM("code_838b0_len_5900", enable_partner_flying); +INCLUDE_ASM(s32, "code_838b0_len_5900", enable_partner_flying); -INCLUDE_ASM("code_838b0_len_5900", update_player_move_history); +INCLUDE_ASM(s32, "code_838b0_len_5900", update_player_move_history); -INCLUDE_ASM("code_838b0_len_5900", func_800ED5D0); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800ED5D0); -INCLUDE_ASM("code_838b0_len_5900", func_800ED9F8); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800ED9F8); -INCLUDE_ASM("code_838b0_len_5900", func_800EE994); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EE994); -INCLUDE_ASM("code_838b0_len_5900", func_800EE9B8); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EE9B8); -INCLUDE_ASM("code_838b0_len_5900", func_800EECC4); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EECC4); -INCLUDE_ASM("code_838b0_len_5900", func_800EECE8); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EECE8); -INCLUDE_ASM("code_838b0_len_5900", func_800EF300); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF300); -INCLUDE_ASM("code_838b0_len_5900", func_800EF314); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF314); -INCLUDE_ASM("code_838b0_len_5900", enable_partner_ai); +INCLUDE_ASM(s32, "code_838b0_len_5900", enable_partner_ai); -INCLUDE_ASM("code_838b0_len_5900", func_800EF394); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF394); -INCLUDE_ASM("code_838b0_len_5900", func_800EF3A4); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3A4); -INCLUDE_ASM("code_838b0_len_5900", func_800EF3C0); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3C0); -INCLUDE_ASM("code_838b0_len_5900", func_800EF3D4); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3D4); -INCLUDE_ASM("code_838b0_len_5900", func_800EF3E4); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF3E4); -INCLUDE_ASM("code_838b0_len_5900", func_800EF414); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF414); -INCLUDE_ASM("code_838b0_len_5900", func_800EF43C); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF43C); -INCLUDE_ASM("code_838b0_len_5900", clear_partner_move_history); +INCLUDE_ASM(s32, "code_838b0_len_5900", clear_partner_move_history); -INCLUDE_ASM("code_838b0_len_5900", func_800EF4E0); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF4E0); -INCLUDE_ASM("code_838b0_len_5900", func_800EF600); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF600); -INCLUDE_ASM("code_838b0_len_5900", func_800EF628); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF628); -INCLUDE_ASM("code_838b0_len_5900", func_800EF640); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF640); -INCLUDE_ASM("code_838b0_len_5900", func_800EF82C); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EF82C); diff --git a/src/code_891b0_len_fb0.c b/src/code_891b0_len_fb0.c index a7c676a2da..a7ca74acae 100644 --- a/src/code_891b0_len_fb0.c +++ b/src/code_891b0_len_fb0.c @@ -1,19 +1,19 @@ #include "common.h" -INCLUDE_ASM("code_891b0_len_fb0", func_800EFD00); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFD00); -INCLUDE_ASM("code_891b0_len_fb0", func_800EFD08); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFD08); -INCLUDE_ASM("code_891b0_len_fb0", func_800EFE2C); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFE2C); -INCLUDE_ASM("code_891b0_len_fb0", func_800F0248); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0248); -INCLUDE_ASM("code_891b0_len_fb0", func_800F0490); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0490); -INCLUDE_ASM("code_891b0_len_fb0", func_800F0864); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0864); -INCLUDE_ASM("code_891b0_len_fb0", func_800F09EC); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F09EC); -INCLUDE_ASM("code_891b0_len_fb0", func_800F0B3C); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0B3C); -INCLUDE_ASM("code_891b0_len_fb0", func_800F0C9C); +INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0C9C); diff --git a/src/code_8a160_len_700.c b/src/code_8a160_len_700.c index ad4cda7bcf..895400d048 100644 --- a/src/code_8a160_len_700.c +++ b/src/code_8a160_len_700.c @@ -18,7 +18,7 @@ typedef struct { extern struct_func_800F0CB0 D_8010D000[]; -INCLUDE_ASM("code_8a160_len_700", func_800F0CB0); +INCLUDE_ASM(s32, "code_8a160_len_700", func_800F0CB0); // void func_800F0CB0(s32 arg0, f32 arg1, f32 arg2, f32 arg3) //{ // sub_struct_func_800F0CB0 *temp_a1 = &D_8010D000[arg0].unk00[0]; @@ -49,7 +49,7 @@ void func_800F0D5C(void) { } } -INCLUDE_ASM("code_8a160_len_700", func_800F0D80); +INCLUDE_ASM(s32, "code_8a160_len_700", func_800F0D80); /*extern u16 D_800741F0; extern Gfx *D_8009A66C; @@ -58,7 +58,7 @@ extern void *D_801096B0; extern Gfx D_80109710[]; extern Gfx D_801097D8[];*/ -INCLUDE_ASM("code_8a160_len_700", func_800F102C); +INCLUDE_ASM(s32, "code_8a160_len_700", func_800F102C); /*void func_800F102C(void) { s32 temp_s2; s32 temp_s7; diff --git a/src/code_8a860_len_3f30.c b/src/code_8a860_len_3f30.c index 7717892997..d36dfd9b2e 100644 --- a/src/code_8a860_len_3f30.c +++ b/src/code_8a860_len_3f30.c @@ -1,34 +1,34 @@ #include "common.h" -INCLUDE_ASM("code_8a860_len_3f30", func_800F13B0); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F13B0); -INCLUDE_ASM("code_8a860_len_3f30", func_800F1538); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F1538); -INCLUDE_ASM("code_8a860_len_3f30", func_800F16CC); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F16CC); -INCLUDE_ASM("code_8a860_len_3f30", func_800F1A10); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F1A10); -INCLUDE_ASM("code_8a860_len_3f30", func_800F3680); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F3680); -INCLUDE_ASM("code_8a860_len_3f30", draw_submenu_title); +INCLUDE_ASM(s32, "code_8a860_len_3f30", draw_submenu_title); -INCLUDE_ASM("code_8a860_len_3f30", func_800F48F4); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F48F4); -INCLUDE_ASM("code_8a860_len_3f30", func_800F4944); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4944); -INCLUDE_ASM("code_8a860_len_3f30", func_800F4C1C); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4C1C); -INCLUDE_ASM("code_8a860_len_3f30", func_800F4C6C); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4C6C); -INCLUDE_ASM("code_8a860_len_3f30", func_800F4CF0); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4CF0); -INCLUDE_ASM("code_8a860_len_3f30", func_800F4D28); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4D28); -INCLUDE_ASM("code_8a860_len_3f30", func_800F4E40); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4E40); -INCLUDE_ASM("code_8a860_len_3f30", func_800F4FC4); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4FC4); -INCLUDE_ASM("code_8a860_len_3f30", func_800F513C); +INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F513C); void func_800F52BC(void) { func_800F1A10(); diff --git a/src/code_8e790_len_2850.c b/src/code_8e790_len_2850.c index b47268edb2..d9d940f77e 100644 --- a/src/code_8e790_len_2850.c +++ b/src/code_8e790_len_2850.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("code_8e790_len_2850", draw_box); +INCLUDE_ASM(s32, "code_8e790_len_2850", draw_box); diff --git a/src/code_9d10_len_1080.c b/src/code_9d10_len_1080.c index 305b3cf00b..0592bf3cb8 100644 --- a/src/code_9d10_len_1080.c +++ b/src/code_9d10_len_1080.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM("code_9d10_len_1080", do_camera_type_4); +INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_4); -INCLUDE_ASM("code_9d10_len_1080", do_camera_type_2); +INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_2); -INCLUDE_ASM("code_9d10_len_1080", do_camera_type_1); +INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_1); -INCLUDE_ASM("code_9d10_len_1080", do_camera_type_0); +INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_0); diff --git a/src/code_a5dd0_len_114e0.c b/src/code_a5dd0_len_114e0.c index 671f85cb3c..9ed0e0da3c 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/code_a5dd0_len_114e0.c @@ -1,30 +1,30 @@ #include "common.h" -INCLUDE_ASM("code_a5dd0_len_114e0", update_entities); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_entities); -INCLUDE_ASM("code_a5dd0_len_114e0", update_shadows); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_shadows); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FBC0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8010FBC0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FBD8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8010FBD8); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FD68); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8010FD68); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FD98); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8010FD98); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FE44); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8010FE44); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8010FE68); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8010FE68); -INCLUDE_ASM("code_a5dd0_len_114e0", render_entities); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_entities); -INCLUDE_ASM("code_a5dd0_len_114e0", render_shadows); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_shadows); -INCLUDE_ASM("code_a5dd0_len_114e0", update_entity_transform_matrix); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_entity_transform_matrix); -INCLUDE_ASM("code_a5dd0_len_114e0", update_shadow_transform_matrix); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_shadow_transform_matrix); -INCLUDE_ASM("code_a5dd0_len_114e0", update_entity_inverse_rotation_matrix); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_entity_inverse_rotation_matrix); Entity* get_entity_by_index(s32 index) { return (*gCurrentEntityListPtr)[index & 0xFFF]; @@ -56,59 +56,59 @@ Shadow** get_shadow_list(void) { return ret; } -INCLUDE_ASM("code_a5dd0_len_114e0", func_80110678); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80110678); -INCLUDE_ASM("code_a5dd0_len_114e0", get_entity_type); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_entity_type); -INCLUDE_ASM("code_a5dd0_len_114e0", delete_entity); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", delete_entity); -INCLUDE_ASM("code_a5dd0_len_114e0", delete_entity_and_unload_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", delete_entity_and_unload_data); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011085C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011085C); -INCLUDE_ASM("code_a5dd0_len_114e0", entity_get_collision_flags); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", entity_get_collision_flags); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801109DC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801109DC); -INCLUDE_ASM("code_a5dd0_len_114e0", test_player_entity_aabb); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", test_player_entity_aabb); s32 is_player_action_state(ActionState actionState) { return actionState == gPlayerActionState; } -INCLUDE_ASM("code_a5dd0_len_114e0", func_80110BCC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80110BCC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80110BF8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80110BF8); -INCLUDE_ASM("code_a5dd0_len_114e0", load_area_specific_entity_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_area_specific_entity_data); -INCLUDE_ASM("code_a5dd0_len_114e0", clear_entity_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", clear_entity_data); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80110E58); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80110E58); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80110F10); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80110F10); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801110B4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801110B4); -INCLUDE_ASM("code_a5dd0_len_114e0", is_entity_data_loaded); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", is_entity_data_loaded); -INCLUDE_ASM("code_a5dd0_len_114e0", load_simple_entity_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_simple_entity_data); -INCLUDE_ASM("code_a5dd0_len_114e0", load_split_entity_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_split_entity_data); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80111790); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80111790); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801117DC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801117DC); -INCLUDE_ASM("code_a5dd0_len_114e0", create_entity); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", create_entity); -INCLUDE_ASM("code_a5dd0_len_114e0", create_shadow_from_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", create_shadow_from_data); INCLUDE_API_ASM("code_a5dd0_len_114e0", MakeEntity); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80111E9C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80111E9C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80111F2C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80111F2C); INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignScript); @@ -122,295 +122,295 @@ INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignPanelFlag); INCLUDE_API_ASM("code_a5dd0_len_114e0", AssignCrateFlag); -INCLUDE_ASM("code_a5dd0_len_114e0", create_entity_shadow); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", create_entity_shadow); -INCLUDE_ASM("code_a5dd0_len_114e0", create_shadow_type); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", create_shadow_type); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112328); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112328); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112344); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112344); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801125E8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801125E8); -INCLUDE_ASM("code_a5dd0_len_114e0", set_standard_shadow_scale); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_standard_shadow_scale); -INCLUDE_ASM("code_a5dd0_len_114e0", set_npc_shadow_scale); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_npc_shadow_scale); -INCLUDE_ASM("code_a5dd0_len_114e0", set_peach_shadow_scale); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_peach_shadow_scale); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112B20); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B20); -INCLUDE_ASM("code_a5dd0_len_114e0", NOP_state); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", NOP_state); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112B98); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B98); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112BBC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112BBC); -INCLUDE_ASM("code_a5dd0_len_114e0", _set_game_mode); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", _set_game_mode); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112D84); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112D84); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112DD4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112DD4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112DFC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112DFC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112E24); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112E24); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112E4C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112E4C); -INCLUDE_ASM("code_a5dd0_len_114e0", step_current_game_mode); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", step_current_game_mode); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112EEC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112EEC); -INCLUDE_ASM("code_a5dd0_len_114e0", render_ui); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_ui); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80112FC4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112FC4); -INCLUDE_ASM("code_a5dd0_len_114e0", appendGfx_model); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", appendGfx_model); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80114B58); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80114B58); -INCLUDE_ASM("code_a5dd0_len_114e0", load_tile_header); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_tile_header); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80115498); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80115498); -INCLUDE_ASM("code_a5dd0_len_114e0", get_model_property); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_model_property); -INCLUDE_ASM("code_a5dd0_len_114e0", _load_model_textures); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", _load_model_textures); -INCLUDE_ASM("code_a5dd0_len_114e0", load_model_textures); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_model_textures); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80115CA8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80115CA8); -INCLUDE_ASM("code_a5dd0_len_114e0", clear_model_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", clear_model_data); -INCLUDE_ASM("code_a5dd0_len_114e0", init_model_data); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", init_model_data); -INCLUDE_ASM("code_a5dd0_len_114e0", calculate_model_sizes); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", calculate_model_sizes); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011620C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011620C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80116674); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80116674); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80116698); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80116698); -INCLUDE_ASM("code_a5dd0_len_114e0", render_models); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_models); -INCLUDE_ASM("code_a5dd0_len_114e0", appendGfx_model_group); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", appendGfx_model_group); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80117D00); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80117D00); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80117E74); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80117E74); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011800C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011800C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801180E8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801180E8); Model* get_model_from_list_index(s32 listIndex) { return (*gCurrentModelListPtr)[listIndex]; } -INCLUDE_ASM("code_a5dd0_len_114e0", load_data_for_models); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_data_for_models); -INCLUDE_ASM("code_a5dd0_len_114e0", load_model_transforms); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_model_transforms); -INCLUDE_ASM("code_a5dd0_len_114e0", get_model_list_index_from_tree_index); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_model_list_index_from_tree_index, s32 treeIndex); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B090); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B090); -INCLUDE_ASM_T(void, "code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY, +INCLUDE_ASM(void, "code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B1C0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B1C0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B1D8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B1D8); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B37C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B37C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B5D0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B5D0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B660); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B660); -INCLUDE_ASM_T(void, "code_a5dd0_len_114e0", clone_model, u16 srcModelID, u16 newModelID); +INCLUDE_ASM(void, "code_a5dd0_len_114e0", clone_model, u16 srcModelID, u16 newModelID); -INCLUDE_ASM_T(void, "code_a5dd0_len_114e0", func_8011B7C0, u16 arg0, s32 arg1, s32 arg2); +INCLUDE_ASM(void, "code_a5dd0_len_114e0", func_8011B7C0, u16 arg0, s32 arg1, s32 arg2); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011B950); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B950); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BAE8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BAE8); -INCLUDE_ASM("code_a5dd0_len_114e0", enable_world_fog); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", enable_world_fog); -INCLUDE_ASM("code_a5dd0_len_114e0", disable_world_fog); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", disable_world_fog); -INCLUDE_ASM("code_a5dd0_len_114e0", set_world_fog_dist); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_world_fog_dist); -INCLUDE_ASM("code_a5dd0_len_114e0", set_world_fog_color); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_world_fog_color); -INCLUDE_ASM("code_a5dd0_len_114e0", is_world_fog_enabled); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", is_world_fog_enabled); -INCLUDE_ASM("code_a5dd0_len_114e0", get_world_fog_distance); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_world_fog_distance); -INCLUDE_ASM("code_a5dd0_len_114e0", get_world_fog_color); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_world_fog_color); void set_tex_panner(Model* model, s8 texPannerID) { model->texPannerID = texPannerID; } -INCLUDE_ASM("code_a5dd0_len_114e0", set_main_pan_u); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_main_pan_u); -INCLUDE_ASM("code_a5dd0_len_114e0", set_main_pan_v); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_main_pan_v); -INCLUDE_ASM("code_a5dd0_len_114e0", set_aux_pan_u); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_aux_pan_u); -INCLUDE_ASM("code_a5dd0_len_114e0", set_aux_pan_v); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_aux_pan_v); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BC7C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BC7C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BCB4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCB4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BCD0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCD0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BCEC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCEC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BE14); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BE14); -INCLUDE_ASM("code_a5dd0_len_114e0", set_background_color_blend); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_background_color_blend); -INCLUDE_ASM("code_a5dd0_len_114e0", get_background_color_blend); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_background_color_blend); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BEB4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BEB4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BF14); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BF14); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BF98); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BF98); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011BFD4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BFD4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C028); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C028); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C0DC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C0DC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C130); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C130); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C164); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C164); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C2B0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C2B0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C2EC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C2EC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C32C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C32C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011C80C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C80C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011CFBC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011CFBC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D72C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D72C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D7E4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D7E4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D82C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D82C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D890); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D890); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D8D0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D8D0); -INCLUDE_ASM("code_a5dd0_len_114e0", queue_render_task); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", queue_render_task); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011D9B8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D9B8); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011DE80); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011DE80); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011DFD0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011DFD0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E014); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E014); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E058); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E058); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E09C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E09C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E0DC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E0DC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E150); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E150); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E1C4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E1C4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E224); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E224); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E310); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E310); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E398); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E398); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E400); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E400); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E438); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E438); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E4B8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E4B8); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E5E0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E5E0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E718); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E718); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011E8BC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011E8BC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011EA54); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011EA54); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011EBF0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011EBF0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F058); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F058); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F118); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F118); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F304); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F304); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F3E8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F3E8); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011F4D4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011F4D4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FA54); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FA54); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FF74); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FF74); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FF98); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FF98); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FFB4); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FFB4); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8011FFE0); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011FFE0); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120000); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120000); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120028); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120028); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8012003C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012003C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8012004C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012004C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120064); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120064); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8012008C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012008C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_8012009C); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8012009C); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801200B8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801200B8); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801200EC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801200EC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120118); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120118); -INCLUDE_ASM("code_a5dd0_len_114e0", play_model_animation); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", play_model_animation); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120198); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120198); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120234); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120234); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801203AC); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801203AC); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120420); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120420); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120474); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120474); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120530); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120530); -INCLUDE_ASM("code_a5dd0_len_114e0", func_80120678); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80120678); -INCLUDE_ASM("code_a5dd0_len_114e0", func_801206F8); +INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801206F8); diff --git a/src/code_ad90_len_2880.c b/src/code_ad90_len_2880.c index b5cf37f581..3631748d05 100644 --- a/src/code_ad90_len_2880.c +++ b/src/code_ad90_len_2880.c @@ -1,19 +1,19 @@ #include "common.h" -INCLUDE_ASM("code_ad90_len_2880", do_camera_type_6); +INCLUDE_ASM(s32, "code_ad90_len_2880", do_camera_type_6); -INCLUDE_ASM("code_ad90_len_2880", do_camera_type_unused); +INCLUDE_ASM(s32, "code_ad90_len_2880", do_camera_type_unused); -INCLUDE_ASM("code_ad90_len_2880", do_camera_type_5); +INCLUDE_ASM(s32, "code_ad90_len_2880", do_camera_type_5); -INCLUDE_ASM("code_ad90_len_2880", func_80030210); +INCLUDE_ASM(s32, "code_ad90_len_2880", func_80030210); -INCLUDE_ASM("code_ad90_len_2880", func_8003034C); +INCLUDE_ASM(s32, "code_ad90_len_2880", func_8003034C); -INCLUDE_ASM("code_ad90_len_2880", func_80030450); +INCLUDE_ASM(s32, "code_ad90_len_2880", func_80030450); -INCLUDE_ASM("code_ad90_len_2880", test_ray_zone_aabb); +INCLUDE_ASM(s32, "code_ad90_len_2880", test_ray_zone_aabb); -INCLUDE_ASM("code_ad90_len_2880", func_800304FC); +INCLUDE_ASM(s32, "code_ad90_len_2880", func_800304FC); -INCLUDE_ASM("code_ad90_len_2880", do_camera_type_3); +INCLUDE_ASM(s32, "code_ad90_len_2880", do_camera_type_3); diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index 20bd600df4..5c6b76e876 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -1,267 +1,267 @@ #include "common.h" -INCLUDE_ASM("code_b72b0_len_15ed0", clear_virtual_models); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_virtual_models); -INCLUDE_ASM("code_b72b0_len_15ed0", init_virtual_models); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_virtual_models); -INCLUDE_ASM("code_b72b0_len_15ed0", load_virtual_model); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_virtual_model); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80120DE4); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80120DE4); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80120F04); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80120F04); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80120FB8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80120FB8); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80121140); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121140); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80121184); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121184); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80121CE8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121CE8); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80121EB8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80121EB8); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122088); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122088); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122188); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122188); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122288); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122288); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122D7C); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122D7C); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122DDC); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122DDC); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122DFC); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122DFC); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122E94); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122E94); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122EE8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122EE8); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122F24); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122F24); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122F64); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122F64); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122F8C); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122F8C); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80122FB8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80122FB8); -INCLUDE_ASM("code_b72b0_len_15ed0", enable_entity_fog); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", enable_entity_fog); -INCLUDE_ASM("code_b72b0_len_15ed0", disable_entity_fog); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", disable_entity_fog); -INCLUDE_ASM("code_b72b0_len_15ed0", set_entity_fog_dist); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_entity_fog_dist); -INCLUDE_ASM("code_b72b0_len_15ed0", set_entity_fog_color); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_entity_fog_color); -INCLUDE_ASM("code_b72b0_len_15ed0", is_entity_fog_enabled); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", is_entity_fog_enabled); -INCLUDE_ASM("code_b72b0_len_15ed0", get_entity_fog_distance); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_distance); -INCLUDE_ASM("code_b72b0_len_15ed0", get_entity_fog_color); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_entity_fog_color); -INCLUDE_ASM("code_b72b0_len_15ed0", stub_dynamic_entity_delegate); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", stub_dynamic_entity_delegate); -INCLUDE_ASM("code_b72b0_len_15ed0", clear_dynamic_entity_list); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_dynamic_entity_list); -INCLUDE_ASM("code_b72b0_len_15ed0", init_dynamic_entity_list); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_dynamic_entity_list); -INCLUDE_ASM("code_b72b0_len_15ed0", bind_dynamic_entity_3); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_3); -INCLUDE_ASM("code_b72b0_len_15ed0", bind_dynamic_entity_7); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_7); -INCLUDE_ASM("code_b72b0_len_15ed0", bind_dynamic_entity_B); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", bind_dynamic_entity_B); -INCLUDE_ASM("code_b72b0_len_15ed0", update_dynamic_entities); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_dynamic_entities); -INCLUDE_ASM("code_b72b0_len_15ed0", render_dynamic_entities); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", render_dynamic_entities); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801234E0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801234E0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80123550); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80123550); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801235C0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801235C0); -INCLUDE_ASM("code_b72b0_len_15ed0", get_dynamic_entity); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_dynamic_entity); -INCLUDE_ASM("code_b72b0_len_15ed0", clear_character_set); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_character_set); -INCLUDE_ASM("code_b72b0_len_15ed0", clear_printers); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_printers); -INCLUDE_ASM("code_b72b0_len_15ed0", load_font_data); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_font_data); -INCLUDE_ASM("code_b72b0_len_15ed0", load_font); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_font); -INCLUDE_ASM("code_b72b0_len_15ed0", update_messages); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_messages); -INCLUDE_ASM("code_b72b0_len_15ed0", _update_message); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", _update_message); -INCLUDE_ASM("code_b72b0_len_15ed0", render_messages); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", render_messages); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80124434); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80124434); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80124570); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80124570); -INCLUDE_ASM("code_b72b0_len_15ed0", initialize_printer); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", initialize_printer); -INCLUDE_ASM("code_b72b0_len_15ed0", dma_load_string); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", dma_load_string); -INCLUDE_ASM("code_b72b0_len_15ed0", load_message_to_buffer); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_message_to_buffer); -INCLUDE_ASM("code_b72b0_len_15ed0", load_string); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_string); -INCLUDE_ASM("code_b72b0_len_15ed0", _load_string); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", _load_string); -INCLUDE_ASM("code_b72b0_len_15ed0", load_message_to_printer); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", load_message_to_printer); -INCLUDE_ASM("code_b72b0_len_15ed0", clamp_printer_coords); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clamp_printer_coords); -INCLUDE_ASM("code_b72b0_len_15ed0", cancel_message); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", cancel_message); -INCLUDE_ASM("code_b72b0_len_15ed0", set_message_images); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_message_images); -INCLUDE_ASM("code_b72b0_len_15ed0", set_message_string); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_message_string); -INCLUDE_ASM("code_b72b0_len_15ed0", set_message_value); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_message_value); -INCLUDE_ASM("code_b72b0_len_15ed0", close_message); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", close_message); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80125C84); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80125C84); -INCLUDE_ASM("code_b72b0_len_15ed0", get_char_width); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_char_width); -INCLUDE_ASM("code_b72b0_len_15ed0", get_string_properties); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_string_properties); -INCLUDE_ASM("code_b72b0_len_15ed0", get_string_width); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_string_width); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801264B0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801264B0); -INCLUDE_ASM("code_b72b0_len_15ed0", draw_string); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_string); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80126790); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80126790); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80126EAC); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80126EAC); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80126F78); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80126F78); -INCLUDE_ASM("code_b72b0_len_15ed0", draw_digit); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_digit); -INCLUDE_ASM("code_b72b0_len_15ed0", draw_number); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_number); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80127B70); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80127B70); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80127BA4); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80127BA4); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80127D90); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80127D90); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012C2E0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012C2E0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012C324); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012C324); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012C9A8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012C9A8); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012CA08); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012CA08); -INCLUDE_ASM("code_b72b0_len_15ed0", _draw_message_box); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", _draw_message_box); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012D3DC); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012D3DC); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012DB58); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012DB58); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012E8E0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012E8E0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012E9A0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012E9A0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012EC94); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012EC94); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012F500); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012F500); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012FE10); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012FE10); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8012FE78); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8012FE78); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801309F0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801309F0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80130A04); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130A04); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80130ACC); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130ACC); -INCLUDE_ASM("code_b72b0_len_15ed0", draw_coin_sparkles); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_coin_sparkles); -INCLUDE_ASM("code_b72b0_len_15ed0", get_item_entity); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", get_item_entity); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80130F70); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130F70); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80130FAC); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80130FAC); -INCLUDE_ASM("code_b72b0_len_15ed0", clear_item_entity_data); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_data); -INCLUDE_ASM("code_b72b0_len_15ed0", init_item_entity_list); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_item_entity_list); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80131128); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80131128); -INCLUDE_ASM("code_b72b0_len_15ed0", make_item_entity); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", make_item_entity); -INCLUDE_ASM("code_b72b0_len_15ed0", make_item_entity_nodelay); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", make_item_entity_nodelay); -INCLUDE_ASM_T(void, "code_b72b0_len_15ed0", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1, +INCLUDE_ASM(void, "code_b72b0_len_15ed0", make_item_entity_delayed, s32 itemID, f32 x, f32 y, f32 z, s32 unk1, s32 unk2, s32 unk3); -INCLUDE_ASM("code_b72b0_len_15ed0", init_got_item); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", init_got_item); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80131DD4); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80131DD4); -INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entities); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entities); -INCLUDE_ASM("code_b72b0_len_15ed0", appendGfx_item_entity); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", appendGfx_item_entity); -INCLUDE_ASM("code_b72b0_len_15ed0", draw_item_entities); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_item_entities); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80132D94); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80132D94); -INCLUDE_ASM("code_b72b0_len_15ed0", render_item_entities); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", render_item_entities); -INCLUDE_ASM("code_b72b0_len_15ed0", remove_item_entity_by_reference); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", remove_item_entity_by_reference); -INCLUDE_ASM("code_b72b0_len_15ed0", remove_item_entity_by_index); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", remove_item_entity_by_index); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80133A94); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133A94); -INCLUDE_ASM("code_b72b0_len_15ed0", test_item_player_collision); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", test_item_player_collision); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80133FC8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133FC8); -INCLUDE_ASM("code_b72b0_len_15ed0", set_item_entity_flags); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_item_entity_flags); -INCLUDE_ASM("code_b72b0_len_15ed0", clear_item_entity_flags); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_flags); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801341B0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801341B0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801341E8); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801341E8); -INCLUDE_ASM("code_b72b0_len_15ed0", set_item_entity_position); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_item_entity_position); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80134230); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80134230); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80134240); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80134240); -INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entity_collectable); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_collectable); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8013559C); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8013559C); -INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entity_static); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_static); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801356C4); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801356C4); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801356CC); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801356CC); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801356D4); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801356D4); -INCLUDE_ASM("code_b72b0_len_15ed0", update_item_entity_temp); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", update_item_entity_temp); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801363A0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801363A0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_8013673C); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_8013673C); -INCLUDE_ASM("code_b72b0_len_15ed0", func_801369D0); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_801369D0); -INCLUDE_ASM("code_b72b0_len_15ed0", func_80136A08); +INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80136A08); diff --git a/src/code_cd180_len_38f0.c b/src/code_cd180_len_38f0.c index fc948ae3a1..eb02bded87 100644 --- a/src/code_cd180_len_38f0.c +++ b/src/code_cd180_len_38f0.c @@ -1,41 +1,41 @@ #include "common.h" -INCLUDE_ASM("code_cd180_len_38f0", func_80136A80); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80136A80); -INCLUDE_ASM_T(void, "code_cd180_len_38f0", func_80137D88, s32 arg0, f32 arg1); +INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137D88, s32 arg0, f32 arg1); -INCLUDE_ASM_T(void, "code_cd180_len_38f0", func_80137DA4, s32 arg0, f32 arg1); +INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137DA4, s32 arg0, f32 arg1); -INCLUDE_ASM("code_cd180_len_38f0", func_80137DC0); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80137DC0); -INCLUDE_ASM_T(s32, "code_cd180_len_38f0", func_80137E10, s32 arg0, u8 arg1, u8 arg2, u8 arg3); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80137E10, s32 arg0, u8 arg1, u8 arg2, u8 arg3); -INCLUDE_ASM_T(void, "code_cd180_len_38f0", func_80137E4C, s32 arg0, s32 arg1, s32 arg2, s32 arg3); +INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137E4C, s32 arg0, s32 arg1, s32 arg2, s32 arg3); -INCLUDE_ASM("code_cd180_len_38f0", func_80137EC0); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80137EC0); -INCLUDE_ASM("code_cd180_len_38f0", func_801380D4); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801380D4); -INCLUDE_ASM("code_cd180_len_38f0", func_80138108); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138108); -INCLUDE_ASM("code_cd180_len_38f0", func_80138188); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138188); -INCLUDE_ASM("code_cd180_len_38f0", func_80138198); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138198); -INCLUDE_ASM("code_cd180_len_38f0", func_801381A0); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801381A0); -INCLUDE_ASM("code_cd180_len_38f0", func_80138220); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138220); -INCLUDE_ASM("code_cd180_len_38f0", set_map_transition_effect); +INCLUDE_ASM(s32, "code_cd180_len_38f0", set_map_transition_effect); -INCLUDE_ASM("code_cd180_len_38f0", func_801382AC); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801382AC); -INCLUDE_ASM("code_cd180_len_38f0", func_801385D4); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801385D4); -INCLUDE_ASM("code_cd180_len_38f0", func_80138740); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138740); -INCLUDE_ASM("code_cd180_len_38f0", func_80138D88); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138D88); -INCLUDE_ASM("code_cd180_len_38f0", func_80138E54); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138E54); -INCLUDE_ASM("code_cd180_len_38f0", func_80139F10); +INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80139F10); diff --git a/src/code_d0a70_len_4fe0.c b/src/code_d0a70_len_4fe0.c index 8be25f89fb..ef284e2ba0 100644 --- a/src/code_d0a70_len_4fe0.c +++ b/src/code_d0a70_len_4fe0.c @@ -1,61 +1,61 @@ #include "common.h" -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A370); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A370); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A37C); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A37C); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A4D0); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A4D0); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A610); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A610); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A650); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A650); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A6E8); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A6E8); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A704); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A704); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A854); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A854); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A888); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A888); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A8E0); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A8E0); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A920); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A920); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A93C); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A93C); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A9C8); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A9C8); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013A9E8); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A9E8); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013AA9C); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013AA9C); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013AF20); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013AF20); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013AF70); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013AF70); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013B0EC); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013B0EC); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013B1B0); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013B1B0); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013BC88); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013BC88); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013C048); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013C048); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013C220); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013C220); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013C3F0); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013C3F0); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013CFA8); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013CFA8); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013DAB4); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013DAB4); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013E2F0); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013E2F0); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013E904); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013E904); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013EE48); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013EE48); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013EE68); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013EE68); -INCLUDE_ASM("code_d0a70_len_4fe0", func_8013F1F8); +INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013F1F8); diff --git a/src/code_d5a50_len_5fd0.c b/src/code_d5a50_len_5fd0.c index ececbcae4c..21d68bb4b9 100644 --- a/src/code_d5a50_len_5fd0.c +++ b/src/code_d5a50_len_5fd0.c @@ -1,95 +1,95 @@ #include "common.h" -INCLUDE_ASM("code_d5a50_len_5fd0", func_8013F350); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_8013F350); -INCLUDE_ASM("code_d5a50_len_5fd0", func_8013F704); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_8013F704); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80141100); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80141100); -INCLUDE_ASM("code_d5a50_len_5fd0", init_menu_icon_list); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", init_menu_icon_list); -INCLUDE_ASM("code_d5a50_len_5fd0", func_801413F8); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801413F8); -INCLUDE_ASM("code_d5a50_len_5fd0", create_icon); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", create_icon); -INCLUDE_ASM("code_d5a50_len_5fd0", update_menu_icons); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", update_menu_icons); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80141704); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80141704); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80142210); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80142210); -INCLUDE_ASM("code_d5a50_len_5fd0", func_8014271C); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_8014271C); -INCLUDE_ASM("code_d5a50_len_5fd0", render_menu_icon); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", render_menu_icon); -INCLUDE_ASM("code_d5a50_len_5fd0", render_menu_icons); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", render_menu_icons); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80143C48); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80143C48); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144218); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144218); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144238); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144238); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144258); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144258); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144278); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144278); -INCLUDE_ASM("code_d5a50_len_5fd0", draw_menu_icon); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_menu_icon); -INCLUDE_ASM("code_d5a50_len_5fd0", draw_icon_0); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_icon_0); -INCLUDE_ASM("code_d5a50_len_5fd0", draw_icon_1); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_icon_1); -INCLUDE_ASM("code_d5a50_len_5fd0", draw_icon_2); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_icon_2); -INCLUDE_ASM("code_d5a50_len_5fd0", set_menu_icon_script); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", set_menu_icon_script); -INCLUDE_ASM("code_d5a50_len_5fd0", get_menu_icon_script); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_menu_icon_script); -INCLUDE_ASM("code_d5a50_len_5fd0", get_menu_icon); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_menu_icon); -INCLUDE_ASM("code_d5a50_len_5fd0", free_icon); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", free_icon); -INCLUDE_ASM("code_d5a50_len_5fd0", set_icon_render_pos); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", set_icon_render_pos); -INCLUDE_ASM("code_d5a50_len_5fd0", get_icon_render_pos); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_icon_render_pos); -INCLUDE_ASM("code_d5a50_len_5fd0", func_801449DC); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801449DC); -INCLUDE_ASM("code_d5a50_len_5fd0", set_icon_flags); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", set_icon_flags); -INCLUDE_ASM("code_d5a50_len_5fd0", clear_icon_flags); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", clear_icon_flags); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144A5C); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144A5C); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144C20); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144C20); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144DF4); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144DF4); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144E4C); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144E4C); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144E74); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144E74); -INCLUDE_ASM("code_d5a50_len_5fd0", icon_set_opacity); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", icon_set_opacity); -INCLUDE_ASM("code_d5a50_len_5fd0", icon_set_tint); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", icon_set_tint); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144F28); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144F28); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80144FD8); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144FD8); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80145070); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145070); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80145108); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145108); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80145184); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145184); -INCLUDE_ASM("code_d5a50_len_5fd0", func_801451D4); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801451D4); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80145224); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145224); -INCLUDE_ASM("code_d5a50_len_5fd0", func_80145274); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145274); -INCLUDE_ASM("code_d5a50_len_5fd0", func_801452B4); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801452B4); -INCLUDE_ASM("code_d5a50_len_5fd0", func_801452E8); +INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801452E8); diff --git a/src/code_d610_len_1330.c b/src/code_d610_len_1330.c index de9aa812a9..80a1686da3 100644 --- a/src/code_d610_len_1330.c +++ b/src/code_d610_len_1330.c @@ -1,21 +1,21 @@ #include "common.h" -INCLUDE_ASM("code_d610_len_1330", func_80032210); +INCLUDE_ASM(s32, "code_d610_len_1330", func_80032210); -INCLUDE_ASM("code_d610_len_1330", func_800322DC); +INCLUDE_ASM(s32, "code_d610_len_1330", func_800322DC); -INCLUDE_ASM("code_d610_len_1330", func_800325E4); +INCLUDE_ASM(s32, "code_d610_len_1330", func_800325E4); -INCLUDE_ASM("code_d610_len_1330", func_800328A4); +INCLUDE_ASM(s32, "code_d610_len_1330", func_800328A4); -INCLUDE_ASM("code_d610_len_1330", func_80032970); +INCLUDE_ASM(s32, "code_d610_len_1330", func_80032970); -INCLUDE_ASM("code_d610_len_1330", func_80032C64); +INCLUDE_ASM(s32, "code_d610_len_1330", func_80032C64); -INCLUDE_ASM("code_d610_len_1330", func_80033394); +INCLUDE_ASM(s32, "code_d610_len_1330", func_80033394); -INCLUDE_ASM("code_d610_len_1330", func_800334E8); +INCLUDE_ASM(s32, "code_d610_len_1330", func_800334E8); -INCLUDE_ASM("code_d610_len_1330", set_game_mode); +INCLUDE_ASM(s32, "code_d610_len_1330", set_game_mode); -INCLUDE_ASM("code_d610_len_1330", get_game_mode); +INCLUDE_ASM(s32, "code_d610_len_1330", get_game_mode); diff --git a/src/code_dba20_len_350.c b/src/code_dba20_len_350.c index a6783196d0..8c6abfcf79 100644 --- a/src/code_dba20_len_350.c +++ b/src/code_dba20_len_350.c @@ -22,7 +22,7 @@ void clear_saved_variables(void) { } } #else -INCLUDE_ASM("code_dba20_len_350", clear_saved_variables); +INCLUDE_ASM(s32, "code_dba20_len_350", clear_saved_variables); #endif #ifdef NON_MATCHING @@ -41,7 +41,7 @@ void clear_area_flags(void) { } } #else -INCLUDE_ASM("code_dba20_len_350", clear_area_flags); +INCLUDE_ASM(s32, "code_dba20_len_350", clear_area_flags); #endif s32 clear_global_flag(s32 index) { diff --git a/src/code_dbd70_len_700.c b/src/code_dbd70_len_700.c index f18c899c94..bdcd8704a0 100644 --- a/src/code_dbd70_len_700.c +++ b/src/code_dbd70_len_700.c @@ -4,7 +4,7 @@ void default_trigger_function_handler(s32* arg0) { arg0[0] |= 2; } -INCLUDE_ASM("code_dbd70_len_700", clear_trigger_data); +INCLUDE_ASM(s32, "code_dbd70_len_700", clear_trigger_data); void init_trigger_list(void) { if ((*gGameStatusPtr)->isBattle == 0) { @@ -16,9 +16,9 @@ void init_trigger_list(void) { gTriggerCount = 0; } -INCLUDE_ASM_T(Trigger*, "code_dbd70_len_700", create_trigger, TriggerDefinition* def); +INCLUDE_ASM(Trigger*, "code_dbd70_len_700", create_trigger, TriggerDefinition* def); -INCLUDE_ASM("code_dbd70_len_700", update_triggers); +INCLUDE_ASM(s32, "code_dbd70_len_700", update_triggers); void delete_trigger(Trigger* toDelete) { s32 i; @@ -35,7 +35,7 @@ void delete_trigger(Trigger* toDelete) { } } -INCLUDE_ASM("code_dbd70_len_700", is_trigger_bound); +INCLUDE_ASM(s32, "code_dbd70_len_700", is_trigger_bound); Trigger* get_trigger_by_id(s32 triggerID) { return (*gCurrentTriggerListPtr)[triggerID]; @@ -62,5 +62,5 @@ s32 func_80145CE8(s32 arg0) { return ret; } #else -INCLUDE_ASM("code_dbd70_len_700", func_80145CE8); +INCLUDE_ASM(s32, "code_dbd70_len_700", func_80145CE8); #endif diff --git a/src/code_dc470_len_14c0.c b/src/code_dc470_len_14c0.c index 5ee9b4fcd3..d0151b6166 100644 --- a/src/code_dc470_len_14c0.c +++ b/src/code_dc470_len_14c0.c @@ -68,8 +68,8 @@ u16 func_80145E98(s32 arg0, s32 arg1, s32 arg2) { return temp_lo; } -INCLUDE_ASM("code_dc470_len_14c0", func_80145EC0); +INCLUDE_ASM(s32, "code_dc470_len_14c0", func_80145EC0); -INCLUDE_ASM("code_dc470_len_14c0", func_8014720C); +INCLUDE_ASM(s32, "code_dc470_len_14c0", func_8014720C); -INCLUDE_ASM("code_dc470_len_14c0", func_8014721C); +INCLUDE_ASM(s32, "code_dc470_len_14c0", func_8014721C); diff --git a/src/code_ddaf0_len_c50.c b/src/code_ddaf0_len_c50.c index ba239ae740..ec27285311 100644 --- a/src/code_ddaf0_len_c50.c +++ b/src/code_ddaf0_len_c50.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_ASM("code_ddaf0_len_c50", func_801473F0); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_801473F0); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147414); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147414); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147474); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147474); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147574); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147574); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147650); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147650); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147698); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147698); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147AC4); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147AC4); -INCLUDE_ASM("code_ddaf0_len_c50", set_ui_panel_properties); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", set_ui_panel_properties); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147D70); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147D70); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147E48); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147E48); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147E7C); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147E7C); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147EC4); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147EC4); -INCLUDE_ASM("code_ddaf0_len_c50", func_80147F30); +INCLUDE_ASM(s32, "code_ddaf0_len_c50", func_80147F30); diff --git a/src/code_de740_len_23f0.c b/src/code_de740_len_23f0.c index 893ee91d71..a2ed49edc3 100644 --- a/src/code_de740_len_23f0.c +++ b/src/code_de740_len_23f0.c @@ -1,48 +1,48 @@ #include "common.h" -INCLUDE_ASM("code_de740_len_23f0", func_80148040); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80148040); -INCLUDE_ASM("code_de740_len_23f0", func_801480F0); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_801480F0); -INCLUDE_ASM("code_de740_len_23f0", func_80148154); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80148154); -INCLUDE_ASM("code_de740_len_23f0", func_801481C4); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_801481C4); -INCLUDE_ASM("code_de740_len_23f0", func_801489B8); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_801489B8); -INCLUDE_ASM("code_de740_len_23f0", func_801491E4); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_801491E4); -INCLUDE_ASM("code_de740_len_23f0", func_80149250); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149250); -INCLUDE_ASM("code_de740_len_23f0", func_80149600); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149600); -INCLUDE_ASM("code_de740_len_23f0", func_80149618); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149618); -INCLUDE_ASM("code_de740_len_23f0", func_80149670); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149670); -INCLUDE_ASM("code_de740_len_23f0", func_80149734); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149734); -INCLUDE_ASM("code_de740_len_23f0", func_801497FC); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_801497FC); -INCLUDE_ASM("code_de740_len_23f0", func_80149828); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149828); -INCLUDE_ASM("code_de740_len_23f0", func_80149838); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149838); -INCLUDE_ASM("code_de740_len_23f0", func_801498C4); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_801498C4); -INCLUDE_ASM("code_de740_len_23f0", func_80149908); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149908); -INCLUDE_ASM("code_de740_len_23f0", func_80149974); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149974); -INCLUDE_ASM("code_de740_len_23f0", func_801499EC); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_801499EC); -INCLUDE_ASM("code_de740_len_23f0", func_80149A6C); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149A6C); -INCLUDE_ASM("code_de740_len_23f0", _play_sound); +INCLUDE_ASM(s32, "code_de740_len_23f0", _play_sound); -INCLUDE_ASM("code_de740_len_23f0", func_80149BE4); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149BE4); -INCLUDE_ASM("code_de740_len_23f0", stop_sound); +INCLUDE_ASM(s32, "code_de740_len_23f0", stop_sound); void play_sound(s32 soundID) { _play_sound(soundID, 0, 0, 0); @@ -62,11 +62,11 @@ void play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) { } } -INCLUDE_ASM_T(s32, "code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, +INCLUDE_ASM(s32, "code_de740_len_23f0", play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); -INCLUDE_ASM("code_de740_len_23f0", func_80149E04); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149E04); -INCLUDE_ASM("code_de740_len_23f0", func_80149F58); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_80149F58); -INCLUDE_ASM("code_de740_len_23f0", func_8014A1B4); +INCLUDE_ASM(s32, "code_de740_len_23f0", func_8014A1B4); diff --git a/src/code_e0b30_len_b80.c b/src/code_e0b30_len_b80.c index 265d8db887..576166fd3e 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/code_e0b30_len_b80.c @@ -1,51 +1,51 @@ #include "common.h" -INCLUDE_ASM("code_e0b30_len_b80", get_default_variation_for_song); +INCLUDE_ASM(s32, "code_e0b30_len_b80", get_default_variation_for_song); -INCLUDE_ASM("code_e0b30_len_b80", func_8014A498); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A498); void func_8014A52C(void) { D_80159AE2 = 0x08; D_80159AE4 = 0x08; } -INCLUDE_ASM("code_e0b30_len_b80", func_8014A548); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A548); -INCLUDE_ASM("code_e0b30_len_b80", _set_music_track); +INCLUDE_ASM(s32, "code_e0b30_len_b80", _set_music_track); -INCLUDE_ASM_T(s32, "code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk, +INCLUDE_ASM(s32, "code_e0b30_len_b80", set_music_track, s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume); -INCLUDE_ASM("code_e0b30_len_b80", func_8014A964); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014A964); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AA54); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AA54); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AB0C); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AB0C); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AB60); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AB60); -INCLUDE_ASM("code_e0b30_len_b80", func_8014ABB4); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014ABB4); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AC08); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC08); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AC5C); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC5C); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AC70); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC70); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AC84); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC84); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AC94); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AC94); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AD40); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AD40); -INCLUDE_ASM("code_e0b30_len_b80", func_8014ADA4); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014ADA4); -INCLUDE_ASM("code_e0b30_len_b80", func_8014ADF8); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014ADF8); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AE6C); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AE6C); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AEF8); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AEF8); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AF8C); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AF8C); -INCLUDE_ASM("code_e0b30_len_b80", func_8014AFA0); +INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AFA0); diff --git a/src/code_e20eb0.c b/src/code_e20eb0.c index 25f95b2610..4f04788920 100644 --- a/src/code_e20eb0.c +++ b/src/code_e20eb0.c @@ -15,8 +15,8 @@ s32 func_802B7000(f32 angle) { return 0xFF - angleDiff - angleDiff; } -INCLUDE_ASM("code_e20eb0", func_802B70B4); +INCLUDE_ASM(s32, "code_e20eb0", func_802B70B4); -INCLUDE_ASM("code_e20eb0", func_802B71C8); +INCLUDE_ASM(s32, "code_e20eb0", func_802B71C8); -INCLUDE_ASM("code_e20eb0", func_802B742C); +INCLUDE_ASM(s32, "code_e20eb0", func_802B742C); diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c index 7c0659ff3f..7e84786229 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/code_e79b0_len_1920.c @@ -1,24 +1,24 @@ #include "common.h" -INCLUDE_ASM("code_e79b0_len_1920", sort_scripts); +INCLUDE_ASM(s32, "code_e79b0_len_1920", sort_scripts); -INCLUDE_ASM("code_e79b0_len_1920", find_script_labels); +INCLUDE_ASM(s32, "code_e79b0_len_1920", find_script_labels); -INCLUDE_ASM("code_e79b0_len_1920", clear_script_list); +INCLUDE_ASM(s32, "code_e79b0_len_1920", clear_script_list); -INCLUDE_ASM("code_e79b0_len_1920", init_script_list); +INCLUDE_ASM(s32, "code_e79b0_len_1920", init_script_list); -INCLUDE_ASM("code_e79b0_len_1920", func_802C3390); +INCLUDE_ASM(s32, "code_e79b0_len_1920", func_802C3390); -INCLUDE_ASM("code_e79b0_len_1920", start_script); +INCLUDE_ASM(s32, "code_e79b0_len_1920", start_script); -INCLUDE_ASM("code_e79b0_len_1920", start_script_in_group); +INCLUDE_ASM(s32, "code_e79b0_len_1920", start_script_in_group); -INCLUDE_ASM("code_e79b0_len_1920", start_child_script); +INCLUDE_ASM(s32, "code_e79b0_len_1920", start_child_script); -INCLUDE_ASM("code_e79b0_len_1920", func_802C39F8); +INCLUDE_ASM(s32, "code_e79b0_len_1920", func_802C39F8); -INCLUDE_ASM("code_e79b0_len_1920", func_802C3C10); +INCLUDE_ASM(s32, "code_e79b0_len_1920", func_802C3C10); ScriptInstance* restart_script(ScriptInstance* script) { Bytecode* ptrFirstLine = script->ptrFirstLine; @@ -44,11 +44,11 @@ ScriptInstance* restart_script(ScriptInstance* script) { return script; } -INCLUDE_ASM("code_e79b0_len_1920", update_scripts); +INCLUDE_ASM(s32, "code_e79b0_len_1920", update_scripts); -INCLUDE_ASM("code_e79b0_len_1920", func_802C3EE4); +INCLUDE_ASM(s32, "code_e79b0_len_1920", func_802C3EE4); -INCLUDE_ASM("code_e79b0_len_1920", kill_script); +INCLUDE_ASM(s32, "code_e79b0_len_1920", kill_script); void kill_script_by_ID(s32 id) { s32 i; @@ -112,7 +112,7 @@ void set_global_timespace(f32 timeScale) { //gGlobalTimeSpace = timeScale; } #else -INCLUDE_ASM("code_e79b0_len_1920", set_global_timespace); +INCLUDE_ASM(s32, "code_e79b0_len_1920", set_global_timespace); #endif #ifdef NON_MATCHING @@ -121,7 +121,7 @@ f32 get_global_timespace(void) { //return gGlobalTimeSpace; } #else -INCLUDE_ASM("code_e79b0_len_1920", get_global_timespace); +INCLUDE_ASM(s32, "code_e79b0_len_1920", get_global_timespace); #endif void set_script_group(ScriptInstance* script, s8 groupFlags) { diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c index 11ceb3c107..de97de8648 100644 --- a/src/code_e92d0_len_5da0.c +++ b/src/code_e92d0_len_5da0.c @@ -1,5 +1,11 @@ #include "common.h" +s32 si_find_label(ScriptInstance* script, s32 arg1); +s32 si_skip_if(ScriptInstance* script); +s32 si_skip_else(ScriptInstance* script); +s32 si_goto_end_loop(ScriptInstance* script); +s32 si_goto_end_case(ScriptInstance* script); + f32 fixed_var_to_float(s32 scriptVar) { if (scriptVar <= -220000000) { return (scriptVar + 230000000) * (1 / 1024.0f); @@ -38,7 +44,7 @@ ApiStatus si_handle_loop(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_end_loop); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_end_loop); ApiStatus si_handle_break_loop(ScriptInstance* script) { ASSERT(script->loopDepth >= 0); @@ -199,19 +205,19 @@ ApiStatus si_handle_switch_const(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_equal); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_equal); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_not_equal); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_not_equal); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_less); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_less); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_less_equal); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_less_equal); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_greater); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_greater); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_greater_equal); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_greater_equal); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_range); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_range); ApiStatus si_handle_case_default(ScriptInstance* script) { s32 switchDepth = script->switchDepth; @@ -228,13 +234,13 @@ ApiStatus si_handle_case_default(ScriptInstance* script) { do {} while (0); // Necessary to match } -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_AND); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_AND); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_equal_OR); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_equal_OR); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_case_equal_AND); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_case_equal_AND); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_end_case_group); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_end_case_group); ApiStatus si_handle_break_case(ScriptInstance* script) { ASSERT(script->switchDepth >= 0); @@ -556,12 +562,19 @@ ApiStatus si_handle_allocate_array(ScriptInstance* script) { s32 size = get_variable(script, *thisPos++); Bytecode var = *thisPos++; - script->array = heap_malloc(size * 4); - set_variable(script, var, script->array); + script->array = (s32)heap_malloc(size * 4); + set_variable(script, var, (s32)script->array); return ApiStatus_DONE2; } -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_AND); +ApiStatus si_handle_AND(ScriptInstance* script) { + Bytecode var = script->ptrReadPos[0]; + s32 val = get_variable(script, script->ptrReadPos[1]); + + val &= get_variable(script, var); + set_variable(script, var, val); + return ApiStatus_DONE2; +} ApiStatus si_handle_AND_const(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -575,7 +588,14 @@ ApiStatus si_handle_AND_const(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_OR); +ApiStatus si_handle_OR(ScriptInstance* script) { + Bytecode var = script->ptrReadPos[0]; + s32 val = get_variable(script, script->ptrReadPos[1]); + + val |= get_variable(script, var); + set_variable(script, var, val); + return ApiStatus_DONE2; +} ApiStatus si_handle_OR_const(ScriptInstance* script) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -589,11 +609,11 @@ ApiStatus si_handle_OR_const(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_call); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_call); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_exec1); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_exec1); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_exec2); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_exec2); ApiStatus si_handle_exec_wait(ScriptInstance* script) { start_child_script(script, get_variable(script, *script->ptrReadPos), 0); @@ -607,9 +627,9 @@ ApiStatus si_handle_jump(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM_T(s32, "code_e92d0_len_5da0", _bound_script_trigger_handler, Trigger* trigger); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", _bound_script_trigger_handler, Trigger* trigger); -INCLUDE_ASM("code_e92d0_len_5da0", si_handle_bind); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_handle_bind); ApiStatus DeleteTrigger(ScriptInstance* script, s32 isInitialCall) { delete_trigger(get_variable(script, *script->ptrReadPos)); @@ -671,9 +691,16 @@ ApiStatus si_handle_resume(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_API_ASM("code_e92d0_len_5da0", si_handle_does_script_exist); +ApiStatus si_handle_does_script_exist(ScriptInstance* script) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode scriptID = get_variable(script, *thisPos++); + Bytecode var2 = *thisPos++; -INCLUDE_ASM("code_e92d0_len_5da0", func_802C6AD0); + set_variable(script, var2, does_script_exist(scriptID)); + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_e92d0_len_5da0", func_802C6AD0); INCLUDE_API_ASM("code_e92d0_len_5da0", si_handle_bind_lock); @@ -718,7 +745,7 @@ s32 func_802C73B8(ScriptInstance* script) { return 1; } -INCLUDE_ASM("code_e92d0_len_5da0", si_execute_next_command); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_execute_next_command); // TODO: consider renaming to si_get_variable #ifdef NON_MATCHING @@ -776,22 +803,22 @@ s32 get_variable(ScriptInstance* script, Bytecode var) { } } #else -INCLUDE_ASM_T(s32, "code_e92d0_len_5da0", get_variable, ScriptInstance* script, Bytecode var); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", get_variable, ScriptInstance* script, Bytecode var); #endif -INCLUDE_ASM("code_e92d0_len_5da0", get_variable_index); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", get_variable_index); -INCLUDE_ASM("code_e92d0_len_5da0", get_variable_index_alt); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", get_variable_index_alt); -INCLUDE_ASM_T(s32, "code_e92d0_len_5da0", set_variable, ScriptInstance* script, Bytecode var, s32 value); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", set_variable, ScriptInstance* script, Bytecode var, s32 value); -INCLUDE_ASM_T(f32, "code_e92d0_len_5da0", get_float_variable, ScriptInstance* script, Bytecode var); +INCLUDE_ASM(f32, "code_e92d0_len_5da0", get_float_variable, ScriptInstance* script, Bytecode var); -INCLUDE_ASM_T(f32, "code_e92d0_len_5da0", set_float_variable, ScriptInstance* script, Bytecode var, f32 value); +INCLUDE_ASM(f32, "code_e92d0_len_5da0", set_float_variable, ScriptInstance* script, Bytecode var, f32 value); -INCLUDE_ASM("code_e92d0_len_5da0", si_find_label); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_find_label, ScriptInstance* script, s32 arg1); -INCLUDE_ASM("code_e92d0_len_5da0", si_skip_if); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_skip_if, ScriptInstance* script); // Matching but needs rodata support /*Bytecode* si_skip_if(ScriptInstance* script) { s32 nestedIfDepth = 0; @@ -831,7 +858,7 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_skip_if); } while(1); }*/ -INCLUDE_ASM("code_e92d0_len_5da0", si_skip_else); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_skip_else, ScriptInstance* script); // Matching but needs rodata support /*Bytecode* si_skip_else(ScriptInstance* script) { s32 nestedIfDepth = 0; @@ -867,11 +894,11 @@ INCLUDE_ASM("code_e92d0_len_5da0", si_skip_else); } while(1); }*/ -INCLUDE_ASM("code_e92d0_len_5da0", si_goto_end_case); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_goto_end_case, ScriptInstance* script); -INCLUDE_ASM("code_e92d0_len_5da0", si_goto_next_case); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_goto_next_case, ScriptInstance* script); -INCLUDE_ASM("code_e92d0_len_5da0", si_goto_end_loop); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", si_goto_end_loop, ScriptInstance* script); // Ethan: I think this is the start of a new file //INCLUDE_API_ASM("code_e92d0_len_5da0", TranslateModel); @@ -924,20 +951,75 @@ ApiStatus GetModelCenter(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM("code_e92d0_len_5da0", SetTexPanner); +ApiStatus SetTexPanner(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s32 treeIndex = get_variable(script, *thisPos++); + s32 var2 = get_variable(script, *thisPos++); + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); -INCLUDE_API_ASM("code_e92d0_len_5da0", SetModelFlag10); + set_tex_panner(model, var2); + model->flags |= 0x800; + return ApiStatus_DONE2; +} -INCLUDE_ASM("code_e92d0_len_5da0", func_802C90FC); +ApiStatus SetModelFlag10(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode treeIndex = get_variable(script, *thisPos++); + Bytecode var2 = get_variable(script, *thisPos++); + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); + + if (var2 != 0) { + model->flags |= 0x10; + } else { + model->flags &= ~0x10; + } + return ApiStatus_DONE2; +} -INCLUDE_ASM("code_e92d0_len_5da0", func_802C91A4); +#ifdef NON_MATCHING +ApiStatus func_802C90FC(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s32 treeIndex = get_variable(script, *thisPos++); + s32 var2 = get_variable(script, *thisPos++); + s32 var3 = get_variable(script, *thisPos++); + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); + + func_8011BC7C(model, var2, var3); + if (var2 != -1) { + model->flags |= 0x10; + } + return ApiStatus_DONE2; +} +#else +INCLUDE_ASM(s32, "code_e92d0_len_5da0", func_802C90FC); +#endif -INCLUDE_API_ASM("code_e92d0_len_5da0", EnableTexPanning); +ApiStatus func_802C91A4(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + Bytecode treeIndex = get_variable(script, *thisPos++); + Bytecode var2 = get_variable(script, *thisPos++); + + get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex))->unk_A9 = var2; + return ApiStatus_DONE2; +} + +ApiStatus EnableTexPanning(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s32 treeIndex = get_variable(script, *thisPos++); + s32 flag = get_variable(script, *thisPos++); + Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); + + if (flag) { + model->flags |= 0x800; + } else { + model->flags &= ~0x800; + } + return ApiStatus_DONE2; +} ApiStatus EnableModel(ScriptInstance* script, s32 isInitialCall) { Bytecode* thisPos = script->ptrReadPos; - Bytecode treeIndex = get_variable(script, *thisPos++); - s32 listIndex = get_model_list_index_from_tree_index(treeIndex); + s32 listIndex = get_model_list_index_from_tree_index(get_variable(script, *thisPos++)); Bytecode flag = get_variable(script, *thisPos++); Model* model = get_model_from_list_index(listIndex); @@ -960,17 +1042,47 @@ ApiStatus SetGroupEnabled(ScriptInstance* script, s32 isInitialCall) { INCLUDE_API_ASM("code_e92d0_len_5da0", SetTexPanOffset); -INCLUDE_ASM("code_e92d0_len_5da0", func_802C9428); +ApiStatus func_802C9428(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s32 var1 = get_variable(script, *thisPos++); + s32 var2 = get_variable(script, *thisPos++); + s32 var3 = get_variable(script, *thisPos++); -INCLUDE_ASM("code_e92d0_len_5da0", func_802C94A0); + func_8011BCB4(var1, var2, var3); + return ApiStatus_DONE2; +} + +ApiStatus func_802C94A0(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s32 var1 = get_variable(script, *thisPos++); + s32 var2 = get_variable(script, *thisPos++); + s32 var3 = get_variable(script, *thisPos++); + + func_8011BCD0(var1, var2, var3); + return ApiStatus_DONE2; +} INCLUDE_API_ASM("code_e92d0_len_5da0", SetModelFlags); -INCLUDE_ASM("code_e92d0_len_5da0", func_802C95A0); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", func_802C95A0); -INCLUDE_ASM("code_e92d0_len_5da0", func_802C971C); +ApiStatus func_802C971C(ScriptInstance* script, s32 isInitialCall) { + func_8011B37C((u16)get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} -INCLUDE_ASM("code_e92d0_len_5da0", func_802C9748); +ApiStatus func_802C9748(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + u16 var1 = get_variable(script, *thisPos++); + s32 var2 = get_variable(script, *thisPos++); + + if (var2 != 0) { + func_8011B5D0(var1); + } else { + func_8011B660(var1); + } + return ApiStatus_DONE2; +} INCLUDE_API_ASM("code_e92d0_len_5da0", TranslateGroup); @@ -978,19 +1090,34 @@ INCLUDE_API_ASM("code_e92d0_len_5da0", RotateGroup); INCLUDE_API_ASM("code_e92d0_len_5da0", ScaleGroup); -INCLUDE_ASM("code_e92d0_len_5da0", func_802C9B40); +ApiStatus func_802C9B40(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s32 var1 = get_variable(script, *thisPos++); + Bytecode var2 = *thisPos++; + + set_variable(script, var2, func_8011B090(var1)); + return ApiStatus_DONE2; +} INCLUDE_API_ASM("code_e92d0_len_5da0", EnableGroup); -INCLUDE_ASM("code_e92d0_len_5da0", func_802C9C70); +ApiStatus func_802C9C70(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s32 var1 = get_variable(script, *thisPos++); + u16 var2 = get_variable(script, *thisPos++); + s32 var3 = get_variable(script, *thisPos++); -INCLUDE_ASM("code_e92d0_len_5da0", modify_collider_family_flags); + func_8011C164(var1, var2, var3); + return ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "code_e92d0_len_5da0", modify_collider_family_flags); INCLUDE_API_ASM("code_e92d0_len_5da0", ModifyColliderFlags); INCLUDE_API_ASM("code_e92d0_len_5da0", ResetFromLava); -INCLUDE_ASM("code_e92d0_len_5da0", func_802C9FD4); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", func_802C9FD4); ApiStatus GetColliderCenter(ScriptInstance* script, s32 initialCall) { f32 x; @@ -1006,18 +1133,26 @@ ApiStatus GetColliderCenter(ScriptInstance* script, s32 initialCall) { return ApiStatus_DONE2; } -INCLUDE_API_ASM("code_e92d0_len_5da0", ParentColliderToModel); +ApiStatus ParentColliderToModel(ScriptInstance* script, s32 isInitialCall) { + Bytecode* thisPos = script->ptrReadPos; + s16 colliderID = get_variable(script, *thisPos++); + s32 treeIndex = get_variable(script, *thisPos++); + + parent_collider_to_model(colliderID, get_model_list_index_from_tree_index(treeIndex)); + update_collider_transform(colliderID); + return ApiStatus_DONE2; +} ApiStatus UpdateColliderTransform(ScriptInstance* script, s32 isInitialCall) { update_collider_transform(get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } -INCLUDE_ASM("code_e92d0_len_5da0", set_zone_enabled); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", set_zone_enabled); -INCLUDE_ASM("code_e92d0_len_5da0", SetZoneEnabled); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", SetZoneEnabled); -INCLUDE_ASM("code_e92d0_len_5da0", goto_map); +INCLUDE_ASM(s32, "code_e92d0_len_5da0", goto_map); ApiStatus GotoMap(ScriptInstance* script, s32 isInitialCall) { goto_map(script, 0); diff --git a/src/code_e940_len_290.c b/src/code_e940_len_290.c index 56938ad053..bbf051b9ab 100644 --- a/src/code_e940_len_290.c +++ b/src/code_e940_len_290.c @@ -5,7 +5,7 @@ void begin_state_init(void) { GAME_STATUS->loadMenuState = 3; } -INCLUDE_ASM("code_e940_len_290", step_init_state); +INCLUDE_ASM(s32, "code_e940_len_290", step_init_state); void func_80033788(void) { func_8002AB5C(0, 0, 0x13F, 0xEF, 0, 0, 0, 0xFF); diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c index be9b52a31c..1b8301d968 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/code_ebd0_len_6a0.c @@ -51,7 +51,7 @@ void begin_state_battle(void) { D_800A0900 = 5; } -INCLUDE_ASM("code_ebd0_len_6a0", step_battle); +INCLUDE_ASM(s32, "code_ebd0_len_6a0", step_battle); void func_80033B54(void) { func_8003E5B0(); @@ -66,7 +66,7 @@ void func_80033B88(void) { D_800A0900 = 5; } -INCLUDE_ASM("code_ebd0_len_6a0", func_80033BC0); +INCLUDE_ASM(s32, "code_ebd0_len_6a0", func_80033BC0); void func_80033E64(void) { } diff --git a/src/code_ef070_len_3400.c b/src/code_ef070_len_3400.c index 2f31908609..b272dd4c02 100644 --- a/src/code_ef070_len_3400.c +++ b/src/code_ef070_len_3400.c @@ -33,7 +33,7 @@ ApiStatus SetCamPerspective(ScriptInstance* script, s32 isInitialCall) { f32 vfov = get_float_variable(script, *args++); s16 nearClip = get_variable(script, *args++); s16 farClip = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->farClip = farClip; @@ -49,7 +49,7 @@ ApiStatus func_802CA90C(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); s16 mode = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->mode = mode; @@ -115,7 +115,7 @@ ApiStatus func_802CABE8(ScriptInstance* script, s32 isInitialCall) { s32 value2 = get_variable(script, *args++); s32 value3 = get_variable(script, *args++); s16 value4 = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->unk_22 = value4; @@ -132,7 +132,7 @@ ApiStatus func_802CACC0(ScriptInstance* script, s32 isInitialCall) { s32 value2 = get_variable(script, *args++); s32 value3 = get_variable(script, *args++); s16 zoomPercent = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->zoomPercent = zoomPercent; @@ -148,7 +148,7 @@ ApiStatus SetCamBGColor(ScriptInstance* script, s32 isInitialCall) { s16 r = get_variable(script, *args++); s16 g = get_variable(script, *args++); s16 b = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->backgroundColor[0] = r; @@ -163,7 +163,7 @@ ApiStatus func_802CAE50(ScriptInstance* script, s32 isInitialCall) { s32 value1 = get_variable(script, *args++); s32 value2 = get_variable(script, *args++); s32 value3 = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->unk_54 = value1; @@ -178,7 +178,7 @@ ApiStatus SetCamTarget(ScriptInstance* script, s32 isInitialCall) { s32 x = get_variable(script, *args++); s32 y = get_variable(script, *args++); s32 z = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->targetPos.x = x; @@ -191,15 +191,15 @@ INCLUDE_API_ASM("code_ef070_len_3400", func_802CB008); INCLUDE_API_ASM("code_ef070_len_3400", ShakeCam); -INCLUDE_ASM("code_ef070_len_3400", exec_ShakeCam1); +INCLUDE_ASM(s32, "code_ef070_len_3400", exec_ShakeCam1); -INCLUDE_ASM("code_ef070_len_3400", exec_ShakeCamX); +INCLUDE_ASM(s32, "code_ef070_len_3400", exec_ShakeCamX); ApiStatus SetCamLeadPlayer(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); s32 enabled = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; if (enabled) { @@ -214,7 +214,7 @@ ApiStatus func_802CB710(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); f32 value = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->unk_520 = (value / 100.0f); @@ -226,7 +226,7 @@ ApiStatus PanToTarget(ScriptInstance* script, s32 isInitialCall) { s32 id = get_variable(script, *args++); f32 panPhase = get_float_variable(script, *args++); s32 targetType = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->unk_506 = 1; @@ -248,7 +248,7 @@ INCLUDE_API_ASM("code_ef070_len_3400", LoadSettings); ApiStatus SetCamType(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; s32 controllerType = get_variable(script, *args++); s32 enabled = get_variable(script, *args++); @@ -261,7 +261,7 @@ ApiStatus SetCamType(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetCamPitch(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; f32 boomPitch = get_float_variable(script, *args++); f32 viewPitch = get_float_variable(script, *args++); @@ -274,7 +274,7 @@ ApiStatus SetCamPitch(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetCamDistance(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; f32 boomLength = get_float_variable(script, *args++); @@ -285,7 +285,7 @@ ApiStatus SetCamDistance(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetCamPosA(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; f32 x = get_float_variable(script, *args++); f32 z = get_float_variable(script, *args++); @@ -298,7 +298,7 @@ ApiStatus SetCamPosA(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetCamPosB(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; f32 x = get_float_variable(script, *args++); f32 z = get_float_variable(script, *args++); @@ -311,7 +311,7 @@ ApiStatus SetCamPosB(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetCamPosC(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; f32 y1 = get_float_variable(script, *args++); f32 y2 = get_float_variable(script, *args++); @@ -324,7 +324,7 @@ ApiStatus SetCamPosC(ScriptInstance* script, s32 isInitialCall) { ApiStatus SetPanTarget(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; f32 x = get_float_variable(script, *args++); f32 y = get_float_variable(script, *args++); @@ -341,7 +341,7 @@ ApiStatus SetCamSpeed(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); f32 speed = get_float_variable(script, *args++); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; camera->moveSpeed = speed; @@ -353,7 +353,7 @@ ApiStatus GetCamType(ScriptInstance* script, s32 isInitialCall) { s32 id = get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; set_variable(script, outVar1, camera->controllerType); @@ -366,7 +366,7 @@ ApiStatus GetCamPitch(ScriptInstance* script, s32 isInitialCall) { s32 id = get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; set_float_variable(script, outVar1, camera->controllerBoomPitch); @@ -378,7 +378,7 @@ ApiStatus GetCamDistance(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, *args++); Bytecode outVar1 = *args++; - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; set_float_variable(script, outVar1, camera->controllerBoomLen); @@ -390,7 +390,7 @@ ApiStatus GetCamPosA(ScriptInstance* script, s32 isInitialCall) { s32 id = get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; set_float_variable(script, outVar1, camera->posA.x); @@ -403,7 +403,7 @@ ApiStatus GetCamPosB(ScriptInstance* script, s32 isInitialCall) { s32 id = get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; set_float_variable(script, outVar1, camera->posB.x); @@ -416,7 +416,7 @@ ApiStatus GetCamPosC(ScriptInstance* script, s32 isInitialCall) { s32 id = get_variable(script, *args++); Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; set_float_variable(script, outVar1, camera->posA.y); @@ -430,7 +430,7 @@ ApiStatus GetCamPosition(ScriptInstance* script, s32 isInitialCall) { Bytecode outVar1 = *args++; Bytecode outVar2 = *args++; Bytecode outVar3 = *args++; - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; set_float_variable(script, outVar1, camera->movePos.x); @@ -443,7 +443,7 @@ ApiStatus WaitForCam(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 id = get_variable(script, args[0]); f32 endInterpValue = get_float_variable(script, args[1]); - Camera* cameras = &gCameras; + Camera* cameras = gCameras; Camera* camera = &cameras[id]; if (isInitialCall || !(endInterpValue <= camera->sinInterpAlpha)) { @@ -458,48 +458,48 @@ INCLUDE_API_ASM("code_ef070_len_3400", AdjustCam); INCLUDE_API_ASM("code_ef070_len_3400", ResetCam); -INCLUDE_ASM("code_ef070_len_3400", func_802CCAC0); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CCAC0); -INCLUDE_ASM("code_ef070_len_3400", draw_anim_models); +INCLUDE_ASM(s32, "code_ef070_len_3400", draw_anim_models); -INCLUDE_ASM("code_ef070_len_3400", func_802CCCB0); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CCCB0); -INCLUDE_ASM("code_ef070_len_3400", LoadModelAnimation); +INCLUDE_ASM(s32, "code_ef070_len_3400", LoadModelAnimation); -INCLUDE_ASM("code_ef070_len_3400", func_802CCDAC); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CCDAC); -INCLUDE_ASM("code_ef070_len_3400", PlayModelAnimation); +INCLUDE_ASM(s32, "code_ef070_len_3400", PlayModelAnimation); -INCLUDE_ASM("code_ef070_len_3400", func_802CCEDC); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CCEDC); -INCLUDE_ASM("code_ef070_len_3400", ChangeModelAnimation); +INCLUDE_ASM(s32, "code_ef070_len_3400", ChangeModelAnimation); -INCLUDE_ASM("code_ef070_len_3400", SetAnimModelPosition); +INCLUDE_ASM(s32, "code_ef070_len_3400", SetAnimModelPosition); -INCLUDE_ASM("code_ef070_len_3400", GetAnimModelPosition); +INCLUDE_ASM(s32, "code_ef070_len_3400", GetAnimModelPosition); -INCLUDE_ASM("code_ef070_len_3400", AddAnimModelPosition); +INCLUDE_ASM(s32, "code_ef070_len_3400", AddAnimModelPosition); -INCLUDE_ASM("code_ef070_len_3400", SetAnimModelRotation); +INCLUDE_ASM(s32, "code_ef070_len_3400", SetAnimModelRotation); -INCLUDE_ASM("code_ef070_len_3400", SetAnimModelScale); +INCLUDE_ASM(s32, "code_ef070_len_3400", SetAnimModelScale); -INCLUDE_ASM("code_ef070_len_3400", func_802CD348); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD348); -INCLUDE_ASM("code_ef070_len_3400", func_802CD3C0); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD3C0); -INCLUDE_ASM("code_ef070_len_3400", func_802CD418); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD418); -INCLUDE_ASM("code_ef070_len_3400", func_802CD4B4); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD4B4); -INCLUDE_ASM("code_ef070_len_3400", func_802CD57C); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD57C); -INCLUDE_ASM("code_ef070_len_3400", func_802CD5C0); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD5C0); -INCLUDE_ASM("code_ef070_len_3400", func_802CD6E0); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD6E0); -INCLUDE_ASM("code_ef070_len_3400", func_802CD7D8); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD7D8); -INCLUDE_ASM("code_ef070_len_3400", func_802CD8F8); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD8F8); -INCLUDE_ASM("code_ef070_len_3400", func_802CD9F0); +INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD9F0); diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c index 471610835c..9dc5a659e9 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/code_f2470_len_27f0.c @@ -10,9 +10,9 @@ Npc* resolve_npc(ScriptInstance* script, NpcId npcIdOrPtr) { } } -INCLUDE_ASM("code_f2470_len_27f0", set_npc_animation); +INCLUDE_ASM(s32, "code_f2470_len_27f0", set_npc_animation); -INCLUDE_ASM("code_f2470_len_27f0", CreateNpc); +INCLUDE_ASM(s32, "code_f2470_len_27f0", CreateNpc); ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -145,7 +145,7 @@ ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { INCLUDE_API_ASM("code_f2470_len_27f0", NpcMoveTo); -INCLUDE_ASM("code_f2470_len_27f0", _npc_jump_to); +INCLUDE_ASM(s32, "code_f2470_len_27f0", _npc_jump_to); void NpcJump0(ScriptInstance* script, s32 isInitialCall) { _npc_jump_to(script, isInitialCall, 0); @@ -195,9 +195,9 @@ INCLUDE_API_ASM("code_f2470_len_27f0", SetNpcFlagBits); INCLUDE_API_ASM("code_f2470_len_27f0", GetNpcPos); -INCLUDE_ASM("code_f2470_len_27f0", func_802CF1B4); +INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CF1B4); -INCLUDE_ASM("code_f2470_len_27f0", func_802CF208); +INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CF208); ApiStatus EnableNpcShadow(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -294,25 +294,25 @@ ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_f2470_len_27f0", BringPartnerOut); +INCLUDE_ASM(s32, "code_f2470_len_27f0", BringPartnerOut); -INCLUDE_ASM("code_f2470_len_27f0", PutPartnerAway); +INCLUDE_ASM(s32, "code_f2470_len_27f0", PutPartnerAway); -INCLUDE_ASM("code_f2470_len_27f0", GetCurrentPartnerID); +INCLUDE_ASM(s32, "code_f2470_len_27f0", GetCurrentPartnerID); -INCLUDE_ASM("code_f2470_len_27f0", PartnerCanUseAbility); +INCLUDE_ASM(s32, "code_f2470_len_27f0", PartnerCanUseAbility); -INCLUDE_ASM("code_f2470_len_27f0", PartnerIsFlying); +INCLUDE_ASM(s32, "code_f2470_len_27f0", PartnerIsFlying); -INCLUDE_ASM("code_f2470_len_27f0", func_802CFD30); +INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFD30); -INCLUDE_ASM("code_f2470_len_27f0", func_802CFE2C); +INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFE2C); -INCLUDE_ASM("code_f2470_len_27f0", func_802CFE80); +INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFE80); -INCLUDE_ASM("code_f2470_len_27f0", func_802CFEEC); +INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFEEC); -INCLUDE_ASM("code_f2470_len_27f0", func_802CFFC0); +INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFFC0); ApiStatus SetNpcEffect(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; diff --git a/src/code_f270_len_1190.c b/src/code_f270_len_1190.c index 3296f43278..0c8719908f 100644 --- a/src/code_f270_len_1190.c +++ b/src/code_f270_len_1190.c @@ -1,21 +1,21 @@ #include "common.h" -INCLUDE_ASM("code_f270_len_1190", begin_state_logos); +INCLUDE_ASM(s32, "code_f270_len_1190", begin_state_logos); -INCLUDE_ASM("code_f270_len_1190", step_logos); +INCLUDE_ASM(s32, "code_f270_len_1190", step_logos); -INCLUDE_ASM("code_f270_len_1190", func_80034388); +INCLUDE_ASM(s32, "code_f270_len_1190", func_80034388); -INCLUDE_ASM("code_f270_len_1190", func_800343A4); +INCLUDE_ASM(s32, "code_f270_len_1190", func_800343A4); -INCLUDE_ASM("code_f270_len_1190", begin_state_pause_menu); +INCLUDE_ASM(s32, "code_f270_len_1190", begin_state_pause_menu); -INCLUDE_ASM("code_f270_len_1190", step_pause_menu); +INCLUDE_ASM(s32, "code_f270_len_1190", step_pause_menu); -INCLUDE_ASM("code_f270_len_1190", func_80034BF4); +INCLUDE_ASM(s32, "code_f270_len_1190", func_80034BF4); -INCLUDE_ASM("code_f270_len_1190", func_80034BFC); +INCLUDE_ASM(s32, "code_f270_len_1190", func_80034BFC); -INCLUDE_ASM("code_f270_len_1190", func_80034C3C); +INCLUDE_ASM(s32, "code_f270_len_1190", func_80034C3C); -INCLUDE_ASM("code_f270_len_1190", func_80034FF0); +INCLUDE_ASM(s32, "code_f270_len_1190", func_80034FF0); diff --git a/src/code_f4c60_len_4300.c b/src/code_f4c60_len_4300.c index 1309b1920f..17298f550e 100644 --- a/src/code_f4c60_len_4300.c +++ b/src/code_f4c60_len_4300.c @@ -16,7 +16,7 @@ ApiStatus SpeakToNpc(ScriptInstance* script, s32 isInitialCall) { return _show_message(script, isInitialCall, 3); } -INCLUDE_ASM("code_f4c60_len_4300", _show_message); +INCLUDE_ASM(s32, "code_f4c60_len_4300", _show_message); INCLUDE_API_ASM("code_f4c60_len_4300", ShowMessageAtScreenPos); @@ -164,11 +164,11 @@ INCLUDE_API_ASM("code_f4c60_len_4300", SetPlayerAnimationSpeed); INCLUDE_API_ASM("code_f4c60_len_4300", PlayerMoveTo); -INCLUDE_ASM("code_f4c60_len_4300", func_802D1270); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D1270); -INCLUDE_ASM("code_f4c60_len_4300", func_802D1380); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D1380); -INCLUDE_ASM("code_f4c60_len_4300", player_jump); +INCLUDE_ASM(s32, "code_f4c60_len_4300", player_jump); void PlayerJump(ScriptInstance* script, s32 isInitialCall) { player_jump(script, isInitialCall, 0); @@ -224,118 +224,118 @@ ApiStatus FullyRestoreHPandFP(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_f4c60_len_4300", FullyRestoreSP); +INCLUDE_ASM(s32, "code_f4c60_len_4300", FullyRestoreSP); -INCLUDE_ASM("code_f4c60_len_4300", EnablePartner); +INCLUDE_ASM(s32, "code_f4c60_len_4300", EnablePartner); -INCLUDE_ASM("code_f4c60_len_4300", DisablePartner); +INCLUDE_ASM(s32, "code_f4c60_len_4300", DisablePartner); -INCLUDE_ASM("code_f4c60_len_4300", UseEntryHeading); +INCLUDE_ASM(s32, "code_f4c60_len_4300", UseEntryHeading); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2148); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2148); -INCLUDE_ASM("code_f4c60_len_4300", UseExitHeading); +INCLUDE_ASM(s32, "code_f4c60_len_4300", UseExitHeading); -INCLUDE_ASM("code_f4c60_len_4300", func_802D23F8); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D23F8); -INCLUDE_ASM("code_f4c60_len_4300", func_802D244C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D244C); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2484); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2484); -INCLUDE_ASM("code_f4c60_len_4300", func_802D249C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D249C); -INCLUDE_ASM("code_f4c60_len_4300", func_802D24F4); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D24F4); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2508); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2508); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2520); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2520); -INCLUDE_ASM("code_f4c60_len_4300", func_802D286C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D286C); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2884); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2884); -INCLUDE_ASM("code_f4c60_len_4300", DisablePulseStone); +INCLUDE_ASM(s32, "code_f4c60_len_4300", DisablePulseStone); INCLUDE_API_ASM("code_f4c60_len_4300", GetCurrentPartner); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2B50); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2B50); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2B6C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2B6C); INCLUDE_API_ASM("code_f4c60_len_4300", Disable8bitMario); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2C14); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2C14); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2C40); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2C40); INCLUDE_API_ASM("code_f4c60_len_4300", PlaySoundAtPlayer); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2D30); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2D30); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2ED4); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2ED4); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2F34); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2F34); -INCLUDE_ASM("code_f4c60_len_4300", func_802D2FCC); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D2FCC); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3028); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3028); -INCLUDE_ASM("code_f4c60_len_4300", func_802D31E0); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D31E0); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3398); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3398); -INCLUDE_ASM("code_f4c60_len_4300", func_802D33D4); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D33D4); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3474); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3474); -INCLUDE_ASM("code_f4c60_len_4300", func_802D354C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D354C); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3624); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3624); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3674); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3674); -INCLUDE_ASM("code_f4c60_len_4300", func_802D36E0); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D36E0); -INCLUDE_ASM("code_f4c60_len_4300", func_802D378C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D378C); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3840); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3840); -INCLUDE_ASM("code_f4c60_len_4300", func_802D38EC); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D38EC); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3998); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3998); -INCLUDE_ASM("code_f4c60_len_4300", func_802D39FC); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D39FC); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3A60); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3A60); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3C58); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3C58); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3EB8); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3EB8); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3F74); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3F74); -INCLUDE_ASM("code_f4c60_len_4300", func_802D3FC8); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D3FC8); -INCLUDE_ASM("code_f4c60_len_4300", func_802D4050); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D4050); -INCLUDE_ASM("code_f4c60_len_4300", func_802D4164); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D4164); -INCLUDE_ASM("code_f4c60_len_4300", func_802D417C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D417C); -INCLUDE_ASM("code_f4c60_len_4300", func_802D420C); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D420C); -INCLUDE_ASM("code_f4c60_len_4300", func_802D42AC); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D42AC); -INCLUDE_ASM("code_f4c60_len_4300", func_802D4364); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D4364); -INCLUDE_ASM("code_f4c60_len_4300", func_802D43AC); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D43AC); -INCLUDE_ASM("code_f4c60_len_4300", func_802D43D0); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D43D0); -INCLUDE_ASM("code_f4c60_len_4300", func_802D43F4); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D43F4); -INCLUDE_ASM("code_f4c60_len_4300", func_802D4434); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D4434); -INCLUDE_ASM("code_f4c60_len_4300", func_802D4488); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D4488); -INCLUDE_ASM("code_f4c60_len_4300", func_802D4560); +INCLUDE_ASM(s32, "code_f4c60_len_4300", func_802D4560); diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c index 63f66867bb..d9d917c5f9 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/code_f8f60_len_1560.c @@ -248,9 +248,9 @@ ApiStatus func_802D4D88(ScriptInstance* script, s32 initialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM("code_f8f60_len_1560", setup_path_data); +INCLUDE_ASM(s32, "code_f8f60_len_1560", setup_path_data); -INCLUDE_ASM("code_f8f60_len_1560", func_802D5270); +INCLUDE_ASM(s32, "code_f8f60_len_1560", func_802D5270); INCLUDE_API_ASM("code_f8f60_len_1560", LoadPath); diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c index 65bd53591d..1d5165f7f8 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/code_fa4c0_len_3bf0.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5B10); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5B10); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5C70); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5C70); ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -24,23 +24,23 @@ ApiStatus SetMusicTrack(ScriptInstance* script, s32 isInitialCall) { INCLUDE_API_ASM("code_fa4c0_len_3bf0", FadeInMusic); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5EE0); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5EE0); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5F28); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5F28); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5FA4); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5FA4); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5FD8); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5FD8); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D5FF8); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5FF8); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D6050); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D6050); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D6070); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D6070); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D6090); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D6090); -INCLUDE_ASM("code_fa4c0_len_3bf0", ClearAmbientSounds); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", ClearAmbientSounds); ApiStatus PlayAmbientSounds(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -108,9 +108,9 @@ ApiStatus func_802D6340(ScriptInstance* script, s32 initialCall) { INCLUDE_API_ASM("code_fa4c0_len_3bf0", PlaySoundAtF); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D6420); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D6420); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D663C); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D663C); ApiStatus RemoveKeyItemAt(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -344,7 +344,7 @@ ApiStatus SetItemPos(ScriptInstance* script, s32 isInitialCall) { INCLUDE_API_ASM("code_fa4c0_len_3bf0", SetItemFlags); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D721C); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D721C); ApiStatus AddCoin(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = add_coins(get_variable(script, *script->ptrReadPos)); @@ -380,15 +380,15 @@ INCLUDE_API_ASM("code_fa4c0_len_3bf0", GetItemPower); INCLUDE_API_ASM("code_fa4c0_len_3bf0", ShowGotItem); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7460); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7460); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D74C0); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D74C0); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7520); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7520); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D75D8); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D75D8); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7690); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7690); INCLUDE_API_ASM("code_fa4c0_len_3bf0", ShowEmote); @@ -435,20 +435,20 @@ ApiStatus func_802D7B74(ScriptInstance* script, s32 isInitialCall) { INCLUDE_API_ASM("code_fa4c0_len_3bf0", RemoveEffect); #endif -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7B10); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7B10); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7B44); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7B44); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7B74); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7B74); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7BA4); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7BA4); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7CF8); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7CF8); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D7E08); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D7E08); -INCLUDE_ASM("code_fa4c0_len_3bf0", ShowSleepBubble); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", ShowSleepBubble); -INCLUDE_ASM("code_fa4c0_len_3bf0", func_802D8248); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D8248); -INCLUDE_ASM("code_fa4c0_len_3bf0", PlayEffect); +INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", PlayEffect); diff --git a/src/code_fee30_len_2d60.c b/src/code_fee30_len_2d60.c index 5b530ceeaa..a9c6786d4e 100644 --- a/src/code_fee30_len_2d60.c +++ b/src/code_fee30_len_2d60.c @@ -1,22 +1,22 @@ #include "common.h" -INCLUDE_ASM("code_fee30_len_2d60", func_802DBD40); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBD40); -INCLUDE_ASM("code_fee30_len_2d60", func_802DBD8C); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBD8C); -INCLUDE_ASM("code_fee30_len_2d60", func_802DBDBC); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBDBC); -INCLUDE_ASM("code_fee30_len_2d60", func_802DBE78); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBE78); -INCLUDE_ASM("code_fee30_len_2d60", func_802DBFC0); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBFC0); -INCLUDE_ASM("code_fee30_len_2d60", func_802DC008); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DC008); -INCLUDE_ASM("code_fee30_len_2d60", spr_appendMDL_component); +INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_appendMDL_component); -INCLUDE_ASM("code_fee30_len_2d60", spr_transform_point); +INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_transform_point); -INCLUDE_ASM("code_fee30_len_2d60", spr_draw_component); +INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_draw_component); s32 _spr_sign_extend_12bit(u16 val) { s32 temp = val & 0xFFF; @@ -38,60 +38,60 @@ s32 _spr_sign_extend_16bit(u16 val) { } } -INCLUDE_ASM("code_fee30_len_2d60", update_component); +INCLUDE_ASM(s32, "code_fee30_len_2d60", update_component); -INCLUDE_ASM("code_fee30_len_2d60", func_802DD634); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD634); -INCLUDE_ASM("code_fee30_len_2d60", func_802DD6DC); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD6DC); -INCLUDE_ASM("code_fee30_len_2d60", func_802DD7B0); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD7B0); -INCLUDE_ASM("code_fee30_len_2d60", func_802DD820); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD820); -INCLUDE_ASM("code_fee30_len_2d60", set_anim_timescale); +INCLUDE_ASM(s32, "code_fee30_len_2d60", set_anim_timescale); -INCLUDE_ASM("code_fee30_len_2d60", func_802DD89C); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD89C); -INCLUDE_ASM("code_fee30_len_2d60", func_802DD8F8); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD8F8); -INCLUDE_ASM("code_fee30_len_2d60", func_802DDA60); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDA60); -INCLUDE_ASM("code_fee30_len_2d60", func_802DDA84); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDA84); -INCLUDE_ASM("code_fee30_len_2d60", func_802DDA8C); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDA8C); -INCLUDE_ASM("code_fee30_len_2d60", render_sprite); +INCLUDE_ASM(s32, "code_fee30_len_2d60", render_sprite); -INCLUDE_ASM("code_fee30_len_2d60", func_802DDEC4); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDEC4); -INCLUDE_ASM("code_fee30_len_2d60", func_802DDEE4); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDEE4); -INCLUDE_ASM("code_fee30_len_2d60", func_802DDFF8); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDFF8); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE044); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE044); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE0C0); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE0C0); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE0EC); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE0EC); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE2AC); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE2AC); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE3D8); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE3D8); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE5C8); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE5C8); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE5E8); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE5E8); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE748); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE748); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE780); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE780); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE894); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE894); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE8DC); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE8DC); -INCLUDE_ASM("code_fee30_len_2d60", func_802DE9D8); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE9D8); -INCLUDE_ASM("code_fee30_len_2d60", func_802DEA40); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DEA40); -INCLUDE_ASM("code_fee30_len_2d60", func_802DEA6C); +INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DEA6C); diff --git a/src/guOrtho.c b/src/guOrtho.c index bdeea086ce..56c69e7bd4 100644 --- a/src/guOrtho.c +++ b/src/guOrtho.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM("guOrtho", guOrthoF); +INCLUDE_ASM(s32, "guOrtho", guOrthoF); /*void guOrthoF(f32 mf[4][4], f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) { s32 i, j; @@ -21,7 +21,7 @@ INCLUDE_ASM("guOrtho", guOrthoF); } }*/ -INCLUDE_ASM("guOrtho", guOrtho); +INCLUDE_ASM(s32, "guOrtho", guOrtho); /*void guOrtho(Mtx* mtx, f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) { float mf[4][4]; diff --git a/src/os/code_39cb0_len_100.c b/src/os/code_39cb0_len_100.c index 3c823bb98b..9127581a96 100644 --- a/src/os/code_39cb0_len_100.c +++ b/src/os/code_39cb0_len_100.c @@ -2,4 +2,4 @@ INCLUDE_API_ASM("os/code_39cb0_len_100", nuBoot); -INCLUDE_ASM("os/code_39cb0_len_100", boot_idle); +INCLUDE_ASM(s32, "os/code_39cb0_len_100", boot_idle); diff --git a/src/os/code_39db0_len_8a0.c b/src/os/code_39db0_len_8a0.c index 0fe028bc9b..74d513375e 100644 --- a/src/os/code_39db0_len_8a0.c +++ b/src/os/code_39db0_len_8a0.c @@ -1,25 +1,25 @@ #include "common.h" -INCLUDE_ASM("os/code_39db0_len_8a0", nuScCreateScheduler); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScCreateScheduler); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScExecuteAudio); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScExecuteAudio); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScAddClient); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScAddClient); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScRemoveClient); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScRemoveClient); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScResetClientMesgType); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScResetClientMesgType); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScGetGfxMQ); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetGfxMQ); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScGetAudioMQ); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetAudioMQ); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScSetFrameBufferNum); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScSetFrameBufferNum); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScGetFrameRate); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScGetFrameRate); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScEventHandler); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScEventHandler); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScEventBroadcast); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScEventBroadcast); -INCLUDE_ASM("os/code_39db0_len_8a0", nuScWaitTaskReady); +INCLUDE_ASM(s32, "os/code_39db0_len_8a0", nuScWaitTaskReady); diff --git a/src/os/code_3a850_le_a40.c b/src/os/code_3a850_le_a40.c index 2392733e82..e623dc422c 100644 --- a/src/os/code_3a850_le_a40.c +++ b/src/os/code_3a850_le_a40.c @@ -1,50 +1,50 @@ #include "common.h" -INCLUDE_ASM("os/code_3a850_le_a40", nuPiInit); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuPiInit); -INCLUDE_ASM("os/code_3a850_le_a40", nuPiReadRom); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuPiReadRom); -INCLUDE_ASM("os/code_3a850_le_a40", nuGfxInit); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuGfxInit); -INCLUDE_ASM("os/code_3a850_le_a40", nuContInit); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContInit); -INCLUDE_ASM("os/code_3a850_le_a40", nuContDataGet); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContDataGet); -INCLUDE_ASM("os/code_3a850_le_a40", nuContPakMgrInit); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContPakMgrInit); -INCLUDE_ASM("os/code_3a850_le_a40", nuContPakMgrRemove); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContPakMgrRemove); -INCLUDE_ASM("os/code_3a850_le_a40", contPakOpen); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakOpen); -INCLUDE_ASM("os/code_3a850_le_a40", contPakFree); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFree); -INCLUDE_ASM("os/code_3a850_le_a40", contPakFileReadWrite); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileReadWrite); -INCLUDE_ASM("os/code_3a850_le_a40", contPakFileOpen); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileOpen); -INCLUDE_ASM("os/code_3a850_le_a40", contPakFileDelete); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileDelete); -INCLUDE_ASM("os/code_3a850_le_a40", contPakFileState); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileState); -INCLUDE_ASM("os/code_3a850_le_a40", contPakFileNum); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakFileNum); -INCLUDE_ASM("os/code_3a850_le_a40", contPakRepairId); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contPakRepairId); #undef osMotorStop -INCLUDE_ASM_T(s32, "os/code_3a850_le_a40", osMotorStop, OSPfs* unk); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", osMotorStop, OSPfs* unk); -INCLUDE_ASM("os/code_3a850_le_a40", contRmbControl); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbControl); -INCLUDE_ASM("os/code_3a850_le_a40", nuContRmbMgrInit); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContRmbMgrInit); -INCLUDE_ASM("os/code_3a850_le_a40", nuContRmbMgrRemove); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", nuContRmbMgrRemove); -INCLUDE_ASM("os/code_3a850_le_a40", contRmbCheckMesg); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbCheckMesg); -INCLUDE_ASM("os/code_3a850_le_a40", contRmbStartMesg); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", contRmbStartMesg); -INCLUDE_ASM("os/code_3a850_le_a40", func_8005FDE4); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FDE4); -INCLUDE_ASM("os/code_3a850_le_a40", func_8005FE0C); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FE0C); -INCLUDE_ASM("os/code_3a850_le_a40", func_8005FE54); +INCLUDE_ASM(s32, "os/code_3a850_le_a40", func_8005FE54); diff --git a/src/os/code_3bd20_len_c0.c b/src/os/code_3bd20_len_c0.c index 4bd706b135..08662b1911 100644 --- a/src/os/code_3bd20_len_c0.c +++ b/src/os/code_3bd20_len_c0.c @@ -2,4 +2,4 @@ INCLUDE_API_ASM("os/code_3bd20_len_c0", nuContQueryRead); -INCLUDE_ASM_T(OSIntMask, "os/code_3bd20_len_c0", osSetIntMask, OSIntMask mask); +INCLUDE_ASM(OSIntMask, "os/code_3bd20_len_c0", osSetIntMask, OSIntMask mask); diff --git a/src/os/code_3bde0_len_3e0.c b/src/os/code_3bde0_len_3e0.c index 545060418d..6599b92720 100644 --- a/src/os/code_3bde0_len_3e0.c +++ b/src/os/code_3bde0_len_3e0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3bde0_len_3e0", osCreatePiManager, OSPri prio, OSMesgQueue* queue, OSMesg* mesg, s32 unk); +INCLUDE_ASM(void, "os/code_3bde0_len_3e0", osCreatePiManager, OSPri prio, OSMesgQueue* queue, OSMesg* mesg, s32 unk); INCLUDE_API_ASM("os/code_3bde0_len_3e0", osEPiRawStartDma); -INCLUDE_ASM_T(s32, "os/code_3bde0_len_3e0", osEPiWriteIo, OSPiHandle* handle, u32 unk1, u32 unk2); +INCLUDE_ASM(s32, "os/code_3bde0_len_3e0", osEPiWriteIo, OSPiHandle* handle, u32 unk1, u32 unk2); diff --git a/src/os/code_3c1c0_len_60.c b/src/os/code_3c1c0_len_60.c index cfd8598bc6..4dc123e0ef 100644 --- a/src/os/code_3c1c0_len_60.c +++ b/src/os/code_3c1c0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_3c1c0_len_60", osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); +INCLUDE_ASM(s32, "os/code_3c1c0_len_60", osEPiReadIo, OSPiHandle* handle, u32 size, u32* out); diff --git a/src/os/code_3c220_len_a0.c b/src/os/code_3c220_len_a0.c index c1c831ca0e..5f3f95e52f 100644 --- a/src/os/code_3c220_len_a0.c +++ b/src/os/code_3c220_len_a0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_3c220_len_a0", osEPiStartDma, OSPiHandle* handle, OSIoMesg* mesg, s32 unk); +INCLUDE_ASM(s32, "os/code_3c220_len_a0", osEPiStartDma, OSPiHandle* handle, OSIoMesg* mesg, s32 unk); diff --git a/src/os/code_3c2c0_len_50.c b/src/os/code_3c2c0_len_50.c index 443d73d44a..13d7824cb4 100644 --- a/src/os/code_3c2c0_len_50.c +++ b/src/os/code_3c2c0_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_3c2c0_len_50", osEPiLinkHandle, OSPiHandle* handle); +INCLUDE_ASM(s32, "os/code_3c2c0_len_50", osEPiLinkHandle, OSPiHandle* handle); diff --git a/src/os/code_3c310_len_180.c b/src/os/code_3c310_len_180.c index efc48142e3..df8a973897 100644 --- a/src/os/code_3c310_len_180.c +++ b/src/os/code_3c310_len_180.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(OSPiHandle*, "os/code_3c310_len_180", osCartRomInit, void); +INCLUDE_ASM(OSPiHandle*, "os/code_3c310_len_180", osCartRomInit, void); diff --git a/src/os/code_3c940_len_140.c b/src/os/code_3c940_len_140.c index aec929494a..68e1361ca4 100644 --- a/src/os/code_3c940_len_140.c +++ b/src/os/code_3c940_len_140.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM_T(u32, "os/code_3c940_len_140", osAiGetLength, void); +INCLUDE_ASM(u32, "os/code_3c940_len_140", osAiGetLength, void); -INCLUDE_ASM_T(u32, "os/code_3c940_len_140", osAiGetStatus, void); +INCLUDE_ASM(u32, "os/code_3c940_len_140", osAiGetStatus, void); -INCLUDE_ASM_T(s32, "os/code_3c940_len_140", osAiSetFrequency, u32 freq); +INCLUDE_ASM(s32, "os/code_3c940_len_140", osAiSetFrequency, u32 freq); diff --git a/src/os/code_3ca80_len_a0.c b/src/os/code_3ca80_len_a0.c index 2a3340055d..c5e74eac62 100644 --- a/src/os/code_3ca80_len_a0.c +++ b/src/os/code_3ca80_len_a0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_3ca80_len_a0", osAiSetNextBuffer, void* buf, u32 unk); +INCLUDE_ASM(s32, "os/code_3ca80_len_a0", osAiSetNextBuffer, void* buf, u32 unk); diff --git a/src/os/code_3cb20_len_130.c b/src/os/code_3cb20_len_130.c index 8f3cb3c707..17c4d9a176 100644 --- a/src/os/code_3cb20_len_130.c +++ b/src/os/code_3cb20_len_130.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3cb20_len_130", osInvalDCache, void* buf, s32 size); +INCLUDE_ASM(void, "os/code_3cb20_len_130", osInvalDCache, void* buf, s32 size); -INCLUDE_ASM_T(void, "os/code_3cb20_len_130", osInvalICache, void* buf, s32 size); +INCLUDE_ASM(void, "os/code_3cb20_len_130", osInvalICache, void* buf, s32 size); diff --git a/src/os/code_3cc50_len_80.c b/src/os/code_3cc50_len_80.c index 4dc93580a4..289d67ba64 100644 --- a/src/os/code_3cc50_len_80.c +++ b/src/os/code_3cc50_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3cc50_len_80", osWritebackDCache, void* buf, s32 size); +INCLUDE_ASM(void, "os/code_3cc50_len_80", osWritebackDCache, void* buf, s32 size); diff --git a/src/os/code_3ccd0_len_30.c b/src/os/code_3ccd0_len_30.c index dfedd445ef..82799df016 100644 --- a/src/os/code_3ccd0_len_30.c +++ b/src/os/code_3ccd0_len_30.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3ccd0_len_30", osWritebackDCacheAll, void); +INCLUDE_ASM(void, "os/code_3ccd0_len_30", osWritebackDCacheAll, void); diff --git a/src/os/code_3cd00_len_5f0.c b/src/os/code_3cd00_len_5f0.c index b8399d7ba9..4a91670456 100644 --- a/src/os/code_3cd00_len_5f0.c +++ b/src/os/code_3cd00_len_5f0.c @@ -1,19 +1,19 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_3cd00_len_5f0", osContStartQuery, OSMesgQueue* queue); +INCLUDE_ASM(s32, "os/code_3cd00_len_5f0", osContStartQuery, OSMesgQueue* queue); -INCLUDE_ASM_T(void, "os/code_3cd00_len_5f0", osContGetQuery, OSContStatus* status); +INCLUDE_ASM(void, "os/code_3cd00_len_5f0", osContGetQuery, OSContStatus* status); -INCLUDE_ASM_T(s32, "os/code_3cd00_len_5f0", osContStartReadData, OSMesgQueue* queue); +INCLUDE_ASM(s32, "os/code_3cd00_len_5f0", osContStartReadData, OSMesgQueue* queue); -INCLUDE_ASM_T(void, "os/code_3cd00_len_5f0", osContGetReadData, OSContPad* pad); +INCLUDE_ASM(void, "os/code_3cd00_len_5f0", osContGetReadData, OSContPad* pad); INCLUDE_API_ASM("os/code_3cd00_len_5f0", osPackReadData); -INCLUDE_ASM_T(s32, "os/code_3cd00_len_5f0", osContInit, OSMesgQueue* queue, u8* unk, OSContStatus* status); +INCLUDE_ASM(s32, "os/code_3cd00_len_5f0", osContInit, OSMesgQueue* queue, u8* unk, OSContStatus* status); INCLUDE_API_ASM("os/code_3cd00_len_5f0", osContGetInitData); INCLUDE_API_ASM("os/code_3cd00_len_5f0", osPackRequestData); -INCLUDE_ASM_T(u32, "os/code_3cd00_len_5f0", osVirtualToPhysical, void* virt); +INCLUDE_ASM(u32, "os/code_3cd00_len_5f0", osVirtualToPhysical, void* virt); diff --git a/src/os/code_3d2f0_len_10.c b/src/os/code_3d2f0_len_10.c index 8e975a1025..59062e9031 100644 --- a/src/os/code_3d2f0_len_10.c +++ b/src/os/code_3d2f0_len_10.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(f32, "os/code_3d2f0_len_10", sqrtf, f32 value); +INCLUDE_ASM(f32, "os/code_3d2f0_len_10", sqrtf, f32 value); diff --git a/src/os/code_3d300_len_30.c b/src/os/code_3d300_len_30.c index bcb0036dfb..788f679ae8 100644 --- a/src/os/code_3d300_len_30.c +++ b/src/os/code_3d300_len_30.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s16, "os/code_3d300_len_30", coss, u16 angle); +INCLUDE_ASM(s16, "os/code_3d300_len_30", coss, u16 angle); diff --git a/src/os/code_3d330_len_990.c b/src/os/code_3d330_len_990.c index 6466db509c..c09e9f09a2 100644 --- a/src/os/code_3d330_len_990.c +++ b/src/os/code_3d330_len_990.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3d330_len_990", guFrustumF, float mf[4][4], float l, float r, float b, float t, float n, +INCLUDE_ASM(void, "os/code_3d330_len_990", guFrustumF, float mf[4][4], float l, float r, float b, float t, float n, float f, float scale); -INCLUDE_ASM_T(void, "os/code_3d330_len_990", guFrustum, Mtx* m, float l, float r, float b, float t, float n, float f, +INCLUDE_ASM(void, "os/code_3d330_len_990", guFrustum, Mtx* m, float l, float r, float b, float t, float n, float f, float scale); -INCLUDE_ASM_T(void, "os/code_3d330_len_990", guLookAtF, float mf[4][4], float xEye, float yEye, float zEye, float xAt, +INCLUDE_ASM(void, "os/code_3d330_len_990", guLookAtF, float mf[4][4], float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); -INCLUDE_ASM_T(void, "os/code_3d330_len_990", guLookAt, Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt, +INCLUDE_ASM(void, "os/code_3d330_len_990", guLookAt, Mtx* m, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/code_3dcc0_len_a60.c b/src/os/code_3dcc0_len_a60.c index e274b59760..d5f65b7a15 100644 --- a/src/os/code_3dcc0_len_a60.c +++ b/src/os/code_3dcc0_len_a60.c @@ -1,10 +1,10 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, +INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, float zl1, float xl2, float yl2, float zl2, int twidth, int theight); -INCLUDE_ASM_T(void, "os/code_3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye, +INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, float zl1, float xl2, float yl2, float zl2, int twidth, int theight); diff --git a/src/os/code_3e720_len_5f0.c b/src/os/code_3e720_len_5f0.c index d9ce162fbb..a323c7a0ca 100644 --- a/src/os/code_3e720_len_5f0.c +++ b/src/os/code_3e720_len_5f0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye, +INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); -INCLUDE_ASM_T(void, "os/code_3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye, +INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/code_3ef90_len_600.c b/src/os/code_3ef90_len_600.c index 0c3e744e29..0b86122fc0 100644 --- a/src/os/code_3ef90_len_600.c +++ b/src/os/code_3ef90_len_600.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect, +INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect, float near, float far, float scale); -INCLUDE_ASM_T(void, "os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, +INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, float near, float far, float scale); diff --git a/src/os/code_3f310_len_3c0.c b/src/os/code_3f310_len_3c0.c index 966005770b..a2dca57ad1 100644 --- a/src/os/code_3f310_len_3c0.c +++ b/src/os/code_3f310_len_3c0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x, +INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x, float y, float z); -INCLUDE_ASM_T(void, "os/code_3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y, +INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y, float z); diff --git a/src/os/code_3f9f0_len_60.c b/src/os/code_3f9f0_len_60.c index 58dbadbdad..e08ace25ba 100644 --- a/src/os/code_3f9f0_len_60.c +++ b/src/os/code_3f9f0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s16, "os/code_3f9f0_len_60", sins, u16 angle); +INCLUDE_ASM(s16, "os/code_3f9f0_len_60", sins, u16 angle); diff --git a/src/os/code_3fa50_len_f60.c b/src/os/code_3fa50_len_f60.c index a31edf6f7f..68c549a72c 100644 --- a/src/os/code_3fa50_len_f60.c +++ b/src/os/code_3fa50_len_f60.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_3fa50_len_f60", bcopy, const void* src, void* dst, int size); +INCLUDE_ASM(void, "os/code_3fa50_len_f60", bcopy, const void* src, void* dst, int size); -INCLUDE_ASM_T(void, "os/code_3fa50_len_f60", bzero, void* buf, int size); +INCLUDE_ASM(void, "os/code_3fa50_len_f60", bzero, void* buf, int size); INCLUDE_API_ASM("os/code_3fa50_len_f60", strchr); @@ -10,12 +10,12 @@ INCLUDE_API_ASM("os/code_3fa50_len_f60", strlen); INCLUDE_API_ASM("os/code_3fa50_len_f60", memcpy); -INCLUDE_ASM("os/code_3fa50_len_f60", _Printf); +INCLUDE_ASM(s32, "os/code_3fa50_len_f60", _Printf); -INCLUDE_ASM("os/code_3fa50_len_f60", _Putfld); +INCLUDE_ASM(s32, "os/code_3fa50_len_f60", _Putfld); -INCLUDE_ASM_T(int, "os/code_3fa50_len_f60", sprintf, char* s, const char* fmt, ...); +INCLUDE_ASM(int, "os/code_3fa50_len_f60", sprintf, char* s, const char* fmt, ...); INCLUDE_API_ASM("os/code_3fa50_len_f60", proutSprintf); -INCLUDE_ASM_T(void, "os/code_3fa50_len_f60", osCreateMesgQueue, OSMesgQueue* queue, OSMesg* mesg, s32 unk); +INCLUDE_ASM(void, "os/code_3fa50_len_f60", osCreateMesgQueue, OSMesgQueue* queue, OSMesg* mesg, s32 unk); diff --git a/src/os/code_409b0_len_140.c b/src/os/code_409b0_len_140.c index 613236fb9b..da73a1ab93 100644 --- a/src/os/code_409b0_len_140.c +++ b/src/os/code_409b0_len_140.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_409b0_len_140", osJamMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); +INCLUDE_ASM(s32, "os/code_409b0_len_140", osJamMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); diff --git a/src/os/code_40af0_len_130.c b/src/os/code_40af0_len_130.c index ff963680b9..8a375486b3 100644 --- a/src/os/code_40af0_len_130.c +++ b/src/os/code_40af0_len_130.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_40af0_len_130", osRecvMesg, OSMesgQueue* queue, OSMesg* mesg, s32 unk); +INCLUDE_ASM(s32, "os/code_40af0_len_130", osRecvMesg, OSMesgQueue* queue, OSMesg* mesg, s32 unk); diff --git a/src/os/code_40c20_len_1f0.c b/src/os/code_40c20_len_1f0.c index 70edcccd3a..bda8480ade 100644 --- a/src/os/code_40c20_len_1f0.c +++ b/src/os/code_40c20_len_1f0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_40c20_len_1f0", osSendMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); +INCLUDE_ASM(s32, "os/code_40c20_len_1f0", osSendMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); -INCLUDE_ASM_T(void, "os/code_40c20_len_1f0", osSetEventMesg, OSEvent event, OSMesgQueue* queue, OSMesg mesg); +INCLUDE_ASM(void, "os/code_40c20_len_1f0", osSetEventMesg, OSEvent event, OSMesgQueue* queue, OSMesg mesg); -INCLUDE_ASM_T(u32, "os/code_40c20_len_1f0", osGetCount, void); +INCLUDE_ASM(u32, "os/code_40c20_len_1f0", osGetCount, void); diff --git a/src/os/code_40e10_len_240.c b/src/os/code_40e10_len_240.c index 6f5cc2895a..dafec23b7a 100644 --- a/src/os/code_40e10_len_240.c +++ b/src/os/code_40e10_len_240.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_40e10_len_240", osSpTaskLoad, OSTask* tp); +INCLUDE_ASM(void, "os/code_40e10_len_240", osSpTaskLoad, OSTask* tp); -INCLUDE_ASM_T(void, "os/code_40e10_len_240", osSpTaskStartGo, OSTask* tp); +INCLUDE_ASM(void, "os/code_40e10_len_240", osSpTaskStartGo, OSTask* tp); diff --git a/src/os/code_41050_len_120.c b/src/os/code_41050_len_120.c index d53f6a3827..59587c5770 100644 --- a/src/os/code_41050_len_120.c +++ b/src/os/code_41050_len_120.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41050_len_120", osSpTaskYield, void); +INCLUDE_ASM(void, "os/code_41050_len_120", osSpTaskYield, void); -INCLUDE_ASM_T(OSYieldResult, "os/code_41050_len_120", osSpTaskYielded, OSTask* tp); +INCLUDE_ASM(OSYieldResult, "os/code_41050_len_120", osSpTaskYielded, OSTask* tp); INCLUDE_API_ASM("os/code_41050_len_120", osSiRawStartDma); diff --git a/src/os/code_41350_len_d0.c b/src/os/code_41350_len_d0.c index 91b3c8d581..491ac05161 100644 --- a/src/os/code_41350_len_d0.c +++ b/src/os/code_41350_len_d0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41350_len_d0", osSetThreadPri, OSThread* thread, OSPri pri); +INCLUDE_ASM(void, "os/code_41350_len_d0", osSetThreadPri, OSThread* thread, OSPri pri); diff --git a/src/os/code_41420_len_120.c b/src/os/code_41420_len_120.c index d42a6bb4e6..007b3713c8 100644 --- a/src/os/code_41420_len_120.c +++ b/src/os/code_41420_len_120.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41420_len_120", osStartThread, OSThread* thread); +INCLUDE_ASM(void, "os/code_41420_len_120", osStartThread, OSThread* thread); diff --git a/src/os/code_41540_len_c0.c b/src/os/code_41540_len_c0.c index 92e045c4c0..2585f7b87d 100644 --- a/src/os/code_41540_len_c0.c +++ b/src/os/code_41540_len_c0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41540_len_c0", osStopThread, OSThread* thread); +INCLUDE_ASM(void, "os/code_41540_len_c0", osStopThread, OSThread* thread); diff --git a/src/os/code_41640_len_50.c b/src/os/code_41640_len_50.c index 4d8c811ecb..b9bc922c0c 100644 --- a/src/os/code_41640_len_50.c +++ b/src/os/code_41640_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41640_len_50", osYieldThread, void); +INCLUDE_ASM(void, "os/code_41640_len_50", osYieldThread, void); diff --git a/src/os/code_416a0_len_90.c b/src/os/code_416a0_len_90.c index acca81ccfc..2d0937015d 100644 --- a/src/os/code_416a0_len_90.c +++ b/src/os/code_416a0_len_90.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(OSTime, "os/code_416a0_len_90", osGetTime, void); +INCLUDE_ASM(OSTime, "os/code_416a0_len_90", osGetTime, void); diff --git a/src/os/code_41730_len_20.c b/src/os/code_41730_len_20.c index aa9c24d830..3f54830e18 100644 --- a/src/os/code_41730_len_20.c +++ b/src/os/code_41730_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41730_len_20", osSetTime, OSTime time); +INCLUDE_ASM(void, "os/code_41730_len_20", osSetTime, OSTime time); diff --git a/src/os/code_41750_len_450.c b/src/os/code_41750_len_450.c index 72224ff0b9..7502a29074 100644 --- a/src/os/code_41750_len_450.c +++ b/src/os/code_41750_len_450.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM_T(int, "os/code_41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, +INCLUDE_ASM(int, "os/code_41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, OSMesg mesg); INCLUDE_API_ASM("os/code_41750_len_450", osTimerServicesInit); diff --git a/src/os/code_41ba0_len_c0.c b/src/os/code_41ba0_len_c0.c index f90373a0e1..aaef5f0b08 100644 --- a/src/os/code_41ba0_len_c0.c +++ b/src/os/code_41ba0_len_c0.c @@ -1,4 +1,4 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2, +INCLUDE_ASM(void, "os/code_41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2, s32 unk3); diff --git a/src/os/code_41d20_len_40.c b/src/os/code_41d20_len_40.c index 1d4272b37c..fd043e663e 100644 --- a/src/os/code_41d20_len_40.c +++ b/src/os/code_41d20_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41d20_len_40", osUnmapTLB, s32 unk); +INCLUDE_ASM(void, "os/code_41d20_len_40", osUnmapTLB, s32 unk); diff --git a/src/os/code_41d60_len_50.c b/src/os/code_41d60_len_50.c index 5b8116b36c..7f59498c5e 100644 --- a/src/os/code_41d60_len_50.c +++ b/src/os/code_41d60_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41d60_len_50", osUnmapTLBAll, void); +INCLUDE_ASM(void, "os/code_41d60_len_50", osUnmapTLBAll, void); diff --git a/src/os/code_41db0_len_40.c b/src/os/code_41db0_len_40.c index 8fcc043dd2..29249b29ba 100644 --- a/src/os/code_41db0_len_40.c +++ b/src/os/code_41db0_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void*, "os/code_41db0_len_40", osViGetCurrentFramebuffer, void); +INCLUDE_ASM(void*, "os/code_41db0_len_40", osViGetCurrentFramebuffer, void); diff --git a/src/os/code_41df0_len_40.c b/src/os/code_41df0_len_40.c index 65cc1777ec..543e25c965 100644 --- a/src/os/code_41df0_len_40.c +++ b/src/os/code_41df0_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void*, "os/code_41df0_len_40", osViGetNextFramebuffer, void); +INCLUDE_ASM(void*, "os/code_41df0_len_40", osViGetNextFramebuffer, void); diff --git a/src/os/code_41e30_len_40.c b/src/os/code_41e30_len_40.c index 026b49706e..3970a894e5 100644 --- a/src/os/code_41e30_len_40.c +++ b/src/os/code_41e30_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(u32, "os/code_41e30_len_40", osViGetCurrentMode, void); +INCLUDE_ASM(u32, "os/code_41e30_len_40", osViGetCurrentMode, void); diff --git a/src/os/code_41e70_len_340.c b/src/os/code_41e70_len_340.c index 434b83e5e0..6154c28fea 100644 --- a/src/os/code_41e70_len_340.c +++ b/src/os/code_41e70_len_340.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_41e70_len_340", osCreateViManager, OSPri pri); +INCLUDE_ASM(void, "os/code_41e70_len_340", osCreateViManager, OSPri pri); INCLUDE_API_ASM("os/code_41e70_len_340", viMgrMain); diff --git a/src/os/code_421b0_len_60.c b/src/os/code_421b0_len_60.c index 72beec0539..f3d2330cc6 100644 --- a/src/os/code_421b0_len_60.c +++ b/src/os/code_421b0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_421b0_len_60", osViSetEvent, OSMesgQueue* queue, OSMesg mesg, u32 unk); +INCLUDE_ASM(void, "os/code_421b0_len_60", osViSetEvent, OSMesgQueue* queue, OSMesg mesg, u32 unk); diff --git a/src/os/code_42210_len_50.c b/src/os/code_42210_len_50.c index 56d12a3d7b..854a47b55e 100644 --- a/src/os/code_42210_len_50.c +++ b/src/os/code_42210_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42210_len_50", osViSetMode, OSViMode* mode); +INCLUDE_ASM(void, "os/code_42210_len_50", osViSetMode, OSViMode* mode); diff --git a/src/os/code_42260_len_170.c b/src/os/code_42260_len_170.c index 29d527bf08..4574c07866 100644 --- a/src/os/code_42260_len_170.c +++ b/src/os/code_42260_len_170.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42260_len_170", osViSetSpecialFeatures, u32 feat); +INCLUDE_ASM(void, "os/code_42260_len_170", osViSetSpecialFeatures, u32 feat); diff --git a/src/os/code_423d0_len_50.c b/src/os/code_423d0_len_50.c index df35c58a04..4c34d08b2d 100644 --- a/src/os/code_423d0_len_50.c +++ b/src/os/code_423d0_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_423d0_len_50", osViSetYScale, f32 scale); +INCLUDE_ASM(void, "os/code_423d0_len_50", osViSetYScale, f32 scale); diff --git a/src/os/code_42420_len_50.c b/src/os/code_42420_len_50.c index 963aff294a..8bf75cc94d 100644 --- a/src/os/code_42420_len_50.c +++ b/src/os/code_42420_len_50.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42420_len_50", osViSwapBuffer, void* buf); +INCLUDE_ASM(void, "os/code_42420_len_50", osViSwapBuffer, void* buf); diff --git a/src/os/code_42780_len_120.c b/src/os/code_42780_len_120.c index 8068d12c01..ddad57fbe6 100644 --- a/src/os/code_42780_len_120.c +++ b/src/os/code_42780_len_120.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42780_len_120", osViBlack, u8 unk); +INCLUDE_ASM(void, "os/code_42780_len_120", osViBlack, u8 unk); -INCLUDE_ASM_T(void, "os/code_42780_len_120", osViRepeatLine, u8 unk); +INCLUDE_ASM(void, "os/code_42780_len_120", osViRepeatLine, u8 unk); -INCLUDE_ASM_T(void, "os/code_42780_len_120", guMtxIdent, Mtx* m); +INCLUDE_ASM(void, "os/code_42780_len_120", guMtxIdent, Mtx* m); diff --git a/src/os/code_42900_len_80.c b/src/os/code_42900_len_80.c index 369bcc2092..20055cb0de 100644 --- a/src/os/code_42900_len_80.c +++ b/src/os/code_42900_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42900_len_80", guMtxF2L, float mf[4][4], Mtx* m); +INCLUDE_ASM(void, "os/code_42900_len_80", guMtxF2L, float mf[4][4], Mtx* m); diff --git a/src/os/code_42980_len_80.c b/src/os/code_42980_len_80.c index f57f3209a8..2fb4f4d12e 100644 --- a/src/os/code_42980_len_80.c +++ b/src/os/code_42980_len_80.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42980_len_80", guMtxL2F, float mf[4][4], Mtx* m); +INCLUDE_ASM(void, "os/code_42980_len_80", guMtxL2F, float mf[4][4], Mtx* m); diff --git a/src/os/code_42a00_len_100.c b/src/os/code_42a00_len_100.c index f5bd812955..c2413f1d90 100644 --- a/src/os/code_42a00_len_100.c +++ b/src/os/code_42a00_len_100.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42a00_len_100", guMtxCatF, float m[4][4], float n[4][4], float r[4][4]); +INCLUDE_ASM(void, "os/code_42a00_len_100", guMtxCatF, float m[4][4], float n[4][4], float r[4][4]); diff --git a/src/os/code_42b00_len_c0.c b/src/os/code_42b00_len_c0.c index 4800522f09..73645bc559 100644 --- a/src/os/code_42b00_len_c0.c +++ b/src/os/code_42b00_len_c0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42b00_len_c0", guScale, Mtx* m, float x, float y, float z); +INCLUDE_ASM(void, "os/code_42b00_len_c0", guScale, Mtx* m, float x, float y, float z); diff --git a/src/os/code_42bc0_len_60.c b/src/os/code_42bc0_len_60.c index 197cfe1afa..9e61700a01 100644 --- a/src/os/code_42bc0_len_60.c +++ b/src/os/code_42bc0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42bc0_len_60", guScaleF, float mf[4][4], float x, float y, float z); +INCLUDE_ASM(void, "os/code_42bc0_len_60", guScaleF, float mf[4][4], float x, float y, float z); diff --git a/src/os/code_42c20_len_e0.c b/src/os/code_42c20_len_e0.c index e86686a3a6..752fd2a592 100644 --- a/src/os/code_42c20_len_e0.c +++ b/src/os/code_42c20_len_e0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42c20_len_e0", guTranslate, Mtx* m, float x, float y, float z); +INCLUDE_ASM(void, "os/code_42c20_len_e0", guTranslate, Mtx* m, float x, float y, float z); diff --git a/src/os/code_42d00_len_60.c b/src/os/code_42d00_len_60.c index 52fc06a7f4..4f2e1ec615 100644 --- a/src/os/code_42d00_len_60.c +++ b/src/os/code_42d00_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42d00_len_60", guTranslateF, float mf[4][4], float x, float y, float z); +INCLUDE_ASM(void, "os/code_42d00_len_60", guTranslateF, float mf[4][4], float x, float y, float z); diff --git a/src/os/code_42de0_len_90.c b/src/os/code_42de0_len_90.c index fa8e6b01ca..d121d7b748 100644 --- a/src/os/code_42de0_len_90.c +++ b/src/os/code_42de0_len_90.c @@ -1,4 +1,4 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, +INCLUDE_ASM(void, "os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, float* oz); diff --git a/src/os/code_42e70_len_390.c b/src/os/code_42e70_len_390.c index 49bca3aa09..b18144788a 100644 --- a/src/os/code_42e70_len_390.c +++ b/src/os/code_42e70_len_390.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy, +INCLUDE_ASM(void, "os/code_42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy, float* oz); -INCLUDE_ASM_T(void, "os/code_42e70_len_390", guRotateF, float mf[4][4], float a, float x, float y, float z); +INCLUDE_ASM(void, "os/code_42e70_len_390", guRotateF, float mf[4][4], float a, float x, float y, float z); -INCLUDE_ASM_T(void, "os/code_42e70_len_390", guRotate, Mtx* m, float a, float x, float y, float z); +INCLUDE_ASM(void, "os/code_42e70_len_390", guRotate, Mtx* m, float a, float x, float y, float z); diff --git a/src/os/code_43200_len_7c0.c b/src/os/code_43200_len_7c0.c index 5c224e3dfb..5957062714 100644 --- a/src/os/code_43200_len_7c0.c +++ b/src/os/code_43200_len_7c0.c @@ -2,9 +2,9 @@ INCLUDE_API_ASM("os/code_43200_len_7c0", osMotorAccess); -INCLUDE_ASM_T(s32, "os/code_43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); +INCLUDE_ASM(s32, "os/code_43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); -INCLUDE_ASM_T(s32, "os/code_43200_len_7c0", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, +INCLUDE_ASM(s32, "os/code_43200_len_7c0", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, int unk5, s32* unk6); INCLUDE_API_ASM("os/code_43200_len_7c0", osPfsDeclearPage); diff --git a/src/os/code_439c0_len_220.c b/src/os/code_439c0_len_220.c index 431350c243..cfcf17632d 100644 --- a/src/os/code_439c0_len_220.c +++ b/src/os/code_439c0_len_220.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_439c0_len_220", osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4); +INCLUDE_ASM(s32, "os/code_439c0_len_220", osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4); INCLUDE_API_ASM("os/code_439c0_len_220", osPfsReleasePages); diff --git a/src/os/code_43be0_len_5e0.c b/src/os/code_43be0_len_5e0.c index ff6d75090d..01abb14e43 100644 --- a/src/os/code_43be0_len_5e0.c +++ b/src/os/code_43be0_len_5e0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4, +INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4, u8* unk5); -INCLUDE_ASM_T(s32, "os/code_43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state); +INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state); diff --git a/src/os/code_441c0_len_1c0.c b/src/os/code_441c0_len_1c0.c index b3b3a354ee..c8799f7a80 100644 --- a/src/os/code_441c0_len_1c0.c +++ b/src/os/code_441c0_len_1c0.c @@ -1,4 +1,4 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, +INCLUDE_ASM(s32, "os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, s32* unk5); diff --git a/src/os/code_44380_len_4e0.c b/src/os/code_44380_len_4e0.c index af12dba64b..01c403162f 100644 --- a/src/os/code_44380_len_4e0.c +++ b/src/os/code_44380_len_4e0.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_44380_len_4e0", osPfsFreeBlocks, OSPfs* pfs, s32* unk1); +INCLUDE_ASM(s32, "os/code_44380_len_4e0", osPfsFreeBlocks, OSPfs* pfs, s32* unk1); -INCLUDE_ASM_T(s32, "os/code_44380_len_4e0", osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); +INCLUDE_ASM(s32, "os/code_44380_len_4e0", osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); -INCLUDE_ASM_T(s32, "os/code_44380_len_4e0", osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); +INCLUDE_ASM(s32, "os/code_44380_len_4e0", osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); INCLUDE_API_ASM("os/code_44380_len_4e0", osPfsCheckRamArea); diff --git a/src/os/code_44860_len_60.c b/src/os/code_44860_len_60.c index e2fa3a9c1f..0a81df02a5 100644 --- a/src/os/code_44860_len_60.c +++ b/src/os/code_44860_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_44860_len_60", osPfsRepairId, OSPfs* pfs); +INCLUDE_ASM(s32, "os/code_44860_len_60", osPfsRepairId, OSPfs* pfs); diff --git a/src/os/code_45a30_len_20.c b/src/os/code_45a30_len_20.c index 8c69b72019..3f8b420f7c 100644 --- a/src/os/code_45a30_len_20.c +++ b/src/os/code_45a30_len_20.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_45a30_len_20", osAfterPreNMI, void); +INCLUDE_ASM(s32, "os/code_45a30_len_20", osAfterPreNMI, void); diff --git a/src/os/code_45a50_len_3a0.c b/src/os/code_45a50_len_3a0.c index ab025c2522..9e13461d99 100644 --- a/src/os/code_45a50_len_3a0.c +++ b/src/os/code_45a50_len_3a0.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM("os/code_45a50_len_3a0", func_8006A650) +INCLUDE_ASM(s32, "os/code_45a50_len_3a0", func_8006A650) #undef osInitialize -INCLUDE_ASM_T(void, "os/code_45a50_len_3a0", osInitialize, void); +INCLUDE_ASM(void, "os/code_45a50_len_3a0", osInitialize, void); -INCLUDE_ASM("os/code_45a50_len_3a0", func_8006A9E0) +INCLUDE_ASM(s32, "os/code_45a50_len_3a0", func_8006A9E0) diff --git a/src/os/code_45df0_len_970.c b/src/os/code_45df0_len_970.c index 99845c8a70..8f98394452 100644 --- a/src/os/code_45df0_len_970.c +++ b/src/os/code_45df0_len_970.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM("os/code_45df0_len_970", func_8006A9F0); +INCLUDE_ASM(s32, "os/code_45df0_len_970", func_8006A9F0); INCLUDE_API_ASM("os/code_45df0_len_970", osExceptionPreamble); @@ -10,13 +10,13 @@ INCLUDE_API_ASM("os/code_45df0_len_970", savercp); INCLUDE_API_ASM("os/code_45df0_len_970", endrcp); -INCLUDE_ASM("os/code_45df0_len_970", handle_interrupt); +INCLUDE_ASM(s32, "os/code_45df0_len_970", handle_interrupt); -INCLUDE_ASM("os/code_45df0_len_970", next_interrupt); +INCLUDE_ASM(s32, "os/code_45df0_len_970", next_interrupt); -INCLUDE_ASM("os/code_45df0_len_970", IP6_Hdlr); +INCLUDE_ASM(s32, "os/code_45df0_len_970", IP6_Hdlr); -INCLUDE_ASM("os/code_45df0_len_970", IP7_Hdlr); +INCLUDE_ASM(s32, "os/code_45df0_len_970", IP7_Hdlr); INCLUDE_API_ASM("os/code_45df0_len_970", counter); @@ -24,7 +24,7 @@ INCLUDE_API_ASM("os/code_45df0_len_970", cart); INCLUDE_API_ASM("os/code_45df0_len_970", rcp); -INCLUDE_ASM("os/code_45df0_len_970", sp_other_break); +INCLUDE_ASM(s32, "os/code_45df0_len_970", sp_other_break); INCLUDE_API_ASM("os/code_45df0_len_970", vi); @@ -46,7 +46,7 @@ INCLUDE_API_ASM("os/code_45df0_len_970", sw2); INCLUDE_API_ASM("os/code_45df0_len_970", sw1); -INCLUDE_ASM("os/code_45df0_len_970", handle_break); +INCLUDE_ASM(s32, "os/code_45df0_len_970", handle_break); INCLUDE_API_ASM("os/code_45df0_len_970", redispatch); @@ -54,11 +54,11 @@ INCLUDE_API_ASM("os/code_45df0_len_970", enqueueRunning); INCLUDE_API_ASM("os/code_45df0_len_970", panic); -INCLUDE_ASM("os/code_45df0_len_970", send_mesg); +INCLUDE_ASM(s32, "os/code_45df0_len_970", send_mesg); -INCLUDE_ASM("os/code_45df0_len_970", send_done); +INCLUDE_ASM(s32, "os/code_45df0_len_970", send_done); -INCLUDE_ASM("os/code_45df0_len_970", handle_CPU); +INCLUDE_ASM(s32, "os/code_45df0_len_970", handle_CPU); INCLUDE_API_ASM("os/code_45df0_len_970", osEnqueueAndYield); @@ -72,4 +72,4 @@ INCLUDE_API_ASM("os/code_45df0_len_970", osNop); INCLUDE_API_ASM("os/code_45df0_len_970", osDispatchThread); -INCLUDE_ASM_T(void, "os/code_45df0_len_970", osCleanupThread); +INCLUDE_ASM(void, "os/code_45df0_len_970", osCleanupThread); diff --git a/src/os/code_46760_len_90.c b/src/os/code_46760_len_90.c index 83e28966fd..df0f9bc2b9 100644 --- a/src/os/code_46760_len_90.c +++ b/src/os/code_46760_len_90.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM("os/code_46760_len_90", __osDisableInt); +INCLUDE_ASM(s32, "os/code_46760_len_90", __osDisableInt); -INCLUDE_ASM("os/code_46760_len_90", __osRestoreInt); +INCLUDE_ASM(s32, "os/code_46760_len_90", __osRestoreInt); diff --git a/src/os/code_46c70_len_e00.c b/src/os/code_46c70_len_e00.c index ff8d311c75..a14464d049 100644 --- a/src/os/code_46c70_len_e00.c +++ b/src/os/code_46c70_len_e00.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM_T(int, "os/code_46c70_len_e00", bcmp, const void* src, const void* dst, int size); +INCLUDE_ASM(int, "os/code_46c70_len_e00", bcmp, const void* src, const void* dst, int size); -INCLUDE_ASM("os/code_46c70_len_e00", _Litob); +INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Litob); -INCLUDE_ASM("os/code_46c70_len_e00", _Ldtob); +INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Ldtob); -INCLUDE_ASM("os/code_46c70_len_e00", _Ldunscale); +INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Ldunscale); -INCLUDE_ASM("os/code_46c70_len_e00", _Genld); +INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Genld); INCLUDE_API_ASM("os/code_46c70_len_e00", osGetCause); diff --git a/src/os/code_47d50_len_e0.c b/src/os/code_47d50_len_e0.c index b3d34d3560..2da73dea71 100644 --- a/src/os/code_47d50_len_e0.c +++ b/src/os/code_47d50_len_e0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_47d50_len_e0", osDestroyThread, OSThread* thread); +INCLUDE_ASM(void, "os/code_47d50_len_e0", osDestroyThread, OSThread* thread); diff --git a/src/os/code_47e30_len_60.c b/src/os/code_47e30_len_60.c index e237c45539..fec849347a 100644 --- a/src/os/code_47e30_len_60.c +++ b/src/os/code_47e30_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_47e30_len_60", osMapTLBRdb, void); +INCLUDE_ASM(void, "os/code_47e30_len_60", osMapTLBRdb, void); diff --git a/src/os/code_47fc0_len_60.c b/src/os/code_47fc0_len_60.c index 0208613c33..b3714af772 100644 --- a/src/os/code_47fc0_len_60.c +++ b/src/os/code_47fc0_len_60.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_47fc0_len_60", guNormalize, float* x, float* y, float* z); +INCLUDE_ASM(void, "os/code_47fc0_len_60", guNormalize, float* x, float* y, float* z); diff --git a/src/os/code_48020_len_a00.c b/src/os/code_48020_len_a00.c index b7954e59a6..2ee0df4088 100644 --- a/src/os/code_48020_len_a00.c +++ b/src/os/code_48020_len_a00.c @@ -1,12 +1,12 @@ #include "common.h" -INCLUDE_ASM_T(s32, "os/code_48020_len_a00", osPfsChecker, OSPfs* pfs); +INCLUDE_ASM(s32, "os/code_48020_len_a00", osPfsChecker, OSPfs* pfs); -INCLUDE_ASM("os/code_48020_len_a00", corrupted_init); +INCLUDE_ASM(s32, "os/code_48020_len_a00", corrupted_init); INCLUDE_API_ASM("os/code_48020_len_a00", corrupted); -INCLUDE_ASM_T(s32, "os/code_48020_len_a00", osPfsIsPlug, OSMesgQueue* queue, u8* unk); +INCLUDE_ASM(s32, "os/code_48020_len_a00", osPfsIsPlug, OSMesgQueue* queue, u8* unk); INCLUDE_API_ASM("os/code_48020_len_a00", osPfsRequestData); diff --git a/src/os/code_48c00_len_5c0.c b/src/os/code_48c00_len_5c0.c index 414f52d302..e8b6c18733 100644 --- a/src/os/code_48c00_len_5c0.c +++ b/src/os/code_48c00_len_5c0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("os/code_48c00_len_5c0", func_8006D800); +INCLUDE_ASM(s32, "os/code_48c00_len_5c0", func_8006D800); diff --git a/src/os/code_491c0_len_f80.c b/src/os/code_491c0_len_f80.c index dd66c4b9ac..0fb716125d 100644 --- a/src/os/code_491c0_len_f80.c +++ b/src/os/code_491c0_len_f80.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM("os/code_491c0_len_f80", func_8006DDC0); +INCLUDE_ASM(s32, "os/code_491c0_len_f80", func_8006DDC0); -INCLUDE_ASM("os/code_491c0_len_f80", func_8006E310); +INCLUDE_ASM(s32, "os/code_491c0_len_f80", func_8006E310); diff --git a/src/os/code_49C70.c b/src/os/code_49C70.c index a0dbffe12a..7ece93e6d2 100644 --- a/src/os/code_49C70.c +++ b/src/os/code_49C70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM("os/code_49C70", func_8006E870); +INCLUDE_ASM(s32, "os/code_49C70", func_8006E870); diff --git a/src/os/code_4a140_len_70.c b/src/os/code_4a140_len_70.c index 6864ea105c..61ae8a6e99 100644 --- a/src/os/code_4a140_len_70.c +++ b/src/os/code_4a140_len_70.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM_T(char*, "os/code_4a140_len_70", strcpy, char* destination, const char* source); +INCLUDE_ASM(char*, "os/code_4a140_len_70", strcpy, char* destination, const char* source); -INCLUDE_ASM_T(s32, "os/code_4a140_len_70", strcmp, const char* str1, const char* str2); +INCLUDE_ASM(s32, "os/code_4a140_len_70", strcmp, const char* str1, const char* str2); diff --git a/src/os/code_4a1b0_len_40.c b/src/os/code_4a1b0_len_40.c index 4d937ca098..44936e5197 100644 --- a/src/os/code_4a1b0_len_40.c +++ b/src/os/code_4a1b0_len_40.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void*, "os/code_4a1b0_len_40", memset, void* ptr, s32 value, s32 num); +INCLUDE_ASM(void*, "os/code_4a1b0_len_40", memset, void* ptr, s32 value, s32 num); diff --git a/src/os/code_4a1f0_len_170.c b/src/os/code_4a1f0_len_170.c index cd22d449c5..d15c0d01bd 100644 --- a/src/os/code_4a1f0_len_170.c +++ b/src/os/code_4a1f0_len_170.c @@ -1,11 +1,11 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/code_4a1f0_len_170", decode_yay0, void* src, void* dest); +INCLUDE_ASM(void, "os/code_4a1f0_len_170", decode_yay0, void* src, void* dest); -INCLUDE_ASM("os/code_4a1f0_len_170", func_8006EF18); +INCLUDE_ASM(s32, "os/code_4a1f0_len_170", func_8006EF18); -INCLUDE_ASM("os/code_4a1f0_len_170", func_8006EF20); +INCLUDE_ASM(s32, "os/code_4a1f0_len_170", func_8006EF20); -INCLUDE_ASM("os/code_4a1f0_len_170", func_8006EF28); +INCLUDE_ASM(s32, "os/code_4a1f0_len_170", func_8006EF28); -INCLUDE_ASM("os/code_4a1f0_len_170", func_8006EF58); +INCLUDE_ASM(s32, "os/code_4a1f0_len_170", func_8006EF58); diff --git a/src/os/code_4a360_len_930.c b/src/os/code_4a360_len_930.c index 33b4cad03d..6740f3c107 100644 --- a/src/os/code_4a360_len_930.c +++ b/src/os/code_4a360_len_930.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM("os/code_4a360_len_930", func_8006EF60); +INCLUDE_ASM(s32, "os/code_4a360_len_930", func_8006EF60); INCLUDE_API_ASM("os/code_4a360_len_930", osFlashInit); diff --git a/src/os/code_4ac90_len_3910.c b/src/os/code_4ac90_len_3910.c index ce64f61945..17e359d698 100644 --- a/src/os/code_4ac90_len_3910.c +++ b/src/os/code_4ac90_len_3910.c @@ -1,293 +1,293 @@ #include "common.h" -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006F890); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006F890); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006F8F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006F8F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006F950); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006F950); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006F9B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006F9B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FA10); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FA10); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FA70); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FA70); -INCLUDE_ASM("os/code_4ac90_len_3910", fx_walk_large); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_walk_large); -INCLUDE_ASM("os/code_4ac90_len_3910", fx_walk_normal); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_walk_normal); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FB90); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FB90); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FBF0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FBF0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FC50); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FC50); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FCB0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FCB0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FD10); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FD10); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FD70); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FD70); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FDD0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FDD0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FE30); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FE30); -INCLUDE_ASM("os/code_4ac90_len_3910", fx_emote); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_emote); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FEF0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FEF0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FF50); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FF50); -INCLUDE_ASM("os/code_4ac90_len_3910", func_8006FFB0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_8006FFB0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070010); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070010); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070070); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070070); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800700D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800700D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070130); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070130); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070190); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070190); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800701F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800701F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070250); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070250); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800702B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800702B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070310); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070310); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070370); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070370); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800703D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800703D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070430); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070430); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070490); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070490); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800704F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800704F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070550); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070550); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800705B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800705B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070610); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070610); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070670); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070670); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800706D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800706D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070730); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070730); -INCLUDE_ASM("os/code_4ac90_len_3910", fx_sweat); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_sweat); -INCLUDE_ASM("os/code_4ac90_len_3910", fx_sleep_bubble); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", fx_sleep_bubble); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070850); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070850); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800708B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800708B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070910); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070910); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070970); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070970); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800709D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800709D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070A30); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070A30); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070A90); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070A90); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070AF0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070AF0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070B50); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070B50); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070BB0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070BB0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070C10); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070C10); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070C70); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070C70); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070CD0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070CD0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070D30); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070D30); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070D90); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070D90); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070DF0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070DF0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070E50); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070E50); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070EB0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070EB0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070F10); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070F10); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070F70); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070F70); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80070FD0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80070FD0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071030); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071030); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071090); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071090); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800710F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800710F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071150); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071150); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800711B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800711B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071210); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071210); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071270); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071270); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800712D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800712D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071330); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071330); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071390); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071390); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800713F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800713F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071450); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071450); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800714B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800714B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071510); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071510); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071570); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071570); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800715D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800715D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071630); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071630); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071690); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071690); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800716F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800716F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071750); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071750); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800717B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800717B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071810); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071810); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071870); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071870); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800718D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800718D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071930); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071930); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071990); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071990); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800719F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800719F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071A50); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071A50); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071AB0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071AB0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071B10); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071B10); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071B70); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071B70); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071BD0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071BD0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071C30); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071C30); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071C90); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071C90); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071CF0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071CF0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071D50); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071D50); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071DB0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071DB0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071E10); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071E10); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071E70); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071E70); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071ED0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071ED0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071F30); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071F30); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071F90); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071F90); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80071FF0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80071FF0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072050); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072050); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800720B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800720B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072110); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072110); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072170); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072170); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800721D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800721D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072230); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072230); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072290); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072290); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800722F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800722F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072350); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072350); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800723B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800723B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072410); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072410); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072470); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072470); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800724D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800724D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072530); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072530); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072590); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072590); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800725F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800725F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072650); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072650); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800726B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800726B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072710); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072710); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072770); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072770); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800727D0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800727D0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072830); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072830); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072890); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072890); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800728F0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800728F0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072950); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072950); -INCLUDE_ASM("os/code_4ac90_len_3910", func_800729B0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_800729B0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072A10); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072A10); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072A70); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072A70); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072AD0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072AD0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072B30); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072B30); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072BB0); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BB0); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072BCC); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BCC); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072BDC); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072BDC); -INCLUDE_ASM("os/code_4ac90_len_3910", load_battle); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", load_battle); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072CCC); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CCC); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072CDC); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CDC); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072CEC); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CEC); -INCLUDE_ASM("os/code_4ac90_len_3910", func_80072CF4); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", func_80072CF4); -INCLUDE_ASM("os/code_4ac90_len_3910", setup_demo_player); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", setup_demo_player); -INCLUDE_ASM("os/code_4ac90_len_3910", load_demo_battle); +INCLUDE_ASM(s32, "os/code_4ac90_len_3910", load_demo_battle); diff --git a/src/os/code_7e40_len_3f0.c b/src/os/code_7e40_len_3f0.c index fa95f6ed57..077ad44f8b 100644 --- a/src/os/code_7e40_len_3f0.c +++ b/src/os/code_7e40_len_3f0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM("os/code_7e40_len_3f0", nuGfxTaskMgr); +INCLUDE_ASM(s32, "os/code_7e40_len_3f0", nuGfxTaskMgr); -INCLUDE_ASM("os/code_7e40_len_3f0", nuGfxTaskMgrInit); +INCLUDE_ASM(s32, "os/code_7e40_len_3f0", nuGfxTaskMgrInit); -INCLUDE_ASM("os/code_7e40_len_3f0", nuGfxTaskStart); +INCLUDE_ASM(s32, "os/code_7e40_len_3f0", nuGfxTaskStart); diff --git a/src/os/guMtxIdentF.c b/src/os/guMtxIdentF.c index 240e5714fd..7dd9b577c0 100644 --- a/src/os/guMtxIdentF.c +++ b/src/os/guMtxIdentF.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/guMtxIdentF", guMtxIdentF, float mf[4][4]); +INCLUDE_ASM(void, "os/guMtxIdentF", guMtxIdentF, float mf[4][4]); diff --git a/src/os/osCreateThread.c b/src/os/osCreateThread.c index c702a55bc0..d8c7468897 100644 --- a/src/os/osCreateThread.c +++ b/src/os/osCreateThread.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM_T(void, "os/osCreateThread", osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*), +INCLUDE_ASM(void, "os/osCreateThread", osCreateThread, OSThread* thread, OSId id, void (*entrypoint)(void*), void* unk1, void* unk2, OSPri pri); diff --git a/src/os/osGetThreadPri.c b/src/os/osGetThreadPri.c index 7846828165..98d4cd8cab 100644 --- a/src/os/osGetThreadPri.c +++ b/src/os/osGetThreadPri.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM_T(OSPri, "os/osGetThreadPri", osGetThreadPri, OSThread* thread); +INCLUDE_ASM(OSPri, "os/osGetThreadPri", osGetThreadPri, OSThread* thread); diff --git a/undefined_funcs.txt b/undefined_funcs.txt deleted file mode 100644 index 32d042baba..0000000000 --- a/undefined_funcs.txt +++ /dev/null @@ -1 +0,0 @@ -func_8002C890 = 0x8002C890; diff --git a/undefined_syms.txt b/undefined_syms.txt index 16b70bdb41..d628dce52b 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -27,6 +27,8 @@ D_800A0944 = 0x800A0944; D_8010CD10 = 0x8010CD10; D_8010CD12 = 0x8010CD12; +D_8010CD20 = 0x8010CD20; +D_8010F094 = 0x8010F094; gBattleStatus = 0x800DC070; @@ -104,6 +106,10 @@ gWorldShadowList = 0x80151478; gBattleShadowList = 0x80151568; gCurrentShadowListPtr = 0x80151658; +gWorldNpcList = 0x800A0990; +gBattleNpcList = 0x800A0A90; +gCurrentNpcListPtr = 0x800A0B90; + gMainGameState = 0x80151700; gCurrentUpdateFunction = 0x8015170C;