summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rwxr-xr-xdata/animated_objects_3e_1.asm184
-rw-r--r--data/map_songs.asm2
-rwxr-xr-xdata/mart_inventories.asm42
-rwxr-xr-xdata/mon_palettes.asm2
-rwxr-xr-xdata/mon_party_sprites.asm2
-rwxr-xr-xdata/pikachu_emotions.asm42
-rwxr-xr-xdata/pikachu_pic_animation.asm118
-rwxr-xr-xdata/pikachu_pic_objects.asm593
-rwxr-xr-xdata/pikachu_pic_tilemaps.asm165
-rwxr-xr-xdata/super_rod.asm2
10 files changed, 598 insertions, 554 deletions
diff --git a/data/animated_objects_3e_1.asm b/data/animated_objects_3e_1.asm
index 2461c469..07b17ce5 100755
--- a/data/animated_objects_3e_1.asm
+++ b/data/animated_objects_3e_1.asm
@@ -1,32 +1,32 @@
-Unkn_f9405:
- dw Unkn_f943d
- dw Unkn_f9440
- dw Unkn_f9445
- dw Unkn_f944a
- dw Unkn_f944f
- dw Unkn_f9454
- dw Unkn_f9459
- dw Unkn_f945e
- dw Unkn_f9463
- dw Unkn_f9468
- dw Unkn_f946d
- dw Unkn_f9472
- dw Unkn_f9477
- dw Unkn_f947c
- dw Unkn_f9481
- dw Unkn_f9486
- dw Unkn_f948b
- dw Unkn_f9494
- dw Unkn_f9499
- dw Unkn_f949e
- dw Unkn_f94fb
- dw Unkn_f94a1
- dw Unkn_f94b0
- dw Unkn_f94bf
- dw Unkn_f94ce
- dw Unkn_f94dd
- dw Unkn_f94ec
- dw Unkn_f94fe
+SurfingPikachuFrames:
+ dw Unkn_f943d ; 00
+ dw Unkn_f9440 ; 01
+ dw Unkn_f9445 ; 02
+ dw Unkn_f944a ; 03
+ dw Unkn_f944f ; 04
+ dw Unkn_f9454 ; 05
+ dw Unkn_f9459 ; 06
+ dw Unkn_f945e ; 07
+ dw Unkn_f9463 ; 08
+ dw Unkn_f9468 ; 09
+ dw Unkn_f946d ; 0a
+ dw Unkn_f9472 ; 0b
+ dw Unkn_f9477 ; 0c
+ dw Unkn_f947c ; 0d
+ dw Unkn_f9481 ; 0e
+ dw Unkn_f9486 ; 0f
+ dw Unkn_f948b ; 10
+ dw Unkn_f9494 ; 11
+ dw Unkn_f9499 ; 12
+ dw Unkn_f949e ; 13
+ dw Unkn_f94fb ; 14
+ dw Unkn_f94a1 ; 15
+ dw Unkn_f94b0 ; 16
+ dw Unkn_f94bf ; 17
+ dw Unkn_f94ce ; 18
+ dw Unkn_f94dd ; 19
+ dw Unkn_f94ec ; 1a
+ dw Unkn_f94fe ; 1b
Unkn_f943d:
frame $00, 32
@@ -199,49 +199,66 @@ Unkn_f94fe:
frame $23, 7
dorestart
-Unkn_f9507:
- dbw $00, Unkn_f9573
- dbw $00, Unkn_f9578
- dbw $36, Unkn_f9578
- dbw $03, Unkn_f9578
- dbw $39, Unkn_f9578
- dbw $06, Unkn_f9578
- dbw $3c, Unkn_f9578
- dbw $09, Unkn_f9578
- dbw $60, Unkn_f9578
- dbw $0c, Unkn_f9578
- dbw $63, Unkn_f9578
- dbw $30, Unkn_f9578
- dbw $66, Unkn_f9578
- dbw $33, Unkn_f9578
- dbw $69, Unkn_f9578
- dbw $6c, Unkn_f9578
- dbw $9c, Unkn_f9578
- dbw $a0, Unkn_f9578
- dbw $a3, Unkn_f9578
- dbw $a7, Unkn_f95db
- dbw $a8, Unkn_f95f4
- dbw $98, Unkn_f9625
- dbw $e0, Unkn_f959d
- dbw $e6, Unkn_f959d
- dbw $ca, Unkn_f959d
- dbw $a7, Unkn_f95ce
- dbw $00, Unkn_f9632
- dbw $00, Unkn_f963f
- dbw $00, Unkn_f9650
- dbw $00, Unkn_f9661
- dbw $00, Unkn_f9672
- dbw $00, Unkn_f9683
- dbw $80, Unkn_f9694
- dbw $84, Unkn_f9694
- dbw $88, Unkn_f9694
- dbw $8c, Unkn_f9694
-
-Unkn_f9573:
+SurfingPikachuOAMData:
+ dbw $00, .Frame0
+ dbw $00, .Frame1
+ dbw $36, .Frame2
+ dbw $03, .Frame3
+ dbw $39, .Frame4
+ dbw $06, .Frame5
+ dbw $3c, .Frame6
+ dbw $09, .Frame7
+ dbw $60, .Frame8
+ dbw $0c, .Frame9
+ dbw $63, .Frame10
+ dbw $30, .Frame11
+ dbw $66, .Frame12
+ dbw $33, .Frame13
+ dbw $69, .Frame14
+ dbw $6c, .Frame15
+ dbw $9c, .Frame16
+ dbw $a0, .Frame17
+ dbw $a3, .Frame18
+ dbw $a7, .Frame19
+ dbw $a8, .Frame20
+ dbw $98, .Frame21
+ dbw $e0, .Frame22
+ dbw $e6, .Frame23
+ dbw $ca, .Frame24
+ dbw $a7, .Frame25
+ dbw $00, .Frame26
+ dbw $00, .Frame27
+ dbw $00, .Frame28
+ dbw $00, .Frame29
+ dbw $00, .Frame30
+ dbw $00, .Frame31
+ dbw $80, .Frame32
+ dbw $84, .Frame33
+ dbw $88, .Frame34
+ dbw $8c, .Frame35
+
+.Frame0:
db 1
db $fc, $fc, $00, $00
-Unkn_f9578:
+.Frame1:
+.Frame2:
+.Frame3:
+.Frame4:
+.Frame5:
+.Frame6:
+.Frame7:
+.Frame8:
+.Frame9:
+.Frame10:
+.Frame11:
+.Frame12:
+.Frame13:
+.Frame14:
+.Frame15:
+.Frame16:
+.Frame17:
+.Frame18:
db 9
db $f4, $f4, $00, $00
db $f4, $fc, $01, $00
@@ -253,7 +270,9 @@ Unkn_f9578:
db $04, $fc, $21, $00
db $04, $04, $22, $00
-Unkn_f959d:
+.Frame22:
+.Frame23:
+.Frame24:
db 12
db $f8, $e8, $00, $00
db $f8, $f0, $01, $00
@@ -268,13 +287,13 @@ Unkn_f959d:
db $00, $08, $14, $00
db $00, $10, $15, $00
-Unkn_f95ce:
+.Frame25:
db 3
db $fc, $0b, $00, $10
db $04, $03, $0f, $10
db $04, $0b, $10, $10
-Unkn_f95db:
+.Frame19:
db 6
db $fc, $f0, $00, $30
db $fc, $08, $00, $10
@@ -283,7 +302,7 @@ Unkn_f95db:
db $04, $00, $0f, $10
db $04, $08, $10, $10
-Unkn_f95f4:
+.Frame20:
db 12
db $f4, $f0, $00, $10
db $f4, $f8, $01, $10
@@ -298,54 +317,57 @@ Unkn_f95f4:
db $04, $00, $21, $30
db $04, $08, $20, $30
-Unkn_f9625:
+.Frame21:
db 3
db $04, $f4, $00, $00
db $04, $fc, $01, $00
db $04, $04, $02, $00
-Unkn_f9632:
+.Frame26:
db 3
db $fc, $f4, $bf, $00
db $fc, $fc, $d5, $00
db $fc, $04, $d0, $00
-Unkn_f963f:
+.Frame27:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d1, $00
db $fc, $00, $d5, $00
db $fc, $08, $d0, $00
-Unkn_f9650:
+.Frame28:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d3, $00
db $fc, $00, $d5, $00
db $fc, $08, $d0, $00
-Unkn_f9661:
+.Frame29:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d7, $00
db $fc, $00, $d5, $00
db $fc, $08, $d0, $00
-Unkn_f9672:
+.Frame30:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d1, $00
db $fc, $00, $d8, $00
db $fc, $08, $d0, $00
-Unkn_f9683:
+.Frame31:
db 4
db $fc, $f0, $bf, $00
db $fc, $f8, $d5, $00
db $fc, $00, $d0, $00
db $fc, $08, $d0, $00
-Unkn_f9694:
+.Frame32:
+.Frame33:
+.Frame34:
+.Frame35:
db 12
db $f4, $f0, $03, $20
db $f4, $f8, $02, $20
diff --git a/data/map_songs.asm b/data/map_songs.asm
index b65822e7..b7f50c93 100644
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -247,4 +247,4 @@ MapSongBanks: ; fc000 (3f:4000)
db MUSIC_GYM, BANK(Music_Gym) ; Lorelei
db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
- db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse \ No newline at end of file
+ db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm
index 498d48d2..964f7179 100755
--- a/data/mart_inventories.asm
+++ b/data/mart_inventories.asm
@@ -4,72 +4,62 @@
; Viridian
ViridianMartText6:: ; 233b (0:233b)
- db $FE,5,POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF
+ TX_MART POKE_BALL, POTION, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
; Pewter
PewterMartText1:: ; 2343 (0:2343)
- db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING
- db PARLYZ_HEAL,$FF
+ TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
; Cerulean
CeruleanMartText1:: ; 234d (0:234d)
- db $FE,8,POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING
- db PARLYZ_HEAL,$FF
+ TX_MART POKE_BALL, POTION, ESCAPE_ROPE, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
; Bike shop ; 2358 (0:2358)
- db $FE,1,BICYCLE,$FF
+ TX_MART BICYCLE
; Vermilion
VermilionMartText1:: ; 235c (0:235c)
- db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL
- db REPEL,$FF
+ TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
; Lavender
LavenderMartText1:: ; 2365 (0:2365)
- db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL
- db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF
+ TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
; Celadon Dept. Store 2F (1)
CeladonMart2Text1:: ; 2371 (0:2371)
- db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE
- db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF
+ TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
; Celadon Dept. Store 2F (2)
CeladonMart2Text2:: ; 237d (0:237d)
- db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF
+ TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
; Celadon Dept. Store 4F
CeladonMart4Text1:: ; 2389 (0:2389)
- db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF
+ TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
; Celadon Dept. Store 5F (1)
CeladonMart5Text3:: ; 2391 (0:2391)
- db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED
- db X_SPECIAL,$FF
+ TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
; Celadon Dept. Store 5F (2)
CeladonMart5Text4:: ; 239b (0:239b)
- db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF
+ TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
; Fuchsia
FuchsiaMartText1:: ; 23a3 (0:23a3)
- db $FE,6,ULTRA_BALL,GREAT_BALL,HYPER_POTION,REVIVE,FULL_HEAL
- db SUPER_REPEL,$FF
+ TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
; unused? 23ac (0:23ac)
- db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF
+ TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
; Cinnabar
CinnabarMartText1:: ; 23b4 (0:23b4)
- db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE
- db FULL_HEAL,REVIVE,$FF
+ TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
; Saffron
SaffronMartText1:: ; 23be (0:23be)
- db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL
- db REVIVE,$FF
+ TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
; Indigo
IndigoPlateauLobbyText4:: ; 23c7 (0:23c7)
- db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL
- db REVIVE,MAX_REPEL,$FF
+ TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
diff --git a/data/mon_palettes.asm b/data/mon_palettes.asm
index b271aa5a..5980e22e 100755
--- a/data/mon_palettes.asm
+++ b/data/mon_palettes.asm
@@ -151,4 +151,4 @@ MonsterPalettes: ; 72921 (1c:6921)
db PAL_BROWNMON ; DRAGONITE
db PAL_MEWMON ; MEWTWO
db PAL_MEWMON ; MEW
-; 1c:69b9 \ No newline at end of file
+; 1c:69b9
diff --git a/data/mon_party_sprites.asm b/data/mon_party_sprites.asm
index 017c8d7c..2f45619c 100755
--- a/data/mon_party_sprites.asm
+++ b/data/mon_party_sprites.asm
@@ -85,4 +85,4 @@ MonPartyData: ; 719ba (1c:59ba)
dn SPRITE_BIRD_M, SPRITE_BIRD_M ;Zapdos/Moltres
dn SPRITE_SNAKE, SPRITE_SNAKE ;Dratini/Dragonair
dn SPRITE_SNAKE, SPRITE_MON ;Dragonite/Mewtwo
- dn SPRITE_MON, 0 ;Mew/Padding \ No newline at end of file
+ dn SPRITE_MON, 0 ;Mew/Padding
diff --git a/data/pikachu_emotions.asm b/data/pikachu_emotions.asm
index 0fe51be8..cb90a4e6 100755
--- a/data/pikachu_emotions.asm
+++ b/data/pikachu_emotions.asm
@@ -223,44 +223,44 @@ PikachuEmotion32: ; fd213 (3f:5213)
PikachuMovementData_fd218: ; fd218 (3f:5218)
db $00
- db $39, $01
- db $3e, $1e
+ db $39, 2 - 1
+ db $3e, 31 - 1
db $3f
PikachuMovementData_fd21e: ; fd21e (3f:521e)
db $00
- db $39, $00
- db $3e, $1e
+ db $39, 1 - 1
+ db $3e, 31 - 1
db $3f
PikachuMovementData_fd224: ; fd224 (3f:5224)
db $00
- db $3c, $07, $2f
- db $3c, $07, $2f
+ db $3c, 8 - 1, (2 << 4) | (16 - 1)
+ db $3c, 8 - 1, (2 << 4) | (16 - 1)
db $3f
PikachuMovementData_fd22c: ; fd22c (3f:522c)
- db $3b, $1f, $03
+ db $3b, 32 - 1, 4 - 1
db $3f
PikachuMovementData_fd230: ; fd230 (3f:5230)
db $00
- db $3c, $0f, $1f
- db $3c, $0f, $1f
+ db $3c, 16 - 1, (1 << 4) | (16 - 1)
+ db $3c, 16 - 1, (1 << 4) | (16 - 1)
db $3f
PikachuMovementData_fd238: ; fd238 (3f:5238)
db $00
- db $05, $07
- db $39, $00
- db $05, $07
- db $06, $07
- db $39, $00
- db $06, $07
- db $08, $07
- db $39, $00
- db $08, $07
- db $07, $07
- db $39, $00
- db $07, $07
+ db $05, 8 - 1
+ db $39, 1 - 1
+ db $05, 8 - 1
+ db $06, 8 - 1
+ db $39, 1 - 1
+ db $06, 8 - 1
+ db $08, 8 - 1
+ db $39, 1 - 1
+ db $08, 8 - 1
+ db $07, 8 - 1
+ db $39, 1 - 1
+ db $07, 8 - 1
db $3f
diff --git a/data/pikachu_pic_animation.asm b/data/pikachu_pic_animation.asm
index e54a4399..85e67ecb 100755
--- a/data/pikachu_pic_animation.asm
+++ b/data/pikachu_pic_animation.asm
@@ -25,9 +25,9 @@ Data_fe26b: ; fe26b (3f:626b)
pikapic_loadgfx Pic_e4000
pikapic_loadgfx Pic_e49d1
pikapic_loadgfx PikachuSprite
- pikapic_object $1, $80, $0, $0
- pikapic_object $2, $b2, $5, $5
- pikapic_object $3, $b6, $5, $5
+ pikapic_animation PikaPicAnimBGFrames_1, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_2, $b2, $5, $5
+ pikapic_animation PikaPicAnimBGFrames_3, $b6, $5, $5
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -38,8 +38,8 @@ PikaPicAnimScript29: ; fe28a (3f:628a)
pikapic_setduration 40
pikapic_loadgfx Pic_e4000
pikapic_loadgfx GFX_e40cc
- pikapic_object $4, $80, $0, $0
- pikapic_object $6, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_6, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry3
pikapic_looptofinish
@@ -48,8 +48,8 @@ PikaPicAnimScript2: ; fe2a4 (3f:62a4)
pikapic_setduration 44
pikapic_loadgfx Pic_e411c
pikapic_loadgfx GFX_e41d2
- pikapic_object $4, $80, $0, $0
- pikapic_object $7, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_7, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -58,8 +58,8 @@ PikaPicAnimScript3: ; fe2be (3f:62be)
pikapic_setduration 80
pikapic_loadgfx Pic_e4272
pikapic_loadgfx GFX_e4323
- pikapic_object $4, $80, $0, $0
- pikapic_object $8, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_8, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -68,8 +68,8 @@ PikaPicAnimScript4: ; fe2d8 (3f:62d8)
pikapic_setduration 70
pikapic_loadgfx Pic_e4383
pikapic_loadgfx GFX_e444b
- pikapic_object $4, $80, $0, $0
- pikapic_object $9, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_9, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -78,8 +78,8 @@ PikaPicAnimScript5: ; fe2f2 (3f:62f2)
pikapic_setduration 32
pikapic_loadgfx Pic_e458b
pikapic_loadgfx GFX_e463b
- pikapic_object $4, $80, $0, $0
- pikapic_object $a, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_10, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -88,8 +88,8 @@ PikaPicAnimScript6: ; fe30c (3f:630c)
pikapic_setduration 50
pikapic_loadgfx Pic_e467b
pikapic_loadgfx GFX_e472e
- pikapic_object $4, $80, $0, $0
- pikapic_object $b, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_11, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry38
pikapic_looptofinish
@@ -98,8 +98,8 @@ PikaPicAnimScript7: ; fe326 (3f:6326)
pikapic_setduration 58
pikapic_loadgfx Pic_e476e
pikapic_loadgfx GFX_e4841
- pikapic_object $4, $80, $0, $0
- pikapic_object $c, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_12, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -108,8 +108,8 @@ PikaPicAnimScript8: ; fe340 (3f:6340)
pikapic_setduration 44
pikapic_loadgfx Pic_e49d1
pikapic_loadgfx GFX_e4a99
- pikapic_object $4, $80, $0, $0
- pikapic_object $d, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_13, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -118,8 +118,8 @@ PikaPicAnimScript9: ; fe35a (3f:635a)
pikapic_setduration 56
pikapic_loadgfx Pic_e4b39
pikapic_loadgfx GFX_e4bde
- pikapic_object $4, $80, $0, $0
- pikapic_object $e, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_14, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -129,8 +129,8 @@ PikaPicAnimScript10: ; fe374 (3f:6374)
pikapic_loadgfx Pic_e4c3e
pikapic_loadgfx GFX_e4ce0
pikapic_loadgfx GFX_e4e70
- pikapic_object $4, $80, $0, $0
- pikapic_object $10, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_16, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -139,8 +139,8 @@ PikaPicAnimScript11: ; fe390 (3f:6390)
pikapic_setduration 100
pikapic_loadgfx Pic_e5000
pikapic_loadgfx GFX_e50af
- pikapic_object $4, $80, $0, $0
- pikapic_object $11, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_17, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -149,8 +149,8 @@ PikaPicAnimScript12: ; fe3aa (3f:63aa)
pikapic_setduration 50
pikapic_loadgfx Pic_e523f
pikapic_loadgfx GFX_e52fe
- pikapic_object $4, $80, $0, $0
- pikapic_object $12, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_18, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry25
pikapic_looptofinish
@@ -159,8 +159,8 @@ PikaPicAnimScript13: ; fe3c4 (3f:63c4)
pikapic_setduration 50
pikapic_loadgfx Pic_e548e
pikapic_loadgfx GFX_e5541
- pikapic_object $4, $80, $0, $0
- pikapic_object $13, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_19, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -169,8 +169,8 @@ PikaPicAnimScript14: ; fe3de (3f:63de)
pikapic_setduration 40
pikapic_loadgfx Pic_e56d1
pikapic_loadgfx GFX_e5794
- pikapic_object $4, $80, $0, $0
- pikapic_object $14, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_20, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -179,8 +179,8 @@ PikaPicAnimScript15: ; fe3f8 (3f:63f8)
pikapic_setduration 50
pikapic_loadgfx Pic_e5924
pikapic_loadgfx GFX_e59ed
- pikapic_object $4, $80, $0, $0
- pikapic_object $15, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_21, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -189,8 +189,8 @@ PikaPicAnimScript16: ; fe412 (3f:6412)
pikapic_setduration 32
pikapic_loadgfx Pic_e5b7d
pikapic_loadgfx GFX_e5c4d
- pikapic_object $4, $80, $0, $0
- pikapic_object $16, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_22, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -199,8 +199,8 @@ PikaPicAnimScript17: ; fe42c (3f:642c)
pikapic_setduration 100
pikapic_loadgfx Pic_e5ddd
pikapic_loadgfx GFX_e5e90
- pikapic_object $4, $80, $0, $0
- pikapic_object $17, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_23, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -209,8 +209,8 @@ PikaPicAnimScript18: ; fe446 (3f:6446)
pikapic_setduration 32
pikapic_loadgfx GFX_e6020
pikapic_loadgfx GFX_e61b0
- pikapic_object $5, $80, $0, $0
- pikapic_object $18, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_24, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry18
pikapic_looptofinish
@@ -219,8 +219,8 @@ PikaPicAnimScript19: ; fe460 (3f:6460)
pikapic_setduration 44
pikapic_loadgfx Pic_e6340
pikapic_loadgfx GFX_e63f7
- pikapic_object $4, $80, $0, $0
- pikapic_object $19, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_25, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -229,8 +229,8 @@ PikaPicAnimScript20: ; fe47a (3f:647a)
pikapic_setduration 50
pikapic_loadgfx Pic_e6587
pikapic_loadgfx GFX_e6646
- pikapic_object $4, $80, $0, $0
- pikapic_object $1a, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_26, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -242,8 +242,8 @@ PikaPicAnimScript21: ; fe494 (3f:6494)
pikapic_loadgfx GFX_e69bf
pikapic_loadgfx GFX_e6b4f
pikapic_loadgfx GFX_e6cdf
- pikapic_object $4, $80, $0, $0
- pikapic_object $1b, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_27, $99, $0, $0
pikapic_waitbgmap
pikapic_cry PikachuCry20
pikapic_looptofinish
@@ -252,8 +252,8 @@ PikaPicAnimScript22: ; fe4b4 (3f:64b4)
pikapic_setduration 40
pikapic_loadgfx GFX_e6e6f
pikapic_loadgfx GFX_e6fff
- pikapic_object $5, $80, $0, $0
- pikapic_object $1c, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_28, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -262,8 +262,8 @@ PikaPicAnimScript23: ; fe4ce (3f:64ce)
pikapic_setduration 70
pikapic_loadgfx GFX_e718f
pikapic_loadgfx GFX_e731f
- pikapic_object $5, $80, $0, $0
- pikapic_object $1d, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_29, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -272,8 +272,8 @@ PikaPicAnimScript24: ; fe4e8 (3f:64e8)
pikapic_setduration 60
pikapic_loadgfx GFX_e74af
pikapic_loadgfx GFX_e763f
- pikapic_object $5, $80, $0, $0
- pikapic_object $1e, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_5, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_30, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -283,8 +283,8 @@ PikaPicAnimScript25: ; fe502 (3f:6502)
pikapic_loadgfx Pic_e77cf
pikapic_loadgfx GFX_e7863
pikapic_loadgfx GFX_e79f3
- pikapic_object $4, $80, $0, $0
- pikapic_object $1f, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_31, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_writebyte 13
@@ -300,8 +300,8 @@ PikaPicAnimScript26: ; fe520 (3f:6520)
pikapic_loadgfx GFX_e50af
pikapic_loadgfx GFX_e7b83
pikapic_loadgfx GFX_e7d13
- pikapic_object $4, $80, $0, $0
- pikapic_object $20, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_32, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -310,8 +310,8 @@ PikaPicAnimScript27: ; fe53e (3f:653e)
pikapic_setduration 30
pikapic_loadgfx Pic_f0abf
pikapic_loadgfx GFX_f0b64
- pikapic_object $4, $80, $0, $0
- pikapic_object $21, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_33, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
@@ -320,8 +320,8 @@ PikaPicAnimScript28: ; fe558 (3f:6558)
pikapic_setduration 64
pikapic_loadgfx Pic_f0cf4
pikapic_loadgfx GFX_f0d82
- pikapic_object $4, $80, $0, $0
- pikapic_object $22, $99, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_4, $80, $0, $0
+ pikapic_animation PikaPicAnimBGFrames_34, $99, $0, $0
pikapic_waitbgmap
pikapic_cry
pikapic_looptofinish
diff --git a/data/pikachu_pic_objects.asm b/data/pikachu_pic_objects.asm
index e696f9e1..940c1141 100755
--- a/data/pikachu_pic_objects.asm
+++ b/data/pikachu_pic_objects.asm
@@ -1,293 +1,300 @@
-PikaPicAnimOAMPointers:
- dw Data_fdc11
- dw Data_fdc11
- dw Data_fdc29
- dw Data_fdc32
- dw Data_fdc3b
- dw Data_fdc3e
- dw Data_fdc41
- dw Data_fdc50
- dw Data_fdc61
- dw Data_fdc6e
- dw Data_fdc77
- dw Data_fdc84
- dw Data_fdc8d
- dw Data_fdc98
- dw Data_fdca5
- dw Data_fdcb2
- dw Data_fdcb7
- dw Data_fdcc2
- dw Data_fdccb
- dw Data_fdcd4
- dw Data_fdcdf
- dw Data_fdce8
- dw Data_fdcf1
- dw Data_fdcf6
- dw Data_fdd01
- dw Data_fdd0a
- dw Data_fdd13
- dw Data_fdd1c
- dw Data_fdd27
- dw Data_fdd2c
- dw Data_fdd35
- dw Data_fdd40
- dw Data_fdd47
- dw Data_fdd54
- dw Data_fdd59
- dw Data_fdc3b
-
-Data_fdc11:
- db $01, $14
- db $07, $02
- db $01, $01
- db $07, $02
- db $01, $01
- db $07, $08
- db $e0
-
-Data_fdc1e:
- db $02, $02
- db $01, $01
- db $02, $02
- db $01, $01
- db $02, $08
- db $e0
-
-Data_fdc29:
- db $00, $08
- db $08, $08
- db $00, $08
- db $08, $08
- db $e0
-
-Data_fdc32:
- db $08, $08
- db $00, $08
- db $08, $08
- db $00, $08
- db $e0
-
-Data_fdc3b:
- db $01, $00
- db $e0
-
-Data_fdc3e:
- db $09, $00
- db $e0
-
-Data_fdc41:
- db $00, $02
- db $0e, $04
- db $00, $08
- db $0e, $04
- db $00, $40
- db $0e, $04
- db $00, $40
- db $e0
-
-Data_fdc50:
- db $00, $04
- db $0f, $04
- db $00, $04
- db $0f, $04
- db $00, $08
- db $0f, $04
- db $00, $08
- db $0f, $04
- db $e0
-
-Data_fdc61:
- db $10, $01
- db $00, $01
- db $10, $01
- db $00, $40
- db $10, $01
- db $00, $40
- db $e0
-
-Data_fdc6e:
- db $00, $08
- db $11, $08
- db $00, $14
- db $11, $08
- db $e0
-
-Data_fdc77:
- db $00, $02
- db $12, $02
- db $00, $02
- db $12, $40
- db $00, $03
- db $12, $40
- db $e0
-
-Data_fdc84:
- db $00, $08
- db $13, $40
- db $00, $04
- db $13, $40
- db $e0
-
-Data_fdc8d:
- db $14, $08
- db $00, $02
- db $14, $08
- db $00, $02
- db $14, $08
- db $e0
-
-Data_fdc98:
- db $15, $04
- db $00, $08
- db $15, $04
- db $00, $40
- db $15, $04
- db $00, $40
- db $e0
-
-Data_fdca5:
- db $00, $02
- db $16, $02
- db $00, $02
- db $16, $02
- db $00, $14
- db $16, $02
- db $e0
-
-Data_fdcb2:
- db $00, $08
- db $17, $08
- db $e0
-
-Data_fdcb7:
- db $00, $08
- db $17, $03
- db $18, $05
- db $17, $03
- db $00, $05
- db $e0
-
-Data_fdcc2:
- db $00, $14
- db $19, $08
- db $00, $14
- db $19, $08
- db $e0
-
-Data_fdccb:
- db $00, $0d
- db $1a, $0c
- db $00, $64
- db $1a, $08
- db $e0
-
-Data_fdcd4:
- db $00, $05
- db $1b, $05
- db $00, $05
- db $1b, $05
- db $00, $64
- db $e0
-
-Data_fdcdf:
- db $00, $02
- db $1c, $02
- db $00, $02
- db $1c, $02
- db $e0
-
-Data_fdce8:
- db $00, $05
- db $1d, $05
- db $00, $05
- db $1d, $05
- db $e0
-
-Data_fdcf1:
- db $1e, $08
- db $00, $64
- db $e0
-
-Data_fdcf6:
- db $00, $0a
- db $1f, $03
- db $00, $03
- db $1f, $03
- db $00, $64
- db $e0
-
-Data_fdd01:
- db $00, $03
- db $20, $64
- db $00, $08
- db $20, $08
- db $e0
-
-Data_fdd0a:
- db $21, $06
- db $00, $06
- db $21, $06
- db $00, $06
- db $e0
-
-Data_fdd13:
- db $00, $08
- db $22, $0c
- db $00, $08
- db $22, $0c
- db $e0
-
-Data_fdd1c:
- db $00, $08
- db $09, $02
- db $0a, $01
- db $0b, $01
- db $0c, $64
- db $e0
-
-Data_fdd27:
- db $00, $08
- db $24, $64
- db $e0
-
-Data_fdd2c:
- db $00, $10
- db $25, $10
- db $00, $10
- db $25, $10
- db $e0
-
-Data_fdd35:
- db $00, $06
- db $26, $06
- db $00, $06
- db $26, $06
- db $00, $64
- db $e0
-
-Data_fdd40:
- db $00, $06
- db $09, $06
- db $0a, $64
- db $e0
-
-Data_fdd47:
- db $00, $14
- db $09, $08
- db $00, $14
- db $09, $08
- db $0a, $08
- db $0b, $64
- db $e0
-
-Data_fdd54:
- db $00, $04
- db $09, $64
- db $e0
-
-Data_fdd59:
- db $00, $0c
- db $09, $0c
- db $00, $0c
- db $09, $64
- db $e0
+PikaPicAnimBGFramesPointers:
+pikaanim_def: macro
+\1_id: dw \1
+ endm
+
+ pikaanim_def PikaPicAnimBGFrames_0 ; 00
+ pikaanim_def PikaPicAnimBGFrames_1 ; 01
+ pikaanim_def PikaPicAnimBGFrames_2 ; 02
+ pikaanim_def PikaPicAnimBGFrames_3 ; 03
+ pikaanim_def PikaPicAnimBGFrames_4 ; 04
+ pikaanim_def PikaPicAnimBGFrames_5 ; 05
+ pikaanim_def PikaPicAnimBGFrames_6 ; 06
+ pikaanim_def PikaPicAnimBGFrames_7 ; 07
+ pikaanim_def PikaPicAnimBGFrames_8 ; 08
+ pikaanim_def PikaPicAnimBGFrames_9 ; 09
+ pikaanim_def PikaPicAnimBGFrames_10 ; 0a
+ pikaanim_def PikaPicAnimBGFrames_11 ; 0b
+ pikaanim_def PikaPicAnimBGFrames_12 ; 0c
+ pikaanim_def PikaPicAnimBGFrames_13 ; 0d
+ pikaanim_def PikaPicAnimBGFrames_14 ; 0e
+ pikaanim_def PikaPicAnimBGFrames_15 ; 0f
+ pikaanim_def PikaPicAnimBGFrames_16 ; 10
+ pikaanim_def PikaPicAnimBGFrames_17 ; 11
+ pikaanim_def PikaPicAnimBGFrames_18 ; 12
+ pikaanim_def PikaPicAnimBGFrames_19 ; 13
+ pikaanim_def PikaPicAnimBGFrames_20 ; 14
+ pikaanim_def PikaPicAnimBGFrames_21 ; 15
+ pikaanim_def PikaPicAnimBGFrames_22 ; 16
+ pikaanim_def PikaPicAnimBGFrames_23 ; 17
+ pikaanim_def PikaPicAnimBGFrames_24 ; 18
+ pikaanim_def PikaPicAnimBGFrames_25 ; 19
+ pikaanim_def PikaPicAnimBGFrames_26 ; 1a
+ pikaanim_def PikaPicAnimBGFrames_27 ; 1b
+ pikaanim_def PikaPicAnimBGFrames_28 ; 1c
+ pikaanim_def PikaPicAnimBGFrames_29 ; 1d
+ pikaanim_def PikaPicAnimBGFrames_30 ; 1e
+ pikaanim_def PikaPicAnimBGFrames_31 ; 1f
+ pikaanim_def PikaPicAnimBGFrames_32 ; 20
+ pikaanim_def PikaPicAnimBGFrames_33 ; 21
+ pikaanim_def PikaPicAnimBGFrames_34 ; 22
+ pikaanim_def PikaPicAnimBGFrames_35 ; 23
+
+PikaPicAnimBGFrames_0:
+PikaPicAnimBGFrames_1:
+ ; Tilemap idx, duration
+ pikaframe PikaAnimTilemap_1, 20
+ pikaframe PikaAnimTilemap_7, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_7, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_7, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_fdc1e: ; unreferenced
+ pikaframe PikaAnimTilemap_2, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_2, 2
+ pikaframe PikaAnimTilemap_1, 1
+ pikaframe PikaAnimTilemap_2, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_2:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_3:
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_8, 8
+ pikaframedelay 8
+ pikaframeend
+
+PikaPicAnimBGFrames_4:
+PikaPicAnimBGFrames_35:
+ pikaframe PikaAnimTilemap_1, 0
+ pikaframeend
+
+PikaPicAnimBGFrames_5:
+ pikaframe PikaAnimTilemap_9, 0
+ pikaframeend
+
+PikaPicAnimBGFrames_6:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_14, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_14, 4
+ pikaframedelay 64
+ pikaframe PikaAnimTilemap_14, 4
+ pikaframedelay 64
+ pikaframeend
+
+PikaPicAnimBGFrames_7:
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_15, 4
+ pikaframeend
+
+PikaPicAnimBGFrames_8:
+ pikaframe PikaAnimTilemap_16, 1
+ pikaframedelay 1
+ pikaframe PikaAnimTilemap_16, 1
+ pikaframedelay 64
+ pikaframe PikaAnimTilemap_16, 1
+ pikaframedelay 64
+ pikaframeend
+
+PikaPicAnimBGFrames_9:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_17, 8
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_17, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_10:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_18, 2
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_18, 64
+ pikaframedelay 3
+ pikaframe PikaAnimTilemap_18, 64
+ pikaframeend
+
+PikaPicAnimBGFrames_11:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_19, 64
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_19, 64
+ pikaframeend
+
+PikaPicAnimBGFrames_12:
+ pikaframe PikaAnimTilemap_20, 8
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_20, 8
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_20, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_13:
+ pikaframe PikaAnimTilemap_21, 4
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_21, 4
+ pikaframedelay 64
+ pikaframe PikaAnimTilemap_21, 4
+ pikaframedelay 64
+ pikaframeend
+
+PikaPicAnimBGFrames_14:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_22, 2
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_22, 2
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_22, 2
+ pikaframeend
+
+PikaPicAnimBGFrames_15:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_23, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_16:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_23, 3
+ pikaframe PikaAnimTilemap_24, 5
+ pikaframe PikaAnimTilemap_23, 3
+ pikaframedelay 5
+ pikaframeend
+
+PikaPicAnimBGFrames_17:
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_25, 8
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_25, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_18:
+ pikaframedelay 13
+ pikaframe PikaAnimTilemap_26, 12
+ pikaframedelay 100
+ pikaframe PikaAnimTilemap_26, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_19:
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_27, 5
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_27, 5
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_20:
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_28, 2
+ pikaframedelay 2
+ pikaframe PikaAnimTilemap_28, 2
+ pikaframeend
+
+PikaPicAnimBGFrames_21:
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_29, 5
+ pikaframedelay 5
+ pikaframe PikaAnimTilemap_29, 5
+ pikaframeend
+
+PikaPicAnimBGFrames_22:
+ pikaframe PikaAnimTilemap_30, 8
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_23:
+ pikaframedelay 10
+ pikaframe PikaAnimTilemap_31, 3
+ pikaframedelay 3
+ pikaframe PikaAnimTilemap_31, 3
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_24:
+ pikaframedelay 3
+ pikaframe PikaAnimTilemap_32, 100
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_32, 8
+ pikaframeend
+
+PikaPicAnimBGFrames_25:
+ pikaframe PikaAnimTilemap_33, 6
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_33, 6
+ pikaframedelay 6
+ pikaframeend
+
+PikaPicAnimBGFrames_26:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_34, 12
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_34, 12
+ pikaframeend
+
+PikaPicAnimBGFrames_27:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_9, 2
+ pikaframe PikaAnimTilemap_10, 1
+ pikaframe PikaAnimTilemap_11, 1
+ pikaframe PikaAnimTilemap_12, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_28:
+ pikaframedelay 8
+ pikaframe PikaAnimTilemap_36, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_29:
+ pikaframedelay 16
+ pikaframe PikaAnimTilemap_37, 16
+ pikaframedelay 16
+ pikaframe PikaAnimTilemap_37, 16
+ pikaframeend
+
+PikaPicAnimBGFrames_30:
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_38, 6
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_38, 6
+ pikaframedelay 100
+ pikaframeend
+
+PikaPicAnimBGFrames_31:
+ pikaframedelay 6
+ pikaframe PikaAnimTilemap_9, 6
+ pikaframe PikaAnimTilemap_10, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_32:
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_9, 8
+ pikaframedelay 20
+ pikaframe PikaAnimTilemap_9, 8
+ pikaframe PikaAnimTilemap_10, 8
+ pikaframe PikaAnimTilemap_11, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_33:
+ pikaframedelay 4
+ pikaframe PikaAnimTilemap_9, 100
+ pikaframeend
+
+PikaPicAnimBGFrames_34:
+ pikaframedelay 12
+ pikaframe PikaAnimTilemap_9, 12
+ pikaframedelay 12
+ pikaframe PikaAnimTilemap_9, 100
+ pikaframeend
diff --git a/data/pikachu_pic_tilemaps.asm b/data/pikachu_pic_tilemaps.asm
index 4b28f29d..95882711 100755
--- a/data/pikachu_pic_tilemaps.asm
+++ b/data/pikachu_pic_tilemaps.asm
@@ -1,52 +1,59 @@
PikaPicTilemapPointers:
- dw Data_fde0e
- dw Data_fde0f
- dw Data_fde2a
- dw Data_fde60
- dw Data_fde63
- dw Data_fde67
- dw Data_fde6b
- dw Data_fde45
- dw Data_fde6b
- dw Data_fdfaa
- dw Data_fdfc5
- dw Data_fdfe0
- dw Data_fdffb
- dw Data_fe016
- dw Data_fde81
- dw Data_fde9c
- dw Data_fdeb7
- dw Data_fded2
- dw Data_fdeed
- dw Data_fdf08
- dw Data_fdf23
- dw Data_fdf3e
- dw Data_fdf59
- dw Data_fdf74
- dw Data_fdf8f
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfaa
- dw Data_fdfc5
- dw Data_fdfe0
- dw Data_fde0f
-
-Data_fde0e:
+pikatilemap_def: macro
+\1_id: dw \1
+ endm
+
+ pikatilemap_def PikaAnimTilemap_0
+ pikatilemap_def PikaAnimTilemap_1
+ pikatilemap_def PikaAnimTilemap_2
+ pikatilemap_def PikaAnimTilemap_3
+ pikatilemap_def PikaAnimTilemap_4
+ pikatilemap_def PikaAnimTilemap_5
+ pikatilemap_def PikaAnimTilemap_6
+ pikatilemap_def PikaAnimTilemap_7
+ pikatilemap_def PikaAnimTilemap_8
+ pikatilemap_def PikaAnimTilemap_9
+ pikatilemap_def PikaAnimTilemap_10
+ pikatilemap_def PikaAnimTilemap_11
+ pikatilemap_def PikaAnimTilemap_12
+ pikatilemap_def PikaAnimTilemap_13
+ pikatilemap_def PikaAnimTilemap_14
+ pikatilemap_def PikaAnimTilemap_15
+ pikatilemap_def PikaAnimTilemap_16
+ pikatilemap_def PikaAnimTilemap_17
+ pikatilemap_def PikaAnimTilemap_18
+ pikatilemap_def PikaAnimTilemap_19
+ pikatilemap_def PikaAnimTilemap_20
+ pikatilemap_def PikaAnimTilemap_21
+ pikatilemap_def PikaAnimTilemap_22
+ pikatilemap_def PikaAnimTilemap_23
+ pikatilemap_def PikaAnimTilemap_24
+ pikatilemap_def PikaAnimTilemap_25
+ pikatilemap_def PikaAnimTilemap_26
+ pikatilemap_def PikaAnimTilemap_27
+ pikatilemap_def PikaAnimTilemap_28
+ pikatilemap_def PikaAnimTilemap_29
+ pikatilemap_def PikaAnimTilemap_30
+ pikatilemap_def PikaAnimTilemap_31
+ pikatilemap_def PikaAnimTilemap_32
+ pikatilemap_def PikaAnimTilemap_33
+ pikatilemap_def PikaAnimTilemap_34
+ pikatilemap_def PikaAnimTilemap_35
+ pikatilemap_def PikaAnimTilemap_36
+ pikatilemap_def PikaAnimTilemap_37
+ pikatilemap_def PikaAnimTilemap_38
+ pikatilemap_def PikaAnimTilemap_39
+ pikatilemap_def PikaAnimTilemap_40
+ pikatilemap_def PikaAnimTilemap_41
+ pikatilemap_def PikaAnimTilemap_42
+
+PikaAnimTilemap_0:
db $ff ; unused
-Data_fde0f: ; fde0f
+
+ ; $ff inhibits overwriting that tile
+PikaAnimTilemap_1:
+PikaAnimTilemap_42:
db 5, 5
db $00, $05, $0a, $0f, $14
db $01, $06, $0b, $10, $15
@@ -54,7 +61,7 @@ Data_fde0f: ; fde0f
db $03, $08, $0d, $12, $17
db $04, $09, $0e, $13, $18
-Data_fde2a: ; fde2a
+PikaAnimTilemap_2:
db 5, 5
db $19, $1e, $23, $28, $2d
db $1a, $1f, $24, $29, $2e
@@ -62,7 +69,7 @@ Data_fde2a: ; fde2a
db $1c, $21, $26, $2b, $30
db $1d, $22, $27, $2c, $31
-Data_fde45: ; fde45
+PikaAnimTilemap_7:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
@@ -70,36 +77,37 @@ Data_fde45: ; fde45
db $ff, $21, $26, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
-Data_fde60: ; fde60
+PikaAnimTilemap_3:
db 1, 1
db $00
-Data_fde63: ; fde63
+PikaAnimTilemap_4:
db 2, 1
db $00
db $01
-Data_fde67: ; fde67
+PikaAnimTilemap_5:
db 1, 2
db $00, $01
-Data_fde6b: ; fde6b
+PikaAnimTilemap_6:
+PikaAnimTilemap_8:
db 2, 2
db $00, $01
db $02, $03
-Data_fde71: ; fde71
+PikaAnimTilemap_fde71: ; unused
db 3, 2
db $00, $01
db $02, $03
db $04, $05
-Data_fde79: ; fde79
+PikaAnimTilemap_fde79: ; unused
db 2, 3
db $00, $01, $02
db $03, $04, $05
-Data_fde81: ; fde81
+PikaAnimTilemap_14:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
@@ -107,7 +115,7 @@ Data_fde81: ; fde81
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
-Data_fde9c: ; fde9c
+PikaAnimTilemap_15:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
@@ -115,7 +123,7 @@ Data_fde9c: ; fde9c
db $00, $01, $02, $03, $04
db $05, $06, $07, $08, $09
-Data_fdeb7: ; fdeb7
+PikaAnimTilemap_16:
db 5, 5
db $00, $01, $ff, $ff, $ff
db $02, $03, $ff, $ff, $ff
@@ -123,7 +131,7 @@ Data_fdeb7: ; fdeb7
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
-Data_fded2: ; fded2
+PikaAnimTilemap_17:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $00, $01, $02, $03, $04
@@ -131,7 +139,7 @@ Data_fded2: ; fded2
db $0a, $0b, $0c, $0d, $0e
db $0f, $10, $11, $12, $13
-Data_fdeed: ; fdeed
+PikaAnimTilemap_18:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $00, $01
@@ -139,7 +147,7 @@ Data_fdeed: ; fdeed
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
-Data_fdf08: ; fdf08
+PikaAnimTilemap_19:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
@@ -147,7 +155,7 @@ Data_fdf08: ; fdf08
db $02, $03, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
-Data_fdf23: ; fdf23
+PikaAnimTilemap_20:
db 5, 5
db $00, $01, $02, $03, $04
db $05, $06, $07, $08, $09
@@ -155,7 +163,7 @@ Data_fdf23: ; fdf23
db $0f, $10, $11, $12, $13
db $14, $15, $16, $17, $18
-Data_fdf3e: ; fdf3e
+PikaAnimTilemap_21:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
@@ -163,7 +171,7 @@ Data_fdf3e: ; fdf3e
db $05, $06, $07, $08, $09
db $ff, $ff, $ff, $ff, $ff
-Data_fdf59: ; fdf59
+PikaAnimTilemap_22:
db 5, 5
db $ff, $ff, $ff, $ff, $ff
db $ff, $ff, $ff, $ff, $ff
@@ -171,7 +179,7 @@ Data_fdf59: ; fdf59
db $02, $03, $ff, $ff, $ff
db $04, $05, $ff, $ff, $ff
-Data_fdf74: ; fdf74
+PikaAnimTilemap_23:
db 5, 5
db $00, $01, $02, $03, $04
db $05, $06, $07, $08, $09
@@ -179,7 +187,7 @@ Data_fdf74: ; fdf74
db $0f, $10, $11, $12, $13
db $14, $15, $16, $17, $18
-Data_fdf8f: ; fdf8f
+PikaAnimTilemap_24:
db 5, 5
db $19, $1a, $1b, $1c, $1d
db $1e, $1f, $20, $21, $22
@@ -187,7 +195,22 @@ Data_fdf8f: ; fdf8f
db $28, $29, $2a, $2b, $2c
db $2d, $2e, $2f, $30, $31
-Data_fdfaa: ; fdfaa
+PikaAnimTilemap_9:
+PikaAnimTilemap_25:
+PikaAnimTilemap_26:
+PikaAnimTilemap_27:
+PikaAnimTilemap_28:
+PikaAnimTilemap_29:
+PikaAnimTilemap_30:
+PikaAnimTilemap_31:
+PikaAnimTilemap_32:
+PikaAnimTilemap_33:
+PikaAnimTilemap_34:
+PikaAnimTilemap_35:
+PikaAnimTilemap_36:
+PikaAnimTilemap_37:
+PikaAnimTilemap_38:
+PikaAnimTilemap_39:
db 5, 5
db $00, $01, $02, $03, $04
db $05, $06, $07, $08, $09
@@ -195,7 +218,8 @@ Data_fdfaa: ; fdfaa
db $0f, $10, $11, $12, $13
db $14, $15, $16, $17, $18
-Data_fdfc5: ; fdfc5
+PikaAnimTilemap_10:
+PikaAnimTilemap_40:
db 5, 5
db $19, $1a, $1b, $1c, $1d
db $1e, $1f, $20, $21, $22
@@ -203,7 +227,8 @@ Data_fdfc5: ; fdfc5
db $28, $29, $2a, $2b, $2c
db $2d, $2e, $2f, $30, $31
-Data_fdfe0: ; fdfe0
+PikaAnimTilemap_11:
+PikaAnimTilemap_41:
db 5, 5
db $32, $33, $34, $35, $36
db $37, $38, $39, $3a, $3b
@@ -211,7 +236,7 @@ Data_fdfe0: ; fdfe0
db $41, $42, $43, $44, $45
db $46, $47, $48, $49, $4a
-Data_fdffb: ; fdffb
+PikaAnimTilemap_12:
db 5, 5
db $4b, $4c, $4d, $4e, $4f
db $50, $51, $52, $53, $54
@@ -219,7 +244,7 @@ Data_fdffb: ; fdffb
db $5a, $5b, $5c, $5d, $5e
db $5f, $60, $61, $62, $63
-Data_fe016: ; fe016
+PikaAnimTilemap_13:
db 5, 5
db $64, $65, $66, $67, $68
db $69, $6a, $6b, $6c, $6d
diff --git a/data/super_rod.asm b/data/super_rod.asm
index 14a3b9b7..fa133c77 100755
--- a/data/super_rod.asm
+++ b/data/super_rod.asm
@@ -30,4 +30,4 @@ FishingSlots:: ; f5eda (3d:5eda)
db SEAFOAM_ISLANDS_5,KRABBY,25,STARYU,20,KINGLER,35,STARYU,40
db UNKNOWN_DUNGEON_1,GOLDEEN,25,SEAKING,35,SEAKING,45,SEAKING,55
db UNKNOWN_DUNGEON_3,GOLDEEN,30,SEAKING,40,SEAKING,50,SEAKING,60
- db $ff \ No newline at end of file
+ db $ff
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 08:51:31 +0000