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

match some functions in code_1a1f0_len_5390.c

Browse Source
This commit is contained in:
Rain 2020-12-03 02:07:39 -06:00
parent cf67dbe1c3
commit b85b91ce6c
4 changed files with 26 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
asm/nonmatchings/code_1a1f0_len_5390/FadeBackgroundToBlack.s
View File

@ -1,43 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel FadeBackgroundToBlack
/* 1A300 8003EF00 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 1A304 8003EF04 AFB00010 */ sw $s0, 0x10($sp)
/* 1A308 8003EF08 0080802D */ daddu $s0, $a0, $zero
/* 1A30C 8003EF0C 10A0000E */ beqz $a1, .L8003EF48
/* 1A310 8003EF10 AFBF0014 */ sw $ra, 0x14($sp)
/* 1A314 8003EF14 0C04760B */ jal func_8011D82C
/* 1A318 8003EF18 24040001 */ addiu $a0, $zero, 1
/* 1A31C 8003EF1C 0000202D */ daddu $a0, $zero, $zero
/* 1A320 8003EF20 0080282D */ daddu $a1, $a0, $zero
/* 1A324 8003EF24 0080302D */ daddu $a2, $a0, $zero
/* 1A328 8003EF28 0080382D */ daddu $a3, $a0, $zero
/* 1A32C 8003EF2C 3C028015 */ lui $v0, %hi(D_801512F0)
/* 1A330 8003EF30 8C4212F0 */ lw $v0, %lo(D_801512F0)($v0)
/* 1A334 8003EF34 24030001 */ addiu $v1, $zero, 1
/* 1A338 8003EF38 0C046F97 */ jal set_background_color_blend
/* 1A33C 8003EF3C A0430000 */ sb $v1, ($v0)
/* 1A340 8003EF40 24020019 */ addiu $v0, $zero, 0x19
/* 1A344 8003EF44 AE020070 */ sw $v0, 0x70($s0)
.L8003EF48:
/* 1A348 8003EF48 0000202D */ daddu $a0, $zero, $zero
/* 1A34C 8003EF4C 0080282D */ daddu $a1, $a0, $zero
/* 1A350 8003EF50 0080302D */ daddu $a2, $a0, $zero
/* 1A354 8003EF54 8E030070 */ lw $v1, 0x70($s0)
/* 1A358 8003EF58 24020019 */ addiu $v0, $zero, 0x19
/* 1A35C 8003EF5C 00431023 */ subu $v0, $v0, $v1
/* 1A360 8003EF60 00023880 */ sll $a3, $v0, 2
/* 1A364 8003EF64 00E23821 */ addu $a3, $a3, $v0
/* 1A368 8003EF68 00073840 */ sll $a3, $a3, 1
/* 1A36C 8003EF6C 0C046F97 */ jal set_background_color_blend
/* 1A370 8003EF70 30E700FE */ andi $a3, $a3, 0xfe
/* 1A374 8003EF74 8E020070 */ lw $v0, 0x70($s0)
/* 1A378 8003EF78 2442FFFF */ addiu $v0, $v0, -1
/* 1A37C 8003EF7C AE020070 */ sw $v0, 0x70($s0)
/* 1A380 8003EF80 2C420001 */ sltiu $v0, $v0, 1
/* 1A384 8003EF84 8FBF0014 */ lw $ra, 0x14($sp)
/* 1A388 8003EF88 8FB00010 */ lw $s0, 0x10($sp)
/* 1A38C 8003EF8C 00021040 */ sll $v0, $v0, 1
/* 1A390 8003EF90 03E00008 */ jr $ra
/* 1A394 8003EF94 27BD0018 */ addiu $sp, $sp, 0x18

21
asm/nonmatchings/code_1a1f0_len_5390/func_8003F084.s
View File

@ -1,21 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8003F084
/* 1A484 8003F084 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 1A488 8003F088 AFBF0010 */ sw $ra, 0x10($sp)
/* 1A48C 8003F08C 0C00EABB */ jal get_npc_unsafe
/* 1A490 8003F090 2404FFF6 */ addiu $a0, $zero, -0xa
/* 1A494 8003F094 0040182D */ daddu $v1, $v0, $zero
/* 1A498 8003F098 906200AC */ lbu $v0, 0xac($v1)
/* 1A49C 8003F09C 2442FFEF */ addiu $v0, $v0, -0x11
/* 1A4A0 8003F0A0 A06200AC */ sb $v0, 0xac($v1)
/* 1A4A4 8003F0A4 304200FF */ andi $v0, $v0, 0xff
/* 1A4A8 8003F0A8 14400003 */ bnez $v0, .L8003F0B8
/* 1A4AC 8003F0AC 0000102D */ daddu $v0, $zero, $zero
/* 1A4B0 8003F0B0 A06000AC */ sb $zero, 0xac($v1)
/* 1A4B4 8003F0B4 24020001 */ addiu $v0, $zero, 1
.L8003F0B8:
/* 1A4B8 8003F0B8 8FBF0010 */ lw $ra, 0x10($sp)
/* 1A4BC 8003F0BC 03E00008 */ jr $ra
/* 1A4C0 8003F0C0 27BD0018 */ addiu $sp, $sp, 0x18

2
include/variables.h
View File

@ -71,9 +71,11 @@ extern Npc* gPlayerNpcPtr;
extern s8 D_800A0900; extern s8 D_800A0900;
extern EncounterStatus gCurrentEncounter; extern EncounterStatus gCurrentEncounter;
extern s8* D_801512F0;
extern s16 D_80151308; extern s16 D_80151308;
extern s32 D_80151310; extern s32 D_80151310;
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_8010CD20;

26
src/code_1a1f0_len_5390.c
View File

@ -41,7 +41,19 @@ ApiStatus func_8003EECC(ScriptInstance* script, s32 isInitialCall) {
return (func_80045FA4() == 0) * ApiStatus_DONE2; return (func_80045FA4() == 0) * ApiStatus_DONE2;
} }
INCLUDE_ASM(s32, "code_1a1f0_len_5390", FadeBackgroundToBlack); ApiStatus FadeBackgroundToBlack(ScriptInstance* script, s32 isInitialCall) {
if (isInitialCall) {
func_8011D82C(1);
*D_801512F0 = 1;
set_background_color_blend(0, 0, 0, 0);
script->functionTemp[0].s = 25;
}
set_background_color_blend(0, 0, 0, ((25 - script->functionTemp[0].s) * 10) & 254);
script->functionTemp[0].s--;
do {} while(0);
return (script->functionTemp[0].s == 0) * ApiStatus_DONE2;
}
ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) { ApiStatus UnfadeBackgroundFromBlack(ScriptInstance* script, s32 isInitialCall) {
if (isInitialCall) { if (isInitialCall) {
@ -76,7 +88,17 @@ ApiStatus func_8003F018(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_BLOCK; return ApiStatus_BLOCK;
} }
INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F084); ApiStatus func_8003F084(ScriptInstance* script, s32 isInitialCall) {
Npc* npc = get_npc_unsafe(-0xA);
npc->unk_AC -= 17;
if (npc->unk_AC == 0) {
npc->unk_AC = 0;
return ApiStatus_DONE1;
}
return ApiStatus_BLOCK;
}
INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F0C4); INCLUDE_ASM(s32, "code_1a1f0_len_5390", func_8003F0C4);