From 4da8580ed3cb8849b6c92d9beea0638d7cf0e102 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 11 Feb 2017 10:52:45 -0800 Subject: [PATCH] hall_of_fame baserom incbins --- asm/hall_of_fame.s | 8 ++++---- data/hall_of_fame.s | 27 ++++++++++++++++++--------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index c1e93c8b3..f0295656c 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -1700,7 +1700,7 @@ _08142B8E: adds r0, 0x4 adds r0, r1, r0 ldrh r3, [r0] - ldr r0, _08142BD0 @ =gUnknown_0840B53A + ldr r0, _08142BD0 @ =gUnknown_0840B534 + 0x6 adds r1, r0 b _08142BE2 .align 2, 0 @@ -1710,14 +1710,14 @@ _08142BC0: .4byte gUnknown_0203931C _08142BC4: .4byte 0x000001ff _08142BC8: .4byte gUnknown_0840B564 _08142BCC: .4byte gUnknown_0840B534 -_08142BD0: .4byte gUnknown_0840B53A +_08142BD0: .4byte gUnknown_0840B534 + 0x6 _08142BD4: lsls r1, r5, 3 mov r0, r10 adds r0, 0x4 adds r0, r1, r0 ldrh r3, [r0] - ldr r2, _08142C28 @ =gUnknown_0840B56A + ldr r2, _08142C28 @ =gUnknown_0840B564 + 0x6 adds r1, r2 _08142BE2: ldrh r2, [r1] @@ -1755,7 +1755,7 @@ _08142BE2: strh r0, [r1] b _08142C3C .align 2, 0 -_08142C28: .4byte gUnknown_0840B56A +_08142C28: .4byte gUnknown_0840B564 + 0x6 _08142C2C: .4byte gSprites _08142C30: adds r0, r5, 0x5 diff --git a/data/hall_of_fame.s b/data/hall_of_fame.s index faf9c4fef..0795e7389 100644 --- a/data/hall_of_fame.s +++ b/data/hall_of_fame.s @@ -12,20 +12,29 @@ gUnknown_0840B524:: @ 840B524 obj_pal gContestConfetti_Pal, 1001 .space 8 + .align 2 gUnknown_0840B534:: @ 840B534 - .incbin "baserom.gba", 0x0040b534, 0x6 - -gUnknown_0840B53A:: @ 840B53A - .incbin "baserom.gba", 0x0040b53a, 0x2a + .2byte 120,210,120, 40 + .2byte 326,220, 56, 40 + .2byte -86,220,184, 40 + .2byte 120,-62,120, 88 + .2byte -25,-62,200, 88 + .2byte 265,-62, 40, 88 + .align 2 gUnknown_0840B564:: @ 840B564 - .incbin "baserom.gba", 0x0040b564, 0x6 - -gUnknown_0840B56A:: @ 840B56A - .incbin "baserom.gba", 0x0040b56a, 0x12 + .2byte 120,214,120, 64 + .2byte 281,214, 56, 64 + .2byte -41,214,184, 64 + .align 2 gUnknown_0840B57C:: @ 840B57C - .incbin "baserom.gba", 0x0040b57c, 0x1c + .2byte 1002 + .2byte 1002 + .space 0x10 + +@ unused data? + .byte 2, 1, 3, 6, 4, 5 .align 2 gOamData_840B598:: @ 840B598