summaryrefslogtreecommitdiff
path: root/asm/emerald.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/emerald.s')
-rw-r--r--asm/emerald.s158
1 files changed, 79 insertions, 79 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index 1271f5c83..614d240b3 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -297604,8 +297604,8 @@ sub_809FDC0: ; 809FDC0
.pool
thumb_func_end sub_809FDC0
- thumb_func_start atk17_seteffectuser
-atk17_seteffectuser: ; 809FDD4
+ thumb_func_start sub_809FDD4
+sub_809FDD4: ; 809FDD4
push {lr}
movs r0, 0
movs r1, 0
@@ -297618,7 +297618,7 @@ atk17_seteffectuser: ; 809FDD4
bx r0
.align 2, 0
.pool
- thumb_func_end atk17_seteffectuser
+ thumb_func_end sub_809FDD4
thumb_func_start sub_809FDF4
sub_809FDF4: ; 809FDF4
@@ -299257,8 +299257,8 @@ cur_mapheader_run_tileset2_func: ; 80A0AE4
.pool
thumb_func_end cur_mapheader_run_tileset2_func
- thumb_func_start sub_80A0B20
-sub_80A0B20: ; 80A0B20
+ thumb_func_start TilesetCb_General
+TilesetCb_General: ; 80A0B20
ldr r1, =0x03000f36
movs r0, 0
strh r0, [r1]
@@ -299273,10 +299273,10 @@ sub_80A0B20: ; 80A0B20
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0B20
+ thumb_func_end TilesetCb_General
- thumb_func_start sub_80A0B48
-sub_80A0B48: ; 80A0B48
+ thumb_func_start TilesetCb_InsideBuilding
+TilesetCb_InsideBuilding: ; 80A0B48
ldr r1, =0x03000f36
movs r0, 0
strh r0, [r1]
@@ -299291,7 +299291,7 @@ sub_80A0B48: ; 80A0B48
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0B48
+ thumb_func_end TilesetCb_InsideBuilding
thumb_func_start sub_80A0B70
sub_80A0B70: ; 80A0B70
@@ -299429,8 +299429,8 @@ sub_80A0C44: ; 80A0C44
.pool
thumb_func_end sub_80A0C44
- thumb_func_start sub_80A0C6C
-sub_80A0C6C: ; 80A0C6C
+ thumb_func_start TilesetCb_Petalburg
+TilesetCb_Petalburg: ; 80A0C6C
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299444,10 +299444,10 @@ sub_80A0C6C: ; 80A0C6C
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0C6C
+ thumb_func_end TilesetCb_Petalburg
- thumb_func_start sub_80A0C94
-sub_80A0C94: ; 80A0C94
+ thumb_func_start TilesetCb_Rustboro
+TilesetCb_Rustboro: ; 80A0C94
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299461,10 +299461,10 @@ sub_80A0C94: ; 80A0C94
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0C94
+ thumb_func_end TilesetCb_Rustboro
- thumb_func_start sub_80A0CC0
-sub_80A0CC0: ; 80A0CC0
+ thumb_func_start TilesetCb_Dewford
+TilesetCb_Dewford: ; 80A0CC0
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299478,10 +299478,10 @@ sub_80A0CC0: ; 80A0CC0
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0CC0
+ thumb_func_end TilesetCb_Dewford
- thumb_func_start sub_80A0CEC
-sub_80A0CEC: ; 80A0CEC
+ thumb_func_start TilesetCb_Slateport
+TilesetCb_Slateport: ; 80A0CEC
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299495,10 +299495,10 @@ sub_80A0CEC: ; 80A0CEC
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0CEC
+ thumb_func_end TilesetCb_Slateport
- thumb_func_start sub_80A0D18
-sub_80A0D18: ; 80A0D18
+ thumb_func_start TilesetCb_Mauville
+TilesetCb_Mauville: ; 80A0D18
ldr r1, =0x03000f3a
ldr r0, =0x03000f36
ldrh r0, [r0]
@@ -299513,10 +299513,10 @@ sub_80A0D18: ; 80A0D18
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0D18
+ thumb_func_end TilesetCb_Mauville
- thumb_func_start sub_80A0D48
-sub_80A0D48: ; 80A0D48
+ thumb_func_start TilesetCb_Lavaridge
+TilesetCb_Lavaridge: ; 80A0D48
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299530,10 +299530,10 @@ sub_80A0D48: ; 80A0D48
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0D48
+ thumb_func_end TilesetCb_Lavaridge
- thumb_func_start sub_80A0D74
-sub_80A0D74: ; 80A0D74
+ thumb_func_start TilesetCb_Fallarbor
+TilesetCb_Fallarbor: ; 80A0D74
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299547,10 +299547,10 @@ sub_80A0D74: ; 80A0D74
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0D74
+ thumb_func_end TilesetCb_Fallarbor
- thumb_func_start sub_80A0D9C
-sub_80A0D9C: ; 80A0D9C
+ thumb_func_start TilesetCb_Fortree
+TilesetCb_Fortree: ; 80A0D9C
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299564,10 +299564,10 @@ sub_80A0D9C: ; 80A0D9C
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0D9C
+ thumb_func_end TilesetCb_Fortree
- thumb_func_start sub_80A0DC4
-sub_80A0DC4: ; 80A0DC4
+ thumb_func_start TilesetCb_Lilycove
+TilesetCb_Lilycove: ; 80A0DC4
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299581,10 +299581,10 @@ sub_80A0DC4: ; 80A0DC4
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0DC4
+ thumb_func_end TilesetCb_Lilycove
- thumb_func_start sub_80A0DEC
-sub_80A0DEC: ; 80A0DEC
+ thumb_func_start TilesetCb_Mossdeep
+TilesetCb_Mossdeep: ; 80A0DEC
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299598,10 +299598,10 @@ sub_80A0DEC: ; 80A0DEC
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0DEC
+ thumb_func_end TilesetCb_Mossdeep
- thumb_func_start sub_80A0E14
-sub_80A0E14: ; 80A0E14
+ thumb_func_start TilesetCb_EverGrande
+TilesetCb_EverGrande: ; 80A0E14
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299615,10 +299615,10 @@ sub_80A0E14: ; 80A0E14
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0E14
+ thumb_func_end TilesetCb_EverGrande
- thumb_func_start sub_80A0E40
-sub_80A0E40: ; 80A0E40
+ thumb_func_start TilesetCb_Pacifidlog
+TilesetCb_Pacifidlog: ; 80A0E40
ldr r1, =0x03000f3a
ldr r0, =0x03000f36
ldrh r0, [r0]
@@ -299633,10 +299633,10 @@ sub_80A0E40: ; 80A0E40
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0E40
+ thumb_func_end TilesetCb_Pacifidlog
- thumb_func_start sub_80A0E70
-sub_80A0E70: ; 80A0E70
+ thumb_func_start TilesetCb_Sootopolis
+TilesetCb_Sootopolis: ; 80A0E70
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299650,10 +299650,10 @@ sub_80A0E70: ; 80A0E70
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0E70
+ thumb_func_end TilesetCb_Sootopolis
- thumb_func_start sub_80A0E9C
-sub_80A0E9C: ; 80A0E9C
+ thumb_func_start TilesetCb_BattleFrontierOutsideWest
+TilesetCb_BattleFrontierOutsideWest: ; 80A0E9C
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299667,10 +299667,10 @@ sub_80A0E9C: ; 80A0E9C
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0E9C
+ thumb_func_end TilesetCb_BattleFrontierOutsideWest
- thumb_func_start sub_80A0EC8
-sub_80A0EC8: ; 80A0EC8
+ thumb_func_start TilesetCb_BattleFrontierOutsideEast
+TilesetCb_BattleFrontierOutsideEast: ; 80A0EC8
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299684,10 +299684,10 @@ sub_80A0EC8: ; 80A0EC8
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0EC8
+ thumb_func_end TilesetCb_BattleFrontierOutsideEast
- thumb_func_start sub_80A0EF4
-sub_80A0EF4: ; 80A0EF4
+ thumb_func_start TilesetCb_Underwater
+TilesetCb_Underwater: ; 80A0EF4
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299700,10 +299700,10 @@ sub_80A0EF4: ; 80A0EF4
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0EF4
+ thumb_func_end TilesetCb_Underwater
- thumb_func_start Tileset28AnimationHeader
-Tileset28AnimationHeader: ; 80A0F18
+ thumb_func_start TilesetCb_SootopolisGym
+TilesetCb_SootopolisGym: ; 80A0F18
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299716,10 +299716,10 @@ Tileset28AnimationHeader: ; 80A0F18
bx lr
.align 2, 0
.pool
- thumb_func_end Tileset28AnimationHeader
+ thumb_func_end TilesetCb_SootopolisGym
- thumb_func_start sub_80A0F3C
-sub_80A0F3C: ; 80A0F3C
+ thumb_func_start TilesetCb_Cave
+TilesetCb_Cave: ; 80A0F3C
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299733,10 +299733,10 @@ sub_80A0F3C: ; 80A0F3C
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0F3C
+ thumb_func_end TilesetCb_Cave
- thumb_func_start sub_80A0F68
-sub_80A0F68: ; 80A0F68
+ thumb_func_start TilesetCb_EliteFour
+TilesetCb_EliteFour: ; 80A0F68
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299749,10 +299749,10 @@ sub_80A0F68: ; 80A0F68
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0F68
+ thumb_func_end TilesetCb_EliteFour
- thumb_func_start sub_80A0F8C
-sub_80A0F8C: ; 80A0F8C
+ thumb_func_start TilesetCb_MauvilleGym
+TilesetCb_MauvilleGym: ; 80A0F8C
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299766,10 +299766,10 @@ sub_80A0F8C: ; 80A0F8C
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0F8C
+ thumb_func_end TilesetCb_MauvilleGym
- thumb_func_start sub_80A0FB8
-sub_80A0FB8: ; 80A0FB8
+ thumb_func_start TilesetCb_BikeShop
+TilesetCb_BikeShop: ; 80A0FB8
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299783,10 +299783,10 @@ sub_80A0FB8: ; 80A0FB8
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0FB8
+ thumb_func_end TilesetCb_BikeShop
- thumb_func_start sub_80A0FE4
-sub_80A0FE4: ; 80A0FE4
+ thumb_func_start TilesetCb_BattlePyramid
+TilesetCb_BattlePyramid: ; 80A0FE4
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299800,10 +299800,10 @@ sub_80A0FE4: ; 80A0FE4
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A0FE4
+ thumb_func_end TilesetCb_BattlePyramid
- thumb_func_start sub_80A1010
-sub_80A1010: ; 80A1010
+ thumb_func_start TilesetCb_BattleDome
+TilesetCb_BattleDome: ; 80A1010
ldr r1, =0x03000f3a
movs r0, 0
strh r0, [r1]
@@ -299817,7 +299817,7 @@ sub_80A1010: ; 80A1010
bx lr
.align 2, 0
.pool
- thumb_func_end sub_80A1010
+ thumb_func_end TilesetCb_BattleDome
thumb_func_start sub_80A103C
sub_80A103C: ; 80A103C
@@ -820786,7 +820786,7 @@ sub_81A97DC: ; 81A97DC
thumb_func_start sub_81A9828
sub_81A9828: ; 81A9828
push {lr}
- bl atk17_seteffectuser
+ bl sub_809FDD4
pop {r0}
bx r0
thumb_func_end sub_81A9828
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 11:48:01 +0000