diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-06 21:24:58 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-06 21:24:58 -0700 |
| commit | f64303defa5193264add529303bb66c5a8d6f771 (patch) | |
| tree | 8dfee1fa6754f42c4a38bc33da3c85cfdfe4e110 | |
| parent | 770b750c375324aed9683276245f25f351657e7f (diff) | |
add font half row offsets data and more
| -rw-r--r-- | asm/data2.s | 27 | ||||
| -rw-r--r-- | asm/macros.s | 10 | ||||
| -rw-r--r-- | asm/text_renderer.s | 2 | ||||
| -rw-r--r-- | asm/window.s | 4 |
4 files changed, 37 insertions, 6 deletions
diff --git a/asm/data2.s b/asm/data2.s index 6fc00e9a7..c22e4f864 100644 --- a/asm/data2.s +++ b/asm/data2.s @@ -2,10 +2,10 @@ .align 2, 0 -gUnknown_82E9530: +gUnknown_82E9530: @ 82E9530 .byte 3 -gUnknown_82E9531: +gUnknown_82E9531: @ 82E9531 .byte 2 .align 2, 0 @@ -34,4 +34,25 @@ gRomInterruptTable: @ 82E9548 gBgConfigZeroValue: @ 82E9580 .4byte 0 - .incbin "base_emerald.gba", 0x2e9584 +gDummyWindowTemplate: @ 82E9584 + window_template -1, 0, 0, 0, 0, 0, 0 + +gFontHalfRowOffsets: @ 82E958C + .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00 + .byte 0x09,0x0a,0x0b,0x09,0x0c,0x0d,0x0e,0x0c,0x0f,0x10,0x11,0x0f,0x09,0x0a,0x0b,0x09 + .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 + .byte 0x1b,0x1c,0x1d,0x1b,0x1e,0x1f,0x20,0x1e,0x21,0x22,0x23,0x21,0x1b,0x1c,0x1d,0x1b + .byte 0x24,0x25,0x26,0x24,0x27,0x28,0x29,0x27,0x2a,0x2b,0x2c,0x2a,0x24,0x25,0x26,0x24 + .byte 0x2d,0x2e,0x2f,0x2d,0x30,0x31,0x32,0x30,0x33,0x34,0x35,0x33,0x2d,0x2e,0x2f,0x2d + .byte 0x1b,0x1c,0x1d,0x1b,0x1e,0x1f,0x20,0x1e,0x21,0x22,0x23,0x21,0x1b,0x1c,0x1d,0x1b + .byte 0x36,0x37,0x38,0x36,0x39,0x3a,0x3b,0x39,0x3c,0x3d,0x3e,0x3c,0x36,0x37,0x38,0x36 + .byte 0x3f,0x40,0x41,0x3f,0x42,0x43,0x44,0x42,0x45,0x46,0x47,0x45,0x3f,0x40,0x41,0x3f + .byte 0x48,0x49,0x4a,0x48,0x4b,0x4c,0x4d,0x4b,0x4e,0x4f,0x50,0x4e,0x48,0x49,0x4a,0x48 + .byte 0x36,0x37,0x38,0x36,0x39,0x3a,0x3b,0x39,0x3c,0x3d,0x3e,0x3c,0x36,0x37,0x38,0x36 + .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00 + .byte 0x09,0x0a,0x0b,0x09,0x0c,0x0d,0x0e,0x0c,0x0f,0x10,0x11,0x0f,0x09,0x0a,0x0b,0x09 + .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 diff --git a/asm/macros.s b/asm/macros.s index b109595df..96f79195d 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -27,3 +27,13 @@ .macro thumb_func_end name .size \name, .-\name .endm + + .macro window_template bg_id, x, y, width, height, palette, vram_tile_offset + .byte \bg_id + .byte \x + .byte \y + .byte \width + .byte \height + .byte \palette + .2byte \vram_tile_offset + .endm diff --git a/asm/text_renderer.s b/asm/text_renderer.s index 9266acf39..5c576cda3 100644 --- a/asm/text_renderer.s +++ b/asm/text_renderer.s @@ -854,7 +854,7 @@ font_render_sub: @ 8004C10 push {r7} ldrh r7, [r0] ldr r5, =0x03000948 - ldr r4, =0x082e958c + ldr r4, =gFontHalfRowOffsets movs r2, 0xFF mov r8, r2 adds r2, r7, 0 diff --git a/asm/window.s b/asm/window.s index 5b3bfc6f3..657c5389c 100644 --- a/asm/window.s +++ b/asm/window.s @@ -32,7 +32,7 @@ _080031E4: mov r0, r8 cmp r0, 0x3 ble _080031D4 - ldr r0, =0x082e9584 + ldr r0, =gDummyWindowTemplate ldr r2, [r0] ldr r3, [r0, 0x4] ldr r1, =0x02020004 @@ -494,7 +494,7 @@ Window_Remove: @ 8003574 movs r3, 0x2 bl do_nothing _080035A0: - ldr r0, =0x082e9584 + ldr r0, =gDummyWindowTemplate ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r4] |