summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-11-28 21:21:42 -0800
committerYamaArashi <shadow962@live.com>2015-11-28 21:21:42 -0800
commitf8504f2c9c8932da4782a35186dce4065c4be967 (patch)
treeffaa2692528d6b43e9ccefc4ef9d4ba66887d3b7
parentfe5e75ac8f45528204faf51fdcd02fdbbefc80da (diff)
new game Birch pic
Diffstat
-rw-r--r--asm/emerald.s1122
-rw-r--r--asm/gpu_obj.s6
-rw-r--r--asm/main_menu.s24
-rw-r--r--data/data2.s64
-rw-r--r--data/graphics/field_objects/field_effect_objects.s6
-rw-r--r--data/graphics/new_game/birch.pal19
-rw-r--r--data/graphics/new_game/birch.pngbin0 -> 843 bytes
7 files changed, 655 insertions, 586 deletions
diff --git a/asm/emerald.s b/asm/emerald.s
index d2ad7f140..9193aa8c5 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -623,7 +623,7 @@ sub_8009900: ; 8009900
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08009946:
ldrh r1, [r4, 0x2E]
movs r0, 0x8
@@ -24551,7 +24551,7 @@ sub_80156E0: ; 80156E0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x12
b @08016876
@080163A2:
@@ -24692,7 +24692,7 @@ sub_80156E0: ; 80156E0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x36
b @08016876
@080164F4:
@@ -32907,7 +32907,7 @@ sub_801A6C0: ; 801A6C0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl gpu_sync_bg_show
movs r0, 0
@@ -33047,7 +33047,7 @@ sub_801A6C0: ; 801A6C0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0801A86C:
ldr r1, =0x03005e00
lsls r0, r5, 2
@@ -33723,7 +33723,7 @@ sub_801AC54: ; 801AC54
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
bl gpu_sync_bg_show
ldr r1, =0x030022c0
@@ -33790,7 +33790,7 @@ sub_801AC54: ; 801AC54
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x030022c0
movs r1, 0x87
lsls r1, 3
@@ -35456,7 +35456,7 @@ sub_801BB74: ; 801BB74
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0801BD86
@0801BBDA:
bl fade_and_return_progress_probably
@@ -35626,7 +35626,7 @@ sub_801BB74: ; 801BB74
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl fade_and_return_progress_probably
b @0801BD86
.pool
@@ -35703,7 +35703,7 @@ sub_801BDA4: ; 801BDA4
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0801BEDA
@0801BE02:
bl fade_and_return_progress_probably
@@ -35785,7 +35785,7 @@ sub_801BDA4: ; 801BDA4
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0801BEDA
.pool
@0801BEC4:
@@ -36549,7 +36549,7 @@ sub_801C4C0: ; 801C4C0
bl sub_80D2E84
lsls r0, 16
lsrs r0, 16
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r7, [sp]
str r7, [sp, 0x4]
movs r2, 0xDC
@@ -36654,7 +36654,7 @@ sub_801C4C0: ; 801C4C0
mov r2, r9
str r2, [sp]
str r2, [sp, 0x4]
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
adds r2, r5, 0
movs r3, 0x88
bl sub_80D2D78
@@ -36886,7 +36886,7 @@ sub_801C758: ; 801C758
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0801CA1E
@0801C7C6:
bl fade_and_return_progress_probably
@@ -37124,7 +37124,7 @@ sub_801C758: ; 801C758
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl fade_and_return_progress_probably
b @0801CA1E
.pool
@@ -37213,7 +37213,7 @@ sub_801CA50: ; 801CA50
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0801CC0E
@0801CAB2:
bl fade_and_return_progress_probably
@@ -37345,7 +37345,7 @@ sub_801CA50: ; 801CA50
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0801CC0E
.pool
@0801CBF4:
@@ -39807,7 +39807,7 @@ c2_081284E0: ; 801DE54
adds r1, r4, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_801DF20
bl SetVBlankCallback
@0801DEBC:
@@ -41331,7 +41331,7 @@ sub_801E978: ; 801E978
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x02022c84
ldr r1, [r0]
movs r0, 0xD
@@ -46308,7 +46308,7 @@ sub_802130C: ; 802130C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl fade_and_return_progress_probably
b @0802143E
@0802137E:
@@ -46683,7 +46683,7 @@ sub_8021608: ; 8021608
ands r0, r2
cmp r1, r0
blt @0802169A
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r5, 0x1C]
adds r0, r5, 0
bl obj_free_rotscale_entry
@@ -49043,7 +49043,7 @@ sub_8022A4C: ; 8022A4C
push {r4,r5,lr}
adds r3, r0, 0
movs r1, 0
- ldr r5, =nullsub_12
+ ldr r5, =DummyObjectCallback
adds r2, r3, 0
adds r2, 0x2E
movs r4, 0
@@ -49341,7 +49341,7 @@ sub_8022C58: ; 8022C58
ldrb r3, [r1, 0x6]
str r4, [sp]
adds r1, r5, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl fade_and_return_progress_probably
movs r0, 0x2
strb r0, [r6, 0xE]
@@ -52348,7 +52348,7 @@ sub_80243BC: ; 80243BC
movs r2, 0x10
movs r3, 0
@08024410:
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl fade_and_return_progress_probably
b @08024434
@0802441A:
@@ -53468,7 +53468,7 @@ sub_8024BC8: ; 8024BC8
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80261E4
bl SetVBlankCallback
b @08024D20
@@ -54674,7 +54674,7 @@ sub_80256AC: ; 80256AC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0802571A
@080256E0:
bl fade_and_return_progress_probably
@@ -54763,7 +54763,7 @@ sub_8025758: ; 8025758
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08025848
@080257B0:
movs r0, 0
@@ -54821,7 +54821,7 @@ sub_8025758: ; 8025758
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08025848
@08025838:
bl fade_and_return_progress_probably
@@ -65281,7 +65281,7 @@ sub_802ACA0: ; 802ACA0
adds r1, r4, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_802AC58
bl SetVBlankCallback
ldr r0, =0x02022cfc
@@ -67229,7 +67229,7 @@ sub_802BC60: ; 802BC60
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
b @0802BD02
@0802BCEE:
@@ -69198,7 +69198,7 @@ sub_802CB7C: ; 802CB7C
movs r1, 0x4
orrs r0, r1
strb r0, [r3]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@0802CBE6:
pop {r0}
@@ -69279,7 +69279,7 @@ sub_802CC40: ; 802CC40
ble @0802CC7C
movs r0, 0
strh r0, [r2, 0x26]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@0802CC7C:
pop {r0}
@@ -69321,7 +69321,7 @@ sub_802CCB0: ; 802CCB0
ldr r1, =0x000081a8
adds r3, r4, r1
ldr r7, =sub_802CD08
- ldr r6, =nullsub_12
+ ldr r6, =DummyObjectCallback
movs r5, 0xA
adds r4, r0, 0
@0802CCD2:
@@ -69517,7 +69517,7 @@ sub_802CDD4: ; 802CDD4
b @0802CE3C
.pool
@0802CE38:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r5, 0x1C]
@0802CE3C:
pop {r4,r5}
@@ -73670,7 +73670,7 @@ sub_802EE5C: ; 802EE5C
asrs r0, 16
cmp r0, 0x28
ble @0802EF46
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r5, 0x1C]
@0802EF46:
pop {r4,r5}
@@ -84889,7 +84889,7 @@ sub_8038420: ; 8038420
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80384E4
bl set_callback2
@08038482:
@@ -86195,7 +86195,7 @@ sub_8038F34: ; 8038F34
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0803910C
@08038FC2:
ldr r0, =0x02037fd4
@@ -86323,7 +86323,7 @@ sub_8038F34: ; 8038F34
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08039172
.pool
@08039100:
@@ -86578,7 +86578,7 @@ sub_80392A8: ; 80392A8
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x02024332
strb r4, [r0]
add sp, 0x8
@@ -86992,7 +86992,7 @@ sub_803939C: ; 803939C
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x02024332
movs r0, 0x20
strb r0, [r1, 0x1]
@@ -87077,7 +87077,7 @@ oac_poke_opponent: ; 80397DC
movs r1, 0
movs r2, 0xA
movs r3, 0xA
- bl sub_80A1AD4
+ bl pal_fade_maybe
add sp, 0x4
pop {r0}
bx r0
@@ -87141,7 +87141,7 @@ sub_8039838: ; 8039838
movs r1, 0
movs r2, 0xA
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08039880:
add sp, 0x4
pop {r4}
@@ -124192,7 +124192,7 @@ sub_804E038: ; 804E038
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0804E192
.pool
@0804E150:
@@ -139787,7 +139787,7 @@ sub_80568CC: ; 80568CC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08056A06
@0805692A:
ldr r0, =0x02037fd4
@@ -139870,7 +139870,7 @@ sub_80568CC: ; 80568CC
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
bl gpu_sync_bg_show
movs r0, 0x3
@@ -143309,7 +143309,7 @@ sub_8058844: ; 8058844
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08058868
bl dp01_tbl1_exec_completed
@@ -143334,7 +143334,7 @@ sub_805887C: ; 805887C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @080588A0
bl dp01_tbl1_exec_completed
@@ -143360,7 +143360,7 @@ bx_802F7A0: ; 80588B4
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08058908
ldr r0, =0x03005d90
@@ -143462,7 +143462,7 @@ sub_805896C: ; 805896C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
mov r10, r3
cmp r1, r0
bne @08058A0A
@@ -143482,7 +143482,7 @@ sub_805896C: ; 805896C
adds r5, 0x1C
adds r0, r5
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
mov r10, r2
cmp r3, r0
bne @08058A0A
@@ -143894,7 +143894,7 @@ sub_8058B40: ; 8058B40
adds r2, 0x1C
adds r0, r2
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r3, r0
bne @08058E0A
ldr r0, =0x020241e4
@@ -143922,7 +143922,7 @@ sub_8058B40: ; 8058B40
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
bne @08058E0A
ldr r6, =0x020241e4
@@ -144062,7 +144062,7 @@ sub_8058EDC: ; 8058EDC
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
bne @08058F94
ldr r5, =0x020244d0
@@ -144228,7 +144228,7 @@ sub_805902C: ; 805902C
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @080590D2
ldr r0, [r6]
@@ -148138,7 +148138,7 @@ sub_805B258: ; 805B258
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@@ -148914,7 +148914,7 @@ sub_805B9F8: ; 805B9F8
adds r0, r1
lsls r0, 2
adds r0, r4
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
ldrb r0, [r6]
adds r0, r5
@@ -149053,7 +149053,7 @@ sub_805BBA4: ; 805BBA4
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl dp01_tbl1_exec_completed
add sp, 0x4
pop {r0}
@@ -149790,7 +149790,7 @@ sub_805C248: ; 805C248
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005d60
ldr r2, =0x02024064
ldrb r0, [r2]
@@ -149939,7 +149939,7 @@ sub_805C2AC: ; 805C2AC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005d60
ldrb r0, [r4]
lsls r0, 2
@@ -149971,7 +149971,7 @@ sub_805C3EC: ; 805C3EC
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl dp01_tbl1_exec_completed
add sp, 0x4
pop {r0}
@@ -152202,7 +152202,7 @@ sub_805D714: ; 805D714
lsls r0, r3, 27
cmp r0, 0
bge @0805D766
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@0805D766:
pop {r4}
@@ -152222,7 +152222,7 @@ sub_805D770: ; 805D770
movs r2, 0x40
orrs r0, r2
strb r0, [r3]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
cmp r1, 0
bne @0805D798
@@ -152268,7 +152268,7 @@ sub_805D7AC: ; 805D7AC
b @0805D7E2
.pool
@0805D7E0:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
@0805D7E2:
str r0, [r2, 0x1C]
@0805D7E4:
@@ -152287,7 +152287,7 @@ sub_805D7EC: ; 805D7EC
lsls r0, 16
cmp r0, 0
bne @0805D800
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r1, 0x1C]
@0805D800:
pop {r0}
@@ -155341,7 +155341,7 @@ sub_805F1D0: ; 805F1D0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805F1F4
bl dp01_tbl7_exec_completed
@@ -155366,7 +155366,7 @@ sub_805F208: ; 805F208
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805F22C
bl dp01_tbl7_exec_completed
@@ -155392,7 +155392,7 @@ sub_805F240: ; 805F240
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805F292
adds r0, r2, r5
@@ -155502,7 +155502,7 @@ sub_805F2F0: ; 805F2F0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805F34E
movs r1, 0x1
@@ -155524,7 +155524,7 @@ sub_805F2F0: ; 805F2F0
adds r3, 0x1C
adds r0, r3
ldr r5, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r5, r0
bne @0805F3A0
movs r0, 0x2
@@ -156033,7 +156033,7 @@ sub_805F560: ; 805F560
adds r2, 0x1C
adds r0, r2
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r3, r0
bne @0805F86E
ldr r0, =0x020241e4
@@ -156063,7 +156063,7 @@ sub_805F560: ; 805F560
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
bne @0805F86E
ldr r6, =0x020241e4
@@ -156274,7 +156274,7 @@ sub_805F994: ; 805F994
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805FA48
ldr r4, =0x020244d0
@@ -156524,7 +156524,7 @@ sub_805FC10: ; 805FC10
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805FC5C
ldr r0, =0x020244d0
@@ -156588,7 +156588,7 @@ bx_803AEDC: ; 805FC80
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @0805FCCA
ldr r0, =nullsub_18
@@ -156636,7 +156636,7 @@ sub_805FD00: ; 805FD00
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805FDBC
ldrb r1, [r3]
@@ -156743,7 +156743,7 @@ sub_805FDF0: ; 805FDF0
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0805FE8C
ldr r0, [r6]
@@ -159300,7 +159300,7 @@ sub_80613DC: ; 80613DC
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFE
@@ -159991,7 +159991,7 @@ sub_8061AF0: ; 8061AF0
adds r0, r1
lsls r0, 2
adds r0, r5
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
ldr r1, =0x03005d60
ldrb r0, [r4]
@@ -164846,7 +164846,7 @@ sub_8064400: ; 8064400
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08064424
bl sub_8065068
@@ -164871,7 +164871,7 @@ sub_8064438: ; 8064438
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0806445C
bl sub_8065068
@@ -164897,7 +164897,7 @@ sub_8064470: ; 8064470
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @080644C2
adds r0, r2, r5
@@ -164998,7 +164998,7 @@ sub_8064520: ; 8064520
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
adds r7, r3, 0
cmp r1, r0
bne @080645C2
@@ -165018,7 +165018,7 @@ sub_8064520: ; 8064520
adds r5, 0x1C
adds r0, r5
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
adds r7, r2, 0
cmp r3, r0
bne @080645C0
@@ -165478,7 +165478,7 @@ sub_8064734: ; 8064734
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
beq @08064982
b @08064AC0
@@ -165664,7 +165664,7 @@ sub_8064B04: ; 8064B04
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08064BB6
adds r0, r2, r4
@@ -165935,7 +165935,7 @@ sub_8064D60: ; 8064D60
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08064DAC
ldr r0, =0x020244d0
@@ -165999,7 +165999,7 @@ sub_8064DD0: ; 8064DD0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @08064E1A
ldr r0, =nullsub_18
@@ -166047,7 +166047,7 @@ sub_8064E50: ; 8064E50
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08064F0C
ldrb r1, [r3]
@@ -166154,7 +166154,7 @@ sub_8064F40: ; 8064F40
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08064FDC
ldr r0, [r6]
@@ -168643,7 +168643,7 @@ sub_8066494: ; 8066494
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFE
@@ -169344,7 +169344,7 @@ sub_8066B94: ; 8066B94
adds r0, r1
lsls r0, 2
adds r0, r5
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
ldr r1, =0x03005d60
ldrb r0, [r4]
@@ -185400,7 +185400,7 @@ sub_806ED40: ; 806ED40
adds r0, r4, 0
bl cry_related
@0806ED7C:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
b @0806EDFA
.pool
@0806ED84:
@@ -185557,7 +185557,7 @@ sub_806EEB4: ; 806EEB4
ands r0, r1
cmp r0, 0
bne @0806EEE8
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
b @0806EEFC
.pool
@0806EEE8:
@@ -190725,7 +190725,7 @@ sub_807163C: ; 807163C
strb r0, [r2]
adds r4, 0x1C
adds r1, r4
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r1]
@08071712:
adds r0, r7, 0
@@ -191117,7 +191117,7 @@ sub_8071A94: ; 8071A94
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =gUnknown_0832BFFC
movs r1, 0x78
movs r2, 0x4B
@@ -191197,7 +191197,7 @@ sub_8071A94: ; 8071A94
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @08071BBC
b @08071E06
@@ -191234,7 +191234,7 @@ sub_8071A94: ; 8071A94
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @08071C12
b @08071E06
@@ -191416,7 +191416,7 @@ sub_8071A94: ; 8071A94
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08071DC4:
ldr r0, =0x03000de0
ldr r1, [r0]
@@ -191676,7 +191676,7 @@ sub_8071FC8: ; 8071FC8
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08071FE8:
ldrh r0, [r5, 0x2E]
cmp r0, 0x3
@@ -191766,7 +191766,7 @@ sub_8072048: ; 8072048
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0807209E:
movs r1, 0x2E
ldrsh r0, [r5, r1]
@@ -191789,7 +191789,7 @@ sub_8072048: ; 8072048
ldrsh r0, [r5, r2]
cmp r0, 0x28
ble @080720CA
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r5, 0x1C]
@080720CA:
adds r0, r1, 0x1
@@ -194053,7 +194053,7 @@ sub_8073314: ; 8073314
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @08073354
b @080735A8
@@ -195740,7 +195740,7 @@ sub_80740C4: ; 80740C4
movs r0, 0x73
bl sub_80A3808
@0807414A:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@0807414E:
pop {r4}
@@ -195801,7 +195801,7 @@ sub_8074158: ; 8074158
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
@080741BC:
pop {r4}
@@ -197976,7 +197976,7 @@ sub_8075370: ; 8075370
b @080753A8
.pool
@080753A4:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@080753A8:
pop {r4}
@@ -200566,7 +200566,7 @@ sub_80768F0: ; 80768F0
ands r0, r1
cmp r0, 0
beq @08076904
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@08076904:
pop {r0}
@@ -200685,7 +200685,7 @@ sub_80769CC: ; 80769CC
ldr r0, [r2, 0x24]
cmp r0, 0
bne @080769EA
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@080769EA:
pop {r0}
@@ -202642,7 +202642,7 @@ sub_80773D0: ; 80773D0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x030022c0
movs r5, 0x87
lsls r5, 3
@@ -203265,7 +203265,7 @@ sub_8077B74: ; 8077B74
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x030022c0
movs r3, 0x87
lsls r3, 3
@@ -203356,7 +203356,7 @@ sub_8078130: ; 8078130
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, [r4]
adds r0, 0x6F
movs r1, 0xA
@@ -204237,7 +204237,7 @@ sub_8078900: ; 8078900
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x4
bl sub_807A19C
ldr r0, =0x0203229c
@@ -204278,7 +204278,7 @@ sub_8078900: ; 8078900
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x0203229c
ldr r0, [r0]
adds r0, 0x6F
@@ -204456,7 +204456,7 @@ sub_80789FC: ; 80789FC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, [r6]
adds r1, r0, 0
adds r1, 0x79
@@ -204879,7 +204879,7 @@ sub_8078DBC: ; 8078DBC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, [r4]
adds r0, 0x6F
movs r1, 0x2
@@ -204982,7 +204982,7 @@ sub_8078F50: ; 8078F50
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x0203229c
ldr r0, [r0]
adds r0, 0x6F
@@ -208816,7 +208816,7 @@ sub_807ACFC: ; 807ACFC
lsls r0, 2
adds r3, 0x1C
adds r0, r3
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
@0807AE36:
pop {r3}
@@ -209086,7 +209086,7 @@ sub_807AE50: ; 807AE50
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
bl gpu_sync_bg_show
ldr r1, =0x030022c0
@@ -210700,7 +210700,7 @@ sub_807BBEC: ; 807BBEC
adds r4, 0x1C
adds r0, r4
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @0807C1FC
bl @0807CFB4
@@ -210740,7 +210740,7 @@ sub_807BBEC: ; 807BBEC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020322a0
ldr r0, [r0]
adds r0, 0x94
@@ -211014,7 +211014,7 @@ sub_807BBEC: ; 807BBEC
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020322a0
ldr r0, [r0]
adds r0, 0x94
@@ -211061,7 +211061,7 @@ sub_807BBEC: ; 807BBEC
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r5, =gUnknown_08338DC8
adds r0, r5, 0
movs r1, 0x6F
@@ -211468,7 +211468,7 @@ sub_807BBEC: ; 807BBEC
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r7]
adds r2, r1, 0
adds r2, 0x94
@@ -211805,7 +211805,7 @@ sub_807BBEC: ; 807BBEC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020322a0
ldr r0, [r0]
adds r0, 0x94
@@ -211951,7 +211951,7 @@ sub_807BBEC: ; 807BBEC
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r7]
b @0807CF4C
.pool
@@ -211967,7 +211967,7 @@ sub_807BBEC: ; 807BBEC
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @0807CCEE
b @0807CFB4
@@ -212235,7 +212235,7 @@ sub_807BBEC: ; 807BBEC
movs r2, 0
movs r3, 0x10
@0807CF44:
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0807CF48:
ldr r0, =0x020322a0
ldr r1, [r0]
@@ -212762,7 +212762,7 @@ sub_807CFC8: ; 807CFC8
adds r4, 0x1C
adds r0, r4
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @0807D5D8
bl @0807E400
@@ -212802,7 +212802,7 @@ sub_807CFC8: ; 807CFC8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020322a0
ldr r0, [r0]
adds r0, 0x94
@@ -213083,7 +213083,7 @@ sub_807CFC8: ; 807CFC8
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020322a0
ldr r0, [r0]
adds r0, 0x94
@@ -213130,7 +213130,7 @@ sub_807CFC8: ; 807CFC8
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r5, =gUnknown_08338DC8
adds r0, r5, 0
movs r1, 0x6F
@@ -213542,7 +213542,7 @@ sub_807CFC8: ; 807CFC8
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r7]
adds r2, r1, 0
adds r2, 0x94
@@ -213910,7 +213910,7 @@ sub_807CFC8: ; 807CFC8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020322a0
ldr r0, [r0]
adds r0, 0x94
@@ -214056,7 +214056,7 @@ sub_807CFC8: ; 807CFC8
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r7]
b @0807E398
.pool
@@ -214072,7 +214072,7 @@ sub_807CFC8: ; 807CFC8
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @0807E13A
b @0807E400
@@ -214340,7 +214340,7 @@ sub_807CFC8: ; 807CFC8
movs r2, 0
movs r3, 0x10
@0807E390:
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0807E394:
ldr r0, =0x020322a0
ldr r1, [r0]
@@ -214597,7 +214597,7 @@ sub_807E55C: ; 807E55C
bne @0807E5CE
movs r0, 0x1
strh r0, [r5, 0x3C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r5, 0x1C]
@0807E5CE:
pop {r4,r5}
@@ -214652,7 +214652,7 @@ sub_807E5D8: ; 807E5D8
str r2, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0807E636:
add sp, 0x4
pop {r4}
@@ -214774,7 +214774,7 @@ sub_807E6AC: ; 807E6AC
asrs r0, 16
cmp r0, 0x6C
bne @0807E72C
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@0807E72C:
pop {r4}
@@ -215630,7 +215630,7 @@ sub_807EB50: ; 807EB50
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0807EFDC
@0807EF7E:
ldr r0, =0x02037fd4
@@ -215784,7 +215784,7 @@ sub_807F0E4: ; 807F0E4
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
add sp, 0x4
pop {r0}
bx r0
@@ -216451,7 +216451,7 @@ sub_807F464: ; 807F464
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x030022c0
movs r1, 0x87
lsls r1, 3
@@ -217039,7 +217039,7 @@ sub_807FAC8: ; 807FAC8
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl sub_8082D28
b @0807FCA0
@0807FC4E:
@@ -217076,7 +217076,7 @@ sub_807FAC8: ; 807FAC8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0807FCA0:
ldr r0, =0x020322a4
ldr r1, [r0]
@@ -217644,7 +217644,7 @@ sub_8080018: ; 8080018
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @080804F8
@080801AE:
bl sub_807F9D0
@@ -218664,7 +218664,7 @@ sub_80808D4: ; 80808D4
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x020322a4
ldr r1, [r2]
ldrb r0, [r1]
@@ -222191,7 +222191,7 @@ sub_8082644: ; 8082644
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020322a4
ldr r1, [r0]
b @080828BC
@@ -224589,7 +224589,7 @@ sub_8083B08: ; 8083B08
adds r5, r6, 0
adds r5, 0x1C
adds r0, r5
- ldr r4, =nullsub_12
+ ldr r4, =DummyObjectCallback
str r4, [r0]
mov r0, r8
movs r1, 0xA0
@@ -283018,7 +283018,7 @@ sub_809F200: ; 809F200
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
strh r0, [r5]
b @0809F404
@@ -283180,7 +283180,7 @@ sub_809F200: ; 809F200
movs r1, 0x1
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x6
strh r0, [r5]
@0809F3EA:
@@ -285302,7 +285302,7 @@ sub_80A0550: ; 80A0550
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x030030fc
ldrb r0, [r0]
cmp r0, 0
@@ -285351,7 +285351,7 @@ sub_80A0550: ; 80A0550
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x4
b @080A06A6
@080A0670:
@@ -285922,8 +285922,8 @@ sub_80A1A94: ; 80A1A94
.pool
thumb_func_end sub_80A1A94
- thumb_func_start sub_80A1AD4
-sub_80A1AD4: ; 80A1AD4
+ thumb_func_start pal_fade_maybe
+pal_fade_maybe: ; 80A1AD4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -286075,7 +286075,7 @@ sub_80A1AD4: ; 80A1AD4
pop {r1}
bx r1
.pool
- thumb_func_end sub_80A1AD4
+ thumb_func_end pal_fade_maybe
thumb_func_start sub_80A1C1C
sub_80A1C1C: ; 80A1C1C
@@ -286104,7 +286104,7 @@ sub_80A1C1C: ; 80A1C1C
adds r1, r4, 0
adds r2, r6, 0
ldr r3, [sp, 0x4]
- bl sub_80A1AD4
+ bl pal_fade_maybe
lsls r0, 24
lsrs r0, 24
add sp, 0x8
@@ -299877,7 +299877,7 @@ sub_80A89C8: ; 80A89C8
sub sp, 0x4
lsls r6, r1, 24
lsrs r6, 24
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
mov r10, r0
bl object_new_hidden_with_callback
mov r8, r0
@@ -301090,7 +301090,7 @@ sub_80A9708: ; 80A9708
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
ldrb r1, [r4]
lsls r0, r1, 4
@@ -301223,7 +301223,7 @@ sub_80A9708: ; 80A9708
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
ldrb r1, [r3]
lsls r0, r1, 4
@@ -301307,7 +301307,7 @@ sub_80A9708: ; 80A9708
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
ldrb r1, [r4]
lsls r0, r1, 4
@@ -303160,7 +303160,7 @@ c2_title_screen_1: ; 80AA7A4
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =title_screen_vblank_callback
bl SetVBlankCallback
ldr r0, =0x030022c0
@@ -303560,7 +303560,7 @@ task_title_screen_3: ; 80AAD64
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =Cb2_GoToMainMenu
bl set_callback2
b @080AAE98
@@ -303591,7 +303591,7 @@ task_title_screen_3: ; 80AAD64
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =c2_reset_rtc_screen_1
bl set_callback2
b @080AAE98
@@ -303611,7 +303611,7 @@ task_title_screen_3: ; 80AAD64
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =c2_berry_program_update_screen_1
bl set_callback2
b @080AAE98
@@ -303662,7 +303662,7 @@ task_title_screen_3: ; 80AAD64
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =c2_show_copyright_and_intro_again_1
bl set_callback2
@080AAE98:
@@ -305496,7 +305496,7 @@ fade_screen: ; 80ABCD0
str r4, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x02038454
ldr r3, =0x000006c6
adds r0, r3
@@ -305525,7 +305525,7 @@ fade_screen: ; 80ABCD0
str r4, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@080ABDB2:
ldr r4, =0x02038454
ldr r1, =0x000006c6
@@ -325171,14 +325171,14 @@ sub_80B5E6C: ; 80B5E6C
mov r3, r8
ldrh r0, [r3, 0x4]
strh r0, [r1, 0x2]
- ldr r0, =gUnknown_0855C210
+ ldr r0, =gNewGameBirchOamAttributes
str r0, [sp, 0x4]
ldr r0, =gDummyObjectImageAnimTable
str r0, [sp, 0x8]
str r2, [sp, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [sp, 0x10]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [sp, 0x14]
lsls r5, 16
asrs r5, 16
@@ -325239,9 +325239,9 @@ sub_80B5F44: ; 80B5F44
lsrs r5, 16
lsls r6, 24
lsrs r6, 24
- ldr r0, =gUnknown_0855C230
+ ldr r0, =gNewGameBirchObjectPaletteInfo
bl gpu_pal_obj_alloc_tag_and_apply
- ldr r0, =gUnknown_0855C244
+ ldr r0, =gNewGameBirchObjectTemplate
lsls r4, 16
asrs r4, 16
lsls r5, 16
@@ -330818,7 +330818,7 @@ sub_80B8C60: ; 80B8C60
lsls r2, 2
ldr r1, =0x02020630
adds r2, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r2, 0x1C]
ldrb r3, [r2, 0x5]
movs r1, 0xD
@@ -332780,7 +332780,7 @@ sub_80B9C54: ; 80B9C54
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
adds r0, r4, 0
bl sub_80B9D24
movs r0, 0x57
@@ -334108,7 +334108,7 @@ c2_options_menu: ; 80BA4DC
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80BA4C8
bl SetVBlankCallback
ldr r0, =sub_80BA4B0
@@ -334461,7 +334461,7 @@ sub_80BAA64: ; 80BAA64
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80BAB08
str r0, [r4]
add sp, 0x4
@@ -336050,7 +336050,7 @@ sub_80BB7D4: ; 80BB7D4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, [r7]
adds r0, r5
ldrh r1, [r0]
@@ -336120,7 +336120,7 @@ sub_80BB7D4: ; 80BB7D4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl sub_80C1258
ldr r1, =0x03005e00
lsls r3, r6, 2
@@ -336180,7 +336180,7 @@ sub_80BB7D4: ; 80BB7D4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r6, 2
adds r0, r6
@@ -336351,7 +336351,7 @@ sub_80BBA78: ; 80BBA78
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r7, 2
adds r0, r7
@@ -336786,7 +336786,7 @@ sub_80BBEB8: ; 80BBEB8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r6, 2
adds r0, r6
@@ -336844,7 +336844,7 @@ sub_80BBEB8: ; 80BBEB8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl sub_80C1258
ldr r2, =0x03005e00
lsls r1, r6, 2
@@ -336879,7 +336879,7 @@ sub_80BBEB8: ; 80BBEB8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r6, 2
adds r0, r6
@@ -337060,7 +337060,7 @@ sub_80BC0F8: ; 80BC0F8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r6, 2
adds r0, r6
@@ -337079,7 +337079,7 @@ sub_80BC0F8: ; 80BC0F8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r6, 2
adds r0, r6
@@ -337629,7 +337629,7 @@ sub_80BC514: ; 80BC514
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80BB370
bl SetVBlankCallback
ldr r1, =0x030022c0
@@ -341976,7 +341976,7 @@ sub_80BEA24: ; 80BEA24
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x030060b4
ldr r0, [r0]
bl SetVBlankCallback
@@ -342145,7 +342145,7 @@ sub_80BEDF4: ; 80BEDF4
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80BF038
str r0, [r4]
movs r0, 0x6C
@@ -342197,7 +342197,7 @@ sub_80BEDF4: ; 80BEDF4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, [r5]
ldr r3, =0x0000064e
adds r0, r3
@@ -342211,7 +342211,7 @@ sub_80BEDF4: ; 80BEDF4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, [r5]
ldr r1, =0x0000064e
adds r0, r1
@@ -342236,7 +342236,7 @@ sub_80BEDF4: ; 80BEDF4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, [r5]
ldr r3, =0x0000064e
adds r0, r3
@@ -342257,7 +342257,7 @@ sub_80BEDF4: ; 80BEDF4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80BF070
str r0, [r4]
movs r0, 0x3
@@ -342891,7 +342891,7 @@ sub_80BF250: ; 80BF250
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x030060b4
ldr r0, [r0]
bl SetVBlankCallback
@@ -343020,7 +343020,7 @@ sub_80BF5CC: ; 80BF5CC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x03007420
bl m4aMPlayContinue
ldr r0, =0x02039b4c
@@ -343062,7 +343062,7 @@ sub_80BF5CC: ; 80BF5CC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x03007420
bl m4aMPlayContinue
ldr r0, =0x02039b4c
@@ -343117,7 +343117,7 @@ sub_80BF5CC: ; 80BF5CC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x03007420
bl m4aMPlayContinue
ldr r0, =0x02039b4c
@@ -343502,7 +343502,7 @@ sub_80BF82C: ; 80BF82C
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x030060b4
ldr r0, [r0]
bl SetVBlankCallback
@@ -343599,7 +343599,7 @@ sub_80BFBB0: ; 80BFBB0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x02039b4c
ldr r0, [r0]
ldr r1, =0x0000064e
@@ -343639,7 +343639,7 @@ sub_80BFBB0: ; 80BFBB0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x02039b4c
ldr r0, [r0]
ldr r1, =0x0000064e
@@ -344057,7 +344057,7 @@ sub_80BFE38: ; 80BFE38
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x030060b4
ldr r0, [r0]
bl SetVBlankCallback
@@ -344147,7 +344147,7 @@ sub_80C0088: ; 80C0088
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r3, =0x02020630
ldr r0, =0x03005e00
lsls r1, r4, 2
@@ -346646,7 +346646,7 @@ sub_80C12E0: ; 80C12E0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x030022c0
movs r2, 0x87
lsls r2, 3
@@ -347632,7 +347632,7 @@ sub_80C1D38: ; 80C1D38
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -349010,7 +349010,7 @@ sub_80C2760: ; 80C2760
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80C2690
bl SetVBlankCallback
ldr r1, [r4]
@@ -349237,7 +349237,7 @@ sub_80C2760: ; 80C2760
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
movs r0, 0xE
strb r0, [r1]
@@ -354290,7 +354290,7 @@ sub_80C5484: ; 80C5484
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @080C56F4
.pool
@080C56D0:
@@ -354362,7 +354362,7 @@ sub_80C570C: ; 80C570C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @080C57E4
@080C576A:
ldr r1, [r2]
@@ -354954,7 +354954,7 @@ sub_80C5BD8: ; 80C5BD8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @080C5CA4
.pool
@080C5C4C:
@@ -354993,7 +354993,7 @@ sub_80C5BD8: ; 80C5BD8
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@080C5CA4:
ldr r4, =0x02039cf0
ldr r0, [r4]
@@ -356109,7 +356109,7 @@ sub_80C64CC: ; 80C64CC
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @080C6694
.pool
@080C6678:
@@ -356171,7 +356171,7 @@ sub_80C66AC: ; 80C66AC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @080C67A4
.pool
@080C66FC:
@@ -358491,7 +358491,7 @@ sub_80C7958: ; 80C7958
str r2, [sp, 0x28]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [sp, 0x2C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [sp, 0x30]
add r0, sp, 0x4
movs r2, 0x18
@@ -359463,7 +359463,7 @@ box_related_2: ; 80C81F8
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @080C8282
@080C8230:
bl fade_and_return_progress_probably
@@ -362175,7 +362175,7 @@ sub_80C9AC8: ; 80C9AC8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r5]
ldrb r0, [r1]
adds r0, 0x1
@@ -362222,7 +362222,7 @@ sub_80C9B28: ; 80C9B28
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r5]
ldrb r0, [r1]
adds r0, 0x1
@@ -362268,7 +362268,7 @@ sub_80C9B88: ; 80C9B88
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
ldrb r0, [r1]
adds r0, 0x1
@@ -363091,7 +363091,7 @@ BoxSetMosaic2: ; 80CA2D0
negs r1, r1
ands r1, r0
strb r1, [r4, 0x1]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@080CA30E:
pop {r4}
@@ -364891,7 +364891,7 @@ sub_80CB234: ; 80CB234
strh r0, [r1]
ldrh r0, [r2, 0x34]
strh r0, [r2, 0x20]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@080CB266:
pop {r0}
@@ -364924,7 +364924,7 @@ sub_80CB278: ; 80CB278
lsrs r0, 16
cmp r0, 0xB6
bls @080CB2A8
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@080CB2A8:
pop {r0}
@@ -365912,7 +365912,7 @@ sub_80CBA3C: ; 80CBA3C
adds r0, 0x10
@080CBA8E:
strh r0, [r3, 0x22]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
ldr r0, =0x02039d08
ldr r2, [r0]
@@ -366262,7 +366262,7 @@ sub_80CBCAC: ; 80CBCAC
ldr r0, =0x00000a6c
adds r1, r0
ldr r2, [r1]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
movs r0, 0
str r0, [r1]
@@ -366307,7 +366307,7 @@ sub_80CBD5C: ; 80CBD5C
ldr r2, =0x00000a6c
adds r0, r1, r2
ldr r2, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
ldr r4, =0x00000c5d
adds r1, r4
@@ -366471,7 +366471,7 @@ sub_80CBDC4: ; 80CBDC4
adds r1, r7
ldr r0, [r1]
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r1, 0x1C]
@080CBEF2:
movs r0, 0x1
@@ -367455,7 +367455,7 @@ sub_80CC6B0: ; 80CC6B0
movs r1, 0x1
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
ldr r2, =0x00000a62
adds r1, r2
@@ -367488,7 +367488,7 @@ sub_80CC6B0: ; 80CC6B0
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
ldr r2, =0x00000a62
adds r1, r2
@@ -368408,7 +368408,7 @@ sub_80CCF30: ; 80CCF30
ldrsh r1, [r2, r3]
cmp r0, r1
bne @080CCF5C
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@080CCF5C:
pop {r0}
@@ -368920,7 +368920,7 @@ sub_80CD2E8: ; 80CD2E8
strb r0, [r6, 0x5]
adds r5, 0x1C
adds r4, r5
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4]
adds r0, r6, 0
b @080CD362
@@ -376431,7 +376431,7 @@ sub_80D1218: ; 80D1218
cmp r0, 0x8
beq @080D124E
ldr r1, [r2, 0x1C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @080D1268
ldr r0, =sub_80D1AD8
@@ -377419,7 +377419,7 @@ sub_80D1A48: ; 80D1A48
lsrs r0, 24
movs r1, 0
bl sub_80D1740
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@080D1A68:
pop {r4}
@@ -377573,7 +377573,7 @@ sub_80D1B14: ; 80D1B14
lsls r2, 24
lsrs r2, 24
bl sub_80D140C
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@080D1B8A:
pop {r4}
@@ -377730,7 +377730,7 @@ sub_80D1C30: ; 80D1C30
lsls r2, 24
lsrs r2, 24
bl sub_80D140C
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x24]
@@ -377757,7 +377757,7 @@ sub_80D1CCC: ; 80D1CCC
negs r1, r1
cmp r0, r1
bge @080D1CFC
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
adds r0, r2, 0
bl sub_80D13C4
@@ -384026,7 +384026,7 @@ sub_80D4D94: ; 80D4D94
lsrs r1, 24
adds r0, r4, 0
bl obj_anim_image_start
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@080D4DB8:
pop {r4}
@@ -384080,7 +384080,7 @@ sub_80D4E0C: ; 80D4E0C
adds r0, r4, 0
movs r1, 0
bl sub_8008258
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@080D4E28:
pop {r4}
@@ -391818,7 +391818,7 @@ sub_80D8B38: ; 80D8B38
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @080D8EA0
bl @080DA100
@@ -394000,7 +394000,7 @@ sub_80DA134: ; 80DA134
cmp r0, 0x1F
bne @080DA15C
strh r2, [r1, 0x2E]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r1, 0x1C]
@080DA15C:
pop {r0}
@@ -394024,7 +394024,7 @@ sub_80DA164: ; 80DA164
negs r1, r1
cmp r0, r1
bge @080DA18E
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
adds r2, 0x3E
ldrb r0, [r2]
@@ -394735,7 +394735,7 @@ sub_80DA740: ; 80DA740
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80DA830
@080DA792:
str r0, [r4]
@@ -394791,7 +394791,7 @@ sub_80DA7EC: ; 80DA7EC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x03005e00
ldr r0, =0x02039f34
ldr r0, [r0]
@@ -395917,7 +395917,7 @@ sub_80DB0C4: ; 80DB0C4
strb r1, [r5, 0x5]
adds r4, 0x1C
adds r2, r4
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r2]
pop {r4,r5}
pop {r1}
@@ -396051,7 +396051,7 @@ sub_80DB174: ; 80DB174
mov r0, r8
adds r0, 0x1C
adds r0, r6, r0
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
ldrb r0, [r4, 0x5]
lsrs r0, 4
@@ -398366,7 +398366,7 @@ sub_80DC408: ; 80DC408
negs r0, r0
ands r0, r2
strb r0, [r1, 0x2]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
b @080DC446
.pool
@@ -399358,7 +399358,7 @@ sub_80DCBE8: ; 80DCBE8
ldr r0, =sub_80DCC84
str r0, [r6]
add r4, r8
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4]
mov r3, r9
cmp r3, 0
@@ -400721,7 +400721,7 @@ sub_80DD6DC: ; 80DD6DC
movs r1, 0x4
orrs r0, r1
strb r0, [r3]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
ldr r0, =0x02039f34
ldr r0, [r0]
@@ -403034,7 +403034,7 @@ sub_80DE9DC: ; 80DE9DC
thumb_func_start sub_80DEA20
sub_80DEA20: ; 80DEA20
push {lr}
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
bl object_new_hidden_with_callback
ldr r1, =0x020241e4
strb r0, [r1, 0x3]
@@ -405525,7 +405525,7 @@ sub_80DFD94: ; 80DFD94
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80DFD80
bl SetVBlankCallback
ldr r0, =sub_80DFD64
@@ -406862,7 +406862,7 @@ sub_80E08F0: ; 80E08F0
movs r0, 0x2
str r0, [sp]
adds r0, r4, 0
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl sub_808DD68
lsls r0, 24
lsrs r4, r0, 24
@@ -407735,7 +407735,7 @@ sub_80E1168: ; 80E1168
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -410740,7 +410740,7 @@ sub_80E2900: ; 80E2900
adds r0, r4, 0
adds r0, 0x1C
adds r0, r1, r0
- ldr r2, =nullsub_12
+ ldr r2, =DummyObjectCallback
str r2, [r0]
adds r1, r4
ldrb r2, [r1, 0x5]
@@ -411853,7 +411853,7 @@ sub_80E3294: ; 80E3294
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r5]
ldr r0, =0x00001e10
adds r1, r0
@@ -411986,7 +411986,7 @@ sub_80E3448: ; 80E3448
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x02039f94
ldr r1, [r0]
ldr r0, =0x00001e10
@@ -413832,7 +413832,7 @@ sub_80E4384: ; 80E4384
bl sub_808BD3C
lsls r0, 24
lsrs r0, 24
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r2, 0
str r2, [sp]
movs r2, 0x38
@@ -413896,7 +413896,7 @@ sub_80E4420: ; 80E4420
ldr r1, =0x00001e34
adds r0, r3, r1
ldrh r0, [r0]
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r2, 0
str r2, [sp]
ldr r2, =0x00001e38
@@ -413929,7 +413929,7 @@ sub_80E4420: ; 80E4420
sub_80E447C: ; 80E447C
push {lr}
sub sp, 0x4
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r0, 0
str r0, [sp]
movs r0, 0x13
@@ -445903,7 +445903,7 @@ sub_80F5B00: ; 80F5B00
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrb r1, [r5, 0x8]
movs r0, 0x7F
ands r0, r1
@@ -448171,7 +448171,7 @@ sub_80F6F40: ; 80F6F40
strh r1, [r0, 0x22]
strh r2, [r0, 0x26]
strh r2, [r0, 0x24]
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0, 0x1C]
ldr r0, =0x0203a034
ldr r0, [r0]
@@ -449007,7 +449007,7 @@ sub_80F75A8: ; 80F75A8
ldrsh r0, [r4, r2]
cmp r0, 0x78
bne @080F7610
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x30]
@@ -449046,7 +449046,7 @@ sub_80F7620: ; 80F7620
negs r1, r1
cmp r0, r1
bge @080F7664
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
adds r2, r3, 0
adds r2, 0x3E
@@ -450735,7 +450735,7 @@ sub_80F840C: ; 80F840C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
add sp, 0x4
pop {r0}
bx r0
@@ -450791,7 +450791,7 @@ sub_80F8484: ; 80F8484
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
add sp, 0x4
pop {r0}
bx r0
@@ -451977,7 +451977,7 @@ sub_80F8D28: ; 80F8D28
adds r0, r3, 0
adds r0, 0x1C
adds r0, r1, r0
- ldr r2, =nullsub_12
+ ldr r2, =DummyObjectCallback
str r2, [r0]
adds r1, r3
ldrb r2, [r1, 0x5]
@@ -456889,7 +456889,7 @@ sub_80FB5E8: ; 80FB5E8
sub_80FB6EC: ; 80FB6EC
push {r4,lr}
sub sp, 0x4
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r0, 0
str r0, [sp]
movs r0, 0x8C
@@ -470663,7 +470663,7 @@ sub_81025C0: ; 81025C0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =sub_81026A8
str r1, [r6]
adds r0, r7, 0
@@ -470862,7 +470862,7 @@ sub_81026A8: ; 81026A8
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08102814:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -480113,7 +480113,7 @@ sub_8107260: ; 8107260
strh r0, [r6, 0x36]
adds r0, r6, 0
bl obj_translate_based_on_private_1_2_3_4
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
bl object_new_hidden_with_callback
adds r4, r0, 0
lsls r4, 24
@@ -491672,7 +491672,7 @@ sub_810CF30: ; 810CF30
lsls r0, 2
adds r4, 0x1C
adds r0, r4
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
@0810D08C:
ldr r0, =sub_810D0B8
@@ -497689,7 +497689,7 @@ sub_8110034: ; 8110034
adds r0, r2, 0
adds r0, 0x1C
adds r0, r4, r0
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
adds r4, r2
ldrb r0, [r4, 0x1]
@@ -501191,7 +501191,7 @@ sub_8111C50: ; 8111C50
adds r0, r1
lsls r0, 2
adds r0, r4
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
movs r0, 0x8
ldrsh r1, [r5, r0]
@@ -502631,7 +502631,7 @@ sub_811280C: ; 811280C
movs r1, 0
movs r2, 0x10
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8112994
str r0, [r4]
@08112966:
@@ -508268,7 +508268,7 @@ sub_81157FC: ; 81157FC
ldrb r3, [r4, 0x6]
ldrh r4, [r4, 0x8]
str r4, [sp]
- bl sub_80A1AD4
+ bl pal_fade_maybe
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -508577,7 +508577,7 @@ sub_8115A54: ; 8115A54
str r2, [sp]
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0xC]
subs r0, 0x1
strh r0, [r4, 0xC]
@@ -508763,7 +508763,7 @@ sub_8115BC8: ; 8115BC8
ldrh r2, [r4, 0x12]
str r2, [sp]
adds r2, r5, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0xC]
subs r0, 0x1
strh r0, [r4, 0xC]
@@ -508902,7 +508902,7 @@ sub_8115CD0: ; 8115CD0
adds r0, r2, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0xC]
subs r0, 0x1
strh r0, [r4, 0xC]
@@ -509014,7 +509014,7 @@ sub_8115D94: ; 8115D94
adds r0, r1, 0
movs r1, 0
adds r2, r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8115E00
str r0, [r4]
add sp, 0x4
@@ -509079,7 +509079,7 @@ sub_8115E00: ; 8115E00
adds r0, r2, 0
movs r1, 0
adds r2, r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08115E8A
@08115E7A:
ldrb r3, [r4, 0x14]
@@ -509088,7 +509088,7 @@ sub_8115E00: ; 8115E00
adds r0, r2, 0
movs r1, 0
adds r2, r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08115E8A:
ldr r0, =0x03005e00
lsls r1, r5, 2
@@ -509146,7 +509146,7 @@ sub_8115EB8: ; 8115EB8
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
adds r0, r4, 0
bl move_anim_task_del
@08115EFE:
@@ -517446,7 +517446,7 @@ sub_811A2FC: ; 811A2FC
adds r1, r4, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x5
b @0811A41A
.pool
@@ -517466,7 +517466,7 @@ sub_811A2FC: ; 811A2FC
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x3
strh r0, [r5]
strh r4, [r5, 0xC]
@@ -517480,7 +517480,7 @@ sub_811A2FC: ; 811A2FC
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x4
b @0811A41A
@0811A3B6:
@@ -526260,7 +526260,7 @@ sub_811E828: ; 811E828
cmp r0, 0x4
bne @0811E8D0
adds r0, r4, 0
- ldr r5, =nullsub_12
+ ldr r5, =DummyObjectCallback
movs r4, 0
str r4, [sp]
adds r1, r5, 0
@@ -529095,7 +529095,7 @@ sub_811FC80: ; 811FC80
lsrs r5, r0, 16
cmp r5, 0x3
bls @0811FDC8
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x14]
adds r0, r4, 0
movs r1, 0
@@ -532415,7 +532415,7 @@ sub_81215EC: ; 81215EC
@08121940:
adds r0, r4, 0
bl sub_80D2F68
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -532426,7 +532426,7 @@ sub_81215EC: ; 81215EC
@08121958:
adds r0, r4, 0
bl sub_80D2F68
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -532459,7 +532459,7 @@ sub_81215EC: ; 81215EC
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -532853,7 +532853,7 @@ sub_8121CC0: ; 8121CC0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x0203a134
ldr r0, [r0]
movs r1, 0x84
@@ -537751,7 +537751,7 @@ sub_8124288: ; 8124288
str r5, [sp, 0xC]
ldr r0, =gDummyObjectRotScalAnimTable
str r0, [sp, 0x10]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [sp, 0x14]
ldr r0, =0x02037318
ldrb r0, [r0, 0x14]
@@ -537856,7 +537856,7 @@ sub_81243B0: ; 81243B0
strb r0, [r2]
ldr r0, [r3]
ldr r1, [r0, 0x20]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r1, 0x1C]
@081243CE:
pop {r0}
@@ -538999,7 +538999,7 @@ sub_8124D14: ; 8124D14
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
ldrh r0, [r1, 0x4]
adds r0, 0x1
@@ -539108,7 +539108,7 @@ sub_8124E0C: ; 8124E0C
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
ldrh r0, [r1, 0x4]
adds r0, 0x1
@@ -545447,13 +545447,13 @@ sub_81281A8: ; 81281A8
ldrb r0, [r0, 0x8]
cmp r0, 0
bne @0812820C
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r0, [sp]
movs r0, 0xC1
b @08128214
.pool
@0812820C:
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r0, 0
str r0, [sp]
movs r0, 0xC2
@@ -547655,7 +547655,7 @@ gpu_pal_decompress_alloc_tag_and_upload: ; 8129334
@081293B4:
ldr r0, [r4, 0x1C]
ldrh r0, [r0]
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r2, 0x1
str r2, [sp]
movs r2, 0
@@ -547872,7 +547872,7 @@ sub_81294C0: ; 81294C0
@081295A4:
ldr r0, [r4, 0x1C]
ldrh r0, [r0]
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r2, 0x1
str r2, [sp]
movs r2, 0
@@ -548430,13 +548430,13 @@ sub_81299DC: ; 81299DC
ldrb r0, [r0, 0x8]
cmp r0, 0
bne @08129A3C
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r0, [sp]
movs r0, 0xC1
b @08129A44
.pool
@08129A3C:
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r0, 0
str r0, [sp]
movs r0, 0xC2
@@ -548674,7 +548674,7 @@ sub_8129BF8: ; 8129BF8
lsls r0, 2
adds r3, 0x1C
adds r0, r3
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
ldr r5, =0x02021fc4
ldr r1, =gUnknown_085EAA62
@@ -548753,7 +548753,7 @@ sub_8129C74: ; 8129C74
lsls r0, 2
adds r3, 0x1C
adds r0, r3
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
ldr r4, =0x02021fc4
ldr r1, =gUnknown_085EAA62
@@ -548909,7 +548909,7 @@ sub_8129E0C: ; 8129E0C
adds r3, r5, 0
adds r3, 0x1C
adds r2, r3
- ldr r3, =nullsub_12
+ ldr r3, =DummyObjectCallback
str r3, [r2]
ldr r4, =0x0203aa39
ldrb r3, [r4]
@@ -549730,7 +549730,7 @@ sub_812A4DC: ; 812A4DC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -549847,7 +549847,7 @@ sub_812A588: ; 812A588
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
bl gpu_sync_bg_show
movs r0, 0x1
@@ -550421,7 +550421,7 @@ sub_812AB04: ; 812AB04
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r4, =0x0203ab34
ldr r0, [r4]
ldrb r0, [r0, 0x2]
@@ -551450,7 +551450,7 @@ sub_812B2EC: ; 812B2EC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r4]
ldrb r0, [r1]
adds r0, 0x1
@@ -556848,7 +556848,7 @@ sub_812DD04: ; 812DD04
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -556924,7 +556924,7 @@ sub_812DD78: ; 812DD78
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -556962,7 +556962,7 @@ sub_812DDC4: ; 812DDC4
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -557018,7 +557018,7 @@ sub_812DE48: ; 812DE48
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -560143,7 +560143,7 @@ sub_812F648: ; 812F648
ldrsh r0, [r0, r1]
cmp r0, 0
beq @0812F76C
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
movs r4, 0
str r4, [sp]
movs r0, 0x5
@@ -561196,7 +561196,7 @@ sub_812FFC8: ; 812FFC8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08130040:
ldr r0, =0x030011f6
ldrb r0, [r0]
@@ -569021,7 +569021,7 @@ set_256color_bg_bg0: ; 8133F0C
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl enable_irqs
ldr r0, =sub_8133EF8
@@ -570030,7 +570030,7 @@ sub_813498C: ; 813498C
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl enable_irqs
ldr r0, =sub_81347B4
@@ -570618,7 +570618,7 @@ sub_8134EA4: ; 8134EA4
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =c2_080111BC
str r0, [r4]
add sp, 0x4
@@ -570711,7 +570711,7 @@ sub_8134F78: ; 8134F78
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -572155,7 +572155,7 @@ sub_8135978: ; 8135978
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -573254,7 +573254,7 @@ sub_8136470: ; 8136470
lsls r0, 26
lsrs r0, 27
bl rotscale_free_entry
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@081364E0:
pop {r4,r5}
@@ -573276,7 +573276,7 @@ sub_81364EC: ; 81364EC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -576006,7 +576006,7 @@ mapldr_080CA5C0: ; 8137C5C
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8137C94
movs r1, 0xA
bl AddTask
@@ -584926,7 +584926,7 @@ sub_813C62C: ; 813C62C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -585344,7 +585344,7 @@ sub_813C91C: ; 813C91C
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0813CA00:
ldr r1, =0x030022c0
movs r0, 0x87
@@ -586735,7 +586735,7 @@ sub_813D42C: ; 813D42C
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0813D584
@0813D544:
ldr r1, =0x00003f41
@@ -586865,7 +586865,7 @@ sub_813D5A0: ; 813D5A0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0813D698
@0813D652:
ldr r0, =0x02037fd4
@@ -587299,7 +587299,7 @@ sub_813D9C0: ; 813D9C0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -587811,7 +587811,7 @@ sub_813DD7C: ; 813DD7C
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
bl gpu_sync_bg_show
movs r0, 0x1
@@ -588046,7 +588046,7 @@ sub_813DF70: ; 813DF70
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl sub_807B140
movs r0, 0
bl gpu_sync_bg_show
@@ -588548,7 +588548,7 @@ sub_813E570: ; 813E570
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02020630
ldr r0, =0x0203ab80
ldr r0, [r0]
@@ -588664,7 +588664,7 @@ sub_813E570: ; 813E570
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl @0813F1A4
.pool
@0813E7B0:
@@ -588844,7 +588844,7 @@ sub_813E570: ; 813E570
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x03005e00
mov r3, r8
adds r1, r3, r7
@@ -588991,7 +588991,7 @@ sub_813E570: ; 813E570
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x03005e00
mov r2, r8
adds r1, r2, r7
@@ -589063,7 +589063,7 @@ sub_813E570: ; 813E570
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
mov r2, r8
adds r1, r2, r7
lsls r1, 3
@@ -589444,7 +589444,7 @@ sub_813E570: ; 813E570
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0813EEF2:
ldr r0, =0x030022c0
ldrh r1, [r0, 0x2E]
@@ -590241,7 +590241,7 @@ sub_813F1B8: ; 813F1B8
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0813F6AC:
lsls r0, r7, 2
adds r0, r7
@@ -590582,7 +590582,7 @@ sub_813F1B8: ; 813F1B8
@0813F9C8:
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0813FCC4
.pool
@0813F9E4:
@@ -591458,7 +591458,7 @@ sub_8140208: ; 8140208
adds r2, 0x1C
adds r1, r2
ldr r1, [r1]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @08140230
movs r0, 0
@@ -593192,7 +593192,7 @@ sub_81410FC: ; 81410FC
lsls r0, 2
adds r2, 0x1C
adds r0, r2
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
b @08141180
.pool
@@ -595998,7 +595998,7 @@ sub_8142918: ; 8142918
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
lsls r1, 26
@@ -598056,7 +598056,7 @@ sub_8143A40: ; 8143A40
strb r1, [r3]
mov r1, r10
adds r2, r4, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r2]
movs r1, 0
bl obj_anim_image_start
@@ -600540,7 +600540,7 @@ sub_8144E60: ; 8144E60
negs r1, r1
ands r1, r2
strb r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x3C]
@@ -600583,7 +600583,7 @@ sub_8144FB0: ; 8144FB0
strh r0, [r4, 0x22]
b @0814501C
@08144FC8:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
adds r2, r4, 0
adds r2, 0x3E
@@ -602815,7 +602815,7 @@ sub_8146178: ; 8146178
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@081461B0:
ldrh r1, [r4, 0xC]
movs r0, 0xF
@@ -602902,7 +602902,7 @@ sub_814623C: ; 814623C
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x020393a8
ldr r1, =0x0203aba0
ldr r1, [r1]
@@ -603073,7 +603073,7 @@ sub_81463BC: ; 81463BC
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x0203aba0
ldr r1, [r0]
ldr r0, =0x020393a8
@@ -603991,7 +603991,7 @@ sub_8146B7C: ; 8146B7C
movs r1, 0x1
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -604270,7 +604270,7 @@ sub_8146DAC: ; 8146DAC
movs r1, 0x1
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -605536,7 +605536,7 @@ sub_81477A8: ; 81477A8
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08147838:
movs r5, 0x10
ldrsh r0, [r6, r5]
@@ -608931,7 +608931,7 @@ sub_81493D8: ; 81493D8
str r2, [sp]
movs r1, 0x2
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08149402:
movs r0, 0
add sp, 0x4
@@ -611210,7 +611210,7 @@ sub_814A550: ; 814A550
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0814A632:
movs r2, 0x10
ldrsh r0, [r4, r2]
@@ -612298,7 +612298,7 @@ sub_814AF1C: ; 814AF1C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0814AF40
bl dp01_tbl4_exec_completed
@@ -612324,7 +612324,7 @@ sub_814AF54: ; 814AF54
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0814AFA4
movs r0, 0
@@ -612420,7 +612420,7 @@ sub_814B004: ; 814B004
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0814B094
b @0814B092
@@ -612439,7 +612439,7 @@ sub_814B004: ; 814B004
adds r4, 0x1C
adds r0, r4
ldr r2, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r2, r0
bne @0814B094
movs r0, 0x2
@@ -612544,7 +612544,7 @@ sub_814B0E8: ; 814B0E8
adds r5, 0x1C
adds r0, r5
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r3, r0
bne @0814B252
ldr r0, =0x020241e4
@@ -612957,7 +612957,7 @@ sub_814B4E0: ; 814B4E0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0814B532
adds r0, r3, 0
@@ -613018,7 +613018,7 @@ sub_814B554: ; 814B554
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0814B590
bl dp01_tbl4_exec_completed
@@ -613164,7 +613164,7 @@ sub_814B69C: ; 814B69C
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0814B714
ldr r0, [r6]
@@ -615665,7 +615665,7 @@ sub_814CC98: ; 814CC98
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@@ -616078,7 +616078,7 @@ sub_814D0F0: ; 814D0F0
adds r0, r1
lsls r0, 2
adds r0, r5
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
ldr r1, =0x03005d60
ldrb r0, [r4]
@@ -620986,7 +620986,7 @@ sub_814FC9C: ; 814FC9C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
add sp, 0x4
pop {r0}
bx r0
@@ -621500,7 +621500,7 @@ sub_814FCC8: ; 814FCC8
movs r1, 0x3
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x000001a9
movs r1, 0x1
bl sub_80A3194
@@ -621885,7 +621885,7 @@ sub_81503E4: ; 81503E4
movs r1, 0x3
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x4
bl play_sound_effect
b @08150542
@@ -640205,7 +640205,7 @@ sub_815955C: ; 815955C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08159580
bl dp01_tbl6_exec_completed
@@ -640244,7 +640244,7 @@ sub_81595AC: ; 81595AC
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081595D0
bl dp01_tbl6_exec_completed
@@ -640868,7 +640868,7 @@ sub_8159B14: ; 8159B14
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005d60
ldr r2, =0x02024064
ldrb r0, [r2]
@@ -641447,7 +641447,7 @@ sub_8159F5C: ; 8159F5C
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8159FEC
movs r1, 0
bl AddTask
@@ -641530,7 +641530,7 @@ sub_8159FEC: ; 8159FEC
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
bl sub_81BE6B8
b @0815A088
.pool
@@ -643596,7 +643596,7 @@ sub_815B054: ; 815B054
strb r0, [r3]
adds r5, 0x1C
adds r1, r5
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r1]
@0815B120:
ldrh r1, [r6, 0xA]
@@ -645415,7 +645415,7 @@ sub_815BFF4: ; 815BFF4
adds r6, 0x1C
adds r0, r3, r6
ldr r2, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r2, r0
bne @0815C040
movs r1, 0x3C
@@ -645483,7 +645483,7 @@ sub_815C050: ; 815C050
orrs r0, r1
mov r1, r12
strb r0, [r1]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
@0815C09C:
pop {r0}
@@ -654076,7 +654076,7 @@ sub_8160638: ; 8160638
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
add sp, 0x4
pop {r0}
bx r0
@@ -654686,7 +654686,7 @@ sub_8160868: ; 8160868
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08160E8A
.pool
@08160C48:
@@ -654734,7 +654734,7 @@ sub_8160868: ; 8160868
@08160CAE:
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08160E8A
@08160CB8:
movs r0, 0x1
@@ -654743,7 +654743,7 @@ sub_8160868: ; 8160868
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x0203bc34
ldr r1, [r0]
ldrb r0, [r1]
@@ -654771,7 +654771,7 @@ sub_8160868: ; 8160868
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x0203bc34
ldr r1, [r0]
ldrb r0, [r1]
@@ -665122,7 +665122,7 @@ map_warp_consider_1_to_outside_or_stair_or_dive: ; 8166564
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8166340
bl SetVBlankCallback
movs r0, 0
@@ -665425,7 +665425,7 @@ sub_816681C: ; 816681C
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, [r5]
adds r1, 0x50
ldrb r0, [r1]
@@ -665567,7 +665567,7 @@ sub_81668F8: ; 81668F8
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@081669DE:
ldr r0, =0x0203bc90
ldr r1, [r0]
@@ -665812,7 +665812,7 @@ sub_8166BEC: ; 8166BEC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08166C4A
@08166C28:
ldr r0, =0x02037fd4
@@ -668513,7 +668513,7 @@ sub_8168374: ; 8168374
@081683A0:
ldrh r0, [r2, 0x30]
strh r0, [r2, 0x20]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@081683A8:
pop {r4}
@@ -668747,7 +668747,7 @@ sub_816856C: ; 816856C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08168590
bl dp01_tbl5_exec_completed
@@ -668928,7 +668928,7 @@ sub_816864C: ; 816864C
adds r4, 0x1C
adds r0, r4
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r3, r0
bne @081687DC
ldr r0, =0x020241e4
@@ -669058,7 +669058,7 @@ sub_8168818: ; 8168818
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08168842
movs r4, 0x1
@@ -669336,7 +669336,7 @@ sub_8168A90: ; 8168A90
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08168AB4
bl dp01_tbl5_exec_completed
@@ -672311,7 +672311,7 @@ sub_816A57C: ; 816A57C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005d60
ldr r2, =0x02024064
ldrb r0, [r2]
@@ -673041,7 +673041,7 @@ sub_816AA80: ; 816AA80
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@@ -676917,7 +676917,7 @@ do_copyright_screen: ; 816CCC8
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r1, 0xE0
lsls r1, 3
movs r0, 0x8
@@ -676962,7 +676962,7 @@ do_copyright_screen: ; 816CCC8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -677265,7 +677265,7 @@ task_intro_2: ; 816D12C
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_816CBE8
bl SetVBlankCallback
movs r1, 0xFA
@@ -677608,7 +677608,7 @@ task_intro_4: ; 816D354
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -677791,7 +677791,7 @@ task_intro_7: ; 816D4E4
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_816CBE8
bl SetVBlankCallback
movs r1, 0x80
@@ -677851,7 +677851,7 @@ task_intro_8: ; 816D650
movs r1, 0x8
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -678537,7 +678537,7 @@ task_intro_10: ; 816DBAC
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x00004883
movs r0, 0xC
bl lcd_io_set
@@ -678619,7 +678619,7 @@ task_intro_11: ; 816DC64
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0816DCE6:
add sp, 0x4
pop {r4,r5}
@@ -678738,7 +678738,7 @@ task_intro_14: ; 816DDD8
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x03005e00
lsls r4, r5, 2
adds r4, r5
@@ -679098,7 +679098,7 @@ task_intro_18: ; 816DF2C
movs r1, 0x3
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
strh r5, [r4, 0x6]
movs r0, 0
strh r0, [r4, 0x8]
@@ -679314,7 +679314,7 @@ task_intro_19: ; 816E2A0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x03005e00
lsls r1, r4, 2
adds r1, r4
@@ -679715,7 +679715,7 @@ task_intro_20: ; 816E358
movs r1, 0x3
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0816E690
.pool
@0816E664:
@@ -680170,7 +680170,7 @@ task_intro_24: ; 816E9DC
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r2, 0xA0
lsls r2, 7
adds r0, r2, 0
@@ -680193,7 +680193,7 @@ task_intro_24: ; 816E9DC
movs r1, 0x3
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0816EA74:
ldrh r1, [r4, 0xC]
movs r2, 0xC
@@ -680529,7 +680529,7 @@ task_intro_27: ; 816ED20
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
strh r0, [r4, 0x8]
movs r0, 0xA8
@@ -680910,7 +680910,7 @@ sub_816EEA8: ; 816EEA8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -683281,7 +683281,7 @@ sub_8170290: ; 8170290
movs r2, 0
movs r3, 0x10
@081703CC:
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =0x0203bcd0
ldr r1, [r0]
@081703D4:
@@ -683426,12 +683426,12 @@ sub_8170478: ; 8170478
ldrh r6, [r4, 0x38]
lsls r6, 24
lsrs r6, 24
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
bl object_new_hidden_with_callback
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
bl object_new_hidden_with_callback
mov r10, r0
mov r2, r10
@@ -683503,7 +683503,7 @@ sub_8170478: ; 8170478
movs r0, 0x1C
add r9, r0
add r6, r9
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r6]
add r4, r9
str r1, [r4]
@@ -684689,7 +684689,7 @@ sub_8170F2C: ; 8170F2C
movs r0, 0x1C
add r9, r0
add r4, r9
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4]
movs r0, 0
bl battle_get_side_with_given_state
@@ -685727,7 +685727,7 @@ sub_81717F8: ; 81717F8
movs r1, 0x2
movs r2, 0x6
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @081718BC
@0817185A:
cmp r1, 0x5F
@@ -685830,7 +685830,7 @@ sub_81718D8: ; 81718D8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08171982
.pool
@08171944:
@@ -687910,7 +687910,7 @@ sub_81729E8: ; 81729E8
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
mov r0, r8
add sp, 0x4
pop {r3,r4}
@@ -687980,7 +687980,7 @@ sub_8172AB0: ; 8172AB0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
adds r0, r5, 0
bl remove_task
@08172B30:
@@ -688017,7 +688017,7 @@ sub_8172B40: ; 8172B40
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8172B90
str r0, [r4]
@08172B78:
@@ -689285,7 +689285,7 @@ sub_817357C: ; 817357C
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08173642:
ldr r1, =0x030022c0
movs r0, 0x87
@@ -689956,7 +689956,7 @@ sub_8173BC0: ; 8173BC0
ldr r1, =0x02020630
adds r3, r0, r1
ldr r1, [r3, 0x1C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08173C1A
ldrb r1, [r3, 0x1]
@@ -690054,7 +690054,7 @@ sub_8173C34: ; 8173C34
movs r1, 0
movs r2, 0xC
movs r3, 0xC
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
ldrsh r1, [r6, r0]
lsls r0, r1, 4
@@ -690103,7 +690103,7 @@ sub_8173D24: ; 8173D24
str r1, [sp]
movs r2, 0
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r3, 0
lsls r1, r4, 2
adds r0, r1, r4
@@ -690240,7 +690240,7 @@ sub_8173DC0: ; 8173DC0
movs r1, 0
movs r2, 0xC
movs r3, 0xC
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0
movs r1, 0
bl FillWindowPixelBuffer
@@ -690487,7 +690487,7 @@ sub_8174060: ; 8174060
movs r1, 0x8
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -693007,7 +693007,7 @@ sub_8175620: ; 8175620
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl enable_irqs
ldr r0, =sub_81754C8
@@ -693113,7 +693113,7 @@ sub_8175774: ; 8175774
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8175808
b @081757FA
.pool
@@ -693128,7 +693128,7 @@ sub_8175774: ; 8175774
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_81758A4
@081757FA:
str r0, [r4]
@@ -693196,7 +693196,7 @@ c2_080C9BFC: ; 8175848
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl enable_irqs
ldr r0, =sub_81754C8
@@ -693384,7 +693384,7 @@ sub_81758E4: ; 81758E4
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1C
movs r1, 0
bl lcd_io_set
@@ -693443,7 +693443,7 @@ sub_8175A9C: ; 8175A9C
movs r1, 0xC
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8175AE4
str r0, [r4]
@08175AD8:
@@ -693504,7 +693504,7 @@ sub_8175B1C: ; 8175B1C
movs r1, 0x8
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r1, 0xE0
lsls r1, 3
movs r0, 0x8
@@ -693558,7 +693558,7 @@ sub_8175B90: ; 8175B90
movs r1, 0x6
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8175BD8
str r0, [r4]
@08175BCC:
@@ -693593,7 +693593,7 @@ sub_8175BD8: ; 8175BD8
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -693647,7 +693647,7 @@ sub_8175C34: ; 8175C34
movs r1, 0x8
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8175CC8
str r0, [r4]
b @08175CB8
@@ -693949,7 +693949,7 @@ sub_8175DA0: ; 8175DA0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0817602A
.pool
@08175F2C:
@@ -694030,7 +694030,7 @@ sub_8175DA0: ; 8175DA0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0817602A
.pool
@08175FC8:
@@ -697182,7 +697182,7 @@ sub_8177888: ; 8177888
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl enable_irqs
ldr r0, =sub_8177874
@@ -697252,7 +697252,7 @@ sub_8177A50: ; 8177A50
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -697617,7 +697617,7 @@ sub_8177CB0: ; 8177CB0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -698532,7 +698532,7 @@ sub_81785D0: ; 81785D0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -699492,7 +699492,7 @@ sub_8178A78: ; 8178A78
movs r2, 0
movs r3, 0x10
@08178E30:
- bl sub_80A1AD4
+ bl pal_fade_maybe
@08178E34:
ldr r1, =0x030022c0
movs r0, 0x87
@@ -699893,7 +699893,7 @@ sub_8178FDC: ; 8178FDC
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl enable_irqs
ldr r0, =sub_8178FC8
@@ -700082,7 +700082,7 @@ sub_81793E0: ; 81793E0
str r2, [sp]
movs r1, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_8178FC8
bl SetVBlankCallback
ldr r0, =sub_8179428
@@ -701116,7 +701116,7 @@ sub_8179B98: ; 8179B98
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -701750,7 +701750,7 @@ sub_817A320: ; 817A320
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -701812,7 +701812,7 @@ sub_817A358: ; 817A358
adds r0, r7, 0
adds r0, 0x1C
adds r0, r5, r0
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
mov r2, r9
ldr r0, [r2]
@@ -701908,7 +701908,7 @@ sub_817A468: ; 817A468
ldrsh r0, [r4, r1]
cmp r0, 0x9
bne @0817A49A
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@0817A49A:
pop {r4}
@@ -701946,7 +701946,7 @@ sub_817A4A4: ; 817A4A4
str r2, [r1]
adds r5, 0x1C
adds r3, r5
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r3]
bl obj_alloc_rotscale_entry
adds r0, r4, 0
@@ -703093,7 +703093,7 @@ sub_817AE00: ; 817AE00
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
bl enable_irqs
ldr r0, =sub_817ADF4
@@ -703147,7 +703147,7 @@ sub_817AFD4: ; 817AFD4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x1
strb r0, [r4]
b @0817B020
@@ -704877,7 +704877,7 @@ sub_817BEC4: ; 817BEC4
movs r1, 0xA
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_817BF14
str r0, [r5]
movs r0, 0x8C
@@ -705233,7 +705233,7 @@ sub_817C174: ; 817C174
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_817C1D4
str r0, [r5]
movs r0, 0xCA
@@ -705291,7 +705291,7 @@ sub_817C1D4: ; 817C1D4
movs r1, 0x10
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0817C234:
ldr r0, =0x03005e00
adds r1, r5, r6
@@ -705380,7 +705380,7 @@ sub_817C2B0: ; 817C2B0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_817C310
str r0, [r5]
movs r0, 0xCA
@@ -705438,7 +705438,7 @@ sub_817C310: ; 817C310
movs r1, 0x10
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0817C370:
ldr r0, =0x03005e00
adds r1, r5, r6
@@ -711200,7 +711200,7 @@ sub_817F498: ; 817F498
movs r0, 0x8
ldrsh r4, [r2, r0]
mov r8, r1
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
mov r12, r0
cmp r4, 0
bne @0817F508
@@ -722851,7 +722851,7 @@ sub_8184D88: ; 8184D88
ands r0, r1
cmp r0, 0
beq @08184D9C
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@08184D9C:
pop {r0}
@@ -723201,7 +723201,7 @@ sub_8185054: ; 8185054
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_80384E4
bl set_callback2
movs r0, 0xFF
@@ -725668,7 +725668,7 @@ sub_8186558: ; 8186558
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0818657C
bl sub_81871AC
@@ -725693,7 +725693,7 @@ sub_8186590: ; 8186590
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081865B4
bl sub_81871AC
@@ -725719,7 +725719,7 @@ sub_81865C8: ; 81865C8
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0818661A
adds r0, r2, r5
@@ -725821,7 +725821,7 @@ sub_8186678: ; 8186678
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
mov r8, r2
cmp r1, r0
bne @08186764
@@ -725853,7 +725853,7 @@ sub_8186678: ; 8186678
adds r5, 0x1C
adds r0, r5
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
mov r8, r2
cmp r4, r0
bne @08186764
@@ -726266,7 +726266,7 @@ sub_818686C: ; 818686C
adds r2, 0x1C
adds r0, r2
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r3, r0
bne @08186B26
ldr r0, =0x020241e4
@@ -726294,7 +726294,7 @@ sub_818686C: ; 818686C
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
bne @08186B26
ldr r6, =0x020241e4
@@ -726468,7 +726468,7 @@ sub_8186C48: ; 8186C48
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08186CFA
adds r0, r2, r4
@@ -726739,7 +726739,7 @@ sub_8186EA4: ; 8186EA4
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08186EF0
ldr r0, =0x020244d0
@@ -726803,7 +726803,7 @@ sub_8186F14: ; 8186F14
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @08186F5E
ldr r0, =nullsub_18
@@ -726851,7 +726851,7 @@ sub_8186F94: ; 8186F94
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08187050
ldrb r1, [r3]
@@ -726958,7 +726958,7 @@ sub_8187084: ; 8187084
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08187120
ldr r0, [r6]
@@ -729447,7 +729447,7 @@ sub_81885D8: ; 81885D8
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFE
@@ -729856,7 +729856,7 @@ sub_8188A4C: ; 8188A4C
adds r0, r1
lsls r0, 2
adds r0, r5
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
ldr r1, =0x03005d60
ldrb r0, [r4]
@@ -731629,7 +731629,7 @@ sub_81899B8: ; 81899B8
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081899DC
bl sub_818A514
@@ -731655,7 +731655,7 @@ sub_81899F0: ; 81899F0
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08189A40
movs r0, 0
@@ -731761,7 +731761,7 @@ sub_8189AA0: ; 8189AA0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08189B42
b @08189B48
@@ -731779,7 +731779,7 @@ sub_8189AA0: ; 8189AA0
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
bne @08189B42
movs r0, 0x2
@@ -731947,7 +731947,7 @@ sub_8189AA0: ; 8189AA0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08189CE6
b @08189CE4
@@ -731965,7 +731965,7 @@ sub_8189AA0: ; 8189AA0
adds r2, 0x1C
adds r0, r2
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
bne @08189CE6
movs r0, 0x2
@@ -732289,7 +732289,7 @@ sub_8189D40: ; 8189D40
adds r4, 0x1C
adds r0, r4
ldr r2, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r2, r0
bne @0818A02A
ldr r0, =0x020241e4
@@ -732663,7 +732663,7 @@ sub_818A2B4: ; 818A2B4
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0818A306
adds r0, r3, 0
@@ -732724,7 +732724,7 @@ sub_818A328: ; 818A328
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0818A364
bl sub_818A514
@@ -732870,7 +732870,7 @@ sub_818A470: ; 818A470
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @0818A4E8
ldr r0, [r6]
@@ -735371,7 +735371,7 @@ sub_818BA6C: ; 818BA6C
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@@ -735888,7 +735888,7 @@ sub_818BFB8: ; 818BFB8
adds r0, r1
lsls r0, 2
adds r0, r5
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
ldr r1, =0x03005d60
ldrb r0, [r4]
@@ -744376,7 +744376,7 @@ sub_8190790: ; 8190790
asrs r0, 16
cmp r0, 0x28
bne @081907F0
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
b @081907F0
.pool
@@ -744430,7 +744430,7 @@ sub_81907F8: ; 81907F8
asrs r0, 16
cmp r0, 0x28
bne @08190858
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
b @08190858
.pool
@@ -744488,7 +744488,7 @@ sub_8190860: ; 8190860
asrs r0, 16
cmp r0, 0x40
bne @081908C0
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
b @081908C0
.pool
@@ -744543,7 +744543,7 @@ sub_81908CC: ; 81908CC
asrs r0, 16
cmp r0, 0x40
bne @08190930
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
b @08190930
.pool
@@ -745102,7 +745102,7 @@ sub_8190CD4: ; 8190CD4
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
mov r6, r8
lsls r0, r6, 2
@@ -745153,7 +745153,7 @@ sub_8190CD4: ; 8190CD4
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
mov r3, r8
lsls r0, r3, 2
@@ -750220,7 +750220,7 @@ sub_819395C: ; 819395C
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -750276,7 +750276,7 @@ sub_819395C: ; 819395C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -750293,7 +750293,7 @@ sub_819395C: ; 819395C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -750310,7 +750310,7 @@ sub_819395C: ; 819395C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -752022,7 +752022,7 @@ sub_8194950: ; 8194950
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -752186,7 +752186,7 @@ sub_8194950: ; 8194950
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -755769,7 +755769,7 @@ sub_81968BC: ; 81968BC
cmp r4, 0
bne @081968EC
movs r0, 0
- bl nullsub_12
+ bl DummyObjectCallback
@081968EC:
movs r1, 0xFF
lsrs r0, r4, 8
@@ -763859,7 +763859,7 @@ sub_819A514: ; 819A514
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r1, 0x9A
lsls r1, 5
movs r0, 0
@@ -764627,7 +764627,7 @@ sub_819AE08: ; 819AE08
str r2, [sp]
movs r1, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x7
strh r0, [r6, 0x8]
b @0819AF50
@@ -764770,7 +764770,7 @@ bc_exit_to_overworld: ; 819AF68
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -766793,7 +766793,7 @@ sub_819C040: ; 819C040
adds r1, r2
ldr r1, [r1]
bl _call_via_r1
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@0819C0DC:
pop {r4-r6}
@@ -767102,7 +767102,7 @@ sub_819C2D4: ; 819C2D4
adds r0, r1
lsls r0, 2
adds r0, r6
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
mov r10, r1
str r1, [r0]
ldr r5, =0x0000029d
@@ -767298,7 +767298,7 @@ sub_819C4B4: ; 819C4B4
adds r0, r1
lsls r0, 2
adds r0, r3
- ldr r5, =nullsub_12
+ ldr r5, =DummyObjectCallback
str r5, [r0]
adds r4, r2, r4
ldrb r1, [r4]
@@ -767792,7 +767792,7 @@ sub_819C90C: ; 819C90C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x7
strh r0, [r6, 0x8]
b @0819C9F0
@@ -767937,7 +767937,7 @@ sub_819CA08: ; 819CA08
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0819CA9C:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -769349,7 +769349,7 @@ sub_819D588: ; 819D588
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0819D622:
ldr r1, =0x03005e00
lsls r0, r5, 2
@@ -769689,7 +769689,7 @@ sub_819D770: ; 819D770
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0819D990
.pool
@0819D910:
@@ -770379,7 +770379,7 @@ sub_819DC1C: ; 819DC1C
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r1, 0x82
lsls r1, 5
movs r0, 0
@@ -773106,7 +773106,7 @@ sub_819F600: ; 819F600
strh r2, [r1, 0x16]
ldr r1, [r1]
bl _call_via_r1
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@0819F640:
pop {r4}
@@ -784069,7 +784069,7 @@ sub_81A5258: ; 81A5258
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x00003f3e
movs r0, 0x48
bl lcd_io_set
@@ -784294,7 +784294,7 @@ sub_81A5258: ; 81A5258
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @081A553E
.pool
@081A5520:
@@ -795403,7 +795403,7 @@ setup_bag_menu: ; 81AADB8
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -796426,7 +796426,7 @@ task_close_bag_menu_1: ; 81AB8F8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -805412,7 +805412,7 @@ sub_81B020C: ; 81B020C
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@081B0484:
ldr r1, =0x030022c0
movs r2, 0x87
@@ -805451,7 +805451,7 @@ sub_81B04BC: ; 81B04BC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_81B04F8
movs r1, 0
bl AddTask
@@ -807153,7 +807153,7 @@ sub_81B12C0: ; 81B12C0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -824624,7 +824624,7 @@ sub_81BAE60: ; 81BAE60
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081BAE84
bl dp01_tbl3_exec_completed
@@ -824650,7 +824650,7 @@ sub_81BAE98: ; 81BAE98
adds r1, 0x1C
adds r0, r1
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081BAEE8
movs r0, 0
@@ -824746,7 +824746,7 @@ sub_81BAF48: ; 81BAF48
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081BAFD8
b @081BAFD6
@@ -824765,7 +824765,7 @@ sub_81BAF48: ; 81BAF48
adds r4, 0x1C
adds r0, r4
ldr r2, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r2, r0
bne @081BAFD8
movs r0, 0x2
@@ -824870,7 +824870,7 @@ sub_81BB02C: ; 81BB02C
adds r5, 0x1C
adds r0, r5
ldr r3, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r3, r0
bne @081BB196
ldr r0, =0x020241e4
@@ -825857,7 +825857,7 @@ sub_81BB92C: ; 81BB92C
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081BB97E
adds r0, r3, 0
@@ -825918,7 +825918,7 @@ dp01t_35_3_free_vram: ; 81BB9A0
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081BB9DC
bl dp01_tbl3_exec_completed
@@ -826064,7 +826064,7 @@ sub_81BBAE8: ; 81BBAE8
adds r0, 0x1C
adds r0, r3, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081BBB60
ldr r0, [r6]
@@ -828565,7 +828565,7 @@ sub_81BD0E4: ; 81BD0E4
adds r1, r5, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
movs r0, 0
movs r1, 0xFF
@@ -829027,7 +829027,7 @@ sub_81BD5C8: ; 81BD5C8
adds r0, r1
lsls r0, 2
adds r0, r5
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
bl oamt_set_x3A_32
ldr r1, =0x03005d60
ldrb r0, [r4]
@@ -832268,7 +832268,7 @@ sub_81BF028: ; 81BF028
adds r0, 0x1C
adds r0, r2, r0
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @081BF238
adds r0, r2, r3
@@ -832322,7 +832322,7 @@ sub_81BF248: ; 81BF248
ldrh r0, [r0, 0x10]
cmp r0, 0xFF
bls @081BF268
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r5, 0x1C]
b @081BF2B0
.pool
@@ -833584,7 +833584,7 @@ sub_81BFB10: ; 81BFB10
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -834285,7 +834285,7 @@ sub_81C044C: ; 81C044C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -842154,7 +842154,7 @@ sub_81C48B4: ; 81C48B4
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
beq @081C48E8
movs r0, 0x1
@@ -842194,7 +842194,7 @@ sub_81C48F0: ; 81C48F0
adds r1, r6, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
bl sub_806EE98
ldr r0, [r5]
@@ -842331,7 +842331,7 @@ sub_81C4A08: ; 81C4A08
adds r1, r4, 0
adds r1, 0x1C
adds r0, r1
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0]
ldrb r1, [r2]
lsls r0, r1, 4
@@ -843192,7 +843192,7 @@ sub_81C5078: ; 81C5078
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r2, =0x02037fd4
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -844311,7 +844311,7 @@ sub_81C5B14: ; 81C5B14
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -846599,7 +846599,7 @@ sub_81C6F68: ; 81C6F68
adds r0, r4, 0
movs r1, 0
bl sub_8008258
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@081C6F84:
pop {r4}
@@ -847563,7 +847563,7 @@ sub_81C7710: ; 81C7710
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
add sp, 0x4
pop {r0}
bx r0
@@ -848068,7 +848068,7 @@ sub_81C7AC0: ; 81C7AC0
str r2, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @081C7B2C
@081C7B04:
movs r0, 0x1
@@ -848079,7 +848079,7 @@ sub_81C7AC0: ; 81C7AC0
str r2, [sp]
@081C7B10:
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @081C7B2C
@081C7B18:
movs r0, 0x1
@@ -848090,7 +848090,7 @@ sub_81C7AC0: ; 81C7AC0
str r2, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@081C7B2C:
add sp, 0x4
pop {r4}
@@ -848309,7 +848309,7 @@ sub_81C7CCC: ; 81C7CCC
movs r0, 0
bl sub_81C763C
ldr r0, [r0, 0x18]
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r0, 0x1C]
pop {r1}
bx r1
@@ -848712,7 +848712,7 @@ sub_81C8010: ; 81C8010
adds r1, r0, 0
ldr r0, [r1, 0x1C]
ldr r2, [r0, 0x1C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r2, r0
bne @081C8034
ldr r0, [r1, 0x24]
@@ -848948,7 +848948,7 @@ sub_81C817C: ; 81C817C
@081C81C4:
ldrh r0, [r2, 0x3C]
strh r0, [r2, 0x20]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@081C81CC:
pop {r0}
@@ -850781,7 +850781,7 @@ sub_81C9008: ; 81C9008
cmp r4, 0
beq @081C9028
ldr r2, [r5, 0x3C]
- ldr r1, =nullsub_12
+ ldr r1, =DummyObjectCallback
str r1, [r2, 0x1C]
ldr r0, [r5, 0x40]
str r1, [r0, 0x1C]
@@ -853240,7 +853240,7 @@ sub_81CA324: ; 81CA324
bl sub_81C763C
adds r3, r0, 0
movs r2, 0
- ldr r4, =nullsub_12
+ ldr r4, =DummyObjectCallback
adds r1, r3, 0
adds r1, 0x2C
@081CA336:
@@ -853431,7 +853431,7 @@ sub_81CA474: ; 81CA474
@081CA49A:
ldrh r0, [r2, 0x3C]
strh r0, [r2, 0x20]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@081CA4A2:
pop {r0}
@@ -853541,7 +853541,7 @@ sub_81CA4AC: ; 81CA4AC
negs r1, r1
ands r0, r1
strb r0, [r4, 0x1]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
b @081CA578
.pool
@@ -857496,7 +857496,7 @@ sub_81CC420: ; 81CC420
sub_81CC42C: ; 81CC42C
ldr r0, [r0, 0x20]
ldr r1, [r0, 0x1C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
eors r1, r0
negs r0, r1
orrs r0, r1
@@ -857549,7 +857549,7 @@ sub_81CC440: ; 81CC440
blt @081CC498
movs r0, 0
strh r0, [r4, 0x24]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@081CC498:
pop {r4}
@@ -857577,7 +857577,7 @@ sub_81CC4A4: ; 81CC4A4
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
@081CC4CA:
pop {r0}
@@ -862218,7 +862218,7 @@ sub_81CE9E4: ; 81CE9E4
blt @081CEA8C
movs r0, 0x67
strh r0, [r7]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r7, 0x14]
cmp r4, 0x5
bhi @081CEB5C
@@ -867235,7 +867235,7 @@ sub_81D1234: ; 81D1234
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
eors r1, r0
negs r0, r1
orrs r0, r1
@@ -867308,7 +867308,7 @@ sub_81D1284: ; 81D1284
@081D12C8:
ldrh r0, [r2, 0x34]
strh r0, [r2, 0x20]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r2, 0x1C]
@081D12D0:
pop {r0}
@@ -867601,7 +867601,7 @@ sub_81D1500: ; 81D1500
sub_81D1524: ; 81D1524
ldr r0, [r0, 0x14]
ldr r1, [r0, 0x1C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
eors r1, r0
negs r0, r1
orrs r0, r1
@@ -867635,7 +867635,7 @@ sub_81D1538: ; 81D1538
orrs r0, r1
mov r1, r12
strb r0, [r1]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
@081D156A:
pop {r0}
@@ -872007,7 +872007,7 @@ sub_81D3564: ; 81D3564
b @081D35DA
.pool
@081D35D8:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
@081D35DA:
str r0, [r4, 0x1C]
@081D35DC:
@@ -874704,7 +874704,7 @@ sub_81D4A90: ; 81D4A90
movs r2, 0x8
orrs r0, r2
strb r0, [r1, 0x5]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r1, 0x1C]
@081D4BC4:
add sp, 0x4
@@ -879244,7 +879244,7 @@ task_add_00_WIN0V_open_close_above_and_more: ; 81D7134
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =sub_81D6FD0
bl SetVBlankCallback
movs r0, 0x53
@@ -879722,7 +879722,7 @@ sub_81D75B4: ; 81D75B4
adds r1, r4, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r5, 2
adds r0, r5
@@ -880941,7 +880941,7 @@ sub_81D7FC0: ; 81D7FC0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
strh r5, [r4, 0x4]
movs r0, 0x1E
strh r0, [r4, 0x6]
@@ -881080,7 +881080,7 @@ sub_81D7FC0: ; 81D7FC0
movs r1, 0x6
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @081D815A
.pool
@081D8124:
@@ -881589,7 +881589,7 @@ sub_81D857C: ; 81D857C
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
strh r4, [r5, 0x2]
b @081D864E
@081D85DC:
@@ -881660,7 +881660,7 @@ sub_81D857C: ; 81D857C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -882104,7 +882104,7 @@ sub_81D89E0: ; 81D89E0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
strh r5, [r4, 0x2]
b @081D8A9A
@081D8A5C:
@@ -882152,7 +882152,7 @@ sub_81D89E0: ; 81D89E0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r6, 2
adds r0, r6
@@ -882591,7 +882591,7 @@ sub_81D8E80: ; 81D8E80
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
strh r5, [r4, 0x2]
b @081D8F30
@081D8EDE:
@@ -882677,7 +882677,7 @@ sub_81D8E80: ; 81D8E80
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
@@ -883193,7 +883193,7 @@ pokemon_alive_on_battle_side: ; 81D9338
strh r2, [r4, 0x36]
strh r2, [r4, 0x38]
strh r2, [r4, 0x3A]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
b @081D93D2
.pool
@@ -885766,7 +885766,7 @@ sub_81DA848: ; 81DA848
ldrsh r0, [r2, r4]
cmp r1, r0
bne @081DA874
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r3, 0x1C]
b @081DA8B4
.pool
@@ -885982,7 +885982,7 @@ sub_81DA9BC: ; 81DA9BC
strh r0, [r4, 0x36]
b @081DAA16
@081DAA12:
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
str r0, [r4, 0x1C]
@081DAA16:
pop {r4}
@@ -886042,7 +886042,7 @@ sub_81DAA74: ; 81DAA74
adds r5, 0x1C
adds r0, r5
ldr r4, [r0]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r4, r0
bne @081DAAC4
movs r0, 0x12
@@ -886165,7 +886165,7 @@ sub_81DAB4C: ; 81DAB4C
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
diff --git a/asm/gpu_obj.s b/asm/gpu_obj.s
index 905af5e13..df5655356 100644
--- a/asm/gpu_obj.s
+++ b/asm/gpu_obj.s
@@ -1407,10 +1407,10 @@ gpu_tile_obj_alloc_map_bit_op: ; 80073B8
.pool
thumb_func_end gpu_tile_obj_alloc_map_bit_op
- thumb_func_start nullsub_12
-nullsub_12: ; 8007428
+ thumb_func_start DummyObjectCallback
+DummyObjectCallback: ; 8007428
bx lr
- thumb_func_end nullsub_12
+ thumb_func_end DummyObjectCallback
thumb_func_start copy_queue_process
; void copy_queue_process()
diff --git a/asm/main_menu.s b/asm/main_menu.s
index e21067040..a998d24b6 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -132,7 +132,7 @@ InitMainMenu: ; 802F6F4
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @0802F7FE
.pool
@0802F7EC:
@@ -143,7 +143,7 @@ InitMainMenu: ; 802F6F4
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
@0802F7FE:
movs r0, 0
bl gpu_reset_bgs_and_dma3_busy_flags
@@ -1086,7 +1086,7 @@ HandleMainMenuInput: ; 80300E0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
adds r0, r7, 0
subs r0, 0x8
adds r0, r4, r0
@@ -1110,7 +1110,7 @@ HandleMainMenuInput: ; 80300E0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x40
movs r1, 0xF0
bl lcd_io_set
@@ -1541,7 +1541,7 @@ Task_HandleMainMenuAPressed: ; 803027C
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
b @08030536
.pool
@08030514:
@@ -1720,7 +1720,7 @@ Task_DisplayMainMenuInvalidActionError: ; 80305A4
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =Task_HandleMainMenuBPressed
str r0, [r4]
@08030688:
@@ -1935,7 +1935,7 @@ task_new_game_prof_birch_speech_1: ; 80307B0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -2270,7 +2270,7 @@ sub_8030B14: ; 8030B14
.pool
@08030B64:
ldr r1, [r3, 0x1C]
- ldr r0, =nullsub_12
+ ldr r0, =DummyObjectCallback
cmp r1, r0
bne @08030BBA
ldrb r1, [r3, 0x1]
@@ -2888,7 +2888,7 @@ task_new_game_prof_birch_speech_16: ; 8031040
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r1, =0x03005e00
lsls r0, r4, 2
adds r0, r4
@@ -3471,7 +3471,7 @@ task_new_game_prof_birch_speech_part2_9: ; 80314C4
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x4
bl play_sound_effect
ldr r0, =task_new_game_prof_birch_speech_part2_10
@@ -3551,7 +3551,7 @@ task_new_game_prof_birch_speech_part2_11: ; 80315BC
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_80A1AD4
+ bl pal_fade_maybe
ldr r0, =task_new_game_prof_birch_speech_part2_12
str r0, [r4]
@0803160A:
@@ -3751,7 +3751,7 @@ new_game_prof_birch_speech_part2_start: ; 8031678
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_80A1AD4
+ bl pal_fade_maybe
movs r0, 0x40
movs r1, 0
bl lcd_io_set
diff --git a/data/data2.s b/data/data2.s
index ea412697c..4ac7f5600 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -3417,7 +3417,23 @@ gUnknown_08553A78: ; 8553A78
.incbin "base_emerald.gba", 0x553a78, 0x4
gUnknown_08553A7C: ; 8553A7C
- .incbin "base_emerald.gba", 0x553a7c, 0x6f14
+ .incbin "base_emerald.gba", 0x553a7c, 0x14
+
+ .align 2, 0
+
+gNewGameBirchPic: ; 8553A90
+ .incbin "data/graphics/new_game/birch.4bpp"
+
+ .incbin "base_emerald.gba", 0x554290, 0x66c0
+
+ .align 2, 0
+
+gNewGameBirchPalette: ; 855A950
+ .incbin "data/graphics/new_game/birch.gbapal"
+
+ .align 2, 0
+
+ .incbin "base_emerald.gba", 0x55a970, 0x20
.align 2, 0
@@ -3458,14 +3474,48 @@ gUnknown_0855B630: ; 855B630
gUnknown_0855C1F0: ; 855C1F0
.incbin "base_emerald.gba", 0x55c1f0, 0x20
-gUnknown_0855C210: ; 855C210
- .incbin "base_emerald.gba", 0x55c210, 0x20
+ .align 2, 0
+
+; TODO: something else uses these too
+gNewGameBirchOamAttributes: ; 855C210
+ .4byte OAM_SIZE_64x64
+ .2byte 0
+
+ .align 2, 0
+
+ .incbin "base_emerald.gba", 0x55c218, 0x10
-gUnknown_0855C230: ; 855C230
- .incbin "base_emerald.gba", 0x55c230, 0x14
+ .align 2, 0
+
+gNewGameBirchPicTable: ; 855C228
+ obj_tiles gNewGameBirchPic, 0x800
+
+ .align 2, 0
+
+gNewGameBirchObjectPaletteInfo: ; 855C230
+ obj_pal gNewGameBirchPalette, 0x1006
+
+ .align 2, 0
+
+gNewGameBirchImageAnim: ; 855C238
+ obj_image_anim_frame 0, 1
+ obj_image_anim_end
+
+ .align 2, 0
+
+gNewGameBirchImageAnimTable: ; 855C240
+ .4byte gNewGameBirchImageAnim
+
+ .align 2, 0
-gUnknown_0855C244: ; 855C244
- .incbin "base_emerald.gba", 0x55c244, 0x18
+gNewGameBirchObjectTemplate: ; 855C244
+ .2byte 0xFFFF ; tiles tag
+ .2byte 0x1006 ; palette tag
+ .4byte gNewGameBirchOamAttributes
+ .4byte gNewGameBirchImageAnimTable
+ .4byte gNewGameBirchPicTable
+ .4byte gDummyObjectRotScalAnimTable
+ .4byte DummyObjectCallback
.align 2, 0
diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s
index 9f1c3cc1f..af54ce775 100644
--- a/data/graphics/field_objects/field_effect_objects.s
+++ b/data/graphics/field_objects/field_effect_objects.s
@@ -299,7 +299,7 @@ gFieldEffectObjectTemplate_Arrow: ; 850CC5C
.4byte gFieldEffectObjectImageAnimTable_Arrow
.4byte gFieldEffectObjectPicTable_Arrow
.4byte gDummyObjectRotScalAnimTable
- .4byte nullsub_12
+ .4byte DummyObjectCallback
.align 2, 0
@@ -945,7 +945,7 @@ gFieldEffectObjectTemplate_Unknown21: ; 850D28C
.4byte gDummyObjectImageAnimTable
.4byte NULL
.4byte gFieldEffectObjectRotScalAnimTable_Unknown21
- .4byte nullsub_12
+ .4byte DummyObjectCallback
.align 2, 0
@@ -1137,7 +1137,7 @@ gFieldEffectObjectTemplate_Bird: ; 850D4A8
.4byte gFieldEffectObjectImageAnimTable_Bird
.4byte gFieldEffectObjectPicTable_Bird
.4byte gDummyObjectRotScalAnimTable
- .4byte nullsub_12
+ .4byte DummyObjectCallback
.align 2, 0
diff --git a/data/graphics/new_game/birch.pal b/data/graphics/new_game/birch.pal
new file mode 100644
index 000000000..b89a5861a
--- /dev/null
+++ b/data/graphics/new_game/birch.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 230 205
+222 189 148
+197 148 115
+106 74 65
+98 98 115
+41 57 65
+180 115 82
+115 74 57
+205 205 222
+148 148 148
+189 156 90
+139 115 57
+74 49 24
+255 255 255
+0 0 24
diff --git a/data/graphics/new_game/birch.png b/data/graphics/new_game/birch.png
new file mode 100644
index 000000000..2a2d7b6a9
--- /dev/null
+++ b/data/graphics/new_game/birch.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 17:54:07 +0000