diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-26 20:33:41 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-26 20:33:41 -0500 |
| commit | b3f0e11567ca84b855c233c0621d18f3aaac8495 (patch) | |
| tree | 6290e30bd2e27eca2d78aa7628341fa7c045222e /event | |
| parent | 82591369114ea1d7723e433c7b9e49a639b4919b (diff) | |
Various cleanup
Diffstat (limited to 'event')
| -rwxr-xr-x | event/heal_machine_anim.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/event/heal_machine_anim.asm b/event/heal_machine_anim.asm index 4f543c0b3..c7789a28d 100755 --- a/event/heal_machine_anim.asm +++ b/event/heal_machine_anim.asm @@ -126,14 +126,14 @@ HealMachineAnim: ; 12324 ; 123dc .PC_ElmsLab_OAM: ; 123dc - dsprite 4, 0, 4, 2, $7c, $16 - dsprite 4, 0, 4, 6, $7c, $16 - dsprite 4, 6, 4, 0, $7d, $16 - dsprite 4, 6, 5, 0, $7d, $36 ; xflip - dsprite 5, 3, 4, 0, $7d, $16 - dsprite 5, 3, 5, 0, $7d, $36 ; xflip - dsprite 6, 0, 4, 0, $7d, $16 - dsprite 6, 0, 5, 0, $7d, $36 ; xflip + dsprite 4, 0, 4, 2, $7c, PAL_OW_TREE | OBP_NUM + dsprite 4, 0, 4, 6, $7c, PAL_OW_TREE | OBP_NUM + dsprite 4, 6, 4, 0, $7d, PAL_OW_TREE | OBP_NUM + dsprite 4, 6, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP + dsprite 5, 3, 4, 0, $7d, PAL_OW_TREE | OBP_NUM + dsprite 5, 3, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP + dsprite 6, 0, 4, 0, $7d, PAL_OW_TREE | OBP_NUM + dsprite 6, 0, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP ; 123fc .HealMachineGFX: ; 123fc @@ -141,12 +141,12 @@ INCBIN "gfx/overworld/heal_machine.2bpp" ; 1241c .HOF_OAM: ; 1241c - dsprite 7, 4, 10, 1, $7d, $16 - dsprite 7, 4, 10, 6, $7d, $16 - dsprite 7, 3, 9, 5, $7d, $16 - dsprite 7, 3, 11, 2, $7d, $16 - dsprite 7, 1, 9, 1, $7d, $16 - dsprite 7, 1, 11, 5, $7d, $16 + dsprite 7, 4, 10, 1, $7d, PAL_OW_TREE | OBP_NUM + dsprite 7, 4, 10, 6, $7d, PAL_OW_TREE | OBP_NUM + dsprite 7, 3, 9, 5, $7d, PAL_OW_TREE | OBP_NUM + dsprite 7, 3, 11, 2, $7d, PAL_OW_TREE | OBP_NUM + dsprite 7, 1, 9, 1, $7d, PAL_OW_TREE | OBP_NUM + dsprite 7, 1, 11, 5, $7d, PAL_OW_TREE | OBP_NUM ; 12434 .LoadPalettes: ; 12434 @@ -158,8 +158,8 @@ INCBIN "gfx/overworld/heal_machine.2bpp" .cgb ld hl, .palettes - ld de, OBPals + 8 * 6 - ld bc, 8 + ld de, OBPals palette PAL_OW_TREE + ld bc, 1 palettes ld a, $5 call FarCopyWRAM ld a, $1 @@ -201,7 +201,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp" ld a, $5 ld [rSVBK], a - ld hl, OBPals + 8 * 6 + ld hl, OBPals palette PAL_OW_TREE ld a, [hli] ld e, a ld a, [hli] |