diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/overworld/healing_machine.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/overworld/healing_machine.asm')
| -rw-r--r-- | engine/overworld/healing_machine.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index dfc6b97b..5cf312ac 100644 --- 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 | OAM_HIGH_PALS + dbsprite 6, 4, 4, 4, $7c, OAM_PAL1 | OAM_HIGH_PALS ; poke balls 1-6 - 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 + dbsprite 6, 5, 0, 3, $7d, OAM_PAL1 | OAM_HIGH_PALS + dbsprite 7, 5, 0, 3, $7d, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP + dbsprite 6, 6, 0, 0, $7d, OAM_PAL1 | OAM_HIGH_PALS + dbsprite 7, 6, 0, 0, $7d, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP + dbsprite 6, 6, 0, 5, $7d, OAM_PAL1 | OAM_HIGH_PALS + dbsprite 7, 6, 0, 5, $7d, OAM_PAL1 | OAM_HIGH_PALS | OAM_XFLIP ; d = value to xor with palette FlashSprite8Times: |