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

fix PR merge conflicts

Browse Source
This commit is contained in:
Evan
2019-11-21 09:31:40 -07:00
parent e6bc189a03 1234d0252c
commit 407d22af8e
47 changed files with 1979 additions and 4704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sym_ewram.txt
+2 -7
View File
@@ -420,13 +420,8 @@ gPlayerFacingPosition: @ 2039A04
.include "src/field_specials.o"
.align 2
.include "src/battle_records.o"
gUnknown_2039A20: @ 2039A20
.space 0x4
gUnknown_2039A24: @ 2039A24
.space 0x4
.align 2
.include "src/evolution_scene.o"
.align 2
.include "src/coins.o"
.align 2