diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 20:18:04 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 20:18:04 -0600 |
| commit | a247120ac115c7c7f48d487dbaf9aaaf26e18757 (patch) | |
| tree | 56dd818eaa0f515291e2643feeebc5dd265cf74e | |
| parent | Fix inaccurate comment in UpdateNPCSprite (diff) | |
| download | pokeyellow-a247120ac115c7c7f48d487dbaf9aaaf26e18757.tar.gz pokeyellow-a247120ac115c7c7f48d487dbaf9aaaf26e18757.tar.xz pokeyellow-a247120ac115c7c7f48d487dbaf9aaaf26e18757.zip | |
Fix a few usages of EFFECTIVE
| -rw-r--r-- | engine/battle/core.asm | 3 | ||||
| -rw-r--r-- | engine/battle/display_effectiveness.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/sprite_collisions.asm | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index b93b6fa7..ca3294b8 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5324,8 +5324,7 @@ AIGetTypeEffectiveness: inc hl ld c, [hl] ; c = type 2 of player's pokemon ; initialize to neutral effectiveness - ; bug: this is $10 (MORE_EFFECTIVE + 1) but should be 10 (EFFECTIVE) - ld a, MORE_EFFECTIVE + 1 + ld a, $10 ; bug: should be EFFECTIVE (10) ld [wTypeEffectiveness], a ld hl, TypeEffects .loop diff --git a/engine/battle/display_effectiveness.asm b/engine/battle/display_effectiveness.asm index b23695cf..2879f847 100644 --- a/engine/battle/display_effectiveness.asm +++ b/engine/battle/display_effectiveness.asm @@ -1,7 +1,7 @@ DisplayEffectiveness: ld a, [wDamageMultipliers] and $7F - cp $0A + cp EFFECTIVE ret z ld hl, SuperEffectiveText jr nc, .done diff --git a/engine/overworld/sprite_collisions.asm b/engine/overworld/sprite_collisions.asm index ffed3708..e6d89480 100644 --- a/engine/overworld/sprite_collisions.asm +++ b/engine/overworld/sprite_collisions.asm @@ -1,5 +1,5 @@ _UpdateSprites:: - ld h, $c1 + ld h, HIGH(wSpriteStateData1) inc h ld a, SPRITESTATEDATA2_IMAGEBASEOFFSET .spriteLoop |