atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add font half row offsets data and more

Browse source
This commit is contained in:
YamaArashi 2015-10-06 21:24:58 -07:00
parent 770b750c37
commit f64303defa
4 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
asm/data2.s
View file

@ -2,10 +2,10 @@
.align 2, 0 .align 2, 0
gUnknown_82E9530: gUnknown_82E9530: @ 82E9530
.byte 3 .byte 3
gUnknown_82E9531: gUnknown_82E9531: @ 82E9531
.byte 2 .byte 2
.align 2, 0 .align 2, 0
@ -34,4 +34,25 @@ gRomInterruptTable: @ 82E9548
gBgConfigZeroValue: @ 82E9580 gBgConfigZeroValue: @ 82E9580
.4byte 0 .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

10
asm/macros.s
View file

@ -27,3 +27,13 @@
.macro thumb_func_end name .macro thumb_func_end name
.size \name, .-\name .size \name, .-\name
.endm .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

2
asm/text_renderer.s
View file

@ -854,7 +854,7 @@ font_render_sub: @ 8004C10
push {r7} push {r7}
ldrh r7, [r0] ldrh r7, [r0]
ldr r5, =0x03000948 ldr r5, =0x03000948
ldr r4, =0x082e958c ldr r4, =gFontHalfRowOffsets
movs r2, 0xFF movs r2, 0xFF
mov r8, r2 mov r8, r2
adds r2, r7, 0 adds r2, r7, 0

4
asm/window.s
View file

@ -32,7 +32,7 @@ _080031E4:
mov r0, r8 mov r0, r8
cmp r0, 0x3 cmp r0, 0x3
ble _080031D4 ble _080031D4
ldr r0, =0x082e9584 ldr r0, =gDummyWindowTemplate
ldr r2, [r0] ldr r2, [r0]
ldr r3, [r0, 0x4] ldr r3, [r0, 0x4]
ldr r1, =0x02020004 ldr r1, =0x02020004
@ -494,7 +494,7 @@ Window_Remove: @ 8003574
movs r3, 0x2 movs r3, 0x2
bl do_nothing bl do_nothing
_080035A0: _080035A0:
ldr r0, =0x082e9584 ldr r0, =gDummyWindowTemplate
ldr r1, [r0, 0x4] ldr r1, [r0, 0x4]
ldr r0, [r0] ldr r0, [r0]
str r0, [r4] str r0, [r4]