diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:47:36 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:47:36 -0500 |
| commit | 62f64aa793c25b96109a5bf9c1fdf57257f4524f (patch) | |
| tree | 307167c2c752535f66c397707a5ef44726b499f5 /engine/overworld | |
| parent | 4efb3e307cd6b4bf267ab0d509f8e5ab498f798e (diff) | |
Define OAM_HIGH_PALS for %100 in OAM attributes
Diffstat (limited to 'engine/overworld')
| -rwxr-xr-x | engine/overworld/cut.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index e36b8d88..564ad65a 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -124,8 +124,8 @@ WriteCutOrBoulderDustAnimationOAMBlock: jp WriteOAMBlock CutOrBoulderDustAnimationTilesAndAttributes: - dbsprite 2, -1, 4, 4, $fd, OAM_OBP1 | %100 - dbsprite 2, -1, 4, 6, $ff, OAM_OBP1 | %100 + dbsprite 2, -1, 4, 4, $fd, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 2, -1, 4, 6, $ff, OAM_OBP1 | OAM_HIGH_PALS GetCutOrBoulderDustAnimationOffsets: ld hl, wSpritePlayerStateData1YPixels diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 84891353..a081811b 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -65,14 +65,14 @@ PokeCenterFlashingMonitorAndHealBall: PokeCenterOAMData: ; heal machine monitor - dbsprite 6, 4, 4, 4, $7c, OAM_OBP1 | %100 + dbsprite 6, 4, 4, 4, $7c, OAM_OBP1 | OAM_HIGH_PALS ; poke balls 1-6 - dbsprite 6, 5, 0, 3, $7d, OAM_OBP1 | %100 - dbsprite 7, 5, 0, 3, $7d, OAM_OBP1 | OAM_HFLIP | %100 - dbsprite 6, 6, 0, 0, $7d, OAM_OBP1 | %100 - dbsprite 7, 6, 0, 0, $7d, OAM_OBP1 | OAM_HFLIP | %100 - dbsprite 6, 6, 0, 5, $7d, OAM_OBP1 | %100 - dbsprite 7, 6, 0, 5, $7d, OAM_OBP1 | OAM_HFLIP | %100 + dbsprite 6, 5, 0, 3, $7d, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 7, 5, 0, 3, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP + dbsprite 6, 6, 0, 0, $7d, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 7, 6, 0, 0, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP + dbsprite 6, 6, 0, 5, $7d, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 7, 6, 0, 5, $7d, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP ; d = value to xor with palette FlashSprite8Times: |