Merge branch 'master' into decompile_battle_message

This commit is contained in:
DizzyEggg
2017-10-09 13:58:24 +02:00
15 changed files with 410 additions and 638 deletions
-22
View File
@@ -1,22 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_085E7088:: @ 85E7088
.incbin "baserom.gba", 0x5e7088, 0x40
gUnknown_085E70C8:: @ 85E70C8
.incbin "baserom.gba", 0x5e70c8, 0x73c
gUnknown_085E7804:: @ 85E7804
.incbin "baserom.gba", 0x5e7804, 0x9f8
gUnknown_085E81FC:: @ 85E81FC
.incbin "baserom.gba", 0x5e81fc, 0x8
gUnknown_085E8204:: @ 85E8204
.incbin "baserom.gba", 0x5e8204, 0x10
gUnknown_085E8214:: @ 85E8214
.incbin "baserom.gba", 0x5e8214, 0x4
-13
View File
@@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_086143BC:: @ 86143BC
.incbin "baserom.gba", 0x6143bc, 0x4e
gUnknown_0861440A:: @ 861440A
.incbin "baserom.gba", 0x61440a, 0x4
gUnknown_0861440E:: @ 861440E
.incbin "baserom.gba", 0x61440e, 0x2