summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rwxr-xr-xasm/bonus_field_select.s2
-rwxr-xr-xasm/ereader.s4
-rwxr-xr-xasm/high_scores.s6
-rwxr-xr-xasm/intro.s14
-rwxr-xr-xasm/pokedex.s2
-rwxr-xr-xasm/rom_3219C.s4
-rwxr-xr-xasm/rom_9BC.s8
7 files changed, 20 insertions, 20 deletions
diff --git a/asm/bonus_field_select.s b/asm/bonus_field_select.s
index 75f11da..f1b177d 100755
--- a/asm/bonus_field_select.s
+++ b/asm/bonus_field_select.s
@@ -23,7 +23,7 @@ _080025C0: .4byte gMain
thumb_func_start sub_25C4
sub_25C4: @ 0x080025C4
push {r4, lr}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x84
diff --git a/asm/ereader.s b/asm/ereader.s
index b5a612c..6ae020e 100755
--- a/asm/ereader.s
+++ b/asm/ereader.s
@@ -26,7 +26,7 @@ sub_2C78: @ 0x08002C78
mov r6, sb
mov r5, r8
push {r5, r6}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x86
@@ -922,7 +922,7 @@ sub_343C: @ 0x0800343C
mov r6, sb
mov r5, r8
push {r5, r6}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x86
diff --git a/asm/high_scores.s b/asm/high_scores.s
index 2db7c6a..b82e058 100755
--- a/asm/high_scores.s
+++ b/asm/high_scores.s
@@ -40,7 +40,7 @@ _0800CE84: .4byte gMain
thumb_func_start sub_CE88
sub_CE88: @ 0x0800CE88
push {r4, r5, r6, r7, lr}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x84
@@ -1864,7 +1864,7 @@ sub_DD70: @ 0x0800DD70
push {r4, r5, r6, lr}
mov r6, r8
push {r6}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x84
@@ -2283,7 +2283,7 @@ sub_E0EC: @ 0x0800E0EC
push {r4, r5, r6, lr}
mov r6, r8
push {r6}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x84
diff --git a/asm/intro.s b/asm/intro.s
index 401f925..0783af7 100755
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -23,7 +23,7 @@ _08009298: .4byte gMain
thumb_func_start sub_929C
sub_929C: @ 0x0800929C
push {r4, lr}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r3, #0x80
lsls r3, r3, #0x13
movs r0, #0x80
@@ -70,7 +70,7 @@ sub_929C: @ 0x0800929C
ldr r0, _08009340 @ =gUnknown_0202C790
strb r2, [r0]
ldr r0, _08009344 @ =sub_93F8 + 1
- bl sub_898
+ bl SetMainCallback
bl sub_CBC
bl sub_24C
ldrb r0, [r4, #3]
@@ -169,7 +169,7 @@ sub_93D0: @ 0x080093D0
bl sub_2B4
bl m4aMPlayAllStop
bl sub_D10
- bl sub_8BC
+ bl ResetMainCallback
ldr r1, _080093F4 @ =gAutoDisplayTitlescreenMenu
movs r0, #0
strb r0, [r1]
@@ -266,7 +266,7 @@ sub_9498: @ 0x08009498
push {r5, r6, r7}
bl ClearGraphicsMemory
bl sub_518
- bl sub_578
+ bl ClearSprites
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x80
@@ -3630,7 +3630,7 @@ sub_B090: @ 0x0800B090
push {lr}
sub sp, #8
bl sub_10480
- bl sub_578
+ bl ClearSprites
movs r2, #0
str r2, [sp]
ldr r1, _0800B0D4 @ =0x040000D4
@@ -4488,7 +4488,7 @@ _0800B79C: .4byte gUnknown_0202C790
sub_B7A0: @ 0x0800B7A0
push {lr}
sub sp, #8
- bl sub_578
+ bl ClearSprites
movs r2, #0
str r2, [sp]
ldr r1, _0800B7E4 @ =0x040000D4
@@ -6093,7 +6093,7 @@ sub_C498: @ 0x0800C498
push {lr}
sub sp, #8
bl sub_10480
- bl sub_578
+ bl ClearSprites
movs r2, #0
str r2, [sp]
ldr r1, _0800C4DC @ =0x040000D4
diff --git a/asm/pokedex.s b/asm/pokedex.s
index c0c5dea..8aaa2c7 100755
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -27,7 +27,7 @@ sub_3DCC: @ 0x08003DCC
mov r6, sb
mov r5, r8
push {r5, r6, r7}
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
movs r2, #0x80
lsls r2, r2, #0x13
movs r1, #0x86
diff --git a/asm/rom_3219C.s b/asm/rom_3219C.s
index 78f972d..e88ef82 100755
--- a/asm/rom_3219C.s
+++ b/asm/rom_3219C.s
@@ -5595,7 +5595,7 @@ _08035170:
.align 2, 0
_08035194: .4byte gMain
_08035198:
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
ldr r0, [r5]
strb r4, [r0, #0x1d]
_080351A0:
@@ -46258,7 +46258,7 @@ _08049EFA:
ldr r1, _08049F1C @ =gUnknown_020314E0
ldr r0, _08049F20 @ =gUnknown_02000000
str r0, [r1]
- bl sub_438
+ bl ResetSomeGraphicsRelatedStuff
ldr r1, _08049F18 @ =gMain
movs r0, #0
strb r0, [r1, #0xe]
diff --git a/asm/rom_9BC.s b/asm/rom_9BC.s
index 12970f6..fc9c5bc 100755
--- a/asm/rom_9BC.s
+++ b/asm/rom_9BC.s
@@ -620,9 +620,9 @@ sub_1884: @ 0x08001884
mov r1, r8
strh r0, [r1]
ldr r0, _08001960 @ =sub_19CC + 1
- bl sub_898
+ bl SetMainCallback
ldr r0, _08001964 @ =sub_1A78 + 1
- bl sub_8D4
+ bl SetVBlankIntrFunc
strh r4, [r5]
ldrh r0, [r6]
movs r1, #0x80
@@ -2250,8 +2250,8 @@ sub_2568: @ 0x08002568
ldr r4, _08002594 @ =0x04000208
movs r0, #0
strh r0, [r4]
- bl sub_8BC
- bl sub_8FC
+ bl ResetMainCallback
+ bl ResetVBlankIntrFunc
ldr r1, _08002598 @ =0x04000200
ldr r2, _0800259C @ =0x00002005
adds r0, r2, #0