diff --git a/src/data/map_ow_framesets.asm b/src/data/map_ow_framesets.asm index 9c1f4b3..a86fb8a 100644 --- a/src/data/map_ow_framesets.asm +++ b/src/data/map_ow_framesets.asm @@ -11,6 +11,12 @@ INCLUDE "data/map_ow_frameset_pointers.asm" +MACRO ow_frameset + db \2 - \1 + db \3 - \1 + db \4 - \1 +ENDM + ; OW_FRAME_STRUCT (see constants/animation_constants.asm) ; \1 = duration ; \2 = VRAM tile offset @@ -26,23 +32,28 @@ MACRO ow_frame ENDM DefaultOWFrameset: - db $3, $3, $3 + ow_frameset DefaultOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 +.subgroup_2 +.subgroup_3 db -1 ; end OverworldMapOWFrameset: - db $3, $33, $33 - + ow_frameset OverworldMapOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 7, $f3, 0, OverworldMapTiles, $73 ow_frame 7, $f4, 0, OverworldMapTiles, $74 ow_frame 7, $f3, 0, OverworldMapTiles, $74 ow_frame 7, $f4, 0, OverworldMapTiles, $75 ow_frame 7, $f3, 0, OverworldMapTiles, $75 ow_frame 7, $f4, 0, OverworldMapTiles, $73 +.subgroup_2 +.subgroup_3 db -1 ; end OverworldMapCGBOWFrameset: - db $3, $ab, $ab - + ow_frameset OverworldMapCGBOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 4, $f3, 0, OverworldMapTiles, $73 ow_frame 4, $f4, 0, OverworldMapTiles, $74 ow_frame 4, $18, 1, OverworldMapTiles, $98 @@ -64,11 +75,13 @@ OverworldMapCGBOWFrameset: ow_frame 0, $1a, 1, OverworldMapTiles, $a4 ow_frame 0, $1b, 1, OverworldMapTiles, $a5 ow_frame 0, $1c, 1, OverworldMapTiles, $a6 +.subgroup_2 +.subgroup_3 db -1 ; end MasonLaboratoryOWFrameset: - db $3, $43, $43 - + ow_frameset MasonLaboratoryOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 3, $dc, 0, MasonLaboratoryTilesetGfx, $5c ow_frame 0, $dd, 0, MasonLaboratoryTilesetGfx, $5d ow_frame 3, $de, 0, MasonLaboratoryTilesetGfx, $5e @@ -77,11 +90,13 @@ MasonLaboratoryOWFrameset: ow_frame 0, $dd, 0, MasonLaboratoryTilesetGfx, $61 ow_frame 3, $de, 0, MasonLaboratoryTilesetGfx, $62 ow_frame 0, $df, 0, MasonLaboratoryTilesetGfx, $63 +.subgroup_2 +.subgroup_3 db -1 ; end DeckMachineRoomOWFrameset: - db $3, $83, $83 - + ow_frameset DeckMachineRoomOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 3, $dc, 0, MasonLaboratoryTilesetGfx, $5c ow_frame 0, $dd, 0, MasonLaboratoryTilesetGfx, $5d ow_frame 3, $de, 0, MasonLaboratoryTilesetGfx, $5e @@ -98,11 +113,13 @@ DeckMachineRoomOWFrameset: ow_frame 0, $e5, 0, MasonLaboratoryTilesetGfx, $69 ow_frame 0, $e6, 0, MasonLaboratoryTilesetGfx, $6a ow_frame 0, $e7, 0, MasonLaboratoryTilesetGfx, $6b +.subgroup_2 +.subgroup_3 db -1 ; end DeckMachineRoomCGBOWFrameset: - db $3, $83, $83 - + ow_frameset DeckMachineRoomCGBOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 3, $dc, 0, MasonLaboratoryTilesetGfx, $5c ow_frame 0, $dd, 0, MasonLaboratoryTilesetGfx, $5d ow_frame 3, $de, 0, MasonLaboratoryTilesetGfx, $5e @@ -119,11 +136,13 @@ DeckMachineRoomCGBOWFrameset: ow_frame 0, $04, 1, MasonLaboratoryTilesetGfx, $88 ow_frame 0, $05, 1, MasonLaboratoryTilesetGfx, $89 ow_frame 0, $06, 1, MasonLaboratoryTilesetGfx, $8a +.subgroup_2 +.subgroup_3 db -1 ; end FireClubOWFrameset: - db $3, $83, $83 - + ow_frameset FireClubOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 5, $9f, 0, FireClubTilesetGfx, $1f ow_frame 0, $a0, 0, FireClubTilesetGfx, $20 ow_frame 0, $a1, 0, FireClubTilesetGfx, $21 @@ -140,11 +159,13 @@ FireClubOWFrameset: ow_frame 0, $a4, 0, FireClubTilesetGfx, $2c ow_frame 0, $a5, 0, FireClubTilesetGfx, $2d ow_frame 0, $a6, 0, FireClubTilesetGfx, $2e +.subgroup_2 +.subgroup_3 db -1 ; end FireClubCGBOWFrameset: - db $3, $83, $83 - + ow_frameset FireClubCGBOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 5, $bb, 0, FireClubTilesetGfx, $3b ow_frame 0, $bc, 0, FireClubTilesetGfx, $3c ow_frame 0, $bd, 0, FireClubTilesetGfx, $3d @@ -161,11 +182,13 @@ FireClubCGBOWFrameset: ow_frame 0, $c0, 0, FireClubTilesetGfx, $48 ow_frame 0, $c1, 0, FireClubTilesetGfx, $49 ow_frame 0, $c2, 0, FireClubTilesetGfx, $4a +.subgroup_2 +.subgroup_3 db -1 ; end WaterClubOWFrameset: - db $3, $c3, $c3 - + ow_frameset WaterClubOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 1, $e2, 0, WaterClubTilesetGfx, $62 ow_frame 1, $e3, 0, WaterClubTilesetGfx, $63 ow_frame 3, $e4, 0, WaterClubTilesetGfx, $64 @@ -190,11 +213,13 @@ WaterClubOWFrameset: ow_frame 0, $e5, 0, WaterClubTilesetGfx, $71 ow_frame 3, $e6, 0, WaterClubTilesetGfx, $72 ow_frame 0, $e7, 0, WaterClubTilesetGfx, $73 +.subgroup_2 +.subgroup_3 db -1 ; end LightningClubOWFrameset: - db $3, $c3, $c3 - + ow_frameset LightningClubOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 10, $a2, 0, LightningClubTilesetGfx, $22 ow_frame 0, $a3, 0, LightningClubTilesetGfx, $23 ow_frame 0, $aa, 0, LightningClubTilesetGfx, $2a @@ -219,20 +244,29 @@ LightningClubOWFrameset: ow_frame 0, $a8, 0, LightningClubTilesetGfx, $30 ow_frame 0, $b0, 0, LightningClubTilesetGfx, $28 ow_frame 0, $b1, 0, LightningClubTilesetGfx, $29 +.subgroup_2 +.subgroup_3 db -1 ; end ScienceClubOWFrameset: - db $3, $13, $13 + ow_frameset ScienceClubOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 11, $c7, 0, ScienceClubTilesetGfx, $47 ow_frame 11, $c7, 0, ScienceClubTilesetGfx, $48 +.subgroup_2 +.subgroup_3 db -1 ; end ChallengeHallOWFrameset: - db $3, $3, $3 + ow_frameset ChallengeHallOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 +.subgroup_2 +.subgroup_3 db -1 ; end HallOfHonorOWFrameset: - db $3, $43, $43 + ow_frameset HallOfHonorOWFrameset, .subgroup_1, .subgroup_2, .subgroup_3 +.subgroup_1 ow_frame 11, $a4, 0, HallOfHonorTilesetGfx, $28 ow_frame 0, $a5, 0, HallOfHonorTilesetGfx, $29 ow_frame 0, $a6, 0, HallOfHonorTilesetGfx, $2a @@ -241,4 +275,6 @@ HallOfHonorOWFrameset: ow_frame 0, $a5, 0, HallOfHonorTilesetGfx, $2d ow_frame 0, $a6, 0, HallOfHonorTilesetGfx, $2e ow_frame 0, $a7, 0, HallOfHonorTilesetGfx, $2f +.subgroup_2 +.subgroup_3 db -1 ; end