diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/battle/core.asm | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d6ce6557..39e80e74 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -67,9 +67,9 @@ SlidePlayerAndEnemySilhouettesOnScreen: ldh [rBGP], a ldh [rOBP0], a ldh [rOBP1], a - call UpdateGBCPal_BGP - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_BGP + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 .slideSilhouettesLoop ; slide silhouettes of the player's pic and the enemy's pic onto the screen ld h, b ld l, $40 @@ -905,8 +905,8 @@ ReplaceFaintedEnemyMon: ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE ldh [rOBP0], a ldh [rOBP1], a - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 callfar DrawEnemyPokeballs ld a, [wLinkState] cp LINK_STATE_BATTLING @@ -4619,7 +4619,7 @@ CalculateDamage: ; Multi-hit attacks may or may not have 0 bp. cp TWO_TO_FIVE_ATTACKS_EFFECT jr z, .skipbp - cp $1e + cp EFFECT_1E jr z, .skipbp ; Calculate OHKO damage based on remaining HP. @@ -5328,7 +5328,7 @@ MetronomePickMove: and a jr z, .pickMoveLoop cp STRUGGLE - assert NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves + ASSERT NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves jr nc, .pickMoveLoop cp METRONOME jr z, .pickMoveLoop @@ -6940,7 +6940,7 @@ HandleExplodingAnimation: ret nz ld a, ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT ld [wAnimationType], a - assert ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT == MEGA_PUNCH + ASSERT ANIMATIONTYPE_SHAKE_SCREEN_HORIZONTALLY_LIGHT == MEGA_PUNCH ; ld a, MEGA_PUNCH ; fallthrough PlayMoveAnimation: |