diff options
| author | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
| commit | eb47bda8ee5c1f002236200df36012de9e243a97 (patch) | |
| tree | fc69fc5435582efebd36fc54414673dd8ac7f646 /engine/pokemon | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Verify data table and name list sizes with assertion macros (diff) | |
| download | pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.gz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.xz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/add_mon.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/evos_moves.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/learn_move.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index 54d7b4de..e86b7b61 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -265,7 +265,7 @@ AddPartyMon_WriteMovePP: push de push bc ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wcd6d ld a, BANK(Moves) diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 7c1476d3..165ae02d 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -166,7 +166,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wd11e] dec a ld hl, BaseStats - ld bc, MonBaseStatsEnd - MonBaseStats + ld bc, BASE_DATA_SIZE call AddNTimes ld de, wMonHeader call CopyData @@ -584,7 +584,7 @@ WriteMonMoves: push hl dec a ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wBuffer ld a, BANK(Moves) diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index ff704003..9f4ac2d2 100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -44,7 +44,7 @@ DontAbandonLearning: push de dec a ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wBuffer ld a, BANK(Moves) |