summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/berry_pouch.s6
-rw-r--r--asm/field_map_obj.s6
-rw-r--r--asm/field_specials.s2
-rw-r--r--asm/item_menu.s26
-rw-r--r--asm/item_pc.s10
-rw-r--r--asm/learn_move.s2
-rw-r--r--asm/list_menu.s6
-rw-r--r--asm/menu_helpers.s14
-rw-r--r--asm/naming_screen.s2
-rw-r--r--asm/overworld.s2
-rw-r--r--asm/party_menu.s8
-rw-r--r--asm/player_pc.s2
-rw-r--r--asm/pokedex_screen.s12
-rw-r--r--asm/shop.s6
-rw-r--r--asm/teachy_tv.s714
15 files changed, 75 insertions, 743 deletions
diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s
index 7813d1ade..556cccbe0 100644
--- a/asm/berry_pouch.s
+++ b/asm/berry_pouch.s
@@ -183,7 +183,7 @@ _0813CE84:
.4byte _0813CFB0
.4byte _0813CFBE
_0813CED0:
- bl sub_80BF768
+ bl VblankHblankHandlerSetZero
bl clear_scheduled_bg_copies_to_vram
b _0813CFD2
_0813CEDA:
@@ -386,7 +386,7 @@ _0813D078: .4byte gUnknown_203F370
thumb_func_start sub_813D07C
sub_813D07C: @ 813D07C
push {r4,lr}
- bl sub_80BF7C8
+ bl InitBgReg
ldr r4, _0813D0DC @ =gUnknown_203F36C
ldr r0, [r4]
adds r0, 0xC
@@ -1694,7 +1694,7 @@ _0813DA9E:
ldr r4, _0813DAE0 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
ldr r0, _0813DAE4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 77df1274b..1275f7471 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -1550,8 +1550,8 @@ MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
bx r0
thumb_func_end MakeObjectTemplateFromFieldObjectTemplate
- thumb_func_start AddPseudoFieldObject
-AddPseudoFieldObject: @ 805E978
+ thumb_func_start AddPseudoEventObject
+AddPseudoEventObject: @ 805E978
push {r4-r6,lr}
sub sp, 0x1C
ldr r4, [sp, 0x2C]
@@ -1612,7 +1612,7 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gSprites
- thumb_func_end AddPseudoFieldObject
+ thumb_func_end AddPseudoEventObject
thumb_func_start sprite_new
sprite_new: @ 805E9F8
diff --git a/asm/field_specials.s b/asm/field_specials.s
index d1302c8d2..7a0221941 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -2753,7 +2753,7 @@ sub_80CBADC: @ 80CBADC
ldr r4, _080CBB20 @ =gUnknown_3005378
adds r1, r4, 0
movs r2, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
ldr r1, _080CBB24 @ =gUnknown_2039A18
ldrh r0, [r4]
strh r0, [r1]
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 53c92a8d3..edb342d6b 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -253,7 +253,7 @@ _08107F60:
.4byte _081080D8
.4byte _081080DE
_08107FB0:
- bl sub_80BF768
+ bl VblankHblankHandlerSetZero
bl clear_scheduled_bg_copies_to_vram
b _08108104
_08107FBA:
@@ -520,7 +520,7 @@ _081081CC: .4byte gUnknown_203AD1C
thumb_func_start sub_81081D0
sub_81081D0: @ 81081D0
push {r4,r5,lr}
- bl sub_80BF7C8
+ bl InitBgReg
ldr r5, _08108230 @ =gUnknown_203AD14
movs r4, 0x80
lsls r4, 4
@@ -2313,7 +2313,7 @@ _08108FA0:
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -2353,7 +2353,7 @@ _08108FE4:
adds r3, r5, 0
adds r3, 0x8
adds r2, r3
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -2830,7 +2830,7 @@ sub_81093B8: @ 81093B8
mov r2, sp
adds r2, 0x16
add r1, sp, 0x14
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
mov r2, r8
ldrb r0, [r2]
movs r1, 0x10
@@ -2942,7 +2942,7 @@ sub_81094B0: @ 81094B0
adds r1, r2, r1
adds r3, 0x8
adds r2, r3
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
ldrb r0, [r4]
bl ListMenuGetYCoordForPrintingArrowCursor
adds r1, r0, 0
@@ -2967,7 +2967,7 @@ sub_81094B0: @ 81094B0
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -3001,7 +3001,7 @@ _08109558:
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -4573,7 +4573,7 @@ sub_810A288: @ 810A288
adds r6, 0x2
mov r1, sp
adds r2, r6, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r0, [r0]
ldrh r1, [r6]
@@ -6342,11 +6342,11 @@ sub_810B108: @ 810B108
beq _0810B160
cmp r4, 0x8
beq _0810B16C
- ldr r2, _0810B15C @ =CB2_ReturnToTeachyTV
+ ldr r2, _0810B15C @ =sub_815ABFC
adds r0, r4, 0
b _0810B170
.align 2, 0
-_0810B15C: .4byte CB2_ReturnToTeachyTV
+_0810B15C: .4byte sub_815ABFC
_0810B160:
ldr r2, _0810B168 @ =sub_8030AEC
movs r0, 0x7
@@ -6386,7 +6386,7 @@ _0810B19C:
bl sub_815AC20
ldr r0, _0810B1C4 @ =gUnknown_203AD10
ldr r1, [r0]
- ldr r0, _0810B1C8 @ =CB2_ReturnToTeachyTV
+ ldr r0, _0810B1C8 @ =sub_815ABFC
str r0, [r1]
ldr r1, _0810B1CC @ =gTasks
lsls r0, r4, 2
@@ -6402,7 +6402,7 @@ _0810B1BC:
bx r1
.align 2, 0
_0810B1C4: .4byte gUnknown_203AD10
-_0810B1C8: .4byte CB2_ReturnToTeachyTV
+_0810B1C8: .4byte sub_815ABFC
_0810B1CC: .4byte gTasks
_0810B1D0: .4byte sub_810B070
thumb_func_end sub_810B180
diff --git a/asm/item_pc.s b/asm/item_pc.s
index 87e64619e..93ca91ff9 100644
--- a/asm/item_pc.s
+++ b/asm/item_pc.s
@@ -158,7 +158,7 @@ _0810D4E8:
.4byte _0810D630
.4byte _0810D668
_0810D53C:
- bl sub_80BF768
+ bl VblankHblankHandlerSetZero
bl clear_scheduled_bg_copies_to_vram
b _0810D674
_0810D546:
@@ -389,7 +389,7 @@ _0810D718: .4byte gUnknown_203ADCC
thumb_func_start sub_810D71C
sub_810D71C: @ 810D71C
push {r4,r5,lr}
- bl sub_80BF7C8
+ bl InitBgReg
ldr r5, _0810D77C @ =gUnknown_203ADC0
movs r4, 0x80
lsls r4, 4
@@ -1403,7 +1403,7 @@ sub_810DEA0: @ 810DEA0
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -1436,7 +1436,7 @@ _0810DF20:
ldrb r0, [r6]
ldr r1, _0810DF44 @ =gUnknown_203ADD0
adds r2, r1, 0x2
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -1630,7 +1630,7 @@ sub_810E0B4: @ 810E0B4
ldr r7, _0810E120 @ =gUnknown_203ADD0
adds r2, r7, 0x2
adds r1, r7, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
movs r5, 0x20
negs r5, r5
ldrb r0, [r4]
diff --git a/asm/learn_move.s b/asm/learn_move.s
index 47b5c74fe..e9041a9b2 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -736,7 +736,7 @@ _080E4C7E:
adds r1, r2, r3
ldr r6, _080E4CD4 @ =0x00000a6a
adds r2, r6
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
bl FreeAllWindowBuffers
ldr r0, _080E4CD8 @ =gPlayerParty
ldr r5, [r7]
diff --git a/asm/list_menu.s b/asm/list_menu.s
index 3a215f799..9558ea323 100644
--- a/asm/list_menu.s
+++ b/asm/list_menu.s
@@ -563,8 +563,8 @@ _081072CA:
_081072D0: .4byte gTasks+0x8
thumb_func_end sub_81072AC
- thumb_func_start get_coro_args_x18_x1A
-get_coro_args_x18_x1A: @ 81072D4
+ thumb_func_start ListMenuGetScrollAndRow
+ListMenuGetScrollAndRow: @ 81072D4
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -588,7 +588,7 @@ _081072F6:
bx r0
.align 2, 0
_081072FC: .4byte gTasks+0x8
- thumb_func_end get_coro_args_x18_x1A
+ thumb_func_end ListMenuGetScrollAndRow
thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
ListMenuGetYCoordForPrintingArrowCursor: @ 8107300
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index 69567e0ca..7984a32c4 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -418,8 +418,8 @@ _080BF764:
bx r1
thumb_func_end sub_80BF748
- thumb_func_start sub_80BF768
-sub_80BF768: @ 80BF768
+ thumb_func_start VblankHblankHandlerSetZero
+VblankHblankHandlerSetZero: @ 80BF768
push {lr}
movs r0, 0
bl SetVBlankCallback
@@ -427,13 +427,13 @@ sub_80BF768: @ 80BF768
bl SetHBlankCallback
pop {r0}
bx r0
- thumb_func_end sub_80BF768
+ thumb_func_end VblankHblankHandlerSetZero
thumb_func_start sub_80BF77C
sub_80BF77C: @ 80BF77C
push {r4,lr}
sub sp, 0xC
- bl sub_80BF7C8
+ bl InitBgReg
mov r1, sp
movs r0, 0
strh r0, [r1]
@@ -465,8 +465,8 @@ _080BF7C0: .4byte 0x05000100
_080BF7C4: .4byte 0x01000200
thumb_func_end sub_80BF77C
- thumb_func_start sub_80BF7C8
-sub_80BF7C8: @ 80BF7C8
+ thumb_func_start InitBgReg
+InitBgReg: @ 80BF7C8
push {lr}
movs r0, 0
movs r1, 0
@@ -517,7 +517,7 @@ sub_80BF7C8: @ 80BF7C8
bl ChangeBgY
pop {r0}
bx r0
- thumb_func_end sub_80BF7C8
+ thumb_func_end InitBgReg
thumb_func_start sub_80BF848
sub_80BF848: @ 80BF848
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 36c3b1a75..ef692b052 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -2789,7 +2789,7 @@ sub_809EF54: @ 809EF54
str r2, [sp]
movs r2, 0x38
movs r3, 0x25
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/overworld.s b/asm/overworld.s
index 103ed2c46..87f146d39 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -7888,7 +7888,7 @@ _080588C6:
movs r2, 0
str r2, [sp]
movs r3, 0
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
strb r0, [r4, 0x4]
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
diff --git a/asm/party_menu.s b/asm/party_menu.s
index bcf65c35b..89feaa035 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -276,7 +276,7 @@ _0811EC24:
.4byte _0811EDD0
.4byte _0811EDDE
_0811EC80:
- bl sub_80BF768
+ bl VblankHblankHandlerSetZero
bl sub_80BF77C
bl clear_scheduled_bg_copies_to_vram
b _0811EDFC
@@ -565,7 +565,7 @@ _0811EEC8: .4byte gUnknown_203B0B8
thumb_func_start sub_811EECC
sub_811EECC: @ 811EECC
push {r4,r5,lr}
- bl sub_80BF7C8
+ bl InitBgReg
ldr r5, _0811EF34 @ =gUnknown_203B0BC
movs r4, 0x80
lsls r4, 4
@@ -4879,12 +4879,12 @@ sub_8120FB0: @ 8120FB0
bl FreeRestoreBattleData
bl LoadPlayerParty
bl sub_815AC20
- ldr r0, _08120FC8 @ =CB2_ReturnToTeachyTV
+ ldr r0, _08120FC8 @ =sub_815ABFC
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
-_08120FC8: .4byte CB2_ReturnToTeachyTV
+_08120FC8: .4byte sub_815ABFC
thumb_func_end sub_8120FB0
thumb_func_start sub_8120FCC
diff --git a/asm/player_pc.s b/asm/player_pc.s
index b5149a435..cb6c9f9d0 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -1142,7 +1142,7 @@ sub_80EBF40: @ 80EBF40
mov r8, r1
adds r1, r7, 0
mov r2, r8
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r6, r0
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index 92a6b5f08..80cc1ab5d 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -593,7 +593,7 @@ _081029D0:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
bl sub_806E25C
cmp r0, 0
beq _081029F4
@@ -627,7 +627,7 @@ _08102A14:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
ldr r0, _08102A4C @ =gMain
ldrh r1, [r0, 0x2E]
movs r3, 0x1
@@ -1367,7 +1367,7 @@ _0810307C:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
bl sub_81039F0
ldr r1, [r4]
adds r1, 0x60
@@ -1385,7 +1385,7 @@ _08103098:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
ldr r0, _081030F0 @ =gMain
ldrh r1, [r0, 0x2E]
movs r3, 0x1
@@ -1687,7 +1687,7 @@ _08103344:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
bl sub_81039F0
ldr r1, [r4]
adds r1, 0x60
@@ -1706,7 +1706,7 @@ _08103362:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
ldr r0, _081033C4 @ =gMain
ldrh r1, [r0, 0x2E]
movs r2, 0x1
diff --git a/asm/shop.s b/asm/shop.s
index 33f6bd225..d7188e66e 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -515,7 +515,7 @@ _0809AEA0: .4byte gTasks
_0809AEA4: .4byte sub_809AE00
_0809AEA8: .4byte sub_809ADE4
_0809AEAC:
- bl sub_80BF768
+ bl VblankHblankHandlerSetZero
str r4, [sp, 0x8]
movs r1, 0xE0
lsls r1, 19
@@ -2017,7 +2017,7 @@ _0809BA56:
str r0, [sp]
adds r0, r4, 0
ldr r1, _0809BAF4 @ =SpriteCallbackDummy
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -2170,7 +2170,7 @@ sub_809BBC0: @ 809BBC0
ldr r7, _0809BC08 @ =gUnknown_2039942
subs r2, r7, 0x2
adds r1, r7, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
movs r0, 0x2
negs r0, r0
cmp r4, r0
diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s
index 418da67dd..f19915d6e 100644
--- a/asm/teachy_tv.s
+++ b/asm/teachy_tv.s
@@ -5,676 +5,8 @@
.text
- thumb_func_start sub_815AB94
-sub_815AB94: @ 815AB94
- push {lr}
- bl RunTasks
- bl AnimateSprites
- bl BuildOamBuffer
- bl do_scheduled_bg_tilemap_copies_to_vram
- bl UpdatePaletteFade
- pop {r0}
- bx r0
- thumb_func_end sub_815AB94
-
- thumb_func_start sub_815ABB0
-sub_815ABB0: @ 815ABB0
- push {lr}
- bl LoadOam
- bl ProcessSpriteCopyRequests
- bl TransferPlttBuffer
- pop {r0}
- bx r0
- thumb_func_end sub_815ABB0
-
- thumb_func_start sub_815ABC4
-sub_815ABC4: @ 815ABC4
- push {r4,lr}
- lsls r0, 24
- lsrs r0, 24
- adds r2, r0, 0
- ldr r3, _0815ABF4 @ =gTeachyTV_StaticResources
- movs r4, 0
- strb r2, [r3, 0x4]
- str r1, [r3]
- cmp r2, 0
- bne _0815ABE0
- movs r0, 0
- strh r4, [r3, 0x6]
- strh r4, [r3, 0x8]
- strb r0, [r3, 0x5]
-_0815ABE0:
- cmp r2, 0x1
- bne _0815ABE6
- strb r4, [r3, 0x4]
-_0815ABE6:
- ldr r0, _0815ABF8 @ =sub_815AC2C
- bl SetMainCallback2
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0815ABF4: .4byte gTeachyTV_StaticResources
-_0815ABF8: .4byte sub_815AC2C
- thumb_func_end sub_815ABC4
-
- thumb_func_start CB2_ReturnToTeachyTV
-CB2_ReturnToTeachyTV: @ 815ABFC
- push {lr}
- ldr r1, _0815AC10 @ =gTeachyTV_StaticResources
- ldrb r0, [r1, 0x4]
- cmp r0, 0x1
- bne _0815AC14
- ldr r1, [r1]
- movs r0, 0x1
- bl sub_815ABC4
- b _0815AC1C
- .align 2, 0
-_0815AC10: .4byte gTeachyTV_StaticResources
-_0815AC14:
- ldr r1, [r1]
- movs r0, 0x2
- bl sub_815ABC4
-_0815AC1C:
- pop {r0}
- bx r0
- thumb_func_end CB2_ReturnToTeachyTV
-
- thumb_func_start sub_815AC20
-sub_815AC20: @ 815AC20
- ldr r1, _0815AC28 @ =gTeachyTV_StaticResources
- movs r0, 0x1
- strb r0, [r1, 0x4]
- bx lr
- .align 2, 0
-_0815AC28: .4byte gTeachyTV_StaticResources
- thumb_func_end sub_815AC20
-
- thumb_func_start sub_815AC2C
-sub_815AC2C: @ 815AC2C
- push {r4-r6,lr}
- sub sp, 0x4
- ldr r0, _0815AC44 @ =gMain
- movs r1, 0x87
- lsls r1, 3
- adds r6, r0, r1
- ldrb r5, [r6]
- cmp r5, 0
- beq _0815AC48
- cmp r5, 0x1
- beq _0815AC9C
- b _0815AD6E
- .align 2, 0
-_0815AC44: .4byte gMain
-_0815AC48:
- ldr r4, _0815AC90 @ =gUnknown_203F450
- ldr r0, _0815AC94 @ =0x00004008
- bl AllocZeroed
- str r0, [r4]
- str r5, [r0]
- ldr r1, _0815AC98 @ =0x00004006
- adds r0, r1
- strb r5, [r0]
- ldr r0, [r4]
- adds r1, 0x1
- adds r0, r1
- movs r1, 0xFF
- strb r1, [r0]
- bl sub_80BF768
- bl clear_scheduled_bg_copies_to_vram
- bl ScanlineEffect_Stop
- bl FreeAllSpritePalettes
- bl ResetPaletteFade
- bl ResetSpriteData
- bl ResetTasks
- bl sub_815AD88
- bl sub_815AE38
- ldrb r0, [r6]
- adds r0, 0x1
- strb r0, [r6]
- b _0815AD6E
- .align 2, 0
-_0815AC90: .4byte gUnknown_203F450
-_0815AC94: .4byte 0x00004008
-_0815AC98: .4byte 0x00004006
-_0815AC9C:
- bl free_temp_tile_data_buffers_if_possible
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- beq _0815AD6E
- bl sub_815AEB8
- bl sub_815AFEC
- ldr r0, _0815ACE0 @ =gTeachyTV_StaticResources
- ldrb r0, [r0, 0x4]
- cmp r0, 0x2
- bne _0815ACEC
- ldr r0, _0815ACE4 @ =sub_815BA54
- movs r1, 0
- bl CreateTask
- lsls r0, 24
- lsrs r5, r0, 24
- bl sub_815B014
- ldr r2, _0815ACE8 @ =gTasks
- lsls r1, r5, 2
- adds r1, r5
- lsls r1, 3
- adds r1, r2
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r1, 0xA]
- adds r0, r5, 0
- bl sub_815B118
- b _0815AD26
- .align 2, 0
-_0815ACE0: .4byte gTeachyTV_StaticResources
-_0815ACE4: .4byte sub_815BA54
-_0815ACE8: .4byte gTasks
-_0815ACEC:
- ldr r0, _0815AD78 @ =sub_815B2C0
- movs r1, 0
- bl CreateTask
- lsls r0, 24
- lsrs r5, r0, 24
- bl sub_815AEE8
- ldr r1, _0815AD7C @ =gTasks
- lsls r4, r5, 2
- adds r4, r5
- lsls r4, 3
- adds r4, r1
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r4, 0x8]
- bl sub_815B014
- lsls r0, 24
- lsrs r0, 24
- strh r0, [r4, 0xA]
- bl sub_815AF5C
- movs r0, 0xAD
- lsls r0, 1
- bl PlayNewMapMusic
- bl sub_815B094
-_0815AD26:
- movs r0, 0
- bl schedule_bg_copy_tilemap_to_vram
- movs r0, 0x1
- bl schedule_bg_copy_tilemap_to_vram
- movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
- movs r0, 0x3
- bl schedule_bg_copy_tilemap_to_vram
- movs r0, 0x9
- bl sub_812B1E0
- movs r4, 0x1
- negs r4, r4
- adds r0, r4, 0
- movs r1, 0x10
- movs r2, 0
- bl BlendPalettes
- movs r0, 0
- str r0, [sp]
- adds r0, r4, 0
- movs r1, 0
- movs r2, 0x10
- movs r3, 0
- bl BeginNormalPaletteFade
- ldr r0, _0815AD80 @ =sub_815ABB0
- bl SetVBlankCallback
- ldr r0, _0815AD84 @ =sub_815AB94
- bl SetMainCallback2
-_0815AD6E:
- add sp, 0x4
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0815AD78: .4byte sub_815B2C0
-_0815AD7C: .4byte gTasks
-_0815AD80: .4byte sub_815ABB0
-_0815AD84: .4byte sub_815AB94
- thumb_func_end sub_815AC2C
-
- thumb_func_start sub_815AD88
-sub_815AD88: @ 815AD88
- push {r4,lr}
- bl sub_80BF7C8
- movs r0, 0
- bl ResetBgsAndClearDma3BusyFlags
- ldr r1, _0815AE20 @ =gUnknown_84792E0
- movs r0, 0
- movs r2, 0x4
- bl InitBgsFromTemplates
- ldr r4, _0815AE24 @ =gUnknown_203F450
- ldr r1, [r4]
- adds r1, 0x4
- movs r0, 0x1
- bl SetBgTilemapBuffer
- ldr r1, [r4]
- ldr r0, _0815AE28 @ =0x00001004
- adds r1, r0
- movs r0, 0x2
- bl SetBgTilemapBuffer
- ldr r1, [r4]
- ldr r0, _0815AE2C @ =0x00002004
- adds r1, r0
- movs r0, 0x3
- bl SetBgTilemapBuffer
- movs r1, 0xC1
- lsls r1, 6
- movs r0, 0
- bl SetGpuReg
- movs r0, 0
- bl ShowBg
- movs r0, 0x1
- bl ShowBg
- movs r0, 0x2
- bl ShowBg
- movs r0, 0x3
- bl ShowBg
- movs r1, 0x80
- lsls r1, 5
- movs r0, 0x3
- movs r2, 0x2
- bl ChangeBgX
- movs r1, 0xA0
- lsls r1, 6
- movs r0, 0x3
- movs r2, 0x1
- bl ChangeBgY
- ldr r0, [r4]
- ldr r1, _0815AE30 @ =0x00004004
- adds r0, r1
- movs r1, 0
- strb r1, [r0]
- ldr r0, [r4]
- ldr r1, _0815AE34 @ =0x00004005
- adds r0, r1
- movs r1, 0x3
- strb r1, [r0]
- movs r0, 0x50
- movs r1, 0
- bl SetGpuReg
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0815AE20: .4byte gUnknown_84792E0
-_0815AE24: .4byte gUnknown_203F450
-_0815AE28: .4byte 0x00001004
-_0815AE2C: .4byte 0x00002004
-_0815AE30: .4byte 0x00004004
-_0815AE34: .4byte 0x00004005
- thumb_func_end sub_815AD88
-
- thumb_func_start sub_815AE38
-sub_815AE38: @ 815AE38
- push {r4,lr}
- sub sp, 0x8
- movs r4, 0
- add r0, sp, 0x4
- strh r4, [r0]
- bl reset_temp_tile_data_buffers
- ldr r1, _0815AE98 @ =gUnknown_8E86240
- str r4, [sp]
- movs r0, 0x1
- movs r2, 0
- movs r3, 0
- bl decompress_and_copy_tile_data_to_vram
- ldr r0, _0815AE9C @ =gUnknown_8E86BE8
- ldr r4, _0815AEA0 @ =gUnknown_203F450
- ldr r1, [r4]
- adds r1, 0x4
- bl LZDecompressWram
- ldr r0, _0815AEA4 @ =gUnknown_8E86D6C
- ldr r1, [r4]
- ldr r2, _0815AEA8 @ =0x00003004
- adds r1, r2
- bl LZDecompressWram
- ldr r0, _0815AEAC @ =gUnknown_8E86F98
- movs r1, 0
- movs r2, 0x80
- bl LoadCompressedPalette
- add r0, sp, 0x4
- movs r1, 0
- movs r2, 0x2
- bl LoadPalette
- ldr r0, _0815AEB0 @ =gUnknown_83A5348
- bl LoadSpritePalette
- ldr r0, [r4]
- ldr r1, _0815AEB4 @ =0x00002004
- adds r0, r1
- bl sub_815BD80
- add sp, 0x8
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0815AE98: .4byte gUnknown_8E86240
-_0815AE9C: .4byte gUnknown_8E86BE8
-_0815AEA0: .4byte gUnknown_203F450
-_0815AEA4: .4byte gUnknown_8E86D6C
-_0815AEA8: .4byte 0x00003004
-_0815AEAC: .4byte gUnknown_8E86F98
-_0815AEB0: .4byte gUnknown_83A5348
-_0815AEB4: .4byte 0x00002004
- thumb_func_end sub_815AE38
-
- thumb_func_start sub_815AEB8
-sub_815AEB8: @ 815AEB8
- push {lr}
- ldr r0, _0815AEE4 @ =gUnknown_84792F0
- bl InitWindows
- bl DeactivateAllTextPrinters
- movs r0, 0
- movs r1, 0xCC
- bl FillWindowPixelBuffer
- movs r0, 0
- bl PutWindowTilemap
- movs r0, 0x1
- bl PutWindowTilemap
- movs r0, 0
- movs r1, 0x2
- bl CopyWindowToVram
- pop {r0}
- bx r0
- .align 2, 0
-_0815AEE4: .4byte gUnknown_84792F0
- thumb_func_end sub_815AEB8
-
- thumb_func_start sub_815AEE8
-sub_815AEE8: @ 815AEE8
- push {r4,r5,lr}
- ldr r4, _0815AF48 @ =gMultiuseListMenuTemplate
- adds r1, r4, 0
- ldr r0, _0815AF4C @ =gUnknown_8479368
- ldm r0!, {r2,r3,r5}
- stm r1!, {r2,r3,r5}
- ldm r0!, {r2,r3,r5}
- stm r1!, {r2,r3,r5}
- movs r0, 0x1
- strb r0, [r4, 0x10]
- ldr r0, _0815AF50 @ =sub_815AFD8
- str r0, [r4, 0x4]
- movs r0, 0xB6
- lsls r0, 1
- movs r1, 0x1
- bl CheckBagHasItem
- lsls r0, 24
- cmp r0, 0
- bne _0815AF30
- ldr r0, _0815AF54 @ =gUnknown_8479340
- str r0, [r4]
- movs r0, 0x5
- strh r0, [r4, 0xC]
- strh r0, [r4, 0xE]
- ldrb r2, [r4, 0x14]
- lsls r1, r2, 28
- lsrs r1, 28
- adds r1, 0x8
- movs r0, 0xF
- ands r1, r0
- movs r0, 0x10
- negs r0, r0
- ands r0, r2
- orrs r0, r1
- strb r0, [r4, 0x14]
-_0815AF30:
- ldr r0, _0815AF58 @ =gTeachyTV_StaticResources
- ldrh r1, [r0, 0x6]
- ldrh r2, [r0, 0x8]
- adds r0, r4, 0
- bl ListMenuInit
- lsls r0, 24
- lsrs r0, 24
- pop {r4,r5}
- pop {r1}
- bx r1
- .align 2, 0
-_0815AF48: .4byte gMultiuseListMenuTemplate
-_0815AF4C: .4byte gUnknown_8479368
-_0815AF50: .4byte sub_815AFD8
-_0815AF54: .4byte gUnknown_8479340
-_0815AF58: .4byte gTeachyTV_StaticResources
- thumb_func_end sub_815AEE8
-
- thumb_func_start sub_815AF5C
-sub_815AF5C: @ 815AF5C
- push {lr}
- movs r0, 0xB6
- lsls r0, 1
- movs r1, 0x1
- bl CheckBagHasItem
- lsls r0, 24
- cmp r0, 0
- bne _0815AF84
- ldr r0, _0815AF7C @ =gUnknown_203F450
- ldr r0, [r0]
- ldr r1, _0815AF80 @ =0x00004007
- adds r0, r1
- movs r1, 0xFF
- strb r1, [r0]
- b _0815AF96
- .align 2, 0
-_0815AF7C: .4byte gUnknown_203F450
-_0815AF80: .4byte 0x00004007
-_0815AF84:
- ldr r0, _0815AF9C @ =gUnknown_8479380
- ldr r1, _0815AFA0 @ =gUnknown_203F44A
- bl AddScrollIndicatorArrowPair
- ldr r1, _0815AFA4 @ =gUnknown_203F450
- ldr r1, [r1]
- ldr r2, _0815AFA8 @ =0x00004007
- adds r1, r2
- strb r0, [r1]
-_0815AF96:
- pop {r0}
- bx r0
- .align 2, 0
-_0815AF9C: .4byte gUnknown_8479380
-_0815AFA0: .4byte gUnknown_203F44A
-_0815AFA4: .4byte gUnknown_203F450
-_0815AFA8: .4byte 0x00004007
- thumb_func_end sub_815AF5C
-
- thumb_func_start sub_815AFAC
-sub_815AFAC: @ 815AFAC
- push {r4,lr}
- ldr r4, _0815AFD0 @ =gUnknown_203F450
- ldr r0, [r4]
- ldr r2, _0815AFD4 @ =0x00004007
- adds r1, r0, r2
- ldrb r0, [r1]
- cmp r0, 0xFF
- beq _0815AFCA
- bl RemoveScrollIndicatorArrowPair
- ldr r0, [r4]
- ldr r1, _0815AFD4 @ =0x00004007
- adds r0, r1
- movs r1, 0xFF
- strb r1, [r0]
-_0815AFCA:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0815AFD0: .4byte gUnknown_203F450
-_0815AFD4: .4byte 0x00004007
- thumb_func_end sub_815AFAC
-
- thumb_func_start sub_815AFD8
-sub_815AFD8: @ 815AFD8
- push {lr}
- lsls r1, 24
- lsrs r1, 24
- cmp r1, 0x1
- beq _0815AFE8
- movs r0, 0x5
- bl PlaySE
-_0815AFE8:
- pop {r0}
- bx r0
- thumb_func_end sub_815AFD8
-
- thumb_func_start sub_815AFEC
-sub_815AFEC: @ 815AFEC
- push {lr}
- movs r0, 0x48
- movs r1, 0x3F
- bl SetGpuReg
- movs r0, 0x4A
- movs r1, 0x1F
- bl SetGpuReg
- movs r0, 0x50
- movs r1, 0xCC
- bl SetGpuReg
- movs r0, 0x54
- movs r1, 0x5
- bl SetGpuReg
- pop {r0}
- bx r0
- thumb_func_end sub_815AFEC
-
- thumb_func_start sub_815B014
-sub_815B014: @ 815B014
- push {lr}
- sub sp, 0x4
- ldr r1, _0815B054 @ =SpriteCallbackDummy
- movs r0, 0x8
- str r0, [sp]
- movs r0, 0x5A
- movs r2, 0
- movs r3, 0
- bl AddPseudoFieldObject
- lsls r0, 24
- lsrs r0, 24
- ldr r1, _0815B058 @ =gSprites
- lsls r2, r0, 4
- adds r2, r0
- lsls r2, 2
- adds r2, r1
- ldrb r3, [r2, 0x5]
- movs r1, 0xD
- negs r1, r1
- ands r1, r3
- movs r3, 0x8
- orrs r1, r3
- strb r1, [r2, 0x5]
- adds r2, 0x3E
- ldrb r1, [r2]
- movs r3, 0x4
- orrs r1, r3
- strb r1, [r2]
- add sp, 0x4
- pop {r1}
- bx r1
- .align 2, 0
-_0815B054: .4byte SpriteCallbackDummy
-_0815B058: .4byte gSprites
- thumb_func_end sub_815B014
-
- thumb_func_start sub_815B05C
-sub_815B05C: @ 815B05C
- push {r4,r5,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r3, 24
- lsrs r3, 24
- ldr r5, _0815B090 @ =gSprites
- lsls r0, r4, 4
- adds r0, r4
- lsls r0, 2
- adds r0, r5
- strh r1, [r0, 0x24]
- strh r2, [r0, 0x26]
- adds r4, r0, 0
- adds r4, 0x3E
- ldrb r2, [r4]
- movs r1, 0x5
- negs r1, r1
- ands r1, r2
- strb r1, [r4]
- adds r1, r3, 0
- bl StartSpriteAnim
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0815B090: .4byte gSprites
- thumb_func_end sub_815B05C
-
- thumb_func_start sub_815B094
-sub_815B094: @ 815B094
- push {lr}
- ldr r1, _0815B0AC @ =0x00000c64
- movs r0, 0x44
- bl SetGpuReg
- ldr r1, _0815B0B0 @ =0x00001cd4
- movs r0, 0x40
- bl SetGpuReg
- pop {r0}
- bx r0
- .align 2, 0
-_0815B0AC: .4byte 0x00000c64
-_0815B0B0: .4byte 0x00001cd4
- thumb_func_end sub_815B094
-
- thumb_func_start sub_815B0B4
-sub_815B0B4: @ 815B0B4
- push {lr}
- movs r0, 0x44
- movs r1, 0
- bl SetGpuReg
- movs r0, 0x40
- movs r1, 0
- bl SetGpuReg
- pop {r0}
- bx r0
- thumb_func_end sub_815B0B4
-
- thumb_func_start sub_815B0CC
-sub_815B0CC: @ 815B0CC
- push {r4-r7,lr}
- movs r0, 0x2
- bl GetBgTilemapBuffer
- adds r7, r0, 0
- movs r0, 0x1
-_0815B0D8:
- movs r4, 0x2
- lsls r5, r0, 5
- adds r6, r0, 0x1
-_0815B0DE:
- bl Random
- adds r2, r5, r4
- lsls r2, 1
- adds r2, r7
- movs r1, 0x3
- ands r1, r0
- lsls r1, 10
- ldr r3, _0815B114 @ =0x0000301f
- adds r0, r3, 0
- adds r1, r0
- strh r1, [r2]
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x1B
- bls _0815B0DE
- lsls r0, r6, 24
- lsrs r0, 24
- cmp r0, 0xC
- bls _0815B0D8
- movs r0, 0x2
- bl schedule_bg_copy_tilemap_to_vram
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0815B114: .4byte 0x0000301f
- thumb_func_end sub_815B0CC
-
- thumb_func_start sub_815B118
-sub_815B118: @ 815B118
+ thumb_func_start TeachyTvSetupPostBattleWindowAndObj
+TeachyTvSetupPostBattleWindowAndObj: @ 815B118
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -693,7 +25,7 @@ sub_815B118: @ 815B118
adds r7, r0, r1
movs r0, 0x1
bl ClearWindowTilemap
- bl sub_815B0B4
+ bl TeachyTvClearWindowRegs
ldr r0, _0815B198 @ =gTeachyTV_StaticResources
ldrb r0, [r0, 0x5]
cmp r0, 0
@@ -704,7 +36,7 @@ sub_815B118: @ 815B118
movs r1, 0x78
movs r2, 0x38
movs r3, 0
- bl sub_815B05C
+ bl TeachyTvSetSpriteCoordsAndSwitchFrame
movs r4, 0xC0
lsls r4, 6
movs r0, 0x3
@@ -743,7 +75,7 @@ _0815B1A8:
movs r1, 0x78
movs r2, 0x38
movs r3, 0
- bl sub_815B05C
+ bl TeachyTvSetSpriteCoordsAndSwitchFrame
_0815B1B8:
movs r0, 0
strh r0, [r5, 0x8]
@@ -761,7 +93,7 @@ _0815B1B8:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_815B118
+ thumb_func_end TeachyTvSetupPostBattleWindowAndObj
thumb_func_start sub_815B1DC
sub_815B1DC: @ 815B1DC
@@ -892,7 +224,7 @@ sub_815B2C0: @ 815B2C0
lsls r0, 3
ldr r1, _0815B31C @ =gTasks+0x8
adds r6, r0, r1
- bl sub_815B0CC
+ bl TeachyTvBg2AnimController
ldr r0, _0815B320 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -903,10 +235,10 @@ sub_815B2C0: @ 815B2C0
bl ListMenuHandleInput
adds r5, r0, 0
ldrb r0, [r6]
- ldr r4, _0815B324 @ =gUnknown_203F44A
+ ldr r4, _0815B324 @ =gTeachyTV_StaticResources+6
adds r2, r4, 0x2
adds r1, r4, 0
- bl get_coro_args_x18_x1A
+ bl ListMenuGetScrollAndRow
ldr r0, _0815B328 @ =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x4
@@ -930,7 +262,7 @@ _0815B30A:
.align 2, 0
_0815B31C: .4byte gTasks+0x8
_0815B320: .4byte gPaletteFade
-_0815B324: .4byte gUnknown_203F44A
+_0815B324: .4byte gTeachyTV_StaticResources+6
_0815B328: .4byte gMain
_0815B32C: .4byte UseFameCheckerFromMenu
_0815B330:
@@ -949,12 +281,12 @@ _0815B33E:
adds r1, r2, 0x6
adds r2, 0x8
bl DestroyListMenu
- bl sub_815B0B4
+ bl TeachyTvClearWindowRegs
movs r0, 0x1
bl ClearWindowTilemap
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
- bl sub_815AFAC
+ bl TeachyTvRemoveScrollIndicatorArrowPair
strh r4, [r6, 0x6]
strh r4, [r6, 0x4]
ldr r1, _0815B384 @ =gTasks
@@ -985,7 +317,7 @@ sub_815B38C: @ 815B38C
lsls r1, 3
ldr r0, _0815B3F8 @ =gTasks+0x8
adds r4, r1, r0
- bl sub_815B0CC
+ bl TeachyTvBg2AnimController
ldrh r0, [r4, 0x4]
adds r0, 0x1
strh r0, [r4, 0x4]
@@ -1010,7 +342,7 @@ sub_815B38C: @ 815B38C
movs r1, 0x8
movs r2, 0x38
movs r3, 0x7
- bl sub_815B05C
+ bl TeachyTvSetSpriteCoordsAndSwitchFrame
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
@@ -1184,7 +516,7 @@ sub_815B4EC: @ 815B4EC
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_815B05C
+ bl TeachyTvSetSpriteCoordsAndSwitchFrame
movs r0, 0
movs r1, 0xCC
bl FillWindowPixelBuffer
@@ -1730,7 +1062,7 @@ sub_815B92C: @ 815B92C
lsls r0, 1
bl PlayNewMapMusic
_0815B94C:
- bl sub_815B0CC
+ bl TeachyTvBg2AnimController
ldrh r0, [r5, 0x4]
adds r0, 0x1
strh r0, [r5, 0x4]
@@ -1741,7 +1073,7 @@ _0815B94C:
movs r4, 0
strh r4, [r5, 0x4]
strh r4, [r5, 0x6]
- bl sub_815AEE8
+ bl TeachyTvSetupWindow
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
@@ -1752,8 +1084,8 @@ _0815B94C:
str r1, [r0]
movs r0, 0
bl PutWindowTilemap
- bl sub_815AF5C
- bl sub_815B094
+ bl TeachyTvSetupScrollIndicatorArrowPair
+ bl TeachyTvSetWindowRegs
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
@@ -1854,8 +1186,8 @@ _0815BA4E:
bx r0
thumb_func_end sub_815BA30
- thumb_func_start sub_815BA54
-sub_815BA54: @ 815BA54
+ thumb_func_start TeachyTvPostBattleFadeControl
+TeachyTvPostBattleFadeControl: @ 815BA54
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -1891,7 +1223,7 @@ _0815BA90: .4byte gPaletteFade
_0815BA94: .4byte gUnknown_8479390
_0815BA98: .4byte gTeachyTV_StaticResources
_0815BA9C: .4byte sub_815B4EC
- thumb_func_end sub_815BA54
+ thumb_func_end TeachyTvPostBattleFadeControl
thumb_func_start sub_815BAA0
sub_815BAA0: @ 815BAA0
@@ -2257,7 +1589,7 @@ _0815BD70:
lsls r0, 1
bl PlayNewMapMusic
_0815BD78:
- bl CB2_ReturnToTeachyTV
+ bl sub_815ABFC
pop {r0}
bx r0
thumb_func_end sub_815BD58
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 07:24:51 +0000