diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-19 21:36:23 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-19 21:36:23 -0400 |
| commit | 0def3b67fa0a64bc2e2778c99c53e1a77cbf302c (patch) | |
| tree | c70beb8a39f122cad0753a2f4974ac6d1712e3f6 /engine/pokemon | |
| parent | 7b63a9c032a130a08fc554b9b6790fe47d170530 (diff) | |
Start adding engine/battle/core.asm.
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc_top.asm | 2 | ||||
| -rwxr-xr-x | engine/pokemon/move_mon.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 38cfc479..25166209 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -337,7 +337,7 @@ Function65b4: swap a or b ld b, a - ld a, [wd12d] + ld a, [wBaseGender] cp b ld a, $1 jr c, .asm_e63d diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 26b0f0b9..39e6ea47 100755 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -69,7 +69,7 @@ GeneratePartyMonStats: ld a, [wCurPartySpecies] ld [wCurSpecies], a call GetBaseData - ld a, [wd120] + ld a, [wBaseDexNo] ld [de], a inc de ld a, [wBattleMode] @@ -1288,7 +1288,7 @@ CalcMonStatC: ; e181 ld a, b ld d, a push hl - ld hl, wd121 + ld hl, wBaseStats dec hl ; has to be decreased, because 'c' begins with 1 ld b, $0 add hl, bc |