summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-06 22:05:11 -0700
committerYamaArashi <shadow962@live.com>2015-10-06 22:05:11 -0700
commit69f436b393277f73a2306e0baf2629170d95ea32 (patch)
tree22757c52de72c0194fcfaeb46dae88b664d9ac90
parent2b1c03dd2e2567eb21c0f3b74a4fc40eeb4c8054 (diff)
add down arrow tiles data
-rw-r--r--asm/data2.s8
-rw-r--r--asm/text_renderer.s8
2 files changed, 11 insertions, 5 deletions
diff --git a/asm/data2.s b/asm/data2.s
index c22e4f864..08e750ca4 100644
--- a/asm/data2.s
+++ b/asm/data2.s
@@ -55,4 +55,10 @@ gFontHalfRowOffsets: @ 82E958C
.byte 0x12,0x13,0x14,0x12,0x15,0x16,0x17,0x15,0x18,0x19,0x1a,0x18,0x12,0x13,0x14,0x12
.byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00
- .incbin "base_emerald.gba", 0x2e968c
+gDownArrowTiles: @ 82E968C
+ .incbin "base_emerald.gba", 0x2e968c, 0xc0
+
+gDarkDownArrowTiles: @ 82E974C
+ .incbin "base_emerald.gba", 0x2e974c, 0xc0
+
+ .incbin "base_emerald.gba", 0x2e980c
diff --git a/asm/text_renderer.s b/asm/text_renderer.s
index 5c576cda3..35e22d5dc 100644
--- a/asm/text_renderer.s
+++ b/asm/text_renderer.s
@@ -2152,12 +2152,12 @@ _08005560:
cmp r0, 0x1
beq _08005594
_0800558A:
- ldr r7, =0x082e968c
+ ldr r7, =gDownArrowTiles
b _08005596
.align 2, 0
.pool
_08005594:
- ldr r7, =0x082e974c
+ ldr r7, =gDarkDownArrowTiles
_08005596:
ldrb r0, [r5, 0x4]
ldr r2, =0x082e9d0c
@@ -2390,12 +2390,12 @@ _0800571A:
cmp r0, 0x1
beq _08005754
_08005748:
- ldr r6, =0x082e968c
+ ldr r6, =gDownArrowTiles
b _08005756
.align 2, 0
.pool
_08005754:
- ldr r6, =0x082e974c
+ ldr r6, =gDarkDownArrowTiles
_08005756:
ldr r2, =0x082e9d0c
mov r0, r10