dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics

Browse Source
This commit is contained in:
paul
2018-10-10 22:54:23 +02:00
parent 1ee1ebe23a 10fff9c6f2
commit 3f0827128a
42 changed files with 1111 additions and 2350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data.s
+4 -1
View File
@@ -1558,7 +1558,10 @@ gUnknown_83AC970:: @ 83AC970
.incbin "baserom.gba", 0x3AC970, 0x20
sFanfares:: @ 83AC990
.incbin "baserom.gba", 0x3AC990, 0x278
.incbin "baserom.gba", 0x3AC990, 0x40
gUnknown_83AC9D0:: @ 83AC9D0
.incbin "baserom.gba", 0x3AC9D0, 0x238
gUnknown_83ACC08:: @ 83ACC08
.incbin "baserom.gba", 0x3ACC08, 0x440