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

pokeblock merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-21 23:12:36 +01:00
parent df479661ff a705a863d1
commit bcffcb0c1c
51 changed files with 5037 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/graphics.s
View File

@@ -1527,8 +1527,11 @@ gUnknown_08DD4620:: @ 8DD4620
.incbin "baserom.gba", 0xdd4620, 0xc0
gUnknown_08DD46E0:: @ 8DD46E0
.incbin "baserom.gba", 0xdd46e0, 0x180
.incbin "baserom.gba", 0xdd46e0, 0xc0
gUnknown_08DD47A0:: @ 8DD47A0
.incbin "baserom.gba", 0xdd47a0, 0xc0
gUnknown_08DD4860:: @ 8DD4860
.incbin "baserom.gba", 0xdd4860, 0x20