Character dict; surfing minigame; printer debug

1 files changed, 94 insertions, 69 deletions

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
+pikatilemap_def: macro
+\1_id: dw \1
+	endm
 
-Data_fde0e:
+	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