summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-09 01:32:19 -0700
committerYamaArashi <shadow962@live.com>2016-06-09 01:32:19 -0700
commita37de9f76364f3ed95c49ca1417ee01cd4d617b1 (patch)
treec8039e8fc47394076faad856abb859c5bb39fcf3
parent54c60e33cb69514228f4bfb3d65b2668c824e449 (diff)
double-colon global labels in preproc; misc other stuff
Diffstat
-rw-r--r--asm/rom3.s546
-rw-r--r--asm/rom4.s398
-rw-r--r--asm/rom5.s1276
-rw-r--r--include/gba/defines.h26
-rw-r--r--include/gba/io_reg.h37
-rw-r--r--src/link.c8
-rw-r--r--src/sprite.c4
-rw-r--r--src/text.c4
-rw-r--r--tools/preproc/asm_file.cpp25
-rw-r--r--tools/preproc/asm_file.h1
-rw-r--r--tools/preproc/preproc.cpp15
11 files changed, 1217 insertions, 1123 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 928e05fac..bdc94367b 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -4,8 +4,8 @@
.text
- thumb_func_start sub_80096C4
-sub_80096C4: @ 80096C4
+ thumb_func_start CB2_MainMenu
+CB2_MainMenu: @ 80096C4
push {lr}
bl RunTasks
bl AnimateSprites
@@ -13,38 +13,38 @@ sub_80096C4: @ 80096C4
bl fade_and_return_progress_probably
pop {r0}
bx r0
- thumb_func_end sub_80096C4
+ thumb_func_end CB2_MainMenu
- thumb_func_start sub_80096DC
-sub_80096DC: @ 80096DC
+ thumb_func_start VBlankCB_MainMenu
+VBlankCB_MainMenu: @ 80096DC
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl copy_pal_bg_faded_to_pal_ram
pop {r0}
bx r0
- thumb_func_end sub_80096DC
+ thumb_func_end VBlankCB_MainMenu
- thumb_func_start sub_80096F0
-sub_80096F0: @ 80096F0
+ thumb_func_start CB2_InitMainMenu
+CB2_InitMainMenu: @ 80096F0
push {lr}
movs r0, 0
- bl sub_8009708
+ bl InitMainMenu
pop {r0}
bx r0
- thumb_func_end sub_80096F0
+ thumb_func_end CB2_InitMainMenu
thumb_func_start sub_80096FC
sub_80096FC: @ 80096FC
push {lr}
movs r0, 0x1
- bl sub_8009708
+ bl InitMainMenu
pop {r0}
bx r0
thumb_func_end sub_80096FC
- thumb_func_start sub_8009708
-sub_8009708: @ 8009708
+ thumb_func_start InitMainMenu
+InitMainMenu: @ 8009708
push {r4,r5,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -106,7 +106,7 @@ sub_8009708: @ 8009708
ldr r0, _080097D0
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl remove_some_task
bl ResetTasks
bl ResetSpriteData
@@ -199,14 +199,14 @@ _08009858: .4byte 0x0000ffff
_0800985C: .4byte 0x04000040
_08009860: .4byte 0x04000208
_08009864: .4byte 0x04000200
-_08009868: .4byte sub_80096DC
-_0800986C: .4byte sub_80096C4
-_08009870: .4byte sub_8009878
+_08009868: .4byte VBlankCB_MainMenu
+_0800986C: .4byte CB2_MainMenu
+_08009870: .4byte Task_CheckSave
_08009874: .4byte 0x03004b20
- thumb_func_end sub_8009708
+ thumb_func_end InitMainMenu
- thumb_func_start sub_8009878
-sub_8009878: @ 8009878
+ thumb_func_start Task_CheckSave
+Task_CheckSave: @ 8009878
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -299,7 +299,7 @@ _0800992A:
b _080099FA
.align 2, 0
_08009934: .4byte 0x03004b20
-_08009938: .4byte sub_8009A64
+_08009938: .4byte Task_CheckRtc
_0800993C:
movs r0, 0x2
movs r1, 0xE
@@ -347,7 +347,7 @@ _08009994: .4byte gUnknown_0840DE81
_08009998: .4byte 0x000011df
_0800999C: .4byte 0x0000719f
_080099A0: .4byte 0x03004b20
-_080099A4: .4byte sub_8009A1C
+_080099A4: .4byte Task_WaitForSaveErrorAck
_080099A8:
strh r5, [r4, 0x8]
b _080099FC
@@ -363,7 +363,7 @@ _080099AC:
b _080099FA
.align 2, 0
_080099C0: .4byte 0x03004b20
-_080099C4: .4byte sub_8009A64
+_080099C4: .4byte Task_CheckRtc
_080099C8:
movs r0, 0x2
movs r1, 0xE
@@ -402,11 +402,11 @@ _08009A08: .4byte gUnknown_0840DEE5
_08009A0C: .4byte 0x000011df
_08009A10: .4byte 0x0000719f
_08009A14: .4byte 0x03004b20
-_08009A18: .4byte sub_8009A1C
- thumb_func_end sub_8009878
+_08009A18: .4byte Task_WaitForSaveErrorAck
+ thumb_func_end Task_CheckSave
- thumb_func_start sub_8009A1C
-sub_8009A1C: @ 8009A1C
+ thumb_func_start Task_WaitForSaveErrorAck
+Task_WaitForSaveErrorAck: @ 8009A1C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -439,11 +439,11 @@ _08009A52:
.align 2, 0
_08009A58: .4byte 0x03001770
_08009A5C: .4byte 0x03004b20
-_08009A60: .4byte sub_8009A64
- thumb_func_end sub_8009A1C
+_08009A60: .4byte Task_CheckRtc
+ thumb_func_end Task_WaitForSaveErrorAck
- thumb_func_start sub_8009A64
-sub_8009A64: @ 8009A64
+ thumb_func_start Task_CheckRtc
+Task_CheckRtc: @ 8009A64
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -497,7 +497,7 @@ _08009ACC: .4byte 0x04000048
_08009AD0: .4byte 0x00001111
_08009AD4: .4byte 0x04000052
_08009AD8: .4byte 0x03004b20
-_08009ADC: .4byte sub_8009B74
+_08009ADC: .4byte Task_DrawMainMenu
_08009AE0:
movs r0, 0x2
movs r1, 0xE
@@ -530,11 +530,11 @@ _08009B18: .4byte gUnknown_0840DF10
_08009B1C: .4byte 0x000011df
_08009B20: .4byte 0x0000719f
_08009B24: .4byte 0x03004b20
-_08009B28: .4byte sub_8009B2C
- thumb_func_end sub_8009A64
+_08009B28: .4byte Task_WaitForRtcErrorAck
+ thumb_func_end Task_CheckRtc
- thumb_func_start sub_8009B2C
-sub_8009B2C: @ 8009B2C
+ thumb_func_start Task_WaitForRtcErrorAck
+Task_WaitForRtcErrorAck: @ 8009B2C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -567,11 +567,11 @@ _08009B62:
.align 2, 0
_08009B68: .4byte 0x03001770
_08009B6C: .4byte 0x03004b20
-_08009B70: .4byte sub_8009B74
- thumb_func_end sub_8009B2C
+_08009B70: .4byte Task_DrawMainMenu
+ thumb_func_end Task_WaitForRtcErrorAck
- thumb_func_start sub_8009B74
-sub_8009B74: @ 8009B74
+ thumb_func_start Task_DrawMainMenu
+Task_DrawMainMenu: @ 8009B74
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -609,7 +609,7 @@ _08009B8E:
strh r2, [r0]
movs r1, 0xFE
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08009BF0
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -621,7 +621,7 @@ _08009B8E:
mov r0, sp
movs r1, 0xF1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
b _08009C0A
.align 2, 0
_08009BDC: .4byte 0x0202f388
@@ -639,7 +639,7 @@ _08009BF8:
mov r0, sp
movs r1, 0xF1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
_08009C0A:
ldr r2, _08009C58
lsls r1, r4, 2
@@ -664,7 +664,7 @@ _08009C26:
ldr r0, _08009C5C
movs r1, 0x2
movs r2, 0x1
- bl sub_800A0BC
+ bl PrintMainMenuItem
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1C
@@ -673,7 +673,7 @@ _08009C26:
ldr r0, _08009C60
movs r1, 0x2
movs r2, 0x5
- bl sub_800A0BC
+ bl PrintMainMenuItem
b _08009D14
.align 2, 0
_08009C54: .4byte 0x0000547f
@@ -689,7 +689,7 @@ _08009C64:
ldr r0, _08009CAC
movs r1, 0x2
movs r2, 0x1
- bl sub_800A0BC
+ bl PrintMainMenuItem
movs r0, 0x1
movs r1, 0x8
movs r2, 0x1C
@@ -698,7 +698,7 @@ _08009C64:
ldr r0, _08009CB0
movs r1, 0x2
movs r2, 0x9
- bl sub_800A0BC
+ bl PrintMainMenuItem
movs r0, 0x1
movs r1, 0xC
movs r2, 0x1C
@@ -707,8 +707,8 @@ _08009C64:
ldr r0, _08009CB4
movs r1, 0x2
movs r2, 0xD
- bl sub_800A0BC
- bl sub_800A108
+ bl PrintMainMenuItem
+ bl PrintSaveFileInfo
b _08009D14
.align 2, 0
_08009CAC: .4byte gUnknown_0840DCD9
@@ -723,7 +723,7 @@ _08009CB8:
ldr r0, _08009D28
movs r1, 0x2
movs r2, 0x1
- bl sub_800A0BC
+ bl PrintMainMenuItem
movs r0, 0x1
movs r1, 0x8
movs r2, 0x1C
@@ -732,7 +732,7 @@ _08009CB8:
ldr r0, _08009D2C
movs r1, 0x2
movs r2, 0x9
- bl sub_800A0BC
+ bl PrintMainMenuItem
movs r0, 0x1
movs r1, 0xC
movs r2, 0x1C
@@ -741,7 +741,7 @@ _08009CB8:
ldr r0, _08009D30
movs r1, 0x2
movs r2, 0xD
- bl sub_800A0BC
+ bl PrintMainMenuItem
movs r0, 0x1
movs r1, 0x10
movs r2, 0x1C
@@ -750,8 +750,8 @@ _08009CB8:
ldr r0, _08009D34
movs r1, 0x2
movs r2, 0x11
- bl sub_800A0BC
- bl sub_800A108
+ bl PrintMainMenuItem
+ bl PrintSaveFileInfo
_08009D14:
ldr r0, _08009D38
adds r1, r5, r4
@@ -770,11 +770,11 @@ _08009D2C: .4byte gUnknown_0840DCD0
_08009D30: .4byte gUnknown_0840DCE9
_08009D34: .4byte gUnknown_0840DCE2
_08009D38: .4byte 0x03004b20
-_08009D3C: .4byte sub_8009D40
- thumb_func_end sub_8009B74
+_08009D3C: .4byte Task_HighlightCurrentMenuItem
+ thumb_func_end Task_DrawMainMenu
- thumb_func_start sub_8009D40
-sub_8009D40: @ 8009D40
+ thumb_func_start Task_HighlightCurrentMenuItem
+Task_HighlightCurrentMenuItem: @ 8009D40
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -785,7 +785,7 @@ sub_8009D40: @ 8009D40
adds r4, r1
ldrb r0, [r4, 0x8]
ldrb r1, [r4, 0xA]
- bl sub_8009FDC
+ bl HighlightCurrentMenuItem
ldr r0, _08009D68
str r0, [r4]
pop {r4}
@@ -793,11 +793,11 @@ sub_8009D40: @ 8009D40
bx r0
.align 2, 0
_08009D64: .4byte 0x03004b20
-_08009D68: .4byte task_main_menu_process_key_input
- thumb_func_end sub_8009D40
+_08009D68: .4byte Task_MainMenuProcessKeyInput
+ thumb_func_end Task_HighlightCurrentMenuItem
- thumb_func_start main_menu_process_key_input
-main_menu_process_key_input: @ 8009D6C
+ thumb_func_start MainMenuProcessKeyInput
+MainMenuProcessKeyInput: @ 8009D6C
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -829,7 +829,7 @@ main_menu_process_key_input: @ 8009D6C
.align 2, 0
_08009DA8: .4byte 0x03001770
_08009DAC: .4byte 0x03004b20
-_08009DB0: .4byte main_menu_handle_a_pressed
+_08009DB0: .4byte MainMenuPressedA
_08009DB4:
movs r0, 0x2
ands r0, r2
@@ -863,7 +863,7 @@ _08009DB4:
_08009DF0: .4byte 0x0000ffff
_08009DF4: .4byte 0x04000040
_08009DF8: .4byte 0x03004b20
-_08009DFC: .4byte main_menu_handle_b_pressed
+_08009DFC: .4byte MainMenuPressedB
_08009E00:
ldr r0, _08009E20
lsls r2, r4, 2
@@ -935,15 +935,15 @@ _08009E76:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end main_menu_process_key_input
+ thumb_func_end MainMenuProcessKeyInput
- thumb_func_start task_main_menu_process_key_input
-task_main_menu_process_key_input: @ 8009E80
+ thumb_func_start Task_MainMenuProcessKeyInput
+Task_MainMenuProcessKeyInput: @ 8009E80
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl main_menu_process_key_input
+ bl MainMenuProcessKeyInput
lsls r0, 24
cmp r0, 0
beq _08009EA0
@@ -960,11 +960,11 @@ _08009EA0:
bx r0
.align 2, 0
_08009EA8: .4byte 0x03004b20
-_08009EAC: .4byte sub_8009D40
- thumb_func_end task_main_menu_process_key_input
+_08009EAC: .4byte Task_HighlightCurrentMenuItem
+ thumb_func_end Task_MainMenuProcessKeyInput
- thumb_func_start main_menu_handle_a_pressed
-main_menu_handle_a_pressed: @ 8009EB0
+ thumb_func_start MainMenuPressedA
+MainMenuPressedA: @ 8009EB0
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1055,7 +1055,7 @@ _08009F38:
.align 2, 0
_08009F50: .4byte 0x0202eac8
_08009F54: .4byte 0x0202eec8
-_08009F58: .4byte task_new_game_prof_birch_speech_1
+_08009F58: .4byte Task_Birch1
_08009F5C:
ldr r0, _08009F6C
movs r1, 0
@@ -1067,7 +1067,7 @@ _08009F5C:
.align 2, 0
_08009F6C: .4byte 0x0202eac8
_08009F70: .4byte 0x0202eec8
-_08009F74: .4byte c2_8056854
+_08009F74: .4byte CB2_ContinueSavedGame
_08009F78:
ldr r0, _08009F8C
ldr r1, _08009F90
@@ -1081,7 +1081,7 @@ _08009F80:
.align 2, 0
_08009F8C: .4byte 0x03001770
_08009F90: .4byte sub_80096FC
-_08009F94: .4byte sub_808B63C
+_08009F94: .4byte CB2_InitOptionMenu
_08009F98:
ldr r0, _08009FAC
bl SetMainCallback2
@@ -1092,11 +1092,11 @@ _08009FA4:
pop {r0}
bx r0
.align 2, 0
-_08009FAC: .4byte sub_8146930
- thumb_func_end main_menu_handle_a_pressed
+_08009FAC: .4byte CB2_InitMysteryEventMenu
+ thumb_func_end MainMenuPressedA
- thumb_func_start main_menu_handle_b_pressed
-main_menu_handle_b_pressed: @ 8009FB0
+ thumb_func_start MainMenuPressedB
+MainMenuPressedB: @ 8009FB0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1116,11 +1116,11 @@ _08009FCE:
bx r0
.align 2, 0
_08009FD4: .4byte 0x0202f388
-_08009FD8: .4byte c2_title_screen_1
- thumb_func_end main_menu_handle_b_pressed
+_08009FD8: .4byte CB2_InitTitleScreen
+ thumb_func_end MainMenuPressedB
- thumb_func_start sub_8009FDC
-sub_8009FDC: @ 8009FDC
+ thumb_func_start HighlightCurrentMenuItem
+HighlightCurrentMenuItem: @ 8009FDC
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -1232,10 +1232,10 @@ _0800A0AA:
.align 2, 0
_0800A0B4: .4byte 0x04000044
_0800A0B8: .4byte 0x0000819f
- thumb_func_end sub_8009FDC
+ thumb_func_end HighlightCurrentMenuItem
- thumb_func_start sub_800A0BC
-sub_800A0BC: @ 800A0BC
+ thumb_func_start PrintMainMenuItem
+PrintMainMenuItem: @ 800A0BC
push {r4-r6,lr}
sub sp, 0x20
adds r4, r0, 0
@@ -1273,21 +1273,21 @@ _0800A0DA:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_800A0BC
+ thumb_func_end PrintMainMenuItem
- thumb_func_start sub_800A108
-sub_800A108: @ 800A108
+ thumb_func_start PrintSaveFileInfo
+PrintSaveFileInfo: @ 800A108
push {lr}
- bl sub_800A120
- bl sub_800A188
- bl sub_800A144
- bl sub_800A1C0
+ bl PrintPlayerName
+ bl PrintPokedexCount
+ bl PrintPlayTime
+ bl PrintBadgeCount
pop {r0}
bx r0
- thumb_func_end sub_800A108
+ thumb_func_end PrintSaveFileInfo
- thumb_func_start sub_800A120
-sub_800A120: @ 800A120
+ thumb_func_start PrintPlayerName
+PrintPlayerName: @ 800A120
push {lr}
ldr r0, _0800A13C
movs r1, 0x2
@@ -1302,10 +1302,10 @@ sub_800A120: @ 800A120
.align 2, 0
_0800A13C: .4byte gUnknown_0840DF7C
_0800A140: .4byte 0x02024ea4
- thumb_func_end sub_800A120
+ thumb_func_end PrintPlayerName
- thumb_func_start sub_800A144
-sub_800A144: @ 800A144
+ thumb_func_start PrintPlayTime
+PrintPlayTime: @ 800A144
push {r4,lr}
sub sp, 0x30
ldr r0, _0800A180
@@ -1317,7 +1317,7 @@ sub_800A144: @ 800A144
ldrb r2, [r0, 0x10]
mov r0, sp
movs r3, 0x1
- bl sub_80948E4
+ bl FormatPlayTime
add r4, sp, 0x10
adds r0, r4, 0
mov r1, sp
@@ -1335,17 +1335,17 @@ sub_800A144: @ 800A144
.align 2, 0
_0800A180: .4byte gUnknown_0840DF8B
_0800A184: .4byte 0x02024ea4
- thumb_func_end sub_800A144
+ thumb_func_end PrintPlayTime
- thumb_func_start sub_800A188
-sub_800A188: @ 800A188
+ thumb_func_start PrintPokedexCount
+PrintPokedexCount: @ 800A188
push {lr}
sub sp, 0x10
ldr r0, _0800A1BC
movs r1, 0x2
movs r2, 0x5
bl Print
- bl sub_80948C4
+ bl GetPokedexSeenCount
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -1362,17 +1362,17 @@ sub_800A188: @ 800A188
bx r0
.align 2, 0
_0800A1BC: .4byte gUnknown_0840DF83
- thumb_func_end sub_800A188
+ thumb_func_end PrintPokedexCount
- thumb_func_start sub_800A1C0
-sub_800A1C0: @ 800A1C0
+ thumb_func_start PrintBadgeCount
+PrintBadgeCount: @ 800A1C0
push {lr}
sub sp, 0x10
ldr r0, _0800A1F0
movs r1, 0x10
movs r2, 0x5
bl Print
- bl sub_8094890
+ bl GetBadgeCount
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1388,10 +1388,10 @@ sub_800A1C0: @ 800A1C0
bx r0
.align 2, 0
_0800A1F0: .4byte gUnknown_0840DF90
- thumb_func_end sub_800A1C0
+ thumb_func_end PrintBadgeCount
- thumb_func_start task_new_game_prof_birch_speech_1
-task_new_game_prof_birch_speech_1: @ 800A1F4
+ thumb_func_start Task_Birch1
+Task_Birch1: @ 800A1F4
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1426,11 +1426,11 @@ task_new_game_prof_birch_speech_1: @ 800A1F4
ldr r0, _0800A2C8
movs r1, 0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0800A2CC
movs r1, 0x1
movs r2, 0x10
- bl gpu_pal_apply
+ bl LoadPalette
bl remove_some_task
bl ResetSpriteData
bl FreeAllSpritePalettes
@@ -1486,7 +1486,7 @@ _0800A2D0: .4byte 0x0400000a
_0800A2D4: .4byte 0x00000703
_0800A2D8: .4byte 0x03004b20
_0800A2DC: .4byte task_new_game_prof_birch_speech_2
- thumb_func_end task_new_game_prof_birch_speech_1
+ thumb_func_end Task_Birch1
thumb_func_start task_new_game_prof_birch_speech_2
task_new_game_prof_birch_speech_2: @ 800A2E0
@@ -2120,7 +2120,7 @@ task_new_game_prof_birch_speech_15: @ 800A79C
beq _0800A7C4
movs r0, 0x2
movs r1, 0x4
- bl BirchSpeechCreateGenderMenu
+ bl CreateGenderMenu
ldr r0, _0800A7CC
lsls r1, r4, 2
adds r1, r4
@@ -2142,7 +2142,7 @@ task_new_game_prof_birch_speech_16: @ 800A7D4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- bl BirchSpeechProcessGenderMenuInput
+ bl GenderMenuProcessInput
lsls r0, 24
asrs r4, r0, 24
cmp r4, 0
@@ -2380,11 +2380,11 @@ sub_800A974: @ 800A974
.align 2, 0
_0800A9A8: .4byte gUnknown_081C6FFA
_0800A9AC: .4byte 0x03004b20
-_0800A9B0: .4byte sub_800A9B4
+_0800A9B0: .4byte Task_800A9B4
thumb_func_end sub_800A974
- thumb_func_start sub_800A9B4
-sub_800A9B4: @ 800A9B4
+ thumb_func_start Task_800A9B4
+Task_800A9B4: @ 800A9B4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -2395,7 +2395,7 @@ sub_800A9B4: @ 800A9B4
beq _0800A9DC
movs r0, 0x2
movs r1, 0x1
- bl BirchSpeechCreateNameMenu
+ bl CreateNameMenu
ldr r0, _0800A9E4
lsls r1, r4, 2
adds r1, r4
@@ -2410,7 +2410,7 @@ _0800A9DC:
.align 2, 0
_0800A9E4: .4byte 0x03004b20
_0800A9E8: .4byte sub_800A9EC
- thumb_func_end sub_800A9B4
+ thumb_func_end Task_800A9B4
thumb_func_start sub_800A9EC
sub_800A9EC: @ 800A9EC
@@ -2418,7 +2418,7 @@ sub_800A9EC: @ 800A9EC
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
- bl BirchSpeechProcessNameMenuInput
+ bl NameMenuProcessInput
lsls r6, r0, 24
asrs r4, r6, 24
cmp r4, 0
@@ -2453,7 +2453,7 @@ _0800AA0E:
b _0800AA9C
.align 2, 0
_0800AA40: .4byte 0x03004b20
-_0800AA44: .4byte sub_800AAEC
+_0800AA44: .4byte task_new_game_prof_birch_speech_part2_1
_0800AA48:
movs r0, 0x5
bl audio_play
@@ -2534,8 +2534,8 @@ _0800AAE4: .4byte 0x02024ea4
_0800AAE8: .4byte new_game_prof_birch_speech_part2_start
thumb_func_end sub_800AAAC
- thumb_func_start sub_800AAEC
-sub_800AAEC: @ 800AAEC
+ thumb_func_start task_new_game_prof_birch_speech_part2_1
+task_new_game_prof_birch_speech_part2_1: @ 800AAEC
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2568,7 +2568,7 @@ _0800AB28: .4byte 0x020234cc
_0800AB2C: .4byte gUnknown_081C7017
_0800AB30: .4byte 0x03004b20
_0800AB34: .4byte sub_800AB38
- thumb_func_end sub_800AAEC
+ thumb_func_end task_new_game_prof_birch_speech_part2_1
thumb_func_start sub_800AB38
sub_800AB38: @ 800AB38
@@ -3292,7 +3292,7 @@ new_game_prof_birch_speech_part2_start: @ 800B060
ldr r0, _0800B158
movs r1, 0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
bl ResetTasks
ldr r0, _0800B15C
movs r1, 0
@@ -3332,7 +3332,7 @@ _0800B14C: .4byte gUnknown_081E768C
_0800B150: .4byte gUnknown_081E7834
_0800B154: .4byte 0x06003800
_0800B158: .4byte gUnknown_081E764C
-_0800B15C: .4byte sub_800AAEC
+_0800B15C: .4byte task_new_game_prof_birch_speech_part2_1
_0800B160: .4byte 0x03004b20
_0800B164: .4byte 0x0000ffc4
_0800B168: .4byte gWindowConfig_81E6C3C
@@ -3422,8 +3422,8 @@ _0800B21C: .4byte 0x0000ffc4
_0800B220: .4byte 0x04000040
_0800B224: .4byte 0x04000208
_0800B228: .4byte 0x04000200
-_0800B22C: .4byte sub_80096DC
-_0800B230: .4byte sub_80096C4
+_0800B22C: .4byte VBlankCB_MainMenu
+_0800B230: .4byte CB2_MainMenu
_0800B234: .4byte 0x0400000a
_0800B238: .4byte 0x00000703
thumb_func_end new_game_prof_birch_speech_part2_start
@@ -3924,7 +3924,7 @@ _0800B5EE:
adds r0, r1
movs r1, 0x1
movs r2, 0x10
- bl gpu_pal_apply
+ bl LoadPalette
_0800B608:
pop {r4}
pop {r0}
@@ -4017,7 +4017,7 @@ _0800B69A:
adds r0, r1
movs r1, 0x1
movs r2, 0x10
- bl gpu_pal_apply
+ bl LoadPalette
_0800B6B4:
pop {r4}
pop {r0}
@@ -4059,8 +4059,8 @@ _0800B6F8: .4byte sub_800B654
_0800B6FC: .4byte 0x03004b20
thumb_func_end sub_800B6C0
- thumb_func_start BirchSpeechCreateGenderMenu
-BirchSpeechCreateGenderMenu: @ 800B700
+ thumb_func_start CreateGenderMenu
+CreateGenderMenu: @ 800B700
push {r4,r5,lr}
sub sp, 0x8
adds r2, r0, 0
@@ -4106,20 +4106,20 @@ BirchSpeechCreateGenderMenu: @ 800B700
bx r0
.align 2, 0
_0800B75C: .4byte gUnknown_081E79B0
- thumb_func_end BirchSpeechCreateGenderMenu
+ thumb_func_end CreateGenderMenu
- thumb_func_start BirchSpeechProcessGenderMenuInput
-BirchSpeechProcessGenderMenuInput: @ 800B760
+ thumb_func_start GenderMenuProcessInput
+GenderMenuProcessInput: @ 800B760
push {lr}
bl ProcessMenuInputNoWrap
lsls r0, 24
asrs r0, 24
pop {r1}
bx r1
- thumb_func_end BirchSpeechProcessGenderMenuInput
+ thumb_func_end GenderMenuProcessInput
- thumb_func_start BirchSpeechCreateNameMenu
-BirchSpeechCreateNameMenu: @ 800B770
+ thumb_func_start CreateNameMenu
+CreateNameMenu: @ 800B770
push {r4,r5,lr}
sub sp, 0x8
adds r2, r0, 0
@@ -4184,17 +4184,17 @@ _0800B7D4:
bx r0
.align 2, 0
_0800B7F4: .4byte gUnknown_081E79E8
- thumb_func_end BirchSpeechCreateNameMenu
+ thumb_func_end CreateNameMenu
- thumb_func_start BirchSpeechProcessNameMenuInput
-BirchSpeechProcessNameMenuInput: @ 800B7F8
+ thumb_func_start NameMenuProcessInput
+NameMenuProcessInput: @ 800B7F8
push {lr}
bl ProcessMenuInput
lsls r0, 24
asrs r0, 24
pop {r1}
bx r1
- thumb_func_end BirchSpeechProcessNameMenuInput
+ thumb_func_end NameMenuProcessInput
thumb_func_start set_default_player_name
set_default_player_name: @ 800B808
@@ -6036,8 +6036,8 @@ _0800C692:
_0800C6A0: .4byte 0x03004040
thumb_func_end dp01_build_cmdbuf_x02_a_b_varargs
- thumb_func_start sub_800C6A4
-sub_800C6A4: @ 800C6A4
+ thumb_func_start unref_sub_800C6A4
+unref_sub_800C6A4: @ 800C6A4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -6071,7 +6071,7 @@ _0800C6D0:
bx r0
.align 2, 0
_0800C6E0: .4byte 0x03004040
- thumb_func_end sub_800C6A4
+ thumb_func_end unref_sub_800C6A4
thumb_func_start dp01_build_cmdbuf_x04_4_4_4
dp01_build_cmdbuf_x04_4_4_4: @ 800C6E4
@@ -6262,8 +6262,8 @@ dp01_build_cmdbuf_x0D_a: @ 800C808
_0800C824: .4byte 0x03004040
thumb_func_end dp01_build_cmdbuf_x0D_a
- thumb_func_start sub_800C828
-sub_800C828: @ 800C828
+ thumb_func_start unref_sub_800C828
+unref_sub_800C828: @ 800C828
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -6300,7 +6300,7 @@ _0800C856:
bx r0
.align 2, 0
_0800C86C: .4byte 0x03004040
- thumb_func_end sub_800C828
+ thumb_func_end unref_sub_800C828
thumb_func_start dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes
dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 800C870
@@ -6679,8 +6679,8 @@ dp01_build_cmdbuf_x12_a_bb: @ 800CB58
_0800CB80: .4byte 0x03004040
thumb_func_end dp01_build_cmdbuf_x12_a_bb
- thumb_func_start sub_800CB84
-sub_800CB84: @ 800CB84
+ thumb_func_start unref_sub_800CB84
+unref_sub_800CB84: @ 800CB84
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -6695,7 +6695,7 @@ sub_800CB84: @ 800CB84
bx r0
.align 2, 0
_0800CBA0: .4byte 0x03004040
- thumb_func_end sub_800CB84
+ thumb_func_end unref_sub_800CB84
thumb_func_start sub_800CBA4
sub_800CBA4: @ 800CBA4
@@ -7006,8 +7006,8 @@ _0800CDBC:
_0800CDD0: .4byte 0x03004040
thumb_func_end dp01_build_cmdbuf_x1D_1D_numargs_varargs
- thumb_func_start sub_800CDD4
-sub_800CDD4: @ 800CDD4
+ thumb_func_start unref_sub_800CDD4
+unref_sub_800CDD4: @ 800CDD4
push {r4-r6,lr}
adds r4, r3, 0
lsls r0, 24
@@ -7060,10 +7060,10 @@ _0800CE24:
bx r0
.align 2, 0
_0800CE38: .4byte 0x03004040
- thumb_func_end sub_800CDD4
+ thumb_func_end unref_sub_800CDD4
- thumb_func_start sub_800CE3C
-sub_800CE3C: @ 800CE3C
+ thumb_func_start unref_sub_800CE3C
+unref_sub_800CE3C: @ 800CE3C
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -7100,10 +7100,10 @@ _0800CE6A:
bx r0
.align 2, 0
_0800CE80: .4byte 0x03004040
- thumb_func_end sub_800CE3C
+ thumb_func_end unref_sub_800CE3C
- thumb_func_start sub_800CE84
-sub_800CE84: @ 800CE84
+ thumb_func_start unref_sub_800CE84
+unref_sub_800CE84: @ 800CE84
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -7140,7 +7140,7 @@ _0800CEB2:
bx r0
.align 2, 0
_0800CEC8: .4byte 0x03004040
- thumb_func_end sub_800CE84
+ thumb_func_end unref_sub_800CE84
thumb_func_start dp01_build_cmdbuf_x21_a_bb
dp01_build_cmdbuf_x21_a_bb: @ 800CECC
@@ -7920,8 +7920,8 @@ Unused_LZDecompressWramIndirect: @ 800D420
bx r0
thumb_func_end Unused_LZDecompressWramIndirect
- thumb_func_start sub_800D42C
-sub_800D42C: @ 800D42C
+ thumb_func_start unref_sub_800D42C
+unref_sub_800D42C: @ 800D42C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -8259,10 +8259,10 @@ _0800D674:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_800D42C
+ thumb_func_end unref_sub_800D42C
- thumb_func_start sub_800D684
-sub_800D684: @ 800D684
+ thumb_func_start unref_sub_800D684
+unref_sub_800D684: @ 800D684
push {lr}
bl ResetSpriteData
ldr r0, _0800D6B8
@@ -8290,7 +8290,7 @@ sub_800D684: @ 800D684
_0800D6B8: .4byte gUnknown_081F96D0
_0800D6BC: .4byte 0x02020004
_0800D6C0: .4byte sub_800D6C4
- thumb_func_end sub_800D684
+ thumb_func_end unref_sub_800D684
thumb_func_start sub_800D6C4
sub_800D6C4: @ 800D6C4
@@ -8677,7 +8677,7 @@ _0800DA54:
_0800DA66:
movs r1, 0x20
movs r2, 0x60
- bl decompress_palette
+ bl LoadCompressedPalette
b _0800DA9E
.align 2, 0
_0800DA70: .4byte gUnknown_08E62DAC
@@ -8695,7 +8695,7 @@ _0800DA84:
ldr r0, _0800DAB4
movs r1, 0x20
movs r2, 0x60
- bl decompress_palette
+ bl LoadCompressedPalette
_0800DA9E:
pop {r4,r5}
pop {r0}
@@ -8723,7 +8723,7 @@ sub_800DAB8: @ 800DAB8
ldr r0, _0800DAF4
movs r1, 0
movs r2, 0x40
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_800D74C
bl sub_800D7B8
pop {r0}
@@ -9650,7 +9650,7 @@ sub_800E23C: @ 800E23C
ldr r0, _0800E2BC
movs r1, 0x60
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, _0800E2C0
ldr r2, _0800E2C4
adds r0, r2, 0
@@ -9868,7 +9868,7 @@ _0800E474:
ldr r0, _0800E480
movs r1, 0
movs r2, 0x40
- bl decompress_palette
+ bl LoadCompressedPalette
b _0800E7BC
.align 2, 0
_0800E480: .4byte gUnknown_08D004E0
@@ -10271,7 +10271,7 @@ _0800E7A4:
_0800E7A6:
movs r1, 0x20
movs r2, 0x60
- bl decompress_palette
+ bl LoadCompressedPalette
b _0800E7BC
.align 2, 0
_0800E7B0: .4byte gUnknown_08E62AC0
@@ -13401,7 +13401,7 @@ _08010084:
ldr r0, _08010198
movs r1, 0
movs r2, 0x40
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_800D74C
bl ResetSpriteData
bl ResetTasks
@@ -13651,8 +13651,8 @@ nullsub_37: @ 8010308
bx lr
thumb_func_end nullsub_37
- thumb_func_start sub_801030C
-sub_801030C: @ 801030C
+ thumb_func_start unref_sub_801030C
+unref_sub_801030C: @ 801030C
movs r1, 0x6
strh r1, [r0, 0x34]
movs r1, 0x1
@@ -13662,7 +13662,7 @@ sub_801030C: @ 801030C
bx lr
.align 2, 0
_0801031C: .4byte sub_8010320
- thumb_func_end sub_801030C
+ thumb_func_end unref_sub_801030C
thumb_func_start sub_8010320
sub_8010320: @ 8010320
@@ -16463,8 +16463,8 @@ _08011948: .4byte 0x030042d4
_0801194C: .4byte sub_8011970
thumb_func_end bc_801362C
- thumb_func_start sub_8011950
-sub_8011950: @ 8011950
+ thumb_func_start unref_sub_8011950
+unref_sub_8011950: @ 8011950
push {lr}
ldr r0, _08011964
ldr r0, [r0]
@@ -16480,7 +16480,7 @@ _08011960:
_08011964: .4byte 0x02024a64
_08011968: .4byte 0x030042d4
_0801196C: .4byte sub_8011970
- thumb_func_end sub_8011950
+ thumb_func_end unref_sub_8011950
thumb_func_start sub_8011970
sub_8011970: @ 8011970
@@ -16599,8 +16599,8 @@ _08011A60: .4byte 0x030042d4
_08011A64: .4byte sub_8011B00
thumb_func_end sub_80119B4
- thumb_func_start sub_8011A68
-sub_8011A68: @ 8011A68
+ thumb_func_start unref_sub_8011A68
+unref_sub_8011A68: @ 8011A68
push {r4,r5,lr}
ldr r0, _08011AD8
ldr r1, [r0]
@@ -16669,7 +16669,7 @@ _08011AF0: .4byte 0x000160f9
_08011AF4: .4byte 0x000160e6
_08011AF8: .4byte 0x030042d4
_08011AFC: .4byte sub_8011B00
- thumb_func_end sub_8011A68
+ thumb_func_end unref_sub_8011A68
thumb_func_start sub_8011B00
sub_8011B00: @ 8011B00
@@ -23667,8 +23667,8 @@ _080154DC: .4byte gUnknown_0820872C
_080154E0: .4byte 0x02024a60
thumb_func_end sub_80153D0
- thumb_func_start sub_80154E4
-sub_80154E4: @ 80154E4
+ thumb_func_start unref_sub_80154E4
+unref_sub_80154E4: @ 80154E4
push {r4,r5,lr}
ldr r0, _08015514
ldrh r1, [r0]
@@ -23724,7 +23724,7 @@ _08015542:
_08015548: .4byte 0x02024a68
_0801554C: .4byte 0x02024a64
_08015550: .4byte gUnknown_0820872C
- thumb_func_end sub_80154E4
+ thumb_func_end unref_sub_80154E4
thumb_func_start dp01_battle_side_mark_buffer_for_execution
dp01_battle_side_mark_buffer_for_execution: @ 8015554
@@ -35152,8 +35152,8 @@ _0801B404: .4byte 0x02024c10
_0801B408: .4byte gUnknown_081D9AA7
thumb_func_end sub_801A02C
- thumb_func_start sub_801B40C
-sub_801B40C: @ 801B40C
+ thumb_func_start unref_sub_801B40C
+unref_sub_801B40C: @ 801B40C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -35345,7 +35345,7 @@ _0801B584: .4byte 0x02024c60
_0801B588: .4byte 0x02024c80
_0801B58C: .4byte 0x02024c7a
_0801B590: .4byte 0x0000ffff
- thumb_func_end sub_801B40C
+ thumb_func_end unref_sub_801B40C
thumb_func_start sub_801B594
sub_801B594: @ 801B594
@@ -39277,8 +39277,8 @@ _0801D56C: .4byte 0x02024a80
_0801D570: .4byte gBattleMoves
thumb_func_end ai_rate_move
- thumb_func_start sub_801D574
-sub_801D574: @ 801D574
+ thumb_func_start unref_sub_801D574
+unref_sub_801D574: @ 801D574
push {r4,lr}
bl Random
lsls r0, 16
@@ -39308,7 +39308,7 @@ _0801D5A6:
bx r0
.align 2, 0
_0801D5AC: .4byte 0x02024bec
- thumb_func_end sub_801D574
+ thumb_func_end unref_sub_801D574
thumb_func_start atk07_cmd7
atk07_cmd7: @ 801D5B0
@@ -67936,7 +67936,7 @@ _0802BB10:
ldr r0, _0802BB9C
movs r1, 0x20
movs r2, 0x60
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, _0802BBA0
ldr r2, _0802BBA4
adds r0, r2, 0
@@ -68869,8 +68869,8 @@ _0802C2AC:
bx r0
thumb_func_end sub_802C098
- thumb_func_start sub_802C2B8
-sub_802C2B8: @ 802C2B8
+ thumb_func_start unref_sub_802C2B8
+unref_sub_802C2B8: @ 802C2B8
push {r4,lr}
ldr r4, _0802C2E0
ldrb r0, [r4]
@@ -68892,7 +68892,7 @@ sub_802C2B8: @ 802C2B8
_0802C2E0: .4byte 0x02024a60
_0802C2E4: .4byte 0x03004330
_0802C2E8: .4byte sub_802C2EC
- thumb_func_end sub_802C2B8
+ thumb_func_end unref_sub_802C2B8
thumb_func_start sub_802C2EC
sub_802C2EC: @ 802C2EC
@@ -77940,7 +77940,7 @@ sub_8030CC0: @ 8030CC0
lsls r2, 1
adds r1, r4, r2
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldrb r0, [r7]
adds r0, r6
ldrb r0, [r0]
@@ -78671,8 +78671,8 @@ _0803135C: .4byte sub_80105DC
_08031360: .4byte SpriteCallbackDummy
thumb_func_end sub_80312F0
- thumb_func_start sub_8031364
-sub_8031364: @ 8031364
+ thumb_func_start unref_sub_8031364
+unref_sub_8031364: @ 8031364
push {r4,lr}
adds r4, r0, 0
lsls r1, 24
@@ -78702,7 +78702,7 @@ _08031394:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8031364
+ thumb_func_end unref_sub_8031364
thumb_func_start sub_80313A0
sub_80313A0: @ 80313A0
@@ -79320,12 +79320,12 @@ _08031856:
mov r0, r8
adds r1, r7, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r1, r4, 0
adds r1, 0x80
mov r0, r8
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080318E4
cmp r6, r0
bne _080318A2
@@ -79344,7 +79344,7 @@ _08031856:
adds r0, r4
adds r1, r7, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_080318A2:
movs r0, 0xBC
lsls r0, 9
@@ -79484,12 +79484,12 @@ _080319BE:
mov r0, r8
adds r1, r7, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r1, r4, 0
adds r1, 0x80
mov r0, r8
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08031A4C
cmp r6, r0
bne _08031A0A
@@ -79508,7 +79508,7 @@ _080319BE:
adds r0, r4
adds r1, r7, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_08031A0A:
movs r0, 0xBC
lsls r0, 9
@@ -79549,10 +79549,10 @@ _08031A5C: .4byte 0x0202eac8
_08031A60: .4byte 0x04000008
thumb_func_end sub_80318FC
- thumb_func_start nullsub_44
-nullsub_44: @ 8031A64
+ thumb_func_start unref_sub_8031A64
+unref_sub_8031A64: @ 8031A64
bx lr
- thumb_func_end nullsub_44
+ thumb_func_end unref_sub_8031A64
thumb_func_start nullsub_9
nullsub_9: @ 8031A68
@@ -79668,7 +79668,7 @@ sub_8031AF4: @ 8031AF4
lsrs r5, 16
adds r1, r5, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
add sp, 0x8
pop {r3}
mov r8, r3
@@ -79709,8 +79709,8 @@ _08031B98: .4byte gTrainerFrontPicPaletteTable
_08031B9C: .4byte gTrainerFrontPicTable
thumb_func_end sub_8031B74
- thumb_func_start sub_8031BA0
-sub_8031BA0: @ 8031BA0
+ thumb_func_start unref_sub_8031BA0
+unref_sub_8031BA0: @ 8031BA0
push {r4-r7,lr}
ldr r4, _08031BCC
adds r0, r4, 0
@@ -79772,7 +79772,7 @@ _08031C20: .4byte gUnknown_0820A48C
_08031C24: .4byte gUnknown_0820A49C
_08031C28: .4byte 0x02024a72
_08031C2C: .4byte gUnknown_0820A4B4
- thumb_func_end sub_8031BA0
+ thumb_func_end unref_sub_8031BA0
thumb_func_start sub_8031C30
sub_8031C30: @ 8031C30
@@ -80279,7 +80279,7 @@ sub_8031FC4: @ 8031FC4
adds r0, r1
adds r1, r5, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08032074
add r0, r8
ldrh r1, [r4]
@@ -80544,7 +80544,7 @@ _08032202:
mov r0, r9
adds r1, r5, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08032338
cmp r7, r0
bne _08032288
@@ -80562,7 +80562,7 @@ _08032202:
adds r0, r4
adds r1, r5, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_08032288:
ldr r3, _08032340
adds r0, r5, 0
@@ -80726,7 +80726,7 @@ _080323D4:
adds r1, r7, r0
mov r0, r12
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
b _08032456
.align 2, 0
_080323F4: .4byte gUnknown_08D2D4CC
@@ -80994,8 +80994,8 @@ _080325F2:
_08032600: .4byte 0x02017800
thumb_func_end sub_80325B8
- thumb_func_start sub_8032604
-sub_8032604: @ 8032604
+ thumb_func_start unref_sub_8032604
+unref_sub_8032604: @ 8032604
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x39
@@ -81018,7 +81018,7 @@ sub_8032604: @ 8032604
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8032604
+ thumb_func_end unref_sub_8032604
thumb_func_start sub_8032638
sub_8032638: @ 8032638
@@ -97391,8 +97391,8 @@ _0803AAFC:
bx r0
thumb_func_end pokemon_make_with_nature
- thumb_func_start sub_803AB44
-sub_803AB44: @ 803AB44
+ thumb_func_start unref_sub_803AB44
+unref_sub_803AB44: @ 803AB44
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -97513,7 +97513,7 @@ _0803AC1A:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803AB44
+ thumb_func_end unref_sub_803AB44
thumb_func_start sub_803AC44
sub_803AC44: @ 803AC44
@@ -97597,8 +97597,8 @@ sub_803ACAC: @ 803ACAC
bx r0
thumb_func_end sub_803ACAC
- thumb_func_start sub_803ACEC
-sub_803ACEC: @ 803ACEC
+ thumb_func_start unref_sub_803ACEC
+unref_sub_803ACEC: @ 803ACEC
push {r4,r5,lr}
sub sp, 0x10
adds r5, r0, 0
@@ -97648,7 +97648,7 @@ sub_803ACEC: @ 803ACEC
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_803ACEC
+ thumb_func_end unref_sub_803ACEC
thumb_func_start pokemon_make_ev_something
pokemon_make_ev_something: @ 803AD60
@@ -98859,13 +98859,13 @@ sub_803B6E4: @ 803B6E4
_0803B710: .4byte gBattleMoves
thumb_func_end sub_803B6E4
- thumb_func_start sub_803B714
-sub_803B714: @ 803B714
+ thumb_func_start unref_sub_803B714
+unref_sub_803B714: @ 803B714
push {lr}
bl sub_803B720
pop {r0}
bx r0
- thumb_func_end sub_803B714
+ thumb_func_end unref_sub_803B714
thumb_func_start sub_803B720
sub_803B720: @ 803B720
@@ -107468,8 +107468,8 @@ _0803F932:
bx r1
thumb_func_end speciesid_conv
- thumb_func_start sub_803F938
-sub_803F938: @ 803F938
+ thumb_func_start unref_sub_803F938
+unref_sub_803F938: @ 803F938
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -107618,7 +107618,7 @@ _0803FA42:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803F938
+ thumb_func_end unref_sub_803F938
thumb_func_start DrawSpindaSpots
DrawSpindaSpots: @ 803FA54
@@ -110196,8 +110196,8 @@ _08040DA2:
bx r1
thumb_func_end sub_8040D8C
- thumb_func_start sub_8040DAC
-sub_8040DAC: @ 8040DAC
+ thumb_func_start unref_sub_8040DAC
+unref_sub_8040DAC: @ 8040DAC
push {r4-r6,lr}
sub sp, 0xC
adds r6, r0, 0
@@ -110226,7 +110226,7 @@ sub_8040DAC: @ 8040DAC
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8040DAC
+ thumb_func_end unref_sub_8040DAC
thumb_func_start sine
sine: @ 8040DEC
@@ -110777,8 +110777,8 @@ _080411C0:
bx r1
thumb_func_end sub_8041174
- thumb_func_start sub_80411CC
-sub_80411CC: @ 80411CC
+ thumb_func_start unref_sub_80411CC
+unref_sub_80411CC: @ 80411CC
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -110813,7 +110813,7 @@ _080411FA:
.align 2, 0
_08041208: .4byte 0x00001121
_0804120C: .4byte gUnknown_082087DC
- thumb_func_end sub_80411CC
+ thumb_func_end unref_sub_80411CC
thumb_func_start pal_fade_1
pal_fade_1: @ 8041210
@@ -111606,8 +111606,8 @@ _08041812:
bx r0
thumb_func_end sub_80417F4
- thumb_func_start sub_8041824
-sub_8041824: @ 8041824
+ thumb_func_start unref_sub_8041824
+unref_sub_8041824: @ 8041824
push {r4-r6,lr}
adds r6, r0, 0
movs r5, 0
@@ -111645,7 +111645,7 @@ _0804182A:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8041824
+ thumb_func_end unref_sub_8041824
thumb_func_start sub_8041870
sub_8041870: @ 8041870
@@ -114419,7 +114419,7 @@ _08042DC4:
ldr r0, _08042E14
movs r1, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, _08042E18
ldr r2, _08042E1C
adds r1, r2
@@ -114502,7 +114502,7 @@ _08042EB0:
ldr r0, _08042F1C
movs r1, 0x10
movs r2, 0xA0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r3, _08042F20
ldr r4, _08042F24
movs r5, 0x98
@@ -115799,8 +115799,8 @@ _080438CE:
bx r0
thumb_func_end sub_8043740
- thumb_func_start sub_80438E0
-sub_80438E0: @ 80438E0
+ thumb_func_start unref_sub_80438E0
+unref_sub_80438E0: @ 80438E0
push {r4,r5,lr}
adds r4, r0, 0
adds r0, r1, 0
@@ -115824,7 +115824,7 @@ sub_80438E0: @ 80438E0
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80438E0
+ thumb_func_end unref_sub_80438E0
thumb_func_start battle_make_oam_normal_battle
battle_make_oam_normal_battle: @ 8043914
@@ -116504,8 +116504,8 @@ sub_8043E50: @ 8043E50
_08043E6C: .4byte 0x02020004
thumb_func_end sub_8043E50
- thumb_func_start sub_8043E70
-sub_8043E70: @ 8043E70
+ thumb_func_start unref_sub_8043E70
+unref_sub_8043E70: @ 8043E70
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -116534,7 +116534,7 @@ sub_8043E70: @ 8043E70
bx r0
.align 2, 0
_08043EAC: .4byte 0x02020004
- thumb_func_end sub_8043E70
+ thumb_func_end unref_sub_8043E70
thumb_func_start nullsub_11
nullsub_11: @ 8043EB0
@@ -119636,7 +119636,7 @@ _080456FC:
lsls r3, 1
adds r1, r4, r3
movs r2, 0x2
- bl rboxid_80040B8
+ bl FillPalette
lsls r4, 1
ldr r0, _080457D0
adds r0, r4, r0
@@ -130910,7 +130910,7 @@ _0804B098:
lsls r1, 4
adds r1, 0x4
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
_0804B0B2:
pop {r0}
bx r0
@@ -131464,7 +131464,7 @@ _0804B47C:
ldr r0, _0804B5A8
movs r1, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, [r6]
adds r0, r1, 0
adds r0, 0xB6
@@ -132276,7 +132276,7 @@ _0804BC24:
ldr r0, _0804BCA0
movs r1, 0x10
movs r2, 0xA0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r3, _0804BCA4
ldr r4, _0804BCA8
movs r5, 0x98
@@ -132630,11 +132630,11 @@ _0804BEF8:
ldr r0, _0804BF90
movs r1, 0x70
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
movs r0, 0
movs r1, 0
movs r2, 0x2
- bl rboxid_80040B8
+ bl FillPalette
movs r0, 0xE0
lsls r0, 7
adds r2, r0, 0
@@ -132780,7 +132780,7 @@ _0804C060:
ldr r0, _0804C0DC
movs r1, 0x10
movs r2, 0xA0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r3, _0804C0E0
ldr r4, _0804C0E4
movs r5, 0x98
@@ -136616,7 +136616,7 @@ sub_804E22C: @ 804E22C
ldr r0, _0804E284
movs r1, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, _0804E288
ldr r2, _0804E28C
adds r0, r2, 0
@@ -136732,7 +136732,7 @@ _0804E34C:
movs r2, 0x80
lsls r2, 1
movs r1, 0
- bl gpu_pal_apply
+ bl LoadPalette
b _0804E49E
.align 2, 0
_0804E36C: .4byte gUnknown_08215C2C
@@ -136852,7 +136852,7 @@ _0804E444:
adds r0, r7, 0
movs r1, 0x80
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _0804E49E
.align 2, 0
_0804E474: .4byte 0x02013000
@@ -140849,15 +140849,15 @@ sub_80504F0: @ 80504F0
_080504F8: .4byte 0x0300052c
thumb_func_end sub_80504F0
- thumb_func_start sub_80504FC
-sub_80504FC: @ 80504FC
+ thumb_func_start unref_sub_80504FC
+unref_sub_80504FC: @ 80504FC
ldr r0, _08050504
movs r1, 0
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_08050504: .4byte 0x0300052c
- thumb_func_end sub_80504FC
+ thumb_func_end unref_sub_80504FC
thumb_func_start sub_8050508
sub_8050508: @ 8050508
@@ -140868,15 +140868,15 @@ sub_8050508: @ 8050508
_08050510: .4byte 0x0300052e
thumb_func_end sub_8050508
- thumb_func_start sub_8050514
-sub_8050514: @ 8050514
+ thumb_func_start unref_sub_8050514
+unref_sub_8050514: @ 8050514
ldr r0, _0805051C
movs r1, 0
ldrsh r0, [r0, r1]
bx lr
.align 2, 0
_0805051C: .4byte 0x0300052e
- thumb_func_end sub_8050514
+ thumb_func_end unref_sub_8050514
thumb_func_start sub_8050520
sub_8050520: @ 8050520
@@ -143138,8 +143138,8 @@ sub_80516C4: @ 80516C4
_080516F4: .4byte 0x03004854
thumb_func_end sub_80516C4
- thumb_func_start sub_80516F8
-sub_80516F8: @ 80516F8
+ thumb_func_start unref_sub_80516F8
+unref_sub_80516F8: @ 80516F8
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 24
@@ -143277,7 +143277,7 @@ _0805180C:
.align 2, 0
_08051814: .4byte gUnknown_0842D390
_08051818: .4byte 0x03002a68
- thumb_func_end sub_80516F8
+ thumb_func_end unref_sub_80516F8
thumb_func_start sub_805181C
sub_805181C: @ 805181C
@@ -144896,8 +144896,8 @@ _080524B0:
bx r1
thumb_func_end sub_8052228
- thumb_func_start sub_80524BC
-sub_80524BC: @ 80524BC
+ thumb_func_start unref_sub_80524BC
+unref_sub_80524BC: @ 80524BC
push {r4,lr}
bl ResetSpriteData
bl FreeAllSpritePalettes
@@ -144940,7 +144940,7 @@ _08052520: .4byte gWindowConfig_81E6CE4
_08052524: .4byte 0x03001770
_08052528: .4byte 0x03000560
_0805252C: .4byte sub_8052AF8
- thumb_func_end sub_80524BC
+ thumb_func_end unref_sub_80524BC
thumb_func_start sub_8052530
sub_8052530: @ 8052530
diff --git a/asm/rom4.s b/asm/rom4.s
index 503ad955e..9c02fe0d6 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -1386,8 +1386,8 @@ _08053788: .4byte 0x020297f8
_0805378C: .4byte 0x02025734
thumb_func_end sub_8053778
- thumb_func_start sub_8053790
-sub_8053790: @ 8053790
+ thumb_func_start unref_sub_8053790
+unref_sub_8053790: @ 8053790
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -1417,7 +1417,7 @@ sub_8053790: @ 8053790
bx r0
.align 2, 0
_080537C8: .4byte 0x02025740
- thumb_func_end sub_8053790
+ thumb_func_end unref_sub_8053790
thumb_func_start sub_80537CC
sub_80537CC: @ 80537CC
@@ -2856,8 +2856,8 @@ _0805425A:
bx r1
thumb_func_end is_light_level_8_or_9
- thumb_func_start sub_8054260
-sub_8054260: @ 8054260
+ thumb_func_start unref_sub_8054260
+unref_sub_8054260: @ 8054260
push {lr}
ldr r1, _08054280
movs r0, 0x14
@@ -2875,7 +2875,7 @@ sub_8054260: @ 8054260
bx r1
.align 2, 0
_08054280: .4byte 0x02025734
- thumb_func_end sub_8054260
+ thumb_func_end unref_sub_8054260
thumb_func_start sav1_map_get_name
sav1_map_get_name: @ 8054284
@@ -3455,8 +3455,8 @@ _08054726:
_08054730: .4byte 0x0202e828
thumb_func_end sub_805470C
- thumb_func_start c2_8056854
-c2_8056854: @ 8054734
+ thumb_func_start CB2_ContinueSavedGame
+CB2_ContinueSavedGame: @ 8054734
push {lr}
bl sub_80547A8
bl sub_8074D08
@@ -3495,7 +3495,7 @@ _08054798:
_0805479C: .4byte 0x0300485c
_080547A0: .4byte sub_805470C
_080547A4: .4byte c1_overworld
- thumb_func_end c2_8056854
+ thumb_func_end CB2_ContinueSavedGame
thumb_func_start sub_80547A8
sub_80547A8: @ 80547A8
@@ -5236,14 +5236,14 @@ _08055562:
bx r1
thumb_func_end sub_80554F8
- thumb_func_start sub_8055568
-sub_8055568: @ 8055568
+ thumb_func_start unref_sub_8055568
+unref_sub_8055568: @ 8055568
push {lr}
movs r0, 0x83
bl sub_8054FC0
pop {r1}
bx r1
- thumb_func_end sub_8055568
+ thumb_func_end unref_sub_8055568
thumb_func_start sub_8055574
sub_8055574: @ 8055574
@@ -5931,8 +5931,8 @@ sub_8055A2C: @ 8055A2C
bx r0
thumb_func_end sub_8055A2C
- thumb_func_start sub_8055A6C
-sub_8055A6C: @ 8055A6C
+ thumb_func_start unref_sub_8055A6C
+unref_sub_8055A6C: @ 8055A6C
push {lr}
lsls r0, 24
lsls r1, 24
@@ -5956,10 +5956,10 @@ _08055A8E:
.align 2, 0
_08055A94: .4byte 0x02029818
_08055A98: .4byte 0x030048a0
- thumb_func_end sub_8055A6C
+ thumb_func_end unref_sub_8055A6C
- thumb_func_start sub_8055A9C
-sub_8055A9C: @ 8055A9C
+ thumb_func_start unref_sub_8055A9C
+unref_sub_8055A9C: @ 8055A9C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 22
@@ -5995,7 +5995,7 @@ _08055AC8:
_08055ADC: .4byte 0x02029818
_08055AE0: .4byte 0x030048a0
_08055AE4: .4byte 0x02020004
- thumb_func_end sub_8055A9C
+ thumb_func_end unref_sub_8055A9C
thumb_func_start sub_8055AE8
sub_8055AE8: @ 8055AE8
@@ -6078,8 +6078,8 @@ _08055B6C: .4byte 0x02029818
_08055B70: .4byte 0x030048a0
thumb_func_end sub_8055B50
- thumb_func_start sub_8055B74
-sub_8055B74: @ 8055B74
+ thumb_func_start unref_sub_8055B74
+unref_sub_8055B74: @ 8055B74
lsls r0, 24
ldr r1, _08055B94
lsrs r0, 22
@@ -6099,7 +6099,7 @@ sub_8055B74: @ 8055B74
.align 2, 0
_08055B94: .4byte 0x02029818
_08055B98: .4byte 0x030048a0
- thumb_func_end sub_8055B74
+ thumb_func_end unref_sub_8055B74
thumb_func_start sub_8055B9C
sub_8055B9C: @ 8055B9C
@@ -8453,15 +8453,15 @@ sav1_camera_get_focus_coords: @ 8056C68
_08056C78: .4byte 0x02025734
thumb_func_end sav1_camera_get_focus_coords
- thumb_func_start sub_8056C7C
-sub_8056C7C: @ 8056C7C
+ thumb_func_start unref_sub_8056C7C
+unref_sub_8056C7C: @ 8056C7C
ldr r2, _08056C84
strh r0, [r2]
strh r1, [r2, 0x2]
bx lr
.align 2, 0
_08056C84: .4byte 0x02025734
- thumb_func_end sub_8056C7C
+ thumb_func_end unref_sub_8056C7C
thumb_func_start GetCameraCoords
GetCameraCoords: @ 8056C88
@@ -8514,7 +8514,7 @@ sub_8056CBC: @ 8056CBC
lsls r1, r5, 16
lsrs r1, 16
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, [r4, 0x8]
adds r0, 0x2
adds r1, r5, 0x1
@@ -8533,7 +8533,7 @@ _08056CEE:
lsls r2, r6, 16
_08056CFC:
lsrs r2, 16
- bl gpu_pal_apply
+ bl LoadPalette
b _08056D1E
_08056D04:
ldr r0, [r4, 0x8]
@@ -8546,7 +8546,7 @@ _08056D04:
lsls r2, r6, 16
lsrs r2, 16
adds r0, r4, 0
- bl gpu_pal_apply
+ bl LoadPalette
_08056D1E:
add sp, 0x4
pop {r4-r6}
@@ -8873,8 +8873,8 @@ _08056EDA:
bx r1
thumb_func_end MetatileBehavior_IsEscalator
- thumb_func_start sub_8056EE0
-sub_8056EE0: @ 8056EE0
+ thumb_func_start unref_sub_8056EE0
+unref_sub_8056EE0: @ 8056EE0
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -8887,7 +8887,7 @@ _08056EEE:
_08056EF0:
pop {r1}
bx r1
- thumb_func_end sub_8056EE0
+ thumb_func_end unref_sub_8056EE0
thumb_func_start MetatileBehavior_IsLadder
MetatileBehavior_IsLadder: @ 8056EF4
@@ -9037,8 +9037,8 @@ _08056FB4:
bx r1
thumb_func_end MetatileBehavior_IsSouthArrowWarp
- thumb_func_start sub_8056FB8
-sub_8056FB8: @ 8056FB8
+ thumb_func_start unref_sub_8056FB8
+unref_sub_8056FB8: @ 8056FB8
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -9070,7 +9070,7 @@ _08056FF2:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8056FB8
+ thumb_func_end unref_sub_8056FB8
thumb_func_start sub_8056FFC
sub_8056FFC: @ 8056FFC
@@ -9539,8 +9539,8 @@ _0805725C:
bx r1
thumb_func_end sub_805724C
- thumb_func_start sub_8057260
-sub_8057260: @ 8057260
+ thumb_func_start unref_sub_8057260
+unref_sub_8057260: @ 8057260
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -9553,7 +9553,7 @@ _0805726E:
_08057270:
pop {r1}
bx r1
- thumb_func_end sub_8057260
+ thumb_func_end unref_sub_8057260
thumb_func_start sub_8057274
sub_8057274: @ 8057274
@@ -9618,8 +9618,8 @@ _080572C0:
bx r1
thumb_func_end sub_80572B0
- thumb_func_start sub_80572C4
-sub_80572C4: @ 80572C4
+ thumb_func_start unref_sub_80572C4
+unref_sub_80572C4: @ 80572C4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -9632,7 +9632,7 @@ _080572D2:
_080572D4:
pop {r1}
bx r1
- thumb_func_end sub_80572C4
+ thumb_func_end unref_sub_80572C4
thumb_func_start sub_80572D8
sub_80572D8: @ 80572D8
@@ -10147,8 +10147,8 @@ _08057580:
bx r1
thumb_func_end sub_8057568
- thumb_func_start sub_8057584
-sub_8057584: @ 8057584
+ thumb_func_start unref_sub_8057584
+unref_sub_8057584: @ 8057584
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -10164,7 +10164,7 @@ _08057596:
_08057598:
pop {r1}
bx r1
- thumb_func_end sub_8057584
+ thumb_func_end unref_sub_8057584
thumb_func_start sub_805759C
sub_805759C: @ 805759C
@@ -12733,8 +12733,8 @@ _08058694:
bx r1
thumb_func_end cur_mapdata_get_door_x2_at
- thumb_func_start sub_805869C
-sub_805869C: @ 805869C
+ thumb_func_start unref_sub_805869C
+unref_sub_805869C: @ 805869C
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -12745,7 +12745,7 @@ sub_805869C: @ 805869C
bx r0
.align 2, 0
_080586B0: .4byte gUnknown_0830F9B4
- thumb_func_end sub_805869C
+ thumb_func_end unref_sub_805869C
thumb_func_start sub_80586B4
sub_80586B4: @ 80586B4
@@ -15072,8 +15072,8 @@ _08059788: .4byte 0x030048a0
_0805978C: .4byte 0x0202e858
thumb_func_end PlayerGetZCoord
- thumb_func_start sub_8059790
-sub_8059790: @ 8059790
+ thumb_func_start unref_sub_8059790
+unref_sub_8059790: @ 8059790
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -15095,7 +15095,7 @@ sub_8059790: @ 8059790
.align 2, 0
_080597B8: .4byte 0x0202e858
_080597BC: .4byte 0x030048a0
- thumb_func_end sub_8059790
+ thumb_func_end unref_sub_8059790
thumb_func_start TestPlayerAvatarFlags
TestPlayerAvatarFlags: @ 80597C0
@@ -15214,8 +15214,8 @@ GetPlayerAvatarGraphicsIdByStateId: @ 805986C
_08059884: .4byte 0x0202e858
thumb_func_end GetPlayerAvatarGraphicsIdByStateId
- thumb_func_start sub_8059888
-sub_8059888: @ 8059888
+ thumb_func_start unref_sub_8059888
+unref_sub_8059888: @ 8059888
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -15242,7 +15242,7 @@ _080598AE:
_080598B0:
pop {r1}
bx r1
- thumb_func_end sub_8059888
+ thumb_func_end unref_sub_8059888
thumb_func_start GetPlayerAvatarGenderByGraphicsId
GetPlayerAvatarGenderByGraphicsId: @ 80598B4
@@ -19674,8 +19674,8 @@ _0805BA72:
_0805BA7C: .4byte 0x02020004
thumb_func_end sub_805B980
- thumb_func_start sub_805BA80
-sub_805BA80: @ 805BA80
+ thumb_func_start unref_sub_805BA80
+unref_sub_805BA80: @ 805BA80
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -19707,7 +19707,7 @@ _0805BAB4:
bx r0
.align 2, 0
_0805BABC: .4byte 0x030048a0
- thumb_func_end sub_805BA80
+ thumb_func_end unref_sub_805BA80
thumb_func_start FieldObjectTurn
FieldObjectTurn: @ 805BAC0
@@ -19785,8 +19785,8 @@ _0805BB44:
_0805BB4C: .4byte 0x030048a0
thumb_func_end FieldObjectTurnByLocalIdAndMap
- thumb_func_start sub_805BB50
-sub_805BB50: @ 805BB50
+ thumb_func_start unref_sub_805BB50
+unref_sub_805BB50: @ 805BB50
push {lr}
lsls r1, 24
lsrs r1, 24
@@ -19801,7 +19801,7 @@ sub_805BB50: @ 805BB50
bx r0
.align 2, 0
_0805BB6C: .4byte 0x030048a0
- thumb_func_end sub_805BB50
+ thumb_func_end unref_sub_805BB50
thumb_func_start get_berry_tree_graphics
get_berry_tree_graphics: @ 805BB70
@@ -20179,8 +20179,8 @@ _0805BE1C: .4byte 0x000011ff
_0805BE20: .4byte gUnknown_0837377C
thumb_func_end sub_805BDF8
- thumb_func_start sub_805BE24
-sub_805BE24: @ 805BE24
+ thumb_func_start unref_sub_805BE24
+unref_sub_805BE24: @ 805BE24
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
@@ -20208,7 +20208,7 @@ _0805BE4E:
bx r0
.align 2, 0
_0805BE54: .4byte 0x000011ff
- thumb_func_end sub_805BE24
+ thumb_func_end unref_sub_805BE24
thumb_func_start sub_805BE58
sub_805BE58: @ 805BE58
@@ -20254,7 +20254,7 @@ pal_patch_for_npc: @ 805BE80
lsrs r4, 16
adds r1, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -20445,8 +20445,8 @@ _0805C00C:
bx r0
thumb_func_end npc_load_two_palettes__and_record
- thumb_func_start sub_805C014
-sub_805C014: @ 805C014
+ thumb_func_start unref_sub_805C014
+unref_sub_805C014: @ 805C014
push {r4,lr}
ldrh r3, [r0, 0x10]
strh r3, [r0, 0x14]
@@ -20463,7 +20463,7 @@ sub_805C014: @ 805C014
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805C014
+ thumb_func_end unref_sub_805C014
thumb_func_start npc_coords_shift
npc_coords_shift: @ 805C034
@@ -21038,8 +21038,8 @@ CameraObjectReset2: @ 805C42C
bx r0
thumb_func_end CameraObjectReset2
- thumb_func_start sub_805C43C
-sub_805C43C: @ 805C43C
+ thumb_func_start unref_sub_805C43C
+unref_sub_805C43C: @ 805C43C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -21090,7 +21090,7 @@ _0805C492:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_805C43C
+ thumb_func_end unref_sub_805C43C
thumb_func_start obj_unfreeze
obj_unfreeze: @ 805C4A0
@@ -21263,8 +21263,8 @@ GetFieldObjectFlagIdByFieldObjectId: @ 805C5A8
_0805C5CC: .4byte 0x030048a0
thumb_func_end GetFieldObjectFlagIdByFieldObjectId
- thumb_func_start sub_805C5D0
-sub_805C5D0: @ 805C5D0
+ thumb_func_start unref_sub_805C5D0
+unref_sub_805C5D0: @ 805C5D0
push {lr}
sub sp, 0x4
lsls r0, 24
@@ -21295,10 +21295,10 @@ _0805C606:
add sp, 0x4
pop {r1}
bx r1
- thumb_func_end sub_805C5D0
+ thumb_func_end unref_sub_805C5D0
- thumb_func_start sub_805C60C
-sub_805C60C: @ 805C60C
+ thumb_func_start unref_sub_805C60C
+unref_sub_805C60C: @ 805C60C
lsls r0, 24
lsrs r0, 24
ldr r2, _0805C620
@@ -21310,10 +21310,10 @@ sub_805C60C: @ 805C60C
bx lr
.align 2, 0
_0805C620: .4byte 0x030048a0
- thumb_func_end sub_805C60C
+ thumb_func_end unref_sub_805C60C
- thumb_func_start sub_805C624
-sub_805C624: @ 805C624
+ thumb_func_start unref_sub_805C624
+unref_sub_805C624: @ 805C624
push {lr}
sub sp, 0x4
lsls r0, 24
@@ -21344,7 +21344,7 @@ _0805C65A:
add sp, 0x4
pop {r1}
bx r1
- thumb_func_end sub_805C624
+ thumb_func_end unref_sub_805C624
thumb_func_start FieldObjectGetBerryTreeId
FieldObjectGetBerryTreeId: @ 805C660
@@ -29044,8 +29044,8 @@ sub_805FD98: @ 805FD98
_0805FDA4: .4byte gUnknown_0837562A
thumb_func_end sub_805FD98
- thumb_func_start sub_805FDA8
-sub_805FDA8: @ 805FDA8
+ thumb_func_start unref_sub_805FDA8
+unref_sub_805FDA8: @ 805FDA8
lsls r0, 24
lsrs r0, 24
ldr r1, _0805FDB4
@@ -29054,7 +29054,7 @@ sub_805FDA8: @ 805FDA8
bx lr
.align 2, 0
_0805FDB4: .4byte gUnknown_08375633
- thumb_func_end sub_805FDA8
+ thumb_func_end unref_sub_805FDA8
thumb_func_start sub_805FDB8
sub_805FDB8: @ 805FDB8
@@ -29815,8 +29815,8 @@ MoveCoords: @ 80602D4
_080602F4: .4byte gUnknown_083756A4
thumb_func_end MoveCoords
- thumb_func_start sub_80602F8
-sub_80602F8: @ 80602F8
+ thumb_func_start unref_sub_80602F8
+unref_sub_80602F8: @ 80602F8
push {r4,lr}
lsls r0, 24
ldr r3, _0806031C
@@ -29837,7 +29837,7 @@ sub_80602F8: @ 80602F8
bx r0
.align 2, 0
_0806031C: .4byte gUnknown_083756A4
- thumb_func_end sub_80602F8
+ thumb_func_end unref_sub_80602F8
thumb_func_start sub_8060320
sub_8060320: @ 8060320
@@ -40139,8 +40139,8 @@ _08064BB2:
bx r1
thumb_func_end box_related_two__3
- thumb_func_start sub_8064BB8
-sub_8064BB8: @ 8064BB8
+ thumb_func_start unref_sub_8064BB8
+unref_sub_8064BB8: @ 8064BB8
push {lr}
ldr r2, _08064BCC
movs r1, 0x3
@@ -40151,10 +40151,10 @@ sub_8064BB8: @ 8064BB8
bx r1
.align 2, 0
_08064BCC: .4byte 0x030005a8
- thumb_func_end sub_8064BB8
+ thumb_func_end unref_sub_8064BB8
- thumb_func_start sub_8064BD0
-sub_8064BD0: @ 8064BD0
+ thumb_func_start unref_sub_8064BD0
+unref_sub_8064BD0: @ 8064BD0
push {lr}
ldr r1, _08064BE8
ldrb r0, [r1]
@@ -40172,7 +40172,7 @@ _08064BEC:
_08064BEE:
pop {r1}
bx r1
- thumb_func_end sub_8064BD0
+ thumb_func_end unref_sub_8064BD0
thumb_func_start textbox_fdecode_auto_and_task_add
textbox_fdecode_auto_and_task_add: @ 8064BF4
@@ -40266,8 +40266,8 @@ _08064C9A:
bx r1
thumb_func_end sub_8064C84
- thumb_func_start sub_8064CA0
-sub_8064CA0: @ 8064CA0
+ thumb_func_start unref_sub_8064CA0
+unref_sub_8064CA0: @ 8064CA0
push {lr}
bl task_del_textbox
ldr r0, _08064CB8
@@ -40280,7 +40280,7 @@ sub_8064CA0: @ 8064CA0
.align 2, 0
_08064CB8: .4byte 0x0202e87c
_08064CBC: .4byte 0x030005a8
- thumb_func_end sub_8064CA0
+ thumb_func_end unref_sub_8064CA0
thumb_func_start walkrun_is_standing_still
walkrun_is_standing_still: @ 8064CC0
@@ -40498,8 +40498,8 @@ sub_8064E2C: @ 8064E2C
_08064E58: .4byte 0x030048a0
thumb_func_end sub_8064E2C
- thumb_func_start sub_8064E5C
-sub_8064E5C: @ 8064E5C
+ thumb_func_start unref_sub_8064E5C
+unref_sub_8064E5C: @ 8064E5C
push {r4,lr}
ldr r4, _08064EA4
ldr r0, _08064EA8
@@ -40535,7 +40535,7 @@ _08064E7A:
.align 2, 0
_08064EA4: .4byte 0x030048a0
_08064EA8: .4byte 0x03004ae0
- thumb_func_end sub_8064E5C
+ thumb_func_end unref_sub_8064E5C
thumb_func_start sub_8064EAC
sub_8064EAC: @ 8064EAC
@@ -40748,7 +40748,7 @@ sub_8065014: @ 8065014
lsls r4, 4
adds r1, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -40983,8 +40983,8 @@ sub_80651C8: @ 80651C8
_080651D8: .4byte 0x030005ae
thumb_func_end sub_80651C8
- thumb_func_start sub_80651DC
-sub_80651DC: @ 80651DC
+ thumb_func_start unref_sub_80651DC
+unref_sub_80651DC: @ 80651DC
push {lr}
sub sp, 0x4
ldr r2, _080651FC
@@ -41001,7 +41001,7 @@ sub_80651DC: @ 80651DC
bx r0
.align 2, 0
_080651FC: .4byte 0x030005ae
- thumb_func_end sub_80651DC
+ thumb_func_end unref_sub_80651DC
thumb_func_start copy_textbox_border_tile_patterns_to_vram
copy_textbox_border_tile_patterns_to_vram: @ 8065200
@@ -48397,8 +48397,8 @@ _080688EE:
_080688F4: .4byte gUnknown_0815FD0D
thumb_func_end sub_8068894
- thumb_func_start sub_80688F8
-sub_80688F8: @ 80688F8
+ thumb_func_start unref_sub_80688F8
+unref_sub_80688F8: @ 80688F8
push {lr}
ldr r0, _08068908
movs r1, 0
@@ -48407,7 +48407,7 @@ sub_80688F8: @ 80688F8
bx r0
.align 2, 0
_08068908: .4byte 0x0000402a
- thumb_func_end sub_80688F8
+ thumb_func_end unref_sub_80688F8
thumb_func_start happiness_algorithm_step
happiness_algorithm_step: @ 806890C
@@ -49517,8 +49517,8 @@ _08069166:
bx r1
thumb_func_end sub_806912C
- thumb_func_start sub_806916C
-sub_806916C: @ 806916C
+ thumb_func_start unref_sub_806916C
+unref_sub_806916C: @ 806916C
push {lr}
ldr r0, _08069178
bl FlagReset
@@ -49526,10 +49526,10 @@ sub_806916C: @ 806916C
bx r0
.align 2, 0
_08069178: .4byte 0x0000084c
- thumb_func_end sub_806916C
+ thumb_func_end unref_sub_806916C
- thumb_func_start sub_806917C
-sub_806917C: @ 806917C
+ thumb_func_start unref_sub_806917C
+unref_sub_806917C: @ 806917C
push {lr}
ldr r0, _08069188
bl FlagSet
@@ -49537,7 +49537,7 @@ sub_806917C: @ 806917C
bx r0
.align 2, 0
_08069188: .4byte 0x0000084c
- thumb_func_end sub_806917C
+ thumb_func_end unref_sub_806917C
thumb_func_start sub_806918C
sub_806918C: @ 806918C
@@ -55149,8 +55149,8 @@ _0806BCB0: .4byte gUnknown_08376918
_0806BCB4: .4byte gUnknown_08E9A300
thumb_func_end sub_806BC3C
- thumb_func_start sub_806BCB8
-sub_806BCB8: @ 806BCB8
+ thumb_func_start unref_sub_806BCB8
+unref_sub_806BCB8: @ 806BCB8
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -55176,7 +55176,7 @@ _0806BCDE:
bx r0
.align 2, 0
_0806BCE4: .4byte 0x03004350
- thumb_func_end sub_806BCB8
+ thumb_func_end unref_sub_806BCB8
thumb_func_start sub_806BCE8
sub_806BCE8: @ 806BCE8
@@ -58607,7 +58607,7 @@ _0806D74E:
movs r2, 0xB0
lsls r2, 1
movs r1, 0
- bl decompress_palette
+ bl LoadCompressedPalette
_0806D75A:
cmp r4, 0x4
beq _0806D762
@@ -58617,11 +58617,11 @@ _0806D762:
mov r0, sp
movs r1, 0
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0806D7D8
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_0806D776:
cmp r4, 0x5
beq _0806D77E
@@ -58658,7 +58658,7 @@ _0806D7AE:
ldr r0, _0806D7F4
movs r1, 0xB0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
movs r5, 0x1
_0806D7BA:
adds r0, r5, 0
@@ -58866,8 +58866,8 @@ _0806D95A:
bx r0
thumb_func_end sub_806D90C
- thumb_func_start sub_806D964
-sub_806D964: @ 806D964
+ thumb_func_start unref_sub_806D964
+unref_sub_806D964: @ 806D964
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -58896,7 +58896,7 @@ _0806D986:
.align 2, 0
_0806D994: .4byte 0x03004360
_0806D998: .4byte 0x03004350
- thumb_func_end sub_806D964
+ thumb_func_end unref_sub_806D964
thumb_func_start sub_806D99C
sub_806D99C: @ 806D99C
@@ -60444,15 +60444,15 @@ _0806E544:
_0806E560: .4byte 0x03004360
thumb_func_end sub_806E53C
- thumb_func_start nullsub_52
-nullsub_52: @ 806E564
+ thumb_func_start unref_sub_806E564
+unref_sub_806E564: @ 806E564
bx lr
- thumb_func_end nullsub_52
+ thumb_func_end unref_sub_806E564
- thumb_func_start nullsub_87
-nullsub_87: @ 806E568
+ thumb_func_start unref_sub_806E568
+unref_sub_806E568: @ 806E568
bx lr
- thumb_func_end nullsub_87
+ thumb_func_end unref_sub_806E568
thumb_func_start nullsub_12
nullsub_12: @ 806E56C
@@ -65573,8 +65573,8 @@ _08070F8A:
bx r1
thumb_func_end sub_8070E48
- thumb_func_start sub_8070F90
-sub_8070F90: @ 8070F90
+ thumb_func_start unref_sub_8070F90
+unref_sub_8070F90: @ 8070F90
push {lr}
ldr r0, _08070FAC
bl FlagSet
@@ -65588,7 +65588,7 @@ sub_8070F90: @ 8070F90
.align 2, 0
_08070FAC: .4byte 0x00000801
_08070FB0: .4byte 0x00000802
- thumb_func_end sub_8070F90
+ thumb_func_end unref_sub_8070F90
thumb_func_start sub_8070FB4
sub_8070FB4: @ 8070FB4
@@ -66311,7 +66311,7 @@ _08071542:
pop {r1}
bx r1
.align 2, 0
-_08071548: .4byte sub_808B63C
+_08071548: .4byte CB2_InitOptionMenu
_0807154C: .4byte 0x03001770
_08071550: .4byte sub_805469C
thumb_func_end sub_8071518
@@ -67419,8 +67419,8 @@ _08071D9C: .4byte 0x0202e9d2
_08071DA0: .4byte 0x0202e9d4
thumb_func_end sub_8071D48
- thumb_func_start sub_8071DA4
-sub_8071DA4: @ 8071DA4
+ thumb_func_start unref_sub_8071DA4
+unref_sub_8071DA4: @ 8071DA4
push {r4,r5,lr}
adds r2, r0, 0
lsls r4, r1, 16
@@ -67457,7 +67457,7 @@ _08071DF0: .4byte 0x0202e9d0
_08071DF4: .4byte 0x0202e9d2
_08071DF8: .4byte 0x0202e9ce
_08071DFC: .4byte 0x0202e9d4
- thumb_func_end sub_8071DA4
+ thumb_func_end unref_sub_8071DA4
thumb_func_start sub_8071E00
sub_8071E00: @ 8071E00
@@ -67681,8 +67681,8 @@ _08071F90: .4byte 0x0202e9c8
_08071F94: .4byte 0x0202e9ce
thumb_func_end sub_8071F60
- thumb_func_start sub_8071F98
-sub_8071F98: @ 8071F98
+ thumb_func_start unref_sub_8071F98
+unref_sub_8071F98: @ 8071F98
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -67700,10 +67700,10 @@ sub_8071F98: @ 8071F98
bx r1
.align 2, 0
_08071FB8: .4byte 0x0202e9c8
- thumb_func_end sub_8071F98
+ thumb_func_end unref_sub_8071F98
- thumb_func_start sub_8071FBC
-sub_8071FBC: @ 8071FBC
+ thumb_func_start unref_sub_8071FBC
+unref_sub_8071FBC: @ 8071FBC
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -67734,7 +67734,7 @@ sub_8071FBC: @ 8071FBC
bx r0
.align 2, 0
_08071FF8: .4byte 0x0202e9c8
- thumb_func_end sub_8071FBC
+ thumb_func_end unref_sub_8071FBC
thumb_func_start sub_8071FFC
sub_8071FFC: @ 8071FFC
@@ -67823,8 +67823,8 @@ sub_8072080: @ 8072080
_08072094: .4byte 0x0202e9c8
thumb_func_end sub_8072080
- thumb_func_start sub_8072098
-sub_8072098: @ 8072098
+ thumb_func_start unref_sub_8072098
+unref_sub_8072098: @ 8072098
push {lr}
ldr r0, _080720AC
ldr r0, [r0]
@@ -67835,7 +67835,7 @@ sub_8072098: @ 8072098
bx r1
.align 2, 0
_080720AC: .4byte 0x0202e9c8
- thumb_func_end sub_8072098
+ thumb_func_end unref_sub_8072098
thumb_func_start sub_80720B0
sub_80720B0: @ 80720B0
@@ -69146,8 +69146,8 @@ _08072A54: .4byte 0x0202e9c8
_08072A58: .4byte 0x0202e9ce
thumb_func_end sub_8072A18
- thumb_func_start sub_8072A5C
-sub_8072A5C: @ 8072A5C
+ thumb_func_start unref_sub_8072A5C
+unref_sub_8072A5C: @ 8072A5C
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -69187,7 +69187,7 @@ sub_8072A5C: @ 8072A5C
.align 2, 0
_08072AA8: .4byte 0x0202e9c8
_08072AAC: .4byte 0x0202e9ce
- thumb_func_end sub_8072A5C
+ thumb_func_end unref_sub_8072A5C
thumb_func_start sub_8072AB0
sub_8072AB0: @ 8072AB0
@@ -69510,14 +69510,14 @@ sub_8072CF4: @ 8072CF4
_08072D08: .4byte 0x0202e9c8
thumb_func_end sub_8072CF4
- thumb_func_start sub_8072D0C
-sub_8072D0C: @ 8072D0C
+ thumb_func_start unref_sub_8072D0C
+unref_sub_8072D0C: @ 8072D0C
ldr r0, _08072D14
ldr r0, [r0]
bx lr
.align 2, 0
_08072D14: .4byte 0x0202e9c8
- thumb_func_end sub_8072D0C
+ thumb_func_end unref_sub_8072D0C
thumb_func_start sub_8072D18
sub_8072D18: @ 8072D18
@@ -69612,13 +69612,13 @@ RedrawMenuCursor: @ 8072DA8
bx r0
thumb_func_end RedrawMenuCursor
- thumb_func_start sub_8072DC0
-sub_8072DC0: @ 8072DC0
+ thumb_func_start unref_sub_8072DC0
+unref_sub_8072DC0: @ 8072DC0
push {lr}
bl sub_814A904
pop {r0}
bx r0
- thumb_func_end sub_8072DC0
+ thumb_func_end unref_sub_8072DC0
thumb_func_start sub_8072DCC
sub_8072DCC: @ 8072DCC
@@ -71265,8 +71265,8 @@ _08073A0C: .4byte gUnknown_0837DEDC
_08073A10: .4byte 0x06007e00
thumb_func_end sub_80739EC
- thumb_func_start decompress_palette
-decompress_palette: @ 8073A14
+ thumb_func_start LoadCompressedPalette
+LoadCompressedPalette: @ 8073A14
push {r4-r6,lr}
adds r4, r1, 0
adds r5, r2, 0
@@ -71296,10 +71296,10 @@ decompress_palette: @ 8073A14
_08073A4C: .4byte 0x0202f39c
_08073A50: .4byte 0x0202eac8
_08073A54: .4byte 0x0202eec8
- thumb_func_end decompress_palette
+ thumb_func_end LoadCompressedPalette
- thumb_func_start gpu_pal_apply
-gpu_pal_apply: @ 8073A58
+ thumb_func_start LoadPalette
+LoadPalette: @ 8073A58
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
@@ -71324,10 +71324,10 @@ gpu_pal_apply: @ 8073A58
.align 2, 0
_08073A88: .4byte 0x0202eac8
_08073A8C: .4byte 0x0202eec8
- thumb_func_end gpu_pal_apply
+ thumb_func_end LoadPalette
- thumb_func_start rboxid_80040B8
-rboxid_80040B8: @ 8073A90
+ thumb_func_start FillPalette
+FillPalette: @ 8073A90
push {r4-r6,lr}
sub sp, 0x4
adds r6, r0, 0
@@ -71364,7 +71364,7 @@ rboxid_80040B8: @ 8073A90
.align 2, 0
_08073AD8: .4byte 0x0202eac8
_08073ADC: .4byte 0x0202eec8
- thumb_func_end rboxid_80040B8
+ thumb_func_end FillPalette
thumb_func_start copy_pal_bg_faded_to_pal_ram
copy_pal_bg_faded_to_pal_ram: @ 8073AE0
@@ -71674,8 +71674,8 @@ _08073D34: .4byte 0x04000100
_08073D38: .4byte 0x0202f398
thumb_func_end pal_fade_maybe
- thumb_func_start sub_8073D3C
-sub_8073D3C: @ 8073D3C
+ thumb_func_start unref_sub_8073D3C
+unref_sub_8073D3C: @ 8073D3C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -71710,10 +71710,10 @@ sub_8073D3C: @ 8073D3C
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8073D3C
+ thumb_func_end unref_sub_8073D3C
- thumb_func_start sub_8073D84
-sub_8073D84: @ 8073D84
+ thumb_func_start unref_sub_8073D84
+unref_sub_8073D84: @ 8073D84
push {r4-r7,lr}
adds r6, r1, 0
lsls r0, 24
@@ -71775,7 +71775,7 @@ _08073DEC:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8073D84
+ thumb_func_end unref_sub_8073D84
thumb_func_start sub_8073DFC
sub_8073DFC: @ 8073DFC
@@ -72231,8 +72231,8 @@ _08074160: .4byte 0xffff8000
_08074164: .4byte 0xfffe0fff
thumb_func_end pal_fade_control_reset_maybe
- thumb_func_start sub_8074168
-sub_8074168: @ 8074168
+ thumb_func_start unref_sub_8074168
+unref_sub_8074168: @ 8074168
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -72255,10 +72255,10 @@ _0807418C:
bx r0
.align 2, 0
_08074190: .4byte 0x0202f2c8
- thumb_func_end sub_8074168
+ thumb_func_end unref_sub_8074168
- thumb_func_start sub_8074194
-sub_8074194: @ 8074194
+ thumb_func_start unref_sub_8074194
+unref_sub_8074194: @ 8074194
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -72282,7 +72282,7 @@ _080741BA:
bx r0
.align 2, 0
_080741C0: .4byte 0x0202f2c8
- thumb_func_end sub_8074194
+ thumb_func_end unref_sub_8074194
thumb_func_start sub_80741C4
sub_80741C4: @ 80741C4
@@ -73918,8 +73918,8 @@ _08074DD0: .4byte 0x030006d8
_08074DD4: .4byte 0x030006d9
thumb_func_end sub_8074D94
- thumb_func_start sub_8074DD8
-sub_8074DD8: @ 8074DD8
+ thumb_func_start unref_sub_8074DD8
+unref_sub_8074DD8: @ 8074DD8
push {r4,lr}
adds r4, r0, 0
lsls r4, 16
@@ -73946,7 +73946,7 @@ _08074E04: .4byte 0x030006d4
_08074E08: .4byte 0x030006d6
_08074E0C: .4byte 0x030006d8
_08074E10: .4byte 0x030006d9
- thumb_func_end sub_8074DD8
+ thumb_func_end unref_sub_8074DD8
thumb_func_start sub_8074E14
sub_8074E14: @ 8074E14
@@ -74028,8 +74028,8 @@ _08074EA0:
bx r1
thumb_func_end ducking_tick
- thumb_func_start sub_8074EA4
-sub_8074EA4: @ 8074EA4
+ thumb_func_start unref_sub_8074EA4
+unref_sub_8074EA4: @ 8074EA4
push {lr}
lsls r0, 24
ldr r1, _08074EB8
@@ -74041,7 +74041,7 @@ sub_8074EA4: @ 8074EA4
bx r0
.align 2, 0
_08074EB8: .4byte gUnknown_0837DEF4
- thumb_func_end sub_8074EA4
+ thumb_func_end unref_sub_8074EA4
thumb_func_start fanfare_play
fanfare_play: @ 8074EBC
@@ -76478,7 +76478,7 @@ _0807611C:
lsls r1, 4
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
mov r3, sp
ldrb r0, [r3, 0x18]
lsls r0, 5
@@ -76668,7 +76668,7 @@ _08076244:
adds r0, r4, 0
movs r1, 0x90
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08076378
str r4, [r5]
str r0, [r5, 0x4]
@@ -78148,7 +78148,7 @@ _08076E22:
lsrs r1, 20
adds r0, r4, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
b _08076E9E
.align 2, 0
_08076E54: .4byte gUnknown_0837F374
@@ -78178,7 +78178,7 @@ _08076E70:
ldr r0, [r4]
movs r1, 0x20
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
_08076E9E:
pop {r4-r7}
pop {r0}
@@ -80719,8 +80719,8 @@ _080781EA:
bx r0
thumb_func_end sub_8078174
- thumb_func_start sub_80781F0
-sub_80781F0: @ 80781F0
+ thumb_func_start unref_sub_80781F0
+unref_sub_80781F0: @ 80781F0
push {r4,lr}
adds r4, r0, 0
movs r1, 0x34
@@ -80793,7 +80793,7 @@ _08078272:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80781F0
+ thumb_func_end unref_sub_80781F0
thumb_func_start sub_8078278
sub_8078278: @ 8078278
@@ -81027,8 +81027,8 @@ _08078406:
bx r0
thumb_func_end sub_80783D0
- thumb_func_start sub_8078414
-sub_8078414: @ 8078414
+ thumb_func_start unref_sub_8078414
+unref_sub_8078414: @ 8078414
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x24]
@@ -81060,7 +81060,7 @@ sub_8078414: @ 8078414
.align 2, 0
_08078450: .4byte 0x0202f7c9
_08078454: .4byte sub_80782F8
- thumb_func_end sub_8078414
+ thumb_func_end unref_sub_8078414
thumb_func_start sub_8078458
sub_8078458: @ 8078458
@@ -81228,8 +81228,8 @@ move_anim_8074EE0: @ 8078574
bx r0
thumb_func_end move_anim_8074EE0
- thumb_func_start sub_8078588
-sub_8078588: @ 8078588
+ thumb_func_start unref_sub_8078588
+unref_sub_8078588: @ 8078588
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x24]
@@ -81261,10 +81261,10 @@ sub_8078588: @ 8078588
.align 2, 0
_080785C4: .4byte 0x0202f7c8
_080785C8: .4byte sub_80782F8
- thumb_func_end sub_8078588
+ thumb_func_end unref_sub_8078588
- thumb_func_start sub_80785CC
-sub_80785CC: @ 80785CC
+ thumb_func_start unref_sub_80785CC
+unref_sub_80785CC: @ 80785CC
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x38]
@@ -81274,7 +81274,7 @@ sub_80785CC: @ 80785CC
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80785CC
+ thumb_func_end unref_sub_80785CC
thumb_func_start sub_80785E4
sub_80785E4: @ 80785E4
@@ -83164,8 +83164,8 @@ sub_80793A8: @ 80793A8
bx lr
thumb_func_end sub_80793A8
- thumb_func_start sub_80793B0
-sub_80793B0: @ 80793B0
+ thumb_func_start unref_sub_80793B0
+unref_sub_80793B0: @ 80793B0
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -83174,7 +83174,7 @@ sub_80793B0: @ 80793B0
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_80793B0
+ thumb_func_end unref_sub_80793B0
thumb_func_start sub_80793C4
sub_80793C4: @ 80793C4
@@ -84427,8 +84427,8 @@ _08079D18: .4byte 0x0202f7be
_08079D1C: .4byte 0x03004b00
thumb_func_end sub_8079CEC
- thumb_func_start sub_8079D20
-sub_8079D20: @ 8079D20
+ thumb_func_start unref_sub_8079D20
+unref_sub_8079D20: @ 8079D20
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -84555,7 +84555,7 @@ _08079E14: .4byte 0x0202f7c9
_08079E18: .4byte 0x02020004
_08079E1C: .4byte 0x02024be0
_08079E20: .4byte 0x0202f7c8
- thumb_func_end sub_8079D20
+ thumb_func_end unref_sub_8079D20
thumb_func_start sub_8079E24
sub_8079E24: @ 8079E24
@@ -84774,7 +84774,7 @@ sub_8079F44: @ 8079F44
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
lsls r0, r6, 3
ldr r1, _08079FE8
adds r0, r1
@@ -84809,7 +84809,7 @@ _08079FF0:
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
lsls r0, r6, 3
ldr r1, _0807A068
adds r0, r1
diff --git a/asm/rom5.s b/asm/rom5.s
index 2d3e369da..17e783f1c 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -1092,8 +1092,8 @@ _0807B694: .4byte 0x02024a6a
_0807B698: .4byte 0x03004360
thumb_func_end sub_807B508
- thumb_func_start sub_807B69C
-sub_807B69C: @ 807B69C
+ thumb_func_start unref_sub_807B69C
+unref_sub_807B69C: @ 807B69C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1249,7 +1249,7 @@ _0807B7BC:
.align 2, 0
_0807B7D8: .4byte 0x02020004
_0807B7DC: .4byte gUnknown_083931F8
- thumb_func_end sub_807B69C
+ thumb_func_end unref_sub_807B69C
thumb_func_start sub_807B7E0
sub_807B7E0: @ 807B7E0
@@ -2443,8 +2443,8 @@ _0807C0E8: .4byte 0x04000016
_0807C0EC: .4byte 0x030041b4
thumb_func_end sub_807C0C8
- thumb_func_start c2_title_screen_1
-c2_title_screen_1: @ 807C0F0
+ thumb_func_start CB2_InitTitleScreen
+CB2_InitTitleScreen: @ 807C0F0
push {r4,r5,lr}
sub sp, 0x14
ldr r0, _0807C10C
@@ -2565,7 +2565,7 @@ _0807C1E4:
adds r0, r4, 0
movs r1, 0
adds r2, r5, 0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0807C280
ldr r1, _0807C284
bl LZ77UnCompVram
@@ -2578,7 +2578,7 @@ _0807C1E4:
ldr r0, _0807C298
movs r1, 0xE0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
bl remove_some_task
bl ResetTasks
bl ResetSpriteData
@@ -2596,7 +2596,7 @@ _0807C1E4:
lsls r1, 1
adds r0, r4, 0
adds r2, r5, 0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0807C2AC
bl LoadSpritePalette
ldr r0, _0807C2B0
@@ -2801,7 +2801,7 @@ _0807C446:
bx r0
.align 2, 0
_0807C450: .4byte sub_807C454
- thumb_func_end c2_title_screen_1
+ thumb_func_end CB2_InitTitleScreen
thumb_func_start sub_807C454
sub_807C454: @ 807C454
@@ -3199,7 +3199,7 @@ _0807C786:
pop {r0}
bx r0
.align 2, 0
-_0807C78C: .4byte sub_80096F0
+_0807C78C: .4byte CB2_InitMainMenu
thumb_func_end sub_807C774
thumb_func_start sub_807C790
@@ -3282,7 +3282,7 @@ _0807C816:
mov r0, sp
movs r1, 0xEF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
_0807C820:
add sp, 0x4
pop {r0}
@@ -5438,8 +5438,8 @@ sub_807D874: @ 807D874
_0807D890: .4byte 0x0202f7e8
thumb_func_end sub_807D874
- thumb_func_start sub_807D894
-sub_807D894: @ 807D894
+ thumb_func_start unref_sub_807D894
+unref_sub_807D894: @ 807D894
push {lr}
ldr r1, _0807D8A8
ldr r2, _0807D8AC
@@ -5461,7 +5461,7 @@ _0807D8B6:
bx r1
.align 2, 0
_0807D8BC: .4byte 0x000006ca
- thumb_func_end sub_807D894
+ thumb_func_end unref_sub_807D894
thumb_func_start sub_807D8C0
sub_807D8C0: @ 807D8C0
@@ -5476,7 +5476,7 @@ sub_807D8C0: @ 807D8C0
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrb r0, [r4]
bl sub_807D78C
pop {r4}
@@ -5982,8 +5982,8 @@ _0807DCAE:
bx r1
thumb_func_end sub_807DBE8
- thumb_func_start sub_807DCB4
-sub_807DCB4: @ 807DCB4
+ thumb_func_start unref_sub_807DCB4
+unref_sub_807DCB4: @ 807DCB4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -6051,7 +6051,7 @@ _0807DD40:
_0807DD46:
pop {r0}
bx r0
- thumb_func_end sub_807DCB4
+ thumb_func_end unref_sub_807DCB4
thumb_func_start weather_get_current
weather_get_current: @ 807DD4C
@@ -6177,8 +6177,8 @@ _0807DE1C: .4byte 0x0202f7e8
_0807DE20: .4byte 0x000006c6
thumb_func_end sub_807DE10
- thumb_func_start sub_807DE24
-sub_807DE24: @ 807DE24
+ thumb_func_start unref_sub_807DE24
+unref_sub_807DE24: @ 807DE24
ldr r0, _0807DE30
ldr r1, _0807DE34
adds r0, r1
@@ -6188,7 +6188,7 @@ sub_807DE24: @ 807DE24
.align 2, 0
_0807DE30: .4byte 0x0202f7e8
_0807DE34: .4byte 0x000006c6
- thumb_func_end sub_807DE24
+ thumb_func_end unref_sub_807DE24
thumb_func_start sub_807DE38
sub_807DE38: @ 807DE38
@@ -13485,7 +13485,7 @@ _0808163A:
lsrs r1, r4, 16
mov r0, sp
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x80
lsls r0, 9
adds r4, r0
@@ -15419,8 +15419,8 @@ sub_808257C: @ 808257C
bx r0
thumb_func_end sub_808257C
- thumb_func_start sub_8082590
-sub_8082590: @ 8082590
+ thumb_func_start unref_sub_8082590
+unref_sub_8082590: @ 8082590
push {lr}
bl trainerflag_opponent
lsls r0, 16
@@ -15428,7 +15428,7 @@ sub_8082590: @ 8082590
bl FlagSet
pop {r0}
bx r0
- thumb_func_end sub_8082590
+ thumb_func_end unref_sub_8082590
thumb_func_start trainer_flag_check
trainer_flag_check: @ 80825A4
@@ -15806,8 +15806,8 @@ _08082864: .4byte 0x0202ff68
_08082868: .4byte 0x020234cc
thumb_func_end sub_8082830
- thumb_func_start sub_808286C
-sub_808286C: @ 808286C
+ thumb_func_start unref_sub_808286C
+unref_sub_808286C: @ 808286C
push {lr}
ldr r0, _0808287C
ldr r0, [r0]
@@ -15816,7 +15816,7 @@ sub_808286C: @ 808286C
bx r1
.align 2, 0
_0808287C: .4byte 0x0202ff6c
- thumb_func_end sub_808286C
+ thumb_func_end unref_sub_808286C
thumb_func_start sub_8082880
sub_8082880: @ 8082880
@@ -16356,8 +16356,8 @@ sub_8082C0C: @ 8082C0C
_08082C28: .4byte gUnknown_0839AE70
thumb_func_end sub_8082C0C
- thumb_func_start sub_8082C2C
-sub_8082C2C: @ 8082C2C
+ thumb_func_start unref_sub_8082C2C
+unref_sub_8082C2C: @ 8082C2C
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -16372,7 +16372,7 @@ sub_8082C2C: @ 8082C2C
bx r1
.align 2, 0
_08082C48: .4byte gUnknown_0839AE70
- thumb_func_end sub_8082C2C
+ thumb_func_end unref_sub_8082C2C
thumb_func_start sub_8082C4C
sub_8082C4C: @ 8082C4C
@@ -16742,8 +16742,8 @@ _08082EE4: .4byte 0x03004b20
_08082EE8: .4byte sub_8083418
thumb_func_end sub_8082EB8
- thumb_func_start sub_8082EEC
-sub_8082EEC: @ 8082EEC
+ thumb_func_start unref_sub_8082EEC
+unref_sub_8082EEC: @ 8082EEC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -16769,7 +16769,7 @@ _08082F16:
bx r0
.align 2, 0
_08082F1C: .4byte 0x03004b20
- thumb_func_end sub_8082EEC
+ thumb_func_end unref_sub_8082EEC
thumb_func_start sub_8082F20
sub_8082F20: @ 8082F20
@@ -18347,8 +18347,8 @@ _08083BA8: .4byte 0x00002211
_08083BAC: .4byte sub_808382C
thumb_func_end sub_8083B90
- thumb_func_start sub_8083BB0
-sub_8083BB0: @ 8083BB0
+ thumb_func_start unref_sub_8083BB0
+unref_sub_8083BB0: @ 8083BB0
push {r4,lr}
ldr r4, _08083BD4
adds r0, r4, 0
@@ -18366,7 +18366,7 @@ sub_8083BB0: @ 8083BB0
.align 2, 0
_08083BD4: .4byte sub_80839DC
_08083BD8: .4byte sub_80B9484
- thumb_func_end sub_8083BB0
+ thumb_func_end unref_sub_8083BB0
thumb_func_start sub_8083BDC
sub_8083BDC: @ 8083BDC
@@ -18487,8 +18487,8 @@ _08083CBC:
_08083CC4: .4byte 0x03002fa4
thumb_func_end sub_8083CA4
- thumb_func_start sub_8083CC8
-sub_8083CC8: @ 8083CC8
+ thumb_func_start unref_sub_8083CC8
+unref_sub_8083CC8: @ 8083CC8
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -18507,10 +18507,10 @@ sub_8083CC8: @ 8083CC8
.align 2, 0
_08083CE8: .4byte 0x03004b20
_08083CEC: .4byte sub_8083CA4
- thumb_func_end sub_8083CC8
+ thumb_func_end unref_sub_8083CC8
- thumb_func_start sub_8083CF0
-sub_8083CF0: @ 8083CF0
+ thumb_func_start unref_sub_8083CF0
+unref_sub_8083CF0: @ 8083CF0
push {r4-r7,lr}
ldr r0, _08083D38
ldr r4, [r0]
@@ -18552,7 +18552,7 @@ _08083D3C: .4byte 0x03004da0
_08083D40: .4byte gUnknown_0839B24A
_08083D44: .4byte 0x03002910
_08083D48: .4byte gUnknown_0839B22C
- thumb_func_end sub_8083CF0
+ thumb_func_end unref_sub_8083CF0
thumb_func_start sub_8083D4C
sub_8083D4C: @ 8083D4C
@@ -18830,8 +18830,8 @@ _08083F66:
bx r1
thumb_func_end sub_8083F2C
- thumb_func_start sub_8083F6C
-sub_8083F6C: @ 8083F6C
+ thumb_func_start unref_sub_8083F6C
+unref_sub_8083F6C: @ 8083F6C
push {lr}
sub sp, 0x8
bl sub_8071EF4
@@ -18865,7 +18865,7 @@ sub_8083F6C: @ 8083F6C
_08083FB0: .4byte gUnknown_0839B2C0
_08083FB4: .4byte 0x03004ae8
_08083FB8: .4byte sub_8083F2C
- thumb_func_end sub_8083F6C
+ thumb_func_end unref_sub_8083F6C
thumb_func_start sub_8083FBC
sub_8083FBC: @ 8083FBC
@@ -20184,14 +20184,14 @@ _0808496E:
bx r0
thumb_func_end objc_exclamation_mark_probably
- thumb_func_start sub_8084978
-sub_8084978: @ 8084978
+ thumb_func_start unref_sub_8084978
+unref_sub_8084978: @ 8084978
ldr r1, _08084980
strb r0, [r1]
bx lr
.align 2, 0
_08084980: .4byte 0x0202ff7c
- thumb_func_end sub_8084978
+ thumb_func_end unref_sub_8084978
thumb_func_start sub_8084984
sub_8084984: @ 8084984
@@ -22498,7 +22498,7 @@ sub_8085A5C: @ 8085A5C
ldr r0, [r4]
adds r1, r5, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -27601,7 +27601,7 @@ sub_80881C0: @ 80881C0
ldr r0, _08088224
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
bl sub_808843C
ldrh r0, [r6, 0x8]
@@ -28019,7 +28019,7 @@ sub_80884E8: @ 80884E8
ldr r0, _08088550
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -32736,7 +32736,7 @@ _0808AA80: .4byte 0x03004b20
_0808AA84: .4byte sub_808AB34
_0808AA88:
adds r0, r5, 0
- bl sub_8133D28
+ bl unref_sub_8133D28
b _0808AADA
_0808AA90:
movs r0, 0x13
@@ -33122,8 +33122,8 @@ _0808AD80: .4byte sub_8089CD4
_0808AD84: .4byte sub_808AD0C
thumb_func_end sub_808AD58
- thumb_func_start sub_808AD88
-sub_808AD88: @ 808AD88
+ thumb_func_start unref_sub_808AD88
+unref_sub_808AD88: @ 808AD88
push {lr}
ldr r0, _0808ADA4
ldrb r1, [r0]
@@ -33140,7 +33140,7 @@ sub_808AD88: @ 808AD88
.align 2, 0
_0808ADA4: .4byte 0x03005ce0
_0808ADA8: .4byte 0x03004360
- thumb_func_end sub_808AD88
+ thumb_func_end unref_sub_808AD88
thumb_func_start sub_808ADAC
sub_808ADAC: @ 808ADAC
@@ -34218,8 +34218,8 @@ sub_808B628: @ 808B628
bx r0
thumb_func_end sub_808B628
- thumb_func_start sub_808B63C
-sub_808B63C: @ 808B63C
+ thumb_func_start CB2_InitOptionMenu
+CB2_InitOptionMenu: @ 808B63C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -34388,7 +34388,7 @@ _0808B7AC:
ldr r0, _0808B7C4
movs r1, 0x80
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0808B7C8
ldr r1, _0808B7CC
movs r2, 0x20
@@ -34607,7 +34607,7 @@ _0808B9B2:
bx r0
.align 2, 0
_0808B9C0: .4byte sub_808B610
- thumb_func_end sub_808B63C
+ thumb_func_end CB2_InitOptionMenu
thumb_func_start sub_808B9C4
sub_808B9C4: @ 808B9C4
@@ -36082,8 +36082,8 @@ _0808C538: .4byte 0x03007380
_0808C53C: .4byte 0x0000ffff
thumb_func_end sub_808C27C
- thumb_func_start InitMainMenu
-InitMainMenu: @ 808C540
+ thumb_func_start unref_sub_808C540
+unref_sub_808C540: @ 808C540
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0
@@ -36155,7 +36155,7 @@ _0808C5BE:
.align 2, 0
_0808C5E8: .4byte sub_808D198
_0808C5EC: .4byte 0x03004b20
- thumb_func_end InitMainMenu
+ thumb_func_end unref_sub_808C540
thumb_func_start sub_808C5F0
sub_808C5F0: @ 808C5F0
@@ -38117,7 +38117,7 @@ _0808D664:
_0808D66E:
movs r1, 0x1
movs r2, 0xBE
- bl gpu_pal_apply
+ bl LoadPalette
b _0808D686
.align 2, 0
_0808D678: .4byte gUnknown_08E87AF6
@@ -38125,7 +38125,7 @@ _0808D67C:
ldr r0, _0808D68C
movs r1, 0x1
movs r2, 0xBE
- bl gpu_pal_apply
+ bl LoadPalette
_0808D686:
pop {r0}
bx r0
@@ -41975,7 +41975,7 @@ _0808F50C:
ldr r0, _0808F528
movs r1, 0x31
movs r2, 0x1E
- bl gpu_pal_apply
+ bl LoadPalette
b _0808F67C
.align 2, 0
_0808F524: .4byte gUnknown_083A05F8
@@ -43310,7 +43310,7 @@ _08090056:
mov r0, sp
movs r1, 0x5D
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
add sp, 0x4
pop {r0}
bx r0
@@ -43523,7 +43523,7 @@ _080901D4:
adds r1, 0x10
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _08090270
ldr r2, _08090274
adds r1, r2
@@ -43596,7 +43596,7 @@ _08090278:
adds r1, 0x10
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _08090310
ldr r0, _08090314
adds r1, r0
@@ -44255,7 +44255,7 @@ _08090800:
ldr r0, _08090858
movs r1, 0x21
movs r2, 0x9E
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -44616,7 +44616,7 @@ _08090B44:
ldr r0, _08090B6C
movs r1, 0x51
movs r2, 0xE
- bl gpu_pal_apply
+ bl LoadPalette
b _08090B7A
.align 2, 0
_08090B68: .4byte 0x03004b20
@@ -44625,7 +44625,7 @@ _08090B70:
ldr r0, _08090B88
movs r1, 0x51
movs r2, 0xE
- bl gpu_pal_apply
+ bl LoadPalette
_08090B7A:
add sp, 0x4
pop {r3}
@@ -44694,7 +44694,7 @@ sub_8090B8C: @ 8090B8C
orrs r4, r1
adds r1, r4, 0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
adds r0, r6, 0
bl DestroyTask
_08090C0C:
@@ -45716,8 +45716,8 @@ _08091388:
bx r0
thumb_func_end sub_8091304
- thumb_func_start sub_80913A4
-sub_80913A4: @ 80913A4
+ thumb_func_start unref_sub_80913A4
+unref_sub_80913A4: @ 80913A4
push {r4-r7,lr}
sub sp, 0x8
lsls r0, 16
@@ -45803,7 +45803,7 @@ _08091402:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80913A4
+ thumb_func_end unref_sub_80913A4
thumb_func_start sub_8091458
sub_8091458: @ 8091458
@@ -46524,7 +46524,7 @@ _080919CE:
lsls r1, 16
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
mov r3, r8
lsls r1, r3, 24
lsrs r1, 24
@@ -47161,7 +47161,7 @@ _08091EA6:
ldr r0, _08091F34
movs r1, 0x1
movs r2, 0x7E
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_806912C
cmp r0, 0
bne _08091F10
@@ -49776,7 +49776,7 @@ _080933B6:
strb r0, [r5, 0x2]
bl sub_8090FC0
strb r0, [r5, 0x3]
- bl sub_80948C4
+ bl GetPokedexSeenCount
strh r0, [r5, 0xC]
ldrb r1, [r6, 0xB]
lsls r1, 8
@@ -51188,7 +51188,7 @@ sub_8093E28: @ 8093E28
ldr r0, _08093E84
movs r1, 0xE0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r3, _08093E88
movs r4, 0xC0
lsls r4, 19
@@ -51248,15 +51248,15 @@ sub_8093EA0: @ 8093EA0
ldr r0, [r0]
movs r1, 0
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08093EEC
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08093EF0
movs r1, 0x40
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r4, 0x64
ldrb r0, [r4]
cmp r0, 0
@@ -51264,7 +51264,7 @@ sub_8093EA0: @ 8093EA0
ldr r0, _08093EF4
movs r1, 0x10
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_08093EDC:
pop {r4}
pop {r0}
@@ -51743,7 +51743,7 @@ _08094272:
asrs r3, 16
mov r0, sp
adds r1, r4, 0
- bl sub_80948E4
+ bl FormatPlayTime
adds r0, r5, 0
mov r1, sp
movs r2, 0x30
@@ -52152,8 +52152,8 @@ _0809457E:
_08094584: .4byte 0x02000000
thumb_func_end sub_8094558
- thumb_func_start sub_8094588
-sub_8094588: @ 8094588
+ thumb_func_start unref_sub_8094588
+unref_sub_8094588: @ 8094588
push {r4,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -52179,7 +52179,7 @@ _0809459E:
_080945B4: .4byte gUnknown_0842C979
_080945B8: .4byte 0x02024ea4
_080945BC: .4byte gUnknown_0842C97D
- thumb_func_end sub_8094588
+ thumb_func_end unref_sub_8094588
thumb_func_start sub_80945C0
sub_80945C0: @ 80945C0
@@ -52447,7 +52447,7 @@ sub_80947B0: @ 80947B0
lsrs r5, 24
adds r2, r5, 0
bl Print
- bl sub_8094890
+ bl GetBadgeCount
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -52483,7 +52483,7 @@ sub_80947F8: @ 80947F8
lsrs r5, 24
adds r2, r5, 0
bl Print
- bl sub_80948C4
+ bl GetPokedexSeenCount
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -52526,7 +52526,7 @@ sub_8094844: @ 8094844
ldrb r2, [r0, 0x10]
mov r0, sp
movs r3, 0x1
- bl sub_80948E4
+ bl FormatPlayTime
adds r4, 0xC
lsls r4, 24
lsrs r4, 24
@@ -52543,8 +52543,8 @@ _08094888: .4byte gUnknown_0842C99A
_0809488C: .4byte 0x02024ea4
thumb_func_end sub_8094844
- thumb_func_start sub_8094890
-sub_8094890: @ 8094890
+ thumb_func_start GetBadgeCount
+GetBadgeCount: @ 8094890
push {r4,r5,lr}
movs r5, 0
ldr r4, _080948BC
@@ -52570,10 +52570,10 @@ _080948AA:
.align 2, 0
_080948BC: .4byte 0x00000807
_080948C0: .4byte 0x0000080e
- thumb_func_end sub_8094890
+ thumb_func_end GetBadgeCount
- thumb_func_start sub_80948C4
-sub_80948C4: @ 80948C4
+ thumb_func_start GetPokedexSeenCount
+GetPokedexSeenCount: @ 80948C4
push {lr}
bl sub_806912C
cmp r0, 0
@@ -52589,10 +52589,10 @@ _080948DC:
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_80948C4
+ thumb_func_end GetPokedexSeenCount
- thumb_func_start sub_80948E4
-sub_80948E4: @ 80948E4
+ thumb_func_start FormatPlayTime
+FormatPlayTime: @ 80948E4
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r3, 0
@@ -52627,10 +52627,10 @@ _08094910:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80948E4
+ thumb_func_end FormatPlayTime
- thumb_func_start sub_8094928
-sub_8094928: @ 8094928
+ thumb_func_start unref_sub_8094928
+unref_sub_8094928: @ 8094928
push {lr}
ldr r1, _08094938
ldr r2, _0809493C
@@ -52640,10 +52640,10 @@ sub_8094928: @ 8094928
.align 2, 0
_08094938: .4byte 0x020300a0
_0809493C: .4byte 0x000083d0
- thumb_func_end sub_8094928
+ thumb_func_end unref_sub_8094928
- thumb_func_start sub_8094940
-sub_8094940: @ 8094940
+ thumb_func_start unref_sub_8094940
+unref_sub_8094940: @ 8094940
push {lr}
adds r1, r0, 0
ldr r0, _08094950
@@ -52654,7 +52654,7 @@ sub_8094940: @ 8094940
.align 2, 0
_08094950: .4byte 0x020300a0
_08094954: .4byte 0x000083d0
- thumb_func_end sub_8094940
+ thumb_func_end unref_sub_8094940
thumb_func_start sub_8094958
sub_8094958: @ 8094958
@@ -53257,8 +53257,8 @@ _08094DA8: .4byte 0xfffffda8
_08094DAC: .4byte 0x03004360
thumb_func_end sub_8094D60
- thumb_func_start sub_8094DB0
-sub_8094DB0: @ 8094DB0
+ thumb_func_start unref_sub_8094DB0
+unref_sub_8094DB0: @ 8094DB0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -53312,7 +53312,7 @@ _08094E16:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8094DB0
+ thumb_func_end unref_sub_8094DB0
thumb_func_start sub_8094E20
sub_8094E20: @ 8094E20
@@ -54766,8 +54766,8 @@ _08095A40: .4byte gFont3LatinGlyphs
_08095A44: .4byte 0x0000fff0
thumb_func_end sub_8095904
- thumb_func_start sub_8095A48
-sub_8095A48: @ 8095A48
+ thumb_func_start unref_sub_8095A48
+unref_sub_8095A48: @ 8095A48
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -54845,7 +54845,7 @@ _08095ACE:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8095A48
+ thumb_func_end unref_sub_8095A48
thumb_func_start sub_8095ADC
sub_8095ADC: @ 8095ADC
@@ -55062,8 +55062,8 @@ _08095C46:
_08095C5C: .4byte 0x03004360
thumb_func_end sub_8095C28
- thumb_func_start sub_8095C60
-sub_8095C60: @ 8095C60
+ thumb_func_start unref_sub_8095C60
+unref_sub_8095C60: @ 8095C60
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r2, 16
@@ -55086,7 +55086,7 @@ _08095C7E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8095C60
+ thumb_func_end unref_sub_8095C60
thumb_func_start sub_8095C8C
sub_8095C8C: @ 8095C8C
@@ -55155,8 +55155,8 @@ _08095CFC:
bx r0
thumb_func_end sub_8095C8C
- thumb_func_start sub_8095D08
-sub_8095D08: @ 8095D08
+ thumb_func_start unref_sub_8095D08
+unref_sub_8095D08: @ 8095D08
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -55256,7 +55256,7 @@ _08095DB2:
.align 2, 0
_08095DC4: .4byte 0x040000d4
_08095DC8: .4byte 0x81000800
- thumb_func_end sub_8095D08
+ thumb_func_end unref_sub_8095D08
thumb_func_start sub_8095DCC
sub_8095DCC: @ 8095DCC
@@ -59186,7 +59186,7 @@ sub_8097DE0: @ 8097DE0
ldr r0, _08097E40
movs r1, 0xD0
movs r2, 0x10
- bl gpu_pal_apply
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -59254,48 +59254,48 @@ sub_8097E70: @ 8097E70
ldr r0, _08097F40
movs r1, 0x10
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08097F44
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08097F48
movs r1, 0xB0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08097F4C
movs r1, 0xC0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r4, _08097F50
adds r0, r4, 0
movs r1, 0xF1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xF2
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0x8
movs r1, 0xF3
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0x16
movs r1, 0xF4
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0x12
movs r1, 0xF6
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r4, 0x2
adds r0, r4, 0
movs r1, 0xFF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08097F54
bl LoadSpritePalette
bl sub_80980D4
@@ -59702,7 +59702,7 @@ sub_80981F0: @ 80981F0
ldrh r1, [r0]
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, r8
ldr r1, [r0]
adds r1, 0x3E
@@ -59915,11 +59915,11 @@ sub_8098400: @ 8098400
ldr r0, _08098494
movs r1, 0x20
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08098498
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r4, _0809849C
add r1, sp, 0x10
movs r0, 0
@@ -63392,7 +63392,7 @@ _08099ED8:
adds r1, r3
lsrs r1, 16
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, [r4, 0x8]
ldr r1, _08099F50
adds r5, r1
@@ -64102,7 +64102,7 @@ _0809A478:
adds r0, r1
mov r1, r8
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r5, 0
bl sub_8072CA4
lsls r0, 24
@@ -69109,8 +69109,8 @@ sub_809CB74: @ 809CB74
_0809CB90: .4byte gUnknown_083B6DB4
thumb_func_end sub_809CB74
- thumb_func_start sub_809CB94
-sub_809CB94: @ 809CB94
+ thumb_func_start unref_sub_809CB94
+unref_sub_809CB94: @ 809CB94
push {r4,lr}
adds r4, r0, 0
ldr r0, _0809CBBC
@@ -69163,7 +69163,7 @@ _0809CBF6:
.align 2, 0
_0809CBFC: .4byte 0x020300a0
_0809CC00: .4byte 0x020384e5
- thumb_func_end sub_809CB94
+ thumb_func_end unref_sub_809CB94
thumb_func_start sub_809CC04
sub_809CC04: @ 809CC04
@@ -70007,8 +70007,8 @@ _0809D264: .4byte 0x040000d4
_0809D268: .4byte 0x81000800
thumb_func_end sub_809D1C4
- thumb_func_start sub_809D26C
-sub_809D26C: @ 809D26C
+ thumb_func_start unref_sub_809D26C
+unref_sub_809D26C: @ 809D26C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -70072,7 +70072,7 @@ _0809D2EC: .4byte gUnknown_083BC660
_0809D2F0: .4byte gMonIconPaletteIndices
_0809D2F4: .4byte 0x0000dac0
_0809D2F8: .4byte 0x02020004
- thumb_func_end sub_809D26C
+ thumb_func_end unref_sub_809D26C
thumb_func_start sub_809D2FC
sub_809D2FC: @ 809D2FC
@@ -70377,8 +70377,8 @@ _0809D522:
_0809D53C: .4byte gMonIconPaletteTable
thumb_func_end sub_809D51C
- thumb_func_start sub_809D540
-sub_809D540: @ 809D540
+ thumb_func_start unref_sub_809D540
+unref_sub_809D540: @ 809D540
push {r4,lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -70410,7 +70410,7 @@ _0809D572:
.align 2, 0
_0809D578: .4byte gMonIconPaletteIndices
_0809D57C: .4byte gMonIconPaletteTable
- thumb_func_end sub_809D540
+ thumb_func_end unref_sub_809D540
thumb_func_start sub_809D580
sub_809D580: @ 809D580
@@ -70440,8 +70440,8 @@ _0809D5AC: .4byte gMonIconPaletteIndices
_0809D5B0: .4byte gMonIconPaletteTable
thumb_func_end sub_809D580
- thumb_func_start sub_809D5B4
-sub_809D5B4: @ 809D5B4
+ thumb_func_start unref_sub_809D5B4
+unref_sub_809D5B4: @ 809D5B4
push {r4,r5,lr}
movs r4, 0
ldr r5, _0809D5D4
@@ -70460,10 +70460,10 @@ _0809D5BA:
bx r0
.align 2, 0
_0809D5D4: .4byte gMonIconPaletteTable
- thumb_func_end sub_809D5B4
+ thumb_func_end unref_sub_809D5B4
- thumb_func_start sub_809D5D8
-sub_809D5D8: @ 809D5D8
+ thumb_func_start unref_sub_809D5D8
+unref_sub_809D5D8: @ 809D5D8
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -70487,7 +70487,7 @@ _0809D5EA:
.align 2, 0
_0809D600: .4byte gMonIconPaletteIndices
_0809D604: .4byte gMonIconPaletteTable
- thumb_func_end sub_809D5D8
+ thumb_func_end unref_sub_809D5D8
thumb_func_start sub_809D608
sub_809D608: @ 809D608
@@ -71672,7 +71672,7 @@ _0809DFC4:
ldr r0, _0809DFD0
movs r1, 0
movs r2, 0xA0
- bl decompress_palette
+ bl LoadCompressedPalette
b _0809E030
.align 2, 0
_0809DFD0: .4byte gUnknown_08E73468
@@ -71711,7 +71711,7 @@ _0809E010:
movs r1, 0xE8
lsls r1, 1
movs r2, 0x60
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r0, _0809E02C
adds r0, 0x74
movs r1, 0
@@ -71742,71 +71742,71 @@ sub_809E044: @ 809E044
adds r0, r4, 0
movs r1, 0x81
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r5, r4, 0x2
adds r0, r5, 0
movs r1, 0x88
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x8F
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r5, 0
movs r1, 0x89
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
subs r5, 0x12
adds r0, r5, 0
movs r1, 0xD1
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
subs r0, 0x8
movs r1, 0xD3
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xD5
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r5, 0
movs r1, 0xD7
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
subs r0, 0x14
movs r1, 0xD9
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
subs r0, 0xC
movs r1, 0xDB
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
subs r0, 0x18
movs r1, 0xDD
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
subs r5, 0x6
adds r0, r5, 0
movs r1, 0xDE
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
subs r4, 0x1A
adds r0, r4, 0
movs r1, 0xDF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0809E0F8
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r5, 0
movs r1, 0xF9
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -75098,7 +75098,7 @@ sub_809FA94: @ 809FA94
ldr r0, _0809FAB0
movs r1, 0x4
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x1
b _0809FAC0
.align 2, 0
@@ -75107,7 +75107,7 @@ _0809FAB4:
ldr r0, _0809FAC4
movs r1, 0x4
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0
_0809FAC0:
pop {r1}
@@ -75152,7 +75152,7 @@ sub_809FAC8: @ 809FAC8
ldr r0, _0809FB24
movs r1, 0x4
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
b _0809FBD6
.align 2, 0
_0809FB20: .4byte 0x020231cc
@@ -81661,11 +81661,11 @@ _080A2DEA:
bx r1
thumb_func_end sub_80A2D88
- thumb_func_start sub_80A2DF4
-sub_80A2DF4: @ 80A2DF4
+ thumb_func_start unref_sub_80A2DF4
+unref_sub_80A2DF4: @ 80A2DF4
movs r0, 0
bx lr
- thumb_func_end sub_80A2DF4
+ thumb_func_end unref_sub_80A2DF4
thumb_func_start sub_80A2DF8
sub_80A2DF8: @ 80A2DF8
@@ -81714,8 +81714,8 @@ _080A2E50: .4byte 0x02025734
_080A2E54: .4byte 0x00002b6c
thumb_func_end sub_80A2DF8
- thumb_func_start sub_80A2E58
-sub_80A2E58: @ 80A2E58
+ thumb_func_start unref_sub_80A2E58
+unref_sub_80A2E58: @ 80A2E58
lsls r0, 24
lsrs r0, 24
ldr r2, _080A2E70
@@ -81731,7 +81731,7 @@ sub_80A2E58: @ 80A2E58
.align 2, 0
_080A2E70: .4byte 0x02025734
_080A2E74: .4byte 0x00002b6c
- thumb_func_end sub_80A2E58
+ thumb_func_end unref_sub_80A2E58
thumb_func_start sub_80A2E78
sub_80A2E78: @ 80A2E78
@@ -81840,15 +81840,15 @@ _080A2F40:
bx r1
thumb_func_end itemid_is_mail
- thumb_func_start sub_80A2F44
-sub_80A2F44: @ 80A2F44
+ thumb_func_start unref_sub_80A2F44
+unref_sub_80A2F44: @ 80A2F44
push {lr}
bl sub_8071C20
bl AddMapNamePopUpWindowTask
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_80A2F44
+ thumb_func_end unref_sub_80A2F44
thumb_func_start AddMapNamePopUpWindowTask
AddMapNamePopUpWindowTask: @ 80A2F54
@@ -82580,7 +82580,7 @@ _080A3598:
ldr r0, _080A35AC
movs r1, 0
movs r2, 0x40
- bl decompress_palette
+ bl LoadCompressedPalette
b _080A35EA
.align 2, 0
_080A35A4: .4byte 0x02024ea4
@@ -82590,7 +82590,7 @@ _080A35B0:
ldr r0, _080A35BC
movs r1, 0
movs r2, 0x40
- bl decompress_palette
+ bl LoadCompressedPalette
b _080A35EA
.align 2, 0
_080A35BC: .4byte gUnknown_08E76FCC
@@ -82818,11 +82818,11 @@ sub_80A3740: @ 80A3740
adds r0, 0x2
movs r1, 0xD1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, sp
movs r1, 0xD8
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
add sp, 0x4
pop {r0}
bx r0
@@ -94549,8 +94549,8 @@ _080A9258:
bx r0
thumb_func_end itemid_copy_name
- thumb_func_start sub_80A9260
-sub_80A9260: @ 80A9260
+ thumb_func_start unref_sub_80A9260
+unref_sub_80A9260: @ 80A9260
push {lr}
lsls r0, 24
movs r2, 0
@@ -94584,7 +94584,7 @@ _080A9292:
_080A9296:
pop {r1}
bx r1
- thumb_func_end sub_80A9260
+ thumb_func_end unref_sub_80A9260
thumb_func_start IsBagPocketNonEmpty
IsBagPocketNonEmpty: @ 80A929C
@@ -95818,8 +95818,8 @@ itemid_get_x28: @ 80A9B04
_080A9B24: .4byte gItems
thumb_func_end itemid_get_x28
- thumb_func_start sub_80A9B28
-sub_80A9B28: @ 80A9B28
+ thumb_func_start unref_sub_80A9B28
+unref_sub_80A9B28: @ 80A9B28
push {lr}
sub sp, 0x8
bl sub_8071EF4
@@ -95853,7 +95853,7 @@ sub_80A9B28: @ 80A9B28
_080A9B6C: .4byte gUnknown_083C91F0
_080A9B70: .4byte 0x03004ae8
_080A9B74: .4byte sub_80A9B78
- thumb_func_end sub_80A9B28
+ thumb_func_end unref_sub_80A9B28
thumb_func_start sub_80A9B78
sub_80A9B78: @ 80A9B78
@@ -98335,8 +98335,8 @@ _080AAEE0: .4byte 0xfffffc00
_080AAEE4: .4byte 0xfffffe00
thumb_func_end sub_80AAD84
- thumb_func_start sub_80AAEE8
-sub_80AAEE8: @ 80AAEE8
+ thumb_func_start unref_sub_80AAEE8
+unref_sub_80AAEE8: @ 80AAEE8
push {r4-r7,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -98372,7 +98372,7 @@ _080AAF12:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80AAEE8
+ thumb_func_end unref_sub_80AAEE8
thumb_func_start sub_80AAF30
sub_80AAF30: @ 80AAF30
@@ -98544,8 +98544,8 @@ _080AB07C: .4byte 0x02038690
_080AB080: .4byte 0x0203869c
thumb_func_end sub_80AB02C
- thumb_func_start sub_80AB084
-sub_80AB084: @ 80AB084
+ thumb_func_start unref_sub_80AB084
+unref_sub_80AB084: @ 80AB084
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -98660,7 +98660,7 @@ _080AB174: .4byte 0x040000d4
_080AB178: .4byte 0x85000400
_080AB17C: .4byte gWindowConfig_81E6FD8
_080AB180: .4byte 0x03004210
- thumb_func_end sub_80AB084
+ thumb_func_end unref_sub_80AB084
thumb_func_start sub_80AB184
sub_80AB184: @ 80AB184
@@ -98823,7 +98823,7 @@ sub_80AB2AC: @ 80AB2AC
movs r2, 0x80
lsls r2, 2
movs r1, 0
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_80AB350
movs r4, 0
movs r5, 0xA0
@@ -98836,7 +98836,7 @@ _080AB2DC:
adds r1, 0x5
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r5, 0x20
adds r4, 0x1
cmp r4, 0x3
@@ -98885,14 +98885,14 @@ sub_80AB350: @ 80AB350
movs r0, 0
movs r1, 0
movs r2, 0x2
- bl rboxid_80040B8
+ bl FillPalette
movs r4, 0xA
_080AB364:
adds r1, r4, 0
adds r1, 0xF0
ldr r0, _080AB390
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -98901,7 +98901,7 @@ _080AB364:
ldr r0, _080AB394
movs r1, 0xF3
movs r2, 0x2
- bl rboxid_80040B8
+ bl FillPalette
pop {r4}
pop {r0}
bx r0
@@ -99484,7 +99484,7 @@ _080AB844:
movs r2, 0x80
lsls r2, 2
movs r1, 0
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r5, _080AB8B0
ldr r6, _080AB8B4
adds r0, r5, 0
@@ -100601,7 +100601,7 @@ sub_80AC188: @ 80AC188
ldr r1, _080AC1F8
adds r0, r1
movs r1, 0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _080AC1FC
lsls r0, r5, 2
adds r0, r5
@@ -101234,7 +101234,7 @@ _080AC77C:
bl _080AD8CA
_080AC790:
adds r0, r7, 0
- bl sub_80B28CC
+ bl unref_sub_80B28CC
ldr r1, _080AC7C0
adds r0, r1, 0
adds r0, 0x5A
@@ -101270,7 +101270,7 @@ _080AC7C8:
adds r0, r7, 0
bl sub_80B03A8
_080AC7E2:
- bl sub_80B20C4
+ bl unref_sub_80B20C4
ldr r0, _080AC7F0
mov r2, r8
lsls r1, r2, 2
@@ -105365,7 +105365,7 @@ sub_80AE858: @ 80AE858
movs r1, 0x88
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r0, _080AE8A8
movs r1, 0x70
movs r2, 0x24
@@ -105439,8 +105439,8 @@ _080AE900: .4byte gUnknown_083CA4D4
_080AE904: .4byte 0x02020004
thumb_func_end sub_80AE8B4
- thumb_func_start sub_80AE908
-sub_80AE908: @ 80AE908
+ thumb_func_start unref_sub_80AE908
+unref_sub_80AE908: @ 80AE908
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -105477,7 +105477,7 @@ sub_80AE908: @ 80AE908
movs r1, 0x88
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
mov r1, r8
ldrb r0, [r1]
lsls r0, 6
@@ -105549,7 +105549,7 @@ _080AE9EC: .4byte 0x02024e8c
_080AE9F0: .4byte 0x02020004
_080AE9F4: .4byte SpriteCallbackDummy
_080AE9F8: .4byte gUnknown_081E7C18
- thumb_func_end sub_80AE908
+ thumb_func_end unref_sub_80AE908
thumb_func_start sub_80AE9FC
sub_80AE9FC: @ 80AE9FC
@@ -105588,7 +105588,7 @@ sub_80AE9FC: @ 80AE9FC
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0
bl gpu_pal_obj_decompress_and_apply
@@ -106073,8 +106073,8 @@ _080AEE18: .4byte 0x0600c068
_080AEE1C: .4byte 0x0600c06a
thumb_func_end sub_80AED7C
- thumb_func_start sub_80AEE20
-sub_80AEE20: @ 80AEE20
+ thumb_func_start unref_sub_80AEE20
+unref_sub_80AEE20: @ 80AEE20
push {r4,lr}
movs r4, 0
_080AEE24:
@@ -106096,7 +106096,7 @@ _080AEE24:
bx r0
.align 2, 0
_080AEE48: .4byte 0x02019260
- thumb_func_end sub_80AEE20
+ thumb_func_end unref_sub_80AEE20
thumb_func_start sub_80AEE4C
sub_80AEE4C: @ 80AEE4C
@@ -106671,8 +106671,8 @@ _080AF278: .4byte 0x03004210
_080AF27C: .4byte gUnknown_083CA318
thumb_func_end sub_80AF1E4
- thumb_func_start sub_80AF280
-sub_80AF280: @ 80AF280
+ thumb_func_start unref_sub_80AF280
+unref_sub_80AF280: @ 80AF280
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -106689,7 +106689,7 @@ _080AF288:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80AF280
+ thumb_func_end unref_sub_80AF280
thumb_func_start sub_80AF2A0
sub_80AF2A0: @ 80AF2A0
@@ -106724,8 +106724,8 @@ _080AF2D8: .4byte 0x03004210
_080AF2DC: .4byte gUnknown_083CA318
thumb_func_end sub_80AF2A0
- thumb_func_start sub_80AF2E0
-sub_80AF2E0: @ 80AF2E0
+ thumb_func_start unref_sub_80AF2E0
+unref_sub_80AF2E0: @ 80AF2E0
push {r4,lr}
movs r4, 0
_080AF2E4:
@@ -106739,7 +106739,7 @@ _080AF2E4:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80AF2E0
+ thumb_func_end unref_sub_80AF2E0
thumb_func_start sub_80AF2FC
sub_80AF2FC: @ 80AF2FC
@@ -107137,8 +107137,8 @@ _080AF5CA:
bx r1
thumb_func_end sub_80AF59C
- thumb_func_start sub_80AF5D0
-sub_80AF5D0: @ 80AF5D0
+ thumb_func_start unref_sub_80AF5D0
+unref_sub_80AF5D0: @ 80AF5D0
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -107194,7 +107194,7 @@ _080AF626:
bx r1
.align 2, 0
_080AF62C: .4byte 0x02019204
- thumb_func_end sub_80AF5D0
+ thumb_func_end unref_sub_80AF5D0
thumb_func_start sub_80AF630
sub_80AF630: @ 80AF630
@@ -107524,8 +107524,8 @@ _080AF894: .4byte 0x0202e908
_080AF898: .4byte gUnknown_083CC361
thumb_func_end sub_80AF860
- thumb_func_start sub_80AF89C
-sub_80AF89C: @ 80AF89C
+ thumb_func_start unref_sub_80AF89C
+unref_sub_80AF89C: @ 80AF89C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -107608,7 +107608,7 @@ _080AF932:
_080AF940: .4byte 0x02019338
_080AF944: .4byte sub_80AF94C
_080AF948: .4byte 0x03004b20
- thumb_func_end sub_80AF89C
+ thumb_func_end unref_sub_80AF89C
thumb_func_start sub_80AF94C
sub_80AF94C: @ 80AF94C
@@ -107793,8 +107793,8 @@ _080AFAB0: .4byte 0x040000d4
_080AFAB4: .4byte 0x81000008
thumb_func_end sub_80AFA5C
- thumb_func_start sub_80AFAB8
-sub_80AFAB8: @ 80AFAB8
+ thumb_func_start unref_sub_80AFAB8
+unref_sub_80AFAB8: @ 80AFAB8
push {r4-r6,lr}
sub sp, 0x14
lsls r1, 24
@@ -107859,7 +107859,7 @@ _080AFB0A:
_080AFB34: .4byte 0x0600c128
_080AFB38: .4byte 0x040000d4
_080AFB3C: .4byte 0x80000009
- thumb_func_end sub_80AFAB8
+ thumb_func_end unref_sub_80AFAB8
thumb_func_start sub_80AFB40
sub_80AFB40: @ 80AFB40
@@ -108639,8 +108639,8 @@ nullsub_18: @ 80B0118
bx lr
thumb_func_end nullsub_18
- thumb_func_start sub_80B011C
-sub_80B011C: @ 80B011C
+ thumb_func_start unref_sub_80B011C
+unref_sub_80B011C: @ 80B011C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -108709,10 +108709,10 @@ _080B01A0: .4byte gUnknown_083CA330
_080B01A4: .4byte 0x02020004
_080B01A8: .4byte 0x0201920d
_080B01AC: .4byte gUnknown_083CC454
- thumb_func_end sub_80B011C
+ thumb_func_end unref_sub_80B011C
- thumb_func_start sub_80B01B0
-sub_80B01B0: @ 80B01B0
+ thumb_func_start unref_sub_80B01B0
+unref_sub_80B01B0: @ 80B01B0
push {r4,r5,lr}
movs r2, 0
ldr r5, _080B01D4
@@ -108736,10 +108736,10 @@ _080B01BA:
_080B01D4: .4byte 0x0201920d
_080B01D8: .4byte 0x02020020
_080B01DC: .4byte ObjectCB_SwitchPocketRotatingBallInit
- thumb_func_end sub_80B01B0
+ thumb_func_end unref_sub_80B01B0
- thumb_func_start sub_80B01E0
-sub_80B01E0: @ 80B01E0
+ thumb_func_start unref_sub_80B01E0
+unref_sub_80B01E0: @ 80B01E0
push {r4,r5,lr}
movs r3, 0
ldr r2, _080B0224
@@ -108785,7 +108785,7 @@ _080B0232:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80B01E0
+ thumb_func_end unref_sub_80B01E0
thumb_func_start ObjectCB_SwitchPocketRotatingBallInit
ObjectCB_SwitchPocketRotatingBallInit: @ 80B0238
@@ -109420,8 +109420,8 @@ _080B06C2:
_080B06DC: .4byte 0x03004b20
thumb_func_end sub_80B05FC
- thumb_func_start sub_80B06E0
-sub_80B06E0: @ 80B06E0
+ thumb_func_start unref_sub_80B06E0
+unref_sub_80B06E0: @ 80B06E0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -109473,7 +109473,7 @@ _080B0726:
_080B073C: .4byte sub_80B0748
_080B0740: .4byte 0x03004b28
_080B0744: .4byte 0x02019338
- thumb_func_end sub_80B06E0
+ thumb_func_end unref_sub_80B06E0
thumb_func_start sub_80B0748
sub_80B0748: @ 80B0748
@@ -109777,8 +109777,8 @@ _080B0980:
_080B0990: .4byte 0x02019338
thumb_func_end sub_80B0748
- thumb_func_start sub_80B0994
-sub_80B0994: @ 80B0994
+ thumb_func_start unref_sub_80B0994
+unref_sub_80B0994: @ 80B0994
push {lr}
lsls r0, 24
cmp r0, 0
@@ -109793,7 +109793,7 @@ _080B09A6:
bx r0
.align 2, 0
_080B09AC: .4byte 0x02019204
- thumb_func_end sub_80B0994
+ thumb_func_end unref_sub_80B0994
thumb_func_start sub_80B09B0
sub_80B09B0: @ 80B09B0
@@ -110216,8 +110216,8 @@ sub_80B0CDC: @ 80B0CDC
_080B0CF0: .4byte 0x02019338
thumb_func_end sub_80B0CDC
- thumb_func_start sub_80B0CF4
-sub_80B0CF4: @ 80B0CF4
+ thumb_func_start unref_sub_80B0CF4
+unref_sub_80B0CF4: @ 80B0CF4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -110282,7 +110282,7 @@ _080B0D70:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80B0CF4
+ thumb_func_end unref_sub_80B0CF4
thumb_func_start sub_80B0D7C
sub_80B0D7C: @ 80B0D7C
@@ -110466,8 +110466,8 @@ _080B0EE0: .4byte 0x02019260
_080B0EE4: .4byte 0x02038696
thumb_func_end sub_80B0D7C
- thumb_func_start sub_80B0EE8
-sub_80B0EE8: @ 80B0EE8
+ thumb_func_start unref_sub_80B0EE8
+unref_sub_80B0EE8: @ 80B0EE8
push {r4-r7,lr}
adds r7, r0, 0
movs r4, 0
@@ -110504,7 +110504,7 @@ _080B0F20:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80B0EE8
+ thumb_func_end unref_sub_80B0EE8
thumb_func_start sub_80B0F28
sub_80B0F28: @ 80B0F28
@@ -110785,7 +110785,7 @@ _080B111E:
adds r1, 0x5
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r5, 0x20
adds r4, 0x1
cmp r4, 0x3
@@ -111886,8 +111886,8 @@ _080B19C8: .4byte 0x04000008
_080B19CC: .4byte gUnknown_08E6978C
thumb_func_end sub_80B1928
- thumb_func_start sub_80B19D0
-sub_80B19D0: @ 80B19D0
+ thumb_func_start unref_sub_80B19D0
+unref_sub_80B19D0: @ 80B19D0
push {lr}
sub sp, 0x18
ldr r1, _080B19F4
@@ -111907,7 +111907,7 @@ sub_80B19D0: @ 80B19D0
.align 2, 0
_080B19F4: .4byte gUnknown_083CC2EC
_080B19F8: .4byte 0x03004210
- thumb_func_end sub_80B19D0
+ thumb_func_end unref_sub_80B19D0
thumb_func_start sub_80B19FC
sub_80B19FC: @ 80B19FC
@@ -112379,8 +112379,8 @@ _080B1D78:
_080B1D80: .4byte 0x02019204
thumb_func_end sub_80B1CFC
- thumb_func_start sub_80B1D84
-sub_80B1D84: @ 80B1D84
+ thumb_func_start unref_sub_80B1D84
+unref_sub_80B1D84: @ 80B1D84
ldr r3, _080B1DB0
ldr r2, _080B1DB4
adds r2, 0x58
@@ -112406,10 +112406,10 @@ sub_80B1D84: @ 80B1D84
.align 2, 0
_080B1DB0: .4byte 0x02020004
_080B1DB4: .4byte 0x02019204
- thumb_func_end sub_80B1D84
+ thumb_func_end unref_sub_80B1D84
- thumb_func_start sub_80B1DB8
-sub_80B1DB8: @ 80B1DB8
+ thumb_func_start unref_sub_80B1DB8
+unref_sub_80B1DB8: @ 80B1DB8
ldr r2, _080B1DD4
ldr r0, _080B1DD8
adds r0, 0x58
@@ -112427,7 +112427,7 @@ sub_80B1DB8: @ 80B1DB8
.align 2, 0
_080B1DD4: .4byte 0x02020004
_080B1DD8: .4byte 0x02019204
- thumb_func_end sub_80B1DB8
+ thumb_func_end unref_sub_80B1DB8
thumb_func_start sub_80B1DDC
sub_80B1DDC: @ 80B1DDC
@@ -112807,8 +112807,8 @@ _080B20BA:
_080B20C0: .4byte gUnknown_08E69578
thumb_func_end sub_80B208C
- thumb_func_start sub_80B20C4
-sub_80B20C4: @ 80B20C4
+ thumb_func_start unref_sub_80B20C4
+unref_sub_80B20C4: @ 80B20C4
push {r4-r7,lr}
movs r6, 0
ldr r7, _080B2134
@@ -112870,7 +112870,7 @@ _080B213C: .4byte 0x0600c028
_080B2140: .4byte 0x0600c02a
_080B2144: .4byte 0x0600c068
_080B2148: .4byte 0x0600c06a
- thumb_func_end sub_80B20C4
+ thumb_func_end unref_sub_80B20C4
thumb_func_start sub_80B214C
sub_80B214C: @ 80B214C
@@ -113846,8 +113846,8 @@ _080B28BE:
_080B28C8: .4byte 0x0202f7c4
thumb_func_end sub_80B2790
- thumb_func_start sub_80B28CC
-sub_80B28CC: @ 80B28CC
+ thumb_func_start unref_sub_80B28CC
+unref_sub_80B28CC: @ 80B28CC
push {r4,lr}
ldr r4, _080B28EC
adds r0, r4, 0
@@ -113866,7 +113866,7 @@ _080B28E6:
bx r0
.align 2, 0
_080B28EC: .4byte 0x02019348
- thumb_func_end sub_80B28CC
+ thumb_func_end unref_sub_80B28CC
thumb_func_start sub_80B28F0
sub_80B28F0: @ 80B28F0
@@ -114815,8 +114815,8 @@ sub_80B3068: @ 80B3068
bx r0
thumb_func_end sub_80B3068
- thumb_func_start sub_80B3078
-sub_80B3078: @ 80B3078
+ thumb_func_start unref_sub_80B3078
+unref_sub_80B3078: @ 80B3078
lsls r0, 24
lsrs r0, 24
ldr r2, _080B308C
@@ -114830,7 +114830,7 @@ sub_80B3078: @ 80B3078
.align 2, 0
_080B308C: .4byte 0x03004b20
_080B3090: .4byte Task_ExitSellMenu
- thumb_func_end sub_80B3078
+ thumb_func_end unref_sub_80B3078
thumb_func_start sub_80B3094
sub_80B3094: @ 80B3094
@@ -114933,7 +114933,7 @@ BuyMenuDrawGraphics: @ 80B3108
ldr r0, _080B3224
movs r1, 0xC0
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
bl FreeAllSpritePalettes
bl sub_8073B94
bl ResetSpriteData
@@ -115021,11 +115021,11 @@ sub_80B3240: @ 80B3240
adds r0, 0x2
movs r1, 0xD1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, sp
movs r1, 0xD8
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
add sp, 0x4
pop {r0}
bx r0
@@ -117825,8 +117825,8 @@ _080B487E:
bx r1
thumb_func_end sub_80B4850
- thumb_func_start sub_80B4884
-sub_80B4884: @ 80B4884
+ thumb_func_start unref_sub_80B4884
+unref_sub_80B4884: @ 80B4884
push {lr}
sub sp, 0x4
mov r1, sp
@@ -117842,7 +117842,7 @@ sub_80B4884: @ 80B4884
.align 2, 0
_080B48A0: .4byte 0x02028894
_080B48A4: .4byte 0x01000298
- thumb_func_end sub_80B4884
+ thumb_func_end unref_sub_80B4884
thumb_func_start sub_80B48A8
sub_80B48A8: @ 80B48A8
@@ -119485,8 +119485,8 @@ _080B54C2:
bx r1
thumb_func_end yes_no_box
- thumb_func_start sub_80B54C8
-sub_80B54C8: @ 80B54C8
+ thumb_func_start unref_sub_80B54C8
+unref_sub_80B54C8: @ 80B54C8
push {lr}
ldr r0, _080B54D8
ldrh r0, [r0]
@@ -119501,7 +119501,7 @@ _080B54DC:
_080B54DE:
pop {r1}
bx r1
- thumb_func_end sub_80B54C8
+ thumb_func_end unref_sub_80B54C8
thumb_func_start task_yes_no_maybe
task_yes_no_maybe: @ 80B54E4
@@ -123909,7 +123909,7 @@ sub_80B75B0: @ 80B75B0
ldr r0, _080B75C0
movs r1, 0
movs r2, 0x80
- bl gpu_pal_apply
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -129661,8 +129661,8 @@ _080BA0E2:
_080BA0E8: .4byte 0x020387b0
thumb_func_end sub_80BA0C0
- thumb_func_start sub_80BA0EC
-sub_80BA0EC: @ 80BA0EC
+ thumb_func_start unref_sub_80BA0EC
+unref_sub_80BA0EC: @ 80BA0EC
push {r4-r6,lr}
sub sp, 0xC
movs r0, 0
@@ -129815,7 +129815,7 @@ _080BA248: .4byte 0x00007140
_080BA24C: .4byte sub_80BA258
_080BA250: .4byte 0x03004b20
_080BA254: .4byte 0x020387b0
- thumb_func_end sub_80BA0EC
+ thumb_func_end unref_sub_80BA0EC
thumb_func_start sub_80BA258
sub_80BA258: @ 80BA258
@@ -130360,7 +130360,7 @@ _080BA6AA:
bx r0
.align 2, 0
_080BA6B0: .4byte 0x0202f388
-_080BA6B4: .4byte c2_title_screen_1
+_080BA6B4: .4byte CB2_InitTitleScreen
thumb_func_end sub_80BA68C
thumb_func_start sub_80BA6B8
@@ -132414,8 +132414,8 @@ sub_80BB70C: @ 80BB70C
_080BB720: .4byte 0x0202e8d2
thumb_func_end sub_80BB70C
- thumb_func_start sub_80BB724
-sub_80BB724: @ 80BB724
+ thumb_func_start unref_sub_80BB724
+unref_sub_80BB724: @ 80BB724
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 24
@@ -132449,7 +132449,7 @@ _080BB75E:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80BB724
+ thumb_func_end unref_sub_80BB724
thumb_func_start sub_80BB764
sub_80BB764: @ 80BB764
@@ -135280,8 +135280,8 @@ _080BCD72:
_080BCD78: .4byte gUnknown_081A2754
thumb_func_end sub_80BCCE8
- thumb_func_start sub_80BCD7C
-sub_80BCD7C: @ 80BCD7C
+ thumb_func_start unref_sub_80BCD7C
+unref_sub_80BCD7C: @ 80BCD7C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -135356,7 +135356,7 @@ _080BCE0C: .4byte 0x00000115
_080BCE10: .4byte 0x00001a90
_080BCE14: .4byte 0x00001a9c
_080BCE18: .4byte 0x00001aa2
- thumb_func_end sub_80BCD7C
+ thumb_func_end unref_sub_80BCD7C
thumb_func_start sub_80BCE1C
sub_80BCE1C: @ 80BCE1C
@@ -145792,7 +145792,7 @@ _080C2162:
movs r2, 0x80
lsls r2, 2
movs r1, 0
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r0, _080C2234
bl LoadFontDefaultPalette
movs r6, 0
@@ -147707,7 +147707,7 @@ _080C3116:
adds r0, r1
lsrs r1, r5, 16
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x80
lsls r0, 13
adds r5, r0
@@ -158455,8 +158455,8 @@ _080C8410: .4byte 0x0202e8dc
_080C8414: .4byte 0x0000ffff
thumb_func_end sub_80C837C
- thumb_func_start sub_80C8418
-sub_80C8418: @ 80C8418
+ thumb_func_start unref_sub_80C8418
+unref_sub_80C8418: @ 80C8418
push {lr}
bl sub_80C82EC
ldr r2, _080C8434
@@ -158478,7 +158478,7 @@ _080C8440:
_080C8442:
pop {r1}
bx r1
- thumb_func_end sub_80C8418
+ thumb_func_end unref_sub_80C8418
thumb_func_start sub_80C8448
sub_80C8448: @ 80C8448
@@ -158612,8 +158612,8 @@ _080C8528:
_080C8538: .4byte 0x0203880c
thumb_func_end sub_80C8508
- thumb_func_start sub_80C853C
-sub_80C853C: @ 80C853C
+ thumb_func_start unref_sub_80C853C
+unref_sub_80C853C: @ 80C853C
push {lr}
bl sub_80C82EC
ldr r3, _080C8564
@@ -158641,7 +158641,7 @@ _080C8574:
_080C8576:
pop {r1}
bx r1
- thumb_func_end sub_80C853C
+ thumb_func_end unref_sub_80C853C
thumb_func_start sub_80C857C
sub_80C857C: @ 80C857C
@@ -160024,8 +160024,8 @@ sub_80C9038: @ 80C9038
bx r0
thumb_func_end sub_80C9038
- thumb_func_start run_eventually_start
-run_eventually_start: @ 80C9050
+ thumb_func_start SetUpItemUseOnFieldCallback
+SetUpItemUseOnFieldCallback: @ 80C9050
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -160058,7 +160058,7 @@ _080C908E:
bx r0
.align 2, 0
_080C9094: .4byte 0x03005d00
- thumb_func_end run_eventually_start
+ thumb_func_end SetUpItemUseOnFieldCallback
thumb_func_start sub_80C9098
sub_80C9098: @ 80C9098
@@ -160301,11 +160301,11 @@ _080C9254:
ldr r0, _080C9278
str r0, [r1]
adds r0, r5, 0
- bl run_eventually_start
+ bl SetUpItemUseOnFieldCallback
b _080C928E
.align 2, 0
_080C9274: .4byte 0x03005d00
-_080C9278: .4byte sub_80C929C
+_080C9278: .4byte ItemUseOnFieldCB_Bike
_080C927C:
ldr r0, _080C9298
lsls r1, r5, 2
@@ -160324,8 +160324,8 @@ _080C928E:
_080C9298: .4byte 0x03004b20
thumb_func_end ItemUseOutOfBattle_Bike
- thumb_func_start sub_80C929C
-sub_80C929C: @ 80C929C
+ thumb_func_start ItemUseOnFieldCB_Bike
+ItemUseOnFieldCB_Bike: @ 80C929C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -160356,7 +160356,7 @@ _080C92CA:
bx r0
.align 2, 0
_080C92E0: .4byte 0x0203855e
- thumb_func_end sub_80C929C
+ thumb_func_end ItemUseOnFieldCB_Bike
thumb_func_start CanFish
CanFish: @ 80C92E4
@@ -160443,7 +160443,7 @@ ItemUseOutOfBattle_Rod: @ 80C9378
ldr r0, _080C9398
str r0, [r1]
adds r0, r4, 0
- bl run_eventually_start
+ bl SetUpItemUseOnFieldCallback
b _080C93AE
.align 2, 0
_080C9394: .4byte 0x03005d00
@@ -160498,7 +160498,7 @@ ItemUseOutOfBattle_Itemfinder: @ 80C93E0
ldr r0, _080C9404
str r0, [r1]
adds r0, r4, 0
- bl run_eventually_start
+ bl SetUpItemUseOnFieldCallback
pop {r4}
pop {r0}
bx r0
@@ -161580,8 +161580,8 @@ _080C9BF0:
_080C9BF4: .4byte 0x03001770
thumb_func_end sub_80C9BD8
- thumb_func_start ItemUseOnFieldCB_Bike
-ItemUseOnFieldCB_Bike: @ 80C9BF8
+ thumb_func_start unref_sub_80C9BF8
+unref_sub_80C9BF8: @ 80C9BF8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -161638,7 +161638,7 @@ _080C9C68:
_080C9C70: .4byte gUnknown_083D61DC
_080C9C74: .4byte 0x0203855e
_080C9C78: .4byte sub_80C9BD8
- thumb_func_end ItemUseOnFieldCB_Bike
+ thumb_func_end unref_sub_80C9BF8
thumb_func_start sub_80C9C7C
sub_80C9C7C: @ 80C9C7C
@@ -161738,7 +161738,7 @@ ItemUseOutOfBattle_WailmerPail: @ 80C9D30
ldr r0, _080C9D54
str r0, [r1]
adds r0, r4, 0
- bl run_eventually_start
+ bl SetUpItemUseOnFieldCallback
b _080C9D6A
.align 2, 0
_080C9D50: .4byte 0x03005d00
@@ -162334,7 +162334,7 @@ ItemUseOutOfBattle_EscapeRope: @ 80CA1E4
ldr r0, _080CA208
str r0, [r1]
adds r0, r4, 0
- bl run_eventually_start
+ bl SetUpItemUseOnFieldCallback
b _080CA21E
.align 2, 0
_080CA204: .4byte 0x03005d00
@@ -162604,8 +162604,8 @@ _080CA408: .4byte 0x03004ae4
_080CA40C: .4byte sub_806FE2C
thumb_func_end ItemUseInBattle_Medicine
- thumb_func_start sub_80CA410
-sub_80CA410: @ 80CA410
+ thumb_func_start unref_sub_80CA410
+unref_sub_80CA410: @ 80CA410
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -162618,7 +162618,7 @@ sub_80CA410: @ 80CA410
.align 2, 0
_080CA424: .4byte 0x03004ae4
_080CA428: .4byte sub_8070048
- thumb_func_end sub_80CA410
+ thumb_func_end unref_sub_80CA410
thumb_func_start ItemUseInBattle_PPRecovery
ItemUseInBattle_PPRecovery: @ 80CA42C
@@ -162636,8 +162636,8 @@ _080CA440: .4byte 0x03004ae4
_080CA444: .4byte dp05_ether
thumb_func_end ItemUseInBattle_PPRecovery
- thumb_func_start sub_80CA448
-sub_80CA448: @ 80CA448
+ thumb_func_start unref_sub_80CA448
+unref_sub_80CA448: @ 80CA448
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -162690,7 +162690,7 @@ _080CA4B8:
.align 2, 0
_080CA4C0: .4byte gUnknown_0840EF85
_080CA4C4: .4byte sub_80A5C48
- thumb_func_end sub_80CA448
+ thumb_func_end unref_sub_80CA448
thumb_func_start ItemUseInBattle_Escape
ItemUseInBattle_Escape: @ 80CA4C8
@@ -167679,8 +167679,8 @@ _080CCB64: .4byte move_anim_8072740
_080CCB68: .4byte sub_80782D8
thumb_func_end sub_80CCB00
- thumb_func_start sub_80CCB6C
-sub_80CCB6C: @ 80CCB6C
+ thumb_func_start unref_sub_80CCB6C
+unref_sub_80CCB6C: @ 80CCB6C
push {r4,r5,lr}
adds r5, r0, 0
ldrh r1, [r5, 0x32]
@@ -167794,7 +167794,7 @@ _080CCC44:
bx r0
.align 2, 0
_080CCC4C: .4byte 0x02020004
- thumb_func_end sub_80CCB6C
+ thumb_func_end unref_sub_80CCB6C
thumb_func_start sub_80CCC50
sub_80CCC50: @ 80CCC50
@@ -169076,7 +169076,7 @@ _080CD5D8:
adds r2, r3, 0
orrs r1, r2
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x3F
bl sub_8076F98
adds r1, r0, 0
@@ -170721,8 +170721,8 @@ _080CE258: .4byte 0x03004b20
_080CE25C: .4byte 0x04000052
thumb_func_end sub_80CE210
- thumb_func_start sub_80CE260
-sub_80CE260: @ 80CE260
+ thumb_func_start unref_sub_80CE260
+unref_sub_80CE260: @ 80CE260
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
@@ -170778,10 +170778,10 @@ _080CE2BC:
_080CE2C8: .4byte 0x02024a68
_080CE2CC: .4byte 0x03004b00
_080CE2D0: .4byte 0x03004340
- thumb_func_end sub_80CE260
+ thumb_func_end unref_sub_80CE260
- thumb_func_start sub_80CE2D4
-sub_80CE2D4: @ 80CE2D4
+ thumb_func_start unref_sub_80CE2D4
+unref_sub_80CE2D4: @ 80CE2D4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -170808,7 +170808,7 @@ _080CE2EE:
.align 2, 0
_080CE304: .4byte 0x03004340
_080CE308: .4byte 0x02024a68
- thumb_func_end sub_80CE2D4
+ thumb_func_end unref_sub_80CE2D4
thumb_func_start sub_80CE30C
sub_80CE30C: @ 80CE30C
@@ -178144,7 +178144,7 @@ _080D1B4E:
lsrs r1, 16
adds r0, r2, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r5, 0x1
cmp r5, 0x4
ble _080D1B24
@@ -178928,7 +178928,7 @@ _080D2144:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_8076BE0
lsls r0, 24
cmp r0, 0
@@ -179300,7 +179300,7 @@ _080D2488:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_8076BE0
lsls r0, 24
cmp r0, 0
@@ -182071,7 +182071,7 @@ _080D39CE:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
b _080D3A0E
.align 2, 0
_080D39F0: .4byte gUnknown_08E70F0C
@@ -182084,7 +182084,7 @@ _080D3A00:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
_080D3A0E:
ldr r0, _080D3A7C
ldr r4, _080D3A80
@@ -191389,7 +191389,7 @@ _080D812A:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_8076BE0
lsls r0, 24
cmp r0, 0
@@ -191781,7 +191781,7 @@ _080D845E:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_8076BE0
lsls r0, 24
cmp r0, 0
@@ -198306,8 +198306,8 @@ _080DB6E0:
bx r0
thumb_func_end sub_80DB6A0
- thumb_func_start sub_80DB6E4
-sub_80DB6E4: @ 80DB6E4
+ thumb_func_start unref_sub_80DB6E4
+unref_sub_80DB6E4: @ 80DB6E4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -198357,7 +198357,7 @@ _080DB73A:
bx r0
.align 2, 0
_080DB748: .4byte 0x02020004
- thumb_func_end sub_80DB6E4
+ thumb_func_end unref_sub_80DB6E4
thumb_func_start sub_80DB74C
sub_80DB74C: @ 80DB74C
@@ -201651,7 +201651,7 @@ _080DD0C4:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_8076BE0
lsls r0, 24
cmp r0, 0
@@ -207876,7 +207876,7 @@ _080E015E:
lsls r1, 4
movs r0, 0
movs r2, 0x20
- bl rboxid_80040B8
+ bl FillPalette
ldr r0, _080E01BC
str r0, [sp]
movs r7, 0x2
@@ -207905,7 +207905,7 @@ _080E01C4:
movs r0, 0
movs r1, 0x90
movs r2, 0x20
- bl rboxid_80040B8
+ bl FillPalette
ldr r0, _080E0284
str r0, [sp]
movs r7, 0x4
@@ -208251,7 +208251,7 @@ _080E048C:
lsls r1, 4
movs r0, 0
movs r2, 0x20
- bl rboxid_80040B8
+ bl FillPalette
b _080E04C4
.align 2, 0
_080E04B0: .4byte 0x030041b4
@@ -208262,7 +208262,7 @@ _080E04B4:
movs r0, 0
movs r1, 0x90
movs r2, 0x20
- bl rboxid_80040B8
+ bl FillPalette
_080E04C4:
movs r0, 0x3
bl sub_80E08CC
@@ -209196,7 +209196,7 @@ _080E0BCC:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r2, _080E0C78
ldr r0, _080E0C7C
lsls r1, r4, 4
@@ -212264,8 +212264,8 @@ _080E23A0: .4byte 0x0202f7c9
_080E23A4: .4byte 0x03004b00
thumb_func_end sub_80E2324
- thumb_func_start sub_80E23A8
-sub_80E23A8: @ 80E23A8
+ thumb_func_start unref_sub_80E23A8
+unref_sub_80E23A8: @ 80E23A8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -212398,7 +212398,7 @@ _080E24A8: .4byte 0x0202f7c9
_080E24AC: .4byte 0x0000ffff
_080E24B0: .4byte 0x02020004
_080E24B4: .4byte 0x03004340
- thumb_func_end sub_80E23A8
+ thumb_func_end unref_sub_80E23A8
thumb_func_start sub_80E24B8
sub_80E24B8: @ 80E24B8
@@ -213995,7 +213995,7 @@ _080E3106:
lsls r1, 4
adds r1, 0x1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
ldr r2, _080E3180
ldr r0, _080E3184
lsls r1, r5, 4
@@ -214592,7 +214592,7 @@ _080E35FE:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
b _080E361E
.align 2, 0
_080E360C: .4byte gUnknown_08D2DFF4
@@ -214602,7 +214602,7 @@ _080E3610:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
_080E361E:
ldr r2, _080E3648
movs r1, 0
@@ -215612,7 +215612,7 @@ _080E3DE6:
lsls r1, 4
ldr r0, [sp, 0x54]
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r0, _080E3E54
movs r1, 0
strh r1, [r0]
@@ -217764,8 +217764,8 @@ _080E4EBA:
bx r0
thumb_func_end sub_80E4C34
- thumb_func_start sub_80E4EC8
-sub_80E4EC8: @ 80E4EC8
+ thumb_func_start unref_sub_80E4EC8
+unref_sub_80E4EC8: @ 80E4EC8
push {r4,lr}
sub sp, 0xC
lsls r0, 24
@@ -217788,7 +217788,7 @@ sub_80E4EC8: @ 80E4EC8
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80E4EC8
+ thumb_func_end unref_sub_80E4EC8
thumb_func_start sub_80E4EF8
sub_80E4EF8: @ 80E4EF8
@@ -217908,8 +217908,8 @@ _080E4FD4: .4byte 0x02024e84
_080E4FD8: .4byte 0x80000400
thumb_func_end sub_80E4EF8
- thumb_func_start sub_80E4FDC
-sub_80E4FDC: @ 80E4FDC
+ thumb_func_start unref_sub_80E4FDC
+unref_sub_80E4FDC: @ 80E4FDC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -218014,7 +218014,7 @@ _080E508C:
_080E509C: .4byte 0x040000d4
_080E50A0: .4byte gUnknown_081FAF4C
_080E50A4: .4byte 0x80000400
- thumb_func_end sub_80E4FDC
+ thumb_func_end unref_sub_80E4FDC
thumb_func_start MovePlayerOnBike
MovePlayerOnBike: @ 80E50A8
@@ -226121,7 +226121,7 @@ sub_80E8DD8: @ 80E8DD8
ldr r0, _080E8F50
movs r1, 0x40
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _080E8F54
ldr r2, _080E8F58
adds r0, r2, 0
@@ -226152,11 +226152,11 @@ sub_80E8DD8: @ 80E8DD8
ldr r0, _080E8F74
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080E8F78
movs r1, 0x10
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _080E8F7C
ldr r2, _080E8F80
adds r0, r2, 0
@@ -226177,7 +226177,7 @@ sub_80E8DD8: @ 80E8DD8
ldr r0, _080E8F88
movs r1, 0x20
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080E8F8C
adds r1, r0, 0
adds r1, 0x7E
@@ -231206,8 +231206,8 @@ _080EB5C8:
bx r1
thumb_func_end sub_80EB544
- thumb_func_start sub_80EB5E0
-sub_80EB5E0: @ 80EB5E0
+ thumb_func_start unref_sub_80EB5E0
+unref_sub_80EB5E0: @ 80EB5E0
push {lr}
lsls r1, r0, 16
lsrs r3, r1, 16
@@ -231299,7 +231299,7 @@ _080EB674:
_080EB67C:
pop {r1}
bx r1
- thumb_func_end sub_80EB5E0
+ thumb_func_end unref_sub_80EB5E0
thumb_func_start sub_80EB680
sub_80EB680: @ 80EB680
@@ -231307,8 +231307,8 @@ sub_80EB680: @ 80EB680
bx lr
thumb_func_end sub_80EB680
- thumb_func_start sub_80EB684
-sub_80EB684: @ 80EB684
+ thumb_func_start unref_sub_80EB684
+unref_sub_80EB684: @ 80EB684
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -231375,7 +231375,7 @@ _080EB6EE:
.align 2, 0
_080EB6F4: .4byte 0x02027e6e
_080EB6F8: .4byte 0x0000ffff
- thumb_func_end sub_80EB684
+ thumb_func_end unref_sub_80EB684
thumb_func_start sub_80EB6FC
sub_80EB6FC: @ 80EB6FC
@@ -238209,7 +238209,7 @@ _080EEEB8:
ldr r0, _080EEEC4
movs r1, 0x10
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _080EEF18
.align 2, 0
_080EEEC4: .4byte gUnknown_08E89628
@@ -238813,11 +238813,11 @@ _080EF3A4:
ldr r0, _080EF3C4
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080EF3C8
movs r1, 0x40
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_80EF7D4
b _080EF40C
.align 2, 0
@@ -239009,7 +239009,7 @@ sub_80EF4F8: @ 80EF4F8
adds r0, r1
movs r1, 0x31
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x1
b _080EF546
.align 2, 0
@@ -239050,7 +239050,7 @@ _080EF558:
adds r0, r1
movs r1, 0x31
movs r2, 0x4
- bl gpu_pal_apply
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -239535,7 +239535,7 @@ _080EF940:
ldr r0, _080EF950
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_80EFC3C
b _080EF9DC
.align 2, 0
@@ -240420,7 +240420,7 @@ _080F003C:
ldr r0, _080F0058
movs r1, 0x20
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _080F0154
.align 2, 0
_080F0050: .4byte gUnknown_08E9AC4C
@@ -240465,26 +240465,26 @@ _080F00AC:
ldr r0, _080F00EC
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080F00F0
movs r1, 0xB0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r4, _080F00F4
adds r0, r4, 0
movs r1, 0xB1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0xE
movs r1, 0xB5
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r4, 0x1C
adds r0, r4, 0
movs r1, 0xBF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_80F01A4
b _080F0154
.align 2, 0
@@ -240815,15 +240815,15 @@ _080F0394:
adds r0, r6, 0
movs r1, 0xB0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r6, 0
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080F0400
movs r1, 0x40
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080F0404
ldr r0, [r0]
ldr r1, _080F0408
@@ -240835,23 +240835,23 @@ _080F0394:
adds r0, r4, 0
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _080F0410
ldrh r0, [r4, 0xA]
strh r0, [r1]
ldr r0, _080F0414
movs r1, 0xB0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r6, 0x2
movs r1, 0xB1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r6, 0
adds r0, 0x10
movs r1, 0xB5
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r4, 0xA
adds r0, r4, 0
movs r1, 0xBF
@@ -240871,23 +240871,23 @@ _080F0418:
adds r0, r4, 0
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _080F045C
ldrh r0, [r4, 0xA]
strh r0, [r1]
ldr r0, _080F0460
movs r1, 0xB0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r6, 0x2
movs r1, 0xB1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r6, 0
adds r0, 0x10
movs r1, 0xB5
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r4, 0xA
adds r0, r4, 0
movs r1, 0xBF
@@ -240901,7 +240901,7 @@ _080F0464:
adds r0, r4, 0
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _080F04B4
adds r5, r4, 0
adds r5, 0xA
@@ -240910,25 +240910,25 @@ _080F0464:
ldr r0, _080F04B8
movs r1, 0x50
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r6, 0x2
movs r1, 0xB1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r6, 0
adds r0, 0x10
movs r1, 0xB5
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r5, 0
movs r1, 0xBF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r5, 0
movs r1, 0x5F
_080F04A8:
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
b _080F0618
.align 2, 0
_080F04B0: .4byte gUnknown_08E9F9E8
@@ -242533,25 +242533,25 @@ _080F1194:
ldr r0, _080F11CC
movs r1, 0x20
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r4, _080F11D0
adds r0, r4, 0
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080F11D4
movs r1, 0x30
movs r2, 0xA0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080F11D8
movs r1, 0xB0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
adds r4, 0x1E
adds r0, r4, 0
movs r1, 0xBF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
b _080F1218
.align 2, 0
_080F11CC: .4byte gUnknown_08E9FAFC
@@ -243152,7 +243152,7 @@ _080F1694:
ldr r0, _080F16A4
movs r1, 0xD0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _080F16B2
.align 2, 0
_080F16A4: .4byte gUnknown_083E0124
@@ -243160,7 +243160,7 @@ _080F16A8:
ldr r0, _080F16D4
movs r1, 0xD0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_080F16B2:
ldr r0, _080F16D8
ldr r1, [r0]
@@ -243339,7 +243339,7 @@ _080F1810:
ldr r0, _080F182C
movs r1, 0x20
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _080F1914
.align 2, 0
_080F1824: .4byte gUnknown_08E9AC4C
@@ -243375,26 +243375,26 @@ _080F186C:
ldr r0, _080F18AC
movs r1, 0x30
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080F18B0
movs r1, 0xB0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r4, _080F18B4
adds r0, r4, 0
movs r1, 0xB1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0xE
movs r1, 0xB5
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r4, 0x1C
adds r0, r4, 0
movs r1, 0xBF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_80F01A4
b _080F1914
.align 2, 0
@@ -246318,7 +246318,7 @@ _080F2EFC:
adds r1, r4, r5
ldrh r1, [r1]
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_080F2F26:
add sp, 0x28
pop {r3}
@@ -258287,7 +258287,7 @@ _080F8B54:
ldr r0, [r0]
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _080F8D30
.align 2, 0
_080F8B70: .4byte gUnknown_083E5634
@@ -259115,8 +259115,8 @@ _080F91D4:
_080F91E8: .4byte 0x020234cc
thumb_func_end brm_trade_1
- thumb_func_start sub_80F91EC
-sub_80F91EC: @ 80F91EC
+ thumb_func_start unref_sub_80F91EC
+unref_sub_80F91EC: @ 80F91EC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -259163,10 +259163,10 @@ _080F9242:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80F91EC
+ thumb_func_end unref_sub_80F91EC
- thumb_func_start sub_80F924C
-sub_80F924C: @ 80F924C
+ thumb_func_start unref_sub_80F924C
+unref_sub_80F924C: @ 80F924C
push {r4-r6,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -259193,7 +259193,7 @@ sub_80F924C: @ 80F924C
bx r0
.align 2, 0
_080F9280: .4byte gUnknown_083E5A1C
- thumb_func_end sub_80F924C
+ thumb_func_end unref_sub_80F924C
thumb_func_start sub_80F9284
sub_80F9284: @ 80F9284
@@ -262145,8 +262145,8 @@ _080FA89E:
bx r1
thumb_func_end sub_80FA86C
- thumb_func_start sub_80FA8A4
-sub_80FA8A4: @ 80FA8A4
+ thumb_func_start unref_sub_80FA8A4
+unref_sub_80FA8A4: @ 80FA8A4
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -262166,7 +262166,7 @@ _080FA8C4:
_080FA8C6:
pop {r1}
bx r1
- thumb_func_end sub_80FA8A4
+ thumb_func_end unref_sub_80FA8A4
thumb_func_start sub_80FA8CC
sub_80FA8CC: @ 80FA8CC
@@ -262287,7 +262287,7 @@ _080FA9AC:
ldr r0, _080FA9B8
movs r1, 0x70
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
b _080FAAF4
.align 2, 0
_080FA9B8: .4byte gUnknown_083E5D60
@@ -264755,8 +264755,8 @@ _080FBCC4:
_080FBCCC: .4byte 0x020388cc
thumb_func_end sub_80FBCA0
- thumb_func_start sub_80FBCD0
-sub_80FBCD0: @ 80FBCD0
+ thumb_func_start unref_sub_80FBCD0
+unref_sub_80FBCD0: @ 80FBCD0
ldr r0, _080FBCDC
ldr r0, [r0]
ldr r1, [r0, 0x1C]
@@ -264765,10 +264765,10 @@ sub_80FBCD0: @ 80FBCD0
bx lr
.align 2, 0
_080FBCDC: .4byte 0x020388cc
- thumb_func_end sub_80FBCD0
+ thumb_func_end unref_sub_80FBCD0
- thumb_func_start sub_80FBCE0
-sub_80FBCE0: @ 80FBCE0
+ thumb_func_start unref_sub_80FBCE0
+unref_sub_80FBCE0: @ 80FBCE0
ldr r0, _080FBCEC
ldr r0, [r0]
ldr r1, [r0, 0x1C]
@@ -264777,7 +264777,7 @@ sub_80FBCE0: @ 80FBCE0
bx lr
.align 2, 0
_080FBCEC: .4byte 0x020388cc
- thumb_func_end sub_80FBCE0
+ thumb_func_end unref_sub_80FBCE0
thumb_func_start sub_80FBCF0
sub_80FBCF0: @ 80FBCF0
@@ -265377,7 +265377,7 @@ _080FC184:
ldr r0, _080FC19C
movs r1, 0x10
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _080FC1A0
movs r1, 0x1
movs r2, 0x90
@@ -269751,16 +269751,16 @@ sub_80FE2B4: @ 80FE2B4
add r0, sp, 0x4
movs r1, 0xDF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, sp
adds r0, 0x2
movs r1, 0xD1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, sp
movs r1, 0xD8
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
add sp, 0x8
pop {r0}
bx r0
@@ -276547,8 +276547,8 @@ _08101748: .4byte 0x03004b20
_0810174C: .4byte 0x020388f6
thumb_func_end sub_8101700
- thumb_func_start sub_8101750
-sub_8101750: @ 8101750
+ thumb_func_start unref_sub_8101750
+unref_sub_8101750: @ 8101750
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -276585,7 +276585,7 @@ _08101792:
.align 2, 0
_08101798: .4byte 0x03004b20
_0810179C: .4byte 0x020388f6
- thumb_func_end sub_8101750
+ thumb_func_end unref_sub_8101750
thumb_func_start sub_81017A0
sub_81017A0: @ 81017A0
@@ -281655,7 +281655,7 @@ sub_8103D00: @ 8103D00
ldrb r1, [r0]
adds r0, r2, 0
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -281677,7 +281677,7 @@ sub_8103D28: @ 8103D28
ldrb r1, [r0]
adds r0, r2, 0
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -282045,7 +282045,7 @@ _08103FCC:
ldr r0, [r0]
movs r1, 0x10
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x1
_08103FE0:
pop {r1}
@@ -282097,7 +282097,7 @@ _08104026:
ldr r0, [r1]
movs r1, 0x10
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -286406,7 +286406,7 @@ sub_8106058: @ 8106058
lsrs r1, 16
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r5, 0x32]
adds r0, 0x1
strh r0, [r5, 0x32]
@@ -286440,7 +286440,7 @@ _081060A8:
lsrs r1, 16
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r5, 0x32]
adds r0, 0x1
movs r1, 0
@@ -286824,7 +286824,7 @@ sub_8106370: @ 8106370
lsrs r1, 16
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -286954,11 +286954,11 @@ _08106468:
ldr r0, _081064B0
movs r1, 0
movs r2, 0xA0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _081064B4
movs r1, 0xD0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
pop {r4-r7}
pop {r0}
bx r0
@@ -287337,7 +287337,7 @@ _0810678C:
ldr r0, _081067F0
movs r1, 0
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
movs r1, 0xA0
lsls r1, 19
movs r4, 0
@@ -287934,7 +287934,7 @@ sub_8106C40: @ 8106C40
movs r2, 0x80
lsls r2, 1
movs r1, 0
- bl gpu_pal_apply
+ bl LoadPalette
cmp r4, 0x1
beq _08106C5E
b _08106DB4
@@ -288406,7 +288406,7 @@ _08107052:
lsls r1, 1
movs r2, 0x80
lsls r2, 2
- bl gpu_pal_apply
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -288951,8 +288951,8 @@ _0810749A:
bx r0
thumb_func_end sub_810745C
- thumb_func_start sub_81074A0
-sub_81074A0: @ 81074A0
+ thumb_func_start unref_sub_81074A0
+unref_sub_81074A0: @ 81074A0
push {lr}
lsls r0, 24
ldr r1, _081074C0
@@ -288972,7 +288972,7 @@ _081074B2:
bx r0
.align 2, 0
_081074C0: .4byte 0x02016a00
- thumb_func_end sub_81074A0
+ thumb_func_end unref_sub_81074A0
thumb_func_start sub_81074C4
sub_81074C4: @ 81074C4
@@ -293894,8 +293894,8 @@ sub_81098C4: @ 81098C4
_081098E0: .4byte 0x02016c00
thumb_func_end sub_81098C4
- thumb_func_start sub_81098E4
-sub_81098E4: @ 81098E4
+ thumb_func_start unref_sub_81098E4
+unref_sub_81098E4: @ 81098E4
ldr r3, _08109900
adds r2, r3, 0
adds r2, 0x20
@@ -293912,7 +293912,7 @@ sub_81098E4: @ 81098E4
.align 2, 0
_08109900: .4byte 0x02016c00
_08109904: .4byte 0x02039238
- thumb_func_end sub_81098E4
+ thumb_func_end unref_sub_81098E4
thumb_func_start sub_8109908
sub_8109908: @ 8109908
@@ -294707,7 +294707,7 @@ sub_8109E80: @ 8109E80
ldr r0, _0810A0BC
movs r1, 0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0810A0C0
bl LoadCompressedObjectPic
ldr r0, _0810A0C4
@@ -295768,7 +295768,7 @@ _0810A77C:
ldr r0, _0810A808
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _0810A816
.align 2, 0
_0810A7F8: .4byte 0x040000d4
@@ -295780,7 +295780,7 @@ _0810A80C:
ldr r0, _0810A850
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_0810A816:
bl remove_some_task
bl ResetTasks
@@ -298045,7 +298045,7 @@ _0810B9F8:
ldr r0, _0810BA04
movs r1, 0
movs r2, 0xC0
- bl decompress_palette
+ bl LoadCompressedPalette
b _0810BA0E
.align 2, 0
_0810BA04: .4byte gUnknown_08E77D20
@@ -300691,11 +300691,11 @@ sub_810CE78: @ 810CE78
ldr r0, _0810CEF8
movs r1, 0xE0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0810CEFC
movs r1, 0xE0
movs r2, 0x10
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _0810CF00
ldr r2, _0810CF04
adds r0, r2, 0
@@ -300807,7 +300807,7 @@ sub_810CF5C: @ 810CF5C
lsls r2, 16
lsrs r2, 16
movs r1, 0xE0
- bl gpu_pal_apply
+ bl LoadPalette
b _0810CFB6
.align 2, 0
_0810CF94: .4byte 0x04000052
@@ -300818,7 +300818,7 @@ _0810CFA4:
ldr r0, _0810CFBC
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0810CFC0
str r0, [r4]
movs r0, 0x8
@@ -300925,11 +300925,11 @@ sub_810D028: @ 810D028
ldr r0, _0810D0B4
movs r1, 0xE0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0810D0B8
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _0810D0BC
lsls r0, r5, 2
adds r0, r5
@@ -300983,7 +300983,7 @@ sub_810D0C4: @ 810D0C4
lsls r2, 17
lsrs r2, 16
movs r1, 0xE0
- bl gpu_pal_apply
+ bl LoadPalette
b _0810D114
.align 2, 0
_0810D0F8: .4byte 0x03004b20
@@ -301042,7 +301042,7 @@ _0810D160:
ldr r0, _0810D178
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0810D17C
ldr r0, [r0, 0x8]
bl SetMainCallback2
@@ -301219,8 +301219,8 @@ _0810D2CC: .4byte 0x00004024
_0810D2D0: .4byte 0x00004025
thumb_func_end sub_810D2AC
- thumb_func_start sub_810D2D4
-sub_810D2D4: @ 810D2D4
+ thumb_func_start unref_sub_810D2D4
+unref_sub_810D2D4: @ 810D2D4
push {r4,lr}
bl Random
adds r4, r0, 0
@@ -301234,7 +301234,7 @@ sub_810D2D4: @ 810D2D4
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_810D2D4
+ thumb_func_end unref_sub_810D2D4
thumb_func_start sub_810D2F4
sub_810D2F4: @ 810D2F4
@@ -307932,8 +307932,8 @@ _0811065C: .4byte gUnknown_0842CA63
_08110660: .4byte gUnknown_0842CA69
thumb_func_end sub_81105E4
- thumb_func_start sub_8110664
-sub_8110664: @ 8110664
+ thumb_func_start unref_sub_8110664
+unref_sub_8110664: @ 8110664
push {lr}
ldr r3, _08110678
str r1, [r3, 0x4]
@@ -307946,7 +307946,7 @@ sub_8110664: @ 8110664
.align 2, 0
_08110678: .4byte 0x02000000
_0811067C: .4byte sub_8110680
- thumb_func_end sub_8110664
+ thumb_func_end unref_sub_8110664
thumb_func_start sub_8110680
sub_8110680: @ 8110680
@@ -308216,7 +308216,7 @@ _081108C0:
ldr r0, _081108CC
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _081108F0
.align 2, 0
_081108CC: .4byte gUnknown_083F8418
@@ -310545,7 +310545,7 @@ evolution_cutscene: @ 8111984
movs r1, 0x88
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
adds r0, r6, 0
movs r1, 0x1
bl gpu_pal_obj_decompress_and_apply
@@ -310611,7 +310611,7 @@ evolution_cutscene: @ 8111984
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
mov r0, r10
movs r1, 0x3
bl gpu_pal_obj_decompress_and_apply
@@ -310853,7 +310853,7 @@ sub_8111C90: @ 8111C90
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
adds r0, r6, 0
movs r1, 0x3
bl gpu_pal_obj_decompress_and_apply
@@ -311117,7 +311117,7 @@ _08111FE2:
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, _08112040
ldr r0, _08112044
adds r1, r0
@@ -311279,7 +311279,7 @@ sub_81120E4: @ 81120E4
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
bl gpu_pal_obj_decompress_and_apply
@@ -314230,8 +314230,8 @@ _08113B48: .4byte 0x03004828
_08113B4C: .4byte 0x03004b20
thumb_func_end sub_8112FE8
- thumb_func_start sub_8113B50
-sub_8113B50: @ 8113B50
+ thumb_func_start unref_sub_8113B50
+unref_sub_8113B50: @ 8113B50
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -315098,7 +315098,7 @@ _081141E0: .4byte 0x000010c4
_081141E4: .4byte 0x000018c4
_081141E8: .4byte 0x02014800
_081141EC: .4byte 0x02014804
- thumb_func_end sub_8113B50
+ thumb_func_end unref_sub_8113B50
thumb_func_start sub_81141F0
sub_81141F0: @ 81141F0
@@ -315334,8 +315334,8 @@ _081143C4: .4byte 0x000080c4
_081143C8: .4byte 0x000090c4
thumb_func_end sub_811430C
- thumb_func_start sub_81143CC
-sub_81143CC: @ 81143CC
+ thumb_func_start unref_sub_81143CC
+unref_sub_81143CC: @ 81143CC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -316554,7 +316554,7 @@ _08114D9A:
.align 2, 0
_08114DAC: .4byte 0x000008c4
_08114DB0: .4byte 0x02014800
- thumb_func_end sub_81143CC
+ thumb_func_end unref_sub_81143CC
thumb_func_start sub_8114DB4
sub_8114DB4: @ 8114DB4
@@ -317394,7 +317394,7 @@ _08115460:
movs r2, 0xE0
lsls r2, 1
movs r1, 0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _0811548C
ldr r2, _08115490
adds r1, r2
@@ -322117,8 +322117,8 @@ _08117A6C: .4byte gUnknown_083F9FD4
_08117A70: .4byte gUnknown_083FA034
thumb_func_end sub_8117900
- thumb_func_start sub_8117A74
-sub_8117A74: @ 8117A74
+ thumb_func_start unref_sub_8117A74
+unref_sub_8117A74: @ 8117A74
push {r4,r5,lr}
movs r4, 0
ldr r5, _08117AA0
@@ -322144,7 +322144,7 @@ _08117A7A:
.align 2, 0
_08117AA0: .4byte 0x0201903c
_08117AA4: .4byte 0x02020004
- thumb_func_end sub_8117A74
+ thumb_func_end unref_sub_8117A74
thumb_func_start sub_8117AA8
sub_8117AA8: @ 8117AA8
@@ -326800,7 +326800,7 @@ _08119F60:
ldrb r1, [r5, 0x3]
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
movs r0, 0x1
mov r9, r0
_08119F74:
@@ -327413,7 +327413,7 @@ _0811A3FE:
ldrb r1, [r4, 0x3]
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
mov r1, r10
ldrb r0, [r1]
adds r0, 0x1
@@ -329214,7 +329214,7 @@ _0811B168:
ldr r0, _0811B1D4
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -329751,7 +329751,7 @@ sub_811B5B0: @ 811B5B0
ldr r0, _0811B5F8
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -331322,7 +331322,7 @@ sub_811C1CC: @ 811C1CC
ldr r0, [r0]
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _0811C290
ldr r0, _0811C294
ldrb r0, [r0, 0x8]
@@ -331331,7 +331331,7 @@ sub_811C1CC: @ 811C1CC
ldr r0, [r0]
movs r1, 0xFA
movs r2, 0xC
- bl gpu_pal_apply
+ bl LoadPalette
movs r1, 0
ldr r5, [sp]
ldr r0, _0811C298
@@ -333283,7 +333283,7 @@ sub_811D0F0: @ 811D0F0
ldr r0, _0811D140
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -339902,7 +339902,7 @@ sub_8120588: @ 8120588
lsls r2, 1
adds r1, r4, r2
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldrb r0, [r7]
adds r0, r6
ldrb r0, [r0]
@@ -344644,8 +344644,8 @@ _08122C58: .4byte 0x03004b20
_08122C5C: .4byte sub_8122450
thumb_func_end sub_8122C18
- thumb_func_start sub_8122C60
-sub_8122C60: @ 8122C60
+ thumb_func_start unref_sub_8122C60
+unref_sub_8122C60: @ 8122C60
push {r4,r5,lr}
ldr r1, _08122C80
movs r2, 0x99
@@ -344796,7 +344796,7 @@ _08122D8C:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8122C60
+ thumb_func_end unref_sub_8122C60
thumb_func_start sub_8122D94
sub_8122D94: @ 8122D94
@@ -345596,7 +345596,7 @@ _081233EC:
ldr r0, _08123474
movs r1, 0
movs r2, 0x80
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08123478
movs r1, 0xC0
lsls r1, 19
@@ -348287,8 +348287,8 @@ _081249AA:
bx r1
thumb_func_end sub_812492C
- thumb_func_start sub_81249B0
-sub_81249B0: @ 81249B0
+ thumb_func_start unref_sub_81249B0
+unref_sub_81249B0: @ 81249B0
push {r4,lr}
adds r2, r0, 0
lsls r1, 24
@@ -348316,7 +348316,7 @@ _081249DE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_81249B0
+ thumb_func_end unref_sub_81249B0
thumb_func_start sub_81249E4
sub_81249E4: @ 81249E4
@@ -349124,8 +349124,8 @@ _08124F82:
bx r0
thumb_func_end sub_8124F08
- thumb_func_start sub_8124F94
-sub_8124F94: @ 8124F94
+ thumb_func_start unref_sub_8124F94
+unref_sub_8124F94: @ 8124F94
sub sp, 0x4
movs r3, 0
strb r3, [r0, 0x1]
@@ -349158,10 +349158,10 @@ sub_8124F94: @ 8124F94
_08124FCC: .4byte 0x040000d4
_08124FD0: .4byte 0x81000040
_08124FD4: .4byte 0x810000c0
- thumb_func_end sub_8124F94
+ thumb_func_end unref_sub_8124F94
- thumb_func_start sub_8124FD8
-sub_8124FD8: @ 8124FD8
+ thumb_func_start unref_sub_8124FD8
+unref_sub_8124FD8: @ 8124FD8
push {r4-r7,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -349268,10 +349268,10 @@ _0812509C:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8124FD8
+ thumb_func_end unref_sub_8124FD8
- thumb_func_start sub_81250A4
-sub_81250A4: @ 81250A4
+ thumb_func_start unref_sub_81250A4
+unref_sub_81250A4: @ 81250A4
push {r4,r5,lr}
sub sp, 0x20
adds r4, r0, 0
@@ -349296,7 +349296,7 @@ _081250AE:
lsls r1, 4
adds r0, r2, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
b _081250EC
_081250D8:
adds r0, r2, 0
@@ -349306,7 +349306,7 @@ _081250D8:
lsls r1, 4
mov r0, sp
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
_081250EC:
ldrb r0, [r4]
lsls r1, r0, 3
@@ -349332,10 +349332,10 @@ _0812510E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_81250A4
+ thumb_func_end unref_sub_81250A4
- thumb_func_start sub_8125118
-sub_8125118: @ 8125118
+ thumb_func_start unref_sub_8125118
+unref_sub_8125118: @ 8125118
push {r4-r7,lr}
ldr r4, _0812514C
add sp, r4
@@ -349380,7 +349380,7 @@ _08125150:
ldrb r1, [r5]
lsls r1, 4
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -349398,7 +349398,7 @@ _08125188:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8125118
+ thumb_func_end unref_sub_8125118
thumb_func_start calls_flash_erase_block
calls_flash_erase_block: @ 8125194
@@ -351156,8 +351156,8 @@ _08125F40:
_08125F48: .4byte gUnknown_08401E14
thumb_func_end sub_8125EC8
- thumb_func_start sub_8125F4C
-sub_8125F4C: @ 8125F4C
+ thumb_func_start unref_sub_8125F4C
+unref_sub_8125F4C: @ 8125F4C
push {r4-r6,lr}
adds r4, r0, 0
adds r2, r4, 0
@@ -351198,10 +351198,10 @@ _08125F9A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8125F4C
+ thumb_func_end unref_sub_8125F4C
- thumb_func_start sub_8125FA0
-sub_8125FA0: @ 8125FA0
+ thumb_func_start unref_sub_8125FA0
+unref_sub_8125FA0: @ 8125FA0
push {r4-r7,lr}
movs r0, 0
bl sub_8125D44
@@ -351240,10 +351240,10 @@ _08125FE8:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8125FA0
+ thumb_func_end unref_sub_8125FA0
- thumb_func_start sub_8125FF0
-sub_8125FF0: @ 8125FF0
+ thumb_func_start unref_sub_8125FF0
+unref_sub_8125FF0: @ 8125FF0
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 16
@@ -351303,10 +351303,10 @@ _08126062:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8125FF0
+ thumb_func_end unref_sub_8125FF0
- thumb_func_start sub_8126068
-sub_8126068: @ 8126068
+ thumb_func_start unref_sub_8126068
+unref_sub_8126068: @ 8126068
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -351320,10 +351320,10 @@ _0812607A:
_0812607C:
pop {r1}
bx r1
- thumb_func_end sub_8126068
+ thumb_func_end unref_sub_8126068
- thumb_func_start sub_8126080
-sub_8126080: @ 8126080
+ thumb_func_start unref_sub_8126080
+unref_sub_8126080: @ 8126080
push {lr}
adds r2, r1, 0
lsls r0, 24
@@ -351335,7 +351335,7 @@ sub_8126080: @ 8126080
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_8126080
+ thumb_func_end unref_sub_8126080
thumb_func_start sub_8126098
sub_8126098: @ 8126098
@@ -351509,8 +351509,8 @@ sub_81261A4: @ 81261A4
bx lr
thumb_func_end sub_81261A4
- thumb_func_start sub_81261B4
-sub_81261B4: @ 81261B4
+ thumb_func_start unref_sub_81261B4
+unref_sub_81261B4: @ 81261B4
push {r4-r7,lr}
adds r5, r0, 0
adds r7, r1, 0
@@ -351552,10 +351552,10 @@ _08126206:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_81261B4
+ thumb_func_end unref_sub_81261B4
- thumb_func_start sub_812620C
-sub_812620C: @ 812620C
+ thumb_func_start unref_sub_812620C
+unref_sub_812620C: @ 812620C
push {r4-r7,lr}
adds r5, r0, 0
adds r7, r1, 0
@@ -351599,7 +351599,7 @@ _08126262:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_812620C
+ thumb_func_end unref_sub_812620C
thumb_func_start sub_8126268
sub_8126268: @ 8126268
@@ -361955,8 +361955,8 @@ _0812AEC4:
_0812AEC8: .4byte 0x02039238
thumb_func_end sub_812AE88
- thumb_func_start sub_812AECC
-sub_812AECC: @ 812AECC
+ thumb_func_start unref_sub_812AECC
+unref_sub_812AECC: @ 812AECC
push {lr}
bl sub_812613C
lsls r0, 24
@@ -361990,7 +361990,7 @@ _0812AF08:
_0812AF0A:
pop {r1}
bx r1
- thumb_func_end sub_812AECC
+ thumb_func_end unref_sub_812AECC
thumb_func_start sub_812AF10
sub_812AF10: @ 812AF10
@@ -362678,10 +362678,10 @@ _0812B45C: .4byte 0x03004b20
_0812B460: .4byte 0x0202f7d2
thumb_func_end sub_812B404
- thumb_func_start nullsub_77
-nullsub_77: @ 812B464
+ thumb_func_start unref_sub_812B464
+unref_sub_812B464: @ 812B464
bx lr
- thumb_func_end nullsub_77
+ thumb_func_end unref_sub_812B464
thumb_func_start sub_812B468
sub_812B468: @ 812B468
@@ -363172,8 +363172,8 @@ _0812B830: .4byte 0x02024a64
_0812B834: .4byte gUnknown_0820872C
thumb_func_end dp01_tbl6_exec_completed
- thumb_func_start sub_812B838
-sub_812B838: @ 812B838
+ thumb_func_start unref_sub_812B838
+unref_sub_812B838: @ 812B838
push {lr}
ldr r0, _0812B85C
ldrb r1, [r0]
@@ -363194,7 +363194,7 @@ _0812B856:
.align 2, 0
_0812B85C: .4byte 0x02024a60
_0812B860: .4byte 0x02017810
- thumb_func_end sub_812B838
+ thumb_func_end unref_sub_812B838
thumb_func_start sub_812B864
sub_812B864: @ 812B864
@@ -367907,7 +367907,7 @@ _0812DC12:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_8076BE0
lsls r0, 24
cmp r0, 0
@@ -368626,7 +368626,7 @@ _0812E1D4:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
bl sub_8076BE0
lsls r0, 24
cmp r0, 0
@@ -370647,7 +370647,7 @@ _0812F13E:
adds r2, r3, 0
orrs r1, r2
movs r2, 0x20
- bl rboxid_80040B8
+ bl FillPalette
ldrb r0, [r5, 0x5]
ands r4, r0
mov r0, r8
@@ -377571,7 +377571,7 @@ sub_81326D8: @ 81326D8
movs r0, 0
movs r1, 0
movs r2, 0x2
- bl rboxid_80040B8
+ bl FillPalette
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
@@ -377647,7 +377647,7 @@ sub_81327A4: @ 81327A4
movs r0, 0
movs r1, 0
movs r2, 0x2
- bl rboxid_80040B8
+ bl FillPalette
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
@@ -380234,8 +380234,8 @@ _08133D1E:
bx r1
thumb_func_end sub_8133CCC
- thumb_func_start sub_8133D28
-sub_8133D28: @ 8133D28
+ thumb_func_start unref_sub_8133D28
+unref_sub_8133D28: @ 8133D28
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -380253,7 +380253,7 @@ sub_8133D28: @ 8133D28
_08133D44: .4byte 0x02001000
_08133D48: .4byte sub_8133D50
_08133D4C: .4byte 0x0001a272
- thumb_func_end sub_8133D28
+ thumb_func_end unref_sub_8133D28
thumb_func_start sub_8133D50
sub_8133D50: @ 8133D50
@@ -384608,8 +384608,8 @@ _08135EE0: .4byte 0x00000565
_08135EE4: .4byte 0x03004360
thumb_func_end sub_8135E50
- thumb_func_start sub_8135EE8
-sub_8135EE8: @ 8135EE8
+ thumb_func_start unref_sub_8135EE8
+unref_sub_8135EE8: @ 8135EE8
push {r4-r7,lr}
ldr r7, _08135F0C
ldr r0, _08135F10
@@ -384707,7 +384707,7 @@ _08135FAC: .4byte 0x02024eae
_08135FB0: .4byte 0x02025734
_08135FB4: .4byte 0x00002b28
_08135FB8: .4byte 0x03004360
- thumb_func_end sub_8135EE8
+ thumb_func_end unref_sub_8135EE8
thumb_func_start sub_8135FBC
sub_8135FBC: @ 8135FBC
@@ -387027,10 +387027,10 @@ _08137218:
_0813721C: .4byte 0x02039304
thumb_func_end sub_81371DC
- thumb_func_start nullsub_79
-nullsub_79: @ 8137220
+ thumb_func_start unref_sub_8137220
+unref_sub_8137220: @ 8137220
bx lr
- thumb_func_end nullsub_79
+ thumb_func_end unref_sub_8137220
thumb_func_start sub_8137224
sub_8137224: @ 8137224
@@ -387989,8 +387989,8 @@ _081379DC: .4byte 0x02024a64
_081379E0: .4byte gUnknown_0820872C
thumb_func_end dp01_tbl5_exec_completed
- thumb_func_start sub_81379E4
-sub_81379E4: @ 81379E4
+ thumb_func_start unref_sub_81379E4
+unref_sub_81379E4: @ 81379E4
push {lr}
ldr r0, _08137A08
ldrb r1, [r0]
@@ -388011,7 +388011,7 @@ _08137A02:
.align 2, 0
_08137A08: .4byte 0x02024a60
_08137A0C: .4byte 0x02017810
- thumb_func_end sub_81379E4
+ thumb_func_end unref_sub_81379E4
thumb_func_start dp01t_00_5_getattr
dp01t_00_5_getattr: @ 8137A10
@@ -391643,7 +391643,7 @@ sub_8139750: @ 8139750
lsls r2, 1
adds r1, r4, r2
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldrb r0, [r7]
adds r0, r6
ldrb r0, [r0]
@@ -394532,16 +394532,16 @@ sub_813AF04: @ 813AF04
add r0, sp, 0x4
movs r1, 0xDF
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, sp
adds r0, 0x2
movs r1, 0xD1
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
mov r0, sp
movs r1, 0xD8
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
add sp, 0x8
pop {r0}
bx r0
@@ -395611,8 +395611,8 @@ sub_813B784: @ 813B784
bx r0
thumb_func_end sub_813B784
- thumb_func_start sub_813B798
-sub_813B798: @ 813B798
+ thumb_func_start CB2_813B798
+CB2_813B798: @ 813B798
push {lr}
bl RunTasks
bl AnimateSprites
@@ -395634,7 +395634,7 @@ sub_813B798: @ 813B798
.align 2, 0
_0813B7C8: .4byte 0x03001770
_0813B7CC: .4byte 0x0202f388
-_0813B7D0: .4byte sub_813B7EC
+_0813B7D0: .4byte CB2_813B7EC
_0813B7D4:
ldr r2, _0813B7E8
ldr r1, [r2]
@@ -395649,10 +395649,10 @@ _0813B7E4:
bx r0
.align 2, 0
_0813B7E8: .4byte 0x03005ed0
- thumb_func_end sub_813B798
+ thumb_func_end CB2_813B798
- thumb_func_start sub_813B7EC
-sub_813B7EC: @ 813B7EC
+ thumb_func_start CB2_813B7EC
+CB2_813B7EC: @ 813B7EC
push {lr}
bl fade_and_return_progress_probably
lsls r0, 24
@@ -395664,8 +395664,8 @@ _0813B7FE:
pop {r0}
bx r0
.align 2, 0
-_0813B804: .4byte c2_title_screen_1
- thumb_func_end sub_813B7EC
+_0813B804: .4byte CB2_InitTitleScreen
+ thumb_func_end CB2_813B7EC
thumb_func_start sub_813B808
sub_813B808: @ 813B808
@@ -395688,7 +395688,7 @@ sub_813B808: @ 813B808
ldr r0, _0813B84C
adds r1, r5, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0813B850
adds r4, r6
movs r2, 0xA0
@@ -395905,7 +395905,7 @@ _0813B9F0:
b _0813BA2E
.align 2, 0
_0813BA18: .4byte task_intro_1
-_0813BA1C: .4byte sub_813B798
+_0813BA1C: .4byte CB2_813B798
_0813BA20: .4byte 0x03005ee0
_0813BA24:
bl GameCubeMultiBoot_Quit
@@ -396047,7 +396047,7 @@ task_intro_1: @ 813BA94
lsls r5, 2
movs r1, 0
adds r2, r5, 0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r1, _0813BC64
ldr r2, _0813BC68
adds r0, r2, 0
@@ -396877,7 +396877,7 @@ task_intro_10: @ 813C230
movs r2, 0x80
lsls r2, 2
movs r1, 0
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _0813C2D0
lsls r4, r5, 2
adds r4, r5
@@ -397160,7 +397160,7 @@ _0813C45A:
ldr r0, _0813C52C
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl ResetSpriteData
bl FreeAllSpritePalettes
ldr r1, _0813C530
@@ -397925,7 +397925,7 @@ sub_813CADC: @ 813CADC
pop {r0}
bx r0
.align 2, 0
-_0813CAF0: .4byte sub_813B7EC
+_0813CAF0: .4byte CB2_813B7EC
thumb_func_end sub_813CADC
thumb_func_start sub_813CAF4
@@ -398480,7 +398480,7 @@ _0813CF1C:
lsls r1, 16
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
lsls r1, r6, 24
lsrs r1, 24
mov r0, r8
@@ -398581,7 +398581,7 @@ sub_813CFA8: @ 813CFA8
lsls r1, 16
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
lsls r1, r6, 24
lsrs r1, 24
adds r0, r6, 0
@@ -402894,8 +402894,8 @@ _0813F0EA:
_0813F0F0: .4byte 0x02000000
thumb_func_end sub_813F0C8
- thumb_func_start sub_813F0F4
-sub_813F0F4: @ 813F0F4
+ thumb_func_start unref_sub_813F0F4
+unref_sub_813F0F4: @ 813F0F4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -403071,7 +403071,7 @@ sub_813F0F4: @ 813F0F4
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, _0813F2F0
ldrh r0, [r7, 0x20]
negs r0, r0
@@ -403129,7 +403129,7 @@ _0813F2F0: .4byte 0x030042c0
_0813F2F4: .4byte 0x030041b4
_0813F2F8: .4byte 0x03004b20
_0813F2FC: .4byte sub_813F300
- thumb_func_end sub_813F0F4
+ thumb_func_end unref_sub_813F0F4
thumb_func_start sub_813F300
sub_813F300: @ 813F300
@@ -403436,7 +403436,7 @@ sub_813F4EC: @ 813F4EC
adds r1, r3, r1
movs r2, 0x20
str r3, [sp, 0x8]
- bl gpu_pal_apply
+ bl LoadPalette
lsls r4, 1
add r4, r10
mov r2, r9
@@ -403447,7 +403447,7 @@ sub_813F4EC: @ 813F4EC
adds r0, r4, 0
adds r1, r3, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldrb r1, [r6, 0x5]
movs r2, 0xF
adds r0, r2, 0
@@ -411506,7 +411506,7 @@ _0814350A:
ldr r0, _0814356C
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
add sp, 0x8
pop {r3,r4}
mov r8, r3
@@ -411761,7 +411761,7 @@ sub_81436BC: @ 81436BC
lsls r1, 16
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
lsls r1, r5, 24
lsrs r1, 24
mov r0, r8
@@ -411861,7 +411861,7 @@ sub_81437A4: @ 81437A4
lsls r1, 16
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
lsls r1, r6, 24
lsrs r1, 24
adds r0, r6, 0
@@ -412136,7 +412136,7 @@ _08143A0E:
ldr r0, _08143AFC
movs r1, 0x80
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08143B00
ldr r1, _08143B04
movs r2, 0x20
@@ -412496,7 +412496,7 @@ _08143D24:
ldr r0, _08143DE0
movs r1, 0x1
movs r2, 0x3E
- bl gpu_pal_apply
+ bl LoadPalette
movs r1, 0
ldr r4, _08143DE4
movs r3, 0x11
@@ -414998,7 +414998,7 @@ sub_8145128: @ 8145128
ldr r0, _081451F0
adds r1, r5, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
lsrs r4, 20
lsls r4, 28
lsrs r4, 16
@@ -415777,7 +415777,7 @@ _081456FC:
lsls r1, 16
lsrs r1, 16
movs r2, 0x20
- bl decompress_palette
+ bl LoadCompressedPalette
mov r7, r9
lsls r6, r7, 24
lsrs r6, 24
@@ -416561,15 +416561,15 @@ _08145D5C: .4byte 0x0000404b
_08145D60: .4byte 0x0000404c
thumb_func_end sub_8145D3C
- thumb_func_start sub_8145D64
-sub_8145D64: @ 8145D64
+ thumb_func_start unref_sub_8145D64
+unref_sub_8145D64: @ 8145D64
push {lr}
lsls r0, 16
lsrs r0, 16
bl sub_8145D14
pop {r0}
bx r0
- thumb_func_end sub_8145D64
+ thumb_func_end unref_sub_8145D64
thumb_func_start sub_8145D74
sub_8145D74: @ 8145D74
@@ -416660,7 +416660,7 @@ sub_8145D88: @ 8145D88
ldr r0, _08145ED0
movs r1, 0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08145ED4
bl SetUpWindowConfig
ldr r0, _08145ED8
@@ -417298,7 +417298,7 @@ _081463A4:
ldr r0, _081463B8
movs r1, 0
movs r2, 0xC0
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r1, _081463BC
ldr r2, _081463C0
adds r1, r2
@@ -418009,8 +418009,8 @@ _08146924:
_0814692C: .4byte 0x03002970
thumb_func_end sub_8146914
- thumb_func_start sub_8146930
-sub_8146930: @ 8146930
+ thumb_func_start CB2_InitMysteryEventMenu
+CB2_InitMysteryEventMenu: @ 8146930
push {r4,lr}
bl ResetSpriteData
bl FreeAllSpritePalettes
@@ -418043,7 +418043,7 @@ sub_8146930: @ 8146930
movs r0, 0
movs r1, 0
movs r2, 0x2
- bl rboxid_80040B8
+ bl FillPalette
ldr r0, _081469A8
bl SetMainCallback2
pop {r4}
@@ -418054,7 +418054,7 @@ _0814699C: .4byte sub_8146900
_081469A0: .4byte gWindowConfig_81E6CE4
_081469A4: .4byte Task_DestroySelf
_081469A8: .4byte sub_81469E4
- thumb_func_end sub_8146930
+ thumb_func_end CB2_InitMysteryEventMenu
thumb_func_start sub_81469AC
sub_81469AC: @ 81469AC
@@ -418680,12 +418680,12 @@ _08146E6C:
ldr r0, _08146FEC
movs r1, 0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08146FF0
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08146FF4
bl SetUpWindowConfig
ldr r0, _08146FF8
@@ -420272,7 +420272,7 @@ _08147C60:
ldr r0, _08147C78
movs r1, 0x20
movs r2, 0x60
- bl decompress_palette
+ bl LoadCompressedPalette
ldr r0, _08147C7C
ldr r1, _08147C80
adds r0, r1
@@ -422093,7 +422093,7 @@ load_intro_part2_graphics: @ 8148B8C
ldr r0, _08148BF8
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
cmp r4, 0
beq _08148BB4
cmp r4, 0x1
@@ -422109,14 +422109,14 @@ _08148BB4:
ldr r0, _08148C08
movs r1, 0
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148C0C
bl LoadCompressedObjectPic
ldr r0, _08148C10
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_8149248
b _08148C46
.align 2, 0
@@ -422142,14 +422142,14 @@ _08148C14:
ldr r0, _08148C64
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148C68
bl LoadCompressedObjectPic
ldr r0, _08148C6C
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_8149264
_08148C46:
ldr r1, _08148C70
@@ -422237,7 +422237,7 @@ _08148CFC:
ldr r0, _08148D34
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148D38
movs r1, 0xC0
lsls r1, 19
@@ -422248,7 +422248,7 @@ _08148CFC:
ldr r0, _08148D44
movs r1, 0
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148D48
bl LoadCompressedObjectPic
ldr r0, _08148D4C
@@ -422270,7 +422270,7 @@ _08148D58:
ldr r0, _08148DA0
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148DA4
movs r1, 0xC0
lsls r1, 19
@@ -422281,7 +422281,7 @@ _08148D58:
ldr r0, _08148DB0
movs r1, 0
movs r2, 0x60
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148DB4
bl LoadCompressedObjectPic
ldr r0, _08148DB8
@@ -422292,7 +422292,7 @@ _08148D8E:
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_8149248
b _08148E58
.align 2, 0
@@ -422309,7 +422309,7 @@ _08148DC4:
ldr r0, _08148E04
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148E08
movs r1, 0xC0
lsls r1, 19
@@ -422321,14 +422321,14 @@ _08148DC4:
adds r0, r4, 0
movs r1, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148E18
bl LoadCompressedObjectPic
movs r1, 0x80
lsls r1, 1
adds r0, r4, 0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_8149264
b _08148E58
.align 2, 0
@@ -422342,7 +422342,7 @@ _08148E1C:
ldr r0, _08148E6C
movs r1, 0xF0
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148E70
movs r1, 0xC0
lsls r1, 19
@@ -422353,14 +422353,14 @@ _08148E1C:
ldr r0, _08148E7C
movs r1, 0
movs r2, 0x40
- bl gpu_pal_apply
+ bl LoadPalette
ldr r0, _08148E80
bl LoadCompressedObjectPic
ldr r0, _08148E84
movs r1, 0x80
lsls r1, 1
movs r2, 0x20
- bl gpu_pal_apply
+ bl LoadPalette
bl sub_8149280
_08148E58:
ldr r1, _08148E88
@@ -422637,11 +422637,11 @@ _08149076:
mov r0, sp
movs r1, 0x9
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xA
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
b _08149100
.align 2, 0
_08149094: .4byte 0x0202eac8
@@ -422689,11 +422689,11 @@ _081490E6:
mov r0, sp
movs r1, 0xC
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xD
movs r2, 0x2
- bl gpu_pal_apply
+ bl LoadPalette
_08149100:
add sp, 0x4
pop {r4}
@@ -423177,8 +423177,8 @@ _08149498: .4byte 0x02020004
_0814949C: .4byte sub_81493C4
thumb_func_end sub_8149424
- thumb_func_start sub_81494A0
-sub_81494A0: @ 81494A0
+ thumb_func_start unref_sub_81494A0
+unref_sub_81494A0: @ 81494A0
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -423234,7 +423234,7 @@ _0814950C: .4byte gUnknown_08416D94
_08149510: .4byte 0xffe00000
_08149514: .4byte 0x02020004
_08149518: .4byte sub_81493C4
- thumb_func_end sub_81494A0
+ thumb_func_end unref_sub_81494A0
thumb_func_start nullsub_84
nullsub_84: @ 814951C
@@ -425246,8 +425246,8 @@ sub_814A404: @ 814A404
bx r0
thumb_func_end sub_814A404
- thumb_func_start sub_814A414
-sub_814A414: @ 814A414
+ thumb_func_start unref_sub_814A414
+unref_sub_814A414: @ 814A414
push {lr}
sub sp, 0x8
bl sub_8071EF4
@@ -425281,7 +425281,7 @@ sub_814A414: @ 814A414
_0814A458: .4byte gUnknown_0842C29C
_0814A45C: .4byte 0x03004ae8
_0814A460: .4byte sub_814A464
- thumb_func_end sub_814A414
+ thumb_func_end unref_sub_814A414
thumb_func_start sub_814A464
sub_814A464: @ 814A464
@@ -425698,8 +425698,8 @@ _0814A7A4: .4byte 0x0203a3d0
_0814A7A8: .4byte 0x02020004
thumb_func_end sub_814A758
- thumb_func_start sub_814A7AC
-sub_814A7AC: @ 814A7AC
+ thumb_func_start unref_sub_814A7AC
+unref_sub_814A7AC: @ 814A7AC
push {r4-r7,lr}
lsls r0, 24
lsrs r0, 24
@@ -425741,7 +425741,7 @@ _0814A7DA:
bx r1
.align 2, 0
_0814A7F8: .4byte 0x0202eac8
- thumb_func_end sub_814A7AC
+ thumb_func_end unref_sub_814A7AC
thumb_func_start sub_814A7FC
sub_814A7FC: @ 814A7FC
@@ -426251,8 +426251,8 @@ _0814ABDC: .4byte 0x0400004b
_0814ABE0: .4byte 0x0203a3d4
thumb_func_end sub_814AB84
- thumb_func_start sub_814ABE4
-sub_814ABE4: @ 814ABE4
+ thumb_func_start unref_sub_814ABE4
+unref_sub_814ABE4: @ 814ABE4
push {r4,lr}
adds r4, r0, 0
ldr r1, _0814AC40
@@ -426304,7 +426304,7 @@ _0814AC48: .4byte 0x0203a3d0
_0814AC4C: .4byte 0x02020004
_0814AC50: .4byte gUnknown_0842F758
_0814AC54: .4byte 0x0203a3d1
- thumb_func_end sub_814ABE4
+ thumb_func_end unref_sub_814ABE4
thumb_func_start sub_814AC58
sub_814AC58: @ 814AC58
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 5b83d3d03..4fd54975d 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -34,15 +34,33 @@
#define INTR_CHECK (*(u16 *)0x3007FF8)
#define INTR_VECTOR (*(void **)0x3007FFC)
-#define BG_VRAM 0x6000000
+#define PLTT 0x5000000
+#define PLTT_SIZE 0x400
+#define BG_PLTT PLTT
+#define BG_PLTT_SIZE 0x200
+
+#define OBJ_PLTT (PLTT + 0x200)
+#define OBJ_PLTT_SIZE 0x200
+
+#define VRAM 0x6000000
+#define VRAM_SIZE 0x18000
+
+#define BG_VRAM VRAM
+#define BG_VRAM_SIZE 0x10000
#define BG_CHAR_ADDR(n) (BG_VRAM + (0x4000 * (n)))
#define BG_SCREEN_ADDR(n) (BG_VRAM + (0x800 * (n)))
-#define OBJ_VRAM0 0x6010000 // when BG is in tiled mode
-#define OBJ_VRAM1 0x6014000 // when BG is in bitmap mode
+// text-mode BG
+#define OBJ_VRAM0 (VRAM + 0x10000)
+#define OBJ_VRAM0_SIZE 0x8000
+
+// bitmap-mode BG
+#define OBJ_VRAM1 (VRAM + 0x14000)
+#define OBJ_VRAM1_SIZE 0x4000
-#define OAM 0x7000000
+#define OAM 0x7000000
+#define OAM_SIZE 0x400
#define DISPLAY_WIDTH 240
#define DISPLAY_HEIGHT 160
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h
index 3c30c494e..0be92fa60 100644
--- a/include/gba/io_reg.h
+++ b/include/gba/io_reg.h
@@ -24,16 +24,20 @@
#define REG_OFFSET_BG2PB 0x22
#define REG_OFFSET_BG2PC 0x24
#define REG_OFFSET_BG2PD 0x26
+#define REG_OFFSET_BG2X 0x28
#define REG_OFFSET_BG2X_L 0x28
#define REG_OFFSET_BG2X_H 0x2a
+#define REG_OFFSET_BG2Y 0x2c
#define REG_OFFSET_BG2Y_L 0x2c
#define REG_OFFSET_BG2Y_H 0x2e
#define REG_OFFSET_BG3PA 0x30
#define REG_OFFSET_BG3PB 0x32
#define REG_OFFSET_BG3PC 0x34
#define REG_OFFSET_BG3PD 0x36
+#define REG_OFFSET_BG3X 0x38
#define REG_OFFSET_BG3X_L 0x38
#define REG_OFFSET_BG3X_H 0x3a
+#define REG_OFFSET_BG3Y 0x3c
#define REG_OFFSET_BG3Y_L 0x3c
#define REG_OFFSET_BG3Y_H 0x3e
#define REG_OFFSET_WIN0H 0x40
@@ -197,16 +201,20 @@
#define REG_ADDR_BG2PB (REG_BASE + REG_OFFSET_BG2PB)
#define REG_ADDR_BG2PC (REG_BASE + REG_OFFSET_BG2PC)
#define REG_ADDR_BG2PD (REG_BASE + REG_OFFSET_BG2PD)
+#define REG_ADDR_BG2X (REG_BASE + REG_OFFSET_BG2X)
#define REG_ADDR_BG2X_L (REG_BASE + REG_OFFSET_BG2X_L)
#define REG_ADDR_BG2X_H (REG_BASE + REG_OFFSET_BG2X_H)
+#define REG_ADDR_BG2Y (REG_BASE + REG_OFFSET_BG2Y)
#define REG_ADDR_BG2Y_L (REG_BASE + REG_OFFSET_BG2Y_L)
#define REG_ADDR_BG2Y_H (REG_BASE + REG_OFFSET_BG2Y_H)
#define REG_ADDR_BG3PA (REG_BASE + REG_OFFSET_BG3PA)
#define REG_ADDR_BG3PB (REG_BASE + REG_OFFSET_BG3PB)
#define REG_ADDR_BG3PC (REG_BASE + REG_OFFSET_BG3PC)
#define REG_ADDR_BG3PD (REG_BASE + REG_OFFSET_BG3PD)
+#define REG_ADDR_BG3X (REG_BASE + REG_OFFSET_BG3X)
#define REG_ADDR_BG3X_L (REG_BASE + REG_OFFSET_BG3X_L)
#define REG_ADDR_BG3X_H (REG_BASE + REG_OFFSET_BG3X_H)
+#define REG_ADDR_BG3Y (REG_BASE + REG_OFFSET_BG3Y)
#define REG_ADDR_BG3Y_L (REG_BASE + REG_OFFSET_BG3Y_L)
#define REG_ADDR_BG3Y_H (REG_BASE + REG_OFFSET_BG3Y_H)
#define REG_ADDR_WIN0H (REG_BASE + REG_OFFSET_WIN0H)
@@ -350,7 +358,36 @@
#define REG_BG2VOFS (*(vu16 *)REG_ADDR_BG2VOFS)
#define REG_BG3HOFS (*(vu16 *)REG_ADDR_BG3HOFS)
#define REG_BG3VOFS (*(vu16 *)REG_ADDR_BG3VOFS)
+#define REG_BG2PA (*(vu16 *)REG_ADDR_BG2PA)
+#define REG_BG2PB (*(vu16 *)REG_ADDR_BG2PB)
+#define REG_BG2PC (*(vu16 *)REG_ADDR_BG2PC)
+#define REG_BG2PD (*(vu16 *)REG_ADDR_BG2PD)
+#define REG_BG2X (*(vu32 *)REG_ADDR_BG2X)
+#define REG_BG2X_L (*(vu16 *)REG_ADDR_BG2X_L)
+#define REG_BG2X_H (*(vu16 *)REG_ADDR_BG2X_H)
+#define REG_BG2Y (*(vu32 *)REG_ADDR_BG2Y)
+#define REG_BG2Y_L (*(vu16 *)REG_ADDR_BG2Y_L)
+#define REG_BG2Y_H (*(vu16 *)REG_ADDR_BG2Y_H)
+#define REG_BG3PA (*(vu16 *)REG_ADDR_BG3PA)
+#define REG_BG3PB (*(vu16 *)REG_ADDR_BG3PB)
+#define REG_BG3PC (*(vu16 *)REG_ADDR_BG3PC)
+#define REG_BG3PD (*(vu16 *)REG_ADDR_BG3PD)
+#define REG_BG3X (*(vu32 *)REG_ADDR_BG3X)
+#define REG_BG3X_L (*(vu16 *)REG_ADDR_BG3X_L)
+#define REG_BG3X_H (*(vu16 *)REG_ADDR_BG3X_H)
+#define REG_BG3Y (*(vu32 *)REG_ADDR_BG3Y)
+#define REG_BG3Y_L (*(vu16 *)REG_ADDR_BG3Y_L)
+#define REG_BG3Y_H (*(vu16 *)REG_ADDR_BG3Y_H)
+#define REG_WIN0H (*(vu16 *)REG_ADDR_WIN0H)
+#define REG_WIN1H (*(vu16 *)REG_ADDR_WIN1H)
+#define REG_WIN0V (*(vu16 *)REG_ADDR_WIN0V)
+#define REG_WIN1V (*(vu16 *)REG_ADDR_WIN1V)
+#define REG_WININ (*(vu16 *)REG_ADDR_WININ)
+#define REG_WINOUT (*(vu16 *)REG_ADDR_WINOUT)
+#define REG_MOSAIC (*(vu16 *)REG_ADDR_MOSAIC)
+#define REG_BLDCNT (*(vu16 *)REG_ADDR_BLDCNT)
#define REG_BLDALPHA (*(vu16 *)REG_ADDR_BLDALPHA)
+#define REG_BLDY (*(vu16 *)REG_ADDR_BLDY)
#define REG_SOUND1CNT_L (*(vu16 *)REG_ADDR_SOUND1CNT_L)
#define REG_NR10 (*(vu8 *)REG_ADDR_NR10)
diff --git a/src/link.c b/src/link.c
index 64e33fdfc..5a194e449 100644
--- a/src/link.c
+++ b/src/link.c
@@ -25,7 +25,7 @@ struct LinkTestBGInfo
u32 dummy_C;
};
-extern void gpu_pal_apply(const u16 *, u16, u32);
+extern void LoadPalette(const u16 *, u16, u32);
extern void sub_8071C4C(const struct WindowConfig *);
extern u16 Random(void);
extern void SeedRng(u16);
@@ -201,7 +201,7 @@ void Task_DestroySelf(u8 taskId)
static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
{
- gpu_pal_apply(sLinkTestDigitPalette, 16 * paletteNum, 32);
+ LoadPalette(sLinkTestDigitPalette, 16 * paletteNum, 32);
DmaCopy16(3, sLinkTestDigitTiles, BG_CHAR_ADDR(charBaseBlock), 0x220);
gLinkTestBGInfo.screenBaseBlock = screenBaseBlock;
@@ -223,7 +223,7 @@ static void InitLinkTestBG(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charB
static void InitLinkTestBG_Unused(u8 paletteNum, u8 bgNum, u8 screenBaseBlock, u8 charBaseBlock)
{
- gpu_pal_apply(sLinkTestDigitPalette, 16 * paletteNum, 32);
+ LoadPalette(sLinkTestDigitPalette, 16 * paletteNum, 32);
DmaCopy16(3, sLinkTestDigitTiles, BG_CHAR_ADDR(charBaseBlock), 0x220);
gLinkTestBGInfo.screenBaseBlock = screenBaseBlock;
@@ -1223,7 +1223,7 @@ void CB2_LinkError(void)
ResetSpriteData();
FreeAllSpritePalettes();
pal_fade_control_reset_maybe();
- rboxid_80040B8(0, 0, 2);
+ FillPalette(0, 0, 2);
ResetTasks();
SetVBlankCallback(VBlankCB_LinkTest);
SetUpWindowConfig(&gWindowConfig_81E7198);
diff --git a/src/sprite.c b/src/sprite.c
index ebe1648fa..b96f264a3 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -51,7 +51,7 @@ struct OamDimensions
s8 height;
};
-void gpu_pal_apply(u16 *, u16, u32);
+void LoadPalette(u16 *, u16, u32);
void sub_814A590(void);
static void UpdateOamCoords(void);
@@ -1668,7 +1668,7 @@ void LoadSpritePalettes(struct SpritePalette *palettes)
static void DoLoadSpritePalette(u16 *src, u16 paletteOffset)
{
- gpu_pal_apply(src, paletteOffset + 0x100, 32);
+ LoadPalette(src, paletteOffset + 0x100, 32);
}
u8 AllocSpritePalette(u16 tag)
diff --git a/src/text.c b/src/text.c
index c6455f1f0..276a2ccfb 100644
--- a/src/text.c
+++ b/src/text.c
@@ -117,7 +117,7 @@ struct ShiftAmount
u32 right;
};
-extern void gpu_pal_apply(const u16 *, u16, u32);
+extern void LoadPalette(const u16 *, u16, u32);
extern void sub_8075474(u16);
extern void audio_play(u16);
extern u8 mplay_has_finished_maybe(void);
@@ -1800,7 +1800,7 @@ static void ClearBGMem(struct WindowConfig *winConfig)
void LoadFontDefaultPalette(struct WindowConfig *winConfig)
{
- gpu_pal_apply(gFontDefaultPalette, 16 * winConfig->paletteNum, 32);
+ LoadPalette(gFontDefaultPalette, 16 * winConfig->paletteNum, 32);
}
void SetUpWindowConfig(struct WindowConfig *winConfig)
diff --git a/tools/preproc/asm_file.cpp b/tools/preproc/asm_file.cpp
index eba486e66..7deaccc8a 100644
--- a/tools/preproc/asm_file.cpp
+++ b/tools/preproc/asm_file.cpp
@@ -197,6 +197,31 @@ Directive AsmFile::GetDirective()
return Directive::Unknown;
}
+// Checks if we're at label that ends with '::'.
+// Returns the name if so and an empty string if not.
+std::string AsmFile::GetGlobalLabel()
+{
+ long start = m_pos;
+ long pos = m_pos;
+
+ if (IsIdentifierStartingChar(m_buffer[pos]))
+ {
+ pos++;
+
+ while (IsIdentifierChar(m_buffer[pos]))
+ pos++;
+ }
+
+ if (m_buffer[pos] == ':' && m_buffer[pos + 1] == ':')
+ {
+ m_pos = pos + 2;
+ ExpectEmptyRestOfLine();
+ return std::string(&m_buffer[start], pos - start);
+ }
+
+ return std::string();
+}
+
// Skips tabs and spaces.
void AsmFile::SkipWhitespace()
{
diff --git a/tools/preproc/asm_file.h b/tools/preproc/asm_file.h
index c0aba878d..d73b36e90 100644
--- a/tools/preproc/asm_file.h
+++ b/tools/preproc/asm_file.h
@@ -42,6 +42,7 @@ public:
AsmFile(const AsmFile&) = delete;
~AsmFile();
Directive GetDirective();
+ std::string GetGlobalLabel();
std::string ReadPath();
int ReadString(unsigned char* s);
int ReadBraille(unsigned char* s);
diff --git a/tools/preproc/preproc.cpp b/tools/preproc/preproc.cpp
index 38ae762ea..b51861580 100644
--- a/tools/preproc/preproc.cpp
+++ b/tools/preproc/preproc.cpp
@@ -84,9 +84,22 @@ void PreprocAsmFile(std::string filename)
break;
}
case Directive::Unknown:
- stack.top().OutputLine();
+ {
+ std::string globalLabel = stack.top().GetGlobalLabel();
+
+ if (globalLabel.length() != 0)
+ {
+ printf("\t.global %s\n", globalLabel.c_str());
+ printf("%s:\n", globalLabel.c_str());
+ }
+ else
+ {
+ stack.top().OutputLine();
+ }
+
break;
}
+ }
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 12:16:36 +0000