diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-06-07 20:00:24 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-06-07 20:00:24 -0400 |
| commit | 1f0b578ced3cd4fbde3b71fd211cfa7be109010e (patch) | |
| tree | 330f58b9388896152b0c51c8f2d25d5dcaa7023d | |
| parent | 6f11782f6313138b8dbf8e221d0bf714a19873ec (diff) | |
MON_PKRUS -> MON_POKERUS
| -rw-r--r-- | constants/pokemon_data_constants.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 12670215..64ddc565 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -89,7 +89,7 @@ MON_SPC_EXP rw MON_DVS rw MON_PP rb NUM_MOVES MON_HAPPINESS rb -MON_PKRUS rb +MON_POKERUS rb rb_skip 2 MON_LEVEL rb BOXMON_STRUCT_LENGTH EQU _RS diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 7e13f89d..cce9a688 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3637,7 +3637,7 @@ InitBattleMon: ld bc, MON_DVS - MON_ID add hl, bc ld de, wBattleMonDVs - ld bc, MON_PKRUS - MON_DVS + ld bc, MON_POKERUS - MON_DVS call CopyBytes inc hl inc hl @@ -3723,7 +3723,7 @@ InitEnemyMon: ld bc, MON_DVS - MON_ID add hl, bc ld de, wEnemyMonDVs - ld bc, MON_PKRUS - MON_DVS + ld bc, MON_POKERUS - MON_DVS call CopyBytes inc hl inc hl @@ -6769,7 +6769,7 @@ GiveExperiencePoints: .no_carry_stat_exp push hl push bc - ld a, MON_PKRUS + ld a, MON_POKERUS call GetPartyParamLocation ld a, [hl] and a |