diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-19 17:52:26 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-19 17:52:26 -0700 |
| commit | 1d86932cc9c38815434409f07d14c2bfe4e7a836 (patch) | |
| tree | 43d021ef4340e90c591e490f2a20b5005b23d7d5 /engine/battle | |
| parent | e607199397cb36565f61703a58d99efdc21891c5 (diff) | |
naming
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/battle/init_battle_variables.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 93ccdef5..42d7f5e6 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6296,7 +6296,7 @@ LoadEnemyMonData: ; 3eb01 (f:6b01) predef WriteMonMoves ; get moves based on current level .loadMovePPs ld hl, wEnemyMonMoves - ld de, wEnemyMonSpecial + 1 + ld de, wEnemyMonPP - 1 predef LoadMovePPs ld hl, W_MONHBASESTATS ld de, wEnemyMonBaseStats @@ -6957,7 +6957,7 @@ InitBattle_Common: ; 3efeb (f:6feb) ld [wLetterPrintingDelayFlags], a pop af ld [wMapPalOffset], a - ld a, [wd0d4] + ld a, [wSavedTilesetType] ld [hTilesetType], a scf ret diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index d5ee7816..3c926858 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -1,6 +1,6 @@ InitBattleVariables: ; 525af (14:65af) ld a, [hTilesetType] - ld [wd0d4], a + ld [wSavedTilesetType], a xor a ld [wActionResultOrTookBattleTurn], a ld [wBattleResult], a |