Merge branch 'master' into player_field_avatar

INSTALL.md

@@ -8,16 +8,22 @@ Make sure that there is an environment variable called DEVKITARM with the path o
 
 Then get the compiler from https://github.com/pret/agbcc and run the following commands.
 
-	./build.sh
+```
-	./install.sh PATH_OF_POKEEMERALD_DIRECTORY
+./build.sh
+./install.sh PATH_OF_POKEEMERALD_DIRECTORY
+```
 
 Then in the pokeemerald directory, build the tools.
 
-	./build_tools.sh
+```
+./build_tools.sh
+```
 
 Finally, build the rom.
 
-	make
+```
+make
+```
 
 # Windows
 
@@ -26,3 +32,65 @@ Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
 Then get the compiled tools from https://github.com/pret/pokeruby-tools. Copy the `tools/` folder over the `tools/` folder in your pokeemerald directory.
 
 You can then build pokeemerald using `make` in the MSYS environment provided with devkitARM.
+
+# Mac
+
+Installing pokeemerald on a Mac requires macOS >= 10.12 (Sierra or higher).
+
+Download a [devkitPRO pacman](https://github.com/devkitPro/pacman/releases/tag/v1.0.0)
+
+Run the following commands in Terminal:
+
+
+```
+xcode-select --install
+
+sudo dkp-pacman -S devkitARM 
+
+export DEVKITPRO=/opt/devkitpro
+echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc
+export DEVKITARM=$DEVKITPRO/devkitARM
+echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc
+echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile
+
+git clone https://github.com/pret/pokeemerald
+git clone https://github.com/pret/agbcc
+
+cd agbcc/
+./build.sh
+./install.sh ../pokeemerald 
+
+cd ../pokeemerald
+./build_tools.sh
+```
+
+And build the ROM with `make`.
+
+# Faster builds
+
+After the first build, subsequent builds are faster. You can further speed up the build:
+
+## Parallel build
+
+This significantly speeds up the build on modern machines.
+
+By default `make` only runs a single thread. You can tell `make` to run on multiple threads with `make -j`. See the manfile for usage (`man make`).
+
+The optimal value for `-j` is the number of logical cores on your machine. You can run `nproc` to see the exact number.
+
+```
+$ nproc
+8
+```
+
+If you have 8 cores, run: `make -j8`
+
+`-j` on its own will spawn a new thread for each job. A clean build will have thousands of jobs, which will be slower than not using -j at all.
+
+## Disable the dependency scanning
+
+If you've only changed `.c` or `.s` files, you can turn off the dependency scanning temporarily. Changes to any other files will be ignored, and the build will either fail or not reflect those changes.
+
+`make NODEP=1`
+
+

Makefile

@@ -25,14 +25,13 @@ ASFLAGS := -mcpu=arm7tdmi
 CC1             := tools/agbcc/bin/agbcc
 override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
 
-CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
+CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -nostdinc -undef
 
 LDFLAGS = -Map ../../$(MAP)
 
 LIB := -L ../../tools/agbcc/lib -lgcc -lc
 
-SHA1 := sha1sum -c
+SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
-
 GFX := tools/gbagfx/gbagfx
 AIF := tools/aif2pcm/aif2pcm
 MID := $(abspath tools/mid2agb/mid2agb)

asm/battle_anim_80A9C70.s

@@ -623,8 +623,8 @@ _080AA186:
 	bx r0
 	thumb_func_end sub_80AA124
 
-	thumb_func_start sub_80AA18C
+	thumb_func_start AnimTask_StatsChange
-sub_80AA18C: @ 80AA18C
+AnimTask_StatsChange: @ 80AA18C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -853,7 +853,7 @@ _080AA352:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80AA18C
+	thumb_func_end AnimTask_StatsChange
 
 	thumb_func_start LaunchStatusAnimation
 LaunchStatusAnimation: @ 80AA364

asm/battle_frontier_1.s

@@ -6481,7 +6481,7 @@ _0819218E:
 	mov r0, r9
 	cmp r0, 0
 	bne _081921C4
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	b _081921FC
 	.pool
@@ -9539,7 +9539,7 @@ _08193B84:
 	ldr r0, [r4]
 	bl Free
 	str r6, [r4]
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	ldr r1, =gTasks
 	lsls r0, r5, 2
@@ -11320,7 +11320,7 @@ _08194B24:
 	ands r0, r1
 	cmp r0, 0
 	bne _08194B3C
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	adds r0, r4, 0
 	bl DestroyTask

asm/battle_frontier_2.s

@@ -1321,7 +1321,7 @@ _0819AFB8:
 	bl Free
 	str r5, [r7]
 	bl FreeAllWindowBuffers
-	ldr r0, =sub_80861B0
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	adds r0, r6, 0
 	bl DestroyTask
@@ -4491,7 +4491,7 @@ _0819CAA4:
 	bl Free
 	str r5, [r7]
 	bl FreeAllWindowBuffers
-	ldr r0, =sub_80861B0
+	ldr r0, =CB2_ReturnToFieldContinueScript
 	bl SetMainCallback2
 	adds r0, r6, 0
 	bl DestroyTask
@@ -11843,7 +11843,7 @@ sub_81A0784: @ 81A0784
 	movs r1, 0
 	adds r2, r4, 0
 	adds r3, r5, 0
-	bl sub_8198A50
+	bl CreateWindowTemplate
 	ldr r0, [sp, 0x10]
 	ldr r1, [sp, 0x14]
 	str r0, [sp, 0x18]

asm/battle_tower.s

@@ -3172,7 +3172,7 @@ _08163A3C:
 _08163A74:
 	bl sub_816537C
 _08163A78:
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	add sp, 0x4
 	pop {r4-r6}

asm/cable_club.s

@@ -2586,7 +2586,7 @@ sp02A_crash_sound: @ 80B39BC
 	push {lr}
 	ldr r0, =gSpecialVar_0x8006
 	ldrb r0, [r0]
-	ldr r1, =CB2_ReturnToFieldContinueScript
+	ldr r1, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl sub_80C4E74
 	pop {r0}
 	bx r0

asm/contest.s

@@ -102,7 +102,7 @@ LoadContestBgAfterMoveAnim: @ 80D7724
 	movs r4, 0
 	movs r5, 0xA0
 _080D775E:
-	ldr r0, =0x0201a004
+	ldr r0, =gHeap+0x1A004
 	adds r0, r5, r0
 	ldr r1, =gUnknown_02039F26
 	adds r1, r4, r1
@@ -576,7 +576,7 @@ _080D7B4E:
 	ldr r1, =gReservedSpritePaletteCount
 	movs r0, 0x4
 	strb r0, [r1]
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1
@@ -928,7 +928,7 @@ _080D7ED8:
 	ldr r4, =0x06002000
 	adds r1, r4, 0
 	bl LZDecompressVram
-	ldr r3, =0x02018000
+	ldr r3, =gHeap+0x18000
 	movs r5, 0x80
 	lsls r5, 6
 	ldr r1, =0x040000d4
@@ -976,7 +976,7 @@ _080D7F40:
 	ldr r0, =gContestResources
 	ldr r0, [r0]
 	ldr r1, [r0, 0x2C]
-	ldr r2, =0x0201aa04
+	ldr r2, =gHeap+0x1AA04
 	ldr r0, =0x040000d4
 	str r1, [r0]
 	str r2, [r0, 0x4]
@@ -1022,7 +1022,7 @@ _080D7F7C:
 	mov r0, sp
 	adds r2, r6, 0
 	bl CpuSet
-	ldr r1, =0x0201a004
+	ldr r1, =gHeap+0x1A004
 	ldr r0, =0x040000d4
 	mov r2, r8
 	str r2, [r0]
@@ -1393,7 +1393,7 @@ sub_80D833C: @ 80D833C
 	strh r1, [r0]
 	bl sub_80DCD48
 	ldr r1, =gPlttBufferUnfaded
-	ldr r2, =0x0201a204
+	ldr r2, =gHeap+0x1A204
 	ldr r0, =0x040000d4
 	str r1, [r0]
 	str r2, [r0, 0x4]
@@ -2070,7 +2070,7 @@ _080D897C:
 	movs r0, 0
 	bl sub_80DED60
 	ldr r1, =gPlttBufferFaded
-	ldr r0, =0x0201a604
+	ldr r0, =gHeap+0x1A604
 	movs r2, 0x80
 	lsls r2, 3
 	ldr r4, =0x040000d4
@@ -5012,7 +5012,7 @@ _080DA33A:
 sub_80DA348: @ 80DA348
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, =0x0201a204
+	ldr r2, =gHeap+0x1A204
 	ldr r3, =gPlttBufferUnfaded
 	ldr r1, =0x040000d4
 	str r2, [r1]
@@ -10211,7 +10211,7 @@ sub_80DCCD8: @ 80DCCD8
 	thumb_func_start sub_80DCD08
 sub_80DCD08: @ 80DCD08
 	push {lr}
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r2, r0, r1
@@ -10250,7 +10250,7 @@ sub_80DCD48: @ 80DCD48
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080DCE44
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1
@@ -10639,7 +10639,7 @@ sub_80DD04C: @ 80DD04C
 	movs r4, 0
 	movs r5, 0xA0
 _080DD052:
-	ldr r0, =0x0201a004
+	ldr r0, =gHeap+0x1A004
 	adds r0, r5, r0
 	ldr r1, =gUnknown_02039F26
 	adds r1, r4, r1
@@ -12351,7 +12351,7 @@ sub_80DDE30: @ 80DDE30
 	ldrsh r0, [r4, r1]
 	cmp r0, 0
 	bne _080DDE78
-	ldr r0, =0x02019000
+	ldr r0, =gHeap+0x19000
 	ldr r1, =0x06002000
 	movs r2, 0x80
 	lsls r2, 5
@@ -12360,7 +12360,7 @@ sub_80DDE30: @ 80DDE30
 	b _080DDE8C
 	.pool
 _080DDE78:
-	ldr r0, =0x02018000
+	ldr r0, =gHeap+0x18000
 	ldr r1, =0x06002000
 	movs r2, 0x80
 	lsls r2, 5
@@ -15417,7 +15417,7 @@ sub_80DF704: @ 80DF704
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r2, r0, r1
@@ -15468,7 +15468,7 @@ sub_80DF750: @ 80DF750
 	bne _080DF766
 	b _080DF924
 _080DF766:
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1
@@ -15493,7 +15493,7 @@ _080DF784:
 	lsrs r7, r0, 24
 	cmp r7, 0x3
 	bls _080DF784
-	ldr r0, =0x02000000
+	ldr r0, =gHeap
 	movs r1, 0xD0
 	lsls r1, 9
 	adds r0, r1

asm/contest_link_80F57C4.s

@@ -1825,7 +1825,7 @@ _080F6884:
 	adds r0, r5, 0
 	bl DestroyTask
 	bl FreeAllWindowBuffers
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	bl sub_80F7E64
 _080F68A8:

asm/contest_link_80FC4F4.s

@@ -11,7 +11,7 @@ sub_80FC4F4: @ 80FC4F4
 	adds r2, r0, 0
 	lsls r4, r1, 16
 	lsrs r4, 16
-	ldr r5, =0x0201c000
+	ldr r5, =gDecompressionBuffer
 	adds r0, r5, 0
 	adds r1, r2, 0
 	adds r2, r4, 0

asm/easy_chat.s

@@ -623,7 +623,7 @@ _0811A7C2:
 	bl overworld_free_bg_tilemaps
 	ldr r0, =gSpecialVar_0x8004
 	ldrb r0, [r0]
-	ldr r2, =sub_80861B0
+	ldr r2, =CB2_ReturnToFieldContinueScript
 	adds r1, r4, 0
 	adds r3, r5, 0
 	bl sub_811A20C
@@ -760,7 +760,7 @@ sub_811A8CC: @ 811A8CC
 	ldr r1, [r0]
 	ldr r0, =0x00003b6e
 	adds r1, r0
-	ldr r2, =sub_80861B0
+	ldr r2, =CB2_ReturnToFieldContinueScript
 	movs r0, 0xF
 	movs r3, 0x3
 	bl sub_811A20C
@@ -776,7 +776,7 @@ sub_811A8F0: @ 811A8F0
 	ldr r1, [r0]
 	ldr r0, =0x00003b5a
 	adds r1, r0
-	ldr r2, =sub_80861B0
+	ldr r2, =CB2_ReturnToFieldContinueScript
 	movs r0, 0x10
 	movs r3, 0x3
 	bl sub_811A20C
@@ -792,7 +792,7 @@ sub_811A914: @ 811A914
 	ldr r1, [r0]
 	ldr r0, =0x00003b6c
 	adds r1, r0
-	ldr r2, =sub_80861B0
+	ldr r2, =CB2_ReturnToFieldContinueScript
 	movs r0, 0x12
 	movs r3, 0x3
 	bl sub_811A20C
@@ -808,7 +808,7 @@ sub_811A938: @ 811A938
 	ldr r1, [r0]
 	ldr r0, =0x00003b5a
 	adds r1, r0
-	ldr r2, =sub_80861B0
+	ldr r2, =CB2_ReturnToFieldContinueScript
 	movs r0, 0x11
 	movs r3, 0x3
 	bl sub_811A20C
@@ -3691,7 +3691,7 @@ sub_811BDF0: @ 811BDF0
 	adds r6, r0, 0
 	ldr r0, =gSaveBlock1Ptr
 	ldr r4, [r0]
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r0, =0x00003b70
 	adds r5, r4, r0
 	adds r0, r5, 0
@@ -3707,17 +3707,17 @@ sub_811BDF0: @ 811BDF0
 	bl TVShowConvertInternationalString
 	movs r0, 0
 	mov r1, sp
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	b _0811BE3C
 	.pool
 _0811BE34:
 	ldr r1, =gText_Lady
 	movs r0, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 _0811BE3C:
 	ldr r1, =gText_F700sQuiz
 	adds r0, r6, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	add sp, 0x20
 	pop {r4-r6}
 	pop {r0}

asm/party_menu.s

@@ -16021,7 +16021,7 @@ sub_81B892C: @ 81B892C
 	str r0, [sp]
 	ldr r0, =sub_81B1370
 	str r0, [sp, 0x4]
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -16042,7 +16042,7 @@ sub_81B8958: @ 81B8958
 	str r0, [sp]
 	ldr r0, =sub_81B1370
 	str r0, [sp, 0x4]
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	str r0, [sp, 0x8]
 	movs r0, 0xB
 	movs r1, 0

asm/pokemon_summary_screen.s

@@ -5,869 +5,7 @@
 
 	.text
 
-	thumb_func_start sub_81C3E2C
-sub_81C3E2C: @ 81C3E2C
-	push {r4,lr}
-	sub sp, 0x8
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x4
-	bne _081C3E48
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	ldr r1, =0x000040c4
-	b _081C3E50
-	.pool
-_081C3E48:
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	lsls r1, 1
-	adds r0, 0x84
-_081C3E50:
-	adds r0, r1
-	ldrh r4, [r0]
-	cmp r4, 0
-	beq _081C3E82
-	ldr r0, =gUnknown_0861CD14
-	movs r1, 0x2
-	bl sub_81C2D2C
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r3, =gContestEffectDescriptionPointers
-	ldr r2, =gContestMoves
-	lsls r1, r4, 3
-	adds r1, r2
-	ldrb r1, [r1]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	movs r2, 0
-	str r2, [sp]
-	str r2, [sp, 0x4]
-	movs r2, 0x6
-	movs r3, 0x1
-	bl sub_81C25A4
-_081C3E82:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C3E2C
 
-	thumb_func_start sub_81C3E9C
-sub_81C3E9C: @ 81C3E9C
-	push {r4-r6,lr}
-	sub sp, 0x8
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r6, r4, 0
-	ldr r0, =gUnknown_0861CD14
-	movs r1, 0x2
-	bl sub_81C2D2C
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r5, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	cmp r4, 0
-	beq _081C3F30
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	ldr r1, =0x000040c0
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _081C3F00
-	adds r0, r4, 0
-	bl sub_81C3C5C
-	ldr r1, =gMoveDescriptionPointers
-	subs r0, r4, 0x1
-	lsls r0, 2
-	adds r0, r1
-	ldr r1, [r0]
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	movs r2, 0x6
-	movs r3, 0x1
-	bl sub_81C25A4
-	b _081C3F20
-	.pool
-_081C3F00:
-	ldr r2, =gContestEffectDescriptionPointers
-	ldr r1, =gContestMoves
-	lsls r0, r6, 3
-	adds r0, r1
-	ldrb r0, [r0]
-	lsls r0, 2
-	adds r0, r2
-	ldr r1, [r0]
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	movs r2, 0x6
-	movs r3, 0x1
-	bl sub_81C25A4
-_081C3F20:
-	adds r0, r5, 0
-	bl PutWindowTilemap
-	b _081C3F36
-	.pool
-_081C3F30:
-	adds r0, r5, 0
-	bl ClearWindowTilemap
-_081C3F36:
-	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81C3E9C
-
-	thumb_func_start sub_81C3F44
-sub_81C3F44: @ 81C3F44
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x8
-	ldr r4, =gUnknown_0861CD14
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_81C2D2C
-	lsls r0, 24
-	lsrs r6, r0, 24
-	adds r7, r6, 0
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_81C2D2C
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r0, =gUnknown_0203CF1C
-	ldr r1, [r0]
-	ldr r2, =0x000040c4
-	adds r0, r1, r2
-	ldrh r2, [r0]
-	cmp r2, 0
-	bne _081C3F9C
-	ldr r1, =gText_Cancel
-	str r2, [sp]
-	movs r0, 0x1
-	str r0, [sp, 0x4]
-	adds r0, r6, 0
-	movs r2, 0
-	movs r3, 0x41
-	bl sub_81C25A4
-	b _081C4044
-	.pool
-_081C3F9C:
-	ldrh r5, [r0]
-	ldr r2, =0x000040c0
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _081C3FD0
-	movs r0, 0xD
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, =gMoveNames
-	adds r1, r0
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x6
-	str r0, [sp, 0x4]
-	adds r0, r6, 0
-	movs r2, 0
-	movs r3, 0x41
-	bl sub_81C25A4
-	b _081C3FEC
-	.pool
-_081C3FD0:
-	movs r0, 0xD
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, =gMoveNames
-	adds r1, r0
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x5
-	str r0, [sp, 0x4]
-	adds r0, r7, 0
-	movs r2, 0
-	movs r3, 0x41
-	bl sub_81C25A4
-_081C3FEC:
-	ldr r4, =gStringVar1
-	ldr r1, =gBattleMoves
-	lsls r0, r5, 1
-	adds r0, r5
-	lsls r0, 2
-	adds r0, r1
-	ldrb r1, [r0, 0x4]
-	adds r0, r4, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-	bl UnkTextUtil_Reset
-	movs r0, 0
-	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
-	movs r0, 0x1
-	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
-	ldr r4, =gStringVar4
-	ldr r1, =gUnknown_0861CE97
-	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
-	movs r0, 0x1
-	adds r1, r4, 0
-	movs r2, 0x2C
-	bl GetStringRightAlignXOffset
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xC
-	str r0, [sp, 0x4]
-	mov r0, r8
-	adds r1, r4, 0
-	movs r3, 0x41
-	bl sub_81C25A4
-_081C4044:
-	add sp, 0x8
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C3F44
-
-	thumb_func_start sub_81C4064
-sub_81C4064: @ 81C4064
-	push {r4,lr}
-	sub sp, 0x8
-	ldr r0, =gUnknown_0861CD14
-	movs r1, 0
-	bl sub_81C2D2C
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x48
-	str r0, [sp]
-	movs r0, 0x10
-	str r0, [sp, 0x4]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x42
-	bl FillWindowPixelRect
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl CopyWindowToVram
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C4064
-
-	thumb_func_start sub_81C40A0
-sub_81C40A0: @ 81C40A0
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	mov r9, r0
-	mov r10, r1
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	mov r0, r10
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	ldr r5, =gUnknown_0861CD14
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_81C2D2C
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl sub_81C2D2C
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	mov r0, r9
-	lsls r6, r0, 4
-	movs r0, 0x48
-	mov r8, r0
-	str r0, [sp]
-	movs r0, 0x10
-	str r0, [sp, 0x4]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0
-	adds r3, r6, 0
-	bl FillWindowPixelRect
-	mov r0, r10
-	lsls r7, r0, 4
-	mov r0, r8
-	str r0, [sp]
-	movs r0, 0x10
-	str r0, [sp, 0x4]
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0
-	adds r3, r7, 0
-	bl FillWindowPixelRect
-	movs r4, 0x30
-	str r4, [sp]
-	movs r0, 0x10
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0
-	adds r3, r6, 0
-	bl FillWindowPixelRect
-	str r4, [sp]
-	movs r0, 0x10
-	str r0, [sp, 0x4]
-	adds r0, r5, 0
-	movs r1, 0
-	movs r2, 0
-	adds r3, r7, 0
-	bl FillWindowPixelRect
-	mov r0, r9
-	bl sub_81C3B08
-	mov r0, r10
-	bl sub_81C3B08
-	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_81C40A0
-
-	thumb_func_start sub_81C4154
-sub_81C4154: @ 81C4154
-	push {r4,lr}
-	sub sp, 0x8
-	ldr r0, =gUnknown_0861CD14
-	movs r1, 0x2
-	bl sub_81C2D2C
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	ldr r1, =gText_HMMovesCantBeForgotten2
-	movs r0, 0
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	adds r0, r4, 0
-	movs r2, 0x6
-	movs r3, 0x1
-	bl sub_81C25A4
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C4154
-
-	thumb_func_start sub_81C4190
-sub_81C4190: @ 81C4190
-	push {r4,r5,lr}
-	movs r2, 0
-	ldr r5, =gUnknown_0203CF1C
-	ldr r4, =0x000040d3
-	movs r3, 0xFF
-_081C419A:
-	ldr r0, [r5]
-	adds r0, r4
-	adds r0, r2
-	ldrb r1, [r0]
-	orrs r1, r3
-	strb r1, [r0]
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x1B
-	bls _081C419A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C4190
-
-	thumb_func_start sub_81C41C0
-sub_81C41C0: @ 81C41C0
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r5, =gUnknown_0203CF1C
-	ldr r0, [r5]
-	ldr r1, =0x000040d3
-	adds r0, r1
-	adds r1, r0, r4
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	beq _081C41F2
-	adds r1, r0, 0
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, =gSprites
-	adds r0, r1
-	bl DestroySprite
-	ldr r0, [r5]
-	ldr r1, =0x000040d3
-	adds r0, r1
-	adds r0, r4
-	movs r1, 0xFF
-	strb r1, [r0]
-_081C41F2:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C41C0
-
-	thumb_func_start sub_81C4204
-sub_81C4204: @ 81C4204
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, =gSprites
-	ldr r2, =gUnknown_0203CF1C
-	ldr r2, [r2]
-	ldr r4, =0x000040d3
-	adds r2, r4
-	adds r2, r0
-	ldrb r0, [r2]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r3
-	adds r2, 0x3E
-	movs r0, 0x1
-	ands r1, r0
-	lsls r1, 2
-	ldrb r3, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C4204
-
-	thumb_func_start sub_81C424C
-sub_81C424C: @ 81C424C
-	push {r4,lr}
-	movs r4, 0x3
-_081C4250:
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	ldr r1, =0x000040d3
-	adds r0, r1
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0xFF
-	beq _081C4268
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_81C4204
-_081C4268:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x1B
-	bls _081C4250
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C424C
-
-	thumb_func_start sub_81C4280
-sub_81C4280: @ 81C4280
-	push {lr}
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	ldr r1, =0x000040c0
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	beq _081C42B0
-	cmp r0, 0x2
-	bgt _081C42A4
-	cmp r0, 0
-	beq _081C42AA
-	b _081C42C2
-	.pool
-_081C42A4:
-	cmp r0, 0x3
-	beq _081C42BA
-	b _081C42C2
-_081C42AA:
-	bl sub_81C43A0
-	b _081C42C2
-_081C42B0:
-	bl sub_81C4420
-	bl sub_81C44F0
-	b _081C42C2
-_081C42BA:
-	bl sub_81C4484
-	bl sub_81C44F0
-_081C42C2:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81C4280
-
-	thumb_func_start sub_81C42C8
-sub_81C42C8: @ 81C42C8
-	push {r4,r5,lr}
-	movs r4, 0x3
-	ldr r5, =gUnknown_0203CF1C
-_081C42CE:
-	ldr r0, [r5]
-	ldr r1, =0x000040d3
-	adds r0, r1
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0xFF
-	bne _081C42F2
-	ldr r0, =gUnknown_0861CFC4
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x2
-	bl CreateSprite
-	ldr r1, [r5]
-	ldr r2, =0x000040d3
-	adds r1, r2
-	adds r1, r4
-	strb r0, [r1]
-_081C42F2:
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_81C4204
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _081C42CE
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C42C8
-
-	thumb_func_start sub_81C4318
-sub_81C4318: @ 81C4318
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r6, r1, 0
-	mov r8, r2
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r6, 24
-	lsrs r6, 24
-	mov r0, r8
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r3, 24
-	lsrs r3, 24
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	ldr r1, =0x000040d3
-	adds r0, r1
-	adds r0, r3
-	ldrb r0, [r0]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, =gSprites
-	adds r4, r0
-	adds r0, r4, 0
-	adds r1, r5, 0
-	str r3, [sp]
-	bl StartSpriteAnim
-	ldr r0, =gUnknown_0861CFDC
-	adds r5, r0
-	ldrb r1, [r5]
-	lsls r1, 4
-	ldrb r2, [r4, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, 0x5]
-	adds r6, 0x10
-	strh r6, [r4, 0x20]
-	movs r0, 0x8
-	add r8, r0
-	mov r1, r8
-	strh r1, [r4, 0x22]
-	ldr r3, [sp]
-	adds r0, r3, 0
-	movs r1, 0
-	bl sub_81C4204
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C4318
-
-	thumb_func_start sub_81C43A0
-sub_81C43A0: @ 81C43A0
-	push {r4,r5,lr}
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	adds r5, r0, 0
-	adds r5, 0x70
-	ldrb r0, [r5, 0x4]
-	cmp r0, 0
-	beq _081C43CC
-	movs r0, 0x9
-	movs r1, 0x78
-	movs r2, 0x30
-	movs r3, 0x3
-	bl sub_81C4318
-	movs r0, 0x4
-	movs r1, 0x1
-	bl sub_81C4204
-	b _081C4418
-	.pool
-_081C43CC:
-	ldr r4, =gBaseStats
-	ldrh r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrb r0, [r0, 0x6]
-	movs r1, 0x78
-	movs r2, 0x30
-	movs r3, 0x3
-	bl sub_81C4318
-	ldrh r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	adds r1, r0, r4
-	ldrb r0, [r1, 0x6]
-	ldrb r2, [r1, 0x7]
-	cmp r0, r2
-	beq _081C4410
-	ldrb r0, [r1, 0x7]
-	movs r1, 0xA0
-	movs r2, 0x30
-	movs r3, 0x4
-	bl sub_81C4318
-	movs r0, 0x4
-	movs r1, 0
-	bl sub_81C4204
-	b _081C4418
-	.pool
-_081C4410:
-	movs r0, 0x4
-	movs r1, 0x1
-	bl sub_81C4204
-_081C4418:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81C43A0
-
-	thumb_func_start sub_81C4420
-sub_81C4420: @ 81C4420
-	push {r4-r6,lr}
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	adds r5, r0, 0
-	adds r5, 0x70
-	movs r4, 0
-	ldr r6, =gBattleMoves
-_081C442E:
-	lsls r0, r4, 1
-	adds r1, r5, 0
-	adds r1, 0x14
-	adds r1, r0
-	ldrh r0, [r1]
-	cmp r0, 0
-	beq _081C4468
-	adds r1, r0, 0
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	ldrb r0, [r0, 0x2]
-	lsls r2, r4, 28
-	movs r1, 0x80
-	lsls r1, 22
-	adds r2, r1
-	lsrs r2, 24
-	adds r3, r4, 0x3
-	lsls r3, 24
-	lsrs r3, 24
-	movs r1, 0x55
-	bl sub_81C4318
-	b _081C4474
-	.pool
-_081C4468:
-	adds r0, r4, 0x3
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl sub_81C4204
-_081C4474:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x3
-	bls _081C442E
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81C4420
-
-	thumb_func_start sub_81C4484
-sub_81C4484: @ 81C4484
-	push {r4,r5,lr}
-	ldr r0, =gUnknown_0203CF1C
-	ldr r0, [r0]
-	adds r5, r0, 0
-	adds r5, 0x70
-	movs r4, 0
-_081C4490:
-	lsls r0, r4, 1
-	adds r1, r5, 0
-	adds r1, 0x14
-	adds r2, r1, r0
-	ldrh r0, [r2]
-	cmp r0, 0
-	beq _081C44D4
-	ldr r1, =gContestMoves
-	lsls r0, 3
-	adds r0, r1
-	ldrb r0, [r0, 0x1]
-	lsls r0, 29
-	lsrs r0, 5
-	movs r1, 0x90
-	lsls r1, 21
-	adds r0, r1
-	lsrs r0, 24
-	lsls r2, r4, 28
-	movs r1, 0x80
-	lsls r1, 22
-	adds r2, r1
-	lsrs r2, 24
-	adds r3, r4, 0x3
-	lsls r3, 24
-	lsrs r3, 24
-	movs r1, 0x55
-	bl sub_81C4318
-	b _081C44E0
-	.pool
-_081C44D4:
-	adds r0, r4, 0x3
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x1
-	bl sub_81C4204
-_081C44E0:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x3
-	bls _081C4490
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_81C4484
-
-	thumb_func_start sub_81C44F0
-sub_81C44F0: @ 81C44F0
-	push {lr}
-	ldr r0, =gUnknown_0203CF1C
-	ldr r1, [r0]
-	ldr r0, =0x000040c4
-	adds r3, r1, r0
-	ldrh r0, [r3]
-	cmp r0, 0
-	bne _081C4514
-	movs r0, 0x7
-	movs r1, 0x1
-	bl sub_81C4204
-	b _081C4560
-	.pool
-_081C4514:
-	ldr r2, =0x000040c0
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _081C4540
-	ldr r2, =gBattleMoves
-	ldrh r1, [r3]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x2]
-	movs r1, 0x55
-	movs r2, 0x60
-	movs r3, 0x7
-	bl sub_81C4318
-	b _081C4560
-	.pool
-_081C4540:
-	ldr r1, =gContestMoves
-	ldrh r0, [r3]
-	lsls r0, 3
-	adds r0, r1
-	ldrb r0, [r0, 0x1]
-	lsls r0, 29
-	lsrs r0, 5
-	movs r1, 0x90
-	lsls r1, 21
-	adds r0, r1
-	lsrs r0, 24
-	movs r1, 0x55
-	movs r2, 0x60
-	movs r3, 0x7
-	bl sub_81C4318
-_081C4560:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81C44F0
 
 	thumb_func_start sub_81C4568
 sub_81C4568: @ 81C4568

asm/pokenav.s

@@ -66,7 +66,7 @@ sub_81C72BC: @ 81C72BC
 	str r0, [r4]
 	cmp r0, 0
 	bne _081C72F0
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	b _081C7320
 	.pool
@@ -351,7 +351,7 @@ _081C752C:
 	bl sub_81C7334
 	cmp r4, 0
 	beq _081C755C
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	b _081C7562
 	.pool
@@ -1585,7 +1585,7 @@ sub_81C7E58: @ 81C7E58
 	adds r0, r4, 0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r4, =0x0201c000
+	ldr r4, =gDecompressionBuffer
 	mov r0, r8
 	adds r1, r4, 0
 	bl LZ77UnCompWram
@@ -1667,7 +1667,7 @@ sub_81C7F24: @ 81C7F24
 	adds r0, r4, 0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r4, =0x0201d000
+	ldr r4, =gDecompressionBuffer+0x1000
 	adds r0, r6, 0
 	adds r1, r4, 0
 	bl LZ77UnCompWram
@@ -16941,17 +16941,17 @@ sub_81CF7F4: @ 81CF7F4
 	mov r8, r0
 	bl sub_81CF0F0
 	adds r7, r0, 0
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	ldr r4, =gStringVar1
 	movs r0, 0
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	movs r0, 0xFF
 	strb r0, [r4]
 	ldr r5, =gStringVar2
 	ldr r1, =gText_NumberF700
 	adds r0, r5, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	mov r1, r8
 	ldrb r0, [r1, 0x8]
 	movs r1, 0x1
@@ -19854,14 +19854,14 @@ sub_81D0E84: @ 81D0E84
 	movs r2, 0
 	movs r3, 0x2
 	bl ConvertIntToDecimalStringN
-	bl UnkTextUtil_Reset
+	bl DynamicPlaceholderTextUtil_Reset
 	movs r0, 0
 	adds r1, r4, 0
-	bl UnkTextUtil_SetPtrI
+	bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
 	ldr r4, =gStringVar4
 	ldr r1, =gText_RibbonsF700
 	adds r0, r4, 0
-	bl UnkTextUtil_StringExpandPlaceholders
+	bl DynamicPlaceholderTextUtil_ExpandPlaceholders
 	ldrb r0, [r5, 0xA]
 	movs r1, 0x44
 	bl FillWindowPixelBuffer
@@ -27036,7 +27036,7 @@ _081D4E1C:
 	thumb_func_start sub_81D4E30
 sub_81D4E30: @ 81D4E30
 	push {lr}
-	ldr r0, =0x0201c000
+	ldr r0, =gDecompressionBuffer
 	movs r2, 0x80
 	lsls r2, 6
 	movs r1, 0
@@ -27657,7 +27657,7 @@ _081D5386:
 	strb r0, [r4, 0x8]
 	b _081D548A
 _081D5390:
-	ldr r0, =0x0201c000
+	ldr r0, =gDecompressionBuffer
 	bl sub_81D3920
 	strb r0, [r4, 0xE]
 	ldrb r0, [r4, 0xE]
@@ -27683,7 +27683,7 @@ _081D53C0:
 	strb r0, [r4, 0x8]
 	b _081D548A
 _081D53C6:
-	ldr r0, =0x0201c000
+	ldr r0, =gDecompressionBuffer
 	bl sub_81D3AB0
 	cmp r0, 0
 	beq _081D53EC

asm/roulette.s

@@ -4948,7 +4948,7 @@ sub_8142CD0: @ 8142CD0
 	sub sp, 0x8
 	ldr r4, =gUnknown_085B7488
 	ldr r0, [r4]
-	ldr r5, =0x0201c000
+	ldr r5, =gDecompressionBuffer
 	adds r1, r5, 0
 	bl LZ77UnCompWram
 	str r5, [sp]
@@ -5575,7 +5575,7 @@ sub_81431E4: @ 81431E4
 	sub sp, 0xC
 	ldr r4, =gUnknown_085B741C
 	ldr r0, [r4]
-	ldr r5, =0x0201c000
+	ldr r5, =gDecompressionBuffer
 	adds r1, r5, 0
 	bl LZ77UnCompWram
 	str r5, [sp, 0x4]
@@ -5720,7 +5720,7 @@ sub_8143314: @ 8143314
 	push {r7}
 	sub sp, 0x8
 	movs r5, 0
-	ldr r7, =0x0201c000
+	ldr r7, =gDecompressionBuffer
 	mov r6, sp
 _08143322:
 	ldr r0, =gUnknown_085B7750
@@ -6448,7 +6448,7 @@ sub_814391C: @ 814391C
 	sub sp, 0x8
 	ldr r4, =gUnknown_085B7948
 	ldr r0, [r4]
-	ldr r5, =0x0201c000
+	ldr r5, =gDecompressionBuffer
 	adds r1, r5, 0
 	bl LZ77UnCompWram
 	str r5, [sp]

asm/script_menu.s

@@ -1498,7 +1498,7 @@ CreateWindowFromRect: @ 80E2A1C
 	movs r1, 0
 	adds r2, r4, 0
 	adds r3, r5, 0
-	bl sub_8198A50
+	bl CreateWindowTemplate
 	ldr r0, [sp, 0x10]
 	ldr r1, [sp, 0x14]
 	str r0, [sp, 0x18]

asm/script_pokemon_util_80F87D8.s

@@ -390,7 +390,7 @@ _080F8AB6:
 	thumb_func_start sub_80F8ACC
 sub_80F8ACC: @ 80F8ACC
 	push {lr}
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -1559,7 +1559,7 @@ _080F9478:
 	movs r0, 0x1
 	strh r0, [r1]
 _080F947E:
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	pop {r0}
 	bx r0
@@ -1599,7 +1599,7 @@ _080F94D0:
 	movs r0, 0x1
 	strh r0, [r1]
 _080F94D6:
-	ldr r0, =CB2_ReturnToFieldContinueScript
+	ldr r0, =CB2_ReturnToFieldContinueScriptPlayMapMusic
 	bl SetMainCallback2
 	pop {r0}
 	bx r0

asm/trade.s

@@ -7612,7 +7612,7 @@ sub_807B170: @ 807B170
 	bl copy_decompressed_tile_data_to_vram_autofree
 	ldr r0, =gBattleTextboxTilemap
 	mov r8, r0
-	ldr r4, =0x0201c000
+	ldr r4, =gDecompressionBuffer
 	adds r1, r4, 0
 	bl LZDecompressWram
 	movs r0, 0

charmap.txt

@@ -44,6 +44,7 @@ SUPER_ER    = 2C
 '+'         = 2E
 LV          = 34
 '='         = 35
+';'         = 36
 '¿'         = 51
 '¡'         = 52
 PK          = 53
@@ -55,6 +56,7 @@ POKEBLOCK   = 55 56 57 58 59
 ')'         = 5D
 'â'         = 68
 'í'         = 6F
+UNK_SPACER  = 77
 UP_ARROW    = 79
 DOWN_ARROW  = 7A
 LEFT_ARROW  = 7B
@@ -982,18 +984,83 @@ PH_NURSE_BLEND = 5F 02
 PH_NURSE_HELD = 60 02
 PH_NURSE_SOLO = 61 02
 
-UNK_CTRL_F800 = F8 00
+A_BUTTON = F8 00
-UNK_CTRL_F801 = F8 01
+B_BUTTON = F8 01
-UNK_CTRL_F80A = F8 0A
+DPAD_UPDOWN = F8 0A
-UNK_CTRL_F80C = F8 0C
+DPAD_NONE = F8 0C
 
-UNK_CTRL_F9 = F9
+UP_ARROW_2 = F9 00
-UNK_CTRL_F904 = F9 04
+DOWN_ARROW_2 = F9 01
-UNK_CTRL_F905 = F9 05
+LEFT_ARROW_2 = F9 02
-UNK_CTRL_F907 = F9 07
+RIGHT_ARROW_2 = F9 03
-UNK_CTRL_F908 = F9 08
+PLUS = F9 04
-UNK_CTRL_F9DD = F9 DD
+LV_2 = F9 05
-UNK_CTRL_F9F9 = F9 F9
+PP = F9 06
+ID = F9 07
+NO = F9 08
+UNDERSCORE = F9 09
+CIRCLE_1 = F9 0A
+CIRCLE_2 = F9 0B
+CIRCLE_3 = F9 0C
+CIRCLE_4 = F9 0D
+CIRCLE_5 = F9 0E
+CIRCLE_6 = F9 0F
+CIRCLE_7 = F9 10
+CIRCLE_8 = F9 11
+CIRCLE_9 = F9 12
+ROUND_LEFT_PAREN = F9 13
+ROUND_RIGHT_PAREN = F9 14
+CIRCLE_DOT = F9 15
+TRIANGLE = F9 16
+BIG_MULT_X = F9 17
+
+EMOJI_UNDERSCORE = F9 D0
+EMOJI_PIPE = F9 D1
+EMOJI_HIGHBAR = F9 D2
+EMOJI_TILDE = F9 D3
+EMOJI_LEFT_PAREN = F9 D4
+EMOJI_RIGHT_PAREN = F9 D5
+EMOJI_UNION = F9 D6 @ ⊂
+EMOJI_GREATER_THAN = F9 D7
+EMOJI_LEFT_EYE = F9 D8
+EMOJI_RIGHT_EYE = F9 D9
+EMOJI_AT = F9 DA
+EMOJI_SEMICOLON = F9 DB
+EMOJI_PLUS = F9 DC
+EMOJI_MINUS = F9 DD
+EMOJI_EQUALS = F9 DE
+EMOJI_SPIRAL = F9 DF
+EMOJI_TONGUE = F9 E0
+EMOJI_TRIANGLE_OUTLINE = F9 E1
+EMOJI_ACUTE = F9 E2
+EMOJI_GRAVE = F9 E3
+EMOJI_CIRCLE = F9 E4
+EMOJI_TRIANGLE = F9 E5
+EMOJI_SQUARE = F9 E6
+EMOJI_HEART = F9 E7
+EMOJI_MOON = F9 E8
+EMOJI_NOTE = F9 E9
+EMOJI_BALL = F9 EA
+EMOJI_BOLT = F9 EB
+EMOJI_LEAF = F9 EC
+EMOJI_FIRE = F9 ED
+EMOJI_WATER = F9 EE
+EMOJI_LEFT_FIST = F9 EF
+EMOJI_RIGHT_FIST = F9 F0
+EMOJI_BIGWHEEL = F9 F1
+EMOJI_SMALLWHEEL = F9 F2
+EMOJI_SPHERE = F9 F3
+EMOJI_IRRITATED = F9 F4
+EMOJI_MISCHIEVOUS = F9 F5
+EMOJI_HAPPY = F9 F6
+EMOJI_ANGRY = F9 F7
+EMOJI_SURPRISED = F9 F8
+EMOJI_BIGSMILE = F9 F9
+EMOJI_EVIL = F9 FA
+EMOJI_TIRED = F9 FB
+EMOJI_NEUTRAL = F9 FC
+EMOJI_SHOCKED = F9 FD
+EMOJI_BIGANGER = F9 FE
 
 '\l' = FA @ scroll up window text
 '\p' = FB @ new paragraph

common_syms/field_specials.txt

@@ -0,0 +1 @@
+gUnknown_030061D0

data/battle_anim_scripts.s

@@ -10484,7 +10484,7 @@ AnimScript_82D7ECA:
 	end
 
 Anim_StatChange:
-	createvisualtask sub_80AA18C, 0x5
+	createvisualtask AnimTask_StatsChange, 0x5
 	waitforvisualfinish
 	end
 

data/battle_frontier_2.s

@@ -498,7 +498,7 @@ gUnknown_08610970:: @ 8610970
 	.string "LAMONT$", 8
 	.string "XAV$", 8
 	.string "ORFEO$", 8
-	.string "J{0xf3}RGEN$", 8 @accent?
+	.string "JÜRGEN$", 8
 	.string "JORGE$", 8
 	.byte 0x90, 0xE5
 	.2byte 0x19

data/battle_scripts_1.s

@@ -2240,34 +2240,34 @@ BattleScript_EffectMemento::
 	setatkhptozero
 	attackanimation
 	waitanimation
-	jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_82DA148
+	jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectMementoPrintNoEffect
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, 0x12, 0x7
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, 0x2, 0x3
+	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
 	setstatchanger STAT_ATK, 2, TRUE
-	statbuffchange 0x1, BattleScript_82DA119
+	statbuffchange 0x1, BattleScript_EffectMementoTrySpAtk
-	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DA119
+	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTrySpAtk
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
-BattleScript_82DA119::
+BattleScript_EffectMementoTrySpAtk:
-	playstatchangeanimation BS_TARGET, 0x10, 0x3
+	playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
 	setstatchanger STAT_SPATK, 2, TRUE
-	statbuffchange 0x1, BattleScript_82DA13C
+	statbuffchange 0x1, BattleScript_EffectMementoTryFaint
-	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_82DA13C
+	jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 0x1, BattleScript_EffectMementoTryFaint
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
-BattleScript_82DA13C::
+BattleScript_EffectMementoTryFaint:
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	goto BattleScript_MoveEnd
-BattleScript_82DA148::
+BattleScript_EffectMementoPrintNoEffect:
 	printstring STRINGID_BUTNOEFFECT
 	waitmessage 0x40
-	goto BattleScript_82DA13C
+	goto BattleScript_EffectMementoTryFaint
-BattleScript_82DA153::
+BattleScript_82DA153:
 	attackstring
 	ppreduce
 	jumpifattackandspecialattackcannotfall BattleScript_82DA15A
-BattleScript_82DA15A::
+BattleScript_82DA15A:
 	setatkhptozero
 	pause 0x40
 	effectivenesssound
@@ -2688,16 +2688,16 @@ BattleScript_TickleDoMoveAnim::
 	accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
 	attackanimation
 	waitanimation
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_TARGET, 0x6, 0x5
+	playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_TARGET, 0x2, 0x1
+	playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
 	statbuffchange 0x1, BattleScript_TickleTryLowerDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleTryLowerDef
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_TickleTryLowerDef::
-	playstatchangeanimation BS_TARGET, 0x4, 0x1
+	playstatchangeanimation BS_TARGET, BIT_DEF, ATK48_STAT_NEGATIVE
 	setstatchanger STAT_DEF, 1, TRUE
 	statbuffchange 0x1, BattleScript_TickleEnd
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TickleEnd
@@ -2722,8 +2722,8 @@ BattleScript_EffectCosmicPower::
 BattleScript_CosmicPowerDoMoveAnim::
 	attackanimation
 	waitanimation
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, 0x24, 0x0
+	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0x0
 	setstatchanger STAT_DEF, 1, FALSE
 	statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CosmicPowerTrySpDef
@@ -2751,8 +2751,8 @@ BattleScript_EffectBulkUp::
 BattleScript_BulkUpDoMoveAnim::
 	attackanimation
 	waitanimation
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, 0x6, 0x0
+	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
 	statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_BulkUpTryDef
@@ -2776,8 +2776,8 @@ BattleScript_EffectCalmMind::
 BattleScript_CalmMindDoMoveAnim::
 	attackanimation
 	waitanimation
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, 0x30, 0x0
+	playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0x0
 	setstatchanger STAT_SPATK, 1, FALSE
 	statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CalmMindTrySpDef
@@ -2808,8 +2808,8 @@ BattleScript_EffectDragonDance::
 BattleScript_DragonDanceDoMoveAnim::
 	attackanimation
 	waitanimation
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, 0xA, 0x0
+	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
 	statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DragonDanceTrySpeed
@@ -3487,8 +3487,8 @@ BattleScript_AllStatsUp::
 	jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 0xC, BattleScript_AllStatsUpAtk
 	jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 0xC, BattleScript_AllStatsUpRet
 BattleScript_AllStatsUpAtk::
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, 0x3E, 0x0
+	playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
 	setstatchanger STAT_ATK, 1, FALSE
 	statbuffchange MOVE_EFFECT_AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef
 	printfromtable gStatUpStringIds
@@ -3655,16 +3655,16 @@ BattleScript_PrintMonIsRooted::
 	goto BattleScript_MoveEnd
 
 BattleScript_AtkDefDown::
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, 0x6, 0xD
+	playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE
-	playstatchangeanimation BS_ATTACKER, 0x2, 0x9
+	playstatchangeanimation BS_ATTACKER, BIT_ATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
 	setstatchanger STAT_ATK, 1, TRUE
 	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB144
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB144
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
 BattleScript_82DB144::
-	playstatchangeanimation BS_ATTACKER, 0x4, 0x9
+	playstatchangeanimation BS_ATTACKER, BIT_DEF, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE
 	setstatchanger STAT_DEF, 1, TRUE
 	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB167
 	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB167
@@ -3729,14 +3729,14 @@ BattleScript_OneHitKOMsg::
 	return
 
 BattleScript_SAtkDown2::
-	setbyte sFIELD_1B, 0x0
+	setbyte sSTAT_ANIM_PLAYED, FALSE
-	playstatchangeanimation BS_ATTACKER, 0x10, 0xB
+	playstatchangeanimation BS_ATTACKER, BIT_SPATK, ATK48_DONT_CHECK_LOWER | ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO
 	setstatchanger STAT_SPATK, 2, TRUE
-	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_82DB1FE
+	statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | 0x1, BattleScript_SAtkDown2End
-	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_82DB1FE
+	jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_SAtkDown2End
 	printfromtable gStatDownStringIds
 	waitmessage 0x40
-BattleScript_82DB1FE::
+BattleScript_SAtkDown2End::
 	return
 
 BattleScript_FocusPunchSetUp::

data/battle_scripts_2.s

@@ -4,6 +4,7 @@
 #include "constants/battle_string_ids.h"
 #include "constants/items.h"
 #include "constants/songs.h"
+#include "constants/game_stat.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_script.inc"
 	.include "constants/constants.inc"
@@ -62,7 +63,7 @@ BattleScript_SafariBallThrow::
 
 BattleScript_SuccessBallThrow::
 	jumpifhalfword CMP_EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
-	incrementgamestat 0xB
+	incrementgamestat GAME_STAT_POKEMON_CAPTURES
 BattleScript_PrintCaughtMonInfo::
 	printstring STRINGID_GOTCHAPKMNCAUGHT
 	trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon

data/data2b.s

@@ -4630,235 +4630,3 @@ gUnknown_08305D0C:: @ 8305D0C
 	.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
 	.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
 	.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
-
-@ 830B62C
-	.include "data/trainer_parties.inc"
-
-@ 830FCD4
-	.include "data/text/trainer_class_names.inc"
-
-@ 8310030
-	.include "data/trainers.inc"
-
-@ 83185C8
-	.include "data/text/species_names.inc"
-
-@ 831977C
-	.include "data/text/move_names.inc"
-
-.align 2
-	.2byte 0x0300, 0x0000
-
-	.align 2
-gUnknown_0831A988:: @ 831A988
-	.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0831A990:: @ 831A990
-	.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0831A998:: @ 831A998
-	.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gUnknown_0831A9A8:: @ 831A9A8
-	.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
-	.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
-	.align 2
-gUnknown_0831A9C8:: @ 831A9C8
-	.4byte gUnknown_0831A998
-	.4byte gUnknown_0831A9A8
-
-	.align 2
-gUnknown_0831A9D0:: @ 831A9D0
-	spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
-
-	.align 2
-gUnknown_0831A9E8:: @ 831A9E8
-	spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
-
-	.align 2
-gUnknown_0831AA00:: @ 831AA00
-	obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
-
-	.align 2
-gBattleBgTemplates:: @ 831AA08
-	.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
-
-	.align 2
-gUnknown_0831AA18:: @ 831AA18
-	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
-	window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
-	window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
-	window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
-	window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
-	window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
-	window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
-	window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
-	window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
-	window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
-	window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
-	window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
-	window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
-	window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
-	window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
-	window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
-	window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
-	window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
-	window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
-	window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
-	window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
-	window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
-	window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
-	window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
-	null_window_template
-
-	.align 2
-gUnknown_0831AAE0:: @ 831AAE0
-	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
-	window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
-	window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
-	window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
-	window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
-	window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
-	window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
-	window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
-	window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
-	window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
-	window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
-	window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
-	window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
-	window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
-	window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
-	window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
-	window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
-	window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
-	window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
-	window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
-	window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
-	window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
-	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
-	null_window_template
-
-	.align 2
-gBattleWindowTemplates:: @ 831ABA0
-	.4byte gUnknown_0831AA18
-	.4byte gUnknown_0831AAE0
-
-	.align 2
-gBattleTerrainTable:: @ 831ABA8
-	@ tall_grass
-	.4byte gBattleTerrainTiles_TallGrass
-	.4byte gBattleTerrainTilemap_TallGrass
-	.4byte gBattleTerrainAnimTiles_TallGrass
-	.4byte gBattleTerrainAnimTilemap_TallGrass
-	.4byte gBattleTerrainPalette_TallGrass
-
-	@ long_grass
-	.4byte gBattleTerrainTiles_LongGrass
-	.4byte gBattleTerrainTilemap_LongGrass
-	.4byte gBattleTerrainAnimTiles_LongGrass
-	.4byte gBattleTerrainAnimTilemap_LongGrass
-	.4byte gBattleTerrainPalette_LongGrass
-
-	@ sand
-	.4byte gBattleTerrainTiles_Sand
-	.4byte gBattleTerrainTilemap_Sand
-	.4byte gBattleTerrainAnimTiles_Sand
-	.4byte gBattleTerrainAnimTilemap_Sand
-	.4byte gBattleTerrainPalette_Sand
-
-	@ underwater
-	.4byte gBattleTerrainTiles_Underwater
-	.4byte gBattleTerrainTilemap_Underwater
-	.4byte gBattleTerrainAnimTiles_Underwater
-	.4byte gBattleTerrainAnimTilemap_Underwater
-	.4byte gBattleTerrainPalette_Underwater
-
-	@ water
-	.4byte gBattleTerrainTiles_Water
-	.4byte gBattleTerrainTilemap_Water
-	.4byte gBattleTerrainAnimTiles_Water
-	.4byte gBattleTerrainAnimTilemap_Water
-	.4byte gBattleTerrainPalette_Water
-
-	@ pond_water
-	.4byte gBattleTerrainTiles_PondWater
-	.4byte gBattleTerrainTilemap_PondWater
-	.4byte gBattleTerrainAnimTiles_PondWater
-	.4byte gBattleTerrainAnimTilemap_PondWater
-	.4byte gBattleTerrainPalette_PondWater
-
-	@ rock
-	.4byte gBattleTerrainTiles_Rock
-	.4byte gBattleTerrainTilemap_Rock
-	.4byte gBattleTerrainAnimTiles_Rock
-	.4byte gBattleTerrainAnimTilemap_Rock
-	.4byte gBattleTerrainPalette_Rock
-
-	@ cave
-	.4byte gBattleTerrainTiles_Cave
-	.4byte gBattleTerrainTilemap_Cave
-	.4byte gBattleTerrainAnimTiles_Cave
-	.4byte gBattleTerrainAnimTilemap_Cave
-	.4byte gBattleTerrainPalette_Cave
-
-	@ building
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Building
-
-	@ plain
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Plain
-
-	.align 2
-gUnknown_0831AC70:: @ 831AC70
-	.4byte REG_BG3HOFS
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-	.4byte REG_BG3HOFS
-	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
-	.4byte 1
-
-	.align 2
-gUnknown_0831AC88:: @ 831AC88
-	spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
-
-gText_ShedinjaJapaneseName:: @ 831ACA0
-	.string "ヌケニン$" @ Nukenin
-    
-	.align 2
-gUnknown_0831ACA8:: @ 831ACA8
-	.2byte 0x0100
-	.2byte 0xC000
-	.2byte 0x0800
-
-	.align 2
-gUnknown_0831ACB0:: @ 831ACB0
-	.2byte 0x0100
-	.2byte 0xC000
-	.2byte 0x2800
-
-	.align 2
-gUnknown_0831ACB8:: @ 831ACB8
-	.2byte 0x0000, 0x0005, 0xfffe, 0x0000
-
-	.align 2
-gUnknown_0831ACC0:: @ 831ACC0
-	.4byte gUnknown_0831ACB8
-
-	.align 2
-gUnknown_0831ACC4:: @ 831ACC4
-	.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
-
-	.align 2
-gUnknown_0831ACDC:: @ 831ACDC
-	.4byte gUnknown_0831ACC4

data/data2c.s

@@ -0,0 +1,226 @@
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/species.h"
+#include "constants/trainers.h"
+#include "constants/pokemon.h"
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+       .2byte 0x0300, 0x0000
+
+	.align 2
+gUnknown_0831A988:: @ 831A988
+	.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
+
+	.align 2
+gUnknown_0831A990:: @ 831A990
+	.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
+
+	.align 2
+gUnknown_0831A998:: @ 831A998
+	.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gUnknown_0831A9A8:: @ 831A9A8
+	.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
+	.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
+
+	.align 2
+gUnknown_0831A9C8:: @ 831A9C8
+	.4byte gUnknown_0831A998
+	.4byte gUnknown_0831A9A8
+
+	.align 2
+gUnknown_0831A9D0:: @ 831A9D0
+	spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
+
+	.align 2
+gUnknown_0831A9E8:: @ 831A9E8
+	spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
+
+	.align 2
+gUnknown_0831AA00:: @ 831AA00
+	obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
+
+	.align 2
+gBattleBgTemplates:: @ 831AA08
+	.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
+
+	.align 2
+gUnknown_0831AA18:: @ 831AA18
+	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
+	window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
+	window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
+	window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
+	window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
+	window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
+	window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
+	window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
+	window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
+	window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
+	window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
+	window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
+	window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
+	window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
+	window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
+	window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
+	window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
+	window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
+	window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
+	window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
+	window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
+	window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
+	window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
+	window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
+	null_window_template
+
+	.align 2
+gUnknown_0831AAE0:: @ 831AAE0
+	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
+	window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
+	window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
+	window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
+	window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
+	window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
+	window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
+	window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
+	window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
+	window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
+	window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
+	window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
+	window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
+	window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
+	window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
+	window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
+	window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
+	window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
+	window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
+	window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
+	window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
+	window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
+	window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
+	null_window_template
+
+	.align 2
+gBattleWindowTemplates:: @ 831ABA0
+	.4byte gUnknown_0831AA18
+	.4byte gUnknown_0831AAE0
+
+	.align 2
+gBattleTerrainTable:: @ 831ABA8
+	@ tall_grass
+	.4byte gBattleTerrainTiles_TallGrass
+	.4byte gBattleTerrainTilemap_TallGrass
+	.4byte gBattleTerrainAnimTiles_TallGrass
+	.4byte gBattleTerrainAnimTilemap_TallGrass
+	.4byte gBattleTerrainPalette_TallGrass
+
+	@ long_grass
+	.4byte gBattleTerrainTiles_LongGrass
+	.4byte gBattleTerrainTilemap_LongGrass
+	.4byte gBattleTerrainAnimTiles_LongGrass
+	.4byte gBattleTerrainAnimTilemap_LongGrass
+	.4byte gBattleTerrainPalette_LongGrass
+
+	@ sand
+	.4byte gBattleTerrainTiles_Sand
+	.4byte gBattleTerrainTilemap_Sand
+	.4byte gBattleTerrainAnimTiles_Sand
+	.4byte gBattleTerrainAnimTilemap_Sand
+	.4byte gBattleTerrainPalette_Sand
+
+	@ underwater
+	.4byte gBattleTerrainTiles_Underwater
+	.4byte gBattleTerrainTilemap_Underwater
+	.4byte gBattleTerrainAnimTiles_Underwater
+	.4byte gBattleTerrainAnimTilemap_Underwater
+	.4byte gBattleTerrainPalette_Underwater
+
+	@ water
+	.4byte gBattleTerrainTiles_Water
+	.4byte gBattleTerrainTilemap_Water
+	.4byte gBattleTerrainAnimTiles_Water
+	.4byte gBattleTerrainAnimTilemap_Water
+	.4byte gBattleTerrainPalette_Water
+
+	@ pond_water
+	.4byte gBattleTerrainTiles_PondWater
+	.4byte gBattleTerrainTilemap_PondWater
+	.4byte gBattleTerrainAnimTiles_PondWater
+	.4byte gBattleTerrainAnimTilemap_PondWater
+	.4byte gBattleTerrainPalette_PondWater
+
+	@ rock
+	.4byte gBattleTerrainTiles_Rock
+	.4byte gBattleTerrainTilemap_Rock
+	.4byte gBattleTerrainAnimTiles_Rock
+	.4byte gBattleTerrainAnimTilemap_Rock
+	.4byte gBattleTerrainPalette_Rock
+
+	@ cave
+	.4byte gBattleTerrainTiles_Cave
+	.4byte gBattleTerrainTilemap_Cave
+	.4byte gBattleTerrainAnimTiles_Cave
+	.4byte gBattleTerrainAnimTilemap_Cave
+	.4byte gBattleTerrainPalette_Cave
+
+	@ building
+	.4byte gBattleTerrainTiles_Building
+	.4byte gBattleTerrainTilemap_Building
+	.4byte gBattleTerrainAnimTiles_Building
+	.4byte gBattleTerrainAnimTilemap_Building
+	.4byte gBattleTerrainPalette_Building
+
+	@ plain
+	.4byte gBattleTerrainTiles_Building
+	.4byte gBattleTerrainTilemap_Building
+	.4byte gBattleTerrainAnimTiles_Building
+	.4byte gBattleTerrainAnimTilemap_Building
+	.4byte gBattleTerrainPalette_Plain
+
+	.align 2
+gUnknown_0831AC70:: @ 831AC70
+	.4byte REG_BG3HOFS
+	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
+	.4byte 1
+	.4byte REG_BG3HOFS
+	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
+	.4byte 1
+
+	.align 2
+gUnknown_0831AC88:: @ 831AC88
+	spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
+
+gText_ShedinjaJapaneseName:: @ 831ACA0
+	.string "ヌケニン$" @ Nukenin
+    
+	.align 2
+gUnknown_0831ACA8:: @ 831ACA8
+	.2byte 0x0100
+	.2byte 0xC000
+	.2byte 0x0800
+
+	.align 2
+gUnknown_0831ACB0:: @ 831ACB0
+	.2byte 0x0100
+	.2byte 0xC000
+	.2byte 0x2800
+
+	.align 2
+gUnknown_0831ACB8:: @ 831ACB8
+	.2byte 0x0000, 0x0005, 0xfffe, 0x0000
+
+	.align 2
+gUnknown_0831ACC0:: @ 831ACC0
+	.4byte gUnknown_0831ACB8
+
+	.align 2
+gUnknown_0831ACC4:: @ 831ACC4
+	.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
+
+	.align 2
+gUnknown_0831ACDC:: @ 831ACDC
+	.4byte gUnknown_0831ACC4

data/event_scripts.s

@@ -5,6 +5,7 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/vars.h"
+#include "constants/heal_locations.h"
 #include "constants/trainers.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
@@ -1110,10 +1111,10 @@ EventScript_2715DE:: @ 82715DE
 	setflag FLAG_0x2DE
 	setflag FLAG_0x351
 	setflag FLAG_0x32F
-	setflag FLAG_0x315
+	setflag FLAG_HIDE_FANCLUB_OLD_LADY
-	setflag FLAG_0x316
+	setflag FLAG_HIDE_FANCLUB_BOY
-	setflag FLAG_0x317
+	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
-	setflag FLAG_0x318
+	setflag FLAG_HIDE_FANCLUB_LADY
 	setflag FLAG_0x2DA
 	setflag FLAG_0x31D
 	setflag FLAG_0x31E
@@ -1801,7 +1802,7 @@ EventScript_271E0E:: @ 8271E0E
 	checkflag FLAG_SYS_PC_LANETTE
 	call_if 1, EventScript_271E3E
 	msgbox gUnknown_082726A3, 4
-	special sub_80C7578
+	special ShowPokemonStorageSystem
 	waitstate
 	goto EventScript_271DAC
 	end
@@ -2356,8 +2357,8 @@ RusturfTunnel_EventScript_272216:: @ 8272216
 	removeobject 10
 	clearflag FLAG_0x328
 	clearflag FLAG_0x3D8
-	setvar VAR_0x409A, 6
+	setvar VAR_RUSTURF_TUNNEL_STATE, 6
-	setflag FLAG_0x0C7
+	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
 EventScript_27222B:: @ 827222B
@@ -2517,7 +2518,7 @@ Route119_EventScript_272365:: @ 8272365
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq Route119_EventScript_2723C1
 	compare VAR_RESULT, 4
@@ -3346,7 +3347,7 @@ EventScript_2736D9:: @ 82736D9
 	end
 
 EventScript_2736F4:: @ 82736F4
-	setrespawn 16
+	setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
 	return
 
 EventScript_2736F8:: @ 82736F8

data/field_specials.s

@@ -1,547 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_085B2B5C:: @ 85B2B5C
-	.byte 0x07, 0x09, 0x08, 0x0a
-
-	.align 2
-gUnknown_085B2B60:: @ 85B2B60
-	.byte 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00
-
-gUnknown_085B2B68:: @ 85B2B68
-	.byte 0x07, 0x16, 0x00, 0x00, 0x0b, 0x13, 0x00, 0x00, 0x0a, 0x10, 0x00, 0x00, 0x0f, 0x10, 0x00, 0x00
-
-gUnknown_085B2B78:: @ 85B2B78
-	.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x00
-
-	.align 1
-gUnknown_085B2B7E:: @ 85B2B7E
-	.2byte 0x0218, 0x0219, 0x021a, 0x021b, 0x021c
-
-gUnknown_085B2B88:: @ 85B2B88
-	.byte 0x0c, 0x02, 0x04, 0x05, 0x01, 0x08, 0x07, 0x0b, 0x03, 0x0a, 0x09, 0x06
-
-gUnknown_085B2B94:: @ 85B2B94
-	.byte 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x05
-
-gUnknown_085B2BA0:: @ 85B2BA0
-	.byte 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05
-
-	.align 2
-gUnknown_085B2BAC:: @ 85B2BAC
-	.byte 0x00, 0x15, 0x01, 0x08, 0x04, 0x0f, 0x08, 0x00
-
-	.align 2
-gElevatorFloorsTable:: @ 85B2BB4
-	.4byte gText_B4F
-	.4byte gText_B3F
-	.4byte gText_B2F
-	.4byte gText_B1F
-	.4byte gText_1F
-	.4byte gText_2F
-	.4byte gText_3F
-	.4byte gText_4F
-	.4byte gText_5F
-	.4byte gText_6F
-	.4byte gText_7F
-	.4byte gText_8F
-	.4byte gText_9F
-	.4byte gText_10F
-	.4byte gText_11F
-	.4byte gText_Rooftop
-
-	.align 1
-gUnknown_085B2BF4:: @ 85B2BF4
-	.2byte 0x0329, 0x032a, 0x032b, 0x0331, 0x0332, 0x0333, 0x0339, 0x033a, 0x033b
-
-	.align 1
-gUnknown_085B2C06:: @ 85B2C06
-	.2byte 0x0329, 0x032b, 0x032a, 0x0331, 0x0333, 0x0332, 0x0339, 0x033b, 0x033a
-
-gUnknown_085B2C18:: @ 85B2C18
-	.byte 0x08, 0x10, 0x18, 0x20, 0x26, 0x2e, 0x34, 0x38, 0x39
-
-gUnknown_085B2C21:: @ 85B2C21
-	.byte 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b
-
-	.align 1
-gUnknown_085B2C2A:: @ 85B2C2A
-	.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
-	.2byte 0x1a35, 0x193c, 0xffff
-
-	.align 2
-gUnknown_085B2C50:: @ 85B2C50
-	.4byte BattleFrontier_Lounge2_Text_260971
-	.4byte BattleFrontier_Lounge2_Text_260A1E
-	.4byte BattleFrontier_Lounge2_Text_260AE7
-	.4byte BattleFrontier_Lounge2_Text_2619AC
-	.4byte BattleFrontier_Lounge2_Text_261A91
-	.4byte BattleFrontier_Lounge2_Text_261B0C
-	.4byte BattleFrontier_Lounge2_Text_261B95
-	.4byte BattleFrontier_Lounge2_Text_261B95
-	.4byte BattleFrontier_Lounge2_Text_261B95
-	.4byte BattleFrontier_Lounge2_Text_261C1A
-	.4byte BattleFrontier_Lounge2_Text_261C1A
-	.4byte BattleFrontier_Lounge2_Text_261C1A
-	.4byte BattleFrontier_Lounge2_Text_260BC4
-	.4byte BattleFrontier_Lounge2_Text_260C6D
-	.4byte BattleFrontier_Lounge2_Text_260D3A
-	.4byte BattleFrontier_Lounge2_Text_260E1E
-	.4byte BattleFrontier_Lounge2_Text_260EC7
-	.4byte BattleFrontier_Lounge2_Text_260F74
-	.4byte BattleFrontier_Lounge2_Text_2614E6
-	.4byte BattleFrontier_Lounge2_Text_261591
-	.4byte BattleFrontier_Lounge2_Text_26166F
-	.4byte BattleFrontier_Lounge2_Text_261282
-	.4byte BattleFrontier_Lounge2_Text_261329
-	.4byte BattleFrontier_Lounge2_Text_261403
-	.4byte BattleFrontier_Lounge2_Text_261026
-	.4byte BattleFrontier_Lounge2_Text_2610CC
-	.4byte BattleFrontier_Lounge2_Text_261194
-	.4byte BattleFrontier_Lounge2_Text_26174D
-	.4byte BattleFrontier_Lounge2_Text_2617F9
-	.4byte BattleFrontier_Lounge2_Text_2618C4
-
-gUnknown_085B2CC8:: @ 85B2CC8
-	.byte 0x15, 0x38, 0x15, 0x23, 0xff, 0xff, 0xff, 0xff, 0x02, 0x04, 0x07, 0x15, 0x07, 0x15, 0x0e, 0x1c, 0x0d, 0x70, 0x07, 0x38
-
-	.align 1
-gUnknown_085B2CDC:: @ 85B2CDC
-	.2byte 0x0007, 0x000e, 0x0015, 0x001c, 0x0023, 0x0031, 0x003f, 0x004d, 0x005b, 0x0000
-
-	.align 2
-gUnknown_085B2CF0:: @ 85B2CF0
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_BlueFlute
-	.4byte gText_YellowFlute
-	.4byte gText_RedFlute
-	.4byte gText_WhiteFlute
-	.4byte gText_BlackFlute
-	.4byte gText_PrettyChair
-	.4byte gText_PrettyDesk
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_0Pts
-	.4byte gText_10Pts
-	.4byte gText_20Pts
-	.4byte gText_30Pts
-	.4byte gText_40Pts
-	.4byte gText_50Pts
-	.4byte gText_60Pts
-	.4byte gText_70Pts
-	.4byte gText_80Pts
-	.4byte gText_90Pts
-	.4byte gText_100Pts
-	.4byte gText_QuestionMark
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_KissPoster16BP
-	.4byte gText_KissCushion32BP
-	.4byte gText_SmoochumDoll32BP
-	.4byte gText_TogepiDoll48BP
-	.4byte gText_MeowthDoll48BP
-	.4byte gText_ClefairyDoll48BP
-	.4byte gText_DittoDoll48BP
-	.4byte gText_CyndaquilDoll80BP
-	.4byte gText_ChikoritaDoll80BP
-	.4byte gText_TotodileDoll80BP
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_LaprasDoll128BP
-	.4byte gText_SnorlaxDoll128BP
-	.4byte gText_VenusaurDoll256BP
-	.4byte gText_CharizardDoll256BP
-	.4byte gText_BlastoiseDoll256BP
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_Protein1BP
-	.4byte gText_Calcium1BP
-	.4byte gText_Iron1BP
-	.4byte gText_Zinc1BP
-	.4byte gText_Carbos1BP
-	.4byte gText_HpUp1BP
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_Leftovers48BP
-	.4byte gText_WhiteHerb48BP
-	.4byte gText_QuickClaw48BP
-	.4byte gText_MentalHerb48BP
-	.4byte gText_BrightPowder64BP
-	.4byte gText_ChoiceBand64BP
-	.4byte gText_KingsRock64BP
-	.4byte gText_FocusBand64BP
-	.4byte gText_ScopeLens64BP
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_EnergyPowder50
-	.4byte gText_EnergyRoot80
-	.4byte gText_HealPowder50
-	.4byte gText_RevivalHerb300
-	.4byte gText_Protein1000
-	.4byte gText_Iron1000
-	.4byte gText_Carbos1000
-	.4byte gText_Calcium1000
-	.4byte gText_Zinc1000
-	.4byte gText_HPUp1000
-	.4byte gText_PPUp3000
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_BattleTower2
-	.4byte gText_BattleDome
-	.4byte gText_BattlePalace
-	.4byte gText_BattleArena
-	.4byte gText_BattleFactory
-	.4byte gText_BattlePike
-	.4byte gText_BattlePyramid
-	.4byte gText_RankingHall
-	.4byte gText_ExchangeService
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_Softboiled16BP
-	.4byte gText_SeismicToss24BP
-	.4byte gText_DreamEater24BP
-	.4byte gText_MegaPunch24BP
-	.4byte gText_MegaKick48BP
-	.4byte gText_BodySlam48BP
-	.4byte gText_RockSlide48BP
-	.4byte gText_Counter48BP
-	.4byte gText_ThunderWave48BP
-	.4byte gText_SwordsDance48BP
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_DefenseCurl16BP
-	.4byte gText_Snore24BP
-	.4byte gText_MudSlap24BP
-	.4byte gText_Swift24BP
-	.4byte gText_IcyWind24BP
-	.4byte gText_Endure48BP
-	.4byte gText_PsychUp48BP
-	.4byte gText_IcePunch48BP
-	.4byte gText_ThunderPunch48BP
-	.4byte gText_FirePunch48BP
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_SlateportCity
-	.4byte gText_BattleFrontier
-	.4byte gText_SouthernIsland
-	.4byte gText_NavelRock
-	.4byte gText_BirthIsland
-	.4byte gText_FarawayIsland
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.4byte gText_BattleTrainers
-	.4byte gText_BattleBasics
-	.4byte gText_PokemonNature
-	.4byte gText_PokemonMoves
-	.4byte gText_Underpowered
-	.4byte gText_WhenInDanger
-	.4byte gText_Exit
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-	.4byte NULL
-
-	.align 2
-gUnknown_085B3030:: @ 85B3030
-	.4byte 0x03000002, 0x00000000, 0x07d00000, 0x00000064
-
-	.align 2
-gUnknown_085B3040:: @ 85B3040
-	.4byte BattleFrontier_Lounge5_Text_26468D
-	.4byte BattleFrontier_Lounge5_Text_2646E5
-	.4byte BattleFrontier_Lounge5_Text_264741
-	.4byte BattleFrontier_Lounge5_Text_2647A4
-	.4byte BattleFrontier_Lounge5_Text_2647FC
-	.4byte BattleFrontier_Lounge5_Text_264858
-	.4byte BattleFrontier_Lounge5_Text_2648BE
-	.4byte BattleFrontier_Lounge5_Text_264916
-	.4byte BattleFrontier_Lounge5_Text_264972
-	.4byte BattleFrontier_Lounge5_Text_2649D5
-	.4byte BattleFrontier_Lounge5_Text_264A3F
-	.4byte BattleFrontier_Lounge5_Text_264A9B
-	.4byte BattleFrontier_Lounge5_Text_264AF3
-	.4byte BattleFrontier_Lounge5_Text_264B5D
-	.4byte BattleFrontier_Lounge5_Text_2648BE
-	.4byte BattleFrontier_Lounge5_Text_264BC3
-	.4byte BattleFrontier_Lounge5_Text_264C36
-	.4byte BattleFrontier_Lounge5_Text_2648BE
-	.4byte BattleFrontier_Lounge5_Text_264C95
-	.4byte BattleFrontier_Lounge5_Text_264D01
-	.4byte BattleFrontier_Lounge5_Text_264D6B
-	.4byte BattleFrontier_Lounge5_Text_264DD7
-	.4byte BattleFrontier_Lounge5_Text_264E33
-	.4byte BattleFrontier_Lounge5_Text_264E8F
-	.4byte BattleFrontier_Lounge5_Text_2648BE
-
-	.align 2
-gUnknown_085B30A4:: @ 85B30A4
-	.4byte BattleFrontier_Lounge3_Text_262261
-	.4byte BattleFrontier_Lounge3_Text_26230D
-	.4byte BattleFrontier_Lounge3_Text_2623B9
-	.4byte BattleFrontier_Lounge3_Text_262464
-	.4byte BattleFrontier_Lounge3_Text_26250E
-	.4byte BattleFrontier_Lounge3_Text_2625B8
-	.4byte BattleFrontier_Lounge3_Text_26266A
-	.4byte BattleFrontier_Lounge3_Text_26271C
-	.4byte BattleFrontier_Lounge3_Text_2627C9
-	.4byte BattleFrontier_Lounge3_Text_262876
-	.4byte BattleFrontier_Lounge3_Text_26291A
-	.4byte BattleFrontier_Lounge3_Text_2629BC
-
-	.align 2
-gUnknown_085B30D4:: @ 85B30D4
-	.4byte BattleFrontier_Lounge3_Text_262C04
-	.4byte BattleFrontier_Lounge3_Text_262C90
-	.4byte BattleFrontier_Lounge3_Text_262D1C
-	.4byte BattleFrontier_Lounge3_Text_262DA7
-	.4byte BattleFrontier_Lounge3_Text_262E34
-	.4byte BattleFrontier_Lounge3_Text_262EC1
-	.4byte BattleFrontier_Lounge3_Text_262F56
-	.4byte BattleFrontier_Lounge3_Text_262FEB
-	.4byte BattleFrontier_Lounge3_Text_263078
-	.4byte BattleFrontier_Lounge3_Text_263105
-	.4byte BattleFrontier_Lounge3_Text_26318C
-	.4byte BattleFrontier_Lounge3_Text_263211
-
-	.align 1
-gUnknown_085B3104:: @ 85B3104
-	.2byte 0x0000, 0x0001, 0x0002, 0x0100, 0x0101, 0x0400, 0x0401, 0x0200, 0x0201, 0x0300, 0x0500, 0x0600
-
-	.align 2
-gUnknown_085B311C:: @ 85B311C
-	window_template 0x00, 0x01, 0x01, 0x06, 0x02, 0x0f, 0x0008
-
-	.align 2
-gUnknown_085B3124:: @ 85B3124
-	window_template 0x00, 0x02, 0x09, 0x04, 0x04, 0x0f, 0x0014
-
-	.align 1
-gUnknown_085B312C:: @ 85B312C
-	.2byte 0x004b, 0x0067, 0x0057, 0x004f, 0x0054, 0x0055, 0x0056, 0x0050, 0x0051, 0x0052, 0xffff
-
-	.align 1
-gUnknown_085B3142:: @ 85B3142
-	.2byte 0x0071, 0x006f, 0x0072, 0x0073, 0x0074, 0xffff
-
-	.align 1
-gUnknown_085B314E:: @ 85B314E
-	.2byte 0x0040, 0x0043, 0x0041, 0x0046, 0x0042, 0x003f, 0xffff
-
-	.align 1
-gUnknown_085B315C:: @ 85B315C
-	.2byte 0x00c8, 0x00b4, 0x00b7, 0x00b9, 0x00b3, 0x00ba, 0x00bb, 0x00c4, 0x00c6, 0xffff
-
-	.align 2
-gUnknown_085B3170:: @ 85B3170
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601AA
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2601D0
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260201
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26022F
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26025B
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260287
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602B5
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2602E0
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26030F
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26033E
-	.4byte gText_Exit
-
-	.align 2
-gUnknown_085B319C:: @ 85B319C
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26036C
-	.4byte gText_Exit
-
-	.align 2
-gUnknown_085B31B4:: @ 85B31B4
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260397
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603BE
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2603E6
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26040E
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260436
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26045C
-	.4byte gText_Exit
-
-	.align 2
-gUnknown_085B31D0:: @ 85B31D0
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26047A
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604AC
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2604D8
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_26050F
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260542
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260575
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_2605E2
-	.4byte BattleFrontier_BattlePointExchangeServiceCorner_Text_260613
-	.4byte gText_Exit
-
-	.align 1
-gUnknown_085B31F8:: @ 85B31F8
-	.2byte 0x0087, 0x0045, 0x008a, 0x0005, 0x0019, 0x0022, 0x009d, 0x0044, 0x0056, 0x000e
-
-	.align 1
-gUnknown_085B320C:: @ 85B320C
-	.2byte 0x006f, 0x00ad, 0x00bd, 0x0081, 0x00c4, 0x00cb, 0x00f4, 0x0008, 0x0009, 0x0007
-
-	.align 2
-gUnknown_085B3220:: @ 85B3220
-	window_template 0x00, 0x01, 0x07, 0x0c, 0x06, 0x0f, 0x001c
-
-	.align 2
-gUnknown_085B3228:: @ 85B3228
-	.4byte BattleFrontier_Lounge7_Text_265E30
-	.4byte BattleFrontier_Lounge7_Text_265E5B
-	.4byte BattleFrontier_Lounge7_Text_265E8A
-	.4byte BattleFrontier_Lounge7_Text_265EC0
-	.4byte BattleFrontier_Lounge7_Text_265EED
-	.4byte BattleFrontier_Lounge7_Text_265F1C
-	.4byte BattleFrontier_Lounge7_Text_265F47
-	.4byte BattleFrontier_Lounge7_Text_265F77
-	.4byte BattleFrontier_Lounge7_Text_265FAA
-	.4byte BattleFrontier_Lounge7_Text_265FDD
-	.4byte gText_Exit
-
-	.align 2
-gUnknown_085B3254:: @ 85B3254
-	.4byte BattleFrontier_Lounge7_Text_26600A
-	.4byte BattleFrontier_Lounge7_Text_26603E
-	.4byte BattleFrontier_Lounge7_Text_266070
-	.4byte BattleFrontier_Lounge7_Text_2660A6
-	.4byte BattleFrontier_Lounge7_Text_2660D0
-	.4byte BattleFrontier_Lounge7_Text_2660FF
-	.4byte BattleFrontier_Lounge7_Text_26612D
-	.4byte BattleFrontier_Lounge7_Text_26615F
-	.4byte BattleFrontier_Lounge7_Text_266185
-	.4byte BattleFrontier_Lounge7_Text_2661B5
-	.4byte gText_Exit
-
-	.align 2
-gUnknown_085B3280:: @ 85B3280
-	.incbin "graphics/unknown/unknown_5B3280.gbapal"
-
-gUnknown_085B33E0:: @ 85B33E0
-	.byte 0x0f, 0x0c, 0x0b, 0x0e, 0x0f, 0x08, 0x13, 0x0e, 0x0c, 0x0b, 0x12, 0x0b, 0x0f, 0x0e, 0x0b, 0x0e, 0x13, 0x0e, 0x0f, 0x0f, 0x0f, 0x0a
-
-gUnknown_085B33F6:: @ 85B33F6
-	.byte 0x04, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03
-
-gUnknown_085B3400:: @ 85B3400
-	.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
-
-gUnknown_085B3410:: @ 85B3410
-	.byte 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f, 0x21, 0x21, 0x14, 0x14, 0x28, 0x28, 0x2a, 0x2a, 0x2c, 0x2c
-
-gUnknown_085B3420:: @ 85B3420
-	.byte 0x02, 0x04, 0x01, 0x04, 0x04, 0x01, 0x05, 0x00, 0x01, 0x06, 0x03, 0x01, 0x08, 0x06, 0x01, 0x09, 0x0d, 0x01, 0x0a, 0x07, 0x01, 0x0b, 0x07, 0x01, 0x0c, 0x04, 0x01, 0x0e, 0x05, 0x01, 0x0f, 0x04
-	.byte 0x01, 0x1a, 0x37, 0x01
-
-	.align 1
-gUnknown_085B3444:: @ 85B3444
-	.2byte 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a
-	.2byte 0x1a35, 0x1918, 0x1919, 0x191a, 0x191b, 0xffff
-
-gUnknown_085B3470:: @ 85B3470
-	.byte 0x02, 0x01, 0x02, 0x01
-
-gUnknown_085B3474:: @ 85B3474
-	.byte 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-
-gUnknown_085B347C:: @ 85B347C
-	.byte 0x08, 0x0d, 0x0e, 0x0b, 0x0a, 0x0c, 0x0f, 0x09
-

data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc

@@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
 	setfieldeffectargument 1, 10
 	setfieldeffectargument 2, 0
 	dofieldeffect 54
-	specialvar VAR_RESULT, sub_81392F8
+	specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
 	compare VAR_RESULT, 0
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3
 	waitfieldeffect 54
@@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
-	specialvar VAR_RESULT, sub_81392AC
+	specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
 	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
 	delay 20
@@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
 	setfieldeffectargument 1, 3
 	setfieldeffectargument 2, 0
 	dofieldeffect 54
-	specialvar VAR_RESULT, sub_8139320
+	specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
 	compare VAR_RESULT, 0
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3
 	waitfieldeffect 54
@@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
 	setfieldeffectargument 1, 6
 	setfieldeffectargument 2, 0
 	dofieldeffect 54
-	specialvar VAR_RESULT, sub_81392D4
+	specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
 	compare VAR_RESULT, 0
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3
 	waitfieldeffect 54

data/maps/AncientTomb/scripts.inc

@@ -10,7 +10,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
 	end
 
 AncientTomb_EventScript_238FCD:: @ 8238FCD
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, AncientTomb_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ AncientTomb_EventScript_23905A:: @ 823905A
 	special StartRegiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq AncientTomb_EventScript_2390A1
 	compare VAR_RESULT, 4

data/maps/AquaHideout_B1F/scripts.inc

@@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
 	end
 
 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, AquaHideout_B1F_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -41,7 +41,7 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq AquaHideout_B1F_EventScript_233A2F
 	compare VAR_RESULT, 4
@@ -68,7 +68,7 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq AquaHideout_B1F_EventScript_233A7C
 	compare VAR_RESULT, 4

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -14,7 +14,7 @@ BattleFrontier_BattleTowerElevator_EventScript_2419F0:: @ 82419F0
 	waitmovement 0
 	special sub_813A080
 	waitse
-	special sub_8139A78
+	special ShakeScreenInElevator
 	waitstate
 	delay 48
 	applymovement 1, BattleFrontier_BattleTowerElevator_Movement_241A8E

data/maps/BattleFrontier_OutsideEast/scripts.inc

@@ -9,7 +9,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
 	end
 
 BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, BattleFrontier_OutsideEast_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -134,7 +134,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_OutsideEast_EventScript_242D60
 	compare VAR_RESULT, 4

data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
 	.byte 0
 
 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904
-	setrespawn 22
+	setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
 	end
 
 BattleFrontier_PokemonCenter_1F_EventScript_267908:: @ 8267908

data/maps/BirthIsland_Exterior/scripts.inc

@@ -37,7 +37,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
 	end
 
 BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, BirthIsland_Exterior_EventScript_27374E
 	removeobject 2
@@ -91,7 +91,7 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
 	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq BirthIsland_Exterior_EventScript_26803B
 	compare VAR_RESULT, 4

data/maps/DesertRuins/scripts.inc

@@ -10,7 +10,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
 	end
 
 DesertRuins_EventScript_22D975:: @ 822D975
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, DesertRuins_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -75,7 +75,7 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
 	special StartRegiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq DesertRuins_EventScript_22DA49
 	compare VAR_RESULT, 4

data/maps/DewfordTown_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
 	.byte 0
 
 DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E
-	setrespawn 15
+	setrespawn HEAL_LOCATION_DEWFORD_TOWN
 	call DewfordTown_PokemonCenter_1F_EventScript_2718DE
 	end
 

data/maps/EverGrandeCity_HallOfFame/scripts.inc

@@ -51,7 +51,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
 	end
 
 EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
-	setrespawn 1
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	fadescreenspeed 1, 24
 	special GameClear
 	waitstate
@@ -59,7 +59,7 @@ EverGrandeCity_HallOfFame_EventScript_2298E9:: @ 82298E9
 	end
 
 EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5
-	setrespawn 2
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	fadescreenspeed 1, 24
 	special GameClear
 	waitstate

data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
-	setrespawn 11
+	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
 	checkflag FLAG_0x1CF
 	call_if 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
 	end

data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc

@@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
 	.byte 0
 
 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
-	setrespawn 20
+	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
 	setflag FLAG_LANDMARK_POKEMON_LEAGUE
 	checkflag FLAG_0x107
 	call_if 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED

data/maps/FallarborTown_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
 	.byte 0
 
 FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8
-	setrespawn 17
+	setrespawn HEAL_LOCATION_FALLARBOR_TOWN
 	call FallarborTown_PokemonCenter_1F_EventScript_2718DE
 	end
 

data/maps/FarawayIsland_Interior/scripts.inc

@@ -11,7 +11,7 @@ FarawayIsland_Interior_MapScript1_267D0F: @ 8267D0F
 	end
 
 FarawayIsland_Interior_EventScript_267D19:: @ 8267D19
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq FarawayIsland_Interior_EventScript_267D4B
 	compare VAR_RESULT, 4
@@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
 	end
 
 FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, FarawayIsland_Interior_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -148,7 +148,7 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
 	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq FarawayIsland_Interior_EventScript_267E96
 	compare VAR_RESULT, 4

data/maps/FortreeCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
 	.byte 0
 
 FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3
-	setrespawn 7
+	setrespawn HEAL_LOCATION_FORTREE_CITY
 	end
 
 FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7

data/maps/InsideOfTruck/scripts.inc

@@ -24,7 +24,7 @@ InsideOfTruck_EventScript_23BF04:: @ 823BF04
 	end
 
 InsideOfTruck_EventScript_23BF20:: @ 823BF20
-	setrespawn 1
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	setvar VAR_0x4092, 1
 	setflag FLAG_0x2F7
 	setflag FLAG_0x2FA
@@ -37,7 +37,7 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20
 	end
 
 InsideOfTruck_EventScript_23BF46:: @ 823BF46
-	setrespawn 2
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	setvar VAR_0x4092, 2
 	setflag FLAG_0x2F6
 	setflag FLAG_0x2F9

data/maps/IslandCave/scripts.inc

@@ -10,7 +10,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A
 	end
 
 IslandCave_EventScript_238E44:: @ 8238E44
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, IslandCave_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -107,7 +107,7 @@ IslandCave_EventScript_238F58:: @ 8238F58
 	special StartRegiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq IslandCave_EventScript_238F9F
 	compare VAR_RESULT, 4

data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
 	.byte 0
 
 LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05
-	setrespawn 16
+	setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
 	call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE
 	end
 

data/maps/LilycoveCity/scripts.inc

@@ -255,7 +255,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
 	compare VAR_RESULT, 0
 	goto_eq LilycoveCity_EventScript_1E2E5A
 	msgbox LilycoveCity_Text_1E3234, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, LilycoveCity_EventScript_1E2EDE
 	case 1, LilycoveCity_EventScript_1E2EEE
 	case 2, LilycoveCity_EventScript_1E2EFE
@@ -286,7 +286,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
 	compare VAR_RESULT, 0
 	goto_eq LilycoveCity_EventScript_1E2ECD
 	msgbox LilycoveCity_Text_1E373C, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, LilycoveCity_EventScript_1E2F0E
 	case 1, LilycoveCity_EventScript_1E2F1E
 	case 2, LilycoveCity_EventScript_1E2F2E

data/maps/LilycoveCity_ContestLobby/events.inc

@@ -32,7 +32,7 @@ LilycoveCity_ContestLobby_MapWarps: @ 853178C
 	warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL
 
 LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
-	bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_294055
+	bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink
 	bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E
 	bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753
 	bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A
@@ -41,7 +41,7 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC
 	bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E
 	bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745
 	bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C
-	bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293C3E
+	bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask
 	bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D
 	bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784
 

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -877,7 +877,7 @@ LilycoveCity_ContestLobby_EventScript_21ABA0:: @ 821ABA0
 	return
 
 LilycoveCity_ContestLobby_EventScript_21ABA6:: @ 821ABA6
-	message LilycoveCity_ContestLobby_Text_27C1EA
+	message Text_DecideLinkLeader
 	waitmessage
 	multichoice 16, 6, 81, 0
 	switch VAR_RESULT

data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc

@@ -118,12 +118,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
 	applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_2725AA
 	waitmovement 0
 	waitse
-	special sub_8139A78
+	special ShakeScreenInElevator
 	waitstate
 	setflag FLAG_0x002
 	return
 
 LilycoveCity_DepartmentStoreElevator_EventScript_2207FC:: @ 82207FC
-	special sub_8139994
+	special SetDepartmentStoreFloorVar
 	return
 

data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc

@@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
 	waitmessage
 	special RetrieveLotteryNumber
 	copyvar VAR_0x8008, VAR_RESULT
-	special sub_81397C4
+	special BufferLottoTicketNumber
 	msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4
 	applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8
 	waitmovement 0

data/maps/LilycoveCity_Harbor/scripts.inc

@@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149
 	msgbox LilycoveCity_Harbor_Text_21E864, 5
 	compare VAR_RESULT, 0
 	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
-	setvar VAR_PORTHOLE, 5
+	setvar VAR_PORTHOLE_STATE, 5
 	call LilycoveCity_Harbor_EventScript_21E5CC
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
@@ -398,7 +398,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575
 	msgbox LilycoveCity_Harbor_Text_21E864, 5
 	compare VAR_RESULT, 0
 	goto_eq LilycoveCity_Harbor_EventScript_21E5C0
-	setvar VAR_PORTHOLE, 5
+	setvar VAR_PORTHOLE_STATE, 5
 	call LilycoveCity_Harbor_EventScript_21E5CC
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate

data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
 	.byte 0
 
 LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD
-	setrespawn 8
+	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6
 	end
 

data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc

@@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
 	.byte 0
 
 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
-	map_script_2 VAR_0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
+	map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A
 	.2byte 0
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
@@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
 	waitmovement 0
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
 	waitmovement 0
-	setvar VAR_0x4095, 2
+	setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2
 	releaseall
 	end
 
@@ -62,45 +62,45 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807
 
 LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA
-	compare VAR_0x4095, 1
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8
-	compare VAR_0x4095, 2
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 2
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C829
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C829:: @ 821C829
-	special sub_813BCE8
+	special UpdateMovedLilycoveFanClubMembers
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5
 	setvar VAR_0x8004, 8
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9B8
 	setvar VAR_0x8004, 9
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C0
 	setvar VAR_0x8004, 10
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9C8
 	setvar VAR_0x8004, 11
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D0
 	setvar VAR_0x8004, 12
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9D8
 	setvar VAR_0x8004, 13
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E0
 	setvar VAR_0x8004, 14
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9E8
 	setvar VAR_0x8004, 15
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F0
 	end
@@ -120,35 +120,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
 LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F5:: @ 821C8F5
 	setvar VAR_0x8005, 8
 	setvar VAR_0x8004, 8
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	setvar VAR_0x8004, 9
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	setvar VAR_0x8004, 10
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	setvar VAR_0x8004, 11
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	setvar VAR_0x8004, 12
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	setvar VAR_0x8004, 13
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	setvar VAR_0x8004, 14
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	setvar VAR_0x8004, 15
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 0
 	call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_21C9AE
 	compare VAR_0x8005, 5
@@ -208,13 +208,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
 	lock
 	faceplayer
 	setvar VAR_0x8004, 13
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	compare VAR_0x4095, 0
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4
@@ -222,7 +222,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4
@@ -248,13 +248,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
 	lock
 	faceplayer
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	compare VAR_0x4095, 0
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4
@@ -262,7 +262,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4
@@ -288,13 +288,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
 	lock
 	faceplayer
 	setvar VAR_0x8004, 9
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	compare VAR_0x4095, 0
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4
@@ -302,7 +302,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4
@@ -328,13 +328,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
 	lock
 	faceplayer
 	setvar VAR_0x8004, 10
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	compare VAR_0x4095, 0
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4
@@ -342,7 +342,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4
@@ -368,11 +368,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
 	lock
 	faceplayer
 	setvar VAR_0x8004, 11
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4
@@ -380,7 +380,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4
@@ -401,11 +401,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
 	lock
 	faceplayer
 	setvar VAR_0x8004, 12
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4
@@ -413,7 +413,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4
@@ -434,11 +434,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
 	lock
 	faceplayer
 	setvar VAR_0x8004, 14
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4
@@ -446,7 +446,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4
@@ -467,11 +467,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
 	lock
 	faceplayer
 	setvar VAR_0x8004, 15
-	special sub_813BDB4
+	special BufferStreakTrainerText
-	specialvar VAR_RESULT, sub_813BD60
+	specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4
@@ -479,7 +479,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D
-	specialvar VAR_RESULT, sub_813BCA8
+	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4
@@ -512,7 +512,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
 	copyvar VAR_0x800A, VAR_0x8006
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4
 	setvar VAR_0x8004, 14
 	copyvar VAR_0x8005, VAR_0x800A
@@ -532,7 +532,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -542,7 +542,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4
 	setvar VAR_0x8004, 14
 	copyvar VAR_0x8005, VAR_0x800A
@@ -557,7 +557,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	message LilycoveCity_PokemonTrainerFanClub_Text_281C95
 	waitmessage
 	setvar VAR_0x8004, 2
@@ -568,7 +568,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
 	case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
 	case 127, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	copyvar VAR_0x8006, VAR_0x800A
 	copyvar VAR_0x8005, VAR_RESULT
 	special PutFanClubSpecialOnTheAir
@@ -577,7 +577,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5
 	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
@@ -587,14 +587,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4
 	setflag FLAG_0x0D2
 	release
@@ -602,7 +602,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
 	setvar VAR_0x8004, 8
-	special sub_813BDB4
+	special BufferStreakTrainerText
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4
 	release
 	end

data/maps/MarineCave_End/scripts.inc

@@ -9,7 +9,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA
 	end
 
 MarineCave_End_EventScript_23AFF4:: @ 823AFF4
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, MarineCave_End_EventScript_27374E
 	removeobject 1
@@ -42,7 +42,7 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	setvar VAR_TEMP_1, 0
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq MarineCave_End_EventScript_23B084
 	compare VAR_RESULT, 4

data/maps/MauvilleCity_GameCorner/scripts.inc

@@ -409,7 +409,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137
 	msgbox MauvilleCity_GameCorner_Text_210750, 5
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210209
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, MauvilleCity_GameCorner_EventScript_21017C
 	case 1, MauvilleCity_GameCorner_EventScript_2101A6
 	case 2, MauvilleCity_GameCorner_EventScript_2101D0
@@ -540,7 +540,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -551,7 +551,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 1
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -562,7 +562,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 2
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -573,7 +573,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 3
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -584,7 +584,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 4
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -595,7 +595,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 5
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -606,7 +606,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 6
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -617,7 +617,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 7
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -628,7 +628,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 8
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -639,7 +639,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 9
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -650,7 +650,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 10
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end
@@ -661,7 +661,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_GameCorner_EventScript_210456
 	setvar VAR_0x8004, 11
-	specialvar VAR_RESULT, sub_8139248
+	specialvar VAR_RESULT, GetSlotMachineId
 	playslotmachine VAR_RESULT
 	releaseall
 	end

data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
 	.byte 0
 
 MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66
-	setrespawn 5
+	setrespawn HEAL_LOCATION_MAUVILLE_CITY
 	call MauvilleCity_PokemonCenter_1F_EventScript_2718DE
 	goto MauvilleCity_PokemonCenter_1F_EventScript_210E74
 	end

data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
 	.byte 0
 
 MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A
-	setrespawn 9
+	setrespawn HEAL_LOCATION_MOSSDEEP_CITY
 	end
 
 MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E

data/maps/MtChimney/scripts.inc

@@ -765,7 +765,7 @@ MtChimney_Text_22FFC0: @ 822FFC0
 	.string "It makes no response whatsoever.$"
 
 MtChimney_Text_22FFFA: @ 822FFFA
-	.string "{0x7A} JAGGED PATH\n"
+	.string "{DOWN_ARROW} JAGGED PATH\n"
 	.string "LAVARIDGE TOWN AHEAD$"
 
 MtChimney_Text_23001D: @ 823001D

data/maps/NavelRock_Bottom/scripts.inc

@@ -26,7 +26,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
 	end
 
 NavelRock_Bottom_EventScript_26928E:: @ 826928E
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, NavelRock_Bottom_EventScript_27374E
 	removeobject 1
@@ -64,7 +64,7 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2
 	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq NavelRock_Bottom_EventScript_269336
 	compare VAR_RESULT, 4

data/maps/NavelRock_Top/scripts.inc

@@ -29,7 +29,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151
 	end
 
 NavelRock_Top_EventScript_26915B:: @ 826915B
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, NavelRock_Top_EventScript_27374E
 	removeobject 1
@@ -69,7 +69,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	setvar VAR_LAST_TALKED, 1
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq NavelRock_Top_EventScript_269217
 	compare VAR_RESULT, 4

data/maps/NewMauville_Inside/scripts.inc

@@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7
 	end
 
 NewMauville_Inside_EventScript_237407:: @ 8237407
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, NewMauville_Inside_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -193,7 +193,7 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq NewMauville_Inside_EventScript_2377F3
 	compare VAR_RESULT, 4
@@ -220,7 +220,7 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq NewMauville_Inside_EventScript_237840
 	compare VAR_RESULT, 4
@@ -247,7 +247,7 @@ NewMauville_Inside_EventScript_237849:: @ 8237849
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq NewMauville_Inside_EventScript_23788D
 	compare VAR_RESULT, 4

data/maps/OldaleTown_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
 	.byte 0
 
 OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011
-	setrespawn 14
+	setrespawn HEAL_LOCATION_OLDALE_TOWN
 	call OldaleTown_PokemonCenter_1F_EventScript_2718DE
 	end
 

data/maps/PacifidlogTown_House2/scripts.inc

@@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792
 PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE
 	checkflag FLAG_0x12B
 	goto_if 0, PacifidlogTown_House2_EventScript_27374E
-	specialvar VAR_RESULT, sub_813970C
+	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	compare VAR_RESULT, 0
 	call_if 1, PacifidlogTown_House2_EventScript_203812
 	return
@@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816
 	compare VAR_RESULT, 0
 	goto_eq PacifidlogTown_House2_EventScript_272054
 	setflag FLAG_0x12B
-	special sub_8139754
+	special SetPacifidlogTMReceivedDay
 	msgbox PacifidlogTown_House2_Text_203A85, 4
 	release
 	end
@@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F
 	compare VAR_RESULT, 0
 	goto_eq PacifidlogTown_House2_EventScript_272054
 	setflag FLAG_0x12B
-	special sub_8139754
+	special SetPacifidlogTMReceivedDay
 	msgbox PacifidlogTown_House2_Text_203A85, 4
 	release
 	end
 
 PacifidlogTown_House2_EventScript_20387E:: @ 820387E
-	specialvar VAR_RESULT, sub_813970C
+	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	buffernumberstring 0, VAR_RESULT
 	msgbox PacifidlogTown_House2_Text_203AF4, 4
 	release

data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
 	.byte 0
 
 PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2
-	setrespawn 19
+	setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
 	end
 
 PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6

data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
 	.byte 0
 
 PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3
-	setrespawn 3
+	setrespawn HEAL_LOCATION_PETALBURG_CITY
 	call PetalburgCity_PokemonCenter_1F_EventScript_2718DE
 	end
 
@@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38
-	compare VAR_FIRST_POKE, 0
+	compare VAR_STARTER_MON, 0
 	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A5B
-	compare VAR_FIRST_POKE, 1
+	compare VAR_STARTER_MON, 1
 	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A64
-	compare VAR_FIRST_POKE, 2
+	compare VAR_STARTER_MON, 2
 	call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_207A6D
 	release
 	end

data/maps/Route101/scripts.inc

@@ -297,5 +297,5 @@ Route101_Text_1EC04A: @ 81EC04A
 
 Route101_Text_1EC0C8: @ 81EC0C8
 	.string "ROUTE 101\n"
-	.string "{0x79} OLDALE TOWN$"
+	.string "{UP_ARROW} OLDALE TOWN$"
 

data/maps/Route102/scripts.inc

@@ -112,8 +112,8 @@ Route102_Text_1EC32E: @ 81EC32E
 
 Route102_Text_1EC35B: @ 81EC35B
 	.string "ROUTE 102\n"
-	.string "{0x7C} OLDALE TOWN$"
+	.string "{RIGHT_ARROW} OLDALE TOWN$"
 
 Route102_Text_1EC373: @ 81EC373
 	.string "ROUTE 102\n"
-	.string "{0x7B} PETALBURG CITY$"
+	.string "{LEFT_ARROW} PETALBURG CITY$"

data/maps/Route103/scripts.inc

@@ -38,7 +38,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA
 	applymovement 2, Route103_Movement_27259A
 	waitmovement 0
 	msgbox Route103_Text_1EC7DE, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_1EC48E
 	case 1, Route103_EventScript_1EC49E
 	case 2, Route103_EventScript_1EC4AE
@@ -55,7 +55,7 @@ Route103_EventScript_1EC434:: @ 81EC434
 	applymovement 2, Route103_Movement_27259A
 	waitmovement 0
 	msgbox Route103_Text_1EC9CE, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_1EC4BE
 	case 1, Route103_EventScript_1EC4CE
 	case 2, Route103_EventScript_1EC4DE
@@ -364,5 +364,5 @@ Route103_Text_1ECBB5: @ 81ECBB5
 
 Route103_Text_1ECC1A: @ 81ECC1A
 	.string "ROUTE 103\n"
-	.string "{0x7A} OLDALE TOWN$"
+	.string "{DOWN_ARROW} OLDALE TOWN$"
 

data/maps/Route104/scripts.inc

@@ -153,7 +153,7 @@ Route104_EventScript_1ECDD0:: @ 81ECDD0
 
 Route104_EventScript_1ECDED:: @ 81ECDED
 	msgbox Route104_Text_1EDDDB, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route104_EventScript_1ECE36
 	case 1, Route104_EventScript_1ECE49
 	case 2, Route104_EventScript_1ECE5C
@@ -230,7 +230,7 @@ Route104_EventScript_1ECEEC:: @ 81ECEEC
 
 Route104_EventScript_1ECF09:: @ 81ECF09
 	msgbox Route104_Text_1EE0C7, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route104_EventScript_1ECF4D
 	case 1, Route104_EventScript_1ECF60
 	case 2, Route104_EventScript_1ECF73
@@ -1115,11 +1115,11 @@ Route104_Text_1EDA8C: @ 81EDA8C
 
 Route104_Text_1EDAA1: @ 81EDAA1
 	.string "ROUTE 1O4\n"
-	.string "{0x7C} PETALBURG CITY$"
+	.string "{RIGHT_ARROW} PETALBURG CITY$"
 
 Route104_Text_1EDABC: @ 81EDABC
 	.string "ROUTE 1O4\n"
-	.string "{0x79} RUSTBORO CITY$"
+	.string "{UP_ARROW} RUSTBORO CITY$"
 
 Route104_Text_1EDAD6: @ 81EDAD6
 	.string "PRETTY PETAL FLOWER SHOP$"

data/maps/Route110/events.inc

@@ -45,8 +45,8 @@ Route110_MapWarps: @ 8529050
 	warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
 
 Route110_MapCoordEvents: @ 8529080
-	coord_event 28, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661
+	coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
-	coord_event 29, 92, 3, VAR_0x40A9, 2, Route110_EventScript_1EF661
+	coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661
 	coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D
 	coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758
 	coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763

data/maps/Route110/scripts.inc

@@ -11,7 +11,7 @@ Route110_MapScript1_1EF279: @ 81EF279
 Route110_MapScript1_1EF27D: @ 81EF27D
 	call Route110_EventScript_271ED7
 	call Route110_EventScript_271EFB
-	compare VAR_0x40A9, 1
+	compare VAR_CYCLING_CHALLENGE_STATE, 1
 	call_if 1, Route110_EventScript_1EF293
 	end
 
@@ -20,12 +20,12 @@ Route110_EventScript_1EF293:: @ 81EF293
 	return
 
 Route110_MapScript2_1EF297: @ 81EF297
-	map_script_2 VAR_0x40A9, 1, Route110_EventScript_1EF2A1
+	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_1EF2A1
 	.2byte 0
 
 Route110_EventScript_1EF2A1:: @ 81EF2A1
 	special Special_BeginCyclingRoadChallenge
-	setvar VAR_0x40A9, 2
+	setvar VAR_CYCLING_CHALLENGE_STATE, 2
 	return
 
 Route110_EventScript_1EF2AA:: @ 81EF2AA
@@ -148,7 +148,7 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7
 	specialvar VAR_RESULT, GetPlayerAvatarBike
 	compare VAR_RESULT, 1
 	goto_eq Route110_EventScript_1EF3E8
-	compare VAR_0x40A9, 0
+	compare VAR_CYCLING_CHALLENGE_STATE, 0
 	goto_eq Route110_EventScript_1EF3DE
 	msgbox Route110_Text_1F06FB, 4
 	release
@@ -368,7 +368,7 @@ Route110_EventScript_1EF735:: @ 81EF735
 	end
 
 Route110_EventScript_1EF743:: @ 81EF743
-	setvar VAR_0x40A9, 3
+	setvar VAR_CYCLING_CHALLENGE_STATE, 3
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
@@ -426,7 +426,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6
 
 Route110_EventScript_1EF7EB:: @ 81EF7EB
 	msgbox Route110_Text_1EFC48, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_1EF81A
 	case 1, Route110_EventScript_1EF82A
 	case 2, Route110_EventScript_1EF83A
@@ -456,7 +456,7 @@ Route110_EventScript_1EF84A:: @ 81EF84A
 
 Route110_EventScript_1EF865:: @ 81EF865
 	msgbox Route110_Text_1EFE3F, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_1EF894
 	case 1, Route110_EventScript_1EF8A4
 	case 2, Route110_EventScript_1EF8B4
@@ -951,7 +951,7 @@ Route110_Text_1F0755: @ 81F0755
 
 Route110_Text_1F0812: @ 81F0812
 	.string "ROUTE 110\n"
-	.string "{0x7A} SLATEPORT CITY$"
+	.string "{DOWN_ARROW} SLATEPORT CITY$"
 
 Route110_Text_1F082D: @ 81F082D
 	.string "SEASIDE CYCLING ROAD$"
@@ -965,14 +965,14 @@ Route110_Text_1F0842: @ 81F0842
 
 Route110_Text_1F08CD: @ 81F08CD
 	.string "ROUTE 110\n"
-	.string "{0x7B} ROUTE 103$"
+	.string "{LEFT_ARROW} ROUTE 103$"
 
 Route110_Text_1F08E3: @ 81F08E3
 	.string "SEASIDE PARKING$"
 
 Route110_Text_1F08F3: @ 81F08F3
 	.string "ROUTE 110\n"
-	.string "{0x79} MAUVILLE CITY$"
+	.string "{UP_ARROW} MAUVILLE CITY$"
 
 Route110_Text_1F090D: @ 81F090D
 	.string "TRAINER TIPS\p"
@@ -987,7 +987,7 @@ Route110_Text_1F0992: @ 81F0992
 	.string "by pressing SELECT.$"
 
 Route110_Text_1F09DB: @ 81F09DB
-	.string "“Three steps {0x7C} and two steps {0x79}\n"
+	.string "“Three steps {RIGHT_ARROW} and two steps {UP_ARROW}\n"
 	.string "to reach the wondrous TRICK HOUSE.”$"
 
 Route110_Text_1F0A1E: @ 81F0A1E

data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc

@@ -3,14 +3,14 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
 	.byte 0
 
 Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7
-	compare VAR_0x40A9, 3
+	compare VAR_CYCLING_CHALLENGE_STATE, 3
 	call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
-	compare VAR_0x40A9, 2
+	compare VAR_CYCLING_CHALLENGE_STATE, 2
 	call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
 	end
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE
-	setvar VAR_0x40A9, 1
+	setvar VAR_CYCLING_CHALLENGE_STATE, 1
 	return
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4
@@ -33,7 +33,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0
 	end
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6
-	setvar VAR_0x40A9, 1
+	setvar VAR_CYCLING_CHALLENGE_STATE, 1
 	return
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC
@@ -50,7 +50,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13
 	lockall
-	setvar VAR_0x40A9, 0
+	setvar VAR_CYCLING_CHALLENGE_STATE, 0
 	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 0
 	releaseall

data/maps/Route111/scripts.inc

@@ -676,7 +676,7 @@ Route111_Text_1F186E: @ 81F186E
 
 Route111_Text_1F18CE: @ 81F18CE
 	.string "ROUTE 111\n"
-	.string "{0x7A} MAUVILLE CITY$"
+	.string "{DOWN_ARROW} MAUVILLE CITY$"
 
 Route111_Text_1F18E8: @ 81F18E8
 	.string "“Our family’s hearts beat as one!”\n"
@@ -684,11 +684,11 @@ Route111_Text_1F18E8: @ 81F18E8
 
 Route111_Text_1F1921: @ 81F1921
 	.string "ROUTE 111\n"
-	.string "{0x7B} ROUTE 112$"
+	.string "{LEFT_ARROW} ROUTE 112$"
 
 Route111_Text_1F1937: @ 81F1937
 	.string "ROUTE 111\n"
-	.string "{0x7B} ROUTE 113$"
+	.string "{LEFT_ARROW} ROUTE 113$"
 
 Route111_Text_1F194D: @ 81F194D
 	.string "OLD LADY’S REST STOP\n"
@@ -750,7 +750,7 @@ Route111_Text_1F1CCA: @ 81F1CCA
 	.string "the bike shop in MAUVILLE.$"
 
 Route111_Text_1F1D61: @ 81F1D61
-	.string "{0x7C} TRAINER HILL ENTRANCE\p"
+	.string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p"
 	.string "“Scale the heights, you hot-blooded\n"
 	.string "TRAINERS!”$"
 

data/maps/Route112/scripts.inc

@@ -133,7 +133,7 @@ Route112_Text_1F204E: @ 81F204E
 
 Route112_Text_1F20C1: @ 81F20C1
 	.string "MT. CHIMNEY CABLE CAR\n"
-	.string "“A short walk {0x79} way!”$"
+	.string "“A short walk {UP_ARROW} way!”$"
 
 Route112_Text_1F20ED: @ 81F20ED
 	.string "MT. CHIMNEY\p"
@@ -142,5 +142,5 @@ Route112_Text_1F20ED: @ 81F20ED
 
 Route112_Text_1F2138: @ 81F2138
 	.string "ROUTE 112\n"
-	.string "{0x7B} LAVARIDGE TOWN$"
+	.string "{LEFT_ARROW} LAVARIDGE TOWN$"
 

data/maps/Route113/scripts.inc

@@ -157,11 +157,11 @@ Route113_Text_1F23CA: @ 81F23CA
 
 Route113_Text_1F2440: @ 81F2440
 	.string "ROUTE 113\n"
-	.string "{0x7C} ROUTE 111$"
+	.string "{RIGHT_ARROW} ROUTE 111$"
 
 Route113_Text_1F2456: @ 81F2456
 	.string "ROUTE 113\n"
-	.string "{0x7B} FALLARBOR TOWN$"
+	.string "{LEFT_ARROW} FALLARBOR TOWN$"
 
 Route113_Text_1F2471: @ 81F2471
 	.string "TRAINER TIPS\p"

data/maps/Route115/scripts.inc

@@ -154,7 +154,7 @@ Route115_Text_1F2B55: @ 81F2B55
 
 Route115_Text_1F2BC9: @ 81F2BC9
 	.string "ROUTE 115\n"
-	.string "{0x7A} RUSTBORO CITY$"
+	.string "{DOWN_ARROW} RUSTBORO CITY$"
 
 Route115_Text_1F2BE3: @ 81F2BE3
 	.string "METEOR FALLS\n"

data/maps/Route116/scripts.inc

@@ -169,7 +169,7 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6
 	checkitem ITEM_BLACK_GLASSES, 1
 	compare VAR_RESULT, 1
 	goto_eq Route116_EventScript_1F2DF1
-	specialvar VAR_RESULT, sub_8139634
+	specialvar VAR_RESULT, FoundBlackGlasses
 	compare VAR_RESULT, 1
 	goto_eq Route116_EventScript_1F2DE2
 	msgbox Route116_Text_1F3657, 4
@@ -185,7 +185,7 @@ Route116_EventScript_1F2DE2:: @ 81F2DE2
 Route116_EventScript_1F2DF1:: @ 81F2DF1
 	msgbox Route116_Text_1F3657, 4
 	msgbox Route116_Text_1F3688, 4
-	specialvar VAR_RESULT, sub_8139634
+	specialvar VAR_RESULT, FoundBlackGlasses
 	compare VAR_RESULT, 1
 	goto_eq Route116_EventScript_1F2E1B
 	msgbox Route116_Text_1F375E, 4
@@ -482,7 +482,7 @@ Route116_Text_1F375E: @ 81F375E
 
 Route116_Text_1F379D: @ 81F379D
 	.string "ROUTE 116\n"
-	.string "{0x7B} RUSTBORO CITY$"
+	.string "{LEFT_ARROW} RUSTBORO CITY$"
 
 Route116_Text_1F37B7: @ 81F37B7
 	.string "RUSTURF TUNNEL\n"

data/maps/Route116_TunnelersRestHouse/scripts.inc

@@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863
 Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C
 	lock
 	faceplayer
-	checkflag FLAG_0x0C7
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_eq Route116_TunnelersRestHouse_EventScript_22B881
 	msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4
 	release

data/maps/Route117/scripts.inc

@@ -220,11 +220,11 @@ Route117_Text_1F3D41: @ 81F3D41
 
 Route117_Text_1F3D58: @ 81F3D58
 	.string "ROUTE 117\n"
-	.string "{0x7B} VERDANTURF TOWN$"
+	.string "{LEFT_ARROW} VERDANTURF TOWN$"
 
 Route117_Text_1F3D74: @ 81F3D74
 	.string "ROUTE 117\n"
-	.string "{0x7C} MAUVILLE CITY$"
+	.string "{RIGHT_ARROW} MAUVILLE CITY$"
 
 Route117_Text_1F3D8E: @ 81F3D8E
 	.string "POKéMON DAY CARE\n"

data/maps/Route118/scripts.inc

@@ -310,9 +310,9 @@ Route118_Text_1F4367: @ 81F4367
 
 Route118_Text_1F43F4: @ 81F43F4
 	.string "ROUTE 118\n"
-	.string "{0x7B} MAUVILLE CITY$"
+	.string "{LEFT_ARROW} MAUVILLE CITY$"
 
 Route118_Text_1F440E: @ 81F440E
 	.string "ROUTE 118\n"
-	.string "{0x79} ROUTE 119$"
+	.string "{UP_ARROW} ROUTE 119$"
 

data/maps/Route119/scripts.inc

@@ -9,7 +9,7 @@ Route119_MapScript1_1F442F: @ 81F442F
 	end
 
 Route119_EventScript_1F4439:: @ 81F4439
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, Route119_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -80,7 +80,7 @@ Route119_EventScript_1F4506:: @ 81F4506
 
 Route119_EventScript_1F450B:: @ 81F450B
 	msgbox Route119_Text_1F49FD, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_1F453A
 	case 1, Route119_EventScript_1F454A
 	case 2, Route119_EventScript_1F455A
@@ -110,7 +110,7 @@ Route119_EventScript_1F456A:: @ 81F456A
 
 Route119_EventScript_1F4585:: @ 81F4585
 	msgbox Route119_Text_1F4C9A, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_1F45B4
 	case 1, Route119_EventScript_1F45C4
 	case 2, Route119_EventScript_1F45D4
@@ -622,7 +622,7 @@ Route119_Text_1F52B9: @ 81F52B9
 
 Route119_Text_1F530E: @ 81F530E
 	.string "ROUTE 119\n"
-	.string "{0x7C} FORTREE CITY$"
+	.string "{RIGHT_ARROW} FORTREE CITY$"
 
 Route119_Text_1F5327: @ 81F5327
 	.string "WEATHER INSTITUTE$"

data/maps/Route120/scripts.inc

@@ -25,7 +25,7 @@ Route120_EventScript_1F5406:: @ 81F5406
 	return
 
 Route120_EventScript_1F5449:: @ 81F5449
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, Route120_EventScript_27374E
 	removeobject 30
@@ -33,7 +33,7 @@ Route120_EventScript_1F5449:: @ 81F5449
 	return
 
 Route120_EventScript_1F5460:: @ 81F5460
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, Route120_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -220,7 +220,7 @@ Route120_EventScript_1F568B:: @ 81F568B
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq Route120_EventScript_1F571C
 	compare VAR_RESULT, 4
@@ -459,8 +459,8 @@ Route119_Text_1F5D63: @ 81F5D63
 
 Route120_Text_1F5DCB: @ 81F5DCB
 	.string "ROUTE 120\n"
-	.string "{0x7B} FORTREE CITY$"
+	.string "{LEFT_ARROW} FORTREE CITY$"
 
 Route120_Text_1F5DE4: @ 81F5DE4
-	.string "{0x7C} ROUTE 121\n"
+	.string "{RIGHT_ARROW} ROUTE 121\n"
-	.string "{0x7B} ROUTE 120$"
+	.string "{LEFT_ARROW} ROUTE 120$"

data/maps/Route123/scripts.inc

@@ -201,11 +201,11 @@ Route123_Text_1F64CF: @ 81F64CF
 	.string "POKéMON. I’m like a tree doctor.$"
 
 Route123_Text_1F6511: @ 81F6511
-	.string "{0x7C} ROUTE 123\n"
+	.string "{RIGHT_ARROW} ROUTE 123\n"
-	.string "{0x7B} ROUTE 118$"
+	.string "{LEFT_ARROW} ROUTE 118$"
 
 Route123_Text_1F6529: @ 81F6529
-	.string "{0x79} MT. PYRE\n"
+	.string "{UP_ARROW} MT. PYRE\n"
 	.string "“Forbidden to the faint of heart.”$"
 
 Route123_Text_1F6557: @ 81F6557

data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc

@@ -339,11 +339,11 @@ Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8
 	.string "Well, if you change your mind, come back.$"
 
 Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217
-	.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
+	.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
-	.string "{CLEAR_TO}{0x0f}RED SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}FIRE STONE{CLEAR_TO}{0xc8}\p"
+	.string "{CLEAR_TO 0x0f}RED SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}FIRE STONE{CLEAR_TO 0xc8}\p"
-	.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
+	.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
-	.string "{CLEAR_TO}{0x06}YELLOW SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x73}THUNDERSTONE{CLEAR_TO}{0xc8}\p"
+	.string "{CLEAR_TO 0x06}YELLOW SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x73}THUNDERSTONE{CLEAR_TO 0xc8}\p"
-	.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
+	.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
-	.string "{CLEAR_TO}{0x0c}BLUE SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x79}WATER STONE{CLEAR_TO}{0xc8}\p"
+	.string "{CLEAR_TO 0x0c}BLUE SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x79}WATER STONE{CLEAR_TO 0xc8}\p"
-	.string "{CLEAR_TO}{0x0a}Wanted item{CLEAR_TO}{0x7c}Trade item\n"
+	.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
-	.string "{CLEAR_TO}{0x08}GREEN SHARD{CLEAR_TO}{0x59}{0x7B}{0x7C}{CLEAR_TO}{0x7b}LEAF STONE$"
+	.string "{CLEAR_TO 0x08}GREEN SHARD{CLEAR_TO 0x59}{LEFT_ARROW}{RIGHT_ARROW}{CLEAR_TO 0x7b}LEAF STONE$"

data/maps/RustboroCity/scripts.inc

@@ -306,7 +306,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
 	clearflag FLAG_0x2DC
 	setflag FLAG_0x08E
 	setvar VAR_0x405A, 2
-	setvar VAR_0x409A, 2
+	setvar VAR_RUSTURF_TUNNEL_STATE, 2
 	setvar VAR_0x406F, 1
 	clearflag FLAG_0x37B
 	clearflag FLAG_0x370
@@ -869,7 +869,7 @@ RustboroCity_EventScript_1E1070:: @ 81E1070
 
 RustboroCity_EventScript_1E1092:: @ 81E1092
 	msgbox RustboroCity_Text_1E1C84, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, RustboroCity_EventScript_1E10DB
 	case 1, RustboroCity_EventScript_1E10EE
 	case 2, RustboroCity_EventScript_1E1101
@@ -940,7 +940,7 @@ RustboroCity_EventScript_1E1174:: @ 81E1174
 
 RustboroCity_EventScript_1E1191:: @ 81E1191
 	msgbox RustboroCity_Text_1E1FA9, 4
-	switch VAR_FIRST_POKE
+	switch VAR_STARTER_MON
 	case 0, RustboroCity_EventScript_1E11D5
 	case 1, RustboroCity_EventScript_1E11E8
 	case 2, RustboroCity_EventScript_1E11FB

data/maps/RustboroCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
 	.byte 0
 
 RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D
-	setrespawn 6
+	setrespawn HEAL_LOCATION_RUSTBORO_CITY
 	call RustboroCity_PokemonCenter_1F_EventScript_2718DE
 	end
 

data/maps/RusturfTunnel/events.inc

@@ -17,8 +17,8 @@ RusturfTunnel_MapWarps: @ 85342B4
 
 RusturfTunnel_MapCoordEvents: @ 85342CC
 	coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071
-	coord_event 9, 4, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083
+	coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
-	coord_event 9, 5, 3, VAR_0x409A, 2, RusturfTunnel_EventScript_22D083
+	coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083
 	coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077
 	coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D
 

data/maps/RusturfTunnel/scripts.inc

@@ -4,12 +4,12 @@ RusturfTunnel_MapScripts:: @ 822CE27
 	.byte 0
 
 RusturfTunnel_MapScript2_22CE32: @ 822CE32
-	map_script_2 VAR_0x409A, 4, RusturfTunnel_EventScript_22CEAE
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE
-	map_script_2 VAR_0x409A, 5, RusturfTunnel_EventScript_22CEAE
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE
 	.2byte 0
 
 RusturfTunnel_MapScript1_22CE44: @ 822CE44
-	compare VAR_0x409A, 2
+	compare VAR_RUSTURF_TUNNEL_STATE, 2
 	call_if 1, RusturfTunnel_EventScript_22CE50
 	end
 
@@ -288,7 +288,7 @@ RusturfTunnel_EventScript_22D083:: @ 822D083
 	waitmovement 0
 	moveobjectoffscreen 6
 	moveobjectoffscreen 7
-	setvar VAR_0x409A, 3
+	setvar VAR_RUSTURF_TUNNEL_STATE, 3
 	releaseall
 	end
 

data/maps/SSTidalCorridor/scripts.inc

@@ -4,15 +4,15 @@ SSTidalCorridor_MapScripts:: @ 823BFCF
 
 SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
 	map_script_2 VAR_0x40D4, 0, SSTidalCorridor_EventScript_23C219
-	map_script_2 VAR_PORTHOLE, 1, SSTidalCorridor_EventScript_23BFFF
+	map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
-	map_script_2 VAR_PORTHOLE, 5, SSTidalCorridor_EventScript_23C015
+	map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
-	map_script_2 VAR_PORTHOLE, 9, SSTidalCorridor_EventScript_23C067
+	map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
-	map_script_2 VAR_PORTHOLE, 10, SSTidalCorridor_EventScript_23C07D
+	map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D
 	.2byte 0
 
 SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE, 2
+	setvar VAR_PORTHOLE_STATE, 2
 	lockall
 	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_23C462, 4
@@ -20,7 +20,7 @@ SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
 	end
 
 SSTidalCorridor_EventScript_23C015:: @ 823C015
-	setvar VAR_PORTHOLE, 6
+	setvar VAR_PORTHOLE_STATE, 6
 	lockall
 	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_23C4E3, 4
@@ -29,28 +29,28 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015
 
 SSTidalRooms_EventScript_23C028:: @ 823C028
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE, 7
+	setvar VAR_PORTHOLE_STATE, 7
 	playse SE_PINPON
 	msgbox SSTidalRooms_Text_23C462, 4
 	return
 
 SSTidalRooms_EventScript_23C03C:: @ 823C03C
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 4
+	setvar VAR_PORTHOLE_STATE, 4
 	playse SE_PINPON
 	msgbox SSTidalRooms_Text_23C553, 4
 	return
 
 SSTidalCorridor_EventScript_23C050:: @ 823C050
-	compare VAR_PORTHOLE, 2
+	compare VAR_PORTHOLE_STATE, 2
 	goto_eq SSTidalCorridor_EventScript_23C067
-	compare VAR_PORTHOLE, 7
+	compare VAR_PORTHOLE_STATE, 7
 	goto_eq SSTidalCorridor_EventScript_23C07D
 	end
 
 SSTidalCorridor_EventScript_23C067:: @ 823C067
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 3
+	setvar VAR_PORTHOLE_STATE, 3
 	lockall
 	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_23C4E3, 4
@@ -59,7 +59,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067
 
 SSTidalCorridor_EventScript_23C07D:: @ 823C07D
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 8
+	setvar VAR_PORTHOLE_STATE, 8
 	lockall
 	playse SE_PINPON
 	msgbox SSTidalCorridor_Text_23C50F, 4
@@ -68,13 +68,13 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D
 
 SSTidalRooms_EventScript_23C093:: @ 823C093
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE, 8
+	setvar VAR_PORTHOLE_STATE, 8
 	playse SE_PINPON
 	msgbox SSTidalRooms_Text_23C50F, 4
 	return
 
 SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
-	switch VAR_PORTHOLE
+	switch VAR_PORTHOLE_STATE
 	case 2, SSTidalRooms_EventScript_23C03C
 	case 3, SSTidalRooms_EventScript_23C03C
 	case 6, SSTidalRooms_EventScript_23C028
@@ -114,16 +114,16 @@ SSTidalCorridor_EventScript_23C110:: @ 823C110
 SSTidalCorridor_EventScript_23C119:: @ 823C119
 	lock
 	faceplayer
-	compare VAR_PORTHOLE, 4
+	compare VAR_PORTHOLE_STATE, 4
 	goto_eq SSTidalCorridor_EventScript_23C13B
-	compare VAR_PORTHOLE, 8
+	compare VAR_PORTHOLE_STATE, 8
 	goto_eq SSTidalCorridor_EventScript_23C15A
 	msgbox SSTidalCorridor_Text_23C596, 4
 	release
 	end
 
 SSTidalCorridor_EventScript_23C13B:: @ 823C13B
-	setrespawn 8
+	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	msgbox SSTidalCorridor_Text_23C64F, 4
 	checkflag FLAG_0x104
 	call_if 1, SSTidalCorridor_EventScript_23C179
@@ -133,7 +133,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B
 	end
 
 SSTidalCorridor_EventScript_23C15A:: @ 823C15A
-	setrespawn 4
+	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	msgbox SSTidalCorridor_Text_23C64F, 4
 	checkflag FLAG_0x104
 	call_if 1, SSTidalCorridor_EventScript_23C179
@@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_23C179:: @ 823C179
 
 SSTidalCorridor_EventScript_23C17D:: @ 823C17D
 	lockall
-	compare VAR_PORTHOLE, 2
+	compare VAR_PORTHOLE_STATE, 2
 	goto_eq SSTidalCorridor_EventScript_23C19E
-	compare VAR_PORTHOLE, 7
+	compare VAR_PORTHOLE_STATE, 7
 	goto_eq SSTidalCorridor_EventScript_23C19E
 	msgbox SSTidalCorridor_Text_23C6C3, 4
 	releaseall

data/maps/SkyPillar_Top/scripts.inc

@@ -10,7 +10,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8
 	end
 
 SkyPillar_Top_EventScript_2396D2:: @ 82396D2
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, SkyPillar_Top_EventScript_27374E
 	removeobject VAR_LAST_TALKED
@@ -56,7 +56,7 @@ SkyPillar_Top_EventScript_239722:: @ 8239722
 	special BattleSetup_StartLegendaryBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq SkyPillar_Top_EventScript_239768
 	compare VAR_RESULT, 4

data/maps/SlateportCity_Harbor/scripts.inc

@@ -203,7 +203,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92
 	msgbox SlateportCity_Harbor_Text_20CF93, 5
 	compare VAR_RESULT, 0
 	goto_eq SlateportCity_Harbor_EventScript_20CBDD
-	setvar VAR_PORTHOLE, 1
+	setvar VAR_PORTHOLE_STATE, 1
 	call SlateportCity_Harbor_EventScript_20CBE9
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate

data/maps/SlateportCity_House1/scripts.inc

@@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3
 	special TV_CheckMonOTIDEqualsPlayerID
 	compare VAR_RESULT, 1
 	goto_eq SlateportCity_House1_EventScript_209B50
-	specialvar VAR_RESULT, sub_8139770
+	specialvar VAR_RESULT, MonOTNameMatchesPlayer
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare VAR_RESULT, 1
 	goto_eq SlateportCity_House1_EventScript_209B50

data/maps/SlateportCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
 	.byte 0
 
 SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA
-	setrespawn 4
+	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	call SlateportCity_PokemonCenter_1F_EventScript_2718DE
 	end
 

data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc

@@ -91,7 +91,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
 	special SavePlayerParty
-	special sub_8139238
+	special BufferEReaderTrainerName
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5
 	compare VAR_RESULT, 0
 	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2

data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc

@@ -4,7 +4,7 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
 	.byte 0
 
 SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC
-	setrespawn 10
+	setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY
 	end
 
 SootopolisCity_PokemonCenter_1F_EventScript_226500:: @ 8226500

data/maps/SouthernIsland_Interior/scripts.inc

@@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
 	end
 
 SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 7
 	goto_if 5, SouthernIsland_Interior_EventScript_27374E
 	removeobject 2
@@ -90,7 +90,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0
 	special BattleSetup_StartLatiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar VAR_RESULT, sub_8138B80
+	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, 1
 	goto_eq SouthernIsland_Interior_EventScript_242B81
 	compare VAR_RESULT, 4