ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Through sub_80173D4

Browse Source
This commit is contained in:
PikalaxALT 2019-03-28 08:42:35 -04:00
parent 51d2131dc2
commit 9538855d9a
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
asm/union_room.s
View File

@ -5,34 +5,6 @@
.text .text
thumb_func_start sub_80173B0
sub_80173B0: @ 80173B0
push {lr}
sub sp, 0xC
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
movs r1, 0
movs r2, 0
movs r3, 0
bl FillBgTilemapBufferRect
movs r0, 0
bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r0}
bx r0
thumb_func_end sub_80173B0
thumb_func_start sub_80173D4
sub_80173D4: @ 80173D4
push {lr}
bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80173D4
thumb_func_start sub_80173E0 thumb_func_start sub_80173E0
sub_80173E0: @ 80173E0 sub_80173E0: @ 80173E0
push {r4,r5,lr} push {r4,r5,lr}

28
src/union_room.c
View File

@ -3934,3 +3934,31 @@ s32 sub_80172A0(u8 *arg0, u8 *arg1, u8 *arg2, u8 *arg3, const struct WindowTempl
"\tbx r1"); "\tbx r1");
} }
#endif #endif
void sub_80173B0(void)
{
FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0);
CopyBgTilemapBufferToVram(0);
}
void sub_80173D4(void)
{
EnableBothScriptContexts();
}
/*
void sub_80173E0(u8 windowId, u8 arg1, const u8 *str, u8 arg3, u8 arg4, u8 arg5)
{
struct TextPrinterTemplate sp0 = {
.currentChar = str,
.windowId = windowId,
.fontId = arg1,
.x = arg3,
.y = arg4,
.currentX = arg3,
.currentY = arg4
};
// to be continued
}
*/