fix merge conflict

.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) $(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

@@ -1547,7 +1547,7 @@ _080358E0:
 	.4byte _08035A40
 	.4byte _08035A70
 _08035904:
-	ldr r4, =gUnknown_0831ABA8
+	ldr r4, =gBattleTerrainTable
 	ldr r5, =gBattleTerrain
 	ldrb r1, [r5]
 	lsls r0, r1, 2
@@ -2632,7 +2632,7 @@ _08036350:
 	lsls r0, 24
 	cmp r0, 0
 	bne _0803639C
-	ldr r4, =gUnknown_0831ABA8
+	ldr r4, =gBattleTerrainTable
 	ldr r5, =gBattleTerrain
 	ldrb r1, [r5]
 	lsls r0, r1, 2
@@ -2778,7 +2778,7 @@ _080364A8:
 	.4byte _08036510
 	.4byte _08036518
 _080364CC:
-	ldr r2, =gUnknown_0831ABA8
+	ldr r2, =gBattleTerrainTable
 	ldr r0, =gBattleTerrain
 	ldrb r1, [r0]
 	lsls r0, r1, 2
@@ -2888,7 +2888,7 @@ _080365B4:
 	.4byte _0803661C
 	.4byte _08036624
 _080365D8:
-	ldr r2, =gUnknown_0831ABA8
+	ldr r2, =gBattleTerrainTable
 	ldr r0, =gBattleTerrain
 	ldrb r1, [r0]
 	lsls r0, r1, 2
@@ -3003,7 +3003,7 @@ _080366C8:
 	.4byte _08036738
 	.4byte _08036740
 _080366EC:
-	ldr r2, =gUnknown_0831ABA8
+	ldr r2, =gBattleTerrainTable
 	ldr r0, =gBattleTerrain
 	ldrb r1, [r0]
 	lsls r0, r1, 2

asm/battle_7.s

@@ -1323,8 +1323,8 @@ _0805DC02:
 	.pool
 	thumb_func_end mplay_80342A4
 
-	thumb_func_start sub_805DC0C
+	thumb_func_start BattleLoadOpponentMonSpriteGfx
-sub_805DC0C: @ 805DC0C
+BattleLoadOpponentMonSpriteGfx: @ 805DC0C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1474,10 +1474,10 @@ _0805DD46:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805DC0C
+	thumb_func_end BattleLoadOpponentMonSpriteGfx
 
-	thumb_func_start sub_805DD7C
+	thumb_func_start BattleLoadPlayerMonSpriteGfx
-sub_805DD7C: @ 805DD7C
+BattleLoadPlayerMonSpriteGfx: @ 805DD7C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1658,7 +1658,7 @@ _0805DEFC:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805DD7C
+	thumb_func_end BattleLoadPlayerMonSpriteGfx
 
 	thumb_func_start nullsub_23
 nullsub_23: @ 805DF30
@@ -1703,8 +1703,8 @@ sub_805DF38: @ 805DF38
 	.pool
 	thumb_func_end sub_805DF38
 
-	thumb_func_start sub_805DF84
+	thumb_func_start LoadBackTrainerBankSpriteGfx
-sub_805DF84: @ 805DF84
+LoadBackTrainerBankSpriteGfx: @ 805DF84
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
@@ -1742,7 +1742,7 @@ sub_805DF84: @ 805DF84
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805DF84
+	thumb_func_end LoadBackTrainerBankSpriteGfx
 
 	thumb_func_start nullsub_25
 nullsub_25: @ 805DFE0
@@ -1772,7 +1772,7 @@ sub_805DFFC: @ 805DFFC
 	adds r4, 0x8
 	adds r0, r4, 0
 	bl LoadSpritePalette
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805E034
@@ -1821,8 +1821,8 @@ _0805E076:
 	.pool
 	thumb_func_end sub_805DFFC
 
-	thumb_func_start sub_805E08C
+	thumb_func_start BattleLoadAllHealthBoxesGfx
-sub_805E08C: @ 805E08C
+BattleLoadAllHealthBoxesGfx: @ 805E08C
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -1843,7 +1843,7 @@ _0805E09C:
 	b _0805E1AE
 	.pool
 _0805E0B8:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805E120
@@ -1953,7 +1953,7 @@ _0805E1AE:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_805E08C
+	thumb_func_end BattleLoadAllHealthBoxesGfx
 
 	thumb_func_start load_gfxc_health_bar
 load_gfxc_health_bar: @ 805E1B8
@@ -2002,7 +2002,7 @@ _0805E214:
 	b _0805E324
 _0805E21A:
 	ldrb r0, [r4]
-	bl sub_805E08C
+	bl BattleLoadAllHealthBoxesGfx
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805E228
@@ -2022,12 +2022,12 @@ _0805E230:
 	ldrb r0, [r4]
 	cmp r0, 0
 	bne _0805E24C
-	bl battle_make_oam_safari_battle
+	bl CreateSafariPlayerHealthboxSprites
 	b _0805E252
 	.pool
 _0805E24C:
 	ldrb r0, [r4]
-	bl battle_make_oam_normal_battle
+	bl CreateBankHealthboxSprites
 _0805E252:
 	ldr r2, =gHealthBoxesIds
 	ldrb r1, [r4]
@@ -2037,7 +2037,7 @@ _0805E252:
 	.pool
 _0805E260:
 	ldrb r0, [r4]
-	bl sub_8072B18
+	bl SetBankHealthboxSpritePos
 	ldr r0, =gBanksBySide
 	ldrb r1, [r4]
 	adds r0, r1, r0
@@ -2084,7 +2084,7 @@ _0805E29C:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	b _0805E302
 	.pool
 _0805E2E4:
@@ -2101,13 +2101,13 @@ _0805E2E4:
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 _0805E302:
 	ldr r1, =gHealthBoxesIds
 	ldrb r0, [r4]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 _0805E30E:
 	ldrb r0, [r4]
 	adds r0, 0x1
@@ -2128,7 +2128,7 @@ _0805E324:
 	b _0805E346
 	.pool
 _0805E33C:
-	bl sub_805EC84
+	bl LoadAndCreateEnemyShadowSprites
 	bl sub_81B8C68
 	movs r6, 0x1
 _0805E346:
@@ -2541,7 +2541,7 @@ _0805E662:
 	ldr r1, =gSprites
 	adds r1, 0x8
 	adds r0, r1
-	ldr r1, =gUnknown_08309AAC
+	ldr r1, =gMonAnimationsSpriteAnimsPtrTable
 	mov r3, r8
 	lsls r2, r3, 2
 	adds r1, r2
@@ -2630,8 +2630,8 @@ _0805E77A:
 	.pool
 	thumb_func_end sub_805E448
 
-	thumb_func_start sub_805E7DC
+	thumb_func_start BattleLoadSubstituteSpriteGfx
-sub_805E7DC: @ 805E7DC
+BattleLoadSubstituteSpriteGfx: @ 805E7DC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2732,7 +2732,7 @@ _0805E898:
 	ldr r1, =gEnemyParty
 	adds r0, r1
 	adds r1, r4, 0
-	bl sub_805DC0C
+	bl BattleLoadOpponentMonSpriteGfx
 	b _0805E8E6
 	.pool
 _0805E8D0:
@@ -2745,13 +2745,13 @@ _0805E8D0:
 	ldr r1, =gPlayerParty
 	adds r0, r1
 	adds r1, r5, 0
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 _0805E8E6:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805E7DC
+	thumb_func_end BattleLoadSubstituteSpriteGfx
 
 	thumb_func_start refresh_graphics_maybe
 refresh_graphics_maybe: @ 805E8F4
@@ -2766,7 +2766,7 @@ refresh_graphics_maybe: @ 805E8F4
 	lsrs r4, 24
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl sub_805E7DC
+	bl BattleLoadSubstituteSpriteGfx
 	lsls r0, r4, 4
 	adds r0, r4
 	lsls r0, 2
@@ -2905,7 +2905,7 @@ _0805EA08:
 	negs r0, r0
 	ands r0, r2
 	strb r0, [r1]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _0805EA34
@@ -2914,7 +2914,7 @@ _0805EA08:
 	b _0805EA5A
 	.pool
 _0805EA34:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805EA5A
@@ -2955,7 +2955,7 @@ BattleMusicStop: @ 805EA60
 	adds r0, r6, 0
 	ands r0, r2
 	strb r0, [r1]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805EAA2
@@ -3059,7 +3059,7 @@ sub_805EAE8: @ 805EAE8
 	mov r1, r8
 	bl sub_805E990
 _0805EB5A:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805EB7E
@@ -3195,8 +3195,8 @@ _0805EC6C:
 	.pool
 	thumb_func_end sub_805EB9C
 
-	thumb_func_start sub_805EC84
+	thumb_func_start LoadAndCreateEnemyShadowSprites
-sub_805EC84: @ 805EC84
+LoadAndCreateEnemyShadowSprites: @ 805EC84
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -3247,7 +3247,7 @@ sub_805EC84: @ 805EC84
 	lsls r0, 2
 	adds r0, r7
 	strh r5, [r0, 0x2E]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805ED56
@@ -3299,7 +3299,7 @@ _0805ED56:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805EC84
+	thumb_func_end LoadAndCreateEnemyShadowSprites
 
 	thumb_func_start sub_805ED70
 @ int sub_805ED70(obj *a1)
@@ -3365,7 +3365,7 @@ _0805EDE4:
 	adds r4, r1, 0
 	cmp r0, 0
 	beq _0805EE06
-	ldr r0, =gUnknown_08305DCC
+	ldr r0, =gEnemyMonElevation
 	ldrh r1, [r3, 0x2]
 	adds r1, r0
 	ldrb r0, [r1]
@@ -3418,8 +3418,8 @@ sub_805EE48: @ 805EE48
 	bx lr
 	thumb_func_end sub_805EE48
 
-	thumb_func_start sub_805EE54
+	thumb_func_start SetBankEnemyShadowSpriteCallback
-sub_805EE54: @ 805EE54
+SetBankEnemyShadowSpriteCallback: @ 805EE54
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -3441,7 +3441,7 @@ sub_805EE54: @ 805EE54
 	beq _0805EE7E
 	adds r5, r0, 0
 _0805EE7E:
-	ldr r0, =gUnknown_08305DCC
+	ldr r0, =gEnemyMonElevation
 	adds r0, r5, r0
 	ldrb r0, [r0]
 	cmp r0, 0
@@ -3482,7 +3482,7 @@ _0805EED0:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_805EE54
+	thumb_func_end SetBankEnemyShadowSpriteCallback
 
 	thumb_func_start sub_805EEE0
 sub_805EEE0: @ 805EEE0

asm/battle_anim.s

@@ -4047,7 +4047,7 @@ sub_80A5AFC: @ 80A5AFC
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A5BA6
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A5BA6
@@ -4129,7 +4129,7 @@ sub_80A5BAC: @ 80A5BAC
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A5C38
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A5C38

asm/battle_anim_80FE840.s

@@ -721,7 +721,7 @@ sub_80FEE1C: @ 80FEE1C
 	lsls r0, 24
 	cmp r0, 0
 	bne _080FEE36
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _080FEE3E
@@ -1260,7 +1260,7 @@ _080FF260:
 sub_80FF268: @ 80FF268
 	push {r4,lr}
 	adds r4, r0, 0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5433,7 +5433,7 @@ _08101378:
 	ldr r0, =gAnimationBankTarget
 _0810137A:
 	ldrb r6, [r0]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081013C4
@@ -7557,7 +7557,7 @@ _08102448:
 	bne _08102464
 	adds r0, r4, r5
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 _08102464:
 	movs r1, 0x2
 	ldrsh r0, [r6, r1]
@@ -7571,7 +7571,7 @@ _08102464:
 	bne _08102482
 	adds r0, r4, r5
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 _08102482:
 	adds r0, r4, 0x1
 	lsls r0, 24
@@ -7600,7 +7600,7 @@ _081024B2:
 	ldr r0, =gHealthBoxesIds
 	adds r0, r4, r0
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -13205,7 +13205,7 @@ _081051F2:
 	movs r0, 0x1
 	adds r4, r0, 0
 	eors r4, r1
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0810526A
@@ -26794,7 +26794,7 @@ _0810BF90:
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	beq _0810BFA8
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _0810BFB4
@@ -33105,7 +33105,7 @@ _0810F284:
 	mov r0, r8
 	cmp r0, 0
 	bne _0810F2B8
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0810F2B8
@@ -33501,7 +33501,7 @@ _0810F5A6:
 	lsls r0, 24
 	cmp r0, 0
 	bne _0810F5EE
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0810F5EE
@@ -43194,7 +43194,7 @@ sub_81144F8: @ 81144F8
 	movs r2, 0x1
 	bl lcd_bg_operations
 _0811455C:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _081145D6
@@ -47859,7 +47859,7 @@ sub_8116B14: @ 8116B14
 	movs r0, 0xA
 	bl SetGpuReg
 _08116BA2:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08116C26
@@ -48295,7 +48295,7 @@ _08116F5C:
 	movs r2, 0x1
 	bl lcd_bg_operations
 _08116FBA:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08117036

asm/battle_anim_815A0D4.s

@@ -3256,7 +3256,7 @@ _0815BAB6:
 	lsls r1, r0, 2
 	adds r1, r2
 	ldrh r1, [r1, 0x2]
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 _0815BAF6:
 	mov r0, r8
 	bl move_anim_task_del
@@ -4001,7 +4001,7 @@ _0815C15C:
 	bl GetBankIdentity
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -9334,7 +9334,7 @@ sub_815EC48: @ 815EC48
 	lsls r0, 24
 	cmp r0, 0
 	bne _0815ECD0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r7, r0, 24
 	cmp r7, 0x1

asm/battle_controller_linkopponent.s

@@ -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
@@ -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,13 +583,13 @@ _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, =gBattleSpritesDataPtr
 	ldr r0, [r4]
@@ -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,7 +827,7 @@ _08064A3A:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r5, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
@@ -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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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
@@ -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}
@@ -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
@@ -5242,7 +5242,7 @@ sub_806719C: @ 806719C
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
@@ -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

asm/battle_controller_linkpartner.s

@@ -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
@@ -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,13 +419,13 @@ _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, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
@@ -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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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}
@@ -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]
@@ -4551,7 +4551,7 @@ sub_814D738: @ 814D738
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
@@ -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

asm/battle_controller_opponent.s

@@ -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
@@ -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
@@ -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,13 +635,13 @@ _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, =gBattleSpritesDataPtr
 	ldr r2, [r3]
@@ -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,7 +905,7 @@ _0805F8D2:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r5, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
@@ -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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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
@@ -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}
@@ -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
@@ -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 EmitCmd_x21
 _08061FDA:
 	bl OpponentBufferExecCompleted
 	b _08062156
@@ -5347,7 +5347,7 @@ _0806209C:
 	movs r0, 0x1
 	movs r1, 0xA
 	adds r2, r4, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	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 EmitCmd_x21
 	b _08062152
 	.pool
 _08062108:
@@ -5401,7 +5401,7 @@ _08062108:
 	orrs r2, r4
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	b _08062152
 	.pool
 _0806213C:
@@ -5413,7 +5413,7 @@ _0806213C:
 	orrs r2, r4
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 _08062152:
 	bl OpponentBufferExecCompleted
 _08062156:
@@ -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
@@ -5692,7 +5692,7 @@ sub_8062390: @ 8062390
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
@@ -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

asm/battle_controller_player.s

@@ -226,7 +226,7 @@ _0805764C:
 	movs r0, 0x1
 	movs r1, 0x3
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	b _080577C2
 _08057658:
 	movs r0, 0x20
@@ -249,7 +249,7 @@ _08057674:
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	ldrb r1, [r4]
 	adds r1, r5
 	ldrb r0, [r1]
@@ -277,7 +277,7 @@ _080576B4:
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	ldrb r1, [r4]
 	adds r1, r5
 	ldrb r0, [r1]
@@ -321,7 +321,7 @@ _0805771A:
 	ldrb r0, [r4]
 	adds r0, r5
 	ldrb r0, [r0]
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	ldrb r1, [r4]
 	adds r1, r5
 	ldrb r0, [r1]
@@ -333,7 +333,7 @@ _08057732:
 	adds r0, r5
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	b _080577E8
 	.pool
 _0805774C:
@@ -393,7 +393,7 @@ _080577B2:
 	movs r1, 0xC
 _080577BC:
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 _080577C2:
 	bl PlayerBufferExecCompleted
 	b _080577E8
@@ -518,7 +518,7 @@ _080578A0:
 	orrs r2, r0
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	ldrb r0, [r4]
 	movs r1, 0x1
 	bl dp11b_obj_free
@@ -1086,7 +1086,7 @@ _08057E14:
 _08057E1C:
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	bl PlayerBufferExecCompleted
 	b _08057F9E
 	.pool
@@ -2385,11 +2385,11 @@ sub_805896C: @ 805896C
 	mov r5, r8
 	push {r5-r7}
 	movs r7, 0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08058998
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _080589D0
@@ -2541,7 +2541,7 @@ _08058A0E:
 	ldr r4, =gPlayerParty
 	adds r0, r4
 	bl sub_805E990
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08058AE4
@@ -2672,7 +2672,7 @@ _08058BB2:
 	ands r0, r1
 	cmp r0, 0
 	bne _08058C68
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08058C38
@@ -2697,7 +2697,7 @@ _08058BB2:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r0, [r7]
 	eors r0, r6
 	bl sub_8076918
@@ -2705,7 +2705,7 @@ _08058BB2:
 	eors r0, r6
 	adds r0, r4
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 _08058C38:
 	ldr r5, =gHealthBoxesIds
 	ldr r4, =gActiveBank
@@ -2721,13 +2721,13 @@ _08058C38:
 	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
 _08058C68:
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r2, [r0]
@@ -2817,11 +2817,11 @@ _08058D14:
 	movs r0, 0x1
 	mov r9, r0
 _08058D32:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08058D52
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08058DAC
@@ -2915,7 +2915,7 @@ _08058E0A:
 	mov r0, r8
 	cmp r0, 0
 	beq _08058EAA
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08058E48
@@ -3207,13 +3207,13 @@ _0805905E:
 	ldr r2, =gPlayerParty
 	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
 	ldr r1, =gBattleBankFunc
 	ldrb r0, [r5]
 	lsls r0, 2
@@ -3267,7 +3267,7 @@ bx_t1_healthbar_update: @ 8059130
 	ldrb r0, [r5]
 	adds r0, r6
 	ldrb r0, [r0]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r1, r4, 16
 	movs r0, 0x1
@@ -3338,7 +3338,7 @@ sub_80591B8: @ 80591B8
 	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
@@ -3413,9 +3413,9 @@ _080591FE:
 	lsrs r2, 16
 	movs r0, 0x1
 	movs r1, 0xB
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	strb r5, [r4]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -3616,7 +3616,7 @@ _08059430:
 	lsls r4, 16
 	lsrs r4, 16
 	ldrb r0, [r5]
-	bl sub_80729D0
+	bl SetHealthboxSpriteVisible
 	lsls r4, 16
 	asrs r4, 16
 	movs r0, 0x1
@@ -3686,7 +3686,7 @@ _08059430:
 	lsrs r2, 16
 	movs r0, 0x1
 	movs r1, 0xB
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	strb r5, [r4]
 	ldr r0, =sub_8059544
 	str r0, [r6]
@@ -3729,7 +3729,7 @@ sub_8059544: @ 8059544
 	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
@@ -3795,7 +3795,7 @@ sub_80595A4: @ 80595A4
 	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
@@ -3814,7 +3814,7 @@ sub_80595A4: @ 80595A4
 	ldrb r0, [r0]
 	adds r1, r7, 0
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	b _08059638
 	.pool
 _08059624:
@@ -3826,7 +3826,7 @@ _08059624:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 _08059638:
 	ldr r0, =gTasks
 	lsls r1, r6, 2
@@ -3930,7 +3930,7 @@ sub_80596A8: @ 80596A8
 	ldrb r0, [r4]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl PlayerBufferExecCompleted
 _08059724:
 	pop {r4-r6}
@@ -3977,7 +3977,7 @@ sub_8059744: @ 8059744
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl PlayerBufferExecCompleted
 _08059798:
 	pop {r4-r6}
@@ -4291,14 +4291,14 @@ _08059A2C:
 	movs r0, 0x1
 	movs r1, 0xE
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	b _08059A76
 	.pool
 _08059A6C:
 	movs r0, 0x1
 	movs r1, 0xD
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 _08059A76:
 	bl PlayerBufferExecCompleted
 _08059A7A:
@@ -4401,7 +4401,7 @@ sub_8059B3C: @ 8059B3C
 	ldrb r0, [r0]
 	cmp r0, 0x1
 	beq _08059B98
-	bl sub_814FBAC
+	bl SetPpNumbersPaletteInMoveSelection
 	ldrb r1, [r7]
 	lsls r4, r1, 9
 	adds r0, r5, 0x4
@@ -4561,8 +4561,8 @@ battle_menu_cursor_related: @ 8059C70
 	.pool
 	thumb_func_end battle_menu_cursor_related
 
-	thumb_func_start sub_8059CB4
+	thumb_func_start ActionSelectionCreateCursorAt
-sub_8059CB4: @ 8059CB4
+ActionSelectionCreateCursorAt: @ 8059CB4
 	push {r4,lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -4595,10 +4595,10 @@ sub_8059CB4: @ 8059CB4
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8059CB4
+	thumb_func_end ActionSelectionCreateCursorAt
 
-	thumb_func_start sub_8059CF8
+	thumb_func_start ActionSelectionDestroyCursorAt
-sub_8059CF8: @ 8059CF8
+ActionSelectionDestroyCursorAt: @ 8059CF8
 	push {lr}
 	sub sp, 0x10
 	adds r3, r0, 0
@@ -4632,7 +4632,7 @@ sub_8059CF8: @ 8059CF8
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8059CF8
+	thumb_func_end ActionSelectionDestroyCursorAt
 
 	thumb_func_start sub_8059D40
 sub_8059D40: @ 8059D40
@@ -6866,7 +6866,7 @@ sub_805B164: @ 805B164
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldr r2, =gSprites
 	ldr r0, =gBankSpriteIds
 	ldrb r3, [r4]
@@ -6923,7 +6923,7 @@ sub_805B1CC: @ 805B1CC
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldr r1, =gActionSelectionCursor
 	ldrb r0, [r5]
 	adds r0, r1
@@ -7162,7 +7162,7 @@ _0805B41C:
 	ldrb r0, [r6]
 	adds r0, r1
 	ldrb r0, [r0]
-	bl sub_8072984
+	bl SetHealthboxSpriteInvisible
 	bl PlayerBufferExecCompleted
 _0805B452:
 	pop {r4-r6}
@@ -7371,11 +7371,11 @@ _0805B5E0:
 	beq _0805B618
 	movs r0, 0x5A
 	mov r9, r0
-	ldr r1, =gUnknown_083054E0
+	ldr r1, =gTrainerFrontPicCoords
 	b _0805B642
 	.pool
 _0805B618:
-	ldr r1, =gUnknown_08305D2C
+	ldr r1, =gTrainerBackPicCoords
 	lsls r0, r4, 2
 	adds r0, r1
 	ldrb r1, [r0]
@@ -7392,7 +7392,7 @@ _0805B618:
 _0805B63C:
 	movs r0, 0x50
 	mov r9, r0
-	ldr r1, =gUnknown_08305D2C
+	ldr r1, =gTrainerBackPicCoords
 _0805B642:
 	lsls r0, r4, 2
 	adds r0, r1
@@ -7542,7 +7542,7 @@ _0805B794:
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldrb r0, [r5]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -7724,7 +7724,7 @@ _0805B926:
 	ldr r5, =gActiveBank
 	ldrb r1, [r5]
 	adds r0, r4, 0
-	bl sub_805DF84
+	bl LoadBackTrainerBankSpriteGfx
 	ldrb r0, [r5]
 	bl GetBankIdentity
 	adds r1, r0, 0
@@ -7733,7 +7733,7 @@ _0805B926:
 	adds r0, r4, 0
 	bl sub_806A12C
 	ldr r0, =gUnknown_0202499C
-	ldr r1, =gUnknown_08305D2C
+	ldr r1, =gTrainerBackPicCoords
 	lsls r4, 2
 	adds r4, r1
 	ldrb r1, [r4]
@@ -8539,7 +8539,7 @@ dp01t_12_6_battle_menu: @ 805C044
 _0805C062:
 	lsls r0, r4, 24
 	lsrs r0, 24
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0805C062
@@ -8549,7 +8549,7 @@ _0805C062:
 	adds r0, r1
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	ldr r0, =gText_WhatWillPkmnDo
 	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
@@ -8658,7 +8658,7 @@ sub_805C158: @ 805C158
 	lsrs r2, 16
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	bl PlayerBufferExecCompleted
 _0805C194:
 	pop {r0}
@@ -9130,7 +9130,7 @@ sub_805C5C4: @ 805C5C4
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
@@ -9378,7 +9378,7 @@ sub_805C80C: @ 805C80C
 	movs r0, 0x1
 	movs r1, 0
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	bl PlayerBufferExecCompleted
 	pop {r0}
 	bx r0
@@ -9860,7 +9860,7 @@ sub_805CC00: @ 805CC00
 	ldr r1, =gPlayerParty
 	adds r0, r1
 	adds r1, r4, 0
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldr r0, =gBankSpriteIds
 	adds r4, r0
 	ldrb r1, [r4]
@@ -9906,7 +9906,7 @@ _0805CC94:
 	mov r9, r0
 	ldrh r0, [r1, 0x8]
 	strb r0, [r7]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _0805CCB4
@@ -9965,7 +9965,7 @@ _0805CCE4:
 	muls r0, r2
 	ldr r2, =gPlayerParty
 	adds r0, r2
-	bl sub_805DD7C
+	bl BattleLoadPlayerMonSpriteGfx
 	ldrb r0, [r7]
 	movs r1, 0
 	bl sub_805B258

asm/battle_controller_player_partner.s

@@ -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
@@ -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,13 +420,13 @@ _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, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
@@ -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
@@ -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 EmitCmd_x21
 	strb r5, [r4]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -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 EmitCmd_x21
 	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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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}
@@ -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
@@ -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
@@ -5068,7 +5068,7 @@ _081BDB3C:
 	orrs r2, r5
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	bl PlayerPartnerBufferExecCompleted
 	pop {r4-r6}
 	pop {r0}
@@ -5087,7 +5087,7 @@ 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
@@ -5338,7 +5338,7 @@ sub_81BDD9C: @ 81BDD9C
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
@@ -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

asm/battle_controller_recorded_opponent.s

@@ -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
@@ -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,13 +553,13 @@ _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, =gBattleSpritesDataPtr
 	ldr r2, [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,7 +809,7 @@ _08186B8A:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r5, 0
-	bl sub_805EE54
+	bl SetBankEnemyShadowSpriteCallback
 	ldr r3, =gBattleSpritesDataPtr
 	ldr r0, [r3]
 	ldr r2, [r0, 0x8]
@@ -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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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
@@ -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}
@@ -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
@@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0
 	lsrs r1, 24
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	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 EmitCmd_x21
 	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 EmitCmd_x21
 _08188F6C:
 	bl RecordedOpponentBufferExecCompleted
 	pop {r4,r5}
@@ -4981,7 +4981,7 @@ sub_81890CC: @ 81890CC
 	ldr r2, =gEnemyParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
@@ -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

asm/battle_controller_recorded_player.s

@@ -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
@@ -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
@@ -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,13 +613,13 @@ _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, =gBattleSpritesDataPtr
 	ldr r0, [r4]
@@ -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
@@ -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
@@ -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}
@@ -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}
@@ -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
@@ -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
@@ -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}
@@ -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
@@ -4861,7 +4861,7 @@ sub_818C49C: @ 818C49C
 	lsrs r1, 24
 	movs r0, 0x1
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	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 EmitCmd_x21
 	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 EmitCmd_x21
 	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 EmitCmd_x21
 _0818C584:
 	bl RecordedPlayerBufferExecCompleted
 	pop {r4,r5}
@@ -5132,7 +5132,7 @@ sub_818C6F4: @ 818C6F4
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x9
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldrb r2, [r4]
 	ldr r0, =gBattleSpritesDataPtr
 	ldr r0, [r0]
@@ -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

asm/battle_controller_safari.s

@@ -103,13 +103,13 @@ _0815942A:
 	movs r1, 0x7
 _0815942E:
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	b _08159440
 _08159436:
 	movs r0, 0x1
 	movs r1, 0x8
 	movs r2, 0
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 _08159440:
 	bl SafariBufferExecCompleted
 	b _0815954E
@@ -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]
@@ -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]
@@ -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:
@@ -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}
@@ -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
@@ -867,7 +867,7 @@ sub_8159A94: @ 8159A94
 _08159AAE:
 	lsls r0, r4, 24
 	lsrs r0, 24
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _08159AAE
@@ -877,7 +877,7 @@ _08159AAE:
 	adds r0, r1
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	ldr r0, =gText_WhatWillPkmnDo2
 	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
@@ -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
@@ -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 EmitCmd_x21
 	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 EmitCmd_x21
 	bl WallyBufferExecCompleted
 _08168564:
 	pop {r4,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,13 +493,13 @@ _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, =gBattleSpritesDataPtr
 	ldr r0, [r0]
 	ldr r2, [r0, 0x8]
@@ -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
@@ -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}
@@ -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
@@ -3681,7 +3681,7 @@ dp01t_12_1_battle_menu: @ 816A470
 _0816A48A:
 	lsls r0, r4, 24
 	lsrs r0, 24
-	bl sub_8059CF8
+	bl ActionSelectionDestroyCursorAt
 	adds r4, 0x1
 	cmp r4, 0x3
 	ble _0816A48A
@@ -3691,7 +3691,7 @@ _0816A48A:
 	adds r0, r1
 	ldrb r0, [r0]
 	movs r1, 0
-	bl sub_8059CB4
+	bl ActionSelectionCreateCursorAt
 	ldr r0, =gText_WhatWillWallyDo
 	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r0, =gDisplayedStringBattle
@@ -3777,7 +3777,7 @@ _0816A550:
 	lsls r2, 1
 	movs r0, 0x1
 	movs r1, 0xA
-	bl dp01_build_cmdbuf_x21_a_bb
+	bl EmitCmd_x21
 	bl WallyBufferExecCompleted
 _0816A574:
 	pop {r4}

asm/battle_frontier_1.s

@@ -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
@@ -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:
@@ -20577,7 +20577,7 @@ _081A5328:
 	movs r0, 0x1
 	negs r0, r0
 	strb r0, [r1, 0x1]
-	ldr r0, =gText_JapaneseHonorific
+	ldr r0, =gText_PlayerMon1Name
 	bl BattleStringExpandPlaceholdersToDisplayedString
 	ldr r4, =gDisplayedStringBattle
 	adds r0, r4, 0
@@ -20586,7 +20586,7 @@ _081A5328:
 	ldr r0, =gText_Vs
 	movs r1, 0x10
 	bl sub_814F9EC
-	ldr r0, =gText_RivalBuffer
+	ldr r0, =gText_OpponentMon1Name
 	bl BattleStringExpandPlaceholdersToDisplayedString
 	adds r0, r4, 0
 	movs r1, 0x11
@@ -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

asm/battle_interface.s

@@ -261,8 +261,8 @@ sub_80724A8: @ 80724A8
 	bx r0
 	thumb_func_end sub_80724A8
 
-	thumb_func_start battle_make_oam_normal_battle
+	thumb_func_start CreateBankHealthboxSprites
-battle_make_oam_normal_battle: @ 80724DC
+CreateBankHealthboxSprites: @ 80724DC
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -274,7 +274,7 @@ battle_make_oam_normal_battle: @ 80724DC
 	mov r10, r0
 	movs r0, 0
 	str r0, [sp]
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _080725F0
@@ -608,10 +608,10 @@ _08072718:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end battle_make_oam_normal_battle
+	thumb_func_end CreateBankHealthboxSprites
 
-	thumb_func_start battle_make_oam_safari_battle
+	thumb_func_start CreateSafariPlayerHealthboxSprites
-battle_make_oam_safari_battle: @ 8072804
+CreateSafariPlayerHealthboxSprites: @ 8072804
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -680,7 +680,7 @@ battle_make_oam_safari_battle: @ 8072804
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end battle_make_oam_safari_battle
+	thumb_func_end CreateSafariPlayerHealthboxSprites
 
 	thumb_func_start sub_80728A4
 sub_80728A4: @ 80728A4
@@ -802,8 +802,8 @@ sub_807294C: @ 807294C
 	.pool
 	thumb_func_end sub_807294C
 
-	thumb_func_start sub_8072984
+	thumb_func_start SetHealthboxSpriteInvisible
-sub_8072984: @ 8072984
+SetHealthboxSpriteInvisible: @ 8072984
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -841,10 +841,10 @@ sub_8072984: @ 8072984
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8072984
+	thumb_func_end SetHealthboxSpriteInvisible
 
-	thumb_func_start sub_80729D0
+	thumb_func_start SetHealthboxSpriteVisible
-sub_80729D0: @ 80729D0
+SetHealthboxSpriteVisible: @ 80729D0
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -885,7 +885,7 @@ sub_80729D0: @ 80729D0
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80729D0
+	thumb_func_end SetHealthboxSpriteVisible
 
 	thumb_func_start sub_8072A24
 sub_8072A24: @ 8072A24
@@ -1014,14 +1014,14 @@ _08072B00:
 	.pool
 	thumb_func_end sub_8072A88
 
-	thumb_func_start sub_8072B18
+	thumb_func_start SetBankHealthboxSpritePos
-sub_8072B18: @ 8072B18
+SetBankHealthboxSpritePos: @ 8072B18
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r6, r0, 24
 	movs r5, 0
 	movs r4, 0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _08072B44
@@ -1081,7 +1081,7 @@ _08072B7C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8072B18
+	thumb_func_end SetBankHealthboxSpritePos
 
 	thumb_func_start healthbar_draw_level
 healthbar_draw_level: @ 8072B94
@@ -1132,7 +1132,7 @@ healthbar_draw_level: @ 8072B94
 	lsls r0, 24
 	cmp r0, 0
 	bne _08072C18
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	ldr r2, =0x06010420
 	adds r1, r4, r2
@@ -1187,7 +1187,7 @@ heathbar_draw_hp: @ 8072C38
 	lsls r0, 24
 	cmp r0, 0
 	bne _08072D10
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _08072D10
@@ -1267,7 +1267,7 @@ _08072D10:
 	ldrh r0, [r6, 0x3A]
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r4
@@ -1993,7 +1993,7 @@ _08073354:
 	bne _0807336A
 	b _080735A8
 _0807336A:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _08073382
@@ -2036,7 +2036,7 @@ _08073382:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080734B0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _080733D0
@@ -2107,7 +2107,7 @@ _08073468:
 	ldr r2, =gPlayerParty
 	adds r1, r2
 	movs r2, 0x5
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	movs r0, 0x75
 	bl sub_80728A4
 	ldrb r2, [r6]
@@ -2209,7 +2209,7 @@ _0807355C:
 	ldr r4, =gEnemyParty
 	adds r1, r4
 	movs r2, 0x5
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 	ldr r0, =gBattleTypeFlags
 	ldr r0, [r0]
 	movs r1, 0x80
@@ -2222,7 +2222,7 @@ _0807355C:
 	muls r1, r5
 	adds r1, r4
 	movs r2, 0x4
-	bl healthbar_draw_field_maybe
+	bl UpdateHealthboxAttribute
 _08073592:
 	ldr r0, =gHealthBoxesIds
 	add r0, r9
@@ -2303,7 +2303,7 @@ _08073630:
 	mov r9, r3
 	cmp r4, 0
 	beq _08073642
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _08073648
@@ -3842,7 +3842,7 @@ _08074272:
 	adds r1, r6, 0
 	movs r2, 0x6
 	bl sub_8075198
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	ldr r1, =0x06010400
 	adds r5, r4, r1
@@ -4013,7 +4013,7 @@ draw_status_ailment_maybe: @ 80743F8
 	movs r1, 0x37
 	bl GetMonData
 	adds r4, r0, 0
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	movs r3, 0x12
 	mov r8, r3
@@ -4210,7 +4210,7 @@ _080745B8:
 	ldr r2, =0x04000018
 	adds r0, r6, 0
 	bl CpuSet
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4468,8 +4468,8 @@ sub_80747D8: @ 80747D8
 	.pool
 	thumb_func_end sub_80747D8
 
-	thumb_func_start healthbar_draw_field_maybe
+	thumb_func_start UpdateHealthboxAttribute
-healthbar_draw_field_maybe: @ 8074860
+UpdateHealthboxAttribute: @ 8074860
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -4492,7 +4492,7 @@ healthbar_draw_field_maybe: @ 8074860
 	mov r9, r0
 	cmp r7, 0
 	bne _0807489C
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _0807489C
@@ -4581,7 +4581,7 @@ _08074914:
 	movs r3, 0
 	bl sub_8074AA0
 _08074948:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
@@ -4742,7 +4742,7 @@ _08074A8E:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end healthbar_draw_field_maybe
+	thumb_func_end UpdateHealthboxAttribute
 
 	thumb_func_start sub_8074AA0
 sub_8074AA0: @ 8074AA0

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}

asm/battle_setup.s

@@ -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
@@ -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
@@ -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:
@@ -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}
@@ -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

asm/berry_blender.s

@@ -1275,7 +1275,7 @@ _080802AC:
 	strh r0, [r1]
 	adds r5, 0x1
 _080802D4:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -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
@@ -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
@@ -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/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
@@ -1059,7 +1059,7 @@ _080B2C5C:
 	lsls r0, 24
 	lsrs r4, r0, 24
 _080B2C7E:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -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
@@ -1984,7 +1984,7 @@ _080B3474:
 	adds r5, 0x1C
 	adds r4, 0x1
 _080B349A:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -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
@@ -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

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.s

@@ -1525,7 +1525,7 @@ sub_80D8490: @ 80D8490
 	movs r6, 0
 	ldr r0, =gUnknown_02039F25
 	mov r8, r0
-	ldr r2, =gUnknown_02039E1E
+	ldr r2, =gUnknown_02039E00 + 30
 	mov r10, r2
 	ldr r7, =gUnknown_02039F34
 _080D84B8:
@@ -2624,7 +2624,7 @@ _080D8EF2:
 	bl sub_80DB89C
 	ldr r0, =gStringVar1
 	lsls r1, r6, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	mov r2, r9
@@ -3562,7 +3562,7 @@ _080D96D4:
 	bl sub_80DB89C
 	ldr r0, =gStringVar1
 	lsls r1, r6, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r4, =gStringVar4
@@ -3671,7 +3671,7 @@ _080D97DC:
 	bl sub_80DB89C
 	ldr r0, =gStringVar1
 	lsls r1, r6, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r4, =gStringVar4
@@ -3809,7 +3809,7 @@ _080D9904:
 	bl sub_80DB89C
 	ldr r0, =gStringVar1
 	lsls r1, r6, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r4, =gStringVar4
@@ -4010,7 +4010,7 @@ _080D9AD2:
 	bl sub_80DB89C
 	ldr r0, =gStringVar1
 	lsls r1, r6, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r4, =gUnknown_02039F34
@@ -4381,7 +4381,7 @@ _080D9DD4:
 	lsls r1, 20
 	lsrs r1, 29
 	lsls r1, 6
-	ldr r4, =gUnknown_02039E02
+	ldr r4, =gUnknown_02039E00 + 2
 	adds r1, r4
 	bl StringCopy
 	ldr r0, =gStringVar1
@@ -4476,7 +4476,7 @@ _080D9EDC:
 	bl sub_80DC9B4
 	ldr r0, =gStringVar1
 	lsls r1, r6, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r0, =gStringVar2
@@ -4626,7 +4626,7 @@ _080DA038:
 	bl sub_80DB89C
 	ldr r0, =gStringVar1
 	lsls r1, r6, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r4, =gStringVar4
@@ -5096,7 +5096,7 @@ sub_80DA3CC: @ 80DA3CC
 	ldr r0, =gStringVar1
 	ldrb r1, [r5]
 	lsls r1, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r5, =gStringVar4
@@ -5360,7 +5360,7 @@ _080DA600:
 	lsls r0, 2
 	adds r0, r2
 	ldrh r0, [r0, 0x8]
-	bl sub_80ED03C
+	bl BravoTrainerPokemonProfile_BeforeInterview1
 	b _080DA668
 	.pool
 _080DA65C:
@@ -5667,7 +5667,7 @@ _080DA8F2:
 	ldr r5, =gUnknown_02039F25
 	ldrb r0, [r5]
 	lsls r0, 6
-	ldr r4, =gUnknown_02039E0D
+	ldr r4, =gUnknown_02039E00 + 13
 	adds r0, r4
 	mov r1, sp
 	movs r2, 0x8
@@ -6313,7 +6313,7 @@ _080DAE1E:
 	movs r0, 0x4
 	b _080DAE9A
 _080DAE2E:
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bhi _080DAE82
@@ -6451,7 +6451,7 @@ sub_80DAF1C: @ 80DAF1C
 	add r0, sp, 0x4
 	bl StringCopy
 	lsls r1, r5, 6
-	ldr r0, =gUnknown_02039E0D
+	ldr r0, =gUnknown_02039E00 + 13
 	adds r1, r0
 	add r0, sp, 0x4
 	bl StringAppend
@@ -6508,7 +6508,7 @@ sub_80DAFA0: @ 80DAFA0
 	lsls r1, 24
 	lsrs r1, 24
 	lsls r0, r4, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r0, r2
 	bl sub_80DAED4
 	ldr r0, =gUnknown_02039F26
@@ -8456,7 +8456,7 @@ sub_80DBED4: @ 80DBED4
 	adds r0, r1
 	ldrb r1, [r0]
 	lsls r1, 1
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	lsls r0, 3
 	adds r1, r0
@@ -11173,7 +11173,7 @@ sub_80DD45C: @ 80DD45C
 	lsrs r6, r1, 24
 	ldr r0, =gStringVar1
 	lsls r1, r4, 6
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	adds r1, r2
 	bl StringCopy
 	ldr r0, =gStringVar2
@@ -11805,7 +11805,7 @@ sub_80DD9F0: @ 80DD9F0
 	ldrb r1, [r0, 0x1]
 	lsls r1, 29
 	lsrs r1, 29
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r2, [r0]
 	lsls r0, r2, 2
 	adds r0, r2
@@ -14260,7 +14260,7 @@ _080DEDE6:
 	b _080DEF90
 	.pool
 _080DEE00:
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bhi _080DEE4C
@@ -14383,7 +14383,7 @@ _080DEF02:
 	mov r2, r9
 	lsls r1, r2, 5
 	adds r0, r1
-	ldr r1, =gUnknown_02039F2C
+	ldr r1, =gScriptContestCategory
 	ldrh r1, [r1]
 	ldr r3, =0x00002e9a
 	adds r0, r3
@@ -14485,7 +14485,7 @@ _080DEFE6:
 	b _080DF03A
 	.pool
 _080DEFF8:
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bhi _080DF038
@@ -15385,21 +15385,21 @@ _080DF6AE:
 	beq _080DF6AE
 _080DF6C4:
 	mov r0, r9
-	bl sub_80ECDA4
+	bl ContestLiveUpdates_BeforeInterview_1
 	mov r0, r10
-	bl sub_80ECDF4
+	bl ContestLiveUpdates_BeforeInterview_2
 	ldr r5, [sp, 0x4]
 	lsrs r0, r5, 24
-	bl sub_80ECE34
+	bl ContestLiveUpdates_BeforeInterview_3
 	ldr r0, =gUnknown_02039F34
 	ldr r0, [r0]
 	ldr r0, [r0, 0x1C]
 	add r0, r8
 	ldrh r0, [r0, 0xA]
-	bl sub_80ECE74
+	bl ContestLiveUpdates_BeforeInterview_4
 	adds r0, r4, 0
 	adds r1, r6, 0
-	bl sub_80ECEB4
+	bl ContestLiveUpdates_BeforeInterview_5
 _080DF6EE:
 	add sp, 0xC
 	pop {r3-r5}

asm/contest_ai.s

@@ -144,7 +144,7 @@ sub_81563B0: @ 81563B0
 	beq _081564A0
 	adds r7, r5, 0
 	ldr r6, =gAIScriptPtr
-	ldr r0, =gUnknown_02039E1E
+	ldr r0, =gUnknown_02039E00 + 30
 	mov r8, r0
 _081563CC:
 	ldr r0, [r7]
@@ -1352,7 +1352,7 @@ sub_8156CF4: @ 8156CF4
 	ldr r0, =gUnknown_02039F34
 	ldr r0, [r0]
 	ldr r1, [r0, 0xC]
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	strh r0, [r1, 0x18]
 	ldr r1, =gAIScriptPtr
@@ -5030,7 +5030,7 @@ sub_8158948: @ 8158948
 	push {r4-r6,lr}
 	movs r5, 0
 	movs r4, 0
-	ldr r6, =gUnknown_02039E1E
+	ldr r6, =gUnknown_02039E00 + 30
 _08158950:
 	lsls r1, r4, 1
 	ldr r0, =gUnknown_02039F34

asm/contest_effect.s

@@ -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

asm/contest_link_80F57C4.s

@@ -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
@@ -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]
@@ -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
@@ -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

asm/contest_link_80FC4F4.s

@@ -141,7 +141,7 @@ sub_80FC5DC: @ 80FC5DC
 	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

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

asm/decoration.s

@@ -2094,7 +2094,7 @@ sub_8127B04: @ 8127B04
 	lsls r4, 24
 	asrs r4, 24
 	str r4, [sp]
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	bl warp_in
 	add sp, 0x4
 	pop {r4,r5}
@@ -2490,7 +2490,7 @@ _08127E34:
 	cmp r0, 0x1
 	bne _08127F1C
 	adds r0, r4, 0
-	bl FlagReset
+	bl FlagClear
 	movs r2, 0
 	ldr r0, [r7, 0x4]
 	ldrb r4, [r0]

asm/decoration_inventory.s

@@ -156,8 +156,8 @@ _08161910:
 	bx r1
 	thumb_func_end sub_81618D0
 
-	thumb_func_start sub_8161918
+	thumb_func_start CheckHasDecoration
-sub_8161918: @ 8161918
+CheckHasDecoration: @ 8161918
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -193,7 +193,7 @@ _08161958:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8161918
+	thumb_func_end CheckHasDecoration
 
 	thumb_func_start DecorationAdd
 DecorationAdd: @ 8161960

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/easy_chat.s

@@ -565,7 +565,7 @@ _0811A72C:
 	ldr r4, =gStringVar3
 	adds r0, r4, 0
 	movs r1, 0x2
-	bl sub_811F88C
+	bl InitializeEasyChatWordArray
 	b _0811A7C2
 	.pool
 _0811A73C:
@@ -3704,7 +3704,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
@@ -9914,7 +9914,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}
@@ -11109,8 +11109,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
@@ -11133,7 +11133,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/field_door.s

@@ -581,8 +581,8 @@ 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
@@ -602,10 +602,10 @@ _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
@@ -625,10 +625,10 @@ _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
@@ -654,10 +654,10 @@ _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
@@ -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

@@ -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]
@@ -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

@@ -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]
@@ -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
@@ -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
@@ -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

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
@@ -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

@@ -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]

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

@@ -268,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
@@ -282,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/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

asm/item_use.s

@@ -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/link.s

@@ -1371,8 +1371,8 @@ _08009FC4:
 	.pool
 	thumb_func_end sub_8009FAC
 
-	thumb_func_start sub_8009FCC
+	thumb_func_start GetLinkPlayerCount
-sub_8009FCC: @ 8009FCC
+GetLinkPlayerCount: @ 8009FCC
 	push {lr}
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
@@ -1392,14 +1392,14 @@ _08009FEC:
 _08009FF4:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8009FCC
+	thumb_func_end GetLinkPlayerCount
 
 	thumb_func_start sub_8009FF8
 sub_8009FF8: @ 8009FF8
 	push {r4-r7,lr}
 	adds r6, r0, 0
 	adds r5, r1, 0
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r2, 0
@@ -1442,7 +1442,7 @@ sub_800A03C: @ 800A03C
 	thumb_func_start sub_800A040
 sub_800A040: @ 800A040
 	push {lr}
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -1546,7 +1546,7 @@ _0800A0EA:
 	b _0800A22E
 	.pool
 _0800A0FC:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	cmp r0, 0
 	bne _0800A10E
@@ -1572,12 +1572,12 @@ _0800A130:
 	adds r5, 0x1C
 	adds r6, 0x1
 _0800A134:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r6, r0
 	blt _0800A120
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r7, r0
@@ -1714,12 +1714,12 @@ _0800A266:
 	lsls r0, 24
 	lsrs r4, r0, 24
 _0800A26C:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
 	bcc _0800A24C
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r6, r0
@@ -1742,8 +1742,8 @@ _0800A298:
 	.pool
 	thumb_func_end sub_800A23C
 
-	thumb_func_start sub_800A2A4
+	thumb_func_start GetLinkPlayerTrainerId
-sub_800A2A4: @ 800A2A4
+GetLinkPlayerTrainerId: @ 800A2A4
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r2, =gLinkPlayers
@@ -1755,7 +1755,7 @@ sub_800A2A4: @ 800A2A4
 	ldr r0, [r1]
 	bx lr
 	.pool
-	thumb_func_end sub_800A2A4
+	thumb_func_end GetLinkPlayerTrainerId
 
 	thumb_func_start sub_800A2BC
 sub_800A2BC: @ 800A2BC
@@ -2697,7 +2697,7 @@ _0800A9E2:
 	lsrs r4, r0, 24
 	adds r5, 0x1
 _0800A9EE:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -3044,7 +3044,7 @@ _0800AC96:
 	thumb_func_start sub_800ACAC
 sub_800ACAC: @ 800ACAC
 	push {r4,lr}
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r2, r0, 24
 	movs r3, 0
@@ -3142,7 +3142,7 @@ _0800AD72:
 	thumb_func_start sub_800AD88
 sub_800AD88: @ 800AD88
 	push {r4,r5,lr}
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r3, r0, 24
 	movs r1, 0
@@ -3239,7 +3239,7 @@ _0800AE46:
 	thumb_func_start sub_800AE5C
 sub_800AE5C: @ 800AE5C
 	push {r4,lr}
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r2, r0, 24
 	movs r1, 0
@@ -9671,7 +9671,7 @@ _0800E1C8:
 	lsls r0, 24
 	lsrs r5, r0, 24
 _0800E1E6:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	subs r0, 0x1
@@ -9965,7 +9965,7 @@ _0800E428:
 	ble _0800E3FC
 	mov r4, r9
 _0800E434:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -10019,7 +10019,7 @@ _0800E4A6:
 	adds r5, 0x1C
 	adds r4, 0x1
 _0800E4AC:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -13627,7 +13627,7 @@ sub_80102B8: @ 80102B8
 	bl sub_800FD14
 	strh r4, [r5]
 _080102E6:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r2, r0, 24
 	movs r1, 0
@@ -13734,7 +13734,7 @@ sub_8010390: @ 8010390
 	b _0801041C
 	.pool
 _080103CC:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r2, r0, 24
 	movs r1, 0x1
@@ -15290,7 +15290,7 @@ _08011048:
 	strb r0, [r1, 0x3]
 	adds r4, 0x1
 _08011054:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -20950,12 +20950,12 @@ _08014138:
 	adds r5, 0x1C
 	adds r4, 0x1
 _08014152:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
 	blt _08014138
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -21117,7 +21117,7 @@ sub_8014290: @ 8014290
 	asrs r5, 24
 	str r5, [sp]
 	adds r3, r4, 0
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	ldr r0, [r6]
 	movs r1, 0x4
 	ldrsb r1, [r0, r1]
@@ -21159,7 +21159,7 @@ sub_8014304: @ 8014304
 	strh r1, [r0]
 	ldr r0, =0x00004087
 	bl VarSet
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	ldr r1, =gUnknown_03005DB8
 	strb r0, [r1]
 	bl GetMultiplayerId
@@ -21182,7 +21182,7 @@ sub_8014304: @ 8014304
 	adds r0, r4, 0
 	adds r1, r5, 0
 	mov r3, r8
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	bl warp_in
 	add sp, 0x4
 	pop {r3}
@@ -28312,7 +28312,7 @@ _080181BC:
 sub_80181CC: @ 80181CC
 	push {lr}
 	bl ScriptContext2_Enable
-	bl sub_80983E8
+	bl ScriptFreezeMapObjects
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80181CC
@@ -31292,7 +31292,7 @@ flag_clear_x63: @ 8019A64
 	adds r0, r1
 	lsls r0, 16
 	lsrs r0, 16
-	bl FlagReset
+	bl FlagClear
 	pop {r0}
 	bx r0
 	.pool
@@ -39697,7 +39697,7 @@ sub_801DDD0: @ 801DDD0
 	strb r5, [r4, 0x16]
 	movs r0, 0xFF
 	strb r0, [r4, 0x1A]
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	strb r0, [r4, 0xD]
 	bl GetMultiplayerId
 	strb r0, [r4, 0x13]
@@ -42285,7 +42285,7 @@ _0801F30A:
 	movs r0, 0x1
 	strh r0, [r4]
 _0801F30E:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	adds r2, r0, 0
@@ -42446,7 +42446,7 @@ _0801F448:
 	ldrsh r0, [r4, r3]
 	cmp r0, 0
 	beq _0801F47C
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -45504,7 +45504,7 @@ _08020C8E:
 	b _08020CF8
 	.pool
 _08020CAC:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	mov r8, r0
@@ -53271,7 +53271,7 @@ _08024B2C:
 _08024B6A:
 	ldr r0, [sp, 0x10]
 	strb r1, [r0]
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	mov r1, r8
 	strb r0, [r1]
 	bl GetMultiplayerId
@@ -57700,7 +57700,7 @@ _08026EF6:
 	adds r4, 0xC
 	adds r5, 0x1
 _08026EFE:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -59511,7 +59511,7 @@ _08027C76:
 	thumb_func_start sub_8027D20
 sub_8027D20: @ 8027D20
 	push {lr}
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	ldr r1, =gUnknown_02022C98
 	ldr r1, [r1]
 	adds r1, 0x24
@@ -64891,7 +64891,7 @@ sub_802AA48: @ 802AA48
 sub_802AA60: @ 802AA60
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	movs r2, 0
 	strb r0, [r4, 0x5]
 	adds r1, r4, 0
@@ -68775,7 +68775,7 @@ _0802C8A4:
 	thumb_func_start sub_802C8AC
 sub_802C8AC: @ 802C8AC
 	push {lr}
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	pop {r1}

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/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/party_menu.s

@@ -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]
@@ -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,7 +16222,7 @@ _081B8CB0:
 	strb r0, [r6, 0x2]
 	b _081B8D58
 _081B8CBE:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	bne _081B8CFC
@@ -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

@@ -1211,7 +1211,7 @@ _08075DD4:
 	cmp r5, r0
 	bne _08075E56
 _08075E00:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08075E56
@@ -1243,7 +1243,7 @@ _08075E4C:
 	movs r2, 0x80
 	bl m4aMPlayVolumeControl
 _08075E56:
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _08075E70
@@ -1815,7 +1815,7 @@ _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
@@ -1888,7 +1888,7 @@ 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

asm/pokemon_storage_system.s

@@ -6902,7 +6902,7 @@ sub_80CABE0: @ 80CABE0
 	cmp r1, r0
 	beq _080CAC0A
 	ldr r0, =0x000008d7
-	bl FlagReset
+	bl FlagClear
 	ldr r4, =0x00004036
 	bl StorageGetCurrentBox
 	adds r1, r0, 0

asm/pokemon_summary_screen.s

@@ -6514,7 +6514,7 @@ sub_81C3220: @ 81C3220
 	b _081C3282
 	.pool
 _081C326C:
-	bl sub_80F0020
+	bl GetPlayerIDAsU32
 	adds r4, r0, 0
 	ldr r0, =0x0000ffff
 	ands r4, r0
@@ -7571,7 +7571,7 @@ sub_81C3B08: @ 81C3B08
 	adds r7, r4, 0
 	ldrb r0, [r5]
 	adds r1, r6, 0
-	bl sub_814FC20
+	bl GetCurrentPpToMaxPpState
 	lsls r0, 24
 	lsrs r0, 24
 	adds r5, r0, 0

asm/record_mixing.s

@@ -1162,7 +1162,7 @@ _080E7714:
 	lsrs r0, 24
 	mov r8, r0
 _080E771C:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r8, r0
@@ -1179,7 +1179,7 @@ _080E771C:
 	adds r1, 0x1
 	strh r1, [r0, 0x8]
 _080E773E:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r4, [sp, 0x8]
@@ -1312,7 +1312,7 @@ sub_80E7820: @ 80E7820
 sub_80E7830: @ 80E7830
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x3
@@ -1341,7 +1341,7 @@ _080E7856:
 	.pool
 _080E7868:
 	movs r0, 0
-	bl sub_800A2A4
+	bl GetLinkPlayerTrainerId
 	adds r2, r0, 0
 	movs r0, 0x1
 	ands r2, r0
@@ -1362,7 +1362,7 @@ _080E7880:
 	.pool
 _080E7894:
 	movs r0, 0
-	bl sub_800A2A4
+	bl GetLinkPlayerTrainerId
 	movs r1, 0x9
 	bl __umodsi3
 	adds r2, r0, 0
@@ -1523,7 +1523,7 @@ _080E79CE:
 	adds r4, r1, 0
 	adds r4, 0x20
 	adds r0, r4, 0
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _080E79F2
 	adds r0, r4, 0
@@ -1738,7 +1738,7 @@ sub_80E7B60: @ 80E7B60
 	ldr r0, =gLinkPlayers
 	ldrh r0, [r0, 0x4]
 	bl SeedRng2
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0
@@ -1878,7 +1878,7 @@ _080E7C9A:
 	bne _080E7CEE
 	adds r0, r5, 0
 	adds r0, 0x24
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _080E7CBA
 	adds r0, r5, 0
@@ -1901,7 +1901,7 @@ _080E7CC6:
 	adds r4, r0, 0
 	adds r0, r5, 0
 	adds r0, 0x2C
-	bl sub_8009228
+	bl IsStringJapanese
 	cmp r0, 0
 	beq _080E7CE2
 	ldrb r0, [r4]
@@ -1931,7 +1931,7 @@ _080E7CFA:
 	lsrs r0, 16
 	mov r8, r0
 _080E7D04:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r8, r0
@@ -2266,7 +2266,7 @@ sub_80E7F68: @ 80E7F68
 	bne _080E7FE4
 	ldrh r0, [r4]
 	movs r1, 0x1
-	bl sub_80D6D1C
+	bl CheckPCHasItem
 	lsls r0, 24
 	cmp r0, 0
 	bne _080E7FE4
@@ -3557,7 +3557,7 @@ sub_80E89AC: @ 80E89AC
 	adds r6, r0, 0
 	mov r8, r1
 	mov r9, r2
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24

asm/recorded_battle.s

@@ -125,7 +125,7 @@ _08184EAC:
 	bl GetMultiplayerId
 	ldr r1, =gUnknown_0203C7B4
 	strb r0, [r1]
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
@@ -505,7 +505,7 @@ _081851D0:
 	adds r4, 0x1C
 	adds r5, 0x1
 _081851DA:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0

asm/reset_rtc_screen.s

@@ -291,7 +291,7 @@ sub_809EB04: @ 809EB04
 	lsrs r5, 24
 	ldr r0, =gUnknown_085104C4
 	bl LoadSpritePalette
-	ldr r0, =gUnknown_085104F0
+	ldr r0, =gSpriteTemplate_85104F0
 	mov r8, r0
 	movs r1, 0x35
 	movs r2, 0x44
@@ -655,7 +655,7 @@ sub_809EDE8: @ 809EDE8
 	lsls r0, r4, 1
 	adds r0, r4
 	lsls r0, 2
-	ldr r1, =gUnknown_0851041C
+	ldr r1, =gUnknown_08510420 - 0x4
 	adds r2, r0, r1
 	ldr r1, =gMain
 	ldrh r3, [r1, 0x2E]

asm/rom3.s

@@ -1963,7 +1963,7 @@ _08033726:
 	lsls r0, r1, 24
 	lsrs r4, r0, 24
 _0803372C:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -3259,8 +3259,8 @@ _0803413E:
 	.pool
 	thumb_func_end sub_8034110
 
-	thumb_func_start dp01_build_cmdbuf_x21_a_bb
+	thumb_func_start EmitCmd_x21
-dp01_build_cmdbuf_x21_a_bb: @ 8034158
+EmitCmd_x21: @ 8034158
 	push {r4,lr}
 	adds r4, r1, 0
 	lsls r0, 24
@@ -3280,7 +3280,7 @@ dp01_build_cmdbuf_x21_a_bb: @ 8034158
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end dp01_build_cmdbuf_x21_a_bb
+	thumb_func_end EmitCmd_x21
 
 	thumb_func_start dp01_build_cmdbuf_x22_a_three_bytes
 dp01_build_cmdbuf_x22_a_three_bytes: @ 8034184

asm/rom4.s

@@ -36,15 +36,15 @@ flag_var_implications_of_teleport_: @ 8084660
 	push {lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088d
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088c
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000889
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000888
-	bl FlagReset
+	bl FlagClear
 	pop {r0}
 	bx r0
 	.pool
@@ -55,15 +55,15 @@ sub_808469C: @ 808469C
 	push {lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088d
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088c
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000889
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000888
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =gUnknown_08271862
 	bl ScriptContext2_RunNewScript
 	pop {r0}
@@ -76,15 +76,15 @@ flagmods_08054D70: @ 80846E4
 	push {lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088d
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088c
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000889
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000888
-	bl FlagReset
+	bl FlagClear
 	pop {r0}
 	bx r0
 	.pool
@@ -95,15 +95,15 @@ sub_8084720: @ 8084720
 	push {r4,lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088d
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x0000088c
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000889
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000888
-	bl FlagReset
+	bl FlagClear
 	ldr r4, =0x00004039
 	adds r0, r4, 0
 	bl VarGet
@@ -128,7 +128,7 @@ _08084764:
 sub_8084788: @ 8084788
 	push {lr}
 	ldr r0, =0x0000088c
-	bl FlagReset
+	bl FlagClear
 	bl sub_8085B2C
 	bl wild_pokemon_reroll
 	bl UpdateLocationHistoryForRoamer
@@ -324,8 +324,8 @@ _080848F4:
 	.pool
 	thumb_func_end CopyFieldObjectTemplateCoordsToSav1
 
-	thumb_func_start update_saveblock1_field_object_coords
+	thumb_func_start Overworld_SetMapObjTemplateCoords
-update_saveblock1_field_object_coords: @ 8084910
+Overworld_SetMapObjTemplateCoords: @ 8084910
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -356,10 +356,10 @@ _08084944:
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end update_saveblock1_field_object_coords
+	thumb_func_end Overworld_SetMapObjTemplateCoords
 
-	thumb_func_start update_saveblock1_field_object_movement_behavior
+	thumb_func_start Overworld_SetMapObjTemplateMovementType
-update_saveblock1_field_object_movement_behavior: @ 808494C
+Overworld_SetMapObjTemplateMovementType: @ 808494C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -387,7 +387,7 @@ _08084978:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end update_saveblock1_field_object_movement_behavior
+	thumb_func_end Overworld_SetMapObjTemplateMovementType
 
 	thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw
 mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980
@@ -710,9 +710,9 @@ warp_in: @ 8084BD8
 	bx r0
 	thumb_func_end warp_in
 
-	thumb_func_start warp1_set
+	thumb_func_start Overworld_SetWarpDestination
-@ void warp1_set(char bank, char map, char warpid, char enter_x, char enter_y)
+@ void Overworld_SetWarpDestination(char bank, char map, char warpid, char enter_x, char enter_y)
-warp1_set: @ 8084BEC
+Overworld_SetWarpDestination: @ 8084BEC
 	push {r4-r6,lr}
 	sub sp, 0x8
 	adds r4, r0, 0
@@ -741,7 +741,7 @@ warp1_set: @ 8084BEC
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end warp1_set
+	thumb_func_end Overworld_SetWarpDestination
 
 	thumb_func_start warp1_set_2
 @ void warp1_set_2(char bank, char map, char warpid)
@@ -757,7 +757,7 @@ warp1_set_2: @ 8084C28
 	movs r3, 0x1
 	negs r3, r3
 	str r3, [sp]
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	add sp, 0x4
 	pop {r0}
 	bx r0
@@ -857,7 +857,7 @@ sub_8084CCC: @ 8084CCC
 	lsls r4, 24
 	asrs r4, 24
 	str r4, [sp]
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 _08084CFA:
 	add sp, 0x4
 	pop {r4}
@@ -879,8 +879,8 @@ copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04
 	.pool
 	thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
 
-	thumb_func_start sub_8084D1C
+	thumb_func_start Overworld_SetHealLocationWarp
-sub_8084D1C: @ 8084D1C
+Overworld_SetHealLocationWarp: @ 8084D1C
 	push {r4,r5,lr}
 	sub sp, 0x8
 	lsls r0, 24
@@ -911,7 +911,7 @@ _08084D50:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8084D1C
+	thumb_func_end Overworld_SetHealLocationWarp
 
 	thumb_func_start sub_8084D5C
 sub_8084D5C: @ 8084D5C
@@ -1126,7 +1126,7 @@ _08084EF0:
 	lsls r4, r6, 24
 	asrs r4, 24
 	str r4, [sp]
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 _08084F0A:
 	add sp, 0x4
 	pop {r4-r6}
@@ -1289,7 +1289,7 @@ sub_8084FF8: @ 8084FF8
 	lsls r4, r5, 24
 	asrs r4, 24
 	str r4, [sp]
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	b _0808504C
 _08085030:
 	bl mapheader_run_script_with_tag_x6
@@ -1365,7 +1365,7 @@ mliX_load_map: @ 8085098
 	negs r3, r3
 	str r3, [sp]
 	adds r2, r3, 0
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	ldr r4, =gMapHeader
 	ldrb r0, [r4, 0x14]
 	cmp r0, 0x3A
@@ -1382,7 +1382,7 @@ _080850C8:
 	adds r0, r6, 0
 	adds r1, r5, 0
 	bl sub_80B21B4
-	bl sub_809E7B0
+	bl DoTimeBasedEvents
 	bl sub_80AEDBC
 	bl sub_8085B2C
 	bl update_sav1_flash_used_on_map
@@ -1404,7 +1404,7 @@ _08085116:
 	bl sub_80A0A2C
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMove
-	bl sub_80AEE20
+	bl DoCurrentWeather
 	bl wild_encounter_reset_coro_args
 	bl mapheader_run_script_with_tag_x5
 	ldr r2, =gMapHeader
@@ -1481,14 +1481,14 @@ _080851A2:
 	bl sub_80B21B4
 	cmp r7, 0x1
 	beq _080851EE
-	bl sub_809E7B0
+	bl DoTimeBasedEvents
 _080851EE:
 	bl sub_80AEDBC
 	bl sub_8085B2C
 	cmp r5, 0
 	beq _08085200
 	ldr r0, =0x00000888
-	bl FlagReset
+	bl FlagClear
 _08085200:
 	bl update_sav1_flash_used_on_map
 	bl sav1_reset_battle_music_maybe
@@ -1858,8 +1858,8 @@ _080854DE:
 	.pool
 	thumb_func_end update_sav1_flash_used_on_map
 
-	thumb_func_start sub_80854EC
+	thumb_func_start Overworld_SetFlashLevel
-sub_80854EC: @ 80854EC
+Overworld_SetFlashLevel: @ 80854EC
 	push {lr}
 	adds r1, r0, 0
 	cmp r1, 0
@@ -1878,7 +1878,7 @@ _080854FE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80854EC
+	thumb_func_end Overworld_SetFlashLevel
 
 	thumb_func_start sav1_get_flash_used_on_map
 sav1_get_flash_used_on_map: @ 8085514
@@ -2263,14 +2263,14 @@ _080857E8:
 	.pool
 	thumb_func_end sub_8085784
 
-	thumb_func_start sav1_set_battle_music_maybe
+	thumb_func_start Overworld_SetSavedMusic
-sav1_set_battle_music_maybe: @ 80857F4
+Overworld_SetSavedMusic: @ 80857F4
 	ldr r1, =gSaveBlock1Ptr
 	ldr r1, [r1]
 	strh r0, [r1, 0x2C]
 	bx lr
 	.pool
-	thumb_func_end sav1_set_battle_music_maybe
+	thumb_func_end Overworld_SetSavedMusic
 
 	thumb_func_start sav1_reset_battle_music_maybe
 sav1_reset_battle_music_maybe: @ 8085800
@@ -2339,8 +2339,8 @@ _08085890:
 	bx r0
 	thumb_func_end sub_8085810
 
-	thumb_func_start sub_8085898
+	thumb_func_start Overworld_ChangeMusicToDefault
-sub_8085898: @ 8085898
+Overworld_ChangeMusicToDefault: @ 8085898
 	push {r4,lr}
 	bl GetCurrentMapMusic
 	adds r4, r0, 0
@@ -2360,10 +2360,10 @@ _080858BE:
 	pop {r4}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8085898
+	thumb_func_end Overworld_ChangeMusicToDefault
 
-	thumb_func_start sub_80858C4
+	thumb_func_start Overworld_ChangeMusicTo
-sub_80858C4: @ 80858C4
+Overworld_ChangeMusicTo: @ 80858C4
 	push {r4,lr}
 	lsls r0, 16
 	lsrs r4, r0, 16
@@ -2383,7 +2383,7 @@ _080858E4:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80858C4
+	thumb_func_end Overworld_ChangeMusicTo
 
 	thumb_func_start is_warp1_light_level_8_or_9
 is_warp1_light_level_8_or_9: @ 80858F0
@@ -3525,8 +3525,8 @@ _08086278:
 _08086286:
 	bl CopyFieldObjectTemplateCoordsToSav1
 _0808628A:
-	bl sub_809757C
+	bl UnfreezeMapObjects
-	bl sub_809E7B0
+	bl DoTimeBasedEvents
 	bl sub_8084788
 	ldr r0, =gMapHeader
 	ldrh r1, [r0, 0x12]

asm/rom6.s

@@ -167,7 +167,7 @@ sub_8135578: @ 8135578
 	cmp r4, 0
 	bne _081355FC
 	bl player_get_direction_lower_nybble
-	ldr r6, =gFieldEffectSpawnParams
+	ldr r6, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r6, 0x4]
@@ -303,7 +303,7 @@ _081356AC:
 sub_81356C4: @ 81356C4
 	push {lr}
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -380,7 +380,7 @@ hm2_dig: @ 8135760
 	movs r0, 0x26
 	bl FieldEffectStart
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -3381,7 +3381,7 @@ hm2_flash: @ 8137178
 	lsls r4, 24
 	lsrs r4, 24
 	bl brm_get_pokemon_selection
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	lsls r0, 24
 	lsrs r0, 24
 	str r0, [r1]
@@ -4121,7 +4121,7 @@ _081377BC:
 	add r2, sp, 0x18
 	bl SetMonData
 	adds r0, r4, 0
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	strb r0, [r5, 0x1]
 	movs r7, 0x1
 _0813780A:
@@ -4337,7 +4337,7 @@ sub_8137988: @ 8137988
 	.pool
 _081379C8:
 	ldr r0, =0x0000089a
-	bl FlagReset
+	bl FlagClear
 _081379CE:
 	pop {r0}
 	bx r0
@@ -4629,7 +4629,7 @@ sub_8137C10: @ 8137C10
 	ldr r0, =gSpecialVar_0x8004
 	ldrh r0, [r0]
 	bl sub_8137A98
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	.pool
@@ -5030,7 +5030,7 @@ _08137F6E:
 	movs r1, 0
 	bl VarSet
 	movs r0, 0
-	bl sav1_set_battle_music_maybe
+	bl Overworld_SetSavedMusic
 _08137F7C:
 	pop {r4}
 	pop {r0}
@@ -5056,7 +5056,7 @@ sub_8137F90: @ 8137F90
 sub_8137FB0: @ 8137FB0
 	push {lr}
 	ldr r0, =0x0000088d
-	bl FlagReset
+	bl FlagClear
 	pop {r0}
 	bx r0
 	.pool
@@ -5399,13 +5399,13 @@ sub_8138240: @ 8138240
 	bl GetMultiplayerId
 	lsls r0, 24
 	lsrs r7, r0, 24
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r5, r0, 24
 	movs r4, 0
 	cmp r4, r5
 	bcs _0813828A
-	ldr r0, =gUnknown_0858D144
+	ldr r0, =gTVStringVarPtrs
 	mov r8, r0
 _08138262:
 	cmp r7, r4
@@ -6378,7 +6378,7 @@ sub_8138AA4: @ 8138AA4
 sub_8138AC0: @ 8138AC0
 	push {lr}
 	ldr r0, =gStringVar4
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	.pool
@@ -6485,7 +6485,7 @@ sub_8138B8C: @ 8138B8C
 	movs r0, 0x13
 	movs r1, 0
 	movs r3, 0x6
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	b _08138BC2
 	.pool
 _08138BB0:
@@ -6496,7 +6496,7 @@ _08138BB0:
 	movs r0, 0x13
 	movs r1, 0x1
 	movs r3, 0x6
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 _08138BC2:
 	add sp, 0x4
 	pop {r0}
@@ -6537,7 +6537,7 @@ _08138BF6:
 	thumb_func_start sub_8138C04
 sub_8138C04: @ 8138C04
 	push {r4,lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7051,7 +7051,7 @@ sub_8138FEC: @ 8138FEC
 	ldr r1, =gSpecialVar_0x8004
 	ldr r0, =0x000001f5
 	strh r0, [r1]
-	bl FlagReset
+	bl FlagClear
 	pop {r0}
 	bx r0
 	.pool
@@ -7060,7 +7060,7 @@ sub_8138FEC: @ 8138FEC
 	thumb_func_start sub_8139004
 sub_8139004: @ 8139004
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7084,7 +7084,7 @@ _0813902A:
 	thumb_func_start sub_8139030
 sub_8139030: @ 8139030
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7108,7 +7108,7 @@ _08139056:
 	thumb_func_start sub_813905C
 sub_813905C: @ 813905C
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7132,7 +7132,7 @@ _08139082:
 	thumb_func_start sub_8139088
 sub_8139088: @ 8139088
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7156,7 +7156,7 @@ _081390AE:
 	thumb_func_start sub_81390B4
 sub_81390B4: @ 81390B4
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7295,7 +7295,7 @@ RemoveScriptFieldObject: @ 81391AC
 	thumb_func_start sub_81391D0
 sub_81391D0: @ 81391D0
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7347,7 +7347,7 @@ sub_8139228: @ 8139228
 sub_8139238: @ 8139238
 	push {lr}
 	ldr r0, =gStringVar1
-	bl sub_8165284
+	bl GetEreaderTrainerName
 	pop {r0}
 	bx r0
 	.pool
@@ -7479,7 +7479,7 @@ _08139342:
 	thumb_func_start sub_8139348
 sub_8139348: @ 8139348
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7507,7 +7507,7 @@ sub_8139370: @ 8139370
 	movs r1, 0x1
 	mov r0, sp
 	strb r1, [r0]
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7519,7 +7519,7 @@ sub_8139370: @ 8139370
 	mov r2, sp
 	bl SetMonData
 	adds r0, r4, 0
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -7538,7 +7538,7 @@ _081393B6:
 	thumb_func_start sub_81393C8
 sub_81393C8: @ 81393C8
 	push {lr}
-	bl sub_8139688
+	bl GetLeadMonIndex
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x64
@@ -7858,7 +7858,7 @@ sub_8139648: @ 8139648
 	cmp r0, 0x1
 	beq _08139664
 	movs r0, 0x14
-	bl sub_80AED7C
+	bl SetSav1Weather
 _08139664:
 	pop {r0}
 	bx r0
@@ -7876,14 +7876,14 @@ sub_8139668: @ 8139668
 	cmp r0, 0x1
 	beq _08139684
 	movs r0, 0x15
-	bl sub_80AED7C
+	bl SetSav1Weather
 _08139684:
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8139668
 
-	thumb_func_start sub_8139688
+	thumb_func_start GetLeadMonIndex
-sub_8139688: @ 8139688
+GetLeadMonIndex: @ 8139688
 	push {r4-r6,lr}
 	bl CalculatePlayerPartyCount
 	lsls r0, 24
@@ -7926,7 +7926,7 @@ _081396D8:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8139688
+	thumb_func_end GetLeadMonIndex
 
 	thumb_func_start sub_81396E0
 sub_81396E0: @ 81396E0
@@ -8050,7 +8050,7 @@ sub_81397C4: @ 81397C4
 	cmp r1, r0
 	bls _081397E0
 	movs r0, 0
-	bl sub_80EF340
+	bl TV_PrintIntToStringVar
 	b _08139862
 	.pool
 _081397E0:
@@ -9094,7 +9094,7 @@ _0813A062:
 	lsls r0, 2
 	adds r0, r7
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -9996,7 +9996,7 @@ _0813A7C6:
 	lsrs r0, 22
 	adds r0, r1
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	.pool
@@ -10036,7 +10036,7 @@ sub_813A820: @ 813A820
 	lsls r0, r4, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	ldr r0, =0x00004031
 	adds r1, r4, 0
 	bl VarSet
@@ -10056,7 +10056,7 @@ sub_813A854: @ 813A854
 	lsrs r0, 14
 	adds r0, r4
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -11039,7 +11039,7 @@ _0813B0F8:
 	ldr r0, =sub_813B160
 	movs r1, 0x8
 	bl CreateTask
-	ldr r3, =gFieldEffectSpawnParams
+	ldr r3, =gFieldEffectArguments
 	movs r0, 0x1
 	str r0, [r3]
 	movs r0, 0x3A
@@ -11074,7 +11074,7 @@ _0813B13A:
 	adds r0, r5, r0
 	ldrb r2, [r0]
 	movs r0, 0x1
-	bl update_saveblock1_field_object_coords
+	bl Overworld_SetMapObjTemplateCoords
 	add sp, 0x4
 	pop {r4,r5}
 	pop {r0}
@@ -11238,7 +11238,7 @@ _0813B27E:
 	cmp r0, r4
 	beq _0813B2A6
 	ldr r0, =0x000008d7
-	bl FlagReset
+	bl FlagClear
 _0813B2A6:
 	ldr r0, =0x00004036
 	lsrs r1, r7, 16
@@ -11778,7 +11778,7 @@ _0813B728:
 	cmp r0, 0x2
 	bne _0813B790
 	ldr r0, =gUnknown_0824979B
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	b _0813B790
 	.pool
 _0813B74C:
@@ -11787,7 +11787,7 @@ _0813B74C:
 	cmp r0, 0x3
 	bne _0813B790
 	ldr r0, =gUnknown_0824979B
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	b _0813B790
 	.pool
 _0813B764:
@@ -12075,7 +12075,7 @@ sub_813B9A0: @ 813B9A0
 	cmp r1, r0
 	bne _0813B9B6
 	movs r0, 0x3
-	bl sub_8084D1C
+	bl Overworld_SetHealLocationWarp
 _0813B9B6:
 	pop {r0}
 	bx r0
@@ -12187,16 +12187,16 @@ sub_813BA60: @ 813BA60
 	adds r1, r2
 	strh r0, [r1]
 	ldr r0, =0x00000315
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000316
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00000317
-	bl FlagReset
+	bl FlagClear
 	movs r0, 0xC6
 	lsls r0, 2
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x000002da
-	bl FlagReset
+	bl FlagClear
 	ldr r0, =0x00004095
 	movs r1, 0x1
 	bl VarSet

asm/rom_80A5C6C.s

@@ -419,11 +419,11 @@ _080A5FE8:
 	lsls r0, 1
 	cmp r4, r0
 	bls _080A5FF8
-	ldr r0, =gUnknown_08305DCC
+	ldr r0, =gEnemyMonElevation
 	b _080A5FFC
 	.pool
 _080A5FF8:
-	ldr r0, =gUnknown_08305DCC
+	ldr r0, =gEnemyMonElevation
 	adds r0, r7, r0
 _080A5FFC:
 	ldrb r5, [r0]
@@ -1928,15 +1928,15 @@ _080A6B1A:
 	bx r1
 	thumb_func_end sub_80A6A90
 
-	thumb_func_start battle_type_is_double
+	thumb_func_start IsDoubleBattle
-battle_type_is_double: @ 80A6B20
+IsDoubleBattle: @ 80A6B20
 	ldr r0, =gBattleTypeFlags
 	ldr r0, [r0]
 	movs r1, 0x1
 	ands r0, r1
 	bx lr
 	.pool
-	thumb_func_end battle_type_is_double
+	thumb_func_end IsDoubleBattle
 
 	thumb_func_start sub_80A6B30
 sub_80A6B30: @ 80A6B30
@@ -5807,7 +5807,7 @@ _080A8946:
 	bl sub_80A5C6C
 	lsls r0, 24
 	lsrs r7, r0, 24
-	bl battle_type_is_double
+	bl IsDoubleBattle
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A8998

asm/script_menu.s

@@ -5,9 +5,9 @@
 
 	.text
 
-	thumb_func_start Multichoice
+	thumb_func_start ScriptMenu_Multichoice
-@ bool8 Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
+@ bool8 ScriptMenu_Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
-Multichoice: @ 80E1E08
+ScriptMenu_Multichoice: @ 80E1E08
 	push {r4-r7,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -44,10 +44,10 @@ _080E1E4E:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end Multichoice
+	thumb_func_end ScriptMenu_Multichoice
 
-	thumb_func_start sub_80E1E58
+	thumb_func_start ScriptMenu_MultichoiceWithDefault
-sub_80E1E58: @ 80E1E58
+ScriptMenu_MultichoiceWithDefault: @ 80E1E58
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -91,7 +91,7 @@ _080E1EAA:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80E1E58
+	thumb_func_end ScriptMenu_MultichoiceWithDefault
 
 	thumb_func_start sub_80E1EB8
 sub_80E1EB8: @ 80E1EB8
@@ -379,8 +379,8 @@ _080E20FC:
 	.pool
 	thumb_func_end sub_80E2058
 
-	thumb_func_start yes_no_box
+	thumb_func_start ScriptMenu_YesNo
-yes_no_box: @ 80E2108
+ScriptMenu_YesNo: @ 80E2108
 	push {r4,lr}
 	ldr r4, =task_yes_no_maybe
 	adds r0, r4, 0
@@ -405,7 +405,7 @@ _080E213A:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end yes_no_box
+	thumb_func_end ScriptMenu_YesNo
 
 	thumb_func_start sub_80E2140
 sub_80E2140: @ 80E2140
@@ -485,8 +485,8 @@ _080E21C4:
 	.pool
 	thumb_func_end task_yes_no_maybe
 
-	thumb_func_start sub_80E21D0
+	thumb_func_start ScriptMenu_MultichoiceGrid
-sub_80E21D0: @ 80E21D0
+ScriptMenu_MultichoiceGrid: @ 80E21D0
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -627,7 +627,7 @@ _080E22E8:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80E21D0
+	thumb_func_end ScriptMenu_MultichoiceGrid
 
 	thumb_func_start sub_80E2308
 sub_80E2308: @ 80E2308
@@ -1334,8 +1334,8 @@ _080E28F8:
 	bx r0
 	thumb_func_end task_picbox
 
-	thumb_func_start sub_80E2900
+	thumb_func_start ScriptMenu_ShowPokemonPic
-sub_80E2900: @ 80E2900
+ScriptMenu_ShowPokemonPic: @ 80E2900
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1422,10 +1422,10 @@ _080E29BA:
 	pop {r4-r7}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80E2900
+	thumb_func_end ScriptMenu_ShowPokemonPic
 
-	thumb_func_start picbox_close
+	thumb_func_start ScriptMenu_GetPicboxWaitFunc
-picbox_close: @ 80E29C4
+ScriptMenu_GetPicboxWaitFunc: @ 80E29C4
 	push {lr}
 	ldr r0, =task_picbox
 	bl FindTaskIdByFunc
@@ -1449,7 +1449,7 @@ _080E29F4:
 _080E29F6:
 	pop {r1}
 	bx r1
-	thumb_func_end picbox_close
+	thumb_func_end ScriptMenu_GetPicboxWaitFunc
 
 	thumb_func_start sub_80E29FC
 sub_80E29FC: @ 80E29FC

asm/script_movement.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start exec_movement
+	thumb_func_start ScriptMovement_StartObjectMovementScript
-exec_movement: @ 80D32E8
+ScriptMovement_StartObjectMovementScript: @ 80D32E8
 	push {r4,lr}
 	sub sp, 0x4
 	adds r4, r3, 0
@@ -47,10 +47,10 @@ _080D3332:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end exec_movement
+	thumb_func_end ScriptMovement_StartObjectMovementScript
 
-	thumb_func_start sub_80D3340
+	thumb_func_start ScriptMovement_IsObjectMovementFinished
-sub_80D3340: @ 80D3340
+ScriptMovement_IsObjectMovementFinished: @ 80D3340
 	push {r4,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -87,7 +87,7 @@ _080D3384:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80D3340
+	thumb_func_end ScriptMovement_IsObjectMovementFinished
 
 	thumb_func_start sub_80D338C
 sub_80D338C: @ 80D338C

asm/script_pokemon_util_80F87D8.s

@@ -83,7 +83,7 @@ sub_80F8850: @ 80F8850
 	thumb_func_start sub_80F8864
 sub_80F8864: @ 80F8864
 	push {lr}
-	ldr r0, =gUnknown_02039F2C
+	ldr r0, =gScriptContestCategory
 	ldrh r0, [r0]
 	cmp r0, 0x4
 	bhi _080F88A4
@@ -222,7 +222,7 @@ sub_80F8970: @ 80F8970
 	mov r12, r0
 	ldr r1, =gSpecialVar_0x8006
 	mov r9, r1
-	ldr r2, =gUnknown_02039E02
+	ldr r2, =gUnknown_02039E00 + 2
 	mov r10, r2
 	mov r2, r12
 	mov r1, sp
@@ -397,8 +397,8 @@ sub_80F8ACC: @ 80F8ACC
 	.pool
 	thumb_func_end sub_80F8ACC
 
-	thumb_func_start sub_80F8ADC
+	thumb_func_start ShowContestWinner
-sub_80F8ADC: @ 80F8ADC
+ShowContestWinner: @ 80F8ADC
 	push {lr}
 	ldr r0, =sub_812FDEC
 	bl SetMainCallback2
@@ -408,7 +408,7 @@ sub_80F8ADC: @ 80F8ADC
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80F8ADC
+	thumb_func_end ShowContestWinner
 
 	thumb_func_start sub_80F8AFC
 sub_80F8AFC: @ 80F8AFC
@@ -625,7 +625,7 @@ sub_80F8C7C: @ 80F8C7C
 	ldrb r0, [r6]
 	muls r0, r5
 	adds r0, r4
-	bl sub_80EE5A4
+	bl GetRibbonCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -1269,9 +1269,9 @@ _080F922C:
 	.pool
 	thumb_func_end sp000_heal_pokemon
 
-	thumb_func_start sub_80F9244
+	thumb_func_start ScriptGiveMon
-@ void sub_80F9244(s16 species_num, u8 level, int held_item)
+@ void ScriptGiveMon(s16 species_num, u8 level, int held_item)
-sub_80F9244: @ 80F9244
+ScriptGiveMon: @ 80F9244
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -1332,10 +1332,10 @@ _080F92B8:
 	pop {r4-r6}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80F9244
+	thumb_func_end ScriptGiveMon
 
-	thumb_func_start sub_80F92C8
+	thumb_func_start ScriptGiveEgg
-sub_80F92C8: @ 80F92C8
+ScriptGiveEgg: @ 80F92C8
 	push {lr}
 	sub sp, 0x68
 	adds r1, r0, 0
@@ -1357,7 +1357,7 @@ sub_80F92C8: @ 80F92C8
 	add sp, 0x68
 	pop {r1}
 	bx r1
-	thumb_func_end sub_80F92C8
+	thumb_func_end ScriptGiveEgg
 
 	thumb_func_start sub_80F92F8
 sub_80F92F8: @ 80F92F8
@@ -1450,8 +1450,8 @@ _080F9392:
 	.pool
 	thumb_func_end sub_80F9370
 
-	thumb_func_start sub_80F93A0
+	thumb_func_start CreateScriptedWildMon
-sub_80F93A0: @ 80F93A0
+CreateScriptedWildMon: @ 80F93A0
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1496,10 +1496,10 @@ _080F93EE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80F93A0
+	thumb_func_end CreateScriptedWildMon
 
-	thumb_func_start sub_80F9400
+	thumb_func_start ScriptSetMonMoveSlot
-sub_80F9400: @ 80F9400
+ScriptSetMonMoveSlot: @ 80F9400
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -1525,7 +1525,7 @@ _080F941C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80F9400
+	thumb_func_end ScriptSetMonMoveSlot
 
 	thumb_func_start sub_80F9438
 sub_80F9438: @ 80F9438

asm/secret_base.s

@@ -861,7 +861,7 @@ sub_80E916C: @ 80E916C
 	asrs r0, 24
 	str r0, [sp]
 	adds r0, r5, 0
-	bl warp1_set
+	bl Overworld_SetWarpDestination
 	bl warp_in
 	ldr r1, =gFieldCallback
 	ldr r0, =sub_80E9108
@@ -1208,7 +1208,7 @@ _080E9462:
 	adds r0, 0xAE
 	lsls r0, 16
 	lsrs r0, 16
-	bl FlagReset
+	bl FlagClear
 	ldrb r0, [r6]
 	ldr r5, =gSaveBlock1Ptr
 	ldr r2, [r5]
@@ -4494,7 +4494,7 @@ sub_80EAF80: @ 80EAF80
 	bne _080EAF9A
 	b _080EB16A
 _080EAF9A:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2

asm/shop.s

@@ -2465,7 +2465,7 @@ BuyMenuSubtractMoney: @ 80E0F88
 	lsls r2, 6
 	adds r1, r2
 	ldr r1, [r1]
-	bl SubtractMoney
+	bl RemoveMoney
 	movs r0, 0x5F
 	bl PlaySE
 	ldr r0, [r5]

asm/slot_machine.s

@@ -55,8 +55,8 @@ _0812A530:
 	.pool
 	thumb_func_end sub_812A4DC
 
-	thumb_func_start sub_812A540
+	thumb_func_start PlaySlotMachine
-sub_812A540: @ 812A540
+PlaySlotMachine: @ 812A540
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -85,7 +85,7 @@ sub_812A540: @ 812A540
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_812A540
+	thumb_func_end PlaySlotMachine
 
 	thumb_func_start sub_812A588
 sub_812A588: @ 812A588

asm/trade.s

@@ -6603,7 +6603,7 @@ _0807A97C:
 	adds r4, 0x1C
 	adds r5, 0x1
 _0807A980:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -6632,7 +6632,7 @@ _0807A9B0:
 	adds r4, 0x1C
 	adds r5, 0x1
 _0807A9B4:
-	bl sub_8009FCC
+	bl GetLinkPlayerCount
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0

asm/trainer_rematch.s

@@ -185,7 +185,7 @@ _081DA6D4:
 	adds r0, r1
 	adds r0, r6
 	ldrh r0, [r0]
-	bl trainer_flag_check
+	bl HasTrainerAlreadyBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	bne _081DA6F0

asm/trainer_see.s

@@ -267,7 +267,7 @@ CheckIfTrainerCanApproachPlayer: @ 80B3DF0
 	mov r8, r4
 	cmp r0, 0x1
 	bne _080B3E50
-	ldr r1, =gUnknown_0855072C
+	ldr r1, =gIsTrainerInRange
 	ldrb r0, [r7, 0x18]
 	lsls r0, 28
 	lsrs r0, 26
@@ -300,7 +300,7 @@ _080B3E4C:
 _080B3E50:
 	movs r5, 0
 _080B3E52:
-	ldr r0, =gUnknown_0855072C
+	ldr r0, =gIsTrainerInRange
 	lsls r4, r5, 2
 	adds r4, r0
 	ldrb r1, [r7, 0x1D]
@@ -702,7 +702,7 @@ c3_8081EDC: @ 80B4118
 	b _080B416C
 	.pool
 _080B4150:
-	ldr r7, =gUnknown_0855073C
+	ldr r7, =gTrainerSeeFuncList
 _080B4152:
 	movs r1, 0x8
 	ldrsh r0, [r4, r1]
@@ -734,7 +734,7 @@ sub_80B417C: @ 80B417C
 	push {r4,r5,lr}
 	adds r5, r1, 0
 	adds r4, r2, 0
-	ldr r1, =gFieldEffectSpawnParams
+	ldr r1, =gFieldEffectArguments
 	adds r2, r1, 0x4
 	adds r3, r1, 0
 	adds r3, 0x8
@@ -1050,7 +1050,7 @@ sub_80B43E0: @ 80B43E0
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B4426
-	ldr r2, =gFieldEffectSpawnParams
+	ldr r2, =gFieldEffectArguments
 	movs r1, 0x10
 	ldrsh r0, [r4, r1]
 	str r0, [r2]
@@ -1186,7 +1186,7 @@ sub_80B44C8: @ 80B44C8
 	adds r0, 0x1
 	strh r0, [r4, 0x16]
 _080B44FA:
-	ldr r1, =gUnknown_0855076C
+	ldr r1, =gTrainerSeeFuncList2
 	movs r2, 0x8
 	ldrsh r0, [r4, r2]
 	lsls r0, 2
@@ -1303,7 +1303,7 @@ sub_80B45D0: @ 80B45D0
 	ldr r1, =gScriptResult
 	movs r0, 0x1
 	strh r0, [r1]
-	bl sub_809757C
+	bl UnfreezeMapObjects
 	ldr r0, =gUnknown_03006090
 	ldrb r0, [r0, 0xC]
 	bl sub_80974D0
@@ -1322,4 +1322,324 @@ _080B4616:
 	.pool
 	thumb_func_end sub_80B45D0
 
+	thumb_func_start oei_exclamation_mark
+oei_exclamation_mark: @ 80B4620
+	push {lr}
+	ldr r0, =gSpriteTemplate_85507B4
+	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, =gSpriteTemplate_85507B4
+	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, =gSpriteTemplate_85507CC
+	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, =gFieldEffectArguments
+	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 ScriptMovement_StartObjectMovementScript
+	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 ScriptMovement_StartObjectMovementScript
+_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.

charmap.txt

@@ -355,12 +355,12 @@ B_LINK_OPPONENT_MON1_NAME = FD 0A
 B_LINK_PLAYER_MON2_NAME = FD 0B
 B_LINK_OPPONENT_MON2_NAME = FD 0C
 B_ATK_NAME_WITH_PREFIX_MON1 = FD 0D
-B_ATK_NAME = FD 0E
+B_ATK_PARTNER_NAME = FD 0E
 B_ATK_NAME_WITH_PREFIX = FD 0F
 B_DEF_NAME_WITH_PREFIX = FD 10
 B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBank
-B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 12
+B_ACTIVE_NAME_WITH_PREFIX = FD 12
-B_ACTIVE_NAME_WITH_PREFIX = FD 13
+B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13
 B_CURRENT_MOVE = FD 14
 B_LAST_MOVE = FD 15
 B_LAST_ITEM = FD 16

common_syms/tv.txt

@@ -0,0 +1,4 @@
+sCurTVShowSlot
+sTV_SecretBaseVisitMovesTemp
+sTV_DecorationsBuffer
+sTV_SecretBaseVisitMonsTemp

data/battle_1.s

@@ -0,0 +1,12 @@
+
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gUnknown_082FF1C8:: @ 82FF1C8
+    .byte 0x01, 0x04, 0x10, 0x40
+    .byte 0x02, 0x04, 0x08, 0x20
+    .byte 0x02, 0x04, 0x08, 0x20
+    .byte 0x00, 0x00, 0x00, 0x00

data/battle_anims.s

@@ -4,6 +4,8 @@
     .section .rodata
     .align 2, 0
 
+	@ only partially done because this file terrifies me
+
 gUnknown_08524904:: @ 8524904
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
 
@@ -291,62 +293,740 @@ gUnknown_08524B34:: @ 8524B34
 gUnknown_08524B3C:: @ 8524B3C
 	.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
 
+    .align 2
 gUnknown_08524B44:: @ 8524B44
-	.incbin "baserom.gba", 0x524b44, 0x1d0
+	obj_tiles 0x08c02538, 0x0200, 0x2710
+	obj_tiles 0x08c1c6e0, 0x0300, 0x2711
+	obj_tiles 0x08c20784, 0x0200, 0x2712
+	obj_tiles 0x08c025e8, 0x0100, 0x2713
+	obj_tiles 0x08c0265c, 0x0200, 0x2714
+	obj_tiles 0x08c0270c, 0x0400, 0x2715
+	obj_tiles 0x08c027e0, 0x0180, 0x2716
+	obj_tiles 0x08c029cc, 0x0800, 0x2717
+	obj_tiles 0x08c02b68, 0x0020, 0x2718
+	obj_tiles 0x08c02fa4, 0x0400, 0x2719
+	obj_tiles 0x08c02bc4, 0x1200, 0x271a
+	obj_tiles 0x08c032ac, 0x0180, 0x271b
+	obj_tiles 0x08c0334c, 0x0080, 0x271c
+	obj_tiles 0x08c03438, 0x0080, 0x271d
+	obj_tiles 0x08c1fbd4, 0x0280, 0x271e
+	obj_tiles 0x08c03484, 0x0080, 0x271f
+	obj_tiles 0x08c03518, 0x0100, 0x2720
+	obj_tiles 0x08c03598, 0x0020, 0x2721
+	obj_tiles 0x08c24d7c, 0x0080, 0x2722
+	obj_tiles 0x08c035f8, 0x0400, 0x2723
+	obj_tiles 0x08c036b8, 0x0200, 0x2724
+	obj_tiles 0x08c03a28, 0x0a00, 0x2725
+	obj_tiles 0x08c03a28, 0x0a00, 0x2726
+	obj_tiles 0x08c037d4, 0x0380, 0x2727
+	obj_tiles 0x08c03ea0, 0x0300, 0x2728
+	obj_tiles 0x08c03db0, 0x0a00, 0x2729
+	obj_tiles 0x08c04494, 0x0a00, 0x272a
+	obj_tiles 0x08c0481c, 0x0a00, 0x272b
+	obj_tiles 0x08c04b40, 0x0a00, 0x272c
+	obj_tiles 0x08c04e90, 0x0a00, 0x272d
+	obj_tiles 0x08c05170, 0x0a00, 0x272e
+	obj_tiles 0x08c03f80, 0x0e00, 0x272f
+	obj_tiles 0x08c043a8, 0x0380, 0x2730
+	obj_tiles 0x08c0557c, 0x1000, 0x2731
+	obj_tiles 0x08c05eec, 0x0800, 0x2732
+	obj_tiles 0x08c062b8, 0x0a00, 0x2733
+	obj_tiles 0x08c06678, 0x0800, 0x2734
+	obj_tiles 0x08c06a4c, 0x0a00, 0x2735
+	obj_tiles 0x08c07964, 0x0a00, 0x2736
+	obj_tiles 0x08c07b88, 0x0a00, 0x2737
+	obj_tiles 0x08c07e84, 0x0a00, 0x2738
+	obj_tiles 0x08c08090, 0x0a00, 0x2739
+	obj_tiles 0x08c082c4, 0x0a00, 0x273a
+	obj_tiles 0x08c085bc, 0x0a00, 0x273b
+	obj_tiles 0x08c08a0c, 0x0a00, 0x273c
+	obj_tiles 0x08c08ca0, 0x0a00, 0x273d
+	obj_tiles 0x08c09604, 0x1000, 0x273e
+	obj_tiles 0x08c09604, 0x1000, 0x273f
+	obj_tiles 0x08c09cf0, 0x1000, 0x2740
+	obj_tiles 0x08c09cf0, 0x1000, 0x2741
+	obj_tiles 0x08c09ffc, 0x0200, 0x2742
+	obj_tiles 0x08c0a09c, 0x0200, 0x2743
+	obj_tiles 0x08c0a148, 0x0200, 0x2744
+	obj_tiles 0x08c2e830, 0x0800, 0x2745
+	obj_tiles 0x08c0a3a8, 0x0080, 0x2746
+	obj_tiles 0x08c0a8bc, 0x0200, 0x2747
+	obj_tiles 0x08c0a3ec, 0x1000, 0x2748
+	obj_tiles 0x08c0a980, 0x0180, 0x2749
 
+    .align 2
 gUnknown_08524D14:: @ 8524D14
-	.incbin "baserom.gba", 0x524d14, 0x270
+	obj_tiles 0x08c0aa2c, 0x0c00, 0x274a
+	obj_tiles 0x08c0aebc, 0x0100, 0x274b
+	obj_tiles 0x08c0af38, 0x0040, 0x274c
+	obj_tiles 0x08c0af7c, 0x0180, 0x274d
+	obj_tiles 0x08c0b04c, 0x0800, 0x274e
+	obj_tiles 0x08c0b444, 0x0480, 0x274f
+	obj_tiles 0x08c23104, 0x0200, 0x2750
+	obj_tiles 0x08c0b6bc, 0x0200, 0x2751
+	obj_tiles 0x08c0b7f0, 0x0100, 0x2752
+	obj_tiles 0x08c0b6bc, 0x0200, 0x2753
+	obj_tiles 0x08c0b6bc, 0x0200, 0x2754
+	obj_tiles 0x08c0b6bc, 0x0200, 0x2755
+	obj_tiles 0x08c0b864, 0x0200, 0x2756
+	obj_tiles 0x08c0b90c, 0x0a00, 0x2757
+	obj_tiles 0x08c0bb38, 0x0300, 0x2758
+	obj_tiles 0x08c0bc20, 0x0180, 0x2759
+	obj_tiles 0x08c1b29c, 0x00a0, 0x275a
+	obj_tiles 0x08c0bd5c, 0x0700, 0x275b
+	obj_tiles 0x08c14cec, 0x0400, 0x275c
+	obj_tiles 0x08c14f50, 0x0200, 0x275d
+	obj_tiles 0x08c0bffc, 0x0300, 0x275e
+	obj_tiles 0x08c0c1bc, 0x0c00, 0x275f
+	obj_tiles 0x08c0c5ec, 0x0a00, 0x2760
+	obj_tiles 0x08c0c974, 0x0080, 0x2761
+	obj_tiles 0x08c0cb90, 0x0040, 0x2762
+	obj_tiles 0x08c0ce18, 0x0e00, 0x2763
+	obj_tiles 0x08c0d2bc, 0x0e00, 0x2764
+	obj_tiles 0x08c0d680, 0x0280, 0x2765
+	obj_tiles 0x08c0d738, 0x0200, 0x2766
+	obj_tiles 0x08c24cfc, 0x0080, 0x2767
+	obj_tiles 0x08c0d8a8, 0x00c0, 0x2768
+	obj_tiles 0x08c0d8f8, 0x0a00, 0x2769
+	obj_tiles 0x08c0db6c, 0x0200, 0x276a
+	obj_tiles 0x08c0dbfc, 0x0180, 0x276b
+	obj_tiles 0x08c0dd30, 0x0080, 0x276c
+	obj_tiles 0x08c0ddac, 0x1000, 0x276d
+	obj_tiles 0x08c0e47c, 0x0a00, 0x276e
+	obj_tiles 0x08c0e620, 0x0180, 0x276f
+	obj_tiles 0x08c0e6d0, 0x0380, 0x2770
+	obj_tiles 0x08c0e840, 0x0c00, 0x2771
+	obj_tiles 0x08c0ea20, 0x0200, 0x2772
+	obj_tiles 0x08c27cec, 0x0200, 0x2773
+	obj_tiles 0x08c0eb58, 0x0200, 0x2774
+	obj_tiles 0x08c0ec58, 0x0200, 0x2775
+	obj_tiles 0x08c0ed88, 0x0400, 0x2776
+	obj_tiles 0x08c0ef20, 0x0080, 0x2777
+	obj_tiles 0x08c0ef8c, 0x0400, 0x2778
+	obj_tiles 0x08c0f174, 0x0c00, 0x2779
+	obj_tiles 0x08c0f720, 0x0200, 0x277a
+	obj_tiles 0x08c0f810, 0x1000, 0x277b
+	obj_tiles 0x08c0fbe4, 0x0a00, 0x277c
+	obj_tiles 0x08c0ff68, 0x0020, 0x277d
+	obj_tiles 0x08c0ffb8, 0x0e00, 0x277e
+	obj_tiles 0x08c1039c, 0x0080, 0x277f
+	obj_tiles 0x08c10404, 0x0a00, 0x2780
+	obj_tiles 0x08c10754, 0x0400, 0x2781
+	obj_tiles 0x08c109e8, 0x0200, 0x2782
+	obj_tiles 0x08c115e4, 0x0700, 0x2783
+	obj_tiles 0x08c12e88, 0x0800, 0x2784
+	obj_tiles 0x08c1315c, 0x0a00, 0x2785
+	obj_tiles 0x08c133b4, 0x0600, 0x2786
+	obj_tiles 0x08c13568, 0x0800, 0x2787
+	obj_tiles 0x08c13820, 0x0200, 0x2788
+	obj_tiles 0x08c1393c, 0x0040, 0x2789
+	obj_tiles 0x08c1398c, 0x0180, 0x278a
+	obj_tiles 0x08c13aa4, 0x0600, 0x278b
+	obj_tiles 0x08c13be0, 0x0600, 0x278c
+	obj_tiles 0x08c13ea0, 0x0200, 0x278d
+	obj_tiles 0x08c13fb4, 0x0080, 0x278e
+	obj_tiles 0x08c1403c, 0x0200, 0x278f
+	obj_tiles 0x08c14200, 0x0800, 0x2790
+	obj_tiles 0x08c1448c, 0x0080, 0x2791
+	obj_tiles 0x08c144f0, 0x0a00, 0x2792
+	obj_tiles 0x08c148e8, 0x0280, 0x2793
+	obj_tiles 0x08c14a58, 0x0280, 0x2794
+	obj_tiles 0x08c14b78, 0x0100, 0x2795
+	obj_tiles 0x08c14c1c, 0x0200, 0x2796
+	obj_tiles 0x08c1a3a0, 0x0200, 0x2797
 
+    .align 2
 gUnknown_08524F84:: @ 8524F84
-	.incbin "baserom.gba", 0x524f84, 0x308
+	obj_tiles 0x08c1a540, 0x0020, 0x2798
+	obj_tiles 0x08c1a58c, 0x0a00, 0x2799
+	obj_tiles 0x08c1ab40, 0x0800, 0x279a
+	obj_tiles 0x08c1a790, 0x0800, 0x279b
+	obj_tiles 0x08c1ac8c, 0x00c0, 0x279c
+	obj_tiles 0x08c1ad2c, 0x01c0, 0x279d
+	obj_tiles 0x08c1ae54, 0x0100, 0x279e
+	obj_tiles 0x08c2cbac, 0x0800, 0x279f
+	obj_tiles 0x08c1bc64, 0x0200, 0x27a0
+	obj_tiles 0x08c1a9a0, 0x0800, 0x27a1
+	obj_tiles 0x08c02478, 0x0180, 0x27a2
+	obj_tiles 0x08c1af6c, 0x0180, 0x27a3
+	obj_tiles 0x08c1b178, 0x0200, 0x27a4
+	obj_tiles 0x08c1b0a8, 0x0200, 0x27a5
+	obj_tiles 0x08c1b328, 0x0180, 0x27a6
+	obj_tiles 0x08c1b418, 0x0400, 0x27a7
+	obj_tiles 0x08c033cc, 0x0080, 0x27a8
+	obj_tiles 0x08c1b510, 0x0100, 0x27a9
+	obj_tiles 0x08c1b594, 0x0100, 0x27aa
+	obj_tiles 0x08c1b660, 0x0140, 0x27ab
+	obj_tiles 0x08c1b748, 0x0800, 0x27ac
+	obj_tiles 0x08c1b988, 0x0200, 0x27ad
+	obj_tiles 0x08c1ba04, 0x0100, 0x27ae
+	obj_tiles 0x08c1baf0, 0x00a0, 0x27af
+	obj_tiles 0x08c1bb94, 0x0100, 0x27b0
+	obj_tiles 0x08c0297c, 0x0080, 0x27b1
+	obj_tiles 0x08c1be40, 0x0300, 0x27b2
+	obj_tiles 0x08c1bee4, 0x0100, 0x27b3
+	obj_tiles 0x08c1bee4, 0x0100, 0x27b4
+	obj_tiles 0x08c1bee4, 0x0100, 0x27b5
+	obj_tiles 0x08c1bfa4, 0x0800, 0x27b6
+	obj_tiles 0x08c1bfa4, 0x0800, 0x27b7
+	obj_tiles 0x08c1bfa4, 0x0800, 0x27b8
+	obj_tiles 0x08c1bfa4, 0x0800, 0x27b9
+	obj_tiles 0x08c1bfa4, 0x0800, 0x27ba
+	obj_tiles 0x08c1c350, 0x0080, 0x27bb
+	obj_tiles 0x08c1bc64, 0x0200, 0x27bc
+	obj_tiles 0x08c1c7bc, 0x0200, 0x27bd
+	obj_tiles 0x08c1d5fc, 0x0200, 0x27be
+	obj_tiles 0x08c1d6c4, 0x0080, 0x27bf
+	obj_tiles 0x08c1d750, 0x0200, 0x27c0
+	obj_tiles 0x08c1d8d0, 0x0500, 0x27c1
+	obj_tiles 0x08c1d9ac, 0x0800, 0x27c2
+	obj_tiles 0x08c1db64, 0x0400, 0x27c3
+	obj_tiles 0x08c1dc40, 0x0020, 0x27c4
+	obj_tiles 0x08c1dc58, 0x0800, 0x27c5
+	obj_tiles 0x08c1dfe8, 0x0100, 0x27c6
+	obj_tiles 0x08c1e0b4, 0x0800, 0x27c7
+	obj_tiles 0x08c1e354, 0x0400, 0x27c8
+	obj_tiles 0x08c1e4d0, 0x0a00, 0x27c9
+	obj_tiles 0x08c1edd8, 0x1000, 0x27ca
+	obj_tiles 0x08c1ebc8, 0x0800, 0x27cb
+	obj_tiles 0x08d966c0, 0x0400, 0x27cc
+	obj_tiles 0x08c20198, 0x0200, 0x27cd
+	obj_tiles 0x08c1fc84, 0x0800, 0x27ce
+	obj_tiles 0x08c1ff04, 0x0800, 0x27cf
+	obj_tiles 0x08c2023c, 0x0800, 0x27d0
+	obj_tiles 0x08c204e4, 0x0200, 0x27d1
+	obj_tiles 0x08c20c4c, 0x0800, 0x27d2
+	obj_tiles 0x08c20fac, 0x0200, 0x27d3
+	obj_tiles 0x08c20890, 0x0800, 0x27d4
+	obj_tiles 0x08c21084, 0x0200, 0x27d5
+	obj_tiles 0x08c2121c, 0x0800, 0x27d6
+	obj_tiles 0x08c21634, 0x0400, 0x27d7
+	obj_tiles 0x08c21718, 0x0200, 0x27d8
+	obj_tiles 0x08c21874, 0x0a80, 0x27d9
+	obj_tiles 0x08c220a8, 0x0600, 0x27da
+	obj_tiles 0x08c22234, 0x0800, 0x27db
+	obj_tiles 0x08c21f0c, 0x0200, 0x27dc
+	obj_tiles 0x08c226a4, 0x0600, 0x27dd
+	obj_tiles 0x08c22404, 0x0800, 0x27de
+	obj_tiles 0x08c228fc, 0x0180, 0x27df
+	obj_tiles 0x08c229ec, 0x0800, 0x27e0
+	obj_tiles 0x08c22ddc, 0x0800, 0x27e1
+	obj_tiles 0x08c23218, 0x0080, 0x27e2
+	obj_tiles 0x08c242b0, 0x0080, 0x27e3
+	obj_tiles 0x08c2407c, 0x0800, 0x27e4
+	obj_tiles 0x08c24300, 0x0800, 0x27e5
+	obj_tiles 0x08c24590, 0x0600, 0x27e6
+	obj_tiles 0x08c24820, 0x0600, 0x27e7
+	obj_tiles 0x08c23218, 0x0080, 0x27e8
+	obj_tiles 0x08c23ff4, 0x0080, 0x27e9
+	obj_tiles 0x08c24c50, 0x0180, 0x27ea
+	obj_tiles 0x08c23218, 0x0080, 0x27eb
+	obj_tiles 0x08c24dfc, 0x0200, 0x27ec
+	obj_tiles 0x08c24f48, 0x0400, 0x27ed
+	obj_tiles 0x08c251ac, 0x0a00, 0x27ee
+	obj_tiles 0x08c254e0, 0x0800, 0x27ef
+	obj_tiles 0x08c25794, 0x0200, 0x27f0
+	obj_tiles 0x08c27764, 0x0400, 0x27f1
+	obj_tiles 0x08c27a58, 0x0080, 0x27f2
+	obj_tiles 0x08c27910, 0x0800, 0x27f3
+	obj_tiles 0x08c25b1c, 0x0200, 0x27f4
+	obj_tiles 0x08c27b08, 0x0300, 0x27f5
+	obj_tiles 0x08c258b8, 0x0800, 0x27f6
+	obj_tiles 0x08c28394, 0x0380, 0x27f7
+	obj_tiles 0x08c27e34, 0x0800, 0x27f8
 
+    .align 2
 gUnknown_0852528C:: @ 852528C
-	.incbin "baserom.gba", 0x52528c, 0x120
+	obj_tiles 0x08c28564, 0x00c0, 0x27f9
+	obj_tiles 0x08c28610, 0x0800, 0x27fa
+	obj_tiles 0x08c28880, 0x0060, 0x27fb
+	obj_tiles 0x08c28880, 0x0060, 0x27fc
+	obj_tiles 0x08c28880, 0x0060, 0x27fd
+	obj_tiles 0x08c287f4, 0x0080, 0x27fe
+	obj_tiles 0x08c2caa0, 0x0180, 0x27ff
+	obj_tiles 0x08c2cdf4, 0x0180, 0x2800
+	obj_tiles 0x08c2d348, 0x0200, 0x2801
+	obj_tiles 0x08c2d570, 0x0200, 0x2802
+	obj_tiles 0x08c2d6d0, 0x0020, 0x2803
+	obj_tiles 0x08c2e554, 0x0400, 0x2804
+	obj_tiles 0x08c2df08, 0x0600, 0x2805
+	obj_tiles 0x08c2e0ac, 0x1000, 0x2806
+	obj_tiles 0x08c2e64c, 0x0400, 0x2807
+	obj_tiles 0x08c2eba4, 0x0020, 0x2808
+	obj_tiles 0x08c2ebd4, 0x0080, 0x2809
+	obj_tiles 0x08c2ec44, 0x0800, 0x280a
+	obj_tiles 0x08c2ee38, 0x0080, 0x280b
+	obj_tiles 0x08c2eeb4, 0x0200, 0x280c
+	obj_tiles 0x08c2eff0, 0x0400, 0x280d
+	obj_tiles 0x08c2f1f4, 0x0200, 0x280e
+	obj_tiles 0x08c2f354, 0x0200, 0x280f
+	obj_tiles 0x08c2f4f0, 0x0800, 0x2810
+	obj_tiles 0x08c2f8a4, 0x0280, 0x2811
+	obj_tiles 0x08c2f3e0, 0x0200, 0x2812
+	obj_tiles 0x08c1b0a8, 0x0200, 0x2813
+	obj_tiles 0x08d8dae0, 0x0400, 0x2814
+	obj_tiles 0x08d8d2a4, 0x0200, 0x2815
+	obj_tiles 0x08d8e840, 0x0200, 0x2816
+	obj_tiles 0x08d93b44, 0x0080, 0x2817
+	obj_tiles 0x08d8ea54, 0x0020, 0x2818
+	obj_tiles 0x08d8ea54, 0x0020, 0x2819
+	obj_tiles 0x08d93b9c, 0x0080, 0x281a
+	obj_tiles 0x08c2407c, 0x0800, 0x281b
+	obj_tiles 0x08d8ea54, 0x0020, 0x281c
 
+    .align 2
 gUnknown_085253AC:: @ 85253AC
-	.incbin "baserom.gba", 0x5253ac, 0x270
+	obj_tiles 0x08d8ef2c, 0x0080, 0x281d
+	obj_tiles 0x08dba378, 0x0400, 0x281e
+	obj_tiles 0x08dba4b8, 0x0080, 0x281f
+	obj_tiles 0x08d8ecc4, 0x0800, 0x2820
+	obj_tiles 0x08d8ef04, 0x0020, 0x2821
+	obj_tiles 0x08d8ef98, 0x0800, 0x2822
+	obj_tiles 0x08d8f118, 0x0800, 0x2823
+	obj_tiles 0x08d8f284, 0x0800, 0x2824
+	obj_tiles 0x08d92eec, 0x1000, 0x2825
+	obj_tiles 0x08d93c24, 0x0800, 0x2826
+	obj_tiles 0x08d93e4c, 0x00a0, 0x2827
+	obj_tiles 0x08d8f780, 0x0800, 0x2828
+	obj_tiles 0x08d93eb4, 0x0200, 0x2829
+	obj_tiles 0x08dba174, 0x0600, 0x282a
+	obj_tiles 0x08d93474, 0x0200, 0x282b
+	obj_tiles 0x08d94658, 0x0800, 0x282c
+	obj_tiles 0x08d949f0, 0x0200, 0x282d
+	obj_tiles 0x08c1e0b4, 0x0800, 0x282e
+	obj_tiles 0x08c0a3ec, 0x1000, 0x282f
+	obj_tiles 0x08c1bee4, 0x0100, 0x2830
 
+	obj_pal 0x08c028cc, 0x2710
+	obj_pal 0x08c1c794, 0x2711
+	obj_pal 0x08c20868, 0x2712
+	obj_pal 0x08c028f0, 0x2713
+	obj_pal 0x08c02918, 0x2714
+	obj_pal 0x08c0292c, 0x2715
+	obj_pal 0x08c02954, 0x2716
+	obj_pal 0x08c02b48, 0x2717
+	obj_pal 0x08c02b88, 0x2718
+	obj_pal 0x08c0328c, 0x2719
+	obj_pal 0x08c02ba4, 0x271a
+	obj_pal 0x08c03324, 0x271b
+	obj_pal 0x08c033b4, 0x271c
+	obj_pal 0x08c0346c, 0x271d
+	obj_pal 0x08c1fc68, 0x271e
+	obj_pal 0x08c034f0, 0x271f
+	obj_pal 0x08c03588, 0x2720
+	obj_pal 0x08c03588, 0x2721
+	obj_pal 0x08c24db8, 0x2722
+	obj_pal 0x08c035dc, 0x2723
+	obj_pal 0x08c03784, 0x2724
+	obj_pal 0x08c03a00, 0x2725
+	obj_pal 0x08c03d60, 0x2726
+	obj_pal 0x08c037ac, 0x2727
+	obj_pal 0x08c03f6c, 0x2728
+	obj_pal 0x08c03d88, 0x2729
+	obj_pal 0x08c047cc, 0x272a
+	obj_pal 0x08c047f4, 0x272b
+	obj_pal 0x08c04b18, 0x272c
+	obj_pal 0x08c05148, 0x272d
+	obj_pal 0x08c05530, 0x272e
+	obj_pal 0x08c04360, 0x272f
+	obj_pal 0x08c04380, 0x2730
+	obj_pal 0x08c05554, 0x2731
+	obj_pal 0x08c05554, 0x2732
+	obj_pal 0x08c05554, 0x2733
+	obj_pal 0x08c06650, 0x2734
+	obj_pal 0x08c06650, 0x2735
+	obj_pal 0x08c07914, 0x2736
+	obj_pal 0x08c0793c, 0x2737
+	obj_pal 0x08c07914, 0x2738
+	obj_pal 0x08c07914, 0x2739
+	obj_pal 0x08c08594, 0x273a
+	obj_pal 0x08c089bc, 0x273b
+	obj_pal 0x08c089e4, 0x273c
+	obj_pal 0x08c08c78, 0x273d
+	obj_pal 0x08c099e4, 0x273e
+	obj_pal 0x08c09a04, 0x273e
+	obj_pal 0x08c09f88, 0x2740
+	obj_pal 0x08c09fb0, 0x2741
+	obj_pal 0x08c09fd8, 0x2742
+	obj_pal 0x08c09fd8, 0x2743
+	obj_pal 0x08c09fd8, 0x2744
+	obj_pal 0x08c047cc, 0x2745
+	obj_pal 0x08c0a3d4, 0x2746
+	obj_pal 0x08c09fd8, 0x2747
+	obj_pal 0x08c0a894, 0x2748
+	obj_pal 0x08c0aa08, 0x2749
+
+    .align 2
 gUnknown_0852561C:: @ 852561C
-	.incbin "baserom.gba", 0x52561c, 0x270
+	obj_pal 0x08c0ae94, 0x274a
+	obj_pal 0x08c0af1c, 0x274b
+	obj_pal 0x08c0af60, 0x274c
+	obj_pal 0x08c0b02c, 0x274d
+	obj_pal 0x08c0b41c, 0x274e
+	obj_pal 0x08c0b600, 0x274f
+	obj_pal 0x08c231f4, 0x2750
+	obj_pal 0x08c0b7d0, 0x2751
+	obj_pal 0x08c0b83c, 0x2752
+	obj_pal 0x08d8eaa4, 0x2753
+	obj_pal 0x08d8eac4, 0x2754
+	obj_pal 0x08c0b7d0, 0x2755
+	obj_pal 0x08c0b8e4, 0x2756
+	obj_pal 0x08c0b8e4, 0x2757
+	obj_pal 0x08c0bc08, 0x2758
+	obj_pal 0x08c0bd3c, 0x2759
+	obj_pal 0x08c1b304, 0x275a
+	obj_pal 0x08c0bfd8, 0x275b
+	obj_pal 0x08c14f28, 0x275c
+	obj_pal 0x08c14f28, 0x275d
+	obj_pal 0x08c0c194, 0x275e
+	obj_pal 0x08c0c194, 0x275f
+	obj_pal 0x08c0c950, 0x2760
+	obj_pal 0x08c0c9f8, 0x2761
+	obj_pal 0x08c0cbb4, 0x2762
+	obj_pal 0x08c0cbc8, 0x2763
+	obj_pal 0x08c0cbf0, 0x2764
+	obj_pal 0x08c0cc18, 0x2765
+	obj_pal 0x08c0cc30, 0x2766
+	obj_pal 0x08c24d54, 0x2767
+	obj_pal 0x08c0cc58, 0x2768
+	obj_pal 0x08c0cc74, 0x2769
+	obj_pal 0x08c0cc9c, 0x276a
+	obj_pal 0x08c0b698, 0x276b
+	obj_pal 0x08c0ccc0, 0x276c
+	obj_pal 0x08c0ccdc, 0x276d
+	obj_pal 0x08c0cd04, 0x276e
+	obj_pal 0x08c0cd44, 0x276f
+	obj_pal 0x08c0cd6c, 0x2770
+	obj_pal 0x08c0cd88, 0x2771
+	obj_pal 0x08c0cd04, 0x2772
+	obj_pal 0x08c27e0c, 0x2773
+	obj_pal 0x08c0cdb0, 0x2774
+	obj_pal 0x08c0cdcc, 0x2775
+	obj_pal 0x08c0cdcc, 0x2776
+	obj_pal 0x08c0cdf4, 0x2777
+	obj_pal 0x08c0f14c, 0x2778
+	obj_pal 0x08c0f6f8, 0x2779
+	obj_pal 0x08c0f6f8, 0x277a
+	obj_pal 0x08c0fbbc, 0x277b
+	obj_pal 0x08c0fbbc, 0x277c
+	obj_pal 0x08c0ff90, 0x277d
+	obj_pal 0x08c0ff90, 0x277e
+	obj_pal 0x08c103e0, 0x277f
+	obj_pal 0x08c1072c, 0x2780
+	obj_pal 0x08c109c0, 0x2781
+	obj_pal 0x08c10adc, 0x2782
+	obj_pal 0x08c028ac, 0x2783
+	obj_pal 0x08c13134, 0x2784
+	obj_pal 0x08c13398, 0x2785
+	obj_pal 0x08c1354c, 0x2786
+	obj_pal 0x08c137f8, 0x2787
+	obj_pal 0x08c13914, 0x2788
+	obj_pal 0x08c13968, 0x2789
+	obj_pal 0x08c13a88, 0x278a
+	obj_pal 0x08c13a88, 0x278b
+	obj_pal 0x08c13e78, 0x278c
+	obj_pal 0x08c13f8c, 0x278d
+	obj_pal 0x08c1401c, 0x278e
+	obj_pal 0x08c141dc, 0x278f
+	obj_pal 0x08c1446c, 0x2790
+	obj_pal 0x08c1446c, 0x2791
+	obj_pal 0x08c148c0, 0x2792
+	obj_pal 0x08c148c0, 0x2793
+	obj_pal 0x08c14b58, 0x2794
+	obj_pal 0x08c14bf4, 0x2795
+	obj_pal 0x08c14bf4, 0x2796
+	obj_pal 0x08c1a478, 0x2797
 
+    .align 2
 gUnknown_0852588C:: @ 852588C
-	.incbin "baserom.gba", 0x52588c, 0x308
+	obj_pal 0x08c1a564, 0x2798
+	obj_pal 0x08c1a478, 0x2799
+	obj_pal 0x08c1a478, 0x279a
+	obj_pal 0x08c1a980, 0x279b
+	obj_pal 0x08c1ad0c, 0x279c
+	obj_pal 0x08c1ae34, 0x279d
+	obj_pal 0x08c1ae34, 0x279e
+	obj_pal 0x08c2cddc, 0x279f
+	obj_pal 0x08c1bcdc, 0x27a0
+	obj_pal 0x08c1a980, 0x27a1
+	obj_pal 0x08c028ac, 0x27a2
+	obj_pal 0x08c1b080, 0x27a3
+	obj_pal 0x08c1b25c, 0x27a4
+	obj_pal 0x08c1b25c, 0x27a5
+	obj_pal 0x08c1b3fc, 0x27a6
+	obj_pal 0x08c1b3fc, 0x27a7
+	obj_pal 0x08c03414, 0x27a8
+	obj_pal 0x08c1b57c, 0x27a9
+	obj_pal 0x08c1b640, 0x27aa
+	obj_pal 0x08c1b728, 0x27ab
+	obj_pal 0x08c1b960, 0x27ac
+	obj_pal 0x08c1b9ec, 0x27ad
+	obj_pal 0x08c1bacc, 0x27ae
+	obj_pal 0x08c1bb6c, 0x27af
+	obj_pal 0x08c1bc3c, 0x27b0
+	obj_pal 0x08c029a4, 0x27b1
+	obj_pal 0x08c1bec4, 0x27b2
+	obj_pal 0x08c1bf44, 0x27b3
+	obj_pal 0x08c1bf74, 0x27b4
+	obj_pal 0x08c1bf8c, 0x27b5
+	obj_pal 0x08c1c2b0, 0x27b6
+	obj_pal 0x08c1c2d0, 0x27b7
+	obj_pal 0x08c1c2f0, 0x27b8
+	obj_pal 0x08c1c310, 0x27b9
+	obj_pal 0x08c1c330, 0x27ba
+	obj_pal 0x08c1c39c, 0x27bb
+	obj_pal 0x08c1c3c4, 0x27bc
+	obj_pal 0x08c1c794, 0x27bd
+	obj_pal 0x08c1d69c, 0x27be
+	obj_pal 0x08c1d728, 0x27bf
+	obj_pal 0x08c1d8a8, 0x27c0
+	obj_pal 0x08c1d994, 0x27c1
+	obj_pal 0x08c1db14, 0x27c2
+	obj_pal 0x08c1db3c, 0x27c3
+	obj_pal 0x08c1db3c, 0x27c4
+	obj_pal 0x08c1db3c, 0x27c5
+	obj_pal 0x08c1e08c, 0x27c6
+	obj_pal 0x08c1e32c, 0x27c7
+	obj_pal 0x08c1e4a8, 0x27c8
+	obj_pal 0x08c1e8e4, 0x27c9
+	obj_pal 0x08c1f1a4, 0x27ca
+	obj_pal 0x08c1edb8, 0x27cb
+	obj_pal 0x08d967d4, 0x27cc
+	obj_pal 0x08c2021c, 0x27cd
+	obj_pal 0x08c1fee0, 0x27ce
+	obj_pal 0x08c20170, 0x27cf
+	obj_pal 0x08c204bc, 0x27d0
+	obj_pal 0x08c20640, 0x27d1
+	obj_pal 0x08c20f84, 0x27d2
+	obj_pal 0x08c21064, 0x27d3
+	obj_pal 0x08c20c34, 0x27d4
+	obj_pal 0x08c211f4, 0x27d5
+	obj_pal 0x08c2160c, 0x27d6
+	obj_pal 0x08c216fc, 0x27d7
+	obj_pal 0x08c21858, 0x27d8
+	obj_pal 0x08c21ee4, 0x27d9
+	obj_pal 0x08c22210, 0x27da
+	obj_pal 0x08c223e0, 0x27db
+	obj_pal 0x08c22080, 0x27dc
+	obj_pal 0x08c228d8, 0x27dd
+	obj_pal 0x08c22610, 0x27de
+	obj_pal 0x08c229c8, 0x27df
+	obj_pal 0x08c1c2d0, 0x27e0
+	obj_pal 0x08c230e4, 0x27e1
+	obj_pal 0x08c232a0, 0x27e2
+	obj_pal 0x08c2456c, 0x27e3
+	obj_pal 0x08c2456c, 0x27e4
+	obj_pal 0x08c2456c, 0x27e5
+	obj_pal 0x08c231f4, 0x27e6
+	obj_pal 0x08c249ac, 0x27e7
+	obj_pal 0x08c232c0, 0x27e8
+	obj_pal 0x08c2405c, 0x27e9
+	obj_pal 0x08c24c28, 0x27ea
+	obj_pal 0x08c23280, 0x27eb
+	obj_pal 0x08c24dd4, 0x27ec
+	obj_pal 0x08c24f28, 0x27ed
+	obj_pal 0x08c25498, 0x27ee
+	obj_pal 0x08c254c0, 0x27ef
+	obj_pal 0x08c25774, 0x27f0
+	obj_pal 0x08c278e8, 0x27f1
+	obj_pal 0x08c27ae4, 0x27f2
+	obj_pal 0x08c27ae4, 0x27f3
+	obj_pal 0x08c25afc, 0x27f4
+	obj_pal 0x08c27cc4, 0x27f5
+	obj_pal 0x08c25890, 0x27f6
+	obj_pal 0x08c2836c, 0x27f7
+	obj_pal 0x08c2836c, 0x27f8
 
+    .align 2
 gUnknown_08525B94:: @ 8525B94
-	.incbin "baserom.gba", 0x525b94, 0x120
+	obj_pal 0x08c285e8, 0x27f9
+	obj_pal 0x08c287d0, 0x27fa
+	obj_pal 0x08c288d0, 0x27fb
+	obj_pal 0x08c288ec, 0x27fc
+	obj_pal 0x08c28908, 0x27fd
+	obj_pal 0x08c2885c, 0x27fe
+	obj_pal 0x08c2cb84, 0x27ff
+	obj_pal 0x08c2ce94, 0x2800
+	obj_pal 0x08c2d40c, 0x2801
+	obj_pal 0x08c2d6ac, 0x2802
+	obj_pal 0x08c2d6f8, 0x2803
+	obj_pal 0x08c2e630, 0x2804
+	obj_pal 0x08c2dee0, 0x2805
+	obj_pal 0x08c2dee0, 0x2806
+	obj_pal 0x08c231f4, 0x2807
+	obj_pal 0x08c2ebbc, 0x2808
+	obj_pal 0x08c2ec24, 0x2809
+	obj_pal 0x08c2ec24, 0x280a
+	obj_pal 0x08c2ee9c, 0x280b
+	obj_pal 0x08c2efcc, 0x280c
+	obj_pal 0x08c2f1cc, 0x280d
+	obj_pal 0x08c2f32c, 0x280e
+	obj_pal 0x08c2f3cc, 0x280f
+	obj_pal 0x08c2f87c, 0x2810
+	obj_pal 0x08c2f9c0, 0x2811
+	obj_pal 0x08c2f4c8, 0x2812
+	obj_pal 0x08c1b27c, 0x2813
+	obj_pal 0x08d8dc9c, 0x2814
+	obj_pal 0x08d8dab8, 0x2815
+	obj_pal 0x08d8e914, 0x2816
+	obj_pal 0x08d93b84, 0x2817
+	obj_pal 0x08d8ea74, 0x2818
+	obj_pal 0x08d8ea8c, 0x2819
+	obj_pal 0x08d93bdc, 0x281a
+	obj_pal 0x08d93bf4, 0x281b
+	obj_pal 0x08d93c0c, 0x281c
 
+    .align 2
 gUnknown_08525CB4:: @ 8525CB4
-	.incbin "baserom.gba", 0x525cb4, 0xa0
+	obj_pal 0x08d8ef80, 0x281d
+	obj_pal 0x08dba35c, 0x281e
+	obj_pal 0x08dba4a0, 0x281f
+	obj_pal 0x08d8eee0, 0x2820
+	obj_pal 0x08d8eee0, 0x2821
+	obj_pal 0x08d8f3ec, 0x2822
+	obj_pal 0x08d8f3ec, 0x2823
+	obj_pal 0x08d8f3ec, 0x2824
+	obj_pal 0x08d92ec4, 0x2825
+	obj_pal 0x08d93e30, 0x2826
+	obj_pal 0x08d93e98, 0x2827
+	obj_pal 0x08d8fb7c, 0x2828
+	obj_pal 0x08d9403c, 0x2829
+	obj_pal 0x08dba14c, 0x282a
+	obj_pal 0x08d93458, 0x282b
+	obj_pal 0x08d949d4, 0x282c
+	obj_pal 0x08d94a90, 0x282d
+	obj_pal 0x08d96698, 0x282e
+	obj_pal 0x08d9104c, 0x282f
+	obj_pal 0x08c1bf5c, 0x2830
 
+    .align 2
 gUnknown_08525D54:: @ 8525D54
-	.incbin "baserom.gba", 0x525d54, 0x144
+	.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
+	.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
+	.4byte 0x08d90074, 0x08d90d3c, 0x08d90d58
+	.4byte 0x08c1e90c, 0x08c1eadc, 0x08c1eb00
+	.4byte 0x08c25bec, 0x08c25bc4, 0x08c26958
+	.4byte 0x08c25bec, 0x08c25bc4, 0x08c26e54
+	.4byte 0x08c25bec, 0x08c25bc4, 0x08c27324
+	.4byte 0x08c28924, 0x08c28acc, 0x08c28b1c
+	.4byte 0x08c28924, 0x08c28acc, 0x08c28cac
+	.4byte 0x08c29dbc, 0x08c29d7c, 0x08c29a84
+	.4byte 0x08c29dbc, 0x08c29d7c, 0x08c2a33c
+	.4byte 0x08c2bde4, 0x08c2c780, 0x08c2c7a8
+	.4byte 0x08c2b05c, 0x08c2bdc4, 0x08c2a808
+	.4byte 0x08c2b05c, 0x08c2bdc4, 0x08c2aad0
+	.4byte 0x08c2b05c, 0x08c2bdc4, 0x08c2adcc
+	.4byte 0x08d8dcb4, 0x08d8e624, 0x08d8e648
+	.4byte 0x08d92b28, 0x08d92b00, 0x08d92d88
+	.4byte 0x08d8f414, 0x08d8f570, 0x08d8f598
+	.4byte 0x08c28924, 0x08c28af4, 0x08c28b1c
+	.4byte 0x08c28924, 0x08c28af4, 0x08c28cac
+	.4byte 0x08c28e38, 0x08c29860, 0x08c29880
+	.4byte 0x08d9405c, 0x08d94350, 0x08d9436c
+	.4byte 0x08c29dbc, 0x08c29d9c, 0x08c29a84
+	.4byte 0x08c29dbc, 0x08c29d9c, 0x08c2a33c
+	.4byte 0x08c25bec, 0x08d91074, 0x08c26958
+	.4byte 0x08c25bec, 0x08d91074, 0x08c26e54
+	.4byte 0x08c25bec, 0x08d91074, 0x08c27324
 
+    .align 2
 gUnknown_08525E98:: @ 8525E98
-	.incbin "baserom.gba", 0x525e98, 0xc0
+	.4byte ma00_load_graphics
+	.4byte ma01_080728D0
+	.4byte ma02_instanciate_template
+	.4byte sub_80A3ECC
+	.4byte ma04_wait_countdown
+	.4byte sub_80A3F88
+	.4byte nullsub_6
+	.4byte nullsub_7
+	.4byte sub_80A3FC4
+	.4byte ma09_play_sound
+	.4byte sub_80A41D8
+	.4byte ma0B_0807324C
+	.4byte ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument
+	.4byte ma0D_reset_BLDCNT_and_BLDALPHA
+	.4byte ma0E_call
+	.4byte sub_80A4D00
+	.4byte ma10_080736AC
+	.4byte ma11_if_else
+	.4byte ma12_cond_if
+	.4byte ma13_goto
+	.4byte ma14_load_background
+	.4byte ma15_load_battle_screen_elements
+	.4byte ma16_wait_for_battle_screen_elements_s2
+	.4byte sub_80A5124
+	.4byte ma18_load_background_probably
+	.4byte ma19_08073BC8
+	.4byte ma1A_8073C00
+	.4byte ma1B_8073C2C
+	.4byte ma1C_8073ED0
+	.4byte ma1D_08073FB4
+	.4byte ma1E_set_BLDCNT
+	.4byte sub_80A57F8
+	.4byte ma20_wait_for_something
+	.4byte ma21_08074164
+	.4byte sub_80A4A18
+	.4byte ma23_8073484
+	.4byte sub_80A5944
+	.4byte sub_80A4E5C
+	.4byte sub_80A5508
+	.4byte sub_80A559C
+	.4byte sub_80A5984
+	.4byte sub_80A59DC
+	.4byte sub_80A5A0C
+	.4byte ma2B_make_side_invisible
+	.4byte ma2C_make_side_visible
+	.4byte sub_80A5AFC
+	.4byte sub_80A5BAC
+	.4byte ma2F_stop_music
 
+    .align 2
 gUnknown_08525F58:: @ 8525F58
-	.incbin "baserom.gba", 0x525f58, 0x20
+	.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
+	.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
+	.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
+	.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
 
+    .align 2
 gCastformFrontSpriteCoords:: @ 8525F78
-	.incbin "baserom.gba", 0x525f78, 0x10
+	.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
+	.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
 
+    .align 2
 gUnknown_08525F88:: @ 8525F88
-	.incbin "baserom.gba", 0x525f88, 0x4
+	.byte 0x0d, 0x0e, 0x0d, 0x0d
 
+    .align 2
 gUnknown_08525F8C:: @ 8525F8C
-	.incbin "baserom.gba", 0x525f8c, 0x4
+	.byte 0x00, 0x00, 0x00, 0x00
 
+    .align 2
 gUnknown_08525F90:: @ 8525F90
-	.incbin "baserom.gba", 0x525f90, 0x30
+	spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+    .align 2
 gUnknown_08525FC0:: @ 8525FC0
-	.incbin "baserom.gba", 0x525fc0, 0x18f80
+	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
+	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
 
+    .align 2
+@ the mother of all baserom includes
+	.incbin "baserom.gba", 0x525fd0, 0x18f60
+
+    .align 2
+gUnknown_0853EF30:: @ 853EF30
+	.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
+
+    .align 2
 gUnknown_0853EF40:: @ 853EF40
-	.incbin "baserom.gba", 0x53ef40, 0x8
+	.4byte 0x00000004, gUnknown_0853EF30
 
+    .align 2
 gUnknown_0853EF48:: @ 853EF48
-	.incbin "baserom.gba", 0x53ef48, 0x18
+	spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+    .align 2
 gUnknown_0853EF60:: @ 853EF60
-	.incbin "baserom.gba", 0x53ef60, 0xf8
+	spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44
+

data/bike.s

@@ -5,19 +5,54 @@
 	.align 2, 0
 
 gUnknown_0859744C:: @ 859744C
-	.incbin "baserom.gba", 0x59744c, 0x10
+	.4byte sub_8119224
+	.4byte sub_8119238
+	.4byte sub_8119280
+	.4byte sub_8119344
 
+	.align 2
 gUnknown_0859745C:: @ 859745C
-	.incbin "baserom.gba", 0x59745c, 0xc
+	.4byte PlayerGoSpeed0
+	.4byte PlayerGoSpeed1
+	.4byte PlayerGoSpeed3
 
+	.align 2
 gUnknown_08597468:: @ 8597468
-	.incbin "baserom.gba", 0x597468, 0x34
+	.4byte sub_81197E4
+	.4byte sub_81197F4
+	.4byte sub_8119830
+	.4byte sub_81198C0
+	.4byte sub_81198FC
+	.4byte sub_8119938
+	.4byte sub_8119974
+	.4byte sub_81199B0
+	.4byte sub_8119A24
+	.4byte sub_8119A94
+	.4byte sub_8119AA4
+	.4byte sub_8119B34
+	.4byte sub_8119BC4
 
+	.align 2
 gUnknown_0859749C:: @ 859749C
-	.incbin "baserom.gba", 0x59749c, 0x1c
+	.4byte CheckMovementInputAcroBikeNormal
+	.4byte CheckMovementInputAcroBikeChangingDirection
+	.4byte CheckMovementInputAcroBikeStandingWheelie
+	.4byte CheckMovementInputAcroBikeBunnyHop
+	.4byte CheckMovementInputAcroBikeMovingWheelie
+	.4byte CheckMovementInputAcroBikeUnknownMode5
+	.4byte CheckMovementInputAcroBikeUnknownMode6
 
+	.align 2
 gUnknown_085974B8:: @ 85974B8
-	.incbin "baserom.gba", 0x5974b8, 0x8
+	.2byte 0x0001, 0x0002, 0x0004
 
+	.align 1
+gUnknown_085974BE:: @ 85974BE
+	.2byte 0x0004
+
+	.align 2
 gUnknown_085974C0:: @ 85974C0
-	.incbin "baserom.gba", 0x5974c0, 0x70
+	.4byte 0x00000001, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000001
+    .4byte 0x00000002, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000002
+    .4byte 0x00000003, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000003
+    .4byte 0x00000004, 0x00000002, 0x0000000f, 0x0000000f, gUnknown_085974BE, gUnknown_085974BE, 0x00000004

data/cable_club.s

@@ -4,8 +4,13 @@
     .section .rodata
     .align 2, 0
 
+	.align 2
 gUnknown_08550594:: @ 8550594
-	.incbin "baserom.gba", 0x550594, 0x8
+	window_template 0x00, 0x10, 0x0b, 0x0b, 0x02, 0x0f, 0x0125
 
+	.align 2
 gUnknown_0855059C:: @ 855059C
-	.incbin "baserom.gba", 0x55059c, 0x190
+	.4byte gText_BronzeCard
+	.4byte gText_CopperCard
+	.4byte gText_SilverCard
+	.4byte gText_GoldCard

data/data2c.s

@@ -11,8 +11,9 @@
 @ 831C898
 	.include "data/battle_moves.inc"
 
-	@ 0x31d93c unreferenced unknown data
+@ 0x31d93c
-.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00
+@ unreferenced unknown data
+	.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00
 
 @ 831D94C
 	.include "data/pokedex_order.inc"
@@ -53,56 +54,142 @@
 @ 832937C
 	.include "data/level_up_learnset_pointers.inc"
 
-gMonFrontAnimIdsTable:: @ 83299EC
+@ 83299EC
-	.incbin "baserom.gba", 0x3299ec, 0x19b
+	.include "data/graphics/pokemon/front_anim_ids_table.inc"
 
-gMonAnimationDelayTable:: @ 8329B87
+@ 8329B87
-	.incbin "baserom.gba", 0x329b87, 0x19b
+	.include "data/graphics/pokemon/animation_delay_table.inc"
 
+	.align 1
 gUnknown_08329D22:: @ 8329D22
-	.incbin "baserom.gba", 0x329d22, 0x4
+@ Masks for getting PP Up count, also PP Max values
+	.byte 0x03, 0x0c, 0x30, 0xc0
 
+	.align 1
 gUnknown_08329D26:: @ 8329D26
-	.incbin "baserom.gba", 0x329d26, 0x4
+@ Masks for setting PP Up count
+	.byte 0xfc, 0xf3, 0xcf, 0x3f
 
+	.align 1
 gUnknown_08329D2A:: @ 8329D2A
-	.incbin "baserom.gba", 0x329d2a, 0x4
+@ Values added to PP Up count
+	.byte 0x01, 0x04, 0x10, 0x40
 
+	.align 1
 gStatStageRatios:: @ 8329D2E
-	.incbin "baserom.gba", 0x329d2e, 0x1a
+	.byte 0x0a, 0x28
+	.byte 0x0a, 0x23
+	.byte 0x0a, 0x1e
+	.byte 0x0a, 0x19
+	.byte 0x0a, 0x14
+	.byte 0x0a, 0x0f
+	.byte 0x0a, 0x0a
+	.byte 0x0f, 0x0a
+	.byte 0x14, 0x0a
+	.byte 0x19, 0x0a
+	.byte 0x1e, 0x0a
+	.byte 0x23, 0x0a
+	.byte 0x28, 0x0a
 
+	.align 1
 gUnknown_08329D48:: @ 8329D48
-	.incbin "baserom.gba", 0x329d48, 0xc
+	.2byte 0x0032, 0x005f, 0x005a, 0x00b4, 0x005f, 0x005a
 
+	.align 1
 gUnknown_08329D54:: @ 8329D54
-	.incbin "baserom.gba", 0x329d54, 0x20
+	.2byte 0x0003, 0x000a, 0x001b, 0x002b, 0x001e, 0x0043, 0x0042, 0x0019
+	.2byte 0x0012, 0x000c, 0x001c, 0x0047, 0x001f, 0x0036, 0x0002, 0x0014
 
+	.align 1
 gHoldEffectToType:: @ 8329D74
-	.incbin "baserom.gba", 0x329d74, 0x24
+	.byte 0x1f, 0x06
+	.byte 0x2a, 0x08
+	.byte 0x2e, 0x04
+	.byte 0x2f, 0x05
+	.byte 0x30, 0x0c
+	.byte 0x31, 0x11
+	.byte 0x32, 0x01
+	.byte 0x33, 0x0d
+	.byte 0x34, 0x0b
+	.byte 0x35, 0x02
+	.byte 0x36, 0x03
+	.byte 0x37, 0x0f
+	.byte 0x38, 0x07
+	.byte 0x39, 0x0e
+	.byte 0x3a, 0x0a
+	.byte 0x3b, 0x10
+	.byte 0x3c, 0x00
+	.byte 0x00, 0x00
 
+	.align 2
 gUnknown_08329D98:: @ 8329D98
-	.incbin "baserom.gba", 0x329d98, 0x60
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3A8, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF3C8, gUnknown_082FF694, oac_poke_opponent
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF3E8, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACA8, NULL, gUnknown_082FF408, gUnknown_082FF694, oac_poke_opponent
 
+	.align 2
 gUnknown_08329DF8:: @ 8329DF8
-	.incbin "baserom.gba", 0x329df8, 0xc0
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF428, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF448, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF468, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF490, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4B8, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4D8, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF4F8, gUnknown_082FF618, sub_8039BB4
+	spr_template 0xffff, 0x0000, gUnknown_0831ACB0, NULL, gUnknown_082FF518, gUnknown_082FF618, sub_8039BB4
 
 gSecretBaseTrainerClasses:: @ 8329EB8
-	.incbin "baserom.gba", 0x329eb8, 0xa
+	.byte TRAINER_CLASS_YOUNGSTER, TRAINER_CLASS_BUG_CATCHER, TRAINER_CLASS_RICH_BOY, TRAINER_CLASS_CAMPER, TRAINER_CLASS_COOLTRAINER_1
+	.byte TRAINER_CLASS_LASS, TRAINER_CLASS_SCHOOL_KID_2, TRAINER_CLASS_LADY, TRAINER_CLASS_PICNICKER, TRAINER_CLASS_COOLTRAINER_2
 
 gUnknown_08329EC2:: @ 8329EC2
-	.incbin "baserom.gba", 0x329ec2, 0x6
+	.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1f, 0x1e
 
 gUnknown_08329EC8:: @ 8329EC8
-	.incbin "baserom.gba", 0x329ec8, 0x6
+	.byte 1, 1, 3, 2, 4, 6
 
 gUnknown_08329ECE:: @ 8329ECE
-	.incbin "baserom.gba", 0x329ece, 0x1c
+@ Happiness deltas
+	.byte 0x05, 0x03, 0x02
+	.byte 0x05, 0x03, 0x02
+	.byte 0x01, 0x01, 0x00
+	.byte 0x03, 0x02, 0x01
+	.byte 0x01, 0x01, 0x00
+	.byte 0x01, 0x01, 0x01
+	.byte 0xff, 0xff, 0xff
+	.byte 0xfb, 0xfb, 0xf6
+	.byte 0xfb, 0xfb, 0xf6
 
+	.align 1
 gHMMoves:: @ 8329EEA
-	.incbin "baserom.gba", 0x329eea, 0x12
+	.2byte MOVE_CUT
+	.2byte MOVE_FLY
+	.2byte MOVE_SURF
+	.2byte MOVE_STRENGTH
+	.2byte MOVE_FLASH
+	.2byte MOVE_ROCK_SMASH
+	.2byte MOVE_WATERFALL
+	.2byte MOVE_DIVE
+	.2byte 0xffff
 
+	.align 1
 gAlteringCaveWildMonHeldItems:: @ 8329EFC
-	.incbin "baserom.gba", 0x329efc, 0x2c
+	.2byte 0, ITEM_NONE
+	.2byte SPECIES_MAREEP,		ITEM_GANLON_BERRY
+	.2byte SPECIES_PINECO,		ITEM_APICOT_BERRY
+	.2byte SPECIES_HOUNDOUR,	ITEM_BIG_MUSHROOM
+	.2byte SPECIES_TEDDIURSA,	ITEM_PETAYA_BERRY
+	.2byte SPECIES_AIPOM,		ITEM_BERRY_JUICE
+	.2byte SPECIES_SHUCKLE,		ITEM_BERRY_JUICE
+	.2byte SPECIES_STANTLER,	ITEM_PETAYA_BERRY
+	.2byte SPECIES_SMEARGLE,	ITEM_SALAC_BERRY
 
+	.align 2
+gUnknown_08329F20:: @ 8329F20
+	.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
+
+	.align 2
 gUnknown_08329F28:: @ 8329F28
-	.incbin "baserom.gba", 0x329f28, 0x18
+	spr_template 0xffff, 0xffff, gUnknown_08329F20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+

data/enemy_mon_elevation.inc

@@ -0,0 +1,415 @@
+@ This determines how much higher above the usual position the enemy Pokémon
+@ is during battle. Species that float or fly have nonzero values.
+gEnemyMonElevation:: @ 8305DCC
+	.byte  0 @ 0
+	.byte  0 @ SPECIES_BULBASAUR
+	.byte  0 @ SPECIES_IVYSAUR
+	.byte  0 @ SPECIES_VENUSAUR
+	.byte  0 @ SPECIES_CHARMANDER
+	.byte  0 @ SPECIES_CHARMELEON
+	.byte  0 @ SPECIES_CHARIZARD
+	.byte  0 @ SPECIES_SQUIRTLE
+	.byte  0 @ SPECIES_WARTORTLE
+	.byte  0 @ SPECIES_BLASTOISE
+	.byte  0 @ SPECIES_CATERPIE
+	.byte  0 @ SPECIES_METAPOD
+	.byte  8 @ SPECIES_BUTTERFREE
+	.byte  0 @ SPECIES_WEEDLE
+	.byte  0 @ SPECIES_KAKUNA
+	.byte  8 @ SPECIES_BEEDRILL
+	.byte 16 @ SPECIES_PIDGEY
+	.byte  0 @ SPECIES_PIDGEOTTO
+	.byte  4 @ SPECIES_PIDGEOT
+	.byte  0 @ SPECIES_RATTATA
+	.byte  0 @ SPECIES_RATICATE
+	.byte  0 @ SPECIES_SPEAROW
+	.byte  6 @ SPECIES_FEAROW
+	.byte  0 @ SPECIES_EKANS
+	.byte  0 @ SPECIES_ARBOK
+	.byte  0 @ SPECIES_PIKACHU
+	.byte  0 @ SPECIES_RAICHU
+	.byte  0 @ SPECIES_SANDSHREW
+	.byte  0 @ SPECIES_SANDSLASH
+	.byte  0 @ SPECIES_NIDORAN_F
+	.byte  0 @ SPECIES_NIDORINA
+	.byte  0 @ SPECIES_NIDOQUEEN
+	.byte  0 @ SPECIES_NIDORAN_M
+	.byte  0 @ SPECIES_NIDORINO
+	.byte  0 @ SPECIES_NIDOKING
+	.byte  0 @ SPECIES_CLEFAIRY
+	.byte  0 @ SPECIES_CLEFABLE
+	.byte  0 @ SPECIES_VULPIX
+	.byte  0 @ SPECIES_NINETALES
+	.byte  0 @ SPECIES_JIGGLYPUFF
+	.byte  0 @ SPECIES_WIGGLYTUFF
+	.byte  8 @ SPECIES_ZUBAT
+	.byte  8 @ SPECIES_GOLBAT
+	.byte  0 @ SPECIES_ODDISH
+	.byte  0 @ SPECIES_GLOOM
+	.byte  0 @ SPECIES_VILEPLUME
+	.byte  0 @ SPECIES_PARAS
+	.byte  0 @ SPECIES_PARASECT
+	.byte  0 @ SPECIES_VENONAT
+	.byte  8 @ SPECIES_VENOMOTH
+	.byte  0 @ SPECIES_DIGLETT
+	.byte  0 @ SPECIES_DUGTRIO
+	.byte  0 @ SPECIES_MEOWTH
+	.byte  0 @ SPECIES_PERSIAN
+	.byte  0 @ SPECIES_PSYDUCK
+	.byte  0 @ SPECIES_GOLDUCK
+	.byte  0 @ SPECIES_MANKEY
+	.byte  0 @ SPECIES_PRIMEAPE
+	.byte  0 @ SPECIES_GROWLITHE
+	.byte  0 @ SPECIES_ARCANINE
+	.byte  0 @ SPECIES_POLIWAG
+	.byte  0 @ SPECIES_POLIWHIRL
+	.byte  0 @ SPECIES_POLIWRATH
+	.byte  0 @ SPECIES_ABRA
+	.byte  0 @ SPECIES_KADABRA
+	.byte  0 @ SPECIES_ALAKAZAM
+	.byte  0 @ SPECIES_MACHOP
+	.byte  0 @ SPECIES_MACHOKE
+	.byte  0 @ SPECIES_MACHAMP
+	.byte  0 @ SPECIES_BELLSPROUT
+	.byte  0 @ SPECIES_WEEPINBELL
+	.byte  0 @ SPECIES_VICTREEBEL
+	.byte  0 @ SPECIES_TENTACOOL
+	.byte  0 @ SPECIES_TENTACRUEL
+	.byte 16 @ SPECIES_GEODUDE
+	.byte  0 @ SPECIES_GRAVELER
+	.byte  0 @ SPECIES_GOLEM
+	.byte  0 @ SPECIES_PONYTA
+	.byte  0 @ SPECIES_RAPIDASH
+	.byte  0 @ SPECIES_SLOWPOKE
+	.byte  0 @ SPECIES_SLOWBRO
+	.byte 16 @ SPECIES_MAGNEMITE
+	.byte  8 @ SPECIES_MAGNETON
+	.byte  0 @ SPECIES_FARFETCHD
+	.byte  0 @ SPECIES_DODUO
+	.byte  0 @ SPECIES_DODRIO
+	.byte  0 @ SPECIES_SEEL
+	.byte  0 @ SPECIES_DEWGONG
+	.byte  0 @ SPECIES_GRIMER
+	.byte  0 @ SPECIES_MUK
+	.byte  0 @ SPECIES_SHELLDER
+	.byte  0 @ SPECIES_CLOYSTER
+	.byte  4 @ SPECIES_GASTLY
+	.byte  4 @ SPECIES_HAUNTER
+	.byte  0 @ SPECIES_GENGAR
+	.byte  0 @ SPECIES_ONIX
+	.byte  0 @ SPECIES_DROWZEE
+	.byte  0 @ SPECIES_HYPNO
+	.byte  0 @ SPECIES_KRABBY
+	.byte  0 @ SPECIES_KINGLER
+	.byte 10 @ SPECIES_VOLTORB
+	.byte 12 @ SPECIES_ELECTRODE
+	.byte  0 @ SPECIES_EXEGGCUTE
+	.byte  0 @ SPECIES_EXEGGUTOR
+	.byte  0 @ SPECIES_CUBONE
+	.byte  0 @ SPECIES_MAROWAK
+	.byte  0 @ SPECIES_HITMONLEE
+	.byte  0 @ SPECIES_HITMONCHAN
+	.byte  0 @ SPECIES_LICKITUNG
+	.byte  8 @ SPECIES_KOFFING
+	.byte  6 @ SPECIES_WEEZING
+	.byte  0 @ SPECIES_RHYHORN
+	.byte  0 @ SPECIES_RHYDON
+	.byte  0 @ SPECIES_CHANSEY
+	.byte  0 @ SPECIES_TANGELA
+	.byte  0 @ SPECIES_KANGASKHAN
+	.byte  0 @ SPECIES_HORSEA
+	.byte  0 @ SPECIES_SEADRA
+	.byte  0 @ SPECIES_GOLDEEN
+	.byte  0 @ SPECIES_SEAKING
+	.byte  0 @ SPECIES_STARYU
+	.byte  0 @ SPECIES_STARMIE
+	.byte  0 @ SPECIES_MR_MIME
+	.byte  0 @ SPECIES_SCYTHER
+	.byte  0 @ SPECIES_JYNX
+	.byte  0 @ SPECIES_ELECTABUZZ
+	.byte  0 @ SPECIES_MAGMAR
+	.byte  0 @ SPECIES_PINSIR
+	.byte  0 @ SPECIES_TAUROS
+	.byte  0 @ SPECIES_MAGIKARP
+	.byte  0 @ SPECIES_GYARADOS
+	.byte  0 @ SPECIES_LAPRAS
+	.byte  0 @ SPECIES_DITTO
+	.byte  0 @ SPECIES_EEVEE
+	.byte  0 @ SPECIES_VAPOREON
+	.byte  0 @ SPECIES_JOLTEON
+	.byte  0 @ SPECIES_FLAREON
+	.byte  0 @ SPECIES_PORYGON
+	.byte  0 @ SPECIES_OMANYTE
+	.byte  0 @ SPECIES_OMASTAR
+	.byte  0 @ SPECIES_KABUTO
+	.byte  0 @ SPECIES_KABUTOPS
+	.byte  7 @ SPECIES_AERODACTYL
+	.byte  0 @ SPECIES_SNORLAX
+	.byte  6 @ SPECIES_ARTICUNO
+	.byte  8 @ SPECIES_ZAPDOS
+	.byte  5 @ SPECIES_MOLTRES
+	.byte  0 @ SPECIES_DRATINI
+	.byte  0 @ SPECIES_DRAGONAIR
+	.byte  6 @ SPECIES_DRAGONITE
+	.byte  0 @ SPECIES_MEWTWO
+	.byte  8 @ SPECIES_MEW
+	.byte  0 @ SPECIES_CHIKORITA
+	.byte  0 @ SPECIES_BAYLEEF
+	.byte  0 @ SPECIES_MEGANIUM
+	.byte  0 @ SPECIES_CYNDAQUIL
+	.byte  0 @ SPECIES_QUILAVA
+	.byte  0 @ SPECIES_TYPHLOSION
+	.byte  0 @ SPECIES_TOTODILE
+	.byte  0 @ SPECIES_CROCONAW
+	.byte  0 @ SPECIES_FERALIGATR
+	.byte  0 @ SPECIES_SENTRET
+	.byte  0 @ SPECIES_FURRET
+	.byte  0 @ SPECIES_HOOTHOOT
+	.byte  0 @ SPECIES_NOCTOWL
+	.byte  0 @ SPECIES_LEDYBA
+	.byte  8 @ SPECIES_LEDIAN
+	.byte  0 @ SPECIES_SPINARAK
+	.byte  0 @ SPECIES_ARIADOS
+	.byte  6 @ SPECIES_CROBAT
+	.byte  0 @ SPECIES_CHINCHOU
+	.byte  0 @ SPECIES_LANTURN
+	.byte  0 @ SPECIES_PICHU
+	.byte  0 @ SPECIES_CLEFFA
+	.byte  0 @ SPECIES_IGGLYBUFF
+	.byte  0 @ SPECIES_TOGEPI
+	.byte  0 @ SPECIES_TOGETIC
+	.byte  0 @ SPECIES_NATU
+	.byte  0 @ SPECIES_XATU
+	.byte  0 @ SPECIES_MAREEP
+	.byte  0 @ SPECIES_FLAAFFY
+	.byte  0 @ SPECIES_AMPHAROS
+	.byte  0 @ SPECIES_BELLOSSOM
+	.byte  0 @ SPECIES_MARILL
+	.byte  0 @ SPECIES_AZUMARILL
+	.byte  0 @ SPECIES_SUDOWOODO
+	.byte  0 @ SPECIES_POLITOED
+	.byte 11 @ SPECIES_HOPPIP
+	.byte 12 @ SPECIES_SKIPLOOM
+	.byte  9 @ SPECIES_JUMPLUFF
+	.byte  0 @ SPECIES_AIPOM
+	.byte  0 @ SPECIES_SUNKERN
+	.byte  0 @ SPECIES_SUNFLORA
+	.byte  8 @ SPECIES_YANMA
+	.byte  0 @ SPECIES_WOOPER
+	.byte  0 @ SPECIES_QUAGSIRE
+	.byte  0 @ SPECIES_ESPEON
+	.byte  0 @ SPECIES_UMBREON
+	.byte  0 @ SPECIES_MURKROW
+	.byte  0 @ SPECIES_SLOWKING
+	.byte  8 @ SPECIES_MISDREAVUS
+	.byte  8 @ SPECIES_UNOWN
+	.byte  0 @ SPECIES_WOBBUFFET
+	.byte  0 @ SPECIES_GIRAFARIG
+	.byte  0 @ SPECIES_PINECO
+	.byte  0 @ SPECIES_FORRETRESS
+	.byte  0 @ SPECIES_DUNSPARCE
+	.byte  6 @ SPECIES_GLIGAR
+	.byte  0 @ SPECIES_STEELIX
+	.byte  0 @ SPECIES_SNUBBULL
+	.byte  0 @ SPECIES_GRANBULL
+	.byte  0 @ SPECIES_QWILFISH
+	.byte  0 @ SPECIES_SCIZOR
+	.byte  0 @ SPECIES_SHUCKLE
+	.byte  0 @ SPECIES_HERACROSS
+	.byte  0 @ SPECIES_SNEASEL
+	.byte  0 @ SPECIES_TEDDIURSA
+	.byte  0 @ SPECIES_URSARING
+	.byte  0 @ SPECIES_SLUGMA
+	.byte  0 @ SPECIES_MAGCARGO
+	.byte  0 @ SPECIES_SWINUB
+	.byte  0 @ SPECIES_PILOSWINE
+	.byte  0 @ SPECIES_CORSOLA
+	.byte  0 @ SPECIES_REMORAID
+	.byte  0 @ SPECIES_OCTILLERY
+	.byte  0 @ SPECIES_DELIBIRD
+	.byte  0 @ SPECIES_MANTINE
+	.byte  0 @ SPECIES_SKARMORY
+	.byte  0 @ SPECIES_HOUNDOUR
+	.byte  0 @ SPECIES_HOUNDOOM
+	.byte  0 @ SPECIES_KINGDRA
+	.byte  0 @ SPECIES_PHANPY
+	.byte  0 @ SPECIES_DONPHAN
+	.byte  0 @ SPECIES_PORYGON2
+	.byte  0 @ SPECIES_STANTLER
+	.byte  0 @ SPECIES_SMEARGLE
+	.byte  0 @ SPECIES_TYROGUE
+	.byte  0 @ SPECIES_HITMONTOP
+	.byte  0 @ SPECIES_SMOOCHUM
+	.byte  0 @ SPECIES_ELEKID
+	.byte  0 @ SPECIES_MAGBY
+	.byte  0 @ SPECIES_MILTANK
+	.byte  0 @ SPECIES_BLISSEY
+	.byte  0 @ SPECIES_RAIKOU
+	.byte  0 @ SPECIES_ENTEI
+	.byte  0 @ SPECIES_SUICUNE
+	.byte  0 @ SPECIES_LARVITAR
+	.byte  0 @ SPECIES_PUPITAR
+	.byte  0 @ SPECIES_TYRANITAR
+	.byte  6 @ SPECIES_LUGIA
+	.byte  6 @ SPECIES_HO_OH
+	.byte 15 @ SPECIES_CELEBI
+	.byte  0 @ 252
+	.byte  0 @ 253
+	.byte  0 @ 254
+	.byte  0 @ 255
+	.byte  0 @ 256
+	.byte  0 @ 257
+	.byte  0 @ 258
+	.byte  0 @ 259
+	.byte  0 @ 260
+	.byte  0 @ 261
+	.byte  0 @ 262
+	.byte  0 @ 263
+	.byte  0 @ 264
+	.byte  0 @ 265
+	.byte  0 @ 266
+	.byte  0 @ 267
+	.byte  0 @ 268
+	.byte  0 @ 269
+	.byte  0 @ 270
+	.byte  0 @ 271
+	.byte  0 @ 272
+	.byte  0 @ 273
+	.byte  0 @ 274
+	.byte  0 @ 275
+	.byte  0 @ 276
+	.byte  0 @ SPECIES_TREECKO
+	.byte  0 @ SPECIES_GROVYLE
+	.byte  0 @ SPECIES_SCEPTILE
+	.byte  0 @ SPECIES_TORCHIC
+	.byte  0 @ SPECIES_COMBUSKEN
+	.byte  0 @ SPECIES_BLAZIKEN
+	.byte  0 @ SPECIES_MUDKIP
+	.byte  0 @ SPECIES_MARSHTOMP
+	.byte  0 @ SPECIES_SWAMPERT
+	.byte  0 @ SPECIES_POOCHYENA
+	.byte  0 @ SPECIES_MIGHTYENA
+	.byte  0 @ SPECIES_ZIGZAGOON
+	.byte  0 @ SPECIES_LINOONE
+	.byte  0 @ SPECIES_WURMPLE
+	.byte  0 @ SPECIES_SILCOON
+	.byte  8 @ SPECIES_BEAUTIFLY
+	.byte  0 @ SPECIES_CASCOON
+	.byte 10 @ SPECIES_DUSTOX
+	.byte  0 @ SPECIES_LOTAD
+	.byte  0 @ SPECIES_LOMBRE
+	.byte  0 @ SPECIES_LUDICOLO
+	.byte  0 @ SPECIES_SEEDOT
+	.byte  0 @ SPECIES_NUZLEAF
+	.byte  0 @ SPECIES_SHIFTRY
+	.byte  0 @ SPECIES_NINCADA
+	.byte 10 @ SPECIES_NINJASK
+	.byte  8 @ SPECIES_SHEDINJA
+	.byte  0 @ SPECIES_TAILLOW
+	.byte  0 @ SPECIES_SWELLOW
+	.byte  0 @ SPECIES_SHROOMISH
+	.byte  0 @ SPECIES_BRELOOM
+	.byte  0 @ SPECIES_SPINDA
+	.byte 16 @ SPECIES_WINGULL
+	.byte  8 @ SPECIES_PELIPPER
+	.byte  0 @ SPECIES_SURSKIT
+	.byte 10 @ SPECIES_MASQUERAIN
+	.byte  0 @ SPECIES_WAILMER
+	.byte  0 @ SPECIES_WAILORD
+	.byte  0 @ SPECIES_SKITTY
+	.byte  0 @ SPECIES_DELCATTY
+	.byte  0 @ SPECIES_KECLEON
+	.byte  4 @ SPECIES_BALTOY
+	.byte 10 @ SPECIES_CLAYDOL
+	.byte  0 @ SPECIES_NOSEPASS
+	.byte  0 @ SPECIES_TORKOAL
+	.byte  0 @ SPECIES_SABLEYE
+	.byte  0 @ SPECIES_BARBOACH
+	.byte  0 @ SPECIES_WHISCASH
+	.byte  0 @ SPECIES_LUVDISC
+	.byte  0 @ SPECIES_CORPHISH
+	.byte  0 @ SPECIES_CRAWDAUNT
+	.byte  0 @ SPECIES_FEEBAS
+	.byte  0 @ SPECIES_MILOTIC
+	.byte  0 @ SPECIES_CARVANHA
+	.byte  0 @ SPECIES_SHARPEDO
+	.byte  0 @ SPECIES_TRAPINCH
+	.byte  0 @ SPECIES_VIBRAVA
+	.byte  7 @ SPECIES_FLYGON
+	.byte  0 @ SPECIES_MAKUHITA
+	.byte  0 @ SPECIES_HARIYAMA
+	.byte  0 @ SPECIES_ELECTRIKE
+	.byte  0 @ SPECIES_MANECTRIC
+	.byte  0 @ SPECIES_NUMEL
+	.byte  0 @ SPECIES_CAMERUPT
+	.byte  0 @ SPECIES_SPHEAL
+	.byte  0 @ SPECIES_SEALEO
+	.byte  0 @ SPECIES_WALREIN
+	.byte  0 @ SPECIES_CACNEA
+	.byte  0 @ SPECIES_CACTURNE
+	.byte  0 @ SPECIES_SNORUNT
+	.byte 12 @ SPECIES_GLALIE
+	.byte 13 @ SPECIES_LUNATONE
+	.byte  4 @ SPECIES_SOLROCK
+	.byte  0 @ SPECIES_AZURILL
+	.byte  0 @ SPECIES_SPOINK
+	.byte  0 @ SPECIES_GRUMPIG
+	.byte  0 @ SPECIES_PLUSLE
+	.byte  0 @ SPECIES_MINUN
+	.byte  0 @ SPECIES_MAWILE
+	.byte  0 @ SPECIES_MEDITITE
+	.byte  0 @ SPECIES_MEDICHAM
+	.byte 12 @ SPECIES_SWABLU
+	.byte  8 @ SPECIES_ALTARIA
+	.byte  0 @ SPECIES_WYNAUT
+	.byte  9 @ SPECIES_DUSKULL
+	.byte  0 @ SPECIES_DUSCLOPS
+	.byte  0 @ SPECIES_ROSELIA
+	.byte  0 @ SPECIES_SLAKOTH
+	.byte  0 @ SPECIES_VIGOROTH
+	.byte  0 @ SPECIES_SLAKING
+	.byte  0 @ SPECIES_GULPIN
+	.byte  0 @ SPECIES_SWALOT
+	.byte  0 @ SPECIES_TROPIUS
+	.byte  0 @ SPECIES_WHISMUR
+	.byte  0 @ SPECIES_LOUDRED
+	.byte  0 @ SPECIES_EXPLOUD
+	.byte  0 @ SPECIES_CLAMPERL
+	.byte  0 @ SPECIES_HUNTAIL
+	.byte  0 @ SPECIES_GOREBYSS
+	.byte  0 @ SPECIES_ABSOL
+	.byte 12 @ SPECIES_SHUPPET
+	.byte  8 @ SPECIES_BANETTE
+	.byte  0 @ SPECIES_SEVIPER
+	.byte  0 @ SPECIES_ZANGOOSE
+	.byte  0 @ SPECIES_RELICANTH
+	.byte  0 @ SPECIES_ARON
+	.byte  0 @ SPECIES_LAIRON
+	.byte  0 @ SPECIES_AGGRON
+	.byte 16 @ SPECIES_CASTFORM
+	.byte  0 @ SPECIES_VOLBEAT
+	.byte  0 @ SPECIES_ILLUMISE
+	.byte  0 @ SPECIES_LILEEP
+	.byte  0 @ SPECIES_CRADILY
+	.byte  0 @ SPECIES_ANORITH
+	.byte  0 @ SPECIES_ARMALDO
+	.byte  0 @ SPECIES_RALTS
+	.byte  0 @ SPECIES_KIRLIA
+	.byte  0 @ SPECIES_GARDEVOIR
+	.byte  0 @ SPECIES_BAGON
+	.byte  0 @ SPECIES_SHELGON
+	.byte  0 @ SPECIES_SALAMENCE
+	.byte  8 @ SPECIES_BELDUM
+	.byte  0 @ SPECIES_METANG
+	.byte  0 @ SPECIES_METAGROSS
+	.byte  0 @ SPECIES_REGIROCK
+	.byte  0 @ SPECIES_REGICE
+	.byte  0 @ SPECIES_REGISTEEL
+	.byte  0 @ SPECIES_KYOGRE
+	.byte  0 @ SPECIES_GROUDON
+	.byte  6 @ SPECIES_RAYQUAZA
+	.byte  6 @ SPECIES_LATIAS
+	.byte  6 @ SPECIES_LATIOS
+	.byte 12 @ SPECIES_JIRACHI
+	.byte  8 @ SPECIES_DEOXYS
+	.byte 12 @ SPECIES_CHIMECHO