summaryrefslogtreecommitdiff
path: root/data/new_menu_helpers.s
diff options
context:
space:
mode:
authorDevin <easyaspi314@users.noreply.github.com>2018-01-21 15:22:05 -0500
committerDevin <easyaspi314@users.noreply.github.com>2018-01-21 15:22:05 -0500
commit35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (patch)
tree59427fda7dbbb92268caf353870d0f0ed8f5e13b /data/new_menu_helpers.s
parentc408110319885748b4fcc696063242c7002f4d30 (diff)
parenta1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'data/new_menu_helpers.s')
-rw-r--r--data/new_menu_helpers.s40
1 files changed, 33 insertions, 7 deletions
diff --git a/data/new_menu_helpers.s b/data/new_menu_helpers.s
index 8d4e43b15..c11d73d7c 100644
--- a/data/new_menu_helpers.s
+++ b/data/new_menu_helpers.s
@@ -4,24 +4,50 @@
.section .rodata
gUnknown_0860F074:: @ 860F074
- .incbin "baserom.gba", 0x60f074, 0x20
+ .incbin "graphics/interface/860F074.gbapal"
gUnknown_0860F094:: @ 860F094
- .incbin "baserom.gba", 0x60f094, 0x4
+ .byte 8, 4, 1, 0
gUnknown_0860F098:: @ 860F098
- .incbin "baserom.gba", 0x60f098, 0x10
+ window_template 0, 2, 15, 27, 4, 15, 0x194
+ null_window_template
gUnknown_0860F0A8:: @ 860F0A8
- .incbin "baserom.gba", 0x60f0a8, 0x8
+ window_template 0, 21, 9, 5, 4, 15, 0x125
@ These are not referenced in src/new_menu_helpers.c; rather, they are in src/menu.c. Regardless, they were plopped here.
gUnknown_0860F0B0:: @ 860F0B0
- .incbin "baserom.gba", 0x60f0b0, 0x20
+ .incbin "graphics/interface/860F0B0.gbapal"
gUnknown_0860F0D0:: @ 860F0D0
- .incbin "baserom.gba", 0x60f0d0, 0x4
+ .byte 15, 1, 2, 0
gUnknown_0860F0D4:: @ 860F0D4
- .incbin "baserom.gba", 0x60f0d4, 0x68
+ .2byte 0xC0C, 0
+ .2byte 0xC20, 32
+ .2byte 0xC20, 100
+ .2byte 0xC20, 0x60
+ .2byte 0xC20, 0x80
+ .2byte 0xC20, 0x48
+ .2byte 0xC20, 0x44
+ .2byte 0xC20, 0x6C
+ .2byte 0xC20, 0x68
+ .2byte 0xC20, 0x88
+ .2byte 0xC20, 0xA4
+ .2byte 0xC20, 0x24
+ .2byte 0xC20, 0x28
+ .2byte 0xC20, 0x2C
+ .2byte 0xC20, 0x40
+ .2byte 0xC20, 0x84
+ .2byte 0xC20, 0x4C
+ .2byte 0xC20, 0xA0
+ .2byte 0xC20, 0x8C
+ .2byte 0xC2A, 0xA8
+ .2byte 0xC2A, 0xC0
+ .2byte 0xC2A, 0xC8
+ .2byte 0xC2A, 0xE0
+ .2byte 0xC2A, 0xE8
+ .2byte 0x808, 0xAE
+ .2byte 0x808, 0xAF