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

merge conflicts, review changes, daycare

Browse Source
This commit is contained in:
DizzyEggg
2017-11-17 19:31:03 +01:00
parent ba00a1c688 a98c6bf210
commit 1b7246395d
61 changed files with 3368 additions and 6216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sym_ewram.txt
+2 -8
View File
@@ -1089,12 +1089,7 @@ gUnknown_0203A138: @ 203A138
gUnknown_0203A140: @ 203A140
.space 0x4
gUnknown_0203A144: @ 203A144
.space 0x4
gUnknown_0203A148: @ 203A148
.space 0x4
.include "src/region_map.o"
.include "src/decoration.o"
.align 2
@@ -1382,8 +1377,7 @@ gUnknown_0203BCC8: @ 203BCC8
gUnknown_0203BCCC: @ 203BCCC
.space 0x4
gUnknown_0203BCD0: @ 203BCD0
.space 0x4
.include "src/field_region_map.o"
gUnknown_0203BCD4: @ 203BCD4
.space 0x4