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

1 more

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-20 19:31:45 -04:00
parent 69fd94e161
commit 2bbf2623e7
24 changed files with 6 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/nonmatchings/world/area_isk/isk_02/978800/func_802400F0_978800.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802400F0_978800
/* 978800 802400F0 8C830148 */ lw $v1, 0x148($a0)
/* 978804 802400F4 24020003 */ addiu $v0, $zero, 3
/* 978808 802400F8 A06200B5 */ sb $v0, 0xb5($v1)
/* 97880C 802400FC 03E00008 */ jr $ra
/* 978810 80240100 24020002 */ addiu $v0, $zero, 2
/* 978814 80240104 00000000 */ nop
/* 978818 80240108 00000000 */ nop
/* 97881C 8024010C 00000000 */ nop

2
asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4.s
View File

@ -161,7 +161,7 @@ glabel func_80240FC4
/* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero
/* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero
/* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero
/* B2D698 80241228 0C0902F5 */ jal func_80240BD4
/* B2D698 80241228 0C0902F5 */ jal func_80240BD4_B2D044
/* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero
/* B2D6A0 80241230 080904A6 */ j .L80241298
/* B2D6A4 80241234 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_01/929AD0/func_80240040_929AD0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_929AD0
/* 929AD0 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 929AD4 80240044 24020003 */ addiu $v0, $zero, 3
/* 929AD8 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 929ADC 8024004C 03E00008 */ jr $ra
/* 929AE0 80240050 24020002 */ addiu $v0, $zero, 2
/* 929AE4 80240054 00000000 */ nop
/* 929AE8 80240058 00000000 */ nop
/* 929AEC 8024005C 00000000 */ nop

15
asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240BD4.s
View File

@ -1,15 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240BD4
/* 92AE84 80240BD4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 92AE88 80240BD8 AFB00010 */ sw $s0, 0x10($sp)
/* 92AE8C 80240BDC AFBF0014 */ sw $ra, 0x14($sp)
/* 92AE90 80240BE0 0C039D7B */ jal get_item_count
/* 92AE94 80240BE4 0080802D */ daddu $s0, $a0, $zero
/* 92AE98 80240BE8 AE020084 */ sw $v0, 0x84($s0)
/* 92AE9C 80240BEC 8FBF0014 */ lw $ra, 0x14($sp)
/* 92AEA0 80240BF0 8FB00010 */ lw $s0, 0x10($sp)
/* 92AEA4 80240BF4 24020002 */ addiu $v0, $zero, 2
/* 92AEA8 80240BF8 03E00008 */ jr $ra
/* 92AEAC 80240BFC 27BD0018 */ addiu $sp, $sp, 0x18

12
asm/nonmatchings/world/area_sbk/sbk_03/92F8F0/func_80240040_92F8F0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_92F8F0
/* 92F8F0 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 92F8F4 80240044 24020003 */ addiu $v0, $zero, 3
/* 92F8F8 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 92F8FC 8024004C 03E00008 */ jr $ra
/* 92F900 80240050 24020002 */ addiu $v0, $zero, 2
/* 92F904 80240054 00000000 */ nop
/* 92F908 80240058 00000000 */ nop
/* 92F90C 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_04/930510/func_80240040_930510.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_930510
/* 930510 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 930514 80240044 24020003 */ addiu $v0, $zero, 3
/* 930518 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 93051C 8024004C 03E00008 */ jr $ra
/* 930520 80240050 24020002 */ addiu $v0, $zero, 2
/* 930524 80240054 00000000 */ nop
/* 930528 80240058 00000000 */ nop
/* 93052C 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_05/930D30/func_80240040_930D30.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_930D30
/* 930D30 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 930D34 80240044 24020003 */ addiu $v0, $zero, 3
/* 930D38 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 930D3C 8024004C 03E00008 */ jr $ra
/* 930D40 80240050 24020002 */ addiu $v0, $zero, 2
/* 930D44 80240054 00000000 */ nop
/* 930D48 80240058 00000000 */ nop
/* 930D4C 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_11/934080/func_80240140_934180.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_934180
/* 934180 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 934184 80240144 24020003 */ addiu $v0, $zero, 3
/* 934188 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 93418C 8024014C 03E00008 */ jr $ra
/* 934190 80240150 24020002 */ addiu $v0, $zero, 2
/* 934194 80240154 00000000 */ nop
/* 934198 80240158 00000000 */ nop
/* 93419C 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_12/934D80/func_80240040_934D80.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_934D80
/* 934D80 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 934D84 80240044 24020003 */ addiu $v0, $zero, 3
/* 934D88 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 934D8C 8024004C 03E00008 */ jr $ra
/* 934D90 80240050 24020002 */ addiu $v0, $zero, 2
/* 934D94 80240054 00000000 */ nop
/* 934D98 80240058 00000000 */ nop
/* 934D9C 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_13/935820/func_80240140_935920.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_935920
/* 935920 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 935924 80240144 24020003 */ addiu $v0, $zero, 3
/* 935928 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 93592C 8024014C 03E00008 */ jr $ra
/* 935930 80240150 24020002 */ addiu $v0, $zero, 2
/* 935934 80240154 00000000 */ nop
/* 935938 80240158 00000000 */ nop
/* 93593C 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_15/936D10/func_80240040_936D10.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_936D10
/* 936D10 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 936D14 80240044 24020003 */ addiu $v0, $zero, 3
/* 936D18 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 936D1C 8024004C 03E00008 */ jr $ra
/* 936D20 80240050 24020002 */ addiu $v0, $zero, 2
/* 936D24 80240054 00000000 */ nop
/* 936D28 80240058 00000000 */ nop
/* 936D2C 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_22/939970/func_80240140_939A70.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_939A70
/* 939A70 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 939A74 80240144 24020003 */ addiu $v0, $zero, 3
/* 939A78 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 939A7C 8024014C 03E00008 */ jr $ra
/* 939A80 80240150 24020002 */ addiu $v0, $zero, 2
/* 939A84 80240154 00000000 */ nop
/* 939A88 80240158 00000000 */ nop
/* 939A8C 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_26/93DD10/func_80240140_93DE10.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_93DE10
/* 93DE10 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 93DE14 80240144 24020003 */ addiu $v0, $zero, 3
/* 93DE18 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 93DE1C 8024014C 03E00008 */ jr $ra
/* 93DE20 80240150 24020002 */ addiu $v0, $zero, 2
/* 93DE24 80240154 00000000 */ nop
/* 93DE28 80240158 00000000 */ nop
/* 93DE2C 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_32/944AA0/func_80240140_944BA0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_944BA0
/* 944BA0 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 944BA4 80240144 24020003 */ addiu $v0, $zero, 3
/* 944BA8 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 944BAC 8024014C 03E00008 */ jr $ra
/* 944BB0 80240150 24020002 */ addiu $v0, $zero, 2
/* 944BB4 80240154 00000000 */ nop
/* 944BB8 80240158 00000000 */ nop
/* 944BBC 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_44/94D5E0/func_80240140_94D6E0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_94D6E0
/* 94D6E0 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 94D6E4 80240144 24020003 */ addiu $v0, $zero, 3
/* 94D6E8 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 94D6EC 8024014C 03E00008 */ jr $ra
/* 94D6F0 80240150 24020002 */ addiu $v0, $zero, 2
/* 94D6F4 80240154 00000000 */ nop
/* 94D6F8 80240158 00000000 */ nop
/* 94D6FC 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_46/94E9E0/func_80240140_94EAE0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_94EAE0
/* 94EAE0 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 94EAE4 80240144 24020003 */ addiu $v0, $zero, 3
/* 94EAE8 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 94EAEC 8024014C 03E00008 */ jr $ra
/* 94EAF0 80240150 24020002 */ addiu $v0, $zero, 2
/* 94EAF4 80240154 00000000 */ nop
/* 94EAF8 80240158 00000000 */ nop
/* 94EAFC 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_51/9509B0/func_80240140_950AB0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240140_950AB0
/* 950AB0 80240140 8C830148 */ lw $v1, 0x148($a0)
/* 950AB4 80240144 24020003 */ addiu $v0, $zero, 3
/* 950AB8 80240148 A06200B5 */ sb $v0, 0xb5($v1)
/* 950ABC 8024014C 03E00008 */ jr $ra
/* 950AC0 80240150 24020002 */ addiu $v0, $zero, 2
/* 950AC4 80240154 00000000 */ nop
/* 950AC8 80240158 00000000 */ nop
/* 950ACC 8024015C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_53/951B20/func_80240040_951B20.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_951B20
/* 951B20 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 951B24 80240044 24020003 */ addiu $v0, $zero, 3
/* 951B28 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 951B2C 8024004C 03E00008 */ jr $ra
/* 951B30 80240050 24020002 */ addiu $v0, $zero, 2
/* 951B34 80240054 00000000 */ nop
/* 951B38 80240058 00000000 */ nop
/* 951B3C 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_55/952A90/func_80240040_952A90.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_952A90
/* 952A90 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 952A94 80240044 24020003 */ addiu $v0, $zero, 3
/* 952A98 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 952A9C 8024004C 03E00008 */ jr $ra
/* 952AA0 80240050 24020002 */ addiu $v0, $zero, 2
/* 952AA4 80240054 00000000 */ nop
/* 952AA8 80240058 00000000 */ nop
/* 952AAC 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_60/956A30/func_80240040_956A30.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_956A30
/* 956A30 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 956A34 80240044 24020003 */ addiu $v0, $zero, 3
/* 956A38 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 956A3C 8024004C 03E00008 */ jr $ra
/* 956A40 80240050 24020002 */ addiu $v0, $zero, 2
/* 956A44 80240054 00000000 */ nop
/* 956A48 80240058 00000000 */ nop
/* 956A4C 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_62/957390/func_80240040_957390.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_957390
/* 957390 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 957394 80240044 24020003 */ addiu $v0, $zero, 3
/* 957398 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 95739C 8024004C 03E00008 */ jr $ra
/* 9573A0 80240050 24020002 */ addiu $v0, $zero, 2
/* 9573A4 80240054 00000000 */ nop
/* 9573A8 80240058 00000000 */ nop
/* 9573AC 8024005C 00000000 */ nop

12
asm/nonmatchings/world/area_sbk/sbk_63/957DB0/func_80240040_957DB0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240040_957DB0
/* 957DB0 80240040 8C830148 */ lw $v1, 0x148($a0)
/* 957DB4 80240044 24020003 */ addiu $v0, $zero, 3
/* 957DB8 80240048 A06200B5 */ sb $v0, 0xb5($v1)
/* 957DBC 8024004C 03E00008 */ jr $ra
/* 957DC0 80240050 24020002 */ addiu $v0, $zero, 2
/* 957DC4 80240054 00000000 */ nop
/* 957DC8 80240058 00000000 */ nop
/* 957DCC 8024005C 00000000 */ nop

1
src/world/area_sbk/sbk_02/92A2B0.c
View File

@ -6,6 +6,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240040_92A2F0);
INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240164);
// Accesses SI_MAP_VAR(0) which is an effect handle
INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240338);
INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240364);

5
src/world/area_sbk/sbk_02/92A9A0.c
View File

@ -18,4 +18,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240B5C);
INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240B98_92AE48);
INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240BD4);
ApiStatus func_80240BD4(ScriptInstance* script, s32 isInitialCall) {
script->varTable[0] = get_item_count();
return ApiStatus_DONE2;
}