Merge branch 'master' into quest_log

This commit is contained in:
PikalaxALT
2018-10-17 10:53:16 -07:00
20 changed files with 354 additions and 873 deletions
+2 -14
View File
@@ -530,21 +530,9 @@ gUnknown_202456C: @ 202456C
gUnknown_2024580: @ 2024580
.space 0x8
gSaveBlock2: @ 2024588
.space 0xFA4
gSaveBlock1: @ 202552C
.space 0x3DE8
gPokemonStorage: @ 2029314
.space 0x8450
gUnknown_2031764: @ 2031764
.space 0x528
gUnknown_2031C8C: @ 2031C8C
.space 0x4
.include "src/load_save.o"
.align 2
gUnknown_2031C90: @ 2031C90
.space 0x4