diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-16 14:36:48 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-16 14:36:48 -0500 |
| commit | 9e77982bc8658c09df187b4598f8cbabb427a271 (patch) | |
| tree | d88ff7a45f7b8a80a02f099052da9b4eb2e14d21 /engine/battle/init_battle_variables.asm | |
| parent | b1cb3788938fa981e65619f022a41f1c1d91ae3b (diff) | |
| parent | bd7d9815936decc5b636f4235c0ee745812dcb48 (diff) | |
Merge pull request #101 from YamaArashi/master
Misc changes
Diffstat (limited to 'engine/battle/init_battle_variables.asm')
| -rw-r--r-- | engine/battle/init_battle_variables.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index edb1f13e..74df62aa 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -2,9 +2,9 @@ InitBattleVariables: ; 525af (14:65af) ld a, [hTilesetType] ld [wd0d4], a xor a - ld [wcd6a], a + ld [wActionResultOrTookBattleTurn], a ld [wBattleResult], a - ld hl, wcc2b + ld hl, wPartyAndBillsPCSavedMenuItem ld [hli], a ld [hli], a ld [hli], a |