Merge remote-tracking branch 'pret/master'

This commit is contained in:
Diegoisawesome
2017-09-09 20:54:41 -05:00
211 changed files with 149330 additions and 147270 deletions
+3 -3
View File
@@ -209,7 +209,7 @@ gUnknown_03005D00: @ 3005D00
gBattleMainFunc: @ 3005D04
.space 0xC
gUnknown_03005D10: @ 3005D10
gBattleResults: @ 3005D10
.space 0x2A
gUnknown_03005D3A: @ 3005D3A
@@ -224,7 +224,7 @@ gUnknown_03005D54: @ 3005D54
gBattleBankFunc: @ 3005D60
.space 0x10
gUnknown_03005D70: @ 3005D70
gHealthBoxesIds: @ 3005D70
.space 0x4
gUnknown_03005D74: @ 3005D74
@@ -251,7 +251,7 @@ gSaveBlock1Ptr: @ 3005D8C
gSaveBlock2Ptr: @ 3005D90
.space 0x4
gUnknown_03005D94: @ 3005D94
gPokemonStoragePtr: @ 3005D94
.space 0x4
gUnknown_03005D98: @ 3005D98