summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/anims1.asm134
-rw-r--r--src/data/anims2.asm49
-rw-r--r--src/data/anims3.asm81
-rw-r--r--src/data/anims4.asm45
-rw-r--r--src/data/auto_deck_card_lists.asm1
-rw-r--r--src/data/auto_deck_machines.asm1
-rw-r--r--src/data/duel_animations.asm1
-rw-r--r--src/data/map_ow_frameset_pointers.asm1
-rw-r--r--src/data/map_ow_framesets.asm1
-rw-r--r--src/data/overworld_indexes.asm22
-rw-r--r--src/data/sequences/credits_sequence.asm1
-rw-r--r--src/data/sequences/opening_sequence.asm1
-rw-r--r--src/data/warps.asm194
13 files changed, 108 insertions, 424 deletions
diff --git a/src/data/anims1.asm b/src/data/anims1.asm
index 0657cb6..db1f881 100644
--- a/src/data/anims1.asm
+++ b/src/data/anims1.asm
@@ -5,7 +5,6 @@ AnimData0:: ; a8e54 (2a:4e54)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa8e6b
AnimFrameTable0:: ; a8e6b (2a:4e6b)
dw .data_a8e7f
@@ -88,7 +87,6 @@ AnimFrameTable0:: ; a8e6b (2a:4e6b)
db 8, 0, 19, (1 << OAM_X_FLIP)
db 0, 8, 16, (1 << OAM_X_FLIP)
db 8, 8, 18, (1 << OAM_X_FLIP)
-; 0xa8f29
AnimData4:: ; a8f29 (2a:4f29)
frame_table AnimFrameTable1
@@ -97,7 +95,6 @@ AnimData4:: ; a8f29 (2a:4f29)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa8f40
AnimFrameTable1:: ; a8f40 (2a:4f40)
dw .data_a8f54
@@ -180,20 +177,17 @@ AnimFrameTable1:: ; a8f40 (2a:4f40)
db 8, 0, 19, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa8ffe
AnimData7:: ; a8ffe (2a:4ffe)
frame_table AnimFrameTable1
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa900d
AnimData8:: ; a900d (2a:500d)
frame_table AnimFrameTable2
frame_data 0, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9018
AnimFrameTable2:: ; a9018 (2a:5018)
dw .data_a9020
@@ -228,7 +222,6 @@ AnimFrameTable2:: ; a9018 (2a:5018)
db 8, -16, 1, (1 << OAM_OBP_NUM)
db 0, -8, 0, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, -8, 1, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa9064
AnimData9:: ; a9064 (2a:5064)
frame_table AnimFrameTable2
@@ -237,13 +230,11 @@ AnimData9:: ; a9064 (2a:5064)
frame_data 3, 16, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xa907b
AnimData10:: ; a907b (2a:507b)
frame_table AnimFrameTable3
frame_data 0, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9086
AnimFrameTable3:: ; a9086 (2a:5086)
dw .data_a908e
@@ -278,13 +269,11 @@ AnimFrameTable3:: ; a9086 (2a:5086)
db 8, 0, 5, (1 << OAM_X_FLIP)
db 0, 8, 2, (1 << OAM_X_FLIP)
db 8, 8, 4, (1 << OAM_X_FLIP)
-; 0xa90d2
AnimData13:: ; a90d2 (2a:50d2)
frame_table AnimFrameTable3
frame_data 3, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa90dd
AnimData14:: ; a90dd (2a:50dd)
frame_table AnimFrameTable4
@@ -293,7 +282,6 @@ AnimData14:: ; a90dd (2a:50dd)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa90f4
AnimFrameTable4:: ; a90f4 (2a:50f4)
dw .data_a9108
@@ -376,14 +364,12 @@ AnimFrameTable4:: ; a90f4 (2a:50f4)
db 8, 0, 19, (1 << OAM_X_FLIP)
db 0, 8, 16, (1 << OAM_X_FLIP)
db 8, 8, 18, (1 << OAM_X_FLIP)
-; 0xa91b2
AnimData15:: ; a91b2 (2a:51b2)
frame_table AnimFrameTable4
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91c1
AnimData16:: ; a91c1 (2a:51c1)
frame_table AnimFrameTable4
@@ -392,14 +378,12 @@ AnimData16:: ; a91c1 (2a:51c1)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91d8
AnimData17:: ; a91d8 (2a:51d8)
frame_table AnimFrameTable4
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91e7
AnimData18:: ; a91e7 (2a:51e7)
frame_table AnimFrameTable5
@@ -408,7 +392,6 @@ AnimData18:: ; a91e7 (2a:51e7)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa91fe
AnimFrameTable5:: ; a91fe (2a:51fe)
dw .data_a9212
@@ -491,14 +474,12 @@ AnimFrameTable5:: ; a91fe (2a:51fe)
db 8, 0, 19, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa92bc
AnimData19:: ; a92bc (2a:52bc)
frame_table AnimFrameTable5
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa92cb
AnimData20:: ; a92cb (2a:52cb)
frame_table AnimFrameTable5
@@ -507,14 +488,12 @@ AnimData20:: ; a92cb (2a:52cb)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa92e2
AnimData21:: ; a92e2 (2a:52e2)
frame_table AnimFrameTable5
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa92f1
AnimData22:: ; a92f1 (2a:52f1)
frame_table AnimFrameTable6
@@ -523,7 +502,6 @@ AnimData22:: ; a92f1 (2a:52f1)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9308
AnimFrameTable6:: ; a9308 (2a:5308)
dw .data_a931c
@@ -606,14 +584,12 @@ AnimFrameTable6:: ; a9308 (2a:5308)
db 8, 0, 19, %010 | (1 << OAM_X_FLIP)
db 0, 8, 16, %010 | (1 << OAM_X_FLIP)
db 8, 8, 18, %010 | (1 << OAM_X_FLIP)
-; 0xa93c6
AnimData23:: ; a93c6 (2a:53c6)
frame_table AnimFrameTable6
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa93d5
AnimData24:: ; a93d5 (2a:53d5)
frame_table AnimFrameTable6
@@ -622,14 +598,12 @@ AnimData24:: ; a93d5 (2a:53d5)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa93ec
AnimData25:: ; a93ec (2a:53ec)
frame_table AnimFrameTable6
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa93fb
AnimData26:: ; a93fb (2a:53fb)
frame_table AnimFrameTable7
@@ -638,7 +612,6 @@ AnimData26:: ; a93fb (2a:53fb)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9412
AnimFrameTable7:: ; a9412 (2a:5412)
dw .data_a9426
@@ -721,14 +694,12 @@ AnimFrameTable7:: ; a9412 (2a:5412)
db 8, 0, 19, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 8, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %011 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa94d0
AnimData27:: ; a94d0 (2a:54d0)
frame_table AnimFrameTable7
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa94df
AnimData28:: ; a94df (2a:54df)
frame_table AnimFrameTable7
@@ -737,14 +708,12 @@ AnimData28:: ; a94df (2a:54df)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa94f6
AnimData29:: ; a94f6 (2a:54f6)
frame_table AnimFrameTable7
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9505
AnimData30:: ; a9505 (2a:5505)
frame_table AnimFrameTable8
@@ -753,7 +722,6 @@ AnimData30:: ; a9505 (2a:5505)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa951c
AnimFrameTable8:: ; a951c (2a:551c)
dw .data_a9530
@@ -836,14 +804,12 @@ AnimFrameTable8:: ; a951c (2a:551c)
db 8, 0, 19, %100 | (1 << OAM_X_FLIP)
db 0, 8, 16, %100 | (1 << OAM_X_FLIP)
db 8, 8, 18, %100 | (1 << OAM_X_FLIP)
-; 0xa95da
AnimData31:: ; a95da (2a:55da)
frame_table AnimFrameTable8
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa95e9
AnimData32:: ; a95e9 (2a:55e9)
frame_table AnimFrameTable8
@@ -852,14 +818,12 @@ AnimData32:: ; a95e9 (2a:55e9)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9600
AnimData33:: ; a9600 (2a:5600)
frame_table AnimFrameTable8
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa960f
AnimData34:: ; a960f (2a:560f)
frame_table AnimFrameTable9
@@ -868,7 +832,6 @@ AnimData34:: ; a960f (2a:560f)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9626
AnimFrameTable9:: ; a9626 (2a:5626)
dw .data_a963a
@@ -951,14 +914,12 @@ AnimFrameTable9:: ; a9626 (2a:5626)
db 8, 0, 19, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %101 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa96e4
AnimData35:: ; a96e4 (2a:56e4)
frame_table AnimFrameTable9
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa96f3
AnimData36:: ; a96f3 (2a:56f3)
frame_table AnimFrameTable9
@@ -967,14 +928,12 @@ AnimData36:: ; a96f3 (2a:56f3)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa970a
AnimData37:: ; a970a (2a:570a)
frame_table AnimFrameTable9
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9719
AnimData38:: ; a9719 (2a:5719)
frame_table AnimFrameTable10
@@ -983,7 +942,6 @@ AnimData38:: ; a9719 (2a:5719)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9730
AnimFrameTable10:: ; a9730 (2a:5730)
dw .data_a9744
@@ -1066,14 +1024,12 @@ AnimFrameTable10:: ; a9730 (2a:5730)
db 8, 0, 19, %110 | (1 << OAM_X_FLIP)
db 0, 8, 16, %110 | (1 << OAM_X_FLIP)
db 8, 8, 18, %110 | (1 << OAM_X_FLIP)
-; 0xa97ee
AnimData39:: ; a97ee (2a:57ee)
frame_table AnimFrameTable10
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa97fd
AnimData40:: ; a97fd (2a:57fd)
frame_table AnimFrameTable10
@@ -1082,14 +1038,12 @@ AnimData40:: ; a97fd (2a:57fd)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9814
AnimData41:: ; a9814 (2a:5814)
frame_table AnimFrameTable10
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9823
AnimData42:: ; a9823 (2a:5823)
frame_table AnimFrameTable11
@@ -1098,7 +1052,6 @@ AnimData42:: ; a9823 (2a:5823)
frame_data 2, 16, 0, 0
frame_data 1, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa983a
AnimFrameTable11:: ; a983a (2a:583a)
dw .data_a984e
@@ -1181,14 +1134,12 @@ AnimFrameTable11:: ; a983a (2a:583a)
db 8, 0, 19, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 8, 16, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 18, %111 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa98f8
AnimData43:: ; a98f8 (2a:58f8)
frame_table AnimFrameTable11
frame_data 3, 16, 0, 0
frame_data 4, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9907
AnimData44:: ; a9907 (2a:5907)
frame_table AnimFrameTable11
@@ -1197,20 +1148,17 @@ AnimData44:: ; a9907 (2a:5907)
frame_data 7, 16, 0, 0
frame_data 6, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa991e
AnimData45:: ; a991e (2a:591e)
frame_table AnimFrameTable11
frame_data 8, 16, 0, 0
frame_data 9, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa992d
AnimData46:: ; a992d (2a:592d)
frame_table AnimFrameTable12
frame_data 0, 16, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9938
AnimFrameTable12:: ; a9938 (2a:5938)
dw .data_a9940
@@ -1245,7 +1193,6 @@ AnimFrameTable12:: ; a9938 (2a:5938)
db 8, -16, 1, $0
db 0, -8, 0, (1 << OAM_X_FLIP)
db 8, -8, 1, (1 << OAM_X_FLIP)
-; 0xa9984
AnimData47:: ; a9984 (2a:5984)
frame_table AnimFrameTable12
@@ -1254,13 +1201,11 @@ AnimData47:: ; a9984 (2a:5984)
frame_data 3, 16, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xa999b
AnimData48:: ; a999b (2a:599b)
frame_table AnimFrameTable13
frame_data 0, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa99a6
AnimFrameTable13:: ; a99a6 (2a:59a6)
dw .data_a99ae
@@ -1295,25 +1240,21 @@ AnimFrameTable13:: ; a99a6 (2a:59a6)
db 8, 0, 5, (1 << OAM_X_FLIP)
db 0, 8, 2, (1 << OAM_X_FLIP)
db 8, 8, 4, (1 << OAM_X_FLIP)
-; 0xa99f2
AnimData49:: ; a99f2 (2a:59f2)
frame_table AnimFrameTable13
frame_data 1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa99fd
AnimData50:: ; a99fd (2a:59fd)
frame_table AnimFrameTable13
frame_data 2, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a08
AnimData51:: ; a9a08 (2a:5a08)
frame_table AnimFrameTable13
frame_data 3, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a13
AnimData52:: ; a9a13 (2a:5a13)
frame_table AnimFrameTable14
@@ -1321,7 +1262,6 @@ AnimData52:: ; a9a13 (2a:5a13)
frame_data 1, 13, 0, 0
frame_data 2, 13, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a26
AnimFrameTable14:: ; a9a26 (2a:5a26)
dw .data_a9a30
@@ -1359,21 +1299,18 @@ AnimFrameTable14:: ; a9a26 (2a:5a26)
db 8, 0, 7, $0
db 0, 8, 6, (1 << OAM_X_FLIP)
db 8, 8, 7, (1 << OAM_X_FLIP)
-; 0xa9a71
AnimData53:: ; a9a71 (2a:5a71)
frame_table AnimFrameTable14
frame_data 4, 5, 0, 0
frame_data 3, 10, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a80
AnimData54:: ; a9a80 (2a:5a80)
frame_table AnimFrameTable14
frame_data 4, 4, 0, 0
frame_data 3, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9a8f
AnimData55:: ; a9a8f (2a:5a8f)
frame_table AnimFrameTable15
@@ -1381,7 +1318,6 @@ AnimData55:: ; a9a8f (2a:5a8f)
frame_data 1, 13, 0, 0
frame_data 2, 13, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9aa2
AnimFrameTable15:: ; a9aa2 (2a:5aa2)
dw .data_a9aac
@@ -1419,21 +1355,18 @@ AnimFrameTable15:: ; a9aa2 (2a:5aa2)
db 8, 0, 7, %100
db 0, 8, 6, %100 | (1 << OAM_X_FLIP)
db 8, 8, 7, %100 | (1 << OAM_X_FLIP)
-; 0xa9aed
AnimData56:: ; a9aed (2a:5aed)
frame_table AnimFrameTable15
frame_data 4, 5, 0, 0
frame_data 3, 10, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9afc
AnimData57:: ; a9afc (2a:5afc)
frame_table AnimFrameTable15
frame_data 4, 4, 0, 0
frame_data 3, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9b0b
AnimData58:: ; a9b0b (2a:5b0b)
frame_table AnimFrameTable16
@@ -1442,7 +1375,6 @@ AnimData58:: ; a9b0b (2a:5b0b)
frame_data 2, 6, 0, 0
frame_data 3, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9b22
AnimFrameTable16:: ; a9b22 (2a:5b22)
dw .data_a9b2a
@@ -1477,7 +1409,6 @@ AnimFrameTable16:: ; a9b22 (2a:5b22)
db 0, 0, 5, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 8, 6, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 0, 7, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xa9b6e
AnimData59:: ; a9b6e (2a:5b6e)
frame_table AnimFrameTable17
@@ -1502,7 +1433,6 @@ AnimData59:: ; a9b6e (2a:5b6e)
frame_data 4, 2, 0, 0
frame_data 5, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9bc5
AnimFrameTable17:: ; a9bc5 (2a:5bc5)
dw .data_a9bf9
@@ -1673,7 +1603,6 @@ AnimFrameTable17:: ; a9bc5 (2a:5bc5)
db 2 ; size
db 0, 0, 5, (1 << OAM_X_FLIP)
db 8, 0, 6, (1 << OAM_X_FLIP)
-; 0xa9d13
AnimData60:: ; a9d13 (2a:5d13)
frame_table AnimFrameTable17
@@ -1698,7 +1627,6 @@ AnimData60:: ; a9d13 (2a:5d13)
frame_data 10, 2, 0, 0
frame_data 11, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9d6a
AnimData61:: ; a9d6a (2a:5d6a)
frame_table AnimFrameTable17
@@ -1723,7 +1651,6 @@ AnimData61:: ; a9d6a (2a:5d6a)
frame_data 12, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9dc1
AnimData62:: ; a9dc1 (2a:5dc1)
frame_table AnimFrameTable17
@@ -1748,7 +1675,6 @@ AnimData62:: ; a9dc1 (2a:5dc1)
frame_data 17, 2, 0, 0
frame_data 18, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9e18
AnimData63:: ; a9e18 (2a:5e18)
frame_table AnimFrameTable17
@@ -1773,7 +1699,6 @@ AnimData63:: ; a9e18 (2a:5e18)
frame_data 23, 2, 0, 0
frame_data 24, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9e6f
AnimData64:: ; a9e6f (2a:5e6f)
frame_table AnimFrameTable17
@@ -1798,7 +1723,6 @@ AnimData64:: ; a9e6f (2a:5e6f)
frame_data 25, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9ec6
AnimData65:: ; a9ec6 (2a:5ec6)
frame_table AnimFrameTable18
@@ -1823,7 +1747,6 @@ AnimData65:: ; a9ec6 (2a:5ec6)
frame_data 4, 2, 0, 0
frame_data 5, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xa9f1d
AnimFrameTable18:: ; a9f1d (2a:5f1d)
dw .data_a9f51
@@ -1994,7 +1917,6 @@ AnimFrameTable18:: ; a9f1d (2a:5f1d)
db 2 ; size
db 0, 0, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 0, 6, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xaa06b
AnimData66:: ; aa06b (2a:606b)
frame_table AnimFrameTable18
@@ -2019,7 +1941,6 @@ AnimData66:: ; aa06b (2a:606b)
frame_data 10, 2, 0, 0
frame_data 11, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa0c2
AnimData67:: ; aa0c2 (2a:60c2)
frame_table AnimFrameTable18
@@ -2044,7 +1965,6 @@ AnimData67:: ; aa0c2 (2a:60c2)
frame_data 12, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa119
AnimData68:: ; aa119 (2a:6119)
frame_table AnimFrameTable18
@@ -2069,7 +1989,6 @@ AnimData68:: ; aa119 (2a:6119)
frame_data 17, 2, 0, 0
frame_data 18, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa170
AnimData69:: ; aa170 (2a:6170)
frame_table AnimFrameTable18
@@ -2094,7 +2013,6 @@ AnimData69:: ; aa170 (2a:6170)
frame_data 23, 2, 0, 0
frame_data 24, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa1c7
AnimData70:: ; aa1c7 (2a:61c7)
frame_table AnimFrameTable18
@@ -2119,7 +2037,6 @@ AnimData70:: ; aa1c7 (2a:61c7)
frame_data 25, 2, 0, 0
frame_data -1, 2, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa21e
AnimData71:: ; aa21e (2a:621e)
frame_table AnimFrameTable19
@@ -2134,7 +2051,6 @@ AnimData71:: ; aa21e (2a:621e)
frame_data 2, 4, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa24d
AnimFrameTable19:: ; aa24d (2a:624d)
dw .data_aa253
@@ -2193,7 +2109,6 @@ AnimFrameTable19:: ; aa24d (2a:624d)
db 8, -8, 1, (1 << OAM_Y_FLIP)
db 0, -16, 2, (1 << OAM_Y_FLIP)
db 0, -8, 3, (1 << OAM_Y_FLIP)
-; 0xaa306
AnimData72:: ; aa306 (2a:6306)
frame_table AnimFrameTable20
@@ -2203,7 +2118,6 @@ AnimData72:: ; aa306 (2a:6306)
frame_data 1, 8, 0, 0
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa321
AnimFrameTable20:: ; aa321 (2a:6321)
dw .data_aa325
@@ -2262,7 +2176,6 @@ AnimFrameTable20:: ; aa321 (2a:6321)
db 0, 24, 5, (1 << OAM_Y_FLIP)
db -8, 24, 4, (1 << OAM_Y_FLIP)
db -16, 24, 5, (1 << OAM_Y_FLIP)
-; 0xaa3e7
AnimData73:: ; aa3e7 (2a:63e7)
frame_table AnimFrameTable21
@@ -2279,7 +2192,6 @@ AnimData73:: ; aa3e7 (2a:63e7)
frame_data 4, 7, 0, 0
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa41e
AnimFrameTable21:: ; aa41e (2a:641e)
dw .data_aa428
@@ -2344,7 +2256,6 @@ AnimFrameTable21:: ; aa41e (2a:641e)
db -5, 0, 1, (1 << OAM_X_FLIP)
db 3, 0, 5, (1 << OAM_X_FLIP)
db -18, 15, 7, $0
-; 0xaa4d5
AnimData74:: ; aa4d5 (2a:64d5)
frame_table AnimFrameTable22
@@ -2358,7 +2269,6 @@ AnimData74:: ; aa4d5 (2a:64d5)
frame_data 7, 8, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa500
AnimFrameTable22:: ; aa500 (2a:6500)
dw .data_aa510
@@ -2457,7 +2367,6 @@ AnimFrameTable22:: ; aa500 (2a:6500)
db -24, -16, 1, (1 << OAM_X_FLIP)
db 8, 8, 1, $0
db 8, 16, 1, (1 << OAM_X_FLIP)
-; 0xaa618
AnimData75:: ; aa618 (2a:6618)
frame_table AnimFrameTable23
@@ -2467,7 +2376,6 @@ AnimData75:: ; aa618 (2a:6618)
frame_data 3, 32, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa633
AnimFrameTable23:: ; aa633 (2a:6633)
dw .data_aa63b
@@ -2538,7 +2446,6 @@ AnimFrameTable23:: ; aa633 (2a:6633)
db -8, -16, 1, (1 << OAM_X_FLIP)
db 0, 8, 1, $0
db -8, 0, 3, $0
-; 0xaa70f
AnimData76:: ; aa70f (2a:670f)
frame_table AnimFrameTable24
@@ -2549,7 +2456,6 @@ AnimData76:: ; aa70f (2a:670f)
frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa72e
AnimFrameTable24:: ; aa72e (2a:672e)
dw .data_aa73c
@@ -2666,7 +2572,6 @@ AnimFrameTable24:: ; aa72e (2a:672e)
db -9, -33, 8, (1 << OAM_X_FLIP)
db 17, -7, 8, (1 << OAM_Y_FLIP)
db 17, -33, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xaa89b
AnimData77:: ; aa89b (2a:689b)
frame_table AnimFrameTable24
@@ -2677,7 +2582,6 @@ AnimData77:: ; aa89b (2a:689b)
frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa8ba
AnimData78:: ; aa8ba (2a:68ba)
frame_table AnimFrameTable24
@@ -2690,7 +2594,6 @@ AnimData78:: ; aa8ba (2a:68ba)
frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa8e1
AnimData79:: ; aa8e1 (2a:68e1)
frame_table AnimFrameTable25
@@ -2727,7 +2630,6 @@ AnimData79:: ; aa8e1 (2a:68e1)
frame_data 0, 1, 0, -1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaa968
AnimFrameTable25:: ; aa968 (2a:6968)
dw .data_aa982
@@ -2800,7 +2702,6 @@ AnimFrameTable25:: ; aa968 (2a:6968)
.data_aa9d2
db 1 ; size
db 0, 0, 10, $0
-; 0xaa9d7
AnimData80:: ; aa9d7 (2a:69d7)
frame_table AnimFrameTable25
@@ -2837,7 +2738,6 @@ AnimData80:: ; aa9d7 (2a:69d7)
frame_data 1, 1, 0, -1
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaaa5e
AnimData81:: ; aaa5e (2a:6a5e)
frame_table AnimFrameTable25
@@ -2874,7 +2774,6 @@ AnimData81:: ; aaa5e (2a:6a5e)
frame_data 2, 1, 0, -1
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaaae5
AnimData82:: ; aaae5 (2a:6ae5)
frame_table AnimFrameTable25
@@ -2911,7 +2810,6 @@ AnimData82:: ; aaae5 (2a:6ae5)
frame_data 3, 1, 0, -1
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaab6c
AnimData83:: ; aab6c (2a:6b6c)
frame_table AnimFrameTable25
@@ -2948,7 +2846,6 @@ AnimData83:: ; aab6c (2a:6b6c)
frame_data 4, 1, 0, -1
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaabf3
AnimData84:: ; aabf3 (2a:6bf3)
frame_table AnimFrameTable25
@@ -2985,7 +2882,6 @@ AnimData84:: ; aabf3 (2a:6bf3)
frame_data 5, 1, 0, -1
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaac7a
AnimData85:: ; aac7a (2a:6c7a)
frame_table AnimFrameTable25
@@ -3022,7 +2918,6 @@ AnimData85:: ; aac7a (2a:6c7a)
frame_data 6, 1, 0, -1
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaad01
AnimData86:: ; aad01 (2a:6d01)
frame_table AnimFrameTable25
@@ -3059,7 +2954,6 @@ AnimData86:: ; aad01 (2a:6d01)
frame_data 7, 1, 0, -1
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaad88
AnimData87:: ; aad88 (2a:6d88)
frame_table AnimFrameTable25
@@ -3096,7 +2990,6 @@ AnimData87:: ; aad88 (2a:6d88)
frame_data 8, 1, 0, -1
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaae0f
AnimData88:: ; aae0f (2a:6e0f)
frame_table AnimFrameTable25
@@ -3133,7 +3026,6 @@ AnimData88:: ; aae0f (2a:6e0f)
frame_data 9, 1, 0, -1
frame_data 9, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaae96
AnimData89:: ; aae96 (2a:6e96)
frame_table AnimFrameTable25
@@ -3170,7 +3062,6 @@ AnimData89:: ; aae96 (2a:6e96)
frame_data 10, 1, 0, -1
frame_data 10, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaaf1d
AnimData90:: ; aaf1d (2a:6f1d)
frame_table AnimFrameTable25
@@ -3207,7 +3098,6 @@ AnimData90:: ; aaf1d (2a:6f1d)
frame_data 11, 1, 0, -1
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaafa4
AnimData91:: ; aafa4 (2a:6fa4)
frame_table AnimFrameTable25
@@ -3244,7 +3134,6 @@ AnimData91:: ; aafa4 (2a:6fa4)
frame_data 12, 1, 0, -1
frame_data 12, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab02b
AnimData92:: ; ab02b (2a:702b)
frame_table AnimFrameTable26
@@ -3262,7 +3151,6 @@ AnimData92:: ; ab02b (2a:702b)
frame_data 6, 2, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab066
AnimFrameTable26:: ; ab066 (2a:7066)
dw .data_ab074
@@ -3325,13 +3213,11 @@ AnimFrameTable26:: ; ab066 (2a:7066)
db 14, -26, 8, (1 << OAM_X_FLIP)
db 14, 18, 7, (1 << OAM_X_FLIP)
db -22, -26, 7, (1 << OAM_X_FLIP)
-; 0xab0fb
AnimData93:: ; ab0fb (2a:70fb)
frame_table AnimFrameTable26
frame_data 8, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xab106
AnimData94:: ; ab106 (2a:7106)
frame_table AnimFrameTable27
@@ -3349,7 +3235,6 @@ AnimData94:: ; ab106 (2a:7106)
frame_data -1, 2, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab141
AnimFrameTable27:: ; ab141 (2a:7141)
dw .data_ab14d
@@ -3466,7 +3351,6 @@ AnimFrameTable27:: ; ab141 (2a:7141)
db -16, -8, 8, (1 << OAM_X_FLIP)
db -8, 0, 11, (1 << OAM_X_FLIP)
db -8, -8, 12, (1 << OAM_X_FLIP)
-; 0xab2bb
AnimData95:: ; ab2bb (2a:72bb)
frame_table AnimFrameTable28
@@ -3481,7 +3365,6 @@ AnimData95:: ; ab2bb (2a:72bb)
frame_data 8, 2, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab2ea
AnimFrameTable28:: ; ab2ea (2a:72ea)
dw .data_ab2fc
@@ -3584,7 +3467,6 @@ AnimFrameTable28:: ; ab2ea (2a:72ea)
db 20, -28, 2, (1 << OAM_X_FLIP)
db 5, -36, 0, (1 << OAM_X_FLIP)
db -12, 27, 0, (1 << OAM_X_FLIP)
-; 0xab405
AnimData96:: ; ab405 (2a:7405)
frame_table AnimFrameTable29
@@ -3602,7 +3484,6 @@ AnimData96:: ; ab405 (2a:7405)
frame_data -1, 2, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab440
AnimFrameTable29:: ; ab440 (2a:7440)
dw .data_ab44c
@@ -3764,7 +3645,6 @@ AnimFrameTable29:: ; ab440 (2a:7440)
db -56, 18, 44, $0
db -56, 2, 44, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -56, 10, 42, $0
-; 0xab66e
AnimData97:: ; ab66e (2a:766e)
frame_table AnimFrameTable30
@@ -3783,7 +3663,6 @@ AnimData97:: ; ab66e (2a:766e)
frame_data 8, 4, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xab6ad
AnimFrameTable30:: ; ab6ad (2a:76ad)
dw .data_ab6d5
@@ -4048,7 +3927,6 @@ AnimFrameTable30:: ; ab6ad (2a:76ad)
db -16, 12, 12, $0
db 8, 12, 12, $0
db 8, -20, 12, $0
-; 0xab9c1
AnimData98:: ; ab9c1 (2a:79c1)
frame_table AnimFrameTable30
@@ -4070,7 +3948,6 @@ AnimData98:: ; ab9c1 (2a:79c1)
frame_data 19, 5, 0, 0
frame_data 19, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaba0c
AnimData99:: ; aba0c (2a:7a0c)
frame_table AnimFrameTable31
@@ -4116,7 +3993,6 @@ AnimData99:: ; aba0c (2a:7a0c)
frame_data 3, 2, 80, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabab7
AnimFrameTable31:: ; abab7 (2a:7ab7)
dw .data_abac7
@@ -4215,7 +4091,6 @@ AnimFrameTable31:: ; abab7 (2a:7ab7)
db -39, 32, 12, $0
db -39, 24, 11, $0
db -47, 24, 8, $0
-; 0xabbcf
AnimData101:: ; abbcf (2a:7bcf)
frame_table AnimFrameTable32
@@ -4230,7 +4105,6 @@ AnimData101:: ; abbcf (2a:7bcf)
frame_data 2, 8, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabbfe
AnimData102:: ; abbfe (2a:7bfe)
frame_table AnimFrameTable32
@@ -4238,7 +4112,6 @@ AnimData102:: ; abbfe (2a:7bfe)
frame_data -1, 8, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabc11
AnimData103:: ; abc11 (2a:7c11)
frame_table AnimFrameTable32
@@ -4267,7 +4140,6 @@ AnimData103:: ; abc11 (2a:7c11)
frame_data 9, 8, 0, 0
frame_data 9, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabc78
AnimData104:: ; abc78 (2a:7c78)
frame_table AnimFrameTable32
@@ -4299,7 +4171,6 @@ AnimData104:: ; abc78 (2a:7c78)
frame_data 2, 8, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabceb
AnimData105:: ; abceb (2a:7ceb)
frame_table AnimFrameTable33
@@ -4322,7 +4193,6 @@ AnimData105:: ; abceb (2a:7ceb)
frame_data -1, 4, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabd3a
AnimFrameTable33:: ; abd3a (2a:7d3a)
dw .data_abd4a
@@ -4442,7 +4312,6 @@ AnimFrameTable33:: ; abd3a (2a:7d3a)
db -56, 0, 0, (1 << OAM_Y_FLIP)
db -80, -32, 0, $0
db -72, -32, 0, (1 << OAM_Y_FLIP)
-; 0xabea6
AnimData106:: ; abea6 (2a:7ea6)
frame_table AnimFrameTable34
@@ -4466,7 +4335,6 @@ AnimData106:: ; abea6 (2a:7ea6)
frame_data 8, 4, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabef9
AnimFrameTable34:: ; abef9 (2a:7ef9)
dw .data_abf0b
@@ -4559,7 +4427,6 @@ AnimFrameTable34:: ; abef9 (2a:7ef9)
db -19, 0, 24, (1 << OAM_X_FLIP)
db -11, 0, 25, (1 << OAM_X_FLIP)
db -3, 0, 26, (1 << OAM_X_FLIP)
-; 0xabfec
AnimData149:: ; abfec (2a:7fec)
frame_table AnimFrameTable71
@@ -4567,4 +4434,3 @@ AnimData149:: ; abfec (2a:7fec)
frame_data 1, 8, 0, 0
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xabfff
diff --git a/src/data/anims2.asm b/src/data/anims2.asm
index 2cc78de..42969d1 100644
--- a/src/data/anims2.asm
+++ b/src/data/anims2.asm
@@ -29,7 +29,6 @@ AnimData100:: ; ac000 (2b:4000)
frame_data 2, 5, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xac077
AnimFrameTable32:: ; ac077 (2b:4077)
dw .data_ac0a7
@@ -593,7 +592,6 @@ AnimFrameTable32:: ; ac077 (2b:4077)
db 8, -8, 31, $0
db 0, -8, 28, $0
db 0, 0, 29, $0
-; 0xac803
AnimData107:: ; ac803 (2b:4803)
frame_table AnimFrameTable35
@@ -617,7 +615,6 @@ AnimData107:: ; ac803 (2b:4803)
frame_data 11, 5, 0, 0
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xac856
AnimFrameTable35:: ; ac856 (2b:4856)
dw .data_ac86e
@@ -771,7 +768,6 @@ AnimFrameTable35:: ; ac856 (2b:4856)
db 2 ; size
db -8, 16, 6, $0
db 0, -8, 6, $0
-; 0xaca16
AnimData108:: ; aca16 (2b:4a16)
frame_table AnimFrameTable36
@@ -786,7 +782,6 @@ AnimData108:: ; aca16 (2b:4a16)
frame_data 8, 6, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaca45
AnimFrameTable36:: ; aca45 (2b:4a45)
dw .data_aca57
@@ -884,7 +879,6 @@ AnimFrameTable36:: ; aca45 (2b:4a45)
db 8, -12, 11, (1 << OAM_X_FLIP)
db 0, 12, 11, (1 << OAM_X_FLIP)
db 0, -4, 11, (1 << OAM_X_FLIP)
-; 0xacb4c
AnimData109:: ; acb4c (2b:4b4c)
frame_table AnimFrameTable37
@@ -919,7 +913,6 @@ AnimData109:: ; acb4c (2b:4b4c)
frame_data 8, 3, 16, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xacbcb
AnimFrameTable37:: ; acbcb (2b:4bcb)
dw .data_acbdd
@@ -1266,7 +1259,6 @@ AnimFrameTable37:: ; acbcb (2b:4bcb)
db 18, 72, 0, $0
db -8, -8, 0, $0
db -48, -32, 0, $0
-; 0xad0b6
AnimData110:: ; ad0b6 (2b:50b6)
frame_table AnimFrameTable38
@@ -1306,7 +1298,6 @@ AnimData110:: ; ad0b6 (2b:50b6)
frame_data 16, 7, 0, 0
frame_data 16, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad149
AnimFrameTable38:: ; ad149 (2b:5149)
dw .data_ad16b
@@ -1499,7 +1490,6 @@ AnimFrameTable38:: ; ad149 (2b:5149)
db -8, 0, 33, (1 << OAM_X_FLIP)
db 0, 0, 33, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 0, -8, 33, (1 << OAM_Y_FLIP)
-; 0xad364
AnimData111:: ; ad364 (2b:5364)
frame_table AnimFrameTable39
@@ -1511,7 +1501,6 @@ AnimData111:: ; ad364 (2b:5364)
frame_data 5, 16, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad387
AnimFrameTable39:: ; ad387 (2b:5387)
dw .data_ad393
@@ -1612,7 +1601,6 @@ AnimFrameTable39:: ; ad387 (2b:5387)
db 4, -16, 30, (1 << OAM_X_FLIP)
db 4, -24, 31, (1 << OAM_X_FLIP)
db -12, -16, 18, (1 << OAM_Y_FLIP)
-; 0xad4c1
AnimData112:: ; ad4c1 (2b:54c1)
frame_table AnimFrameTable40
@@ -1631,7 +1619,6 @@ AnimData112:: ; ad4c1 (2b:54c1)
frame_data 10, 2, 0, 0
frame_data 10, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad500
AnimFrameTable40:: ; ad500 (2b:5500)
dw .data_ad516
@@ -1872,7 +1859,6 @@ AnimFrameTable40:: ; ad500 (2b:5500)
db -64, -16, 7, (1 << OAM_Y_FLIP)
db 0, -16, 8, (1 << OAM_Y_FLIP)
db 0, -8, 9, (1 << OAM_Y_FLIP)
-; 0xad829
AnimData113:: ; ad829 (2b:5829)
frame_table AnimFrameTable41
@@ -1894,7 +1880,6 @@ AnimData113:: ; ad829 (2b:5829)
frame_data -1, 16, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xad874
AnimFrameTable41:: ; ad874 (2b:5874)
dw .data_ad88e
@@ -2097,7 +2082,6 @@ AnimFrameTable41:: ; ad874 (2b:5874)
db -12, 0, 24, (1 << OAM_X_FLIP)
db -12, -8, 25, (1 << OAM_X_FLIP)
db -12, -16, 26, (1 << OAM_X_FLIP)
-; 0xadaeb
AnimData114:: ; adaeb (2b:5aeb)
frame_table AnimFrameTable42
@@ -2110,7 +2094,6 @@ AnimData114:: ; adaeb (2b:5aeb)
frame_data 0, 11, -24, 24
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xadb12
AnimFrameTable42:: ; adb12 (2b:5b12)
dw .data_adb2c
@@ -2328,7 +2311,6 @@ AnimFrameTable42:: ; adb12 (2b:5b12)
db 16, -40, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 24, -32, 16, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 24, -40, 17, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xaddc5
AnimData115:: ; addc5 (2b:5dc5)
frame_table AnimFrameTable42
@@ -2349,7 +2331,6 @@ AnimData115:: ; addc5 (2b:5dc5)
frame_data 12, 7, 0, 0
frame_data 12, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xade0c
AnimData116:: ; ade0c (2b:5e0c)
frame_table AnimFrameTable43
@@ -2369,7 +2350,6 @@ AnimData116:: ; ade0c (2b:5e0c)
frame_data 1, 3, -8, -8
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xade4f
AnimFrameTable43:: ; ade4f (2b:5e4f)
dw .data_ade61
@@ -2505,7 +2485,6 @@ AnimFrameTable43:: ; ade4f (2b:5e4f)
db 16, 3, 26, $0
db -18, -11, 26, (1 << OAM_X_FLIP)
db -8, 13, 26, (1 << OAM_X_FLIP)
-; 0xadfee
AnimData117:: ; adfee (2b:5fee)
frame_table AnimFrameTable43
@@ -2535,7 +2514,6 @@ AnimData117:: ; adfee (2b:5fee)
frame_data 3, 3, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae059
AnimData118:: ; ae059 (2b:6059)
frame_table AnimFrameTable43
@@ -2569,7 +2547,6 @@ AnimData118:: ; ae059 (2b:6059)
frame_data 8, 5, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae0d4
AnimData119:: ; ae0d4 (2b:60d4)
frame_table AnimFrameTable44
@@ -2593,7 +2570,6 @@ AnimData119:: ; ae0d4 (2b:60d4)
frame_data -1, 2, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae127
AnimFrameTable44:: ; ae127 (2b:6127)
dw .data_ae13f
@@ -2736,7 +2712,6 @@ AnimFrameTable44:: ; ae127 (2b:6127)
db -4, 72, 7, $0
db -4, 92, 7, $0
db -4, 112, 7, $0
-; 0xae2bb
AnimData120:: ; ae2bb (2b:62bb)
frame_table AnimFrameTable45
@@ -2750,7 +2725,6 @@ AnimData120:: ; ae2bb (2b:62bb)
frame_data 4, 4, 0, 0
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae2e6
AnimFrameTable45:: ; ae2e6 (2b:62e6)
dw .data_ae306
@@ -2973,7 +2947,6 @@ AnimFrameTable45:: ; ae2e6 (2b:62e6)
db -10, 10, 10, (1 << OAM_Y_FLIP)
db -2, 10, 11, (1 << OAM_Y_FLIP)
db -2, 18, 12, (1 << OAM_Y_FLIP)
-; 0xae586
AnimData121:: ; ae586 (2b:6586)
frame_table AnimFrameTable45
@@ -2997,7 +2970,6 @@ AnimData121:: ; ae586 (2b:6586)
frame_data 15, 4, 0, 0
frame_data 15, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae5d9
AnimData122:: ; ae5d9 (2b:65d9)
frame_table AnimFrameTable46
@@ -3012,7 +2984,6 @@ AnimData122:: ; ae5d9 (2b:65d9)
frame_data 8, 4, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae608
AnimFrameTable46:: ; ae608 (2b:6608)
dw .data_ae61a
@@ -3138,7 +3109,6 @@ AnimFrameTable46:: ; ae608 (2b:6608)
db -8, -10, 31, $0
db -8, -2, 32, $0
db -8, 6, 33, $0
-; 0xae77f
AnimData123:: ; ae77f (2b:677f)
frame_table AnimFrameTable47
@@ -3167,7 +3137,6 @@ AnimData123:: ; ae77f (2b:677f)
frame_data 22, 2, 0, 0
frame_data 22, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xae7e6
AnimFrameTable47:: ; ae7e6 (2b:67e6)
dw .data_ae814
@@ -3626,7 +3595,6 @@ AnimFrameTable47:: ; ae7e6 (2b:67e6)
db -23, 24, 11, $0
db 16, 16, 11, (1 << OAM_Y_FLIP)
db 15, 24, 11, (1 << OAM_Y_FLIP)
-; 0xaeddb
AnimData124:: ; aeddb (2b:6ddb)
frame_table AnimFrameTable48
@@ -3665,7 +3633,6 @@ AnimData124:: ; aeddb (2b:6ddb)
frame_data 2, 2, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaee6a
AnimFrameTable48:: ; aee6a (2b:6e6a)
dw .data_aee76
@@ -3785,7 +3752,6 @@ AnimFrameTable48:: ; aee6a (2b:6e6a)
db 0, -8, 35, (1 << OAM_X_FLIP)
db -1, -13, 36, $0
db -24, 4, 36, $0
-; 0xaeff0
AnimData125:: ; aeff0 (2b:6ff0)
frame_table AnimFrameTable49
@@ -3805,7 +3771,6 @@ AnimData125:: ; aeff0 (2b:6ff0)
frame_data 3, 5, 10, -3
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf033
AnimFrameTable49:: ; af033 (2b:7033)
dw .data_af03b
@@ -3879,7 +3844,6 @@ AnimFrameTable49:: ; af033 (2b:7033)
db 8, 8, 9, (1 << OAM_X_FLIP)
db 8, 0, 10, (1 << OAM_X_FLIP)
db 8, -8, 11, (1 << OAM_X_FLIP)
-; 0xaf11b
AnimData126:: ; af11b (2b:711b)
frame_table AnimFrameTable50
@@ -3934,7 +3898,6 @@ AnimData126:: ; af11b (2b:711b)
frame_data 0, 2, -4, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf1ea
AnimFrameTable50:: ; af1ea (2b:71ea)
dw .data_af202
@@ -4059,7 +4022,6 @@ AnimFrameTable50:: ; af1ea (2b:71ea)
db -55, -44, 4, $0
db -47, -44, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -47, -36, 5, $0
-; 0xaf336
AnimData127:: ; af336 (2b:7336)
frame_table AnimFrameTable51
@@ -4081,7 +4043,6 @@ AnimData127:: ; af336 (2b:7336)
frame_data 7, 16, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf381
AnimFrameTable51:: ; af381 (2b:7381)
dw .data_af391
@@ -4408,7 +4369,6 @@ AnimFrameTable51:: ; af381 (2b:7381)
db -8, -16, 73, $0
db -8, -8, 74, $0
db -8, 0, 75, $0
-; 0xaf829
AnimData128:: ; af829 (2b:7829)
frame_table AnimFrameTable52
@@ -4423,7 +4383,6 @@ AnimData128:: ; af829 (2b:7829)
frame_data 8, 16, 0, 0
frame_data 8, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf858
AnimFrameTable52:: ; af858 (2b:7858)
dw .data_af86a
@@ -4537,7 +4496,6 @@ AnimFrameTable52:: ; af858 (2b:7858)
db -13, -23, 0, (1 << OAM_Y_FLIP)
db -21, -23, 2, (1 << OAM_Y_FLIP)
db -21, -31, 1, (1 << OAM_Y_FLIP)
-; 0xaf99f
AnimData129:: ; af99f (2b:799f)
frame_table AnimFrameTable53
@@ -4562,7 +4520,6 @@ AnimData129:: ; af99f (2b:799f)
frame_data 0, 5, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaf9f6
AnimFrameTable53:: ; af9f6 (2b:79f6)
dw .data_afa06
@@ -4885,7 +4842,6 @@ AnimFrameTable53:: ; af9f6 (2b:79f6)
db 10, -32, 5, (1 << OAM_X_FLIP)
db -22, -32, 1, (1 << OAM_X_FLIP)
db -14, -32, 2, (1 << OAM_X_FLIP)
-; 0xafe8e
AnimData130:: ; afe8e (2b:7e8e)
frame_table AnimFrameTable54
@@ -4908,7 +4864,6 @@ AnimData130:: ; afe8e (2b:7e8e)
frame_data 7, 8, 2, 4
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xafedd
AnimFrameTable54:: ; afedd (2b:7edd)
dw .data_afeed
@@ -4994,7 +4949,6 @@ AnimFrameTable54:: ; afedd (2b:7edd)
db 8, -20, 0, $0
db 8, 8, 0, $0
db 16, -32, 0, $0
-; 0xaffc1
AnimData150:: ; affc1 (2b:7fc1)
frame_table AnimFrameTable71
@@ -5004,7 +4958,6 @@ AnimData150:: ; affc1 (2b:7fc1)
frame_data 5, 8, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xaffdc
AnimData162:: ; affdc (2b:7fdc)
frame_table AnimFrameTable78
@@ -5013,10 +4966,8 @@ AnimData162:: ; affdc (2b:7fdc)
frame_data 24, 6, 0, 0
frame_data 24, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xafff3
AnimData166:: ; afff3 (2b:7ff3)
frame_table AnimFrameTable78
frame_data 0, 1, 0, 0
frame_data 0, 0, 0, 0
-; 0xafffe
diff --git a/src/data/anims3.asm b/src/data/anims3.asm
index 076a65b..f990ffa 100644
--- a/src/data/anims3.asm
+++ b/src/data/anims3.asm
@@ -21,7 +21,6 @@ AnimData131:: ; b0000 (2c:4000)
frame_data 6, 2, 0, 4
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0057
AnimFrameTable55:: ; b0057 (2c:4057)
dw .data_b0065
@@ -134,7 +133,6 @@ AnimFrameTable55:: ; b0057 (2c:4057)
db -8, 0, 2, $0
db 0, -9, 6, $0
db 0, -1, 8, $0
-; 0xb01b4
AnimData132:: ; b01b4 (2c:41b4)
frame_table AnimFrameTable56
@@ -162,7 +160,6 @@ AnimData132:: ; b01b4 (2c:41b4)
frame_data -1, 4, 0, 0
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0217
AnimFrameTable56:: ; b0217 (2c:4217)
dw .data_b0239
@@ -452,7 +449,6 @@ AnimFrameTable56:: ; b0217 (2c:4217)
db -30, 6, 9, (1 << OAM_X_FLIP)
db -18, -6, 9, (1 << OAM_Y_FLIP)
db -18, 6, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb05b6
AnimData133:: ; b05b6 (2c:45b6)
frame_table AnimFrameTable57
@@ -470,7 +466,6 @@ AnimData133:: ; b05b6 (2c:45b6)
frame_data 11, 16, 0, 0
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb05f1
AnimFrameTable57:: ; b05f1 (2c:45f1)
dw .data_b0609
@@ -761,7 +756,6 @@ AnimFrameTable57:: ; b05f1 (2c:45f1)
db 0, -12, 44, $0
db -8, 3, 42, $0
db -8, -5, 44, $0
-; 0xb09d5
AnimData134:: ; b09d5 (2c:49d5)
frame_table AnimFrameTable58
@@ -782,7 +776,6 @@ AnimData134:: ; b09d5 (2c:49d5)
frame_data 12, 8, 0, 0
frame_data 12, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0a1c
AnimFrameTable58:: ; b0a1c (2c:4a1c)
dw .data_b0a36
@@ -979,7 +972,6 @@ AnimFrameTable58:: ; b0a1c (2c:4a1c)
db -8, 24, 3, $0
db -16, 32, 2, (1 << OAM_X_FLIP)
db -8, 32, 3, (1 << OAM_X_FLIP)
-; 0xb0c7b
AnimData135:: ; b0c7b (2c:4c7b)
frame_table AnimFrameTable59
@@ -993,7 +985,6 @@ AnimData135:: ; b0c7b (2c:4c7b)
frame_data 7, 9, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0ca6
AnimFrameTable59:: ; b0ca6 (2c:4ca6)
dw .data_b0cb6
@@ -1094,7 +1085,6 @@ AnimFrameTable59:: ; b0ca6 (2c:4ca6)
db -32, 40, 5, $0
db -24, 36, 6, $0
db -32, 32, 5, (1 << OAM_X_FLIP)
-; 0xb0dc6
AnimData136:: ; b0dc6 (2c:4dc6)
frame_table AnimFrameTable60
@@ -1116,7 +1106,6 @@ AnimData136:: ; b0dc6 (2c:4dc6)
frame_data 3, 8, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0e11
AnimFrameTable60:: ; b0e11 (2c:4e11)
dw .data_b0e19
@@ -1191,7 +1180,6 @@ AnimFrameTable60:: ; b0e11 (2c:4e11)
db 0, -16, 25, (1 << OAM_X_FLIP)
db 8, 0, 26, (1 << OAM_X_FLIP)
db 8, -8, 27, (1 << OAM_X_FLIP)
-; 0xb0efd
AnimData137:: ; b0efd (2c:4efd)
frame_table AnimFrameTable61
@@ -1205,7 +1193,6 @@ AnimData137:: ; b0efd (2c:4efd)
frame_data 5, 6, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb0f28
AnimFrameTable61:: ; b0f28 (2c:4f28)
dw .data_b0f34
@@ -1274,7 +1261,6 @@ AnimFrameTable61:: ; b0f28 (2c:4f28)
db 4, -12, 2, (1 << OAM_X_FLIP)
db 12, -12, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 12, -20, 2, (1 << OAM_Y_FLIP)
-; 0xb0fe2
AnimData138:: ; b0fe2 (2c:4fe2)
frame_table AnimFrameTable62
@@ -1296,7 +1282,6 @@ AnimData138:: ; b0fe2 (2c:4fe2)
frame_data 7, 6, 0, 4
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb102d
AnimFrameTable62:: ; b102d (2c:502d)
dw .data_b103d
@@ -1395,7 +1380,6 @@ AnimFrameTable62:: ; b102d (2c:502d)
db 16, -23, 5, $0
db 16, -15, 6, $0
db 8, -15, 4, $0
-; 0xb1145
AnimData139:: ; b1145 (2c:5145)
frame_table AnimFrameTable63
@@ -1426,7 +1410,6 @@ AnimData139:: ; b1145 (2c:5145)
frame_data 0, 8, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb11b4
AnimFrameTable63:: ; b11b4 (2c:51b4)
dw .data_b11d2
@@ -1633,7 +1616,6 @@ AnimFrameTable63:: ; b11b4 (2c:51b4)
db 16, 16, 2, (1 << OAM_Y_FLIP)
db 8, 16, 4, (1 << OAM_Y_FLIP)
db 0, 16, 10, (1 << OAM_Y_FLIP)
-; 0xb1421
AnimData140:: ; b1421 (2c:5421)
frame_table AnimFrameTable64
@@ -1654,7 +1636,6 @@ AnimData140:: ; b1421 (2c:5421)
frame_data 14, 6, 0, 0
frame_data 14, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1468
AnimFrameTable64:: ; b1468 (2c:5468)
dw .data_b1486
@@ -1872,7 +1853,6 @@ AnimFrameTable64:: ; b1468 (2c:5468)
db -24, -16, 0, (1 << OAM_X_FLIP)
db -48, 24, 0, (1 << OAM_X_FLIP)
db -48, 64, 0, (1 << OAM_X_FLIP)
-; 0xb1701
AnimData141:: ; b1701 (2c:5701)
frame_table AnimFrameTable65
@@ -1890,7 +1870,6 @@ AnimData141:: ; b1701 (2c:5701)
frame_data 11, 16, 0, 0
frame_data 11, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb173c
AnimFrameTable65:: ; b173c (2c:573c)
dw .data_b1754
@@ -2149,7 +2128,6 @@ AnimFrameTable65:: ; b173c (2c:573c)
db -12, 8, 9, (1 << OAM_X_FLIP)
db -12, 0, 10, (1 << OAM_X_FLIP)
db -4, 8, 11, (1 << OAM_X_FLIP)
-; 0xb1aa0
AnimData142:: ; b1aa0 (2c:5aa0)
frame_table AnimFrameTable66
@@ -2162,7 +2140,6 @@ AnimData142:: ; b1aa0 (2c:5aa0)
frame_data 6, 26, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1ac7
AnimFrameTable66:: ; b1ac7 (2c:5ac7)
dw .data_b1ad5
@@ -2313,7 +2290,6 @@ AnimFrameTable66:: ; b1ac7 (2c:5ac7)
db 16, -8, 17, $0
db 16, 0, 18, $0
db 16, 8, 19, $0
-; 0xb1cbc
AnimData143:: ; b1cbc (2c:5cbc)
frame_table AnimFrameTable67
@@ -2338,7 +2314,6 @@ AnimData143:: ; b1cbc (2c:5cbc)
frame_data 1, 2, -20, -7
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1d13
AnimFrameTable67:: ; b1d13 (2c:5d13)
dw .data_b1d17
@@ -2387,7 +2362,6 @@ AnimFrameTable67:: ; b1d13 (2c:5d13)
db -71, -88, 1, (1 << OAM_X_FLIP)
db -72, -96, 2, (1 << OAM_X_FLIP)
db -64, -96, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb1db1
AnimData144:: ; b1db1 (2c:5db1)
frame_table AnimFrameTable68
@@ -2402,7 +2376,6 @@ AnimData144:: ; b1db1 (2c:5db1)
frame_data 1, 8, 8, -10
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1de0
AnimFrameTable68:: ; b1de0 (2c:5de0)
dw .data_b1de6
@@ -2443,7 +2416,6 @@ AnimFrameTable68:: ; b1de0 (2c:5de0)
db -7, 0, 12, (1 << OAM_X_FLIP)
db 1, 8, 13, (1 << OAM_X_FLIP)
db 1, 0, 14, (1 << OAM_X_FLIP)
-; 0xb1e51
AnimData145:: ; b1e51 (2c:5e51)
frame_table AnimFrameTable68
@@ -2479,7 +2451,6 @@ AnimData145:: ; b1e51 (2c:5e51)
frame_data 1, 3, 32, 0
frame_data 1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1ed4
AnimData146:: ; b1ed4 (2c:5ed4)
frame_table AnimFrameTable69
@@ -2502,7 +2473,6 @@ AnimData146:: ; b1ed4 (2c:5ed4)
frame_data 6, 9, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb1f23
AnimFrameTable69:: ; b1f23 (2c:5f23)
dw .data_b1f31
@@ -2614,7 +2584,6 @@ AnimFrameTable69:: ; b1f23 (2c:5f23)
db 8, -12, 6, (1 << OAM_X_FLIP)
db 16, 12, 5, (1 << OAM_X_FLIP)
db 24, 12, 6, (1 << OAM_X_FLIP)
-; 0xb207c
AnimData147:: ; b207c (2c:607c)
frame_table AnimFrameTable70
@@ -2640,7 +2609,6 @@ AnimData147:: ; b207c (2c:607c)
frame_data 7, 16, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb20d7
AnimFrameTable70:: ; b20d7 (2c:60d7)
dw .data_b20e7
@@ -2800,7 +2768,6 @@ AnimFrameTable70:: ; b20d7 (2c:60d7)
db 1, -8, 8, $0
db 1, 0, 9, $0
db 9, -5, 5, $0
-; 0xb22e3
AnimData148:: ; b22e3 (2c:62e3)
frame_table AnimFrameTable71
@@ -2809,7 +2776,6 @@ AnimData148:: ; b22e3 (2c:62e3)
frame_data 7, 8, 0, 0
frame_data 7, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb22fa
AnimFrameTable71:: ; b22fa (2c:62fa)
dw .data_b230a
@@ -2956,7 +2922,6 @@ AnimFrameTable71:: ; b22fa (2c:62fa)
db -32, -32, 4, $0
db 24, -32, 4, $0
db -4, -40, 4, $0
-; 0xb24d2
AnimData151:: ; b24d2 (2c:64d2)
frame_table AnimFrameTable72
@@ -2981,7 +2946,6 @@ AnimData151:: ; b24d2 (2c:64d2)
frame_data 2, 3, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2529
AnimFrameTable72:: ; b2529 (2c:6529)
dw .data_b2533
@@ -3051,7 +3015,6 @@ AnimFrameTable72:: ; b2529 (2c:6529)
db 0, 8, 1, $0
db -36, -32, 0, $0
db 4, -24, 0, $0
-; 0xb25f4
AnimData152:: ; b25f4 (2c:65f4)
frame_table AnimFrameTable72
@@ -3082,7 +3045,6 @@ AnimData152:: ; b25f4 (2c:65f4)
frame_data 3, 4, 8, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2663
AnimData153:: ; b2663 (2c:6663)
frame_table AnimFrameTable73
@@ -3107,7 +3069,6 @@ AnimData153:: ; b2663 (2c:6663)
frame_data 2, 3, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb26ba
AnimFrameTable73:: ; b26ba (2c:66ba)
dw .data_b26c0
@@ -3143,7 +3104,6 @@ AnimFrameTable73:: ; b26ba (2c:66ba)
db -28, 16, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -28, -8, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -28, -24, 0, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb2717
AnimData154:: ; b2717 (2c:6717)
frame_table AnimFrameTable74
@@ -3158,7 +3118,6 @@ AnimData154:: ; b2717 (2c:6717)
frame_data 2, 4, 0, 0
frame_data 2, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2746
AnimFrameTable74:: ; b2746 (2c:6746)
dw .data_b274c
@@ -3185,7 +3144,6 @@ AnimFrameTable74:: ; b2746 (2c:6746)
db -8, 0, 2, (1 << OAM_X_FLIP)
db 0, -8, 2, (1 << OAM_Y_FLIP)
db 0, 0, 2, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb277f
AnimData155:: ; b277f (2c:677f)
frame_table AnimFrameTable75
@@ -3204,7 +3162,6 @@ AnimData155:: ; b277f (2c:677f)
frame_data 6, 6, 0, 0
frame_data 6, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb27be
AnimFrameTable75:: ; b27be (2c:67be)
dw .data_b27cc
@@ -3335,7 +3292,6 @@ AnimFrameTable75:: ; b27be (2c:67be)
db 0, 7, 4, (1 << OAM_Y_FLIP)
db 0, -1, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -8, -1, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb2963
AnimData156:: ; b2963 (2c:6963)
frame_table AnimFrameTable76
@@ -3348,7 +3304,6 @@ AnimData156:: ; b2963 (2c:6963)
frame_data 3, 16, 0, 0
frame_data 3, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb298a
AnimFrameTable76:: ; b298a (2c:698a)
dw .data_b2992
@@ -3388,7 +3343,6 @@ AnimFrameTable76:: ; b298a (2c:698a)
db 1, 0, 1, (1 << OAM_X_FLIP)
db -7, -16, 5, $0
db -7, 8, 5, (1 << OAM_X_FLIP)
-; 0xb29ea
AnimData157:: ; b29ea (2c:69ea)
frame_table AnimFrameTable77
@@ -3436,7 +3390,6 @@ AnimData157:: ; b29ea (2c:69ea)
frame_data 5, 2, 0, 0
frame_data 5, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2a9d
AnimFrameTable77:: ; b2a9d (2c:6a9d)
dw .data_b2ab9
@@ -3695,7 +3648,6 @@ AnimFrameTable77:: ; b2a9d (2c:6a9d)
db 0, -32, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 1, -40, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db 2, -48, 1, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb2de7
AnimData158:: ; b2de7 (2c:6de7)
frame_table AnimFrameTable78
@@ -3709,7 +3661,6 @@ AnimData158:: ; b2de7 (2c:6de7)
frame_data 0, 6, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb2e12
AnimFrameTable78:: ; b2e12 (2c:6e12)
dw .data_b2e68
@@ -4228,7 +4179,6 @@ AnimFrameTable78:: ; b2e12 (2c:6e12)
db -57, -52, 1, $0
db -49, -60, 3, $0
db -49, -52, 3, (1 << OAM_X_FLIP)
-; 0xb33f3
AnimData159:: ; b33f3 (2c:73f3)
frame_table AnimFrameTable78
@@ -4242,7 +4192,6 @@ AnimData159:: ; b33f3 (2c:73f3)
frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb341e
AnimData160:: ; b341e (2c:741e)
frame_table AnimFrameTable78
@@ -4256,7 +4205,6 @@ AnimData160:: ; b341e (2c:741e)
frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3449
AnimData161:: ; b3449 (2c:7449)
frame_table AnimFrameTable78
@@ -4270,7 +4218,6 @@ AnimData161:: ; b3449 (2c:7449)
frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3474
AnimData163:: ; b3474 (2c:7474)
frame_table AnimFrameTable78
@@ -4282,7 +4229,6 @@ AnimData163:: ; b3474 (2c:7474)
frame_data 30, 6, 0, 0
frame_data 30, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3497
AnimData164:: ; b3497 (2c:7497)
frame_table AnimFrameTable78
@@ -4294,7 +4240,6 @@ AnimData164:: ; b3497 (2c:7497)
frame_data 36, 6, 0, 0
frame_data 36, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb34ba
AnimData165:: ; b34ba (2c:74ba)
frame_table AnimFrameTable78
@@ -4306,7 +4251,6 @@ AnimData165:: ; b34ba (2c:74ba)
frame_data 42, 6, 0, 0
frame_data 42, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb34dd
AnimData167:: ; b34dd (2c:74dd)
frame_table AnimFrameTable79
@@ -4319,7 +4263,6 @@ AnimData167:: ; b34dd (2c:74dd)
frame_data 2, 4, 0, 0
frame_data 6, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3504
AnimFrameTable79:: ; b3504 (2c:7504)
dw .data_b3512
@@ -4395,7 +4338,6 @@ AnimFrameTable79:: ; b3504 (2c:7504)
db -8, -12, 19, (1 << OAM_Y_FLIP)
db -8, -4, 20, (1 << OAM_Y_FLIP)
db -8, 4, 19, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb35cd
AnimData168:: ; b35cd (2c:75cd)
frame_table AnimFrameTable79
@@ -4434,7 +4376,6 @@ AnimData168:: ; b35cd (2c:75cd)
frame_data 0, 2, 0, 5
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb365c
AnimData169:: ; b365c (2c:765c)
frame_table AnimFrameTable79
@@ -4473,26 +4414,22 @@ AnimData169:: ; b365c (2c:765c)
frame_data 4, 2, 0, 5
frame_data 4, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb36eb
AnimData170:: ; b36eb (2c:76eb)
frame_table AnimFrameTable79
frame_data 0, 1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb36f6
AnimData171:: ; b36f6 (2c:76f6)
frame_table AnimFrameTable79
frame_data 4, 1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3701
AnimData172:: ; b3701 (2c:7701)
frame_table AnimFrameTable80
frame_data 1, 30, 0, 0
frame_data -1, 30, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3710
AnimFrameTable80:: ; b3710 (2c:7710)
dw .data_b3716
@@ -4623,21 +4560,18 @@ AnimFrameTable80:: ; b3710 (2c:7710)
db -20, -40, 15, $0
db -12, -40, 31, $0
db -4, -40, 47, $0
-; 0xb38e9
AnimData173:: ; b38e9 (2c:78e9)
frame_table AnimFrameTable80
frame_data 0, 30, 0, 0
frame_data -1, 30, 0, 0
frame_data 0, 0, 0, 0
-; 0xb38f8
AnimData174:: ; b38f8 (2c:78f8)
frame_table AnimFrameTable80
frame_data 2, 30, 0, 0
frame_data -1, 30, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3907
AnimData175:: ; b3907 (2c:7907)
frame_table AnimFrameTable81
@@ -4654,7 +4588,6 @@ AnimData175:: ; b3907 (2c:7907)
frame_data 9, 4, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb393e
AnimFrameTable81:: ; b393e (2c:793e)
dw .data_b3982
@@ -5021,7 +4954,6 @@ AnimFrameTable81:: ; b393e (2c:793e)
db -32, 6, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -32, -2, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -40, 6, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb3d34
AnimData176:: ; b3d34 (2c:7d34)
frame_table AnimFrameTable81
@@ -5060,14 +4992,12 @@ AnimData176:: ; b3d34 (2c:7d34)
frame_data 21, 6, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3dc3
AnimData177:: ; b3dc3 (2c:7dc3)
frame_table AnimFrameTable81
frame_data 33, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3dd2
AnimData179:: ; b3dd2 (2c:7dd2)
frame_table AnimFrameTable82
@@ -5106,49 +5036,42 @@ AnimData179:: ; b3dd2 (2c:7dd2)
frame_data 21, 6, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e61
AnimData180:: ; b3e61 (2c:7e61)
frame_table AnimFrameTable82
frame_data 33, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e70
AnimData182:: ; b3e70 (2c:7e70)
frame_table AnimFrameTable83
frame_data 18, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e7f
AnimData184:: ; b3e7f (2c:7e7f)
frame_table AnimFrameTable84
frame_data 18, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e8e
AnimData186:: ; b3e8e (2c:7e8e)
frame_table AnimFrameTable85
frame_data 8, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3e9d
AnimData188:: ; b3e9d (2c:7e9d)
frame_table AnimFrameTable86
frame_data 8, 8, 0, 0
frame_data -1, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3eac
AnimData189:: ; b3eac (2c:7eac)
frame_table AnimFrameTable87
frame_data 0, 1, 0, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3ebb
AnimFrameTable87:: ; b3ebb (2c:7ebb)
dw .data_b3ebd
@@ -5187,14 +5110,12 @@ AnimFrameTable87:: ; b3ebb (2c:7ebb)
db 24, 40, 29, $0
db 24, 48, 30, $0
db 24, 56, 31, $0
-; 0xb3f3e
AnimData190:: ; b3f3e (2c:7f3e)
frame_table AnimFrameTable88
frame_data 0, 37, 0, 0
frame_data -1, 26, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3f4d
AnimFrameTable88:: ; b3f4d (2c:7f4d)
dw .data_b3f4f
@@ -5221,7 +5142,6 @@ AnimFrameTable88:: ; b3f4d (2c:7f4d)
db 6, 73, 19, $0
db 6, 65, 18, $0
db 6, 57, 17, $0
-; 0xb3fa0
AnimData196:: ; b3fa0 (2c:7fa0)
frame_table AnimFrameTable91
@@ -5243,4 +5163,3 @@ AnimData196:: ; b3fa0 (2c:7fa0)
frame_data 0, 1, 3, 1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb3feb
diff --git a/src/data/anims4.asm b/src/data/anims4.asm
index 0d71da2..b4b193f 100644
--- a/src/data/anims4.asm
+++ b/src/data/anims4.asm
@@ -13,7 +13,6 @@ AnimData178:: ; b4000 (2d:4000)
frame_data 9, 4, 0, 0
frame_data -1, 6, 0, 0
frame_data 0, 0, 0, 0
-; 0xb4037
AnimFrameTable82:: ; b4037 (2d:4037)
dw .data_b407b
@@ -380,7 +379,6 @@ AnimFrameTable82:: ; b4037 (2d:4037)
db -32, 6, 8, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -32, -2, 9, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -40, 6, 10, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb442d
AnimData181:: ; b442d (2d:442d)
frame_table AnimFrameTable83
@@ -404,7 +402,6 @@ AnimData181:: ; b442d (2d:442d)
frame_data 17, 4, 0, 0
frame_data -1, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xb4480
AnimFrameTable83:: ; b4480 (2d:4480)
dw .data_b44a6
@@ -837,7 +834,6 @@ AnimFrameTable83:: ; b4480 (2d:4480)
db -8, 6, 3, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -8, -2, 4, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -16, 6, 5, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb4a41
AnimData183:: ; b4a41 (2d:4a41)
frame_table AnimFrameTable84
@@ -861,7 +857,6 @@ AnimData183:: ; b4a41 (2d:4a41)
frame_data 17, 4, 0, 0
frame_data -1, 4, 0, 0
frame_data 0, 0, 0, 0
-; 0xb4a94
AnimFrameTable84:: ; b4a94 (2d:4a94)
dw .data_b4aba
@@ -1294,7 +1289,6 @@ AnimFrameTable84:: ; b4a94 (2d:4a94)
db -8, 6, 3, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -8, -2, 4, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
db -16, 6, 5, (1 << OAM_X_FLIP) | (1 << OAM_Y_FLIP)
-; 0xb5055
AnimData185:: ; b5055 (2d:5055)
frame_table AnimFrameTable85
@@ -1307,7 +1301,6 @@ AnimData185:: ; b5055 (2d:5055)
frame_data 6, 8, 0, 0
frame_data 7, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb507c
AnimFrameTable85:: ; b507c (2d:507c)
dw .data_b508e
@@ -1464,7 +1457,6 @@ AnimFrameTable85:: ; b507c (2d:507c)
db 0, 6, 20, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, -2, 21, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 6, 18, %001 | (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xb526f
AnimData187:: ; b526f (2d:526f)
frame_table AnimFrameTable86
@@ -1477,7 +1469,6 @@ AnimData187:: ; b526f (2d:526f)
frame_data 6, 8, 0, 0
frame_data 7, 8, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5296
AnimFrameTable86:: ; b5296 (2d:5296)
dw .data_b52a8
@@ -1634,14 +1625,12 @@ AnimFrameTable86:: ; b5296 (2d:5296)
db 0, -2, 21, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 0, 6, 20, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
db 8, 6, 18, (1 << OAM_OBP_NUM) | (1 << OAM_X_FLIP)
-; 0xb5489
AnimData191:: ; b5489 (2d:5489)
frame_table AnimFrameTable89
frame_data 0, 37, 0, 0
frame_data -1, 26, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5498
AnimFrameTable89:: ; b5498 (2d:5498)
dw .data_b549a
@@ -1668,7 +1657,6 @@ AnimFrameTable89:: ; b5498 (2d:5498)
db 6, 73, 19, $0
db 6, 65, 18, $0
db 6, 57, 17, $0
-; 0xb54eb
AnimData192:: ; b54eb (2d:54eb)
frame_table AnimFrameTable90
@@ -1762,7 +1750,6 @@ AnimData192:: ; b54eb (2d:54eb)
frame_data 0, 1, 2, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5656
AnimFrameTable90:: ; b5656 (2d:5656)
dw .data_b5658
@@ -1773,7 +1760,6 @@ AnimFrameTable90:: ; b5656 (2d:5656)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb5669
AnimData193:: ; b5669 (2d:5669)
frame_table AnimFrameTable90
@@ -1867,7 +1853,6 @@ AnimData193:: ; b5669 (2d:5669)
frame_data 0, 1, -2, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb57d4
AnimData194:: ; b57d4 (2d:57d4)
frame_table AnimFrameTable91
@@ -1991,7 +1976,6 @@ AnimData194:: ; b57d4 (2d:57d4)
frame_data 0, 1, 0, 2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb59b7
AnimFrameTable91:: ; b59b7 (2d:59b7)
dw .data_b59b9
@@ -2002,7 +1986,6 @@ AnimFrameTable91:: ; b59b7 (2d:59b7)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb59ca
AnimData195:: ; b59ca (2d:59ca)
frame_table AnimFrameTable91
@@ -2055,7 +2038,6 @@ AnimData195:: ; b59ca (2d:59ca)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5a91
AnimData197:: ; b5a91 (2d:5a91)
frame_table AnimFrameTable92
@@ -2197,7 +2179,6 @@ AnimData197:: ; b5a91 (2d:5a91)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5cbc
AnimFrameTable92:: ; b5cbc (2d:5cbc)
dw .data_b5cbe
@@ -2208,7 +2189,6 @@ AnimFrameTable92:: ; b5cbc (2d:5cbc)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb5ccf
AnimData198:: ; b5ccf (2d:5ccf)
frame_table AnimFrameTable92
@@ -2276,7 +2256,6 @@ AnimData198:: ; b5ccf (2d:5ccf)
frame_data 0, 17, -2, -1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5dd2
AnimData199:: ; b5dd2 (2d:5dd2)
frame_table AnimFrameTable92
@@ -2288,7 +2267,6 @@ AnimData199:: ; b5dd2 (2d:5dd2)
frame_data 0, 1, -1, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5df5
AnimData200:: ; b5df5 (2d:5df5)
frame_table AnimFrameTable93
@@ -2420,7 +2398,6 @@ AnimData200:: ; b5df5 (2d:5df5)
frame_data 0, 1, 0, 2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb5ff8
AnimFrameTable93:: ; b5ff8 (2d:5ff8)
dw .data_b5ffa
@@ -2431,7 +2408,6 @@ AnimFrameTable93:: ; b5ff8 (2d:5ff8)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb600b
AnimData201:: ; b600b (2d:600b)
frame_table AnimFrameTable93
@@ -2484,7 +2460,6 @@ AnimData201:: ; b600b (2d:600b)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb60d2
AnimData202:: ; b60d2 (2d:60d2)
frame_table AnimFrameTable93
@@ -2506,7 +2481,6 @@ AnimData202:: ; b60d2 (2d:60d2)
frame_data 0, 1, -3, 1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb611d
AnimData203:: ; b611d (2d:611d)
frame_table AnimFrameTable94
@@ -2604,7 +2578,6 @@ AnimData203:: ; b611d (2d:611d)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6298
AnimFrameTable94:: ; b6298 (2d:6298)
dw .data_b629a
@@ -2615,7 +2588,6 @@ AnimFrameTable94:: ; b6298 (2d:6298)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb62ab
AnimData204:: ; b62ab (2d:62ab)
frame_table AnimFrameTable94
@@ -2693,7 +2665,6 @@ AnimData204:: ; b62ab (2d:62ab)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb63d6
AnimData205:: ; b63d6 (2d:63d6)
frame_table AnimFrameTable94
@@ -2709,7 +2680,6 @@ AnimData205:: ; b63d6 (2d:63d6)
frame_data 0, 1, 1, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6409
AnimData206:: ; b6409 (2d:6409)
frame_table AnimFrameTable95
@@ -2815,7 +2785,6 @@ AnimData206:: ; b6409 (2d:6409)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb65a4
AnimFrameTable95:: ; b65a4 (2d:65a4)
dw .data_b65a6
@@ -2826,7 +2795,6 @@ AnimFrameTable95:: ; b65a4 (2d:65a4)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb65b7
AnimData207:: ; b65b7 (2d:65b7)
frame_table AnimFrameTable95
@@ -2904,7 +2872,6 @@ AnimData207:: ; b65b7 (2d:65b7)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb66e2
AnimData208:: ; b66e2 (2d:66e2)
frame_table AnimFrameTable95
@@ -2920,7 +2887,6 @@ AnimData208:: ; b66e2 (2d:66e2)
frame_data 0, 1, -1, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6715
AnimData209:: ; b6715 (2d:6715)
frame_table AnimFrameTable96
@@ -3054,7 +3020,6 @@ AnimData209:: ; b6715 (2d:6715)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6920
AnimFrameTable96:: ; b6920 (2d:6920)
dw .data_b6922
@@ -3065,7 +3030,6 @@ AnimFrameTable96:: ; b6920 (2d:6920)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb6933
AnimData210:: ; b6933 (2d:6933)
frame_table AnimFrameTable96
@@ -3133,7 +3097,6 @@ AnimData210:: ; b6933 (2d:6933)
frame_data 0, 17, 2, -1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6a36
AnimData211:: ; b6a36 (2d:6a36)
frame_table AnimFrameTable96
@@ -3145,7 +3108,6 @@ AnimData211:: ; b6a36 (2d:6a36)
frame_data 0, 1, 1, 0
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6a59
AnimData212:: ; b6a59 (2d:6a59)
frame_table AnimFrameTable97
@@ -3243,7 +3205,6 @@ AnimData212:: ; b6a59 (2d:6a59)
frame_data 0, 1, 0, 2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6bd4
AnimFrameTable97:: ; b6bd4 (2d:6bd4)
dw .data_b6bd6
@@ -3254,7 +3215,6 @@ AnimFrameTable97:: ; b6bd4 (2d:6bd4)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb6be7
AnimData213:: ; b6be7 (2d:6be7)
frame_table AnimFrameTable97
@@ -3307,7 +3267,6 @@ AnimData213:: ; b6be7 (2d:6be7)
frame_data 0, 1, 0, -2
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6cae
AnimData214:: ; b6cae (2d:6cae)
frame_table AnimFrameTable97
@@ -3343,7 +3302,6 @@ AnimData214:: ; b6cae (2d:6cae)
frame_data 0, 1, 0, 1
frame_data 0, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb6d31
AnimData215:: ; b6d31 (2d:6d31)
frame_table AnimFrameTable98
@@ -3547,7 +3505,6 @@ AnimData215:: ; b6d31 (2d:6d31)
frame_data 0, 1, -1, -1
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb7054
AnimFrameTable98:: ; b7054 (2d:7054)
dw .data_b7056
@@ -3558,7 +3515,6 @@ AnimFrameTable98:: ; b7054 (2d:7054)
db 0, 8, 1, $0
db 8, 0, 2, $0
db 8, 8, 3, $0
-; 0xb7067
AnimData216:: ; b7067 (2d:7067)
frame_table AnimFrameTable98
@@ -3762,4 +3718,3 @@ AnimData216:: ; b7067 (2d:7067)
frame_data 0, 1, -1, -1
frame_data -1, -1, 0, 0
frame_data 0, 0, 0, 0
-; 0xb738a
diff --git a/src/data/auto_deck_card_lists.asm b/src/data/auto_deck_card_lists.asm
index 8dbf6e5..e53ff22 100644
--- a/src/data/auto_deck_card_lists.asm
+++ b/src/data/auto_deck_card_lists.asm
@@ -1156,4 +1156,3 @@ MysteriousPokemonCardList: ; 1b8c3 (6:78c3)
db 2, SWITCH
db 1, POKEMON_CENTER
db 0 ; end of list
-; 0x1b8e8
diff --git a/src/data/auto_deck_machines.asm b/src/data/auto_deck_machines.asm
index 17ca823..2eccbf1 100644
--- a/src/data/auto_deck_machines.asm
+++ b/src/data/auto_deck_machines.asm
@@ -79,4 +79,3 @@ AutoDeckMachineEntries: ; 1b8e8 (6:78e8)
auto_deck LegendaryArticunoCardList, LegendaryArticunoText, LegendaryArticunoDescriptionText
auto_deck LegendaryDragoniteCardList, LegendaryDragoniteText, LegendaryDragoniteDescriptionText
auto_deck MysteriousPokemonCardList, MysteriousPokemonText, MysteriousPokemonDescriptionText
-; 0x1ba14
diff --git a/src/data/duel_animations.asm b/src/data/duel_animations.asm
index 49ed364..278e106 100644
--- a/src/data/duel_animations.asm
+++ b/src/data/duel_animations.asm
@@ -775,4 +775,3 @@ Animations: ; 1ce32 (7:4e32)
db (1 << SPRITE_ANIM_FLAG_UNSKIPPABLE) | (1 << SPRITE_ANIM_FLAG_SPEED) ; anim flags
db SFX_STOP ; sound FX ID
db $00 ; handler function
-; 0x1d078
diff --git a/src/data/map_ow_frameset_pointers.asm b/src/data/map_ow_frameset_pointers.asm
index 3210533..732fb5b 100644
--- a/src/data/map_ow_frameset_pointers.asm
+++ b/src/data/map_ow_frameset_pointers.asm
@@ -34,4 +34,3 @@ MapOWFramesetPointers: ; 805d6 (20:45d6)
dw DefaultOWFrameset, DefaultOWFrameset ; POKEMON_DOME_ENTRANCE
dw DefaultOWFrameset, DefaultOWFrameset ; POKEMON_DOME
dw HallOfHonorOWFrameset, HallOfHonorOWFrameset ; HALL_OF_HONOR
-; 0x8065e
diff --git a/src/data/map_ow_framesets.asm b/src/data/map_ow_framesets.asm
index dec17be..261836c 100644
--- a/src/data/map_ow_framesets.asm
+++ b/src/data/map_ow_framesets.asm
@@ -242,4 +242,3 @@ HallOfHonorOWFrameset: ; 80b36 (20:4b36)
ow_frame 0, $a6, 0, HallOfHonorTilesetGfx, $2e
ow_frame 0, $a7, 0, HallOfHonorTilesetGfx, $2f
db -1 ; end
-; 0x80b7a
diff --git a/src/data/overworld_indexes.asm b/src/data/overworld_indexes.asm
index 86f20c2..dfc7b85 100644
--- a/src/data/overworld_indexes.asm
+++ b/src/data/overworld_indexes.asm
@@ -5,15 +5,15 @@
; 4: 00
OverworldMapIndexes: ; 10f88 (4:4f88)
db $00, $00, $00, $00
- db MASON_LABORATORY, $0E, $1A, $00
+ db MASON_LABORATORY, $0e, $1a, $00
db ISHIHARAS_HOUSE, $08, $14, $00
- db FIGHTING_CLUB_ENTRANCE, $08, $0E, $00
- db ROCK_CLUB_ENTRANCE, $08, $0E, $00
- db WATER_CLUB_ENTRANCE, $08, $0E, $00
- db LIGHTNING_CLUB_ENTRANCE, $08, $0E, $00
- db GRASS_CLUB_ENTRANCE, $08, $0E, $00
- db PSYCHIC_CLUB_ENTRANCE, $08, $0E, $00
- db SCIENCE_CLUB_ENTRANCE, $08, $0E, $00
- db FIRE_CLUB_ENTRANCE, $08, $0E, $00
- db CHALLENGE_HALL_ENTRANCE, $08, $0E, $00
- db POKEMON_DOME_ENTRANCE, $0E, $0E, $00
+ db FIGHTING_CLUB_ENTRANCE, $08, $0e, $00
+ db ROCK_CLUB_ENTRANCE, $08, $0e, $00
+ db WATER_CLUB_ENTRANCE, $08, $0e, $00
+ db LIGHTNING_CLUB_ENTRANCE, $08, $0e, $00
+ db GRASS_CLUB_ENTRANCE, $08, $0e, $00
+ db PSYCHIC_CLUB_ENTRANCE, $08, $0e, $00
+ db SCIENCE_CLUB_ENTRANCE, $08, $0e, $00
+ db FIRE_CLUB_ENTRANCE, $08, $0e, $00
+ db CHALLENGE_HALL_ENTRANCE, $08, $0e, $00
+ db POKEMON_DOME_ENTRANCE, $0e, $0e, $00
diff --git a/src/data/sequences/credits_sequence.asm b/src/data/sequences/credits_sequence.asm
index 2c12413..e7dcd37 100644
--- a/src/data/sequences/credits_sequence.asm
+++ b/src/data/sequences/credits_sequence.asm
@@ -397,4 +397,3 @@ CreditsSequence: ; 1daef (7:5aef)
credits_seq_fade_in
credits_seq_wait 225
credits_seq_end
-; 0x1e1c4
diff --git a/src/data/sequences/opening_sequence.asm b/src/data/sequences/opening_sequence.asm
index 1a25c31..a9f8e3a 100644
--- a/src/data/sequences/opening_sequence.asm
+++ b/src/data/sequences/opening_sequence.asm
@@ -45,4 +45,3 @@ OpeningSequence: ; 1d59d (7:559d)
opening_seq_play_title_screen_music
opening_seq_wait 60
opening_seq_end
-; 0x1d614
diff --git a/src/data/warps.asm b/src/data/warps.asm
index 828db63..6261122 100644
--- a/src/data/warps.asm
+++ b/src/data/warps.asm
@@ -43,208 +43,208 @@ WarpDataPointers: ; 1c099 (7:4099)
; 5: y coordinate of connected map
; double null terminated
MasonLaboratoryWarpData: ; 1c0dd (7:40dd)
- db $0E, $1C, OVERWORLD_MAP, $00, $00
- db $10, $1C, OVERWORLD_MAP, $00, $00
- db $1A, $0A, DECK_MACHINE_ROOM, $02, $0A
- db $1A, $0C, DECK_MACHINE_ROOM, $02, $0C
+ db $0e, $1c, OVERWORLD_MAP, $00, $00
+ db $10, $1c, OVERWORLD_MAP, $00, $00
+ db $1a, $0a, DECK_MACHINE_ROOM, $02, $0a
+ db $1a, $0c, DECK_MACHINE_ROOM, $02, $0c
db $00, $00
DeckMachineRoomWarpData: ; 1c0f3 (7:40f3)
- db $00, $0A, MASON_LABORATORY, $18, $0A
- db $00, $0C, MASON_LABORATORY, $18, $0C
+ db $00, $0a, MASON_LABORATORY, $18, $0a
+ db $00, $0c, MASON_LABORATORY, $18, $0c
db $00, $00
IshiharasHouseWarpData: ; 1c0ff (7:40ff)
db $08, $16, OVERWORLD_MAP, $00, $00
- db $0A, $16, OVERWORLD_MAP, $00, $00
+ db $0a, $16, OVERWORLD_MAP, $00, $00
db $00, $00
FightingClubEntranceWarpData: ; 1c10b (7:410b)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, FIGHTING_CLUB_LOBBY, $18, $0A
- db $00, $08, FIGHTING_CLUB_LOBBY, $18, $0C
- db $08, $00, FIGHTING_CLUB, $0A, $0E
- db $0A, $00, FIGHTING_CLUB, $0C, $0E
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, FIGHTING_CLUB_LOBBY, $18, $0a
+ db $00, $08, FIGHTING_CLUB_LOBBY, $18, $0c
+ db $08, $00, FIGHTING_CLUB, $0a, $0e
+ db $0a, $00, FIGHTING_CLUB, $0c, $0e
db $00, $00
FightingClubLobbyWarpData: ; 1c12b (7:412b)
- db $1A, $0A, FIGHTING_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, FIGHTING_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, FIGHTING_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, FIGHTING_CLUB_ENTRANCE, $02, $08
db $00, $00
FightingClubWarpData: ; 1c137 (7:4137)
- db $0A, $10, FIGHTING_CLUB_ENTRANCE, $08, $02
- db $0C, $10, FIGHTING_CLUB_ENTRANCE, $0A, $02
+ db $0a, $10, FIGHTING_CLUB_ENTRANCE, $08, $02
+ db $0c, $10, FIGHTING_CLUB_ENTRANCE, $0a, $02
db $00, $00
RockClubEntranceWarpData: ; 1c143 (7:4143)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, ROCK_CLUB_LOBBY, $18, $0A
- db $00, $08, ROCK_CLUB_LOBBY, $18, $0C
- db $08, $00, ROCK_CLUB, $0C, $1A
- db $0A, $00, ROCK_CLUB, $0E, $1A
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, ROCK_CLUB_LOBBY, $18, $0a
+ db $00, $08, ROCK_CLUB_LOBBY, $18, $0c
+ db $08, $00, ROCK_CLUB, $0c, $1a
+ db $0a, $00, ROCK_CLUB, $0e, $1a
db $00, $00
RockClubLobbyWarpData: ; 1c163 (7:4163)
- db $1A, $0A, ROCK_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, ROCK_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, ROCK_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, ROCK_CLUB_ENTRANCE, $02, $08
db $00, $00
RockClubWarpData: ; 1c16f (7:416f)
- db $0C, $1C, ROCK_CLUB_ENTRANCE, $08, $02
- db $0E, $1C, ROCK_CLUB_ENTRANCE, $0A, $02
+ db $0c, $1c, ROCK_CLUB_ENTRANCE, $08, $02
+ db $0e, $1c, ROCK_CLUB_ENTRANCE, $0a, $02
db $00, $00
WaterClubEntranceWarpData: ; 1c17b (7:417b)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, WATER_CLUB_LOBBY, $18, $0A
- db $00, $08, WATER_CLUB_LOBBY, $18, $0C
- db $08, $00, WATER_CLUB, $0C, $1C
- db $0A, $00, WATER_CLUB, $0E, $1C
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, WATER_CLUB_LOBBY, $18, $0a
+ db $00, $08, WATER_CLUB_LOBBY, $18, $0c
+ db $08, $00, WATER_CLUB, $0c, $1c
+ db $0a, $00, WATER_CLUB, $0e, $1c
db $00, $00
WaterClubLobbyWarpData: ; 1c19b (7:419b)
- db $1A, $0A, WATER_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, WATER_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, WATER_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, WATER_CLUB_ENTRANCE, $02, $08
db $00, $00
WaterClubWarpData: ; 1c1a7 (7:41a7)
- db $0C, $1E, WATER_CLUB_ENTRANCE, $08, $02
- db $0E, $1E, WATER_CLUB_ENTRANCE, $0A, $02
+ db $0c, $1e, WATER_CLUB_ENTRANCE, $08, $02
+ db $0e, $1e, WATER_CLUB_ENTRANCE, $0a, $02
db $00, $00
LightningClubEntranceWarpData: ; 1c1b3 (7:41b3)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, LIGHTNING_CLUB_LOBBY, $18, $0A
- db $00, $08, LIGHTNING_CLUB_LOBBY, $18, $0C
- db $08, $00, LIGHTNING_CLUB, $0C, $1C
- db $0A, $00, LIGHTNING_CLUB, $0E, $1C
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, LIGHTNING_CLUB_LOBBY, $18, $0a
+ db $00, $08, LIGHTNING_CLUB_LOBBY, $18, $0c
+ db $08, $00, LIGHTNING_CLUB, $0c, $1c
+ db $0a, $00, LIGHTNING_CLUB, $0e, $1c
db $00, $00
LightningClubLobbyWarpData: ; 1c1d3 (7:41d3)
- db $1A, $0A, LIGHTNING_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, LIGHTNING_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, LIGHTNING_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, LIGHTNING_CLUB_ENTRANCE, $02, $08
db $00, $00
LightningClubWarpData: ; 1c1df (7:41df)
- db $0C, $1E, LIGHTNING_CLUB_ENTRANCE, $08, $02
- db $0E, $1E, LIGHTNING_CLUB_ENTRANCE, $0A, $02
+ db $0c, $1e, LIGHTNING_CLUB_ENTRANCE, $08, $02
+ db $0e, $1e, LIGHTNING_CLUB_ENTRANCE, $0a, $02
db $00, $00
GrassClubEntranceWarpData: ; 1c1eb (7:41eb)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, GRASS_CLUB_LOBBY, $18, $0A
- db $00, $08, GRASS_CLUB_LOBBY, $18, $0C
- db $08, $00, GRASS_CLUB, $0C, $1C
- db $0A, $00, GRASS_CLUB, $0E, $1C
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, GRASS_CLUB_LOBBY, $18, $0a
+ db $00, $08, GRASS_CLUB_LOBBY, $18, $0c
+ db $08, $00, GRASS_CLUB, $0c, $1c
+ db $0a, $00, GRASS_CLUB, $0e, $1c
db $00, $00
GrassClubLobbyWarpData: ; 1c20b (7:420b)
- db $1A, $0A, GRASS_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, GRASS_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, GRASS_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, GRASS_CLUB_ENTRANCE, $02, $08
db $00, $00
GrassClubWarpData: ; 1c217 (7:4217)
- db $0C, $1E, GRASS_CLUB_ENTRANCE, $08, $02
- db $0E, $1E, GRASS_CLUB_ENTRANCE, $0A, $02
+ db $0c, $1e, GRASS_CLUB_ENTRANCE, $08, $02
+ db $0e, $1e, GRASS_CLUB_ENTRANCE, $0a, $02
db $00, $00
PsychicClubEntranceWarpData: ; 1c223 (7:4223)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, PSYCHIC_CLUB_LOBBY, $18, $0A
- db $00, $08, PSYCHIC_CLUB_LOBBY, $18, $0C
- db $08, $00, PSYCHIC_CLUB, $0C, $18
- db $0A, $00, PSYCHIC_CLUB, $0E, $18
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, PSYCHIC_CLUB_LOBBY, $18, $0a
+ db $00, $08, PSYCHIC_CLUB_LOBBY, $18, $0c
+ db $08, $00, PSYCHIC_CLUB, $0c, $18
+ db $0a, $00, PSYCHIC_CLUB, $0e, $18
db $00, $00
PsychicClubLobbyWarpData: ; 1c243 (7:4243)
- db $1A, $0A, PSYCHIC_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, PSYCHIC_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, PSYCHIC_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, PSYCHIC_CLUB_ENTRANCE, $02, $08
db $00, $00
PsychicClubWarpData: ; 1c24f (7:424f)
- db $0C, $1A, PSYCHIC_CLUB_ENTRANCE, $08, $02
- db $0E, $1A, PSYCHIC_CLUB_ENTRANCE, $0A, $02
+ db $0c, $1a, PSYCHIC_CLUB_ENTRANCE, $08, $02
+ db $0e, $1a, PSYCHIC_CLUB_ENTRANCE, $0a, $02
db $00, $00
ScienceClubEntranceWarpData: ; 1c25b (7:425b)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, SCIENCE_CLUB_LOBBY, $18, $0A
- db $00, $08, SCIENCE_CLUB_LOBBY, $18, $0C
- db $08, $00, SCIENCE_CLUB, $0C, $1C
- db $0A, $00, SCIENCE_CLUB, $0E, $1C
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, SCIENCE_CLUB_LOBBY, $18, $0a
+ db $00, $08, SCIENCE_CLUB_LOBBY, $18, $0c
+ db $08, $00, SCIENCE_CLUB, $0c, $1c
+ db $0a, $00, SCIENCE_CLUB, $0e, $1c
db $00, $00
ScienceClubLobbyWarpData: ; 1c27b (7:427b)
- db $1A, $0A, SCIENCE_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, SCIENCE_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, SCIENCE_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, SCIENCE_CLUB_ENTRANCE, $02, $08
db $00, $00
ScienceClubWarpData: ; 1c287 (7:4287)
- db $0C, $1E, SCIENCE_CLUB_ENTRANCE, $08, $02
- db $0E, $1E, SCIENCE_CLUB_ENTRANCE, $0A, $02
+ db $0c, $1e, SCIENCE_CLUB_ENTRANCE, $08, $02
+ db $0e, $1e, SCIENCE_CLUB_ENTRANCE, $0a, $02
db $00, $00
FireClubEntranceWarpData: ; 1c293 (7:4293)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, FIRE_CLUB_LOBBY, $18, $0A
- db $00, $08, FIRE_CLUB_LOBBY, $18, $0C
- db $08, $00, FIRE_CLUB, $0C, $1C
- db $0A, $00, FIRE_CLUB, $0E, $1C
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, FIRE_CLUB_LOBBY, $18, $0a
+ db $00, $08, FIRE_CLUB_LOBBY, $18, $0c
+ db $08, $00, FIRE_CLUB, $0c, $1c
+ db $0a, $00, FIRE_CLUB, $0e, $1c
db $00, $00
FireClubLobbyWarpData: ; 1c2b3 (7:42b3)
- db $1A, $0A, FIRE_CLUB_ENTRANCE, $02, $06
- db $1A, $0C, FIRE_CLUB_ENTRANCE, $02, $08
+ db $1a, $0a, FIRE_CLUB_ENTRANCE, $02, $06
+ db $1a, $0c, FIRE_CLUB_ENTRANCE, $02, $08
db $00, $00
FireClubWarpData: ; 1c2bf (7:42bf)
- db $0C, $1E, FIRE_CLUB_ENTRANCE, $08, $02
- db $0E, $1E, FIRE_CLUB_ENTRANCE, $0A, $02
+ db $0c, $1e, FIRE_CLUB_ENTRANCE, $08, $02
+ db $0e, $1e, FIRE_CLUB_ENTRANCE, $0a, $02
db $00, $00
ChallengeHallEntranceWarpData: ; 1c2cb (7:42cb)
db $08, $10, OVERWORLD_MAP, $00, $00
- db $0A, $10, OVERWORLD_MAP, $00, $00
- db $00, $06, CHALLENGE_HALL_LOBBY, $18, $0A
- db $00, $08, CHALLENGE_HALL_LOBBY, $18, $0C
- db $08, $00, CHALLENGE_HALL, $0E, $1C
- db $0A, $00, CHALLENGE_HALL, $10, $1C
+ db $0a, $10, OVERWORLD_MAP, $00, $00
+ db $00, $06, CHALLENGE_HALL_LOBBY, $18, $0a
+ db $00, $08, CHALLENGE_HALL_LOBBY, $18, $0c
+ db $08, $00, CHALLENGE_HALL, $0e, $1c
+ db $0a, $00, CHALLENGE_HALL, $10, $1c
db $00, $00
ChallengeHallLobbyWarpData: ; 1c2eb (7:42eb)
- db $1A, $0A, CHALLENGE_HALL_ENTRANCE, $02, $06
- db $1A, $0C, CHALLENGE_HALL_ENTRANCE, $02, $08
+ db $1a, $0a, CHALLENGE_HALL_ENTRANCE, $02, $06
+ db $1a, $0c, CHALLENGE_HALL_ENTRANCE, $02, $08
db $00, $00
ChallengeHallWarpData: ; 1c2f7 (7:42f7)
- db $0E, $1E, CHALLENGE_HALL_ENTRANCE, $08, $02
- db $10, $1E, CHALLENGE_HALL_ENTRANCE, $0A, $02
+ db $0e, $1e, CHALLENGE_HALL_ENTRANCE, $08, $02
+ db $10, $1e, CHALLENGE_HALL_ENTRANCE, $0a, $02
db $00, $00
PokemonDomeEntranceWarpData: ; 1c303 (7:4303)
- db $0E, $10, OVERWORLD_MAP, $00, $00
+ db $0e, $10, OVERWORLD_MAP, $00, $00
db $10, $10, OVERWORLD_MAP, $00, $00
- db $16, $00, POKEMON_DOME, $0E, $1C
- db $18, $00, POKEMON_DOME, $10, $1C
+ db $16, $00, POKEMON_DOME, $0e, $1c
+ db $18, $00, POKEMON_DOME, $10, $1c
db $00, $00
PokemonDomeWarpData: ; 1c319 (7:4319)
- db $0E, $1E, POKEMON_DOME_ENTRANCE, $16, $02
- db $10, $1E, POKEMON_DOME_ENTRANCE, $18, $02
- db $0E, $00, HALL_OF_HONOR, $0A, $16
- db $10, $00, HALL_OF_HONOR, $0C, $16
+ db $0e, $1e, POKEMON_DOME_ENTRANCE, $16, $02
+ db $10, $1e, POKEMON_DOME_ENTRANCE, $18, $02
+ db $0e, $00, HALL_OF_HONOR, $0a, $16
+ db $10, $00, HALL_OF_HONOR, $0c, $16
db $00, $00
HallOfHonorWarpData: ; 1c32f (7:432f)
- db $0A, $18, POKEMON_DOME, $0E, $02
- db $0C, $18, POKEMON_DOME, $10, $02
+ db $0a, $18, POKEMON_DOME, $0e, $02
+ db $0c, $18, POKEMON_DOME, $10, $02
db $00, $00
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-22 15:22:10 +0000