Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps

This commit is contained in:
Diegoisawesome
2017-11-15 00:47:34 -06:00
121 changed files with 6022 additions and 11283 deletions
+2 -6
View File
@@ -1404,11 +1404,7 @@ gUnknown_0203BCD0: @ 203BCD0
gUnknown_0203BCD4: @ 203BCD4
.space 0x4
gUnknown_0203BCD8: @ 203BCD8
.space 0x4
gUnknown_0203BCDC: @ 203BCDC
.space 0x4
.include "src/hall_of_fame.o"
gUnknown_0203BCE0: @ 203BCE0
.space 0x2
@@ -1416,7 +1412,7 @@ gUnknown_0203BCE0: @ 203BCE0
gUnknown_0203BCE2: @ 203BCE2
.space 0x2
gUnknown_0203BCE4: @ 203BCE4
gHasHallOfFameRecords: @ 203BCE4
.space 0x1
gUnknown_0203BCE5: @ 203BCE5