fixing merge conflicts

INSTALL.md

@@ -93,4 +93,3 @@ If you've only changed `.c` or `.s` files, you can turn off the dependency scann
 
 `make NODEP=1`
 
-

Makefile

@@ -65,9 +65,7 @@ FIX := tools/gbafix/gbafix$(EXE)
 
 .PHONY: rom clean compare tidy
 
-$(shell mkdir -p $(C_BUILDDIR) $(ASM_BUILDDIR) $(DATA_ASM_BUILDDIR) $(SONG_BUILDDIR) $(MID_BUILDDIR))
+C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
-
-C_SRCS := $(wildcard $(C_SUBDIR)/*.c)
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 
 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
@@ -82,9 +80,13 @@ SONG_OBJS := $(patsubst $(SONG_SUBDIR)/%.s,$(SONG_BUILDDIR)/%.o,$(SONG_SRCS))
 MID_SRCS := $(wildcard $(MID_SUBDIR)/*.mid)
 MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))
 
-OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
+OBJS     := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
 OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
+SUBDIRS  := $(sort $(dir $(OBJS)))
+
+$(shell mkdir -p $(SUBDIRS))
+
 rom: $(ROM)
 
 # For contributors to make sure a change didn't affect the contents of the ROM.
@@ -133,10 +135,10 @@ $(C_BUILDDIR)/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
 
 $(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding
 
-ifeq ($(NODEP),)
+ifeq ($(NODEP),1)
-$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include $(C_SUBDIR)/$*.c)
-else
 $(C_BUILDDIR)/%.o: c_dep :=
+else
+$(C_BUILDDIR)/%.o: c_dep = $(shell $(SCANINC) -I include $(C_SUBDIR)/$*.c)
 endif
 
 $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
@@ -145,19 +147,19 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
 	@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
 	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
 
-ifeq ($(NODEP),)
+ifeq ($(NODEP),1)
-$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s)
-else
 $(ASM_BUILDDIR)/%.o: asm_dep :=
+else
+$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s)
 endif
 
 $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
 	$(AS) $(ASFLAGS) -o $@ $<
 
-ifeq ($(NODEP),)
+ifeq ($(NODEP),1)
-$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
-else
 $(DATA_ASM_BUILDDIR)/%.o: data_dep :=
+else
+$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
 endif
 
 $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)

README.md

@@ -32,7 +32,7 @@ To set up the repository, see [INSTALL.md](INSTALL.md).
 [poketcg]: https://github.com/pret/poketcg
 [pokeruby]: https://github.com/pret/pokeruby
 [pokefirered]: https://github.com/pret/pokefirered
-[Discord]: https://discord.gg/cJxDDVP
+[Discord]: https://discord.gg/6EuWgX9
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
 [travis]: https://travis-ci.org/pret/pokeemerald
 [travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master

asm/battle_anim_815A0D4.s

@@ -125,7 +125,7 @@ sub_815A1B0: @ 815A1B0
 	adds r4, r0, 0
 	movs r0, 0x5A
 	strh r0, [r4, 0x2E]
-	ldr r0, =sub_80A64B0
+	ldr r0, =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	movs r0, 0x7
 	strh r0, [r4, 0x30]
@@ -259,7 +259,7 @@ _0815A2B2:
 	strh r0, [r5, 0x2E]
 	strh r7, [r5, 0x32]
 	strh r6, [r5, 0x36]
-	ldr r0, =sub_80A6EEC
+	ldr r0, =StartAnimLinearTranslation
 	str r0, [r5, 0x1C]
 	ldr r1, =DestroyAnimSprite
 	adds r0, r5, 0
@@ -767,7 +767,7 @@ sub_815A6C4: @ 815A6C4
 	sub sp, 0x4
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_80A69CC
+	bl InitAnimSpritePos
 	ldr r0, =gBattleAnimTarget
 	ldrb r0, [r0]
 	mov r5, sp
@@ -802,7 +802,7 @@ _0815A6F8:
 	ldr r0, =0x0000ffce
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_80A68D4
+	bl InitAnimArcTranslation
 	ldr r0, =sub_815A73C
 	str r0, [r4, 0x1C]
 	add sp, 0x4
@@ -824,7 +824,7 @@ sub_815A73C: @ 815A73C
 	movs r0, 0x1E
 	strh r0, [r4, 0x2E]
 	strh r1, [r4, 0x30]
-	ldr r0, =sub_80A64B0
+	ldr r0, =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	ldr r1, =sub_815A76C
 	adds r0, r4, 0
@@ -2216,7 +2216,7 @@ sub_815B27C: @ 815B27C
 	bne _0815B290
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_80A69CC
+	bl InitAnimSpritePos
 _0815B290:
 	ldrh r0, [r5, 0x2E]
 	adds r0, 0x1
@@ -2291,7 +2291,7 @@ _0815B2D8:
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r5, 0x36]
-	ldr r0, =sub_80A6EEC
+	ldr r0, =StartAnimLinearTranslation
 	str r0, [r5, 0x1C]
 _0815B324:
 	pop {r4,r5}
@@ -2810,7 +2810,7 @@ sub_815B70C: @ 815B70C
 _0815B71E:
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80A69CC
+	bl InitAnimSpritePos
 	movs r0, 0x90
 	lsls r0, 4
 	strh r0, [r4, 0x30]
@@ -4309,7 +4309,7 @@ sub_815C400: @ 815C400
 	bne _0815C41E
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_80A69CC
+	bl InitAnimSpritePos
 	ldrh r0, [r4, 0x2E]
 	adds r0, 0x1
 	strh r0, [r4, 0x2E]
@@ -8448,7 +8448,7 @@ _0815E4EE:
 	adds r0, r1
 	lsls r0, 2
 	adds r0, r4
-	bl sub_80A68D4
+	bl InitAnimArcTranslation
 	mov r1, r10
 	ldrb r0, [r1]
 	bl GetBattlerSide
@@ -9605,7 +9605,7 @@ sub_815EE84: @ 815EE84
 	bne _0815EEA8
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_80A69CC
+	bl InitAnimSpritePos
 	ldr r0, =gBattleAnimAttacker
 	b _0815EEAA
 	.pool

asm/battle_anim_8170478.s

@@ -1473,7 +1473,7 @@ sub_8171104: @ 8171104
 	ldr r0, =0x0000ffd8
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_80A68D4
+	bl InitAnimArcTranslation
 	ldr r0, =sub_8171134
 	str r0, [r4, 0x1C]
 	pop {r4}
@@ -2631,7 +2631,7 @@ _08171A26:
 	ldrsb r0, [r1, r0]
 	strh r0, [r5, 0x38]
 	adds r0, r5, 0
-	bl sub_80A68D4
+	bl InitAnimArcTranslation
 	add r4, r10
 	ldr r0, =sub_8171AAC
 	str r0, [r4]
@@ -5571,7 +5571,7 @@ sub_817330C: @ 817330C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_80A69CC
+	bl InitAnimSpritePos
 	movs r0, 0x1E
 	strh r0, [r4, 0x2E]
 	movs r0, 0x1
@@ -5600,7 +5600,7 @@ sub_817330C: @ 817330C
 	ldr r0, =0x0000ffe0
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_80A68D4
+	bl InitAnimArcTranslation
 	ldr r2, =gSprites
 	ldr r1, =gBattlerSpriteIds
 	ldr r0, =gBattleAnimAttacker

asm/battle_frontier_1.s

@@ -7,180 +7,6 @@
 
 
 
-	thumb_func_start sub_8195C7C
-sub_8195C7C: @ 8195C7C
-	push {r4-r7,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =0x00000ca9
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 30
-	lsrs r7, r0, 30
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 24
-	ldr r4, [r4]
-	lsls r1, r7, 1
-	lsrs r5, r0, 22
-	adds r1, r5
-	ldr r3, =0x00000dc8
-	adds r6, r4, r3
-	adds r3, r6, r1
-	ldrh r2, [r3]
-	ldr r0, =0x0000270e
-	cmp r2, r0
-	bhi _08195CCA
-	adds r2, 0x1
-	strh r2, [r3]
-	movs r3, 0xDD
-	lsls r3, 4
-	adds r0, r4, r3
-	adds r1, r0, r1
-	adds r0, r5, 0
-	ldrh r3, [r1]
-	cmp r7, r3
-	bls _08195CC0
-	adds r0, 0x2
-_08195CC0:
-	adds r0, r6, r0
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _08195CCA
-	strh r2, [r1]
-_08195CCA:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8195C7C
-
-	thumb_func_start sub_8195CE4
-sub_8195CE4: @ 8195CE4
-	push {r4,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =gSpecialVar_0x8005
-	ldrh r1, [r1]
-	ldr r2, =0x00000ca8
-	adds r0, r2
-	strb r1, [r0]
-	movs r0, 0x80
-	lsls r0, 7
-	movs r1, 0
-	bl VarSet
-	ldr r1, [r4]
-	ldr r0, =0x00000ca9
-	adds r1, r0
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r1]
-	bl sub_81A4C30
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8195CE4
-
-	thumb_func_start sub_8195D28
-sub_8195D28: @ 8195D28
-	push {r4,r5,lr}
-	ldr r0, =0x000040ce
-	bl VarGet
-	lsls r0, 16
-	ldr r4, =gSaveBlock2Ptr
-	ldr r2, [r4]
-	ldr r3, =0x00000ca9
-	adds r1, r2, r3
-	ldrb r1, [r1]
-	lsls r1, 30
-	lsrs r1, 29
-	lsrs r0, 14
-	adds r1, r0
-	ldr r0, =0x00000dc8
-	adds r2, r0
-	adds r2, r1
-	ldrh r0, [r2]
-	cmp r0, 0x29
-	bls _08195D88
-	bl Random
-	ldr r4, [r4]
-	ldr r5, =gUnknown_0860DE84
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x9
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 15
-	adds r0, r5
-	ldrh r0, [r0]
-	ldr r1, =0x00000dc6
-	adds r4, r1
-	b _08195DA6
-	.pool
-_08195D88:
-	bl Random
-	ldr r4, [r4]
-	ldr r5, =gUnknown_0860DE78
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0x6
-	bl __umodsi3
-	lsls r0, 16
-	lsrs r0, 15
-	adds r0, r5
-	ldrh r0, [r0]
-	ldr r3, =0x00000dc6
-	adds r4, r3
-_08195DA6:
-	strh r0, [r4]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8195D28
-
-	thumb_func_start sub_8195DB8
-sub_8195DB8: @ 8195DB8
-	push {r4,r5,lr}
-	ldr r4, =gSaveBlock2Ptr
-	ldr r0, [r4]
-	ldr r1, =0x00000dc6
-	adds r0, r1
-	ldrh r0, [r0]
-	movs r1, 0x1
-	bl AddBagItem
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x1
-	bne _08195E00
-	ldr r0, [r4]
-	ldr r1, =0x00000dc6
-	adds r0, r1
-	ldrh r0, [r0]
-	ldr r1, =gStringVar1
-	bl CopyItemName
-	ldr r0, [r4]
-	ldr r1, =0x00000dc6
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0]
-	ldr r0, =gSpecialVar_Result
-	strh r5, [r0]
-	b _08195E06
-	.pool
-_08195E00:
-	ldr r1, =gSpecialVar_Result
-	movs r0, 0
-	strh r0, [r1]
-_08195E06:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8195DB8
-
 	thumb_func_start sub_8195E10
 sub_8195E10: @ 8195E10
 	push {lr}
@@ -1180,7 +1006,7 @@ sub_81965D8: @ 81965D8
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r2]
-	bl GetPlayerTextSpeed
+	bl GetPlayerTextSpeedDelay
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -2163,7 +1989,7 @@ sub_8196D74: @ 8196D74
 	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
 	adds r0, 0xA
-	bl ReadUnalignedWord
+	bl GetTrainerId
 	adds r6, r0, 0
 	ldr r0, =0x0000ffff
 	ands r6, r0

asm/contest.s

@@ -6485,7 +6485,7 @@ _080DEC80:
 	b _080DEC9C
 	.pool
 _080DEC94:
-	bl GetPlayerTextSpeed
+	bl GetPlayerTextSpeedDelay
 	lsls r0, 24
 	lsrs r1, r0, 24
 _080DEC9C:

asm/contest_link_81D9DE4.s

@@ -97,7 +97,7 @@ _081D9EB4:
 	ldrb r1, [r1]
 	adds r0, 0x2C
 	strb r1, [r0]
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	lsrs r0, 24

asm/easy_chat.s

@@ -369,7 +369,7 @@ _0811AF86:
 	thumb_func_start sub_811AF8C
 sub_811AF8C: @ 811AF8C
 	push {lr}
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -418,7 +418,7 @@ _0811AFE6:
 	thumb_func_start sub_811AFEC
 sub_811AFEC: @ 811AFEC
 	push {r4,lr}
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -461,7 +461,7 @@ _0811B03A:
 	thumb_func_start sub_811B040
 sub_811B040: @ 811B040
 	push {lr}
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -566,7 +566,7 @@ sub_811B0E8: @ 811B0E8
 	thumb_func_start sub_811B0F8
 sub_811B0F8: @ 811B0F8
 	push {r4,lr}
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -7951,7 +7951,7 @@ sub_811EA28: @ 811EA28
 	bgt _0811EA48
 	cmp r0, 0x11
 	blt _0811EA66
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	b _0811EA60
 	.pool
@@ -9131,7 +9131,7 @@ _0811F2FE:
 	adds r3, 0x1
 	cmp r3, 0x10
 	ble _0811F2FE
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	cmp r0, 0

asm/field_screen.s

@@ -7851,7 +7851,7 @@ palette_bg_faded_fill_black: @ 80AF020
 	thumb_func_start pal_fill_for_maplights
 pal_fill_for_maplights: @ 80AF040
 	push {r4,lr}
-	bl get_map_light_from_warp0
+	bl GetLastUsedWarpMapType
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24

asm/fldeff_80F9BCC.s

@@ -2262,8 +2262,8 @@ _080FAEA2:
 	bx r0
 	thumb_func_end task50_overworld_poison_effect
 
-	thumb_func_start overworld_poison_effect
+	thumb_func_start FldeffPoison_Start
-overworld_poison_effect: @ 80FAEA8
+FldeffPoison_Start: @ 80FAEA8
 	push {lr}
 	movs r0, 0x4F
 	bl PlaySE
@@ -2273,7 +2273,7 @@ overworld_poison_effect: @ 80FAEA8
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end overworld_poison_effect
+	thumb_func_end FldeffPoison_Start
 
 	thumb_func_start FieldPoisonEffectIsRunning
 FieldPoisonEffectIsRunning: @ 80FAEC0

asm/fossil_specials.s

@@ -1,111 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81BF2B8
-sub_81BF2B8: @ 81BF2B8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	str r0, [sp]
-	mov r10, r1
-	adds r6, r2, 0
-	mov r8, r3
-	ldr r0, [sp, 0x28]
-	mov r9, r0
-	lsls r1, 16
-	lsrs r1, 16
-	mov r10, r1
-	lsls r6, 24
-	lsrs r6, 24
-	mov r0, r8
-	lsls r0, 24
-	mov r8, r0
-	lsrs r7, r0, 24
-	mov r1, r9
-	lsls r1, 24
-	lsrs r1, 24
-	mov r9, r1
-	mov r0, r10
-	adds r1, r7, 0
-	bl __divsi3
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r4, r5, 24
-	ldr r3, =gUnknown_030012A8
-	strh r4, [r3]
-	mov r0, r10
-	adds r1, r7, 0
-	str r3, [sp, 0x4]
-	bl __modsi3
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r3, [sp, 0x4]
-	strh r2, [r3, 0x2]
-	movs r1, 0x7
-	ands r4, r1
-	ands r2, r1
-	strh r4, [r3, 0x4]
-	strh r2, [r3, 0x6]
-	lsrs r0, 27
-	lsrs r5, 27
-	strh r0, [r3, 0x8]
-	strh r5, [r3, 0xA]
-	mov r1, r8
-	lsrs r1, 27
-	lsls r1, 6
-	mov r8, r1
-	mov r1, r8
-	muls r1, r5
-	lsls r0, 6
-	adds r1, r0
-	lsls r1, 16
-	lsrs r1, 16
-	strh r1, [r3, 0xC]
-	lsls r4, 3
-	adds r4, r2
-	adds r1, r4
-	lsls r4, r1, 16
-	lsrs r4, 17
-	strh r1, [r3, 0xE]
-	movs r1, 0x1
-	mov r0, r10
-	ands r1, r0
-	movs r2, 0x1
-	eors r1, r2
-	lsls r0, r1, 2
-	lsls r6, r0
-	eors r1, r2
-	lsls r1, 2
-	movs r0, 0xF
-	lsls r0, r1
-	orrs r6, r0
-	lsls r6, 24
-	lsrs r6, 24
-	mov r1, r9
-	lsls r1, 5
-	mov r9, r1
-	add r9, r4
-	ldr r1, [sp]
-	add r1, r9
-	ldrb r0, [r1]
-	ands r6, r0
-	strb r6, [r1]
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81BF2B8
-
-	.align 2, 0 @ Don't pad with nop.

asm/international_string_util.s

@@ -1,355 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start sub_81DB41C
-sub_81DB41C: @ 81DB41C
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	ldr r1, [r4]
-	movs r7, 0
-	movs r6, 0
-	ldrh r0, [r4, 0xC]
-	cmp r7, r0
-	bge _081DB44C
-	adds r5, r1, 0
-_081DB42E:
-	ldrb r0, [r4, 0x17]
-	lsls r0, 26
-	lsrs r0, 26
-	ldr r1, [r5]
-	movs r2, 0
-	bl GetStringWidth
-	cmp r0, r7
-	ble _081DB442
-	adds r7, r0, 0
-_081DB442:
-	adds r5, 0x8
-	adds r6, 0x1
-	ldrh r0, [r4, 0xC]
-	cmp r6, r0
-	blt _081DB42E
-_081DB44C:
-	ldrb r0, [r4, 0x12]
-	adds r1, r7, r0
-	adds r0, r1, 0
-	adds r0, 0x9
-	cmp r0, 0
-	bge _081DB45A
-	adds r0, 0x7
-_081DB45A:
-	asrs r0, 3
-	cmp r0, 0x1C
-	ble _081DB462
-	movs r0, 0x1C
-_081DB462:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81DB41C
-
-	thumb_func_start CopyMonCategoryText
-CopyMonCategoryText: @ 81DB468
-	push {lr}
-	adds r2, r0, 0
-	adds r0, r1, 0
-	lsls r2, 5
-	ldr r1, =gPokedexEntries
-	adds r2, r1
-	adds r1, r2, 0
-	bl StringCopy
-	movs r1, 0
-	strb r1, [r0]
-	adds r0, 0x1
-	ldr r1, =gText_Pokemon
-	bl StringCopy
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end CopyMonCategoryText
-
-	thumb_func_start sub_81DB494
-sub_81DB494: @ 81DB494
-	push {r4-r7,lr}
-	adds r6, r1, 0
-	adds r5, r2, 0
-	adds r7, r3, 0
-	cmp r5, 0
-	beq _081DB4B6
-	adds r1, r5, 0
-	bl StringCopy
-	adds r4, r0, 0
-	lsls r0, r6, 24
-	lsrs r0, 24
-	adds r1, r5, 0
-	movs r2, 0
-	bl GetStringWidth
-	b _081DB4BA
-_081DB4B6:
-	adds r4, r0, 0
-	movs r0, 0
-_081DB4BA:
-	subs r3, r7, r0
-	cmp r3, 0
-	ble _081DB4D4
-	movs r0, 0xFC
-	strb r0, [r4]
-	adds r4, 0x1
-	movs r0, 0x11
-	strb r0, [r4]
-	adds r4, 0x1
-	strb r3, [r4]
-	adds r4, 0x1
-	movs r0, 0xFF
-	strb r0, [r4]
-_081DB4D4:
-	adds r0, r4, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81DB494
-
-	thumb_func_start PadNameString
-PadNameString: @ 81DB4DC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl StripExtCtrlCodes
-	adds r0, r4, 0
-	bl StringLength
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r5, 0xFC
-	bne _081DB51A
-	cmp r1, 0x5
-	bhi _081DB51E
-	movs r3, 0xFC
-	movs r2, 0x7
-_081DB4FE:
-	adds r0, r4, r1
-	strb r3, [r0]
-	strb r2, [r0, 0x1]
-	adds r0, r1, 0x2
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x5
-	bls _081DB4FE
-	b _081DB51E
-_081DB510:
-	adds r0, r4, r1
-	strb r5, [r0]
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-_081DB51A:
-	cmp r1, 0x5
-	bls _081DB510
-_081DB51E:
-	adds r1, r4, r1
-	movs r0, 0xFF
-	strb r0, [r1]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end PadNameString
-
-	thumb_func_start sub_81DB52C
-sub_81DB52C: @ 81DB52C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl StringLength
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x5
-	bhi _081DB546
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl ConvertInternationalString
-	b _081DB54C
-_081DB546:
-	adds r0, r4, 0
-	bl StripExtCtrlCodes
-_081DB54C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81DB52C
-
-	thumb_func_start sub_81DB554
-sub_81DB554: @ 81DB554
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	bl StringLength
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x5
-	bhi _081DB572
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl ConvertInternationalString
-	b _081DB5A4
-_081DB572:
-	cmp r5, 0xFC
-	bne _081DB57E
-	adds r0, r4, 0
-	bl StripExtCtrlCodes
-	b _081DB5A4
-_081DB57E:
-	adds r1, r4, 0
-	b _081DB584
-_081DB582:
-	adds r1, 0x1
-_081DB584:
-	ldrb r0, [r1, 0x1]
-	cmp r0, 0xFF
-	bne _081DB582
-	cmp r1, r4
-	bcc _081DB5A4
-	ldrb r0, [r1]
-	cmp r0, r5
-	bne _081DB5A4
-	movs r2, 0xFF
-_081DB596:
-	strb r2, [r1]
-	subs r1, 0x1
-	cmp r1, r4
-	bcc _081DB5A4
-	ldrb r0, [r1]
-	cmp r0, r5
-	beq _081DB596
-_081DB5A4:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81DB554
-
-	thumb_func_start sub_81DB5AC
-sub_81DB5AC: @ 81DB5AC
-	push {lr}
-	adds r2, r0, 0
-	ldrb r0, [r2]
-	adds r2, 0x1
-	cmp r0, 0xFC
-	bne _081DB5E4
-	ldrb r0, [r2]
-	adds r2, 0x1
-	cmp r0, 0x15
-	bne _081DB5E4
-	b _081DB5CE
-_081DB5C2:
-	cmp r1, 0xFC
-	bne _081DB5CC
-	ldrb r0, [r2, 0x1]
-	cmp r0, 0x16
-	beq _081DB5E4
-_081DB5CC:
-	adds r2, 0x1
-_081DB5CE:
-	ldrb r1, [r2]
-	adds r0, r1, 0
-	cmp r0, 0xFF
-	bne _081DB5C2
-	movs r0, 0xFC
-	strb r0, [r2]
-	adds r2, 0x1
-	movs r0, 0x16
-	strb r0, [r2]
-	movs r0, 0xFF
-	strb r0, [r2, 0x1]
-_081DB5E4:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81DB5AC
-
-	thumb_func_start TVShowConvertInternationalString
-TVShowConvertInternationalString: @ 81DB5E8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r2, 0
-	bl StringCopy
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl ConvertInternationalString
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end TVShowConvertInternationalString
-
-	thumb_func_start sub_81DB604
-sub_81DB604: @ 81DB604
-	push {lr}
-	adds r1, r0, 0
-	ldrb r0, [r1]
-	cmp r0, 0xFC
-	bne _081DB618
-	ldrb r0, [r1, 0x1]
-	cmp r0, 0x15
-	bne _081DB618
-	movs r0, 0x1
-	b _081DB61A
-_081DB618:
-	movs r0, 0x2
-_081DB61A:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81DB604
-
-	thumb_func_start sub_81DB620
-sub_81DB620: @ 81DB620
-	push {r4-r7,lr}
-	sub sp, 0x4
-	lsls r4, r0, 1
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gWindows
-	adds r4, r0
-	lsls r7, r3, 5
-	ldrb r0, [r4, 0x3]
-	lsls r6, r0, 5
-	muls r2, r6
-	ldr r0, [r4, 0x8]
-	adds r0, r2
-	lsls r1, 5
-	adds r5, r0, r1
-	ldr r0, [sp, 0x18]
-	cmp r0, 0
-	ble _081DB66C
-	adds r4, r0, 0
-_081DB646:
-	ldr r0, =0x11111111
-	str r0, [sp]
-	adds r2, r7, 0
-	cmp r2, 0
-	bge _081DB652
-	adds r2, 0x3
-_081DB652:
-	lsls r2, 9
-	lsrs r2, 11
-	movs r0, 0x80
-	lsls r0, 17
-	orrs r2, r0
-	mov r0, sp
-	adds r1, r5, 0
-	bl CpuFastSet
-	adds r5, r6
-	subs r4, 0x1
-	cmp r4, 0
-	bne _081DB646
-_081DB66C:
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81DB620
-
-	.align 2, 0 @ Don't pad with nop.

asm/macros/battle_ai_script.inc

@@ -1,206 +1,206 @@
-	.macro if_random_less_than param0, param1
+	.macro if_random_less_than param0:req, param1:req
 	.byte 0x0
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_random_greater_than param0, param1
+	.macro if_random_greater_than param0:req, param1:req
 	.byte 0x1
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_random_equal param0, param1
+	.macro if_random_equal param0:req, param1:req
 	.byte 0x2
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_random_not_equal param0, param1
+	.macro if_random_not_equal param0:req, param1:req
 	.byte 0x3
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro score param0
+	.macro score param0:req
 	.byte 0x4
 	.byte \param0
 	.endm
 
-	.macro if_hp_less_than battler, param1, param2
+	.macro if_hp_less_than battler:req, param1:req, param2:req
 	.byte 0x5
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_hp_more_than battler, param1, param2
+	.macro if_hp_more_than battler:req, param1:req, param2:req
 	.byte 0x6
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_hp_equal battler, param1, param2
+	.macro if_hp_equal battler:req, param1:req, param2:req
 	.byte 0x7
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_hp_not_equal battler, param1, param2
+	.macro if_hp_not_equal battler:req, param1:req, param2:req
 	.byte 0x8
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_status battler, status1, param2
+	.macro if_status battler:req, status1:req, param2:req
 	.byte 0x9
 	.byte \battler
 	.4byte \status1
 	.4byte \param2
 	.endm
 
-	.macro if_not_status battler, status1, param2
+	.macro if_not_status battler:req, status1:req, param2:req
 	.byte 0xa
 	.byte \battler
 	.4byte \status1
 	.4byte \param2
 	.endm
 
-	.macro if_status2 battler, status2, param2
+	.macro if_status2 battler:req, status2:req, param2:req
 	.byte 0xb
 	.byte \battler
 	.4byte \status2
 	.4byte \param2
 	.endm
 
-	.macro if_not_status2 battler, status2, param2
+	.macro if_not_status2 battler:req, status2:req, param2:req
 	.byte 0xc
 	.byte \battler
 	.4byte \status2
 	.4byte \param2
 	.endm
 
-	.macro if_status3 battler, status3, param2
+	.macro if_status3 battler:req, status3:req, param2:req
 	.byte 0xd
 	.byte \battler
 	.4byte \status3
 	.4byte \param2
 	.endm
 
-	.macro if_not_status3 battler, status3, param2
+	.macro if_not_status3 battler:req, status3:req, param2:req
 	.byte 0xe
 	.byte \battler
 	.4byte \status3
 	.4byte \param2
 	.endm
 
-	.macro if_side_affecting battler, sidestatus, param2
+	.macro if_side_affecting battler:req, sidestatus:req, param2:req
 	.byte 0xf
 	.byte \battler
 	.4byte \sidestatus
 	.4byte \param2
 	.endm
 
-	.macro if_not_side_affecting battler, sidestatus, param2
+	.macro if_not_side_affecting battler:req, sidestatus:req, param2:req
 	.byte 0x10
 	.byte \battler
 	.4byte \sidestatus
 	.4byte \param2
 	.endm
 
-	.macro if_less_than param0, param1
+	.macro if_less_than param0:req, param1:req
 	.byte 0x11
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_more_than param0, param1
+	.macro if_more_than param0:req, param1:req
 	.byte 0x12
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_equal param0, param1
+	.macro if_equal param0:req, param1:req
 	.byte 0x13
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_equal param0, param1
+	.macro if_not_equal param0:req, param1:req
 	.byte 0x14
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_less_than_ptr param0, param1
+	.macro if_less_than_ptr param0:req, param1:req
 	.byte 0x15
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_more_than_ptr param0, param1
+	.macro if_more_than_ptr param0:req, param1:req
 	.byte 0x16
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_equal_ptr param0, param1
+	.macro if_equal_ptr param0:req, param1:req
 	.byte 0x17
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_equal_ptr param0, param1
+	.macro if_not_equal_ptr param0:req, param1:req
 	.byte 0x18
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_move param0, param1
+	.macro if_move param0:req, param1:req
 	.byte 0x19
 	.2byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_move param0, param1
+	.macro if_not_move param0:req, param1:req
 	.byte 0x1a
 	.2byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_in_bytes param0, param1
+	.macro if_in_bytes param0:req, param1:req
 	.byte 0x1b
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_in_bytes param0, param1
+	.macro if_not_in_bytes param0:req, param1:req
 	.byte 0x1c
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_in_hwords param0, param1
+	.macro if_in_hwords param0:req, param1:req
 	.byte 0x1d
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_in_hwords param0, param1
+	.macro if_not_in_hwords param0:req, param1:req
 	.byte 0x1e
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_user_has_attacking_move param0
+	.macro if_user_has_attacking_move param0:req
 	.byte 0x1f
 	.4byte \param0
 	.endm
 
-	.macro if_user_has_no_attacking_moves param0
+	.macro if_user_has_no_attacking_moves param0:req
 	.byte 0x20
 	.4byte \param0
 	.endm
@@ -209,7 +209,7 @@
 	.byte 0x21
 	.endm
 
-	.macro get_type param0
+	.macro get_type param0:req
 	.byte 0x22
 	.byte \param0
 	.endm
@@ -222,30 +222,30 @@
 	.byte 0x24
 	.endm
 
-	.macro get_last_used_bank_move battler
+	.macro get_last_used_bank_move battler:req
 	.byte 0x25
 	.byte \battler
 	.endm
 
-	.macro if_equal_ param0, param1
+	.macro if_equal_ param0:req, param1:req
 	.byte 0x26
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_equal_ param0, param1
+	.macro if_not_equal_ param0:req, param1:req
 	.byte 0x27
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_user_goes param0, param1
+	.macro if_user_goes param0:req, param1:req
 	.byte 0x28
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_user_doesnt_go param0, param1
+	.macro if_user_doesnt_go param0:req, param1:req
 	.byte 0x29
 	.byte \param0
 	.4byte \param1
@@ -259,7 +259,7 @@
 	.byte 0x2b
 	.endm
 
-	.macro count_usable_party_mons battler
+	.macro count_usable_party_mons battler:req
 	.byte 0x2c
 	.byte \battler
 	.endm
@@ -272,7 +272,7 @@
 	.byte 0x2e
 	.endm
 
-	.macro get_ability battler
+	.macro get_ability battler:req
 	.byte 0x2f
 	.byte \battler
 	.endm
@@ -281,7 +281,7 @@
 	.byte 0x30
 	.endm
 
-	.macro if_type_effectiveness param0, param1
+	.macro if_type_effectiveness param0:req, param1:req
 	.byte 0x31
 	.byte \param0
 	.4byte \param1
@@ -295,14 +295,14 @@
 	.byte 0x33
 	.endm
 
-	.macro if_status_in_party battler, status1, param2
+	.macro if_status_in_party battler:req, status1:req, param2:req
 	.byte 0x34
 	.byte \battler
 	.4byte \status1
 	.4byte \param2
 	.endm
 
-	.macro if_status_not_in_party battler, status1, param2
+	.macro if_status_not_in_party battler:req, status1:req, param2:req
 	.byte 0x35
 	.byte \battler
 	.4byte \status1
@@ -313,19 +313,19 @@
 	.byte 0x36
 	.endm
 
-	.macro if_effect param0, param1
+	.macro if_effect param0:req, param1:req
 	.byte 0x37
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_effect param0, param1
+	.macro if_not_effect param0:req, param1:req
 	.byte 0x38
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_stat_level_less_than battler, stat, param2, param3
+	.macro if_stat_level_less_than battler:req, stat:req, param2:req, param3:req
 	.byte 0x39
 	.byte \battler
 	.byte \stat
@@ -333,7 +333,7 @@
 	.4byte \param3
 	.endm
 
-	.macro if_stat_level_more_than battler, stat, param2, param3
+	.macro if_stat_level_more_than battler:req, stat:req, param2:req, param3:req
 	.byte 0x3a
 	.byte \battler
 	.byte \stat
@@ -341,7 +341,7 @@
 	.4byte \param3
 	.endm
 
-	.macro if_stat_level_equal battler, stat, param2, param3
+	.macro if_stat_level_equal battler:req, stat:req, param2:req, param3:req
 	.byte 0x3b
 	.byte \battler
 	.byte \stat
@@ -349,7 +349,7 @@
 	.4byte \param3
 	.endm
 
-	.macro if_stat_level_not_equal battler, stat, param2, param3
+	.macro if_stat_level_not_equal battler:req, stat:req, param2:req, param3:req
 	.byte 0x3c
 	.byte \battler
 	.byte \stat
@@ -357,52 +357,52 @@
 	.4byte \param3
 	.endm
 
-	.macro if_can_faint param0
+	.macro if_can_faint param0:req
 	.byte 0x3d
 	.4byte \param0
 	.endm
 
-	.macro if_cant_faint param0
+	.macro if_cant_faint param0:req
 	.byte 0x3e
 	.4byte \param0
 	.endm
 
-	.macro if_has_move battler, param1, param2
+	.macro if_has_move battler:req, param1:req, param2:req
 	.byte 0x3f
 	.byte \battler
 	.2byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_doesnt_have_move battler, param1, param2
+	.macro if_doesnt_have_move battler:req, param1:req, param2:req
 	.byte 0x40
 	.byte \battler
 	.2byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_has_move_with_effect battler, param1, param2
+	.macro if_has_move_with_effect battler:req, param1:req, param2:req
 	.byte 0x41
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_doesnt_have_move_with_effect battler, param1, param2
+	.macro if_doesnt_have_move_with_effect battler:req, param1:req, param2:req
 	.byte 0x42
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_any_move_disabled_or_encored battler, param1, param2
+	.macro if_any_move_disabled_or_encored battler:req, param1:req, param2:req
 	.byte 0x43
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_curr_move_disabled_or_encored param0, param1
+	.macro if_curr_move_disabled_or_encored param0:req, param1:req
 	.byte 0x44
 	.byte \param0
 	.4byte \param1
@@ -412,7 +412,7 @@
 	.byte 0x45
 	.endm
 
-	.macro if_random_safari_flee param0
+	.macro if_random_safari_flee param0:req
 	.byte 0x46
 	.4byte \param0
 	.endm
@@ -421,22 +421,22 @@
 	.byte 0x47
 	.endm
 
-	.macro get_hold_effect battler
+	.macro get_hold_effect battler:req
 	.byte 0x48
 	.byte \battler
 	.endm
 
-	.macro get_gender battler
+	.macro get_gender battler:req
 	.byte 0x49
 	.byte \battler
 	.endm
 
-	.macro is_first_turn_for battler
+	.macro is_first_turn_for battler:req
 	.byte 0x4a
 	.byte \battler
 	.endm
 
-	.macro get_stockpile_count battler
+	.macro get_stockpile_count battler:req
 	.byte 0x4b
 	.byte \battler
 	.endm
@@ -445,7 +445,7 @@
 	.byte 0x4c
 	.endm
 
-	.macro get_used_held_item battler
+	.macro get_used_held_item battler:req
 	.byte 0x4d
 	.byte \battler
 	.endm
@@ -462,7 +462,7 @@
 	.byte 0x50
 	.endm
 
-	.macro get_protect_count battler
+	.macro get_protect_count battler:req
 	.byte 0x51
 	.byte \battler
 	.endm
@@ -491,12 +491,12 @@
 	.byte 0x57
 	.endm
 
-	.macro call param0
+	.macro call param0:req
 	.byte 0x58
 	.4byte \param0
 	.endm
 
-	.macro goto param0
+	.macro goto param0:req
 	.byte 0x59
 	.4byte \param0
 	.endm
@@ -505,46 +505,46 @@
 	.byte 0x5a
 	.endm
 
-	.macro if_level_cond param0, param1
+	.macro if_level_cond param0:req, param1:req
 	.byte 0x5b
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_target_taunted param0
+	.macro if_target_taunted param0:req
 	.byte 0x5c
 	.4byte \param0
 	.endm
 
-	.macro if_target_not_taunted param0
+	.macro if_target_not_taunted param0:req
 	.byte 0x5d
 	.4byte \param0
 	.endm
 
-	.macro if_target_is_ally param0
+	.macro if_target_is_ally param0:req
 	.byte 0x5e
 	.4byte \param0
 	.endm
 
-	.macro is_of_type battler, type
+	.macro is_of_type battler:req, type:req
 	.byte 0x5f
 	.byte \battler
 	.byte \type
 	.endm
 
-	.macro check_ability battler, ability
+	.macro check_ability battler:req, ability:req
 	.byte 0x60
 	.byte \battler
 	.byte \ability
 	.endm
 
-	.macro if_flash_fired battler, param1
+	.macro if_flash_fired battler:req, param1:req
 	.byte 0x61
 	.byte \battler
 	.4byte \param1
 	.endm
 
-	.macro if_holds_item battler, param1, param2
+	.macro if_holds_item battler:req, param1:req, param2:req
 	.byte 0x62
 	.byte \battler
 	.2byte \param1
@@ -572,48 +572,48 @@
 	get_type AI_TYPE2_TARGET
 	.endm
 	
-	.macro if_ability battler, ability, ptr
+	.macro if_ability battler:req, ability:req, ptr:req
 	check_ability \battler, \ability
 	if_equal 1, \ptr
 	.endm
 	
-	.macro if_no_ability battler, ability, ptr
+	.macro if_no_ability battler:req, ability:req, ptr:req
 	check_ability \battler, \ability
 	if_equal 0, \ptr
 	.endm
 	
-	.macro if_type battler, type, ptr
+	.macro if_type battler:req, type:req, ptr:req
 	is_of_type \battler, \type
 	if_equal 1, \ptr
 	.endm
 
-	.macro if_no_type battler, type, ptr
+	.macro if_no_type battler:req, type:req, ptr:req
 	is_of_type \battler, \type
 	if_equal 0, \ptr
 	.endm
 	
-	.macro if_target_faster ptr
+	.macro if_target_faster ptr:req
 	if_user_goes 1, \ptr
 	.endm
 	
-	.macro if_user_faster ptr
+	.macro if_user_faster ptr:req
 	if_user_goes 0, \ptr
 	.endm
 	
-	.macro if_double_battle ptr
+	.macro if_double_battle ptr:req
 	is_double_battle
 	if_equal 1, \ptr
 	.endm
 	
-	.macro if_not_double_battle ptr
+	.macro if_not_double_battle ptr:req
 	is_double_battle
 	if_equal 0, \ptr
 	.endm
 
-	.macro if_any_move_disabled battler, ptr
+	.macro if_any_move_disabled battler:req, ptr:req
 	if_any_move_disabled_or_encored \battler, 0, \ptr
 	.endm
 	
-	.macro if_any_move_encored battler, ptr
+	.macro if_any_move_encored battler:req, ptr:req
 	if_any_move_disabled_or_encored \battler, 1, \ptr
 	.endm

asm/macros/battle_anim_script.inc

@@ -1,26 +1,30 @@
 @ commands
 
-	.macro loadspritegfx param0
+	.macro loadspritegfx tag:req
 	.byte 0x0
-	.2byte \param0
+	.2byte \tag
 	.endm
 
-	.macro unloadspritegfx param0
+	.macro unloadspritegfx tag:req
 	.byte 0x1
-	.2byte \param0
+	.2byte \tag
 	.endm
 
-	.macro createsprite template, priority, argv:vararg
+.macro createsprite template:req, anim_battler:req, subpriority_offset:req, argv:vararg
 	.byte 0x02
 	.4byte \template
-	.byte \priority
+	.if \anim_battler == ANIM_TARGET
+	.byte 0x80 | (\subpriority_offset & 0x7F)
+	.else
+	.byte (\subpriority_offset & 0x7F)
+	.endif
 	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
 .Lsprite_\@_1:
 	.2byte \argv
 .Lsprite_\@_2:
 	.endm
 
-	.macro createvisualtask addr, priority, argv:vararg
+	.macro createvisualtask addr:req, priority:req, argv:vararg
 	.byte 0x03
 	.4byte \addr
 	.byte \priority
@@ -30,7 +34,7 @@
 .Lcreatetask_\@_2:
 	.endm
 
-	.macro delay param0
+	.macro delay param0:req
 	.byte 0x4
 	.byte \param0
 	.endm
@@ -51,22 +55,22 @@
 	.byte 0x8
 	.endm
 
-	.macro playse param0
+	.macro playse se:req
 	.byte 0x9
-	.2byte \param0
+	.2byte \se
 	.endm
 
-	.macro monbg battler
+	.macro monbg battler:req
 	.byte 0xa
 	.byte \battler
 	.endm
 
-	.macro clearmonbg battler
+	.macro clearmonbg battler:req
 	.byte 0xb
 	.byte \battler
 	.endm
 
-	.macro setalpha eva, evb
+	.macro setalpha eva:req, evb:req
 	.byte 0x0C
 	.2byte ((\evb) << 8) | (\eva)
 	.endm
@@ -75,7 +79,7 @@
 	.byte 0xd
 	.endm
 
-	.macro call param0
+	.macro call param0:req
 	.byte 0xe
 	.4byte \param0
 	.endm
@@ -84,32 +88,32 @@
 	.byte 0xf
 	.endm
 
-	.macro setarg param0, param1
+	.macro setarg param0:req, param1:req
 	.byte 0x10
 	.byte \param0
 	.2byte \param1
 	.endm
 
-	.macro choosetwoturnanim param0, param1
+	.macro choosetwoturnanim param0:req, param1:req
 	.byte 0x11
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro jumpifmoveturn param0, param1
+	.macro jumpifmoveturn param0:req, ptr:req
 	.byte 0x12
 	.byte \param0
-	.4byte \param1
+	.4byte \ptr
 	.endm
 
-	.macro goto param0
+	.macro goto ptr:req
 	.byte 0x13
-	.4byte \param0
+	.4byte \ptr
 	.endm
 
-	.macro fadetobg param0
+	.macro fadetobg bg:req
 	.byte 0x14
-	.byte \param0
+	.byte \bg
 	.endm
 
 	.macro restorebg
@@ -124,52 +128,52 @@
 	.byte 0x17
 	.endm
 
-	.macro changebg param0
+	.macro changebg bg:req
 	.byte 0x18
-	.byte \param0
+	.byte \bg
 	.endm
 
-	.macro playsewithpan param0, param1
+	.macro playsewithpan se:req, pan:req
 	.byte 0x19
-	.2byte \param0
+	.2byte \se
-	.byte \param1
+	.byte \pan
 	.endm
 
-	.macro setpan param0
+	.macro setpan pan:req
 	.byte 0x1a
-	.byte \param0
+	.byte \pan
 	.endm
 
-	.macro panse_1B param0, param1, param2, param3, param4
+	.macro panse_1B se:req, param1:req, param2:req, param3:req, param4
 	.byte 0x1b
-	.2byte \param0
+	.2byte \se
 	.byte \param1
 	.byte \param2
 	.byte \param3
 	.byte \param4
 	.endm
 
-	.macro loopsewithpan param0, param1, param2, param3
+	.macro loopsewithpan se:req, param1:req, param2:req, param3:req
 	.byte 0x1c
-	.2byte \param0
+	.2byte \se
 	.byte \param1
 	.byte \param2
 	.byte \param3
 	.endm
 
-	.macro waitplaysewithpan param0, param1, param2
+	.macro waitplaysewithpan se:req, param1:req, param2:req
 	.byte 0x1d
-	.2byte \param0
+	.2byte \se
 	.byte \param1
 	.byte \param2
 	.endm
 
-	.macro setbldcnt param0
+	.macro setbldcnt param0:req
 	.byte 0x1e
 	.2byte \param0
 	.endm
 
-	.macro createsoundtask addr, argv:vararg
+	.macro createsoundtask addr:req, argv:vararg
 	.byte 0x1F
 	.4byte \addr
 	.byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2
@@ -182,54 +186,54 @@
 	.byte 0x20
 	.endm
 
-	.macro jumpargeq param0, param1, param2
+	.macro jumpargeq param0:req, param1:req, ptr:req
 	.byte 0x21
 	.byte \param0
 	.2byte \param1
-	.4byte \param2
+	.4byte \ptr
 	.endm
 
-	.macro monbg_22 battler
+	.macro monbg_22 battler:req
 	.byte 0x22
 	.byte \battler
 	.endm
 
-	.macro clearmonbg_23 battler
+	.macro clearmonbg_23 battler:req
 	.byte 0x23
 	.byte \battler
 	.endm
 
-	.macro jumpifcontest param0
+	.macro jumpifcontest ptr:req
 	.byte 0x24
-	.4byte \param0
+	.4byte \ptr
 	.endm
 
-	.macro fadetobgfromset param0, param1, param2
+	.macro fadetobgfromset param0:req, param1:req, param2:req
 	.byte 0x25
 	.byte \param0
 	.byte \param1
 	.byte \param2
 	.endm
 
-	.macro panse_26 param0, param1, param2, param3, param4
+	.macro panse_26 se:req, param1:req, param2:req, param3:req, param4
 	.byte 0x26
-	.2byte \param0
+	.2byte \se
 	.byte \param1
 	.byte \param2
 	.byte \param3
 	.byte \param4
 	.endm
 
-	.macro panse_27 param0, param1, param2, param3, param4
+	.macro panse_27 se:req, param1:req, param2:req, param3:req, param4
 	.byte 0x27
-	.2byte \param0
+	.2byte \se
 	.byte \param1
 	.byte \param2
 	.byte \param3
 	.byte \param4
 	.endm
 
-	.macro monbgprio_28 battler
+	.macro monbgprio_28 battler:req
 	.byte 0x28
 	.byte \battler
 	.endm
@@ -238,27 +242,27 @@
 	.byte 0x29
 	.endm
 
-	.macro monbgprio_2A battler
+	.macro monbgprio_2A battler:req
 	.byte 0x2a
 	.byte \battler
 	.endm
 
-	.macro invisible battler
+	.macro invisible battler:req
 	.byte 0x2b
 	.byte \battler
 	.endm
 
-	.macro visible battler
+	.macro visible battler:req
 	.byte 0x2c
 	.byte \battler
 	.endm
 
-	.macro doublebattle_2D battler
+	.macro doublebattle_2D battler:req
 	.byte 0x2d
 	.byte \battler
 	.endm
 
-	.macro doublebattle_2E battler
+	.macro doublebattle_2E battler:req
 	.byte 0x2e
 	.byte \battler
 	.endm
@@ -268,14 +272,14 @@
 	.endm
 	
 @ useful macros
-	.macro jumpreteq value, ptr
+	.macro jumpreteq value:req, ptr:req
 	jumpargeq ARG_RET_ID, \value, \ptr
 	.endm
 	
-	.macro jumprettrue ptr
+	.macro jumprettrue ptr:req
 	jumpreteq TRUE, \ptr
 	.endm
 	
-	.macro jumpretfalse ptr
+	.macro jumpretfalse ptr:req
 	jumpreteq FALSE, \ptr
 	.endm

asm/macros/map.inc

@@ -65,7 +65,7 @@
 	.endm
 
 	.macro bg_hidden_item_event x, y, height, item, flag
-	bg_event \x, \y, \height, 7, \item, \flag, 0
+	bg_event \x, \y, \height, 7, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START), 0
 	.endm
 
 	.macro bg_secret_base_event x, y, height, secret_base_id

asm/party_menu.s

@@ -181,7 +181,7 @@ sub_81B3300: @ 81B3300
 	movs r1, 0x1
 	orrs r0, r1
 	strb r0, [r2]
-	bl GetPlayerTextSpeed
+	bl GetPlayerTextSpeedDelay
 	adds r3, r0, 0
 	lsls r3, 24
 	lsrs r3, 24
@@ -2141,7 +2141,7 @@ sub_81B43DC: @ 81B43DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -2674,7 +2674,7 @@ sub_81B48DC: @ 81B48DC
 	muls r1, r0
 	ldr r0, =gPlayerParty
 	adds r4, r1, r0
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -2966,7 +2966,7 @@ sub_81B4BA0: @ 81B4BA0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3072,7 +3072,7 @@ sub_81B4C94: @ 81B4C94
 	push {r7}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3307,7 +3307,7 @@ sub_81B4E8C: @ 81B4E8C
 	adds r0, r1
 	mov r8, r0
 _081B4EC6:
-	ldr r0, =gUnknown_0203CEF8
+	ldr r0, =gSelectedOrderFromParty
 	adds r4, r5, r0
 	ldrb r0, [r4]
 	cmp r0, 0
@@ -3421,7 +3421,7 @@ sub_81B4FA8: @ 81B4FA8
 	movs r4, 0
 	cmp r4, r5
 	bcs _081B502A
-	ldr r6, =gUnknown_0203CEF8
+	ldr r6, =gSelectedOrderFromParty
 	subs r2, r5, 0x1
 	adds r7, r6, 0
 	ldr r3, =gUnknown_0203CEC8
@@ -3479,7 +3479,7 @@ _081B502A:
 	cmp r4, r5
 	bge _081B5078
 _081B504E:
-	ldr r0, =gUnknown_0203CEF8
+	ldr r0, =gSelectedOrderFromParty
 	adds r1, r4, r0
 	ldrb r0, [r1]
 	cmp r0, 0
@@ -3880,7 +3880,7 @@ sub_81B5430: @ 81B5430
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -4174,7 +4174,7 @@ sub_81B56D8: @ 81B56D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -6546,7 +6546,7 @@ ether_effect_related_3: @ 81B6AB4
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r5, r4, 0
-	bl ProcessMenuInput
+	bl Menu_ProcessInput
 	lsls r0, 24
 	asrs r1, r0, 24
 	movs r0, 0x2
@@ -7159,7 +7159,7 @@ sub_81B7028: @ 81B7028
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -7461,7 +7461,7 @@ sub_81B72C8: @ 81B72C8
 	muls r1, r0
 	ldr r0, =gPlayerParty
 	adds r4, r1, r0
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r5, r0, 24
 	cmp r5, 0
@@ -9243,7 +9243,7 @@ sub_81B82D4: @ 81B82D4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -9521,7 +9521,7 @@ sub_81B8518: @ 81B8518
 	thumb_func_start sub_81B8558
 sub_81B8558: @ 81B8558
 	push {lr}
-	ldr r0, =gUnknown_0203CEF8
+	ldr r0, =gSelectedOrderFromParty
 	movs r1, 0
 	movs r2, 0x4
 	bl memset
@@ -9618,7 +9618,7 @@ _081B8618:
 	bl GetMonData
 	lsls r0, 16
 	lsrs r4, r0, 16
-	ldr r3, =gUnknown_08611C9A
+	ldr r3, =gFrontierBannedSpecies
 	lsls r1, r6, 1
 	adds r0, r1, r3
 	ldrh r0, [r0]
@@ -9658,7 +9658,7 @@ sub_81B865C: @ 81B865C
 	lsls r0, 24
 	lsrs r2, r0, 24
 	adds r1, r2, 0
-	ldr r3, =gUnknown_0203CEF8
+	ldr r3, =gSelectedOrderFromParty
 	adds r0, r2, r3
 	subs r0, 0x1
 	ldrb r0, [r0]
@@ -9703,7 +9703,7 @@ _081B86C0:
 	movs r5, 0
 	b _081B8750
 _081B86CE:
-	ldr r3, =gUnknown_0203CEF8
+	ldr r3, =gSelectedOrderFromParty
 	adds r4, r3, r5
 	ldrb r0, [r4]
 	movs r1, 0x64
@@ -9734,7 +9734,7 @@ _081B86CE:
 	bcs _081B8748
 	movs r7, 0x64
 _081B870E:
-	ldr r0, =gUnknown_0203CEF8
+	ldr r0, =gSelectedOrderFromParty
 	adds r5, r0, r4
 	ldrb r0, [r5]
 	muls r0, r7
@@ -9790,7 +9790,7 @@ sub_81B8770: @ 81B8770
 	lsls r0, 24
 	lsrs r2, r0, 24
 	movs r1, 0
-	ldr r3, =gUnknown_0203CEF8
+	ldr r3, =gSelectedOrderFromParty
 _081B877A:
 	adds r0, r1, r3
 	ldrb r0, [r0]

asm/pokemon_storage_system.s

@@ -1904,7 +1904,7 @@ _080C8F0C:
 	adds r0, 0x1
 	strb r0, [r1]
 _080C8F22:
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -2628,7 +2628,7 @@ _080C9584:
 	b _080C9664
 	.pool
 _080C95A4:
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3422,7 +3422,7 @@ _080C9C78:
 	b _080C9CAA
 	.pool
 _080C9C8C:
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3553,7 +3553,7 @@ _080C9DAC:
 	b _080C9DE0
 	.pool
 _080C9DC0:
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/pokenav.s

@@ -10440,7 +10440,7 @@ sub_81CC158: @ 81CC158
 	adds r1, 0xF
 	bl sub_81CAF78
 	adds r5, r0, 0
-	bl GetPlayerTextSpeed
+	bl GetPlayerTextSpeedDelay
 	lsls r0, 24
 	lsrs r0, 24
 	ldrb r2, [r4, 0x14]
@@ -22957,7 +22957,7 @@ sub_81D2BF4: @ 81D2BF4
 	movs r1, 0x1
 	orrs r0, r1
 	strb r0, [r2]
-	bl GetPlayerTextSpeed
+	bl GetPlayerTextSpeedDelay
 	adds r3, r0, 0
 	lsls r3, 24
 	lsrs r3, 24
@@ -28371,7 +28371,7 @@ _081D5764:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x10
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081D580E
 	.pool
 _081D5790:
@@ -28392,7 +28392,7 @@ _081D5790:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x1C
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081D580E
 	.pool
 _081D57BC:
@@ -28413,7 +28413,7 @@ _081D57BC:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x28
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 	b _081D580E
 	.pool
 _081D57E8:
@@ -28434,7 +28434,7 @@ _081D57E8:
 	adds r1, 0x4
 	adds r0, r1
 	adds r0, 0x34
-	bl ConvertBattleFrontierTrainerSpeechToString
+	bl FrontierSpeechToString
 _081D580E:
 	bl sub_81D5710
 	pop {r4-r6}
@@ -29731,7 +29731,7 @@ sub_81D62CC: @ 81D62CC
 	lsls r0, r1, 24
 	lsrs r6, r0, 24
 	bl sub_81D56B0
-	bl sub_8165CB4
+	bl GetHighestLevelInPlayerParty
 	lsls r0, 24
 	lsrs r0, 24
 	mov r10, r0
@@ -30184,7 +30184,7 @@ _081D6670:
 	asrs r0, 1
 	lsls r0, 1
 	subs r4, r0
-	ldr r0, =0x00000864
+	ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
 	bl FlagGet
 	lsls r0, 24
 	cmp r0, 0

asm/post_battle_event_funcs.s

@@ -1,165 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start GameClear
-GameClear: @ 8137734
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x1C
-	bl HealPlayerParty
-	ldr r4, =0x00000864
-	adds r0, r4, 0
-	bl FlagGet
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x1
-	bne _08137760
-	ldr r0, =gHasHallOfFameRecords
-	strb r1, [r0]
-	b _0813776C
-	.pool
-_08137760:
-	ldr r1, =gHasHallOfFameRecords
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r4, 0
-	bl FlagSet
-_0813776C:
-	movs r0, 0x1
-	bl GetGameStat
-	cmp r0, 0
-	bne _0813778E
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrh r1, [r2, 0xE]
-	lsls r1, 16
-	ldrb r0, [r2, 0x10]
-	lsls r0, 8
-	orrs r1, r0
-	ldrb r0, [r2, 0x11]
-	orrs r1, r0
-	movs r0, 0x1
-	bl SetGameStat
-_0813778E:
-	bl sub_8076D48
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x8]
-	cmp r0, 0
-	bne _081377AC
-	movs r0, 0x1
-	bl sub_8084F6C
-	b _081377B2
-	.pool
-_081377AC:
-	movs r0, 0x2
-	bl sub_8084F6C
-_081377B2:
-	movs r7, 0
-	movs r6, 0
-	add r0, sp, 0x18
-	mov r8, r0
-	mov r5, sp
-_081377BC:
-	movs r0, 0x64
-	adds r1, r6, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r4, r1, r0
-	movs r0, 0
-	strb r6, [r5]
-	strb r0, [r5, 0x1]
-	adds r0, r4, 0
-	movs r1, 0x5
-	bl GetMonData
-	cmp r0, 0
-	beq _0813780A
-	adds r0, r4, 0
-	movs r1, 0x6
-	bl GetMonData
-	cmp r0, 0
-	bne _0813780A
-	adds r0, r4, 0
-	movs r1, 0x43
-	bl GetMonData
-	cmp r0, 0
-	bne _0813780A
-	movs r0, 0x1
-	mov r1, r8
-	strb r0, [r1]
-	adds r0, r4, 0
-	movs r1, 0x43
-	add r2, sp, 0x18
-	bl SetMonData
-	adds r0, r4, 0
-	bl GetRibbonCount
-	strb r0, [r5, 0x1]
-	movs r7, 0x1
-_0813780A:
-	adds r5, 0x4
-	adds r6, 0x1
-	cmp r6, 0x5
-	ble _081377BC
-	cmp r7, 0x1
-	bne _0813785A
-	movs r0, 0x2A
-	bl IncrementGameStat
-	ldr r0, =0x0000089b
-	bl FlagSet
-	mov r3, sp
-	add r2, sp, 0x4
-	movs r6, 0x4
-_08137828:
-	ldrb r1, [r3, 0x1]
-	ldrb r0, [r2, 0x1]
-	cmp r0, r1
-	bls _08137838
-	ldr r1, [sp]
-	ldr r0, [r2]
-	str r0, [sp]
-	str r1, [r2]
-_08137838:
-	adds r2, 0x4
-	subs r6, 0x1
-	cmp r6, 0
-	bge _08137828
-	mov r0, sp
-	ldrb r0, [r0, 0x1]
-	cmp r0, 0x4
-	bls _0813785A
-	mov r0, sp
-	ldrb r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, =gPlayerParty
-	adds r0, r1
-	movs r1, 0x43
-	bl sub_80EE4DC
-_0813785A:
-	ldr r0, =CB2_DoHallOfFameScreen
-	bl SetMainCallback2
-	movs r0, 0
-	add sp, 0x1C
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end GameClear
-
-	thumb_func_start sp0C8_whiteout_maybe
-sp0C8_whiteout_maybe: @ 813787C
-	push {lr}
-	ldr r0, =CB2_WhiteOut
-	bl SetMainCallback2
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sp0C8_whiteout_maybe

asm/roulette.s

@@ -736,7 +736,7 @@ sub_8140914: @ 8140914
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_8197930
+	bl DisplayYesNoMenu
 	ldr r5, =gUnknown_0203AB8C
 	ldrb r0, [r5]
 	movs r1, 0
@@ -4502,7 +4502,7 @@ sub_81428C4: @ 81428C4
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_8197930
+	bl DisplayYesNoMenu
 	ldr r1, =gUnknown_085B6408
 	adds r0, r4, 0
 	bl sub_8121F68

asm/trade.s

@@ -3349,7 +3349,7 @@ sub_8078EF8: @ 8078EF8
 sub_8078F50: @ 8078F50
 	push {lr}
 	sub sp, 0x4
-	bl Menu_ProcessInputNoWrapAround
+	bl Menu_ProcessInputNoWrap
 	lsls r0, 24
 	asrs r0, 24
 	movs r1, 0x1
@@ -3695,7 +3695,7 @@ _0807920E:
 	thumb_func_start sub_8079218
 sub_8079218: @ 8079218
 	push {lr}
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3797,7 +3797,7 @@ _080792D8:
 	thumb_func_start sub_80792E4
 sub_80792E4: @ 80792E4
 	push {lr}
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/use_pokeblock.s

@@ -900,7 +900,7 @@ sub_8166D44: @ 8166D44
 	thumb_func_start sub_8166DE4
 sub_8166DE4: @ 8166DE4
 	push {r4,lr}
-	bl Menu_ProcessInputNoWrap_
+	bl Menu_ProcessInputNoWrapClearOnChoose
 	lsls r0, 24
 	lsrs r4, r0, 24
 	asrs r1, r0, 24

common_syms/apprentice.txt

@@ -0,0 +1,3 @@
+gUnknown_030062EC
+gUnknown_030062F0
+gUnknown_030062F4

common_syms/battle_factory_screen.txt

@@ -0,0 +1 @@
+gUnknown_030062E8

common_syms/battle_tower.txt

@@ -0,0 +1 @@
+gUnknown_03006298

common_syms/berry_blender.txt

@@ -0,0 +1 @@
+gInGameOpponentsNo

common_syms/field_camera.txt

@@ -1,3 +1,3 @@
-gUnknown_03005DD0
+gFieldCamera
-gUnknown_03005DE8
+gTotalCameraPixelOffsetY
-gUnknown_03005DEC
+gTotalCameraPixelOffsetX

common_syms/overworld.txt

@@ -1,3 +1,6 @@
+gBGTilemapBuffers1
+gBGTilemapBuffers2
+gBGTilemapBuffers3
 gUnknown_03005DA8
 gFieldCallback
 gFieldCallback2

common_syms/pokedex.txt

@@ -0,0 +1,2 @@
+gUnknown_030060B0
+gUnknown_030060B4

common_syms/start_menu.txt

@@ -0,0 +1 @@
+gMenuCallback

common_syms/text.txt

@@ -1,8 +1,4 @@
 gFonts
 gUnknown_03002F84
 gUnknown_03002F90
-gUnknown_03002FB0
-gUnknown_03002FD0
-gUnknown_03002FF0
-gGlyphDimensions
 gTextFlags

data/battle_anim_80A9C70.s

@@ -1,3 +1,4 @@
+#include "constants/battle_anim.h"
     .include "asm/macros.inc"
     .include "constants/constants.inc"
 
@@ -13,8 +14,8 @@ gUnknown_0853EDF8:: @ 853EDF8
 
     .align 2
 gUnknown_0853EDFC:: @ 853EDFC
-	spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
+	spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
-	spr_template 0x2714, 0x2714, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C
+	spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_0852490C, gUnknown_0853EDF8, NULL, gDummySpriteAffineAnimTable, sub_80A8A6C
 
     .align 2
 gUnknown_0853EE2C:: @ 853EE2C
@@ -26,11 +27,11 @@ gUnknown_0853EE34:: @ 853EE34
 
     .align 2
 gUnknown_0853EE38:: @ 853EE38
-	spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
+	spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8E30
 	
 	.align 2
 gUnknown_0853EE50:: @ 853EE50
-	spr_template 0x282b, 0x282b, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
+	spr_template ANIM_TAG_WEATHER_BALL, ANIM_TAG_WEATHER_BALL, gUnknown_08524914, gUnknown_0853EE34, NULL, gDummySpriteAffineAnimTable, sub_80A8EE4
 
     .align 2
 gUnknown_0853EE68:: @ 853EE68
@@ -42,8 +43,8 @@ gUnknown_0853EE80:: @ 853EE80
 
     .align 2
 gUnknown_0853EE84:: @ 853EE84
-	spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64
+	spr_template ANIM_TAG_SPARKLE_4, ANIM_TAG_SPARKLE_4, gUnknown_08524914, gUnknown_0853EE80, NULL, gDummySpriteAffineAnimTable, sub_80A8B64
-	spr_template 0x2743, 0x2743, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
+	spr_template ANIM_TAG_UNUSED_MONSTER_FOOT, ANIM_TAG_UNUSED_MONSTER_FOOT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
 
     .align 2
 gUnknown_0853EEB4:: @ 853EEB4
@@ -65,7 +66,7 @@ gUnknown_0853EECC:: @ 853EECC
 
     .align 2
 gUnknown_0853EED8:: @ 853EED8
-	spr_template 0x2797, 0x2797, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
+	spr_template ANIM_TAG_IMPACT, ANIM_TAG_IMPACT, gUnknown_08524914, gUnknown_0853EECC, NULL, gDummySpriteAffineAnimTable, sub_80A8AEC
 
     .align 2
 gUnknown_0853EEF0:: @ 853EEF0
@@ -85,4 +86,4 @@ gUnknown_0853EF14:: @ 853EF14
 
     .align 2
 gUnknown_0853EF18:: @ 853EF18
-	spr_template 0x2714, 0x2714, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C
+	spr_template ANIM_TAG_UNUSED_ORB, ANIM_TAG_UNUSED_ORB, gUnknown_085249CC, gUnknown_0853EEF8, NULL, gUnknown_0853EF14, sub_80A8A6C

data/battle_anim_815A0D4.s

@@ -1,3 +1,4 @@
+#include "constants/battle_anim.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -15,15 +16,15 @@ gUnknown_085CE01C:: @ 85CE01C
 
 	.align 2
 gUnknown_085CE020:: @ 85CE020
-	spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
+	spr_template ANIM_TAG_SCRATCH, ANIM_TAG_SCRATCH, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
 
 	.align 2
 gUnknown_085CE038:: @ 85CE038
-	spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
+	spr_template ANIM_TAG_BLACK_SMOKE, ANIM_TAG_BLACK_SMOKE, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
 
 	.align 2
 gUnknown_085CE050:: @ 85CE050
-	spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
+	spr_template ANIM_TAG_BLACK_BALL, ANIM_TAG_BLACK_BALL, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
 
 	.align 2
 gUnknown_085CE068:: @ 85CE068
@@ -36,15 +37,15 @@ gUnknown_085CE078:: @ 85CE078
 
 	.align 2
 gUnknown_085CE07C:: @ 85CE07C
-	spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
+	spr_template ANIM_TAG_OPENING_EYE, ANIM_TAG_OPENING_EYE, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
 
 	.align 2
 gUnknown_085CE094::
-	spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
+	spr_template ANIM_TAG_ROUND_WHITE_HALO, ANIM_TAG_ROUND_WHITE_HALO, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
 
 	.align 2
 gUnknown_085CE0AC::
-	spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
+	spr_template ANIM_TAG_TEAL_ALERT, ANIM_TAG_TEAL_ALERT, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
 
 	.align 2
 gUnknown_085CE0C4:: @ 85CE0C4
@@ -66,11 +67,11 @@ gUnknown_085CE0FC:: @ 85CE0FC
 
 	.align 2
 gUnknown_085CE104:: @ 85CE104
-	spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
+	spr_template ANIM_TAG_EYE, ANIM_TAG_EYE, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
 
 	.align 2
 gUnknown_085CE11C:: @ 85CE11C
-	spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
+	spr_template ANIM_TAG_SPIKES, ANIM_TAG_SPIKES, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
 
 	.align 2
 gUnknown_085CE134:: @ 85CE134
@@ -84,7 +85,7 @@ gUnknown_085CE14C:: @ 85CE14C
 
 	.align 2
 gUnknown_085CE150:: @ 85CE150
-	spr_template 0x272b, 0x272b, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
+	spr_template ANIM_TAG_LEER, ANIM_TAG_LEER, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
 
 	.align 2
 gUnknown_085CE168:: @ 85CE168
@@ -106,7 +107,7 @@ gUnknown_085CE18C:: @ 85CE18C
 
 	.align 2
 gUnknown_085CE190:: @ 85CE190
-	spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
+	spr_template ANIM_TAG_LETTER_Z, ANIM_TAG_LETTER_Z, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
 
 	.align 2
 gUnknown_085CE1A8:: @ 85CE1A8
@@ -128,7 +129,7 @@ gUnknown_085CE1D8:: @ 85CE1D8
 
 	.align 2
 gUnknown_085CE1DC:: @ 85CE1DC
-	spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
+	spr_template ANIM_TAG_FANG_ATTACK, ANIM_TAG_FANG_ATTACK, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
 
 	.align 2
 gUnknown_085CE1F4:: @ 85CE1F4
@@ -149,15 +150,15 @@ gUnknown_085CE224:: @ 85CE224
 
 	.align 2
 gUnknown_085CE22C:: @ 85CE22C
-	spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
+	spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
 
 	.align 2
 gUnknown_085CE244::
-	spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
+	spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
 
 	.align 2
 gUnknown_085CE25C::
-	spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
+	spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
 
 	.align 2
 gUnknown_085CE274:: @ 85CE274
@@ -170,7 +171,7 @@ gUnknown_085CE284:: @ 85CE284
 
 	.align 2
 gUnknown_085CE288:: @ 85CE288
-	spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
+	spr_template ANIM_TAG_RAPID_SPIN, ANIM_TAG_RAPID_SPIN, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0
 
 	.align 2
 gUnknown_085CE2A0:: @ 85CE2A0
@@ -195,7 +196,7 @@ gUnknown_085CE2F4:: @ 85CE2F4
 
 	.align 2
 gUnknown_085CE2F8:: @ 85CE2F8
-	spr_template 0x27f6, 0x27f6, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C
+	spr_template ANIM_TAG_TRI_FORCE_TRIANGLE, ANIM_TAG_TRI_FORCE_TRIANGLE, gUnknown_085249DC, gUnknown_085CE2C8, NULL, gUnknown_085CE2F4, sub_815B27C
 
 	.align 2
 gUnknown_085CE310:: @ 85CE310
@@ -208,7 +209,7 @@ gUnknown_085CE334:: @ 85CE334
 
 	.align 2
 gUnknown_085CE338:: @ 85CE338
-	spr_template 0x27fa, 0x27fa, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
+	spr_template ANIM_TAG_ECLIPSING_ORB, ANIM_TAG_ECLIPSING_ORB, gUnknown_08524914, gUnknown_085CE334, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
 
 	.align 2
 gUnknown_085CE350:: @ 85CE350
@@ -216,15 +217,15 @@ gUnknown_085CE350:: @ 85CE350
 
 	.align 2
 gUnknown_085CE370:: @ 85CE370
-	spr_template 0x27f2, 0x27f2, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394
+	spr_template ANIM_TAG_POKEBALL, ANIM_TAG_POKEBALL, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B394
 
 	.align 2
 gUnknown_085CE388:: @ 85CE388
-	spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C
+	spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B49C
 
 	.align 2
 gUnknown_085CE3A0:: @ 85CE3A0
-	spr_template 0x27f9, 0x27f9, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570
+	spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B570
 
 	.align 2
 gUnknown_085CE3B8:: @ 85CE3B8
@@ -238,7 +239,7 @@ gUnknown_085CE3E0:: @ 85CE3E0
 
 	.align 2
 gUnknown_085CE418:: @ 85CE418
-	spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C
+	spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815B70C
 
 	.align 2
 gUnknown_085CE430:: @ 85CE430
@@ -269,7 +270,7 @@ gUnknown_085CE480:: @ 85CE480
 
 	.align 2
 gUnknown_085CE48C:: @ 85CE48C
-	spr_template 0x2801, 0x2801, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04
+	spr_template ANIM_TAG_GREEN_STAR, ANIM_TAG_GREEN_STAR, gUnknown_0852490C, gUnknown_085CE480, NULL, gDummySpriteAffineAnimTable, sub_815BE04
 
 	.align 2
 gUnknown_085CE4A4:: @ 85CE4A4
@@ -285,7 +286,7 @@ gUnknown_085CE4B0:: @ 85CE4B0
 
 	.align 2
 gUnknown_085CE4D0:: @ 85CE4D0
-	spr_template 0x2767, 0x2767, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400
+	spr_template ANIM_TAG_ANGER, ANIM_TAG_ANGER, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815C400
 
 	.align 2
 gUnknown_085CE4E8:: @ 85CE4E8
@@ -309,7 +310,7 @@ gUnknown_085CE538:: @ 85CE538
 
 	.align 2
 gUnknown_085CE544:: @ 85CE544
-	spr_template 0x27fe, 0x27fe, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0
+	spr_template ANIM_TAG_PINK_PETAL, ANIM_TAG_PINK_PETAL, gUnknown_08524904, gUnknown_085CE538, NULL, gDummySpriteAffineAnimTable, sub_815C6B0
 
 	.align 2
 gUnknown_085CE55C:: @ 85CE55C
@@ -325,13 +326,13 @@ gUnknown_085CE58C:: @ 85CE58C
 
 	.align 2
 gUnknown_085CE590:: @ 85CE590
-	spr_template 0x27ff, 0x27ff, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C
+	spr_template ANIM_TAG_PAIN_SPLIT, ANIM_TAG_PAIN_SPLIT, gUnknown_0852490C, gUnknown_085CE58C, NULL, gDummySpriteAffineAnimTable, sub_815C95C
 gUnknown_085CE5A8::
-	spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
+	spr_template ANIM_TAG_CONFETTI, ANIM_TAG_CONFETTI, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
 gUnknown_085CE5C0::
-	spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
+	spr_template ANIM_TAG_SPOTLIGHT, ANIM_TAG_SPOTLIGHT, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
 gBattleAnimSpriteTemplate_85CE5D8::
-	spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
+	spr_template ANIM_TAG_BLUE_ORB, ANIM_TAG_BLUE_ORB, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
 
 	.align 2
 gUnknown_085CE5F0:: @ 85CE5F0
@@ -358,7 +359,7 @@ gUnknown_085CE680:: @ 85CE680
 
 	.align 2
 gUnknown_085CE68C:: @ 85CE68C
-	spr_template 0x2802, 0x2802, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4
+	spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE680, sub_815D7B4
 
 	.align 2
 gUnknown_085CE6A4:: @ 85CE6A4
@@ -385,7 +386,7 @@ gUnknown_085CE724:: @ 85CE724
 
 	.align 2
 gUnknown_085CE734:: @ 85CE734
-	spr_template 0x2802, 0x2802, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870
+	spr_template ANIM_TAG_PINK_CLOUD, ANIM_TAG_PINK_CLOUD, gUnknown_085249D4, gDummySpriteAnimTable, NULL, gUnknown_085CE724, sub_815D870
 
 	.align 2
 gUnknown_085CE74C:: @ 85CE74C
@@ -393,7 +394,7 @@ gUnknown_085CE74C:: @ 85CE74C
 
 	.align 2
 gUnknown_085CE76C:: @ 85CE76C
-	spr_template 0x2803, 0x2803, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC
+	spr_template ANIM_TAG_SWEAT_DROP, ANIM_TAG_SWEAT_DROP, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815DEBC
 
 	.align 2
 gUnknown_085CE784:: @ 85CE784
@@ -415,13 +416,13 @@ gUnknown_085CE7CC:: @ 85CE7CC
 
 	.align 2
 gUnknown_085CE7D4:: @ 85CE7D4
-	spr_template 0x2745, 0x2745, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C
+	spr_template ANIM_TAG_NOISE_LINE, ANIM_TAG_NOISE_LINE, gUnknown_08524914, gUnknown_085CE7CC, NULL, gDummySpriteAffineAnimTable, sub_815E01C
 
 	.align 2
 gUnknown_085CE7EC:: @ 85CE7EC
-	spr_template 0x2808, 0x2808, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404
+	spr_template ANIM_TAG_SMALL_RED_EYE, ANIM_TAG_SMALL_RED_EYE, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E404
 gUnknown_085CE804::
-	spr_template 0x280c, 0x280c, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444
+	spr_template ANIM_TAG_PAW_PRINT, ANIM_TAG_PAW_PRINT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E444
 
 	.align 2
 gUnknown_085CE81C:: @ 85CE81C
@@ -439,11 +440,11 @@ gUnknown_085CE844:: @ 85CE844
 
 	.align 2
 gUnknown_085CE84C:: @ 85CE84C
-	spr_template 0x280e, 0x280e, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy
+	spr_template ANIM_TAG_RED_BALL, ANIM_TAG_RED_BALL, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_085CE844, SpriteCallbackDummy
 
 	.align 2
 gUnknown_085CE864::
-	spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8
+	spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E6D8
 
 	.align 2
 gUnknown_085CE87C:: @ 85CE87C
@@ -451,19 +452,19 @@ gUnknown_085CE87C:: @ 85CE87C
 
 	.align 2
 gUnknown_085CE894:: @ 85CE894
-	spr_template 0x280f, 0x280f, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954
+	spr_template ANIM_TAG_SMELLINGSALT_EFFECT, ANIM_TAG_SMELLINGSALT_EFFECT, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815E954
 gUnknown_085CE8AC::
-	spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14
+	spr_template ANIM_TAG_TAG_HAND, ANIM_TAG_TAG_HAND, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EA14
 gUnknown_085CE8C4::
-	spr_template 0x2812, 0x2812, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84
+	spr_template ANIM_TAG_MAGNIFYING_GLASS, ANIM_TAG_MAGNIFYING_GLASS, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815EE84
 gUnknown_085CE8DC::
-	spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C
+	spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F18C
 gUnknown_085CE8F4::
-	spr_template 0x27f9, 0x27f9, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
+	spr_template ANIM_TAG_GOLD_STARS, ANIM_TAG_GOLD_STARS, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
 gUnknown_085CE90C::
-	spr_template 0x280a, 0x280a, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C
+	spr_template ANIM_TAG_X_SIGN, ANIM_TAG_X_SIGN, gUnknown_0852491C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815F48C
 gUnknown_085CE924::
-	spr_template 0x27f0, 0x27f0, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80
+	spr_template ANIM_TAG_ITEM_BAG, ANIM_TAG_ITEM_BAG, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815FE80
 
 	.align 2
 gUnknown_085CE93C:: @ 85CE93C
@@ -488,7 +489,7 @@ gUnknown_085CE97C:: @ 85CE97C
 
 	.align 2
 gUnknown_085CE984:: @ 85CE984
-	spr_template 0x2825, 0x2825, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338
+	spr_template ANIM_TAG_SLAM_HIT_2, ANIM_TAG_SLAM_HIT_2, gUnknown_0852497C, gUnknown_085CE948, NULL, gUnknown_085CE97C, sub_8160338
 
 	.align 2
 gUnknown_085CE99C:: @ 85CE99C
@@ -500,7 +501,7 @@ gUnknown_085CE9AC:: @ 85CE9AC
 
 	.align 2
 gUnknown_085CE9B0:: @ 85CE9B0
-	spr_template 0x2826, 0x2826, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8
+	spr_template ANIM_TAG_RECYCLE, ANIM_TAG_RECYCLE, gUnknown_08524A9C, gDummySpriteAnimTable, NULL, gUnknown_085CE9AC, sub_81603A8
 
 	.align 2
 gUnknown_085CE9C8:: @ 85CE9C8

data/battle_anim_8170478.s

@@ -1,3 +1,4 @@
+#include "constants/battle_anim.h"
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 
@@ -141,7 +142,7 @@ gUnknown_085E5310:: @ 85E5310
 
 	.align 2
 gBattleAnimSpriteTemplate_85E5338:: @ 85E5338
-	spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
+	spr_template ANIM_TAG_UNUSED_RED_BRICK, ANIM_TAG_UNUSED_RED_BRICK, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
 
 	.align 2
 gUnknown_085E5350:: @ 8535350
@@ -152,5 +153,5 @@ gUnknown_085E5358:: @ 8535358
 	.4byte gUnknown_085E5350
 
 	.align 2
-	spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C
+	spr_template ANIM_TAG_ROCKS, ANIM_TAG_ROCKS, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C
 

data/battle_anims.s

@@ -1,907 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_08524904:: @ 8524904
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852490C:: @ 852490C
-	.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524914:: @ 8524914
-	.byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852491C:: @ 852491C
-	.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524924:: @ 8524924
-	.byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852492C:: @ 852492C
-	.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524934:: @ 8524934
-	.byte 0x00, 0x40, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852493C:: @ 852493C
-	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524944:: @ 8524944
-	.byte 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852494C:: @ 852494C
-	.byte 0x00, 0x80, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524954:: @ 8524954
-	.byte 0x00, 0x80, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852495C:: @ 852495C
-	.byte 0x00, 0x80, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524964:: @ 8524964
-	.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852496C:: @ 852496C
-	.byte 0x00, 0x01, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524974:: @ 8524974
-	.byte 0x00, 0x01, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852497C:: @ 852497C
-	.byte 0x00, 0x01, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524984:: @ 8524984
-	.byte 0x00, 0x41, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852498C:: @ 852498C
-	.byte 0x00, 0x41, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524994:: @ 8524994
-	.byte 0x00, 0x41, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_0852499C:: @ 852499C
-	.byte 0x00, 0x41, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249A4:: @ 85249A4
-	.byte 0x00, 0x81, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249AC:: @ 85249AC
-	.byte 0x00, 0x81, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249B4:: @ 85249B4
-	.byte 0x00, 0x81, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249BC:: @ 85249BC
-	.byte 0x00, 0x81, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249C4:: @ 85249C4
-	.byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249CC:: @ 85249CC
-	.byte 0x00, 0x03, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249D4:: @ 85249D4
-	.byte 0x00, 0x03, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249DC:: @ 85249DC
-	.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249E4:: @ 85249E4
-	.byte 0x00, 0x43, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249EC:: @ 85249EC
-	.byte 0x00, 0x43, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249F4:: @ 85249F4
-	.byte 0x00, 0x43, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_085249FC:: @ 85249FC
-	.byte 0x00, 0x43, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A04:: @ 8524A04
-	.byte 0x00, 0x83, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A0C:: @ 8524A0C
-	.byte 0x00, 0x83, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A14:: @ 8524A14
-	.byte 0x00, 0x83, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A1C:: @ 8524A1C
-	.byte 0x00, 0x83, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A24:: @ 8524A24
-	.byte 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A2C:: @ 8524A2C
-	.byte 0x00, 0x04, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A34:: @ 8524A34
-	.byte 0x00, 0x04, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A3C:: @ 8524A3C
-	.byte 0x00, 0x04, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A44:: @ 8524A44
-	.byte 0x00, 0x44, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A4C:: @ 8524A4C
-	.byte 0x00, 0x44, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A54:: @ 8524A54
-	.byte 0x00, 0x44, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A5C:: @ 8524A5C
-	.byte 0x00, 0x44, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A64:: @ 8524A64
-	.byte 0x00, 0x84, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A6C:: @ 8524A6C
-	.byte 0x00, 0x84, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A74:: @ 8524A74
-	.byte 0x00, 0x84, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A7C:: @ 8524A7C
-	.byte 0x00, 0x84, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A84:: @ 8524A84
-	.byte 0x00, 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A8C:: @ 8524A8C
-	.byte 0x00, 0x05, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A94:: @ 8524A94
-	.byte 0x00, 0x05, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524A9C:: @ 8524A9C
-	.byte 0x00, 0x05, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AA4:: @ 8524AA4
-	.byte 0x00, 0x45, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AAC:: @ 8524AAC
-	.byte 0x00, 0x45, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AB4:: @ 8524AB4
-	.byte 0x00, 0x45, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524ABC:: @ 8524ABC
-	.byte 0x00, 0x45, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AC4:: @ 8524AC4
-	.byte 0x00, 0x85, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524ACC:: @ 8524ACC
-	.byte 0x00, 0x85, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AD4:: @ 8524AD4
-	.byte 0x00, 0x85, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524ADC:: @ 8524ADC
-	.byte 0x00, 0x85, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AE4:: @ 8524AE4
-	.byte 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AEC:: @ 8524AEC
-	.byte 0x00, 0x07, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AF4:: @ 8524AF4
-	.byte 0x00, 0x07, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524AFC:: @ 8524AFC
-	.byte 0x00, 0x07, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B04:: @ 8524B04
-	.byte 0x00, 0x47, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B0C:: @ 8524B0C
-	.byte 0x00, 0x47, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B14:: @ 8524B14
-	.byte 0x00, 0x47, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B1C:: @ 8524B1C
-	.byte 0x00, 0x47, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B24:: @ 8524B24
-	.byte 0x00, 0x87, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B2C:: @ 8524B2C
-	.byte 0x00, 0x87, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B34:: @ 8524B34
-	.byte 0x00, 0x87, 0x00, 0x80, 0x00, 0x08, 0x00, 0x00
-
-	.align 2
-gUnknown_08524B3C:: @ 8524B3C
-	.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
-
-    .align 2
-gBattleAnimPicTable:: @ 8524B44
-	obj_tiles gBattleAnimSpriteSheet_000, 0x0200, 0x2710
-	obj_tiles gBattleAnimSpriteSheet_001, 0x0300, 0x2711
-	obj_tiles gBattleAnimSpriteSheet_002, 0x0200, 0x2712
-	obj_tiles gBattleAnimSpriteSheet_003, 0x0100, 0x2713
-	obj_tiles gBattleAnimSpriteSheet_004, 0x0200, 0x2714
-	obj_tiles gBattleAnimSpriteSheet_005, 0x0400, 0x2715
-	obj_tiles gBattleAnimSpriteSheet_006, 0x0180, 0x2716
-	obj_tiles gBattleAnimSpriteSheet_007, 0x0800, 0x2717
-	obj_tiles gBattleAnimSpriteSheet_008, 0x0020, 0x2718
-	obj_tiles gBattleAnimSpriteSheet_009, 0x0400, 0x2719
-	obj_tiles gBattleAnimSpriteSheet_010, 0x1200, 0x271a
-	obj_tiles gBattleAnimSpriteSheet_011, 0x0180, 0x271b
-	obj_tiles gBattleAnimSpriteSheet_012, 0x0080, 0x271c
-	obj_tiles gBattleAnimSpriteSheet_013, 0x0080, 0x271d
-	obj_tiles gBattleAnimSpriteSheet_014, 0x0280, 0x271e
-	obj_tiles gBattleAnimSpriteSheet_015, 0x0080, 0x271f
-	obj_tiles gBattleAnimSpriteSheet_016, 0x0100, 0x2720
-	obj_tiles gBattleAnimSpriteSheet_017, 0x0020, 0x2721
-	obj_tiles gBattleAnimSpriteSheet_018, 0x0080, 0x2722
-	obj_tiles gBattleAnimSpriteSheet_019, 0x0400, 0x2723
-	obj_tiles gBattleAnimSpriteSheet_020, 0x0200, 0x2724
-	obj_tiles gBattleAnimSpriteSheet_021, 0x0a00, 0x2725
-	obj_tiles gBattleAnimSpriteSheet_021, 0x0a00, 0x2726
-	obj_tiles gBattleAnimSpriteSheet_023, 0x0380, 0x2727
-	obj_tiles gBattleAnimSpriteSheet_024, 0x0300, 0x2728
-	obj_tiles gBattleAnimSpriteSheet_025, 0x0a00, 0x2729
-	obj_tiles gBattleAnimSpriteSheet_026, 0x0a00, 0x272a
-	obj_tiles gBattleAnimSpriteSheet_027, 0x0a00, 0x272b
-	obj_tiles gBattleAnimSpriteSheet_028, 0x0a00, 0x272c
-	obj_tiles gBattleAnimSpriteSheet_029, 0x0a00, 0x272d
-	obj_tiles gBattleAnimSpriteSheet_030, 0x0a00, 0x272e
-	obj_tiles gBattleAnimSpriteSheet_031, 0x0e00, 0x272f
-	obj_tiles gBattleAnimSpriteSheet_032, 0x0380, 0x2730
-	obj_tiles gBattleAnimSpriteSheet_033, 0x1000, 0x2731
-	obj_tiles gBattleAnimSpriteSheet_034, 0x0800, 0x2732
-	obj_tiles gBattleAnimSpriteSheet_035, 0x0a00, 0x2733
-	obj_tiles gBattleAnimSpriteSheet_036, 0x0800, 0x2734
-	obj_tiles gBattleAnimSpriteSheet_037, 0x0a00, 0x2735
-	obj_tiles gBattleAnimSpriteSheet_038, 0x0a00, 0x2736
-	obj_tiles gBattleAnimSpriteSheet_039, 0x0a00, 0x2737
-	obj_tiles gBattleAnimSpriteSheet_040, 0x0a00, 0x2738
-	obj_tiles gBattleAnimSpriteSheet_041, 0x0a00, 0x2739
-	obj_tiles gBattleAnimSpriteSheet_042, 0x0a00, 0x273a
-	obj_tiles gBattleAnimSpriteSheet_043, 0x0a00, 0x273b
-	obj_tiles gBattleAnimSpriteSheet_044, 0x0a00, 0x273c
-	obj_tiles gBattleAnimSpriteSheet_045, 0x0a00, 0x273d
-	obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 0x273e
-	obj_tiles gBattleAnimSpriteSheet_046, 0x1000, 0x273f
-	obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 0x2740
-	obj_tiles gBattleAnimSpriteSheet_048, 0x1000, 0x2741
-	obj_tiles gBattleAnimSpriteSheet_050, 0x0200, 0x2742
-	obj_tiles gBattleAnimSpriteSheet_051, 0x0200, 0x2743
-	obj_tiles gBattleAnimSpriteSheet_052, 0x0200, 0x2744
-	obj_tiles gBattleAnimSpriteSheet_053, 0x0800, 0x2745
-	obj_tiles gBattleAnimSpriteSheet_054, 0x0080, 0x2746
-	obj_tiles gBattleAnimSpriteSheet_055, 0x0200, 0x2747
-	obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 0x2748
-	obj_tiles gBattleAnimSpriteSheet_057, 0x0180, 0x2749
-	obj_tiles gBattleAnimSpriteSheet_058, 0x0c00, 0x274a
-	obj_tiles gBattleAnimSpriteSheet_059, 0x0100, 0x274b
-	obj_tiles gBattleAnimSpriteSheet_060, 0x0040, 0x274c
-	obj_tiles gBattleAnimSpriteSheet_061, 0x0180, 0x274d
-	obj_tiles gBattleAnimSpriteSheet_062, 0x0800, 0x274e
-	obj_tiles gBattleAnimSpriteSheet_063, 0x0480, 0x274f
-	obj_tiles gBattleAnimSpriteSheet_064, 0x0200, 0x2750
-	obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2751
-	obj_tiles gBattleAnimSpriteSheet_066, 0x0100, 0x2752
-	obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2753
-	obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2754
-	obj_tiles gBattleAnimSpriteSheet_065, 0x0200, 0x2755
-	obj_tiles gBattleAnimSpriteSheet_070, 0x0200, 0x2756
-	obj_tiles gBattleAnimSpriteSheet_071, 0x0a00, 0x2757
-	obj_tiles gBattleAnimSpriteSheet_072, 0x0300, 0x2758
-	obj_tiles gBattleAnimSpriteSheet_073, 0x0180, 0x2759
-	obj_tiles gBattleAnimSpriteSheet_074, 0x00a0, 0x275a
-	obj_tiles gBattleAnimSpriteSheet_075, 0x0700, 0x275b
-	obj_tiles gBattleAnimSpriteSheet_076, 0x0400, 0x275c
-	obj_tiles gBattleAnimSpriteSheet_077, 0x0200, 0x275d
-	obj_tiles gBattleAnimSpriteSheet_078, 0x0300, 0x275e
-	obj_tiles gBattleAnimSpriteSheet_079, 0x0c00, 0x275f
-	obj_tiles gBattleAnimSpriteSheet_080, 0x0a00, 0x2760
-	obj_tiles gBattleAnimSpriteSheet_081, 0x0080, 0x2761
-	obj_tiles gBattleAnimSpriteSheet_082, 0x0040, 0x2762
-	obj_tiles gBattleAnimSpriteSheet_083, 0x0e00, 0x2763
-	obj_tiles gBattleAnimSpriteSheet_084, 0x0e00, 0x2764
-	obj_tiles gBattleAnimSpriteSheet_085, 0x0280, 0x2765
-	obj_tiles gBattleAnimSpriteSheet_086, 0x0200, 0x2766
-	obj_tiles gBattleAnimSpriteSheet_087, 0x0080, 0x2767
-	obj_tiles gBattleAnimSpriteSheet_088, 0x00c0, 0x2768
-	obj_tiles gBattleAnimSpriteSheet_089, 0x0a00, 0x2769
-	obj_tiles gBattleAnimSpriteSheet_090, 0x0200, 0x276a
-	obj_tiles gBattleAnimSpriteSheet_091, 0x0180, 0x276b
-	obj_tiles gBattleAnimSpriteSheet_092, 0x0080, 0x276c
-	obj_tiles gBattleAnimSpriteSheet_093, 0x1000, 0x276d
-	obj_tiles gBattleAnimSpriteSheet_094, 0x0a00, 0x276e
-	obj_tiles gBattleAnimSpriteSheet_095, 0x0180, 0x276f
-	obj_tiles gBattleAnimSpriteSheet_096, 0x0380, 0x2770
-	obj_tiles gBattleAnimSpriteSheet_097, 0x0c00, 0x2771
-	obj_tiles gBattleAnimSpriteSheet_098, 0x0200, 0x2772
-	obj_tiles gBattleAnimSpriteSheet_099, 0x0200, 0x2773
-	obj_tiles gBattleAnimSpriteSheet_100, 0x0200, 0x2774
-	obj_tiles gBattleAnimSpriteSheet_101, 0x0200, 0x2775
-	obj_tiles gBattleAnimSpriteSheet_102, 0x0400, 0x2776
-	obj_tiles gBattleAnimSpriteSheet_103, 0x0080, 0x2777
-	obj_tiles gBattleAnimSpriteSheet_104, 0x0400, 0x2778
-	obj_tiles gBattleAnimSpriteSheet_105, 0x0c00, 0x2779
-	obj_tiles gBattleAnimSpriteSheet_106, 0x0200, 0x277a
-	obj_tiles gBattleAnimSpriteSheet_107, 0x1000, 0x277b
-	obj_tiles gBattleAnimSpriteSheet_108, 0x0a00, 0x277c
-	obj_tiles gBattleAnimSpriteSheet_109, 0x0020, 0x277d
-	obj_tiles gBattleAnimSpriteSheet_110, 0x0e00, 0x277e
-	obj_tiles gBattleAnimSpriteSheet_111, 0x0080, 0x277f
-	obj_tiles gBattleAnimSpriteSheet_112, 0x0a00, 0x2780
-	obj_tiles gBattleAnimSpriteSheet_113, 0x0400, 0x2781
-	obj_tiles gBattleAnimSpriteSheet_114, 0x0200, 0x2782
-	obj_tiles gBattleAnimSpriteSheet_115, 0x0700, 0x2783
-	obj_tiles gBattleAnimSpriteSheet_116, 0x0800, 0x2784
-	obj_tiles gBattleAnimSpriteSheet_117, 0x0a00, 0x2785
-	obj_tiles gBattleAnimSpriteSheet_118, 0x0600, 0x2786
-	obj_tiles gBattleAnimSpriteSheet_119, 0x0800, 0x2787
-	obj_tiles gBattleAnimSpriteSheet_120, 0x0200, 0x2788
-	obj_tiles gBattleAnimSpriteSheet_121, 0x0040, 0x2789
-	obj_tiles gBattleAnimSpriteSheet_122, 0x0180, 0x278a
-	obj_tiles gBattleAnimSpriteSheet_123, 0x0600, 0x278b
-	obj_tiles gBattleAnimSpriteSheet_124, 0x0600, 0x278c
-	obj_tiles gBattleAnimSpriteSheet_125, 0x0200, 0x278d
-	obj_tiles gBattleAnimSpriteSheet_126, 0x0080, 0x278e
-	obj_tiles gBattleAnimSpriteSheet_127, 0x0200, 0x278f
-	obj_tiles gBattleAnimSpriteSheet_128, 0x0800, 0x2790
-	obj_tiles gBattleAnimSpriteSheet_129, 0x0080, 0x2791
-	obj_tiles gBattleAnimSpriteSheet_130, 0x0a00, 0x2792
-	obj_tiles gBattleAnimSpriteSheet_131, 0x0280, 0x2793
-	obj_tiles gBattleAnimSpriteSheet_132, 0x0280, 0x2794
-	obj_tiles gBattleAnimSpriteSheet_133, 0x0100, 0x2795
-	obj_tiles gBattleAnimSpriteSheet_134, 0x0200, 0x2796
-	obj_tiles gBattleAnimSpriteSheet_135, 0x0200, 0x2797
-	obj_tiles gBattleAnimSpriteSheet_136, 0x0020, 0x2798
-	obj_tiles gBattleAnimSpriteSheet_137, 0x0a00, 0x2799
-	obj_tiles gBattleAnimSpriteSheet_138, 0x0800, 0x279a
-	obj_tiles gBattleAnimSpriteSheet_139, 0x0800, 0x279b
-	obj_tiles gBattleAnimSpriteSheet_140, 0x00c0, 0x279c
-	obj_tiles gBattleAnimSpriteSheet_141, 0x01c0, 0x279d
-	obj_tiles gBattleAnimSpriteSheet_142, 0x0100, 0x279e
-	obj_tiles gBattleAnimSpriteSheet_143, 0x0800, 0x279f
-	obj_tiles gBattleAnimSpriteSheet_144, 0x0200, 0x27a0
-	obj_tiles gBattleAnimSpriteSheet_145, 0x0800, 0x27a1
-	obj_tiles gBattleAnimSpriteSheet_146, 0x0180, 0x27a2
-	obj_tiles gBattleAnimSpriteSheet_147, 0x0180, 0x27a3
-	obj_tiles gBattleAnimSpriteSheet_148, 0x0200, 0x27a4
-	obj_tiles gBattleAnimSpriteSheet_149, 0x0200, 0x27a5
-	obj_tiles gBattleAnimSpriteSheet_150, 0x0180, 0x27a6
-	obj_tiles gBattleAnimSpriteSheet_151, 0x0400, 0x27a7
-	obj_tiles gBattleAnimSpriteSheet_152, 0x0080, 0x27a8
-	obj_tiles gBattleAnimSpriteSheet_153, 0x0100, 0x27a9
-	obj_tiles gBattleAnimSpriteSheet_154, 0x0100, 0x27aa
-	obj_tiles gBattleAnimSpriteSheet_155, 0x0140, 0x27ab
-	obj_tiles gBattleAnimSpriteSheet_156, 0x0800, 0x27ac
-	obj_tiles gBattleAnimSpriteSheet_157, 0x0200, 0x27ad
-	obj_tiles gBattleAnimSpriteSheet_158, 0x0100, 0x27ae
-	obj_tiles gBattleAnimSpriteSheet_159, 0x00a0, 0x27af
-	obj_tiles gBattleAnimSpriteSheet_160, 0x0100, 0x27b0
-	obj_tiles gBattleAnimSpriteSheet_161, 0x0080, 0x27b1
-	obj_tiles gBattleAnimSpriteSheet_162, 0x0300, 0x27b2
-	obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b3
-	obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b4
-	obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x27b5
-	obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b6
-	obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b7
-	obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b8
-	obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27b9
-	obj_tiles gBattleAnimSpriteSheet_166, 0x0800, 0x27ba
-	obj_tiles gBattleAnimSpriteSheet_171, 0x0080, 0x27bb
-	obj_tiles gBattleAnimSpriteSheet_144, 0x0200, 0x27bc
-	obj_tiles gBattleAnimSpriteSheet_173, 0x0200, 0x27bd
-	obj_tiles gBattleAnimSpriteSheet_174, 0x0200, 0x27be
-	obj_tiles gBattleAnimSpriteSheet_175, 0x0080, 0x27bf
-	obj_tiles gBattleAnimSpriteSheet_176, 0x0200, 0x27c0
-	obj_tiles gBattleAnimSpriteSheet_177, 0x0500, 0x27c1
-	obj_tiles gBattleAnimSpriteSheet_178, 0x0800, 0x27c2
-	obj_tiles gBattleAnimSpriteSheet_179, 0x0400, 0x27c3
-	obj_tiles gBattleAnimSpriteSheet_180, 0x0020, 0x27c4
-	obj_tiles gBattleAnimSpriteSheet_181, 0x0800, 0x27c5
-	obj_tiles gBattleAnimSpriteSheet_182, 0x0100, 0x27c6
-	obj_tiles gBattleAnimSpriteSheet_183, 0x0800, 0x27c7
-	obj_tiles gBattleAnimSpriteSheet_184, 0x0400, 0x27c8
-	obj_tiles gBattleAnimSpriteSheet_185, 0x0a00, 0x27c9
-	obj_tiles gBattleAnimSpriteSheet_186, 0x1000, 0x27ca
-	obj_tiles gBattleAnimSpriteSheet_187, 0x0800, 0x27cb
-	obj_tiles gBattleAnimSpriteSheet_188, 0x0400, 0x27cc
-	obj_tiles gBattleAnimSpriteSheet_189, 0x0200, 0x27cd
-	obj_tiles gBattleAnimSpriteSheet_190, 0x0800, 0x27ce
-	obj_tiles gBattleAnimSpriteSheet_191, 0x0800, 0x27cf
-	obj_tiles gBattleAnimSpriteSheet_192, 0x0800, 0x27d0
-	obj_tiles gBattleAnimSpriteSheet_193, 0x0200, 0x27d1
-	obj_tiles gBattleAnimSpriteSheet_194, 0x0800, 0x27d2
-	obj_tiles gBattleAnimSpriteSheet_195, 0x0200, 0x27d3
-	obj_tiles gBattleAnimSpriteSheet_196, 0x0800, 0x27d4
-	obj_tiles gBattleAnimSpriteSheet_197, 0x0200, 0x27d5
-	obj_tiles gBattleAnimSpriteSheet_198, 0x0800, 0x27d6
-	obj_tiles gBattleAnimSpriteSheet_199, 0x0400, 0x27d7
-	obj_tiles gBattleAnimSpriteSheet_200, 0x0200, 0x27d8
-	obj_tiles gBattleAnimSpriteSheet_201, 0x0a80, 0x27d9
-	obj_tiles gBattleAnimSpriteSheet_202, 0x0600, 0x27da
-	obj_tiles gBattleAnimSpriteSheet_203, 0x0800, 0x27db
-	obj_tiles gBattleAnimSpriteSheet_204, 0x0200, 0x27dc
-	obj_tiles gBattleAnimSpriteSheet_205, 0x0600, 0x27dd
-	obj_tiles gBattleAnimSpriteSheet_206, 0x0800, 0x27de
-	obj_tiles gBattleAnimSpriteSheet_207, 0x0180, 0x27df
-	obj_tiles gBattleAnimSpriteSheet_208, 0x0800, 0x27e0
-	obj_tiles gBattleAnimSpriteSheet_209, 0x0800, 0x27e1
-	obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27e2
-	obj_tiles gBattleAnimSpriteSheet_211, 0x0080, 0x27e3
-	obj_tiles gBattleAnimSpriteSheet_212, 0x0800, 0x27e4
-	obj_tiles gBattleAnimSpriteSheet_213, 0x0800, 0x27e5
-	obj_tiles gBattleAnimSpriteSheet_214, 0x0600, 0x27e6
-	obj_tiles gBattleAnimSpriteSheet_215, 0x0600, 0x27e7
-	obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27e8
-	obj_tiles gBattleAnimSpriteSheet_217, 0x0080, 0x27e9
-	obj_tiles gBattleAnimSpriteSheet_218, 0x0180, 0x27ea
-	obj_tiles gBattleAnimSpriteSheet_210, 0x0080, 0x27eb
-	obj_tiles gBattleAnimSpriteSheet_220, 0x0200, 0x27ec
-	obj_tiles gBattleAnimSpriteSheet_221, 0x0400, 0x27ed
-	obj_tiles gBattleAnimSpriteSheet_222, 0x0a00, 0x27ee
-	obj_tiles gBattleAnimSpriteSheet_223, 0x0800, 0x27ef
-	obj_tiles gBattleAnimSpriteSheet_224, 0x0200, 0x27f0
-	obj_tiles gBattleAnimSpriteSheet_225, 0x0400, 0x27f1
-	obj_tiles gBattleAnimSpriteSheet_226, 0x0080, 0x27f2
-	obj_tiles gBattleAnimSpriteSheet_227, 0x0800, 0x27f3
-	obj_tiles gBattleAnimSpriteSheet_228, 0x0200, 0x27f4
-	obj_tiles gBattleAnimSpriteSheet_229, 0x0300, 0x27f5
-	obj_tiles gBattleAnimSpriteSheet_230, 0x0800, 0x27f6
-	obj_tiles gBattleAnimSpriteSheet_231, 0x0380, 0x27f7
-	obj_tiles gBattleAnimSpriteSheet_232, 0x0800, 0x27f8
-	obj_tiles gBattleAnimSpriteSheet_233, 0x00c0, 0x27f9
-	obj_tiles gBattleAnimSpriteSheet_234, 0x0800, 0x27fa
-	obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fb
-	obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fc
-	obj_tiles gBattleAnimSpriteSheet_235, 0x0060, 0x27fd
-	obj_tiles gBattleAnimSpriteSheet_238, 0x0080, 0x27fe
-	obj_tiles gBattleAnimSpriteSheet_239, 0x0180, 0x27ff
-	obj_tiles gBattleAnimSpriteSheet_240, 0x0180, 0x2800
-	obj_tiles gBattleAnimSpriteSheet_241, 0x0200, 0x2801
-	obj_tiles gBattleAnimSpriteSheet_242, 0x0200, 0x2802
-	obj_tiles gBattleAnimSpriteSheet_243, 0x0020, 0x2803
-	obj_tiles gBattleAnimSpriteSheet_244, 0x0400, 0x2804
-	obj_tiles gBattleAnimSpriteSheet_245, 0x0600, 0x2805
-	obj_tiles gBattleAnimSpriteSheet_246, 0x1000, 0x2806
-	obj_tiles gBattleAnimSpriteSheet_247, 0x0400, 0x2807
-	obj_tiles gBattleAnimSpriteSheet_248, 0x0020, 0x2808
-	obj_tiles gBattleAnimSpriteSheet_249, 0x0080, 0x2809
-	obj_tiles gBattleAnimSpriteSheet_250, 0x0800, 0x280a
-	obj_tiles gBattleAnimSpriteSheet_251, 0x0080, 0x280b
-	obj_tiles gBattleAnimSpriteSheet_252, 0x0200, 0x280c
-	obj_tiles gBattleAnimSpriteSheet_253, 0x0400, 0x280d
-	obj_tiles gBattleAnimSpriteSheet_254, 0x0200, 0x280e
-	obj_tiles gBattleAnimSpriteSheet_255, 0x0200, 0x280f
-	obj_tiles gBattleAnimSpriteSheet_256, 0x0800, 0x2810
-	obj_tiles gBattleAnimSpriteSheet_257, 0x0280, 0x2811
-	obj_tiles gBattleAnimSpriteSheet_258, 0x0200, 0x2812
-	obj_tiles gBattleAnimSpriteSheet_149, 0x0200, 0x2813
-	obj_tiles gBattleAnimSpriteSheet_260, 0x0400, 0x2814
-	obj_tiles gBattleAnimSpriteSheet_261, 0x0200, 0x2815
-	obj_tiles gBattleAnimSpriteSheet_262, 0x0200, 0x2816
-	obj_tiles gBattleAnimSpriteSheet_263, 0x0080, 0x2817
-	obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x2818
-	obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x2819
-	obj_tiles gBattleAnimSpriteSheet_266, 0x0080, 0x281a
-	obj_tiles gBattleAnimSpriteSheet_212, 0x0800, 0x281b
-	obj_tiles gBattleAnimSpriteSheet_264, 0x0020, 0x281c
-	obj_tiles gBattleAnimSpriteSheet_269, 0x0080, 0x281d
-	obj_tiles gBattleAnimSpriteSheet_270, 0x0400, 0x281e
-	obj_tiles gBattleAnimSpriteSheet_271, 0x0080, 0x281f
-	obj_tiles gBattleAnimSpriteSheet_272, 0x0800, 0x2820
-	obj_tiles gBattleAnimSpriteSheet_273, 0x0020, 0x2821
-	obj_tiles gBattleAnimSpriteSheet_274, 0x0800, 0x2822
-	obj_tiles gBattleAnimSpriteSheet_275, 0x0800, 0x2823
-	obj_tiles gBattleAnimSpriteSheet_276, 0x0800, 0x2824
-	obj_tiles gBattleAnimSpriteSheet_277, 0x1000, 0x2825
-	obj_tiles gBattleAnimSpriteSheet_278, 0x0800, 0x2826
-	obj_tiles gBattleAnimSpriteSheet_279, 0x00a0, 0x2827
-	obj_tiles gBattleAnimSpriteSheet_280, 0x0800, 0x2828
-	obj_tiles gBattleAnimSpriteSheet_281, 0x0200, 0x2829
-	obj_tiles gBattleAnimSpriteSheet_282, 0x0600, 0x282a
-	obj_tiles gBattleAnimSpriteSheet_283, 0x0200, 0x282b
-	obj_tiles gBattleAnimSpriteSheet_284, 0x0800, 0x282c
-	obj_tiles gBattleAnimSpriteSheet_285, 0x0200, 0x282d
-	obj_tiles gBattleAnimSpriteSheet_183, 0x0800, 0x282e
-	obj_tiles gBattleAnimSpriteSheet_056, 0x1000, 0x282f
-	obj_tiles gBattleAnimSpriteSheet_163, 0x0100, 0x2830
-
-    .align 2
-gBattleAnimPaletteTable:: @ 852544C
-	obj_pal gBattleAnimSpritePalette_000, 0x2710
-	obj_pal gBattleAnimSpritePalette_001, 0x2711
-	obj_pal gBattleAnimSpritePalette_002, 0x2712
-	obj_pal gBattleAnimSpritePalette_003, 0x2713
-	obj_pal gBattleAnimSpritePalette_004, 0x2714
-	obj_pal gBattleAnimSpritePalette_005, 0x2715
-	obj_pal gBattleAnimSpritePalette_006, 0x2716
-	obj_pal gBattleAnimSpritePalette_007, 0x2717
-	obj_pal gBattleAnimSpritePalette_008, 0x2718
-	obj_pal gBattleAnimSpritePalette_009, 0x2719
-	obj_pal gBattleAnimSpritePalette_010, 0x271a
-	obj_pal gBattleAnimSpritePalette_011, 0x271b
-	obj_pal gBattleAnimSpritePalette_012, 0x271c
-	obj_pal gBattleAnimSpritePalette_013, 0x271d
-	obj_pal gBattleAnimSpritePalette_014, 0x271e
-	obj_pal gBattleAnimSpritePalette_015, 0x271f
-	obj_pal gBattleAnimSpritePalette_016, 0x2720
-	obj_pal gBattleAnimSpritePalette_016, 0x2721
-	obj_pal gBattleAnimSpritePalette_018, 0x2722
-	obj_pal gBattleAnimSpritePalette_019, 0x2723
-	obj_pal gBattleAnimSpritePalette_020, 0x2724
-	obj_pal gBattleAnimSpritePalette_021, 0x2725
-	obj_pal gBattleAnimSpritePalette_022, 0x2726
-	obj_pal gBattleAnimSpritePalette_023, 0x2727
-	obj_pal gBattleAnimSpritePalette_024, 0x2728
-	obj_pal gBattleAnimSpritePalette_025, 0x2729
-	obj_pal gBattleAnimSpritePalette_026, 0x272a
-	obj_pal gBattleAnimSpritePalette_027, 0x272b
-	obj_pal gBattleAnimSpritePalette_028, 0x272c
-	obj_pal gBattleAnimSpritePalette_029, 0x272d
-	obj_pal gBattleAnimSpritePalette_030, 0x272e
-	obj_pal gBattleAnimSpritePalette_031, 0x272f
-	obj_pal gBattleAnimSpritePalette_032, 0x2730
-	obj_pal gBattleAnimSpritePalette_033, 0x2731
-	obj_pal gBattleAnimSpritePalette_033, 0x2732
-	obj_pal gBattleAnimSpritePalette_033, 0x2733
-	obj_pal gBattleAnimSpritePalette_036, 0x2734
-	obj_pal gBattleAnimSpritePalette_036, 0x2735
-	obj_pal gBattleAnimSpritePalette_038, 0x2736
-	obj_pal gBattleAnimSpritePalette_039, 0x2737
-	obj_pal gBattleAnimSpritePalette_038, 0x2738
-	obj_pal gBattleAnimSpritePalette_038, 0x2739
-	obj_pal gBattleAnimSpritePalette_042, 0x273a
-	obj_pal gBattleAnimSpritePalette_043, 0x273b
-	obj_pal gBattleAnimSpritePalette_044, 0x273c
-	obj_pal gBattleAnimSpritePalette_045, 0x273d
-	obj_pal gBattleAnimSpritePalette_046, 0x273e
-	obj_pal gBattleAnimSpritePalette_047, 0x273e
-	obj_pal gBattleAnimSpritePalette_048, 0x2740
-	obj_pal gBattleAnimSpritePalette_049, 0x2741
-	obj_pal gBattleAnimSpritePalette_050, 0x2742
-	obj_pal gBattleAnimSpritePalette_050, 0x2743
-	obj_pal gBattleAnimSpritePalette_050, 0x2744
-	obj_pal gBattleAnimSpritePalette_026, 0x2745
-	obj_pal gBattleAnimSpritePalette_054, 0x2746
-	obj_pal gBattleAnimSpritePalette_050, 0x2747
-	obj_pal gBattleAnimSpritePalette_056, 0x2748
-	obj_pal gBattleAnimSpritePalette_057, 0x2749
-	obj_pal gBattleAnimSpritePalette_058, 0x274a
-	obj_pal gBattleAnimSpritePalette_059, 0x274b
-	obj_pal gBattleAnimSpritePalette_060, 0x274c
-	obj_pal gBattleAnimSpritePalette_061, 0x274d
-	obj_pal gBattleAnimSpritePalette_062, 0x274e
-	obj_pal gBattleAnimSpritePalette_063, 0x274f
-	obj_pal gBattleAnimSpritePalette_064, 0x2750
-	obj_pal gBattleAnimSpritePalette_065, 0x2751
-	obj_pal gBattleAnimSpritePalette_066, 0x2752
-	obj_pal gBattleAnimSpritePalette_067, 0x2753
-	obj_pal gBattleAnimSpritePalette_068, 0x2754
-	obj_pal gBattleAnimSpritePalette_065, 0x2755
-	obj_pal gBattleAnimSpritePalette_070, 0x2756
-	obj_pal gBattleAnimSpritePalette_070, 0x2757
-	obj_pal gBattleAnimSpritePalette_072, 0x2758
-	obj_pal gBattleAnimSpritePalette_073, 0x2759
-	obj_pal gBattleAnimSpritePalette_074, 0x275a
-	obj_pal gBattleAnimSpritePalette_075, 0x275b
-	obj_pal gBattleAnimSpritePalette_076, 0x275c
-	obj_pal gBattleAnimSpritePalette_076, 0x275d
-	obj_pal gBattleAnimSpritePalette_078, 0x275e
-	obj_pal gBattleAnimSpritePalette_078, 0x275f
-	obj_pal gBattleAnimSpritePalette_080, 0x2760
-	obj_pal gBattleAnimSpritePalette_081, 0x2761
-	obj_pal gBattleAnimSpritePalette_082, 0x2762
-	obj_pal gBattleAnimSpritePalette_083, 0x2763
-	obj_pal gBattleAnimSpritePalette_084, 0x2764
-	obj_pal gBattleAnimSpritePalette_085, 0x2765
-	obj_pal gBattleAnimSpritePalette_086, 0x2766
-	obj_pal gBattleAnimSpritePalette_087, 0x2767
-	obj_pal gBattleAnimSpritePalette_088, 0x2768
-	obj_pal gBattleAnimSpritePalette_089, 0x2769
-	obj_pal gBattleAnimSpritePalette_090, 0x276a
-	obj_pal gBattleAnimSpritePalette_091, 0x276b
-	obj_pal gBattleAnimSpritePalette_092, 0x276c
-	obj_pal gBattleAnimSpritePalette_093, 0x276d
-	obj_pal gBattleAnimSpritePalette_094, 0x276e
-	obj_pal gBattleAnimSpritePalette_095, 0x276f
-	obj_pal gBattleAnimSpritePalette_096, 0x2770
-	obj_pal gBattleAnimSpritePalette_097, 0x2771
-	obj_pal gBattleAnimSpritePalette_094, 0x2772
-	obj_pal gBattleAnimSpritePalette_099, 0x2773
-	obj_pal gBattleAnimSpritePalette_100, 0x2774
-	obj_pal gBattleAnimSpritePalette_101, 0x2775
-	obj_pal gBattleAnimSpritePalette_101, 0x2776
-	obj_pal gBattleAnimSpritePalette_103, 0x2777
-	obj_pal gBattleAnimSpritePalette_104, 0x2778
-	obj_pal gBattleAnimSpritePalette_105, 0x2779
-	obj_pal gBattleAnimSpritePalette_105, 0x277a
-	obj_pal gBattleAnimSpritePalette_107, 0x277b
-	obj_pal gBattleAnimSpritePalette_107, 0x277c
-	obj_pal gBattleAnimSpritePalette_109, 0x277d
-	obj_pal gBattleAnimSpritePalette_109, 0x277e
-	obj_pal gBattleAnimSpritePalette_111, 0x277f
-	obj_pal gBattleAnimSpritePalette_112, 0x2780
-	obj_pal gBattleAnimSpritePalette_113, 0x2781
-	obj_pal gBattleAnimSpritePalette_114, 0x2782
-	obj_pal gBattleAnimSpritePalette_115, 0x2783
-	obj_pal gBattleAnimSpritePalette_116, 0x2784
-	obj_pal gBattleAnimSpritePalette_117, 0x2785
-	obj_pal gBattleAnimSpritePalette_118, 0x2786
-	obj_pal gBattleAnimSpritePalette_119, 0x2787
-	obj_pal gBattleAnimSpritePalette_120, 0x2788
-	obj_pal gBattleAnimSpritePalette_121, 0x2789
-	obj_pal gBattleAnimSpritePalette_122, 0x278a
-	obj_pal gBattleAnimSpritePalette_122, 0x278b
-	obj_pal gBattleAnimSpritePalette_124, 0x278c
-	obj_pal gBattleAnimSpritePalette_125, 0x278d
-	obj_pal gBattleAnimSpritePalette_126, 0x278e
-	obj_pal gBattleAnimSpritePalette_127, 0x278f
-	obj_pal gBattleAnimSpritePalette_128, 0x2790
-	obj_pal gBattleAnimSpritePalette_128, 0x2791
-	obj_pal gBattleAnimSpritePalette_130, 0x2792
-	obj_pal gBattleAnimSpritePalette_130, 0x2793
-	obj_pal gBattleAnimSpritePalette_132, 0x2794
-	obj_pal gBattleAnimSpritePalette_133, 0x2795
-	obj_pal gBattleAnimSpritePalette_133, 0x2796
-	obj_pal gBattleAnimSpritePalette_135, 0x2797
-	obj_pal gBattleAnimSpritePalette_136, 0x2798
-	obj_pal gBattleAnimSpritePalette_135, 0x2799
-	obj_pal gBattleAnimSpritePalette_135, 0x279a
-	obj_pal gBattleAnimSpritePalette_139, 0x279b
-	obj_pal gBattleAnimSpritePalette_140, 0x279c
-	obj_pal gBattleAnimSpritePalette_141, 0x279d
-	obj_pal gBattleAnimSpritePalette_141, 0x279e
-	obj_pal gBattleAnimSpritePalette_143, 0x279f
-	obj_pal gBattleAnimSpritePalette_144, 0x27a0
-	obj_pal gBattleAnimSpritePalette_139, 0x27a1
-	obj_pal gBattleAnimSpritePalette_115, 0x27a2
-	obj_pal gBattleAnimSpritePalette_147, 0x27a3
-	obj_pal gBattleAnimSpritePalette_148, 0x27a4
-	obj_pal gBattleAnimSpritePalette_148, 0x27a5
-	obj_pal gBattleAnimSpritePalette_150, 0x27a6
-	obj_pal gBattleAnimSpritePalette_150, 0x27a7
-	obj_pal gBattleAnimSpritePalette_152, 0x27a8
-	obj_pal gBattleAnimSpritePalette_153, 0x27a9
-	obj_pal gBattleAnimSpritePalette_154, 0x27aa
-	obj_pal gBattleAnimSpritePalette_155, 0x27ab
-	obj_pal gBattleAnimSpritePalette_156, 0x27ac
-	obj_pal gBattleAnimSpritePalette_157, 0x27ad
-	obj_pal gBattleAnimSpritePalette_158, 0x27ae
-	obj_pal gBattleAnimSpritePalette_159, 0x27af
-	obj_pal gBattleAnimSpritePalette_160, 0x27b0
-	obj_pal gBattleAnimSpritePalette_161, 0x27b1
-	obj_pal gBattleAnimSpritePalette_162, 0x27b2
-	obj_pal gBattleAnimSpritePalette_163, 0x27b3
-	obj_pal gBattleAnimSpritePalette_164, 0x27b4
-	obj_pal gBattleAnimSpritePalette_165, 0x27b5
-	obj_pal gBattleAnimSpritePalette_166, 0x27b6
-	obj_pal gBattleAnimSpritePalette_167, 0x27b7
-	obj_pal gBattleAnimSpritePalette_168, 0x27b8
-	obj_pal gBattleAnimSpritePalette_169, 0x27b9
-	obj_pal gBattleAnimSpritePalette_170, 0x27ba
-	obj_pal gBattleAnimSpritePalette_171, 0x27bb
-	obj_pal gBattleAnimSpritePalette_172, 0x27bc
-	obj_pal gBattleAnimSpritePalette_001, 0x27bd
-	obj_pal gBattleAnimSpritePalette_174, 0x27be
-	obj_pal gBattleAnimSpritePalette_175, 0x27bf
-	obj_pal gBattleAnimSpritePalette_176, 0x27c0
-	obj_pal gBattleAnimSpritePalette_177, 0x27c1
-	obj_pal gBattleAnimSpritePalette_178, 0x27c2
-	obj_pal gBattleAnimSpritePalette_179, 0x27c3
-	obj_pal gBattleAnimSpritePalette_179, 0x27c4
-	obj_pal gBattleAnimSpritePalette_179, 0x27c5
-	obj_pal gBattleAnimSpritePalette_182, 0x27c6
-	obj_pal gBattleAnimSpritePalette_183, 0x27c7
-	obj_pal gBattleAnimSpritePalette_184, 0x27c8
-	obj_pal gBattleAnimSpritePalette_185, 0x27c9
-	obj_pal gBattleAnimSpritePalette_186, 0x27ca
-	obj_pal gBattleAnimSpritePalette_187, 0x27cb
-	obj_pal gBattleAnimSpritePalette_188, 0x27cc
-	obj_pal gBattleAnimSpritePalette_189, 0x27cd
-	obj_pal gBattleAnimSpritePalette_190, 0x27ce
-	obj_pal gBattleAnimSpritePalette_191, 0x27cf
-	obj_pal gBattleAnimSpritePalette_192, 0x27d0
-	obj_pal gBattleAnimSpritePalette_193, 0x27d1
-	obj_pal gBattleAnimSpritePalette_194, 0x27d2
-	obj_pal gBattleAnimSpritePalette_195, 0x27d3
-	obj_pal gBattleAnimSpritePalette_196, 0x27d4
-	obj_pal gBattleAnimSpritePalette_197, 0x27d5
-	obj_pal gBattleAnimSpritePalette_198, 0x27d6
-	obj_pal gBattleAnimSpritePalette_199, 0x27d7
-	obj_pal gBattleAnimSpritePalette_200, 0x27d8
-	obj_pal gBattleAnimSpritePalette_201, 0x27d9
-	obj_pal gBattleAnimSpritePalette_202, 0x27da
-	obj_pal gBattleAnimSpritePalette_203, 0x27db
-	obj_pal gBattleAnimSpritePalette_204, 0x27dc
-	obj_pal gBattleAnimSpritePalette_205, 0x27dd
-	obj_pal gBattleAnimSpritePalette_206, 0x27de
-	obj_pal gBattleAnimSpritePalette_207, 0x27df
-	obj_pal gBattleAnimSpritePalette_167, 0x27e0
-	obj_pal gBattleAnimSpritePalette_209, 0x27e1
-	obj_pal gBattleAnimSpritePalette_210, 0x27e2
-	obj_pal gBattleAnimSpritePalette_211, 0x27e3
-	obj_pal gBattleAnimSpritePalette_211, 0x27e4
-	obj_pal gBattleAnimSpritePalette_211, 0x27e5
-	obj_pal gBattleAnimSpritePalette_064, 0x27e6
-	obj_pal gBattleAnimSpritePalette_215, 0x27e7
-	obj_pal gBattleAnimSpritePalette_216, 0x27e8
-	obj_pal gBattleAnimSpritePalette_217, 0x27e9
-	obj_pal gBattleAnimSpritePalette_218, 0x27ea
-	obj_pal gBattleAnimSpritePalette_219, 0x27eb
-	obj_pal gBattleAnimSpritePalette_220, 0x27ec
-	obj_pal gBattleAnimSpritePalette_221, 0x27ed
-	obj_pal gBattleAnimSpritePalette_222, 0x27ee
-	obj_pal gBattleAnimSpritePalette_223, 0x27ef
-	obj_pal gBattleAnimSpritePalette_224, 0x27f0
-	obj_pal gBattleAnimSpritePalette_225, 0x27f1
-	obj_pal gBattleAnimSpritePalette_226, 0x27f2
-	obj_pal gBattleAnimSpritePalette_226, 0x27f3
-	obj_pal gBattleAnimSpritePalette_228, 0x27f4
-	obj_pal gBattleAnimSpritePalette_229, 0x27f5
-	obj_pal gBattleAnimSpritePalette_230, 0x27f6
-	obj_pal gBattleAnimSpritePalette_231, 0x27f7
-	obj_pal gBattleAnimSpritePalette_231, 0x27f8
-	obj_pal gBattleAnimSpritePalette_233, 0x27f9
-	obj_pal gBattleAnimSpritePalette_234, 0x27fa
-	obj_pal gBattleAnimSpritePalette_235, 0x27fb
-	obj_pal gBattleAnimSpritePalette_236, 0x27fc
-	obj_pal gBattleAnimSpritePalette_237, 0x27fd
-	obj_pal gBattleAnimSpritePalette_238, 0x27fe
-	obj_pal gBattleAnimSpritePalette_239, 0x27ff
-	obj_pal gBattleAnimSpritePalette_240, 0x2800
-	obj_pal gBattleAnimSpritePalette_241, 0x2801
-	obj_pal gBattleAnimSpritePalette_242, 0x2802
-	obj_pal gBattleAnimSpritePalette_243, 0x2803
-	obj_pal gBattleAnimSpritePalette_244, 0x2804
-	obj_pal gBattleAnimSpritePalette_245, 0x2805
-	obj_pal gBattleAnimSpritePalette_245, 0x2806
-	obj_pal gBattleAnimSpritePalette_064, 0x2807
-	obj_pal gBattleAnimSpritePalette_248, 0x2808
-	obj_pal gBattleAnimSpritePalette_249, 0x2809
-	obj_pal gBattleAnimSpritePalette_249, 0x280a
-	obj_pal gBattleAnimSpritePalette_251, 0x280b
-	obj_pal gBattleAnimSpritePalette_252, 0x280c
-	obj_pal gBattleAnimSpritePalette_253, 0x280d
-	obj_pal gBattleAnimSpritePalette_254, 0x280e
-	obj_pal gBattleAnimSpritePalette_255, 0x280f
-	obj_pal gBattleAnimSpritePalette_256, 0x2810
-	obj_pal gBattleAnimSpritePalette_257, 0x2811
-	obj_pal gBattleAnimSpritePalette_258, 0x2812
-	obj_pal gBattleAnimSpritePalette_259, 0x2813
-	obj_pal gBattleAnimSpritePalette_260, 0x2814
-	obj_pal gBattleAnimSpritePalette_261, 0x2815
-	obj_pal gBattleAnimSpritePalette_262, 0x2816
-	obj_pal gBattleAnimSpritePalette_263, 0x2817
-	obj_pal gBattleAnimSpritePalette_264, 0x2818
-	obj_pal gBattleAnimSpritePalette_265, 0x2819
-	obj_pal gBattleAnimSpritePalette_266, 0x281a
-	obj_pal gBattleAnimSpritePalette_267, 0x281b
-	obj_pal gBattleAnimSpritePalette_268, 0x281c
-	obj_pal gBattleAnimSpritePalette_269, 0x281d
-	obj_pal gBattleAnimSpritePalette_270, 0x281e
-	obj_pal gBattleAnimSpritePalette_271, 0x281f
-	obj_pal gBattleAnimSpritePalette_272, 0x2820
-	obj_pal gBattleAnimSpritePalette_272, 0x2821
-	obj_pal gBattleAnimSpritePalette_274, 0x2822
-	obj_pal gBattleAnimSpritePalette_274, 0x2823
-	obj_pal gBattleAnimSpritePalette_274, 0x2824
-	obj_pal gBattleAnimSpritePalette_277, 0x2825
-	obj_pal gBattleAnimSpritePalette_278, 0x2826
-	obj_pal gBattleAnimSpritePalette_279, 0x2827
-	obj_pal gBattleAnimSpritePalette_280, 0x2828
-	obj_pal gBattleAnimSpritePalette_281, 0x2829
-	obj_pal gBattleAnimSpritePalette_282, 0x282a
-	obj_pal gBattleAnimSpritePalette_283, 0x282b
-	obj_pal gBattleAnimSpritePalette_284, 0x282c
-	obj_pal gBattleAnimSpritePalette_285, 0x282d
-	obj_pal gBattleAnimSpritePalette_286, 0x282e
-	obj_pal gBattleAnimSpritePalette_287, 0x282f
-	obj_pal gBattleAnimSpritePalette_288, 0x2830
-
-    .align 2
-gBattleAnimBackgroundTable:: @ 8525D54
-	.4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00
-	.4byte gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00
-	.4byte gBattleAnimBackgroundImage_02, gBattleAnimBackgroundPalette_02, gBattleAnimBackgroundTilemap_02
-	.4byte gBattleAnimBackgroundImage_03, gBattleAnimBackgroundPalette_03, gBattleAnimBackgroundTilemap_03
-	.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_04
-	.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_05
-	.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_06
-	.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_07
-	.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_08
-	.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_09
-	.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_10
-	.4byte gBattleAnimBackgroundImage_11, gBattleAnimBackgroundPalette_11, gBattleAnimBackgroundTilemap_11
-	.4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_12
-	.4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_13
-	.4byte gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_14
-	.4byte gBattleAnimBackgroundImage_15, gBattleAnimBackgroundPalette_15, gBattleAnimBackgroundTilemap_15
-	.4byte gBattleAnimBackgroundImage_16, gBattleAnimBackgroundPalette_16, gBattleAnimBackgroundTilemap_16
-	.4byte gBattleAnimBackgroundImage_17, gBattleAnimBackgroundPalette_17, gBattleAnimBackgroundTilemap_17
-	.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_07
-	.4byte gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_08
-	.4byte gBattleAnimBackgroundImage_20, gBattleAnimBackgroundPalette_20, gBattleAnimBackgroundTilemap_20
-	.4byte gBattleAnimBackgroundImage_21, gBattleAnimBackgroundPalette_21, gBattleAnimBackgroundTilemap_21
-	.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_09
-	.4byte gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_10
-	.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_04
-	.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05
-	.4byte gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06
-

data/battle_frontier/battle_arena_move_mind_ratings.inc

@@ -1,357 +0,0 @@
-	.align 2
-gBattleArenaMoveMindRatings:: @ 8611DC0
-	.byte  0 @ -
-	.byte  1 @ Pound
-	.byte  1 @ Karate Chop
-	.byte  1 @ Double Slap
-	.byte  1 @ Comet Punch
-	.byte  1 @ Mega Punch
-	.byte  1 @ Pay Day
-	.byte  1 @ Fire Punch
-	.byte  1 @ Ice Punch
-	.byte  1 @ Thunder Punch
-	.byte  1 @ Scratch
-	.byte  1 @ Vice Grip
-	.byte  1 @ Guillotine
-	.byte  1 @ Razor Wind
-	.byte  0 @ Swords Dance
-	.byte  1 @ Cut
-	.byte  1 @ Gust
-	.byte  1 @ Wing Attack
-	.byte  0 @ Whirlwind
-	.byte  1 @ Fly
-	.byte  1 @ Bind
-	.byte  1 @ Slam
-	.byte  1 @ Vine Whip
-	.byte  1 @ Stomp
-	.byte  1 @ Double Kick
-	.byte  1 @ Mega Kick
-	.byte  1 @ Jump Kick
-	.byte  1 @ Rolling Kick
-	.byte  0 @ Sand-Attack
-	.byte  1 @ Headbutt
-	.byte  1 @ Horn Attack
-	.byte  1 @ Fury Attack
-	.byte  1 @ Horn Drill
-	.byte  1 @ Tackle
-	.byte  1 @ Body Slam
-	.byte  1 @ Wrap
-	.byte  1 @ Take Down
-	.byte  1 @ Thrash
-	.byte  1 @ Double-Edge
-	.byte  0 @ Tail Whip
-	.byte  1 @ Poison Sting
-	.byte  1 @ Twineedle
-	.byte  1 @ Pin Missile
-	.byte  0 @ Leer
-	.byte  1 @ Bite
-	.byte  0 @ Growl
-	.byte  0 @ Roar
-	.byte  0 @ Sing
-	.byte  0 @ Supersonic
-	.byte  1 @ Sonic Boom
-	.byte  0 @ Disable
-	.byte  1 @ Acid
-	.byte  1 @ Ember
-	.byte  1 @ Flamethrower
-	.byte  0 @ Mist
-	.byte  1 @ Water Gun
-	.byte  1 @ Hydro Pump
-	.byte  1 @ Surf
-	.byte  1 @ Ice Beam
-	.byte  1 @ Blizzard
-	.byte  1 @ Psybeam
-	.byte  1 @ Bubble Beam
-	.byte  1 @ Aurora Beam
-	.byte  1 @ Hyper Beam
-	.byte  1 @ Peck
-	.byte  1 @ Drill Peck
-	.byte  1 @ Submission
-	.byte  1 @ Low Kick
-	.byte  0 @ Counter
-	.byte  1 @ Seismic Toss
-	.byte  1 @ Strength
-	.byte  1 @ Absorb
-	.byte  1 @ Mega Drain
-	.byte  0 @ Leech Seed
-	.byte  0 @ Growth
-	.byte  1 @ Razor Leaf
-	.byte  1 @ Solar Beam
-	.byte  0 @ Poison Powder
-	.byte  0 @ Stun Spore
-	.byte  0 @ Sleep Powder
-	.byte  1 @ Petal Dance
-	.byte  0 @ String Shot
-	.byte  1 @ Dragon Rage
-	.byte  1 @ Fire Spin
-	.byte  1 @ Thunder Shock
-	.byte  1 @ Thunderbolt
-	.byte  0 @ Thunder Wave
-	.byte  1 @ Thunder
-	.byte  1 @ Rock Throw
-	.byte  1 @ Earthquake
-	.byte  1 @ Fissure
-	.byte  1 @ Dig
-	.byte  0 @ Toxic
-	.byte  1 @ Confusion
-	.byte  1 @ Psychic
-	.byte  0 @ Hypnosis
-	.byte  0 @ Meditate
-	.byte  0 @ Agility
-	.byte  1 @ Quick Attack
-	.byte  1 @ Rage
-	.byte  0 @ Teleport
-	.byte  1 @ Night Shade
-	.byte  0 @ Mimic
-	.byte  0 @ Screech
-	.byte  0 @ Double Team
-	.byte  0 @ Recover
-	.byte  0 @ Harden
-	.byte  0 @ Minimize
-	.byte  0 @ Smokescreen
-	.byte  0 @ Confuse Ray
-	.byte  0 @ Withdraw
-	.byte  0 @ Defense Curl
-	.byte  0 @ Barrier
-	.byte  0 @ Light Screen
-	.byte  0 @ Haze
-	.byte  0 @ Reflect
-	.byte  0 @ Focus Energy
-	.byte  0 @ Bide
-	.byte  0 @ Metronome
-	.byte  0 @ Mirror Move
-	.byte  1 @ Self-Destruct
-	.byte  1 @ Egg Bomb
-	.byte  1 @ Lick
-	.byte  1 @ Smog
-	.byte  1 @ Sludge
-	.byte  1 @ Bone Club
-	.byte  1 @ Fire Blast
-	.byte  1 @ Waterfall
-	.byte  1 @ Clamp
-	.byte  1 @ Swift
-	.byte  1 @ Skull Bash
-	.byte  1 @ Spike Cannon
-	.byte  1 @ Constrict
-	.byte  0 @ Amnesia
-	.byte  0 @ Kinesis
-	.byte  0 @ Soft-Boiled
-	.byte  1 @ Hi Jump Kick
-	.byte  0 @ Glare
-	.byte  1 @ Dream Eater
-	.byte  0 @ Poison Gas
-	.byte  1 @ Barrage
-	.byte  1 @ Leech Life
-	.byte  0 @ Lovely Kiss
-	.byte  1 @ Sky Attack
-	.byte  0 @ Transform
-	.byte  1 @ Bubble
-	.byte  1 @ Dizzy Punch
-	.byte  0 @ Spore
-	.byte  0 @ Flash
-	.byte  1 @ Psywave
-	.byte  0 @ Splash
-	.byte  0 @ Acid Armor
-	.byte  1 @ Crabhammer
-	.byte  1 @ Explosion
-	.byte  1 @ Fury Swipes
-	.byte  1 @ Bonemerang
-	.byte  0 @ Rest
-	.byte  1 @ Rock Slide
-	.byte  1 @ Hyper Fang
-	.byte  0 @ Sharpen
-	.byte  0 @ Conversion
-	.byte  1 @ Tri Attack
-	.byte  1 @ Super Fang
-	.byte  1 @ Slash
-	.byte  0 @ Substitute
-	.byte  1 @ Struggle
-	.byte  0 @ Sketch
-	.byte  1 @ Triple Kick
-	.byte  1 @ Thief
-	.byte  0 @ Spider Web
-	.byte  0 @ Mind Reader
-	.byte  0 @ Nightmare
-	.byte  1 @ Flame Wheel
-	.byte  1 @ Snore
-	.byte  0 @ Curse
-	.byte  1 @ Flail
-	.byte  0 @ Conversion 2
-	.byte  1 @ Aeroblast
-	.byte  0 @ Cotton Spore
-	.byte  1 @ Reversal
-	.byte  0 @ Spite
-	.byte  1 @ Powder Snow
-	.byte -1 @ Protect
-	.byte  1 @ Mach Punch
-	.byte  0 @ Scary Face
-	.byte  1 @ Faint Attack
-	.byte  0 @ Sweet Kiss
-	.byte  0 @ Belly Drum
-	.byte  1 @ Sludge Bomb
-	.byte  1 @ Mud-Slap
-	.byte  1 @ Octazooka
-	.byte  0 @ Spikes
-	.byte  1 @ Zap Cannon
-	.byte  0 @ Foresight
-	.byte  0 @ Destiny Bond
-	.byte  0 @ Perish Song
-	.byte  1 @ Icy Wind
-	.byte -1 @ Detect
-	.byte  1 @ Bone Rush
-	.byte  0 @ Lock-On
-	.byte  1 @ Outrage
-	.byte  0 @ Sandstorm
-	.byte  1 @ Giga Drain
-	.byte -1 @ Endure
-	.byte  0 @ Charm
-	.byte  1 @ Rollout
-	.byte  1 @ False Swipe
-	.byte  0 @ Swagger
-	.byte  0 @ Milk Drink
-	.byte  1 @ Spark
-	.byte  1 @ Fury Cutter
-	.byte  1 @ Steel Wing
-	.byte  0 @ Mean Look
-	.byte  0 @ Attract
-	.byte  0 @ Sleep Talk
-	.byte  0 @ Heal Bell
-	.byte  1 @ Return
-	.byte  1 @ Present
-	.byte  1 @ Frustration
-	.byte  0 @ Safeguard
-	.byte  0 @ Pain Split
-	.byte  1 @ Sacred Fire
-	.byte  1 @ Magnitude
-	.byte  1 @ Dynamic Punch
-	.byte  1 @ Megahorn
-	.byte  1 @ Dragon Breath
-	.byte  0 @ Baton Pass
-	.byte  0 @ Encore
-	.byte  1 @ Pursuit
-	.byte  1 @ Rapid Spin
-	.byte  0 @ Sweet Scent
-	.byte  1 @ Iron Tail
-	.byte  1 @ Metal Claw
-	.byte  1 @ Vital Throw
-	.byte  0 @ Morning Sun
-	.byte  0 @ Synthesis
-	.byte  0 @ Moonlight
-	.byte  1 @ Hidden Power
-	.byte  1 @ Cross Chop
-	.byte  1 @ Twister
-	.byte  0 @ Rain Dance
-	.byte  0 @ Sunny Day
-	.byte  1 @ Crunch
-	.byte  0 @ Mirror Coat
-	.byte  0 @ Psych Up
-	.byte  1 @ Extreme Speed
-	.byte  1 @ Ancient Power
-	.byte  1 @ Shadow Ball
-	.byte  1 @ Future Sight
-	.byte  1 @ Rock Smash
-	.byte  1 @ Whirlpool
-	.byte  1 @ Beat Up
-	.byte -1 @ Fake Out
-	.byte  1 @ Uproar
-	.byte  0 @ Stockpile
-	.byte  1 @ Spit Up
-	.byte  0 @ Swallow
-	.byte  1 @ Heat Wave
-	.byte  0 @ Hail
-	.byte  0 @ Torment
-	.byte  0 @ Flatter
-	.byte  0 @ Will-O-Wisp
-	.byte  0 @ Memento
-	.byte  1 @ Facade
-	.byte  1 @ Focus Punch
-	.byte  1 @ Smelling Salt
-	.byte  0 @ Follow Me
-	.byte  0 @ Nature Power
-	.byte  0 @ Charge
-	.byte  0 @ Taunt
-	.byte  0 @ Helping Hand
-	.byte  0 @ Trick
-	.byte  0 @ Role Play
-	.byte  0 @ Wish
-	.byte  0 @ Assist
-	.byte  0 @ Ingrain
-	.byte  1 @ Superpower
-	.byte  0 @ Magic Coat
-	.byte  0 @ Recycle
-	.byte  1 @ Revenge
-	.byte  1 @ Brick Break
-	.byte  0 @ Yawn
-	.byte  1 @ Knock Off
-	.byte  1 @ Endeavor
-	.byte  1 @ Eruption
-	.byte  0 @ Skill Swap
-	.byte  0 @ Imprison
-	.byte  0 @ Refresh
-	.byte  0 @ Grudge
-	.byte  0 @ Snatch
-	.byte  1 @ Secret Power
-	.byte  1 @ Dive
-	.byte  1 @ Arm Thrust
-	.byte  0 @ Camouflage
-	.byte  0 @ Tail Glow
-	.byte  1 @ Luster Purge
-	.byte  1 @ Mist Ball
-	.byte  0 @ Feather Dance
-	.byte  0 @ Teeter Dance
-	.byte  1 @ Blaze Kick
-	.byte  0 @ Mud Sport
-	.byte  1 @ Ice Ball
-	.byte  1 @ Needle Arm
-	.byte  0 @ Slack Off
-	.byte  1 @ Hyper Voice
-	.byte  1 @ Poison Fang
-	.byte  1 @ Crush Claw
-	.byte  1 @ Blast Burn
-	.byte  1 @ Hydro Cannon
-	.byte  1 @ Meteor Mash
-	.byte  1 @ Astonish
-	.byte  1 @ Weather Ball
-	.byte  0 @ Aromatherapy
-	.byte  0 @ Fake Tears
-	.byte  1 @ Air Cutter
-	.byte  1 @ Overheat
-	.byte  0 @ Odor Sleuth
-	.byte  1 @ Rock Tomb
-	.byte  1 @ Silver Wind
-	.byte  0 @ Metal Sound
-	.byte  0 @ Grass Whistle
-	.byte  0 @ Tickle
-	.byte  0 @ Cosmic Power
-	.byte  1 @ Water Spout
-	.byte  1 @ Signal Beam
-	.byte  1 @ Shadow Punch
-	.byte  1 @ Extrasensory
-	.byte  1 @ Sky Uppercut
-	.byte  1 @ Sand Tomb
-	.byte  1 @ Sheer Cold
-	.byte  1 @ Muddy Water
-	.byte  1 @ Bullet Seed
-	.byte  1 @ Aerial Ace
-	.byte  1 @ Icicle Spear
-	.byte  0 @ Iron Defense
-	.byte  0 @ Block
-	.byte  0 @ Howl
-	.byte  1 @ Dragon Claw
-	.byte  1 @ Frenzy Plant
-	.byte  0 @ Bulk Up
-	.byte  1 @ Bounce
-	.byte  1 @ Mud Shot
-	.byte  1 @ Poison Tail
-	.byte  1 @ Covet
-	.byte  1 @ Volt Tackle
-	.byte  1 @ Magical Leaf
-	.byte  0 @ Water Sport
-	.byte  0 @ Calm Mind
-	.byte  1 @ Leaf Blade
-	.byte  0 @ Dragon Dance
-	.byte  1 @ Rock Blast
-	.byte  1 @ Shock Wave
-	.byte  1 @ Water Pulse
-	.byte  1 @ Doom Desire
-	.byte  1 @ Psycho Boost

data/battle_frontier/battle_factory_style_move_lists.inc

@@ -1,191 +0,0 @@
-	.align 2
-gBattleFactoryStyleRequiredMoveCounts:: @ 8611FC0
-	.byte 3
-	.byte 3
-	.byte 3
-	.byte 2
-	.byte 2
-	.byte 2
-	.byte 2
-
-	.align 2
-gBattleFactoryStyleMoveList_TotalPreparation:: @ 8611FC8
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_GROWTH
-	.2byte MOVE_MEDITATE
-	.2byte MOVE_AGILITY
-	.2byte MOVE_DOUBLE_TEAM
-	.2byte MOVE_HARDEN
-	.2byte MOVE_MINIMIZE
-	.2byte MOVE_WITHDRAW
-	.2byte MOVE_DEFENSE_CURL
-	.2byte MOVE_BARRIER
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_ACID_ARMOR
-	.2byte MOVE_SHARPEN
-	.2byte MOVE_CONVERSION
-	.2byte MOVE_CONVERSION_2
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_CHARGE
-	.2byte MOVE_SNATCH
-	.2byte MOVE_TAIL_GLOW
-	.2byte MOVE_COSMIC_POWER
-	.2byte MOVE_IRON_DEFENSE
-	.2byte MOVE_HOWL
-	.2byte MOVE_BULK_UP
-	.2byte MOVE_CALM_MIND
-	.2byte MOVE_DRAGON_DANCE
-	.2byte 0
-
-gBattleFactoryStyleMoveList_ImpossibleToPredict:: @ 8612000
-	.2byte MOVE_MIMIC
-	.2byte MOVE_METRONOME
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_TRANSFORM
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_SKETCH
-	.2byte MOVE_CURSE
-	.2byte MOVE_PRESENT
-	.2byte MOVE_FOLLOW_ME
-	.2byte MOVE_TRICK
-	.2byte MOVE_ROLE_PLAY
-	.2byte MOVE_ASSIST
-	.2byte MOVE_SKILL_SWAP
-	.2byte MOVE_CAMOUFLAGE
-	.2byte 0
-
-gBattleFactoryStyleMoveList_WeakeningTheFoe:: @ 861201E
-	.2byte MOVE_SAND_ATTACK
-	.2byte MOVE_TAIL_WHIP
-	.2byte MOVE_LEER
-	.2byte MOVE_GROWL
-	.2byte MOVE_STRING_SHOT
-	.2byte MOVE_SCREECH
-	.2byte MOVE_SMOKESCREEN
-	.2byte MOVE_KINESIS
-	.2byte MOVE_FLASH
-	.2byte MOVE_COTTON_SPORE
-	.2byte MOVE_SPITE
-	.2byte MOVE_SCARY_FACE
-	.2byte MOVE_CHARM
-	.2byte MOVE_KNOCK_OFF
-	.2byte MOVE_SWEET_SCENT
-	.2byte MOVE_FEATHER_DANCE
-	.2byte MOVE_FAKE_TEARS
-	.2byte MOVE_METAL_SOUND
-	.2byte MOVE_TICKLE
-	.2byte 0
-
-gBattleFactoryStyleMoveList_HighRiskHighReturn:: @ 8612046
-	.2byte MOVE_GUILLOTINE
-	.2byte MOVE_HORN_DRILL
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_HYPER_BEAM
-	.2byte MOVE_COUNTER
-	.2byte MOVE_FISSURE
-	.2byte MOVE_BIDE
-	.2byte MOVE_SELF_DESTRUCT
-	.2byte MOVE_SKY_ATTACK
-	.2byte MOVE_EXPLOSION
-	.2byte MOVE_FLAIL
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_DESTINY_BOND
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_PAIN_SPLIT
-	.2byte MOVE_MIRROR_COAT
-	.2byte MOVE_MEMENTO
-	.2byte MOVE_GRUDGE
-	.2byte MOVE_FACADE
-	.2byte MOVE_FOCUS_PUNCH
-	.2byte MOVE_BLAST_BURN
-	.2byte MOVE_HYDRO_CANNON
-	.2byte MOVE_OVERHEAT
-	.2byte MOVE_FRENZY_PLANT
-	.2byte MOVE_PSYCHO_BOOST
-	.2byte MOVE_VOLT_TACKLE
-	.2byte 0
-
-gBattleFactoryStyleMoveList_Endurance:: @ 861207C
-	.2byte MOVE_MIST
-	.2byte MOVE_RECOVER
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_HAZE
-	.2byte MOVE_REFLECT
-	.2byte MOVE_SOFT_BOILED
-	.2byte MOVE_REST
-	.2byte MOVE_PROTECT
-	.2byte MOVE_DETECT
-	.2byte MOVE_ENDURE
-	.2byte MOVE_MILK_DRINK
-	.2byte MOVE_HEAL_BELL
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_MORNING_SUN
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_MOONLIGHT
-	.2byte MOVE_SWALLOW
-	.2byte MOVE_WISH
-	.2byte MOVE_INGRAIN
-	.2byte MOVE_MAGIC_COAT
-	.2byte MOVE_RECYCLE
-	.2byte MOVE_REFRESH
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_SLACK_OFF
-	.2byte MOVE_AROMATHERAPY
-	.2byte MOVE_WATER_SPORT
-	.2byte 0
-
-gBattleFactoryStyleMoveList_SlowAndSteady:: @ 86120B4
-	.2byte MOVE_SING
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_DISABLE
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_POISON_POWDER
-	.2byte MOVE_STUN_SPORE
-	.2byte MOVE_SLEEP_POWDER
-	.2byte MOVE_THUNDER_WAVE
-	.2byte MOVE_TOXIC
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_CONFUSE_RAY
-	.2byte MOVE_GLARE
-	.2byte MOVE_POISON_GAS
-	.2byte MOVE_LOVELY_KISS
-	.2byte MOVE_SPORE
-	.2byte MOVE_SPIDER_WEB
-	.2byte MOVE_SWEET_KISS
-	.2byte MOVE_SPIKES
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_MEAN_LOOK
-	.2byte MOVE_ATTRACT
-	.2byte MOVE_ENCORE
-	.2byte MOVE_TORMENT
-	.2byte MOVE_FLATTER
-	.2byte MOVE_WILL_O_WISP
-	.2byte MOVE_TAUNT
-	.2byte MOVE_YAWN
-	.2byte MOVE_IMPRISON
-	.2byte MOVE_SNATCH
-	.2byte MOVE_TEETER_DANCE
-	.2byte MOVE_GRASS_WHISTLE
-	.2byte MOVE_BLOCK
-	.2byte 0
-
-gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow:: @ 86120F6
-	.2byte MOVE_SANDSTORM
-	.2byte MOVE_RAIN_DANCE
-	.2byte MOVE_SUNNY_DAY
-	.2byte MOVE_HAIL
-	.2byte MOVE_WEATHER_BALL
-	.2byte 0
-
-	.align 2
-gBattleFactoryStyleMoveListPointers:: @ 8612104
-	.4byte gBattleFactoryStyleMoveList_TotalPreparation
-	.4byte gBattleFactoryStyleMoveList_SlowAndSteady
-	.4byte gBattleFactoryStyleMoveList_Endurance
-	.4byte gBattleFactoryStyleMoveList_HighRiskHighReturn
-	.4byte gBattleFactoryStyleMoveList_WeakeningTheFoe
-	.4byte gBattleFactoryStyleMoveList_ImpossibleToPredict
-	.4byte gBattleFactoryStyleMoveList_DependsOnTheBattlesFlow

data/battle_frontier/battle_frontier_trainers.inc

@@ -625,7 +625,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Lauren
 
 @ 24
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "KIPP$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IF_I_WIN
@@ -651,7 +651,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kipp
 
 @ 25
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "JASON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_TEACH
@@ -677,7 +677,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jason
 
 @ 26
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "JOHN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -703,7 +703,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_John
 
 @ 27
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ANN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IT_S
@@ -729,7 +729,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ann
 
 @ 28
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "EILEEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LET_S
@@ -755,7 +755,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Eileen
 
 @ 29
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "CARLIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -937,7 +937,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kathy
 
 @ 36
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "PEYTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -963,7 +963,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Peyton
 
 @ 37
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "JULIAN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU
@@ -989,7 +989,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Julian
 
 @ 38
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "QUINN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -1015,7 +1015,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Quinn
 
 @ 39
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "HAYLEE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1041,7 +1041,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Haylee
 
 @ 40
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "AMANDA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1067,7 +1067,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Amanda
 
 @ 41
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "STACY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ALL
@@ -1093,7 +1093,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Stacy
 
 @ 42
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "RAFAEL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME_ON
@@ -1119,7 +1119,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Rafael
 
 @ 43
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "OLIVER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -1145,7 +1145,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Oliver
 
 @ 44
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "PAYTON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1171,7 +1171,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Payton
 
 @ 45
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "PAMELA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ALL
@@ -1197,7 +1197,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Pamela
 
 @ 46
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "ELIZA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -1223,7 +1223,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Eliza
 
 @ 47
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "MARISA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2341,7 +2341,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nash
 
 @ 90
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "ROBBY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAHAHA
@@ -2367,7 +2367,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Robby
 
 @ 91
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "REECE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -2393,7 +2393,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Reece
 
 @ 92
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "KATHRYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2419,7 +2419,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kathryn
 
 @ 93
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "ELLEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_CRUSH
@@ -2445,7 +2445,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ellen
 
 @ 94
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "RAMON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_OKAY
@@ -2471,7 +2471,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Ramon
 
 @ 95
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "ARTHUR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HERE_I_COME
@@ -2497,7 +2497,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Arthur
 
 @ 96
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "ALONDRA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_EVERY
@@ -2523,7 +2523,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Alondra
 
 @ 97
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "ADRIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME
@@ -2549,7 +2549,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Adriana
 
 @ 98
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "MALIK$", 8
 @ pre-battle speech
 	.2byte EC_WORD_OH
@@ -2575,7 +2575,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Malik
 
 @ 99
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "JILL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2601,7 +2601,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jill
 
 @ 100
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "ERIK$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2627,7 +2627,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Erik
 
 @ 101
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "YAZMIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -2653,7 +2653,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Yazmin
 
 @ 102
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "JAMAL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2679,7 +2679,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jamal
 
 @ 103
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "LESLIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -2705,7 +2705,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Leslie
 
 @ 104
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "DAVE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WHAT
@@ -2731,7 +2731,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dave
 
 @ 105
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "CARLO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAH
@@ -2757,7 +2757,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Carlo
 
 @ 106
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "EMILIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ME
@@ -2783,7 +2783,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Emilia
 
 @ 107
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "DALIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_MY
@@ -3043,7 +3043,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Joel
 
 @ 117
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "KRISTEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HAHAHA
@@ -3069,7 +3069,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Kristen
 
 @ 118
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "SELPHY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HUH_QUES
@@ -3095,7 +3095,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Selphy
 
 @ 119
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "CHLOE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME
@@ -4057,7 +4057,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Graham
 
 @ 156
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "TYLOR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_ARE
@@ -4083,7 +4083,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Tylor
 
 @ 157
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JAREN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_FIGHTING
@@ -4109,7 +4109,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jaren
 
 @ 158
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "CORDELL$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -4135,7 +4135,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Cordell
 
 @ 159
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "JAZLYN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IS
@@ -4577,7 +4577,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gunnar
 
 @ 176
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "CRAIG$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4603,7 +4603,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Craig
 
 @ 177
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "PIERCE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THERE
@@ -4629,7 +4629,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Pierce
 
 @ 178
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "REGINA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -4655,7 +4655,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Regina
 
 @ 179
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ALISON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THIS
@@ -5513,7 +5513,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Joyce
 
 @ 212
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "TODD$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU_RE
@@ -5539,7 +5539,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Todd
 
 @ 213
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "GAVIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5565,7 +5565,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gavin
 
 @ 214
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "MALORY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_PROMISE
@@ -5591,7 +5591,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Malory
 
 @ 215
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "ESTHER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -5617,7 +5617,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Esther
 
 @ 216
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "OSCAR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LET_S
@@ -5643,7 +5643,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Oscar
 
 @ 217
-	.4byte FACILITY_CLASS_PKMN_BREEDER_2
+	.4byte FACILITY_CLASS_PKMN_BREEDER_M
 	.string "WILSON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WORK
@@ -5669,7 +5669,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Wilson
 
 @ 218
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "CLARE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YAY
@@ -5695,7 +5695,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Clare
 
 @ 219
-	.4byte FACILITY_CLASS_PKMN_BREEDER_1
+	.4byte FACILITY_CLASS_POKEMON_BREEDER_F
 	.string "TESS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WANT
@@ -6397,7 +6397,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jasper
 
 @ 246
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "NADIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YOU
@@ -6423,7 +6423,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nadia
 
 @ 247
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "MIRANDA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_WELL
@@ -6449,7 +6449,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Miranda
 
 @ 248
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "EMMA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_VE
@@ -6865,7 +6865,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Reese
 
 @ 264
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "MASON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_PLEASE
@@ -6891,7 +6891,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Mason
 
 @ 265
-	.4byte FACILITY_CLASS_TRIATHLETE_3
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_M
 	.string "TOBY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LISTEN
@@ -6917,7 +6917,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Toby
 
 @ 266
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "DOROTHY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THE
@@ -6943,7 +6943,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Dorothy
 
 @ 267
-	.4byte FACILITY_CLASS_TRIATHLETE_4
+	.4byte FACILITY_CLASS_RUNNING_TRIATHLETE_F
 	.string "PIPER$", 8
 @ pre-battle speech
 	.2byte EC_WORD_COME_ON
@@ -6969,7 +6969,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Piper
 
 @ 268
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "FINN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_NOT
@@ -6995,7 +6995,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Finn
 
 @ 269
-	.4byte FACILITY_CLASS_TRIATHLETE_5
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_M
 	.string "SAMIR$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -7021,7 +7021,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Samir
 
 @ 270
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "FIONA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_DID
@@ -7047,7 +7047,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Fiona
 
 @ 271
-	.4byte FACILITY_CLASS_TRIATHLETE_6
+	.4byte FACILITY_CLASS_SWIMMING_TRIATHLETE_F
 	.string "GLORIA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -7073,7 +7073,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Gloria
 
 @ 272
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "NICO$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LIKE
@@ -7099,7 +7099,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Nico
 
 @ 273
-	.4byte FACILITY_CLASS_TRIATHLETE_1
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_M
 	.string "JEREMY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -7125,7 +7125,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Jeremy
 
 @ 274
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "CAITLIN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_DON_T
@@ -7151,7 +7151,7 @@ gBattleFrontierTrainers:: @ 85D5ACC
 	.4byte gBattleFrontierTrainerMons_Caitlin
 
 @ 275
-	.4byte FACILITY_CLASS_TRIATHLETE_2
+	.4byte FACILITY_CLASS_CYCLING_TRIATHLETE_F
 	.string "REENA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM

data/battle_frontier/fallarbor_battle_tent_trainers.inc

@@ -53,7 +53,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Javier
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "NATALIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_THE
@@ -79,7 +79,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Natalie
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "TREVE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_LOOK
@@ -417,7 +417,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Mariana
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "SHELDON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A
@@ -443,7 +443,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Sheldon
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "GIANNA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_AHAHA
@@ -495,7 +495,7 @@ gFallarborBattleTentTrainers:: @ 85DF084
 	.4byte gFallarborBattleTentTrainerMons_Yahir
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "BRITNEY$", 8
 @ pre-battle speech
 	.2byte EC_WORD_IT

data/battle_frontier/slateport_battle_tent_trainers.inc

@@ -53,7 +53,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Malachi
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "KELSIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_GO
@@ -79,7 +79,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Kelsie
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "DAVON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YEAH_YEAH
@@ -417,7 +417,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Rebecca
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "REGGIE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_POKEMON
@@ -443,7 +443,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Reggie
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JANAE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I
@@ -495,7 +495,7 @@ gSlateportBattleTentTrainers:: @ 85DDA14
 	.4byte gSlateportBattleTentTrainerMons_Caiden
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "KIRSTEN$", 8
 @ pre-battle speech
 	.2byte EC_WORD_HUH_QUES

data/battle_frontier/verdanturf_battle_tent_trainers.inc

@@ -53,7 +53,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Dilan
 
 @ 2
-	.4byte FACILITY_CLASS_TUBER_1
+	.4byte FACILITY_CLASS_TUBER_F
 	.string "ELIANA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -79,7 +79,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Eliana
 
 @ 3
-	.4byte FACILITY_CLASS_TUBER_2
+	.4byte FACILITY_CLASS_TUBER_M
 	.string "MARKUS$", 8
 @ pre-battle speech
 	.2byte EC_WORD_I_AM
@@ -417,7 +417,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Ashlyn
 
 @ 16
-	.4byte FACILITY_CLASS_POKEFAN_1
+	.4byte FACILITY_CLASS_POKEFAN_M
 	.string "ADDISON$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YES
@@ -443,7 +443,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Addison
 
 @ 17
-	.4byte FACILITY_CLASS_POKEFAN_2
+	.4byte FACILITY_CLASS_POKEFAN_F
 	.string "JUSTINE$", 8
 @ pre-battle speech
 	.2byte EC_WORD_YES
@@ -495,7 +495,7 @@ gVerdanturfBattleTentTrainers:: @ 85DE610
 	.4byte gVerdanturfBattleTentTrainerMons_Tyson
 
 @ 19
-	.4byte FACILITY_CLASS_EXPERT_2
+	.4byte FACILITY_CLASS_EXPERT_F
 	.string "LAILA$", 8
 @ pre-battle speech
 	.2byte EC_WORD_A

data/battle_frontier_1.s

@@ -5,31 +5,6 @@
 
 	.section .rodata
 
-	.align 2
-gUnknown_0860DE50:: @ 860DE50
-	.4byte sub_8195980
-	.4byte sub_8195A38
-	.4byte sub_8195AE4
-	.4byte sub_8195BB0
-	.4byte sub_8195C20
-	.4byte sub_8195C50
-	.4byte sub_8195C7C
-	.4byte sub_8195CE4
-	.4byte sub_8195D28
-	.4byte sub_8195DB8
-	
-gUnknown_0860DE78:: @ 860DE78
-	.2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046
-
-gUnknown_0860DE84:: @ 860DE84
-	.2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000
-
-gUnknown_0860DE98:: @ 860DE98
-	.4byte 0x00000010, 0x00000020, 0x00400000, 0x00800000
-
-gUnknown_0860DEA8:: @ 860DEA8
-	.4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff
-
 	.align 2
 gUnknown_0860DEB8:: @ 860DEB8 //struct
 	.2byte 0x0025, 0x0000, 0x0108, 0x0208, 0x0308, 0x0103, 0x0008, 0x0108, 0x0208, 0x0000

data/battle_scripts_1.s

@@ -318,7 +318,7 @@ BattleScript_EffectSleep::
 	goto BattleScript_MoveEnd
 
 BattleScript_AlreadyAsleep::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x20
 	printstring STRINGID_PKMNALREADYASLEEP
 	waitmessage 0x40
@@ -731,7 +731,7 @@ BattleScript_EffectToxic::
 	goto BattleScript_MoveEnd
 
 BattleScript_AlreadyPoisoned::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x40
 	printstring STRINGID_PKMNALREADYPOISONED
 	waitmessage 0x40
@@ -779,7 +779,7 @@ BattleScript_RestCantSleep::
 	goto BattleScript_MoveEnd
 
 BattleScript_RestIsAlreadyAsleep::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x20
 	printstring STRINGID_PKMNALREADYASLEEP2
 	waitmessage 0x40
@@ -944,7 +944,7 @@ BattleScript_EffectConfuse::
 	goto BattleScript_MoveEnd
 
 BattleScript_AlreadyConfused::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x20
 	printstring STRINGID_PKMNALREADYCONFUSED
 	waitmessage 0x40
@@ -1051,7 +1051,7 @@ BattleScript_EffectParalyze::
 	goto BattleScript_MoveEnd
 
 BattleScript_AlreadyParalyzed::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x20
 	printstring STRINGID_PKMNISALREADYPARALYZED
 	waitmessage 0x40
@@ -1128,7 +1128,7 @@ BattleScript_SubstituteString::
 	waitmessage 0x40
 	goto BattleScript_MoveEnd
 BattleScript_AlreadyHasSubstitute::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x20
 	printstring STRINGID_PKMNHASSUBSTITUTE
 	waitmessage 0x40
@@ -1601,12 +1601,12 @@ BattleScript_EffectPerishSong::
 	waitanimation
 	printstring STRINGID_FAINTINTHREE
 	waitmessage 0x40
-	setbyte sBANK, 0x0
+	setbyte sBATTLER, 0x0
 BattleScript_PerishSongLoop::
 	jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected
 BattleScript_PerishSongLoopIncrement::
-	addbyte sBANK, 0x1
+	addbyte sBATTLER, 0x1
-	jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
+	jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop
 	goto BattleScript_MoveEnd
 
 BattleScript_PerishSongNotAffected::
@@ -2226,7 +2226,7 @@ BattleScript_WaterVeilPrevents::
 	goto BattleScript_MoveEnd
 
 BattleScript_AlreadyBurned::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x20
 	printstring STRINGID_PKMNALREADYHASBURN
 	waitmessage 0x40
@@ -2493,7 +2493,7 @@ BattleScript_EffectYawn::
 	waitmessage 0x40
 	goto BattleScript_MoveEnd
 BattleScript_PrintBankAbilityMadeIneffective::
-	copybyte sBANK, sBANK_WITH_ABILITY
+	copybyte sBATTLER, sBATTLER_WITH_ABILITY
 BattleScript_PrintAbilityMadeIneffective::
 	pause 0x20
 	printstring STRINGID_PKMNSXMADEITINEFFECTIVE
@@ -2643,7 +2643,7 @@ BattleScript_TeeterDanceSubstitutePrevents::
 	goto BattleScript_TeeterDanceDoMoveEndIncrement
 
 BattleScript_TeeterDanceAlreadyConfused::
-	various23 BS_ATTACKER
+	setalreadystatusedmoveattempt BS_ATTACKER
 	pause 0x20
 	printstring STRINGID_PKMNALREADYCONFUSED
 	waitmessage 0x40
@@ -3523,7 +3523,7 @@ BattleScript_RapidSpinAway::
 BattleScript_WrapFree::
 	printstring STRINGID_PKMNGOTFREE
 	waitmessage 0x40
-	copybyte gBattlerTarget, sBANK
+	copybyte gBattlerTarget, sBATTLER
 	return
 
 BattleScript_LeechSeedFree::
@@ -4030,11 +4030,11 @@ BattleScript_ShedSkinActivates::
 	end3
 
 BattleScript_WeatherFormChanges::
-	setbyte sBANK, 0x0
+	setbyte sBATTLER, 0x0
 BattleScript_WeatherFormChangesLoop::
 	trycastformdatachange
-	addbyte sBANK, 0x1
+	addbyte sBATTLER, 0x1
-	jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
+	jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
 	return
 
 BattleScript_CastformChange::
@@ -4487,54 +4487,54 @@ BattleScript_ArenaTurnBeginning::
 	pause 0x8
 	playse SE_HANTEI1
 	various14 BS_ATTACKER
-	various16 8
+	arenajudmengtstring 8
-	various17 8
+	arenawaitmessage 8
 	pause 0x40
 	various15 BS_ATTACKER
 	volumeup
 	end2
 	
-BattleScript_82DB8E0::
+BattleScript_82DB8E0:: @ Unused battlescript
 	playse SE_PINPON
 	various14 BS_ATTACKER
-	various16 BS_TARGET
+	arenajudmengtstring BS_TARGET
-	various17 BS_TARGET
+	arenawaitmessage BS_TARGET
 	pause 0x40
 	various15 BS_ATTACKER
 	end2
 
-BattleScript_82DB8F3::
+BattleScript_ArenaDoJudgment::
-	makevisible 11
+	makevisible BS_PLAYER1
 	waitstate
 	makevisible BS_OPPONENT1
 	waitstate
 	volumedown
-	playse 0x109
+	playse SE_HANTEI1
 	pause 0x8
-	playse 0x109
+	playse SE_HANTEI1
 	pause 0x40
 	various14 BS_ATTACKER
-	various16 BS_ATTACKER
+	arenajudmengtstring 1
-	various17 BS_ATTACKER
+	arenawaitmessage 1
 	pause 0x40
 	setbyte gBattleCommunication, 0x0
-	various9 BS_ATTACKER
+	arenajudgmentwindow
 	pause 0x40
-	various9 BS_ATTACKER
+	arenajudgmentwindow
-	various16 BS_EFFECT_BATTLER
+	arenajudmengtstring 2
-	various17 BS_EFFECT_BATTLER
+	arenawaitmessage 2
-	various9 BS_ATTACKER
+	arenajudgmentwindow
-	various16 BS_FAINTED
+	arenajudmengtstring 3
-	various17 BS_FAINTED
+	arenawaitmessage 3
-	various9 BS_ATTACKER
+	arenajudgmentwindow
-	various16 0x4
+	arenajudmengtstring 4
-	various17 0x4
+	arenawaitmessage 4
-	various9 BS_ATTACKER
+	arenajudgmentwindow
-	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x3, BattleScript_82DB973
+	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x3, BattleScript_ArenaJudgmentPlayerLoses
-	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x4, BattleScript_82DB992
+	jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0x4, BattleScript_ArenaJudgmentDraw
-	various16 0x5
+	arenajudmengtstring 5
-	various17 0x5
+	arenawaitmessage 5
-	various9 BS_ATTACKER
+	arenajudgmentwindow
 	various15 BS_ATTACKER
 	printstring STRINGID_DEFEATEDOPPONENTBYREFEREE
 	waitmessage 0x40
@@ -4542,39 +4542,39 @@ BattleScript_82DB8F3::
 	waitcry BS_ATTACKER
 	dofaintanimation BS_OPPONENT1
 	cleareffectsonfaint BS_OPPONENT1
-	various10 BS_ATTACKER
+	arenaopponentmonlost
 	end2
 
-BattleScript_82DB973::
+BattleScript_ArenaJudgmentPlayerLoses:
-	various16 0x6
+	arenajudmengtstring 6
-	various17 0x6
+	arenawaitmessage 6
-	various9 BS_ATTACKER
+	arenajudgmentwindow
 	various15 BS_ATTACKER
 	printstring STRINGID_LOSTTOOPPONENTBYREFEREE
 	waitmessage 0x40
-	playfaintcry 11
+	playfaintcry BS_PLAYER1
 	waitcry BS_ATTACKER
-	dofaintanimation 11
+	dofaintanimation BS_PLAYER1
-	cleareffectsonfaint 11
+	cleareffectsonfaint BS_PLAYER1
-	various11 BS_ATTACKER
+	arenaplayermonlost
 	end2
 
-BattleScript_82DB992::
+BattleScript_ArenaJudgmentDraw:
-	various16 BS_BATTLER_0
+	arenajudmengtstring 7
-	various17 BS_BATTLER_0
+	arenawaitmessage 7
-	various9 BS_ATTACKER
+	arenajudgmentwindow
 	various15 BS_ATTACKER
 	printstring STRINGID_TIEDOPPONENTBYREFEREE
 	waitmessage 0x40
-	playfaintcry 11
+	playfaintcry BS_PLAYER1
 	waitcry BS_ATTACKER
-	dofaintanimation 11
+	dofaintanimation BS_PLAYER1
-	cleareffectsonfaint 11
+	cleareffectsonfaint BS_PLAYER1
 	playfaintcry BS_OPPONENT1
 	waitcry BS_ATTACKER
 	dofaintanimation BS_OPPONENT1
 	cleareffectsonfaint BS_OPPONENT1
-	various12 BS_ATTACKER
+	arenabothmonlost
 	end2
 
 BattleScript_AskIfWantsToForfeitMatch::

data/battle_tower.s

@@ -21,19 +21,19 @@
 @ 85D97BC
 	.include "data/battle_frontier/battle_frontier_mons.inc"
 
-gUnknown_085DCEDC:: @ 85DCEDC
+gTowerMaleFacilityClasses:: @ 85DCEDC
 	.byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00
 
-gUnknown_085DCEFA:: @ 85DCEFA
+gTowerFemaleFacilityClasses:: @ 85DCEFA
 	.byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47
 
-gUnknown_085DCF0E:: @ 85DCF0E
+gTowerMaleTrainerGfxIds:: @ 85DCF0E
 	.byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37
 
-gUnknown_085DCF2C:: @ 85DCF2C
+gTowerFemaleTrainerGfxIds:: @ 85DCF2C
 	.byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f
 
-gUnknown_085DCF40:: @ 85DCF40
+sRubyFacilityClassToEmerald:: @ 85DCF40
 	.byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07
 	.byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28
 	.byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35
@@ -640,7 +640,7 @@ gUnknown_085DD690:: @ 85DD690
 	.4byte gUnknown_085DD0F0
 	.4byte gUnknown_085DD104
 
-gUnknown_085DD6D0:: @ 85DD6D0
+sStevenMons:: @ 85DD6D0
 	.byte 0x8f, 0x01, 0x1f, 0x2a, 0x02
 
 gUnknown_085DD6D5:: @ 85DD6D5
@@ -677,57 +677,3 @@ gUnknown_085DD6DC:: @ 85DD6DC
 
 @ 85DF69C
 	.include "data/battle_frontier/fallarbor_battle_tent_mons.inc"
-
-	.align 2
-gUnknown_085DF96C:: @ 85DF96C
-	.4byte sub_8161F94
-	.4byte sub_8162054
-	.4byte sub_81620F4
-	.4byte sub_81623F0
-	.4byte sub_81621C0
-	.4byte sub_816502C
-	.4byte sub_8164040
-	.4byte sub_8163914
-	.4byte nullsub_61
-	.4byte nullsub_116
-	.4byte sub_81642A0
-	.4byte sub_8164828
-	.4byte sub_8164B74
-	.4byte sub_8164DCC
-	.4byte sub_8164DE4
-	.4byte sub_8164E04
-
-	.align 2
-gUnknown_085DF9AC:: @ 85DF9AC
-	.4byte 0x00000001, 0x00000002, 0x00004000, 0x00008000, 0x00010000, 0x00020000, 0x00040000, 0x00080000
-
-	.align 2
-gUnknown_085DF9CC:: @ 85DF9CC
-	.4byte 0xfffffffe, 0xfffffffd, 0xffffbfff, 0xffff7fff, 0xfffeffff, 0xfffdffff, 0xfffbffff, 0xfff7ffff
-
-gUnknown_085DF9EC:: @ 85DF9EC
-	.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c
-
-gUnknown_085DF9F6:: @ 85DF9F6
-	.byte 0x03, 0x04, 0x02, 0x02
-
-	.align 1
-gUnknown_085DF9FA:: @ 85DF9FA
-	.2byte 0x0000, 0x0063, 0x0050, 0x0077, 0x0064, 0x008b, 0x0078, 0x009f, 0x008c, 0x00b3, 0x00a0, 0x00c7, 0x00b4, 0x00db, 0x00c8, 0x012b
-
-	.align 1
-gUnknown_085DFA1A:: @ 85DFA1A
-	.2byte 0x0064, 0x0077, 0x0078, 0x008b, 0x008c, 0x009f, 0x00a0, 0x00b3, 0x00b4, 0x00c7, 0x00c8, 0x00db, 0x00dc, 0x00ef, 0x00c8, 0x012b
-	.2byte 0x00b3, 0x008d, 0x00c8, 0x00b7
-
-gUnknown_085DFA42:: @ 85DFA42
-	.byte 0x03, 0x04, 0x02, 0x02
-
-	.align 1
-gUnknown_085DFA46:: @ 85DFA46
-	.2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
-
-	.align 1
-gUnknown_085DFA52:: @ 85DFA52
-	.2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04, 0x0000
-

data/graphics/pokemon/footprint_table.inc

@@ -1,415 +0,0 @@
-	.align 2
-gMonFootprintTable:: @ 856E694
-	.4byte gMonFootprint_Bulbasaur
-	.4byte gMonFootprint_Bulbasaur
-	.4byte gMonFootprint_Ivysaur
-	.4byte gMonFootprint_Venusaur
-	.4byte gMonFootprint_Charmander
-	.4byte gMonFootprint_Charmeleon
-	.4byte gMonFootprint_Charizard
-	.4byte gMonFootprint_Squirtle
-	.4byte gMonFootprint_Wartortle
-	.4byte gMonFootprint_Blastoise
-	.4byte gMonFootprint_Caterpie
-	.4byte gMonFootprint_Metapod
-	.4byte gMonFootprint_Butterfree
-	.4byte gMonFootprint_Weedle
-	.4byte gMonFootprint_Kakuna
-	.4byte gMonFootprint_Beedrill
-	.4byte gMonFootprint_Pidgey
-	.4byte gMonFootprint_Pidgeotto
-	.4byte gMonFootprint_Pidgeot
-	.4byte gMonFootprint_Rattata
-	.4byte gMonFootprint_Raticate
-	.4byte gMonFootprint_Spearow
-	.4byte gMonFootprint_Fearow
-	.4byte gMonFootprint_Ekans
-	.4byte gMonFootprint_Arbok
-	.4byte gMonFootprint_Pikachu
-	.4byte gMonFootprint_Raichu
-	.4byte gMonFootprint_Sandshrew
-	.4byte gMonFootprint_Sandslash
-	.4byte gMonFootprint_NidoranF
-	.4byte gMonFootprint_Nidorina
-	.4byte gMonFootprint_Nidoqueen
-	.4byte gMonFootprint_NidoranM
-	.4byte gMonFootprint_Nidorino
-	.4byte gMonFootprint_Nidoking
-	.4byte gMonFootprint_Clefairy
-	.4byte gMonFootprint_Clefable
-	.4byte gMonFootprint_Vulpix
-	.4byte gMonFootprint_Ninetales
-	.4byte gMonFootprint_Jigglypuff
-	.4byte gMonFootprint_Wigglytuff
-	.4byte gMonFootprint_Zubat
-	.4byte gMonFootprint_Golbat
-	.4byte gMonFootprint_Oddish
-	.4byte gMonFootprint_Gloom
-	.4byte gMonFootprint_Vileplume
-	.4byte gMonFootprint_Paras
-	.4byte gMonFootprint_Parasect
-	.4byte gMonFootprint_Venonat
-	.4byte gMonFootprint_Venomoth
-	.4byte gMonFootprint_Diglett
-	.4byte gMonFootprint_Dugtrio
-	.4byte gMonFootprint_Meowth
-	.4byte gMonFootprint_Persian
-	.4byte gMonFootprint_Psyduck
-	.4byte gMonFootprint_Golduck
-	.4byte gMonFootprint_Mankey
-	.4byte gMonFootprint_Primeape
-	.4byte gMonFootprint_Growlithe
-	.4byte gMonFootprint_Arcanine
-	.4byte gMonFootprint_Poliwag
-	.4byte gMonFootprint_Poliwhirl
-	.4byte gMonFootprint_Poliwrath
-	.4byte gMonFootprint_Abra
-	.4byte gMonFootprint_Kadabra
-	.4byte gMonFootprint_Alakazam
-	.4byte gMonFootprint_Machop
-	.4byte gMonFootprint_Machoke
-	.4byte gMonFootprint_Machamp
-	.4byte gMonFootprint_Bellsprout
-	.4byte gMonFootprint_Weepinbell
-	.4byte gMonFootprint_Victreebel
-	.4byte gMonFootprint_Tentacool
-	.4byte gMonFootprint_Tentacruel
-	.4byte gMonFootprint_Geodude
-	.4byte gMonFootprint_Graveler
-	.4byte gMonFootprint_Golem
-	.4byte gMonFootprint_Ponyta
-	.4byte gMonFootprint_Rapidash
-	.4byte gMonFootprint_Slowpoke
-	.4byte gMonFootprint_Slowbro
-	.4byte gMonFootprint_Magnemite
-	.4byte gMonFootprint_Magneton
-	.4byte gMonFootprint_Farfetchd
-	.4byte gMonFootprint_Doduo
-	.4byte gMonFootprint_Dodrio
-	.4byte gMonFootprint_Seel
-	.4byte gMonFootprint_Dewgong
-	.4byte gMonFootprint_Grimer
-	.4byte gMonFootprint_Muk
-	.4byte gMonFootprint_Shellder
-	.4byte gMonFootprint_Cloyster
-	.4byte gMonFootprint_Gastly
-	.4byte gMonFootprint_Haunter
-	.4byte gMonFootprint_Gengar
-	.4byte gMonFootprint_Onix
-	.4byte gMonFootprint_Drowzee
-	.4byte gMonFootprint_Hypno
-	.4byte gMonFootprint_Krabby
-	.4byte gMonFootprint_Kingler
-	.4byte gMonFootprint_Voltorb
-	.4byte gMonFootprint_Electrode
-	.4byte gMonFootprint_Exeggcute
-	.4byte gMonFootprint_Exeggutor
-	.4byte gMonFootprint_Cubone
-	.4byte gMonFootprint_Marowak
-	.4byte gMonFootprint_Hitmonlee
-	.4byte gMonFootprint_Hitmonchan
-	.4byte gMonFootprint_Lickitung
-	.4byte gMonFootprint_Koffing
-	.4byte gMonFootprint_Weezing
-	.4byte gMonFootprint_Rhyhorn
-	.4byte gMonFootprint_Rhydon
-	.4byte gMonFootprint_Chansey
-	.4byte gMonFootprint_Tangela
-	.4byte gMonFootprint_Kangaskhan
-	.4byte gMonFootprint_Horsea
-	.4byte gMonFootprint_Seadra
-	.4byte gMonFootprint_Goldeen
-	.4byte gMonFootprint_Seaking
-	.4byte gMonFootprint_Staryu
-	.4byte gMonFootprint_Starmie
-	.4byte gMonFootprint_Mrmime
-	.4byte gMonFootprint_Scyther
-	.4byte gMonFootprint_Jynx
-	.4byte gMonFootprint_Electabuzz
-	.4byte gMonFootprint_Magmar
-	.4byte gMonFootprint_Pinsir
-	.4byte gMonFootprint_Tauros
-	.4byte gMonFootprint_Magikarp
-	.4byte gMonFootprint_Gyarados
-	.4byte gMonFootprint_Lapras
-	.4byte gMonFootprint_Ditto
-	.4byte gMonFootprint_Eevee
-	.4byte gMonFootprint_Vaporeon
-	.4byte gMonFootprint_Jolteon
-	.4byte gMonFootprint_Flareon
-	.4byte gMonFootprint_Porygon
-	.4byte gMonFootprint_Omanyte
-	.4byte gMonFootprint_Omastar
-	.4byte gMonFootprint_Kabuto
-	.4byte gMonFootprint_Kabutops
-	.4byte gMonFootprint_Aerodactyl
-	.4byte gMonFootprint_Snorlax
-	.4byte gMonFootprint_Articuno
-	.4byte gMonFootprint_Zapdos
-	.4byte gMonFootprint_Moltres
-	.4byte gMonFootprint_Dratini
-	.4byte gMonFootprint_Dragonair
-	.4byte gMonFootprint_Dragonite
-	.4byte gMonFootprint_Mewtwo
-	.4byte gMonFootprint_Mew
-	.4byte gMonFootprint_Chikorita
-	.4byte gMonFootprint_Bayleef
-	.4byte gMonFootprint_Meganium
-	.4byte gMonFootprint_Cyndaquil
-	.4byte gMonFootprint_Quilava
-	.4byte gMonFootprint_Typhlosion
-	.4byte gMonFootprint_Totodile
-	.4byte gMonFootprint_Croconaw
-	.4byte gMonFootprint_Feraligatr
-	.4byte gMonFootprint_Sentret
-	.4byte gMonFootprint_Furret
-	.4byte gMonFootprint_Hoothoot
-	.4byte gMonFootprint_Noctowl
-	.4byte gMonFootprint_Ledyba
-	.4byte gMonFootprint_Ledian
-	.4byte gMonFootprint_Spinarak
-	.4byte gMonFootprint_Ariados
-	.4byte gMonFootprint_Crobat
-	.4byte gMonFootprint_Chinchou
-	.4byte gMonFootprint_Lanturn
-	.4byte gMonFootprint_Pichu
-	.4byte gMonFootprint_Cleffa
-	.4byte gMonFootprint_Igglybuff
-	.4byte gMonFootprint_Togepi
-	.4byte gMonFootprint_Togetic
-	.4byte gMonFootprint_Natu
-	.4byte gMonFootprint_Xatu
-	.4byte gMonFootprint_Mareep
-	.4byte gMonFootprint_Flaaffy
-	.4byte gMonFootprint_Ampharos
-	.4byte gMonFootprint_Bellossom
-	.4byte gMonFootprint_Marill
-	.4byte gMonFootprint_Azumarill
-	.4byte gMonFootprint_Sudowoodo
-	.4byte gMonFootprint_Politoed
-	.4byte gMonFootprint_Hoppip
-	.4byte gMonFootprint_Skiploom
-	.4byte gMonFootprint_Jumpluff
-	.4byte gMonFootprint_Aipom
-	.4byte gMonFootprint_Sunkern
-	.4byte gMonFootprint_Sunflora
-	.4byte gMonFootprint_Yanma
-	.4byte gMonFootprint_Wooper
-	.4byte gMonFootprint_Quagsire
-	.4byte gMonFootprint_Espeon
-	.4byte gMonFootprint_Umbreon
-	.4byte gMonFootprint_Murkrow
-	.4byte gMonFootprint_Slowking
-	.4byte gMonFootprint_Misdreavus
-	.4byte gMonFootprint_Unown
-	.4byte gMonFootprint_Wobbuffet
-	.4byte gMonFootprint_Girafarig
-	.4byte gMonFootprint_Pineco
-	.4byte gMonFootprint_Forretress
-	.4byte gMonFootprint_Dunsparce
-	.4byte gMonFootprint_Gligar
-	.4byte gMonFootprint_Steelix
-	.4byte gMonFootprint_Snubbull
-	.4byte gMonFootprint_Granbull
-	.4byte gMonFootprint_Qwilfish
-	.4byte gMonFootprint_Scizor
-	.4byte gMonFootprint_Shuckle
-	.4byte gMonFootprint_Heracross
-	.4byte gMonFootprint_Sneasel
-	.4byte gMonFootprint_Teddiursa
-	.4byte gMonFootprint_Ursaring
-	.4byte gMonFootprint_Slugma
-	.4byte gMonFootprint_Magcargo
-	.4byte gMonFootprint_Swinub
-	.4byte gMonFootprint_Piloswine
-	.4byte gMonFootprint_Corsola
-	.4byte gMonFootprint_Remoraid
-	.4byte gMonFootprint_Octillery
-	.4byte gMonFootprint_Delibird
-	.4byte gMonFootprint_Mantine
-	.4byte gMonFootprint_Skarmory
-	.4byte gMonFootprint_Houndour
-	.4byte gMonFootprint_Houndoom
-	.4byte gMonFootprint_Kingdra
-	.4byte gMonFootprint_Phanpy
-	.4byte gMonFootprint_Donphan
-	.4byte gMonFootprint_Porygon2
-	.4byte gMonFootprint_Stantler
-	.4byte gMonFootprint_Smeargle
-	.4byte gMonFootprint_Tyrogue
-	.4byte gMonFootprint_Hitmontop
-	.4byte gMonFootprint_Smoochum
-	.4byte gMonFootprint_Elekid
-	.4byte gMonFootprint_Magby
-	.4byte gMonFootprint_Miltank
-	.4byte gMonFootprint_Blissey
-	.4byte gMonFootprint_Raikou
-	.4byte gMonFootprint_Entei
-	.4byte gMonFootprint_Suicune
-	.4byte gMonFootprint_Larvitar
-	.4byte gMonFootprint_Pupitar
-	.4byte gMonFootprint_Tyranitar
-	.4byte gMonFootprint_Lugia
-	.4byte gMonFootprint_HoOh
-	.4byte gMonFootprint_Celebi
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_QuestionMark
-	.4byte gMonFootprint_Treecko
-	.4byte gMonFootprint_Grovyle
-	.4byte gMonFootprint_Sceptile
-	.4byte gMonFootprint_Torchic
-	.4byte gMonFootprint_Combusken
-	.4byte gMonFootprint_Blaziken
-	.4byte gMonFootprint_Mudkip
-	.4byte gMonFootprint_Marshtomp
-	.4byte gMonFootprint_Swampert
-	.4byte gMonFootprint_Poochyena
-	.4byte gMonFootprint_Mightyena
-	.4byte gMonFootprint_Zigzagoon
-	.4byte gMonFootprint_Linoone
-	.4byte gMonFootprint_Wurmple
-	.4byte gMonFootprint_Silcoon
-	.4byte gMonFootprint_Beautifly
-	.4byte gMonFootprint_Cascoon
-	.4byte gMonFootprint_Dustox
-	.4byte gMonFootprint_Lotad
-	.4byte gMonFootprint_Lombre
-	.4byte gMonFootprint_Ludicolo
-	.4byte gMonFootprint_Seedot
-	.4byte gMonFootprint_Nuzleaf
-	.4byte gMonFootprint_Shiftry
-	.4byte gMonFootprint_Nincada
-	.4byte gMonFootprint_Ninjask
-	.4byte gMonFootprint_Shedinja
-	.4byte gMonFootprint_Taillow
-	.4byte gMonFootprint_Swellow
-	.4byte gMonFootprint_Shroomish
-	.4byte gMonFootprint_Breloom
-	.4byte gMonFootprint_Spinda
-	.4byte gMonFootprint_Wingull
-	.4byte gMonFootprint_Pelipper
-	.4byte gMonFootprint_Surskit
-	.4byte gMonFootprint_Masquerain
-	.4byte gMonFootprint_Wailmer
-	.4byte gMonFootprint_Wailord
-	.4byte gMonFootprint_Skitty
-	.4byte gMonFootprint_Delcatty
-	.4byte gMonFootprint_Kecleon
-	.4byte gMonFootprint_Baltoy
-	.4byte gMonFootprint_Claydol
-	.4byte gMonFootprint_Nosepass
-	.4byte gMonFootprint_Torkoal
-	.4byte gMonFootprint_Sableye
-	.4byte gMonFootprint_Barboach
-	.4byte gMonFootprint_Whiscash
-	.4byte gMonFootprint_Luvdisc
-	.4byte gMonFootprint_Corphish
-	.4byte gMonFootprint_Crawdaunt
-	.4byte gMonFootprint_Feebas
-	.4byte gMonFootprint_Milotic
-	.4byte gMonFootprint_Carvanha
-	.4byte gMonFootprint_Sharpedo
-	.4byte gMonFootprint_Trapinch
-	.4byte gMonFootprint_Vibrava
-	.4byte gMonFootprint_Flygon
-	.4byte gMonFootprint_Makuhita
-	.4byte gMonFootprint_Hariyama
-	.4byte gMonFootprint_Electrike
-	.4byte gMonFootprint_Manectric
-	.4byte gMonFootprint_Numel
-	.4byte gMonFootprint_Camerupt
-	.4byte gMonFootprint_Spheal
-	.4byte gMonFootprint_Sealeo
-	.4byte gMonFootprint_Walrein
-	.4byte gMonFootprint_Cacnea
-	.4byte gMonFootprint_Cacturne
-	.4byte gMonFootprint_Snorunt
-	.4byte gMonFootprint_Glalie
-	.4byte gMonFootprint_Lunatone
-	.4byte gMonFootprint_Solrock
-	.4byte gMonFootprint_Azurill
-	.4byte gMonFootprint_Spoink
-	.4byte gMonFootprint_Grumpig
-	.4byte gMonFootprint_Plusle
-	.4byte gMonFootprint_Minun
-	.4byte gMonFootprint_Mawile
-	.4byte gMonFootprint_Meditite
-	.4byte gMonFootprint_Medicham
-	.4byte gMonFootprint_Swablu
-	.4byte gMonFootprint_Altaria
-	.4byte gMonFootprint_Wynaut
-	.4byte gMonFootprint_Duskull
-	.4byte gMonFootprint_Dusclops
-	.4byte gMonFootprint_Roselia
-	.4byte gMonFootprint_Slakoth
-	.4byte gMonFootprint_Vigoroth
-	.4byte gMonFootprint_Slaking
-	.4byte gMonFootprint_Gulpin
-	.4byte gMonFootprint_Swalot
-	.4byte gMonFootprint_Tropius
-	.4byte gMonFootprint_Whismur
-	.4byte gMonFootprint_Loudred
-	.4byte gMonFootprint_Exploud
-	.4byte gMonFootprint_Clamperl
-	.4byte gMonFootprint_Huntail
-	.4byte gMonFootprint_Gorebyss
-	.4byte gMonFootprint_Absol
-	.4byte gMonFootprint_Shuppet
-	.4byte gMonFootprint_Banette
-	.4byte gMonFootprint_Seviper
-	.4byte gMonFootprint_Zangoose
-	.4byte gMonFootprint_Relicanth
-	.4byte gMonFootprint_Aron
-	.4byte gMonFootprint_Lairon
-	.4byte gMonFootprint_Aggron
-	.4byte gMonFootprint_Castform
-	.4byte gMonFootprint_Volbeat
-	.4byte gMonFootprint_Illumise
-	.4byte gMonFootprint_Lileep
-	.4byte gMonFootprint_Cradily
-	.4byte gMonFootprint_Anorith
-	.4byte gMonFootprint_Armaldo
-	.4byte gMonFootprint_Ralts
-	.4byte gMonFootprint_Kirlia
-	.4byte gMonFootprint_Gardevoir
-	.4byte gMonFootprint_Bagon
-	.4byte gMonFootprint_Shelgon
-	.4byte gMonFootprint_Salamence
-	.4byte gMonFootprint_Beldum
-	.4byte gMonFootprint_Metang
-	.4byte gMonFootprint_Metagross
-	.4byte gMonFootprint_Regirock
-	.4byte gMonFootprint_Regice
-	.4byte gMonFootprint_Registeel
-	.4byte gMonFootprint_Kyogre
-	.4byte gMonFootprint_Groudon
-	.4byte gMonFootprint_Rayquaza
-	.4byte gMonFootprint_Latias
-	.4byte gMonFootprint_Latios
-	.4byte gMonFootprint_Jirachi
-	.4byte gMonFootprint_Deoxys
-	.4byte gMonFootprint_Chimecho
-	.4byte gMonFootprint_Bulbasaur

data/maps/AbandonedShip_CaptainsOffice/events.inc

@@ -1,6 +1,6 @@
 AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
 	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY
 
 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
 	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK

data/maps/AbandonedShip_CaptainsOffice/scripts.inc

@@ -4,24 +4,24 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
 	lock
 	faceplayer
-	checkflag FLAG_0x126
+	checkflag FLAG_TRADED_SCANNER_TO_STERN
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
 	checkitem ITEM_SCANNER, 1
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_238810
-	checkflag FLAG_0x436
+	checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
-	msgbox AbandonedShip_CaptainsOffice_Text_238824, 4
+	msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT
 	release
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810
-	msgbox AbandonedShip_CaptainsOffice_Text_23889D, 4
+	msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT
 	release
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A
-	msgbox AbandonedShip_CaptainsOffice_Text_238918, 4
+	msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT
 	release
 	end
 

data/maps/AbandonedShip_Corridors_1F/scripts.inc

@@ -2,12 +2,12 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4
 	.byte 0
 
 AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5
-	msgbox AbandonedShip_Corridors_1F_Text_237A60, 2
+	msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC
 	end
 
 AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE
-	trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01
+	trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01
-	msgbox AbandonedShip_Corridors_1F_Text_237A1B, 6
+	msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5
@@ -24,4 +24,3 @@ AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B
 AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60
 	.string "Isn’t it fun here?\n"
 	.string "I get excited just being here!$"
-

data/maps/AbandonedShip_Corridors_B1F/scripts.inc

@@ -23,7 +23,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5
 	return
 
 AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2
+	msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
@@ -33,7 +33,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
 	checkitem ITEM_STORAGE_KEY, 1
 	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4
+	msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_STORAGE_KEY, 1
 	setflag FLAG_0x0EF
@@ -43,18 +43,18 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF
-	msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4
+	msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09
-	msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4
+	msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13
-	trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80
+	trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80
-	msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6
+	msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A

data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc

@@ -65,7 +65,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
 	checkitem ITEM_ROOM_1_KEY, 1
 	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_1_KEY, 1
 	setflag FLAG_0x0F0
@@ -81,7 +81,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
 	checkitem ITEM_ROOM_2_KEY, 1
 	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_2_KEY, 1
 	setflag FLAG_0x0F1
@@ -97,7 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
 	checkitem ITEM_ROOM_4_KEY, 1
 	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_4_KEY, 1
 	setflag FLAG_0x0F2
@@ -113,7 +113,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
 	checkitem ITEM_ROOM_6_KEY, 1
 	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
 	playse SE_PIN
 	takeitem ITEM_ROOM_6_KEY, 1
 	setflag FLAG_0x0F3
@@ -123,27 +123,27 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT
 	releaseall
 	end
 

data/maps/AbandonedShip_HiddenFloorRooms/events.inc

@@ -1,8 +1,8 @@
 AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18
-	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE
 
 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
 	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -16,10 +16,10 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
 	warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
 
 AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
-	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31
+	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY
-	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32
+	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY
-	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33
+	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY
-	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34
+	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY
 	bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
 	bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
 	bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3

data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc

@@ -138,7 +138,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3
 
 AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3
 	lockall
-	msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, 4
+	msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT
 	releaseall
 	end
 

data/maps/AbandonedShip_Room_B1F/events.inc

@@ -1,5 +1,5 @@
 AbandonedShip_Room_B1F_EventObjects: @ 853697C
-	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13
 
 AbandonedShip_Room_B1F_MapWarps: @ 8536994
 	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F

data/maps/AbandonedShip_Rooms2_1F/events.inc

@@ -1,7 +1,7 @@
 AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
 	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
 	object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE
 	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
 	object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
 

data/maps/AbandonedShip_Rooms2_1F/scripts.inc

@@ -2,59 +2,53 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
 	.byte 0
 
 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
-	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
+	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
-	msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4
+	msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT
 	release
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7
-	msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4
+	msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 642
+	register_matchcall TRAINER_KIRA_AND_DAN_1
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 642
-	callstd 8
 	release
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0
-	trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509
+	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509
-	msgbox AbandonedShip_Rooms2_1F_Text_238491, 6
+	msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
-	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
+	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_238154
-	msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4
+	msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT
 	release
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B
-	msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4
+	msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 642
+	register_matchcall TRAINER_KIRA_AND_DAN_1
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 642
-	callstd 8
 	release
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154
-	trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668
+	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668
-	msgbox AbandonedShip_Rooms2_1F_Text_23860B, 6
+	msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F
-	trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8
+	trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8
-	msgbox AbandonedShip_Rooms2_1F_Text_238708, 6
+	msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186
-	trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779
+	trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779
-	msgbox AbandonedShip_Rooms2_1F_Text_2387A9, 6
+	msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D
@@ -155,4 +149,3 @@ AbandonedShip_Rooms2_1F_Text_238779: @ 8238779
 AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9
 	.string "In a cabin somewhere on board,\n"
 	.string "I saw something sparkle.$"
-

data/maps/AbandonedShip_Rooms2_B1F/events.inc

@@ -1,6 +1,6 @@
 AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
 	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL
 
 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
 	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F

data/maps/AbandonedShip_Rooms2_B1F/scripts.inc

@@ -2,7 +2,7 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024
 	.byte 0
 
 AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025
-	msgbox AbandonedShip_Rooms2_B1F_Text_23802E, 2
+	msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC
 	end
 
 AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E

data/maps/AbandonedShip_Rooms_1F/events.inc

@@ -1,6 +1,6 @@
 AbandonedShip_Rooms_1F_EventObjects: @ 8536764
 	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL
 	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
 	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
 

data/maps/AbandonedShip_Rooms_1F/scripts.inc

@@ -2,37 +2,34 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92
 	.byte 0
 
 AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93
-	msgbox AbandonedShip_Rooms_1F_Text_237B15, 2
+	msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC
 	end
 
 AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C
-	trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A
+	trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A
-	msgbox AbandonedShip_Rooms_1F_Text_237D41, 6
+	msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3
-	trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
+	trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE
-	msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4
+	msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT
 	release
 	end
 
 AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF
 	special sub_80B4808
 	waitmovement 0
-	msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4
+	msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT
-	setvar VAR_0x8004, 144
+	register_matchcall TRAINER_THALIA_1
-	special SetMatchCallRegisteredFlag
-	setorcopyvar VAR_0x8000, 144
-	callstd 8
 	release
 	end
 
 AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE
-	trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2
+	trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2
-	msgbox AbandonedShip_Rooms_1F_Text_237CC9, 6
+	msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15

data/maps/AbandonedShip_Rooms_B1F/events.inc

@@ -1,6 +1,6 @@
 AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
 	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
-	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE
 
 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
 	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F

data/maps/AbandonedShip_Rooms_B1F/scripts.inc

@@ -7,7 +7,7 @@ AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6
-	msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2
+	msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC
 	end
 
 AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF

data/maps/AncientTomb/events.inc

@@ -1,5 +1,5 @@
 AncientTomb_EventObjects: @ 8536CDC
-	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937
+	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL
 
 AncientTomb_MapWarps: @ 8536CF4
 	warp_def 8, 29, 3, 0, MAP_ROUTE120

data/maps/AncientTomb/scripts.inc

@@ -23,7 +23,7 @@ AncientTomb_MapScript1_238FE1: @ 8238FE1
 	end
 
 AncientTomb_EventScript_238FEE:: @ 8238FEE
-	clearflag FLAG_0x3A9
+	clearflag FLAG_HIDE_REGISTEEL
 	return
 
 AncientTomb_MapScript1_238FF2: @ 8238FF2
@@ -51,7 +51,7 @@ AncientTomb_EventScript_239033:: @ 8239033
 	end
 
 AncientTomb_EventScript_239046:: @ 8239046
-	msgbox gUnknown_0827304E, 4
+	msgbox gUnknown_0827304E, MSGBOX_DEFAULT
 	releaseall
 	end
 

data/maps/AquaHideout_1F/events.inc

@@ -1,7 +1,7 @@
 AquaHideout_1F_EventObjects: @ 8535304
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
-	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 
 AquaHideout_1F_MapWarps: @ 853534C
 	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY

data/maps/AquaHideout_1F/scripts.inc

@@ -8,17 +8,17 @@ AquaHideout_1F_EventScript_233494:: @ 8233494
 	goto_eq AquaHideout_1F_EventScript_2334BC
 	checkflag FLAG_0x0D4
 	goto_eq AquaHideout_1F_EventScript_2334B2
-	msgbox AquaHideout_1F_Text_23351D, 4
+	msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_2334B2:: @ 82334B2
-	msgbox AquaHideout_1F_Text_2335E3, 4
+	msgbox AquaHideout_1F_Text_2335E3, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_2334BC:: @ 82334BC
-	msgbox AquaHideout_1F_Text_23367D, 4
+	msgbox AquaHideout_1F_Text_23367D, MSGBOX_DEFAULT
 	release
 	end
 
@@ -29,27 +29,27 @@ AquaHideout_1F_EventScript_2334C6:: @ 82334C6
 	goto_eq AquaHideout_1F_EventScript_2334EE
 	checkflag FLAG_0x0D4
 	goto_eq AquaHideout_1F_EventScript_2334E4
-	msgbox AquaHideout_1F_Text_233739, 4
+	msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_2334E4:: @ 82334E4
-	msgbox AquaHideout_1F_Text_2337FA, 4
+	msgbox AquaHideout_1F_Text_2337FA, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_2334EE:: @ 82334EE
-	msgbox AquaHideout_1F_Text_233884, 4
+	msgbox AquaHideout_1F_Text_233884, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_2334F8:: @ 82334F8
-	trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513
+	trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513
-	msgbox AquaHideout_1F_Text_233977, 6
+	msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_1F_EventScript_233513:: @ 8233513
-	msgbox AquaHideout_1F_Text_233977, 4
+	msgbox AquaHideout_1F_Text_233977, MSGBOX_DEFAULT
 	release
 	end
 

data/maps/AquaHideout_B1F/events.inc

@@ -1,13 +1,13 @@
 AquaHideout_B1F_EventObjects: @ 8535378
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR
-	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
+	object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL
-	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
-	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET
-	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
-	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
+	object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 
 AquaHideout_B1F_MapWarps: @ 8535450
 	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F

data/maps/AquaHideout_B1F/scripts.inc

@@ -23,11 +23,11 @@ AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
 	end
 
 AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
-	clearflag FLAG_0x3D1
+	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
 	return
 
 AquaHideout_B1F_EventScript_2339E7:: @ 82339E7
-	clearflag FLAG_0x3D2
+	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
 	return
 
 AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
@@ -85,35 +85,35 @@ AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C
 	end
 
 AquaHideout_B1F_EventScript_233A85:: @ 8233A85
-	trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0
+	trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0
-	msgbox AquaHideout_B1F_Text_233B5E, 6
+	msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0
 	special sub_80B4808
 	waitmovement 0
-	msgbox AquaHideout_B1F_Text_233B5E, 4
+	msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0
-	trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB
+	trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB
-	msgbox AquaHideout_B1F_Text_233C41, 6
+	msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB
-	msgbox AquaHideout_B1F_Text_233C41, 4
+	msgbox AquaHideout_B1F_Text_233C41, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5
-	trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA
+	trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA
-	msgbox AquaHideout_B1F_Text_233CDC, 6
+	msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC
-	trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E
+	trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E
-	msgbox AquaHideout_B1F_Text_233D84, 6
+	msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B1F_Text_233B03: @ 8233B03

data/maps/AquaHideout_B2F/events.inc

@@ -1,10 +1,10 @@
 AquaHideout_B2F_EventObjects: @ 853552C
-	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL
-	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943
+	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW
-	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
+	object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
-	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924
+	object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS
 
 AquaHideout_B2F_MapWarps: @ 85355BC
 	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F

data/maps/AquaHideout_B2F/scripts.inc

@@ -24,8 +24,8 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5
 	end
 
 AquaHideout_B2F_EventScript_233E09:: @ 8233E09
-	trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
+	trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25
-	msgbox AquaHideout_B2F_Text_233FF2, 4
+	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
 	release
 	end
 
@@ -37,7 +37,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	delay 20
 	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
 	waitmovement 0
-	msgbox AquaHideout_B2F_Text_233FA6, 4
+	msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4
 	applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
@@ -46,9 +46,9 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25
 	delay 20
 	applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
 	waitmovement 0
-	msgbox AquaHideout_B2F_Text_233FF2, 4
+	msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
 	setflag FLAG_0x070
-	setflag FLAG_0x354
+	setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
 	release
 	end
 
@@ -67,23 +67,23 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85
 	step_end
 
 AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A
-	trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
+	trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5
-	msgbox AquaHideout_B2F_Text_234112, 6
+	msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5
-	msgbox AquaHideout_B2F_Text_234112, 4
+	msgbox AquaHideout_B2F_Text_234112, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF
-	trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
+	trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE
-	msgbox AquaHideout_B2F_Text_2341FE, 6
+	msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6
-	trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
+	trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC
-	msgbox AquaHideout_B2F_Text_2342FF, 6
+	msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B2F_Text_233EDD: @ 8233EDD