Merge branch 'master' into decomp_pokemon

This commit is contained in:
DizzyEggg
2017-09-13 18:24:01 +02:00
8 changed files with 532 additions and 481 deletions

View File

@@ -5,17 +5,7 @@
.section .rodata
gBitTable:: @ 832A328
.incbin "baserom.gba", 0x32a328, 0x80
gUnknown_0832A3A8:: @ 832A3A8
.incbin "baserom.gba", 0x32a3a8, 0x18
gUnknown_0832A3C0:: @ 832A3C0
.incbin "baserom.gba", 0x32a3c0, 0x18
gUnknown_0832A3D8:: @ 832A3D8
.incbin "baserom.gba", 0x32a3d8, 0xa00
@ 832ADD8
.include "data/egg_moves.inc"