tileset anim callbacks

3 files changed, 89 insertions, 89 deletions

diff --git a/asm/rom.s b/asm/rom.s
index 41d35379e..1bf912571 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -208034,11 +208034,11 @@ _08065866:
 	bx r1
 	thumb_func_end sub_806580C
 
-	thumb_func_start sub_806586C
-sub_806586C: ; 806586C
+	thumb_func_start s00_nop
+s00_nop: ; 806586C
 	movs r0, 0
 	bx lr
-	thumb_func_end sub_806586C
+	thumb_func_end s00_nop
 
 	thumb_func_start sub_8065870
 sub_8065870: ; 8065870
@@ -235955,8 +235955,8 @@ _08072FBC: .4byte 0x030006d0
 _08072FC0: .4byte 0x0202e828
 	thumb_func_end cur_mapheader_run_tileset2_func
 
-	thumb_func_start sub_8072FC4
-sub_8072FC4: ; 8072FC4
+	thumb_func_start TilesetCB_General
+TilesetCB_General: ; 8072FC4
 	ldr r1, _08072FDC
 	movs r0, 0
 	strh r0, [r1]
@@ -235974,10 +235974,10 @@ _08072FDC: .4byte 0x030006c2
 _08072FE0: .4byte 0x030006c4
 _08072FE4: .4byte 0x030006cc
 _08072FE8: .4byte sub_8073014
-	thumb_func_end sub_8072FC4
+	thumb_func_end TilesetCB_General
 
-	thumb_func_start sub_8072FEC
-sub_8072FEC: ; 8072FEC
+	thumb_func_start TilesetCB_Building
+TilesetCB_Building: ; 8072FEC
 	ldr r1, _08073004
 	movs r0, 0
 	strh r0, [r1]
@@ -235995,7 +235995,7 @@ _08073004: .4byte 0x030006c2
 _08073008: .4byte 0x030006c4
 _0807300C: .4byte 0x030006cc
 _08073010: .4byte sub_8073058
-	thumb_func_end sub_8072FEC
+	thumb_func_end TilesetCB_Building
 
 	thumb_func_start sub_8073014
 sub_8073014: ; 8073014
@@ -236137,8 +236137,8 @@ _08073108: .4byte gUnknown_08379934
 _0807310C: .4byte 0x06003e00
 	thumb_func_end sub_80730E8
 
-	thumb_func_start sub_8073110
-sub_8073110: ; 8073110
+	thumb_func_start TilesetCB_Petalburg
+TilesetCB_Petalburg: ; 8073110
 	ldr r1, _08073128
 	movs r0, 0
 	strh r0, [r1]
@@ -236155,10 +236155,10 @@ _08073128: .4byte 0x030006c6
 _0807312C: .4byte 0x030006c8
 _08073130: .4byte 0x030006c4
 _08073134: .4byte 0x030006d0
-	thumb_func_end sub_8073110
+	thumb_func_end TilesetCB_Petalburg
 
-	thumb_func_start sub_8073138
-sub_8073138: ; 8073138
+	thumb_func_start TilesetCB_Rustboro
+TilesetCB_Rustboro: ; 8073138
 	ldr r1, _08073150
 	movs r0, 0
 	strh r0, [r1]
@@ -236176,10 +236176,10 @@ _08073154: .4byte 0x030006c8
 _08073158: .4byte 0x030006c4
 _0807315C: .4byte 0x030006d0
 _08073160: .4byte sub_8073424
-	thumb_func_end sub_8073138
+	thumb_func_end TilesetCB_Rustboro
 
-	thumb_func_start sub_8073164
-sub_8073164: ; 8073164
+	thumb_func_start TilesetCB_Dewford
+TilesetCB_Dewford: ; 8073164
 	ldr r1, _0807317C
 	movs r0, 0
 	strh r0, [r1]
@@ -236196,10 +236196,10 @@ _0807317C: .4byte 0x030006c6
 _08073180: .4byte 0x030006c8
 _08073184: .4byte 0x030006c4
 _08073188: .4byte 0x030006d0
-	thumb_func_end sub_8073164
+	thumb_func_end TilesetCB_Dewford
 
-	thumb_func_start sub_807318C
-sub_807318C: ; 807318C
+	thumb_func_start TilesetCB_Slateport
+TilesetCB_Slateport: ; 807318C
 	ldr r1, _080731A4
 	movs r0, 0
 	strh r0, [r1]
@@ -236216,10 +236216,10 @@ _080731A4: .4byte 0x030006c6
 _080731A8: .4byte 0x030006c8
 _080731AC: .4byte 0x030006c4
 _080731B0: .4byte 0x030006d0
-	thumb_func_end sub_807318C
+	thumb_func_end TilesetCB_Slateport
 
-	thumb_func_start sub_80731B4
-sub_80731B4: ; 80731B4
+	thumb_func_start TilesetCB_Mauville
+TilesetCB_Mauville: ; 80731B4
 	ldr r1, _080731CC
 	ldr r0, _080731D0
 	ldrh r0, [r0]
@@ -236239,10 +236239,10 @@ _080731D4: .4byte 0x030006c8
 _080731D8: .4byte 0x030006c4
 _080731DC: .4byte 0x030006d0
 _080731E0: .4byte sub_80734A0
-	thumb_func_end sub_80731B4
+	thumb_func_end TilesetCB_Mauville
 
-	thumb_func_start sub_80731E4
-sub_80731E4: ; 80731E4
+	thumb_func_start TilesetCB_Lavaridge
+TilesetCB_Lavaridge: ; 80731E4
 	ldr r1, _080731FC
 	movs r0, 0
 	strh r0, [r1]
@@ -236260,10 +236260,10 @@ _08073200: .4byte 0x030006c8
 _08073204: .4byte 0x030006c4
 _08073208: .4byte 0x030006d0
 _0807320C: .4byte sub_8073514
-	thumb_func_end sub_80731E4
+	thumb_func_end TilesetCB_Lavaridge
 
-	thumb_func_start sub_8073210
-sub_8073210: ; 8073210
+	thumb_func_start TilesetCB_Fallarbor
+TilesetCB_Fallarbor: ; 8073210
 	ldr r1, _08073228
 	movs r0, 0
 	strh r0, [r1]
@@ -236280,10 +236280,10 @@ _08073228: .4byte 0x030006c6
 _0807322C: .4byte 0x030006c8
 _08073230: .4byte 0x030006c4
 _08073234: .4byte 0x030006d0
-	thumb_func_end sub_8073210
+	thumb_func_end TilesetCB_Fallarbor
 
-	thumb_func_start sub_8073238
-sub_8073238: ; 8073238
+	thumb_func_start TilesetCB_Fortree
+TilesetCB_Fortree: ; 8073238
 	ldr r1, _08073250
 	movs r0, 0
 	strh r0, [r1]
@@ -236300,10 +236300,10 @@ _08073250: .4byte 0x030006c6
 _08073254: .4byte 0x030006c8
 _08073258: .4byte 0x030006c4
 _0807325C: .4byte 0x030006d0
-	thumb_func_end sub_8073238
+	thumb_func_end TilesetCB_Fortree
 
-	thumb_func_start sub_8073260
-sub_8073260: ; 8073260
+	thumb_func_start TilesetCB_Lilycove
+TilesetCB_Lilycove: ; 8073260
 	ldr r1, _08073278
 	movs r0, 0
 	strh r0, [r1]
@@ -236320,10 +236320,10 @@ _08073278: .4byte 0x030006c6
 _0807327C: .4byte 0x030006c8
 _08073280: .4byte 0x030006c4
 _08073284: .4byte 0x030006d0
-	thumb_func_end sub_8073260
+	thumb_func_end TilesetCB_Lilycove
 
-	thumb_func_start sub_8073288
-sub_8073288: ; 8073288
+	thumb_func_start TilesetCB_Mossdeep
+TilesetCB_Mossdeep: ; 8073288
 	ldr r1, _080732A0
 	movs r0, 0
 	strh r0, [r1]
@@ -236340,10 +236340,10 @@ _080732A0: .4byte 0x030006c6
 _080732A4: .4byte 0x030006c8
 _080732A8: .4byte 0x030006c4
 _080732AC: .4byte 0x030006d0
-	thumb_func_end sub_8073288
+	thumb_func_end TilesetCB_Mossdeep
 
-	thumb_func_start sub_80732B0
-sub_80732B0: ; 80732B0
+	thumb_func_start TilesetCB_EverGrande
+TilesetCB_EverGrande: ; 80732B0
 	ldr r1, _080732C8
 	movs r0, 0
 	strh r0, [r1]
@@ -236361,10 +236361,10 @@ _080732CC: .4byte 0x030006c8
 _080732D0: .4byte 0x030006c4
 _080732D4: .4byte 0x030006d0
 _080732D8: .4byte sub_8073540
-	thumb_func_end sub_80732B0
+	thumb_func_end TilesetCB_EverGrande
 
-	thumb_func_start sub_80732DC
-sub_80732DC: ; 80732DC
+	thumb_func_start TilesetCB_Pacifidlog
+TilesetCB_Pacifidlog: ; 80732DC
 	ldr r1, _080732F4
 	ldr r0, _080732F8
 	ldrh r0, [r0]
@@ -236384,10 +236384,10 @@ _080732FC: .4byte 0x030006c8
 _08073300: .4byte 0x030006c4
 _08073304: .4byte 0x030006d0
 _08073308: .4byte sub_80735B4
-	thumb_func_end sub_80732DC
+	thumb_func_end TilesetCB_Pacifidlog
 
-	thumb_func_start sub_807330C
-sub_807330C: ; 807330C
+	thumb_func_start TilesetCB_Sootopolis
+TilesetCB_Sootopolis: ; 807330C
 	ldr r1, _08073324
 	movs r0, 0
 	strh r0, [r1]
@@ -236404,10 +236404,10 @@ _08073324: .4byte 0x030006c6
 _08073328: .4byte 0x030006c8
 _0807332C: .4byte 0x030006c4
 _08073330: .4byte 0x030006d0
-	thumb_func_end sub_807330C
+	thumb_func_end TilesetCB_Sootopolis
 
-	thumb_func_start sub_8073334
-sub_8073334: ; 8073334
+	thumb_func_start TilesetCB_Underwater
+TilesetCB_Underwater: ; 8073334
 	ldr r1, _08073348
 	movs r0, 0
 	strh r0, [r1]
@@ -236423,10 +236423,10 @@ _08073348: .4byte 0x030006c6
 _0807334C: .4byte 0x030006c8
 _08073350: .4byte 0x030006d0
 _08073354: .4byte sub_80735E4
-	thumb_func_end sub_8073334
+	thumb_func_end TilesetCB_Underwater
 
-	thumb_func_start sub_8073358
-sub_8073358: ; 8073358
+	thumb_func_start TilesetCB_SootopolisGym
+TilesetCB_SootopolisGym: ; 8073358
 	ldr r1, _0807336C
 	movs r0, 0
 	strh r0, [r1]
@@ -236442,10 +236442,10 @@ _0807336C: .4byte 0x030006c6
 _08073370: .4byte 0x030006c8
 _08073374: .4byte 0x030006d0
 _08073378: .4byte sub_80738A8
-	thumb_func_end sub_8073358
+	thumb_func_end TilesetCB_SootopolisGym
 
-	thumb_func_start sub_807337C
-sub_807337C: ; 807337C
+	thumb_func_start TilesetCB_Cave
+TilesetCB_Cave: ; 807337C
 	ldr r1, _08073394
 	movs r0, 0
 	strh r0, [r1]
@@ -236463,10 +236463,10 @@ _08073398: .4byte 0x030006c8
 _0807339C: .4byte 0x030006c4
 _080733A0: .4byte 0x030006d0
 _080733A4: .4byte sub_8073600
-	thumb_func_end sub_807337C
+	thumb_func_end TilesetCB_Cave
 
-	thumb_func_start sub_80733A8
-sub_80733A8: ; 80733A8
+	thumb_func_start TilesetCB_EliteFour
+TilesetCB_EliteFour: ; 80733A8
 	ldr r1, _080733BC
 	movs r0, 0
 	strh r0, [r1]
@@ -236482,10 +236482,10 @@ _080733BC: .4byte 0x030006c6
 _080733C0: .4byte 0x030006c8
 _080733C4: .4byte 0x030006d0
 _080733C8: .4byte sub_80738C0
-	thumb_func_end sub_80733A8
+	thumb_func_end TilesetCB_EliteFour
 
-	thumb_func_start sub_80733CC
-sub_80733CC: ; 80733CC
+	thumb_func_start TilesetCB_MauvilleGym
+TilesetCB_MauvilleGym: ; 80733CC
 	ldr r1, _080733E4
 	movs r0, 0
 	strh r0, [r1]
@@ -236503,10 +236503,10 @@ _080733E8: .4byte 0x030006c8
 _080733EC: .4byte 0x030006c4
 _080733F0: .4byte 0x030006d0
 _080733F4: .4byte sub_8073890
-	thumb_func_end sub_80733CC
+	thumb_func_end TilesetCB_MauvilleGym
 
-	thumb_func_start sub_80733F8
-sub_80733F8: ; 80733F8
+	thumb_func_start TilesetCB_BikeShop
+TilesetCB_BikeShop: ; 80733F8
 	ldr r1, _08073410
 	movs r0, 0
 	strh r0, [r1]
@@ -236524,7 +236524,7 @@ _08073414: .4byte 0x030006c8
 _08073418: .4byte 0x030006c4
 _0807341C: .4byte 0x030006d0
 _08073420: .4byte sub_80738EC
-	thumb_func_end sub_80733F8
+	thumb_func_end TilesetCB_BikeShop
 
 	thumb_func_start sub_8073424
 sub_8073424: ; 8073424
diff --git a/data/script_cmd_table.s b/data/script_cmd_table.s
index 64a8c5ce9..bbda75ebc 100644
--- a/data/script_cmd_table.s
+++ b/data/script_cmd_table.s
@@ -1,7 +1,7 @@
 	.align 2
 
 gScriptCmdTable: ; 814AE30
-	.4byte sub_806586C
+	.4byte s00_nop
 	.4byte sub_8065870
 	.4byte s02_end
 	.4byte s03_return
@@ -200,4 +200,4 @@ gScriptCmdTable: ; 814AE30
 	.4byte sC4_unknown
 	.4byte sub_8067BFC
 gScriptCmdTableEnd:
-	.4byte sub_806586C
+	.4byte s00_nop
diff --git a/data/tilesets/headers.s b/data/tilesets/headers.s
index 37b920b15..5bc84a538 100644
--- a/data/tilesets/headers.s
+++ b/data/tilesets/headers.s
@@ -8,7 +8,7 @@ gTileset_General: ; 8286CF4
 	.4byte gTilesetPalettes_General
 	.4byte gMetatiles_General
 	.4byte gMetatileAttributes_General
-	.4byte sub_8072FC4
+	.4byte TilesetCB_General
 
 	.align 2
 
@@ -20,7 +20,7 @@ gTileset_Petalburg: ; 8286D0C
 	.4byte gTilesetPalettes_Petalburg
 	.4byte gMetatiles_Petalburg
 	.4byte gMetatileAttributes_Petalburg
-	.4byte sub_8073110
+	.4byte TilesetCB_Petalburg
 
 	.align 2
 
@@ -32,7 +32,7 @@ gTileset_Rustboro: ; 8286D24
 	.4byte gTilesetPalettes_Rustboro
 	.4byte gMetatiles_Rustboro
 	.4byte gMetatileAttributes_Rustboro
-	.4byte sub_8073138
+	.4byte TilesetCB_Rustboro
 
 	.align 2
 
@@ -44,7 +44,7 @@ gTileset_Dewford: ; 8286D3C
 	.4byte gTilesetPalettes_Dewford
 	.4byte gMetatiles_Dewford
 	.4byte gMetatileAttributes_Dewford
-	.4byte sub_8073164
+	.4byte TilesetCB_Dewford
 
 	.align 2
 
@@ -56,7 +56,7 @@ gTileset_Slateport: ; 8286D54
 	.4byte gTilesetPalettes_Slateport
 	.4byte gMetatiles_Slateport
 	.4byte gMetatileAttributes_Slateport
-	.4byte sub_807318C
+	.4byte TilesetCB_Slateport
 
 	.align 2
 
@@ -68,7 +68,7 @@ gTileset_Mauville: ; 8286D6C
 	.4byte gTilesetPalettes_Mauville
 	.4byte gMetatiles_Mauville
 	.4byte gMetatileAttributes_Mauville
-	.4byte sub_80731B4
+	.4byte TilesetCB_Mauville
 
 	.align 2
 
@@ -80,7 +80,7 @@ gTileset_Lavaridge: ; 8286D84
 	.4byte gTilesetPalettes_Lavaridge
 	.4byte gMetatiles_Lavaridge
 	.4byte gMetatileAttributes_Lavaridge
-	.4byte sub_80731E4
+	.4byte TilesetCB_Lavaridge
 
 	.align 2
 
@@ -92,7 +92,7 @@ gTileset_Fallarbor: ; 8286D9C
 	.4byte gTilesetPalettes_Fallarbor
 	.4byte gMetatiles_Fallarbor
 	.4byte gMetatileAttributes_Fallarbor
-	.4byte sub_8073210
+	.4byte TilesetCB_Fallarbor
 
 	.align 2
 
@@ -104,7 +104,7 @@ gTileset_Fortree: ; 8286DB4
 	.4byte gTilesetPalettes_Fortree
 	.4byte gMetatiles_Fortree
 	.4byte gMetatileAttributes_Fortree
-	.4byte sub_8073238
+	.4byte TilesetCB_Fortree
 
 	.align 2
 
@@ -116,7 +116,7 @@ gTileset_Lilycove: ; 8286DCC
 	.4byte gTilesetPalettes_Lilycove
 	.4byte gMetatiles_Lilycove
 	.4byte gMetatileAttributes_Lilycove
-	.4byte sub_8073260
+	.4byte TilesetCB_Lilycove
 
 	.align 2
 
@@ -128,7 +128,7 @@ gTileset_Mossdeep: ; 8286DE4
 	.4byte gTilesetPalettes_Mossdeep
 	.4byte gMetatiles_Mossdeep
 	.4byte gMetatileAttributes_Mossdeep
-	.4byte sub_8073288
+	.4byte TilesetCB_Mossdeep
 
 	.align 2
 
@@ -140,7 +140,7 @@ gTileset_EverGrande: ; 8286DFC
 	.4byte gTilesetPalettes_EverGrande
 	.4byte gMetatiles_EverGrande
 	.4byte gMetatileAttributes_EverGrande
-	.4byte sub_80732B0
+	.4byte TilesetCB_EverGrande
 
 	.align 2
 
@@ -152,7 +152,7 @@ gTileset_Pacifidlog: ; 8286E14
 	.4byte gTilesetPalettes_Pacifidlog
 	.4byte gMetatiles_Pacifidlog
 	.4byte gMetatileAttributes_Pacifidlog
-	.4byte sub_80732DC
+	.4byte TilesetCB_Pacifidlog
 
 	.align 2
 
@@ -164,7 +164,7 @@ gTileset_Sootopolis: ; 8286E2C
 	.4byte gTilesetPalettes_Sootopolis
 	.4byte gMetatiles_Sootopolis
 	.4byte gMetatileAttributes_Sootopolis
-	.4byte sub_807330C
+	.4byte TilesetCB_Sootopolis
 
 	.align 2
 
@@ -176,7 +176,7 @@ gTileset_Building: ; 8286E44
 	.4byte gTilesetPalettes_Building
 	.4byte gMetatiles_Building
 	.4byte gMetatileAttributes_Building
-	.4byte sub_8072FEC
+	.4byte TilesetCB_Building
 
 	.align 2
 
@@ -212,7 +212,7 @@ gTileset_Cave: ; 8286E8C
 	.4byte gTilesetPalettes_Cave
 	.4byte gMetatiles_Cave
 	.4byte gMetatileAttributes_Cave
-	.4byte sub_807337C
+	.4byte TilesetCB_Cave
 
 	.align 2
 
@@ -344,7 +344,7 @@ gTileset_BikeShop: ; 8286F94
 	.4byte gTilesetPalettes_BikeShop
 	.4byte gMetatiles_BikeShop
 	.4byte gMetatileAttributes_BikeShop
-	.4byte sub_80733F8
+	.4byte TilesetCB_BikeShop
 
 	.align 2
 
@@ -512,7 +512,7 @@ gTileset_Underwater: ; 82870E4
 	.4byte gTilesetPalettes_Underwater
 	.4byte gMetatiles_Underwater
 	.4byte gMetatileAttributes_Underwater
-	.4byte sub_8073334
+	.4byte TilesetCB_Underwater
 
 	.align 2
 
@@ -536,7 +536,7 @@ gTileset_SootopolisGym: ; 8287114
 	.4byte gTilesetPalettes_SootopolisGym
 	.4byte gMetatiles_SootopolisGym
 	.4byte gMetatileAttributes_SootopolisGym
-	.4byte sub_8073358
+	.4byte TilesetCB_SootopolisGym
 
 	.align 2
 
@@ -596,7 +596,7 @@ gTileset_MauvilleGym: ; 828718C
 	.4byte gTilesetPalettes_MauvilleGym
 	.4byte gMetatiles_MauvilleGym
 	.4byte gMetatileAttributes_MauvilleGym
-	.4byte sub_80733CC
+	.4byte TilesetCB_MauvilleGym
 
 	.align 2
 
@@ -680,7 +680,7 @@ gTileset_EliteFour: ; 8287234
 	.4byte gTilesetPalettes_EliteFour
 	.4byte gMetatiles_EliteFour
 	.4byte gMetatileAttributes_EliteFour
-	.4byte sub_80733A8
+	.4byte TilesetCB_EliteFour
 
 	.align 2