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 CloseChoice, CancelMessage, CancelMessageAndBlock. Added gCurrentPrintContext and D_802DB268 (related)

Browse Source
This commit is contained in:
Jdog 2020-08-15 14:51:44 -07:00
parent 98e5db0630
commit 7beaf4c461
6 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asm/nonmatchings/code_f4c60_len_4300/CancelMessage.s
View File

@ -1,16 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel CancelMessage
/* 0F55D0 802D0C20 3C04802E */ lui $a0, 0x802e
/* 0F55D4 802D0C24 8C84B260 */ lw $a0, -0x4da0($a0)
/* 0F55D8 802D0C28 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0F55DC 802D0C2C AFBF0010 */ sw $ra, 0x10($sp)
/* 0F55E0 802D0C30 0C0496C2 */ jal cancel_message
/* 0F55E4 802D0C34 00000000 */ nop
/* 0F55E8 802D0C38 8FBF0010 */ lw $ra, 0x10($sp)
/* 0F55EC 802D0C3C 24020002 */ addiu $v0, $zero, 2
/* 0F55F0 802D0C40 03E00008 */ jr $ra
/* 0F55F4 802D0C44 27BD0018 */ addiu $sp, $sp, 0x18

16
asm/nonmatchings/code_f4c60_len_4300/CancelMessageAndBlock.s
View File

@ -1,16 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel CancelMessageAndBlock
/* 0F55F8 802D0C48 3C04802E */ lui $a0, 0x802e
/* 0F55FC 802D0C4C 8C84B260 */ lw $a0, -0x4da0($a0)
/* 0F5600 802D0C50 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0F5604 802D0C54 AFBF0010 */ sw $ra, 0x10($sp)
/* 0F5608 802D0C58 0C0496C2 */ jal cancel_message
/* 0F560C 802D0C5C 00000000 */ nop
/* 0F5610 802D0C60 8FBF0010 */ lw $ra, 0x10($sp)
/* 0F5614 802D0C64 0000102D */ daddu $v0, $zero, $zero
/* 0F5618 802D0C68 03E00008 */ jr $ra
/* 0F561C 802D0C6C 27BD0018 */ addiu $sp, $sp, 0x18

16
asm/nonmatchings/code_f4c60_len_4300/CloseChoice.s
View File

@ -1,16 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel CloseChoice
/* 0F55A8 802D0BF8 3C04802E */ lui $a0, 0x802e
/* 0F55AC 802D0BFC 8C84B268 */ lw $a0, -0x4d98($a0)
/* 0F55B0 802D0C00 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 0F55B4 802D0C04 AFBF0010 */ sw $ra, 0x10($sp)
/* 0F55B8 802D0C08 0C04971C */ jal close_message
/* 0F55BC 802D0C0C 00000000 */ nop
/* 0F55C0 802D0C10 8FBF0010 */ lw $ra, 0x10($sp)
/* 0F55C4 802D0C14 24020001 */ addiu $v0, $zero, 1
/* 0F55C8 802D0C18 03E00008 */ jr $ra
/* 0F55CC 802D0C1C 27BD0018 */ addiu $sp, $sp, 0x18

3
include/variables.h
View File

@ -27,6 +27,9 @@ extern char gSunnyFlowerFieldsBg[]; // "flb_bg"
extern bg_header gBackgroundImage;
extern s8 D_8014F12F;
extern print_context* gCurrentPrintContext;
extern print_context* D_802DB268;
// Triggers
/* 0x80151334 */ extern s16 gTriggerCount;
/* 0x80159190 */ extern trigger gTriggerList1[64];

15
src/code_f4c60_len_4300.c
View File

@ -28,11 +28,20 @@ INCLUDE_ASM(code_f4c60_len_4300, SwitchMessage);
INCLUDE_ASM(code_f4c60_len_4300, ShowChoice);
INCLUDE_ASM(code_f4c60_len_4300, CloseChoice);
s32 CloseChoice(script_context* script, s32 initialCall) {
close_message(D_802DB268);
return 1;
}
INCLUDE_ASM(code_f4c60_len_4300, CancelMessage);
s32 CancelMessage(script_context* script, s32 initialCall) {
cancel_message(gCurrentPrintContext);
return 2;
}
INCLUDE_ASM(code_f4c60_len_4300, CancelMessageAndBlock);
s32 CancelMessageAndBlock(script_context* script, s32 initialCall) {
cancel_message(gCurrentPrintContext);
return 0;
}
s32 SetMessageImages(script_context* script, s32 initialCall) {
set_message_images(*script->ptrReadPos);

2
undefined_syms.txt
View File

@ -43,6 +43,8 @@ D_8010F6D0 = 0x8010F6D0;
gBackgroundImage = 0x80200000;
D_802C3000 = 0x802C3000;
D_802DBD40 = 0x802DBD40;
gCurrentPrintContext = 0x802DB260;
D_802DB268 = 0x802DB268;
D_802E0D90 = 0x802E0D90;
D_802EB3D0 = 0x802EB3D0;