Merge branch 'master' into mail

This commit is contained in:
PikalaxALT
2017-10-19 18:45:38 -04:00
41 changed files with 1938 additions and 4083 deletions
+4 -4
View File
@@ -196,7 +196,7 @@ gUnknown_02022D0A: @ 2022D0A
gUnknown_02022D0C: @ 2022D0C
.space 0x4
gUnknown_02022D10: @ 2022D10
gBattleBuffersTransferData: @ 2022D10
.space 0x100
gUnknown_02022E10: @ 2022E10
@@ -282,7 +282,7 @@ gNoOfAllBanks: @ 202406C
gBattlePartyID: @ 202406E
.space 0x8
gBanksBySide: @ 2024076
gBanksByIdentity: @ 2024076
.space 0x4
gActionsByTurnOrder: @ 202407A
@@ -471,10 +471,10 @@ gBattleScripting: @ 2024474
gBattleStruct: @ 202449C
.space 0x4
gUnknown_020244A0: @ 20244A0
gLinkBattleSendBuffer: @ 20244A0
.space 0x4
gUnknown_020244A4: @ 20244A4
gLinkBattleRecvBuffer: @ 20244A4
.space 0x4
gBattleResources: @ 20244A8