Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms

This commit is contained in:
golem galvanize
2018-01-19 21:05:13 -05:00
51 changed files with 1249 additions and 178 deletions
+1 -1
View File
@@ -297,7 +297,7 @@ gUnknown_08587F44:: @ 8587F44
window_template 0x00, 0x01, 0x25, 0x09, 0x02, 0x0f, 0x02da
window_template 0x00, 0x10, 0x1f, 0x01, 0x02, 0x0f, 0x02ec
window_template 0x00, 0x0b, 0x23, 0x12, 0x04, 0x0f, 0x02ee
window_template_terminator
null_window_template
.align 2
gUnknown_08587FA4:: @ 8587FA4