diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 15:58:06 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-17 15:58:06 -0400 |
| commit | 76289dfda0b7405944e10a78b7381c723475bea4 (patch) | |
| tree | b3041f6324c7a5b6065a84d94af66ddb098dee2c /engine/overworld/healing_machine.asm | |
| parent | Define constants for subanimations' base coords and frame block modes (diff) | |
| download | pokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.tar.gz pokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.tar.xz pokeyellow-76289dfda0b7405944e10a78b7381c723475bea4.zip | |
Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal
Diffstat (limited to 'engine/overworld/healing_machine.asm')
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index eaa396d0..40ca6f65 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -66,13 +66,15 @@ PokeCenterFlashingMonitorAndHealBall: INCBIN "gfx/overworld/heal_machine.2bpp" PokeCenterOAMData: - db $24,$34,$7C,$10 ; heal machine monitor - db $2B,$30,$7D,$10 ; pokeballs 1-6 - db $2B,$38,$7D,$30 - db $30,$30,$7D,$10 - db $30,$38,$7D,$30 - db $35,$30,$7D,$10 - db $35,$38,$7D,$30 + ; heal machine monitor + dbsprite 6, 4, 4, 4, $7c, OAM_OBP1 + ; poke balls 1-6 + dbsprite 6, 5, 0, 3, $7d, OAM_OBP1 + dbsprite 7, 5, 0, 3, $7d, OAM_OBP1 | OAM_HFLIP + dbsprite 6, 6, 0, 0, $7d, OAM_OBP1 + dbsprite 7, 6, 0, 0, $7d, OAM_OBP1 | OAM_HFLIP + dbsprite 6, 6, 0, 5, $7d, OAM_OBP1 + dbsprite 7, 6, 0, 5, $7d, OAM_OBP1 | OAM_HFLIP ; d = value to xor with palette FlashSprite8Times: |