diff options
author | entrpntr <entrpntr@gmail.com> | 2020-06-03 15:45:20 -0400 |
---|---|---|
committer | entrpntr <entrpntr@gmail.com> | 2020-06-03 15:50:35 -0400 |
commit | 3ceee7fd9ee3eccbe86652e24e9896dbeff52302 (patch) | |
tree | 99eb0bee41a457e03336e597915f0e68847c9fd1 /engine/gfx/sprite_anims.asm | |
parent | 4dd118c2a75c8ee789daacaacd304567a014a8d7 (diff) |
Fill out oam.asm, final cleanups for now.
Diffstat (limited to 'engine/gfx/sprite_anims.asm')
-rwxr-xr-x | engine/gfx/sprite_anims.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index a648d461..a6e717e8 100755 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -20,8 +20,8 @@ DoAnimFrame: dw .GSIntroBubble dw .GSIntroShellder dw .GSIntroMagikarp - dw .UnusedLapras dw .GSIntroLapras + dw .GSIntroLapras2 dw .GSIntroNote dw .GSIntroJigglypuff dw .GSIntroPikachu @@ -227,7 +227,7 @@ DoAnimFrame: call DeinitializeSprite ret -.UnusedLapras +.GSIntroLapras ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -251,7 +251,7 @@ DoAnimFrame: call DeinitializeSprite ret -.GSIntroLapras +.GSIntroLapras2 call .AnonymousJumptable jp hl @@ -871,10 +871,10 @@ ENDC ret .Data_8d8b4 - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_4 - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_5 - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_4 - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_6 + db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU + db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_2 + db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU + db SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_3 .UnusedPikachuTail farcall ret_e0000 |