diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-06-07 20:00:21 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-06-07 20:00:21 -0400 |
| commit | 1f9e688b76c90403d14f1ab68b47b0e7d1df24c6 (patch) | |
| tree | 189df227ee182bc3648e86589ec910a6bc34d322 | |
| parent | a41dac9a2fe3ef50db1c8519d440d83cc6721203 (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 0279d47e6..2839e9b11 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 MON_CAUGHTDATA rw rsset MON_CAUGHTDATA MON_CAUGHTTIME rb diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8e6283738..5345d7e72 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3865,7 +3865,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 @@ -3951,7 +3951,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 @@ -7034,7 +7034,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 |