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

fix record mixing merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2018-05-19 12:32:44 +02:00
parent 0c1f85f200 db898d0e48
commit e44f35c7b7
26 changed files with 1631 additions and 2452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sym_ewram.txt
+1 -11
View File
@@ -487,17 +487,7 @@ gUnknown_02039F90: @ 2039F90
.include "src/naming_screen.o"
.include "src/money.o"
.align 2
gUnknown_02039F9C: @ 2039F9C
.space 0x78
gUnknown_0203A014: @ 203A014
.space 0x4
gUnknown_0203A018: @ 203A018
.space 0x4
.include "src/record_mixing.o"
.include "src/secret_base.o"
.include "src/tv.o"