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

some other stuff

Browse Source
This commit is contained in:
Ethan Roseman 2020-12-31 16:13:49 +09:00
parent a030622f29
commit 0923a61ffd
8 changed files with 6 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_802406D0_CAC8C0.s
View File

@ -1,32 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802406D0_CAC8C0
/* CAC8C0 802406D0 27BDFFE0 */ addiu $sp, $sp, -0x20
/* CAC8C4 802406D4 AFB00010 */ sw $s0, 0x10($sp)
/* CAC8C8 802406D8 0080802D */ daddu $s0, $a0, $zero
/* CAC8CC 802406DC AFBF0018 */ sw $ra, 0x18($sp)
/* CAC8D0 802406E0 AFB10014 */ sw $s1, 0x14($sp)
/* CAC8D4 802406E4 8E02000C */ lw $v0, 0xc($s0)
/* CAC8D8 802406E8 8C510000 */ lw $s1, ($v0)
/* CAC8DC 802406EC 0C0B1EAF */ jal get_variable
/* CAC8E0 802406F0 0220282D */ daddu $a1, $s1, $zero
/* CAC8E4 802406F4 3C03FFF0 */ lui $v1, 0xfff0
/* CAC8E8 802406F8 3463FFFF */ ori $v1, $v1, 0xffff
/* CAC8EC 802406FC 0200202D */ daddu $a0, $s0, $zero
/* CAC8F0 80240700 00431024 */ and $v0, $v0, $v1
/* CAC8F4 80240704 00021140 */ sll $v0, $v0, 5
/* CAC8F8 80240708 3C068008 */ lui $a2, %hi(gItemTable)
/* CAC8FC 8024070C 00C23021 */ addu $a2, $a2, $v0
/* CAC900 80240710 8CC678E0 */ lw $a2, %lo(gItemTable)($a2)
/* CAC904 80240714 0C0B2026 */ jal set_variable
/* CAC908 80240718 0220282D */ daddu $a1, $s1, $zero
/* CAC90C 8024071C 8FBF0018 */ lw $ra, 0x18($sp)
/* CAC910 80240720 8FB10014 */ lw $s1, 0x14($sp)
/* CAC914 80240724 8FB00010 */ lw $s0, 0x10($sp)
/* CAC918 80240728 24020002 */ addiu $v0, $zero, 2
/* CAC91C 8024072C 03E00008 */ jr $ra
/* CAC920 80240730 27BD0020 */ addiu $sp, $sp, 0x20
/* CAC924 80240734 00000000 */ nop
/* CAC928 80240738 00000000 */ nop
/* CAC92C 8024073C 00000000 */ nop

31
asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80241094_916E04.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241094_916E04
/* 916E04 80241094 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 916E08 80241098 AFB00010 */ sw $s0, 0x10($sp)
/* 916E0C 8024109C 0080802D */ daddu $s0, $a0, $zero
/* 916E10 802410A0 AFBF0018 */ sw $ra, 0x18($sp)
/* 916E14 802410A4 AFB10014 */ sw $s1, 0x14($sp)
/* 916E18 802410A8 8E02000C */ lw $v0, 0xc($s0)
/* 916E1C 802410AC 8C510000 */ lw $s1, ($v0)
/* 916E20 802410B0 0C0B1EAF */ jal get_variable
/* 916E24 802410B4 0220282D */ daddu $a1, $s1, $zero
/* 916E28 802410B8 3C03FFF0 */ lui $v1, 0xfff0
/* 916E2C 802410BC 3463FFFF */ ori $v1, $v1, 0xffff
/* 916E30 802410C0 0200202D */ daddu $a0, $s0, $zero
/* 916E34 802410C4 00431024 */ and $v0, $v0, $v1
/* 916E38 802410C8 00021140 */ sll $v0, $v0, 5
/* 916E3C 802410CC 3C068008 */ lui $a2, %hi(gItemTable)
/* 916E40 802410D0 00C23021 */ addu $a2, $a2, $v0
/* 916E44 802410D4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2)
/* 916E48 802410D8 0C0B2026 */ jal set_variable
/* 916E4C 802410DC 0220282D */ daddu $a1, $s1, $zero
/* 916E50 802410E0 8FBF0018 */ lw $ra, 0x18($sp)
/* 916E54 802410E4 8FB10014 */ lw $s1, 0x14($sp)
/* 916E58 802410E8 8FB00010 */ lw $s0, 0x10($sp)
/* 916E5C 802410EC 24020002 */ addiu $v0, $zero, 2
/* 916E60 802410F0 03E00008 */ jr $ra
/* 916E64 802410F4 27BD0020 */ addiu $sp, $sp, 0x20
/* 916E68 802410F8 00000000 */ nop
/* 916E6C 802410FC 00000000 */ nop

31
asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_802400F4_91E664.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802400F4_91E664
/* 91E664 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 91E668 802400F8 AFB00010 */ sw $s0, 0x10($sp)
/* 91E66C 802400FC 0080802D */ daddu $s0, $a0, $zero
/* 91E670 80240100 AFBF0018 */ sw $ra, 0x18($sp)
/* 91E674 80240104 AFB10014 */ sw $s1, 0x14($sp)
/* 91E678 80240108 8E02000C */ lw $v0, 0xc($s0)
/* 91E67C 8024010C 8C510000 */ lw $s1, ($v0)
/* 91E680 80240110 0C0B1EAF */ jal get_variable
/* 91E684 80240114 0220282D */ daddu $a1, $s1, $zero
/* 91E688 80240118 3C03FFF0 */ lui $v1, 0xfff0
/* 91E68C 8024011C 3463FFFF */ ori $v1, $v1, 0xffff
/* 91E690 80240120 0200202D */ daddu $a0, $s0, $zero
/* 91E694 80240124 00431024 */ and $v0, $v0, $v1
/* 91E698 80240128 00021140 */ sll $v0, $v0, 5
/* 91E69C 8024012C 3C068008 */ lui $a2, %hi(gItemTable)
/* 91E6A0 80240130 00C23021 */ addu $a2, $a2, $v0
/* 91E6A4 80240134 8CC678E0 */ lw $a2, %lo(gItemTable)($a2)
/* 91E6A8 80240138 0C0B2026 */ jal set_variable
/* 91E6AC 8024013C 0220282D */ daddu $a1, $s1, $zero
/* 91E6B0 80240140 8FBF0018 */ lw $ra, 0x18($sp)
/* 91E6B4 80240144 8FB10014 */ lw $s1, 0x14($sp)
/* 91E6B8 80240148 8FB00010 */ lw $s0, 0x10($sp)
/* 91E6BC 8024014C 24020002 */ addiu $v0, $zero, 2
/* 91E6C0 80240150 03E00008 */ jr $ra
/* 91E6C4 80240154 27BD0020 */ addiu $sp, $sp, 0x20
/* 91E6C8 80240158 00000000 */ nop
/* 91E6CC 8024015C 00000000 */ nop

29
asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241D44_CF98B4.s
View File

@ -1,29 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241D44_CF98B4
/* CF98B4 80241D44 27BDFFE0 */ addiu $sp, $sp, -0x20
/* CF98B8 80241D48 AFB00010 */ sw $s0, 0x10($sp)
/* CF98BC 80241D4C 0080802D */ daddu $s0, $a0, $zero
/* CF98C0 80241D50 AFBF0018 */ sw $ra, 0x18($sp)
/* CF98C4 80241D54 AFB10014 */ sw $s1, 0x14($sp)
/* CF98C8 80241D58 8E02000C */ lw $v0, 0xc($s0)
/* CF98CC 80241D5C 8C510000 */ lw $s1, ($v0)
/* CF98D0 80241D60 0C0B1EAF */ jal get_variable
/* CF98D4 80241D64 0220282D */ daddu $a1, $s1, $zero
/* CF98D8 80241D68 3C03FFF0 */ lui $v1, 0xfff0
/* CF98DC 80241D6C 3463FFFF */ ori $v1, $v1, 0xffff
/* CF98E0 80241D70 0200202D */ daddu $a0, $s0, $zero
/* CF98E4 80241D74 00431024 */ and $v0, $v0, $v1
/* CF98E8 80241D78 00021140 */ sll $v0, $v0, 5
/* CF98EC 80241D7C 3C068008 */ lui $a2, %hi(gItemTable)
/* CF98F0 80241D80 00C23021 */ addu $a2, $a2, $v0
/* CF98F4 80241D84 8CC678E0 */ lw $a2, %lo(gItemTable)($a2)
/* CF98F8 80241D88 0C0B2026 */ jal set_variable
/* CF98FC 80241D8C 0220282D */ daddu $a1, $s1, $zero
/* CF9900 80241D90 8FBF0018 */ lw $ra, 0x18($sp)
/* CF9904 80241D94 8FB10014 */ lw $s1, 0x14($sp)
/* CF9908 80241D98 8FB00010 */ lw $s0, 0x10($sp)
/* CF990C 80241D9C 24020002 */ addiu $v0, $zero, 2
/* CF9910 80241DA0 03E00008 */ jr $ra
/* CF9914 80241DA4 27BD0020 */ addiu $sp, $sp, 0x20

3
src/world/area_flo/flo_07/CAC5D0.c
View File

@ -2,7 +2,6 @@
#include "world/common/SomeMatrixOperations.inc.c"
INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_8024061C_CAC80C);
INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_802406D0_CAC8C0);
#include "world/common/GetItemName.inc.c"

2
src/world/area_iwa/iwa_02/915D70.c
View File

@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00);
INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240FE0_916D50);
INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80241094_916E04);
#include "world/common/GetItemName.inc.c"

2
src/world/area_iwa/iwa_10/91E5B0.c
View File

@ -2,4 +2,4 @@
INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_80240040_91E5B0);
INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_802400F4_91E664);
#include "world/common/GetItemName.inc.c"

8
src/world/area_sam/sam_01/CF7E80.c
View File

@ -76,11 +76,9 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241B20_CF9690);
INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800);
// Identical to GetItemName but since there is already one inclusion of it in this file,
// we can't include it again. This makes me think there is an undetected file boundary here,
// or there's something else about the area system we're not aware of
//#include "world/common/GetItemName.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4);
#define NAMESPACE dup_sam_01
#include "world/common/GetItemName.inc.c"
#define NAMESPACE sam_01
#include "world/common/SomeItemEntityFunc.inc.c"