pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

GetCurrentFloor (less than 10k funcs now)

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-24 18:25:25 -04:00
parent 820dd235e6
commit 86087faf8f
72 changed files with 42 additions and 351 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
asm/nonmatchings/world/area_dro/dro_01/95B200/func_80240020_95B220.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_95B220
/* 95B220 80240020 3C028016 */ lui $v0, 0x8016
/* 95B224 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 95B228 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 95B22C 8024002C 03E00008 */ jr $ra
/* 95B230 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435C0_95E7C0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802435C0_95E7C0
/* 95E7C0 802435C0 3C028016 */ lui $v0, 0x8016
/* 95E7C4 802435C4 8442A552 */ lh $v0, -0x5aae($v0)
/* 95E7C8 802435C8 AC820084 */ sw $v0, 0x84($a0)
/* 95E7CC 802435CC 03E00008 */ jr $ra
/* 95E7D0 802435D0 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_flo/flo_11/CBDCD0/func_80240020_CBDCF0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_CBDCF0
/* CBDCF0 80240020 3C028016 */ lui $v0, 0x8016
/* CBDCF4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* CBDCF8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* CBDCFC 8024002C 03E00008 */ jr $ra
/* CBDD00 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240020_E1E480.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_E1E480
/* E1E480 80240020 3C028016 */ lui $v0, 0x8016
/* E1E484 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* E1E488 80240028 AC820084 */ sw $v0, 0x84($a0)
/* E1E48C 8024002C 03E00008 */ jr $ra
/* E1E490 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240020_B34BF0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_B34BF0
/* B34BF0 80240020 3C028016 */ lui $v0, 0x8016
/* B34BF4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* B34BF8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* B34BFC 8024002C 03E00008 */ jr $ra
/* B34C00 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_jan/jan_09/B65AB0/func_80240020_B65AD0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_B65AD0
/* B65AD0 80240020 3C028016 */ lui $v0, 0x8016
/* B65AD4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* B65AD8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* B65ADC 8024002C 03E00008 */ jr $ra
/* B65AE0 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240178_B709D8.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240178_B709D8
/* B709D8 80240178 3C028016 */ lui $v0, 0x8016
/* B709DC 8024017C 8442A552 */ lh $v0, -0x5aae($v0)
/* B709E0 80240180 AC820084 */ sw $v0, 0x84($a0)
/* B709E4 80240184 03E00008 */ jr $ra
/* B709E8 80240188 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240020_8B0090.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_8B0090
/* 8B0090 80240020 3C028016 */ lui $v0, 0x8016
/* 8B0094 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 8B0098 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 8B009C 8024002C 03E00008 */ jr $ra
/* 8B00A0 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240050_8EBE70.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240050_8EBE70
/* 8EBE70 80240050 3C028016 */ lui $v0, 0x8016
/* 8EBE74 80240054 8442A552 */ lh $v0, -0x5aae($v0)
/* 8EBE78 80240058 AC820084 */ sw $v0, 0x84($a0)
/* 8EBE7C 8024005C 03E00008 */ jr $ra
/* 8EBE80 80240060 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802417A0_8ED5C0
/* 8ED5C0 802417A0 3C028016 */ lui $v0, 0x8016
/* 8ED5C4 802417A4 8442A552 */ lh $v0, -0x5aae($v0)
/* 8ED5C8 802417A8 AC820084 */ sw $v0, 0x84($a0)
/* 8ED5CC 802417AC 03E00008 */ jr $ra
/* 8ED5D0 802417B0 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D70_8EDB90.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241D70_8EDB90
/* 8EDB90 80241D70 3C028016 */ lui $v0, 0x8016
/* 8EDB94 80241D74 8442A552 */ lh $v0, -0x5aae($v0)
/* 8EDB98 80241D78 AC820084 */ sw $v0, 0x84($a0)
/* 8EDB9C 80241D7C 03E00008 */ jr $ra
/* 8EDBA0 80241D80 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_7EAD30
/* 7EAD30 80240020 3C028016 */ lui $v0, 0x8016
/* 7EAD34 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 7EAD38 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 7EAD3C 8024002C 03E00008 */ jr $ra
/* 7EAD40 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_mac/mac_02/8232C0/func_80240020_8232E0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_8232E0
/* 8232E0 80240020 3C028016 */ lui $v0, 0x8016
/* 8232E4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 8232E8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 8232EC 8024002C 03E00008 */ jr $ra
/* 8232F0 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_mac/mac_03/831800/func_80240020_831820.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_831820
/* 831820 80240020 3C028016 */ lui $v0, 0x8016
/* 831824 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 831828 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 83182C 8024002C 03E00008 */ jr $ra
/* 831830 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240020_E0E7C0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_E0E7C0
/* E0E7C0 80240020 3C028016 */ lui $v0, 0x8016
/* E0E7C4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* E0E7C8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* E0E7CC 8024002C 03E00008 */ jr $ra
/* E0E7D0 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240020_BB7090.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_BB7090
/* BB7090 80240020 3C028016 */ lui $v0, 0x8016
/* BB7094 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* BB7098 80240028 AC820084 */ sw $v0, 0x84($a0)
/* BB709C 8024002C 03E00008 */ jr $ra
/* BB70A0 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240020_9D7040.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_9D7040
/* 9D7040 80240020 3C028016 */ lui $v0, 0x8016
/* 9D7044 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 9D7048 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 9D704C 8024002C 03E00008 */ jr $ra
/* 9D7050 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240020_A06F20.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_A06F20
/* A06F20 80240020 3C028016 */ lui $v0, 0x8016
/* A06F24 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* A06F28 80240028 AC820084 */ sw $v0, 0x84($a0)
/* A06F2C 8024002C 03E00008 */ jr $ra
/* A06F30 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_sam/sam_02/D05730/func_80240020_D05750.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_D05750
/* D05750 80240020 3C028016 */ lui $v0, 0x8016
/* D05754 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* D05758 80240028 AC820084 */ sw $v0, 0x84($a0)
/* D0575C 8024002C 03E00008 */ jr $ra
/* D05760 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024032C_8697DC
/* 8697DC 8024032C 3C028016 */ lui $v0, 0x8016
/* 8697E0 80240330 8442A552 */ lh $v0, -0x5aae($v0)
/* 8697E4 80240334 AC820084 */ sw $v0, 0x84($a0)
/* 8697E8 80240338 03E00008 */ jr $ra
/* 8697EC 8024033C 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_03/86EB00/func_80240020_86EB20.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_86EB20
/* 86EB20 80240020 3C028016 */ lui $v0, 0x8016
/* 86EB24 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 86EB28 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 86EB2C 8024002C 03E00008 */ jr $ra
/* 86EB30 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_04/871A30/func_8024032C_871D5C.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024032C_871D5C
/* 871D5C 8024032C 3C028016 */ lui $v0, 0x8016
/* 871D60 80240330 8442A552 */ lh $v0, -0x5aae($v0)
/* 871D64 80240334 AC820084 */ sw $v0, 0x84($a0)
/* 871D68 80240338 03E00008 */ jr $ra
/* 871D6C 8024033C 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_06/876EE0/func_80240020_876F00.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_876F00
/* 876F00 80240020 3C028016 */ lui $v0, 0x8016
/* 876F04 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 876F08 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 876F0C 8024002C 03E00008 */ jr $ra
/* 876F10 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240020_879C00.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_879C00
/* 879C00 80240020 3C028016 */ lui $v0, 0x8016
/* 879C04 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 879C08 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 879C0C 8024002C 03E00008 */ jr $ra
/* 879C10 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_08/87EDF0/func_80240020_87EE10.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_87EE10
/* 87EE10 80240020 3C028016 */ lui $v0, 0x8016
/* 87EE14 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 87EE18 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 87EE1C 8024002C 03E00008 */ jr $ra
/* 87EE20 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_09/8821C0/func_80240020_8821E0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_8821E0
/* 8821E0 80240020 3C028016 */ lui $v0, 0x8016
/* 8821E4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 8821E8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 8821EC 8024002C 03E00008 */ jr $ra
/* 8821F0 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_12/888BD0/func_80240020_888BF0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_888BF0
/* 888BF0 80240020 3C028016 */ lui $v0, 0x8016
/* 888BF4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 888BF8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 888BFC 8024002C 03E00008 */ jr $ra
/* 888C00 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_14/88D600/func_80240020_88D620.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_88D620
/* 88D620 80240020 3C028016 */ lui $v0, 0x8016
/* 88D624 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 88D628 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 88D62C 8024002C 03E00008 */ jr $ra
/* 88D630 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_15/88FBA0/func_80240020_88FBC0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_88FBC0
/* 88FBC0 80240020 3C028016 */ lui $v0, 0x8016
/* 88FBC4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 88FBC8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 88FBCC 8024002C 03E00008 */ jr $ra
/* 88FBD0 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240D90_8937B0
/* 8937B0 80240D90 3C028016 */ lui $v0, 0x8016
/* 8937B4 80240D94 8442A552 */ lh $v0, -0x5aae($v0)
/* 8937B8 80240D98 AC820084 */ sw $v0, 0x84($a0)
/* 8937BC 80240D9C 03E00008 */ jr $ra
/* 8937C0 80240DA0 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_19/8975E0/func_80240020_897600.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_897600
/* 897600 80240020 3C028016 */ lui $v0, 0x8016
/* 897604 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 897608 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 89760C 8024002C 03E00008 */ jr $ra
/* 897610 80240030 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_20/89A350/func_8024032C_89A67C.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024032C_89A67C
/* 89A67C 8024032C 3C028016 */ lui $v0, 0x8016
/* 89A680 80240330 8442A552 */ lh $v0, -0x5aae($v0)
/* 89A684 80240334 AC820084 */ sw $v0, 0x84($a0)
/* 89A688 80240338 03E00008 */ jr $ra
/* 89A68C 8024033C 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_21/89D7A0/func_8024032C_89DACC.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024032C_89DACC
/* 89DACC 8024032C 3C028016 */ lui $v0, 0x8016
/* 89DAD0 80240330 8442A552 */ lh $v0, -0x5aae($v0)
/* 89DAD4 80240334 AC820084 */ sw $v0, 0x84($a0)
/* 89DAD8 80240338 03E00008 */ jr $ra
/* 89DADC 8024033C 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024035C_8A021C
/* 8A021C 8024035C 3C028016 */ lui $v0, 0x8016
/* 8A0220 80240360 8442A552 */ lh $v0, -0x5aae($v0)
/* 8A0224 80240364 AC820084 */ sw $v0, 0x84($a0)
/* 8A0228 80240368 03E00008 */ jr $ra
/* 8A022C 8024036C 24020002 */ addiu $v0, $zero, 2

9
asm/nonmatchings/world/area_tik/tik_23/8A23D0/func_80240020_8A23F0.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240020_8A23F0
/* 8A23F0 80240020 3C028016 */ lui $v0, 0x8016
/* 8A23F4 80240024 8442A552 */ lh $v0, -0x5aae($v0)
/* 8A23F8 80240028 AC820084 */ sw $v0, 0x84($a0)
/* 8A23FC 8024002C 03E00008 */ jr $ra
/* 8A2400 80240030 24020002 */ addiu $v0, $zero, 2

2
src/world/area_dro/dro_01/95B200.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240000_95B200);
INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240020_95B220);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_dro/dro_01/95B200", func_80240034_95B234);

2
src/world/area_dro/dro_01/95E7A0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435A0_95E7A0);
INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435C0_95E7C0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4);

2
src/world/area_flo/flo_11/CBDCD0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240000_CBDCD0);
INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240020_CBDCF0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_11/CBDCD0", func_80240034_CBDD04);

2
src/world/area_gv/gv_01/E1E460.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240000_E1E460);
INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240020_E1E480);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240034_E1E494);

2
src/world/area_jan/jan_03/B34BD0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240000_B34BD0);
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240020_B34BF0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240034_B34C04);

2
src/world/area_jan/jan_09/B65AB0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240000_B65AB0);
INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240020_B65AD0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_09/B65AB0", func_80240034_B65AE4);

2
src/world/area_jan/jan_11/B70860.c
View File

@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240000_B70860);
INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240158_B709B8);
INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240178_B709D8);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C_B709EC);

2
src/world/area_kmr/kmr_02/8B0070.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240000_8B0070);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240020_8B0090);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240034_8B00A4);

2
src/world/area_kmr/kmr_20/8EBE50.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240030_8EBE50);
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240050_8EBE70);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064_8EBE84);

2
src/world/area_kmr/kmr_20/8ED5A0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241780_8ED5A0);
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417A0_8ED5C0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4);

2
src/world/area_kmr/kmr_20/8EDB70.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D50_8EDB70);
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D70_8EDB90);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4);

2
src/world/area_mac/mac_00/7EAD10.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240000_7EAD10);
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240020_7EAD30);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44);

2
src/world/area_mac/mac_02/8232C0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240000_8232C0);
INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240020_8232E0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_02/8232C0", func_80240034_8232F4);

2
src/world/area_mac/mac_03/831800.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240000_831800);
INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240020_831820);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_03/831800", func_80240034_831834);

2
src/world/area_mgm/mgm_00/E0E7A0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240000_E0E7A0);
INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240020_E0E7C0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240034_E0E7D4);

2
src/world/area_mim/mim_11/BB7070.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240000_BB7070);
INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240020_BB7090);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240034_BB70A4);

2
src/world/area_nok/nok_02/9D7020.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240000_9D7020);
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240020_9D7040);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240034_9D7054);

2
src/world/area_nok/nok_15/A06F00.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240000_A06F00);
INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240020_A06F20);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240034_A06F34);

2
src/world/area_sam/sam_02/D05730.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240000_D05730);
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240020_D05750);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05730", func_80240034_D05764);

2
src/world/area_tik/tik_01/8694B0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240124_8695D4);
INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024030C_8697BC);
INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024032C_8697DC);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340_8697F0);

2
src/world/area_tik/tik_03/86EB00.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240000_86EB00);
INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240020_86EB20);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_03/86EB00", func_80240034_86EB34);

2
src/world/area_tik/tik_04/871A30.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240124_871B54);
INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_8024030C_871D3C);
INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_8024032C_871D5C);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_04/871A30", func_80240340_871D70);

2
src/world/area_tik/tik_06/876EE0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240000_876EE0);
INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240020_876F00);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_06/876EE0", func_80240034_876F14);

2
src/world/area_tik/tik_07/879BE0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240000_879BE0);
INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240020_879C00);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240034_879C14);

2
src/world/area_tik/tik_08/87EDF0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240000_87EDF0);
INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240020_87EE10);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_08/87EDF0", func_80240034_87EE24);

2
src/world/area_tik/tik_09/8821C0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240000_8821C0);
INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240020_8821E0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_09/8821C0", func_80240034_8821F4);

2
src/world/area_tik/tik_12/888BD0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240000_888BD0);
INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240020_888BF0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_12/888BD0", func_80240034_888C04);

2
src/world/area_tik/tik_14/88D600.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240000_88D600);
INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240020_88D620);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_14/88D600", func_80240034_88D634);

2
src/world/area_tik/tik_15/88FBA0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240000_88FBA0);
INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240020_88FBC0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_15/88FBA0", func_80240034_88FBD4);

2
src/world/area_tik/tik_17/893790.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D70_893790);
INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D90_8937B0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240DA4_8937C4);

2
src/world/area_tik/tik_19/8975E0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240000_8975E0);
INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240020_897600);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_19/8975E0", func_80240034_897614);

2
src/world/area_tik/tik_20/89A350.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240124_89A474);
INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_8024030C_89A65C);
INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_8024032C_89A67C);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_20/89A350", func_80240340_89A690);

2
src/world/area_tik/tik_21/89D7A0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240124_89D8C4);
INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_8024030C_89DAAC);
INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_8024032C_89DACC);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_21/89D7A0", func_80240340_89DAE0);

2
src/world/area_tik/tik_22/89FEF0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154_8A0014);
INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024033C_8A01FC);
INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024035C_8A021C);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370_8A0230);

2
src/world/area_tik/tik_23/8A23D0.c
View File

@ -2,7 +2,7 @@
INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240000_8A23D0);
INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240020_8A23F0);
#include "world/common/GetCurrentFloor.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_23/8A23D0", func_80240034_8A2404);

6
src/world/common/GetCurrentFloor.inc.c Normal file
View File

@ -0,0 +1,6 @@
#include "common.h"
static ApiStatus GetCurrentFloor(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = gCollisionStatus.currentFloor;
return ApiStatus_DONE2;
}

2
undefined_syms.txt
View File

@ -181,7 +181,7 @@ gCurrentTriggerListPtr = 0x80159390;
D_801595A0 = 0x801595A0;
D_80159AE2 = 0x80159AE2;
D_80159AE4 = 0x80159AE4;
gCollisionStatus = 0x8015A55A0;
gCollisionStatus = 0x8015A550;
D_8015C7C0 = 0x8015C7C0;
gLastCreatedEntityIndex = 0x801512EC;