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

fix pokeblock conflicts

Browse Source
This commit is contained in:
DizzyEggg committed 2017-12-18 16:58:14 +01:00
2 parents c3abe2863f 6a674e1e83
commit cb229f56e8
174 files changed
+5529 -7226
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

sym_common.txt
+2 -2
View File
@@ -302,10 +302,10 @@ gUnknown_03006080: @ 3006080
gUnknown_03006084: @ 3006084
.space 0xC
gUnknown_03006090: @ 3006090
gApproachingTrainers: @ 3006090
.space 0x18
gUnknown_030060A8: @ 30060A8
gNoOfApproachingTrainers: @ 30060A8
.space 0x4
gUnknown_030060AC: @ 30060AC