dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
U-User-PC\User committed 2017-10-18 19:28:36 -04:00
2 parents 11f9a27640 0f0ba1e28c
commit d4532c70cb
270 files changed
+36319 -38428
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/pokemon_summary_screen.s
+4 -1
View File
@@ -40,7 +40,10 @@ gUnknown_0861CD14:: @ 861CD14
.incbin "baserom.gba", 0x61cd14, 0x18
gUnknown_0861CD2C:: @ 861CD2C
.incbin "baserom.gba", 0x61cd2c, 0xa7
.incbin "baserom.gba", 0x61cd2c, 0x27
gUnknown_0861CD53:: @ 861CD53
.incbin "baserom.gba", 0x61cd53, 0x80
gUnknown_0861CDD3:: @ 861CDD3
.incbin "baserom.gba", 0x61cdd3, 0x81