diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /home/battle_vars.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/battle_vars.asm')
| -rw-r--r-- | home/battle_vars.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/home/battle_vars.asm b/home/battle_vars.asm index c4a8dcd70..a455fce20 100644 --- a/home/battle_vars.asm +++ b/home/battle_vars.asm @@ -1,12 +1,11 @@ -GetBattleVar:: ; 39e1 +GetBattleVar:: ; Preserves hl. push hl call GetBattleVarAddr pop hl ret -; 39e7 -GetBattleVarAddr:: ; 39e7 +GetBattleVarAddr:: ; Get variable from pair a, depending on whose turn it is. ; There are 21 variable pairs. @@ -110,4 +109,3 @@ BattleVarLocations: dw wCurPlayerMove, wCurEnemyMove dw wLastPlayerCounterMove, wLastEnemyCounterMove dw wLastPlayerMove, wLastEnemyMove -; 3a90 |