diff options
| -rw-r--r-- | gfx/pics/frame_pointers.asm | 1 | ||||
| -rw-r--r-- | gfx/pics/unown_frame_pointers.asm | 2 | ||||
| -rw-r--r-- | main.asm | 23 |
3 files changed, 11 insertions, 15 deletions
diff --git a/gfx/pics/frame_pointers.asm b/gfx/pics/frame_pointers.asm index a5b595b0e..cff10ef33 100644 --- a/gfx/pics/frame_pointers.asm +++ b/gfx/pics/frame_pointers.asm @@ -1,3 +1,4 @@ +FramesPointers: dw BulbasaurFrames dw IvysaurFrames dw VenusaurFrames diff --git a/gfx/pics/unown_frame_pointers.asm b/gfx/pics/unown_frame_pointers.asm index 156efe7c3..9d3c4b1d4 100644 --- a/gfx/pics/unown_frame_pointers.asm +++ b/gfx/pics/unown_frame_pointers.asm @@ -1,3 +1,4 @@ +UnownFramesPointers: dw UnownAFrames dw UnownBFrames dw UnownCFrames @@ -24,3 +25,4 @@ dw UnownXFrames dw UnownYFrames dw UnownZFrames + @@ -84071,11 +84071,10 @@ INCLUDE "battle/anim_commands.asm" INCLUDE "battle/anim_objects.asm" -; Pic animations I - -SECTION "bank34", ROMX, BANK[$34] +SECTION "Pic Animations 1", ROMX, BANK[$34] ; Pic animations asm + Functiond0000: ; d0000 ld hl, $c4ac ld a, [IsInBattle] @@ -85138,27 +85137,21 @@ UnownBitmasksPointers: INCLUDE "gfx/pics/unown_bitmask_pointers.asm" INCLUDE "gfx/pics/unown_bitmasks.asm" -; Pic animations II +SECTION "Pic Animations 2", ROMX, BANK[$35] -SECTION "bank35", ROMX, BANK[$35] - -; Frame definitions -FramesPointers: INCLUDE "gfx/pics/frame_pointers.asm" -; Inexplicably, Kanto frames are split off from Johto +INCLUDE "gfx/pics/frame_pointers.asm" INCLUDE "gfx/pics/kanto_frames.asm" -; Pic animations III - SECTION "bank36", ROMX, BANK[$36] FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" -; Johto frame definitions -INCLUDE "gfx/pics/johto_frames.asm" -; Unown frame definitions -UnownFramesPointers: INCLUDE "gfx/pics/unown_frame_pointers.asm" +SECTION "Pic Animations 3", ROMX, BANK[$36] + +INCLUDE "gfx/pics/johto_frames.asm" +INCLUDE "gfx/pics/unown_frame_pointers.asm" INCLUDE "gfx/pics/unown_frames.asm" |