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

fixing conflicts

Browse Source
This commit is contained in:
golem galvanize
2018-01-20 19:44:34 -05:00
parent 59e1aacd26 aca539d5dd
commit bdc8cf6ac4
13 changed files with 301 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/map_name_popup.s
+10
View File
@@ -29,4 +29,14 @@ gMapPopUp_Palette_Table:: @ 857F384
.incbin "graphics/interface/map_popup/stone2.gbapal"
gUnknown_0857F444:: @ 857F444
<<<<<<< HEAD
.incbin "graphics/interface/map_popup/857F444.gbapal"
=======
.incbin "baserom.gba", 0x57f444, 0x20
gUnknown_0857F464:: @ 857F464
.incbin "baserom.gba", 0x57f464, 0xe0
gUnknown_0857F544:: @ 857F544
.incbin "baserom.gba", 0x57f544, 0x20
>>>>>>> aca539d5dd97b55d149ca59c0561a721544d3298