Merge pull request #166 from camthesaxman/battle_refactor

rename/refactor battle code
This commit is contained in:
Cameron Hall
2018-02-07 12:46:12 -06:00
committed by GitHub
66 changed files with 10163 additions and 10132 deletions
+16 -16
View File
@@ -270,25 +270,25 @@ gBattleBufferA: @ 2023064
gBattleBufferB: @ 2023864
.space 0x800
gActiveBank: @ 2024064
gActiveBattler: @ 2024064
.space 0x4
gBattleExecBuffer: @ 2024068
gBattleControllerExecFlags: @ 2024068
.space 0x4
gNoOfAllBanks: @ 202406C
gBattlersCount: @ 202406C
.space 0x2
gBattlePartyID: @ 202406E
gBattlerPartyIndexes: @ 202406E
.space 0x8
gBanksByIdentity: @ 2024076
gBattlerPositions: @ 2024076
.space 0x4
gActionsByTurnOrder: @ 202407A
.space 0x4
gBanksByTurnOrder: @ 202407E
gBattleTurnOrder: @ 202407E
.space 0x4
gCurrentTurnActionNumber: @ 2024082
@@ -300,7 +300,7 @@ gCurrentActionFuncId: @ 2024083
gBattleMons: @ 2024084
.space 0x160
gBankSpriteIds: @ 20241E4
gBattlerSpriteIds: @ 20241E4
.space 0x4
gCurrMovePos: @ 20241E8
@@ -333,10 +333,10 @@ gLastUsedItem: @ 2024208
gLastUsedAbility: @ 202420A
.space 0x1
gBankAttacker: @ 202420B
gBattlerAttacker: @ 202420B
.space 0x1
gBankTarget: @ 202420C
gBattlerTarget: @ 202420C
.space 0x1
gBank1: @ 202420D
@@ -345,10 +345,10 @@ gBank1: @ 202420D
gEffectBank: @ 202420E
.space 0x1
gStringBank: @ 202420F
gStringBattler: @ 202420F
.space 0x1
gAbsentBankFlags: @ 2024210
gAbsentBattlerFlags: @ 2024210
.space 0x1
gCritMultiplier: @ 2024211
@@ -360,7 +360,7 @@ gMultiHitCounter: @ 2024212
gBattlescriptCurrInstr: @ 2024214
.space 0x8
gActionForBanks: @ 202421C
gChosenActionByBattler: @ 202421C
.space 0x4
gSelectionBattleScripts: @ 2024220
@@ -390,10 +390,10 @@ gLockedMoves: @ 2024268
gLastHitBy: @ 2024270
.space 0x4
gChosenMovesByBanks: @ 2024274
gChosenMoveByBattler: @ 2024274
.space 0x8
gBattleMoveFlags: @ 202427C
gMoveResultFlags: @ 202427C
.space 0x4
gHitMarker: @ 2024280
@@ -408,7 +408,7 @@ gTakenDmgBanks: @ 2024288
gUnknown_0202428C: @ 202428C
.space 0x2
gSideAffecting: @ 202428E
gSideStatuses: @ 202428E
.space 0x6
gSideTimers: @ 2024294
@@ -1146,7 +1146,7 @@ gUnknown_0203AB98: @ 203AB98
.include "src/coins.o"
.include "src/battle_transition.o"
gAbilitiesPerBank: @ 203ABA4
gBattlerAbilities: @ 203ABA4
.space 0x4
gStringInfo: @ 203ABA8