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

berry blender fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-11-26 19:21:51 +01:00
parent ad3a97e178 1e4f12e6fa
commit b0657350a4
27 changed files with 1034 additions and 2406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sym_ewram.txt
+1 -5
View File
@@ -763,11 +763,7 @@ gUnknown_02038BF9: @ 2038BF9
gUnknown_02038BFC: @ 2038BFC
.space 0x4
gUnknown_02038C00: @ 2038C00
.space 0x4
gUnknown_02038C04: @ 2038C04
.space 0x4
.include "src/wild_encounter.o"
gFieldEffectArguments: @ 2038C08
.space 0x20