ASM macro fix, decomp of many

This commit is contained in:
Ethan Roseman 2020-09-25 17:18:09 -04:00
parent 3691babd03
commit bbca99bd94
207 changed files with 3465 additions and 3895 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

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

View File

@ -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

View File

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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -115,7 +115,7 @@ typedef struct PlayerData {
/* 0x208 */ s16 equippedBadges[64]; /* 0x208 */ s16 equippedBadges[64];
/* 0x288 */ char unk_288; /* 0x288 */ char unk_288;
/* 0x289 */ u8 merleeSpellType; /* 0x289 */ u8 merleeSpellType;
/* 0x28A */ u8 merleeCastsLeft; /* 0x28A */ s8 merleeCastsLeft;
/* 0x28B */ char unk_28B; /* 0x28B */ char unk_28B;
/* 0x28C */ s16 merleeTurnCount; /* 0x28C */ s16 merleeTurnCount;
/* 0x28E */ s8 maxStarPower; /* 0x28E */ s8 maxStarPower;
@ -679,7 +679,8 @@ typedef struct Model {
/* 0xA6 */ u8 renderMode; /* Created by retype action */ /* 0xA6 */ u8 renderMode; /* Created by retype action */
/* 0xA7 */ char unk_A7; /* 0xA7 */ char unk_A7;
/* 0xA8 */ u8 textureID; /* 0xA8 */ u8 textureID;
/* 0xA9 */ char unk_A9[7]; /* 0xA9 */ u8 unk_A9;
/* 0xAA */ char unk_AA[6];
} Model; // size = 0xB0 } Model; // size = 0xB0
typedef struct AnimatedMesh { typedef struct AnimatedMesh {
@ -855,7 +856,7 @@ typedef struct GameStatus {
/* 0x072 */ u8 nextDemoScene; /* which part of the demo to play next */ /* 0x072 */ u8 nextDemoScene; /* which part of the demo to play next */
/* 0x073 */ u8 contBitPattern; /* 0x073 */ u8 contBitPattern;
/* 0x074 */ char unk_74[4]; /* 0x074 */ char unk_74[4];
/* 0x078 */ u8 disableScripts; /* 0x078 */ s8 disableScripts;
/* 0x079 */ char unk_79; /* 0x079 */ char unk_79;
/* 0x07A */ s8 musicEnabled; /* 0x07A */ s8 musicEnabled;
/* 0x07B */ char unk_7B[3]; /* 0x07B */ char unk_7B[3];
@ -1342,8 +1343,8 @@ typedef struct PlayerStatus {
/* 0x00C */ u8 peachDisguise; /* 0x00C */ u8 peachDisguise;
/* 0x00D */ char unk_0D[5]; /* 0x00D */ char unk_0D[5];
/* 0x012 */ s16 moveFrames; /* 0x012 */ s16 moveFrames;
/* 0x014 */ u8 enableCollisionOverlapsCheck; /* 0x014 */ s8 enableCollisionOverlapsCheck;
/* 0x015 */ u8 statusMenuCounterinputEnabledCounter; /* whether the C-up menu can appear */ /* 0x015 */ s8 statusMenuCounterinputEnabledCounter; /* whether the C-up menu can appear */
/* 0x016 */ s16 lastGoodPosition[3]; /* 0x016 */ s16 lastGoodPosition[3];
/* 0x01C */ struct Vec3f extraVelocity; /* 0x01C */ struct Vec3f extraVelocity;
/* 0x028 */ struct Vec3f position; /* 0x028 */ struct Vec3f position;

View File

@ -15,8 +15,14 @@ s32 get_global_flag(s32 index);
s32 get_area_byte(s32 index); s32 get_area_byte(s32 index);
s32 get_area_flag(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); void clone_model(u16 srcModelID, u16 newModelID);
Model* get_model_from_list_index(s32 listIndex); 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, void get_model_center_and_size(s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY,
f32* sizeZ); 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 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); s32 set_music_track(s32 musicPlayer, s32 songID, s32 variation, s32 unk, s32 volume);
ScriptInstance* get_script_by_index(s32 index);
#endif #endif

View File

@ -2,13 +2,10 @@
#define _MACROS_H_ #define _MACROS_H_
#ifndef SPLAT #ifndef SPLAT
#define INCLUDE_ASM(FOLDER, NAME, ARGS...) \ #define INCLUDE_ASM(TYPE, 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...) \
TYPE __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"include/macro.inc\"\n.include \"asm/nonmatchings/"FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); } TYPE __attribute__((naked)) NAME(ARGS) { __asm__( ".include \"include/macro.inc\"\n.include \"asm/nonmatchings/"FOLDER"/"#NAME".s\"\n.set reorder\n.set at"); }
#else #else
#define INCLUDE_ASM(FOLDER, NAME, ARGS...) #define INCLUDE_ASM(TYPE, FOLDER, NAME, ARGS...)
#define INCLUDE_ASM_T(TYPE, FOLDER, NAME, ARGS...)
#endif #endif
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))

View File

@ -23,7 +23,7 @@ typedef s32 ApiStatus;
#define API_FUN(NAME) ApiStatus (*NAME)(struct ScriptInstance* script, s32 isInitialCall) #define API_FUN(NAME) ApiStatus (*NAME)(struct ScriptInstance* script, s32 isInitialCall)
#ifndef SPLAT #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 #else
#define INCLUDE_API_ASM(FOLDER, NAME) #define INCLUDE_API_ASM(FOLDER, NAME)
#endif #endif

View File

@ -43,7 +43,11 @@ extern Entity** gCurrentEntityListPtr[30];
extern UNK_TYPE* gWorldDynamicEntityList[16]; extern UNK_TYPE* gWorldDynamicEntityList[16];
extern UNK_TYPE* gBattleDynamicEntityList[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* gWorldShadowList[60];
extern Shadow* gBattleShadowList[60]; extern Shadow* gBattleShadowList[60];
@ -61,6 +65,8 @@ extern EncounterStatus gCurrentEncounter;
extern s16* D_80151328; extern s16* D_80151328;
extern s16 D_8010CD10; extern s16 D_8010CD10;
extern s16 D_8010CD12; extern s16 D_8010CD12;
extern s32 D_8010CD20;
extern s32 D_8010F094; // player shadow index?
extern s32 D_801595A0; extern s32 D_801595A0;
extern s16 D_80159AE2; extern s16 D_80159AE2;
extern s16 D_80159AE4; extern s16 D_80159AE4;

View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM("code_1000_len_60", entry_point); INCLUDE_ASM(s32, "code_1000_len_60", entry_point);

View File

@ -1,15 +1,15 @@
#include "common.h" #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);

View File

@ -1,6 +1,6 @@
#include "common.h" #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 // Needs rodata support
/*void create_shadow_callback(Shadow* shadow) { /*void create_shadow_callback(Shadow* shadow) {
shadow->scale.x = 0.1f; shadow->scale.x = 0.1f;
@ -8,15 +8,15 @@ INCLUDE_ASM("code_102610_len_2330", create_shadow_callback);
shadow->scale.z = 0.1f; 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) { void save_game_at_player_position(void) {
GameStatus* gameStatus = GAME_STATUS; GameStatus* gameStatus = GAME_STATUS;
@ -27,56 +27,56 @@ void save_game_at_player_position(void) {
fio_save_game(gameStatus->saveSlot); 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);

View File

@ -1,25 +1,25 @@
#include "common.h" #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);

View File

@ -1,37 +1,37 @@
#include "common.h" #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);

View File

@ -1,99 +1,99 @@
#include "common.h" #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);

View File

@ -1,13 +1,13 @@
#include "common.h" #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);

View File

@ -1,27 +1,27 @@
#include "common.h" #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);

View File

@ -1,37 +1,37 @@
#include "common.h" #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);

View File

@ -1,30 +1,30 @@
#include "common.h" #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) { void player_enter_blue_pipe(Entity* bluePipe) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
@ -62,6 +62,6 @@ void func_802E8E10(Entity* entity) {
func_80110678(); 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);

View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM("code_10A8D0", func_802E9050); INCLUDE_ASM(s32, "code_10A8D0", func_802E9050);

View File

@ -5,13 +5,13 @@ void func_80035DF0(s16 arg0) {
*tempPtr = 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) { void func_800360FC(void) {
GameStatus* gameStatus = *gGameStatusPtr; 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 func_800363FC(void) {
s32 phi_return; s32 phi_return;
@ -59,7 +59,7 @@ s32 func_80036430(void) {
return playerStatus->flags; return playerStatus->flags;
} }
INCLUDE_ASM("code_111f0_len_860", func_8003646C); INCLUDE_ASM(s32, "code_111f0_len_860", func_8003646C);
void func_80036640(void) { void func_80036640(void) {
} }

View File

@ -1,7 +1,7 @@
#include "common.h" #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);

View File

@ -1,19 +1,19 @@
#include "common.h" #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);

View File

@ -1,7 +1,28 @@
#include "common.h" #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;
}
INCLUDE_ASM("code_13480_len_3f0", next_demo_scene); GAME_STATUS->demoStickX = 0;
GAME_STATUS->demoButtonInput = 0;
GAME_STATUS->demoStickY = 0;
INCLUDE_ASM("code_13480_len_3f0", func_8003845C); 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(s32, "code_13480_len_3f0", next_demo_scene);
void func_8003845C(void) {
}

View File

@ -1,203 +1,206 @@
#include "common.h" #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);

View File

@ -1,7 +1,7 @@
#include "common.h" #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);

View File

@ -1,201 +1,204 @@
#include "common.h" #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);

View File

@ -1,99 +1,99 @@
#include "common.h" #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);

View File

@ -1,13 +1,13 @@
#include "common.h" #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);

View File

@ -1,25 +1,25 @@
#include "common.h" #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);

View File

@ -1,9 +1,9 @@
#include "common.h" #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);

File diff suppressed because it is too large Load Diff

View File

@ -1,24 +1,38 @@
#include "common.h" #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) { ApiStatus GetCamLookAtObjVector(ScriptInstance* script, s32 isInitialCall) {
// Almost certainly a CURRENT_CAM macro // Almost certainly a CURRENT_CAM macro
@ -29,11 +43,18 @@ ApiStatus GetCamLookAtObjVector(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2; 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); INCLUDE_API_ASM("code_1a1f0_len_5390", OnDefeatEnemy);
@ -62,18 +83,18 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) {
return --script->functionTemp[1] == 0; 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() { 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) { s32 func_8004304C(void) {
EncounterStatus* currentEncounter = &gCurrentEncounter; EncounterStatus* currentEncounter = &gCurrentEncounter;
@ -87,14 +108,14 @@ s32 func_8004304C(void) {
return ret; return ret;
} }
INCLUDE_ASM("code_1a1f0_len_5390", func_8004309C); INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8004309C);
void func_800431D4() { 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() { void func_80044140() {
} }

View File

@ -34,13 +34,13 @@ extern s32 D_8009A5D8;
void dma_copy(void*, void*, void*); 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) { /*void load_engine_data(void) {
game_status *phi_s0; game_status *phi_s0;
s32 i; s32 i;
@ -111,13 +111,13 @@ INCLUDE_ASM("code_1b40_len_20b0", load_engine_data);
set_game_mode(0); 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) { s32 func_80027190(void) {
return D_8009A5D8; return D_8009A5D8;
} }
INCLUDE_ASM("code_1b40_len_20b0", func_800271A0); INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800271A0);
/*void func_800271A0(void) { /*void func_800271A0(void) {
Gfx *temp = D_8009A66C[0] + 1; Gfx *temp = D_8009A66C[0] + 1;
@ -128,16 +128,16 @@ INCLUDE_ASM("code_1b40_len_20b0", func_800271A0);
gSPDisplayList(D_8009A66C[0]++, &D_00074210); 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);

View File

@ -2,9 +2,9 @@
INCLUDE_API_ASM("code_1f580_len_1940", SetEncounterStatusFlags); 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) { ApiStatus LoadDemoBattle(ScriptInstance* script, s32 isInitialCall) {
load_demo_battle(get_variable(script, *script->ptrReadPos)); 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_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) { ApiStatus GetOwnerEncountered(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, script->ownerActorID->encountered); 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_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) { ApiStatus StartBattle(ScriptInstance* script, s32 isInitialCall) {
start_battle(script, -1); start_battle(script, -1);
@ -98,7 +98,7 @@ ApiStatus SetSelfEnemyFlags(ScriptInstance* script, s32 isInitialCall) {
INCLUDE_API_ASM("code_1f580_len_1940", SetSelfEnemyFlagBits); 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) { ApiStatus GetSelfNpcID(ScriptInstance* script, s32 isInitialCall) {
set_variable(script, *script->ptrReadPos, script->ownerActorID->npcID); 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_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_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);

View File

@ -1,143 +1,143 @@
#include "common.h" #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);

View File

@ -1,17 +1,17 @@
#include "common.h" #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);

View File

@ -1,97 +1,97 @@
#include "common.h" #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);

View File

@ -1,177 +1,177 @@
#include "common.h" #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);

View File

@ -1,17 +1,17 @@
#include "common.h" #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);

View File

@ -1,91 +1,91 @@
#include "common.h" #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);

View File

@ -1,224 +1,224 @@
#include "common.h" #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 #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);

View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM("code_3169f0", func_80200000); INCLUDE_ASM(s32, "code_3169f0", func_80200000);

View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM("code_316a70", func_80200080); INCLUDE_ASM(s32, "code_316a70", func_80200080);

View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM("code_316d90", func_802AE000); INCLUDE_ASM(s32, "code_316d90", func_802AE000);

View File

@ -1,55 +1,55 @@
#include "common.h" #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);

View File

@ -1,51 +1,51 @@
#include "common.h" #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);

View File

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

View File

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

View File

@ -1,91 +1,91 @@
#include "common.h" #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);

View File

@ -6,25 +6,25 @@ void poll_rumble(void) {
nuContRmbModeSet(0, 2); 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) { f32 length2D(f32 x, f32 y) {
return sqrtf(SQ(x) + SQ(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); INCLUDE_API_ASM("code_42e0_len_1f60", cosine);
@ -37,7 +37,7 @@ s32 sign(s32 val) {
return sign; 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) { void mem_clear(s8* data, s32 numBytes) {
while (numBytes > 0) { 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) { void copy_matrix(Matrix4f* src, Matrix4f* dest) {
bcopy(src, dest, sizeof(Matrix4f)); 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 _advance_rng(void) {
s32* rngVal = &gRandSeed; s32* rngVal = &gRandSeed;
@ -67,11 +67,11 @@ s32 _advance_rng(void) {
return *rngVal; 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 signF(f32 val) {
f32 sign; f32 sign;
@ -90,7 +90,7 @@ f32 signF(f32 val) {
INCLUDE_API_ASM("code_42e0_len_1f60", round); 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) { f32 get_clamped_angle_diff(f32 a, f32 b) {
if (fabsf(b - a) >= 180.0f) { if (fabsf(b - a) >= 180.0f) {
@ -103,13 +103,13 @@ f32 get_clamped_angle_diff(f32 a, f32 b) {
return b - a; 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) { f32 get_player_normal_yaw(void) {
return atan2(0, 0, (*gGameStatusPtr)->playerTraceNormal.x, (*gGameStatusPtr)->playerTraceNormal.z); 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 dist2D(f32 ax, f32 ay, f32 bx, f32 by) {
f32 xDiff = bx - ax; 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)); 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);

View File

@ -1,40 +1,40 @@
#include "common.h" #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) { void fio_init_flash(void) {
osFlashInit(); 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) { void fio_erase_flash(s32 pageNum) {
osFlashSectorErase(pageNum * 128); osFlashSectorErase(pageNum * 128);

View File

@ -1,18 +1,18 @@
#include "common.h" #include "common.h"
INCLUDE_ASM("code_6e40_len_500", initialize_curtains) INCLUDE_ASM(s32, "code_6e40_len_500", initialize_curtains)
void update_curtains(void) { 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);

View File

@ -1,27 +1,27 @@
#include "common.h" #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);

View File

@ -1,151 +1,189 @@
#include "common.h" #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);

View File

@ -1,41 +1,41 @@
#include "common.h" #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);

View File

@ -1,51 +1,51 @@
#include "common.h" #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);

View File

@ -1,8 +1,8 @@
#include "common.h" #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); 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) { void set_action_state(s32 actionState) {
PlayerStatus* player_status = &gPlayerStatus; 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) { s32 check_input_hammer(void) {
PlayerStatus* player_status = &gPlayerStatus; PlayerStatus* player_status = &gPlayerStatus;
@ -196,18 +196,18 @@ s32 check_input_hammer(void) {
return FALSE; 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);

View File

@ -1,39 +1,39 @@
#include "common.h" #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);

View File

@ -1,17 +1,17 @@
#include "common.h" #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);

View File

@ -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) { void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) {
UiStatus* uiStatus = &gUIStatus; UiStatus* uiStatus = &gUIStatus;
@ -965,7 +965,7 @@ s32 is_ability_active(s32 arg0) {
} }
} }
#else #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 #endif
s32 is_partner_ability_active(void) { s32 is_partner_ability_active(void) {

View File

@ -10,26 +10,26 @@ INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrRestart);
INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrThread); INCLUDE_API_ASM("code_8230_len_1ae0", nuSiMgrThread);
INCLUDE_ASM("code_8230_len_1ae0", func_8002D160); INCLUDE_ASM(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);

View File

@ -1,109 +1,112 @@
#include "common.h" #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);

View File

@ -1,19 +1,19 @@
#include "common.h" #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);

View File

@ -18,7 +18,7 @@ typedef struct {
extern struct_func_800F0CB0 D_8010D000[]; 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) // void func_800F0CB0(s32 arg0, f32 arg1, f32 arg2, f32 arg3)
//{ //{
// sub_struct_func_800F0CB0 *temp_a1 = &D_8010D000[arg0].unk00[0]; // 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 u16 D_800741F0;
extern Gfx *D_8009A66C; extern Gfx *D_8009A66C;
@ -58,7 +58,7 @@ extern void *D_801096B0;
extern Gfx D_80109710[]; extern Gfx D_80109710[];
extern Gfx D_801097D8[];*/ 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) { /*void func_800F102C(void) {
s32 temp_s2; s32 temp_s2;
s32 temp_s7; s32 temp_s7;

View File

@ -1,34 +1,34 @@
#include "common.h" #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) { void func_800F52BC(void) {
func_800F1A10(); func_800F1A10();

View File

@ -1,3 +1,3 @@
#include "common.h" #include "common.h"
INCLUDE_ASM("code_8e790_len_2850", draw_box); INCLUDE_ASM(s32, "code_8e790_len_2850", draw_box);

View File

@ -1,9 +1,9 @@
#include "common.h" #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);

View File

@ -1,30 +1,30 @@
#include "common.h" #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) { Entity* get_entity_by_index(s32 index) {
return (*gCurrentEntityListPtr)[index & 0xFFF]; return (*gCurrentEntityListPtr)[index & 0xFFF];
@ -56,59 +56,59 @@ Shadow** get_shadow_list(void) {
return ret; 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) { s32 is_player_action_state(ActionState actionState) {
return actionState == gPlayerActionState; 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_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); 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_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) { Model* get_model_from_list_index(s32 listIndex) {
return (*gCurrentModelListPtr)[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); 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) { void set_tex_panner(Model* model, s8 texPannerID) {
model->texPannerID = 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);

View File

@ -1,19 +1,19 @@
#include "common.h" #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);

View File

@ -1,267 +1,267 @@
#include "common.h" #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 unk2,
s32 unk3); 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);

View File

@ -1,41 +1,41 @@
#include "common.h" #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);

View File

@ -1,61 +1,61 @@
#include "common.h" #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);

View File

@ -1,95 +1,95 @@
#include "common.h" #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);

Some files were not shown because too many files have changed in this diff Show More