Merge branch 'master' into easy_chat

.gitignore

@@ -23,5 +23,6 @@ tools/*
 *.dump
 *.sa*
 Thumbs.db
+build/
 .DS_Store
 *.ddump

Makefile

@@ -1,5 +1,19 @@
 SHELL := /bin/bash -o pipefail
 
+ROM := pokeemerald.gba
+OBJ_DIR := build/emerald
+
+ELF = $(ROM:.gba=.elf)
+MAP = $(ROM:.gba=.map)
+
+C_SUBDIR = src
+ASM_SUBDIR = asm
+DATA_ASM_SUBDIR = data
+
+C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
+ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
+DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
+
 AS      := $(DEVKITARM)/bin/arm-none-eabi-as
 ASFLAGS := -mcpu=arm7tdmi
 
@@ -10,7 +24,7 @@ CPP      := $(DEVKITARM)/bin/arm-none-eabi-cpp
 CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
 
 LD      := $(DEVKITARM)/bin/arm-none-eabi-ld
-LDFLAGS := -T ld_script.ld -Map pokeemerald.map
+LDFLAGS = -Map ../../$(MAP)
 
 OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
 
@@ -20,7 +34,7 @@ SHA1 := sha1sum -c
 
 GFX := tools/gbagfx/gbagfx
 AIF := tools/aif2pcm/aif2pcm
-MID := tools/mid2agb/mid2agb
+MID := $(abspath tools/mid2agb/mid2agb)
 SCANINC := tools/scaninc/scaninc
 PREPROC := tools/preproc/preproc
 RAMSCRGEN := tools/ramscrgen/ramscrgen
@@ -35,19 +49,19 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen
 
 .PHONY: rom clean compare tidy
 
-C_SRCS := $(wildcard src/*.c)
+$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR))
-C_OBJS := $(C_SRCS:%.c=%.o)
 
-ASM_SRCS := $(wildcard asm/*.s)
+C_SRCS := $(wildcard $(C_SUBDIR)/*.c)
-ASM_OBJS := $(ASM_SRCS:%.s=%.o)
+C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 
-DATA_ASM_SRCS := $(wildcard data/*.s)
+ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
-DATA_ASM_OBJS := $(DATA_ASM_SRCS:%.s=%.o)
+ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
+
+DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s)
+DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
 
 OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS)
-
+OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
-ROM := pokeemerald.gba
-ELF := $(ROM:.gba=.elf)
 
 rom: $(ROM)
 
@@ -59,8 +73,8 @@ clean: tidy
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
 
 tidy:
-	rm -f ld_script.ld sym_bss.ld sym_common.ld sym_ewram.ld
+	rm -f $(ROM) $(ELF) $(MAP)
-	rm -f $(ROM) $(ELF) $(OBJS) $(C_SRCS:%.c=%.i) pokeemerald.map
+	rm -r build/*
 
 include graphics_file_rules.mk
 
@@ -75,56 +89,62 @@ include graphics_file_rules.mk
 %.lz: % ; $(GFX) $< $@
 %.rl: % ; $(GFX) $< $@
 
-src/libc.o: CC1 := tools/agbcc/bin/old_agbcc
+$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
-src/libc.o: CFLAGS := -O2
+$(C_BUILDDIR)/libc.o: CFLAGS := -O2
 
-src/siirtc.o: CFLAGS := -mthumb-interwork
+$(C_BUILDDIR)/siirtc.o: CFLAGS := -mthumb-interwork
 
-src/agb_flash.o: CFLAGS := -O -mthumb-interwork
+$(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
-src/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
+$(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
-src/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
+$(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
 
-src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
+$(C_BUILDDIR)/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
-src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
+$(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
 
 ifeq ($(NODEP),)
-%.o: c_dep = $(shell $(SCANINC) $*.c)
+$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include $(C_SUBDIR)/$*.c)
 else
-%.o: c_dep :=
+$(C_BUILDDIR)/%.o: c_dep :=
 endif
 
-$(C_OBJS): %.o : %.c $$(c_dep)
+$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
-	@$(CPP) $(CPPFLAGS) $< -o $*.i
+	@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
-	@$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s
+	@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $*.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
-	$(AS) $(ASFLAGS) -o $@ $*.s
+	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
 
 ifeq ($(NODEP),)
-%.o: asm_dep = $(shell $(SCANINC) $*.s)
+$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s)
 else
-%.o: asm_dep :=
+$(ASM_BUILDDIR)/%.o: asm_dep :=
 endif
 
-$(ASM_OBJS): %.o: %.s $$(asm_dep)
+$(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
 	$(AS) $(ASFLAGS) -o $@ $<
 
-$(DATA_ASM_OBJS): %.o: %.s $$(asm_dep)
+ifeq ($(NODEP),)
+$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
+else
+$(DATA_ASM_BUILDDIR)/%.o: data_dep :=
+endif
+
+$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)
 	$(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) -o $@
 
-sym_bss.ld: sym_bss.txt
+$(OBJ_DIR)/sym_bss.ld: sym_bss.txt
-	$(RAMSCRGEN) .bss sym_bss.txt ENGLISH >$@
+	$(RAMSCRGEN) .bss $< ENGLISH > $@
 
-sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
+$(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
-	$(RAMSCRGEN) COMMON sym_common.txt ENGLISH -c src,common_syms >$@
+	$(RAMSCRGEN) COMMON $< ENGLISH -c $(C_BUILDDIR),common_syms > $@
 
-sym_ewram.ld: sym_ewram.txt
+$(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
-	$(RAMSCRGEN) ewram_data sym_ewram.txt ENGLISH >$@
+	$(RAMSCRGEN) ewram_data $< ENGLISH > $@
 
-ld_script.ld: ld_script.txt sym_bss.ld sym_common.ld sym_ewram.ld
+$(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
-	sed -f ld_script.sed ld_script.txt >ld_script.ld
+	cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" | sed "s#sound/#../../sound/#g" > ld_script.ld
 
-$(ELF): ld_script.ld $(OBJS)
+$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBGCC)
+	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC)
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@

asm/battle_1.s

@@ -1358,8 +1358,8 @@ _080356AA:
 	.pool
 	thumb_func_end trs_config
 
-	thumb_func_start c2_berry_program_update_menu
+	thumb_func_start sub_80356D0
-c2_berry_program_update_menu: @ 80356D0
+sub_80356D0: @ 80356D0
 	push {lr}
 	movs r0, 0x2
 	bl DisableInterrupts
@@ -1381,10 +1381,10 @@ c2_berry_program_update_menu: @ 80356D0
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end c2_berry_program_update_menu
+	thumb_func_end sub_80356D0
 
-	thumb_func_start sub_803570C
+	thumb_func_start ApplyPlayerChosenFrameToBattleMenu
-sub_803570C: @ 803570C
+ApplyPlayerChosenFrameToBattleMenu: @ 803570C
 	push {lr}
 	movs r0, 0x2
 	movs r1, 0x12
@@ -1422,10 +1422,10 @@ _0803575A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_803570C
+	thumb_func_end ApplyPlayerChosenFrameToBattleMenu
 
-	thumb_func_start load_battle_oval_graphics
+	thumb_func_start DrawMainBattleBackground
-load_battle_oval_graphics: @ 8035770
+DrawMainBattleBackground: @ 8035770
 	push {r4,r5,lr}
 	ldr r0, =gBattleTypeFlags
 	ldr r1, [r0]
@@ -1547,8 +1547,8 @@ _080358E0:
 	.4byte _08035A40
 	.4byte _08035A70
 _08035904:
-	ldr r4, =gUnknown_0831ABA8
+	ldr r4, =gBattleTerrainTable
-	ldr r5, =gUnknown_02022FF0
+	ldr r5, =gBattleTerrain
 	ldrb r1, [r5]
 	lsls r0, r1, 2
 	adds r0, r1
@@ -1665,10 +1665,10 @@ _08035A8A:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end load_battle_oval_graphics
+	thumb_func_end DrawMainBattleBackground
 
-	thumb_func_start sub_8035AA4
+	thumb_func_start LoadBattleTextboxAndBackground
-sub_8035AA4: @ 8035AA4
+LoadBattleTextboxAndBackground: @ 8035AA4
 	push {lr}
 	ldr r0, =gUnknown_08C00000
 	movs r1, 0xC0
@@ -1685,12 +1685,12 @@ sub_8035AA4: @ 8035AA4
 	movs r1, 0
 	movs r2, 0x40
 	bl LoadCompressedPalette
-	bl sub_803570C
+	bl ApplyPlayerChosenFrameToBattleMenu
-	bl load_battle_oval_graphics
+	bl DrawMainBattleBackground
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8035AA4
+	thumb_func_end LoadBattleTextboxAndBackground
 
 	thumb_func_start sub_8035AE4
 sub_8035AE4: @ 8035AE4
@@ -1888,7 +1888,7 @@ sub_8035C4C: @ 8035C4C
 	bne _08035C68
 	ldr r0, =gText_Draw
 	movs r1, 0x15
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	b _08035D68
 	.pool
 _08035C68:
@@ -1964,10 +1964,10 @@ _08035CE2:
 _08035CFC:
 	ldr r0, =gText_Win
 	movs r1, 0x17
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Loss
 	movs r1, 0x16
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	b _08035D68
 	.pool
 _08035D20:
@@ -1985,19 +1985,19 @@ _08035D20:
 _08035D36:
 	ldr r0, =gText_Win
 	movs r1, 0x16
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Loss
 	movs r1, 0x17
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	b _08035D68
 	.pool
 _08035D58:
 	ldr r0, =gText_Win
 	movs r1, 0x17
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Loss
 	movs r1, 0x16
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 _08035D68:
 	pop {r0}
 	bx r0
@@ -2068,14 +2068,14 @@ _08035DDC:
 _08035DE6:
 	adds r0, r1, 0
 	movs r1, 0x11
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldrb r1, [r4, 0x18]
 	movs r0, 0x4
 	b _08035E14
 _08035DF4:
 	adds r0, r1, 0
 	movs r1, 0x12
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldrb r1, [r4, 0x18]
 	movs r0, 0x4
 	str r0, [sp]
@@ -2085,7 +2085,7 @@ _08035DF4:
 _08035E08:
 	adds r0, r1, 0
 	movs r1, 0x13
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldrb r1, [r4, 0x18]
 	movs r0, 0x8
 _08035E14:
@@ -2099,7 +2099,7 @@ _08035E1A:
 _08035E22:
 	adds r0, r1, 0
 	movs r1, 0x14
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldrb r1, [r4, 0x18]
 	movs r0, 0x8
 	str r0, [sp]
@@ -2139,14 +2139,14 @@ _08035E66:
 	adds r1, r0, r4
 	adds r0, r1, 0
 	movs r1, 0xF
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	lsls r0, r6, 3
 	subs r0, r6
 	lsls r0, 2
 	adds r1, r0, r4
 	adds r0, r1, 0
 	movs r1, 0x10
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	movs r4, 0x7
 	str r4, [sp]
 	adds r0, r7, 0
@@ -2236,7 +2236,7 @@ _08035F64:
 	ldrsh r0, [r5, r1]
 	cmp r0, 0
 	beq _08035FCC
-	ldr r4, =gUnknown_02022E18
+	ldr r4, =gBattle_BG1_X
 	ldrh r0, [r5, 0xA]
 	bl Sin2
 	lsls r0, 16
@@ -2251,7 +2251,7 @@ _08035F7E:
 	adds r0, r2, 0
 	subs r0, r1
 	strh r0, [r4]
-	ldr r4, =gUnknown_02022E1C
+	ldr r4, =gBattle_BG2_X
 	ldrh r0, [r5, 0xC]
 	bl Sin2
 	lsls r0, 16
@@ -2266,16 +2266,16 @@ _08035F9C:
 	adds r0, r3, 0
 	subs r0, r1
 	strh r0, [r4]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	ldr r2, =0x0000ffdc
 	adds r1, r2, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r1, [r0]
 	b _08036038
 	.pool
 _08035FCC:
-	ldr r4, =gUnknown_02022E18
+	ldr r4, =gBattle_BG1_X
 	ldrh r0, [r5, 0xA]
 	bl Sin2
 	lsls r0, 16
@@ -2290,7 +2290,7 @@ _08035FDE:
 	adds r0, r3, 0
 	subs r0, r1
 	strh r0, [r4]
-	ldr r4, =gUnknown_02022E1A
+	ldr r4, =gBattle_BG1_Y
 	ldrh r0, [r5, 0xA]
 	bl Cos2
 	lsls r0, 16
@@ -2302,7 +2302,7 @@ _08035FFC:
 	asrs r0, 5
 	subs r0, 0xA4
 	strh r0, [r4]
-	ldr r4, =gUnknown_02022E1C
+	ldr r4, =gBattle_BG2_X
 	ldrh r0, [r5, 0xC]
 	bl Sin2
 	lsls r0, 16
@@ -2317,7 +2317,7 @@ _08036014:
 	adds r0, r2, 0
 	subs r0, r1
 	strh r0, [r4]
-	ldr r4, =gUnknown_02022E1E
+	ldr r4, =gBattle_BG2_Y
 	ldrh r0, [r5, 0xC]
 	bl Cos2
 	lsls r0, 16
@@ -2457,8 +2457,8 @@ _08036138:
 	.pool
 	thumb_func_end task00_0800F6FC
 
-	thumb_func_start sub_8036154
+	thumb_func_start LoadBattleEntryBackground
-sub_8036154: @ 8036154
+LoadBattleEntryBackground: @ 8036154
 	push {r4,r5,lr}
 	ldr r0, =gBattleTypeFlags
 	ldr r1, [r0]
@@ -2504,11 +2504,11 @@ sub_8036154: @ 8036154
 	movs r0, 0x4A
 	movs r1, 0x36
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	ldr r2, =0x0000ff5c
 	adds r1, r2, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r1, [r0]
 	ldr r0, =gUnknown_0831AA00
 	bl LoadCompressedObjectPicUsingHeap
@@ -2632,8 +2632,8 @@ _08036350:
 	lsls r0, 24
 	cmp r0, 0
 	bne _0803639C
-	ldr r4, =gUnknown_0831ABA8
+	ldr r4, =gBattleTerrainTable
-	ldr r5, =gUnknown_02022FF0
+	ldr r5, =gBattleTerrain
 	ldrb r1, [r5]
 	lsls r0, r1, 2
 	adds r0, r1
@@ -2668,10 +2668,10 @@ _080363AC:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8036154
+	thumb_func_end LoadBattleEntryBackground
 
-	thumb_func_start sub_80363C4
+	thumb_func_start LoadChosenBattleElement
-sub_80363C4: @ 80363C4
+LoadChosenBattleElement: @ 80363C4
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2778,8 +2778,8 @@ _080364A8:
 	.4byte _08036510
 	.4byte _08036518
 _080364CC:
-	ldr r2, =gUnknown_0831ABA8
+	ldr r2, =gBattleTerrainTable
-	ldr r0, =gUnknown_02022FF0
+	ldr r0, =gBattleTerrain
 	ldrb r1, [r0]
 	lsls r0, r1, 2
 	adds r0, r1
@@ -2888,8 +2888,8 @@ _080365B4:
 	.4byte _0803661C
 	.4byte _08036624
 _080365D8:
-	ldr r2, =gUnknown_0831ABA8
+	ldr r2, =gBattleTerrainTable
-	ldr r0, =gUnknown_02022FF0
+	ldr r0, =gBattleTerrain
 	ldrb r1, [r0]
 	lsls r0, r1, 2
 	adds r0, r1
@@ -3003,8 +3003,8 @@ _080366C8:
 	.4byte _08036738
 	.4byte _08036740
 _080366EC:
-	ldr r2, =gUnknown_0831ABA8
+	ldr r2, =gBattleTerrainTable
-	ldr r0, =gUnknown_02022FF0
+	ldr r0, =gBattleTerrain
 	ldrb r1, [r0]
 	lsls r0, r1, 2
 	adds r0, r1
@@ -3051,7 +3051,7 @@ _08036742:
 	b _08036758
 	.pool
 _08036750:
-	bl sub_803570C
+	bl ApplyPlayerChosenFrameToBattleMenu
 	b _08036758
 _08036756:
 	movs r4, 0x1
@@ -3060,6 +3060,6 @@ _08036758:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80363C4
+	thumb_func_end LoadChosenBattleElement
 
 	.align 2, 0 @ Don't pad with nop.

asm/battle_5.s

@@ -6,8 +6,8 @@
 	.text
 
     
-	thumb_func_start sub_8056F28
+	thumb_func_start AllocateBattleResrouces
-sub_8056F28: @ 8056F28
+AllocateBattleResrouces: @ 8056F28
 	push {r4-r6,lr}
 	ldr r5, =gBattleResources
 	ldr r6, =gBattleTypeFlags
@@ -59,13 +59,13 @@ _08056F3E:
 	bl AllocZeroed
 	ldr r1, [r5]
 	str r0, [r1, 0x1C]
-	ldr r4, =gUnknown_020244A0
+	ldr r4, =gLinkBattleSendBuffer
 	movs r5, 0x80
 	lsls r5, 5
 	adds r0, r5, 0
 	bl AllocZeroed
 	str r0, [r4]
-	ldr r4, =gUnknown_020244A4
+	ldr r4, =gLinkBattleRecvBuffer
 	adds r0, r5, 0
 	bl AllocZeroed
 	str r0, [r4]
@@ -102,10 +102,10 @@ _08056FFA:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8056F28
+	thumb_func_end AllocateBattleResrouces
 
-	thumb_func_start sub_8057028
+	thumb_func_start FreeBattleResources
-sub_8057028: @ 8057028
+FreeBattleResources: @ 8057028
 	push {r4-r6,lr}
 	ldr r0, =gBattleTypeFlags
 	ldr r0, [r0]
@@ -160,11 +160,11 @@ _0805703C:
 	str r5, [r0, 0x1C]
 	bl Free
 	str r5, [r6]
-	ldr r4, =gUnknown_020244A0
+	ldr r4, =gLinkBattleSendBuffer
 	ldr r0, [r4]
 	bl Free
 	str r5, [r4]
-	ldr r4, =gUnknown_020244A4
+	ldr r4, =gLinkBattleRecvBuffer
 	ldr r0, [r4]
 	bl Free
 	str r5, [r4]
@@ -181,10 +181,10 @@ _080570D0:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8057028
+	thumb_func_end FreeBattleResources
 
-	thumb_func_start sub_80570F4
+	thumb_func_start AdjustFriendshipOnBattleFaint
-sub_80570F4: @ 80570F4
+AdjustFriendshipOnBattleFaint: @ 80570F4
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -195,11 +195,11 @@ sub_80570F4: @ 80570F4
 	cmp r0, 0
 	beq _08057140
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0x3
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r3, r0, 24
 	ldr r2, =gBattleMons
@@ -220,7 +220,7 @@ sub_80570F4: @ 80570F4
 	.pool
 _08057140:
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 _0805714A:
@@ -285,7 +285,7 @@ _080571CE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80570F4
+	thumb_func_end AdjustFriendshipOnBattleFaint
 
 	thumb_func_start sub_80571DC
 sub_80571DC: @ 80571DC
@@ -414,7 +414,7 @@ _0805729A:
 	ldr r1, =0xf7ffffff
 	ands r0, r1
 	str r0, [r2]
-	bl b_movescr_stack_push_cursor
+	bl BattleScriptPushCursor
 	movs r0, 0x1
 	mov r2, r10
 	strb r0, [r2, 0x5]
@@ -474,7 +474,7 @@ _08057354:
 	ldr r1, =0xf7ffffff
 	ands r0, r1
 	str r0, [r2]
-	bl b_movescr_stack_push_cursor
+	bl BattleScriptPushCursor
 	ldr r0, =gBattleCommunication
 	strb r4, [r0, 0x5]
 	ldr r1, =gBattlescriptCurrInstr
@@ -523,7 +523,7 @@ _080573D4:
 	negs r1, r1
 	ands r0, r1
 	str r0, [r4]
-	bl b_movescr_stack_push_cursor
+	bl BattleScriptPushCursor
 	ldr r1, =gBattlescriptCurrInstr
 	ldr r0, =BattleScript_MoveUsedUnfroze
 	str r0, [r1]
@@ -562,7 +562,7 @@ _08057406:
 	movs r1, 0x28
 	movs r2, 0
 	movs r3, 0x4
-	bl EmitSetAttributes
+	bl EmitSetMonData
 	ldrb r0, [r4]
 	bl MarkBufferBankForExecution
 _08057430:

asm/battle_anim_80A9C70.s

@@ -26,9 +26,9 @@ sub_80A9C70: @ 80A9C70
 	lsls r0, 24
 	lsrs r0, 24
 	mov r8, r0
-	ldr r0, =gUnknown_08524F84
+	ldr r0, =gBattleAnimPicTable + 0x440
 	bl LoadCompressedObjectPicUsingHeap
-	ldr r0, =gUnknown_0852588C
+	ldr r0, =gBattleAnimPaletteTable + 0x440
 	bl LoadCompressedObjectPaletteUsingHeap
 	ldr r1, =gTasks
 	mov r2, r8
@@ -331,7 +331,7 @@ sub_80A9EF4: @ 80A9EF4
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
-	ldr r4, =gAnimationBankTarget
+	ldr r4, =gAnimBankTarget
 	ldrb r0, [r4]
 	movs r1, 0x2
 	bl sub_80A5C6C
@@ -616,7 +616,7 @@ _080AA16C:
 	movs r1, 0
 	bl SetGpuReg
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080AA186:
 	pop {r4}
 	pop {r0}
@@ -629,7 +629,7 @@ sub_80AA18C: @ 80AA18C
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r3, 0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrh r0, [r0]
@@ -829,7 +829,7 @@ _080AA322:
 	b _080AA330
 _080AA328:
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080AA352
 _080AA330:
 	ldr r0, =gBattleAnimArgs
@@ -863,13 +863,13 @@ move_anim_start_t2: @ 80AA364
 	lsrs r4, 24
 	lsls r1, 24
 	lsrs r1, 24
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	strb r4, [r0]
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	strb r4, [r0]
 	ldr r0, =gUnknown_082C92FC
 	movs r2, 0
-	bl move_something
+	bl DoBattleAnim
 	ldr r0, =task0A_80788BC
 	movs r1, 0xA
 	bl CreateTask
@@ -899,7 +899,7 @@ task0A_80788BC: @ 80AA3B4
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080AA3F6
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r1, =gTasks
 	lsls r0, r4, 2

asm/battle_anim_80D51AC.s

@@ -18,7 +18,7 @@ sub_80D51AC: @ 80D51AC
 	cmp r2, 0xFF
 	bne _080D51D0
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D520C
 	.pool
 _080D51D0:
@@ -140,7 +140,7 @@ _080D5288:
 	adds r0, r6
 	strh r3, [r0, 0x26]
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D52CA
 _080D52C6:
 	subs r0, 0x1
@@ -200,11 +200,11 @@ _080D5320:
 _080D5324:
 	movs r0, 0x3
 _080D5326:
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl b_side_obj__get_some_boolean
+	bl IsAnimBankSpriteVisible
 	lsls r0, 24
 	cmp r0, 0
 	bne _080D533C
@@ -216,7 +216,7 @@ _080D533C:
 	.pool
 _080D5348:
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 _080D5350:
@@ -226,7 +226,7 @@ _080D5352:
 	beq _080D5368
 _080D5356:
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D53A6
 	.pool
 _080D5368:
@@ -359,7 +359,7 @@ _080D5436:
 	adds r0, r7
 	strh r2, [r0, 0x26]
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D5478
 _080D5474:
 	subs r0, r2, 0x1
@@ -385,7 +385,7 @@ sub_80D5484: @ 80D5484
 	cmp r3, 0xFF
 	bne _080D54A8
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D54F6
 	.pool
 _080D54A8:
@@ -584,7 +584,7 @@ _080D55F8:
 	strh r0, [r2, 0x26]
 _080D5630:
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D563C
 _080D5638:
 	subs r0, r2, 0x1
@@ -705,7 +705,7 @@ _080D56F6:
 	cmp r0, 0
 	bne _080D5728
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080D5728:
 	pop {r4-r7}
 	pop {r0}
@@ -829,7 +829,7 @@ _080D5810:
 	strh r0, [r4, 0x24]
 	strh r0, [r4, 0x26]
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080D5822:
 	pop {r4-r6}
 	pop {r0}
@@ -842,7 +842,7 @@ sub_80D5830: @ 80D5830
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	bl GetBankSide
 	lsls r0, 24
@@ -871,7 +871,7 @@ sub_80D5860: @ 80D5860
 	movs r1, 0x4
 	orrs r0, r1
 	strb r0, [r2]
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	bl GetBankSide
 	lsls r0, 24
@@ -892,7 +892,7 @@ _080D5894:
 	strh r2, [r4, 0x2E]
 	strh r0, [r4, 0x32]
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
@@ -919,7 +919,7 @@ sub_80D58D4: @ 80D58D4
 	strh r1, [r0, 0x30]
 	ldr r1, =sub_80A6630
 	str r1, [r0, 0x1C]
-	ldr r1, =move_anim_8072740
+	ldr r1, =DestroyAnimSprite
 	bl StoreSpriteCallbackInData6
 	pop {r0}
 	bx r0
@@ -970,7 +970,7 @@ sub_80D5944: @ 80D5944
 	strh r1, [r0, 0x32]
 	ldr r1, =sub_80A6630
 	str r1, [r0, 0x1C]
-	ldr r1, =move_anim_8072740
+	ldr r1, =DestroyAnimSprite
 	bl StoreSpriteCallbackInData6
 	pop {r0}
 	bx r0
@@ -988,12 +988,12 @@ sub_80D5968: @ 80D5968
 	cmp r0, 0
 	bne _080D598C
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	b _080D5990
 	.pool
 _080D598C:
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 _080D5990:
 	ldrb r0, [r0]
 	adds r0, r1
@@ -1093,7 +1093,7 @@ _080D5A56:
 	strh r1, [r3, 0x26]
 _080D5A58:
 	adds r0, r2, 0
-	bl move_anim_8072740
+	bl DestroyAnimSprite
 	b _080D5A8E
 	.pool
 _080D5A64:
@@ -1133,11 +1133,11 @@ sub_80D5A94: @ 80D5A94
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _080D5AB0
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	b _080D5AB2
 	.pool
 _080D5AB0:
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 _080D5AB2:
 	ldrb r2, [r0]
 	ldr r0, =gBankSpriteIds
@@ -1192,7 +1192,7 @@ _080D5ADC:
 	movs r1, 0x4
 	orrs r0, r1
 	strb r0, [r2]
-	ldr r1, =move_anim_8072740
+	ldr r1, =DestroyAnimSprite
 	adds r0, r5, 0
 	bl StoreSpriteCallbackInData6
 	ldr r0, =sub_80A6680
@@ -1218,11 +1218,11 @@ sub_80D5B48: @ 80D5B48
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _080D5B70
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	b _080D5B72
 	.pool
 _080D5B70:
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 _080D5B72:
 	ldrb r1, [r0]
 	ldr r0, =gBankSpriteIds
@@ -1281,7 +1281,7 @@ _080D5B9C:
 	lsls r0, 16
 	cmp r0, 0
 	bne _080D5C04
-	ldr r1, =move_anim_8072740
+	ldr r1, =DestroyAnimSprite
 	adds r0, r6, 0
 	bl StoreSpriteCallbackInData6
 	b _080D5C0C
@@ -1318,7 +1318,7 @@ sub_80D5C20: @ 80D5C20
 	lsls r1, 2
 	adds r1, r4
 	strh r3, [r1, 0x26]
-	bl move_anim_8072740
+	bl DestroyAnimSprite
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1338,7 +1338,7 @@ sub_80D5C50: @ 80D5C50
 	bl __divsi3
 	lsls r0, 16
 	lsrs r7, r0, 16
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	bl GetBankSide
 	lsls r0, 24
@@ -1485,7 +1485,7 @@ _080D5D70:
 	cmp r0, 0
 	bne _080D5DA4
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080D5DA4:
 	pop {r4,r5}
 	pop {r0}
@@ -1518,16 +1518,16 @@ _080D5DD8:
 	beq _080D5DE8
 	b _080D5E10
 _080D5DDE:
-	ldr r5, =gAnimationBankAttacker
+	ldr r5, =gAnimBankAttacker
 	b _080D5DEA
 	.pool
 _080D5DE8:
-	ldr r5, =gAnimationBankTarget
+	ldr r5, =gAnimBankTarget
 _080D5DEA:
 	ldrb r0, [r5]
 	movs r4, 0x2
 	eors r0, r4
-	bl b_side_obj__get_some_boolean
+	bl IsAnimBankSpriteVisible
 	lsls r0, 24
 	cmp r0, 0
 	beq _080D5E10
@@ -1540,7 +1540,7 @@ _080D5DEA:
 	.pool
 _080D5E10:
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D5E58
 _080D5E18:
 	ldr r1, =gTasks
@@ -1549,7 +1549,7 @@ _080D5E18:
 	lsls r0, 3
 	adds r5, r0, r1
 	strh r2, [r5, 0x8]
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r0, [r0]
 	bl GetBankSide
 	lsls r0, 24
@@ -1609,7 +1609,7 @@ sub_80D5E6C: @ 80D5E6C
 	cmp r1, r0
 	bls _080D5EAA
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080D5EAA:
 	pop {r4}
 	pop {r0}
@@ -1622,7 +1622,7 @@ sub_80D5EB8: @ 80D5EB8
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r6, =gAnimationBankAttacker
+	ldr r6, =gAnimBankAttacker
 	ldrb r0, [r6]
 	bl GetBankSide
 	lsls r0, 24
@@ -1660,7 +1660,7 @@ _080D5ED4:
 	b _080D5F18
 	.pool
 _080D5F14:
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r0, [r0]
 _080D5F18:
 	strh r0, [r2, 0x12]
@@ -1817,7 +1817,7 @@ _080D601E:
 	strh r3, [r0, 0x24]
 	strh r3, [r0, 0x26]
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080D6050:
 	pop {r3,r4}
 	mov r8, r3
@@ -1923,7 +1923,7 @@ _080D6120:
 	adds r0, r6, 0
 	bl sub_80A7344
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080D612C:
 	pop {r4-r6}
 	pop {r0}
@@ -1995,11 +1995,11 @@ _080D61B8:
 	ldrsh r0, [r6, r1]
 	cmp r0, 0
 	bne _080D61C8
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	b _080D61CA
 	.pool
 _080D61C8:
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 _080D61CA:
 	ldrb r0, [r0]
 	bl GetBankSide
@@ -2076,11 +2076,11 @@ sub_80D622C: @ 80D622C
 	ldrsh r0, [r4, r1]
 	cmp r0, 0
 	bne _080D6274
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	b _080D6276
 	.pool
 _080D6274:
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 _080D6276:
 	ldrb r0, [r0]
 	bl GetBankSide
@@ -2201,7 +2201,7 @@ _080D6364:
 	bl sub_80A7344
 _080D636A:
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _080D6382
 _080D6372:
 	movs r0, 0
@@ -2236,7 +2236,7 @@ sub_80D6388: @ 80D6388
 	adds r0, r5, r7
 	lsls r0, 3
 	adds r6, r0, r4
-	ldr r0, =gMovePowerMoveAnim
+	ldr r0, =gAnimMovePower
 	ldrh r0, [r0]
 	movs r1, 0xC
 	bl __udivsi3
@@ -2248,7 +2248,7 @@ _080D63C0:
 	adds r0, r5, r7
 	lsls r0, 3
 	adds r6, r0, r4
-	ldr r0, =gMoveDmgMoveAnim
+	ldr r0, =gAnimMoveDmg
 	ldr r0, [r0]
 	movs r1, 0xC
 	bl __divsi3
@@ -2435,7 +2435,7 @@ _080D6518:
 	adds r0, r2
 	strh r4, [r0, 0x26]
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _080D654A:
 	pop {r4,r5}
 	pop {r0}

asm/battle_anim_8170478.s

@@ -16,12 +16,12 @@ sub_8170478: @ 8170478
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [sp, 0x10]
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r4, [r0]
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r1, =0x00003f3f
 	movs r0, 0x48
@@ -43,19 +43,19 @@ sub_8170478: @ 8170478
 	movs r0, 0x1
 	movs r1, 0x4
 	movs r2, 0
-	bl lcd_bg_operations
+	bl SetAnimBgAttribute
 	movs r0, 0x1
 	movs r1, 0
 	movs r2, 0
-	bl lcd_bg_operations
+	bl SetAnimBgAttribute
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r2, 0x1
-	bl lcd_bg_operations
+	bl SetAnimBgAttribute
 	movs r0, 0x1
 	movs r1, 0x3
 	movs r2, 0x1
-	bl lcd_bg_operations
+	bl SetAnimBgAttribute
 	ldr r0, =gHealthBoxesIds
 	adds r4, r0
 	ldrb r0, [r4]
@@ -168,12 +168,12 @@ sub_8170478: @ 8170478
 	lsls r1, 4
 	movs r2, 0x20
 	bl LoadCompressedPalette
-	ldr r1, =gUnknown_02022E18
+	ldr r1, =gBattle_BG1_X
 	ldrh r0, [r7, 0x20]
 	negs r0, r0
 	adds r0, 0x20
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1A
+	ldr r1, =gBattle_BG1_Y
 	ldrh r0, [r7, 0x22]
 	negs r0, r0
 	subs r0, 0x20
@@ -212,7 +212,7 @@ sub_8170660: @ 8170660
 	push {r7}
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	mov r8, r0
 	ldr r1, =gTasks
@@ -225,7 +225,7 @@ sub_8170660: @ 8170660
 	adds r1, r0
 	movs r3, 0
 	strh r1, [r5, 0x22]
-	ldr r2, =gUnknown_02022E1A
+	ldr r2, =gBattle_BG1_Y
 	lsls r0, r1, 16
 	lsrs r0, 24
 	ldrh r4, [r2]
@@ -317,9 +317,9 @@ _08170708:
 	bne _08170814
 	movs r0, 0
 	bl sub_80A477C
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r4, [r0]
 	ldr r4, =0x00003f3f
 	movs r0, 0x48
@@ -335,7 +335,7 @@ _08170708:
 	movs r0, 0x1
 	movs r1, 0x3
 	movs r2, 0
-	bl lcd_bg_operations
+	bl SetAnimBgAttribute
 _0817076C:
 	movs r0, 0
 	bl GetGpuReg
@@ -372,7 +372,7 @@ _0817076C:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r2, 0
-	bl lcd_bg_operations
+	bl SetAnimBgAttribute
 	ldr r0, =gHealthBoxesIds
 	add r0, r8
 	ldrb r0, [r0]
@@ -412,7 +412,7 @@ _0817076C:
 	orrs r2, r5
 	strb r2, [r0, 0x5]
 	adds r0, r7, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08170814:
 	pop {r3}
 	mov r8, r3
@@ -540,12 +540,12 @@ sub_8170920: @ 8170920
 	lsrs r4, 24
 	mov r1, sp
 	adds r1, 0x1
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r2, [r0]
 	mov r0, sp
 	bl sub_8170834
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	add sp, 0x4
 	pop {r4}
 	pop {r0}
@@ -628,11 +628,11 @@ sub_81709EC: @ 81709EC
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	bl sub_817094C
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -752,7 +752,7 @@ _08170AD6:
 	cmp r0, 0
 	bne _08170AF8
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08170AF8:
 	pop {r4-r6}
 	pop {r0}
@@ -766,7 +766,7 @@ sub_8170B04: @ 8170B04
 	lsls r0, 24
 	lsrs r6, r0, 24
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r5, [r0]
@@ -834,7 +834,7 @@ _08170B84:
 	orrs r1, r2
 	strb r1, [r0]
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08170BA4:
 	pop {r4-r6}
 	pop {r0}
@@ -852,7 +852,7 @@ sub_8170BB0: @ 8170BB0
 	lsls r0, 24
 	lsrs r5, r0, 24
 	ldr r1, =gBankSpriteIds
-	ldr r4, =gAnimationBankAttacker
+	ldr r4, =gAnimBankAttacker
 	ldrb r0, [r4]
 	adds r1, r0, r1
 	ldrb r1, [r1]
@@ -904,7 +904,7 @@ _08170C08:
 	b _08170CEE
 	.pool
 _08170C44:
-	ldr r5, =gAnimationBankAttacker
+	ldr r5, =gAnimBankAttacker
 	ldrb r0, [r5]
 	movs r1, 0
 	bl sub_80A5C6C
@@ -979,7 +979,7 @@ _08170CC4:
 	cmp r0, 0
 	bne _08170CEE
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08170CEE:
 	add sp, 0xC
 	pop {r3,r4}
@@ -1003,7 +1003,7 @@ sub_8170CFC: @ 8170CFC
 	lsrs r0, 24
 	bl sub_8076A78
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1023,7 +1023,7 @@ sub_8170D24: @ 8170D24
 	lsrs r0, 24
 	bl sub_8076AE8
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1035,7 +1035,7 @@ sub_8170D4C: @ 8170D4C
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -1051,7 +1051,7 @@ _08170D70:
 _08170D74:
 	strh r0, [r1, 0xE]
 	adds r0, r2, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r0}
 	bx r0
 	.pool
@@ -1162,7 +1162,7 @@ sub_8170E04: @ 8170E04
 	adds r6, r4, r1
 	movs r0, 0x22
 	strh r0, [r6, 0x2E]
-	ldr r2, =gAnimationBankTarget
+	ldr r2, =gAnimBankTarget
 	mov r8, r2
 	ldrb r0, [r2]
 	movs r1, 0
@@ -1183,7 +1183,7 @@ sub_8170E04: @ 8170E04
 	adds r4, r0
 	ldr r0, =sub_8171104
 	str r0, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, [r0, 0x8]
 	ldr r1, =gBankSpriteIds
@@ -1246,7 +1246,7 @@ sub_8170EF0: @ 8170EF0
 	cmp r1, r0
 	bne _08170F1A
 	adds r0, r3, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08170F1A:
 	pop {r0}
 	bx r0
@@ -1283,7 +1283,7 @@ _08170F54:
 	lsls r4, 24
 	lsrs r4, 24
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_80A82E4
@@ -1313,7 +1313,7 @@ _08170F54:
 	adds r6, r4, r0
 	movs r0, 0x22
 	strh r0, [r6, 0x2E]
-	ldr r1, =gAnimationBankTarget
+	ldr r1, =gAnimBankTarget
 	mov r8, r1
 	ldrb r0, [r1]
 	movs r1, 0
@@ -1335,7 +1335,7 @@ _08170F54:
 	ldr r0, =SpriteCallbackDummy
 	str r0, [r4]
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, =gBankSpriteIds
 	lsls r0, 24
 	lsrs r0, 24
@@ -1371,7 +1371,7 @@ sub_8171030: @ 8171030
 	lsrs r5, r0, 24
 	ldr r6, =gSprites
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, =gBankSpriteIds
 	lsls r0, 24
 	lsrs r0, 24
@@ -1422,7 +1422,7 @@ sub_81710A8: @ 81710A8
 	lsrs r5, r0, 24
 	ldr r6, =gSprites
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r4, =gBankSpriteIds
 	lsls r0, 24
 	lsrs r0, 24
@@ -1438,7 +1438,7 @@ sub_81710A8: @ 81710A8
 	cmp r0, 0
 	bge _081710F4
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, r4
@@ -1491,7 +1491,7 @@ sub_8171134: @ 8171134
 	lsls r0, 24
 	cmp r0, 0
 	beq _081711D2
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -1550,7 +1550,7 @@ _08171188:
 	movs r2, 0x1
 	movs r3, 0x1C
 	bl sub_8171D98
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r1, [r0]
 	movs r0, 0
 	movs r2, 0xE
@@ -1585,7 +1585,7 @@ sub_81711E8: @ 81711E8
 	str r0, [r4, 0x1C]
 	ldr r2, =gSprites
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r1, [r0]
@@ -1607,7 +1607,7 @@ sub_8171240: @ 8171240
 	push {r4-r7,lr}
 	adds r7, r0, 0
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r4, [r0]
@@ -1894,7 +1894,7 @@ _08171486:
 	adds r0, r1
 	strh r0, [r4, 0x22]
 	strh r5, [r4, 0x26]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -1940,7 +1940,7 @@ sub_81714D4: @ 81714D4
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl StartSpriteAffineAnim
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strh r5, [r0, 0xC]
@@ -1982,7 +1982,7 @@ _08171540:
 	.4byte _08171708
 	.4byte _08171768
 _0817155C:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r5, [r1]
 	ldr r2, [r5, 0x8]
 	ldrh r3, [r2, 0xC]
@@ -2060,7 +2060,7 @@ _081715EA:
 	bl ChangeSpriteAffineAnim
 	b _081717AE
 _081715F4:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r5, [r1]
 	ldr r2, [r5, 0x8]
 	ldrh r3, [r2, 0xC]
@@ -2152,7 +2152,7 @@ _0817169C:
 	movs r1, 0x1
 	bl ChangeSpriteAffineAnim
 _081716A4:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r5, [r1]
 	ldr r2, [r5, 0x8]
 	ldrh r3, [r2, 0xC]
@@ -2211,7 +2211,7 @@ _08171708:
 	strh r0, [r4, 0x34]
 	lsls r0, 16
 	asrs r1, r0, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -2333,7 +2333,7 @@ sub_81717F8: @ 81717F8
 	push {r7}
 	sub sp, 0x4
 	adds r6, r0, 0
-	ldr r7, =gAnimationBankTarget
+	ldr r7, =gAnimBankTarget
 	ldrh r0, [r6, 0x36]
 	adds r0, 0x1
 	movs r1, 0
@@ -2379,7 +2379,7 @@ _0817185A:
 	movs r1, 0
 	strb r1, [r0]
 	movs r0, 0x1
-	bl sub_8072A88
+	bl UpdateOamPriorityInAllHealthboxes
 	bl m4aMPlayAllStop
 	ldr r0, =0x00000213
 	bl PlaySE
@@ -2715,7 +2715,7 @@ sub_8171AE4: @ 8171AE4
 	movs r2, 0x1
 	movs r3, 0x1C
 	bl sub_8171D98
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r1, [r0]
 	movs r0, 0x1
 	movs r2, 0xE
@@ -2724,7 +2724,7 @@ sub_8171AE4: @ 8171AE4
 _08171B36:
 	ldr r6, =gSprites
 	ldr r5, =gBankSpriteIds
-	ldr r4, =gAnimationBankTarget
+	ldr r4, =gAnimBankTarget
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r1, [r0]
@@ -2792,7 +2792,7 @@ sub_8171BAC: @ 8171BAC
 _08171BCA:
 	ldr r4, =gSprites
 	ldr r3, =gBankSpriteIds
-	ldr r2, =gAnimationBankTarget
+	ldr r2, =gAnimBankTarget
 	ldrb r0, [r2]
 	adds r0, r3
 	ldrb r1, [r0]
@@ -2841,7 +2841,7 @@ _08171C24:
 	beq _08171C8A
 	ldr r4, =gSprites
 	ldr r3, =gBankSpriteIds
-	ldr r2, =gAnimationBankTarget
+	ldr r2, =gAnimBankTarget
 	ldrb r0, [r2]
 	adds r0, r3
 	ldrb r1, [r0]
@@ -2859,7 +2859,7 @@ _08171C24:
 	adds r2, r0
 	lsls r2, 2
 	adds r2, r4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -2879,7 +2879,7 @@ _08171C24:
 	ldr r0, =gDoingBattleAnim
 	strb r6, [r0]
 	movs r0, 0x1
-	bl sub_8072A88
+	bl UpdateOamPriorityInAllHealthboxes
 _08171C8A:
 	pop {r4-r7}
 	pop {r0}
@@ -2974,7 +2974,7 @@ _08171D3E:
 	movs r0, 0
 	strb r0, [r1]
 	movs r0, 0x1
-	bl sub_8072A88
+	bl UpdateOamPriorityInAllHealthboxes
 _08171D52:
 	pop {r4}
 	pop {r0}
@@ -3083,7 +3083,7 @@ sub_8171E20: @ 8171E20
 	ands r0, r1
 	cmp r0, 0
 	beq _08171E3E
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	ldrb r0, [r1, 0xA]
@@ -4419,7 +4419,7 @@ sub_8172944: @ 8172944
 	b _081729E2
 	.pool
 _08172970:
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r1, [r0, 0x8]
 	ldrb r0, [r1, 0xA]
@@ -4730,7 +4730,7 @@ sub_8172BF0: @ 8172BF0
 	movs r0, 0
 	mov r8, r0
 	ldr r0, =gBankSpriteIds
-	ldr r3, =gAnimationBankAttacker
+	ldr r3, =gAnimBankAttacker
 	ldrb r2, [r3]
 	adds r0, r2, r0
 	ldrb r6, [r0]
@@ -4877,7 +4877,7 @@ _08172D28:
 	adds r0, r1
 	ldrb r1, [r0, 0x8]
 	strh r1, [r0, 0x8]
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	bl GetBankSide
 	lsls r0, 24
@@ -4914,7 +4914,7 @@ _08172D7E:
 	beq _08172D8A
 _08172D84:
 	adds r0, r7, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08172D8A:
 	pop {r3}
 	mov r8, r3
@@ -4949,9 +4949,9 @@ _08172DC0:
 	beq _08172E4E
 	b _08172E84
 _08172DC6:
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
-	bl GetBankIdentity_permutated
+	bl sub_80A8364
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5010,7 +5010,7 @@ _08172E14:
 	b _08172E84
 _08172E4E:
 	ldr r1, =gBankSpriteIds
-	ldr r4, =gAnimationBankAttacker
+	ldr r4, =gAnimBankAttacker
 	ldrb r0, [r4]
 	adds r0, r1
 	ldrb r1, [r0]
@@ -5032,7 +5032,7 @@ _08172E4E:
 	ldrb r0, [r4]
 	bl sub_805E974
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08172E84:
 	pop {r4,r5}
 	pop {r0}
@@ -5046,9 +5046,9 @@ sub_8172E9C: @ 8172E9C
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r3, =gBattleAnimArgs
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r2, [r1]
-	ldr r1, =gAnimationBankAttacker
+	ldr r1, =gAnimBankAttacker
 	ldrb r1, [r1]
 	ldr r2, [r2]
 	lsls r1, 2
@@ -5057,7 +5057,7 @@ sub_8172E9C: @ 8172E9C
 	lsls r1, 29
 	lsrs r1, 31
 	strh r1, [r3, 0xE]
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r0}
 	bx r0
 	.pool
@@ -5068,11 +5068,11 @@ sub_8172ED0: @ 8172ED0
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, =gAnimationBankTarget
+	ldr r2, =gAnimBankTarget
 	ldr r1, =gEffectBank
 	ldrb r1, [r1]
 	strb r1, [r2]
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r0}
 	bx r0
 	.pool
@@ -5088,7 +5088,7 @@ sub_8172EF0: @ 8172EF0
 	lsrs r6, r0, 24
 	movs r0, 0
 	mov r8, r0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r6, 1
@@ -5108,7 +5108,7 @@ sub_8172EF0: @ 8172EF0
 	bl GetMonData
 	adds r4, r0, 0
 	adds r0, r6, 0
-	bl b_side_obj__get_some_boolean
+	bl IsAnimBankSpriteVisible
 	lsls r0, 24
 	cmp r0, 0
 	beq _08172FC8
@@ -5134,9 +5134,9 @@ _08172F4E:
 	lsrs r0, 16
 	cmp r0, r7
 	bne _08172F6E
-	ldr r0, =gUnknown_0852528C
+	ldr r0, =gBattleAnimPicTable + 0x748
 	bl LoadCompressedObjectPicUsingHeap
-	ldr r0, =gUnknown_08525B94
+	ldr r0, =gBattleAnimPaletteTable + 0x748
 	bl LoadCompressedObjectPaletteUsingHeap
 _08172F6E:
 	ldr r5, =sub_8172FEC
@@ -5169,7 +5169,7 @@ _08172F6E:
 	b _08172FDE
 	.pool
 _08172FC8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r6, 1
@@ -5212,7 +5212,7 @@ sub_8172FEC: @ 8172FEC
 	b _08173190
 	.pool
 _08173018:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0xA]
@@ -5414,7 +5414,7 @@ sub_81731B0: @ 81731B0
 	cmp r0, 0x1
 	bne _081731EA
 	ldrb r1, [r1, 0x8]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x4]
 	lsls r0, r1, 1
@@ -5533,14 +5533,14 @@ sub_81732B0: @ 81732B0
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r0, =gUnknown_085253AC
+	ldr r0, =gBattleAnimPicTable + 0x868
 	bl LoadCompressedObjectPicUsingHeap
-	ldr r0, =gUnknown_08525CB4
+	ldr r0, =gBattleAnimPaletteTable + 0x868
 	bl LoadCompressedObjectPaletteUsingHeap
 	ldr r0, =0x0000281d
 	bl IndexOfSpritePaletteTag
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -5559,7 +5559,7 @@ sub_81732E4: @ 81732E4
 	adds r0, r5, 0
 	bl FreeSpritePaletteByTag
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -5575,7 +5575,7 @@ sub_817330C: @ 817330C
 	movs r0, 0x1E
 	strh r0, [r4, 0x2E]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
@@ -5587,7 +5587,7 @@ sub_817330C: @ 817330C
 	adds r0, r1
 	strh r0, [r4, 0x32]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -5603,7 +5603,7 @@ sub_817330C: @ 817330C
 	bl sub_80A68D4
 	ldr r2, =gSprites
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r1, [r0]
@@ -5628,7 +5628,7 @@ sub_817339C: @ 817339C
 	adds r3, r0, 0
 	ldr r2, =gSprites
 	ldr r1, =gBankSpriteIds
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r1, [r0]
@@ -5679,7 +5679,7 @@ sub_8173400: @ 8173400
 	adds r4, r0, 0
 	ldr r5, =gSprites
 	ldr r3, =gBankSpriteIds
-	ldr r2, =gAnimationBankAttacker
+	ldr r2, =gAnimBankAttacker
 	ldrb r0, [r2]
 	adds r0, r3
 	ldrb r1, [r0]
@@ -5708,7 +5708,7 @@ sub_8173400: @ 8173400
 	movs r1, 0
 	bl StartSpriteAnim
 	adds r0, r4, 0
-	bl move_anim_8072740
+	bl DestroyAnimSprite
 _08173448:
 	pop {r4,r5}
 	pop {r0}
@@ -5732,25 +5732,25 @@ sub_817345C: @ 817345C
 	.pool
 _08173478:
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
-	ldr r1, =gAnimationBankAttacker
+	ldr r1, =gAnimBankAttacker
 	strb r0, [r1]
 	movs r0, 0x1
 	b _08173498
 	.pool
 _0817348C:
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
-	ldr r1, =gAnimationBankAttacker
+	ldr r1, =gAnimBankAttacker
 	strb r0, [r1]
 	movs r0, 0
 _08173498:
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
-	ldr r1, =gAnimationBankTarget
+	ldr r1, =gAnimBankTarget
 	strb r0, [r1]
 _081734A0:
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -5762,7 +5762,7 @@ sub_81734B4: @ 81734B4
 	push {lr}
 	lsls r0, 24
 	lsrs r2, r0, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrh r1, [r0]
@@ -5801,7 +5801,7 @@ _08173508:
 _0817350C:
 	strh r0, [r1]
 	adds r0, r2, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r0}
 	bx r0
 	.pool
@@ -5812,18 +5812,18 @@ sub_817351C: @ 817351C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r3, =gAnimationBankAttacker
+	ldr r3, =gAnimBankAttacker
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	ldr r2, [r1]
 	ldr r1, [r2, 0x8]
 	ldrh r1, [r1]
 	strb r1, [r3]
-	ldr r3, =gAnimationBankTarget
+	ldr r3, =gAnimBankTarget
 	ldr r1, [r2, 0x8]
 	ldrh r1, [r1]
 	lsrs r1, 8
 	strb r1, [r3]
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r0}
 	bx r0
 	.pool

asm/battle_anim_sound_tasks.s

@@ -22,12 +22,12 @@ sub_8158B30: @ 8158B30
 	strh r0, [r6, 0xA]
 	movs r0, 0x40
 	negs r0, r0
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
 	movs r0, 0x3F
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r5, r0, 0
 	lsls r4, 24
 	asrs r4, 24
@@ -36,7 +36,7 @@ sub_8158B30: @ 8158B30
 	adds r0, r4, 0
 	adds r1, r5, 0
 	movs r2, 0x2
-	bl sub_80A5314
+	bl CalculatePanIncrement
 	strh r4, [r6, 0xC]
 	strh r5, [r6, 0xE]
 	lsls r0, 24
@@ -128,7 +128,7 @@ sub_8158C04: @ 8158C04
 	movs r0, 0
 	strh r0, [r4, 0x1C]
 	movs r0, 0x3F
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r1, r0, 0
 	ldrh r0, [r4, 0xA]
 	lsls r1, 24
@@ -142,7 +142,7 @@ sub_8158C04: @ 8158C04
 	cmp r0, 0x2
 	bne _08158C4C
 	adds r0, r5, 0
-	bl move_anim_related_task_del
+	bl DestroyAnimSoundTask
 _08158C4C:
 	pop {r4,r5}
 	pop {r0}
@@ -175,14 +175,14 @@ mas_80DCF38: @ 8158C58
 	ldrb r0, [r0, 0x2]
 	lsls r0, 24
 	asrs r0, 24
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
 	lsls r5, 24
 	asrs r5, 24
 	adds r0, r5, 0
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r5, r0, 0
 	lsls r4, 24
 	asrs r4, 24
@@ -193,7 +193,7 @@ mas_80DCF38: @ 8158C58
 	adds r0, r4, 0
 	adds r1, r5, 0
 	adds r2, r6, 0
-	bl sub_80A5314
+	bl CalculatePanIncrement
 	ldr r2, =gTasks
 	mov r3, r8
 	lsls r1, r3, 2
@@ -264,7 +264,7 @@ sub_8158D08: @ 8158D08
 	cmp r0, 0
 	bne _08158D50
 	adds r0, r5, 0
-	bl move_anim_related_task_del
+	bl DestroyAnimSoundTask
 	b _08158D82
 	.pool
 _08158D50:
@@ -307,7 +307,7 @@ sub_8158D8C: @ 8158D8C
 	movs r4, 0
 	movs r0, 0x40
 	negs r0, r0
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	lsls r0, 24
 	lsrs r6, r0, 24
 	bl IsContest
@@ -319,7 +319,7 @@ sub_8158D8C: @ 8158D8C
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _08158DC8
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x18]
 	ldrh r4, [r0]
@@ -327,7 +327,7 @@ sub_8158D8C: @ 8158D8C
 	.pool
 _08158DC8:
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _08158E76
 _08158DD0:
 	ldr r0, =gBattleAnimArgs
@@ -336,25 +336,25 @@ _08158DD0:
 	adds r2, r0, 0
 	cmp r1, 0
 	bne _08158DEC
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r4, [r0]
 	b _08158E12
 	.pool
 _08158DEC:
 	cmp r1, 0x1
 	bne _08158DFC
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r4, [r0]
 	b _08158E12
 	.pool
 _08158DFC:
 	cmp r1, 0x2
 	bne _08158E08
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	b _08158E0A
 	.pool
 _08158E08:
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 _08158E0A:
 	ldrb r1, [r0]
 	movs r0, 0x2
@@ -369,12 +369,12 @@ _08158E12:
 	bne _08158E38
 _08158E1E:
 	adds r0, r4, 0
-	bl b_side_obj__get_some_boolean
+	bl IsAnimBankSpriteVisible
 	lsls r0, 24
 	cmp r0, 0
 	bne _08158E38
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _08158E8C
 	.pool
 _08158E38:
@@ -416,7 +416,7 @@ _08158E76:
 	bl PlayCry3
 _08158E86:
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08158E8C:
 	pop {r4-r6}
 	pop {r0}
@@ -432,7 +432,7 @@ sub_8158E9C: @ 8158E9C
 	movs r4, 0
 	movs r0, 0x40
 	negs r0, r0
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	lsls r0, 24
 	lsrs r5, r0, 24
 	bl IsContest
@@ -444,7 +444,7 @@ sub_8158E9C: @ 8158E9C
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _08158ED8
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x18]
 	ldrh r4, [r0]
@@ -452,7 +452,7 @@ sub_8158E9C: @ 8158E9C
 	.pool
 _08158ED8:
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _08158F86
 _08158EE0:
 	ldr r0, =gBattleAnimArgs
@@ -461,25 +461,25 @@ _08158EE0:
 	adds r2, r0, 0
 	cmp r1, 0
 	bne _08158EFC
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r4, [r0]
 	b _08158F22
 	.pool
 _08158EFC:
 	cmp r1, 0x1
 	bne _08158F0C
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 	ldrb r4, [r0]
 	b _08158F22
 	.pool
 _08158F0C:
 	cmp r1, 0x2
 	bne _08158F18
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	b _08158F1A
 	.pool
 _08158F18:
-	ldr r0, =gAnimationBankTarget
+	ldr r0, =gAnimBankTarget
 _08158F1A:
 	ldrb r1, [r0]
 	movs r0, 0x2
@@ -494,12 +494,12 @@ _08158F22:
 	bne _08158F48
 _08158F2E:
 	adds r0, r4, 0
-	bl b_side_obj__get_some_boolean
+	bl IsAnimBankSpriteVisible
 	lsls r0, 24
 	cmp r0, 0
 	bne _08158F48
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _08158FEE
 	.pool
 _08158F48:
@@ -571,7 +571,7 @@ _08158FD0:
 	.pool
 _08158FE8:
 	adds r0, r6, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08158FEE:
 	pop {r4-r6}
 	pop {r0}
@@ -620,7 +620,7 @@ _08159028:
 	movs r2, 0xA
 	bl PlayCry3
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	b _0815906A
 _0815904E:
 	bl IsCryPlaying
@@ -633,7 +633,7 @@ _0815904E:
 	movs r2, 0x8
 	bl PlayCry3
 	mov r0, r9
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _0815906A:
 	pop {r3,r4}
 	mov r8, r3
@@ -669,7 +669,7 @@ _081590A0:
 	cmp r0, 0
 	bne _081590B0
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _081590B0:
 	pop {r4}
 	pop {r0}
@@ -691,21 +691,21 @@ sub_81590B8: @ 81590B8
 	strh r1, [r0, 0x1C]
 	movs r0, 0x40
 	negs r0, r0
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	lsls r0, 24
 	lsrs r5, r0, 24
 	bl IsContest
 	lsls r0, 24
 	cmp r0, 0
 	beq _081590F8
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x18]
 	b _08159102
 	.pool
 _081590F8:
-	ldr r1, =gUnknown_02038438
+	ldr r1, =gAnimSpeciesByBanks
-	ldr r0, =gAnimationBankAttacker
+	ldr r0, =gAnimBankAttacker
 	ldrb r0, [r0]
 	lsls r0, 1
 	adds r0, r1
@@ -728,7 +728,7 @@ _08159102:
 	.pool
 _08159130:
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08159136:
 	pop {r4,r5}
 	pop {r0}
@@ -829,7 +829,7 @@ _081591F2:
 	bl PlayCry3
 _081591FE:
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _08159204:
 	pop {r3}
 	mov r8, r3
@@ -849,14 +849,14 @@ sub_8159210: @ 8159210
 	ldrb r0, [r0, 0x2]
 	lsls r0, 24
 	asrs r0, 24
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r1, r0, 0
 	lsls r1, 24
 	asrs r1, 24
 	adds r0, r5, 0
 	bl PlaySE1WithPanning
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -874,14 +874,14 @@ sub_8159244: @ 8159244
 	ldrb r0, [r0, 0x2]
 	lsls r0, 24
 	asrs r0, 24
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r1, r0, 0
 	lsls r1, 24
 	asrs r1, 24
 	adds r0, r5, 0
 	bl PlaySE2WithPanning
 	adds r0, r4, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -906,14 +906,14 @@ sub_8159278: @ 8159278
 	ldrb r0, [r0]
 	lsls r0, 24
 	asrs r0, 24
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
 	lsls r5, 24
 	asrs r5, 24
 	adds r0, r5, 0
-	bl BattleAnimGetPanControl
+	bl BattleAnimAdjustPanning
 	adds r5, r0, 0
 	lsls r4, 24
 	asrs r4, 24
@@ -924,7 +924,7 @@ sub_8159278: @ 8159278
 	adds r0, r4, 0
 	adds r1, r5, 0
 	adds r2, r6, 0
-	bl sub_80A5314
+	bl CalculatePanIncrement
 	ldr r2, =gTasks
 	mov r3, r8
 	lsls r1, r3, 2
@@ -995,7 +995,7 @@ _08159342:
 	cmp r1, r0
 	bne _0815935A
 	adds r0, r5, 0
-	bl move_anim_task_del
+	bl DestroyAnimVisualTask
 _0815935A:
 	pop {r4,r5}
 	pop {r0}

asm/battle_controller_linkopponent.s

@@ -158,7 +158,7 @@ _080644C2:
 	thumb_func_start sub_80644D8
 sub_80644D8: @ 80644D8
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -199,11 +199,11 @@ sub_8064520: @ 8064520
 	movs r0, 0
 	mov r8, r0
 	movs r4, 0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0806454C
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08064584
@@ -276,12 +276,12 @@ _080645CA:
 	ldrb r1, [r7]
 	movs r0, 0x2
 	eors r0, r1
-	bl b_side_obj__get_some_boolean
+	bl IsAnimBankSpriteVisible
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806469C
 _080645DE:
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	mov r12, r1
 	ldr r0, [r1]
 	ldr r7, =gActiveBank
@@ -364,7 +364,7 @@ _08064600:
 	b _080646F2
 	.pool
 _0806469C:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r1, [r7]
 	ldr r2, [r0, 0x4]
@@ -405,7 +405,7 @@ _0806469C:
 	adds r0, r4, 0
 	bl FreeSpritePaletteByTag
 _080646F2:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -440,7 +440,7 @@ sub_8064734: @ 8064734
 	push {r5-r7}
 	movs r0, 0
 	mov r10, r0
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -497,7 +497,7 @@ _08064776:
 	adds r0, r3, 0
 	bl sub_8172EF0
 _080647B4:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, =gActiveBank
 	ldrb r5, [r2]
@@ -531,7 +531,7 @@ _080647B4:
 	ands r0, r1
 	cmp r0, 0
 	bne _0806487A
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0806484A
@@ -557,7 +557,7 @@ _080647B4:
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	mov r1, r9
 	ldrb r0, [r1]
 	eors r0, r7
@@ -567,7 +567,7 @@ _080647B4:
 	eors r0, r7
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _0806484A:
 	ldr r5, =gHealthBoxesIds
 	ldr r4, =gActiveBank
@@ -583,15 +583,15 @@ _0806484A:
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _0806487A:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -673,7 +673,7 @@ _08064930:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _0806493C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -735,7 +735,7 @@ _08064998:
 	lsrs r0, 24
 	cmp r0, 0x3
 	bne _080649E2
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r0, [r0, 0x4]
@@ -760,7 +760,7 @@ _08064998:
 	movs r1, 0
 	strb r1, [r0, 0x9]
 _080649E2:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08064A3A
@@ -799,7 +799,7 @@ _080649E2:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 _08064A3A:
 	ldr r1, =gUnknown_03005D7C
 	ldr r4, =gActiveBank
@@ -827,8 +827,8 @@ _08064A3A:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r5, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -900,7 +900,7 @@ sub_8064B04: @ 8064B04
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _08064BB6
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r1, [r0, 0x4]
 	lsls r4, r3, 1
@@ -974,7 +974,7 @@ sub_8064BC0: @ 8064BC0
 	ldrb r0, [r6]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -985,7 +985,7 @@ sub_8064BC0: @ 8064BC0
 	adds r0, r5
 	ldrb r0, [r0]
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 	b _08064C0C
 	.pool
 _08064C08:
@@ -1017,7 +1017,7 @@ sub_8064C14: @ 8064C14
 	ldr r0, =gHealthBoxesIds
 	adds r0, r3, r0
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl LinkOpponentBufferExecCompleted
 _08064C42:
 	pop {r0}
@@ -1028,7 +1028,7 @@ _08064C42:
 	thumb_func_start sub_8064C58
 sub_8064C58: @ 8064C58
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1065,7 +1065,7 @@ sub_8064C58: @ 8064C58
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl LinkOpponentBufferExecCompleted
 _08064CB2:
 	pop {r4-r6}
@@ -1166,7 +1166,7 @@ sub_8064D60: @ 8064D60
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _08064DAC
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r3, 2
@@ -1198,7 +1198,7 @@ _08064DAC:
 	thumb_func_start sub_8064DD0
 sub_8064DD0: @ 8064DD0
 	push {r4,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
@@ -1250,7 +1250,7 @@ _08064E2A:
 	thumb_func_start sub_8064E50
 sub_8064E50: @ 8064E50
 	push {r4-r7,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1321,13 +1321,13 @@ sub_8064E50: @ 8064E50
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r5]
 	bl sub_8076918
 	ldrb r0, [r5]
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	ldrb r0, [r5]
 	bl sub_805E408
 	ldr r1, =gBattleBankFunc
@@ -1346,7 +1346,7 @@ _08064F0C:
 	thumb_func_start sub_8064F40
 sub_8064F40: @ 8064F40
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1413,7 +1413,7 @@ _08064F72:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r5]
 	lsls r0, 2
@@ -1430,7 +1430,7 @@ _08064FDC:
 	thumb_func_start sub_8065008
 sub_8065008: @ 8065008
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1454,7 +1454,7 @@ _0806502A:
 	thumb_func_start sub_8065038
 sub_8065038: @ 8065038
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1572,7 +1572,7 @@ _0806513A:
 	lsrs r1, 16
 	movs r0, 0x1
 	mov r2, sp
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl LinkOpponentBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
@@ -3583,7 +3583,7 @@ sub_80662F8: @ 80662F8
 	muls r2, r0
 	adds r0, r2, 0
 	add r0, r9
-	bl sub_805DC0C
+	bl BattleLoadOpponentMonSpriteGfx
 	ldrb r0, [r6]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3673,7 +3673,7 @@ sub_80662F8: @ 80662F8
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r6]
 	lsls r0, 2
@@ -3772,7 +3772,7 @@ sub_8066494: @ 8066494
 	adds r0, r1, 0
 	adds r0, r5
 	adds r1, r6, 0
-	bl sub_805DC0C
+	bl BattleLoadOpponentMonSpriteGfx
 	adds r0, r6, 0
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3907,7 +3907,7 @@ sub_8066624: @ 8066624
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _0806666C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3947,7 +3947,7 @@ _0806666C:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl LinkOpponentBufferExecCompleted
 _080666A8:
 	pop {r4-r6}
@@ -3959,7 +3959,7 @@ _080666A8:
 	thumb_func_start sub_80666BC
 sub_80666BC: @ 80666BC
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4283,7 +4283,7 @@ _0806694C:
 	bl sub_806A12C
 	ldr r6, =gUnknown_0202499C
 	mov r9, r7
-	ldr r1, =gUnknown_083054E0
+	ldr r1, =gTrainerFrontPicCoords
 	mov r2, r8
 	lsls r0, r2, 2
 	adds r0, r1
@@ -4411,7 +4411,7 @@ _08066A76:
 	mov r0, r8
 	bl sub_806A12C
 	ldr r0, =gUnknown_0202499C
-	ldr r2, =gUnknown_083054E0
+	ldr r2, =gTrainerFrontPicCoords
 	mov r3, r8
 	lsls r1, r3, 2
 	adds r1, r2
@@ -4589,7 +4589,7 @@ sub_8066B94: @ 8066B94
 	thumb_func_start sub_8066C40
 sub_8066C40: @ 8066C40
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4721,7 +4721,7 @@ _08066D32:
 	ldrb r0, [r0]
 	lsls r0, 8
 	orrs r6, r0
-	ldr r0, =gUnknown_02038432
+	ldr r0, =gAnimMoveTurn
 	mov r8, r0
 	mov r0, r12
 	adds r0, 0x3
@@ -4729,7 +4729,7 @@ _08066D32:
 	ldrb r0, [r1]
 	mov r1, r8
 	strb r0, [r1]
-	ldr r3, =gMovePowerMoveAnim
+	ldr r3, =gAnimMovePower
 	ldrb r1, [r5]
 	lsls r1, 9
 	mov r0, r12
@@ -4743,7 +4743,7 @@ _08066D32:
 	lsls r0, 8
 	orrs r2, r0
 	strh r2, [r3]
-	ldr r3, =gMoveDmgMoveAnim
+	ldr r3, =gAnimMoveDmg
 	ldrb r1, [r5]
 	lsls r1, 9
 	mov r0, r12
@@ -4769,7 +4769,7 @@ _08066D32:
 	lsls r0, 24
 	orrs r2, r0
 	str r2, [r3]
-	ldr r2, =gHappinessMoveAnim
+	ldr r2, =gAnimFriendship
 	ldrb r0, [r5]
 	lsls r0, 9
 	mov r1, r12
@@ -4791,7 +4791,7 @@ _08066D32:
 	lsls r0, 8
 	orrs r2, r0
 	strh r2, [r4]
-	ldr r7, =gDisableStructMoveAnim
+	ldr r7, =gAnimDisableStructPtr
 	ldrb r1, [r5]
 	lsls r1, 9
 	mov r0, r12
@@ -4816,7 +4816,7 @@ _08066D32:
 	b _08066E58
 	.pool
 _08066E30:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -4869,7 +4869,7 @@ sub_8066E70: @ 8066E70
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4928,7 +4928,7 @@ _08066F08:
 	movs r0, 0
 	bl sub_805EB9C
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl DoMoveAnim
 	ldr r0, [r7]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4977,7 +4977,7 @@ _08066F32:
 	ands r0, r2
 	strb r0, [r1]
 _08066F80:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -5031,10 +5031,10 @@ _08066FE4:
 	thumb_func_start sub_8066FF4
 sub_8066FF4: @ 8066FF4
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
@@ -5045,7 +5045,7 @@ sub_8066FF4: @ 8066FF4
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r5]
 	lsls r0, 2
@@ -5124,7 +5124,7 @@ sub_80670A0: @ 80670A0
 	push {r6,r7}
 	sub sp, 0x4
 	movs r0, 0
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	ldr r3, =gBattleBufferA
 	ldr r0, =gActiveBank
 	mov r9, r0
@@ -5171,7 +5171,7 @@ sub_80670A0: @ 80670A0
 	ldrb r1, [r1]
 	str r7, [sp]
 	mov r2, r8
-	bl sub_807294C
+	bl SetBattleBarStruct
 	b _0806715A
 	.pool
 _08067130:
@@ -5193,7 +5193,7 @@ _08067130:
 	ldrb r1, [r1]
 	str r7, [sp]
 	movs r3, 0
-	bl sub_807294C
+	bl SetBattleBarStruct
 _0806715A:
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
@@ -5242,9 +5242,9 @@ sub_806719C: @ 806719C
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5565,7 +5565,7 @@ sub_806743C: @ 806743C
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08067478
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -5718,7 +5718,7 @@ sub_8067508: @ 8067508
 	adds r1, r4
 	ldrb r0, [r6]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r6]
 	ldr r1, [r0, 0x4]
@@ -5779,7 +5779,7 @@ c3_08038DC4: @ 8067618
 	adds r0, r1
 	ldrh r0, [r0, 0x8]
 	strb r0, [r7]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067652
@@ -5893,7 +5893,7 @@ sub_8067718: @ 8067718
 	b _08067812
 	.pool
 _08067748:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5954,13 +5954,13 @@ _080677B4:
 	subs r4, 0x2
 	adds r3, r4
 	ldrb r3, [r3]
-	bl sub_80735DC
+	bl CreatePartyStatusSummarySprites
 	ldr r2, =gUnknown_020244B4
 	ldrb r1, [r5]
 	adds r1, r2
 	movs r3, 0
 	strb r0, [r1]
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -6000,7 +6000,7 @@ _08067812:
 	thumb_func_start sub_806782C
 sub_806782C: @ 806782C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6036,7 +6036,7 @@ _08067864:
 	thumb_func_start sub_8067874
 sub_8067874: @ 8067874
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -6080,7 +6080,7 @@ sub_80678D0: @ 80678D0
 	push {r4,lr}
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
-	bl sub_80A6A90
+	bl AnimBankSpriteExists
 	lsls r0, 24
 	cmp r0, 0
 	beq _08067916

asm/battle_controller_linkpartner.s

@@ -131,7 +131,7 @@ _0814AFA4:
 	thumb_func_start sub_814AFBC
 sub_814AFBC: @ 814AFBC
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -168,11 +168,11 @@ _0814AFF4:
 sub_814B004: @ 814B004
 	push {r4-r6,lr}
 	movs r6, 0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0814B028
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0814B05C
@@ -239,7 +239,7 @@ _0814B094:
 _0814B0A0:
 	cmp r6, 0
 	beq _0814B0C6
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -270,7 +270,7 @@ sub_814B0E8: @ 814B0E8
 	mov r6, r9
 	mov r5, r8
 	push {r5-r7}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r12, r0
 	ldr r0, [r0]
 	ldr r7, =gActiveBank
@@ -348,7 +348,7 @@ _0814B136:
 	lsls r0, 2
 	adds r0, r2
 	strb r6, [r0, 0x9]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0814B1F0
@@ -383,7 +383,7 @@ _0814B136:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r7]
 	mov r1, r8
 	eors r0, r1
@@ -393,7 +393,7 @@ _0814B136:
 	eors r0, r1
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _0814B1F0:
 	ldr r1, =gUnknown_03005D7C
 	ldr r4, =gActiveBank
@@ -419,14 +419,14 @@ _0814B1F0:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -498,7 +498,7 @@ bx_t4_healthbar_update: @ 814B2D0
 	ldrb r0, [r5]
 	adds r0, r6
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -509,7 +509,7 @@ bx_t4_healthbar_update: @ 814B2D0
 	adds r0, r6
 	ldrb r0, [r0]
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 	b _0814B332
 	.pool
 _0814B318:
@@ -587,7 +587,7 @@ sub_814B340: @ 814B340
 	ldrb r0, [r4]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl LinkPartnerBufferExecCompleted
 _0814B3BC:
 	pop {r4-r6}
@@ -599,7 +599,7 @@ _0814B3BC:
 	thumb_func_start sub_814B3DC
 sub_814B3DC: @ 814B3DC
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -634,7 +634,7 @@ sub_814B3DC: @ 814B3DC
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl LinkPartnerBufferExecCompleted
 _0814B430:
 	pop {r4-r6}
@@ -737,7 +737,7 @@ sub_814B4E0: @ 814B4E0
 	bne _0814B532
 	adds r0, r3, 0
 	bl sub_805E408
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -769,7 +769,7 @@ _0814B532:
 	thumb_func_start sub_814B554
 sub_814B554: @ 814B554
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -808,7 +808,7 @@ sub_814B5A8: @ 814B5A8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r7, =gActiveBank
 	ldrb r1, [r7]
@@ -878,13 +878,13 @@ sub_814B5A8: @ 814B5A8
 	muls r1, r6
 	adds r1, r5
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r7]
 	bl sub_8076918
 	ldrb r0, [r7]
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r7]
 	lsls r0, 2
@@ -903,7 +903,7 @@ _0814B664:
 	thumb_func_start sub_814B69C
 sub_814B69C: @ 814B69C
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -1021,7 +1021,7 @@ _0814B7A6:
 	thumb_func_start sub_814B7B8
 sub_814B7B8: @ 814B7B8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1045,7 +1045,7 @@ _0814B7DA:
 	thumb_func_start sub_814B7E8
 sub_814B7E8: @ 814B7E8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1113,7 +1113,7 @@ _0814B872:
 	lsrs r1, 16
 	movs r0, 0x1
 	mov r2, sp
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl LinkPartnerBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
@@ -3154,7 +3154,7 @@ sub_814CB0C: @ 814CB0C
 	muls r0, r5
 	ldr r4, =gPlayerParty
 	adds r0, r4
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r6]
 	lsls r0, 1
 	add r0, r8
@@ -3283,7 +3283,7 @@ sub_814CC28: @ 814CC28
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r5]
 	lsls r1, r0, 9
 	adds r1, r6
@@ -3476,7 +3476,7 @@ sub_814CE14: @ 814CE14
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _0814CE5C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3514,7 +3514,7 @@ _0814CE5C:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl LinkPartnerBufferExecCompleted
 _0814CE92:
 	pop {r4-r6}
@@ -3526,7 +3526,7 @@ _0814CE92:
 	thumb_func_start sub_814CEA4
 sub_814CEA4: @ 814CEA4
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -3696,7 +3696,7 @@ _0814D002:
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldrb r0, [r5]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3706,7 +3706,7 @@ _0814D002:
 	bl sub_806A12C
 	ldr r6, =gUnknown_0202499C
 	mov r8, r7
-	ldr r0, =gUnknown_08305D2C
+	ldr r0, =gTrainerBackPicCoords
 	lsls r4, 2
 	adds r4, r0
 	ldrb r0, [r4]
@@ -3870,7 +3870,7 @@ sub_814D0F0: @ 814D0F0
 	thumb_func_start sub_814D19C
 sub_814D19C: @ 814D19C
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4030,7 +4030,7 @@ _0814D2CE:
 	ldrb r0, [r0]
 	lsls r0, 8
 	orrs r6, r0
-	ldr r0, =gUnknown_02038432
+	ldr r0, =gAnimMoveTurn
 	mov r8, r0
 	mov r0, r12
 	adds r0, 0x3
@@ -4038,7 +4038,7 @@ _0814D2CE:
 	ldrb r0, [r1]
 	mov r1, r8
 	strb r0, [r1]
-	ldr r3, =gMovePowerMoveAnim
+	ldr r3, =gAnimMovePower
 	ldrb r1, [r5]
 	lsls r1, 9
 	mov r0, r12
@@ -4052,7 +4052,7 @@ _0814D2CE:
 	lsls r0, 8
 	orrs r2, r0
 	strh r2, [r3]
-	ldr r3, =gMoveDmgMoveAnim
+	ldr r3, =gAnimMoveDmg
 	ldrb r1, [r5]
 	lsls r1, 9
 	mov r0, r12
@@ -4078,7 +4078,7 @@ _0814D2CE:
 	lsls r0, 24
 	orrs r2, r0
 	str r2, [r3]
-	ldr r2, =gHappinessMoveAnim
+	ldr r2, =gAnimFriendship
 	ldrb r0, [r5]
 	lsls r0, 9
 	mov r1, r12
@@ -4100,7 +4100,7 @@ _0814D2CE:
 	lsls r0, 8
 	orrs r2, r0
 	strh r2, [r4]
-	ldr r7, =gDisableStructMoveAnim
+	ldr r7, =gAnimDisableStructPtr
 	ldrb r1, [r5]
 	lsls r1, 9
 	mov r0, r12
@@ -4125,7 +4125,7 @@ _0814D2CE:
 	b _0814D3F4
 	.pool
 _0814D3CC:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -4178,7 +4178,7 @@ bx_move_anim_4: @ 814D40C
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4237,7 +4237,7 @@ _0814D4A4:
 	movs r0, 0
 	bl sub_805EB9C
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl DoMoveAnim
 	ldr r0, [r7]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4286,7 +4286,7 @@ _0814D4CE:
 	ands r0, r2
 	strb r0, [r1]
 _0814D51C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4340,10 +4340,10 @@ _0814D580:
 	thumb_func_start sub_814D590
 sub_814D590: @ 814D590
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
@@ -4354,7 +4354,7 @@ sub_814D590: @ 814D590
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r5]
 	lsls r0, 2
@@ -4433,7 +4433,7 @@ sub_814D63C: @ 814D63C
 	push {r6,r7}
 	sub sp, 0x4
 	movs r0, 0
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	ldr r3, =gBattleBufferA
 	ldr r0, =gActiveBank
 	mov r9, r0
@@ -4480,7 +4480,7 @@ sub_814D63C: @ 814D63C
 	ldrb r1, [r1]
 	str r7, [sp]
 	mov r2, r8
-	bl sub_807294C
+	bl SetBattleBarStruct
 	b _0814D6F6
 	.pool
 _0814D6CC:
@@ -4502,7 +4502,7 @@ _0814D6CC:
 	ldrb r1, [r1]
 	str r7, [sp]
 	movs r3, 0
-	bl sub_807294C
+	bl SetBattleBarStruct
 _0814D6F6:
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
@@ -4551,9 +4551,9 @@ sub_814D738: @ 814D738
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -4874,7 +4874,7 @@ sub_814D9D8: @ 814D9D8
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0814DA14
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -5147,7 +5147,7 @@ _0814DC06:
 	adds r1, r4
 	ldrb r0, [r5]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r1, [r0, 0x4]
@@ -5217,7 +5217,7 @@ _0814DCF8:
 	mov r9, r0
 	ldrh r0, [r1, 0x8]
 	strb r0, [r7]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0814DD18
@@ -5276,7 +5276,7 @@ _0814DD48:
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r7]
 	movs r1, 0
 	bl sub_814CC98
@@ -5326,7 +5326,7 @@ sub_814DDD8: @ 814DDD8
 	b _0814DE7C
 	.pool
 _0814DE08:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -5349,7 +5349,7 @@ _0814DE08:
 	subs r4, 0x2
 	adds r3, r4
 	ldrb r3, [r3]
-	bl sub_80735DC
+	bl CreatePartyStatusSummarySprites
 	ldr r2, =gUnknown_020244B4
 	ldrb r1, [r5]
 	adds r1, r2
@@ -5394,7 +5394,7 @@ _0814DE7C:
 	thumb_func_start sub_814DE9C
 sub_814DE9C: @ 814DE9C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5430,7 +5430,7 @@ _0814DED4:
 	thumb_func_start sub_814DEE4
 sub_814DEE4: @ 814DEE4
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -5474,7 +5474,7 @@ sub_814DF40: @ 814DF40
 	push {r4,lr}
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
-	bl sub_80A6A90
+	bl AnimBankSpriteExists
 	lsls r0, 24
 	cmp r0, 0
 	beq _0814DF86

asm/battle_controller_opponent.s

@@ -158,7 +158,7 @@ _0805F292:
 	thumb_func_start sub_805F2A8
 sub_805F2A8: @ 805F2A8
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -200,11 +200,11 @@ sub_805F2F0: @ 805F2F0
 	push {r5-r7}
 	movs r0, 0
 	mov r10, r0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F32C
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F31E
@@ -277,7 +277,7 @@ _0805F3A0:
 	movs r6, 0x1
 _0805F3A2:
 	ldr r3, =gUnknown_020244D8
-	ldr r1, =gUnknown_020244D0
+	ldr r1, =gBattleSpritesDataPtr
 	mov r8, r1
 	ldr r2, [r1]
 	ldr r7, =gActiveBank
@@ -449,7 +449,7 @@ _0805F4E4:
 	ands r0, r2
 	strb r0, [r1, 0x1]
 _0805F51A:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -488,7 +488,7 @@ sub_805F560: @ 805F560
 	movs r0, 0
 	str r0, [sp]
 	mov r10, r0
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -520,7 +520,7 @@ _0805F5A6:
 	ands r0, r1
 	cmp r0, 0
 	bne _0805F5EE
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F5EE
@@ -549,7 +549,7 @@ _0805F5A6:
 	adds r0, r3, 0
 	bl sub_8172EF0
 _0805F5EE:
-	ldr r2, =gUnknown_020244D0
+	ldr r2, =gBattleSpritesDataPtr
 	ldr r0, [r2]
 	ldr r1, =gActiveBank
 	mov r8, r1
@@ -583,7 +583,7 @@ _0805F5EE:
 	ands r0, r1
 	cmp r0, 0
 	bne _0805F6B4
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F684
@@ -609,7 +609,7 @@ _0805F5EE:
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	mov r1, r8
 	ldrb r0, [r1]
 	eors r0, r7
@@ -619,7 +619,7 @@ _0805F5EE:
 	eors r0, r7
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _0805F684:
 	ldr r5, =gHealthBoxesIds
 	ldr r4, =gActiveBank
@@ -635,15 +635,15 @@ _0805F684:
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _0805F6B4:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r2, [r3]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -723,7 +723,7 @@ _0805F768:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _0805F774:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -739,11 +739,11 @@ _0805F774:
 	movs r0, 0x1
 	str r0, [sp]
 _0805F792:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F7B2
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F810
@@ -838,7 +838,7 @@ _0805F86E:
 	mov r0, r10
 	cmp r0, 0
 	beq _0805F958
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805F8D2
@@ -877,7 +877,7 @@ _0805F86E:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 _0805F8D2:
 	ldr r1, =gUnknown_03005D7C
 	ldr r4, =gActiveBank
@@ -905,8 +905,8 @@ _0805F8D2:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r5, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -972,7 +972,7 @@ sub_805F994: @ 805F994
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _0805F9E0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r2, r3, 1
@@ -1010,7 +1010,7 @@ _0805F9E0:
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _0805FA48
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r1, [r0, 0x4]
 	lsls r0, r3, 1
@@ -1068,7 +1068,7 @@ sub_805FA70: @ 805FA70
 	ldrb r0, [r6]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -1079,7 +1079,7 @@ sub_805FA70: @ 805FA70
 	adds r0, r5
 	ldrb r0, [r0]
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 	b _0805FABC
 	.pool
 _0805FAB8:
@@ -1111,7 +1111,7 @@ sub_805FAC4: @ 805FAC4
 	ldr r0, =gHealthBoxesIds
 	adds r0, r3, r0
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl OpponentBufferExecCompleted
 _0805FAF2:
 	pop {r0}
@@ -1122,7 +1122,7 @@ _0805FAF2:
 	thumb_func_start sub_805FB08
 sub_805FB08: @ 805FB08
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1159,7 +1159,7 @@ sub_805FB08: @ 805FB08
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl OpponentBufferExecCompleted
 _0805FB62:
 	pop {r4-r6}
@@ -1260,7 +1260,7 @@ sub_805FC10: @ 805FC10
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _0805FC5C
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r3, 2
@@ -1292,7 +1292,7 @@ _0805FC5C:
 	thumb_func_start bx_803AEDC
 bx_803AEDC: @ 805FC80
 	push {r4,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
@@ -1344,7 +1344,7 @@ _0805FCDA:
 	thumb_func_start sub_805FD00
 sub_805FD00: @ 805FD00
 	push {r4-r7,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1415,13 +1415,13 @@ sub_805FD00: @ 805FD00
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r5]
 	bl sub_8076918
 	ldrb r0, [r5]
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	ldrb r0, [r5]
 	bl sub_805E408
 	ldr r1, =gBattleBankFunc
@@ -1440,7 +1440,7 @@ _0805FDBC:
 	thumb_func_start sub_805FDF0
 sub_805FDF0: @ 805FDF0
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1507,7 +1507,7 @@ _0805FE22:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r5]
 	lsls r0, 2
@@ -1524,7 +1524,7 @@ _0805FE8C:
 	thumb_func_start sub_805FEB8
 sub_805FEB8: @ 805FEB8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1548,7 +1548,7 @@ _0805FEDA:
 	thumb_func_start bx_803B0F4
 bx_803B0F4: @ 805FEE8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1666,7 +1666,7 @@ _0805FFEA:
 	lsrs r1, 16
 	movs r0, 0x1
 	mov r2, sp
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl OpponentBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
@@ -2607,7 +2607,7 @@ _08060806:
 	ldrb r1, [r0]
 	movs r0, 0x1
 	adds r2, r4, 0
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl OpponentBufferExecCompleted
 	add sp, 0x58
 	pop {r4-r7}
@@ -3730,7 +3730,7 @@ sub_8061224: @ 8061224
 	ldrh r0, [r0]
 	muls r0, r7
 	add r0, r10
-	bl sub_805DC0C
+	bl BattleLoadOpponentMonSpriteGfx
 	ldrb r0, [r6]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3828,7 +3828,7 @@ sub_8061224: @ 8061224
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r6]
 	lsls r0, 2
@@ -3934,7 +3934,7 @@ sub_80613DC: @ 80613DC
 	adds r0, r1, 0
 	adds r0, r5
 	adds r1, r6, 0
-	bl sub_805DC0C
+	bl BattleLoadOpponentMonSpriteGfx
 	adds r0, r6, 0
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -4069,7 +4069,7 @@ sub_806156C: @ 806156C
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _080615B4
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -4109,7 +4109,7 @@ _080615B4:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl OpponentBufferExecCompleted
 _080615F0:
 	pop {r4-r6}
@@ -4121,7 +4121,7 @@ _080615F0:
 	thumb_func_start sub_8061604
 sub_8061604: @ 8061604
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4339,7 +4339,7 @@ _080617CA:
 	bl sub_806A12C
 	ldr r6, =gUnknown_0202499C
 	mov r9, r7
-	ldr r1, =gUnknown_083054E0
+	ldr r1, =gTrainerFrontPicCoords
 	mov r2, r8
 	lsls r0, r2, 2
 	adds r0, r1
@@ -4564,7 +4564,7 @@ _080619DE:
 	mov r0, r8
 	bl sub_806A12C
 	ldr r0, =gUnknown_0202499C
-	ldr r2, =gUnknown_083054E0
+	ldr r2, =gTrainerFrontPicCoords
 	mov r3, r8
 	lsls r1, r3, 2
 	adds r1, r2
@@ -4741,7 +4741,7 @@ sub_8061AF0: @ 8061AF0
 	thumb_func_start sub_8061B9C
 sub_8061B9C: @ 8061B9C
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4871,13 +4871,13 @@ _08061C8A:
 	ldrb r1, [r1]
 	lsls r1, 8
 	orrs r0, r1
-	ldr r5, =gUnknown_02038432
+	ldr r5, =gAnimMoveTurn
 	mov r1, r12
 	adds r1, 0x3
 	adds r2, r1
 	ldrb r1, [r2]
 	strb r1, [r5]
-	ldr r4, =gMovePowerMoveAnim
+	ldr r4, =gAnimMovePower
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4891,7 +4891,7 @@ _08061C8A:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r4, =gMoveDmgMoveAnim
+	ldr r4, =gAnimMoveDmg
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4917,7 +4917,7 @@ _08061C8A:
 	lsls r1, 24
 	orrs r3, r1
 	str r3, [r4]
-	ldr r3, =gHappinessMoveAnim
+	ldr r3, =gAnimFriendship
 	ldrb r1, [r6]
 	lsls r1, 9
 	mov r2, r12
@@ -4939,7 +4939,7 @@ _08061C8A:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r3, =gDisableStructMoveAnim
+	ldr r3, =gAnimDisableStructPtr
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4962,7 +4962,7 @@ _08061C8A:
 	b _08061D9E
 	.pool
 _08061D80:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -5009,7 +5009,7 @@ bx_move_anim_7: @ 8061DB0
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -5068,7 +5068,7 @@ _08061E48:
 	movs r0, 0
 	bl sub_805EB9C
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl DoMoveAnim
 	ldr r0, [r7]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -5117,7 +5117,7 @@ _08061E72:
 	ands r0, r2
 	strb r0, [r1]
 _08061EC0:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -5171,10 +5171,10 @@ _08061F24:
 	thumb_func_start sub_8061F34
 sub_8061F34: @ 8061F34
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
@@ -5185,7 +5185,7 @@ sub_8061F34: @ 8061F34
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r5]
 	lsls r0, 2
@@ -5212,7 +5212,7 @@ sub_8061F90: @ 8061F90
 	thumb_func_start sub_8061F9C
 sub_8061F9C: @ 8061F9C
 	push {lr}
-	bl sub_8063880
+	bl AI_TrySwitchOrUseItem
 	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
@@ -5243,7 +5243,7 @@ sub_8061FB8: @ 8061FB8
 	movs r0, 0x1
 	movs r1, 0xA
 _08061FD6:
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 _08061FDA:
 	bl OpponentBufferExecCompleted
 	b _08062156
@@ -5323,7 +5323,7 @@ _08062062:
 	cmp r0, 0
 	beq _0806209C
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r5, =gBankTarget
 	strb r0, [r5]
 	ldr r0, =gAbsentBankFlags
@@ -5337,7 +5337,7 @@ _08062062:
 	cmp r1, 0
 	beq _0806209C
 	movs r0, 0x2
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	strb r0, [r5]
 _0806209C:
 	ldr r0, =gBankTarget
@@ -5347,7 +5347,7 @@ _0806209C:
 	movs r0, 0x1
 	movs r1, 0xA
 	adds r2, r4, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	b _08061FDA
 	.pool
 _080620C4:
@@ -5378,7 +5378,7 @@ _080620C6:
 	movs r0, 0x1
 	movs r1, 0xA
 	adds r2, r4, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	b _08062152
 	.pool
 _08062108:
@@ -5394,26 +5394,26 @@ _08062108:
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r1, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	adds r2, r0, 0
 	lsls r2, 24
 	lsrs r2, 16
 	orrs r2, r4
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	b _08062152
 	.pool
 _0806213C:
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	adds r2, r0, 0
 	lsls r2, 24
 	lsrs r2, 16
 	orrs r2, r4
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 _08062152:
 	bl OpponentBufferExecCompleted
 _08062156:
@@ -5435,7 +5435,7 @@ sub_806215C: @ 806215C
 	adds r0, 0xC0
 	ldrb r1, [r0]
 	movs r0, 0x1
-	bl dp01_build_cmdbuf_x23_aa_0
+	bl EmitCmd35
 	bl OpponentBufferExecCompleted
 	pop {r0}
 	bx r0
@@ -5456,7 +5456,7 @@ sub_8062188: @ 8062188
 	ldrb r0, [r1]
 	cmp r0, 0x6
 	bne _08062254
-	bl sub_8063A90
+	bl GetMostSuitableMonToSwitchInto
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x6
@@ -5468,7 +5468,7 @@ sub_8062188: @ 8062188
 	cmp r0, 0
 	bne _080621D4
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r7, r5, 0
@@ -5476,11 +5476,11 @@ sub_8062188: @ 8062188
 	.pool
 _080621D4:
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r7, r0, 24
 	movs r0, 0x3
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r5, r0, 24
 _080621E8:
@@ -5550,7 +5550,7 @@ _0806225A:
 	lsrs r1, 24
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x22_a_three_bytes
+	bl EmitCmd34
 	bl OpponentBufferExecCompleted
 	pop {r4-r7}
 	pop {r0}
@@ -5574,7 +5574,7 @@ sub_8062294: @ 8062294
 	push {r6,r7}
 	sub sp, 0x4
 	movs r0, 0
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	ldr r3, =gBattleBufferA
 	ldr r0, =gActiveBank
 	mov r9, r0
@@ -5621,7 +5621,7 @@ sub_8062294: @ 8062294
 	ldrb r1, [r1]
 	str r7, [sp]
 	mov r2, r8
-	bl sub_807294C
+	bl SetBattleBarStruct
 	b _0806234E
 	.pool
 _08062324:
@@ -5643,7 +5643,7 @@ _08062324:
 	ldrb r1, [r1]
 	str r7, [sp]
 	movs r3, 0
-	bl sub_807294C
+	bl SetBattleBarStruct
 _0806234E:
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
@@ -5692,9 +5692,9 @@ sub_8062390: @ 8062390
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -6015,7 +6015,7 @@ sub_8062630: @ 8062630
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0806266C
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -6168,7 +6168,7 @@ sub_80626FC: @ 80626FC
 	adds r1, r4
 	ldrb r0, [r6]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r6]
 	ldr r1, [r0, 0x4]
@@ -6244,7 +6244,7 @@ sub_8062828: @ 8062828
 	adds r0, r1
 	ldrh r0, [r0, 0x8]
 	strb r0, [r7]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0806286C
@@ -6348,7 +6348,7 @@ dp01t_30_7_0803D67C: @ 8062918
 	b _08062A12
 	.pool
 _08062948:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6409,13 +6409,13 @@ _080629B4:
 	subs r4, 0x2
 	adds r3, r4
 	ldrb r3, [r3]
-	bl sub_80735DC
+	bl CreatePartyStatusSummarySprites
 	ldr r2, =gUnknown_020244B4
 	ldrb r1, [r5]
 	adds r1, r2
 	movs r3, 0
 	strb r0, [r1]
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -6455,7 +6455,7 @@ _08062A12:
 	thumb_func_start bx_0803D790_t7
 bx_0803D790_t7: @ 8062A2C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6491,7 +6491,7 @@ _08062A64:
 	thumb_func_start sub_8062A74
 sub_8062A74: @ 8062A74
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -6535,7 +6535,7 @@ sub_8062AD0: @ 8062AD0
 	push {r4,lr}
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
-	bl sub_80A6A90
+	bl AnimBankSpriteExists
 	lsls r0, 24
 	cmp r0, 0
 	beq _08062B16
@@ -6655,7 +6655,7 @@ sub_8062BB0: @ 8062BB0
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r3]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r2]
 	ldr r0, [r2, 0x8]

asm/battle_controller_player_partner.s

@@ -132,7 +132,7 @@ _081BAEE8:
 	thumb_func_start sub_81BAF00
 sub_81BAF00: @ 81BAF00
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -169,11 +169,11 @@ _081BAF38:
 sub_81BAF48: @ 81BAF48
 	push {r4-r6,lr}
 	movs r6, 0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081BAF6C
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081BAFA0
@@ -240,7 +240,7 @@ _081BAFD8:
 _081BAFE4:
 	cmp r6, 0
 	beq _081BB00A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -271,7 +271,7 @@ sub_81BB02C: @ 81BB02C
 	mov r6, r9
 	mov r5, r8
 	push {r5-r7}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r12, r0
 	ldr r0, [r0]
 	ldr r7, =gActiveBank
@@ -349,7 +349,7 @@ _081BB07A:
 	lsls r0, 2
 	adds r0, r2
 	strb r6, [r0, 0x9]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081BB134
@@ -384,7 +384,7 @@ _081BB07A:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r7]
 	mov r1, r8
 	eors r0, r1
@@ -394,7 +394,7 @@ _081BB07A:
 	eors r0, r1
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _081BB134:
 	ldr r1, =gUnknown_03005D7C
 	ldr r4, =gActiveBank
@@ -420,14 +420,14 @@ _081BB134:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -499,7 +499,7 @@ bx_t3_healthbar_update: @ 81BB214
 	ldrb r0, [r5]
 	adds r0, r6
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -510,7 +510,7 @@ bx_t3_healthbar_update: @ 81BB214
 	adds r0, r6
 	ldrb r0, [r0]
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 	b _081BB276
 	.pool
 _081BB25C:
@@ -570,7 +570,7 @@ sub_81BB29C: @ 81BB29C
 	str r7, [sp, 0x8]
 	ldrh r2, [r1, 0xA]
 	str r2, [sp, 0xC]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -645,9 +645,9 @@ _081BB2E2:
 	lsrs r2, 16
 	movs r0, 0x1
 	movs r1, 0xB
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	strb r5, [r4]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -789,7 +789,7 @@ sub_81BB414: @ 81BB414
 	negs r0, r0
 	str r0, [sp]
 	mov r0, r10
-	bl sub_807294C
+	bl SetBattleBarStruct
 	movs r0, 0x21
 	bl PlaySE
 	ldr r0, =sub_81BB4E4
@@ -848,7 +848,7 @@ _081BB514:
 	lsls r4, 16
 	lsrs r4, 16
 	ldrb r0, [r5]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r4, 16
 	movs r0, 0x1
@@ -918,7 +918,7 @@ _081BB514:
 	lsrs r2, 16
 	movs r0, 0x1
 	movs r1, 0xB
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	strb r5, [r4]
 	ldr r0, =sub_81BB628
 	str r0, [r6]
@@ -961,7 +961,7 @@ sub_81BB628: @ 81BB628
 	adds r0, r1
 	ldrb r4, [r0, 0xC]
 	ldrb r6, [r0, 0x8]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1006,7 +1006,7 @@ sub_81BB688: @ 81BB688
 	lsls r0, 3
 	adds r2, r0, r1
 	ldrb r5, [r2, 0xC]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r5, 1
@@ -1027,7 +1027,7 @@ sub_81BB688: @ 81BB688
 	adds r0, r7, 0
 	movs r1, 0x38
 	bl GetMonData
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1046,7 +1046,7 @@ sub_81BB688: @ 81BB688
 	ldrb r0, [r0]
 	adds r1, r7, 0
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	b _081BB71C
 	.pool
 _081BB708:
@@ -1058,7 +1058,7 @@ _081BB708:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 _081BB71C:
 	ldr r0, =gTasks
 	lsls r1, r6, 2
@@ -1162,7 +1162,7 @@ sub_81BB78C: @ 81BB78C
 	ldrb r0, [r4]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl PlayerPartnerBufferExecCompleted
 _081BB808:
 	pop {r4-r6}
@@ -1174,7 +1174,7 @@ _081BB808:
 	thumb_func_start sub_81BB828
 sub_81BB828: @ 81BB828
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1209,7 +1209,7 @@ sub_81BB828: @ 81BB828
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl PlayerPartnerBufferExecCompleted
 _081BB87C:
 	pop {r4-r6}
@@ -1312,7 +1312,7 @@ sub_81BB92C: @ 81BB92C
 	bne _081BB97E
 	adds r0, r3, 0
 	bl sub_805E408
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -1344,7 +1344,7 @@ _081BB97E:
 	thumb_func_start dp01t_35_3_free_vram
 dp01t_35_3_free_vram: @ 81BB9A0
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -1383,7 +1383,7 @@ sub_81BB9F4: @ 81BB9F4
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r7, =gActiveBank
 	ldrb r1, [r7]
@@ -1453,13 +1453,13 @@ sub_81BB9F4: @ 81BB9F4
 	muls r1, r6
 	adds r1, r5
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r7]
 	bl sub_8076918
 	ldrb r0, [r7]
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r7]
 	lsls r0, 2
@@ -1478,7 +1478,7 @@ _081BBAB0:
 	thumb_func_start sub_81BBAE8
 sub_81BBAE8: @ 81BBAE8
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -1596,7 +1596,7 @@ _081BBBF2:
 	thumb_func_start sub_81BBC04
 sub_81BBC04: @ 81BBC04
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1620,7 +1620,7 @@ _081BBC26:
 	thumb_func_start bx_80E8A6C
 bx_80E8A6C: @ 81BBC34
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1688,7 +1688,7 @@ _081BBCBE:
 	lsrs r1, 16
 	movs r0, 0x1
 	mov r2, sp
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl PlayerPartnerBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
@@ -3729,7 +3729,7 @@ sub_81BCF58: @ 81BCF58
 	muls r0, r5
 	ldr r4, =gPlayerParty
 	adds r0, r4
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r6]
 	lsls r0, 1
 	add r0, r8
@@ -3858,7 +3858,7 @@ sub_81BD074: @ 81BD074
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r5]
 	lsls r1, r0, 9
 	adds r1, r6
@@ -4051,7 +4051,7 @@ sub_81BD260: @ 81BD260
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _081BD2A8
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -4089,7 +4089,7 @@ _081BD2A8:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl PlayerPartnerBufferExecCompleted
 _081BD2DE:
 	pop {r4-r6}
@@ -4101,7 +4101,7 @@ _081BD2DE:
 	thumb_func_start sub_81BD2F0
 sub_81BD2F0: @ 81BD2F0
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4182,7 +4182,7 @@ sub_81BD37C: @ 81BD37C
 	movs r4, 0x7
 	movs r0, 0x5A
 	mov r9, r0
-	ldr r0, =gUnknown_08305D2C
+	ldr r0, =gTrainerBackPicCoords
 	ldrb r1, [r0, 0x1C]
 	b _081BD3BE
 	.pool
@@ -4193,7 +4193,7 @@ _081BD3A8:
 	lsrs r4, r0, 24
 	movs r0, 0x20
 	mov r9, r0
-	ldr r1, =gUnknown_083054E0
+	ldr r1, =gTrainerFrontPicCoords
 	lsls r0, r4, 2
 	adds r0, r1
 	ldrb r1, [r0]
@@ -4213,7 +4213,7 @@ _081BD3BE:
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldrb r0, [r5]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -4494,7 +4494,7 @@ sub_81BD5C8: @ 81BD5C8
 	thumb_func_start sub_81BD674
 sub_81BD674: @ 81BD674
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4652,13 +4652,13 @@ _081BD7A2:
 	ldrb r1, [r1]
 	lsls r1, 8
 	orrs r0, r1
-	ldr r5, =gUnknown_02038432
+	ldr r5, =gAnimMoveTurn
 	mov r1, r12
 	adds r1, 0x3
 	adds r2, r1
 	ldrb r1, [r2]
 	strb r1, [r5]
-	ldr r4, =gMovePowerMoveAnim
+	ldr r4, =gAnimMovePower
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4672,7 +4672,7 @@ _081BD7A2:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r4, =gMoveDmgMoveAnim
+	ldr r4, =gAnimMoveDmg
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4698,7 +4698,7 @@ _081BD7A2:
 	lsls r1, 24
 	orrs r3, r1
 	str r3, [r4]
-	ldr r3, =gHappinessMoveAnim
+	ldr r3, =gAnimFriendship
 	ldrb r1, [r6]
 	lsls r1, 9
 	mov r2, r12
@@ -4720,7 +4720,7 @@ _081BD7A2:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r3, =gDisableStructMoveAnim
+	ldr r3, =gAnimDisableStructPtr
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4743,7 +4743,7 @@ _081BD7A2:
 	b _081BD8B6
 	.pool
 _081BD898:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4790,7 +4790,7 @@ bx_move_anim_3: @ 81BD8C8
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4849,7 +4849,7 @@ _081BD960:
 	movs r0, 0
 	bl sub_805EB9C
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl DoMoveAnim
 	ldr r0, [r7]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4898,7 +4898,7 @@ _081BD98A:
 	ands r0, r2
 	strb r0, [r1]
 _081BD9D8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4952,10 +4952,10 @@ _081BDA3C:
 	thumb_func_start sub_81BDA4C
 sub_81BDA4C: @ 81BDA4C
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
@@ -4966,7 +4966,7 @@ sub_81BDA4C: @ 81BDA4C
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r4]
 	lsls r0, 2
@@ -4990,7 +4990,7 @@ sub_81BDAA0: @ 81BDAA0
 	thumb_func_start sub_81BDAAC
 sub_81BDAAC: @ 81BDAAC
 	push {lr}
-	bl sub_8063880
+	bl AI_TrySwitchOrUseItem
 	bl PlayerPartnerBufferExecCompleted
 	pop {r0}
 	bx r0
@@ -5045,7 +5045,7 @@ _081BDB02:
 	cmp r0, 0
 	beq _081BDB3C
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r4, =gBankTarget
 	strb r0, [r4]
 	ldr r0, =gAbsentBankFlags
@@ -5059,7 +5059,7 @@ _081BDB02:
 	cmp r1, 0
 	beq _081BDB3C
 	movs r0, 0x3
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	strb r0, [r4]
 _081BDB3C:
 	ldr r0, =gBankTarget
@@ -5068,7 +5068,7 @@ _081BDB3C:
 	orrs r2, r5
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	bl PlayerPartnerBufferExecCompleted
 	pop {r4-r6}
 	pop {r0}
@@ -5087,17 +5087,17 @@ sub_81BDB70: @ 81BDB70
 	thumb_func_start sub_81BDB7C
 sub_81BDB7C: @ 81BDB7C
 	push {r4-r6,lr}
-	bl sub_8063A90
+	bl GetMostSuitableMonToSwitchInto
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0x6
 	bne _081BDBD0
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r6, r0, 24
 	movs r0, 0x2
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0x3
@@ -5138,7 +5138,7 @@ _081BDBD0:
 	lsrs r1, 24
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x22_a_three_bytes
+	bl EmitCmd34
 	bl PlayerPartnerBufferExecCompleted
 	pop {r4-r6}
 	pop {r0}
@@ -5162,7 +5162,7 @@ sub_81BDC10: @ 81BDC10
 	push {r6,r7}
 	sub sp, 0x4
 	movs r0, 0
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	ldr r3, =gBattleBufferA
 	ldr r0, =gActiveBank
 	mov r9, r0
@@ -5209,7 +5209,7 @@ sub_81BDC10: @ 81BDC10
 	ldrb r1, [r1]
 	str r7, [sp]
 	mov r2, r8
-	bl sub_807294C
+	bl SetBattleBarStruct
 	b _081BDCCA
 	.pool
 _081BDCA0:
@@ -5231,7 +5231,7 @@ _081BDCA0:
 	ldrb r1, [r1]
 	str r7, [sp]
 	movs r3, 0
-	bl sub_807294C
+	bl SetBattleBarStruct
 _081BDCCA:
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
@@ -5275,7 +5275,7 @@ sub_81BDD00: @ 81BDD00
 	.pool
 _081BDD38:
 	movs r0, 0x1
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	adds r0, r4, 0
 	movs r1, 0xB
 	bl GetMonData
@@ -5338,9 +5338,9 @@ sub_81BDD9C: @ 81BDD9C
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5661,7 +5661,7 @@ sub_81BE03C: @ 81BE03C
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _081BE078
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -5880,7 +5880,7 @@ _081BE21A:
 	adds r1, r4
 	ldrb r0, [r5]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r1, [r0, 0x4]
@@ -5950,7 +5950,7 @@ _081BE2F4:
 	mov r9, r0
 	ldrh r0, [r1, 0x8]
 	strb r0, [r7]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081BE314
@@ -6009,7 +6009,7 @@ _081BE344:
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r7]
 	movs r1, 0
 	bl sub_81BD0E4
@@ -6059,7 +6059,7 @@ dp01t_30_3_80EB11C: @ 81BE3D4
 	b _081BE478
 	.pool
 _081BE404:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -6082,7 +6082,7 @@ _081BE404:
 	subs r4, 0x2
 	adds r3, r4
 	ldrb r3, [r3]
-	bl sub_80735DC
+	bl CreatePartyStatusSummarySprites
 	ldr r2, =gUnknown_020244B4
 	ldrb r1, [r5]
 	adds r1, r2
@@ -6127,7 +6127,7 @@ _081BE478:
 	thumb_func_start sub_81BE498
 sub_81BE498: @ 81BE498
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -6163,7 +6163,7 @@ _081BE4D0:
 	thumb_func_start sub_81BE4E0
 sub_81BE4E0: @ 81BE4E0
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -6207,7 +6207,7 @@ sub_81BE53C: @ 81BE53C
 	push {r4,lr}
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
-	bl sub_80A6A90
+	bl AnimBankSpriteExists
 	lsls r0, 24
 	cmp r0, 0
 	beq _081BE582

asm/battle_controller_recorded_opponent.s

@@ -157,7 +157,7 @@ _0818661A:
 	thumb_func_start sub_8186630
 sub_8186630: @ 8186630
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -198,11 +198,11 @@ sub_8186678: @ 8186678
 	push {r6,r7}
 	movs r0, 0
 	mov r9, r0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081866A4
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081866F8
@@ -311,7 +311,7 @@ _0818676A:
 	lsrs r3, r0, 24
 	cmp r3, 0x1
 	bne _08186816
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r12, r0
 	ldr r0, [r0]
 	ldrb r2, [r6]
@@ -388,7 +388,7 @@ _0818676A:
 	adds r0, r4, 0
 	bl FreeSpritePaletteByTag
 _08186816:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	mov r2, r8
 	ldrb r1, [r2]
@@ -425,7 +425,7 @@ sub_818686C: @ 818686C
 	movs r0, 0
 	mov r9, r0
 	mov r8, r0
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r7, =gActiveBank
 	ldrb r2, [r7]
@@ -504,7 +504,7 @@ _081868DE:
 	ands r0, r1
 	cmp r0, 0
 	bne _08186994
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08186964
@@ -529,7 +529,7 @@ _081868DE:
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r7]
 	eors r0, r6
 	bl sub_8076918
@@ -537,7 +537,7 @@ _081868DE:
 	eors r0, r6
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _08186964:
 	ldr r5, =gHealthBoxesIds
 	ldr r4, =gActiveBank
@@ -553,15 +553,15 @@ _08186964:
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _08186994:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -575,7 +575,7 @@ _08186994:
 	orrs r1, r2
 	strb r1, [r0, 0x1]
 _081869AE:
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -639,7 +639,7 @@ _08186A40:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _08186A4C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -655,7 +655,7 @@ _08186A4C:
 	movs r0, 0x1
 	mov r9, r0
 _08186A6A:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _08186AC8
@@ -742,7 +742,7 @@ _08186B26:
 	mov r0, r8
 	cmp r0, 0
 	beq _08186C10
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08186B8A
@@ -781,7 +781,7 @@ _08186B26:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 _08186B8A:
 	ldr r1, =gUnknown_03005D7C
 	ldr r4, =gActiveBank
@@ -809,8 +809,8 @@ _08186B8A:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r5, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -881,7 +881,7 @@ sub_8186C48: @ 8186C48
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _08186CFA
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r1, [r0, 0x4]
 	lsls r4, r3, 1
@@ -955,7 +955,7 @@ sub_8186D04: @ 8186D04
 	ldrb r0, [r6]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -966,7 +966,7 @@ sub_8186D04: @ 8186D04
 	adds r0, r5
 	ldrb r0, [r0]
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 	b _08186D50
 	.pool
 _08186D4C:
@@ -998,7 +998,7 @@ sub_8186D58: @ 8186D58
 	ldr r0, =gHealthBoxesIds
 	adds r0, r3, r0
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl RecordedOpponentBufferExecCompleted
 _08186D86:
 	pop {r0}
@@ -1009,7 +1009,7 @@ _08186D86:
 	thumb_func_start sub_8186D9C
 sub_8186D9C: @ 8186D9C
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1046,7 +1046,7 @@ sub_8186D9C: @ 8186D9C
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl RecordedOpponentBufferExecCompleted
 _08186DF6:
 	pop {r4-r6}
@@ -1147,7 +1147,7 @@ sub_8186EA4: @ 8186EA4
 	ldr r0, =SpriteCallbackDummy
 	cmp r1, r0
 	bne _08186EF0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r3, 2
@@ -1179,7 +1179,7 @@ _08186EF0:
 	thumb_func_start sub_8186F14
 sub_8186F14: @ 8186F14
 	push {r4,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
@@ -1231,7 +1231,7 @@ _08186F6E:
 	thumb_func_start sub_8186F94
 sub_8186F94: @ 8186F94
 	push {r4-r7,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1302,13 +1302,13 @@ sub_8186F94: @ 8186F94
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r5]
 	bl sub_8076918
 	ldrb r0, [r5]
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	ldrb r0, [r5]
 	bl sub_805E408
 	ldr r1, =gBattleBankFunc
@@ -1327,7 +1327,7 @@ _08187050:
 	thumb_func_start sub_8187084
 sub_8187084: @ 8187084
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -1394,7 +1394,7 @@ _081870B6:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r5]
 	lsls r0, 2
@@ -1411,7 +1411,7 @@ _08187120:
 	thumb_func_start sub_818714C
 sub_818714C: @ 818714C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1435,7 +1435,7 @@ _0818716E:
 	thumb_func_start sub_818717C
 sub_818717C: @ 818717C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1553,7 +1553,7 @@ _0818727E:
 	lsrs r1, 16
 	movs r0, 0x1
 	mov r2, sp
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl RecordedOpponentBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
@@ -3564,7 +3564,7 @@ sub_818843C: @ 818843C
 	muls r2, r0
 	adds r0, r2, 0
 	add r0, r9
-	bl sub_805DC0C
+	bl BattleLoadOpponentMonSpriteGfx
 	ldrb r0, [r6]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3654,7 +3654,7 @@ sub_818843C: @ 818843C
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r6]
 	lsls r0, 2
@@ -3753,7 +3753,7 @@ sub_81885D8: @ 81885D8
 	adds r0, r1, 0
 	adds r0, r5
 	adds r1, r6, 0
-	bl sub_805DC0C
+	bl BattleLoadOpponentMonSpriteGfx
 	adds r0, r6, 0
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3888,7 +3888,7 @@ sub_8188768: @ 8188768
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _081887B0
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3928,7 +3928,7 @@ _081887B0:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl RecordedOpponentBufferExecCompleted
 _081887EC:
 	pop {r4-r6}
@@ -3940,7 +3940,7 @@ _081887EC:
 	thumb_func_start sub_8188800
 sub_8188800: @ 8188800
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4096,7 +4096,7 @@ _0818892C:
 	bl sub_806A12C
 	ldr r6, =gUnknown_0202499C
 	mov r9, r7
-	ldr r1, =gUnknown_083054E0
+	ldr r1, =gTrainerFrontPicCoords
 	mov r2, r8
 	lsls r0, r2, 2
 	adds r0, r1
@@ -4278,7 +4278,7 @@ sub_8188A4C: @ 8188A4C
 	thumb_func_start sub_8188AF8
 sub_8188AF8: @ 8188AF8
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4408,13 +4408,13 @@ _08188BE6:
 	ldrb r1, [r1]
 	lsls r1, 8
 	orrs r0, r1
-	ldr r5, =gUnknown_02038432
+	ldr r5, =gAnimMoveTurn
 	mov r1, r12
 	adds r1, 0x3
 	adds r2, r1
 	ldrb r1, [r2]
 	strb r1, [r5]
-	ldr r4, =gMovePowerMoveAnim
+	ldr r4, =gAnimMovePower
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4428,7 +4428,7 @@ _08188BE6:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r4, =gMoveDmgMoveAnim
+	ldr r4, =gAnimMoveDmg
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4454,7 +4454,7 @@ _08188BE6:
 	lsls r1, 24
 	orrs r3, r1
 	str r3, [r4]
-	ldr r3, =gHappinessMoveAnim
+	ldr r3, =gAnimFriendship
 	ldrb r1, [r6]
 	lsls r1, 9
 	mov r2, r12
@@ -4476,7 +4476,7 @@ _08188BE6:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r3, =gDisableStructMoveAnim
+	ldr r3, =gAnimDisableStructPtr
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4499,7 +4499,7 @@ _08188BE6:
 	b _08188CFA
 	.pool
 _08188CDC:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4546,7 +4546,7 @@ sub_8188D0C: @ 8188D0C
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4605,7 +4605,7 @@ _08188DA4:
 	movs r0, 0
 	bl sub_805EB9C
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl DoMoveAnim
 	ldr r0, [r7]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4654,7 +4654,7 @@ _08188DCE:
 	ands r0, r2
 	strb r0, [r1]
 _08188E1C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4708,10 +4708,10 @@ _08188E80:
 	thumb_func_start sub_8188E90
 sub_8188E90: @ 8188E90
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
@@ -4722,7 +4722,7 @@ sub_8188E90: @ 8188E90
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r4]
 	lsls r0, 2
@@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0
 	lsrs r1, 24
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	bl RecordedOpponentBufferExecCompleted
 	pop {r0}
 	bx r0
@@ -4785,7 +4785,7 @@ sub_8188F20: @ 8188F20
 	lsrs r2, 16
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	b _08188F6C
 	.pool
 _08188F48:
@@ -4803,7 +4803,7 @@ _08188F48:
 	orrs r2, r4
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 _08188F6C:
 	bl RecordedOpponentBufferExecCompleted
 	pop {r4,r5}
@@ -4839,7 +4839,7 @@ sub_8188F88: @ 8188F88
 	ldrb r1, [r0]
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x22_a_three_bytes
+	bl EmitCmd34
 	bl RecordedOpponentBufferExecCompleted
 	pop {r4}
 	pop {r0}
@@ -4863,7 +4863,7 @@ sub_8188FD0: @ 8188FD0
 	push {r6,r7}
 	sub sp, 0x4
 	movs r0, 0
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	ldr r3, =gBattleBufferA
 	ldr r0, =gActiveBank
 	mov r9, r0
@@ -4910,7 +4910,7 @@ sub_8188FD0: @ 8188FD0
 	ldrb r1, [r1]
 	str r7, [sp]
 	mov r2, r8
-	bl sub_807294C
+	bl SetBattleBarStruct
 	b _0818908A
 	.pool
 _08189060:
@@ -4932,7 +4932,7 @@ _08189060:
 	ldrb r1, [r1]
 	str r7, [sp]
 	movs r3, 0
-	bl sub_807294C
+	bl SetBattleBarStruct
 _0818908A:
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
@@ -4981,9 +4981,9 @@ sub_81890CC: @ 81890CC
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5304,7 +5304,7 @@ sub_818936C: @ 818936C
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _081893A8
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -5457,7 +5457,7 @@ sub_8189438: @ 8189438
 	adds r1, r4
 	ldrb r0, [r6]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r6]
 	ldr r1, [r0, 0x4]
@@ -5518,7 +5518,7 @@ c3_0803D564: @ 8189548
 	adds r0, r1
 	ldrh r0, [r0, 0x8]
 	strb r0, [r7]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189582
@@ -5632,7 +5632,7 @@ sub_8189648: @ 8189648
 	b _08189742
 	.pool
 _08189678:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5693,13 +5693,13 @@ _081896E4:
 	subs r4, 0x2
 	adds r3, r4
 	ldrb r3, [r3]
-	bl sub_80735DC
+	bl CreatePartyStatusSummarySprites
 	ldr r2, =gUnknown_020244B4
 	ldrb r1, [r5]
 	adds r1, r2
 	movs r3, 0
 	strb r0, [r1]
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldrb r1, [r5]
 	ldr r2, [r0, 0x4]
@@ -5739,7 +5739,7 @@ _08189742:
 	thumb_func_start sub_818975C
 sub_818975C: @ 818975C
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5775,7 +5775,7 @@ _08189794:
 	thumb_func_start sub_81897A4
 sub_81897A4: @ 81897A4
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -5819,7 +5819,7 @@ sub_8189800: @ 8189800
 	push {r4,lr}
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
-	bl sub_80A6A90
+	bl AnimBankSpriteExists
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189846

asm/battle_controller_recorded_player.s

@@ -132,7 +132,7 @@ _08189A40:
 	thumb_func_start sub_8189A58
 sub_8189A58: @ 8189A58
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r1, [r4]
 	ldr r3, =gActiveBank
 	ldrb r0, [r3]
@@ -180,11 +180,11 @@ sub_8189AA0: @ 8189AA0
 	beq _08189ABA
 	b _08189C60
 _08189ABA:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189ADA
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189B0C
@@ -244,7 +244,7 @@ _08189B42:
 	bne _08189B48
 	b _08189D18
 _08189B48:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	mov r9, r0
 	ldr r0, [r0]
 	ldr r5, =gActiveBank
@@ -337,7 +337,7 @@ _08189B86:
 	ldr r4, =gPlayerParty
 	adds r0, r4
 	bl sub_805E990
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189C22
@@ -366,11 +366,11 @@ _08189C22:
 	b _08189D10
 	.pool
 _08189C60:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189C80
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189CB0
@@ -435,7 +435,7 @@ _08189CE6:
 _08189CF2:
 	cmp r6, 0
 	beq _08189D18
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -478,7 +478,7 @@ sub_8189D40: @ 8189D40
 	lsls r0, 24
 	cmp r0, 0
 	bne _08189DBE
-	ldr r5, =gUnknown_020244D0
+	ldr r5, =gBattleSpritesDataPtr
 	ldr r0, [r5]
 	ldrb r2, [r4]
 	ldr r1, [r0, 0x4]
@@ -527,7 +527,7 @@ _08189D8C:
 	adds r0, r3, 0
 	bl sub_8172EF0
 _08189DBE:
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, =gActiveBank
 	ldrb r5, [r2]
@@ -561,7 +561,7 @@ _08189DBE:
 	ands r0, r1
 	cmp r0, 0
 	bne _08189E84
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189E54
@@ -587,7 +587,7 @@ _08189DBE:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	mov r1, r9
 	ldrb r0, [r1]
 	eors r0, r7
@@ -597,7 +597,7 @@ _08189DBE:
 	eors r0, r7
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _08189E54:
 	ldr r5, =gHealthBoxesIds
 	ldr r4, =gActiveBank
@@ -613,15 +613,15 @@ _08189E54:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _08189E84:
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -702,7 +702,7 @@ _08189F38:
 	lsls r2, 1
 	bl m4aMPlayVolumeControl
 _08189F44:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -747,7 +747,7 @@ _08189F62:
 	ldr r0, [r0]
 	cmp r0, r2
 	bne _0818A02A
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08189FC8
@@ -779,7 +779,7 @@ _08189FC8:
 	ldr r1, =gSprites
 	adds r0, r1
 	bl DestroySprite
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -874,7 +874,7 @@ sub_818A0A4: @ 818A0A4
 	ldrb r0, [r5]
 	adds r0, r6
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -885,7 +885,7 @@ sub_818A0A4: @ 818A0A4
 	adds r0, r6
 	ldrb r0, [r0]
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 	b _0818A106
 	.pool
 _0818A0EC:
@@ -963,7 +963,7 @@ sub_818A114: @ 818A114
 	ldrb r0, [r4]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl RecordedPlayerBufferExecCompleted
 _0818A190:
 	pop {r4-r6}
@@ -975,7 +975,7 @@ _0818A190:
 	thumb_func_start sub_818A1B0
 sub_818A1B0: @ 818A1B0
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -1010,7 +1010,7 @@ sub_818A1B0: @ 818A1B0
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl RecordedPlayerBufferExecCompleted
 _0818A204:
 	pop {r4-r6}
@@ -1113,7 +1113,7 @@ sub_818A2B4: @ 818A2B4
 	bne _0818A306
 	adds r0, r3, 0
 	bl sub_805E408
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r2, [r4]
 	ldr r1, [r0]
@@ -1145,7 +1145,7 @@ _0818A306:
 	thumb_func_start sub_818A328
 sub_818A328: @ 818A328
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -1184,7 +1184,7 @@ sub_818A37C: @ 818A37C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r7, =gActiveBank
 	ldrb r1, [r7]
@@ -1254,13 +1254,13 @@ sub_818A37C: @ 818A37C
 	muls r1, r6
 	adds r1, r5
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r7]
 	bl sub_8076918
 	ldrb r0, [r7]
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r7]
 	lsls r0, 2
@@ -1279,7 +1279,7 @@ _0818A438:
 	thumb_func_start sub_818A470
 sub_818A470: @ 818A470
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r4, =gActiveBank
 	ldrb r2, [r4]
@@ -1397,7 +1397,7 @@ _0818A57A:
 	thumb_func_start sub_818A58C
 sub_818A58C: @ 818A58C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1421,7 +1421,7 @@ _0818A5AE:
 	thumb_func_start sub_818A5BC
 sub_818A5BC: @ 818A5BC
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -1489,7 +1489,7 @@ _0818A646:
 	lsrs r1, 16
 	movs r0, 0x1
 	mov r2, sp
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl RecordedPlayerBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
@@ -3530,7 +3530,7 @@ sub_818B8E0: @ 818B8E0
 	muls r0, r5
 	ldr r4, =gPlayerParty
 	adds r0, r4
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r6]
 	lsls r0, 1
 	add r0, r8
@@ -3659,7 +3659,7 @@ sub_818B9FC: @ 818B9FC
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r5]
 	lsls r1, r0, 9
 	adds r1, r6
@@ -3852,7 +3852,7 @@ sub_818BBE8: @ 818BBE8
 	ldrb r3, [r0]
 	cmp r3, 0
 	bne _0818BC30
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x4]
 	lsls r0, r2, 1
@@ -3890,7 +3890,7 @@ _0818BC30:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl RecordedPlayerBufferExecCompleted
 _0818BC66:
 	pop {r4-r6}
@@ -3902,7 +3902,7 @@ _0818BC66:
 	thumb_func_start sub_818BC78
 sub_818BC78: @ 818BC78
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4033,14 +4033,14 @@ _0818BD72:
 	beq _0818BD9C
 	movs r0, 0x5A
 	mov r9, r0
-	ldr r1, =gUnknown_083054E0
+	ldr r1, =gTrainerFrontPicCoords
 	b _0818BD9E
 	.pool
 _0818BD98:
 	movs r0, 0x50
 	mov r9, r0
 _0818BD9C:
-	ldr r1, =gUnknown_08305D2C
+	ldr r1, =gTrainerBackPicCoords
 _0818BD9E:
 	lsls r0, r4, 2
 	adds r0, r1
@@ -4182,7 +4182,7 @@ _0818BEDC:
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldrb r0, [r5]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -4350,7 +4350,7 @@ sub_818BFB8: @ 818BFB8
 	thumb_func_start sub_818C064
 sub_818C064: @ 818C064
 	push {r4-r6,lr}
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r4, [r6]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -4508,13 +4508,13 @@ _0818C192:
 	ldrb r1, [r1]
 	lsls r1, 8
 	orrs r0, r1
-	ldr r5, =gUnknown_02038432
+	ldr r5, =gAnimMoveTurn
 	mov r1, r12
 	adds r1, 0x3
 	adds r2, r1
 	ldrb r1, [r2]
 	strb r1, [r5]
-	ldr r4, =gMovePowerMoveAnim
+	ldr r4, =gAnimMovePower
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4528,7 +4528,7 @@ _0818C192:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r4, =gMoveDmgMoveAnim
+	ldr r4, =gAnimMoveDmg
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4554,7 +4554,7 @@ _0818C192:
 	lsls r1, 24
 	orrs r3, r1
 	str r3, [r4]
-	ldr r3, =gHappinessMoveAnim
+	ldr r3, =gAnimFriendship
 	ldrb r1, [r6]
 	lsls r1, 9
 	mov r2, r12
@@ -4576,7 +4576,7 @@ _0818C192:
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r3, =gDisableStructMoveAnim
+	ldr r3, =gAnimDisableStructPtr
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -4599,7 +4599,7 @@ _0818C192:
 	b _0818C2A6
 	.pool
 _0818C288:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4646,7 +4646,7 @@ bx_move_anim_2: @ 818C2B8
 	adds r1, r2
 	ldrb r1, [r1]
 	mov r8, r1
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -4705,7 +4705,7 @@ _0818C350:
 	movs r0, 0
 	bl sub_805EB9C
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl DoMoveAnim
 	ldr r0, [r7]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -4754,7 +4754,7 @@ _0818C37A:
 	ands r0, r2
 	strb r0, [r1]
 _0818C3C8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -4808,10 +4808,10 @@ _0818C42C:
 	thumb_func_start sub_818C43C
 sub_818C43C: @ 818C43C
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
@@ -4822,7 +4822,7 @@ sub_818C43C: @ 818C43C
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r4]
 	lsls r0, 2
@@ -4861,7 +4861,7 @@ sub_818C49C: @ 818C49C
 	lsrs r1, 24
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	bl RecordedPlayerBufferExecCompleted
 _0818C4C6:
 	pop {r0}
@@ -4897,7 +4897,7 @@ _0818C508:
 	lsrs r1, 24
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	bl RecordedPlayerBufferExecCompleted
 _0818C522:
 	pop {r0}
@@ -4929,7 +4929,7 @@ sub_818C538: @ 818C538
 	lsrs r2, 16
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	b _0818C584
 	.pool
 _0818C560:
@@ -4947,7 +4947,7 @@ _0818C560:
 	orrs r2, r4
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 _0818C584:
 	bl RecordedPlayerBufferExecCompleted
 	pop {r4,r5}
@@ -4983,7 +4983,7 @@ sub_818C5A0: @ 818C5A0
 	ldrb r1, [r0]
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x22_a_three_bytes
+	bl EmitCmd34
 	bl RecordedPlayerBufferExecCompleted
 	pop {r4}
 	pop {r0}
@@ -5007,7 +5007,7 @@ sub_818C5E8: @ 818C5E8
 	push {r6,r7}
 	sub sp, 0x4
 	movs r0, 0
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	ldr r3, =gBattleBufferA
 	ldr r0, =gActiveBank
 	mov r9, r0
@@ -5054,7 +5054,7 @@ sub_818C5E8: @ 818C5E8
 	ldrb r1, [r1]
 	str r7, [sp]
 	mov r2, r8
-	bl sub_807294C
+	bl SetBattleBarStruct
 	b _0818C6B2
 	.pool
 _0818C678:
@@ -5076,14 +5076,14 @@ _0818C678:
 	ldrb r1, [r1]
 	str r7, [sp]
 	movs r3, 0
-	bl sub_807294C
+	bl SetBattleBarStruct
 	mov r1, r9
 	ldrb r0, [r1]
 	adds r0, r4
 	ldrb r0, [r0]
 	movs r1, 0
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 _0818C6B2:
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
@@ -5132,9 +5132,9 @@ sub_818C6F4: @ 818C6F4
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r2, 1
@@ -5455,7 +5455,7 @@ sub_818C994: @ 818C994
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0818C9D0
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -5676,7 +5676,7 @@ _0818CB5A:
 	adds r1, r4
 	ldrb r0, [r5]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r5]
 	ldr r1, [r0, 0x4]
@@ -5746,7 +5746,7 @@ _0818CC50:
 	mov r9, r0
 	ldrh r0, [r1, 0x8]
 	strb r0, [r7]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0818CC70
@@ -5805,7 +5805,7 @@ _0818CCA0:
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r7]
 	movs r1, 0
 	bl sub_818BA6C
@@ -5855,7 +5855,7 @@ sub_818CD30: @ 818CD30
 	b _0818CDD4
 	.pool
 _0818CD60:
-	ldr r6, =gUnknown_020244D0
+	ldr r6, =gBattleSpritesDataPtr
 	ldr r0, [r6]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -5878,7 +5878,7 @@ _0818CD60:
 	subs r4, 0x2
 	adds r3, r4
 	ldrb r3, [r3]
-	bl sub_80735DC
+	bl CreatePartyStatusSummarySprites
 	ldr r2, =gUnknown_020244B4
 	ldrb r1, [r5]
 	adds r1, r2
@@ -5923,7 +5923,7 @@ _0818CDD4:
 	thumb_func_start bx_increment_dp11b_field_5_till_x60_then_resume
 bx_increment_dp11b_field_5_till_x60_then_resume: @ 818CDF4
 	push {r4,lr}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r3, =gActiveBank
 	ldrb r1, [r3]
@@ -5959,7 +5959,7 @@ _0818CE2C:
 	thumb_func_start sub_818CE3C
 sub_818CE3C: @ 818CE3C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r1, [r0]
 	ldr r0, =gActiveBank
 	ldrb r3, [r0]
@@ -6003,7 +6003,7 @@ sub_818CE98: @ 818CE98
 	push {r4,lr}
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
-	bl sub_80A6A90
+	bl AnimBankSpriteExists
 	lsls r0, 24
 	cmp r0, 0
 	beq _0818CEDE

asm/battle_controller_safari.s

@@ -71,7 +71,7 @@ bx_battle_menu_t6_2: @ 81593D8
 	beq _08159446
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
@@ -103,13 +103,13 @@ _0815942A:
 	movs r1, 0x7
 _0815942E:
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	b _08159440
 _08159436:
 	movs r0, 0x1
 	movs r1, 0x8
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 _08159440:
 	bl SafariBufferExecCompleted
 	b _0815954E
@@ -118,7 +118,7 @@ _08159446:
 	ands r0, r1
 	cmp r0, 0
 	beq _08159484
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -132,7 +132,7 @@ _08159446:
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	ldrb r1, [r4]
 	adds r1, r5
 	ldrb r0, [r1]
@@ -144,7 +144,7 @@ _08159484:
 	ands r0, r1
 	cmp r0, 0
 	beq _081594C0
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -158,7 +158,7 @@ _08159484:
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	ldrb r1, [r4]
 	adds r1, r5
 	ldrb r0, [r1]
@@ -170,7 +170,7 @@ _081594C0:
 	ands r0, r1
 	cmp r0, 0
 	beq _0815950C
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -184,7 +184,7 @@ _081594C0:
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	ldrb r1, [r4]
 	adds r1, r5
 	ldrb r0, [r1]
@@ -196,7 +196,7 @@ _081594F2:
 	adds r0, r5
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	b _0815954E
 	.pool
 _0815950C:
@@ -204,7 +204,7 @@ _0815950C:
 	ands r0, r1
 	cmp r0, 0
 	beq _0815954E
-	ldr r5, =gUnknown_020244AC
+	ldr r5, =gActionSelectionCursor
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
 	adds r0, r5
@@ -218,7 +218,7 @@ _0815950C:
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	ldrb r1, [r4]
 	adds r1, r5
 	ldrb r0, [r1]
@@ -229,7 +229,7 @@ _0815950C:
 	adds r0, r5
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 _0815954E:
 	pop {r4,r5}
 	pop {r0}
@@ -318,7 +318,7 @@ sub_81595E4: @ 81595E4
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r3]
-	ldr r0, =gUnknown_03005D00
+	ldr r0, =gPreBattleCallback1
 	ldr r0, [r0]
 	str r0, [r2]
 	ldr r0, [r2, 0x8]
@@ -336,7 +336,7 @@ bx_wait_t6: @ 8159624
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0815964A
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -387,7 +387,7 @@ sub_8159698: @ 8159698
 	push {lr}
 	ldr r0, =gMain
 	ldr r1, [r0, 0x4]
-	ldr r0, =sub_8038420
+	ldr r0, =BattleMainCB2
 	cmp r1, r0
 	bne _081596BE
 	ldr r0, =gPaletteFade
@@ -399,7 +399,7 @@ sub_8159698: @ 8159698
 	ldr r0, =gScriptItemId
 	ldrh r1, [r0]
 	movs r0, 0x1
-	bl dp01_build_cmdbuf_x23_aa_0
+	bl EmitCmd35
 	bl SafariBufferExecCompleted
 _081596BE:
 	pop {r0}
@@ -410,7 +410,7 @@ _081596BE:
 	thumb_func_start sub_81596D4
 sub_81596D4: @ 81596D4
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -484,7 +484,7 @@ _0815976A:
 	thumb_func_start bx_80364D0
 bx_80364D0: @ 815977C
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -569,7 +569,7 @@ sub_8159800: @ 8159800
 	ldrb r0, [r0, 0x8]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldr r0, [r4]
 	ldrb r6, [r0, 0x8]
 	ldrb r0, [r5]
@@ -580,7 +580,7 @@ sub_8159800: @ 8159800
 	adds r0, r6, 0
 	bl sub_806A12C
 	ldr r0, =gUnknown_0202499C
-	ldr r2, =gUnknown_08305D2C
+	ldr r2, =gTrainerBackPicCoords
 	ldr r1, [r4]
 	ldrb r1, [r1, 0x8]
 	lsls r1, 2
@@ -689,7 +689,7 @@ sub_8159904: @ 8159904
 	thumb_func_start sub_8159910
 sub_8159910: @ 8159910
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	movs r0, 0x4
@@ -700,7 +700,7 @@ sub_8159910: @ 8159910
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	adds r2, r0, 0
 	lsls r2, 24
 	lsrs r2, 24
@@ -730,7 +730,7 @@ sub_8159964: @ 8159964
 	adds r1, 0x1
 	adds r0, r1
 	ldrb r1, [r0]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strb r1, [r0, 0x8]
@@ -739,7 +739,7 @@ sub_8159964: @ 8159964
 	strb r0, [r1]
 	ldrb r4, [r5]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	adds r2, r0, 0
 	lsls r2, 24
 	lsrs r2, 24
@@ -778,10 +778,10 @@ sub_81599D0: @ 81599D0
 	thumb_func_start dp01t_10_6_message
 dp01t_10_6_message: @ 81599DC
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
@@ -792,7 +792,7 @@ dp01t_10_6_message: @ 81599DC
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r4]
 	lsls r0, 2
@@ -832,9 +832,9 @@ sub_8159A54: @ 8159A54
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _08159A7A
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gBattleBankFunc
@@ -862,27 +862,27 @@ sub_8159A94: @ 8159A94
 	str r1, [r0]
 	ldr r0, =gText_SafariZoneMenu
 	movs r1, 0x2
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	movs r4, 0
 _08159AAE:
 	lsls r0, r4, 24
 	lsrs r0, 24
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _08159AAE
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	ldr r0, =gText_WhatWillPkmnDo2
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0x1
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -981,7 +981,7 @@ sub_8159B84: @ 8159B84
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0xB
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	bl SafariBufferExecCompleted
 	pop {r0}
 	bx r0
@@ -1161,7 +1161,7 @@ dp01t_34_6_move_anim_start_t3: @ 8159CC4
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08159D00
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -1256,13 +1256,13 @@ sub_8159D90: @ 8159D90
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0xA
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r4]
 	lsls r0, 2

asm/battle_controller_wally.s

@@ -153,7 +153,7 @@ _081684CE:
 	movs r1, 0x9
 _081684E4:
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	bl WallyBufferExecCompleted
 	ldr r1, [r4]
 	adds r1, 0x94
@@ -180,10 +180,10 @@ _08168508:
 	movs r0, 0x5
 	bl PlaySE
 	movs r0, 0
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	movs r0, 0x1
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	ldr r0, [r4]
 	adds r0, 0x96
 	movs r1, 0x40
@@ -208,7 +208,7 @@ _08168540:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	bl WallyBufferExecCompleted
 _08168564:
 	pop {r4,r5}
@@ -299,7 +299,7 @@ sub_8168610: @ 8168610
 	push {lr}
 	ldr r0, =gMain
 	ldr r1, [r0, 0x4]
-	ldr r0, =sub_8038420
+	ldr r0, =BattleMainCB2
 	cmp r1, r0
 	bne _08168636
 	ldr r0, =gPaletteFade
@@ -311,7 +311,7 @@ sub_8168610: @ 8168610
 	ldr r0, =gScriptItemId
 	ldrh r1, [r0]
 	movs r0, 0x1
-	bl dp01_build_cmdbuf_x23_aa_0
+	bl EmitCmd35
 	bl WallyBufferExecCompleted
 _08168636:
 	pop {r0}
@@ -324,7 +324,7 @@ sub_816864C: @ 816864C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r5, =gActiveBank
 	ldrb r2, [r5]
@@ -425,7 +425,7 @@ _081686D2:
 	ldr r0, [r0]
 	cmp r0, r3
 	bne _081687DC
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0816877A
@@ -459,7 +459,7 @@ _081686D2:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r5]
 	eors r0, r6
 	bl sub_8076918
@@ -467,7 +467,7 @@ _081686D2:
 	eors r0, r6
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _0816877A:
 	ldr r1, =gUnknown_03005D7C
 	ldr r4, =gActiveBank
@@ -493,14 +493,14 @@ _0816877A:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r4]
 	bl sub_8076918
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
 	ldrb r1, [r2, 0x9]
@@ -549,7 +549,7 @@ sub_8168818: @ 8168818
 _08168842:
 	cmp r4, 0
 	beq _08168904
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r0, [r7]
 	ldr r4, [r0, 0x4]
 	lsls r0, r3, 1
@@ -665,7 +665,7 @@ sub_8168934: @ 8168934
 	ldrb r0, [r5]
 	adds r0, r6
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -676,7 +676,7 @@ sub_8168934: @ 8168934
 	adds r0, r6
 	ldrb r0, [r0]
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 	b _08168996
 	.pool
 _0816897C:
@@ -761,7 +761,7 @@ _08168A1A:
 	thumb_func_start sub_8168A20
 sub_8168A20: @ 8168A20
 	push {r4-r6,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r2, [r6]
@@ -796,7 +796,7 @@ sub_8168A20: @ 8168A20
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl WallyBufferExecCompleted
 _08168A74:
 	pop {r4-r6}
@@ -833,7 +833,7 @@ _08168AB4:
 	thumb_func_start sub_8168AC8
 sub_8168AC8: @ 8168AC8
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -907,7 +907,7 @@ _08168B5E:
 	thumb_func_start sub_8168B70
 sub_8168B70: @ 8168B70
 	push {lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
 	ldr r0, =gActiveBank
 	ldrb r1, [r0]
@@ -975,7 +975,7 @@ _08168BFA:
 	lsrs r1, 16
 	movs r0, 0x1
 	mov r2, sp
-	bl dp01_build_cmdbuf_x1D_1D_numargs_varargs
+	bl EmitDataTransfer
 	bl WallyBufferExecCompleted
 	add sp, 0x100
 	pop {r4-r6}
@@ -3015,7 +3015,7 @@ _08169E80:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl WallyBufferExecCompleted
 _08169EB6:
 	pop {r4-r6}
@@ -3030,7 +3030,7 @@ sub_8169EC8: @ 8169EC8
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
 	movs r0, 0x6
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldrb r0, [r4]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3039,7 +3039,7 @@ sub_8169EC8: @ 8169EC8
 	movs r0, 0x6
 	bl sub_806A12C
 	ldr r0, =gUnknown_0202499C
-	ldr r1, =gUnknown_08305D2C
+	ldr r1, =gTrainerBackPicCoords
 	ldrb r1, [r1, 0x18]
 	movs r2, 0x8
 	subs r2, r1
@@ -3115,7 +3115,7 @@ dp01t_07_6_: @ 8169F94
 	ldr r4, =gActiveBank
 	ldrb r1, [r4]
 	movs r0, 0x6
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldrb r0, [r4]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -3124,7 +3124,7 @@ dp01t_07_6_: @ 8169F94
 	movs r0, 0x6
 	bl sub_806A12C
 	ldr r0, =gUnknown_0202499C
-	ldr r1, =gUnknown_08305D2C
+	ldr r1, =gTrainerBackPicCoords
 	ldrb r1, [r1, 0x18]
 	movs r2, 0x8
 	subs r2, r1
@@ -3221,7 +3221,7 @@ sub_816A078: @ 816A078
 	thumb_func_start sub_816A084
 sub_816A084: @ 816A084
 	push {r4,r5,lr}
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	movs r0, 0x4
@@ -3232,7 +3232,7 @@ sub_816A084: @ 816A084
 	ldr r5, =gActiveBank
 	ldrb r4, [r5]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	adds r2, r0, 0
 	lsls r2, 24
 	lsrs r2, 24
@@ -3262,7 +3262,7 @@ sub_816A0D8: @ 816A0D8
 	adds r1, 0x1
 	adds r0, r1
 	ldrb r1, [r0]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strb r1, [r0, 0x8]
@@ -3271,7 +3271,7 @@ sub_816A0D8: @ 816A0D8
 	strb r0, [r1]
 	ldrb r4, [r5]
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	adds r2, r0, 0
 	lsls r2, 24
 	lsrs r2, 24
@@ -3316,13 +3316,13 @@ sub_816A144: @ 816A144
 	ldrb r1, [r1]
 	lsls r1, 8
 	orrs r0, r1
-	ldr r5, =gUnknown_02038432
+	ldr r5, =gAnimMoveTurn
 	mov r1, r12
 	adds r1, 0x3
 	adds r2, r1
 	ldrb r1, [r2]
 	strb r1, [r5]
-	ldr r4, =gMovePowerMoveAnim
+	ldr r4, =gAnimMovePower
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -3336,7 +3336,7 @@ sub_816A144: @ 816A144
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r4, =gMoveDmgMoveAnim
+	ldr r4, =gAnimMoveDmg
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -3362,7 +3362,7 @@ sub_816A144: @ 816A144
 	lsls r1, 24
 	orrs r3, r1
 	str r3, [r4]
-	ldr r3, =gHappinessMoveAnim
+	ldr r3, =gAnimFriendship
 	ldrb r1, [r6]
 	lsls r1, 9
 	mov r2, r12
@@ -3384,7 +3384,7 @@ sub_816A144: @ 816A144
 	lsls r1, 8
 	orrs r3, r1
 	strh r3, [r4]
-	ldr r3, =gDisableStructMoveAnim
+	ldr r3, =gAnimDisableStructPtr
 	ldrb r2, [r6]
 	lsls r2, 9
 	mov r1, r12
@@ -3407,7 +3407,7 @@ sub_816A144: @ 816A144
 	b _0816A25A
 	.pool
 _0816A23C:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -3449,7 +3449,7 @@ bx_move_anim_5: @ 816A26C
 	ldrb r0, [r1]
 	lsls r0, 8
 	orrs r4, r0
-	ldr r7, =gUnknown_020244D0
+	ldr r7, =gBattleSpritesDataPtr
 	ldr r5, [r7]
 	ldr r1, [r5, 0x4]
 	lsls r0, r3, 1
@@ -3505,7 +3505,7 @@ _0816A2F6:
 	movs r0, 0
 	bl sub_805EB9C
 	adds r0, r4, 0
-	bl move_anim_start_t1
+	bl DoMoveAnim
 	ldr r0, [r7]
 	ldrb r1, [r6]
 	ldr r2, [r0, 0x4]
@@ -3592,10 +3592,10 @@ _0816A3AC:
 	thumb_func_start sub_816A3B8
 sub_816A3B8: @ 816A3B8
 	push {r4,lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
 	ldr r4, =gActiveBank
 	ldrb r0, [r4]
@@ -3606,7 +3606,7 @@ sub_816A3B8: @ 816A3B8
 	bl BufferStringBattle
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r4]
 	lsls r0, 2
@@ -3646,9 +3646,9 @@ sub_816A430: @ 816A430
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _0816A456
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gBattleBankFunc
@@ -3676,27 +3676,27 @@ dp01t_12_1_battle_menu: @ 816A470
 	str r1, [r0]
 	ldr r0, =gText_BattleMenu
 	movs r1, 0x2
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	movs r4, 0
 _0816A48A:
 	lsls r0, r4, 24
 	lsrs r0, 24
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0816A48A
-	ldr r1, =gUnknown_020244AC
+	ldr r1, =gActionSelectionCursor
 	ldr r0, =gActiveBank
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	ldr r0, =gText_WhatWillWallyDo
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0x1
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -3749,9 +3749,9 @@ _0816A522:
 	lsrs r1, r0, 24
 	cmp r1, 0
 	bne _0816A574
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r2, 0xA0
 	lsls r2, 1
 	adds r0, r2, 0
@@ -3777,7 +3777,7 @@ _0816A550:
 	lsls r2, 1
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd33
 	bl WallyBufferExecCompleted
 _0816A574:
 	pop {r4}
@@ -3836,7 +3836,7 @@ sub_816A5D4: @ 816A5D4
 	push {r6,r7}
 	sub sp, 0x4
 	movs r0, 0
-	bl load_gfxc_health_bar
+	bl LoadBattleBarGfx
 	ldr r3, =gBattleBufferA
 	ldr r0, =gActiveBank
 	mov r9, r0
@@ -3883,7 +3883,7 @@ sub_816A5D4: @ 816A5D4
 	ldrb r1, [r1]
 	str r7, [sp]
 	mov r2, r8
-	bl sub_807294C
+	bl SetBattleBarStruct
 	b _0816A69E
 	.pool
 _0816A664:
@@ -3905,14 +3905,14 @@ _0816A664:
 	ldrb r1, [r1]
 	str r7, [sp]
 	movs r3, 0
-	bl sub_807294C
+	bl SetBattleBarStruct
 	mov r1, r9
 	ldrb r0, [r1]
 	adds r0, r4
 	ldrb r0, [r0]
 	movs r1, 0
 	movs r2, 0
-	bl heathbar_draw_hp
+	bl UpdateHpTextInHealthbox
 _0816A69E:
 	ldr r1, =gBattleBankFunc
 	ldr r0, =gActiveBank
@@ -4150,7 +4150,7 @@ sub_816A840: @ 816A840
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0816A87C
-	bl sub_805EA60
+	bl BattleMusicStop
 	ldrb r1, [r5]
 	lsls r1, 9
 	adds r0, r4, 0x1
@@ -4342,7 +4342,7 @@ sub_816A90C: @ 816A90C
 	adds r1, r4
 	ldrb r0, [r7]
 	strh r0, [r1, 0x8]
-	ldr r3, =gUnknown_020244D0
+	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldrb r2, [r7]
 	ldr r1, [r0, 0x4]
@@ -4393,7 +4393,7 @@ sub_816AA80: @ 816AA80
 	adds r6, r0, 0
 	lsls r6, 24
 	lsrs r6, 24
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r1, [r0]
 	lsls r0, r6, 2
@@ -4622,7 +4622,7 @@ sub_816AC78: @ 816AC78
 	b _0816ACE6
 	.pool
 _0816ACA8:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
@@ -4645,7 +4645,7 @@ _0816ACA8:
 	subs r3, 0x2
 	adds r4, r3
 	ldrb r3, [r4]
-	bl sub_80735DC
+	bl CreatePartyStatusSummarySprites
 	ldr r2, =gUnknown_020244B4
 	ldrb r1, [r5]
 	adds r1, r2

asm/battle_frontier_1.s

@@ -2599,10 +2599,10 @@ _0818FFFC:
 	b _081900A4
 	.pool
 _0819002C:
-	ldr r0, =gUnknown_0831ACE8
+	ldr r0, =gTypeEffectiveness
 	adds r1, r6, r0
 	ldrb r0, [r1]
-	ldr r7, =gUnknown_0831ACE8
+	ldr r7, =gTypeEffectiveness
 	cmp r0, 0xFF
 	beq _081900A4
 	adds r4, r1, 0
@@ -2657,7 +2657,7 @@ _08190088:
 _08190096:
 	adds r4, 0x3
 	adds r6, 0x3
-	ldr r1, =gUnknown_0831ACE8
+	ldr r1, =gTypeEffectiveness
 	adds r0, r6, r1
 	ldrb r0, [r0]
 	cmp r0, 0xFF
@@ -3161,31 +3161,31 @@ _0819044E:
 	ldr r0, =gUnknown_0860CEB4
 	bl InitWindows
 	bl DeactivateAllTextPrinters
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E20
+	ldr r0, =gBattle_BG3_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
 	mov r2, r9
 	cmp r2, 0x2
 	bne _081904DC
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r4, [r0]
 	b _081904E6
 	.pool
 _081904DC:
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r4, [r0]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 _081904E6:
@@ -4366,27 +4366,27 @@ _08190E98:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08190ED4
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E1A
+	ldr r1, =gBattle_BG1_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	b _08190EE6
 	.pool
 _08190ED4:
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r2, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	movs r0, 0xA0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r2, [r0]
 _08190EE6:
 	cmp r6, 0x1
@@ -4396,9 +4396,9 @@ _08190EE6:
 	ldrb r1, [r0, 0x10]
 	cmp r1, 0
 	bne _08190F50
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r6, 0xA0
 	lsls r6, 1
 	adds r0, r6, 0
@@ -4424,12 +4424,12 @@ _08190EE6:
 	b _08191084
 	.pool
 _08190F50:
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r6, 0x80
 	lsls r6, 1
 	adds r0, r6, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	movs r4, 0
 	strh r4, [r0]
 	ldr r3, =gUnknown_0860D080
@@ -4473,9 +4473,9 @@ _08190F9C:
 	lsrs r0, 24
 	adds r1, 0x11
 	bl sub_8192F08
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r5, [r0]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r3, 0xA0
 	lsls r3, 1
 	adds r0, r3, 0
@@ -4508,10 +4508,10 @@ _08190FF8:
 	lsrs r0, 24
 	adds r1, 0x11
 	bl sub_8192F08
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r2, 0xA0
 	lsls r2, 1
 	adds r0, r2, 0
@@ -4529,12 +4529,12 @@ _08190FF8:
 	b _08191084
 	.pool
 _0819104C:
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r3, 0x80
 	lsls r3, 1
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gTasks
@@ -4765,29 +4765,29 @@ _08191234:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08191278
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E1A
+	ldr r1, =gBattle_BG1_Y
 	ldr r2, =0x0000ff60
 	adds r0, r2, 0
 	strh r0, [r1]
 	b _0819128C
 	.pool
 _08191278:
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r2, [r0]
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldr r3, =0x0000ff60
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r2, [r0]
 _0819128C:
 	cmp r6, 0x2
@@ -4797,9 +4797,9 @@ _0819128C:
 	ldrb r1, [r0, 0x10]
 	cmp r1, 0
 	bne _081912F4
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r3, =gUnknown_0860D080
@@ -4823,10 +4823,10 @@ _0819128C:
 	b _0819141C
 	.pool
 _081912F4:
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	movs r4, 0
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r4, [r0]
 	ldr r3, =gUnknown_0860D080
 	ldr r2, =gTasks
@@ -4869,9 +4869,9 @@ _0819133C:
 	lsrs r0, 24
 	adds r1, 0x11
 	bl sub_8192F08
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r5, [r0]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r2, [r6]
@@ -4902,10 +4902,10 @@ _08191394:
 	lsrs r0, 24
 	adds r1, 0x11
 	bl sub_8192F08
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r2, [r6]
@@ -4921,12 +4921,12 @@ _08191394:
 	b _0819141C
 	.pool
 _081913E4:
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r4, 0x80
 	lsls r4, 1
 	adds r0, r4, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0
 	strh r0, [r1]
 	ldr r1, =gTasks
@@ -5157,31 +5157,31 @@ _081915CC:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _0819160C
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r2, =gUnknown_02022E18
+	ldr r2, =gBattle_BG1_X
 	movs r6, 0x80
 	lsls r6, 1
 	adds r0, r6, 0
 	strh r0, [r2]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r1, [r0]
 	b _08191622
 	.pool
 _0819160C:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0x80
 	lsls r3, 1
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r2, [r0]
 _08191622:
 	ldr r0, =gUnknown_0203CD78
@@ -5189,12 +5189,12 @@ _08191622:
 	ldrb r0, [r4, 0x10]
 	cmp r0, 0
 	bne _08191688
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r4, 0x80
 	lsls r4, 1
 	adds r0, r4, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r3, =gUnknown_0860D080
@@ -5218,12 +5218,12 @@ _08191622:
 	b _081916C6
 	.pool
 _08191688:
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r6, 0x80
 	lsls r6, 1
 	adds r0, r6, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0
 	strh r0, [r1]
 	ldr r3, =gUnknown_0860D15C
@@ -5457,31 +5457,31 @@ _0819187C:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _081918BC
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r2, =gUnknown_02022E18
+	ldr r2, =gBattle_BG1_X
 	movs r6, 0x80
 	lsls r6, 1
 	adds r0, r6, 0
 	strh r0, [r2]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r1, [r0]
 	b _081918D2
 	.pool
 _081918BC:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0x80
 	lsls r3, 1
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r2, [r0]
 _081918D2:
 	ldr r0, =gUnknown_0203CD78
@@ -5489,12 +5489,12 @@ _081918D2:
 	ldrb r0, [r2, 0x10]
 	cmp r0, 0
 	bne _08191924
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r4, 0x80
 	lsls r4, 1
 	adds r0, r4, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gTasks
@@ -5510,10 +5510,10 @@ _081918D2:
 	b _08191958
 	.pool
 _08191924:
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gTasks
@@ -5744,31 +5744,31 @@ _08191B08:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08191B48
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r2, =gUnknown_02022E18
+	ldr r2, =gBattle_BG1_X
 	movs r6, 0xFF
 	lsls r6, 8
 	adds r0, r6, 0
 	strh r0, [r2]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r1, [r0]
 	b _08191B5E
 	.pool
 _08191B48:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0xFF
 	lsls r3, 8
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r2, [r0]
 _08191B5E:
 	ldr r0, =gUnknown_0203CD78
@@ -5776,19 +5776,19 @@ _08191B5E:
 	ldrb r0, [r0, 0x10]
 	cmp r0, 0x1
 	bne _08191B94
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	b _08191B9E
 	.pool
 _08191B94:
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r1, [r0]
 _08191B9E:
 	ldr r4, =gUnknown_0860D15C
@@ -6011,31 +6011,31 @@ _08191D68:
 	ldrsh r2, [r0, r5]
 	cmp r2, 0
 	beq _08191DA8
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r2, =gUnknown_02022E18
+	ldr r2, =gBattle_BG1_X
 	movs r6, 0xFF
 	lsls r6, 8
 	adds r0, r6, 0
 	strh r0, [r2]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r1, [r0]
 	b _08191DBE
 	.pool
 _08191DA8:
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	movs r3, 0xFF
 	lsls r3, 8
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r2, [r0]
 _08191DBE:
 	ldr r0, =gUnknown_0203CD78
@@ -6043,12 +6043,12 @@ _08191DBE:
 	ldrb r0, [r2, 0x10]
 	cmp r0, 0x2
 	bne _08191E10
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r4, 0x80
 	lsls r4, 1
 	adds r0, r4, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gTasks
@@ -6064,10 +6064,10 @@ _08191DBE:
 	b _08191E44
 	.pool
 _08191E10:
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	movs r0, 0xA0
 	strh r0, [r1]
 	ldr r1, =gTasks
@@ -6306,15 +6306,15 @@ _08191FF8:
 	asrs r0, 16
 	cmp r0, 0x29
 	beq _08192100
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldrh r0, [r1]
 	subs r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1A
+	ldr r1, =gBattle_BG1_Y
 	ldrh r0, [r1]
 	subs r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	b _081920A4
 	.pool
 _08192038:
@@ -6331,15 +6331,15 @@ _08192038:
 	asrs r0, 16
 	cmp r0, 0x29
 	beq _08192100
-	ldr r1, =gUnknown_02022E16
+	ldr r1, =gBattle_BG0_Y
 	ldrh r0, [r1]
 	adds r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1A
+	ldr r1, =gBattle_BG1_Y
 	ldrh r0, [r1]
 	adds r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1E
+	ldr r1, =gBattle_BG2_Y
 	b _081920E8
 	.pool
 _08192078:
@@ -6356,15 +6356,15 @@ _08192078:
 	asrs r0, 16
 	cmp r0, 0x41
 	beq _08192100
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	ldrh r0, [r1]
 	subs r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E18
+	ldr r1, =gBattle_BG1_X
 	ldrh r0, [r1]
 	subs r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 _081920A4:
 	ldrh r0, [r1]
 	subs r0, 0x4
@@ -6385,15 +6385,15 @@ _081920BC:
 	asrs r0, 16
 	cmp r0, 0x41
 	beq _08192100
-	ldr r1, =gUnknown_02022E14
+	ldr r1, =gBattle_BG0_X
 	ldrh r0, [r1]
 	adds r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E18
+	ldr r1, =gBattle_BG1_X
 	ldrh r0, [r1]
 	adds r0, 0x4
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E1C
+	ldr r1, =gBattle_BG2_X
 _081920E8:
 	ldrh r0, [r1]
 	adds r0, 0x4
@@ -10109,7 +10109,7 @@ _08194074:
 	lsls r0, r4, 1
 	add r0, r10
 	ldrh r0, [r0]
-	bl ai_rate_move
+	bl AI_TypeCalc
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r0, 0x6
@@ -10400,13 +10400,13 @@ _0819427C:
 	ldr r0, =gUnknown_0860CE94
 	bl InitWindows
 	bl DeactivateAllTextPrinters
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r4, [r0]
 	movs r0, 0x2
 	movs r1, 0
@@ -11358,27 +11358,27 @@ sub_8194B70: @ 8194B70
 	movs r1, 0x80
 	movs r2, 0x2
 	bl ChangeBgY
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	ldrh r1, [r0]
 	movs r0, 0x14
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	ldrh r1, [r0]
 	movs r0, 0x16
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	ldrh r1, [r0]
 	movs r0, 0x18
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	ldrh r1, [r0]
 	movs r0, 0x1A
 	bl SetGpuReg
@@ -11486,19 +11486,19 @@ _08194CD4:
 	thumb_func_start sub_8194CE4
 sub_8194CE4: @ 8194CE4
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	ldrh r1, [r0]
 	movs r0, 0x14
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	ldrh r1, [r0]
 	movs r0, 0x16
 	bl SetGpuReg
@@ -14296,7 +14296,7 @@ sub_81963F0: @ 81963F0
 	adds r0, r1
 	bl FieldObjectClearAnimIfSpecialAnimFinished
 	bl sub_80D338C
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	bl ScriptContext2_Disable
 _08196446:
 	movs r0, 0x1
@@ -14680,7 +14680,7 @@ sub_8196748: @ 8196748
 	ldr r4, =gUnknown_085500A4
 _08196750:
 	ldrh r0, [r4]
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _0819675E
@@ -14706,7 +14706,7 @@ sub_8196774: @ 8196774
 	ldr r5, =gUnknown_085500A4
 _0819677E:
 	ldrh r0, [r5]
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _0819679A

asm/battle_frontier_2.s

@@ -12935,7 +12935,7 @@ _081A1118:
 	adds r1, r0, 0
 	mov r0, sp
 	movs r2, 0x2
-	bl sub_81DB5E8
+	bl TVShowConvertInternationalString
 	adds r0, r5, 0
 	mov r1, sp
 	bl StringCopy
@@ -18768,7 +18768,7 @@ _081A43EE:
 sub_81A4410: @ 81A4410
 	push {r4,lr}
 	ldr r4, =gScriptResult
-	bl sub_8185338
+	bl MoveRecordedBattleToSaveData
 	strh r0, [r4]
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
@@ -18997,7 +18997,7 @@ sub_81A4594: @ 81A4594
 	adds r1, r6, 0x6
 	ldrb r2, [r6, 0xE]
 	add r0, sp, 0xC
-	bl sub_81DB5E8
+	bl TVShowConvertInternationalString
 	ldr r1, =gUnknown_0203AB74
 	ldrb r0, [r1]
 	mov r3, r8
@@ -19111,7 +19111,7 @@ sub_81A4684: @ 81A4684
 	adds r1, 0xA
 	ldrb r2, [r5, 0x1A]
 	add r0, sp, 0xC
-	bl sub_81DB5E8
+	bl TVShowConvertInternationalString
 	ldr r1, =gUnknown_0203AB74
 	ldrb r0, [r1]
 	adds r3, r7, 0x2
@@ -19133,13 +19133,13 @@ sub_81A4684: @ 81A4684
 	adds r4, r5, 0
 	adds r4, 0x12
 	adds r0, r4, 0
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _081A4734
 	add r0, sp, 0xC
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_81DB5E8
+	bl TVShowConvertInternationalString
 	b _081A473C
 	.pool
 _081A4734:
@@ -20533,10 +20533,10 @@ _081A52A4:
 	lsls r1, 1
 	movs r2, 0x20
 	bl LoadCompressedPalette
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	movs r0, 0xFF
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	movs r0, 0x70
 	strh r0, [r1]
 	b _081A553E
@@ -20577,34 +20577,34 @@ _081A5328:
 	movs r0, 0x1
 	negs r0, r0
 	strb r0, [r1, 0x1]
-	ldr r0, =gText_JapaneseHonorific
+	ldr r0, =gText_PlayerMon1Name
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r4, =gDisplayedStringBattle
 	adds r0, r4, 0
 	movs r1, 0xF
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Vs
 	movs r1, 0x10
-	bl battle_show_message_maybe
+	bl sub_814F9EC
-	ldr r0, =gText_RivalBuffer
+	ldr r0, =gText_OpponentMon1Name
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	adds r0, r4, 0
 	movs r1, 0x11
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Mind
 	movs r1, 0x12
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Skill
 	movs r1, 0x13
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Body
 	movs r1, 0x14
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gText_Judgement
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	adds r0, r4, 0
 	movs r1, 0x15
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	b _081A553E
 	.pool
 _081A53B4:
@@ -20685,10 +20685,10 @@ _081A5464:
 	movs r3, 0x1
 	bl sub_81A5558
 	ldr r0, =gText_Judgement
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0x15
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldrb r0, [r5]
 	adds r0, 0x1
 	strb r0, [r5]
@@ -27306,7 +27306,7 @@ _081A8A74:
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
 	adds r3, r7, 0
-	bl exec_movement
+	bl ScriptMovement_StartObjectMovementScript
 	b _081A8AD4
 	.pool
 _081A8ACC:
@@ -27540,7 +27540,7 @@ _081A8C72:
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl exec_movement
+	bl ScriptMovement_StartObjectMovementScript
 	b _081A8D32
 	.pool
 _081A8C9C:
@@ -27618,7 +27618,7 @@ _081A8D12:
 	ldr r2, [r1]
 	ldrb r1, [r2, 0x5]
 	ldrb r2, [r2, 0x4]
-	bl exec_movement
+	bl ScriptMovement_StartObjectMovementScript
 _081A8D32:
 	mov r0, r9
 	adds r0, 0x1
@@ -28660,7 +28660,7 @@ _081A95EE:
 	lsls r0, r7, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	add sp, 0x8
 	pop {r3,r4}
 	mov r8, r3
@@ -31263,8 +31263,8 @@ _081AAA9E:
 	.pool
 	thumb_func_end sub_81AAA7C
 
-	thumb_func_start CalculateBattlePyramidPickupItemId
+	thumb_func_start GetBattlePyramidPickupItemId
-CalculateBattlePyramidPickupItemId: @ 81AAAE0
+GetBattlePyramidPickupItemId: @ 81AAAE0
 	push {r4-r6,lr}
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
@@ -31331,6 +31331,6 @@ _081AAB5A:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end CalculateBattlePyramidPickupItemId
+	thumb_func_end GetBattlePyramidPickupItemId
 
 	.align 2, 0 @ Don't pad with nop.

asm/battle_link_817C95C.s

@@ -665,7 +665,7 @@ _0817D16C:
 	bl _0817DFAC
 	.pool
 _0817D1B8:
-	ldr r1, =gUnknown_02022F5C
+	ldr r1, =gBattleTextBuff1 + 4
 	ldrb r0, [r1]
 	cmp r0, 0
 	beq _0817D1C4
@@ -917,7 +917,7 @@ _0817D3C0:
 	bne _0817D3CC
 	bl _0817E0A6
 _0817D3CC:
-	ldr r1, =gUnknown_02022F6A
+	ldr r1, =gBattleTextBuff2 + 2
 	ldrh r0, [r1]
 	cmp r0, 0xD1
 	bne _0817D3E8
@@ -946,7 +946,7 @@ _0817D3FE:
 	ldrb r1, [r1]
 	cmp r0, r1
 	bne _0817D436
-	ldr r1, =gUnknown_02022F6A
+	ldr r1, =gBattleTextBuff2 + 2
 	ldrh r0, [r1]
 	cmp r0, 0xD1
 	bne _0817D42C
@@ -988,7 +988,7 @@ _0817D45C:
 	bne _0817D468
 	bl _0817E0A6
 _0817D468:
-	ldr r1, =gUnknown_02022F6A
+	ldr r1, =gBattleTextBuff2 + 2
 	ldrh r0, [r1]
 	cmp r0, 0xD3
 	bne _0817D484
@@ -2182,7 +2182,7 @@ _0817DE10:
 	b _0817DFAA
 	.pool
 _0817DE58:
-	ldr r1, =gUnknown_02022F5A
+	ldr r1, =gBattleTextBuff1 + 2
 	ldrh r0, [r1]
 	cmp r0, 0x73
 	bne _0817DE82
@@ -2204,7 +2204,7 @@ _0817DE58:
 	ands r0, r2
 	strb r0, [r1]
 _0817DE82:
-	ldr r2, =gUnknown_02022F5A
+	ldr r2, =gBattleTextBuff1 + 2
 	ldrh r0, [r2]
 	cmp r0, 0x71
 	bne _0817DEAA
@@ -2225,7 +2225,7 @@ _0817DE82:
 	ands r0, r2
 	strb r0, [r1]
 _0817DEAA:
-	ldr r1, =gUnknown_02022F5A
+	ldr r1, =gBattleTextBuff1 + 2
 	ldrh r0, [r1]
 	cmp r0, 0x36
 	beq _0817DEB4
@@ -3193,7 +3193,7 @@ _0817E63A:
 	adds r1, r4, 0
 	ldr r2, [sp]
 	ldr r3, [sp, 0x4]
-	bl sub_80ECB00
+	bl PutBattleUpdateOnTheAir
 	b _0817E670
 	.pool
 _0817E65C:
@@ -3205,7 +3205,7 @@ _0817E65C:
 	adds r1, r4, 0
 	ldr r2, [sp]
 	ldr r3, [sp, 0x4]
-	bl sub_80ECB00
+	bl PutBattleUpdateOnTheAir
 _0817E670:
 	add sp, 0x20
 	pop {r3-r5}
@@ -4322,7 +4322,7 @@ _0817EF36:
 	b _0817F1FA
 _0817EF44:
 	ldr r3, =gBattleMoves
-	ldr r2, =gUnknown_020244B0
+	ldr r2, =gMoveSelectionCursor
 	adds r0, r4, r2
 	ldrb r0, [r0]
 	lsls r0, 1
@@ -4514,7 +4514,7 @@ _0817F0B4:
 	ble _0817EFC2
 	movs r5, 0
 	ldr r3, =gBankAttacker
-	ldr r6, =gUnknown_020244B0
+	ldr r6, =gMoveSelectionCursor
 	ldr r4, =gBattlePartyID
 	mov r8, r4
 	movs r7, 0x64
@@ -4624,7 +4624,7 @@ _0817F1D4:
 	b _0817F0CC
 _0817F1DC:
 	ldr r2, =gBattleMoveDamage
-	ldr r1, =gUnknown_020244B0
+	ldr r1, =gMoveSelectionCursor
 	ldr r0, =gBankAttacker
 	ldrb r0, [r0]
 	adds r0, r1

asm/battle_setup.s

@@ -41,7 +41,7 @@ _080B062E:
 	cmp r0, 0x1
 	bne _080B0652
 	bl overworld_free_bg_tilemaps
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	bl prev_quest_postbuffer_cursor_backup_reset
 	bl overworld_poison_timer_set
@@ -299,8 +299,8 @@ sub_80B086C: @ 80B086C
 	.pool
 	thumb_func_end sub_80B086C
 
-	thumb_func_start sub_80B08A8
+	thumb_func_start BattleSetup_StartScriptedWildBattle
-sub_80B08A8: @ 80B08A8
+BattleSetup_StartScriptedWildBattle: @ 80B08A8
 	push {lr}
 	bl ScriptContext2_Enable
 	ldr r1, =gMain
@@ -323,7 +323,7 @@ sub_80B08A8: @ 80B08A8
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80B08A8
+	thumb_func_end BattleSetup_StartScriptedWildBattle
 
 	thumb_func_start sub_80B08EC
 sub_80B08EC: @ 80B08EC
@@ -638,8 +638,8 @@ _080B0BC6:
 	.pool
 	thumb_func_end sub_80B0B6C
 
-	thumb_func_start sub_80B0BD0
+	thumb_func_start BattleSetup_GetTerrainId
-sub_80B0BD0: @ 80B0BD0
+BattleSetup_GetTerrainId: @ 80B0BD0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	mov r4, sp
@@ -704,7 +704,7 @@ _080B0C64:
 	lsls r0, r5, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8089588
+	bl MetatileBehavior_IsMB_0B
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B0C78
@@ -734,7 +734,7 @@ _080B0C9C:
 	lsls r0, r5, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_808962C
+	bl MetatileBehavior_IsDeepOrOceanWater
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B0CF2
@@ -744,7 +744,7 @@ _080B0C9C:
 	cmp r0, 0
 	bne _080B0CE0
 	adds r0, r4, 0
-	bl sub_808959C
+	bl MetatileBehavior_IsMountain
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B0CC8
@@ -757,7 +757,7 @@ _080B0CC8:
 	cmp r0, 0
 	beq _080B0CF6
 	adds r0, r4, 0
-	bl sub_80894D4
+	bl MetatileBehavior_GetBridgeSth
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B0CE4
@@ -766,7 +766,7 @@ _080B0CE0:
 	b _080B0D1A
 _080B0CE4:
 	adds r0, r4, 0
-	bl sub_80894AC
+	bl MetatileBehavior_IsBridge
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -798,7 +798,7 @@ _080B0D1A:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80B0BD0
+	thumb_func_end BattleSetup_GetTerrainId
 
 	thumb_func_start sub_80B0D24
 sub_80B0D24: @ 80B0D24
@@ -1357,7 +1357,7 @@ sub_80B1158: @ 80B1158
 	movs r1, 0x5
 	movs r2, 0
 	movs r3, 0
-	bl sub_80F9244
+	bl ScriptGiveMon
 	bl ResetTasks
 	bl PlayBattleBGM
 	ldr r0, =sub_80B11A8
@@ -1387,7 +1387,7 @@ sub_80B11A8: @ 80B11A8
 	ldr r0, =sub_80B1204
 	str r0, [r1, 0x8]
 	bl FreeAllWindowBuffers
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	bl prev_quest_postbuffer_cursor_backup_reset
 	bl overworld_poison_timer_set
@@ -1686,9 +1686,9 @@ _080B141A:
 	.pool
 	thumb_func_end battle_80801F0
 
-	thumb_func_start TrainerBattleConfigure
+	thumb_func_start BattleSetup_ConfigureTrainerBattle
-@ u8 *TrainerBattleConfigure(u8 *args)
+@ u8 *BattleSetup_ConfigureTrainerBattle(u8 *args)
-TrainerBattleConfigure: @ 80B1430
+BattleSetup_ConfigureTrainerBattle: @ 80B1430
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	bl InitTrainerBattleVariables
@@ -1872,7 +1872,7 @@ _080B161E:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end TrainerBattleConfigure
+	thumb_func_end BattleSetup_ConfigureTrainerBattle
 
 	thumb_func_start SingleTrainerWantsBattle
 @ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript)
@@ -1892,7 +1892,7 @@ SingleTrainerWantsBattle: @ 80B162C
 	strh r0, [r4]
 	adds r1, 0x1
 	adds r0, r1, 0
-	bl TrainerBattleConfigure
+	bl BattleSetup_ConfigureTrainerBattle
 	ldr r0, =gUnknown_08271354
 	bl ScriptContext1_SetupScript
 	bl ScriptContext2_Enable
@@ -1920,7 +1920,7 @@ TwoTrainersWantBattle: @ 80B1670
 	strh r0, [r4]
 	adds r1, 0x1
 	adds r0, r1, 0
-	bl TrainerBattleConfigure
+	bl BattleSetup_ConfigureTrainerBattle
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -2056,8 +2056,8 @@ sub_80B178C: @ 80B178C
 	bx r0
 	thumb_func_end sub_80B178C
 
-	thumb_func_start trainer_flag_check
+	thumb_func_start HasTrainerAlreadyBeenFought
-trainer_flag_check: @ 80B17A0
+HasTrainerAlreadyBeenFought: @ 80B17A0
 	push {lr}
 	lsls r0, 16
 	movs r1, 0xA0
@@ -2069,7 +2069,7 @@ trainer_flag_check: @ 80B17A0
 	lsrs r0, 24
 	pop {r1}
 	bx r1
-	thumb_func_end trainer_flag_check
+	thumb_func_end HasTrainerAlreadyBeenFought
 
 	thumb_func_start trainer_flag_set
 trainer_flag_set: @ 80B17B8
@@ -2092,13 +2092,13 @@ trainer_flag_clear: @ 80B17CC
 	lsls r1, 19
 	adds r0, r1
 	lsrs r0, 16
-	bl FlagReset
+	bl FlagClear
 	pop {r0}
 	bx r0
 	thumb_func_end trainer_flag_clear
 
-	thumb_func_start sub_80B17E0
+	thumb_func_start BattleSetup_StartTrainerBattle
-sub_80B17E0: @ 80B17E0
+BattleSetup_StartTrainerBattle: @ 80B17E0
 	push {r4,lr}
 	ldr r0, =gUnknown_030060A8
 	ldrb r0, [r0]
@@ -2217,7 +2217,7 @@ _080B190C:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80B17E0
+	thumb_func_end BattleSetup_StartTrainerBattle
 
 	thumb_func_start sub_80B1918
 sub_80B1918: @ 80B1918
@@ -2407,14 +2407,14 @@ _080B1AD8:
 	.pool
 _080B1AEC:
 	bl sub_80B1C7C
-	bl box_related_two__2
+	bl ShowFieldMessage
 _080B1AF4:
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80B1A14
 
-	thumb_func_start sub_80B1AF8
+	thumb_func_start BattleSetup_GetScriptAddrAfterBattle
-sub_80B1AF8: @ 80B1AF8
+BattleSetup_GetScriptAddrAfterBattle: @ 80B1AF8
 	push {lr}
 	ldr r0, =gUnknown_02038BEC
 	ldr r0, [r0]
@@ -2425,10 +2425,10 @@ _080B1B04:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80B1AF8
+	thumb_func_end BattleSetup_GetScriptAddrAfterBattle
 
-	thumb_func_start sub_80B1B10
+	thumb_func_start BattleSetup_GetTrainerPostBattleScript
-sub_80B1B10: @ 80B1B10
+BattleSetup_GetTrainerPostBattleScript: @ 80B1B10
 	push {lr}
 	ldr r1, =gUnknown_02038BF8
 	ldrb r2, [r1]
@@ -2462,13 +2462,13 @@ _080B1B56:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80B1B10
+	thumb_func_end BattleSetup_GetTrainerPostBattleScript
 
 	thumb_func_start special_trainer_unable_to_battle
 special_trainer_unable_to_battle: @ 80B1B60
 	push {lr}
 	bl sub_80B1D18
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	thumb_func_end special_trainer_unable_to_battle
@@ -2617,8 +2617,8 @@ _080B1C96:
 	.pool
 	thumb_func_end sub_80B1C7C
 
-	thumb_func_start sub_80B1CA4
+	thumb_func_start GetTrainer1LoseText
-sub_80B1CA4: @ 80B1CA4
+GetTrainer1LoseText: @ 80B1CA4
 	push {r4,lr}
 	ldr r0, =gTrainerBattleOpponent_A
 	ldrh r1, [r0]
@@ -2643,10 +2643,10 @@ _080B1CC0:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80B1CA4
+	thumb_func_end GetTrainer1LoseText
 
-	thumb_func_start sub_80B1CE0
+	thumb_func_start GetTrainer2LoseText
-sub_80B1CE0: @ 80B1CE0
+GetTrainer2LoseText: @ 80B1CE0
 	push {r4,lr}
 	ldr r4, =gStringVar4
 	ldr r0, =gUnknown_02038BE0
@@ -2660,7 +2660,7 @@ sub_80B1CE0: @ 80B1CE0
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80B1CE0
+	thumb_func_end GetTrainer2LoseText
 
 	thumb_func_start sub_80B1D04
 sub_80B1D04: @ 80B1D04
@@ -2796,7 +2796,7 @@ _080B1DCE:
 	ldrh r0, [r4]
 	cmp r0, 0
 	beq _080B1DE2
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B1DCA
@@ -2895,7 +2895,7 @@ sub_80B1E94: @ 80B1E94
 	lsls r0, r4, 4
 	adds r0, r5
 	ldrh r0, [r0]
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -3076,7 +3076,7 @@ _080B1FE2:
 	ldrh r0, [r4]
 	cmp r0, 0
 	beq _080B1FCA
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B1FD4
@@ -3127,7 +3127,7 @@ _080B203A:
 	ldrh r0, [r4]
 	cmp r0, 0
 	beq _080B201E
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B2028
@@ -3233,7 +3233,7 @@ sub_80B20F4: @ 80B20F4
 	lsls r0, r1, 4
 	adds r0, r4
 	ldrh r0, [r0, 0x2]
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B211E
@@ -3509,7 +3509,7 @@ sub_80B2318: @ 80B2318
 	lsrs r4, r0, 12
 	adds r6, r4, r7
 	ldrh r0, [r6]
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -3527,7 +3527,7 @@ _080B2338:
 	adds r4, r6, 0x2
 _080B2346:
 	ldrh r0, [r4]
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B2360

asm/battle_tower.s

@@ -1795,7 +1795,7 @@ _08162ED8:
 	adds r0, 0xE4
 	ldrb r2, [r0]
 	adds r0, r6, 0
-	bl sub_81DB5E8
+	bl TVShowConvertInternationalString
 	b _08162F62
 	.pool
 _08162F00:
@@ -1835,7 +1835,7 @@ _08162F3E:
 	adds r1, r0, 0
 	adds r0, r6, 0
 	adds r2, r4, 0
-	bl sub_81DB5E8
+	bl TVShowConvertInternationalString
 	b _08162F62
 	.pool
 _08162F5C:
@@ -3194,7 +3194,7 @@ sub_8163A8C: @ 8163A8C
 	ldr r0, =gMain
 	ldr r1, =sub_81639AC
 	str r1, [r0, 0x8]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask
@@ -3548,11 +3548,11 @@ _08163E2C:
 	movs r0, 0
 	strb r0, [r4]
 	ldr r0, =gUnknown_08224158
-	bl TrainerBattleConfigure
+	bl BattleSetup_ConfigureTrainerBattle
 	movs r0, 0x1
 	strb r0, [r4]
 	ldr r0, =gUnknown_08224167
-	bl TrainerBattleConfigure
+	bl BattleSetup_ConfigureTrainerBattle
 	ldr r0, =gPartnerTrainerId
 	strh r5, [r0]
 	ldr r0, =sub_8163A8C
@@ -4364,7 +4364,7 @@ _081644E0:
 	strb r0, [r1, 0x1]
 	movs r0, 0xD8
 	lsls r0, 2
-	bl FlagReset
+	bl FlagClear
 	ldr r0, [r6]
 	adds r0, r5
 	ldrh r0, [r0]
@@ -4525,7 +4525,7 @@ _08164660:
 	adds r1, 0xC0
 	strb r0, [r1, 0x1]
 	ldr r0, =0x00000361
-	bl FlagReset
+	bl FlagClear
 	ldr r0, [r6]
 	adds r0, r5
 	ldrh r0, [r0]
@@ -5016,7 +5016,7 @@ _08164B04:
 	lsls r0, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	b _08164B54
 	.pool
 _08164B28:
@@ -5040,7 +5040,7 @@ _08164B28:
 	lsls r1, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 _08164B54:
 	add sp, 0x8
 	pop {r3-r5}
@@ -5125,21 +5125,21 @@ _08164C18:
 	lsrs r0, 24
 	mov r1, sp
 	movs r2, 0x4
-	bl link_0800A448
+	bl SendBlock
 	ldr r1, =gScriptResult
 	movs r0, 0x1
 	b _08164DB4
 	.pool
 _08164C3C:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x3
 	ands r1, r0
 	cmp r1, 0x3
 	beq _08164C4A
 	b _08164DB6
 _08164C4A:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	movs r0, 0x80
 	lsls r0, 1
 	adds r2, r1, r0
@@ -5221,23 +5221,23 @@ _08164CE0:
 	ldr r3, =0x00000cb4
 	adds r1, r3
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	ldr r1, =gScriptResult
 	movs r0, 0x3
 	b _08164DB4
 	.pool
 _08164D14:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	movs r1, 0x3
 	ands r1, r0
 	cmp r1, 0x3
 	bne _08164DB6
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r4, =gSaveBlock2Ptr
 	ldr r0, [r4]
 	ldr r5, =0x00000cb4
 	adds r0, r5
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	movs r2, 0x28
 	bl memcpy
 	ldr r2, =gTrainerBattleOpponent_A
@@ -5260,7 +5260,7 @@ _08164D14:
 	ldrh r0, [r4]
 	movs r1, 0x1
 	bl sub_8162614
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08164DB0
@@ -5279,7 +5279,7 @@ _08164D98:
 	b _08164DB4
 	.pool
 _08164DA8:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08164DB6
@@ -5673,7 +5673,7 @@ _0816508C:
 	bl SetMonData
 	ldr r0, [r7]
 	adds r0, r4
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	strb r0, [r5, 0x1]
 _081650D4:
 	adds r5, 0x4
@@ -5857,8 +5857,8 @@ sub_8165244: @ 8165244
 	.pool
 	thumb_func_end sub_8165244
 
-	thumb_func_start sub_8165264
+	thumb_func_start GetEreaderTrainerClassId
-sub_8165264: @ 8165264
+GetEreaderTrainerClassId: @ 8165264
 	ldr r1, =gTrainerClassToNameIndex
 	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
@@ -5869,10 +5869,10 @@ sub_8165264: @ 8165264
 	ldrb r0, [r0]
 	bx lr
 	.pool
-	thumb_func_end sub_8165264
+	thumb_func_end GetEreaderTrainerClassId
 
-	thumb_func_start sub_8165284
+	thumb_func_start GetEreaderTrainerName
-sub_8165284: @ 8165284
+GetEreaderTrainerName: @ 8165284
 	push {r4,lr}
 	adds r3, r0, 0
 	movs r2, 0
@@ -5896,7 +5896,7 @@ _08165294:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8165284
+	thumb_func_end GetEreaderTrainerName
 
 	thumb_func_start sub_81652B4
 sub_81652B4: @ 81652B4
@@ -6056,7 +6056,7 @@ _081653E0:
 	bne _081653F8
 	bl sub_80F01B8
 	movs r0, 0x77
-	bl FlagReset
+	bl FlagClear
 _081653F8:
 	pop {r0}
 	bx r0

asm/battle_transition.s

@@ -2151,7 +2151,7 @@ sub_8147018: @ 8147018
 	ands r5, r0
 	movs r1, 0
 	mov r8, r4
-	ldr r6, =gFieldEffectSpawnParams
+	ldr r6, =gFieldEffectArguments
 _08147046:
 	lsls r5, 16
 	asrs r5, 16
@@ -2221,7 +2221,7 @@ _081470C4:
 sub_81470D0: @ 81470D0
 	push {r4,r5,lr}
 	ldr r0, =gUnknown_085C8E68
-	ldr r5, =gFieldEffectSpawnParams
+	ldr r5, =gFieldEffectArguments
 	movs r2, 0
 	ldrsh r1, [r5, r2]
 	movs r3, 0x4
@@ -9513,11 +9513,11 @@ sub_814ABE4: @ 814ABE4
 	strh r0, [r6, 0xC]
 	cmp r0, 0
 	bne _0814AC24
-	ldr r5, =gUnknown_02022E14
+	ldr r5, =gBattle_BG0_X
 	ldrh r1, [r5]
 	movs r0, 0x12
 	bl SetGpuReg
-	ldr r4, =gUnknown_02022E16
+	ldr r4, =gBattle_BG0_Y
 	ldrh r1, [r4]
 	movs r0, 0x10
 	bl SetGpuReg
@@ -9562,9 +9562,9 @@ sub_814AC38: @ 814AC38
 	movs r1, 0xF0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r5, [r0]
-	ldr r4, =gUnknown_02022E16
+	ldr r4, =gBattle_BG0_Y
 	strh r5, [r4]
 	movs r0, 0x12
 	movs r1, 0
@@ -9781,10 +9781,10 @@ sub_814AE40: @ 814AE40
 	push {r4,r5,lr}
 	sub sp, 0x8
 	adds r5, r0, 0
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r4, =gUnknown_02022E16
+	ldr r4, =gBattle_BG0_Y
 	strh r1, [r4]
 	movs r0, 0x12
 	movs r1, 0

asm/berry_blender.s

@@ -512,7 +512,7 @@ _0807FBBE:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0807FBBE
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0807FC14
@@ -1116,7 +1116,7 @@ _08080126:
 	adds r5, 0x1
 	cmp r5, 0x3
 	ble _08080126
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0808016A
@@ -1213,7 +1213,7 @@ _08080248:
 	bne _08080254
 	b _08080546
 _08080254:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	bl GetMultiplayerId
 	lsls r0, 24
 	cmp r0, 0
@@ -1239,7 +1239,7 @@ _08080282:
 	movs r0, 0x4
 	movs r1, 0x1
 	bl sub_8197DF8
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9D8
 	lsls r4, 24
@@ -1260,7 +1260,7 @@ _080802AC:
 	adds r0, r4, r0
 	adds r0, r6
 	lsls r1, r5, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x10
 	bl memcpy
@@ -1275,12 +1275,12 @@ _080802AC:
 	strh r0, [r1]
 	adds r5, 0x1
 _080802D4:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
 	blt _080802AC
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	b _080804F8
 	.pool
 _080802EC:
@@ -1295,7 +1295,7 @@ _080802EC:
 	bl sub_807FD90
 	b _08080336
 _08080302:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	ldr r2, =gUnknown_020322A4
 	ldr r1, [r2]
 	adds r1, 0x7C
@@ -1876,7 +1876,7 @@ sub_80807BC: @ 80807BC
 	sub sp, 0x1C
 	movs r0, 0
 	mov r10, r0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080807DE
@@ -3330,7 +3330,7 @@ sub_80814B0: @ 80814B0
 	lsrs r1, 16
 	lsls r2, 16
 	lsrs r2, 16
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080814E4
@@ -3633,7 +3633,7 @@ sub_8081744: @ 8081744
 	push {r4-r6,lr}
 	movs r4, 0
 	movs r6, 0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0808175A
@@ -4702,7 +4702,7 @@ _08081F7C:
 sub_8081F94: @ 8081F94
 	push {lr}
 	adds r1, r0, 0
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08081FB8
@@ -4810,7 +4810,7 @@ _08082078:
 	adds r1, 0x4C
 	movs r0, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080820B0
@@ -4848,7 +4848,7 @@ _080820E0:
 	bne _080820EC
 	b _0808249E
 _080820EC:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0808218C
@@ -4911,7 +4911,7 @@ _08082132:
 	adds r1, r4
 	movs r0, 0
 	movs r2, 0x20
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	bne _08082172
@@ -4941,7 +4941,7 @@ _0808218C:
 	strh r2, [r0]
 	movs r0, 0
 	movs r2, 0x28
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	bne _080821BE
@@ -4951,20 +4951,20 @@ _080821BE:
 	b _0808245C
 	.pool
 _080821C8:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _080821D4
 	b _0808249E
 _080821D4:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r5, =gUnknown_020322A4
 	ldr r1, [r5]
 	adds r1, 0x63
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08082254
@@ -4972,7 +4972,7 @@ _080821D4:
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _08082254
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	ldr r3, [r5]
 	ldrh r0, [r2, 0x4]
 	adds r1, r3, 0
@@ -5016,7 +5016,7 @@ _08082220:
 	b _0808249E
 	.pool
 _08082254:
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	ldr r0, =gUnknown_020322A4
 	ldr r3, [r0]
 	ldrh r0, [r2, 0x4]
@@ -5748,7 +5748,7 @@ _080828BC:
 	strb r0, [r1]
 	b _080828DC
 _080828C6:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r4, [r0]
 	cmp r4, 0
 	bne _080828DC
@@ -5966,7 +5966,7 @@ _08082A92:
 	thumb_func_start sub_8082AD4
 sub_8082AD4: @ 8082AD4
 	push {r4-r7,lr}
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08082AE0
@@ -6091,7 +6091,7 @@ _08082BEE:
 	lsls r0, 24
 	lsrs r5, r0, 24
 _08082BF4:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -6104,7 +6104,7 @@ _08082C0C:
 	lsls r0, 24
 	lsrs r5, r0, 24
 _08082C12:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -6118,7 +6118,7 @@ _08082C12:
 	cmp r0, 0
 	bne _08082C0C
 _08082C2E:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -6132,7 +6132,7 @@ _08082C48:
 	lsls r0, 24
 	lsrs r5, r0, 24
 _08082C4E:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -6149,7 +6149,7 @@ _08082C6A:
 	ldr r4, =gUnknown_03003110
 	adds r0, r4, 0
 	bl sub_8081F94
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -6242,7 +6242,7 @@ sub_8082D18: @ 8082D18
 sub_8082D28: @ 8082D28
 	push {r4,lr}
 	movs r1, 0
-	ldr r4, =gUnknown_03003124
+	ldr r4, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r4]
 	cmp r0, 0
 	beq _08082D3C
@@ -7909,7 +7909,7 @@ _08083A80:
 	cmp r5, r0
 	bcc _08083A80
 _08083A9E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08083AB4
@@ -8514,7 +8514,7 @@ sub_8083F94: @ 8083F94
 	strb r0, [r7, 0xC]
 	movs r0, 0xFF
 	strb r0, [r7]
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080840C4
@@ -8568,7 +8568,7 @@ sub_8083F94: @ 8083F94
 	ldrb r0, [r5, 0x12]
 	str r0, [sp]
 	adds r0, r7, 0
-	bl sub_80ECC04
+	bl Put3CheersForPokeblocksOnTheAir
 	lsls r0, 24
 	cmp r0, 0
 	bne _080840BA
@@ -8617,7 +8617,7 @@ _08084058:
 	ldrb r0, [r5, 0x12]
 	str r0, [sp]
 	adds r0, r7, 0
-	bl sub_80ECC04
+	bl Put3CheersForPokeblocksOnTheAir
 	lsls r0, 24
 	cmp r0, 0
 	beq _080840C4

asm/bike.s

@@ -2013,9 +2013,9 @@ _0811A0B0:
 	bl SetPlayerAvatarTransitionFlags
 	ldr r4, =0x00000193
 	adds r0, r4, 0
-	bl sav1_set_battle_music_maybe
+	bl Overworld_SetSavedMusic
 	adds r0, r4, 0
-	bl sub_80858C4
+	bl Overworld_ChangeMusicTo
 _0811A0C4:
 	pop {r4}
 	pop {r0}

asm/braille_puzzles.s

@@ -1,627 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81795E8
-sub_81795E8: @ 81795E8
-	push {lr}
-	ldr r0, =0x000008af
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179634
-	ldr r0, =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldrh r1, [r2, 0x4]
-	ldr r0, =0x00004718
-	cmp r1, r0
-	bne _08179634
-	ldr r1, [r2]
-	ldr r0, =0x0003000a
-	cmp r1, r0
-	beq _08179616
-	ldr r0, =0x00030009
-	cmp r1, r0
-	beq _08179616
-	ldr r0, =0x0003000b
-	cmp r1, r0
-	bne _08179634
-_08179616:
-	movs r0, 0x1
-	b _08179636
-	.pool
-_08179634:
-	movs r0, 0
-_08179636:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81795E8
-
-	thumb_func_start sub_817963C
-sub_817963C: @ 817963C
-	push {lr}
-	ldr r2, =0x0000022a
-	movs r0, 0x10
-	movs r1, 0x8
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x0000022b
-	movs r0, 0x11
-	movs r1, 0x8
-	bl MapGridSetMetatileIdAt
-	movs r2, 0x8B
-	lsls r2, 2
-	movs r0, 0x12
-	movs r1, 0x8
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e32
-	movs r0, 0x10
-	movs r1, 0x9
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000233
-	movs r0, 0x11
-	movs r1, 0x9
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e34
-	movs r0, 0x12
-	movs r1, 0x9
-	bl MapGridSetMetatileIdAt
-	bl DrawWholeMapView
-	movs r0, 0x14
-	bl PlaySE
-	ldr r0, =0x000008af
-	bl FlagSet
-	bl ScriptContext2_Disable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817963C
-
-	thumb_func_start sub_81796AC
-sub_81796AC: @ 81796AC
-	push {r4,lr}
-	ldr r4, =gPlayerParty
-	adds r0, r4, 0
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	movs r1, 0x9D
-	lsls r1, 1
-	cmp r0, r1
-	bne _081796F4
-	bl CalculatePlayerPartyCount
-	ldr r0, =gPlayerPartyCount
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	adds r1, r4, 0
-	subs r1, 0x64
-	adds r0, r1
-	movs r1, 0x41
-	movs r2, 0
-	bl GetMonData
-	ldr r1, =0x0000017d
-	cmp r0, r1
-	bne _081796F4
-	movs r0, 0x1
-	b _081796F6
-	.pool
-_081796F4:
-	movs r0, 0
-_081796F6:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81796AC
-
-	thumb_func_start nullsub_84
-nullsub_84: @ 81796FC
-	bx lr
-	thumb_func_end nullsub_84
-
-	thumb_func_start sub_8179700
-sub_8179700: @ 8179700
-	push {lr}
-	ldr r0, =sub_8179778
-	movs r1, 0x9
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0xA]
-	strh r0, [r1, 0xC]
-	movs r0, 0x2
-	strh r0, [r1, 0x10]
-	movs r0, 0x5
-	strh r0, [r1, 0x12]
-	movs r0, 0x32
-	strh r0, [r1, 0x14]
-	movs r0, 0
-	bl SetCameraPanningCallback
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179700
-
-	thumb_func_start sub_817973C
-sub_817973C: @ 817973C
-	push {lr}
-	ldr r0, =sub_8179778
-	movs r1, 0x9
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0xA]
-	strh r0, [r1, 0xC]
-	movs r0, 0x3
-	strh r0, [r1, 0x10]
-	movs r0, 0x5
-	strh r0, [r1, 0x12]
-	movs r0, 0x2
-	strh r0, [r1, 0x14]
-	movs r0, 0
-	bl SetCameraPanningCallback
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817973C
-
-	thumb_func_start sub_8179778
-sub_8179778: @ 8179778
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r4, r0, r1
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	bl __modsi3
-	cmp r0, 0
-	bne _081797D0
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	ldrh r0, [r4, 0x10]
-	negs r0, r0
-	strh r0, [r4, 0x10]
-	movs r0, 0x10
-	ldrsh r1, [r4, r0]
-	movs r0, 0
-	bl SetCameraPanning
-	movs r2, 0xC
-	ldrsh r1, [r4, r2]
-	movs r2, 0x14
-	ldrsh r0, [r4, r2]
-	cmp r1, r0
-	bne _081797D0
-	adds r0, r5, 0
-	bl DestroyTask
-	bl EnableBothScriptContexts
-	bl InstallCameraPanAheadCallback
-_081797D0:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179778
-
-	thumb_func_start sub_81797DC
-sub_81797DC: @ 81797DC
-	push {lr}
-	movs r0, 0x8B
-	lsls r0, 4
-	bl FlagGet
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0
-	bne _0817982C
-	ldr r0, =gSaveBlock1Ptr
-	ldr r3, [r0]
-	ldrh r1, [r3, 0x4]
-	movs r0, 0xC3
-	lsls r0, 3
-	cmp r1, r0
-	bne _0817982C
-	ldr r1, [r3]
-	ldr r0, =0x00170006
-	cmp r1, r0
-	beq _08179810
-	ldr r0, =0x00170005
-	cmp r1, r0
-	beq _08179810
-	ldr r0, =0x00170007
-	cmp r1, r0
-	bne _0817982C
-_08179810:
-	ldr r0, =gUnknown_0203BD14
-	strb r2, [r0]
-	movs r0, 0x1
-	b _0817982E
-	.pool
-_0817982C:
-	movs r0, 0
-_0817982E:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81797DC
-
-	thumb_func_start sub_8179834
-sub_8179834: @ 8179834
-	push {lr}
-	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	movs r0, 0x3C
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179834
-
-	thumb_func_start sub_8179850
-sub_8179850: @ 8179850
-	push {lr}
-	movs r0, 0x3C
-	bl FieldEffectActiveListRemove
-	bl sub_8179860
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8179850
-
-	thumb_func_start sub_8179860
-sub_8179860: @ 8179860
-	push {lr}
-	ldr r2, =0x0000022a
-	movs r0, 0xE
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x0000022b
-	movs r0, 0xF
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	movs r2, 0x8B
-	lsls r2, 2
-	movs r0, 0x10
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e32
-	movs r0, 0xE
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000233
-	movs r0, 0xF
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e34
-	movs r0, 0x10
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	bl DrawWholeMapView
-	movs r0, 0x14
-	bl PlaySE
-	movs r0, 0x8B
-	lsls r0, 4
-	bl FlagSet
-	bl ScriptContext2_Disable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179860
-
-	thumb_func_start sub_81798D0
-sub_81798D0: @ 81798D0
-	push {lr}
-	ldr r0, =0x000008b2
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179910
-	ldr r0, =gSaveBlock1Ptr
-	ldr r2, [r0]
-	ldrh r1, [r2, 0x4]
-	ldr r0, =0x00004418
-	cmp r1, r0
-	bne _08179910
-	ldr r1, [r2]
-	ldr r0, =0x00190008
-	cmp r1, r0
-	bne _08179910
-	ldr r1, =gUnknown_0203BD14
-	movs r0, 0x1
-	strb r0, [r1]
-	movs r0, 0x1
-	b _08179912
-	.pool
-_08179910:
-	movs r0, 0
-_08179912:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81798D0
-
-	thumb_func_start sub_8179918
-sub_8179918: @ 8179918
-	push {lr}
-	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	movs r0, 0x3C
-	bl FieldEffectStart
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179918
-
-	thumb_func_start sub_8179934
-sub_8179934: @ 8179934
-	push {lr}
-	movs r0, 0x3C
-	bl FieldEffectActiveListRemove
-	bl sub_8179944
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8179934
-
-	thumb_func_start sub_8179944
-sub_8179944: @ 8179944
-	push {lr}
-	ldr r2, =0x0000022a
-	movs r0, 0xE
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x0000022b
-	movs r0, 0xF
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	movs r2, 0x8B
-	lsls r2, 2
-	movs r0, 0x10
-	movs r1, 0x1A
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e32
-	movs r0, 0xE
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000233
-	movs r0, 0xF
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	ldr r2, =0x00000e34
-	movs r0, 0x10
-	movs r1, 0x1B
-	bl MapGridSetMetatileIdAt
-	bl DrawWholeMapView
-	movs r0, 0x14
-	bl PlaySE
-	ldr r0, =0x000008b2
-	bl FlagSet
-	bl ScriptContext2_Disable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8179944
-
-	thumb_func_start nullsub_64
-nullsub_64: @ 81799B4
-	bx lr
-	thumb_func_end nullsub_64
-
-	thumb_func_start sub_81799B8
-sub_81799B8: @ 81799B8
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gUnknown_0203BD14
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _081799E4
-	ldr r1, =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	ldr r2, =sub_8179934
-	b _081799F0
-	.pool
-_081799E4:
-	ldr r1, =gTasks
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	adds r0, r1
-	ldr r2, =sub_8179850
-_081799F0:
-	lsrs r1, r2, 16
-	strh r1, [r0, 0x18]
-	strh r2, [r0, 0x1A]
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81799B8
-
-	thumb_func_start sub_8179A04
-sub_8179A04: @ 8179A04
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	ldr r4, =gSaveBlock1Ptr
-	ldr r0, [r4]
-	ldrh r1, [r0, 0x4]
-	ldr r0, =0x00004318
-	cmp r1, r0
-	beq _08179A1A
-	b _08179B5A
-_08179A1A:
-	ldr r0, =0x000008b1
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08179A28
-	b _08179B5A
-_08179A28:
-	movs r0, 0x2
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	bne _08179A36
-	b _08179B5A
-_08179A36:
-	movs r0, 0x3
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08179A58
-	b _08179B5A
-	.pool
-_08179A54:
-	movs r0, 0x1
-	b _08179B5C
-_08179A58:
-	movs r5, 0
-	mov r8, r4
-	ldr r4, =gUnknown_085EFE74
-	adds r0, r4, 0x1
-	mov r12, r0
-	ldr r6, =0x0000403b
-	ldr r1, =0x0000403c
-	mov r9, r1
-_08179A68:
-	lsls r0, r5, 1
-	adds r1, r0, r4
-	add r0, r12
-	ldrb r3, [r0]
-	mov r7, r8
-	ldr r2, [r7]
-	movs r7, 0
-	ldrsh r0, [r2, r7]
-	ldrb r1, [r1]
-	cmp r0, r1
-	bne _08179B44
-	movs r1, 0x2
-	ldrsh r0, [r2, r1]
-	cmp r0, r3
-	bne _08179B44
-	cmp r5, 0xF
-	bhi _08179AB0
-	adds r0, r6, 0
-	bl VarGet
-	lsls r0, 16
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r5
-	orrs r1, r0
-	lsrs r1, 16
-	adds r0, r6, 0
-	bl VarSet
-	b _08179AF0
-	.pool
-_08179AB0:
-	cmp r5, 0x1F
-	bhi _08179AD2
-	mov r0, r9
-	bl VarGet
-	lsls r0, 16
-	adds r2, r5, 0
-	subs r2, 0x10
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r2
-	orrs r1, r0
-	lsrs r1, 16
-	mov r0, r9
-	bl VarSet
-	b _08179AF0
-_08179AD2:
-	ldr r4, =0x0000403d
-	adds r0, r4, 0
-	bl VarGet
-	lsls r0, 16
-	adds r2, r5, 0
-	subs r2, 0x20
-	movs r1, 0x80
-	lsls r1, 9
-	lsls r1, r2
-	orrs r1, r0
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl VarSet
-_08179AF0:
-	ldr r0, =0x0000403b
-	bl VarGet
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, =0x0000ffff
-	cmp r4, r0
-	bne _08179B5A
-	ldr r0, =0x0000403c
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, r4
-	bne _08179B5A
-	ldr r0, =0x0000403d
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xF
-	bne _08179B5A
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, [r0]
-	ldr r0, =0x00150008
-	cmp r1, r0
-	beq _08179A54
-	b _08179B5A
-	.pool
-_08179B44:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x23
-	bls _08179A68
-	movs r0, 0x3
-	bl FlagSet
-	movs r0, 0x2
-	bl FlagReset
-_08179B5A:
-	movs r0, 0
-_08179B5C:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8179A04
-
-	.align 2, 0 @ Don't pad with nop.

asm/cable_club.s

@@ -434,7 +434,7 @@ sub_80B2688: @ 80B2688
 	movs r0, 0x15
 	bl PlaySE
 	ldr r0, =gUnknown_082780B3
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	ldr r0, =sub_80B270C
 	b _080B26FA
 	.pool
@@ -442,7 +442,7 @@ _080B26EC:
 	movs r0, 0x16
 	bl PlaySE
 	ldr r0, =gUnknown_08278131
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	ldr r0, =sub_80B2918
 _080B26FA:
 	str r0, [r4]
@@ -545,7 +545,7 @@ sub_80B275C: @ 80B275C
 	movs r3, 0x1
 	bl ConvertIntToDecimalStringN
 	ldr r0, =gUnknown_082780F2
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	mov r0, r9
 	subs r0, 0x8
 	add r0, r8
@@ -598,7 +598,7 @@ sub_80B2804: @ 80B2804
 	beq _080B2878
 _080B2852:
 	ldr r0, =gUnknown_082780B3
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	ldr r1, =gTasks
 	lsls r0, r5, 2
 	adds r0, r5
@@ -719,7 +719,7 @@ sub_80B2918: @ 80B2918
 	cmp r0, 0x1
 	bhi _080B297C
 	bl sub_800AC34
-	bl textbox_close
+	bl HideFieldMessageBox
 	ldr r0, =sub_80B2CB0
 	b _080B29E4
 	.pool
@@ -730,7 +730,7 @@ _080B297C:
 	bne _080B2994
 _080B2984:
 	bl sub_80097E8
-	bl textbox_close
+	bl HideFieldMessageBox
 	ldr r0, =sub_80B2CB0
 	b _080B29E4
 	.pool
@@ -814,7 +814,7 @@ _080B2A42:
 _080B2A4A:
 	bl sub_80097E8
 _080B2A4E:
-	bl textbox_close
+	bl HideFieldMessageBox
 	ldr r0, =gTasks
 	lsls r1, r7, 2
 	adds r1, r7
@@ -1030,7 +1030,7 @@ sub_80B2C30: @ 80B2C30
 	bl sub_80B24F8
 	cmp r0, 0x1
 	beq _080B2C9C
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9A8
 	lsls r4, 24
@@ -1047,7 +1047,7 @@ _080B2C5C:
 	ldr r1, =gUnknown_02039B58
 	adds r0, r1
 	lsls r1, r4, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	lsls r2, r4, 3
 	subs r2, r4
@@ -1059,14 +1059,14 @@ _080B2C5C:
 	lsls r0, 24
 	lsrs r4, r0, 24
 _080B2C7E:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
 	bcc _080B2C5C
 	movs r0, 0
 	bl sub_800B330
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r0, =gScriptResult
 	adds r1, r5, 0
 	bl task_map_chg_seq_0807EC34
@@ -1082,7 +1082,7 @@ sub_80B2CB0: @ 80B2CB0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B2CDE
@@ -1151,7 +1151,7 @@ sub_80B2D2C: @ 80B2D2C
 	bl sub_80B241C
 	ldrb r0, [r4, 0x12]
 	bl RemoveWindow
-	bl textbox_close
+	bl HideFieldMessageBox
 	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
@@ -1361,7 +1361,7 @@ _080B2F0C:
 	movs r0, 0
 	mov r8, r0
 	mov r9, r0
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0
@@ -1434,7 +1434,7 @@ _080B2FA8:
 	bl DestroyTask
 	b _080B2FC6
 _080B2FB4:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B2FC6
@@ -1706,7 +1706,7 @@ sub_80B3220: @ 80B3220
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080B3248
@@ -1836,7 +1836,7 @@ _080B3338:
 	bl sub_800AC34
 	b _080B3346
 _080B333E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 _080B3342:
 	cmp r0, 0
@@ -1872,7 +1872,7 @@ _080B3378:
 	lsls r2, 4
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	ldr r1, =gMain
 	ldr r0, =sub_80B360C
@@ -1948,13 +1948,13 @@ _080B3444:
 	ldr r1, =gUnknown_020229CC
 	movs r0, 0
 	movs r2, 0x1C
-	bl link_0800A448
+	bl SendBlock
 	movs r0, 0x3
 	strh r0, [r6]
 	b _080B3532
 	.pool
 _080B3458:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9D8
 	lsls r4, 24
@@ -1967,7 +1967,7 @@ _080B3458:
 	.pool
 _080B3474:
 	lsls r1, r4, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r0, r5, 0
 	adds r1, r2
 	ldm r1!, {r2,r3,r7}
@@ -1980,11 +1980,11 @@ _080B3474:
 	bl sub_800B524
 	lsls r0, r4, 24
 	lsrs r0, 24
-	bl sub_800A5EC
+	bl ResetBlockReceivedFlag
 	adds r5, 0x1C
 	adds r4, 0x1
 _080B349A:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -2045,7 +2045,7 @@ _080B3504:
 	lsls r3, 4
 	adds r0, r3, 0
 	strh r0, [r1]
-	ldr r0, =sub_8036760
+	ldr r0, =CB2_InitBattle
 	bl SetMainCallback2
 	ldr r1, =gMain
 	ldr r0, =sub_80B360C
@@ -2080,7 +2080,7 @@ _080B3574:
 	beq _080B35F8
 	b _080B35FE
 _080B357A:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r3, r0, 24
 	movs r4, 0
@@ -2128,7 +2128,7 @@ _080B35C8:
 	b _080B35FE
 	.pool
 _080B35E0:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B35FE
@@ -2297,13 +2297,13 @@ _080B3750:
 	b _080B37CC
 _080B375A:
 	ldr r0, =gUnknown_08278091
-	bl box_related_two__2
+	bl ShowFieldMessage
 	movs r0, 0x1
 	strh r0, [r5, 0x8]
 	b _080B37CC
 	.pool
 _080B376C:
-	bl sub_809833C
+	bl IsFieldMessageBoxHidden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B37CC
@@ -2325,7 +2325,7 @@ _080B378C:
 	beq _080B37B2
 	b _080B37CC
 _080B379E:
-	bl textbox_close
+	bl HideFieldMessageBox
 	movs r0, 0
 	strh r0, [r5, 0x8]
 	bl sub_80872C4
@@ -2425,7 +2425,7 @@ _080B3864:
 	b _080B3884
 	.pool
 _080B3870:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B3884
@@ -2657,7 +2657,7 @@ task00_08081A90: @ 80B3A30
 	adds r0, r4, 0
 	bl DestroyTask
 _080B3A62:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080B3AA6
@@ -2691,7 +2691,7 @@ sub_80B3AAC: @ 80B3AAC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080B3AC4
@@ -2804,7 +2804,7 @@ _080B3B96:
 	strh r0, [r5]
 	b _080B3BB8
 _080B3B9E:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _080B3BB8

asm/clear_save_data_screen.s

@@ -1,399 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start c2_clear_save_data_screen_2
-c2_clear_save_data_screen_2: @ 817ACC8
-	push {lr}
-	bl sub_817AE00
-	lsls r0, 24
-	cmp r0, 0
-	beq _0817ACDC
-	ldr r0, =sub_817ACE4
-	movs r1, 0
-	bl CreateTask
-_0817ACDC:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end c2_clear_save_data_screen_2
-
-	thumb_func_start sub_817ACE4
-sub_817ACE4: @ 817ACE4
-	push {r4,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x2
-	movs r3, 0xE
-	bl SetWindowBorderStyle
-	ldr r2, =gText_ClearAllSaveData
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	str r0, [sp, 0x4]
-	str r0, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0
-	bl PrintTextOnWindow
-	ldr r0, =gUnknown_085F06D8
-	movs r1, 0x2
-	movs r2, 0xE
-	movs r3, 0x1
-	bl CreateYesNoMenu
-	ldr r1, =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, =sub_817AD40
-	str r1, [r0]
-	add sp, 0xC
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817ACE4
-
-	thumb_func_start sub_817AD40
-sub_817AD40: @ 817AD40
-	push {r4,r5,lr}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r5, r0, 24
-	bl sub_8198C58
-	lsls r0, 24
-	asrs r4, r0, 24
-	cmp r4, 0
-	beq _0817AD68
-	cmp r4, 0
-	bgt _0817AD62
-	movs r0, 0x1
-	negs r0, r0
-	cmp r4, r0
-	beq _0817ADA0
-	b _0817ADB2
-_0817AD62:
-	cmp r4, 0x1
-	beq _0817ADA0
-	b _0817ADB2
-_0817AD68:
-	movs r0, 0
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r2, =gText_ClearingData
-	movs r0, 0x1
-	str r0, [sp]
-	str r4, [sp, 0x4]
-	str r4, [sp, 0x8]
-	movs r0, 0
-	movs r1, 0x1
-	movs r3, 0
-	bl PrintTextOnWindow
-	ldr r1, =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, =sub_817ADC0
-	str r1, [r0]
-	b _0817ADB2
-	.pool
-_0817ADA0:
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r5, 0
-	bl DestroyTask
-	ldr r0, =sub_817AFD4
-	bl SetMainCallback2
-_0817ADB2:
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817AD40
-
-	thumb_func_start sub_817ADC0
-sub_817ADC0: @ 817ADC0
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl ClearSaveData
-	adds r0, r4, 0
-	bl DestroyTask
-	ldr r0, =sub_817AFD4
-	bl SetMainCallback2
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817ADC0
-
-	thumb_func_start sub_817ADE4
-sub_817ADE4: @ 817ADE4
-	push {lr}
-	bl RunTasks
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	thumb_func_end sub_817ADE4
-
-	thumb_func_start sub_817ADF4
-sub_817ADF4: @ 817ADF4
-	push {lr}
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_817ADF4
-
-	thumb_func_start sub_817AE00
-sub_817AE00: @ 817AE00
-	push {r4,lr}
-	sub sp, 0xC
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0817AE18
-	cmp r0, 0x1
-	bne _0817AE18
-	b _0817AFA4
-_0817AE18:
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r0, 0
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x10
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x12
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1C
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1E
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x40
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x44
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x48
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x4A
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x52
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x54
-	movs r1, 0
-	bl SetGpuReg
-	add r0, sp, 0x4
-	movs r4, 0
-	strh r4, [r0]
-	ldr r1, =0x040000d4
-	str r0, [r1]
-	movs r0, 0xC0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x8100c000
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r2, 0
-	str r2, [sp, 0x8]
-	add r0, sp, 0x8
-	str r0, [r1]
-	movs r0, 0xE0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x85000100
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	add r0, sp, 0x4
-	strh r2, [r0]
-	str r0, [r1]
-	ldr r0, =0x05000002
-	str r0, [r1, 0x4]
-	ldr r0, =0x810001ff
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	bl ResetPaletteFade
-	ldr r2, =gPlttBufferUnfaded
-	ldr r0, =0x00007fff
-	strh r0, [r2]
-	ldr r1, =gPlttBufferFaded
-	strh r0, [r1]
-	ldr r0, =0x00003945
-	strh r0, [r2, 0x2]
-	strh r0, [r1, 0x2]
-	movs r1, 0
-	ldr r3, =0x06000020
-	ldr r0, =0x00001111
-	adds r2, r0, 0
-_0817AED4:
-	lsls r0, r1, 1
-	adds r0, r3
-	strh r2, [r0]
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0xF
-	bls _0817AED4
-	movs r1, 0
-	ldr r4, =0x0600f000
-	movs r3, 0x1
-	ldr r2, =0x000003ff
-_0817AEEC:
-	lsls r0, r1, 1
-	adds r0, r4
-	strh r3, [r0]
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, r2
-	bls _0817AEEC
-	bl ResetTasks
-	bl ResetSpriteData
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085F06C0
-	movs r0, 0
-	movs r2, 0x2
-	bl InitBgsFromTemplates
-	movs r1, 0x82
-	lsls r1, 5
-	movs r0, 0
-	bl SetGpuReg
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x3
-	bl ShowBg
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	bl sub_817B02C
-	ldr r0, =0x0000ffff
-	str r0, [sp]
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	movs r0, 0x1
-	bl EnableInterrupts
-	ldr r0, =sub_817ADF4
-	bl SetVBlankCallback
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-	movs r1, 0x1
-	strb r1, [r0]
-	b _0817AFC8
-	.pool
-_0817AFA4:
-	bl UpdatePaletteFade
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0817AFC8
-	ldr r0, =sub_817ADE4
-	bl SetMainCallback2
-	movs r0, 0x1
-	b _0817AFCA
-	.pool
-_0817AFC8:
-	movs r0, 0
-_0817AFCA:
-	add sp, 0xC
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_817AE00
-
-	thumb_func_start sub_817AFD4
-sub_817AFD4: @ 817AFD4
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r4, r0, r1
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0817AFEA
-	cmp r0, 0x1
-	beq _0817B008
-_0817AFEA:
-	ldr r0, =0x0000ffff
-	str r0, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	movs r0, 0x1
-	strb r0, [r4]
-	b _0817B020
-	.pool
-_0817B008:
-	bl UpdatePaletteFade
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0817B020
-	bl FreeAllWindowBuffers
-	bl DoSoftReset
-_0817B020:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817AFD4
-
-	thumb_func_start sub_817B02C
-sub_817B02C: @ 817B02C
-	push {lr}
-	ldr r0, =gUnknown_085F06C8
-	bl InitWindows
-	bl DeactivateAllTextPrinters
-	movs r0, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x2
-	movs r3, 0xE0
-	bl sub_80987D4
-	ldr r0, =gUnknown_0860F074
-	movs r1, 0xF0
-	movs r2, 0x20
-	bl LoadPalette
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_817B02C
-
-	.align 2, 0 @ Don't pad with nop.

asm/clock.s

@@ -27,8 +27,8 @@ sub_809E778: @ 809E778
 	.pool
 	thumb_func_end sub_809E778
 
-	thumb_func_start sub_809E7B0
+	thumb_func_start DoTimeBasedEvents
-sub_809E7B0: @ 809E7B0
+DoTimeBasedEvents: @ 809E7B0
 	push {r4,lr}
 	ldr r0, =0x00000895
 	bl FlagGet
@@ -50,7 +50,7 @@ _0809E7DA:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_809E7B0
+	thumb_func_end DoTimeBasedEvents
 
 	thumb_func_start sub_809E7E8
 sub_809E7E8: @ 809E7E8

asm/coins.s

@@ -5,9 +5,9 @@
 
 	.text
 
-	thumb_func_start AddCoins
+	thumb_func_start GiveCoins
-@ bool8 AddCoins(u16 toAdd)
+@ bool8 GiveCoins(u16 toAdd)
-AddCoins: @ 8145C80
+GiveCoins: @ 8145C80
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -44,11 +44,11 @@ _08145CC0:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end AddCoins
+	thumb_func_end GiveCoins
 
-	thumb_func_start SubtractCoins
+	thumb_func_start TakeCoins
-@ bool8 SubtractCoins(u16 toSub)
+@ bool8 TakeCoins(u16 toSub)
-SubtractCoins: @ 8145CCC
+TakeCoins: @ 8145CCC
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -69,6 +69,6 @@ _08145CEE:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end SubtractCoins
+	thumb_func_end TakeCoins
 
 	.align 2, 0 @ Don't pad with nop.

asm/contest_effect.s

@@ -68,7 +68,7 @@ ContestEffectFunc_080E547C: @ 80E547C
 	thumb_func_start ContestEffectFunc_080E5480
 ContestEffectFunc_080E5480: @ 80E5480
 	push {lr}
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -94,7 +94,7 @@ ContestEffectFunc_080E5480: @ 80E5480
 	thumb_func_start ContestEffectFunc_080E54B0
 ContestEffectFunc_080E54B0: @ 80E54B0
 	push {lr}
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -119,7 +119,7 @@ ContestEffectFunc_080E54B0: @ 80E54B0
 
 	thumb_func_start ContestEffectFunc_080E54E0
 ContestEffectFunc_080E54E0: @ 80E54E0
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -165,7 +165,7 @@ ContestEffectFunc_080E54E0: @ 80E54E0
 	thumb_func_start ContestEffectFunc_080E5534
 ContestEffectFunc_080E5534: @ 80E5534
 	push {lr}
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -189,7 +189,7 @@ ContestEffectFunc_080E5534: @ 80E5534
 	thumb_func_start ContestEffectFunc_080E5560
 ContestEffectFunc_080E5560: @ 80E5560
 	push {lr}
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -215,7 +215,7 @@ ContestEffectFunc_080E5560: @ 80E5560
 	thumb_func_start ContestEffectFunc_080E5590
 ContestEffectFunc_080E5590: @ 80E5590
 	push {lr}
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -239,7 +239,7 @@ ContestEffectFunc_080E5590: @ 80E5590
 	thumb_func_start ContestEffectFunc_080E55BC
 ContestEffectFunc_080E55BC: @ 80E55BC
 	push {lr}
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -266,7 +266,7 @@ ContestEffectFunc_080E55BC: @ 80E55BC
 ContestEffectFunc_080E55EC: @ 80E55EC
 	push {r4,r5,lr}
 	movs r2, 0
-	ldr r5, =gUnknown_02039F34
+	ldr r5, =gContestResources
 	ldr r0, [r5]
 	ldr r1, [r0, 0x8]
 	ldrb r4, [r1, 0x11]
@@ -293,7 +293,7 @@ _080E560A:
 	cmp r0, r1
 	bne _080E560A
 _080E5622:
-	ldr r1, =gUnknown_02039F34
+	ldr r1, =gContestResources
 	ldr r0, [r1]
 	ldr r0, [r0, 0x8]
 	strb r2, [r0, 0x8]
@@ -307,14 +307,14 @@ _080E5622:
 _080E563A:
 	cmp r2, 0
 	bne _080E564C
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
 	movs r1, 0x36
 	bl sub_80DD3F0
 _080E564C:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -330,7 +330,7 @@ _080E564C:
 ContestEffectFunc_080E5664: @ 80E5664
 	push {r4-r6,lr}
 	movs r1, 0
-	ldr r2, =gUnknown_02039F34
+	ldr r2, =gContestResources
 	ldr r0, [r2]
 	ldr r0, [r0, 0x8]
 	ldrb r5, [r0, 0x11]
@@ -359,7 +359,7 @@ _080E5698:
 	adds r3, 0x1
 	cmp r3, 0x3
 	ble _080E567E
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	adds r0, 0x8
@@ -372,14 +372,14 @@ _080E5698:
 _080E56B4:
 	cmp r1, 0
 	bne _080E56C6
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
 	movs r1, 0x36
 	bl sub_80DD3F0
 _080E56C6:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -409,7 +409,7 @@ ContestEffectFunc_080E56E0: @ 80E56E0
 	bhi _080E5702
 	movs r1, 0x28
 _080E5702:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	strh r1, [r0, 0x4]
@@ -425,7 +425,7 @@ ContestEffectFunc_080E5718: @ 80E5718
 	mov r7, r8
 	push {r7}
 	movs r7, 0
-	ldr r1, =gUnknown_02039F34
+	ldr r1, =gContestResources
 	ldr r0, [r1]
 	ldr r0, [r0, 0x8]
 	ldrb r5, [r0, 0x11]
@@ -521,7 +521,7 @@ ContestEffectFunc_080E57CC: @ 80E57CC
 	push {r5-r7}
 	movs r0, 0
 	mov r9, r0
-	ldr r1, =gUnknown_02039F34
+	ldr r1, =gContestResources
 	ldr r0, [r1]
 	ldr r0, [r0, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -619,7 +619,7 @@ ContestEffectFunc_080E588C: @ 80E588C
 	push {r6,r7}
 	movs r0, 0
 	mov r9, r0
-	ldr r1, =gUnknown_02039F34
+	ldr r1, =gContestResources
 	ldr r0, [r1]
 	ldr r0, [r0, 0x8]
 	ldrb r7, [r0, 0x11]
@@ -674,7 +674,7 @@ _080E58DA:
 _080E5900:
 	adds r6, 0x1C
 	adds r5, 0x1
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	cmp r5, 0x3
 	ble _080E58B0
 _080E590A:
@@ -704,7 +704,7 @@ _080E5928:
 	thumb_func_start ContestEffectFunc_080E5938
 ContestEffectFunc_080E5938: @ 80E5938
 	push {r4,lr}
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r1, [r4]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -732,7 +732,7 @@ ContestEffectFunc_080E5938: @ 80E5938
 	thumb_func_start ContestEffectFunc_080E5970
 ContestEffectFunc_080E5970: @ 80E5970
 	push {r4,lr}
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r1, [r4]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -765,7 +765,7 @@ ContestEffectFunc_080E59B0: @ 80E59B0
 	push {lr}
 	movs r0, 0
 	bl sub_80E6934
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -781,7 +781,7 @@ ContestEffectFunc_080E59D0: @ 80E59D0
 	push {lr}
 	movs r0, 0x1
 	bl sub_80E6934
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -797,7 +797,7 @@ ContestEffectFunc_080E59F0: @ 80E59F0
 	push {lr}
 	movs r0, 0x2
 	bl sub_80E6934
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -813,7 +813,7 @@ ContestEffectFunc_080E5A10: @ 80E5A10
 	push {lr}
 	movs r0, 0x3
 	bl sub_80E6934
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -829,7 +829,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
 	push {lr}
 	movs r0, 0x4
 	bl sub_80E6934
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -844,7 +844,7 @@ ContestEffectFunc_080E5A30: @ 80E5A30
 ContestEffectFunc_080E5A50: @ 80E5A50
 	push {r4-r6,lr}
 	movs r4, 0
-	ldr r2, =gUnknown_02039F34
+	ldr r2, =gContestResources
 	ldr r0, [r2]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x11]
@@ -855,7 +855,7 @@ ContestEffectFunc_080E5A50: @ 80E5A50
 	beq _080E5AB0
 	movs r5, 0
 _080E5A68:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r1, [r0, 0x8]
 	ldrb r0, [r1, 0x11]
@@ -932,7 +932,7 @@ ContestEffectFunc_080E5AD4: @ 80E5AD4
 	mov r10, r3
 	movs r6, 0
 _080E5B00:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r2, [r0]
 	ldr r1, [r2, 0x8]
 	ldrb r0, [r1, 0x11]
@@ -1000,7 +1000,7 @@ _080E5B76:
 	bge _080E5B76
 _080E5B7E:
 	movs r5, 0
-	ldr r7, =gUnknown_02039F34
+	ldr r7, =gContestResources
 	movs r6, 0
 	mov r4, r10
 _080E5B86:
@@ -1125,7 +1125,7 @@ _080E5C70:
 	lsrs r0, 24
 	mov r9, r0
 _080E5C86:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	adds r0, 0xD
@@ -1139,7 +1139,7 @@ _080E5C86:
 	cmp r0, 0xFF
 	bne _080E5C16
 _080E5CA0:
-	ldr r6, =gUnknown_02039F34
+	ldr r6, =gContestResources
 	ldr r0, [r6]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -1173,7 +1173,7 @@ ContestEffectFunc_080E5CD4: @ 80E5CD4
 	movs r0, 0
 	mov r8, r0
 	movs r6, 0
-	ldr r7, =gUnknown_02039F34
+	ldr r7, =gContestResources
 	movs r5, 0
 _080E5CE4:
 	ldr r2, [r7]
@@ -1228,7 +1228,7 @@ _080E5D46:
 	adds r6, 0x1
 	cmp r6, 0x3
 	ble _080E5CE4
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r0, [r4]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -1256,7 +1256,7 @@ ContestEffectFunc_080E5D7C: @ 80E5D7C
 	push {r4-r7,lr}
 	movs r7, 0
 	movs r4, 0
-	ldr r5, =gUnknown_02039F34
+	ldr r5, =gContestResources
 	movs r6, 0
 _080E5D86:
 	ldr r3, [r5]
@@ -1301,7 +1301,7 @@ _080E5DD2:
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _080E5D86
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r0, [r4]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -1325,7 +1325,7 @@ _080E5DF8:
 ContestEffectFunc_080E5E04: @ 80E5E04
 	push {r4,lr}
 	ldr r1, =gUnknown_02039F26
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r4, [r0]
 	ldr r0, [r4, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -1366,7 +1366,7 @@ _080E5E46:
 ContestEffectFunc_080E5E5C: @ 80E5E5C
 	push {r4,lr}
 	ldr r1, =gUnknown_02039F26
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r4, [r0]
 	ldr r0, [r4, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -1408,7 +1408,7 @@ ContestEffectFunc_080E5EB4: @ 80E5EB4
 	push {r4-r7,lr}
 	movs r1, 0
 	movs r5, 0
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r4, [r0]
 	ldr r2, [r4, 0x8]
 	ldrb r0, [r2, 0x11]
@@ -1434,7 +1434,7 @@ _080E5EDA:
 	bge _080E5EE8
 	movs r5, 0
 _080E5EE8:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r3, [r0]
 	ldr r0, [r3, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -1467,7 +1467,7 @@ _080E5F0C:
 	movs r1, 0x11
 	bl sub_80DD3D4
 _080E5F2C:
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r1, [r4]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -1498,7 +1498,7 @@ _080E5F2C:
 ContestEffectFunc_080E5F64: @ 80E5F64
 	push {r4-r7,lr}
 	movs r6, 0
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r4, [r0]
 	ldr r2, [r4, 0x8]
 	ldrb r1, [r2, 0x11]
@@ -1567,7 +1567,7 @@ _080E5FDE:
 	thumb_func_start ContestEffectFunc_080E5FE4
 ContestEffectFunc_080E5FE4: @ 80E5FE4
 	push {r4,r5,lr}
-	ldr r1, =gUnknown_02039F34
+	ldr r1, =gContestResources
 	ldr r3, [r1]
 	ldr r0, [r3, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -1647,7 +1647,7 @@ ContestEffectFunc_080E6068: @ 80E6068
 	cmp r0, 0x2
 	bhi _080E6098
 	movs r4, 0xA
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -1659,7 +1659,7 @@ _080E6098:
 	cmp r0, 0x5
 	bhi _080E60B4
 	movs r4, 0x14
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -1671,7 +1671,7 @@ _080E60B4:
 	cmp r0, 0x7
 	bhi _080E60D0
 	movs r4, 0x28
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -1683,7 +1683,7 @@ _080E60D0:
 	cmp r1, 0x8
 	bhi _080E60EC
 	movs r4, 0x3C
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -1693,14 +1693,14 @@ _080E60D0:
 	.pool
 _080E60EC:
 	movs r4, 0x50
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
 	movs r1, 0x1E
 	bl sub_80DD3D4
 _080E60FC:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r1, [r0]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -1721,7 +1721,7 @@ ContestEffectFunc_080E611C: @ 80E611C
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r2, =gUnknown_02039F34
+	ldr r2, =gContestResources
 	ldr r0, [r2]
 	ldr r3, [r0, 0x8]
 	ldrb r0, [r3, 0x11]
@@ -1743,7 +1743,7 @@ _080E6140:
 	adds r5, r0, 0
 	cmp r6, r1
 	beq _080E616A
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 _080E614E:
 	lsls r0, r2, 24
 	movs r2, 0x80
@@ -1845,7 +1845,7 @@ ContestEffectFunc_080E620C: @ 80E620C
 	mov r7, r9
 	mov r6, r8
 	push {r6,r7}
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r3, [r0]
 	ldr r1, [r3, 0x8]
 	ldrb r2, [r1, 0x11]
@@ -1928,7 +1928,7 @@ _080E62AC:
 	thumb_func_start ContestEffectFunc_080E62B8
 ContestEffectFunc_080E62B8: @ 80E62B8
 	push {r4-r7,lr}
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x11]
@@ -1939,7 +1939,7 @@ ContestEffectFunc_080E62B8: @ 80E62B8
 	movs r5, 0
 	movs r6, 0
 _080E62CE:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r4, [r0]
 	ldr r1, [r4, 0x8]
 	ldrb r2, [r1, 0x11]
@@ -1994,7 +1994,7 @@ _080E632E:
 	thumb_func_start ContestEffectFunc_080E6334
 ContestEffectFunc_080E6334: @ 80E6334
 	push {r4,lr}
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r1, [r4]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -2046,7 +2046,7 @@ _080E6390:
 	thumb_func_start ContestEffectFunc_080E6398
 ContestEffectFunc_080E6398: @ 80E6398
 	push {lr}
-	ldr r3, =gUnknown_02039F34
+	ldr r3, =gContestResources
 	ldr r1, [r3]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -2090,7 +2090,7 @@ _080E63E4:
 ContestEffectFunc_080E63E8: @ 80E63E8
 	push {r4-r7,lr}
 	sub sp, 0x4
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r2, [r0]
 	ldr r1, [r2]
 	ldrb r1, [r1, 0x1]
@@ -2258,7 +2258,7 @@ ContestEffectFunc_080E6520: @ 80E6520
 	mov r7, r8
 	push {r7}
 	sub sp, 0x4
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r2, [r0]
 	ldr r1, [r2]
 	ldrb r1, [r1, 0x1]
@@ -2434,7 +2434,7 @@ ContestEffectFunc_080E6664: @ 80E6664
 ContestEffectFunc_080E6668: @ 80E6668
 	push {r4-r7,lr}
 	sub sp, 0x8
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r1, [r0]
 	ldr r0, [r1]
 	ldrb r0, [r0, 0x1]
@@ -2517,7 +2517,7 @@ _080E66FC:
 	cmp r0, 0x3
 	ble _080E66AA
 	movs r6, 0
-	ldr r5, =gUnknown_02039F34
+	ldr r5, =gContestResources
 	adds r4, r5, 0
 _080E6712:
 	ldr r0, [r4]
@@ -2576,7 +2576,7 @@ _080E676C:
 ContestEffectFunc_080E6778: @ 80E6778
 	push {lr}
 	ldr r3, =gContestMoves
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r1, [r0]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778
 	adds r0, r3
 	ldrb r0, [r0, 0x1]
 	lsls r0, 29
-	ldr r1, =gUnknown_02039F2C
+	ldr r1, =gScriptContestCategory
 	lsrs r0, 29
 	ldrh r1, [r1]
 	cmp r0, r1
@@ -2613,7 +2613,7 @@ ContestEffectFunc_080E67BC: @ 80E67BC
 	movs r0, 0
 	mov r8, r0
 	movs r4, 0
-	ldr r5, =gUnknown_02039F34
+	ldr r5, =gContestResources
 	movs r6, 0
 _080E67CC:
 	ldr r3, [r5]
@@ -2672,14 +2672,14 @@ _080E682E:
 	mov r7, r8
 	cmp r7, 0
 	bne _080E684A
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
 	movs r1, 0x36
 	bl sub_80DD3F0
 _080E684A:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -2696,7 +2696,7 @@ _080E684A:
 	thumb_func_start ContestEffectFunc_080E6868
 ContestEffectFunc_080E6868: @ 80E6868
 	push {r4,lr}
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r1, [r0]
 	ldr r0, [r1]
 	ldrb r0, [r0, 0x13]
@@ -2745,7 +2745,7 @@ _080E68C2:
 	movs r1, 0x1E
 	bl sub_80DD3D4
 _080E68CE:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r1, [r0]
 	ldr r0, [r1, 0x8]
 	ldrb r2, [r0, 0x11]
@@ -2764,7 +2764,7 @@ _080E68CE:
 	thumb_func_start ContestEffectFunc_080E68EC
 ContestEffectFunc_080E68EC: @ 80E68EC
 	push {r4,lr}
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r0, [r4]
 	ldr r2, [r0, 0x10]
 	ldrb r1, [r2, 0x1]
@@ -2811,7 +2811,7 @@ sub_80E6934: @ 80E6934
 	mov r8, r0
 	movs r7, 0
 	movs r4, 0
-	ldr r6, =gUnknown_02039F34
+	ldr r6, =gContestResources
 	ldr r0, =gContestMoves
 	mov r9, r0
 	movs r5, 0
@@ -2861,7 +2861,7 @@ _080E699E:
 	ble _080E694E
 	cmp r7, 0
 	bne _080E69B8
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x11]
@@ -2882,7 +2882,7 @@ sub_80E69C8: @ 80E69C8
 	push {lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
-	ldr r2, =gUnknown_02039F34
+	ldr r2, =gContestResources
 	ldr r0, [r2]
 	ldr r0, [r0, 0x8]
 	adds r0, 0xD
@@ -2945,7 +2945,7 @@ sub_80E6A2C: @ 80E6A2C
 	movs r2, 0x8
 	bl memset
 	movs r7, 0
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r0, [r4]
 	ldr r0, [r0, 0x8]
 	ldrb r0, [r0, 0x8]
@@ -3040,7 +3040,7 @@ _080E6AD6:
 	strh r0, [r1]
 _080E6AFE:
 	adds r7, 0x1
-	ldr r4, =gUnknown_02039F34
+	ldr r4, =gContestResources
 	ldr r0, [r4]
 	ldr r0, [r0, 0x8]
 	adds r0, 0x8
@@ -3081,7 +3081,7 @@ sub_80E6B3C: @ 80E6B3C
 	lsrs r0, 24
 	lsls r1, 24
 	lsrs r1, 24
-	ldr r2, =gUnknown_02039F34
+	ldr r2, =gContestResources
 	ldr r4, [r2]
 	ldr r3, [r4, 0x4]
 	lsls r2, r0, 3

asm/contest_link_80F57C4.s

@@ -92,30 +92,30 @@ _080F57E0:
 	lsls r1, 8
 	movs r0, 0
 	bl SetGpuRegBits
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E20
+	ldr r0, =gBattle_BG3_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	strh r1, [r0]
 	pop {r4}
 	pop {r0}
@@ -387,10 +387,10 @@ sub_80F5B00: @ 80F5B00
 	strb r0, [r1, 0x2]
 	ldr r0, =sub_80F5C00
 	bl SetMainCallback2
-	ldr r1, =gUnknown_02022E28
+	ldr r1, =gBattle_WIN1H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E2A
+	ldr r1, =gBattle_WIN1V
 	ldr r2, =0x000080a0
 	adds r0, r2, 0
 	strh r0, [r1]
@@ -441,51 +441,51 @@ sub_80F5C00: @ 80F5C00
 	thumb_func_start sub_80F5C24
 sub_80F5C24: @ 80F5C24
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	ldrh r1, [r0]
 	movs r0, 0x14
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	ldrh r1, [r0]
 	movs r0, 0x16
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	ldrh r1, [r0]
 	movs r0, 0x18
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	ldrh r1, [r0]
 	movs r0, 0x1A
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E20
+	ldr r0, =gBattle_BG3_X
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E24
+	ldr r0, =gBattle_WIN0H
 	ldrh r1, [r0]
 	movs r0, 0x40
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E26
+	ldr r0, =gBattle_WIN0V
 	ldrh r1, [r0]
 	movs r0, 0x44
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E28
+	ldr r0, =gBattle_WIN1H
 	ldrh r1, [r0]
 	movs r0, 0x42
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E2A
+	ldr r0, =gBattle_WIN1V
 	ldrh r1, [r0]
 	movs r0, 0x46
 	bl SetGpuReg
@@ -702,7 +702,7 @@ sub_80F5ED8: @ 80F5ED8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080F5EFC
@@ -1239,7 +1239,7 @@ _080F6334:
 	ldr r1, =gUnknown_02039F20
 	ldrb r0, [r1]
 	ldr r7, =gStringVar1
-	ldr r2, =gUnknown_02039E0D
+	ldr r2, =gUnknown_02039E00 + 13
 	mov r8, r2
 	cmp r0, 0
 	beq _080F636E
@@ -1347,10 +1347,10 @@ _080F643C:
 	.4byte _080F6638
 	.4byte _080F667C
 _080F6454:
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r1, =gUnknown_02022E26
+	ldr r1, =gBattle_WIN0V
 	ldr r3, =0x00005050
 	adds r0, r3, 0
 	strh r0, [r1]
@@ -1364,7 +1364,7 @@ _080F6454:
 	mov r9, r4
 	ldr r4, =gMonFrontPicTable
 	mov r12, r4
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	mov r8, r4
 	cmp r0, 0
 	beq _080F648C
@@ -1494,7 +1494,7 @@ _080F65A4:
 	strh r0, [r4, 0xC]
 _080F65BA:
 	ldrb r2, [r4, 0xC]
-	ldr r3, =gUnknown_02022E26
+	ldr r3, =gBattle_WIN0V
 	movs r0, 0x50
 	subs r0, r2
 	lsls r0, 8
@@ -1556,7 +1556,7 @@ _080F6638:
 	ldrb r0, [r0, 0x6]
 	cmp r0, 0x2
 	bne _080F669C
-	ldr r3, =gUnknown_02022E26
+	ldr r3, =gBattle_WIN0V
 	ldrh r0, [r3]
 	lsrs r2, r0, 8
 	adds r0, r2, 0x2
@@ -1706,7 +1706,7 @@ sub_80F677C: @ 80F677C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080F67AC
@@ -1750,7 +1750,7 @@ task_repel: @ 80F67C4
 	ldrb r0, [r0]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_80ED090
+	bl BravoTrainerPokemonProfile_BeforeInterview2
 _080F67E6:
 	movs r0, 0
 	str r0, [sp]
@@ -1838,11 +1838,11 @@ _080F68A8:
 	thumb_func_start sub_80F68B4
 sub_80F68B4: @ 80F68B4
 	push {r4,r5,lr}
-	ldr r2, =gUnknown_02022E20
+	ldr r2, =gBattle_BG3_X
 	ldrh r3, [r2]
 	adds r0, r3, 0x2
 	strh r0, [r2]
-	ldr r4, =gUnknown_02022E22
+	ldr r4, =gBattle_BG3_Y
 	ldrh r5, [r4]
 	adds r1, r5, 0x1
 	strh r1, [r4]
@@ -1989,7 +1989,7 @@ sub_80F69B8: @ 80F69B8
 _080F69DE:
 	adds r0, r7, 0
 	ldr r1, [sp, 0x28]
-	bl sub_80D2EDC
+	bl GetMonIconPtr
 	adds r3, r0, 0
 	lsls r0, r5, 9
 	adds r0, 0x80
@@ -2870,10 +2870,10 @@ _080F70BE:
 	adds r5, 0x1
 	cmp r5, 0x2
 	ble _080F70BE
-	ldr r1, =gUnknown_02022E24
+	ldr r1, =gBattle_WIN0H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r2, =gUnknown_02022E26
+	ldr r2, =gBattle_WIN0V
 	ldrh r1, [r4, 0x22]
 	adds r0, r1, 0
 	subs r0, 0x10
@@ -2910,8 +2910,8 @@ sub_80F7144: @ 80F7144
 	orrs r0, r1
 	mov r1, r12
 	strb r0, [r1]
-	ldr r7, =gUnknown_02022E24
+	ldr r7, =gBattle_WIN0H
-	ldr r6, =gUnknown_02022E26
+	ldr r6, =gBattle_WIN0V
 	adds r5, r3, 0
 	movs r4, 0x4
 	adds r2, 0x2E
@@ -3008,7 +3008,7 @@ _080F7236:
 	bl CopyToBgTilemapBufferRect
 	movs r5, 0xF
 _080F7240:
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0
 	bne _080F725C
@@ -4522,7 +4522,7 @@ sub_80F7DF4: @ 80F7DF4
 	bl AllocZeroed
 	ldr r1, [r4]
 	str r0, [r1, 0x1C]
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -4569,7 +4569,7 @@ sub_80F7E64: @ 80F7E64
 	str r4, [r0, 0x1C]
 	bl Free
 	str r4, [r5]
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -4640,7 +4640,7 @@ sub_80F7F30: @ 80F7F30
 	adds r5, r0, 0
 	cmp r5, 0
 	beq _080F7F5E
-	ldr r4, =gUnknown_02039F2C
+	ldr r4, =gScriptContestCategory
 	ldrb r0, [r4]
 	ldr r1, =gUnknown_02039F2E
 	ldrb r1, [r1]
@@ -4666,7 +4666,7 @@ sub_80F7F7C: @ 80F7F7C
 	muls r1, r0
 	ldr r0, =gPlayerParty
 	adds r2, r1, r0
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bhi _080F7FEE
@@ -4730,7 +4730,7 @@ sub_80F7FFC: @ 80F7FFC
 	beq _080F8010
 	b _080F8250
 _080F8010:
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bls _080F801A
@@ -4785,7 +4785,7 @@ _080F8074:
 	ldrb r0, [r6]
 	muls r0, r5
 	adds r0, r4
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -4834,7 +4834,7 @@ _080F80E2:
 	ldrb r0, [r7]
 	muls r0, r6
 	adds r0, r5
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -4883,7 +4883,7 @@ _080F814E:
 	ldrb r0, [r7]
 	muls r0, r6
 	adds r0, r5
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -4926,7 +4926,7 @@ _080F8190:
 	ldrb r0, [r7]
 	muls r0, r6
 	adds r0, r5
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -4969,7 +4969,7 @@ _080F81F8:
 	ldrb r0, [r7]
 	muls r0, r6
 	adds r0, r5
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -4994,7 +4994,7 @@ sub_80F8264: @ 80F8264
 	ldr r0, =gSpecialVar_0x8006
 	ldrh r1, [r0]
 	lsls r1, 6
-	ldr r0, =gUnknown_02039E0D
+	ldr r0, =gUnknown_02039E00 + 13
 	adds r1, r0
 	adds r0, r4, 0
 	bl StringCopy
@@ -5013,7 +5013,7 @@ sub_80F8290: @ 80F8290
 	ldr r1, =gSpecialVar_0x8006
 	ldrh r1, [r1]
 	lsls r1, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	pop {r0}
@@ -5104,7 +5104,7 @@ sub_80F834C: @ 80F834C
 	ldr r2, =gUnknown_02039F20
 	ldrb r0, [r2]
 	ldr r4, =gStringVar3
-	ldr r3, =gUnknown_02039E0D
+	ldr r3, =gUnknown_02039E00 + 13
 	cmp r0, 0
 	beq _080F836E
 _080F835C:
@@ -5137,7 +5137,7 @@ sub_80F8390: @ 80F8390
 	ldr r2, =gUnknown_02039F20
 	ldrb r0, [r2]
 	ldr r4, =gStringVar1
-	ldr r3, =gUnknown_02039E02
+	ldr r3, =gUnknown_02039E00 + 2
 	cmp r0, 0
 	beq _080F83B2
 _080F83A0:
@@ -5488,7 +5488,7 @@ _080F8678:
 	bl sub_80F86E0
 	ldr r1, =gUnknown_02039F2B
 	strb r0, [r1]
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrb r0, [r0]
 	bl sub_80DB09C
 	ldr r1, =sub_80FCF40
@@ -5578,7 +5578,7 @@ sub_80F8714: @ 80F8714
 	b _080F877E
 	.pool
 _080F8748:
-	ldr r5, =gUnknown_02039E02
+	ldr r5, =gUnknown_02039E00 + 2
 	movs r4, 0x3
 _080F874C:
 	adds r0, r5, 0
@@ -5633,7 +5633,7 @@ sub_80F87B4: @ 80F87B4
 	push {lr}
 	lsls r0, 24
 	lsrs r1, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080F87D0

asm/contest_link_80FC4F4.s

@@ -21,7 +21,7 @@ sub_80FC4F4: @ 80FC4F4
 	lsrs r0, 24
 	adds r1, r5, 0
 	adds r2, r4, 0
-	bl link_0800A448
+	bl SendBlock
 	lsls r0, 24
 	cmp r0, 0
 	bne _080FC528
@@ -45,12 +45,12 @@ sub_80FC530: @ 80FC530
 	lsls r4, 17
 	lsls r4, r5
 	lsrs r4, 24
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	ands r4, r0
 	cmp r4, 0
 	beq _080FC552
 	adds r0, r5, 0
-	bl sub_800A5EC
+	bl ResetBlockReceivedFlag
 	movs r0, 0x1
 	b _080FC554
 _080FC552:
@@ -64,7 +64,7 @@ _080FC554:
 	thumb_func_start sub_80FC55C
 sub_80FC55C: @ 80FC55C
 	push {r4,lr}
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	adds r4, r0, 0
 	bl sub_800A9D8
 	lsls r4, 24
@@ -74,7 +74,7 @@ sub_80FC55C: @ 80FC55C
 	movs r0, 0
 	b _080FC57A
 _080FC574:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	movs r0, 0x1
 _080FC57A:
 	pop {r4}
@@ -90,7 +90,7 @@ sub_80FC580: @ 80FC580
 	movs r1, 0
 	ldr r5, =gTasks
 	ldr r6, =sub_80FC5C0
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	movs r3, 0xFF
 _080FC590:
 	lsls r0, r1, 8
@@ -134,14 +134,14 @@ sub_80FC5DC: @ 80FC5DC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080FC650
 	bl GetMultiplayerId
 	ldr r1, =gUnknown_02039F25
 	strb r0, [r1]
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	ldr r4, =gUnknown_02039F30
 	strb r0, [r4]
 	ldr r1, =gUnknown_02039F2A
@@ -324,7 +324,7 @@ _080FC770:
 	ldr r0, =gUnknown_02039E00
 	adds r4, r0
 	lsls r1, r5, 8
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r1, r0
 	adds r0, r4, 0
 	movs r2, 0x40
@@ -430,7 +430,7 @@ _080FC858:
 	cmp r0, 0
 	beq _080FC880
 	ldr r0, =gRngValue
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r1, r4, 0
 	movs r2, 0x4
 	bl memcpy
@@ -517,7 +517,7 @@ _080FC90C:
 	ldrb r0, [r1]
 	cmp r3, r0
 	bge _080FC93A
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r0, r7, 0x2
 	adds r2, r5, r0
 	movs r5, 0x80
@@ -657,7 +657,7 @@ _080FCA30:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FCAB2
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r2, [r0]
 	ldr r0, =gUnknown_02039F25
 	ldrb r0, [r0]
@@ -688,9 +688,9 @@ _080FCA68:
 	ldrb r0, [r6]
 	cmp r2, r0
 	bge _080FCAA4
-	ldr r1, =gUnknown_02039F34
+	ldr r1, =gContestResources
 	mov r8, r1
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	movs r3, 0
 	movs r7, 0x80
 	lsls r7, 1
@@ -784,7 +784,7 @@ _080FCB50:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	b _080FCC50
@@ -827,7 +827,7 @@ _080FCBA4:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	b _080FCC50
@@ -850,7 +850,7 @@ _080FCBE0:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	b _080FCC50
@@ -885,7 +885,7 @@ _080FCC38:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x4
 _080FCC50:
@@ -955,7 +955,7 @@ _080FCCE8:
 	bne _080FCCF4
 	b _080FCE42
 _080FCCF4:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	movs r1, 0x70
@@ -968,13 +968,13 @@ _080FCD04:
 	bne _080FCD10
 	b _080FCE42
 _080FCD10:
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x70
 	b _080FCE10
@@ -1004,7 +1004,7 @@ _080FCD54:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FCE42
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	movs r1, 0x14
@@ -1015,13 +1015,13 @@ _080FCD6C:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FCE42
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x14
 	b _080FCE10
@@ -1031,7 +1031,7 @@ _080FCD98:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FCE42
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x10]
 	b _080FCDD4
@@ -1041,7 +1041,7 @@ _080FCDB0:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080FCE42
-	ldr r0, =gUnknown_02039F34
+	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r0, [r0, 0x10]
 	b _080FCE04
@@ -1078,7 +1078,7 @@ _080FCE04:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x4
 _080FCE10:
@@ -1169,7 +1169,7 @@ _080FCEC0:
 	beq _080FCF2E
 	mov r1, r8
 	mov r8, r9
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r0, r7, 0
 	adds r0, 0xA
 	adds r2, r5, r0
@@ -1278,7 +1278,7 @@ _080FCF9C:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x8
 	bl memcpy
@@ -1344,7 +1344,7 @@ _080FD02C:
 	ldr r1, =gUnknown_02039F2B
 	ldrb r1, [r1]
 	lsls r1, 8
-	ldr r2, =gUnknown_020223C4
+	ldr r2, =gBlockRecvBuffer
 	adds r1, r2
 	movs r2, 0x4
 	bl memcpy

asm/contest_link_81D9DE4.s

@@ -370,7 +370,7 @@ sub_81DA10C: @ 81DA10C
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrb r0, [r0]
 	bl sub_80DB09C
 	ldr r1, =sub_80FCF40
@@ -469,7 +469,7 @@ _081DA1EC:
 	ldr r0, =gUnknown_02039E00
 	adds r4, r0
 	lsls r1, r5, 8
-	ldr r0, =gUnknown_020223C4
+	ldr r0, =gBlockRecvBuffer
 	adds r1, r0
 	adds r0, r4, 0
 	movs r2, 0x40
@@ -554,7 +554,7 @@ _081DA2AC:
 	cmp r0, 0
 	beq _081DA2D4
 	ldr r0, =gRngValue
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	adds r1, r4, 0
 	movs r2, 0x4
 	bl memcpy
@@ -641,7 +641,7 @@ _081DA35A:
 	mov r0, r8
 	adds r0, 0xA
 	adds r3, r5, r0
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	mov r2, sp
 	movs r5, 0x80
 	lsls r5, 1
@@ -744,7 +744,7 @@ _081DA42A:
 	mov r0, r8
 	adds r0, 0x2
 	adds r3, r5, r0
-	ldr r4, =gUnknown_020223C4
+	ldr r4, =gBlockRecvBuffer
 	mov r2, sp
 	movs r5, 0x80
 	lsls r5, 1
@@ -849,7 +849,7 @@ _081DA50C:
 	lsls r0, r3, 6
 	ldr r5, =gUnknown_02039E00
 	adds r0, r5
-	ldr r1, =gUnknown_020223C4
+	ldr r1, =gBlockRecvBuffer
 	movs r2, 0x4
 	subs r2, r3
 	lsls r2, 6

asm/contest_painting.s

@@ -72,7 +72,7 @@ sub_812FE0C: @ 812FE0C
 	movs r0, 0x1
 	bl GetBgTilemapBuffer
 	bl Free
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -110,7 +110,7 @@ _0812FE94:
 	bl remove_some_task
 	movs r0, 0
 	bl SetVBlankCallback
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	ldr r1, =gUnknown_030061C0
 	ldr r0, =gUnknown_02039F3C
 	str r0, [r1]
@@ -581,7 +581,7 @@ sub_81302E8: @ 81302E8
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	ldr r1, [r4]
 	ldr r1, [r1, 0x8]
 	ldr r2, [r6]
@@ -600,7 +600,7 @@ _08130348:
 	lsls r0, r5, 3
 	ldr r1, =gMonBackPicTable
 	adds r0, r1
-	ldr r4, =gBattleSpritesGfx
+	ldr r4, =gMonSpritesGfxPtr
 	ldr r1, [r4]
 	ldr r1, [r1, 0x4]
 	ldr r2, [r6]

asm/credits.s

@@ -491,14 +491,14 @@ _08175906:
 	ldr r1, =gReservedSpritePaletteCount
 	movs r0, 0x8
 	strb r0, [r1]
-	ldr r0, =gUnknown_085B0E04
+	ldr r0, =gBirchHelpGfx
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0C0C
+	ldr r0, =gBirchGrassTilemap
 	ldr r1, =0x06003800
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085B0A02
+	ldr r0, =gBirchBagGrassPal + 0x2
 	movs r1, 0x1
 	movs r2, 0x3E
 	bl LoadPalette

asm/crt0.s

@@ -163,7 +163,7 @@ IntrMain: @ 8000248
 IntrMain_FoundIntr:
 	strh r0, [r3, OFFSET_REG_IF - 0x200]
 	bic r2, r2, r0
-	ldr r0, =gUnknown_03007868
+	ldr r0, =gRfuState
 	ldr r0, [r0]
 	ldrb r0, [r0, 0xA]
 	mov r1, 0x8

asm/decoration_inventory.s

@@ -1,459 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-    
-	thumb_func_start SetDecorationInventoriesPointers
-SetDecorationInventoriesPointers: @ 81617F4
-	push {r4,lr}
-	ldr r0, =gDecorationInventories
-	mov r12, r0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r2, =0x00002734
-	adds r0, r1, r2
-	mov r4, r12
-	str r0, [r4]
-	movs r3, 0xA
-	strb r3, [r4, 0x4]
-	adds r2, 0xA
-	adds r0, r1, r2
-	str r0, [r4, 0x8]
-	strb r3, [r4, 0xC]
-	ldr r4, =0x00002748
-	adds r0, r1, r4
-	mov r2, r12
-	str r0, [r2, 0x10]
-	strb r3, [r2, 0x14]
-	adds r4, 0xA
-	adds r0, r1, r4
-	str r0, [r2, 0x18]
-	movs r2, 0x1E
-	mov r0, r12
-	strb r2, [r0, 0x1C]
-	adds r4, 0x1E
-	adds r0, r1, r4
-	mov r4, r12
-	str r0, [r4, 0x20]
-	mov r0, r12
-	adds r0, 0x24
-	strb r2, [r0]
-	ldr r2, =0x0000278e
-	adds r0, r1, r2
-	str r0, [r4, 0x28]
-	mov r0, r12
-	adds r0, 0x2C
-	strb r3, [r0]
-	ldr r4, =0x00002798
-	adds r0, r1, r4
-	mov r2, r12
-	str r0, [r2, 0x30]
-	adds r2, 0x34
-	movs r0, 0x28
-	strb r0, [r2]
-	adds r4, 0x28
-	adds r1, r4
-	mov r0, r12
-	str r1, [r0, 0x38]
-	adds r0, 0x3C
-	strb r3, [r0]
-	bl sub_8126968
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SetDecorationInventoriesPointers
-
-	thumb_func_start ClearDecorationInventory
-ClearDecorationInventory: @ 8161880
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r3, 0
-	ldr r1, =gDecorationInventories
-	lsrs r2, r0, 21
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcs _081618AA
-	adds r5, r1, 0
-	movs r4, 0
-_08161896:
-	adds r0, r2, r5
-	ldr r1, [r0]
-	adds r1, r3
-	strb r4, [r1]
-	adds r1, r3, 0x1
-	lsls r1, 24
-	lsrs r3, r1, 24
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcc _08161896
-_081618AA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearDecorationInventory
-
-	thumb_func_start ClearDecorationInventories
-ClearDecorationInventories: @ 81618B4
-	push {r4,lr}
-	movs r4, 0
-_081618B8:
-	adds r0, r4, 0
-	bl ClearDecorationInventory
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _081618B8
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end ClearDecorationInventories
-
-	thumb_func_start sub_81618D0
-sub_81618D0: @ 81618D0
-	push {r4,lr}
-	lsls r0, 24
-	movs r2, 0
-	ldr r1, =gDecorationInventories
-	lsrs r0, 21
-	adds r0, r1
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	cmp r2, r1
-	bge _0816190C
-	adds r4, r0, 0
-	adds r3, r1, 0
-_081618E8:
-	lsls r0, r2, 24
-	asrs r1, r0, 24
-	ldr r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08161900
-	adds r0, r1, 0
-	b _08161910
-	.pool
-_08161900:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	asrs r0, 24
-	cmp r0, r3
-	blt _081618E8
-_0816190C:
-	movs r0, 0x1
-	negs r0, r0
-_08161910:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81618D0
-
-	thumb_func_start sub_8161918
-sub_8161918: @ 8161918
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, =gDecorations
-	lsls r0, r3, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	movs r2, 0
-	ldr r1, =gDecorationInventories
-	lsls r0, 3
-	adds r0, r1
-	ldrb r1, [r0, 0x4]
-	cmp r2, r1
-	bcs _08161956
-	ldr r4, [r0]
-_08161936:
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	cmp r0, r3
-	bne _0816194C
-	movs r0, 0x1
-	b _08161958
-	.pool
-_0816194C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, r1
-	bcc _08161936
-_08161956:
-	movs r0, 0
-_08161958:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8161918
-
-	thumb_func_start DecorationAdd
-DecorationAdd: @ 8161960
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _081619A0
-	ldr r1, =gDecorations
-	lsls r0, r4, 5
-	adds r0, r1
-	ldrb r5, [r0, 0x13]
-	adds r0, r5, 0
-	bl sub_81618D0
-	lsls r0, 24
-	asrs r2, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r2, r0
-	beq _081619A0
-	ldr r0, =gDecorationInventories
-	lsls r1, r5, 3
-	adds r1, r0
-	ldr r0, [r1]
-	adds r0, r2
-	strb r4, [r0]
-	movs r0, 0x1
-	b _081619A2
-	.pool
-_081619A0:
-	movs r0, 0
-_081619A2:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end DecorationAdd
-
-	thumb_func_start DecorationCheckSpace
-DecorationCheckSpace: @ 81619A8
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081619D4
-	ldr r1, =gDecorations
-	lsls r0, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	bl sub_81618D0
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	beq _081619D4
-	movs r0, 0x1
-	b _081619D6
-	.pool
-_081619D4:
-	movs r0, 0
-_081619D6:
-	pop {r1}
-	bx r1
-	thumb_func_end DecorationCheckSpace
-
-	thumb_func_start DecorationRemove
-DecorationRemove: @ 81619DC
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	cmp r5, 0
-	bne _081619F8
-	b _08161A26
-_081619EA:
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r6, 0
-	bl sub_8161A38
-	movs r0, 0x1
-	b _08161A28
-_081619F8:
-	ldr r2, =gDecorationInventories
-	ldr r1, =gDecorations
-	lsls r0, r5, 5
-	adds r0, r1
-	ldrb r4, [r0, 0x13]
-	lsls r0, r4, 3
-	adds r0, r2
-	ldrb r1, [r0, 0x4]
-	cmp r3, r1
-	bcs _08161A26
-	adds r6, r4, 0
-	adds r4, r0, 0
-	adds r2, r1, 0
-_08161A12:
-	ldr r0, [r4]
-	adds r1, r0, r3
-	ldrb r0, [r1]
-	cmp r0, r5
-	beq _081619EA
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r2
-	bcc _08161A12
-_08161A26:
-	movs r0, 0
-_08161A28:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end DecorationRemove
-
-	thumb_func_start sub_8161A38
-sub_8161A38: @ 8161A38
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	movs r6, 0
-	ldr r2, =gDecorationInventories
-	lsrs r0, 21
-	adds r1, r0, r2
-	ldrb r3, [r1, 0x4]
-	cmp r6, r3
-	bcs _08161ABC
-	adds r7, r0, 0
-	mov r10, r1
-	mov r0, r10
-	str r0, [sp]
-_08161A5C:
-	adds r1, r6, 0x1
-	lsls r0, r1, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r12, r1
-	mov r1, r10
-	ldrb r1, [r1, 0x4]
-	cmp r3, r1
-	bcs _08161AAE
-	ldr r0, =gDecorationInventories
-	mov r9, r0
-	adds r1, r0, 0
-	mov r8, r1
-_08161A76:
-	mov r0, r9
-	adds r5, r2, r0
-	ldr r1, [r5]
-	adds r0, r1, r3
-	ldrb r4, [r0]
-	adds r2, r4, 0
-	cmp r2, 0
-	beq _08161A9C
-	adds r0, r1, r6
-	ldrb r1, [r0]
-	cmp r1, 0
-	beq _08161A92
-	cmp r1, r2
-	bls _08161A9C
-_08161A92:
-	ldrb r1, [r0]
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, r3
-	strb r1, [r0]
-_08161A9C:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r1, r8
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcc _08161A76
-_08161AAE:
-	mov r3, r12
-	lsls r0, r3, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp]
-	ldrb r0, [r0, 0x4]
-	cmp r6, r0
-	bcc _08161A5C
-_08161ABC:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8161A38
-
-	thumb_func_start sub_8161AD0
-sub_8161AD0: @ 8161AD0
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r4, 0
-	movs r3, 0
-	ldr r2, =gDecorationInventories
-	lsrs r1, r0, 21
-	adds r0, r1, r2
-	ldrb r0, [r0, 0x4]
-	cmp r4, r0
-	bcs _08161B04
-	adds r5, r2, 0
-_08161AE6:
-	adds r2, r1, r5
-	ldr r0, [r2]
-	adds r0, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08161AF8
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-_08161AF8:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldrb r2, [r2, 0x4]
-	cmp r3, r2
-	bcc _08161AE6
-_08161B04:
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8161AD0
-
-	thumb_func_start sub_8161B10
-sub_8161B10: @ 8161B10
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0
-_08161B16:
-	adds r0, r4, 0
-	bl sub_8161AD0
-	adds r0, r5, r0
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _08161B16
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8161B10
-
-	.align 2, 0 @ Don't pad with nop.
-    

asm/dewford_trend.s

@@ -492,7 +492,7 @@ sub_812287C: @ 812287C
 	bl Free
 	b _08122980
 _081228B0:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	mov r9, r0

asm/diploma.s

@@ -1,387 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8177874
-sub_8177874: @ 8177874
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8177874
-
-	thumb_func_start sub_8177888
-sub_8177888: @ 8177888
-	push {r4,r5,lr}
-	sub sp, 0xC
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r0, 0
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xE
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xC
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0xA
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x8
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1C
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1E
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x18
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x1A
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x14
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x16
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x10
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x12
-	movs r1, 0
-	bl SetGpuReg
-	add r1, sp, 0x4
-	movs r0, 0
-	strh r0, [r1]
-	ldr r1, =0x040000d4
-	add r0, sp, 0x4
-	str r0, [r1]
-	movs r0, 0xC0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x8100c000
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r5, 0
-	str r5, [sp, 0x8]
-	add r0, sp, 0x8
-	str r0, [r1]
-	movs r0, 0xE0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x85000100
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	add r0, sp, 0x4
-	strh r5, [r0]
-	str r0, [r1]
-	movs r0, 0xA0
-	lsls r0, 19
-	str r0, [r1, 0x4]
-	ldr r0, =0x81000200
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	bl remove_some_task
-	bl ResetTasks
-	bl ResetSpriteData
-	bl ResetPaletteFade
-	bl FreeAllSpritePalettes
-	ldr r0, =gUnknown_085E7088
-	movs r1, 0
-	movs r2, 0x40
-	bl LoadPalette
-	ldr r4, =gUnknown_0203BCF0
-	movs r0, 0x80
-	lsls r0, 5
-	bl Alloc
-	str r0, [r4]
-	bl sub_8177B44
-	bl sub_8177B9C
-	bl reset_temp_tile_data_buffers
-	ldr r1, =gUnknown_085E7804
-	str r5, [sp]
-	movs r0, 0x1
-	movs r2, 0
-	movs r3, 0
-	bl decompress_and_copy_tile_data_to_vram
-_0817797C:
-	bl free_temp_tile_data_buffers_if_possible
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _0817797C
-	ldr r0, =gUnknown_085E70C8
-	ldr r1, =gUnknown_0203BCF0
-	ldr r1, [r1]
-	bl LZDecompressWram
-	movs r0, 0x1
-	bl CopyBgTilemapBufferToVram
-	bl pokedex_diploma_something
-	movs r4, 0x1
-	negs r4, r4
-	adds r0, r4, 0
-	movs r1, 0x10
-	movs r2, 0
-	bl BlendPalettes
-	str r5, [sp]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	movs r0, 0x1
-	bl EnableInterrupts
-	ldr r0, =sub_8177874
-	bl SetVBlankCallback
-	ldr r0, =sub_8177A08
-	bl SetMainCallback2
-	ldr r0, =sub_8177A20
-	movs r1, 0
-	bl CreateTask
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177888
-
-	thumb_func_start sub_8177A08
-sub_8177A08: @ 8177A08
-	push {lr}
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8177A08
-
-	thumb_func_start sub_8177A20
-sub_8177A20: @ 8177A20
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08177A40
-	ldr r0, =gTasks
-	lsls r1, r2, 2
-	adds r1, r2
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =sub_8177A50
-	str r0, [r1]
-_08177A40:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177A20
-
-	thumb_func_start sub_8177A50
-sub_8177A50: @ 8177A50
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x3
-	ands r0, r1
-	cmp r0, 0
-	beq _08177A82
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r1, =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, =sub_8177A98
-	str r1, [r0]
-_08177A82:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177A50
-
-	thumb_func_start sub_8177A98
-sub_8177A98: @ 8177A98
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08177AC2
-	ldr r0, =gUnknown_0203BCF0
-	ldr r0, [r0]
-	bl Free
-	bl FreeAllWindowBuffers
-	adds r0, r4, 0
-	bl DestroyTask
-	ldr r0, =sub_80861E8
-	bl SetMainCallback2
-_08177AC2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177A98
-
-	thumb_func_start pokedex_diploma_something
-pokedex_diploma_something: @ 8177AD4
-	push {r4,lr}
-	bl sub_80C0944
-	lsls r0, 16
-	cmp r0, 0
-	beq _08177AFC
-	movs r1, 0x80
-	lsls r1, 1
-	movs r0, 0x14
-	bl SetGpuReg
-	ldr r0, =gStringVar1
-	ldr r1, =gText_DexNational
-	bl StringCopy
-	b _08177B0C
-	.pool
-_08177AFC:
-	movs r0, 0x14
-	movs r1, 0
-	bl SetGpuReg
-	ldr r0, =gStringVar1
-	ldr r1, =gText_DexHoenn
-	bl StringCopy
-_08177B0C:
-	ldr r4, =gStringVar4
-	ldr r1, =gText_PokedexDiploma
-	adds r0, r4, 0
-	bl StringExpandPlaceholders
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x1
-	bl sub_8177BCC
-	movs r0, 0
-	bl PutWindowTilemap
-	movs r0, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end pokedex_diploma_something
-
-	thumb_func_start sub_8177B44
-sub_8177B44: @ 8177B44
-	push {lr}
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085E81FC
-	movs r0, 0
-	movs r2, 0x2
-	bl InitBgsFromTemplates
-	ldr r0, =gUnknown_0203BCF0
-	ldr r1, [r0]
-	movs r0, 0x1
-	bl SetBgTilemapBuffer
-	movs r1, 0x82
-	lsls r1, 5
-	movs r0, 0
-	bl SetGpuReg
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x52
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x54
-	movs r1, 0
-	bl SetGpuReg
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177B44
-
-	thumb_func_start sub_8177B9C
-sub_8177B9C: @ 8177B9C
-	push {lr}
-	ldr r0, =gUnknown_085E8204
-	bl InitWindows
-	bl DeactivateAllTextPrinters
-	ldr r0, =gUnknown_0860F074
-	movs r1, 0xF0
-	movs r2, 0x20
-	bl LoadPalette
-	movs r0, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	movs r0, 0
-	bl PutWindowTilemap
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177B9C
-
-	thumb_func_start sub_8177BCC
-sub_8177BCC: @ 8177BCC
-	push {r4-r6,lr}
-	sub sp, 0x18
-	adds r6, r0, 0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r1, =gUnknown_085E8214
-	add r0, sp, 0x14
-	movs r2, 0x3
-	bl memcpy
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	add r0, sp, 0x14
-	str r0, [sp, 0x8]
-	movs r0, 0x1
-	negs r0, r0
-	str r0, [sp, 0xC]
-	str r6, [sp, 0x10]
-	movs r0, 0
-	movs r1, 0x1
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl AddTextPrinterParametrized2
-	add sp, 0x18
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8177BCC
-
-	.align 2, 0 @ Don't pad with nop.

asm/easy_chat.s

@@ -214,7 +214,7 @@ _0811A72C:
 	ldr r4, =gStringVar3
 	adds r0, r4, 0
 	movs r1, 0x2
-	bl sub_811F88C
+	bl InitializeEasyChatWordArray
 	b _0811A7C2
 	.pool
 _0811A73C:
@@ -3353,7 +3353,7 @@ sub_811BDF0: @ 811BDF0
 	ldrb r2, [r0]
 	mov r0, sp
 	adds r1, r5, 0
-	bl sub_81DB5E8
+	bl TVShowConvertInternationalString
 	movs r0, 0
 	mov r1, sp
 	bl sub_81AFC0C
@@ -9563,7 +9563,7 @@ _0811EF48:
 	adds r1, r5, 0
 	bl ConvertEasyChatWordsToString
 	adds r0, r4, 0
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 _0811EF58:
 	pop {r4,r5}
 	pop {r0}
@@ -10758,8 +10758,8 @@ _0811F886:
 	bx r1
 	thumb_func_end sub_811F860
 
-	thumb_func_start sub_811F88C
+	thumb_func_start InitializeEasyChatWordArray
-sub_811F88C: @ 811F88C
+InitializeEasyChatWordArray: @ 811F88C
 	push {lr}
 	adds r2, r0, 0
 	lsls r1, 16
@@ -10782,7 +10782,7 @@ _0811F8AE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_811F88C
+	thumb_func_end InitializeEasyChatWordArray
 
 	thumb_func_start sub_811F8BC
 sub_811F8BC: @ 811F8BC

asm/evolution_scene.s

@@ -68,7 +68,7 @@ _0813DA00:
 	adds r1, r4, 0
 	adds r2, r5, 0
 	adds r3, r6, 0
-	bl evolution_cutscene
+	bl EvolutionScene
 _0813DA30:
 	add sp, 0x4
 	pop {r4-r7}
@@ -77,8 +77,8 @@ _0813DA30:
 	.pool
 	thumb_func_end sub_813D9C0
 
-	thumb_func_start sub_813DA40
+	thumb_func_start BeginEvolutionScene
-sub_813DA40: @ 813DA40
+BeginEvolutionScene: @ 813DA40
 	push {r4-r6,lr}
 	adds r4, r1, 0
 	adds r5, r2, 0
@@ -110,10 +110,10 @@ sub_813DA40: @ 813DA40
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_813DA40
+	thumb_func_end BeginEvolutionScene
 
-	thumb_func_start evolution_cutscene
+	thumb_func_start EvolutionScene
-evolution_cutscene: @ 813DA8C
+EvolutionScene: @ 813DA8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -165,32 +165,32 @@ evolution_cutscene: @ 813DA8C
 	movs r1, 0
 	bl SetGpuReg
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r2, 0
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r2, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r2, [r0]
-	ldr r1, =gUnknown_02022E20
+	ldr r1, =gBattle_BG3_X
 	movs r2, 0x80
 	lsls r2, 1
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	movs r1, 0
 	strh r1, [r0]
-	ldr r1, =gUnknown_02022FF0
+	ldr r1, =gBattleTerrain
 	movs r0, 0x9
 	strb r0, [r1]
-	bl c2_berry_program_update_menu
+	bl sub_80356D0
-	bl sub_8035AA4
+	bl LoadBattleTextboxAndBackground
 	bl ResetSpriteData
 	bl remove_some_task
 	bl ResetTasks
@@ -202,7 +202,7 @@ evolution_cutscene: @ 813DA8C
 	bl AllocZeroed
 	ldr r1, =gUnknown_0203AB80
 	str r0, [r1]
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	adds r0, r4, 0
 	movs r1, 0x2
 	mov r2, sp
@@ -235,7 +235,7 @@ evolution_cutscene: @ 813DA8C
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r2, =gBattleSpritesGfx
+	ldr r2, =gMonSpritesGfxPtr
 	ldr r1, [r2]
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
@@ -291,7 +291,7 @@ evolution_cutscene: @ 813DA8C
 	lsls r0, r1, 3
 	ldr r2, =gMonFrontPicTable
 	adds r0, r2
-	ldr r2, =gBattleSpritesGfx
+	ldr r2, =gMonSpritesGfxPtr
 	ldr r1, [r2]
 	ldr r1, [r1, 0x10]
 	mov r2, r10
@@ -393,7 +393,7 @@ evolution_cutscene: @ 813DA8C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end evolution_cutscene
+	thumb_func_end EvolutionScene
 
 	thumb_func_start sub_813DD7C
 sub_813DD7C: @ 813DD7C
@@ -460,30 +460,30 @@ sub_813DD7C: @ 813DD7C
 	movs r1, 0
 	bl SetGpuReg
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r4, [r0]
-	ldr r1, =gUnknown_02022E20
+	ldr r1, =gBattle_BG3_X
 	movs r2, 0x80
 	lsls r2, 1
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
-	ldr r1, =gUnknown_02022FF0
+	ldr r1, =gBattleTerrain
 	movs r0, 0x9
 	strb r0, [r1]
-	bl c2_berry_program_update_menu
+	bl sub_80356D0
-	bl sub_8035AA4
+	bl LoadBattleTextboxAndBackground
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	ldr r1, =gReservedSpritePaletteCount
@@ -492,7 +492,7 @@ sub_813DD7C: @ 813DD7C
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	adds r2, r5, 0
@@ -629,25 +629,25 @@ _0813DFE0:
 	ldr r1, =gReservedSpritePaletteCount
 	movs r0, 0x4
 	strb r0, [r1]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r1, [r0]
-	ldr r2, =gUnknown_02022E20
+	ldr r2, =gBattle_BG3_X
 	movs r3, 0x80
 	lsls r3, 1
 	adds r0, r3, 0
 	strh r0, [r2]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r1, [r0]
 	b _0813E180
 	.pool
@@ -697,7 +697,7 @@ _0813E0A8:
 	lsls r0, r6, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x10]
 	adds r2, r6, 0
@@ -867,7 +867,7 @@ sub_813E1D4: @ 813E1D4
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
@@ -941,24 +941,24 @@ sub_813E1D4: @ 813E1D4
 	mov r1, sp
 	ldrh r1, [r1, 0x14]
 	strh r1, [r0, 0x1C]
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r4, [r0]
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	strh r4, [r0]
-	ldr r1, =gUnknown_02022E20
+	ldr r1, =gBattle_BG3_X
 	movs r2, 0x80
 	lsls r2, 1
 	adds r0, r2, 0
 	strh r0, [r1]
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	strh r4, [r0]
 	ldr r2, =gTextFlags
 	ldrb r0, [r2]
@@ -1338,7 +1338,7 @@ _0813E6E4:
 	bl StringExpandPlaceholders
 	adds r0, r4, 0
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r2, r8
 	adds r1, r2, r7
@@ -1626,7 +1626,7 @@ _0813E99E:
 	bl StringExpandPlaceholders
 	adds r0, r4, 0
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =0x00000173
 	bl PlayBGM
 	ldr r2, =gTasks
@@ -1775,7 +1775,7 @@ _0813EAF6:
 _0813EB06:
 	adds r0, r7, 0
 	bl DestroyTask
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 	ldr r4, =gUnknown_0203AB80
 	ldr r0, [r4]
 	bl Free
@@ -1868,7 +1868,7 @@ _0813EBE4:
 _0813EBEC:
 	ldr r0, =gStringVar4
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gTasks
 	mov r2, r8
 	adds r0, r2, r7
@@ -1892,15 +1892,15 @@ _0813EC1E:
 	beq _0813EC2A
 	b _0813F1A4
 _0813EC2A:
-	bl sub_804F574
+	bl BufferMoveToLearnIntoBattleTextBuff2
 	ldr r0, =0x0000016f
 	bl PlayFanfare
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0xC]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r3, r8
 	adds r1, r3, r7
@@ -1991,13 +1991,13 @@ _0813ED0A:
 	beq _0813ED16
 	b _0813F1A4
 _0813ED16:
-	bl sub_804F574
+	bl BufferMoveToLearnIntoBattleTextBuff2
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x10]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r2, r8
 	adds r1, r2, r7
@@ -2023,10 +2023,10 @@ _0813ED56:
 _0813ED62:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x14]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r3, r8
 	adds r1, r3, r7
@@ -2048,10 +2048,10 @@ _0813ED90:
 	bne _0813EDCE
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x18]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r2, r8
 	adds r1, r2, r7
@@ -2087,7 +2087,7 @@ _0813EDEA:
 	bl sub_8056A3C
 	ldr r0, =gText_BattleYesNoChoice
 	movs r1, 0xC
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r3, r8
 	adds r1, r3, r7
@@ -2100,7 +2100,7 @@ _0813EDEA:
 	ldr r0, =gBattleCommunication
 	strb r2, [r0, 0x1]
 	movs r0, 0
-	bl sub_8056B74
+	bl BattleCreateCursorAt
 	b _0813F1A4
 	.pool
 _0813EE34:
@@ -2117,10 +2117,10 @@ _0813EE34:
 	movs r0, 0x5
 	bl PlaySE
 	ldrb r0, [r4, 0x1]
-	bl sub_8056BAC
+	bl BattleDestroyCursorAt
 	movs r0, 0
 	strb r0, [r4, 0x1]
-	bl sub_8056B74
+	bl BattleCreateCursorAt
 _0813EE5C:
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -2135,10 +2135,10 @@ _0813EE5C:
 	movs r0, 0x5
 	bl PlaySE
 	ldrb r0, [r4, 0x1]
-	bl sub_8056BAC
+	bl BattleDestroyCursorAt
 	movs r0, 0x1
 	strb r0, [r4, 0x1]
-	bl sub_8056B74
+	bl BattleCreateCursorAt
 _0813EE84:
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -2289,10 +2289,10 @@ _0813EFC8:
 	ldr r3, =0x000004cc
 	adds r0, r3
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gTasks
 	mov r2, r8
 	adds r0, r2, r7
@@ -2338,10 +2338,10 @@ _0813F05C:
 	lsls r1, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r2, r8
 	adds r1, r2, r7
@@ -2367,10 +2367,10 @@ _0813F09E:
 _0813F0AA:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x1C]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r0, =gTasks
 	mov r3, r8
 	adds r1, r3, r7
@@ -2395,10 +2395,10 @@ _0813F0D8:
 	lsls r1, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gTasks
 	mov r2, r8
 	adds r0, r2, r7
@@ -2411,10 +2411,10 @@ _0813F0D8:
 _0813F120:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x20]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gTasks
 	mov r3, r8
 	adds r0, r3, r7
@@ -2431,10 +2431,10 @@ _0813F120:
 _0813F154:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x24]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
 	movs r1, 0
-	bl battle_show_message_maybe
+	bl sub_814F9EC
 	ldr r1, =gTasks
 	mov r2, r8
 	adds r0, r2, r7
@@ -3059,12 +3059,12 @@ _0813F756:
 	beq _0813F762
 	b _0813FCC4
 _0813F762:
-	bl sub_804F574
+	bl BufferMoveToLearnIntoBattleTextBuff2
 	ldr r0, =0x0000016f
 	bl PlayFanfare
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0xC]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3160,10 +3160,10 @@ _0813F846:
 	beq _0813F852
 	b _0813FCC4
 _0813F852:
-	bl sub_804F574
+	bl BufferMoveToLearnIntoBattleTextBuff2
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x10]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3193,7 +3193,7 @@ _0813F892:
 _0813F89E:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x14]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3219,7 +3219,7 @@ _0813F8CC:
 	bne _0813F90C
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x18]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3299,7 +3299,7 @@ _0813F98C:
 	lsls r1, 3
 	adds r0, r1
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3336,7 +3336,7 @@ _0813F9E4:
 	lsls r1, 3
 	adds r0, r1
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3441,7 +3441,7 @@ _0813FAEC:
 	ldr r1, =0x000004cc
 	adds r0, r1
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3481,7 +3481,7 @@ _0813FB3C:
 	lsls r1, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3511,7 +3511,7 @@ _0813FBB2:
 _0813FBBE:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x1C]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3540,7 +3540,7 @@ _0813FBEC:
 	lsls r1, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3557,7 +3557,7 @@ _0813FBEC:
 _0813FC38:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x20]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3578,7 +3578,7 @@ _0813FC38:
 _0813FC70:
 	ldr r0, =gBattleStringsTable
 	ldr r0, [r0, 0x24]
-	bl StrCpyDecodeToDisplayedStringBattle
+	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r1, =gDisplayedStringBattle
 	movs r0, 0
 	movs r2, 0x1
@@ -3630,35 +3630,35 @@ nullsub_83: @ 813FCD8
 	thumb_func_start sub_813FCDC
 sub_813FCDC: @ 813FCDC
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	ldrh r1, [r0]
 	movs r0, 0x14
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	ldrh r1, [r0]
 	movs r0, 0x16
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	ldrh r1, [r0]
 	movs r0, 0x18
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	ldrh r1, [r0]
 	movs r0, 0x1A
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E20
+	ldr r0, =gBattle_BG3_X
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
@@ -3674,35 +3674,35 @@ sub_813FCDC: @ 813FCDC
 	thumb_func_start sub_813FD64
 sub_813FD64: @ 813FD64
 	push {lr}
-	ldr r0, =gUnknown_02022E14
+	ldr r0, =gBattle_BG0_X
 	ldrh r1, [r0]
 	movs r0, 0x10
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E16
+	ldr r0, =gBattle_BG0_Y
 	ldrh r1, [r0]
 	movs r0, 0x12
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	ldrh r1, [r0]
 	movs r0, 0x14
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	ldrh r1, [r0]
 	movs r0, 0x16
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	ldrh r1, [r0]
 	movs r0, 0x18
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E1E
+	ldr r0, =gBattle_BG2_Y
 	ldrh r1, [r0]
 	movs r0, 0x1A
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E20
+	ldr r0, =gBattle_BG3_X
 	ldrh r1, [r0]
 	movs r0, 0x1C
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E22
+	ldr r0, =gBattle_BG3_Y
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
@@ -3852,9 +3852,9 @@ sub_813FEE8: @ 813FEE8
 	push {r6,r7}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	mov r8, r0
-	ldr r1, =gUnknown_02022E1A
+	ldr r1, =gBattle_BG1_Y
 	mov r9, r1
 	ldr r1, =gTasks
 	lsls r0, r5, 2
@@ -3865,13 +3865,13 @@ sub_813FEE8: @ 813FEE8
 	ldrsh r0, [r0, r2]
 	cmp r0, 0
 	bne _0813FF28
-	ldr r7, =gUnknown_02022E1C
+	ldr r7, =gBattle_BG2_X
-	ldr r6, =gUnknown_02022E1E
+	ldr r6, =gBattle_BG2_Y
 	b _0813FF2C
 	.pool
 _0813FF28:
-	ldr r7, =gUnknown_02022E20
+	ldr r7, =gBattle_BG3_X
-	ldr r6, =gUnknown_02022E22
+	ldr r6, =gBattle_BG3_Y
 _0813FF2C:
 	lsls r4, r5, 2
 	adds r4, r5
@@ -4130,12 +4130,12 @@ sub_8140174: @ 8140174
 	movs r0, 0x50
 	movs r1, 0
 	bl SetGpuReg
-	ldr r0, =gUnknown_02022E18
+	ldr r0, =gBattle_BG1_X
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1A
+	ldr r0, =gBattle_BG1_Y
 	strh r1, [r0]
-	ldr r0, =gUnknown_02022E1C
+	ldr r0, =gBattle_BG2_X
 	strh r1, [r0]
 	movs r0, 0x1
 	movs r1, 0x5

asm/field_control_avatar.s

@@ -51,7 +51,7 @@ process_overworld_input: @ 809BF08
 	bl cur_mapdata_block_role_at_player_pos
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_808904C
+	bl MetatileBehavior_IsMoveTile
 	lsls r0, 24
 	lsrs r7, r0, 24
 	cmp r6, 0x2
@@ -831,7 +831,7 @@ _0809C55C:
 	.pool
 _0809C574:
 	adds r0, r5, 0
-	bl is_tile_x8B
+	bl MetatileBehavior_IsClosedSootopolisGymDoor
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -841,7 +841,7 @@ _0809C574:
 	.pool
 _0809C58C:
 	adds r0, r5, 0
-	bl is_tile_xEA
+	bl MetatileBehavior_IsUnknownClosedDoor
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -851,7 +851,7 @@ _0809C58C:
 	.pool
 _0809C5A4:
 	adds r0, r5, 0
-	bl is_tile_x84
+	bl MetatileBehavior_IsCableBoxResults1
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -859,7 +859,7 @@ _0809C5A4:
 	b _0809C6E4
 _0809C5B4:
 	adds r0, r5, 0
-	bl is_tile_x87
+	bl MetatileBehavior_IsPokeblockFeeder
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -869,7 +869,7 @@ _0809C5B4:
 	.pool
 _0809C5CC:
 	adds r0, r5, 0
-	bl is_tile_x8C
+	bl MetatileBehavior_IsTrickHousePuzzleDoor
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -879,7 +879,7 @@ _0809C5CC:
 	.pool
 _0809C5E4:
 	adds r0, r5, 0
-	bl is_tile_x85
+	bl MetatileBehavior_IsRegionMap
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -889,7 +889,7 @@ _0809C5E4:
 	.pool
 _0809C5FC:
 	adds r0, r5, 0
-	bl sub_8089A1C
+	bl MetatileBehavior_IsRunningShoesInstruction
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -899,7 +899,7 @@ _0809C5FC:
 	.pool
 _0809C614:
 	adds r0, r5, 0
-	bl sub_8089A30
+	bl MetatileBehavior_IsPictureBookShelf
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -909,7 +909,7 @@ _0809C614:
 	.pool
 _0809C62C:
 	adds r0, r5, 0
-	bl sub_8089A44
+	bl MetatileBehavior_IsBookShelf
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -919,7 +919,7 @@ _0809C62C:
 	.pool
 _0809C644:
 	adds r0, r5, 0
-	bl sub_8089A58
+	bl MetatileBehavior_IsPokeCenterBookShelf
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -929,7 +929,7 @@ _0809C644:
 	.pool
 _0809C65C:
 	adds r0, r5, 0
-	bl sub_8089A6C
+	bl MetatileBehavior_IsVase
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -939,7 +939,7 @@ _0809C65C:
 	.pool
 _0809C674:
 	adds r0, r5, 0
-	bl sub_8089A80
+	bl MetatileBehavior_IsTrashCan
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -949,7 +949,7 @@ _0809C674:
 	.pool
 _0809C68C:
 	adds r0, r5, 0
-	bl sub_8089A94
+	bl MetatileBehavior_IsShopShelf
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -959,7 +959,7 @@ _0809C68C:
 	.pool
 _0809C6A4:
 	adds r0, r5, 0
-	bl sub_8089AA8
+	bl MetatileBehavior_IsBlueprint
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -970,7 +970,7 @@ _0809C6A4:
 _0809C6BC:
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl sub_8089AD0
+	bl MetatileBehavior_IsPlayerFacingWirelessBoxResults
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -981,7 +981,7 @@ _0809C6BC:
 _0809C6D4:
 	adds r0, r5, 0
 	adds r1, r4, 0
-	bl sub_8089AEC
+	bl MetatileBehavior_IsCableBoxResults2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1023,7 +1023,7 @@ _0809C71C:
 	cmp r4, r0
 	bne _0809C7D0
 	adds r0, r5, 0
-	bl sub_8089288
+	bl MetatileBehavior_IsSecretBasePC
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1033,7 +1033,7 @@ _0809C71C:
 	.pool
 _0809C74C:
 	adds r0, r5, 0
-	bl sub_808929C
+	bl MetatileBehavior_IsSecretBaseRegisterPC
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1043,7 +1043,7 @@ _0809C74C:
 	.pool
 _0809C764:
 	adds r0, r5, 0
-	bl sub_80893DC
+	bl MetatileBehavior_IsMB_BF
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1053,7 +1053,7 @@ _0809C764:
 	.pool
 _0809C77C:
 	adds r0, r5, 0
-	bl sub_80893F0
+	bl MetatileBehavior_IsSecretBaseTvOrShield
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1063,7 +1063,7 @@ _0809C77C:
 	.pool
 _0809C794:
 	adds r0, r5, 0
-	bl sub_80892EC
+	bl MetatileBehavior_IsMB_C6
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1072,7 +1072,7 @@ _0809C794:
 	b _0809C7E2
 _0809C7A8:
 	adds r0, r5, 0
-	bl sub_8089364
+	bl MetatileBehavior_IsMB_C3
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1081,7 +1081,7 @@ _0809C7A8:
 	b _0809C7E2
 _0809C7BC:
 	adds r0, r5, 0
-	bl sub_8089350
+	bl MetatileBehavior_IsMB_B5
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1090,7 +1090,7 @@ _0809C7BC:
 	b _0809C7E2
 _0809C7D0:
 	adds r0, r5, 0
-	bl sub_8089300
+	bl MetatileBehavior_IsSecretBasePoster
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1297,7 +1297,7 @@ sub_809C96C: @ 809C96C
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8089918
+	bl MetatileBehavior_IsCrackedFloorHole
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809C988
@@ -1306,7 +1306,7 @@ sub_809C96C: @ 809C96C
 	.pool
 _0809C988:
 	adds r0, r4, 0
-	bl sub_8089ABC
+	bl MetatileBehavior_IsBattlePyramidWarp
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809C9A4
@@ -1318,7 +1318,7 @@ _0809C996:
 	.pool
 _0809C9A4:
 	adds r0, r4, 0
-	bl sub_80893C8
+	bl MetatileBehavior_IsSecretBaseGlitterMat
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1327,7 +1327,7 @@ _0809C9A4:
 	b _0809C9E8
 _0809C9B8:
 	adds r0, r4, 0
-	bl sub_80893B4
+	bl MetatileBehavior_IsSecretBaseSoundMat
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1376,7 +1376,7 @@ _0809CA04:
 	bne _0809CAF8
 	lsls r0, r4, 24
 	lsrs r0, 24
-	bl sub_808904C
+	bl MetatileBehavior_IsMoveTile
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809CAF8
@@ -1411,7 +1411,7 @@ _0809CA64:
 	b _0809CB28
 	.pool
 _0809CA7C:
-	bl sub_8179A04
+	bl ShouldDoBrailleRegicePuzzle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1467,7 +1467,7 @@ _0809CAF8:
 	cmp r0, 0x1
 	beq _0809CB28
 	movs r0, 0x1
-	bl sub_8137FC0
+	bl CountSSTidalStep
 	cmp r0, 0x1
 	bne _0809CB1C
 	ldr r0, =gUnknown_0823C050
@@ -1719,7 +1719,7 @@ sub_809CC9C: @ 809CC9C
 	.pool
 _0809CCF8:
 	adds r0, r4, 0
-	bl sub_8089870
+	bl MetatileBehavior_IsLavaridgeB1FWarp
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1729,7 +1729,7 @@ _0809CCF8:
 	b _0809CD8C
 _0809CD0E:
 	adds r0, r4, 0
-	bl is_role_x68
+	bl MetatileBehavior_IsLavaridge1FWarp
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1749,7 +1749,7 @@ _0809CD24:
 	b _0809CD8C
 _0809CD3A:
 	adds r0, r4, 0
-	bl sub_80898AC
+	bl MetatileBehavior_IsWarpOrBridge
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1759,7 +1759,7 @@ _0809CD3A:
 	b _0809CD8C
 _0809CD50:
 	adds r0, r4, 0
-	bl sub_8089904
+	bl MetatileBehavior_IsMtPyreHole
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1771,7 +1771,7 @@ _0809CD50:
 	.pool
 _0809CD6C:
 	adds r0, r4, 0
-	bl sub_80898C0
+	bl MetatileBehavior_IsMossdeepGymWarp
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1797,7 +1797,7 @@ is_warp_tile: @ 809CD94
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl is_tile_x69_2_warp_door
+	bl MetatileBehavior_IsWarpDoor
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1815,19 +1815,19 @@ is_warp_tile: @ 809CD94
 	cmp r0, 0x1
 	beq _0809CE2A
 	adds r0, r4, 0
-	bl sub_8088F58
+	bl MetatileBehavior_IsNonAnimDoor
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _0809CE2A
 	adds r0, r4, 0
-	bl sub_8089870
+	bl MetatileBehavior_IsLavaridgeB1FWarp
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _0809CE2A
 	adds r0, r4, 0
-	bl is_role_x68
+	bl MetatileBehavior_IsLavaridge1FWarp
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1839,19 +1839,19 @@ is_warp_tile: @ 809CD94
 	cmp r0, 0x1
 	beq _0809CE2A
 	adds r0, r4, 0
-	bl sub_8089904
+	bl MetatileBehavior_IsMtPyreHole
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _0809CE2A
 	adds r0, r4, 0
-	bl sub_80898C0
+	bl MetatileBehavior_IsMossdeepGymWarp
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _0809CE2A
 	adds r0, r4, 0
-	bl sub_80898AC
+	bl MetatileBehavior_IsWarpOrBridge
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2048,7 +2048,7 @@ map_warp_consider_2_to_inside: @ 809CF78
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8089210
+	bl MetatileBehavior_IsSecretBaseOpen
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2062,7 +2062,7 @@ map_warp_consider_2_to_inside: @ 809CF78
 	.pool
 _0809CFB0:
 	adds r0, r4, 0
-	bl is_tile_x69_2_warp_door
+	bl MetatileBehavior_IsWarpDoor
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2322,7 +2322,7 @@ dive_warp: @ 809D16C
 	bne _0809D1A4
 	lsls r0, r5, 24
 	lsrs r0, 24
-	bl sub_80895D0
+	bl MetatileBehavior_IsUnableToEmerge
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809D1A4
@@ -2340,7 +2340,7 @@ dive_warp: @ 809D16C
 _0809D1A4:
 	lsls r0, r5, 24
 	lsrs r0, 24
-	bl sub_80895B0
+	bl MetatileBehavior_IsDiveable
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2394,7 +2394,7 @@ sub_809D1E8: @ 809D1E8
 	cmp r0, 0x5
 	bne _0809D244
 	adds r0, r5, 0
-	bl sub_80895D0
+	bl MetatileBehavior_IsUnableToEmerge
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809D244
@@ -2417,7 +2417,7 @@ sub_809D1E8: @ 809D1E8
 	.pool
 _0809D244:
 	adds r0, r5, 0
-	bl sub_80895B0
+	bl MetatileBehavior_IsDiveable
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/field_door.s

@@ -581,15 +581,15 @@ sub_808A83C: @ 808A83C
 	.pool
 	thumb_func_end sub_808A83C
 
-	thumb_func_start sub_808A854
+	thumb_func_start FieldSetDoorOpened
-sub_808A854: @ 808A854
+FieldSetDoorOpened: @ 808A854
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
 	bl MapGridGetMetatileBehaviorAt
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8088EFC
+	bl MetatileBehavior_IsDoor
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808A876
@@ -602,17 +602,17 @@ _0808A876:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_808A854
+	thumb_func_end FieldSetDoorOpened
 
-	thumb_func_start sub_808A880
+	thumb_func_start FieldSetDoorClosed
-sub_808A880: @ 808A880
+FieldSetDoorClosed: @ 808A880
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
 	bl MapGridGetMetatileBehaviorAt
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8088EFC
+	bl MetatileBehavior_IsDoor
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808A8A2
@@ -625,17 +625,17 @@ _0808A8A2:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_808A880
+	thumb_func_end FieldSetDoorClosed
 
-	thumb_func_start sub_808A8AC
+	thumb_func_start FieldAnimateDoorClose
-sub_808A8AC: @ 808A8AC
+FieldAnimateDoorClose: @ 808A8AC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
 	bl MapGridGetMetatileBehaviorAt
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8088EFC
+	bl MetatileBehavior_IsDoor
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808A8D8
@@ -654,17 +654,17 @@ _0808A8DC:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_808A8AC
+	thumb_func_end FieldAnimateDoorClose
 
-	thumb_func_start task_overworld_door_add_if_role_69_for_opening_door_at
+	thumb_func_start FieldAnimateDoorOpen
-task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4
+FieldAnimateDoorOpen: @ 808A8E4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
 	bl MapGridGetMetatileBehaviorAt
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8088EFC
+	bl MetatileBehavior_IsDoor
 	lsls r0, 24
 	cmp r0, 0
 	beq _0808A910
@@ -683,10 +683,10 @@ _0808A914:
 	pop {r4,r5}
 	pop {r1}
 	bx r1
-	thumb_func_end task_overworld_door_add_if_role_69_for_opening_door_at
+	thumb_func_end FieldAnimateDoorOpen
 
-	thumb_func_start sub_808A91C
+	thumb_func_start FieldIsDoorAnimationRunning
-sub_808A91C: @ 808A91C
+FieldIsDoorAnimationRunning: @ 808A91C
 	push {lr}
 	ldr r0, =task50_overworld_door
 	bl FuncIsActiveTask
@@ -695,10 +695,10 @@ sub_808A91C: @ 808A91C
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_808A91C
+	thumb_func_end FieldIsDoorAnimationRunning
 
-	thumb_func_start cur_mapdata_get_door_sound_at
+	thumb_func_start GetDoorSoundEffect
-cur_mapdata_get_door_sound_at: @ 808A930
+GetDoorSoundEffect: @ 808A930
 	push {lr}
 	adds r3, r0, 0
 	adds r2, r1, 0
@@ -725,7 +725,7 @@ _0808A95C:
 _0808A95E:
 	pop {r1}
 	bx r1
-	thumb_func_end cur_mapdata_get_door_sound_at
+	thumb_func_end GetDoorSoundEffect
 
 	thumb_func_start sub_808A964
 sub_808A964: @ 808A964

asm/field_effect.s

@@ -1989,7 +1989,7 @@ task00_8084310: @ 80B6A24
 	cmp r0, 0
 	beq _080B6A8A
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -2100,7 +2100,7 @@ _080B6B3E:
 	cmp r0, 0
 	bne _080B6B58
 	bl ScriptContext2_Disable
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	adds r0, r5, 0
 	bl DestroyTask
 _080B6B58:
@@ -2459,7 +2459,7 @@ sub_80B6E18: @ 80B6E18
 	strb r0, [r1, 0x6]
 	bl ScriptContext2_Disable
 	bl CameraObjectReset1
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	bl InstallCameraPanAheadCallback
 	ldr r0, =sub_80B6B94
 	bl FindTaskIdByFunc
@@ -3111,7 +3111,7 @@ oei_waterfall: @ 80B734C
 	adds r1, r0
 	lsls r1, 3
 	adds r1, r2
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	ldr r2, [r2]
 	strh r2, [r1, 0xA]
 	bl _call_via_r4
@@ -3188,7 +3188,7 @@ waterfall_1_do_anim_probably: @ 80B73F0
 	bne _080B7420
 	adds r0, r5, 0
 	bl FieldObjectClearAnimIfSpecialAnimFinished
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0xA
 	ldrsh r0, [r4, r2]
 	str r0, [r1]
@@ -3304,7 +3304,7 @@ sub_80B74D0: @ 80B74D0
 	adds r1, r0
 	lsls r1, 3
 	adds r1, r2
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	ldr r2, [r3]
 	strh r2, [r1, 0x26]
 	ldr r2, [r3, 0x4]
@@ -3363,7 +3363,7 @@ dive_2_unknown: @ 80B7558
 	push {r4,lr}
 	adds r4, r0, 0
 	bl ScriptContext2_Enable
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0x26
 	ldrsh r0, [r4, r2]
 	str r0, [r1]
@@ -3536,7 +3536,7 @@ sub_80B76B8: @ 80B76B8
 	strh r0, [r2, 0x26]
 	movs r0, 0x1
 	strh r0, [r4, 0xE]
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r5, 0x10
 	ldrsh r0, [r1, r5]
 	str r0, [r3]
@@ -3835,7 +3835,7 @@ sub_80B791C: @ 80B791C
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B795C
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r0, [r5, r2]
 	str r0, [r1]
@@ -3919,7 +3919,7 @@ sub_80B79BC: @ 80B79BC
 	movs r0, 0
 	strb r0, [r1, 0x6]
 	bl ScriptContext2_Disable
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	ldr r0, =sub_80B7890
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -3935,7 +3935,7 @@ _080B79E6:
 	thumb_func_start sub_80B79F4
 sub_80B79F4: @ 80B79F4
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -4090,7 +4090,7 @@ sub_80B7B18: @ 80B7B18
 	ldrsh r0, [r5, r2]
 	cmp r0, 0x3
 	ble _080B7B6C
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r0, [r4, r2]
 	str r0, [r1]
@@ -4222,7 +4222,7 @@ _080B7C2C:
 	thumb_func_start sub_80B7C48
 sub_80B7C48: @ 80B7C48
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -4583,7 +4583,7 @@ _080B7F32:
 	ands r0, r1
 	strb r0, [r6, 0x1]
 	bl ScriptContext2_Disable
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	ldr r0, =sub_80B7E94
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -5194,7 +5194,7 @@ sub_80B8410: @ 80B8410
 	bne _080B8484
 	bl ScriptContext2_Disable
 	bl CameraObjectReset1
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	ldr r0, =sub_80B8250
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -5229,7 +5229,7 @@ _080B84BE:
 	bl CreateTask
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	ldr r0, [r2]
 	ldr r1, [r2, 0x4]
 	ldr r2, [r2, 0x8]
@@ -5252,7 +5252,7 @@ _080B84BE:
 	thumb_func_start sub_80B84F8
 sub_80B84F8: @ 80B84F8
 	push {r4-r6,lr}
-	ldr r5, =gFieldEffectSpawnParams
+	ldr r5, =gFieldEffectArguments
 	ldr r0, [r5]
 	movs r6, 0x80
 	lsls r6, 24
@@ -6292,12 +6292,12 @@ sub_80B8D44: @ 80B8D44
 	adds r1, r0
 	lsls r1, 3
 	adds r1, r2
-	ldr r0, =gFieldEffectSpawnParams
+	ldr r0, =gFieldEffectArguments
 	ldr r0, [r0]
 	strh r0, [r1, 0x26]
 	bl sav1_reset_battle_music_maybe
 	ldr r0, =0x0000016d
-	bl sub_80858C4
+	bl Overworld_ChangeMusicTo
 	movs r0, 0
 	pop {r1}
 	bx r1
@@ -6421,7 +6421,7 @@ sub_80B8E60: @ 80B8E60
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B8E96
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	movs r1, 0x26
 	ldrsh r0, [r4, r1]
 	movs r1, 0x80
@@ -6473,7 +6473,7 @@ sub_80B8EA8: @ 80B8EA8
 	lsrs r1, 24
 	adds r0, r4, 0
 	bl FieldObjectSetSpecialAnim
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0xA
 	ldrsh r0, [r6, r2]
 	str r0, [r1]
@@ -6527,7 +6527,7 @@ sub_80B8F24: @ 80B8F24
 	ldrb r0, [r4, 0x1A]
 	movs r1, 0x1
 	bl sub_81555AC
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	bl ScriptContext2_Disable
 	movs r0, 0x9
 	bl FieldEffectActiveListRemove
@@ -6704,7 +6704,7 @@ sub_80B90CC: @ 80B90CC
 	strb r0, [r2, 0x5]
 	ldr r0, =sub_80B9128
 	str r0, [r2, 0x1C]
-	ldr r0, =gFieldEffectSpawnParams
+	ldr r0, =gFieldEffectArguments
 	ldr r0, [r0]
 	strh r0, [r2, 0x30]
 	movs r0, 0x9E
@@ -6793,7 +6793,7 @@ sub_80B91A4: @ 80B91A4
 	adds r1, r0
 	lsls r1, 3
 	adds r1, r2
-	ldr r0, =gFieldEffectSpawnParams
+	ldr r0, =gFieldEffectArguments
 	ldr r0, [r0]
 	strh r0, [r1, 0xA]
 	movs r0, 0
@@ -6884,7 +6884,7 @@ sub_80B925C: @ 80B925C
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0xA
 	ldrsh r0, [r4, r2]
 	str r0, [r1]
@@ -7922,7 +7922,7 @@ _080B9ACA:
 sub_80B9ADC: @ 80B9ADC
 	push {r4,lr}
 	sub sp, 0x4
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldrb r0, [r4]
 	ldrb r1, [r4, 0x4]
 	ldrb r2, [r4, 0x8]
@@ -8343,7 +8343,7 @@ _080B9E24:
 sub_80B9E28: @ 80B9E28
 	push {r4-r7,lr}
 	sub sp, 0x4
-	ldr r7, =gFieldEffectSpawnParams
+	ldr r7, =gFieldEffectArguments
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]

asm/field_effect_helpers.s

@@ -130,13 +130,13 @@ npc_pal_op: @ 8153FAC
 	cmp r0, 0
 	bne _08154008
 	ldrb r0, [r5, 0x1F]
-	bl sub_80894D4
+	bl MetatileBehavior_GetBridgeSth
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
 	bne _08153FEE
 	ldrb r0, [r5, 0x1E]
-	bl sub_80894D4
+	bl MetatileBehavior_GetBridgeSth
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -574,7 +574,7 @@ _0815432E:
 	thumb_func_start oei_shadow
 oei_shadow: @ 8154340
 	push {r4,r5,lr}
-	ldr r5, =gFieldEffectSpawnParams
+	ldr r5, =gFieldEffectArguments
 	ldrb r0, [r5]
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
@@ -702,7 +702,7 @@ _08154412:
 	cmp r0, r1
 	bne _08154490
 	ldrb r0, [r4, 0x1E]
-	bl sub_8088E64
+	bl MetatileBehavior_IsPokeGrass
 	lsls r0, 24
 	cmp r0, 0
 	bne _08154490
@@ -742,7 +742,7 @@ _08154498:
 oei_grass_normal: @ 81544AC
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r5, =gFieldEffectSpawnParams
+	ldr r5, =gFieldEffectArguments
 	ldrh r1, [r5]
 	mov r0, sp
 	strh r1, [r0]
@@ -951,7 +951,7 @@ _08154648:
 	thumb_func_start sub_8154658
 sub_8154658: @ 8154658
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1080,7 +1080,7 @@ _0815474C:
 sub_8154758: @ 8154758
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r5, =gFieldEffectSpawnParams
+	ldr r5, =gFieldEffectArguments
 	ldrh r1, [r5]
 	mov r0, sp
 	strh r1, [r0]
@@ -1282,7 +1282,7 @@ _081548EA:
 	thumb_func_start sub_81548FC
 sub_81548FC: @ 81548FC
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1336,7 +1336,7 @@ _08154958:
 	thumb_func_start sub_815496C
 sub_815496C: @ 815496C
 	push {r4-r6,lr}
-	ldr r6, =gFieldEffectSpawnParams
+	ldr r6, =gFieldEffectArguments
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
@@ -1537,7 +1537,7 @@ _08154AF2:
 	thumb_func_start sub_8154B04
 sub_8154B04: @ 8154B04
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1591,7 +1591,7 @@ _08154B62:
 	thumb_func_start sub_8154B78
 sub_8154B78: @ 8154B78
 	push {r4,r5,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1646,7 +1646,7 @@ _08154BD8:
 	thumb_func_start sub_8154BEC
 sub_8154BEC: @ 8154BEC
 	push {r4,r5,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1777,7 +1777,7 @@ _08154CE4:
 	thumb_func_start sub_8154CEC
 sub_8154CEC: @ 8154CEC
 	push {r4-r6,lr}
-	ldr r6, =gFieldEffectSpawnParams
+	ldr r6, =gFieldEffectArguments
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
@@ -1922,7 +1922,7 @@ _08154E0A:
 	thumb_func_start sub_8154E1C
 sub_8154E1C: @ 8154E1C
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -1976,7 +1976,7 @@ _08154E78:
 	thumb_func_start oei_water_drop_tall
 oei_water_drop_tall: @ 8154E8C
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2030,7 +2030,7 @@ _08154EE8:
 	thumb_func_start sub_8154EFC
 sub_8154EFC: @ 8154EFC
 	push {r4-r7,lr}
-	ldr r7, =gFieldEffectSpawnParams
+	ldr r7, =gFieldEffectArguments
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
@@ -2193,7 +2193,7 @@ oei_ripples: @ 8155054
 	push {r4,lr}
 	ldr r0, =gFieldEffectObjectTemplatePointers
 	ldr r0, [r0, 0x14]
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	movs r2, 0
 	ldrsh r1, [r4, r2]
 	movs r3, 0x4
@@ -2238,7 +2238,7 @@ _081550A0:
 	thumb_func_start sub_81550B4
 sub_81550B4: @ 81550B4
 	push {r4-r6,lr}
-	ldr r6, =gFieldEffectSpawnParams
+	ldr r6, =gFieldEffectArguments
 	ldrb r0, [r6]
 	ldrb r1, [r6, 0x4]
 	ldrb r2, [r6, 0x8]
@@ -2393,7 +2393,7 @@ _081551E4:
 	thumb_func_start sub_81551F0
 sub_81551F0: @ 81551F0
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2445,7 +2445,7 @@ _08155248:
 	thumb_func_start sub_815525C
 sub_815525C: @ 815525C
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2497,7 +2497,7 @@ _081552B4:
 	thumb_func_start sub_81552C8
 sub_81552C8: @ 81552C8
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2549,7 +2549,7 @@ _08155320:
 	thumb_func_start sub_8155334
 sub_8155334: @ 8155334
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -2603,7 +2603,7 @@ ash: @ 81553A0
 	push {r4,lr}
 	lsls r2, 16
 	lsrs r2, 16
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	lsls r0, 16
 	asrs r0, 16
 	str r0, [r4]
@@ -2630,7 +2630,7 @@ ash: @ 81553A0
 oei_ash: @ 81553D4
 	push {r4,r5,lr}
 	sub sp, 0x4
-	ldr r5, =gFieldEffectSpawnParams
+	ldr r5, =gFieldEffectArguments
 	ldrh r1, [r5]
 	mov r0, sp
 	strh r1, [r0]
@@ -2809,7 +2809,7 @@ _0815552C:
 	thumb_func_start sub_8155534
 sub_8155534: @ 8155534
 	push {r4,r5,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -3261,7 +3261,7 @@ _08155888:
 	thumb_func_start sub_8155890
 sub_8155890: @ 8155890
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -3315,7 +3315,7 @@ _081558EC:
 	thumb_func_start sub_8155900
 sub_8155900: @ 8155900
 	push {r4-r7,lr}
-	ldr r7, =gFieldEffectSpawnParams
+	ldr r7, =gFieldEffectArguments
 	ldrb r0, [r7]
 	ldrb r1, [r7, 0x4]
 	ldrb r2, [r7, 0x8]
@@ -3505,7 +3505,7 @@ _08155A76:
 	thumb_func_start sub_8155A88
 sub_8155A88: @ 8155A88
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -3586,7 +3586,7 @@ _08155B20:
 	thumb_func_start sub_8155B2C
 sub_8155B2C: @ 8155B2C
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	adds r1, r4, 0x4
 	adds r0, r4, 0
 	movs r2, 0x8
@@ -3689,7 +3689,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
 	lsrs r6, r1, 24
 	lsls r2, 24
 	lsrs r7, r2, 24
-	ldr r5, =gFieldEffectSpawnParams
+	ldr r5, =gFieldEffectArguments
 	ldrb r0, [r5]
 	ldrb r1, [r5, 0x4]
 	ldrb r2, [r5, 0x8]
@@ -3950,7 +3950,7 @@ _08155DD8:
 	thumb_func_start sub_8155DDC
 sub_8155DDC: @ 8155DDC
 	push {r4,lr}
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldr r0, [r4]
 	adds r0, 0x7
 	str r0, [r4]

asm/field_ground_effect.s

@@ -1166,7 +1166,7 @@ _08096E8C:
 @ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_SpawnOnTallGrass: @ 8096E90
 	push {lr}
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r1, [r0, r2]
 	str r1, [r3]
@@ -1205,7 +1205,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
 @ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_StepOnTallGrass: @ 8096EDC
 	push {lr}
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r1, [r0, r2]
 	str r1, [r3]
@@ -1244,7 +1244,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
 @ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_SpawnOnLongGrass: @ 8096F28
 	push {lr}
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r1, [r0, r2]
 	str r1, [r3]
@@ -1283,7 +1283,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
 @ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_StepOnLongGrass: @ 8096F74
 	push {lr}
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r1, [r0, r2]
 	str r1, [r3]
@@ -1413,7 +1413,7 @@ DoTracksGroundEffect_Footprints: @ 8097044
 	mov r0, sp
 	movs r2, 0x4
 	bl memcpy
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0x14
 	ldrsh r0, [r5, r2]
 	str r0, [r1]
@@ -1449,7 +1449,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8097094
 	ldr r0, [r4, 0x14]
 	cmp r1, r0
 	beq _080970D6
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	movs r1, 0x14
 	ldrsh r0, [r4, r1]
 	str r0, [r2]
@@ -1520,7 +1520,7 @@ GroundEffect_JumpOnTallGrass: @ 8097110
 	sub sp, 0x4
 	adds r5, r0, 0
 	adds r6, r1, 0
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r0, [r5, r2]
 	str r0, [r1]
@@ -1562,7 +1562,7 @@ _0809715A:
 @ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_JumpOnLongGrass: @ 8097168
 	push {lr}
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	movs r3, 0x10
 	ldrsh r1, [r0, r3]
 	str r1, [r2]
@@ -1585,7 +1585,7 @@ GroundEffect_JumpOnLongGrass: @ 8097168
 @ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_JumpOnShallowWater: @ 8097190
 	push {r4,lr}
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r4, 0x10
 	ldrsh r2, [r0, r4]
 	str r2, [r3]
@@ -1611,7 +1611,7 @@ GroundEffect_JumpOnShallowWater: @ 8097190
 @ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_JumpOnWater: @ 80971C0
 	push {r4,lr}
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r4, 0x10
 	ldrsh r2, [r0, r4]
 	str r2, [r3]
@@ -1637,7 +1637,7 @@ GroundEffect_JumpOnWater: @ 80971C0
 @ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_JumpLandingDust: @ 80971F0
 	push {r4,lr}
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r4, 0x10
 	ldrsh r2, [r0, r4]
 	str r2, [r3]
@@ -1685,7 +1685,7 @@ GroundEffect_HotSprings: @ 8097230
 @ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
 GroundEffect_Seaweed: @ 8097240
 	push {lr}
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	movs r3, 0x10
 	ldrsh r1, [r0, r3]
 	str r1, [r2]

asm/field_message_box.s

@@ -108,8 +108,8 @@ _080981E4:
 	.pool
 	thumb_func_end task_del_textbox
 
-	thumb_func_start box_related_two__2
+	thumb_func_start ShowFieldMessage
-box_related_two__2: @ 80981EC
+ShowFieldMessage: @ 80981EC
 	push {r4,lr}
 	adds r1, r0, 0
 	ldr r4, =gUnknown_020375BC
@@ -130,7 +130,7 @@ _0809820E:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end box_related_two__2
+	thumb_func_end ShowFieldMessage
 
 	thumb_func_start sub_8098214
 sub_8098214: @ 8098214
@@ -181,8 +181,8 @@ _08098272:
 	bx r1
 	thumb_func_end sub_8098238
 
-	thumb_func_start box_related_two__3
+	thumb_func_start ShowFieldAutoScrollMessage
-box_related_two__3: @ 8098278
+ShowFieldAutoScrollMessage: @ 8098278
 	push {lr}
 	adds r1, r0, 0
 	ldr r2, =gUnknown_020375BC
@@ -202,7 +202,7 @@ _08098298:
 _0809829A:
 	pop {r1}
 	bx r1
-	thumb_func_end box_related_two__3
+	thumb_func_end ShowFieldAutoScrollMessage
 
 	thumb_func_start sub_80982A0
 sub_80982A0: @ 80982A0
@@ -267,8 +267,8 @@ textbox_auto_and_task_add: @ 8098304
 	bx r0
 	thumb_func_end textbox_auto_and_task_add
 
-	thumb_func_start textbox_close
+	thumb_func_start HideFieldMessageBox
-textbox_close: @ 8098314
+HideFieldMessageBox: @ 8098314
 	push {lr}
 	bl task_del_textbox
 	movs r0, 0
@@ -280,7 +280,7 @@ textbox_close: @ 8098314
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end textbox_close
+	thumb_func_end HideFieldMessageBox
 
 	thumb_func_start textbox_any_visible
 textbox_any_visible: @ 8098330
@@ -290,8 +290,8 @@ textbox_any_visible: @ 8098330
 	.pool
 	thumb_func_end textbox_any_visible
 
-	thumb_func_start sub_809833C
+	thumb_func_start IsFieldMessageBoxHidden
-sub_809833C: @ 809833C
+IsFieldMessageBoxHidden: @ 809833C
 	push {lr}
 	ldr r0, =gUnknown_020375BC
 	ldrb r0, [r0]
@@ -305,7 +305,7 @@ _08098350:
 _08098352:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_809833C
+	thumb_func_end IsFieldMessageBoxHidden
 
 	thumb_func_start sub_8098358
 sub_8098358: @ 8098358

asm/field_player_avatar.s

@@ -1223,7 +1223,7 @@ sub_808B238: @ 808B238
 	bl MapGridGetMetatileBehaviorAt
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8088F58
+	bl MetatileBehavior_IsNonAnimDoor
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808B2D8
@@ -1522,7 +1522,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
 	bl FieldObjectTurn
 	movs r0, 0x8
 	bl SetPlayerAvatarStateMask
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r2, 0x10
 	ldrsh r0, [r4, r2]
 	str r0, [r1]
@@ -2255,7 +2255,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC
 	bl MapGridGetMetatileBehaviorAt
 	lsls r0, 24
 	lsrs r0, 24
-	bl is_tile_x69_2_warp_door
+	bl MetatileBehavior_IsWarpDoor
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808BA54
@@ -3517,7 +3517,7 @@ _0808C3F0:
 	lsrs r1, 24
 	adds r0, r4, 0
 	bl FieldObjectSetSpecialAnim
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	movs r1, 0x10
 	ldrsh r0, [r4, r1]
 	str r0, [r2]
@@ -3897,7 +3897,7 @@ sub_808C750: @ 808C750
 	lsrs r4, 24
 	bl ScriptContext2_Enable
 	bl sav1_reset_battle_music_maybe
-	bl sub_8085898
+	bl Overworld_ChangeMusicToDefault
 	ldr r2, =gPlayerAvatar
 	ldrb r1, [r2]
 	movs r0, 0xF7
@@ -4858,7 +4858,7 @@ fishF: @ 808CF2C
 	ldr r0, =gPlayerAvatar
 	strb r1, [r0, 0x6]
 	bl ScriptContext2_Disable
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	movs r0, 0
 	movs r1, 0x1
 	bl sub_8197434

asm/field_poison.s

@@ -178,7 +178,7 @@ _080F96A8:
 	strh r0, [r4]
 	b _080F9722
 _080F96AE:
-	bl sub_809833C
+	bl IsFieldMessageBoxHidden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F9722
@@ -217,7 +217,7 @@ _080F96FC:
 	ldrb r0, [r4, 0x2]
 	bl sub_80F95C0
 	ldr r0, =gText_PkmnFainted3
-	bl box_related_two__2
+	bl ShowFieldMessage
 	ldrh r0, [r4]
 	adds r0, 0x1
 	strh r0, [r4]

asm/field_screen.s

@@ -7503,8 +7503,8 @@ _080AED78:
 	bx r0
 	thumb_func_end bag_add_task0_by_acit
 
-	thumb_func_start sub_80AED7C
+	thumb_func_start SetSav1Weather
-sub_80AED7C: @ 80AED7C
+SetSav1Weather: @ 80AED7C
 	push {r4,r5,lr}
 	ldr r4, =gSaveBlock1Ptr
 	ldr r1, [r4]
@@ -7525,7 +7525,7 @@ sub_80AED7C: @ 80AED7C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80AED7C
+	thumb_func_end SetSav1Weather
 
 	thumb_func_start sav1_get_weather_probably
 sav1_get_weather_probably: @ 80AEDAC
@@ -7564,7 +7564,7 @@ sub_80AEDBC: @ 80AEDBC
 	thumb_func_start sub_80AEDF0
 sub_80AEDF0: @ 80AEDF0
 	push {lr}
-	bl sub_80AED7C
+	bl SetSav1Weather
 	bl sav1_get_weather_probably
 	lsls r0, 24
 	lsrs r0, 24
@@ -7576,7 +7576,7 @@ sub_80AEDF0: @ 80AEDF0
 	thumb_func_start sub_80AEE08
 sub_80AEE08: @ 80AEE08
 	push {lr}
-	bl sub_80AED7C
+	bl SetSav1Weather
 	bl sav1_get_weather_probably
 	lsls r0, 24
 	lsrs r0, 24
@@ -7585,8 +7585,8 @@ sub_80AEE08: @ 80AEE08
 	bx r0
 	thumb_func_end sub_80AEE08
 
-	thumb_func_start sub_80AEE20
+	thumb_func_start DoCurrentWeather
-sub_80AEE20: @ 80AEE20
+DoCurrentWeather: @ 80AEE20
 	push {r4,r5,lr}
 	bl sav1_get_weather_probably
 	lsls r0, 24
@@ -7627,7 +7627,7 @@ _080AEE6E:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80AEE20
+	thumb_func_end DoCurrentWeather
 
 	thumb_func_start sub_80AEE84
 sub_80AEE84: @ 80AEE84
@@ -8248,7 +8248,7 @@ sub_80AF334: @ 80AF334
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8088EFC
+	bl MetatileBehavior_IsDoor
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -8258,7 +8258,7 @@ sub_80AF334: @ 80AF334
 	.pool
 _080AF36C:
 	adds r0, r4, 0
-	bl sub_8088F58
+	bl MetatileBehavior_IsNonAnimDoor
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, =task_map_chg_seq_0807E2CC
@@ -8390,7 +8390,7 @@ _080AF480:
 	ldrsh r0, [r6, r1]
 	movs r2, 0
 	ldrsh r1, [r7, r2]
-	bl sub_808A854
+	bl FieldSetDoorOpened
 	movs r0, 0x1
 	strh r0, [r5, 0x8]
 	b _080AF54A
@@ -8427,7 +8427,7 @@ _080AF4DC:
 	ldrsh r0, [r6, r1]
 	movs r2, 0
 	ldrsh r1, [r7, r2]
-	bl sub_808A8AC
+	bl FieldAnimateDoorClose
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r5, 0xA]
@@ -8461,7 +8461,7 @@ _080AF520:
 	cmp r0, 0x1
 	beq _080AF54A
 _080AF536:
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	movs r0, 0x4
 	strh r0, [r5, 0x8]
 	b _080AF54A
@@ -8550,7 +8550,7 @@ _080AF5EC:
 	lsls r0, 24
 	cmp r0, 0
 	beq _080AF60A
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	movs r0, 0x3
 	strh r0, [r5, 0x8]
 	b _080AF60A
@@ -8593,7 +8593,7 @@ _080AF644:
 	bl sub_80AF71C
 	cmp r0, 0
 	beq _080AF65A
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
@@ -9010,7 +9010,7 @@ _080AF9C8:
 	strh r0, [r4]
 	b _080AF9E8
 _080AF9D0:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080AF9E8
@@ -9142,7 +9142,7 @@ _080AFAD4:
 	movs r2, 0
 	ldrsh r1, [r6, r2]
 	subs r1, 0x1
-	bl cur_mapdata_get_door_sound_at
+	bl GetDoorSoundEffect
 	lsls r0, 16
 	lsrs r0, 16
 	bl PlaySE
@@ -9151,7 +9151,7 @@ _080AFAD4:
 	movs r2, 0
 	ldrsh r1, [r6, r2]
 	subs r1, 0x1
-	bl task_overworld_door_add_if_role_69_for_opening_door_at
+	bl FieldAnimateDoorOpen
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r5, 0xA]
@@ -9211,7 +9211,7 @@ _080AFB6C:
 	movs r2, 0
 	ldrsh r1, [r6, r2]
 	subs r1, 0x1
-	bl sub_808A8AC
+	bl FieldAnimateDoorClose
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r5, 0xA]
@@ -9996,7 +9996,7 @@ _080B0198:
 	bl sub_808D1B4
 	cmp r0, 0x1
 	beq _080B01B6
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask

asm/field_tasks.s

@@ -46,7 +46,7 @@ _0809D8CA:
 	ands r0, r1
 	cmp r0, 0
 	beq _0809D8FC
-	bl sub_809E7B0
+	bl DoTimeBasedEvents
 	ldrh r0, [r4]
 	adds r0, 0x1
 	b _0809D8FA
@@ -144,8 +144,8 @@ _0809D992:
 	.pool
 	thumb_func_end overworld_ensure_per_step_coros_running
 
-	thumb_func_start activate_per_step_callback
+	thumb_func_start ActivatePerStepCallback
-activate_per_step_callback: @ 809D9A8
+ActivatePerStepCallback: @ 809D9A8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -180,7 +180,7 @@ _0809D9EA:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end activate_per_step_callback
+	thumb_func_end ActivatePerStepCallback
 
 	thumb_func_start wild_encounter_reset_coro_args
 wild_encounter_reset_coro_args: @ 809D9F0
@@ -221,7 +221,7 @@ sub_809DA30: @ 809DA30
 	lsls r1, 24
 	lsrs r4, r1, 24
 	adds r0, r4, 0
-	bl sub_8089764
+	bl MetatileBehavior_IsPacifilogVerticalLog1
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DA48
@@ -229,7 +229,7 @@ sub_809DA30: @ 809DA30
 	b _0809DA80
 _0809DA48:
 	adds r0, r4, 0
-	bl sub_8089778
+	bl MetatileBehavior_IsPacifilogVerticalLog2
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DA5A
@@ -238,7 +238,7 @@ _0809DA48:
 	b _0809DA80
 _0809DA5A:
 	adds r0, r4, 0
-	bl sub_808978C
+	bl MetatileBehavior_IsPacifilogHorizontalLog1
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DA6C
@@ -247,7 +247,7 @@ _0809DA5A:
 	b _0809DA80
 _0809DA6C:
 	adds r0, r4, 0
-	bl sub_80897A0
+	bl MetatileBehavior_IsPacifilogHorizontalLog2
 	lsls r0, 24
 	cmp r0, 0
 	bne _0809DA7C
@@ -414,7 +414,7 @@ sub_809DB7C: @ 809DB7C
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8089764
+	bl MetatileBehavior_IsPacifilogVerticalLog1
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DBC0
@@ -427,7 +427,7 @@ _0809DBBC:
 	b _0809DC08
 _0809DBC0:
 	adds r0, r4, 0
-	bl sub_8089778
+	bl MetatileBehavior_IsPacifilogVerticalLog2
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DBD8
@@ -439,7 +439,7 @@ _0809DBC0:
 	b _0809DBBC
 _0809DBD8:
 	adds r0, r4, 0
-	bl sub_808978C
+	bl MetatileBehavior_IsPacifilogHorizontalLog1
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DBF0
@@ -451,7 +451,7 @@ _0809DBD8:
 	b _0809DBBC
 _0809DBF0:
 	adds r0, r4, 0
-	bl sub_80897A0
+	bl MetatileBehavior_IsPacifilogHorizontalLog2
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DC06
@@ -496,7 +496,7 @@ sub_809DC18: @ 809DC18
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8089764
+	bl MetatileBehavior_IsPacifilogVerticalLog1
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DC5C
@@ -509,7 +509,7 @@ _0809DC58:
 	b _0809DCA4
 _0809DC5C:
 	adds r0, r4, 0
-	bl sub_8089778
+	bl MetatileBehavior_IsPacifilogVerticalLog2
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DC74
@@ -521,7 +521,7 @@ _0809DC5C:
 	b _0809DC58
 _0809DC74:
 	adds r0, r4, 0
-	bl sub_808978C
+	bl MetatileBehavior_IsPacifilogHorizontalLog1
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DC8C
@@ -533,7 +533,7 @@ _0809DC74:
 	b _0809DC58
 _0809DC8C:
 	adds r0, r4, 0
-	bl sub_80897A0
+	bl MetatileBehavior_IsPacifilogHorizontalLog2
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809DCA2
@@ -1326,7 +1326,7 @@ _0809E29A:
 	lsls r4, 24
 	lsrs r4, 24
 	adds r0, r4, 0
-	bl sub_8089604
+	bl MetatileBehavior_IsThinIce
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1341,7 +1341,7 @@ _0809E29A:
 	.pool
 _0809E2E0:
 	adds r0, r4, 0
-	bl sub_8089618
+	bl MetatileBehavior_IsCrackedIce
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1630,7 +1630,7 @@ _0809E53E:
 	lsls r0, r6, 24
 	lsrs r6, r0, 24
 	adds r0, r6, 0
-	bl sub_8089918
+	bl MetatileBehavior_IsCrackedFloorHole
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809E556
@@ -1658,7 +1658,7 @@ _0809E572:
 	ldrh r0, [r4]
 	strh r0, [r5, 0x6]
 	adds r0, r6, 0
-	bl sub_808992C
+	bl MetatileBehavior_IsCrackedFloor
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809E5D2

asm/fldeff_80F9BCC.s

@@ -486,7 +486,7 @@ sub_80F9F78: @ 80F9F78
 	ands r0, r1
 	cmp r0, 0
 	beq _080F9FC0
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	ldr r0, [r1, 0x4]
 	cmp r0, 0x2
 	beq _080F9FAE
@@ -517,7 +517,7 @@ _080F9FB6:
 	movs r0, 0x18
 	b _080F9FFC
 _080F9FC0:
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	ldr r0, [r1, 0x4]
 	cmp r0, 0x2
 	beq _080F9FEA
@@ -584,7 +584,7 @@ sub_80FA004: @ 80FA004
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_808923C
+	bl MetatileBehavior_IsSecretBaseCave
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -599,7 +599,7 @@ sub_80FA004: @ 80FA004
 	.pool
 _080FA070:
 	adds r0, r4, 0
-	bl sub_808925C
+	bl MetatileBehavior_IsSecretBaseTree
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -614,7 +614,7 @@ _080FA070:
 	.pool
 _080FA0A0:
 	adds r0, r4, 0
-	bl is_tile_x98
+	bl MetatileBehavior_IsSecretBaseShrub
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -643,7 +643,7 @@ _080FA0C4:
 sub_80FA0DC: @ 80FA0DC
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -701,7 +701,7 @@ sub_80FA13C: @ 80FA13C
 	ldrh r1, [r2, 0x2]
 	lsls r1, 23
 	lsrs r1, 23
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldr r3, [r4, 0x14]
 	adds r1, r3
 	lsls r1, 16
@@ -778,7 +778,7 @@ sub_80FA1D8: @ 80FA1D8
 sub_80FA1E8: @ 80FA1E8
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -836,13 +836,13 @@ sub_80FA248: @ 80FA248
 	ands r2, r0
 	cmp r2, 0x96
 	bne _080FA26A
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r0, 0
 	str r0, [r1, 0x1C]
 _080FA26A:
 	cmp r2, 0x9C
 	bne _080FA274
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	movs r0, 0x2
 	str r0, [r1, 0x1C]
 _080FA274:
@@ -858,7 +858,7 @@ _080FA274:
 	ldrh r1, [r2, 0x2]
 	lsls r1, 23
 	lsrs r1, 23
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldr r3, [r4, 0x14]
 	adds r1, r3
 	lsls r1, 16
@@ -891,7 +891,7 @@ sub_80FA2D8: @ 80FA2D8
 	adds r4, r0, 0
 	movs r0, 0x9B
 	bl PlaySE
-	ldr r0, =gFieldEffectSpawnParams
+	ldr r0, =gFieldEffectArguments
 	ldr r1, [r0, 0x1C]
 	adds r2, r4, 0
 	adds r2, 0x2A
@@ -917,7 +917,7 @@ sub_80FA304: @ 80FA304
 	asrs r0, 16
 	cmp r0, 0x27
 	ble _080FA32E
-	ldr r0, =gFieldEffectSpawnParams
+	ldr r0, =gFieldEffectArguments
 	ldr r0, [r0, 0x1C]
 	cmp r0, 0
 	beq _080FA322
@@ -951,7 +951,7 @@ sub_80FA33C: @ 80FA33C
 sub_80FA34C: @ 80FA34C
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -1009,7 +1009,7 @@ sub_80FA3AC: @ 80FA3AC
 	ldrh r1, [r2, 0x2]
 	lsls r1, 23
 	lsrs r1, 23
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldr r3, [r4, 0x14]
 	adds r1, r3
 	lsls r1, 16
@@ -1807,7 +1807,7 @@ sub_80FAA7C: @ 80FAA7C
 	mov r0, sp
 	adds r1, r4, 0
 	bl GetXYCoordsOneStepInFrontOfPlayer
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	mov r0, sp
 	movs r2, 0
 	ldrsh r0, [r0, r2]
@@ -1930,7 +1930,7 @@ door_restore_tilemap: @ 80FABA4
 	adds r5, r0, 0
 	movs r0, 0x83
 	bl PlaySE
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldr r0, [r4, 0x14]
 	ldr r1, [r4, 0x18]
 	subs r1, 0x1
@@ -1953,7 +1953,7 @@ _080FABDC:
 	lsls r2, 2
 	bl MapGridSetMetatileIdAt
 _080FABEA:
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldr r0, [r4, 0x14]
 	ldr r1, [r4, 0x18]
 	ldr r2, =0x0000020a
@@ -1988,7 +1988,7 @@ sub_80FAC24: @ 80FAC24
 	strh r0, [r5, 0x2E]
 	b _080FAC54
 _080FAC38:
-	ldr r4, =gFieldEffectSpawnParams
+	ldr r4, =gFieldEffectArguments
 	ldr r0, [r4, 0x14]
 	ldr r1, [r4, 0x18]
 	ldr r2, =0x00000e8c

asm/fldeff_cut.s

@@ -130,7 +130,7 @@ _080D37F6:
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8088E64
+	bl MetatileBehavior_IsPokeGrass
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -175,7 +175,7 @@ _080D3890:
 	movs r0, 0x1
 	strb r0, [r1]
 	adds r0, r4, 0
-	bl sub_80899F8
+	bl MetatileBehavior_IsCuttableGrass
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0x1
@@ -309,7 +309,7 @@ _080D395A:
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r0, r4, 0
-	bl sub_8088E64
+	bl MetatileBehavior_IsPokeGrass
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -339,7 +339,7 @@ _080D39F4:
 	b _080D395A
 _080D39F8:
 	adds r0, r4, 0
-	bl sub_80899F8
+	bl MetatileBehavior_IsCuttableGrass
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0x1
@@ -385,7 +385,7 @@ hm2_ruin_valley: @ 80D3A50
 	movs r0, 0x1
 	bl FieldEffectStart
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -421,7 +421,7 @@ sub_80D3A6C: @ 80D3A6C
 sub_80D3A9C: @ 80D3A9C
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -1344,7 +1344,7 @@ sub_80D423C: @ 80D423C
 	bl MapGridGetMetatileBehaviorAt
 	lsls r0, 24
 	lsrs r0, 24
-	bl MetatileBehavior_IsLongGrass2
+	bl MetatileBehavior_IsLongGrass_Duplicate
 	lsls r0, 24
 	cmp r0, 0
 	beq _080D42AE

asm/fldeff_emotion.s

@@ -1,328 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start oei_exclamation_mark
-oei_exclamation_mark: @ 80B4620
-	push {lr}
-	ldr r0, =gUnknown_085507B4
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x53
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x40
-	beq _080B4648
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	movs r1, 0
-	movs r2, 0
-	bl sub_80B46D8
-_080B4648:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end oei_exclamation_mark
-
-	thumb_func_start sub_80B4658
-sub_80B4658: @ 80B4658
-	push {lr}
-	ldr r0, =gUnknown_085507B4
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x52
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x40
-	beq _080B4680
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	movs r1, 0x21
-	movs r2, 0x1
-	bl sub_80B46D8
-_080B4680:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B4658
-
-	thumb_func_start sub_80B4690
-sub_80B4690: @ 80B4690
-	push {r4,lr}
-	ldr r0, =gUnknown_085507CC
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x52
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x40
-	beq _080B46C6
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x2E
-	movs r2, 0
-	bl sub_80B46D8
-	ldrb r1, [r4, 0x5]
-	movs r0, 0xF
-	ands r0, r1
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4, 0x5]
-_080B46C6:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B4690
-
-	thumb_func_start sub_80B46D8
-@ void sub_80B46D8(struct obj *object, s16 a2, u8 a3)
-sub_80B46D8: @ 80B46D8
-	push {r4,lr}
-	lsls r2, 24
-	lsrs r2, 24
-	ldrb r4, [r0, 0x5]
-	movs r3, 0xD
-	negs r3, r3
-	ands r3, r4
-	movs r4, 0x4
-	orrs r3, r4
-	strb r3, [r0, 0x5]
-	movs r3, 0x3E
-	adds r3, r0
-	mov r12, r3
-	ldrb r3, [r3]
-	movs r4, 0x2
-	orrs r3, r4
-	mov r4, r12
-	strb r3, [r4]
-	ldr r4, =gFieldEffectSpawnParams
-	ldr r3, [r4]
-	strh r3, [r0, 0x2E]
-	ldr r3, [r4, 0x4]
-	strh r3, [r0, 0x30]
-	ldr r3, [r4, 0x8]
-	strh r3, [r0, 0x32]
-	ldr r3, =0x0000fffb
-	strh r3, [r0, 0x34]
-	strh r1, [r0, 0x3C]
-	adds r1, r2, 0
-	bl StartSpriteAnim
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B46D8
-
-	thumb_func_start objc_exclamation_mark_probably
-objc_exclamation_mark_probably: @ 80B4724
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x2E]
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x30]
-	lsls r1, 24
-	lsrs r1, 24
-	ldrh r2, [r4, 0x32]
-	lsls r2, 24
-	lsrs r2, 24
-	mov r3, sp
-	bl TryGetFieldObjectIdByLocalIdAndMap
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B4756
-	adds r0, r4, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080B4764
-_080B4756:
-	ldrh r1, [r4, 0x3C]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldEffectStop
-	b _080B47B2
-_080B4764:
-	ldr r2, =gMapObjects
-	mov r0, sp
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, =gSprites
-	adds r1, r0
-	ldrh r3, [r4, 0x34]
-	ldrh r0, [r4, 0x36]
-	adds r2, r3, r0
-	strh r2, [r4, 0x36]
-	ldrh r0, [r1, 0x20]
-	strh r0, [r4, 0x20]
-	ldrh r0, [r1, 0x22]
-	subs r0, 0x10
-	strh r0, [r4, 0x22]
-	ldrh r0, [r1, 0x24]
-	strh r0, [r4, 0x24]
-	ldrh r0, [r1, 0x26]
-	adds r0, r2
-	strh r0, [r4, 0x26]
-	lsls r2, 16
-	asrs r2, 16
-	cmp r2, 0
-	beq _080B47B0
-	adds r0, r3, 0x1
-	strh r0, [r4, 0x34]
-	b _080B47B2
-	.pool
-_080B47B0:
-	strh r2, [r4, 0x34]
-_080B47B2:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end objc_exclamation_mark_probably
-
-	thumb_func_start sub_80B47BC
-sub_80B47BC: @ 80B47BC
-	push {lr}
-	ldr r0, =gUnknown_02038BFC
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080B47D4
-	ldr r0, =gUnknown_03006090
-	ldrb r0, [r0, 0xC]
-	b _080B47D8
-	.pool
-_080B47D4:
-	ldr r0, =gUnknown_03006090
-	ldrb r0, [r0]
-_080B47D8:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B47BC
-
-	thumb_func_start sub_80B47E0
-sub_80B47E0: @ 80B47E0
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _080B47EE
-	movs r0, 0
-	b _080B4800
-_080B47EE:
-	cmp r0, 0
-	beq _080B47FC
-	ldr r0, =gUnknown_03006090
-	ldrb r0, [r0, 0xC]
-	b _080B4800
-	.pool
-_080B47FC:
-	ldr r0, =gUnknown_03006090
-	ldrb r0, [r0]
-_080B4800:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80B47E0
-
-	thumb_func_start sub_80B4808
-sub_80B4808: @ 80B4808
-	push {lr}
-	ldr r0, =gUnknown_030060AC
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _080B4870
-	ldr r2, =gUnknown_03006090
-	ldr r0, =gUnknown_03006080
-	ldrh r1, [r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r0, r1
-	ldrb r0, [r0, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetOppositeDirection
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFaceDirectionAnimId
-	ldr r3, =gUnknown_03006084
-	strb r0, [r3]
-	movs r0, 0xFE
-	strb r0, [r3, 0x1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrb r1, [r0, 0x5]
-	ldrb r2, [r0, 0x4]
-	movs r0, 0xFF
-	bl exec_movement
-	b _080B489E
-	.pool
-_080B4870:
-	ldr r0, =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gMapObjects
-	adds r0, r1
-	ldrb r0, [r0, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetFaceDirectionAnimId
-	ldr r3, =gUnknown_03006084
-	strb r0, [r3]
-	movs r0, 0xFE
-	strb r0, [r3, 0x1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrb r1, [r0, 0x5]
-	ldrb r2, [r0, 0x4]
-	movs r0, 0xFF
-	bl exec_movement
-_080B489E:
-	movs r0, 0xFF
-	bl sub_809BE48
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80B4808
-
-	.align 2, 0 @ Don't pad with nop.

asm/fldeff_groundshake.s

@@ -161,7 +161,7 @@ sub_81BE79C: @ 81BE79C
 	beq _081BE7B8
 	movs r0, 0xA7
 	lsls r0, 1
-	bl FlagReset
+	bl FlagClear
 	b _081BE7EE
 	.pool
 _081BE7B8:
@@ -188,7 +188,7 @@ _081BE7D4:
 _081BE7E6:
 	movs r0, 0xA7
 	lsls r0, 1
-	bl FlagReset
+	bl FlagClear
 _081BE7EE:
 	pop {r4}
 	pop {r0}

asm/fldeff_strength.s

@@ -40,7 +40,7 @@ _08145DF2:
 sub_8145E0C: @ 8145E0C
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -66,7 +66,7 @@ sub_8145E2C: @ 8145E2C
 	lsrs r0, r2, 16
 	strh r0, [r1, 0x18]
 	strh r2, [r1, 0x1A]
-	ldr r0, =gFieldEffectSpawnParams
+	ldr r0, =gFieldEffectArguments
 	ldr r1, [r0]
 	movs r0, 0x64
 	muls r0, r1

asm/fldeff_sweetscent.s

@@ -24,7 +24,7 @@ hm2_sweet_scent: @ 8159F10
 	movs r0, 0x33
 	bl FieldEffectStart
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]

asm/fldeff_teleport.s

@@ -39,7 +39,7 @@ hm_teleport_run_dp02scr: @ 817C8FC
 	movs r0, 0x3F
 	bl FieldEffectStart
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]

asm/international_string_util.s

@@ -5,127 +5,6 @@
 
 	.text
 
-	thumb_func_start GetStringCenterAlignXOffset
-@ s32 GetStringCenterAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
-GetStringCenterAlignXOffset: @ 81DB35C
-	push {lr}
-	movs r3, 0
-	bl GetStringCenterAlignXOffsetWithLetterSpacing
-	pop {r1}
-	bx r1
-	thumb_func_end GetStringCenterAlignXOffset
-
-	thumb_func_start GetStringRightAlignXOffset
-@ s32 GetStringRightAlignXOffset(u8 fontId, u8 *str, s32 totalWidth)
-GetStringRightAlignXOffset: @ 81DB368
-	push {lr}
-	movs r3, 0
-	bl GetStringWidthDifference
-	pop {r1}
-	bx r1
-	thumb_func_end GetStringRightAlignXOffset
-
-	thumb_func_start GetStringCenterAlignXOffsetWithLetterSpacing
-@ s32 GetStringCenterAlignXOffsetWithLetterSpacing(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
-GetStringCenterAlignXOffsetWithLetterSpacing: @ 81DB374
-	push {lr}
-	bl GetStringWidthDifference
-	lsrs r1, r0, 31
-	adds r0, r1
-	asrs r0, 1
-	pop {r1}
-	bx r1
-	thumb_func_end GetStringCenterAlignXOffsetWithLetterSpacing
-
-	thumb_func_start GetStringWidthDifference
-@ s32 GetStringWidthDifference(u8 fontId, u8 *str, s32 totalWidth, s16 letterSpacing)
-GetStringWidthDifference: @ 81DB384
-	push {r4,lr}
-	adds r4, r2, 0
-	adds r2, r3, 0
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, 16
-	asrs r2, 16
-	bl GetStringWidth
-	cmp r4, r0
-	bgt _081DB39E
-	movs r0, 0
-	b _081DB3A0
-_081DB39E:
-	subs r0, r4, r0
-_081DB3A0:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end GetStringWidthDifference
-
-	thumb_func_start GetMaxWidthInMenuTable
-GetMaxWidthInMenuTable: @ 81DB3A8
-	push {r4-r6,lr}
-	movs r6, 0
-	cmp r6, r1
-	bge _081DB3CC
-	adds r5, r0, 0
-	adds r4, r1, 0
-_081DB3B4:
-	ldr r1, [r5]
-	movs r0, 0x1
-	movs r2, 0
-	bl GetStringWidth
-	cmp r0, r6
-	ble _081DB3C4
-	adds r6, r0, 0
-_081DB3C4:
-	adds r5, 0x8
-	subs r4, 0x1
-	cmp r4, 0
-	bne _081DB3B4
-_081DB3CC:
-	adds r0, r6, 0
-	bl convert_pixel_width_to_tile_width
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end GetMaxWidthInMenuTable
-
-	thumb_func_start sub_81DB3D8
-sub_81DB3D8: @ 81DB3D8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	mov r8, r0
-	adds r7, r1, 0
-	adds r5, r2, 0
-	movs r6, 0
-	movs r4, 0
-	cmp r6, r5
-	bge _081DB40A
-_081DB3EC:
-	adds r0, r7, r4
-	ldrb r0, [r0]
-	lsls r0, 3
-	add r0, r8
-	ldr r1, [r0]
-	movs r0, 0x1
-	movs r2, 0
-	bl GetStringWidth
-	cmp r0, r6
-	ble _081DB404
-	adds r6, r0, 0
-_081DB404:
-	adds r4, 0x1
-	cmp r4, r5
-	blt _081DB3EC
-_081DB40A:
-	adds r0, r6, 0
-	bl convert_pixel_width_to_tile_width
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81DB3D8
 
 	thumb_func_start sub_81DB41C
 sub_81DB41C: @ 81DB41C
@@ -389,8 +268,8 @@ _081DB5E4:
 	bx r0
 	thumb_func_end sub_81DB5AC
 
-	thumb_func_start sub_81DB5E8
+	thumb_func_start TVShowConvertInternationalString
-sub_81DB5E8: @ 81DB5E8
+TVShowConvertInternationalString: @ 81DB5E8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r2, 0
@@ -403,7 +282,7 @@ sub_81DB5E8: @ 81DB5E8
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_81DB5E8
+	thumb_func_end TVShowConvertInternationalString
 
 	thumb_func_start sub_81DB604
 sub_81DB604: @ 81DB604

asm/intro.s

@@ -376,11 +376,11 @@ task_intro_1: @ 816CF18
 	movs r0, 0x12
 	movs r1, 0x28
 	bl SetGpuReg
-	ldr r0, =gUnknown_085E13B4
+	ldr r0, =gIntro1BGLeavesGfx
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085E07C4
+	ldr r0, =gIntro1BG0_Tilemap
 	ldr r1, =0x06008000
 	bl LZ77UnCompVram
 	ldr r1, =0x06008800
@@ -393,7 +393,7 @@ task_intro_1: @ 816CF18
 	ldr r5, =0x81000400
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gUnknown_085E0B78
+	ldr r0, =gIntro1BG1_Tilemap
 	ldr r1, =0x06009000
 	bl LZ77UnCompVram
 	ldr r1, =0x06009800
@@ -403,7 +403,7 @@ task_intro_1: @ 816CF18
 	str r1, [r4, 0x4]
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gUnknown_085E0EAC
+	ldr r0, =gIntro1BG2_Tilemap
 	ldr r1, =0x0600a000
 	bl LZ77UnCompVram
 	ldr r1, =0x0600a800
@@ -413,7 +413,7 @@ task_intro_1: @ 816CF18
 	str r1, [r4, 0x4]
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gUnknown_085E119C
+	ldr r0, =gIntro1BG3_Tilemap
 	ldr r1, =0x0600b000
 	bl LZ77UnCompVram
 	ldr r1, =0x0600b800
@@ -423,7 +423,7 @@ task_intro_1: @ 816CF18
 	str r1, [r4, 0x4]
 	str r5, [r4, 0x8]
 	ldr r0, [r4, 0x8]
-	ldr r0, =gUnknown_085E05C4
+	ldr r0, =gIntro1BGPals
 	movs r5, 0x80
 	lsls r5, 2
 	movs r1, 0
@@ -1779,14 +1779,14 @@ task_intro_10: @ 816DBAC
 	lsls r5, 24
 	lsrs r5, 24
 	bl intro_reset_and_hide_bgs
-	ldr r0, =gUnknown_085E3854
+	ldr r0, =gIntro3Pokeball_Gfx
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085E3724
+	ldr r0, =gIntro3Pokeball_Tilemap
 	ldr r1, =0x06004000
 	bl LZ77UnCompVram
-	ldr r0, =gUnknown_085E3524
+	ldr r0, =gIntro3PokeballPal
 	movs r2, 0x80
 	lsls r2, 2
 	movs r1, 0
@@ -1958,9 +1958,9 @@ task_intro_13: @ 816DD28
 	ldr r0, =gUnknown_08D8A818
 	ldr r1, =0x0600e000
 	bl LZDecompressVram
-	ldr r0, =gUnknown_08524D14
+	ldr r0, =gBattleAnimPicTable + 0x1D0
 	bl LoadCompressedObjectPicUsingHeap
-	ldr r0, =gUnknown_0852561C
+	ldr r0, =gBattleAnimPaletteTable + 0x1D0
 	bl LoadCompressedObjectPaletteUsingHeap
 	ldr r0, =gUnknown_08D85CD0
 	ldr r1, =gPlttBufferUnfaded

asm/item.s

@@ -676,8 +676,8 @@ _080D6D04:
 	.pool
 	thumb_func_end sub_80D6CE4
 
-	thumb_func_start sub_80D6D1C
+	thumb_func_start CheckPCHasItem
-sub_80D6D1C: @ 80D6D1C
+CheckPCHasItem: @ 80D6D1C
 	push {r4-r6,lr}
 	lsls r0, 16
 	lsrs r6, r0, 16
@@ -717,10 +717,10 @@ _080D6D68:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80D6D1C
+	thumb_func_end CheckPCHasItem
 
-	thumb_func_start sub_80D6D70
+	thumb_func_start AddPCItem
-sub_80D6D70: @ 80D6D70
+AddPCItem: @ 80D6D70
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -819,7 +819,7 @@ _080D6E3A:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80D6D70
+	thumb_func_end AddPCItem
 
 	thumb_func_start sub_80D6E48
 sub_80D6E48: @ 80D6E48

asm/item_menu.s

@@ -5388,7 +5388,7 @@ _081ADB6C:
 	ldrh r0, [r4]
 	mov r3, r8
 	ldrh r1, [r3, 0x10]
-	bl sub_80D6D70
+	bl AddPCItem
 	lsls r0, 24
 	lsrs r6, r0, 24
 	cmp r6, 0x1
@@ -6237,7 +6237,7 @@ bag_menu_AddMoney_window: @ 81AE268
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r2, 0xE
-	bl set_window_border_style_and_print_money_box
+	bl PrintMoneyAmountInMoneyBoxWithBorder
 	movs r0, 0x13
 	movs r1, 0xB
 	bl AddMoneyLabelObject

asm/item_use.s

@@ -464,7 +464,7 @@ _080FD3EC:
 _080FD40C:
 	lsls r0, r6, 24
 	lsrs r0, 24
-	bl sub_8089510
+	bl MetatileBehavior_8089510
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -2215,7 +2215,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
 	ldr r0, =0x000008ad
 	bl FlagSet
 	ldr r0, =0x000008ae
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =gStringVar4
 	ldr r1, =gText_UsedVar2WildLured
 	bl StringExpandPlaceholders
@@ -2225,7 +2225,7 @@ _080FE278:
 	ldr r0, =0x000008ae
 	bl FlagSet
 	ldr r0, =0x000008ad
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =gStringVar4
 	ldr r1, =gText_UsedVar2WildRepelled
 	bl StringExpandPlaceholders

asm/librfu_intr.s

@@ -0,0 +1,696 @@
+	.include "asm/macros.inc"
+
+	.syntax unified
+
+	.text
+
+	arm_func_start IntrSIO32
+IntrSIO32: @ 82E3554
+	mov r12, sp
+	stmdb sp!, {r11,r12,lr,pc}
+	ldr r3, _082E35B4
+	ldr r0, [r3]
+	ldr r2, [r0]
+	sub r11, r12, 0x4
+	cmp r2, 0xA
+	bne _082E3590
+	ldr r0, [r0, 0x20]
+	cmp r0, 0
+	ldmdbeq r11, {r11,sp,lr}
+	bxeq lr
+	bl sub_82E3EB0
+	ldmdb r11, {r11,sp,lr}
+	bx lr
+_082E3590:
+	ldrb r3, [r0, 0x14]
+	cmp r3, 0x1
+	bne _082E35A8
+	bl sio32intr_clock_master
+	ldmdb r11, {r11,sp,lr}
+	bx lr
+_082E35A8:
+	bl sio32intr_clock_slave
+	ldmdb r11, {r11,sp,lr}
+	bx lr
+	.align 2, 0
+_082E35B4: .4byte gRfuState
+	arm_func_end IntrSIO32
+
+	arm_func_start sio32intr_clock_master
+sio32intr_clock_master: @ 82E35B8
+	mov r12, sp
+	stmdb sp!, {r4-r6,r11,r12,lr,pc}
+	mov r0, 0x50
+	sub r11, r12, 0x4
+	bl STWI_set_timer_in_RAM
+	mov r4, 0x120
+	ldr r2, _082E382C
+	add r4, r4, 0x4000000
+	ldr lr, [r4]
+	ldr r12, [r2]
+	ldr r3, [r12]
+	mov r6, r2
+	cmp r3, 0
+	bne _082E3638
+	cmp lr, 0x80000000
+	bne _082E36B8
+	ldrb r2, [r12, 0x5]
+	ldrb r3, [r12, 0x4]
+	cmp r2, r3
+	bhi _082E3628
+	ldr r3, [r12, 0x24]
+	mov r1, r2
+	ldr r2, [r3, r1, lsl 2]
+	str r2, [r4]
+	ldrb r3, [r12, 0x5]
+	add r3, r3, 0x1
+	strb r3, [r12, 0x5]
+	b _082E3714
+_082E3628:
+	mov r3, 0x1
+	str r3, [r12]
+	str lr, [r4]
+	b _082E3714
+_082E3638:
+	ldr r3, [r12]
+	cmp r3, 0x1
+	bne _082E36C8
+	mov r3, 0x99000000
+	add r3, r3, 0x660000
+	mov r5, 0x80000000
+	and r2, lr, r5, asr 15
+	cmp r2, r3
+	bne _082E36B8
+	mov r3, 0
+	strb r3, [r12, 0x8]
+	ldr r1, [r6]
+	ldrb r0, [r1, 0x8]
+	ldr r2, [r1, 0x28]
+	str lr, [r2, r0, lsl 2]
+	ldrb r3, [r1, 0x8]
+	add r3, r3, 0x1
+	strb r3, [r1, 0x8]
+	ldr r2, [r6]
+	strb lr, [r2, 0x9]
+	ldr r3, [r6]
+	mov r2, lr, lsr 8
+	strb r2, [r3, 0x7]
+	ldr r1, [r6]
+	ldrb r2, [r1, 0x7]
+	ldrb r3, [r1, 0x8]
+	cmp r2, r3
+	bcc _082E3700
+	mov r3, 0x2
+	str r3, [r1]
+	str r5, [r4]
+	b _082E3714
+_082E36B8:
+	bl STWI_stop_timer_in_RAM
+	mov r0, 0x82
+	bl STWI_set_timer_in_RAM
+	b _082E3840
+_082E36C8:
+	ldr r3, [r12]
+	cmp r3, 0x2
+	bne _082E3714
+	ldrb r1, [r12, 0x8]
+	ldr r2, [r12, 0x28]
+	str lr, [r2, r1, lsl 2]
+	ldrb r3, [r12, 0x8]
+	add r3, r3, 0x1
+	strb r3, [r12, 0x8]
+	ldr r1, [r6]
+	ldrb r2, [r1, 0x7]
+	ldrb r3, [r1, 0x8]
+	cmp r2, r3
+	bcs _082E370C
+_082E3700:
+	mov r3, 0x3
+	str r3, [r1]
+	b _082E3714
+_082E370C:
+	mov r3, 0x80000000
+	str r3, [r4]
+_082E3714:
+	mov r0, 0x1
+	bl handshake_wait
+	mov r0, r0, lsl 16
+	cmp r0, 0x10000
+	beq _082E3840
+	mov r4, 0x128
+	add r4, r4, 0x4000000
+	mov r5, 0x5000
+	add r3, r5, 0xB
+	strh r3, [r4]
+	mov r0, 0
+	bl handshake_wait
+	mov r0, r0, lsl 16
+	cmp r0, 0x10000
+	beq _082E3840
+	bl STWI_stop_timer_in_RAM
+	ldr r1, [r6]
+	ldr r0, [r1]
+	cmp r0, 0x3
+	bne _082E3830
+	ldrb r3, [r1, 0x9]
+	cmp r3, 0xA5
+	cmpne r3, 0xA7
+	beq _082E3788
+	and r3, r3, 0xFF
+	cmp r3, 0xB5
+	beq _082E3788
+	cmp r3, 0xB7
+	bne _082E37D0
+_082E3788:
+	mov r1, 0x120
+	add r1, r1, 0x4000000
+	mov r12, 0x128
+	add r12, r12, 0x4000000
+	ldr r0, [r6]
+	mov r3, 0
+	strb r3, [r0, 0x14]
+	mov r2, 0x80000000
+	str r2, [r1]
+	add r3, r3, 0x5000
+	add r2, r3, 0x2
+	strh r2, [r12]
+	add r3, r3, 0x82
+	strh r3, [r12]
+	ldr r2, [r6]
+	mov r3, 0x5
+	str r3, [r2]
+	b _082E3800
+_082E37D0:
+	cmp r3, 0xEE
+	bne _082E37F0
+	add r3, r5, 0x3
+	strh r3, [r4]
+	mov r2, 0x4
+	str r2, [r1]
+	strh r0, [r1, 0x12]
+	b _082E3800
+_082E37F0:
+	add r3, r5, 0x3
+	strh r3, [r4]
+	mov r2, 0x4
+	str r2, [r1]
+_082E3800:
+	ldr r2, [r6]
+	mov r3, 0
+	strb r3, [r2, 0x2C]
+	ldr r0, [r6]
+	ldr r2, [r0, 0x18]
+	cmp r2, r3
+	beq _082E3840
+	ldrh r1, [r0, 0x12]
+	ldrb r0, [r0, 0x6]
+	bl sub_82E3EA8
+	b _082E3840
+	.align 2, 0
+_082E382C: .4byte gRfuState
+_082E3830:
+	add r3, r5, 0x3
+	strh r3, [r4]
+	add r2, r5, 0x83
+	strh r2, [r4]
+_082E3840:
+	ldmdb r11, {r4-r6,r11,sp,lr}
+	bx lr
+	arm_func_end sio32intr_clock_master
+
+	arm_func_start sio32intr_clock_slave
+sio32intr_clock_slave: @ 82E3848
+	mov r12, sp
+	stmdb sp!, {r4-r6,r11,r12,lr,pc}
+	ldr r4, _082E3BF4
+	mov r0, 0x64
+	ldr r3, [r4]
+	mov r6, 0
+	strb r6, [r3, 0x10]
+	sub r11, r12, 0x4
+	bl STWI_set_timer_in_RAM
+	mov r0, r6
+	bl handshake_wait
+	mov r0, r0, lsl 16
+	cmp r0, 0x10000
+	mov r5, r4
+	beq _082E3C4C
+	mov r3, 0x128
+	add r3, r3, 0x4000000
+	mov r2, 0x5000
+	add r2, r2, 0xA
+	strh r2, [r3]
+	mov lr, 0x120
+	ldr r0, [r5]
+	add lr, lr, 0x4000000
+	ldr r12, [lr]
+	ldr r3, [r0]
+	cmp r3, 0x5
+	bne _082E3978
+	ldr r3, [r0, 0x28]
+	mov r4, 0x1
+	mov r0, 0x99000000
+	str r12, [r3]
+	add r0, r0, 0x660000
+	ldr r2, [r5]
+	mov r3, r0, lsr 16
+	strb r4, [r2, 0x5]
+	cmp r3, r12, lsr 16
+	bne _082E3AC4
+	ldr r3, [r5]
+	mov r2, r12, lsr 8
+	strb r2, [r3, 0x4]
+	ldr r2, [r5]
+	strb r12, [r2, 0x6]
+	ldr r1, [r5]
+	ldrb r3, [r1, 0x4]
+	cmp r3, r6
+	bne _082E395C
+	ldrb r2, [r1, 0x6]
+	sub r3, r2, 0x27
+	cmp r2, 0x36
+	cmpne r3, 0x2
+	bhi _082E3930
+	add r3, r2, 0x80
+	strb r3, [r1, 0x9]
+	ldr r2, [r5]
+	ldrb r3, [r2, 0x9]
+	ldr r1, [r2, 0x24]
+	add r3, r3, r0
+	b _082E39E0
+_082E3930:
+	ldr r2, [r1, 0x24]
+	ldr r3, _082E3BF8
+	str r3, [r2]
+	ldr r2, [r5]
+	ldrb r3, [r2, 0x6]
+	sub r3, r3, 0x10
+	cmp r3, 0x2D
+	bhi _082E3A18
+	ldr r3, [r2, 0x24]
+	str r4, [r3, 0x4]
+	b _082E3A24
+_082E395C:
+	mov r3, 0x80000000
+	str r3, [lr]
+	strb r4, [r1, 0x5]
+	ldr r2, [r5]
+	add r3, r3, 0x80000006
+	str r3, [r2]
+	b _082E3AD4
+_082E3978:
+	ldr r3, [r0]
+	cmp r3, 0x6
+	bne _082E3A78
+	ldrb r1, [r0, 0x5]
+	ldr r2, [r0, 0x28]
+	str r12, [r2, r1, lsl 2]
+	ldrb r3, [r0, 0x5]
+	add r3, r3, 0x1
+	strb r3, [r0, 0x5]
+	ldr r1, [r5]
+	ldrb r2, [r1, 0x4]
+	ldrb r3, [r1, 0x5]
+	cmp r2, r3
+	bcs _082E3A6C
+	ldrb r2, [r1, 0x6]
+	sub r3, r2, 0x28
+	cmp r2, 0x36
+	cmpne r3, 0x1
+	bhi _082E39F0
+	add r3, r2, 0x80
+	strb r3, [r1, 0x9]
+	ldr r2, [r5]
+	ldrb r3, [r2, 0x9]
+	ldr r1, [r2, 0x24]
+	orr r3, r3, 0x99000000
+	orr r3, r3, 0x660000
+_082E39E0:
+	str r3, [r1]
+	ldr r2, [r5]
+	strb r6, [r2, 0x7]
+	b _082E3A3C
+_082E39F0:
+	ldr r2, [r1, 0x24]
+	ldr r3, _082E3BF8
+	str r3, [r2]
+	ldr r2, [r5]
+	ldrb r3, [r2, 0x6]
+	sub r3, r3, 0x10
+	cmp r3, 0x2D
+	ldrls r2, [r2, 0x24]
+	movls r3, 0x1
+	bls _082E3A20
+_082E3A18:
+	ldr r2, [r2, 0x24]
+	mov r3, 0x2
+_082E3A20:
+	str r3, [r2, 0x4]
+_082E3A24:
+	ldr r2, [r5]
+	mov r3, 0x1
+	strb r3, [r2, 0x7]
+	ldr r1, [r5]
+	add r3, r3, 0x2
+	strh r3, [r1, 0x12]
+_082E3A3C:
+	ldr r0, [r5]
+	ldr r2, [r0, 0x24]
+	mov r3, 0x120
+	ldr r1, [r2]
+	add r3, r3, 0x4000000
+	str r1, [r3]
+	mov r2, 0x1
+	strb r2, [r0, 0x8]
+	ldr r1, [r5]
+	mov r3, 0x7
+	str r3, [r1]
+	b _082E3AD4
+_082E3A6C:
+	mov r3, 0x80000000
+	str r3, [lr]
+	b _082E3AD4
+_082E3A78:
+	ldr r3, [r0]
+	cmp r3, 0x7
+	bne _082E3AD4
+	cmp r12, 0x80000000
+	bne _082E3AC4
+	ldrb r2, [r0, 0x7]
+	ldrb r3, [r0, 0x8]
+	cmp r2, r3
+	movcc r3, 0x8
+	strcc r3, [r0]
+	bcc _082E3AD4
+	ldrb r1, [r0, 0x8]
+	ldr r3, [r0, 0x24]
+	ldr r2, [r3, r1, lsl 2]
+	str r2, [lr]
+	ldrb r3, [r0, 0x8]
+	add r3, r3, 0x1
+	strb r3, [r0, 0x8]
+	b _082E3AD4
+_082E3AC4:
+	bl STWI_stop_timer_in_RAM
+	mov r0, 0x64
+	bl STWI_set_timer_in_RAM
+	b _082E3C4C
+_082E3AD4:
+	mov r0, 0x1
+	bl handshake_wait
+	mov r0, r0, lsl 16
+	cmp r0, 0x10000
+	beq _082E3C4C
+	mov r6, r5
+	ldr r3, [r6]
+	ldr r2, [r3]
+	cmp r2, 0x8
+	bne _082E3B9C
+	mov r4, 0x128
+	add r4, r4, 0x4000000
+	mov r3, 0x5000
+	add r3, r3, 0x2
+	strh r3, [r4]
+	bl STWI_stop_timer_in_RAM
+	ldr r0, [r6]
+	ldrh r3, [r0, 0x12]
+	cmp r3, 0x3
+	bne _082E3B48
+	bl STWI_init_slave
+	ldr r3, [r6]
+	ldr r1, [r3, 0x1C]
+	cmp r1, 0
+	beq _082E3C4C
+	mov r0, 0x1EC
+	add r0, r0, 0x2
+	bl sub_82E3EAC
+	b _082E3C4C
+_082E3B48:
+	mov r3, 0x120
+	add r3, r3, 0x4000000
+	mov r1, 0
+	str r1, [r3]
+	mov r2, 0x5000
+	strh r1, [r4]
+	add r2, r2, 0x3
+	strh r2, [r4]
+	mov r3, 0x1
+	strb r3, [r0, 0x14]
+	ldr r0, [r5]
+	ldr r2, [r0, 0x1C]
+	str r1, [r0]
+	cmp r2, r1
+	beq _082E3C4C
+	ldrb r3, [r0, 0x4]
+	ldrb r0, [r0, 0x6]
+	mov r1, r2
+	orr r0, r0, r3, lsl 8
+	bl sub_82E3EAC
+	b _082E3C4C
+_082E3B9C:
+	mov r3, 0x208
+	add r3, r3, 0x4000000
+	mov r2, 0
+	strh r2, [r3]
+	mov r1, 0x100
+	add r2, r1, 0x4000002
+	ldrh r3, [r2]
+	tst r3, 0x80
+	beq _082E3C20
+	ldrh r3, [r2]
+	tst r3, 0x3
+	bne _082E3BFC
+	mov r2, 0xFF00
+	add r1, r1, 0x4000000
+	ldrh r3, [r1]
+	add r2, r2, 0x9B
+	cmp r3, r2
+	bls _082E3C20
+_082E3BE4:
+	ldrh r3, [r1]
+	cmp r3, r2
+	bhi _082E3BE4
+	b _082E3C20
+	.align 2, 0
+_082E3BF4: .4byte gRfuState
+_082E3BF8: .4byte 0x996601ee
+_082E3BFC:
+	mov r2, 0xFF00
+	add r1, r1, 0x4000000
+	ldrh r3, [r1]
+	add r2, r2, 0xFE
+	cmp r3, r2
+	bls _082E3C20
+_082E3C14:
+	ldrh r3, [r1]
+	cmp r3, r2
+	bhi _082E3C14
+_082E3C20:
+	mov r1, 0x128
+	add r1, r1, 0x4000000
+	mov r0, 0x208
+	add r0, r0, 0x4000000
+	mov r3, 0x5000
+	add r2, r3, 0x2
+	strh r2, [r1]
+	add r3, r3, 0x82
+	strh r3, [r1]
+	mov r2, 0x1
+	strh r2, [r0]
+_082E3C4C:
+	ldmdb r11, {r4-r6,r11,sp,lr}
+	bx lr
+	arm_func_end sio32intr_clock_slave
+
+	arm_func_start handshake_wait
+handshake_wait: @ 82E3C54
+	mov r12, sp
+	stmdb sp!, {r11,r12,lr,pc}
+	mov r1, 0x128
+	add r1, r1, 0x4000000
+	mov r0, r0, lsl 16
+	ldr r2, _082E3CB8
+	sub r11, r12, 0x4
+	mov lr, r0, lsr 14
+	ldr r12, [r2]
+_082E3C78:
+	ldrb r3, [r12, 0x10]
+	and r0, r3, 0xFF
+	cmp r0, 0x1
+	beq _082E3CA4
+	ldrh r3, [r1]
+	and r3, r3, 0x4
+	cmp r3, lr
+	bne _082E3C78
+	mov r0, 0
+	ldmdb r11, {r11,sp,lr}
+	bx lr
+_082E3CA4:
+	ldr r2, [r2]
+	mov r3, 0
+	strb r3, [r2, 0x10]
+	ldmdb r11, {r11,sp,lr}
+	bx lr
+	.align 2, 0
+_082E3CB8: .4byte gRfuState
+	arm_func_end handshake_wait
+
+	arm_func_start STWI_set_timer_in_RAM
+STWI_set_timer_in_RAM: @ 82E3CBC
+	mov r12, sp
+	stmdb sp!, {r4,r5,r11,r12,lr,pc}
+	mov r1, 0x208
+	add r1, r1, 0x4000000
+	mov r3, 0
+	sub r11, r12, 0x4
+	ldr r12, _082E3D74
+	and lr, r0, 0xFF
+	ldr r2, [r12]
+	cmp lr, 0x50
+	ldrb r0, [r2, 0xA]
+	mov r4, r12
+	mov r2, lr
+	strh r3, [r1]
+	mov r0, r0, lsl 2
+	add r3, r3, 0x100
+	add r1, r3, 0x4000000
+	add r3, r3, 0x4000002
+	add r5, r0, r3
+	beq _082E3D44
+	bgt _082E3D1C
+	cmp lr, 0x32
+	beq _082E3D30
+	b _082E3D90
+_082E3D1C:
+	cmp r2, 0x64
+	beq _082E3D5C
+	cmp r2, 0x82
+	beq _082E3D78
+	b _082E3D90
+_082E3D30:
+	mvn r3, 0x334
+	strh r3, [r0, r1]
+	ldr r2, [r4]
+	mov r3, 0x1
+	b _082E3D8C
+_082E3D44:
+	mov r3, 0xAE000000
+	mov r3, r3, asr 20
+	strh r3, [r0, r1]
+	ldr r2, [r4]
+	mov r3, 0x2
+	b _082E3D8C
+_082E3D5C:
+	mvn r3, 0x660
+	sub r3, r3, 0x9
+	strh r3, [r0, r1]
+	ldr r2, [r4]
+	mov r3, 0x3
+	b _082E3D8C
+	.align 2, 0
+_082E3D74: .4byte gRfuState
+_082E3D78:
+	mvn r3, 0x850
+	sub r3, r3, 0x2
+	strh r3, [r0, r1]
+	ldr r2, [r4]
+	mov r3, 0x4
+_082E3D8C:
+	str r3, [r2, 0xC]
+_082E3D90:
+	mov r12, 0x200
+	add r12, r12, 0x4000002
+	mov r3, 0xC3
+	strh r3, [r5]
+	mov r1, 0x208
+	ldr r2, [r4]
+	add r1, r1, 0x4000000
+	ldrb r0, [r2, 0xA]
+	sub r3, r3, 0xBB
+	mov r3, r3, lsl r0
+	strh r3, [r12]
+	mov r2, 0x1
+	strh r2, [r1]
+	ldmdb r11, {r4,r5,r11,sp,lr}
+	bx lr
+	arm_func_end STWI_set_timer_in_RAM
+
+	arm_func_start STWI_stop_timer_in_RAM
+STWI_stop_timer_in_RAM: @ 82E3DCC
+	mov r12, sp
+	stmdb sp!, {r11,r12,lr,pc}
+	mov r1, 0x100
+	ldr lr, _082E3E18
+	add r0, r1, 0x4000000
+	ldr r2, [lr]
+	sub r11, r12, 0x4
+	ldrb r3, [r2, 0xA]
+	mov r12, 0
+	str r12, [r2, 0xC]
+	mov r3, r3, lsl 2
+	strh r12, [r3, r0]
+	ldr r2, [lr]
+	ldrb r3, [r2, 0xA]
+	add r1, r1, 0x4000002
+	mov r3, r3, lsl 2
+	strh r12, [r3, r1]
+	ldmdb r11, {r11,sp,lr}
+	bx lr
+	.align 2, 0
+_082E3E18: .4byte gRfuState
+	arm_func_end STWI_stop_timer_in_RAM
+
+	arm_func_start STWI_init_slave
+STWI_init_slave: @ 82E3E1C
+	mov r12, sp
+	stmdb sp!, {r11,r12,lr,pc}
+	ldr r0, _082E3EA4
+	ldr r2, [r0]
+	mov r3, 0x5
+	str r3, [r2]
+	mov r1, 0
+	strb r1, [r2, 0x14]
+	ldr r3, [r0]
+	strb r1, [r3, 0x4]
+	ldr r2, [r0]
+	strb r1, [r2, 0x5]
+	ldr r3, [r0]
+	strb r1, [r3, 0x6]
+	ldr r2, [r0]
+	strb r1, [r2, 0x7]
+	ldr r3, [r0]
+	strb r1, [r3, 0x8]
+	ldr r2, [r0]
+	strb r1, [r2, 0x9]
+	ldr r3, [r0]
+	str r1, [r3, 0xC]
+	sub r11, r12, 0x4
+	strb r1, [r3, 0x10]
+	mov r2, 0x128
+	ldr r12, [r0]
+	add r2, r2, 0x4000000
+	strh r1, [r12, 0x12]
+	mov r3, 0x5000
+	strb r1, [r12, 0x15]
+	add r3, r3, 0x82
+	strh r3, [r2]
+	ldmdb r11, {r11,sp,lr}
+	bx lr
+	.align 2, 0
+_082E3EA4: .4byte gRfuState
+	arm_func_end STWI_init_slave
+
+	arm_func_start sub_82E3EA8
+sub_82E3EA8: @ 82E3EA8
+	bx r2
+	arm_func_end sub_82E3EA8
+
+	arm_func_start sub_82E3EAC
+sub_82E3EAC: @ 82E3EAC
+	bx r1
+	arm_func_end sub_82E3EAC
+
+	arm_func_start sub_82E3EB0
+sub_82E3EB0: @ 82E3EB0
+	bx r0
+	arm_func_end sub_82E3EB0

asm/macros/event.s

@@ -241,14 +241,14 @@
 	@ Calls a special function; that is, a piece of ASM code designed for use by scripts and listed in a table of pointers.
 	.macro special function
 	.byte 0x25
-	.2byte \function
+	.2byte SPECIAL_\function
 	.endm
 
 	@ Calls a special function. That function's output (if any) will be written to the variable you specify.
 	.macro specialval output, function
 	.byte 0x26
 	.2byte \output
-	.2byte \function
+	.2byte SPECIAL_\function
 	.endm
 
 	@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).

asm/main_menu.s

@@ -119,11 +119,11 @@ InitMainMenu: @ 802F6F4
 	str r0, [r1, 0x8]
 	ldr r0, [r1, 0x8]
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_082FF0A0
+	ldr r0, =gMainMenuBgPal
 	movs r1, 0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r0, =gUnknown_082FF0C0
+	ldr r0, =gMainMenuTextPal
 	movs r1, 0xF0
 	movs r2, 0x20
 	bl LoadPalette
@@ -1914,7 +1914,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
 	movs r0, 0x54
 	movs r1, 0
 	bl SetGpuReg
-	ldr r0, =gUnknown_082FED3C
+	ldr r0, =gBirchIntroShadowGfx
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZ77UnCompVram
@@ -3679,7 +3679,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
 	str r0, [r1, 0x8]
 	ldr r0, [r1, 0x8]
 	bl ResetPaletteFade
-	ldr r0, =gUnknown_082FED3C
+	ldr r0, =gBirchIntroShadowGfx
 	adds r1, r4, 0
 	bl LZ77UnCompVram
 	ldr r0, =gUnknown_082FEEF0
@@ -3689,7 +3689,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
 	movs r1, 0
 	movs r2, 0x40
 	bl LoadPalette
-	ldr r0, =gUnknown_082FF01A
+	ldr r0, =gUnknown_082FF018+2
 	movs r1, 0x1
 	movs r2, 0x10
 	bl LoadPalette
@@ -4459,11 +4459,11 @@ set_default_player_name: @ 8031DC4
 	adds r5, r1, 0
 	cmp r0, 0
 	bne _08031DE4
-	ldr r1, =gUnknown_082FF128
+	ldr r1, =gMalePresetNames
 	b _08031DE6
 	.pool
 _08031DE4:
-	ldr r1, =gUnknown_082FF178
+	ldr r1, =gFemalePresetNames
 _08031DE6:
 	lsls r0, r2, 2
 	adds r0, r1

asm/map_obj_8097404.s

@@ -205,8 +205,8 @@ _0809756C:
 	.pool
 	thumb_func_end npc_sync_anim_pause_bits
 
-	thumb_func_start sub_809757C
+	thumb_func_start UnfreezeMapObjects
-sub_809757C: @ 809757C
+UnfreezeMapObjects: @ 809757C
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gMapObjects
@@ -231,7 +231,7 @@ _08097598:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_809757C
+	thumb_func_end UnfreezeMapObjects
 
 	thumb_func_start little_step
 @ void little_step(struct obj *object, u8 direction)
@@ -1396,7 +1396,7 @@ oe_exec_and_other_stuff: @ 8097DD0
 	adds r0, r1, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
@@ -1434,7 +1434,7 @@ DoRippleFieldEffect: @ 8097E14
 	adds r4, r1, 0
 	ldrb r0, [r0, 0x5]
 	bl GetFieldObjectGraphicsInfo
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	movs r3, 0x20
 	ldrsh r1, [r4, r3]
 	str r1, [r2]

asm/map_obj_lock.s

@@ -59,8 +59,8 @@ _080983E2:
 	bx r1
 	thumb_func_end sub_80983C4
 
-	thumb_func_start sub_80983E8
+	thumb_func_start ScriptFreezeMapObjects
-sub_80983E8: @ 80983E8
+ScriptFreezeMapObjects: @ 80983E8
 	push {lr}
 	bl player_bitmagic
 	ldr r0, =sub_80983A4
@@ -69,7 +69,7 @@ sub_80983E8: @ 80983E8
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80983E8
+	thumb_func_end ScriptFreezeMapObjects
 
 	thumb_func_start sub_8098400
 sub_8098400: @ 8098400
@@ -149,8 +149,8 @@ _0809849A:
 	bx r1
 	thumb_func_end sub_809847C
 
-	thumb_func_start sub_80984A0
+	thumb_func_start LockSelectedMapObject
-sub_80984A0: @ 80984A0
+LockSelectedMapObject: @ 80984A0
 	push {r4,r5,lr}
 	ldr r4, =gSelectedMapObject
 	ldrb r0, [r4]
@@ -184,7 +184,7 @@ _080984DE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80984A0
+	thumb_func_end LockSelectedMapObject
 
 	thumb_func_start sub_80984F4
 sub_80984F4: @ 80984F4
@@ -203,7 +203,7 @@ sub_80984F4: @ 80984F4
 	adds r0, r1
 	bl FieldObjectClearAnimIfSpecialAnimFinished
 	bl sub_80D338C
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	pop {r0}
 	bx r0
 	.pool
@@ -239,7 +239,7 @@ _08098542:
 	adds r0, r4
 	bl FieldObjectClearAnimIfSpecialAnimFinished
 	bl sub_80D338C
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	pop {r4}
 	pop {r0}
 	bx r0

asm/mauville_old_man.s

@@ -1392,7 +1392,7 @@ _08120BB0:
 	movs r0, 0xFF
 	strb r0, [r7, 0x7]
 	mov r0, sp
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _08120BF8
 	mov r0, sp
@@ -1458,7 +1458,7 @@ _08120C48:
 	muls r0, r5
 	adds r0, 0x5
 	adds r0, r6, r0
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _08120C5E
 	mov r0, r8
@@ -1480,7 +1480,7 @@ _08120C6A:
 	movs r5, 0x3
 _08120C74:
 	adds r0, r6, 0
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _08120C84
 	mov r1, r8
@@ -1569,7 +1569,7 @@ _08120CF2:
 	mov r1, r8
 	strb r0, [r1, 0x7]
 	mov r0, sp
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _08120D1A
 	movs r0, 0x1
@@ -2205,7 +2205,7 @@ sub_8121178: @ 8121178
 	bl ConvertInternationalString
 	mov r0, r8
 	bl sub_8120EC0
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r3}
 	mov r8, r3
 	pop {r4-r6}

asm/menu.s

@@ -5201,7 +5201,7 @@ sub_819A25C: @ 819A25C
 	lsrs r4, 24
 	lsls r0, 16
 	lsrs r0, 16
-	bl sub_80D30B0
+	bl GetValidMonIconPalettePtr
 	adds r1, r4, 0
 	movs r2, 0x20
 	bl LoadPalette
@@ -5228,7 +5228,7 @@ sub_819A27C: @ 819A27C
 	lsls r5, 16
 	lsrs r5, 16
 	movs r2, 0x1
-	bl sub_80D2EDC
+	bl GetMonIconPtr
 	adds r1, r0, 0
 	movs r0, 0x20
 	str r0, [sp]

asm/menu_helpers.s

@@ -533,7 +533,7 @@ sub_81221AC: @ 81221AC
 	bl is_c1_link_related_active
 	cmp r0, 0x1
 	beq _081221BE
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	bne _081221C8

asm/money.s

@@ -1,311 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-
-
-
-	thumb_func_start sub_80E51B0
-sub_80E51B0: @ 80E51B0
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r1, [r1]
-	bl IsEnoughMoney
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80E51B0
-
-	thumb_func_start sub_80E51D4
-sub_80E51D4: @ 80E51D4
-	push {lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0x92
-	lsls r1, 3
-	adds r0, r1
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r1, [r1]
-	bl SubtractMoney
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E51D4
-
-	thumb_func_start PrintMoneyAmountInMoneyBox
-@ void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, s8 a3)
-PrintMoneyAmountInMoneyBox: @ 80E51F4
-	push {lr}
-	sub sp, 0x4
-	adds r3, r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, 24
-	lsrs r2, 24
-	str r2, [sp]
-	movs r1, 0x26
-	movs r2, 0x1
-	bl PrintMoneyAmount
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	thumb_func_end PrintMoneyAmountInMoneyBox
-
-	thumb_func_start PrintMoneyAmount
-@ void PrintMoneyAmount(u8 windowId, char x, char y, int amount, u8 a5)
-PrintMoneyAmount: @ 80E5214
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0xC
-	ldr r4, [sp, 0x24]
-	lsls r0, 24
-	lsrs r7, r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	lsls r2, 24
-	lsrs r6, r2, 24
-	lsls r4, 24
-	lsrs r5, r4, 24
-	ldr r4, =gStringVar1
-	adds r0, r4, 0
-	adds r1, r3, 0
-	movs r2, 0
-	movs r3, 0x6
-	bl ConvertIntToDecimalStringN
-	adds r0, r4, 0
-	bl StringLength
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x6
-	subs r1, r0
-	ldr r2, =gStringVar4
-	adds r0, r1, 0
-	subs r1, 0x1
-	cmp r0, 0
-	ble _080E5264
-	movs r3, 0x77
-_080E5258:
-	strb r3, [r2]
-	adds r2, 0x1
-	adds r0, r1, 0
-	subs r1, 0x1
-	cmp r0, 0
-	bgt _080E5258
-_080E5264:
-	ldr r1, =gText_PokedollarVar1
-	adds r0, r2, 0
-	bl StringExpandPlaceholders
-	ldr r2, =gStringVar4
-	str r6, [sp]
-	str r5, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	adds r0, r7, 0
-	movs r1, 0x1
-	mov r3, r8
-	bl PrintTextOnWindow
-	add sp, 0xC
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end PrintMoneyAmount
-
-	thumb_func_start set_window_border_style_and_print_money_box
-@ void set_window_border_style_and_print_money_box(u8 windowId, u16 tileStart, u8 palette, int amount)
-set_window_border_style_and_print_money_box: @ 80E5298
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	mov r8, r3
-	lsls r6, 24
-	lsrs r6, 24
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 24
-	lsrs r5, 24
-	adds r0, r6, 0
-	movs r1, 0
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl SetWindowBorderStyle
-	adds r0, r6, 0
-	mov r1, r8
-	movs r2, 0
-	bl PrintMoneyAmountInMoneyBox
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end set_window_border_style_and_print_money_box
-
-	thumb_func_start sub_80E52D4
-sub_80E52D4: @ 80E52D4
-	push {lr}
-	adds r1, r0, 0
-	ldr r0, =gUnknown_02039F98
-	ldrb r0, [r0]
-	movs r2, 0
-	bl PrintMoneyAmountInMoneyBox
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E52D4
-
-	thumb_func_start sub_80E52EC
-@ void sub_80E52EC(int money, int x, int y)
-sub_80E52EC: @ 80E52EC
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x18
-	mov r8, r0
-	adds r4, r1, 0
-	adds r3, r2, 0
-	lsls r4, 24
-	lsls r3, 24
-	lsrs r6, r4, 24
-	movs r0, 0x80
-	lsls r0, 17
-	adds r4, r0
-	lsrs r4, 24
-	lsrs r5, r3, 24
-	adds r3, r0
-	lsrs r3, 24
-	movs r0, 0xA
-	str r0, [sp]
-	movs r0, 0x2
-	str r0, [sp, 0x4]
-	movs r0, 0xF
-	str r0, [sp, 0x8]
-	movs r0, 0x8
-	str r0, [sp, 0xC]
-	add r0, sp, 0x10
-	movs r1, 0
-	adds r2, r4, 0
-	bl SetWindowTemplateFields
-	ldr r4, =gUnknown_02039F98
-	add r0, sp, 0x10
-	bl AddWindow
-	strb r0, [r4]
-	ldrb r0, [r4]
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	ldrb r0, [r4]
-	bl PutWindowTilemap
-	ldrb r0, [r4]
-	movs r1, 0x1
-	bl CopyWindowToVram
-	ldrb r0, [r4]
-	movs r1, 0x85
-	lsls r1, 2
-	movs r2, 0xE
-	mov r3, r8
-	bl set_window_border_style_and_print_money_box
-	lsls r6, 19
-	movs r0, 0x98
-	lsls r0, 13
-	adds r6, r0
-	lsrs r6, 16
-	lsls r5, 19
-	movs r0, 0xB0
-	lsls r0, 12
-	adds r5, r0
-	lsrs r5, 16
-	adds r0, r6, 0
-	adds r1, r5, 0
-	bl AddMoneyLabelObject
-	add sp, 0x18
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E52EC
-
-	thumb_func_start sub_80E5384
-sub_80E5384: @ 80E5384
-	push {r4,lr}
-	bl RemoveMoneyLabelObject
-	ldr r4, =gUnknown_02039F98
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_8198070
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	ldrb r0, [r4]
-	bl RemoveWindow
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80E5384
-
-	thumb_func_start AddMoneyLabelObject
-AddMoneyLabelObject: @ 80E53AC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r0, =gUnknown_0858C2A4
-	bl LoadCompressedObjectPic
-	ldr r0, =gUnknown_0858C2AC
-	bl LoadCompressedObjectPalette
-	ldr r0, =gUnknown_0858C28C
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	movs r3, 0
-	bl CreateSprite
-	ldr r1, =gUnknown_02039F99
-	strb r0, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end AddMoneyLabelObject
-
-	thumb_func_start RemoveMoneyLabelObject
-RemoveMoneyLabelObject: @ 80E53F4
-	push {lr}
-	ldr r0, =gUnknown_02039F99
-	ldrb r1, [r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl DestroySpriteAndFreeResources
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end RemoveMoneyLabelObject
-
-	.align 2, 0 @ Don't pad with nop.

asm/mystery_event_menu.s

@@ -337,7 +337,7 @@ _08178C54:
 	lsls r0, 24
 	cmp r0, 0
 	beq _08178D00
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08178C68
@@ -435,13 +435,13 @@ _08178D28:
 _08178D36:
 	b _08178E34
 _08178D38:
-	bl sub_800A550
+	bl GetBlockReceivedStatus
 	lsls r0, 24
 	cmp r0, 0
 	bne _08178D44
 	b _08178E58
 _08178D44:
-	bl sub_800A5B4
+	bl ResetBlockReceivedFlags
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -462,7 +462,7 @@ _08178D60:
 	b _08178E3C
 	.pool
 _08178D74:
-	ldr r0, =gUnknown_03003124
+	ldr r0, =gReceivedRemoteLinkPlayers
 	ldrb r6, [r0]
 	cmp r6, 0
 	bne _08178E58

asm/mystery_event_script.s

@@ -46,7 +46,7 @@ sub_8153804: @ 8153804
 	ldr r1, =gUnknown_08674C86
 	bl StringExpandPlaceholders
 	movs r0, 0x3
-	bl sub_81538C4
+	bl SetMysteryEventScriptStatus
 	pop {r0}
 	bx r0
 	.pool
@@ -140,13 +140,13 @@ _081538AC:
 	.pool
 	thumb_func_end sub_81538A0
 
-	thumb_func_start sub_81538C4
+	thumb_func_start SetMysteryEventScriptStatus
-sub_81538C4: @ 81538C4
+SetMysteryEventScriptStatus: @ 81538C4
 	ldr r1, =gUnknown_0203BBC0
 	str r0, [r1, 0x6C]
 	bx lr
 	.pool
-	thumb_func_end sub_81538C4
+	thumb_func_end SetMysteryEventScriptStatus
 
 	thumb_func_start sub_81538D0
 sub_81538D0: @ 81538D0

asm/naming_screen.s

@@ -840,7 +840,7 @@ pokemon_transfer_to_pc_with_message: @ 80E34E4
 	bl VarGet
 	lsls r0, 24
 	lsrs r0, 24
-	bl sav3_get_box_name
+	bl GetBoxNamePtr
 	adds r1, r0, 0
 	adds r0, r4, 0
 	bl StringCopy
@@ -859,7 +859,7 @@ _080E3534:
 	bl VarGet
 	lsls r0, 24
 	lsrs r0, 24
-	bl sav3_get_box_name
+	bl GetBoxNamePtr
 	adds r1, r0, 0
 	adds r0, r4, 0
 	bl StringCopy
@@ -874,7 +874,7 @@ _080E3534:
 	bl get_unknown_box_id
 	lsls r0, 24
 	lsrs r0, 24
-	bl sav3_get_box_name
+	bl GetBoxNamePtr
 	adds r1, r0, 0
 	adds r0, r4, 0
 	bl StringCopy

asm/party_menu.s

@@ -5441,7 +5441,7 @@ sub_81B2E64: @ 81B2E64
 	mov r2, r9
 	lsls r1, r2, 16
 	asrs r1, 16
-	bl sub_8075060
+	bl GetHPBarLevel
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -5495,7 +5495,7 @@ _081B2F04:
 	asrs r1, 16
 	ldr r2, [r6]
 	ldrb r2, [r2, 0x1A]
-	bl sub_8075034
+	bl GetScaledHPFraction
 	lsls r0, 24
 	lsrs r5, r0, 24
 	ldrb r0, [r6, 0x8]
@@ -10051,7 +10051,7 @@ task_launch_hm_phase_2: @ 81B5750
 	cmp r0, 0x1
 	bne _081B577C
 	bl brm_get_selected_species
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 16
 	lsrs r0, 16
 	str r0, [r1]
@@ -10135,7 +10135,7 @@ _081B57FE:
 hm_surf_run_dp02scr: @ 81B5804
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -10239,7 +10239,7 @@ sub_81B58A8: @ 81B58A8
 hm2_waterfall: @ 81B58D4
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -10299,7 +10299,7 @@ _081B594E:
 sub_81B5958: @ 81B5958
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -10314,7 +10314,7 @@ sub_81B5958: @ 81B5958
 sub_81B5974: @ 81B5974
 	push {lr}
 	bl sub_809D1E8
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1, 0x4]
@@ -10452,7 +10452,7 @@ sub_81B5A8C: @ 81B5A8C
 	asrs r2, 16
 	adds r0, r1, 0
 	adds r1, r2, 0
-	bl sub_8075060
+	bl GetHPBarLevel
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -13868,7 +13868,7 @@ sub_81B7810: @ 81B7810
 	adds r0, r7, 0
 	adds r1, r4, 0
 	movs r2, 0x1
-	bl sub_813DA40
+	bl BeginEvolutionScene
 	adds r0, r5, 0
 	bl DestroyTask
 	b _081B786E
@@ -15205,7 +15205,7 @@ sub_81B841C: @ 81B841C
 	beq _081B8438
 	adds r0, r1, 0
 	movs r1, 0x1
-	bl sub_80D6D70
+	bl AddPCItem
 	b _081B8440
 	.pool
 _081B8438:
@@ -15872,7 +15872,7 @@ sub_81B8958: @ 81B8958
 	thumb_func_start sub_81B8984
 sub_81B8984: @ 81B8984
 	push {lr}
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _081B8994
@@ -16222,13 +16222,13 @@ _081B8CB0:
 	strb r0, [r6, 0x2]
 	b _081B8D58
 _081B8CBE:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _081B8CFC
 	movs r5, 0x1
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	mov r2, sp
 	ldr r1, =gBattlePartyID
 	lsls r0, 24
@@ -16255,7 +16255,7 @@ _081B8CF0:
 _081B8CFC:
 	movs r5, 0x2
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	mov r1, sp
 	ldr r4, =gBattlePartyID
 	lsls r0, 24
@@ -16264,7 +16264,7 @@ _081B8CFC:
 	ldrh r0, [r0]
 	strb r0, [r1]
 	movs r0, 0x2
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	mov r1, sp
 	lsls r0, 24
 	lsrs r0, 23
@@ -16344,19 +16344,19 @@ sub_81B8D88: @ 81B8D88
 	cmp r0, 0
 	bne _081B8DB0
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0x2
 	b _081B8DBC
 _081B8DB0:
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0x3
 _081B8DBC:
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r6, r0, 24
 	bl sub_81B1250
@@ -16382,7 +16382,7 @@ _081B8DE2:
 	strb r0, [r5, 0x2]
 	b _081B8E72
 _081B8DF0:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _081B8E28

asm/player_pc.s

@@ -31,7 +31,7 @@ _0816AE1A:
 	ldrh r0, [r0]
 	adds r1, r6
 	ldrh r1, [r1]
-	bl sub_80D6D70
+	bl AddPCItem
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/pokeball.s

@@ -17,7 +17,7 @@ sub_80753E8: @ 80753E8
 	ldr r1, =gDoingBattleAnim
 	movs r0, 0x1
 	strb r0, [r1]
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r6, =gActiveBank
 	ldrb r1, [r6]
@@ -185,7 +185,7 @@ _08075548:
 	.pool
 _08075584:
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	ldr r1, =gBankTarget
 	strb r0, [r1]
 	movs r0, 0x1
@@ -992,7 +992,7 @@ _08075C22:
 	movs r2, 0xC
 	bl PlayCry4
 _08075C2E:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	mov r2, r8
@@ -1082,7 +1082,7 @@ _08075CD8:
 	movs r2, 0xB
 	bl PlayCry4
 _08075CE4:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	mov r2, r8
@@ -1199,23 +1199,23 @@ _08075DD4:
 	lsrs r0, 16
 	mov r9, r0
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
 	beq _08075E00
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
 	bne _08075E56
 _08075E00:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08075E56
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -1243,11 +1243,11 @@ _08075E4C:
 	movs r2, 0x80
 	bl m4aMPlayVolumeControl
 _08075E56:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08075E70
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -1261,13 +1261,13 @@ _08075E70:
 	.pool
 _08075E80:
 	movs r0, 0
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
 	beq _08075E9C
 	movs r0, 0x1
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -1278,7 +1278,7 @@ _08075E9C:
 _08075EA0:
 	movs r4, 0x2
 _08075EA2:
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	mov r2, r8
@@ -1508,7 +1508,7 @@ _0807605C:
 	strh r1, [r0, 0x26]
 	ldr r0, =gDoingBattleAnim
 	strb r2, [r0]
-	ldr r4, =gUnknown_020244D0
+	ldr r4, =gBattleSpritesDataPtr
 	ldr r0, [r4]
 	ldr r0, [r0, 0x4]
 	lsls r1, r6, 1
@@ -1619,7 +1619,7 @@ _08076130:
 	ands r0, r1
 	cmp r0, 0
 	beq _08076196
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x4]
 	lsls r1, r7, 1
@@ -1815,11 +1815,11 @@ _080762F8:
 	ldrb r0, [r5, 0x6]
 	strh r0, [r5, 0x3A]
 	strh r1, [r5, 0x2E]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08076358
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -1830,7 +1830,7 @@ _080762F8:
 	movs r0, 0x3A
 	ldrsh r4, [r5, r0]
 	movs r0, 0x2
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -1888,11 +1888,11 @@ sub_8076398: @ 8076398
 	ble _080763EC
 	movs r0, 0
 	strh r0, [r5, 0x2E]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _080763E8
-	ldr r0, =gUnknown_020244D0
+	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r0, [r0, 0x8]
 	ldrb r1, [r0, 0x9]
@@ -1903,7 +1903,7 @@ sub_8076398: @ 8076398
 	movs r0, 0x3A
 	ldrsh r4, [r5, r0]
 	movs r0, 0x3
-	bl GetBankByPlayerAI
+	bl GetBankByIdentity
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0

asm/pokeblock_feed.s

@@ -95,7 +95,7 @@ _08179C48:
 	bl FreeAllSpritePalettes
 	b _08179D32
 _08179C4E:
-	bl init_uns_table_pokemon_copy
+	bl AllocateMonSpritesGfx
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -322,7 +322,7 @@ _08179E48:
 	lsls r0, r5, 3
 	ldr r1, =gMonFrontPicTable
 	adds r0, r1
-	ldr r1, =gBattleSpritesGfx
+	ldr r1, =gMonSpritesGfxPtr
 	ldr r1, [r1]
 	ldr r1, [r1, 0x8]
 	adds r2, r5, 0
@@ -797,7 +797,7 @@ sub_817A2C0: @ 817A2C0
 	ldr r0, =gUnknown_0203BD18
 	ldr r0, [r0]
 	bl Free
-	bl sub_805F094
+	bl FreeMonSpritesGfx
 _0817A304:
 	pop {r4}
 	pop {r0}

asm/pokedex.s

@@ -8429,8 +8429,8 @@ _080BFDB4:
 	.pool
 	thumb_func_end sub_80BFD7C
 
-	thumb_func_start sub_80BFDF4
+	thumb_func_start CreateDexDisplayMonDataTask
-sub_80BFDF4: @ 80BFDF4
+CreateDexDisplayMonDataTask: @ 80BFDF4
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
@@ -8460,7 +8460,7 @@ sub_80BFDF4: @ 80BFDF4
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80BFDF4
+	thumb_func_end CreateDexDisplayMonDataTask
 
 	thumb_func_start sub_80BFE38
 sub_80BFE38: @ 80BFE38

asm/pokemon_2.s

@@ -1,356 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start CopyPlayerPartyMonToBattleData
-CopyPlayerPartyMonToBattleData: @ 806B9FC
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x18
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp, 0x14]
-	lsls r1, 24
-	lsrs r1, 24
-	mov r9, r1
-	movs r0, 0x64
-	mov r5, r9
-	muls r5, r0
-	ldr r0, =gPlayerParty
-	adds r5, r0
-	adds r0, r5, 0
-	movs r1, 0xB
-	movs r2, 0
-	bl GetMonData
-	ldr r1, =gBattleMons
-	mov r8, r1
-	movs r1, 0x58
-	ldr r2, [sp, 0x14]
-	adds r4, r2, 0
-	muls r4, r1
-	mov r3, r8
-	adds r6, r4, r3
-	strh r0, [r6]
-	adds r0, r5, 0
-	movs r1, 0xC
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r6, 0x2E]
-	movs r6, 0
-	mov r0, r8
-	adds r0, 0x24
-	adds r7, r4, r0
-_0806BA4E:
-	adds r1, r6, 0
-	adds r1, 0xD
-	adds r0, r5, 0
-	movs r2, 0
-	bl GetMonData
-	movs r1, 0xC
-	add r1, r8
-	mov r10, r1
-	adds r1, r4, r1
-	strh r0, [r1]
-	adds r1, r6, 0
-	adds r1, 0x11
-	adds r0, r5, 0
-	movs r2, 0
-	bl GetMonData
-	strb r0, [r7]
-	adds r7, 0x1
-	adds r4, 0x2
-	adds r6, 0x1
-	cmp r6, 0x3
-	ble _0806BA4E
-	movs r0, 0x64
-	mov r4, r9
-	muls r4, r0
-	ldr r0, =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0x15
-	movs r2, 0
-	bl GetMonData
-	movs r2, 0xC
-	negs r2, r2
-	add r2, r10
-	mov r9, r2
-	movs r1, 0x58
-	ldr r3, [sp, 0x14]
-	adds r5, r3, 0
-	muls r5, r1
-	adds r7, r5, r2
-	adds r1, r7, 0
-	adds r1, 0x3B
-	strb r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x20
-	movs r2, 0
-	bl GetMonData
-	adds r1, r7, 0
-	adds r1, 0x2B
-	strb r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x19
-	movs r2, 0
-	bl GetMonData
-	mov r1, r10
-	adds r1, 0x38
-	adds r1, r5, r1
-	str r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x27
-	movs r2, 0
-	bl GetMonData
-	movs r6, 0x1F
-	ands r0, r6
-	ldrb r2, [r7, 0x14]
-	movs r1, 0x20
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r7, 0x14]
-	adds r0, r4, 0
-	movs r1, 0x28
-	movs r2, 0
-	bl GetMonData
-	movs r1, 0x1F
-	mov r8, r1
-	mov r2, r8
-	ands r0, r2
-	lsls r0, 5
-	ldrh r2, [r7, 0x14]
-	ldr r1, =0xfffffc1f
-	ands r1, r2
-	orrs r1, r0
-	strh r1, [r7, 0x14]
-	adds r0, r4, 0
-	movs r1, 0x29
-	movs r2, 0
-	bl GetMonData
-	ands r0, r6
-	lsls r0, 2
-	ldrb r2, [r7, 0x15]
-	movs r1, 0x7D
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r7, 0x15]
-	adds r0, r4, 0
-	movs r1, 0x2A
-	movs r2, 0
-	bl GetMonData
-	movs r1, 0x1F
-	ands r1, r0
-	lsls r1, 15
-	ldr r0, [r7, 0x14]
-	ldr r2, =0xfff07fff
-	ands r0, r2
-	orrs r0, r1
-	str r0, [r7, 0x14]
-	adds r0, r4, 0
-	movs r1, 0x2B
-	movs r2, 0
-	bl GetMonData
-	mov r3, r8
-	ands r0, r3
-	lsls r0, 4
-	ldrh r2, [r7, 0x16]
-	ldr r1, =0xfffffe0f
-	ands r1, r2
-	orrs r1, r0
-	strh r1, [r7, 0x16]
-	adds r0, r4, 0
-	movs r1, 0x2C
-	movs r2, 0
-	bl GetMonData
-	ands r0, r6
-	lsls r0, 1
-	ldrb r2, [r7, 0x17]
-	movs r1, 0x3F
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r7, 0x17]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0
-	bl GetMonData
-	mov r1, r10
-	adds r1, 0x3C
-	adds r1, r5, r1
-	str r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x37
-	movs r2, 0
-	bl GetMonData
-	mov r1, r10
-	adds r1, 0x40
-	adds r1, r5, r1
-	str r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x38
-	movs r2, 0
-	bl GetMonData
-	adds r1, r7, 0
-	adds r1, 0x2A
-	strb r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x39
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r7, 0x28]
-	adds r0, r4, 0
-	movs r1, 0x3A
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r7, 0x2C]
-	adds r0, r4, 0
-	movs r1, 0x3B
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r7, 0x2]
-	adds r0, r4, 0
-	movs r1, 0x3C
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r7, 0x4]
-	adds r0, r4, 0
-	movs r1, 0x3D
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r7, 0x6]
-	adds r0, r4, 0
-	movs r1, 0x3E
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r7, 0x8]
-	adds r0, r4, 0
-	movs r1, 0x3F
-	movs r2, 0
-	bl GetMonData
-	strh r0, [r7, 0xA]
-	adds r0, r4, 0
-	movs r1, 0x2D
-	movs r2, 0
-	bl GetMonData
-	movs r1, 0x1
-	ands r0, r1
-	lsls r0, 6
-	ldrb r2, [r7, 0x17]
-	movs r1, 0x41
-	negs r1, r1
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r7, 0x17]
-	adds r0, r4, 0
-	movs r1, 0x2E
-	movs r2, 0
-	bl GetMonData
-	lsls r0, 7
-	ldrb r2, [r7, 0x17]
-	movs r1, 0x7F
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r7, 0x17]
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0
-	bl GetMonData
-	mov r1, r10
-	adds r1, 0x48
-	adds r1, r5, r1
-	str r0, [r1]
-	ldr r2, =gBaseStats
-	ldrh r1, [r7]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x6]
-	adds r1, r7, 0
-	adds r1, 0x21
-	strb r0, [r1]
-	ldrh r1, [r7]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x7]
-	adds r1, r7, 0
-	adds r1, 0x22
-	strb r0, [r1]
-	ldrh r0, [r7]
-	ldrb r1, [r7, 0x17]
-	lsrs r1, 7
-	bl GetAbilityBySpecies
-	adds r1, r7, 0
-	adds r1, 0x20
-	strb r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x2
-	mov r2, sp
-	bl GetMonData
-	mov r0, r10
-	adds r0, 0x24
-	adds r0, r5, r0
-	mov r1, sp
-	bl StringCopy10
-	mov r2, r10
-	adds r2, 0x30
-	adds r2, r5, r2
-	adds r0, r4, 0
-	movs r1, 0x7
-	bl GetMonData
-	ldr r0, [sp, 0x14]
-	bl GetBankSide
-	ldr r1, =gBattleStruct
-	lsls r0, 24
-	lsrs r0, 23
-	adds r0, 0xA8
-	ldr r1, [r1]
-	adds r1, r0
-	ldrh r0, [r7, 0x28]
-	strh r0, [r1]
-	movs r2, 0x6
-	mov r1, r9
-	movs r6, 0x7
-	add r5, r10
-	adds r0, r5, 0
-	adds r0, 0x13
-_0806BCB2:
-	strb r2, [r0]
-	subs r0, 0x1
-	subs r6, 0x1
-	cmp r6, 0
-	bge _0806BCB2
-	movs r2, 0
-	movs r0, 0x58
-	ldr r3, [sp, 0x14]
-	muls r0, r3
-	adds r1, 0x50
-	adds r0, r1
-	str r2, [r0]
-	ldr r0, [sp, 0x14]
-	bl sub_803FA70
-	ldr r0, [sp, 0x14]
-	movs r1, 0
-	bl sub_805EF84
-	add sp, 0x18
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end CopyPlayerPartyMonToBattleData
-
-	.align 2, 0 @ Don't pad with nop.

asm/pokemon_icon.s

@@ -32,7 +32,7 @@ sub_80D2CC4: @ 80D2CC4
 	str r0, [sp, 0x18]
 	adds r0, r4, 0
 	adds r2, r5, 0
-	bl sub_80D2EDC
+	bl GetMonIconPtr
 	str r0, [sp, 0x1C]
 	ldr r0, =gUnknown_0857C5B4
 	str r0, [sp, 0x20]
@@ -271,9 +271,9 @@ _080D2ED2:
 	bx r1
 	thumb_func_end sub_80D2E84
 
-	thumb_func_start sub_80D2EDC
+	thumb_func_start GetMonIconPtr
-@ void *sub_80D2EDC(u16 speciesId, u32 personality, bool32)
+@ void *GetMonIconPtr(u16 speciesId, u32 personality, bool32)
-sub_80D2EDC: @ 80D2EDC
+GetMonIconPtr: @ 80D2EDC
 	push {r4,lr}
 	adds r4, r2, 0
 	lsls r0, 16
@@ -286,7 +286,7 @@ sub_80D2EDC: @ 80D2EDC
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80D2EDC
+	thumb_func_end GetMonIconPtr
 
 	thumb_func_start sub_80D2EF8
 sub_80D2EF8: @ 80D2EF8
@@ -534,8 +534,8 @@ sub_80D30A0: @ 80D30A0
 	.pool
 	thumb_func_end sub_80D30A0
 
-	thumb_func_start sub_80D30B0
+	thumb_func_start GetValidMonIconPalettePtr
-sub_80D30B0: @ 80D30B0
+GetValidMonIconPalettePtr: @ 80D30B0
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
@@ -556,7 +556,7 @@ _080D30C2:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80D30B0
+	thumb_func_end GetValidMonIconPalettePtr
 
 	thumb_func_start sub_80D30DC
 sub_80D30DC: @ 80D30DC

asm/pokemon_item_effect.s

@@ -221,7 +221,7 @@ _0806BEE0:
 	mov r0, r8
 	movs r2, 0
 	ldr r3, [sp, 0x10]
-	bl sub_813DA40
+	bl BeginEvolutionScene
 	movs r0, 0
 	bl _0806CD5C
 _0806BEF0:
@@ -1155,7 +1155,7 @@ _0806C6AE:
 	movs r0, 0
 	movs r1, 0
 	movs r2, 0
-	bl dp01_build_cmdbuf_x00_a_b_0
+	bl EmitGetMonData
 	ldrb r0, [r4]
 	bl MarkBufferBankForExecution
 	strb r5, [r4]