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

merge upstream, fix non-conflict in trade.s

Browse Source
This commit is contained in:
paul
2018-10-14 16:36:53 +02:00
parent 943931f86f a2e49c4d5c
commit 3037f37cc6
36 changed files with 2578 additions and 3690 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data.s
+3 -2
View File
@@ -118,9 +118,10 @@ gUnknown_8239FD4:: @ 8239FD4
gUnknown_823A004:: @ 823A004
.incbin "baserom.gba", 0x23A004, 0x4554
gUnknown_823E558:: @ 823E558
.incbin "baserom.gba", 0x23E558, 0x570
gTrainerClassNames:: @ 823E558
.include "data/text/trainer_class_names.inc"
.align 2, 0
gTrainers:: @ 823EAD8
.incbin "baserom.gba", 0x23EAC8, 0x7418