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

SetPartnerFlags20000

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-22 11:06:57 -05:00
parent c5ebc6a376
commit 1f82a0c857
40 changed files with 32 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EEC_D4DF2C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D4DF2C
/* D4DF2C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D4DF30 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D4DF34 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D4DF38 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D4DF3C 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D4DF40 80240F00 10800004 */ beqz $a0, .L80240F14
/* D4DF44 80240F04 3C030002 */ lui $v1, 2
/* D4DF48 80240F08 8C820000 */ lw $v0, ($a0)
/* D4DF4C 80240F0C 00431025 */ or $v0, $v0, $v1
/* D4DF50 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D4DF54 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D4DF58 80240F18 03E00008 */ jr $ra
/* D4DF5C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

12
asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240F60_D4DFA0.s
View File

@ -1,12 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F60_D4DFA0
/* D4DFA0 80240F60 3C02800A */ lui $v0, %hi(D_8009A650)
/* D4DFA4 80240F64 2442A650 */ addiu $v0, $v0, %lo(D_8009A650)
/* D4DFA8 80240F68 8C430000 */ lw $v1, ($v0)
/* D4DFAC 80240F6C 2404FF7F */ addiu $a0, $zero, -0x81
/* D4DFB0 80240F70 00641824 */ and $v1, $v1, $a0
/* D4DFB4 80240F74 AC430000 */ sw $v1, ($v0)
/* D4DFB8 80240F78 03E00008 */ jr $ra
/* D4DFBC 80240F7C 24020002 */ addiu $v0, $zero, 2

18
asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240EEC_D56A9C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D56A9C
/* D56A9C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D56AA0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D56AA4 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D56AA8 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D56AAC 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D56AB0 80240F00 10800004 */ beqz $a0, .L80240F14
/* D56AB4 80240F04 3C030002 */ lui $v1, 2
/* D56AB8 80240F08 8C820000 */ lw $v0, ($a0)
/* D56ABC 80240F0C 00431025 */ or $v0, $v0, $v1
/* D56AC0 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D56AC4 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D56AC8 80240F18 03E00008 */ jr $ra
/* D56ACC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F1C_D5834C
/* D5834C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D58350 80240F20 AFBF0010 */ sw $ra, 0x10($sp)
/* D58354 80240F24 0C00EAD2 */ jal get_npc_safe
/* D58358 80240F28 2404FFFC */ addiu $a0, $zero, -4
/* D5835C 80240F2C 0040202D */ daddu $a0, $v0, $zero
/* D58360 80240F30 10800004 */ beqz $a0, .L80240F44
/* D58364 80240F34 3C030002 */ lui $v1, 2
/* D58368 80240F38 8C820000 */ lw $v0, ($a0)
/* D5836C 80240F3C 00431025 */ or $v0, $v0, $v1
/* D58370 80240F40 AC820000 */ sw $v0, ($a0)
.L80240F44:
/* D58374 80240F44 8FBF0010 */ lw $ra, 0x10($sp)
/* D58378 80240F48 03E00008 */ jr $ra
/* D5837C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240EEC_D6019C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D6019C
/* D6019C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D601A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D601A4 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D601A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D601AC 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D601B0 80240F00 10800004 */ beqz $a0, .L80240F14
/* D601B4 80240F04 3C030002 */ lui $v1, 2
/* D601B8 80240F08 8C820000 */ lw $v0, ($a0)
/* D601BC 80240F0C 00431025 */ or $v0, $v0, $v1
/* D601C0 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D601C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D601C8 80240F18 03E00008 */ jr $ra
/* D601CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240EEC_D623EC.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D623EC
/* D623EC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D623F0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D623F4 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D623F8 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D623FC 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D62400 80240F00 10800004 */ beqz $a0, .L80240F14
/* D62404 80240F04 3C030002 */ lui $v1, 2
/* D62408 80240F08 8C820000 */ lw $v0, ($a0)
/* D6240C 80240F0C 00431025 */ or $v0, $v0, $v1
/* D62410 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D62414 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D62418 80240F18 03E00008 */ jr $ra
/* D6241C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240F1C_D63C2C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F1C_D63C2C
/* D63C2C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D63C30 80240F20 AFBF0010 */ sw $ra, 0x10($sp)
/* D63C34 80240F24 0C00EAD2 */ jal get_npc_safe
/* D63C38 80240F28 2404FFFC */ addiu $a0, $zero, -4
/* D63C3C 80240F2C 0040202D */ daddu $a0, $v0, $zero
/* D63C40 80240F30 10800004 */ beqz $a0, .L80240F44
/* D63C44 80240F34 3C030002 */ lui $v1, 2
/* D63C48 80240F38 8C820000 */ lw $v0, ($a0)
/* D63C4C 80240F3C 00431025 */ or $v0, $v0, $v1
/* D63C50 80240F40 AC820000 */ sw $v0, ($a0)
.L80240F44:
/* D63C54 80240F44 8FBF0010 */ lw $ra, 0x10($sp)
/* D63C58 80240F48 03E00008 */ jr $ra
/* D63C5C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240EEC_D68BEC.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D68BEC
/* D68BEC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D68BF0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D68BF4 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D68BF8 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D68BFC 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D68C00 80240F00 10800004 */ beqz $a0, .L80240F14
/* D68C04 80240F04 3C030002 */ lui $v1, 2
/* D68C08 80240F08 8C820000 */ lw $v0, ($a0)
/* D68C0C 80240F0C 00431025 */ or $v0, $v0, $v1
/* D68C10 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D68C14 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D68C18 80240F18 03E00008 */ jr $ra
/* D68C1C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240EEC_D6AA0C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D6AA0C
/* D6AA0C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D6AA10 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D6AA14 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D6AA18 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D6AA1C 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D6AA20 80240F00 10800004 */ beqz $a0, .L80240F14
/* D6AA24 80240F04 3C030002 */ lui $v1, 2
/* D6AA28 80240F08 8C820000 */ lw $v0, ($a0)
/* D6AA2C 80240F0C 00431025 */ or $v0, $v0, $v1
/* D6AA30 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D6AA34 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D6AA38 80240F18 03E00008 */ jr $ra
/* D6AA3C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240EEC_D6C50C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D6C50C
/* D6C50C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D6C510 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D6C514 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D6C518 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D6C51C 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D6C520 80240F00 10800004 */ beqz $a0, .L80240F14
/* D6C524 80240F04 3C030002 */ lui $v1, 2
/* D6C528 80240F08 8C820000 */ lw $v0, ($a0)
/* D6C52C 80240F0C 00431025 */ or $v0, $v0, $v1
/* D6C530 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D6C534 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D6C538 80240F18 03E00008 */ jr $ra
/* D6C53C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240EEC_D7728C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D7728C
/* D7728C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D77290 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D77294 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D77298 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D7729C 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D772A0 80240F00 10800004 */ beqz $a0, .L80240F14
/* D772A4 80240F04 3C030002 */ lui $v1, 2
/* D772A8 80240F08 8C820000 */ lw $v0, ($a0)
/* D772AC 80240F0C 00431025 */ or $v0, $v0, $v1
/* D772B0 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D772B4 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D772B8 80240F18 03E00008 */ jr $ra
/* D772BC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240F1C_D7A90C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F1C_D7A90C
/* D7A90C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D7A910 80240F20 AFBF0010 */ sw $ra, 0x10($sp)
/* D7A914 80240F24 0C00EAD2 */ jal get_npc_safe
/* D7A918 80240F28 2404FFFC */ addiu $a0, $zero, -4
/* D7A91C 80240F2C 0040202D */ daddu $a0, $v0, $zero
/* D7A920 80240F30 10800004 */ beqz $a0, .L80240F44
/* D7A924 80240F34 3C030002 */ lui $v1, 2
/* D7A928 80240F38 8C820000 */ lw $v0, ($a0)
/* D7A92C 80240F3C 00431025 */ or $v0, $v0, $v1
/* D7A930 80240F40 AC820000 */ sw $v0, ($a0)
.L80240F44:
/* D7A934 80240F44 8FBF0010 */ lw $ra, 0x10($sp)
/* D7A938 80240F48 03E00008 */ jr $ra
/* D7A93C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240F1C_D7C1BC.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F1C_D7C1BC
/* D7C1BC 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D7C1C0 80240F20 AFBF0010 */ sw $ra, 0x10($sp)
/* D7C1C4 80240F24 0C00EAD2 */ jal get_npc_safe
/* D7C1C8 80240F28 2404FFFC */ addiu $a0, $zero, -4
/* D7C1CC 80240F2C 0040202D */ daddu $a0, $v0, $zero
/* D7C1D0 80240F30 10800004 */ beqz $a0, .L80240F44
/* D7C1D4 80240F34 3C030002 */ lui $v1, 2
/* D7C1D8 80240F38 8C820000 */ lw $v0, ($a0)
/* D7C1DC 80240F3C 00431025 */ or $v0, $v0, $v1
/* D7C1E0 80240F40 AC820000 */ sw $v0, ($a0)
.L80240F44:
/* D7C1E4 80240F44 8FBF0010 */ lw $ra, 0x10($sp)
/* D7C1E8 80240F48 03E00008 */ jr $ra
/* D7C1EC 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240EEC_D7DA3C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D7DA3C
/* D7DA3C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D7DA40 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D7DA44 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D7DA48 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D7DA4C 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D7DA50 80240F00 10800004 */ beqz $a0, .L80240F14
/* D7DA54 80240F04 3C030002 */ lui $v1, 2
/* D7DA58 80240F08 8C820000 */ lw $v0, ($a0)
/* D7DA5C 80240F0C 00431025 */ or $v0, $v0, $v1
/* D7DA60 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D7DA64 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D7DA68 80240F18 03E00008 */ jr $ra
/* D7DA6C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240EEC_D8A5CC.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D8A5CC
/* D8A5CC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D8A5D0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D8A5D4 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D8A5D8 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D8A5DC 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D8A5E0 80240F00 10800004 */ beqz $a0, .L80240F14
/* D8A5E4 80240F04 3C030002 */ lui $v1, 2
/* D8A5E8 80240F08 8C820000 */ lw $v0, ($a0)
/* D8A5EC 80240F0C 00431025 */ or $v0, $v0, $v1
/* D8A5F0 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D8A5F4 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D8A5F8 80240F18 03E00008 */ jr $ra
/* D8A5FC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240EEC_D8E13C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D8E13C
/* D8E13C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D8E140 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D8E144 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D8E148 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D8E14C 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D8E150 80240F00 10800004 */ beqz $a0, .L80240F14
/* D8E154 80240F04 3C030002 */ lui $v1, 2
/* D8E158 80240F08 8C820000 */ lw $v0, ($a0)
/* D8E15C 80240F0C 00431025 */ or $v0, $v0, $v1
/* D8E160 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D8E164 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D8E168 80240F18 03E00008 */ jr $ra
/* D8E16C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240F1C_D9261C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F1C_D9261C
/* D9261C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D92620 80240F20 AFBF0010 */ sw $ra, 0x10($sp)
/* D92624 80240F24 0C00EAD2 */ jal get_npc_safe
/* D92628 80240F28 2404FFFC */ addiu $a0, $zero, -4
/* D9262C 80240F2C 0040202D */ daddu $a0, $v0, $zero
/* D92630 80240F30 10800004 */ beqz $a0, .L80240F44
/* D92634 80240F34 3C030002 */ lui $v1, 2
/* D92638 80240F38 8C820000 */ lw $v0, ($a0)
/* D9263C 80240F3C 00431025 */ or $v0, $v0, $v1
/* D92640 80240F40 AC820000 */ sw $v0, ($a0)
.L80240F44:
/* D92644 80240F44 8FBF0010 */ lw $ra, 0x10($sp)
/* D92648 80240F48 03E00008 */ jr $ra
/* D9264C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240F1C_D9650C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F1C_D9650C
/* D9650C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D96510 80240F20 AFBF0010 */ sw $ra, 0x10($sp)
/* D96514 80240F24 0C00EAD2 */ jal get_npc_safe
/* D96518 80240F28 2404FFFC */ addiu $a0, $zero, -4
/* D9651C 80240F2C 0040202D */ daddu $a0, $v0, $zero
/* D96520 80240F30 10800004 */ beqz $a0, .L80240F44
/* D96524 80240F34 3C030002 */ lui $v1, 2
/* D96528 80240F38 8C820000 */ lw $v0, ($a0)
/* D9652C 80240F3C 00431025 */ or $v0, $v0, $v1
/* D96530 80240F40 AC820000 */ sw $v0, ($a0)
.L80240F44:
/* D96534 80240F44 8FBF0010 */ lw $ra, 0x10($sp)
/* D96538 80240F48 03E00008 */ jr $ra
/* D9653C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240F1C_D987AC.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240F1C_D987AC
/* D987AC 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D987B0 80240F20 AFBF0010 */ sw $ra, 0x10($sp)
/* D987B4 80240F24 0C00EAD2 */ jal get_npc_safe
/* D987B8 80240F28 2404FFFC */ addiu $a0, $zero, -4
/* D987BC 80240F2C 0040202D */ daddu $a0, $v0, $zero
/* D987C0 80240F30 10800004 */ beqz $a0, .L80240F44
/* D987C4 80240F34 3C030002 */ lui $v1, 2
/* D987C8 80240F38 8C820000 */ lw $v0, ($a0)
/* D987CC 80240F3C 00431025 */ or $v0, $v0, $v1
/* D987D0 80240F40 AC820000 */ sw $v0, ($a0)
.L80240F44:
/* D987D4 80240F44 8FBF0010 */ lw $ra, 0x10($sp)
/* D987D8 80240F48 03E00008 */ jr $ra
/* D987DC 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240EEC_D9A89C.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240EEC_D9A89C
/* D9A89C 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* D9A8A0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp)
/* D9A8A4 80240EF4 0C00EAD2 */ jal get_npc_safe
/* D9A8A8 80240EF8 2404FFFC */ addiu $a0, $zero, -4
/* D9A8AC 80240EFC 0040202D */ daddu $a0, $v0, $zero
/* D9A8B0 80240F00 10800004 */ beqz $a0, .L80240F14
/* D9A8B4 80240F04 3C030002 */ lui $v1, 2
/* D9A8B8 80240F08 8C820000 */ lw $v0, ($a0)
/* D9A8BC 80240F0C 00431025 */ or $v0, $v0, $v1
/* D9A8C0 80240F10 AC820000 */ sw $v0, ($a0)
.L80240F14:
/* D9A8C4 80240F14 8FBF0010 */ lw $ra, 0x10($sp)
/* D9A8C8 80240F18 03E00008 */ jr $ra
/* D9A8CC 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18

7
src/world/area_pra/pra_01/D4D060.c
View File

@ -24,11 +24,14 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240D3C_D4DD7C);
INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EB8_D4DEF8);
INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EEC_D4DF2C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F20_D4DF60);
INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240F60_D4DFA0);
ApiStatus func_80240F60_D4DFA0(ScriptInstance* script, s32 isInitialCall) {
D_8009A650[0] &= ~0x80;
return ApiStatus_DONE2;
}
#include "world/common/GetNpcCollisionHeight.inc.c"

2
src/world/area_pra/pra_05/D55BD0.c
View File

@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240D3C_D568EC);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240EEC_D56A9C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0);

2
src/world/area_pra/pra_06/D57430.c
View File

@ -26,4 +26,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240D6C_D5819C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240F1C_D5834C);
#include "world/common/SetPartnerFlags20000.inc.c"

2
src/world/area_pra/pra_10/D5F2D0.c
View File

@ -24,6 +24,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240D3C_D5FFEC);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240EEC_D6019C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240F20_D601D0);

2
src/world/area_pra/pra_11/D61520.c
View File

@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240D3C_D6223C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240EEC_D623EC);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240F20_D62420);

2
src/world/area_pra/pra_12/D62D10.c
View File

@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240D6C_D63A7C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F1C_D63C2C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240F50_D63C60);

2
src/world/area_pra/pra_14/D67D20.c
View File

@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240D3C_D68A3C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240EEC_D68BEC);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240F20_D68C20);

2
src/world/area_pra/pra_16/D69B40.c
View File

@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240D3C_D6A85C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240EEC_D6AA0C);
#include "world/common/SetPartnerFlags20000.inc.c"

2
src/world/area_pra/pra_18/D6B640.c
View File

@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240D3C_D6C35C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240EEC_D6C50C);
#include "world/common/SetPartnerFlags20000.inc.c"

2
src/world/area_pra/pra_20/D763C0.c
View File

@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240D3C_D770DC);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240EEC_D7728C);
#include "world/common/SetPartnerFlags20000.inc.c"

2
src/world/area_pra/pra_27/D799F0.c
View File

@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240D6C_D7A75C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F1C_D7A90C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240F50_D7A940);

2
src/world/area_pra/pra_28/D7B2A0.c
View File

@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240D6C_D7C00C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F1C_D7C1BC);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240F50_D7C1F0);

2
src/world/area_pra/pra_29/D7CB70.c
View File

@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240D3C_D7D88C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240EEC_D7DA3C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240F20_D7DA70);

2
src/world/area_pra/pra_33/D89700.c
View File

@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240D3C_D8A41C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240EEC_D8A5CC);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240F20_D8A600);

2
src/world/area_pra/pra_35/D8D270.c
View File

@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240D3C_D8DF8C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240EEC_D8E13C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240F20_D8E170);

2
src/world/area_pra/pra_36/D91700.c
View File

@ -26,4 +26,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240D6C_D9246C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240F1C_D9261C);
#include "world/common/SetPartnerFlags20000.inc.c"

2
src/world/area_pra/pra_38/D955F0.c
View File

@ -26,6 +26,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240D6C_D9635C);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240F1C_D9650C);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240F50_D96540);

2
src/world/area_pra/pra_39/D97890.c
View File

@ -26,6 +26,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240D6C_D985FC);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240F1C_D987AC);
#include "world/common/SetPartnerFlags20000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240F50_D987E0);

2
src/world/area_pra/pra_40/D999D0.c
View File

@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240D3C_D9A6EC);
#include "world/common/SetPartnerFlags80000.inc.c"
INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240EEC_D9A89C);
#include "world/common/SetPartnerFlags20000.inc.c"

9
src/world/common/SetPartnerFlags20000.inc.c Normal file
View File

@ -0,0 +1,9 @@
#include "common.h"
static void SetPartnerFlags20000(void) {
Npc* partner = get_npc_safe(NpcId_PARTNER);
if (partner != NULL) {
partner->flags |= 0x20000;
}
}