diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:51:02 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 10:51:02 -0500 |
| commit | 6fe56af2cd63abaf30040cc5031e3db5358cf638 (patch) | |
| tree | b024aa8480912ebf2667184068466ee7f354012c /engine/battle | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| download | pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.tar.gz pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.tar.xz pokeyellow-6fe56af2cd63abaf30040cc5031e3db5358cf638.zip | |
Organize home and macro code
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 8 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/effects.asm | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 3b0fd4ec..98d85e02 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -57,7 +57,7 @@ DrawFrameBlock: inc hl inc de ld a, [hli] - add a, $31 ; base tile ID for battle animations + add $31 ; base tile ID for battle animations ld [de], a ; store tile ID inc de ld a, [hli] @@ -91,7 +91,7 @@ DrawFrameBlock: inc hl inc de ld a, [hli] - add a, $31 ; base tile ID for battle animations + add $31 ; base tile ID for battle animations ld [de], a ; store tile ID inc de ; toggle horizontal and vertical flip @@ -99,10 +99,10 @@ DrawFrameBlock: and a ld b, OAM_VFLIP | OAM_HFLIP jr z, .storeFlags1 - cp a, OAM_HFLIP + cp OAM_HFLIP ld b, OAM_VFLIP jr z, .storeFlags1 - cp a, OAM_VFLIP + cp OAM_VFLIP ld b, OAM_HFLIP jr z, .storeFlags1 ld b, 0 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f66f509f..4b8d342a 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -902,7 +902,7 @@ ReplaceFaintedEnemyMon: ld hl, wEnemyHPBarColor ld e, $30 call GetBattleHealthBarColor - setpal SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE + ldpal a, SHADE_BLACK, SHADE_DARK, SHADE_LIGHT, SHADE_WHITE ldh [rOBP0], a ldh [rOBP1], a call UpdateGBCPal_OBP0 diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index c4e81816..9e5ee19f 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -231,7 +231,7 @@ FreezeBurnParalyzeEffect: ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr .next1 .asm_3f2c7 - cp a, PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those + cp PARALYZE_SIDE_EFFECT1 + 1 ; 10% status effects are 04, 05, 06 so 07 will set carry for those ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr c, .next1 ; branch ahead if this is a 10% chance effect.. ld b, $4d ; else use 0x4D/0x100 or 77/256 = 30.1%~ chance @@ -293,7 +293,7 @@ FreezeBurnParalyzeEffect: ld b, $1a ; 0x1A/0x100 or 26/256 = 10.2%~ chance jr .next2 .asm_3f341 - cp a, PARALYZE_SIDE_EFFECT1 + 1 + cp PARALYZE_SIDE_EFFECT1 + 1 ld b, $1a jr c, .next2 ld b, $4d |