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

This commit is contained in:
Diegoisawesome
2018-02-17 04:03:59 -06:00
125 changed files with 6338 additions and 14112 deletions
+2 -33
View File
@@ -119,10 +119,7 @@ gUnknown_02022D00: @ 2022D00
@ src/main_menu.c
gUnknown_02022D04: @ 2022D04
.space 0x2
gUnknown_02022D06: @ 2022D06
.space 0x2
.include "src/main_menu.o"
gUnknown_02022D08: @ 2022D08
.space 0x1
@@ -211,35 +208,7 @@ gDifferentSaveFile: @ 20322D4
gUnknown_020322D5: @ 20322D5
.space 0x3
gUnknown_020322D8: @ 20322D8
.space 0x4
gUnknown_020322DC: @ 20322DC
.space 0x8
gUnknown_020322E4: @ 20322E4
.space 0x8
gUnknown_020322EC: @ 20322EC
.space 0x8
gUnknown_020322F4: @ 20322F4
.space 0x8
gUnknown_020322FC: @ 20322FC
.space 0x4
gUnknown_02032300: @ 2032300
.space 0x4
gUnknown_02032304: @ 2032304
.space 0x2
gUnknown_02032306: @ 2032306
.space 0x2
gLinkPlayerMapObjects: @ 2032308
.space 0x10
.include "src/overworld.o"
gUnknown_02032318: @ 2032318
.space 0x5000