Merge remote-tracking branch 'pret/master'

This commit is contained in:
Diegoisawesome
2017-09-16 03:21:42 -05:00
58 changed files with 1542 additions and 1925 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"
@@ -1208,7 +1198,7 @@ gUnknown_0851017C:: @ 851017C
gUnknown_0851021C:: @ 851021C
.incbin "baserom.gba", 0x51021c, 0xa0
gUnknown_085102BC:: @ 85102BC
gNullScriptPtr:: @ 85102BC
.incbin "baserom.gba", 0x5102bc, 0x4
gUnknown_085102C0:: @ 85102C0